diff options
author | Spottedleaf <[email protected]> | 2024-12-16 09:24:34 -0800 |
---|---|---|
committer | Spottedleaf <[email protected]> | 2024-12-16 09:39:14 -0800 |
commit | 7d29c678f771fe49cbb852fbde2b92974042357d (patch) | |
tree | 11672c8d4434f7decdd7a17ac5c778f4149e856e | |
parent | df3be3f436334e6a73391138728299b3203bc980 (diff) | |
download | Paper-7d29c678f771fe49cbb852fbde2b92974042357d.tar.gz Paper-7d29c678f771fe49cbb852fbde2b92974042357d.zip |
Add in DataConverter
-rw-r--r-- | paper-server/patches/features/0001-Add-PaperHooks.patch | 252 | ||||
-rw-r--r-- | paper-server/patches/features/0002-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch (renamed from paper-server/patches/features/0001-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch) | 0 | ||||
-rw-r--r-- | paper-server/patches/features/0003-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch (renamed from paper-server/patches/features/0002-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch) | 0 | ||||
-rw-r--r-- | paper-server/patches/features/0004-Optimize-Network-Manager-and-add-advanced-packet-sup.patch (renamed from paper-server/patches/features/0003-Optimize-Network-Manager-and-add-advanced-packet-sup.patch) | 0 | ||||
-rw-r--r-- | paper-server/patches/features/0005-Allow-Saving-of-Oversized-Chunks.patch (renamed from paper-server/patches/features/0004-Allow-Saving-of-Oversized-Chunks.patch) | 0 | ||||
-rw-r--r-- | paper-server/patches/features/0006-Entity-Activation-Range-2.0.patch (renamed from paper-server/patches/features/0005-Entity-Activation-Range-2.0.patch) | 0 | ||||
-rw-r--r-- | paper-server/patches/features/0007-Anti-Xray.patch (renamed from paper-server/patches/features/0006-Anti-Xray.patch) | 0 | ||||
-rw-r--r-- | paper-server/patches/features/0008-Use-Velocity-compression-and-cipher-natives.patch (renamed from paper-server/patches/features/0007-Use-Velocity-compression-and-cipher-natives.patch) | 0 | ||||
-rw-r--r-- | paper-server/patches/features/0009-Optimize-Collision-to-not-load-chunks.patch (renamed from paper-server/patches/features/0008-Optimize-Collision-to-not-load-chunks.patch) | 0 | ||||
-rw-r--r-- | paper-server/patches/features/0010-Optimize-GoalSelector-Goal.Flag-Set-operations.patch (renamed from paper-server/patches/features/0009-Optimize-GoalSelector-Goal.Flag-Set-operations.patch) | 0 | ||||
-rw-r--r-- | paper-server/patches/features/0011-Optimize-Voxel-Shape-Merging.patch (renamed from paper-server/patches/features/0010-Optimize-Voxel-Shape-Merging.patch) | 0 | ||||
-rw-r--r-- | paper-server/patches/features/0012-Fix-entity-type-tags-suggestions-in-selectors.patch (renamed from paper-server/patches/features/0011-Fix-entity-type-tags-suggestions-in-selectors.patch) | 0 | ||||
-rw-r--r-- | paper-server/patches/features/0013-Handle-Oversized-block-entities-in-chunks.patch (renamed from paper-server/patches/features/0012-Handle-Oversized-block-entities-in-chunks.patch) | 2 | ||||
-rw-r--r-- | paper-server/patches/features/0014-Check-distance-in-entity-interactions.patch (renamed from paper-server/patches/features/0013-Check-distance-in-entity-interactions.patch) | 2 | ||||
-rw-r--r-- | paper-server/patches/features/0015-optimize-dirt-and-snow-spreading.patch (renamed from paper-server/patches/features/0014-optimize-dirt-and-snow-spreading.patch) | 0 | ||||
-rw-r--r-- | paper-server/patches/features/0016-Optimise-getChunkAt-calls-for-loaded-chunks.patch (renamed from paper-server/patches/features/0015-Optimise-getChunkAt-calls-for-loaded-chunks.patch) | 0 | ||||
-rw-r--r-- | paper-server/patches/features/0017-Rewrite-dataconverter-system.patch (renamed from paper-server/patches/features/0016-Rewrite-dataconverter-system.patch) | 1445 | ||||
-rw-r--r-- | paper-server/src/main/java/ca/spottedleaf/moonrise/paper/PaperHooks.java | 240 | ||||
-rw-r--r-- | paper-server/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java | 4 |
19 files changed, 954 insertions, 991 deletions
diff --git a/paper-server/patches/features/0001-Add-PaperHooks.patch b/paper-server/patches/features/0001-Add-PaperHooks.patch new file mode 100644 index 0000000000..db8dd7f311 --- /dev/null +++ b/paper-server/patches/features/0001-Add-PaperHooks.patch @@ -0,0 +1,252 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Spottedleaf <[email protected]> +Date: Mon, 16 Dec 2024 09:03:35 -0800 +Subject: [PATCH] Add PaperHooks + + +diff --git a/ca/spottedleaf/moonrise/paper/PaperHooks.java b/ca/spottedleaf/moonrise/paper/PaperHooks.java +new file mode 100644 +index 0000000000000000000000000000000000000000..834c5ce238c7adb0164a6282582d709348ef96cc +--- /dev/null ++++ b/ca/spottedleaf/moonrise/paper/PaperHooks.java +@@ -0,0 +1,240 @@ ++package ca.spottedleaf.moonrise.paper; ++ ++import ca.spottedleaf.moonrise.common.PlatformHooks; ++import com.mojang.datafixers.DSL; ++import com.mojang.datafixers.DataFixer; ++import com.mojang.serialization.Dynamic; ++import java.util.Collection; ++import net.minecraft.core.BlockPos; ++import net.minecraft.nbt.CompoundTag; ++import net.minecraft.nbt.NbtOps; ++import net.minecraft.server.level.ChunkHolder; ++import net.minecraft.server.level.GenerationChunkHolder; ++import net.minecraft.server.level.ServerLevel; ++import net.minecraft.server.level.ServerPlayer; ++import net.minecraft.world.entity.Entity; ++import net.minecraft.world.entity.boss.EnderDragonPart; ++import net.minecraft.world.level.BlockGetter; ++import net.minecraft.world.level.ChunkPos; ++import net.minecraft.world.level.Level; ++import net.minecraft.world.level.block.state.BlockState; ++import net.minecraft.world.level.chunk.ChunkAccess; ++import net.minecraft.world.level.chunk.LevelChunk; ++import net.minecraft.world.level.chunk.ProtoChunk; ++import net.minecraft.world.level.chunk.storage.SerializableChunkData; ++import net.minecraft.world.level.entity.EntityTypeTest; ++import net.minecraft.world.phys.AABB; ++import java.util.List; ++import java.util.function.Predicate; ++ ++public final class PaperHooks implements PlatformHooks { ++ ++ @Override ++ public String getBrand() { ++ return "Paper"; ++ } ++ ++ @Override ++ public int getLightEmission(final BlockState blockState, final BlockGetter world, final BlockPos pos) { ++ return blockState.getLightEmission(); ++ } ++ ++ @Override ++ public Predicate<BlockState> maybeHasLightEmission() { ++ return (final BlockState state) -> { ++ return state.getLightEmission() != 0; ++ }; ++ } ++ ++ @Override ++ public boolean hasCurrentlyLoadingChunk() { ++ return false; ++ } ++ ++ @Override ++ public LevelChunk getCurrentlyLoadingChunk(final GenerationChunkHolder holder) { ++ return null; ++ } ++ ++ @Override ++ public void setCurrentlyLoading(final GenerationChunkHolder holder, final LevelChunk levelChunk) { ++ ++ } ++ ++ @Override ++ public void chunkFullStatusComplete(final LevelChunk newChunk, final ProtoChunk original) { ++ ++ } ++ ++ @Override ++ public boolean allowAsyncTicketUpdates() { ++ return true; ++ } ++ ++ @Override ++ public void onChunkHolderTicketChange(final ServerLevel world, final ChunkHolder holder, final int oldLevel, final int newLevel) { ++ ++ } ++ ++ @Override ++ public void chunkUnloadFromWorld(final LevelChunk chunk) { ++ ++ } ++ ++ @Override ++ public void chunkSyncSave(final ServerLevel world, final ChunkAccess chunk, final SerializableChunkData data) { ++ ++ } ++ ++ @Override ++ public void onChunkWatch(final ServerLevel world, final LevelChunk chunk, final ServerPlayer player) { ++ ++ } ++ ++ @Override ++ public void onChunkUnWatch(final ServerLevel world, final ChunkPos chunk, final ServerPlayer player) { ++ ++ } ++ ++ @Override ++ public void addToGetEntities(final Level world, final Entity entity, final AABB boundingBox, final Predicate<? super Entity> predicate, final List<Entity> into) { ++ final Collection<EnderDragonPart> parts = world.dragonParts(); ++ if (parts.isEmpty()) { ++ return; ++ } ++ ++ for (final EnderDragonPart part : parts) { ++ if (part != entity && part.getBoundingBox().intersects(boundingBox) && (predicate == null || predicate.test(part))) { ++ into.add(part); ++ } ++ } ++ } ++ ++ @Override ++ public <T extends Entity> void addToGetEntities(final Level world, final EntityTypeTest<Entity, T> entityTypeTest, final AABB boundingBox, final Predicate<? super T> predicate, final List<? super T> into, final int maxCount) { ++ if (into.size() >= maxCount) { ++ // fix neoforge issue: do not add if list is already full ++ return; ++ } ++ ++ final Collection<EnderDragonPart> parts = world.dragonParts(); ++ if (parts.isEmpty()) { ++ return; ++ } ++ for (final EnderDragonPart part : parts) { ++ if (!part.getBoundingBox().intersects(boundingBox)) { ++ continue; ++ } ++ final T casted = (T)entityTypeTest.tryCast(part); ++ if (casted != null && (predicate == null || predicate.test(casted))) { ++ into.add(casted); ++ if (into.size() >= maxCount) { ++ break; ++ } ++ } ++ } ++ } ++ ++ @Override ++ public void entityMove(final Entity entity, final long oldSection, final long newSection) { ++ ++ } ++ ++ @Override ++ public boolean screenEntity(final ServerLevel world, final Entity entity, final boolean fromDisk, final boolean event) { ++ return true; ++ } ++ ++ @Override ++ public boolean configFixMC224294() { ++ return true; ++ } ++ ++ @Override ++ public boolean configAutoConfigSendDistance() { ++ return io.papermc.paper.configuration.GlobalConfiguration.get().chunkLoadingAdvanced.autoConfigSendDistance; ++ } ++ ++ @Override ++ public double configPlayerMaxLoadRate() { ++ return io.papermc.paper.configuration.GlobalConfiguration.get().chunkLoadingBasic.playerMaxChunkLoadRate; ++ } ++ ++ @Override ++ public double configPlayerMaxGenRate() { ++ return io.papermc.paper.configuration.GlobalConfiguration.get().chunkLoadingBasic.playerMaxChunkGenerateRate; ++ } ++ ++ @Override ++ public double configPlayerMaxSendRate() { ++ return io.papermc.paper.configuration.GlobalConfiguration.get().chunkLoadingBasic.playerMaxChunkSendRate; ++ } ++ ++ @Override ++ public int configPlayerMaxConcurrentLoads() { ++ return io.papermc.paper.configuration.GlobalConfiguration.get().chunkLoadingAdvanced.playerMaxConcurrentChunkLoads; ++ } ++ ++ @Override ++ public int configPlayerMaxConcurrentGens() { ++ return io.papermc.paper.configuration.GlobalConfiguration.get().chunkLoadingAdvanced.playerMaxConcurrentChunkGenerates; ++ } ++ ++ @Override ++ public long configAutoSaveInterval(final ServerLevel world) { ++ return world.paperConfig().chunks.autoSaveInterval.value(); ++ } ++ ++ @Override ++ public int configMaxAutoSavePerTick(final ServerLevel world) { ++ return world.paperConfig().chunks.maxAutoSaveChunksPerTick; ++ } ++ ++ @Override ++ public boolean configFixMC159283() { ++ return true; ++ } ++ ++ @Override ++ public boolean forceNoSave(final ChunkAccess chunk) { ++ return chunk instanceof LevelChunk levelChunk && levelChunk.mustNotSave; ++ } ++ ++ @Override ++ public CompoundTag convertNBT(final DSL.TypeReference type, final DataFixer dataFixer, final CompoundTag nbt, ++ final int fromVersion, final int toVersion) { ++ return (CompoundTag)dataFixer.update( ++ type, new Dynamic<>(NbtOps.INSTANCE, nbt), fromVersion, toVersion ++ ).getValue(); ++ } ++ ++ @Override ++ public boolean hasMainChunkLoadHook() { ++ return false; ++ } ++ ++ @Override ++ public void mainChunkLoad(final ChunkAccess chunk, final SerializableChunkData chunkData) { ++ ++ } ++ ++ @Override ++ public List<Entity> modifySavedEntities(final ServerLevel world, final int chunkX, final int chunkZ, final List<Entity> entities) { ++ return entities; ++ } ++ ++ @Override ++ public void unloadEntity(final Entity entity) { ++ entity.setRemoved(Entity.RemovalReason.UNLOADED_TO_CHUNK, org.bukkit.event.entity.EntityRemoveEvent.Cause.UNLOAD); ++ } ++ ++ @Override ++ public void postLoadProtoChunk(final ServerLevel world, final ProtoChunk chunk) { ++ net.minecraft.world.level.chunk.status.ChunkStatusTasks.postLoadProtoChunk(world, chunk.getEntities()); ++ } ++ ++ @Override ++ public int modifyEntityTrackingRange(final Entity entity, final int currentRange) { ++ return org.spigotmc.TrackingRange.getEntityTrackingRange(entity, currentRange); ++ } ++} diff --git a/paper-server/patches/features/0001-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch b/paper-server/patches/features/0002-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch index 4f1d53e0e3..4f1d53e0e3 100644 --- a/paper-server/patches/features/0001-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch +++ b/paper-server/patches/features/0002-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch diff --git a/paper-server/patches/features/0002-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/paper-server/patches/features/0003-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch index a7533a2d46..a7533a2d46 100644 --- a/paper-server/patches/features/0002-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch +++ b/paper-server/patches/features/0003-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch diff --git a/paper-server/patches/features/0003-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/paper-server/patches/features/0004-Optimize-Network-Manager-and-add-advanced-packet-sup.patch index b3be838455..b3be838455 100644 --- a/paper-server/patches/features/0003-Optimize-Network-Manager-and-add-advanced-packet-sup.patch +++ b/paper-server/patches/features/0004-Optimize-Network-Manager-and-add-advanced-packet-sup.patch diff --git a/paper-server/patches/features/0004-Allow-Saving-of-Oversized-Chunks.patch b/paper-server/patches/features/0005-Allow-Saving-of-Oversized-Chunks.patch index 9c998777de..9c998777de 100644 --- a/paper-server/patches/features/0004-Allow-Saving-of-Oversized-Chunks.patch +++ b/paper-server/patches/features/0005-Allow-Saving-of-Oversized-Chunks.patch diff --git a/paper-server/patches/features/0005-Entity-Activation-Range-2.0.patch b/paper-server/patches/features/0006-Entity-Activation-Range-2.0.patch index 322c566db9..322c566db9 100644 --- a/paper-server/patches/features/0005-Entity-Activation-Range-2.0.patch +++ b/paper-server/patches/features/0006-Entity-Activation-Range-2.0.patch diff --git a/paper-server/patches/features/0006-Anti-Xray.patch b/paper-server/patches/features/0007-Anti-Xray.patch index b322872f20..b322872f20 100644 --- a/paper-server/patches/features/0006-Anti-Xray.patch +++ b/paper-server/patches/features/0007-Anti-Xray.patch diff --git a/paper-server/patches/features/0007-Use-Velocity-compression-and-cipher-natives.patch b/paper-server/patches/features/0008-Use-Velocity-compression-and-cipher-natives.patch index 8ec9093e28..8ec9093e28 100644 --- a/paper-server/patches/features/0007-Use-Velocity-compression-and-cipher-natives.patch +++ b/paper-server/patches/features/0008-Use-Velocity-compression-and-cipher-natives.patch diff --git a/paper-server/patches/features/0008-Optimize-Collision-to-not-load-chunks.patch b/paper-server/patches/features/0009-Optimize-Collision-to-not-load-chunks.patch index 940badfeb9..940badfeb9 100644 --- a/paper-server/patches/features/0008-Optimize-Collision-to-not-load-chunks.patch +++ b/paper-server/patches/features/0009-Optimize-Collision-to-not-load-chunks.patch diff --git a/paper-server/patches/features/0009-Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/paper-server/patches/features/0010-Optimize-GoalSelector-Goal.Flag-Set-operations.patch index 8d68059b74..8d68059b74 100644 --- a/paper-server/patches/features/0009-Optimize-GoalSelector-Goal.Flag-Set-operations.patch +++ b/paper-server/patches/features/0010-Optimize-GoalSelector-Goal.Flag-Set-operations.patch diff --git a/paper-server/patches/features/0010-Optimize-Voxel-Shape-Merging.patch b/paper-server/patches/features/0011-Optimize-Voxel-Shape-Merging.patch index b9255fa095..b9255fa095 100644 --- a/paper-server/patches/features/0010-Optimize-Voxel-Shape-Merging.patch +++ b/paper-server/patches/features/0011-Optimize-Voxel-Shape-Merging.patch diff --git a/paper-server/patches/features/0011-Fix-entity-type-tags-suggestions-in-selectors.patch b/paper-server/patches/features/0012-Fix-entity-type-tags-suggestions-in-selectors.patch index 0f7eeec9d8..0f7eeec9d8 100644 --- a/paper-server/patches/features/0011-Fix-entity-type-tags-suggestions-in-selectors.patch +++ b/paper-server/patches/features/0012-Fix-entity-type-tags-suggestions-in-selectors.patch diff --git a/paper-server/patches/features/0012-Handle-Oversized-block-entities-in-chunks.patch b/paper-server/patches/features/0013-Handle-Oversized-block-entities-in-chunks.patch index 3d61143e0e..3ae9000bc3 100644 --- a/paper-server/patches/features/0012-Handle-Oversized-block-entities-in-chunks.patch +++ b/paper-server/patches/features/0013-Handle-Oversized-block-entities-in-chunks.patch @@ -47,7 +47,7 @@ index 3aea76690bc3e35758d3bf274777130af17d8a0f..9e321ef1c3d5803519b243685f4ee598 } } diff --git a/net/minecraft/network/protocol/game/ClientboundLevelChunkWithLightPacket.java b/net/minecraft/network/protocol/game/ClientboundLevelChunkWithLightPacket.java -index d2d21fe8d7275b01454e09be252d7dd7710cdc2d..5eef540242413df3ed136aa8837866a94cc285b3 100644 +index 5699bc15eba92e22433a20cb8326b59f2ebd3036..8578d1f78ddd1bb75f3230f04bfaa35af9f5f822 100644 --- a/net/minecraft/network/protocol/game/ClientboundLevelChunkWithLightPacket.java +++ b/net/minecraft/network/protocol/game/ClientboundLevelChunkWithLightPacket.java @@ -84,4 +84,11 @@ public class ClientboundLevelChunkWithLightPacket implements Packet<ClientGamePa diff --git a/paper-server/patches/features/0013-Check-distance-in-entity-interactions.patch b/paper-server/patches/features/0014-Check-distance-in-entity-interactions.patch index 6e558c931a..45b999e2f7 100644 --- a/paper-server/patches/features/0013-Check-distance-in-entity-interactions.patch +++ b/paper-server/patches/features/0014-Check-distance-in-entity-interactions.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Check distance in entity interactions diff --git a/net/minecraft/Util.java b/net/minecraft/Util.java -index 60952bd49a89b8d6247d0c8bac837e5b3d586a76..fe84fe69a2a9ed95ec45a9e5af6e6f5a5a74edda 100644 +index ae1d53cefb9cede1c93cb8b22122a4a2d2d9a40c..80a7a85e1a03a1ca406259207e1ae3b909b3284f 100644 --- a/net/minecraft/Util.java +++ b/net/minecraft/Util.java @@ -130,6 +130,7 @@ public class Util { diff --git a/paper-server/patches/features/0014-optimize-dirt-and-snow-spreading.patch b/paper-server/patches/features/0015-optimize-dirt-and-snow-spreading.patch index 2423e0adc9..2423e0adc9 100644 --- a/paper-server/patches/features/0014-optimize-dirt-and-snow-spreading.patch +++ b/paper-server/patches/features/0015-optimize-dirt-and-snow-spreading.patch diff --git a/paper-server/patches/features/0015-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/paper-server/patches/features/0016-Optimise-getChunkAt-calls-for-loaded-chunks.patch index 5d23cbf347..5d23cbf347 100644 --- a/paper-server/patches/features/0015-Optimise-getChunkAt-calls-for-loaded-chunks.patch +++ b/paper-server/patches/features/0016-Optimise-getChunkAt-calls-for-loaded-chunks.patch diff --git a/paper-server/patches/features/0016-Rewrite-dataconverter-system.patch b/paper-server/patches/features/0017-Rewrite-dataconverter-system.patch index 63a36045f0..844c0f9320 100644 --- a/paper-server/patches/features/0016-Rewrite-dataconverter-system.patch +++ b/paper-server/patches/features/0017-Rewrite-dataconverter-system.patch @@ -6,11 +6,11 @@ Subject: [PATCH] Rewrite dataconverter system Please see https://github.com/PaperMC/DataConverter for details. -diff --git a/src/main/java/ca/spottedleaf/dataconverter/converters/DataConverter.java b/src/main/java/ca/spottedleaf/dataconverter/converters/DataConverter.java +diff --git a/ca/spottedleaf/dataconverter/converters/DataConverter.java b/ca/spottedleaf/dataconverter/converters/DataConverter.java new file mode 100644 index 0000000000000000000000000000000000000000..1863c606be715683d53863a0c9293525d199c9cf --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/converters/DataConverter.java ++++ b/ca/spottedleaf/dataconverter/converters/DataConverter.java @@ -0,0 +1,54 @@ +package ca.spottedleaf.dataconverter.converters; + @@ -66,11 +66,11 @@ index 0000000000000000000000000000000000000000..1863c606be715683d53863a0c9293525 + return getVersion(encoded) + "." + getStep(encoded); + } +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/converters/datatypes/DataHook.java b/src/main/java/ca/spottedleaf/dataconverter/converters/datatypes/DataHook.java +diff --git a/ca/spottedleaf/dataconverter/converters/datatypes/DataHook.java b/ca/spottedleaf/dataconverter/converters/datatypes/DataHook.java new file mode 100644 index 0000000000000000000000000000000000000000..0b92c5c66ad3a5198873f98287a5ced71c231d09 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/converters/datatypes/DataHook.java ++++ b/ca/spottedleaf/dataconverter/converters/datatypes/DataHook.java @@ -0,0 +1,9 @@ +package ca.spottedleaf.dataconverter.converters.datatypes; + @@ -81,11 +81,11 @@ index 0000000000000000000000000000000000000000..0b92c5c66ad3a5198873f98287a5ced7 + public R postHook(final T data, final long fromVersion, final long toVersion); + +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/converters/datatypes/DataType.java b/src/main/java/ca/spottedleaf/dataconverter/converters/datatypes/DataType.java +diff --git a/ca/spottedleaf/dataconverter/converters/datatypes/DataType.java b/ca/spottedleaf/dataconverter/converters/datatypes/DataType.java new file mode 100644 index 0000000000000000000000000000000000000000..b56a7f9ace3b947fed49101b6e9936721fb99ea5 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/converters/datatypes/DataType.java ++++ b/ca/spottedleaf/dataconverter/converters/datatypes/DataType.java @@ -0,0 +1,7 @@ +package ca.spottedleaf.dataconverter.converters.datatypes; + @@ -94,11 +94,11 @@ index 0000000000000000000000000000000000000000..b56a7f9ace3b947fed49101b6e993672 + public abstract R convert(final T data, final long fromVersion, final long toVersion); + +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/converters/datatypes/DataWalker.java b/src/main/java/ca/spottedleaf/dataconverter/converters/datatypes/DataWalker.java +diff --git a/ca/spottedleaf/dataconverter/converters/datatypes/DataWalker.java b/ca/spottedleaf/dataconverter/converters/datatypes/DataWalker.java new file mode 100644 index 0000000000000000000000000000000000000000..ca55b3f7e7208e629e88d4c7bfa9517384a26fef --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/converters/datatypes/DataWalker.java ++++ b/ca/spottedleaf/dataconverter/converters/datatypes/DataWalker.java @@ -0,0 +1,9 @@ +package ca.spottedleaf.dataconverter.converters.datatypes; + @@ -109,11 +109,11 @@ index 0000000000000000000000000000000000000000..ca55b3f7e7208e629e88d4c7bfa95173 + public T walk(final T data, final long fromVersion, final long toVersion); + +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/MCDataConverter.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/MCDataConverter.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/MCDataConverter.java b/ca/spottedleaf/dataconverter/minecraft/MCDataConverter.java new file mode 100644 index 0000000000000000000000000000000000000000..a27d3d41109271834b6c37fa22d4b80d9e4b88c8 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/MCDataConverter.java ++++ b/ca/spottedleaf/dataconverter/minecraft/MCDataConverter.java @@ -0,0 +1,79 @@ +package ca.spottedleaf.dataconverter.minecraft; + @@ -194,11 +194,11 @@ index 0000000000000000000000000000000000000000..a27d3d41109271834b6c37fa22d4b80d + + private MCDataConverter() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/MCVersionRegistry.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/MCVersionRegistry.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/MCVersionRegistry.java b/ca/spottedleaf/dataconverter/minecraft/MCVersionRegistry.java new file mode 100644 index 0000000000000000000000000000000000000000..344c8c4f3207b6c8b565e5ad6db2470a272b77c3 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/MCVersionRegistry.java ++++ b/ca/spottedleaf/dataconverter/minecraft/MCVersionRegistry.java @@ -0,0 +1,447 @@ +package ca.spottedleaf.dataconverter.minecraft; + @@ -647,11 +647,11 @@ index 0000000000000000000000000000000000000000..344c8c4f3207b6c8b565e5ad6db2470a + + private MCVersionRegistry() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/MCVersions.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/MCVersions.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/MCVersions.java b/ca/spottedleaf/dataconverter/minecraft/MCVersions.java new file mode 100644 index 0000000000000000000000000000000000000000..94da5d6d2f43dae07cfc6750b23689fd4a175d2a --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/MCVersions.java ++++ b/ca/spottedleaf/dataconverter/minecraft/MCVersions.java @@ -0,0 +1,568 @@ +package ca.spottedleaf.dataconverter.minecraft; + @@ -1221,11 +1221,11 @@ index 0000000000000000000000000000000000000000..94da5d6d2f43dae07cfc6750b23689fd + + private MCVersions() {} +} -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 +diff --git a/ca/spottedleaf/dataconverter/minecraft/converters/advancements/ConverterAbstractAdvancementsRename.java b/ca/spottedleaf/dataconverter/minecraft/converters/advancements/ConverterAbstractAdvancementsRename.java new file mode 100644 index 0000000000000000000000000000000000000000..ae3aed21c1fccb688e9a1665e2d317a77508d157 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/advancements/ConverterAbstractAdvancementsRename.java ++++ b/ca/spottedleaf/dataconverter/minecraft/converters/advancements/ConverterAbstractAdvancementsRename.java @@ -0,0 +1,28 @@ +package ca.spottedleaf.dataconverter.minecraft.converters.advancements; + @@ -1255,11 +1255,11 @@ index 0000000000000000000000000000000000000000..ae3aed21c1fccb688e9a1665e2d317a7 + } + +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/advancements/ConverterCriteriaRename.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/advancements/ConverterCriteriaRename.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/converters/advancements/ConverterCriteriaRename.java b/ca/spottedleaf/dataconverter/minecraft/converters/advancements/ConverterCriteriaRename.java new file mode 100644 index 0000000000000000000000000000000000000000..b2a4d16e6a2f9d71dbfa692922671581c2bec136 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/advancements/ConverterCriteriaRename.java ++++ b/ca/spottedleaf/dataconverter/minecraft/converters/advancements/ConverterCriteriaRename.java @@ -0,0 +1,42 @@ +package ca.spottedleaf.dataconverter.minecraft.converters.advancements; + @@ -1303,11 +1303,11 @@ index 0000000000000000000000000000000000000000..b2a4d16e6a2f9d71dbfa692922671581 + } + +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/attributes/ConverterAbstractAttributesRename.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/attributes/ConverterAbstractAttributesRename.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/converters/attributes/ConverterAbstractAttributesRename.java b/ca/spottedleaf/dataconverter/minecraft/converters/attributes/ConverterAbstractAttributesRename.java new file mode 100644 index 0000000000000000000000000000000000000000..f227c0565a0c475fcb06991b485507d50bbd2ad0 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/attributes/ConverterAbstractAttributesRename.java ++++ b/ca/spottedleaf/dataconverter/minecraft/converters/attributes/ConverterAbstractAttributesRename.java @@ -0,0 +1,60 @@ +package ca.spottedleaf.dataconverter.minecraft.converters.attributes; + @@ -1369,11 +1369,11 @@ index 0000000000000000000000000000000000000000..f227c0565a0c475fcb06991b485507d5 + + private ConverterAbstractAttributesRename() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/attributes/ConverterAbstractOldAttributesRename.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/attributes/ConverterAbstractOldAttributesRename.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/converters/attributes/ConverterAbstractOldAttributesRename.java b/ca/spottedleaf/dataconverter/minecraft/converters/attributes/ConverterAbstractOldAttributesRename.java new file mode 100644 index 0000000000000000000000000000000000000000..1b871c78e77015d0216a0ecc61aa05689ccfab10 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/attributes/ConverterAbstractOldAttributesRename.java ++++ b/ca/spottedleaf/dataconverter/minecraft/converters/attributes/ConverterAbstractOldAttributesRename.java @@ -0,0 +1,57 @@ +package ca.spottedleaf.dataconverter.minecraft.converters.attributes; + @@ -1432,11 +1432,11 @@ index 0000000000000000000000000000000000000000..1b871c78e77015d0216a0ecc61aa0568 + + private ConverterAbstractOldAttributesRename() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/attributes/ConverterEntityAttributesBaseValueUpdater.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/attributes/ConverterEntityAttributesBaseValueUpdater.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/converters/attributes/ConverterEntityAttributesBaseValueUpdater.java b/ca/spottedleaf/dataconverter/minecraft/converters/attributes/ConverterEntityAttributesBaseValueUpdater.java new file mode 100644 index 0000000000000000000000000000000000000000..f64b7a1999f9f81ed752626f46803174a9889e9d --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/attributes/ConverterEntityAttributesBaseValueUpdater.java ++++ b/ca/spottedleaf/dataconverter/minecraft/converters/attributes/ConverterEntityAttributesBaseValueUpdater.java @@ -0,0 +1,45 @@ +package ca.spottedleaf.dataconverter.minecraft.converters.attributes; + @@ -1483,11 +1483,11 @@ index 0000000000000000000000000000000000000000..f64b7a1999f9f81ed752626f46803174 + return null; + } +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/blockname/ConverterAbstractBlockRename.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/blockname/ConverterAbstractBlockRename.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/converters/blockname/ConverterAbstractBlockRename.java b/ca/spottedleaf/dataconverter/minecraft/converters/blockname/ConverterAbstractBlockRename.java new file mode 100644 index 0000000000000000000000000000000000000000..7b47879a7c2e8c21fae43bf5247585c716d75565 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/blockname/ConverterAbstractBlockRename.java ++++ b/ca/spottedleaf/dataconverter/minecraft/converters/blockname/ConverterAbstractBlockRename.java @@ -0,0 +1,64 @@ +package ca.spottedleaf.dataconverter.minecraft.converters.blockname; + @@ -1553,11 +1553,11 @@ index 0000000000000000000000000000000000000000..7b47879a7c2e8c21fae43bf5247585c7 + }); + } +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/chunk/ConverterAddBlendingData.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/chunk/ConverterAddBlendingData.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/converters/chunk/ConverterAddBlendingData.java b/ca/spottedleaf/dataconverter/minecraft/converters/chunk/ConverterAddBlendingData.java new file mode 100644 index 0000000000000000000000000000000000000000..d4cd5362e77eb71cb8eb45ffcc73185e01be1157 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/chunk/ConverterAddBlendingData.java ++++ b/ca/spottedleaf/dataconverter/minecraft/converters/chunk/ConverterAddBlendingData.java @@ -0,0 +1,65 @@ +package ca.spottedleaf.dataconverter.minecraft.converters.chunk; + @@ -1624,11 +1624,11 @@ index 0000000000000000000000000000000000000000..d4cd5362e77eb71cb8eb45ffcc73185e + return null; + } +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/chunk/ConverterFlattenChunk.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/chunk/ConverterFlattenChunk.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/converters/chunk/ConverterFlattenChunk.java b/ca/spottedleaf/dataconverter/minecraft/converters/chunk/ConverterFlattenChunk.java new file mode 100644 index 0000000000000000000000000000000000000000..300c2d14818b1e0cfe7341aba573ec75d0581b26 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/chunk/ConverterFlattenChunk.java ++++ b/ca/spottedleaf/dataconverter/minecraft/converters/chunk/ConverterFlattenChunk.java @@ -0,0 +1,1016 @@ +package ca.spottedleaf.dataconverter.minecraft.converters.chunk; + @@ -2646,11 +2646,11 @@ index 0000000000000000000000000000000000000000..300c2d14818b1e0cfe7341aba573ec75 + } + } +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/chunk/ConverterRenameStatus.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/chunk/ConverterRenameStatus.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/converters/chunk/ConverterRenameStatus.java b/ca/spottedleaf/dataconverter/minecraft/converters/chunk/ConverterRenameStatus.java new file mode 100644 index 0000000000000000000000000000000000000000..084c67a46bc5ec7f5a4bef3216805a87b32c83d0 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/chunk/ConverterRenameStatus.java ++++ b/ca/spottedleaf/dataconverter/minecraft/converters/chunk/ConverterRenameStatus.java @@ -0,0 +1,32 @@ +package ca.spottedleaf.dataconverter.minecraft.converters.chunk; + @@ -2684,11 +2684,11 @@ index 0000000000000000000000000000000000000000..084c67a46bc5ec7f5a4bef3216805a87 + return null; + } +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/custom/V3818_Commands.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/custom/V3818_Commands.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/converters/custom/V3818_Commands.java b/ca/spottedleaf/dataconverter/minecraft/converters/custom/V3818_Commands.java new file mode 100644 index 0000000000000000000000000000000000000000..cd190605a2c3d8631f85a74a634f7951eec6f0b1 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/custom/V3818_Commands.java ++++ b/ca/spottedleaf/dataconverter/minecraft/converters/custom/V3818_Commands.java @@ -0,0 +1,304 @@ +package ca.spottedleaf.dataconverter.minecraft.converters.custom; + @@ -2994,11 +2994,11 @@ index 0000000000000000000000000000000000000000..cd190605a2c3d8631f85a74a634f7951 + MCTypeRegistry.TILE_ENTITY.addConverterForId("minecraft:hanging_sign", signTileConverter); + } +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/entity/ConverterAbstractEntityRename.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/entity/ConverterAbstractEntityRename.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/converters/entity/ConverterAbstractEntityRename.java b/ca/spottedleaf/dataconverter/minecraft/converters/entity/ConverterAbstractEntityRename.java new file mode 100644 index 0000000000000000000000000000000000000000..6684915d6c0c44328a9296dc3ceb530e69482083 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/entity/ConverterAbstractEntityRename.java ++++ b/ca/spottedleaf/dataconverter/minecraft/converters/entity/ConverterAbstractEntityRename.java @@ -0,0 +1,38 @@ +package ca.spottedleaf.dataconverter.minecraft.converters.entity; + @@ -3038,11 +3038,11 @@ index 0000000000000000000000000000000000000000..6684915d6c0c44328a9296dc3ceb530e + } + +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/entity/ConverterEntityToVariant.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/entity/ConverterEntityToVariant.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/converters/entity/ConverterEntityToVariant.java b/ca/spottedleaf/dataconverter/minecraft/converters/entity/ConverterEntityToVariant.java new file mode 100644 index 0000000000000000000000000000000000000000..985af815e3c23ad7c8b774eac46a7202d3020234 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/entity/ConverterEntityToVariant.java ++++ b/ca/spottedleaf/dataconverter/minecraft/converters/entity/ConverterEntityToVariant.java @@ -0,0 +1,44 @@ +package ca.spottedleaf.dataconverter.minecraft.converters.entity; + @@ -3088,11 +3088,11 @@ index 0000000000000000000000000000000000000000..985af815e3c23ad7c8b774eac46a7202 + return null; + } +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/entity/ConverterEntityVariantRename.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/entity/ConverterEntityVariantRename.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/converters/entity/ConverterEntityVariantRename.java b/ca/spottedleaf/dataconverter/minecraft/converters/entity/ConverterEntityVariantRename.java new file mode 100644 index 0000000000000000000000000000000000000000..ed5dcf6f8160742c07e23e98c85409209350a7d4 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/entity/ConverterEntityVariantRename.java ++++ b/ca/spottedleaf/dataconverter/minecraft/converters/entity/ConverterEntityVariantRename.java @@ -0,0 +1,37 @@ +package ca.spottedleaf.dataconverter.minecraft.converters.entity; + @@ -3131,11 +3131,11 @@ index 0000000000000000000000000000000000000000..ed5dcf6f8160742c07e23e98c8540920 + return null; + } +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/entity/ConverterFlattenEntity.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/entity/ConverterFlattenEntity.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/converters/entity/ConverterFlattenEntity.java b/ca/spottedleaf/dataconverter/minecraft/converters/entity/ConverterFlattenEntity.java new file mode 100644 index 0000000000000000000000000000000000000000..afad2d92f78d4727ff4440ad2778f018d5a2a609 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/entity/ConverterFlattenEntity.java ++++ b/ca/spottedleaf/dataconverter/minecraft/converters/entity/ConverterFlattenEntity.java @@ -0,0 +1,371 @@ +package ca.spottedleaf.dataconverter.minecraft.converters.entity; + @@ -3508,11 +3508,11 @@ index 0000000000000000000000000000000000000000..afad2d92f78d4727ff4440ad2778f018 + return null; + } +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/helpers/AddFlagIfAbsent.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/helpers/AddFlagIfAbsent.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/converters/helpers/AddFlagIfAbsent.java b/ca/spottedleaf/dataconverter/minecraft/converters/helpers/AddFlagIfAbsent.java new file mode 100644 index 0000000000000000000000000000000000000000..4ab607f946782cc483535564e86fa9753dd7897a --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/helpers/AddFlagIfAbsent.java ++++ b/ca/spottedleaf/dataconverter/minecraft/converters/helpers/AddFlagIfAbsent.java @@ -0,0 +1,30 @@ +package ca.spottedleaf.dataconverter.minecraft.converters.helpers; + @@ -3544,11 +3544,11 @@ index 0000000000000000000000000000000000000000..4ab607f946782cc483535564e86fa975 + return null; + } +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/helpers/ConverterAbstractStringValueTypeRename.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/helpers/ConverterAbstractStringValueTypeRename.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/converters/helpers/ConverterAbstractStringValueTypeRename.java b/ca/spottedleaf/dataconverter/minecraft/converters/helpers/ConverterAbstractStringValueTypeRename.java new file mode 100644 index 0000000000000000000000000000000000000000..bc79670f47aaa413ea3e96ef6a32e14099ad8a58 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/helpers/ConverterAbstractStringValueTypeRename.java ++++ b/ca/spottedleaf/dataconverter/minecraft/converters/helpers/ConverterAbstractStringValueTypeRename.java @@ -0,0 +1,24 @@ +package ca.spottedleaf.dataconverter.minecraft.converters.helpers; + @@ -3574,11 +3574,11 @@ index 0000000000000000000000000000000000000000..bc79670f47aaa413ea3e96ef6a32e140 + } + +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/helpers/HelperBlockFlatteningV1450.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/helpers/HelperBlockFlatteningV1450.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/converters/helpers/HelperBlockFlatteningV1450.java b/ca/spottedleaf/dataconverter/minecraft/converters/helpers/HelperBlockFlatteningV1450.java new file mode 100644 index 0000000000000000000000000000000000000000..4f4f4cb6037c2a46ffcf427f5812164bbb98b8b7 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/helpers/HelperBlockFlatteningV1450.java ++++ b/ca/spottedleaf/dataconverter/minecraft/converters/helpers/HelperBlockFlatteningV1450.java @@ -0,0 +1,1829 @@ +package ca.spottedleaf.dataconverter.minecraft.converters.helpers; + @@ -5409,11 +5409,11 @@ index 0000000000000000000000000000000000000000..4f4f4cb6037c2a46ffcf427f5812164b + finalizeMaps(); + } +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/helpers/HelperItemNameV102.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/helpers/HelperItemNameV102.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/converters/helpers/HelperItemNameV102.java b/ca/spottedleaf/dataconverter/minecraft/converters/helpers/HelperItemNameV102.java new file mode 100644 index 0000000000000000000000000000000000000000..86f6aa3e3fa886976809f350fc5eb16f6a026ed9 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/helpers/HelperItemNameV102.java ++++ b/ca/spottedleaf/dataconverter/minecraft/converters/helpers/HelperItemNameV102.java @@ -0,0 +1,533 @@ +package ca.spottedleaf.dataconverter.minecraft.converters.helpers; + @@ -5948,11 +5948,11 @@ index 0000000000000000000000000000000000000000..86f6aa3e3fa886976809f350fc5eb16f + return POTION_NAMES[id & 127]; + } +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/helpers/HelperSpawnEggNameV105.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/helpers/HelperSpawnEggNameV105.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/converters/helpers/HelperSpawnEggNameV105.java b/ca/spottedleaf/dataconverter/minecraft/converters/helpers/HelperSpawnEggNameV105.java new file mode 100644 index 0000000000000000000000000000000000000000..bcc586cb68148fd960dd685eecce853169a92ed5 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/helpers/HelperSpawnEggNameV105.java ++++ b/ca/spottedleaf/dataconverter/minecraft/converters/helpers/HelperSpawnEggNameV105.java @@ -0,0 +1,77 @@ +package ca.spottedleaf.dataconverter.minecraft.converters.helpers; + @@ -6031,11 +6031,11 @@ index 0000000000000000000000000000000000000000..bcc586cb68148fd960dd685eecce8531 + return ID_TO_STRING[id & 255]; + } +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/helpers/RenameHelper.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/helpers/RenameHelper.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/converters/helpers/RenameHelper.java b/ca/spottedleaf/dataconverter/minecraft/converters/helpers/RenameHelper.java new file mode 100644 index 0000000000000000000000000000000000000000..28dcc6f1425a46c6c76dd16a67aeab0ec72d1d6a --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/helpers/RenameHelper.java ++++ b/ca/spottedleaf/dataconverter/minecraft/converters/helpers/RenameHelper.java @@ -0,0 +1,106 @@ +package ca.spottedleaf.dataconverter.minecraft.converters.helpers; + @@ -6143,11 +6143,11 @@ index 0000000000000000000000000000000000000000..28dcc6f1425a46c6c76dd16a67aeab0e + + private RenameHelper() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/itemname/ConverterAbstractItemRename.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/itemname/ConverterAbstractItemRename.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/converters/itemname/ConverterAbstractItemRename.java b/ca/spottedleaf/dataconverter/minecraft/converters/itemname/ConverterAbstractItemRename.java new file mode 100644 index 0000000000000000000000000000000000000000..94569f0ccff0d3a09eafd4ba73572d9db0a0ac5b --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/itemname/ConverterAbstractItemRename.java ++++ b/ca/spottedleaf/dataconverter/minecraft/converters/itemname/ConverterAbstractItemRename.java @@ -0,0 +1,18 @@ +package ca.spottedleaf.dataconverter.minecraft.converters.itemname; + @@ -6167,11 +6167,11 @@ index 0000000000000000000000000000000000000000..94569f0ccff0d3a09eafd4ba73572d9d + } + +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/itemstack/ConverterEnchantmentsRename.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/itemstack/ConverterEnchantmentsRename.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/converters/itemstack/ConverterEnchantmentsRename.java b/ca/spottedleaf/dataconverter/minecraft/converters/itemstack/ConverterEnchantmentsRename.java new file mode 100644 index 0000000000000000000000000000000000000000..06596b56a1f89900e5f23f7f4a12bd1d5d02b7c8 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/itemstack/ConverterEnchantmentsRename.java ++++ b/ca/spottedleaf/dataconverter/minecraft/converters/itemstack/ConverterEnchantmentsRename.java @@ -0,0 +1,38 @@ +package ca.spottedleaf.dataconverter.minecraft.converters.itemstack; + @@ -6211,11 +6211,11 @@ index 0000000000000000000000000000000000000000..06596b56a1f89900e5f23f7f4a12bd1d + return null; + } +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/itemstack/ConverterFlattenItemStack.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/itemstack/ConverterFlattenItemStack.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/converters/itemstack/ConverterFlattenItemStack.java b/ca/spottedleaf/dataconverter/minecraft/converters/itemstack/ConverterFlattenItemStack.java new file mode 100644 index 0000000000000000000000000000000000000000..21176b8b96be6cb93d3dc1a74ae9f53f1ad4740c --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/itemstack/ConverterFlattenItemStack.java ++++ b/ca/spottedleaf/dataconverter/minecraft/converters/itemstack/ConverterFlattenItemStack.java @@ -0,0 +1,460 @@ +package ca.spottedleaf.dataconverter.minecraft.converters.itemstack; + @@ -6677,11 +6677,11 @@ index 0000000000000000000000000000000000000000..21176b8b96be6cb93d3dc1a74ae9f53f + return null; + } +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/itemstack/ConverterFlattenSpawnEgg.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/itemstack/ConverterFlattenSpawnEgg.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/converters/itemstack/ConverterFlattenSpawnEgg.java b/ca/spottedleaf/dataconverter/minecraft/converters/itemstack/ConverterFlattenSpawnEgg.java new file mode 100644 index 0000000000000000000000000000000000000000..4fa31e40b0a6f571a853299b4e242de921ccbda0 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/itemstack/ConverterFlattenSpawnEgg.java ++++ b/ca/spottedleaf/dataconverter/minecraft/converters/itemstack/ConverterFlattenSpawnEgg.java @@ -0,0 +1,87 @@ +package ca.spottedleaf.dataconverter.minecraft.converters.itemstack; + @@ -6770,11 +6770,11 @@ index 0000000000000000000000000000000000000000..4fa31e40b0a6f571a853299b4e242de9 + return null; + } +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/itemstack/ConverterItemStackToDataComponents.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/itemstack/ConverterItemStackToDataComponents.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/converters/itemstack/ConverterItemStackToDataComponents.java b/ca/spottedleaf/dataconverter/minecraft/converters/itemstack/ConverterItemStackToDataComponents.java new file mode 100644 index 0000000000000000000000000000000000000000..2d29d89cc45866822189a62bffbe1a8fe57c477b --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/itemstack/ConverterItemStackToDataComponents.java ++++ b/ca/spottedleaf/dataconverter/minecraft/converters/itemstack/ConverterItemStackToDataComponents.java @@ -0,0 +1,1245 @@ +package ca.spottedleaf.dataconverter.minecraft.converters.itemstack; + @@ -8021,11 +8021,11 @@ index 0000000000000000000000000000000000000000..2d29d89cc45866822189a62bffbe1a8f + } + } +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/leveldat/ConverterRemoveFeatureFlag.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/leveldat/ConverterRemoveFeatureFlag.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/converters/leveldat/ConverterRemoveFeatureFlag.java b/ca/spottedleaf/dataconverter/minecraft/converters/leveldat/ConverterRemoveFeatureFlag.java new file mode 100644 index 0000000000000000000000000000000000000000..4c537b661b7a28193add3267ec2d639add49423b --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/leveldat/ConverterRemoveFeatureFlag.java ++++ b/ca/spottedleaf/dataconverter/minecraft/converters/leveldat/ConverterRemoveFeatureFlag.java @@ -0,0 +1,46 @@ +package ca.spottedleaf.dataconverter.minecraft.converters.leveldat; + @@ -8073,11 +8073,11 @@ index 0000000000000000000000000000000000000000..4c537b661b7a28193add3267ec2d639a + return null; + } +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/options/ConverterAbstractOptionsRename.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/options/ConverterAbstractOptionsRename.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/converters/options/ConverterAbstractOptionsRename.java b/ca/spottedleaf/dataconverter/minecraft/converters/options/ConverterAbstractOptionsRename.java new file mode 100644 index 0000000000000000000000000000000000000000..769dd8447976b66dcfc36283ede4ae16f1e4206d --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/options/ConverterAbstractOptionsRename.java ++++ b/ca/spottedleaf/dataconverter/minecraft/converters/options/ConverterAbstractOptionsRename.java @@ -0,0 +1,28 @@ +package ca.spottedleaf.dataconverter.minecraft.converters.options; + @@ -8107,11 +8107,11 @@ index 0000000000000000000000000000000000000000..769dd8447976b66dcfc36283ede4ae16 + } + +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/particle/ConverterParticleToNBT.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/particle/ConverterParticleToNBT.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/converters/particle/ConverterParticleToNBT.java b/ca/spottedleaf/dataconverter/minecraft/converters/particle/ConverterParticleToNBT.java new file mode 100644 index 0000000000000000000000000000000000000000..2cf90187ea8bc54b06cebd54ae2582ca66d91132 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/particle/ConverterParticleToNBT.java ++++ b/ca/spottedleaf/dataconverter/minecraft/converters/particle/ConverterParticleToNBT.java @@ -0,0 +1,270 @@ +package ca.spottedleaf.dataconverter.minecraft.converters.particle; + @@ -8383,11 +8383,11 @@ index 0000000000000000000000000000000000000000..2cf90187ea8bc54b06cebd54ae2582ca + + private ConverterParticleToNBT() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/poi/ConverterAbstractPOIRename.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/poi/ConverterAbstractPOIRename.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/converters/poi/ConverterAbstractPOIRename.java b/ca/spottedleaf/dataconverter/minecraft/converters/poi/ConverterAbstractPOIRename.java new file mode 100644 index 0000000000000000000000000000000000000000..57e210bf2bb189b15a32899011c4800b19668a5e --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/poi/ConverterAbstractPOIRename.java ++++ b/ca/spottedleaf/dataconverter/minecraft/converters/poi/ConverterAbstractPOIRename.java @@ -0,0 +1,53 @@ +package ca.spottedleaf.dataconverter.minecraft.converters.poi; + @@ -8442,11 +8442,11 @@ index 0000000000000000000000000000000000000000..57e210bf2bb189b15a32899011c4800b + }); + } +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/poi/ConverterPoiDelete.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/poi/ConverterPoiDelete.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/converters/poi/ConverterPoiDelete.java b/ca/spottedleaf/dataconverter/minecraft/converters/poi/ConverterPoiDelete.java new file mode 100644 index 0000000000000000000000000000000000000000..36aa9c3eedb3f2e2f577efed3622fed74268bce1 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/poi/ConverterPoiDelete.java ++++ b/ca/spottedleaf/dataconverter/minecraft/converters/poi/ConverterPoiDelete.java @@ -0,0 +1,53 @@ +package ca.spottedleaf.dataconverter.minecraft.converters.poi; + @@ -8501,11 +8501,11 @@ index 0000000000000000000000000000000000000000..36aa9c3eedb3f2e2f577efed3622fed7 + return null; + } +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/recipe/ConverterAbstractRecipeRename.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/recipe/ConverterAbstractRecipeRename.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/converters/recipe/ConverterAbstractRecipeRename.java b/ca/spottedleaf/dataconverter/minecraft/converters/recipe/ConverterAbstractRecipeRename.java new file mode 100644 index 0000000000000000000000000000000000000000..8f35cbbd78a629712f9ae3cd5d180269f015a11d --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/recipe/ConverterAbstractRecipeRename.java ++++ b/ca/spottedleaf/dataconverter/minecraft/converters/recipe/ConverterAbstractRecipeRename.java @@ -0,0 +1,18 @@ +package ca.spottedleaf.dataconverter.minecraft.converters.recipe; + @@ -8525,11 +8525,11 @@ index 0000000000000000000000000000000000000000..8f35cbbd78a629712f9ae3cd5d180269 + ConverterAbstractStringValueTypeRename.register(version, subVersion, MCTypeRegistry.RECIPE, renamer); + } +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/stats/ConverterAbstractStatsRename.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/stats/ConverterAbstractStatsRename.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/converters/stats/ConverterAbstractStatsRename.java b/ca/spottedleaf/dataconverter/minecraft/converters/stats/ConverterAbstractStatsRename.java new file mode 100644 index 0000000000000000000000000000000000000000..a1985c85aa9193699d7d20e6f4f11b6e9744ee70 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/stats/ConverterAbstractStatsRename.java ++++ b/ca/spottedleaf/dataconverter/minecraft/converters/stats/ConverterAbstractStatsRename.java @@ -0,0 +1,66 @@ +package ca.spottedleaf.dataconverter.minecraft.converters.stats; + @@ -8597,11 +8597,11 @@ index 0000000000000000000000000000000000000000..a1985c85aa9193699d7d20e6f4f11b6e + }); + } +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/stats/ConverterFlattenStats.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/stats/ConverterFlattenStats.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/converters/stats/ConverterFlattenStats.java b/ca/spottedleaf/dataconverter/minecraft/converters/stats/ConverterFlattenStats.java new file mode 100644 index 0000000000000000000000000000000000000000..891be75bf5c4af56e839c88b26f0a828554ae5c4 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/stats/ConverterFlattenStats.java ++++ b/ca/spottedleaf/dataconverter/minecraft/converters/stats/ConverterFlattenStats.java @@ -0,0 +1,321 @@ +package ca.spottedleaf.dataconverter.minecraft.converters.stats; + @@ -8924,11 +8924,11 @@ index 0000000000000000000000000000000000000000..891be75bf5c4af56e839c88b26f0a828 + }; + } +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/tileentity/ConverterAbstractTileEntityRename.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/tileentity/ConverterAbstractTileEntityRename.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/converters/tileentity/ConverterAbstractTileEntityRename.java b/ca/spottedleaf/dataconverter/minecraft/converters/tileentity/ConverterAbstractTileEntityRename.java new file mode 100644 index 0000000000000000000000000000000000000000..ab05dda0cc2083418443d0dee23ccc0a6f754ea0 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/tileentity/ConverterAbstractTileEntityRename.java ++++ b/ca/spottedleaf/dataconverter/minecraft/converters/tileentity/ConverterAbstractTileEntityRename.java @@ -0,0 +1,34 @@ +package ca.spottedleaf.dataconverter.minecraft.converters.tileentity; + @@ -8964,11 +8964,11 @@ index 0000000000000000000000000000000000000000..ab05dda0cc2083418443d0dee23ccc0a + } + +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/datatypes/DynamicDataType.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/datatypes/DynamicDataType.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/datatypes/DynamicDataType.java b/ca/spottedleaf/dataconverter/minecraft/datatypes/DynamicDataType.java new file mode 100644 index 0000000000000000000000000000000000000000..dfa750bdaef7d7b6dadbc5665c1461f7e6df08ca --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/datatypes/DynamicDataType.java ++++ b/ca/spottedleaf/dataconverter/minecraft/datatypes/DynamicDataType.java @@ -0,0 +1,128 @@ +package ca.spottedleaf.dataconverter.minecraft.datatypes; + @@ -9098,11 +9098,11 @@ index 0000000000000000000000000000000000000000..dfa750bdaef7d7b6dadbc5665c1461f7 + return ret; + } +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/datatypes/IDDataType.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/datatypes/IDDataType.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/datatypes/IDDataType.java b/ca/spottedleaf/dataconverter/minecraft/datatypes/IDDataType.java new file mode 100644 index 0000000000000000000000000000000000000000..b093a9eeeea3f7c1c220485b7144d22c6fd504a0 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/datatypes/IDDataType.java ++++ b/ca/spottedleaf/dataconverter/minecraft/datatypes/IDDataType.java @@ -0,0 +1,166 @@ +package ca.spottedleaf.dataconverter.minecraft.datatypes; + @@ -9270,11 +9270,11 @@ index 0000000000000000000000000000000000000000..b093a9eeeea3f7c1c220485b7144d22c + return ret; + } +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/datatypes/MCDataType.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/datatypes/MCDataType.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/datatypes/MCDataType.java b/ca/spottedleaf/dataconverter/minecraft/datatypes/MCDataType.java new file mode 100644 index 0000000000000000000000000000000000000000..075574f33476882ddc6787e3b8bac8643a414eb0 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/datatypes/MCDataType.java ++++ b/ca/spottedleaf/dataconverter/minecraft/datatypes/MCDataType.java @@ -0,0 +1,129 @@ +package ca.spottedleaf.dataconverter.minecraft.datatypes; + @@ -9405,11 +9405,11 @@ index 0000000000000000000000000000000000000000..075574f33476882ddc6787e3b8bac864 + return ret; + } +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/datatypes/MCTypeRegistry.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/datatypes/MCTypeRegistry.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/datatypes/MCTypeRegistry.java b/ca/spottedleaf/dataconverter/minecraft/datatypes/MCTypeRegistry.java new file mode 100644 index 0000000000000000000000000000000000000000..d42bff4fec99eb0b19d132794f4e3306b6dddb0f --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/datatypes/MCTypeRegistry.java ++++ b/ca/spottedleaf/dataconverter/minecraft/datatypes/MCTypeRegistry.java @@ -0,0 +1,335 @@ +package ca.spottedleaf.dataconverter.minecraft.datatypes; + @@ -9746,11 +9746,11 @@ index 0000000000000000000000000000000000000000..d42bff4fec99eb0b19d132794f4e3306 + + private MCTypeRegistry() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/datatypes/MCValueType.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/datatypes/MCValueType.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/datatypes/MCValueType.java b/ca/spottedleaf/dataconverter/minecraft/datatypes/MCValueType.java new file mode 100644 index 0000000000000000000000000000000000000000..13c1381261909ef672fbeb665907f01f2d5c1ced --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/datatypes/MCValueType.java ++++ b/ca/spottedleaf/dataconverter/minecraft/datatypes/MCValueType.java @@ -0,0 +1,86 @@ +package ca.spottedleaf.dataconverter.minecraft.datatypes; + @@ -9838,11 +9838,11 @@ index 0000000000000000000000000000000000000000..13c1381261909ef672fbeb665907f01f + return ret; + } +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/hooks/DataHookEnforceNamespacedID.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/hooks/DataHookEnforceNamespacedID.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/hooks/DataHookEnforceNamespacedID.java b/ca/spottedleaf/dataconverter/minecraft/hooks/DataHookEnforceNamespacedID.java new file mode 100644 index 0000000000000000000000000000000000000000..f7dced8a47ebdd262ae815ff9bc453312343ce49 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/hooks/DataHookEnforceNamespacedID.java ++++ b/ca/spottedleaf/dataconverter/minecraft/hooks/DataHookEnforceNamespacedID.java @@ -0,0 +1,29 @@ +package ca.spottedleaf.dataconverter.minecraft.hooks; + @@ -9873,11 +9873,11 @@ index 0000000000000000000000000000000000000000..f7dced8a47ebdd262ae815ff9bc45331 + return null; + } +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/hooks/DataHookValueTypeEnforceNamespaced.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/hooks/DataHookValueTypeEnforceNamespaced.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/hooks/DataHookValueTypeEnforceNamespaced.java b/ca/spottedleaf/dataconverter/minecraft/hooks/DataHookValueTypeEnforceNamespaced.java new file mode 100644 index 0000000000000000000000000000000000000000..7f88487e7db589070512fafef1eb243ae29a379a --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/hooks/DataHookValueTypeEnforceNamespaced.java ++++ b/ca/spottedleaf/dataconverter/minecraft/hooks/DataHookValueTypeEnforceNamespaced.java @@ -0,0 +1,20 @@ +package ca.spottedleaf.dataconverter.minecraft.hooks; + @@ -9899,11 +9899,11 @@ index 0000000000000000000000000000000000000000..7f88487e7db589070512fafef1eb243a + return null; + } +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/util/ComponentUtils.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/util/ComponentUtils.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/util/ComponentUtils.java b/ca/spottedleaf/dataconverter/minecraft/util/ComponentUtils.java new file mode 100644 index 0000000000000000000000000000000000000000..17ded002b5546de8be4a5238c20ccfda460a98bb --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/util/ComponentUtils.java ++++ b/ca/spottedleaf/dataconverter/minecraft/util/ComponentUtils.java @@ -0,0 +1,82 @@ +package ca.spottedleaf.dataconverter.minecraft.util; + @@ -9987,11 +9987,11 @@ index 0000000000000000000000000000000000000000..17ded002b5546de8be4a5238c20ccfda + + private ComponentUtils() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V100.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V100.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V100.java b/ca/spottedleaf/dataconverter/minecraft/versions/V100.java new file mode 100644 index 0000000000000000000000000000000000000000..91b1d0be9d697a4fa8bc5b448b329df1f5deabc4 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V100.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V100.java @@ -0,0 +1,161 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -10154,11 +10154,11 @@ index 0000000000000000000000000000000000000000..91b1d0be9d697a4fa8bc5b448b329df1 + + private V100() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V101.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V101.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V101.java b/ca/spottedleaf/dataconverter/minecraft/versions/V101.java new file mode 100644 index 0000000000000000000000000000000000000000..32d54d5960088b547b3ca09bff28b0752dddd77c --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V101.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V101.java @@ -0,0 +1,45 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -10205,11 +10205,11 @@ index 0000000000000000000000000000000000000000..32d54d5960088b547b3ca09bff28b075 + + private V101() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V102.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V102.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V102.java b/ca/spottedleaf/dataconverter/minecraft/versions/V102.java new file mode 100644 index 0000000000000000000000000000000000000000..00bb3cff8f3d220d65a18f9b82b4b5361588b109 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V102.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V102.java @@ -0,0 +1,86 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -10297,11 +10297,11 @@ index 0000000000000000000000000000000000000000..00bb3cff8f3d220d65a18f9b82b4b536 + + private V102() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1022.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1022.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V1022.java b/ca/spottedleaf/dataconverter/minecraft/versions/V1022.java new file mode 100644 index 0000000000000000000000000000000000000000..4f35484ed524dbf09cf9e8b1bb999fc98ec0bb0f --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1022.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V1022.java @@ -0,0 +1,43 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -10346,11 +10346,11 @@ index 0000000000000000000000000000000000000000..4f35484ed524dbf09cf9e8b1bb999fc9 + + private V1022() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V105.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V105.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V105.java b/ca/spottedleaf/dataconverter/minecraft/versions/V105.java new file mode 100644 index 0000000000000000000000000000000000000000..189b682da7eacea118610e466e8648675fccf776 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V105.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V105.java @@ -0,0 +1,49 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -10401,11 +10401,11 @@ index 0000000000000000000000000000000000000000..189b682da7eacea118610e466e864867 + + private V105() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V106.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V106.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V106.java b/ca/spottedleaf/dataconverter/minecraft/versions/V106.java new file mode 100644 index 0000000000000000000000000000000000000000..fa9b11b46f0fbcaabcaed02a7fc3f5af3337ec27 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V106.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V106.java @@ -0,0 +1,83 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -10490,11 +10490,11 @@ index 0000000000000000000000000000000000000000..fa9b11b46f0fbcaabcaed02a7fc3f5af + + private V106() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V107.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V107.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V107.java b/ca/spottedleaf/dataconverter/minecraft/versions/V107.java new file mode 100644 index 0000000000000000000000000000000000000000..e9d288c41c40d96ac7c6b605babc436d6a5796f3 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V107.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V107.java @@ -0,0 +1,43 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -10539,11 +10539,11 @@ index 0000000000000000000000000000000000000000..e9d288c41c40d96ac7c6b605babc436d + + private V107() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V108.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V108.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V108.java b/ca/spottedleaf/dataconverter/minecraft/versions/V108.java new file mode 100644 index 0000000000000000000000000000000000000000..ba9487bc35bedfd7261d4a4fd9476de070f65f33 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V108.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V108.java @@ -0,0 +1,46 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -10591,11 +10591,11 @@ index 0000000000000000000000000000000000000000..ba9487bc35bedfd7261d4a4fd9476de0 + + private V108() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V109.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V109.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V109.java b/ca/spottedleaf/dataconverter/minecraft/versions/V109.java new file mode 100644 index 0000000000000000000000000000000000000000..5df0c8da6415a4651e5678a170bc8ff32dd66337 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V109.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V109.java @@ -0,0 +1,41 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -10638,11 +10638,11 @@ index 0000000000000000000000000000000000000000..5df0c8da6415a4651e5678a170bc8ff3 + + private V109() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V110.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V110.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V110.java b/ca/spottedleaf/dataconverter/minecraft/versions/V110.java new file mode 100644 index 0000000000000000000000000000000000000000..b089fc93b88c5a7b4bb1eb0e105120b5393de1b1 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V110.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V110.java @@ -0,0 +1,38 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -10682,11 +10682,11 @@ index 0000000000000000000000000000000000000000..b089fc93b88c5a7b4bb1eb0e105120b5 + + private V110() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V111.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V111.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V111.java b/ca/spottedleaf/dataconverter/minecraft/versions/V111.java new file mode 100644 index 0000000000000000000000000000000000000000..0c69cf9b419049dc5338abb408fa3f0390e4e353 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V111.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V111.java @@ -0,0 +1,64 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -10752,11 +10752,11 @@ index 0000000000000000000000000000000000000000..0c69cf9b419049dc5338abb408fa3f03 + } + } +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1125.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1125.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V1125.java b/ca/spottedleaf/dataconverter/minecraft/versions/V1125.java new file mode 100644 index 0000000000000000000000000000000000000000..41ceef54e202420616ad57e9f9c200457c7d2848 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1125.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V1125.java @@ -0,0 +1,101 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -10859,11 +10859,11 @@ index 0000000000000000000000000000000000000000..41ceef54e202420616ad57e9f9c20045 + + private V1125() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V113.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V113.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V113.java b/ca/spottedleaf/dataconverter/minecraft/versions/V113.java new file mode 100644 index 0000000000000000000000000000000000000000..7b7d02eac9e121c45b557b664e156327d182c015 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V113.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V113.java @@ -0,0 +1,40 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -10905,11 +10905,11 @@ index 0000000000000000000000000000000000000000..7b7d02eac9e121c45b557b664e156327 + + private V113() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1344.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1344.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V1344.java b/ca/spottedleaf/dataconverter/minecraft/versions/V1344.java new file mode 100644 index 0000000000000000000000000000000000000000..b735165f9b296730b77339875255aa982e18a40a --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1344.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V1344.java @@ -0,0 +1,176 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -11087,11 +11087,11 @@ index 0000000000000000000000000000000000000000..b735165f9b296730b77339875255aa98 + + private V1344() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V135.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V135.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V135.java b/ca/spottedleaf/dataconverter/minecraft/versions/V135.java new file mode 100644 index 0000000000000000000000000000000000000000..b003819eb395039dca8141179b57632e90db1d4d --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V135.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V135.java @@ -0,0 +1,62 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -11155,11 +11155,11 @@ index 0000000000000000000000000000000000000000..b003819eb395039dca8141179b57632e + + private V135() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V143.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V143.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V143.java b/ca/spottedleaf/dataconverter/minecraft/versions/V143.java new file mode 100644 index 0000000000000000000000000000000000000000..90889dddd8a510fe69c47413f5fe3ed4a756fedb --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V143.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V143.java @@ -0,0 +1,17 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -11178,11 +11178,11 @@ index 0000000000000000000000000000000000000000..90889dddd8a510fe69c47413f5fe3ed4 + + private V143() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1446.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1446.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V1446.java b/ca/spottedleaf/dataconverter/minecraft/versions/V1446.java new file mode 100644 index 0000000000000000000000000000000000000000..0e198bef171c92d53725d338bb793b1e269f2997 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1446.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V1446.java @@ -0,0 +1,35 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -11219,11 +11219,11 @@ index 0000000000000000000000000000000000000000..0e198bef171c92d53725d338bb793b1e + + private V1446() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1450.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1450.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V1450.java b/ca/spottedleaf/dataconverter/minecraft/versions/V1450.java new file mode 100644 index 0000000000000000000000000000000000000000..bf6f57bc84785622aea35dc70872db6d4d9516a1 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1450.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V1450.java @@ -0,0 +1,24 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -11249,11 +11249,11 @@ index 0000000000000000000000000000000000000000..bf6f57bc84785622aea35dc70872db6d + + private V1450() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1451.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1451.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V1451.java b/ca/spottedleaf/dataconverter/minecraft/versions/V1451.java new file mode 100644 index 0000000000000000000000000000000000000000..2f6a43d858645baeb3c69959479b6835dd7bd7a8 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1451.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V1451.java @@ -0,0 +1,513 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -11768,11 +11768,11 @@ index 0000000000000000000000000000000000000000..2f6a43d858645baeb3c69959479b6835 + + private V1451() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1456.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1456.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V1456.java b/ca/spottedleaf/dataconverter/minecraft/versions/V1456.java new file mode 100644 index 0000000000000000000000000000000000000000..47682ffbc10805a4cba73dca43198e52c0ce63df --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1456.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V1456.java @@ -0,0 +1,37 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -11811,11 +11811,11 @@ index 0000000000000000000000000000000000000000..47682ffbc10805a4cba73dca43198e52 + + private V1456() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1458.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1458.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V1458.java b/ca/spottedleaf/dataconverter/minecraft/versions/V1458.java new file mode 100644 index 0000000000000000000000000000000000000000..95822caa64d6c8a780bb120bedd2728355d26b84 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1458.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V1458.java @@ -0,0 +1,87 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -11904,11 +11904,11 @@ index 0000000000000000000000000000000000000000..95822caa64d6c8a780bb120bedd27283 + + private V1458() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1460.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1460.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V1460.java b/ca/spottedleaf/dataconverter/minecraft/versions/V1460.java new file mode 100644 index 0000000000000000000000000000000000000000..bf64be7255b02461d218a821ac9b36ba5bc83b13 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1460.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V1460.java @@ -0,0 +1,45 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -11955,11 +11955,11 @@ index 0000000000000000000000000000000000000000..bf64be7255b02461d218a821ac9b36ba + + private V1460() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1466.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1466.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V1466.java b/ca/spottedleaf/dataconverter/minecraft/versions/V1466.java new file mode 100644 index 0000000000000000000000000000000000000000..d870aaca4ff623c71604f889c2e667bfe50fe696 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1466.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V1466.java @@ -0,0 +1,142 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -12103,11 +12103,11 @@ index 0000000000000000000000000000000000000000..d870aaca4ff623c71604f889c2e667bf + + private V1466() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V147.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V147.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V147.java b/ca/spottedleaf/dataconverter/minecraft/versions/V147.java new file mode 100644 index 0000000000000000000000000000000000000000..af9c6ee26580eb10bf8426f5b61c26df63a910a6 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V147.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V147.java @@ -0,0 +1,26 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -12135,11 +12135,11 @@ index 0000000000000000000000000000000000000000..af9c6ee26580eb10bf8426f5b61c26df + + private V147() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1470.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1470.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V1470.java b/ca/spottedleaf/dataconverter/minecraft/versions/V1470.java new file mode 100644 index 0000000000000000000000000000000000000000..2bf1baee2321b3cb584ab6355f43263d6c8ec0be --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1470.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V1470.java @@ -0,0 +1,31 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -12172,11 +12172,11 @@ index 0000000000000000000000000000000000000000..2bf1baee2321b3cb584ab6355f43263d + + private V1470() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1474.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1474.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V1474.java b/ca/spottedleaf/dataconverter/minecraft/versions/V1474.java new file mode 100644 index 0000000000000000000000000000000000000000..99f0f34cc14639ed8ed73b847f74cdc607607af8 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1474.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V1474.java @@ -0,0 +1,34 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -12212,11 +12212,11 @@ index 0000000000000000000000000000000000000000..99f0f34cc14639ed8ed73b847f74cdc6 + + private V1474() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1475.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1475.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V1475.java b/ca/spottedleaf/dataconverter/minecraft/versions/V1475.java new file mode 100644 index 0000000000000000000000000000000000000000..2ae50eea847671f3995688901c79caf520440d7a --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1475.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V1475.java @@ -0,0 +1,22 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -12240,11 +12240,11 @@ index 0000000000000000000000000000000000000000..2ae50eea847671f3995688901c79caf5 + + private V1475() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1480.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1480.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V1480.java b/ca/spottedleaf/dataconverter/minecraft/versions/V1480.java new file mode 100644 index 0000000000000000000000000000000000000000..7180c1168bffb9fe70d18fe7414a5372518413a8 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1480.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V1480.java @@ -0,0 +1,45 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -12291,11 +12291,11 @@ index 0000000000000000000000000000000000000000..7180c1168bffb9fe70d18fe7414a5372 + + private V1480() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1483.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1483.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V1483.java b/ca/spottedleaf/dataconverter/minecraft/versions/V1483.java new file mode 100644 index 0000000000000000000000000000000000000000..56d9babebba8b8ba6be07ea413e9c04ffea84023 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1483.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V1483.java @@ -0,0 +1,30 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -12327,11 +12327,11 @@ index 0000000000000000000000000000000000000000..56d9babebba8b8ba6be07ea413e9c04f + + private V1483() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1484.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1484.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V1484.java b/ca/spottedleaf/dataconverter/minecraft/versions/V1484.java new file mode 100644 index 0000000000000000000000000000000000000000..cdbb9379f66aa6edc05c5e6cb2bdeae97f1ea38b --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1484.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V1484.java @@ -0,0 +1,75 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -12408,11 +12408,11 @@ index 0000000000000000000000000000000000000000..cdbb9379f66aa6edc05c5e6cb2bdeae9 + + private V1484() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1486.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1486.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V1486.java b/ca/spottedleaf/dataconverter/minecraft/versions/V1486.java new file mode 100644 index 0000000000000000000000000000000000000000..a9e42da41064ea293a71dbf2d681a857b2e1812e --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1486.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V1486.java @@ -0,0 +1,39 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -12453,11 +12453,11 @@ index 0000000000000000000000000000000000000000..a9e42da41064ea293a71dbf2d681a857 + + private V1486() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1487.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1487.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V1487.java b/ca/spottedleaf/dataconverter/minecraft/versions/V1487.java new file mode 100644 index 0000000000000000000000000000000000000000..884049818efdf273443fb3d1c2d7250564fbdbf7 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1487.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V1487.java @@ -0,0 +1,27 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -12486,11 +12486,11 @@ index 0000000000000000000000000000000000000000..884049818efdf273443fb3d1c2d72505 + + private V1487() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1488.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1488.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V1488.java b/ca/spottedleaf/dataconverter/minecraft/versions/V1488.java new file mode 100644 index 0000000000000000000000000000000000000000..907a5e2a26ee046e292508e1f06d5f26d10af8c1 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1488.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V1488.java @@ -0,0 +1,93 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -12585,11 +12585,11 @@ index 0000000000000000000000000000000000000000..907a5e2a26ee046e292508e1f06d5f26 + + private V1488() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1490.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1490.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V1490.java b/ca/spottedleaf/dataconverter/minecraft/versions/V1490.java new file mode 100644 index 0000000000000000000000000000000000000000..1e99de15732bdd283835a9531f76e29ddab91f46 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1490.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V1490.java @@ -0,0 +1,30 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -12621,11 +12621,11 @@ index 0000000000000000000000000000000000000000..1e99de15732bdd283835a9531f76e29d + + private V1490() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1492.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1492.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V1492.java b/ca/spottedleaf/dataconverter/minecraft/versions/V1492.java new file mode 100644 index 0000000000000000000000000000000000000000..1259216b43434d0f7c7be10a081fd05057c253cf --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1492.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V1492.java @@ -0,0 +1,151 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -12778,11 +12778,11 @@ index 0000000000000000000000000000000000000000..1259216b43434d0f7c7be10a081fd050 + + private V1492() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1494.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1494.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V1494.java b/ca/spottedleaf/dataconverter/minecraft/versions/V1494.java new file mode 100644 index 0000000000000000000000000000000000000000..b72fe109aa8c60425c00aad234d60a1c70dda60b --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1494.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V1494.java @@ -0,0 +1,88 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -12872,11 +12872,11 @@ index 0000000000000000000000000000000000000000..b72fe109aa8c60425c00aad234d60a1c + + private V1494() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1496.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1496.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V1496.java b/ca/spottedleaf/dataconverter/minecraft/versions/V1496.java new file mode 100644 index 0000000000000000000000000000000000000000..10349a70b865b19cca471a16548fd49910a2b0e7 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1496.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V1496.java @@ -0,0 +1,370 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -13248,11 +13248,11 @@ index 0000000000000000000000000000000000000000..10349a70b865b19cca471a16548fd499 + } + } +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1500.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1500.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V1500.java b/ca/spottedleaf/dataconverter/minecraft/versions/V1500.java new file mode 100644 index 0000000000000000000000000000000000000000..fae8cf61c9900544cdecd223f72e1311c8a1cfb1 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1500.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V1500.java @@ -0,0 +1,23 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -13277,11 +13277,11 @@ index 0000000000000000000000000000000000000000..fae8cf61c9900544cdecd223f72e1311 + + private V1500() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1501.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1501.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V1501.java b/ca/spottedleaf/dataconverter/minecraft/versions/V1501.java new file mode 100644 index 0000000000000000000000000000000000000000..dbfb51b74c54a9a479de49ecb295854fc69aef64 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1501.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V1501.java @@ -0,0 +1,78 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -13361,11 +13361,11 @@ index 0000000000000000000000000000000000000000..dbfb51b74c54a9a479de49ecb295854f + + private V1501() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1502.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1502.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V1502.java b/ca/spottedleaf/dataconverter/minecraft/versions/V1502.java new file mode 100644 index 0000000000000000000000000000000000000000..cd07718649f0e2ca66f1ec3b0aba81611333ba09 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1502.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V1502.java @@ -0,0 +1,77 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -13444,11 +13444,11 @@ index 0000000000000000000000000000000000000000..cd07718649f0e2ca66f1ec3b0aba8161 + + private V1502() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1506.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1506.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V1506.java b/ca/spottedleaf/dataconverter/minecraft/versions/V1506.java new file mode 100644 index 0000000000000000000000000000000000000000..ce87995961605c80f24371c9c64706ae76e3edea --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1506.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V1506.java @@ -0,0 +1,219 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -13669,11 +13669,11 @@ index 0000000000000000000000000000000000000000..ce87995961605c80f24371c9c64706ae + + private V1506() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1510.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1510.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V1510.java b/ca/spottedleaf/dataconverter/minecraft/versions/V1510.java new file mode 100644 index 0000000000000000000000000000000000000000..dfc9d1e89983c73e06ce3c8a22c29f49af4a935c --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1510.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V1510.java @@ -0,0 +1,111 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -13786,11 +13786,11 @@ index 0000000000000000000000000000000000000000..dfc9d1e89983c73e06ce3c8a22c29f49 + + private V1510() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1514.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1514.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V1514.java b/ca/spottedleaf/dataconverter/minecraft/versions/V1514.java new file mode 100644 index 0000000000000000000000000000000000000000..6bcc0de5987db4d9ac28fabefbb58c28f2065d96 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1514.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V1514.java @@ -0,0 +1,68 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -13860,11 +13860,11 @@ index 0000000000000000000000000000000000000000..6bcc0de5987db4d9ac28fabefbb58c28 + + private V1514() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1515.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1515.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V1515.java b/ca/spottedleaf/dataconverter/minecraft/versions/V1515.java new file mode 100644 index 0000000000000000000000000000000000000000..d2093732e06ddccdd8a34bbfcaee6ede3aae96d0 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1515.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V1515.java @@ -0,0 +1,28 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -13894,11 +13894,11 @@ index 0000000000000000000000000000000000000000..d2093732e06ddccdd8a34bbfcaee6ede + + private V1515() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1624.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1624.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V1624.java b/ca/spottedleaf/dataconverter/minecraft/versions/V1624.java new file mode 100644 index 0000000000000000000000000000000000000000..f198495e1bad7a1cb84f41c1ea96b1d0e7943c9e --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1624.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V1624.java @@ -0,0 +1,110 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -14010,11 +14010,11 @@ index 0000000000000000000000000000000000000000..f198495e1bad7a1cb84f41c1ea96b1d0 + } + } +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V165.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V165.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V165.java b/ca/spottedleaf/dataconverter/minecraft/versions/V165.java new file mode 100644 index 0000000000000000000000000000000000000000..810a838edeea95bb5d0b4b351e65417b762fc45c --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V165.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V165.java @@ -0,0 +1,41 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -14057,11 +14057,11 @@ index 0000000000000000000000000000000000000000..810a838edeea95bb5d0b4b351e65417b + + private V165() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1800.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1800.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V1800.java b/ca/spottedleaf/dataconverter/minecraft/versions/V1800.java new file mode 100644 index 0000000000000000000000000000000000000000..7f65def5a0f48af268183d9c3b74937924b47b75 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1800.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V1800.java @@ -0,0 +1,36 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -14099,11 +14099,11 @@ index 0000000000000000000000000000000000000000..7f65def5a0f48af268183d9c3b749379 + + private V1800() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1801.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1801.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V1801.java b/ca/spottedleaf/dataconverter/minecraft/versions/V1801.java new file mode 100644 index 0000000000000000000000000000000000000000..9e1a3af9fb261e585542495f189f898eaa6d9263 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1801.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V1801.java @@ -0,0 +1,18 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -14123,11 +14123,11 @@ index 0000000000000000000000000000000000000000..9e1a3af9fb261e585542495f189f898e + + private V1801() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1802.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1802.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V1802.java b/ca/spottedleaf/dataconverter/minecraft/versions/V1802.java new file mode 100644 index 0000000000000000000000000000000000000000..aeae0c62efa1e189fe4b0da585c8a2a101bb5ede --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1802.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V1802.java @@ -0,0 +1,28 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -14157,11 +14157,11 @@ index 0000000000000000000000000000000000000000..aeae0c62efa1e189fe4b0da585c8a2a1 + + private V1802() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1803.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1803.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V1803.java b/ca/spottedleaf/dataconverter/minecraft/versions/V1803.java new file mode 100644 index 0000000000000000000000000000000000000000..ad12a97fe28b6f05973f0927245c944dcf184c46 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1803.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V1803.java @@ -0,0 +1,46 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -14209,11 +14209,11 @@ index 0000000000000000000000000000000000000000..ad12a97fe28b6f05973f0927245c944d + + private V1803() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1904.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1904.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V1904.java b/ca/spottedleaf/dataconverter/minecraft/versions/V1904.java new file mode 100644 index 0000000000000000000000000000000000000000..2066f320d774319bec84007ca7ed137eb78d91d1 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1904.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V1904.java @@ -0,0 +1,42 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -14257,11 +14257,11 @@ index 0000000000000000000000000000000000000000..2066f320d774319bec84007ca7ed137e + + private V1904() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1905.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1905.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V1905.java b/ca/spottedleaf/dataconverter/minecraft/versions/V1905.java new file mode 100644 index 0000000000000000000000000000000000000000..a4bd2c65fe5a4b4d3e430e5c7eee79435afac4ee --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1905.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V1905.java @@ -0,0 +1,34 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -14297,11 +14297,11 @@ index 0000000000000000000000000000000000000000..a4bd2c65fe5a4b4d3e430e5c7eee7943 + + private V1905() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1906.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1906.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V1906.java b/ca/spottedleaf/dataconverter/minecraft/versions/V1906.java new file mode 100644 index 0000000000000000000000000000000000000000..dbf3215a781555d048077565851884eeb48402b1 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1906.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V1906.java @@ -0,0 +1,20 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -14323,11 +14323,11 @@ index 0000000000000000000000000000000000000000..dbf3215a781555d048077565851884ee + + private V1906() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1909.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1909.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V1909.java b/ca/spottedleaf/dataconverter/minecraft/versions/V1909.java new file mode 100644 index 0000000000000000000000000000000000000000..ede4d0bfc0fe0e4a3a6fb906037a4c964baac6e6 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1909.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V1909.java @@ -0,0 +1,16 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -14345,11 +14345,11 @@ index 0000000000000000000000000000000000000000..ede4d0bfc0fe0e4a3a6fb906037a4c96 + + private V1909() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1911.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1911.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V1911.java b/ca/spottedleaf/dataconverter/minecraft/versions/V1911.java new file mode 100644 index 0000000000000000000000000000000000000000..02204cd67dc614e95f2ab95ed413ce62baec296f --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1911.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V1911.java @@ -0,0 +1,49 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -14400,11 +14400,11 @@ index 0000000000000000000000000000000000000000..02204cd67dc614e95f2ab95ed413ce62 + + private V1911() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1914.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1914.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V1914.java b/ca/spottedleaf/dataconverter/minecraft/versions/V1914.java new file mode 100644 index 0000000000000000000000000000000000000000..a965a5941e3624db725a4f101405357df11598c8 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1914.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V1914.java @@ -0,0 +1,28 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -14434,11 +14434,11 @@ index 0000000000000000000000000000000000000000..a965a5941e3624db725a4f101405357d + + private V1914() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1917.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1917.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V1917.java b/ca/spottedleaf/dataconverter/minecraft/versions/V1917.java new file mode 100644 index 0000000000000000000000000000000000000000..f8b5f5818ed4e839b62777a5d5e9baf70b12a6f0 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1917.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V1917.java @@ -0,0 +1,25 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -14465,11 +14465,11 @@ index 0000000000000000000000000000000000000000..f8b5f5818ed4e839b62777a5d5e9baf7 + + private V1917() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1918.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1918.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V1918.java b/ca/spottedleaf/dataconverter/minecraft/versions/V1918.java new file mode 100644 index 0000000000000000000000000000000000000000..f97f21e12af1e02aacc1591a88b5da3d7e3f4cfa --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1918.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V1918.java @@ -0,0 +1,65 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -14536,11 +14536,11 @@ index 0000000000000000000000000000000000000000..f97f21e12af1e02aacc1591a88b5da3d + + private V1918() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1920.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1920.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V1920.java b/ca/spottedleaf/dataconverter/minecraft/versions/V1920.java new file mode 100644 index 0000000000000000000000000000000000000000..fe2d58caf2371f1c430dea209210357f36392a96 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1920.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V1920.java @@ -0,0 +1,75 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -14617,11 +14617,11 @@ index 0000000000000000000000000000000000000000..fe2d58caf2371f1c430dea209210357f + + private V1920() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1925.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1925.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V1925.java b/ca/spottedleaf/dataconverter/minecraft/versions/V1925.java new file mode 100644 index 0000000000000000000000000000000000000000..7f2db47a58baf1851abb9269b13fb08d4740081a --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1925.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V1925.java @@ -0,0 +1,30 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -14653,11 +14653,11 @@ index 0000000000000000000000000000000000000000..7f2db47a58baf1851abb9269b13fb08d + + private V1925() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1928.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1928.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V1928.java b/ca/spottedleaf/dataconverter/minecraft/versions/V1928.java new file mode 100644 index 0000000000000000000000000000000000000000..f1f7cd60d3fb1d7d3de92091681932607b452d25 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1928.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V1928.java @@ -0,0 +1,33 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -14692,11 +14692,11 @@ index 0000000000000000000000000000000000000000..f1f7cd60d3fb1d7d3de9209168193260 + + private V1928() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1929.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1929.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V1929.java b/ca/spottedleaf/dataconverter/minecraft/versions/V1929.java new file mode 100644 index 0000000000000000000000000000000000000000..cc377819db8182b466b92aba9a9c0d2c483f941d --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1929.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V1929.java @@ -0,0 +1,34 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -14732,11 +14732,11 @@ index 0000000000000000000000000000000000000000..cc377819db8182b466b92aba9a9c0d2c + + private V1929() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1931.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1931.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V1931.java b/ca/spottedleaf/dataconverter/minecraft/versions/V1931.java new file mode 100644 index 0000000000000000000000000000000000000000..0ae698a80e81a1648bb90149d9f0effdec8e777c --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1931.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V1931.java @@ -0,0 +1,19 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -14757,11 +14757,11 @@ index 0000000000000000000000000000000000000000..0ae698a80e81a1648bb90149d9f0effd + private V1931() {} + +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1936.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1936.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V1936.java b/ca/spottedleaf/dataconverter/minecraft/versions/V1936.java new file mode 100644 index 0000000000000000000000000000000000000000..ddebd1ea2eec5e469d4857503965084d78afce19 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1936.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V1936.java @@ -0,0 +1,37 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -14800,11 +14800,11 @@ index 0000000000000000000000000000000000000000..ddebd1ea2eec5e469d4857503965084d + + private V1936() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1946.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1946.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V1946.java b/ca/spottedleaf/dataconverter/minecraft/versions/V1946.java new file mode 100644 index 0000000000000000000000000000000000000000..70d3ab9fe12fab7282edc18938faa94a34d3decb --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1946.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V1946.java @@ -0,0 +1,41 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -14847,11 +14847,11 @@ index 0000000000000000000000000000000000000000..70d3ab9fe12fab7282edc18938faa94a + + private V1946() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1948.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1948.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V1948.java b/ca/spottedleaf/dataconverter/minecraft/versions/V1948.java new file mode 100644 index 0000000000000000000000000000000000000000..19b0a1197cdf5988f21ba332883b65df646ff0c1 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1948.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V1948.java @@ -0,0 +1,39 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -14892,11 +14892,11 @@ index 0000000000000000000000000000000000000000..19b0a1197cdf5988f21ba332883b65df + + private V1948() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1953.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1953.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V1953.java b/ca/spottedleaf/dataconverter/minecraft/versions/V1953.java new file mode 100644 index 0000000000000000000000000000000000000000..c7887c54c85dd7a198aa5c1597c02b2d6887bf71 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1953.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V1953.java @@ -0,0 +1,26 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -14924,11 +14924,11 @@ index 0000000000000000000000000000000000000000..c7887c54c85dd7a198aa5c1597c02b2d + + private V1953() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1955.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1955.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V1955.java b/ca/spottedleaf/dataconverter/minecraft/versions/V1955.java new file mode 100644 index 0000000000000000000000000000000000000000..8654f8c7f759720e1e1dd8ae94656699f151c407 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1955.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V1955.java @@ -0,0 +1,93 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -15023,11 +15023,11 @@ index 0000000000000000000000000000000000000000..8654f8c7f759720e1e1dd8ae94656699 + + private V1955() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1961.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1961.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V1961.java b/ca/spottedleaf/dataconverter/minecraft/versions/V1961.java new file mode 100644 index 0000000000000000000000000000000000000000..4b1b9b55e2491bd98efddfb28e2aa1074140a1c2 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1961.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V1961.java @@ -0,0 +1,29 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -15058,11 +15058,11 @@ index 0000000000000000000000000000000000000000..4b1b9b55e2491bd98efddfb28e2aa107 + + private V1961() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1963.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1963.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V1963.java b/ca/spottedleaf/dataconverter/minecraft/versions/V1963.java new file mode 100644 index 0000000000000000000000000000000000000000..023d8b9aa7d95c674847d9c5dbe0061adcbdc4d3 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1963.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V1963.java @@ -0,0 +1,39 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -15103,11 +15103,11 @@ index 0000000000000000000000000000000000000000..023d8b9aa7d95c674847d9c5dbe0061a + + private V1963() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2100.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2100.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V2100.java b/ca/spottedleaf/dataconverter/minecraft/versions/V2100.java new file mode 100644 index 0000000000000000000000000000000000000000..cec032b20e834a8c6c8901e6fb2d127d7c80b353 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2100.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V2100.java @@ -0,0 +1,51 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -15160,11 +15160,11 @@ index 0000000000000000000000000000000000000000..cec032b20e834a8c6c8901e6fb2d127d + + private V2100() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2202.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2202.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V2202.java b/ca/spottedleaf/dataconverter/minecraft/versions/V2202.java new file mode 100644 index 0000000000000000000000000000000000000000..c9a23cf055353ee49f07263ea01161de2c035138 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2202.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V2202.java @@ -0,0 +1,49 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -15215,11 +15215,11 @@ index 0000000000000000000000000000000000000000..c9a23cf055353ee49f07263ea01161de + + private V2202() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2209.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2209.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V2209.java b/ca/spottedleaf/dataconverter/minecraft/versions/V2209.java new file mode 100644 index 0000000000000000000000000000000000000000..7439d0e948f144d93a1fa7b57c2b478a54835d6d --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2209.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V2209.java @@ -0,0 +1,28 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -15249,11 +15249,11 @@ index 0000000000000000000000000000000000000000..7439d0e948f144d93a1fa7b57c2b478a + + private V2209() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2211.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2211.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V2211.java b/ca/spottedleaf/dataconverter/minecraft/versions/V2211.java new file mode 100644 index 0000000000000000000000000000000000000000..20904d3e18b317a2f7e5d6063fcf94dda27b5768 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2211.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V2211.java @@ -0,0 +1,31 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -15286,11 +15286,11 @@ index 0000000000000000000000000000000000000000..20904d3e18b317a2f7e5d6063fcf94dd + + private V2211() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2218.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2218.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V2218.java b/ca/spottedleaf/dataconverter/minecraft/versions/V2218.java new file mode 100644 index 0000000000000000000000000000000000000000..8297fe9ab7007399847f3e7ac84519f0dec08576 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2218.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V2218.java @@ -0,0 +1,33 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -15325,11 +15325,11 @@ index 0000000000000000000000000000000000000000..8297fe9ab7007399847f3e7ac84519f0 + + private V2218() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2501.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2501.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V2501.java b/ca/spottedleaf/dataconverter/minecraft/versions/V2501.java new file mode 100644 index 0000000000000000000000000000000000000000..f2be8817fe733ae30729952a2aae13d2396b8111 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2501.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V2501.java @@ -0,0 +1,65 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -15396,11 +15396,11 @@ index 0000000000000000000000000000000000000000..f2be8817fe733ae30729952a2aae13d2 + + private V2501() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2502.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2502.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V2502.java b/ca/spottedleaf/dataconverter/minecraft/versions/V2502.java new file mode 100644 index 0000000000000000000000000000000000000000..540ae9aab0acdfbd3800db0468c52e973cb8d93f --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2502.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V2502.java @@ -0,0 +1,18 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -15420,11 +15420,11 @@ index 0000000000000000000000000000000000000000..540ae9aab0acdfbd3800db0468c52e97 + + private V2502() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2503.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2503.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V2503.java b/ca/spottedleaf/dataconverter/minecraft/versions/V2503.java new file mode 100644 index 0000000000000000000000000000000000000000..994960d0e67ed0af48d33e9a3db5d1757d85eac5 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2503.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V2503.java @@ -0,0 +1,73 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -15499,11 +15499,11 @@ index 0000000000000000000000000000000000000000..994960d0e67ed0af48d33e9a3db5d175 + + private V2503() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2505.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2505.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V2505.java b/ca/spottedleaf/dataconverter/minecraft/versions/V2505.java new file mode 100644 index 0000000000000000000000000000000000000000..9342d9efeb1980c7cb67bf0620d12bd9f71165ee --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2505.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V2505.java @@ -0,0 +1,48 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -15553,11 +15553,11 @@ index 0000000000000000000000000000000000000000..9342d9efeb1980c7cb67bf0620d12bd9 + + private V2505() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2508.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2508.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V2508.java b/ca/spottedleaf/dataconverter/minecraft/versions/V2508.java new file mode 100644 index 0000000000000000000000000000000000000000..f9e9d88e4cca15d2d4fdcbc0dbcae4c35c02284a --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2508.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V2508.java @@ -0,0 +1,27 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -15586,11 +15586,11 @@ index 0000000000000000000000000000000000000000..f9e9d88e4cca15d2d4fdcbc0dbcae4c3 + + private V2508() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2509.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2509.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V2509.java b/ca/spottedleaf/dataconverter/minecraft/versions/V2509.java new file mode 100644 index 0000000000000000000000000000000000000000..b948564d01726d9891a0733896b3e5cec937bd6d --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2509.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V2509.java @@ -0,0 +1,33 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -15625,11 +15625,11 @@ index 0000000000000000000000000000000000000000..b948564d01726d9891a0733896b3e5ce + + private V2509() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2511.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2511.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V2511.java b/ca/spottedleaf/dataconverter/minecraft/versions/V2511.java new file mode 100644 index 0000000000000000000000000000000000000000..a640878469c7ea155cde1cca728b15f2a4bacd73 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2511.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V2511.java @@ -0,0 +1,97 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -15728,11 +15728,11 @@ index 0000000000000000000000000000000000000000..a640878469c7ea155cde1cca728b15f2 + + private V2511() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2514.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2514.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V2514.java b/ca/spottedleaf/dataconverter/minecraft/versions/V2514.java new file mode 100644 index 0000000000000000000000000000000000000000..dcd2b1689bbd845238c86cea9dae0c5153d01499 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2514.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V2514.java @@ -0,0 +1,590 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -16324,11 +16324,11 @@ index 0000000000000000000000000000000000000000..dcd2b1689bbd845238c86cea9dae0c51 + + private V2514() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2516.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2516.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V2516.java b/ca/spottedleaf/dataconverter/minecraft/versions/V2516.java new file mode 100644 index 0000000000000000000000000000000000000000..99f65d84ffaa75db3d2b4568c92d85d3ef20b77f --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2516.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V2516.java @@ -0,0 +1,37 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -16367,11 +16367,11 @@ index 0000000000000000000000000000000000000000..99f65d84ffaa75db3d2b4568c92d85d3 + + private V2516() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2518.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2518.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V2518.java b/ca/spottedleaf/dataconverter/minecraft/versions/V2518.java new file mode 100644 index 0000000000000000000000000000000000000000..35eccf43fd7e31071a9d64883212cddf021ae861 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2518.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V2518.java @@ -0,0 +1,65 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -16438,11 +16438,11 @@ index 0000000000000000000000000000000000000000..35eccf43fd7e31071a9d64883212cddf + + private V2518() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2519.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2519.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V2519.java b/ca/spottedleaf/dataconverter/minecraft/versions/V2519.java new file mode 100644 index 0000000000000000000000000000000000000000..7cb7106037b18c0cf8ddff1f9ba25d4f987a6326 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2519.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V2519.java @@ -0,0 +1,18 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -16462,11 +16462,11 @@ index 0000000000000000000000000000000000000000..7cb7106037b18c0cf8ddff1f9ba25d4f + + private V2519() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2522.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2522.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V2522.java b/ca/spottedleaf/dataconverter/minecraft/versions/V2522.java new file mode 100644 index 0000000000000000000000000000000000000000..9a4d47d78596e2275745673f31f772f0252f2cda --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2522.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V2522.java @@ -0,0 +1,18 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -16486,11 +16486,11 @@ index 0000000000000000000000000000000000000000..9a4d47d78596e2275745673f31f772f0 + + private V2522() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2523.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2523.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V2523.java b/ca/spottedleaf/dataconverter/minecraft/versions/V2523.java new file mode 100644 index 0000000000000000000000000000000000000000..7777d83d63dc177f0bac72290ed2e5c3cbd028be --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2523.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V2523.java @@ -0,0 +1,41 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -16533,11 +16533,11 @@ index 0000000000000000000000000000000000000000..7777d83d63dc177f0bac72290ed2e5c3 + + private V2523() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2527.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2527.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V2527.java b/ca/spottedleaf/dataconverter/minecraft/versions/V2527.java new file mode 100644 index 0000000000000000000000000000000000000000..157f4b1673f7b71942949d979890b30a5f9e2ca3 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2527.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V2527.java @@ -0,0 +1,123 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -16662,11 +16662,11 @@ index 0000000000000000000000000000000000000000..157f4b1673f7b71942949d979890b30a + + private V2527() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2528.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2528.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V2528.java b/ca/spottedleaf/dataconverter/minecraft/versions/V2528.java new file mode 100644 index 0000000000000000000000000000000000000000..e7197d098b3d6269d3a4fd9be0432d85f0504dfd --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2528.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V2528.java @@ -0,0 +1,30 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -16698,11 +16698,11 @@ index 0000000000000000000000000000000000000000..e7197d098b3d6269d3a4fd9be0432d85 + + private V2528() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2529.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2529.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V2529.java b/ca/spottedleaf/dataconverter/minecraft/versions/V2529.java new file mode 100644 index 0000000000000000000000000000000000000000..4e54a4ee0c14109609d8d8f1bc6c0c5dabf4fb07 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2529.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V2529.java @@ -0,0 +1,25 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -16729,11 +16729,11 @@ index 0000000000000000000000000000000000000000..4e54a4ee0c14109609d8d8f1bc6c0c5d + + private V2529() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2531.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2531.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V2531.java b/ca/spottedleaf/dataconverter/minecraft/versions/V2531.java new file mode 100644 index 0000000000000000000000000000000000000000..9306ab25feae6315e48aeeb71de960bdf62bcf76 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2531.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V2531.java @@ -0,0 +1,63 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -16798,11 +16798,11 @@ index 0000000000000000000000000000000000000000..9306ab25feae6315e48aeeb71de960bd + + private V2531() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2533.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2533.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V2533.java b/ca/spottedleaf/dataconverter/minecraft/versions/V2533.java new file mode 100644 index 0000000000000000000000000000000000000000..f8d493674380d53398c853899da76024c9d84984 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2533.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V2533.java @@ -0,0 +1,42 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -16846,11 +16846,11 @@ index 0000000000000000000000000000000000000000..f8d493674380d53398c853899da76024 + + private V2533() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2535.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2535.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V2535.java b/ca/spottedleaf/dataconverter/minecraft/versions/V2535.java new file mode 100644 index 0000000000000000000000000000000000000000..c0f6135fff38100c1955d64ee3f4ff984308e503 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2535.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V2535.java @@ -0,0 +1,34 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -16886,11 +16886,11 @@ index 0000000000000000000000000000000000000000..c0f6135fff38100c1955d64ee3f4ff98 + + private V2535() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2538.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2538.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V2538.java b/ca/spottedleaf/dataconverter/minecraft/versions/V2538.java new file mode 100644 index 0000000000000000000000000000000000000000..99d1df6362b290fdaa65385168ff6588647a8056 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2538.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V2538.java @@ -0,0 +1,43 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -16935,11 +16935,11 @@ index 0000000000000000000000000000000000000000..99d1df6362b290fdaa65385168ff6588 + + private V2538() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2550.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2550.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V2550.java b/ca/spottedleaf/dataconverter/minecraft/versions/V2550.java new file mode 100644 index 0000000000000000000000000000000000000000..f64f2c2d6051b7e7024a0ebc42c1dd8dc6434cf9 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2550.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V2550.java @@ -0,0 +1,346 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -17287,11 +17287,11 @@ index 0000000000000000000000000000000000000000..f64f2c2d6051b7e7024a0ebc42c1dd8d + + private V2550() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2551.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2551.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V2551.java b/ca/spottedleaf/dataconverter/minecraft/versions/V2551.java new file mode 100644 index 0000000000000000000000000000000000000000..9cfecd222ef41fdb4f31517a0821d7532386285f --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2551.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V2551.java @@ -0,0 +1,103 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -17396,11 +17396,11 @@ index 0000000000000000000000000000000000000000..9cfecd222ef41fdb4f31517a0821d753 + + private V2551() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2552.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2552.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V2552.java b/ca/spottedleaf/dataconverter/minecraft/versions/V2552.java new file mode 100644 index 0000000000000000000000000000000000000000..9e6c7dc40d509cf424976831382425ab7eceb024 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2552.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V2552.java @@ -0,0 +1,22 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -17424,11 +17424,11 @@ index 0000000000000000000000000000000000000000..9e6c7dc40d509cf424976831382425ab + + private V2552() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2553.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2553.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V2553.java b/ca/spottedleaf/dataconverter/minecraft/versions/V2553.java new file mode 100644 index 0000000000000000000000000000000000000000..f019774923bf08fc0f7dc7cafd5fb66fdd7427f8 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2553.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V2553.java @@ -0,0 +1,77 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -17507,11 +17507,11 @@ index 0000000000000000000000000000000000000000..f019774923bf08fc0f7dc7cafd5fb66f + + private V2553() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2558.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2558.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V2558.java b/ca/spottedleaf/dataconverter/minecraft/versions/V2558.java new file mode 100644 index 0000000000000000000000000000000000000000..137a530c1b979e7257b77f405885aa9f4d376c11 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2558.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V2558.java @@ -0,0 +1,48 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -17561,11 +17561,11 @@ index 0000000000000000000000000000000000000000..137a530c1b979e7257b77f405885aa9f + + private V2558() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2568.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2568.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V2568.java b/ca/spottedleaf/dataconverter/minecraft/versions/V2568.java new file mode 100644 index 0000000000000000000000000000000000000000..e50fbc38dbf9198c0c652b506e50780eca368bb0 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2568.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V2568.java @@ -0,0 +1,18 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -17585,11 +17585,11 @@ index 0000000000000000000000000000000000000000..e50fbc38dbf9198c0c652b506e50780e + + private V2568() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2671.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2671.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V2671.java b/ca/spottedleaf/dataconverter/minecraft/versions/V2671.java new file mode 100644 index 0000000000000000000000000000000000000000..140bfff947e540452f3794eda2f1e2122f8d3f27 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2671.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V2671.java @@ -0,0 +1,18 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -17609,11 +17609,11 @@ index 0000000000000000000000000000000000000000..140bfff947e540452f3794eda2f1e212 + + private V2671() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2679.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2679.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V2679.java b/ca/spottedleaf/dataconverter/minecraft/versions/V2679.java new file mode 100644 index 0000000000000000000000000000000000000000..7ec79da7e8871d6beca05a25c70d8c6811531faa --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2679.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V2679.java @@ -0,0 +1,38 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -17653,11 +17653,11 @@ index 0000000000000000000000000000000000000000..7ec79da7e8871d6beca05a25c70d8c68 + + private V2679() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2680.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2680.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V2680.java b/ca/spottedleaf/dataconverter/minecraft/versions/V2680.java new file mode 100644 index 0000000000000000000000000000000000000000..87cbe1c717635908a30c57028346a1abeb21e6a6 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2680.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V2680.java @@ -0,0 +1,27 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -17686,11 +17686,11 @@ index 0000000000000000000000000000000000000000..87cbe1c717635908a30c57028346a1ab + + private V2680() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2684.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2684.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V2684.java b/ca/spottedleaf/dataconverter/minecraft/versions/V2684.java new file mode 100644 index 0000000000000000000000000000000000000000..0c996642f561d2471a506a34f5efe6dae5cd1fb3 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2684.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V2684.java @@ -0,0 +1,16 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -17708,11 +17708,11 @@ index 0000000000000000000000000000000000000000..0c996642f561d2471a506a34f5efe6da + + private V2684() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2686.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2686.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V2686.java b/ca/spottedleaf/dataconverter/minecraft/versions/V2686.java new file mode 100644 index 0000000000000000000000000000000000000000..1f1685cb0e1427e88dc5c970b0cb58aae0393396 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2686.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V2686.java @@ -0,0 +1,18 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -17732,11 +17732,11 @@ index 0000000000000000000000000000000000000000..1f1685cb0e1427e88dc5c970b0cb58aa + + private V2686() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2688.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2688.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V2688.java b/ca/spottedleaf/dataconverter/minecraft/versions/V2688.java new file mode 100644 index 0000000000000000000000000000000000000000..15a7bf7b7ea883d7a3cee9183b92e12838efd690 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2688.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V2688.java @@ -0,0 +1,22 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -17760,11 +17760,11 @@ index 0000000000000000000000000000000000000000..15a7bf7b7ea883d7a3cee9183b92e128 + + private V2688() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2690.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2690.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V2690.java b/ca/spottedleaf/dataconverter/minecraft/versions/V2690.java new file mode 100644 index 0000000000000000000000000000000000000000..39ffcec6e78229dd62abfd42c1ac64c3ccccc6dc --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2690.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V2690.java @@ -0,0 +1,45 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -17811,11 +17811,11 @@ index 0000000000000000000000000000000000000000..39ffcec6e78229dd62abfd42c1ac64c3 + + private V2690() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2691.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2691.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V2691.java b/ca/spottedleaf/dataconverter/minecraft/versions/V2691.java new file mode 100644 index 0000000000000000000000000000000000000000..bb87bcedfc2ed8d19b266e925beca0f54b50a0ab --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2691.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V2691.java @@ -0,0 +1,29 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -17846,11 +17846,11 @@ index 0000000000000000000000000000000000000000..bb87bcedfc2ed8d19b266e925beca0f5 + + private V2691() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2693.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2693.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V2693.java b/ca/spottedleaf/dataconverter/minecraft/versions/V2693.java new file mode 100644 index 0000000000000000000000000000000000000000..a242e8e9a7a7c80c00ec0d64542b3d7dc3103e24 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2693.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V2693.java @@ -0,0 +1,16 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -17868,11 +17868,11 @@ index 0000000000000000000000000000000000000000..a242e8e9a7a7c80c00ec0d64542b3d7d + + private V2693() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2696.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2696.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V2696.java b/ca/spottedleaf/dataconverter/minecraft/versions/V2696.java new file mode 100644 index 0000000000000000000000000000000000000000..ce568002e54924e001c12271f0bde7183bc23c61 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2696.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V2696.java @@ -0,0 +1,42 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -17916,11 +17916,11 @@ index 0000000000000000000000000000000000000000..ce568002e54924e001c12271f0bde718 + + private V2696() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2700.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2700.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V2700.java b/ca/spottedleaf/dataconverter/minecraft/versions/V2700.java new file mode 100644 index 0000000000000000000000000000000000000000..e6a2f29b20aa6d7cd431fc63c2d8ed70dc9a2ab8 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2700.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V2700.java @@ -0,0 +1,22 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -17944,11 +17944,11 @@ index 0000000000000000000000000000000000000000..e6a2f29b20aa6d7cd431fc63c2d8ed70 + + private V2700() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2701.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2701.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V2701.java b/ca/spottedleaf/dataconverter/minecraft/versions/V2701.java new file mode 100644 index 0000000000000000000000000000000000000000..dc1604f48a9f15721e709f2e128210085520c15e --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2701.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V2701.java @@ -0,0 +1,205 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -18155,11 +18155,11 @@ index 0000000000000000000000000000000000000000..dc1604f48a9f15721e709f2e12821008 + + private V2701() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2702.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2702.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V2702.java b/ca/spottedleaf/dataconverter/minecraft/versions/V2702.java new file mode 100644 index 0000000000000000000000000000000000000000..cc89ca8a01c2589c807be2a7560bcc6051417379 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2702.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V2702.java @@ -0,0 +1,35 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -18196,11 +18196,11 @@ index 0000000000000000000000000000000000000000..cc89ca8a01c2589c807be2a7560bcc60 + + private V2702() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2707.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2707.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V2707.java b/ca/spottedleaf/dataconverter/minecraft/versions/V2707.java new file mode 100644 index 0000000000000000000000000000000000000000..3c5fc48f39c08249a61199c7f72dddee65fd98af --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2707.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V2707.java @@ -0,0 +1,22 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -18224,11 +18224,11 @@ index 0000000000000000000000000000000000000000..3c5fc48f39c08249a61199c7f72dddee + + private V2707() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2710.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2710.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V2710.java b/ca/spottedleaf/dataconverter/minecraft/versions/V2710.java new file mode 100644 index 0000000000000000000000000000000000000000..0967c8c794869a972c1283cab6b3f3cef1d77aec --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2710.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V2710.java @@ -0,0 +1,21 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -18251,11 +18251,11 @@ index 0000000000000000000000000000000000000000..0967c8c794869a972c1283cab6b3f3ce + + private V2710() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2717.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2717.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V2717.java b/ca/spottedleaf/dataconverter/minecraft/versions/V2717.java new file mode 100644 index 0000000000000000000000000000000000000000..e0d6b2f6b00e0bfce205efa889de1765ef22793a --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2717.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V2717.java @@ -0,0 +1,25 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -18282,11 +18282,11 @@ index 0000000000000000000000000000000000000000..e0d6b2f6b00e0bfce205efa889de1765 + + private V2717() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2825.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2825.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V2825.java b/ca/spottedleaf/dataconverter/minecraft/versions/V2825.java new file mode 100644 index 0000000000000000000000000000000000000000..cd00c9398791967be6dd10f7183c61902431b27a --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2825.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V2825.java @@ -0,0 +1,16 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -18304,11 +18304,11 @@ index 0000000000000000000000000000000000000000..cd00c9398791967be6dd10f7183c6190 + + private V2825() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2831.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2831.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V2831.java b/ca/spottedleaf/dataconverter/minecraft/versions/V2831.java new file mode 100644 index 0000000000000000000000000000000000000000..1b692e4866d99c89705289ad1f386f467382b1c7 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2831.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V2831.java @@ -0,0 +1,71 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -18381,11 +18381,11 @@ index 0000000000000000000000000000000000000000..1b692e4866d99c89705289ad1f386f46 + + private V2831() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2832.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2832.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V2832.java b/ca/spottedleaf/dataconverter/minecraft/versions/V2832.java new file mode 100644 index 0000000000000000000000000000000000000000..21d1617d222d0b82b1c5222a0ef1a1fa9da02ab8 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2832.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V2832.java @@ -0,0 +1,929 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -19316,11 +19316,11 @@ index 0000000000000000000000000000000000000000..21d1617d222d0b82b1c5222a0ef1a1fa + + private V2832() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2833.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2833.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V2833.java b/ca/spottedleaf/dataconverter/minecraft/versions/V2833.java new file mode 100644 index 0000000000000000000000000000000000000000..4c58b3b53d8526cbde6cf1e8c90cabdaceaf2a03 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2833.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V2833.java @@ -0,0 +1,31 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -19353,11 +19353,11 @@ index 0000000000000000000000000000000000000000..4c58b3b53d8526cbde6cf1e8c90cabda + + private V2833() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2838.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2838.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V2838.java b/ca/spottedleaf/dataconverter/minecraft/versions/V2838.java new file mode 100644 index 0000000000000000000000000000000000000000..356963228d884a0a74e6d7c9922b4ced627bbfb0 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2838.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V2838.java @@ -0,0 +1,62 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -19421,11 +19421,11 @@ index 0000000000000000000000000000000000000000..356963228d884a0a74e6d7c9922b4ced + + private V2838() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2841.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2841.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V2841.java b/ca/spottedleaf/dataconverter/minecraft/versions/V2841.java new file mode 100644 index 0000000000000000000000000000000000000000..bd8117a101d308e59251f927feb0692a6b22f547 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2841.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V2841.java @@ -0,0 +1,210 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -19637,11 +19637,11 @@ index 0000000000000000000000000000000000000000..bd8117a101d308e59251f927feb0692a + } + } +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2842.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2842.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V2842.java b/ca/spottedleaf/dataconverter/minecraft/versions/V2842.java new file mode 100644 index 0000000000000000000000000000000000000000..03b3d8e2b97a346a45e6c57cb07474baa3bb6096 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2842.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V2842.java @@ -0,0 +1,78 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -19721,11 +19721,11 @@ index 0000000000000000000000000000000000000000..03b3d8e2b97a346a45e6c57cb07474ba + + private V2842() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2843.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2843.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V2843.java b/ca/spottedleaf/dataconverter/minecraft/versions/V2843.java new file mode 100644 index 0000000000000000000000000000000000000000..28a7596b62f8a918f342e2d06eda050a7f2bad0b --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2843.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V2843.java @@ -0,0 +1,111 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -19838,11 +19838,11 @@ index 0000000000000000000000000000000000000000..28a7596b62f8a918f342e2d06eda050a + + private V2843() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2846.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2846.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V2846.java b/ca/spottedleaf/dataconverter/minecraft/versions/V2846.java new file mode 100644 index 0000000000000000000000000000000000000000..e32224267d53d82ba15942141a5cb7a19eb380f2 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2846.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V2846.java @@ -0,0 +1,23 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -19867,11 +19867,11 @@ index 0000000000000000000000000000000000000000..e32224267d53d82ba15942141a5cb7a1 + + private V2846() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2852.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2852.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V2852.java b/ca/spottedleaf/dataconverter/minecraft/versions/V2852.java new file mode 100644 index 0000000000000000000000000000000000000000..224ee1d9a3ba68e5a617c2c0846be47feef0bed1 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2852.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V2852.java @@ -0,0 +1,31 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -19904,11 +19904,11 @@ index 0000000000000000000000000000000000000000..224ee1d9a3ba68e5a617c2c0846be47f + + private V2852() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2967.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2967.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V2967.java b/ca/spottedleaf/dataconverter/minecraft/versions/V2967.java new file mode 100644 index 0000000000000000000000000000000000000000..eddfdecffcaf5e4cd7e5c3a79864816ffbaacae1 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2967.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V2967.java @@ -0,0 +1,58 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -19968,11 +19968,11 @@ index 0000000000000000000000000000000000000000..eddfdecffcaf5e4cd7e5c3a79864816f + + private V2967() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2970.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2970.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V2970.java b/ca/spottedleaf/dataconverter/minecraft/versions/V2970.java new file mode 100644 index 0000000000000000000000000000000000000000..ce083fca547170bb1e1014e868beaf535e940fc3 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2970.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V2970.java @@ -0,0 +1,209 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -20183,11 +20183,11 @@ index 0000000000000000000000000000000000000000..ce083fca547170bb1e1014e868beaf53 + } + } +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3077.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3077.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V3077.java b/ca/spottedleaf/dataconverter/minecraft/versions/V3077.java new file mode 100644 index 0000000000000000000000000000000000000000..06fe7dd2580cd8eaad9e0c7de8d0e27287d1b0a9 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3077.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V3077.java @@ -0,0 +1,40 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -20229,11 +20229,11 @@ index 0000000000000000000000000000000000000000..06fe7dd2580cd8eaad9e0c7de8d0e272 + + private V3077() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3078.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3078.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V3078.java b/ca/spottedleaf/dataconverter/minecraft/versions/V3078.java new file mode 100644 index 0000000000000000000000000000000000000000..a0e89f59c75f6d34480f4b8c4f8fa013dddc5d52 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3078.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V3078.java @@ -0,0 +1,23 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -20258,11 +20258,11 @@ index 0000000000000000000000000000000000000000..a0e89f59c75f6d34480f4b8c4f8fa013 + + private V3078() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3081.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3081.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V3081.java b/ca/spottedleaf/dataconverter/minecraft/versions/V3081.java new file mode 100644 index 0000000000000000000000000000000000000000..fb108cb7f50755b52f537a888ca155aa9db39b3a --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3081.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V3081.java @@ -0,0 +1,21 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -20285,11 +20285,11 @@ index 0000000000000000000000000000000000000000..fb108cb7f50755b52f537a888ca155aa + + private V3081() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3082.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3082.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V3082.java b/ca/spottedleaf/dataconverter/minecraft/versions/V3082.java new file mode 100644 index 0000000000000000000000000000000000000000..79768b25a32a5333f8cb6ec6e8c422478a6891df --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3082.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V3082.java @@ -0,0 +1,16 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -20307,11 +20307,11 @@ index 0000000000000000000000000000000000000000..79768b25a32a5333f8cb6ec6e8c42247 + + private V3082() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3083.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3083.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V3083.java b/ca/spottedleaf/dataconverter/minecraft/versions/V3083.java new file mode 100644 index 0000000000000000000000000000000000000000..e6e70ff4a28446fd8c4c663e0e44791ec4e5ac0a --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3083.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V3083.java @@ -0,0 +1,23 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -20336,11 +20336,11 @@ index 0000000000000000000000000000000000000000..e6e70ff4a28446fd8c4c663e0e44791e + + private V3083() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3084.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3084.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V3084.java b/ca/spottedleaf/dataconverter/minecraft/versions/V3084.java new file mode 100644 index 0000000000000000000000000000000000000000..6a096226995e89285054b4ab35ed3e14ae4da694 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3084.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V3084.java @@ -0,0 +1,42 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -20384,11 +20384,11 @@ index 0000000000000000000000000000000000000000..6a096226995e89285054b4ab35ed3e14 + + private V3084() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3086.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3086.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V3086.java b/ca/spottedleaf/dataconverter/minecraft/versions/V3086.java new file mode 100644 index 0000000000000000000000000000000000000000..f06412a417ba12111c9e8f30b747ed3ad6dcbcb6 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3086.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V3086.java @@ -0,0 +1,54 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -20444,11 +20444,11 @@ index 0000000000000000000000000000000000000000..f06412a417ba12111c9e8f30b747ed3a + + private V3086() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3087.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3087.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V3087.java b/ca/spottedleaf/dataconverter/minecraft/versions/V3087.java new file mode 100644 index 0000000000000000000000000000000000000000..b296229502491b54f6352ee1f9db0023296b36ec --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3087.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V3087.java @@ -0,0 +1,24 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -20474,11 +20474,11 @@ index 0000000000000000000000000000000000000000..b296229502491b54f6352ee1f9db0023 + + private V3087() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3088.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3088.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V3088.java b/ca/spottedleaf/dataconverter/minecraft/versions/V3088.java new file mode 100644 index 0000000000000000000000000000000000000000..2752dfd1a7ff896e2ed736846980da5adde6e657 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3088.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V3088.java @@ -0,0 +1,25 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -20505,11 +20505,11 @@ index 0000000000000000000000000000000000000000..2752dfd1a7ff896e2ed736846980da5a + + private V3088() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3090.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3090.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V3090.java b/ca/spottedleaf/dataconverter/minecraft/versions/V3090.java new file mode 100644 index 0000000000000000000000000000000000000000..b1cfe038364e12d542d93c3108887173b2e05262 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3090.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V3090.java @@ -0,0 +1,25 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -20536,11 +20536,11 @@ index 0000000000000000000000000000000000000000..b1cfe038364e12d542d93c3108887173 + + private V3090() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3093.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3093.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V3093.java b/ca/spottedleaf/dataconverter/minecraft/versions/V3093.java new file mode 100644 index 0000000000000000000000000000000000000000..d0677d68b393da9b151c7b2add2fbbd8608e315f --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3093.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V3093.java @@ -0,0 +1,24 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -20566,11 +20566,11 @@ index 0000000000000000000000000000000000000000..d0677d68b393da9b151c7b2add2fbbd8 + + private V3093() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3094.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3094.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V3094.java b/ca/spottedleaf/dataconverter/minecraft/versions/V3094.java new file mode 100644 index 0000000000000000000000000000000000000000..9b9ef34db7dbae8574c4bb3d474592e7991441d5 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3094.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V3094.java @@ -0,0 +1,44 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -20616,11 +20616,11 @@ index 0000000000000000000000000000000000000000..9b9ef34db7dbae8574c4bb3d474592e7 + + private V3094() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3097.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3097.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V3097.java b/ca/spottedleaf/dataconverter/minecraft/versions/V3097.java new file mode 100644 index 0000000000000000000000000000000000000000..c70d6dc72d1d913904b71640fe3476c644449ee2 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3097.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V3097.java @@ -0,0 +1,63 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -20685,11 +20685,11 @@ index 0000000000000000000000000000000000000000..c70d6dc72d1d913904b71640fe3476c6 + + private V3097() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3108.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3108.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V3108.java b/ca/spottedleaf/dataconverter/minecraft/versions/V3108.java new file mode 100644 index 0000000000000000000000000000000000000000..0a1ef2e55a1f9cd6381a2c6fdc04f81ee190ba81 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3108.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V3108.java @@ -0,0 +1,29 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -20720,11 +20720,11 @@ index 0000000000000000000000000000000000000000..0a1ef2e55a1f9cd6381a2c6fdc04f81e + + private V3108() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3201.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3201.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V3201.java b/ca/spottedleaf/dataconverter/minecraft/versions/V3201.java new file mode 100644 index 0000000000000000000000000000000000000000..04b84c8466d4fa8f2ad21aae2de44273c05495b6 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3201.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V3201.java @@ -0,0 +1,35 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -20761,11 +20761,11 @@ index 0000000000000000000000000000000000000000..04b84c8466d4fa8f2ad21aae2de44273 + + private V3201() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3203.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3203.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V3203.java b/ca/spottedleaf/dataconverter/minecraft/versions/V3203.java new file mode 100644 index 0000000000000000000000000000000000000000..db9eb946638447445649f4576b3698c0774e44bb --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3203.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V3203.java @@ -0,0 +1,20 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -20787,11 +20787,11 @@ index 0000000000000000000000000000000000000000..db9eb946638447445649f4576b3698c0 + + private V3203() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3204.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3204.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V3204.java b/ca/spottedleaf/dataconverter/minecraft/versions/V3204.java new file mode 100644 index 0000000000000000000000000000000000000000..87053c0c1de258770e7630830307ab484915aad8 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3204.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V3204.java @@ -0,0 +1,16 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -20809,11 +20809,11 @@ index 0000000000000000000000000000000000000000..87053c0c1de258770e7630830307ab48 + + private V3204() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3209.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3209.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V3209.java b/ca/spottedleaf/dataconverter/minecraft/versions/V3209.java new file mode 100644 index 0000000000000000000000000000000000000000..85270a36c5f75b1c6be49e461b302c3339c95750 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3209.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V3209.java @@ -0,0 +1,18 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -20833,11 +20833,11 @@ index 0000000000000000000000000000000000000000..85270a36c5f75b1c6be49e461b302c33 + + private V3209() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3214.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3214.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V3214.java b/ca/spottedleaf/dataconverter/minecraft/versions/V3214.java new file mode 100644 index 0000000000000000000000000000000000000000..0096664e25dca8d690c6154324f97efdb1ada723 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3214.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V3214.java @@ -0,0 +1,30 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -20869,11 +20869,11 @@ index 0000000000000000000000000000000000000000..0096664e25dca8d690c6154324f97efd + + private V3214() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3319.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3319.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V3319.java b/ca/spottedleaf/dataconverter/minecraft/versions/V3319.java new file mode 100644 index 0000000000000000000000000000000000000000..0a4a1f690f568b8977e9b2caaf7fba15cb3307a5 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3319.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V3319.java @@ -0,0 +1,23 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -20898,11 +20898,11 @@ index 0000000000000000000000000000000000000000..0a4a1f690f568b8977e9b2caaf7fba15 + + private V3319() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3322.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3322.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V3322.java b/ca/spottedleaf/dataconverter/minecraft/versions/V3322.java new file mode 100644 index 0000000000000000000000000000000000000000..53827b9b8999e7b284f3df0f41c98dbbc7d69c1c --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3322.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V3322.java @@ -0,0 +1,84 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -20988,11 +20988,11 @@ index 0000000000000000000000000000000000000000..53827b9b8999e7b284f3df0f41c98dbb + + private V3322() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3325.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3325.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V3325.java b/ca/spottedleaf/dataconverter/minecraft/versions/V3325.java new file mode 100644 index 0000000000000000000000000000000000000000..2120a5928446f2597fb261d5d6e91c3c9700cb22 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3325.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V3325.java @@ -0,0 +1,19 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -21013,11 +21013,11 @@ index 0000000000000000000000000000000000000000..2120a5928446f2597fb261d5d6e91c3c + + private V3325() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3326.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3326.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V3326.java b/ca/spottedleaf/dataconverter/minecraft/versions/V3326.java new file mode 100644 index 0000000000000000000000000000000000000000..6a8d3f6fd18d941e5b0b18fc5208b7fe1f9fd724 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3326.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V3326.java @@ -0,0 +1,20 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -21039,11 +21039,11 @@ index 0000000000000000000000000000000000000000..6a8d3f6fd18d941e5b0b18fc5208b7fe + + private V3326() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3327.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3327.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V3327.java b/ca/spottedleaf/dataconverter/minecraft/versions/V3327.java new file mode 100644 index 0000000000000000000000000000000000000000..7051d4f01b6f43f3d435d21d65b83ba702ffda41 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3327.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V3327.java @@ -0,0 +1,19 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -21064,11 +21064,11 @@ index 0000000000000000000000000000000000000000..7051d4f01b6f43f3d435d21d65b83ba7 + + private V3327() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3328.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3328.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V3328.java b/ca/spottedleaf/dataconverter/minecraft/versions/V3328.java new file mode 100644 index 0000000000000000000000000000000000000000..75a3cbc8e6749abd4bceff710d2f7c3ca6df9d70 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3328.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V3328.java @@ -0,0 +1,15 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -21085,11 +21085,11 @@ index 0000000000000000000000000000000000000000..75a3cbc8e6749abd4bceff710d2f7c3c + + private V3328() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3438.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3438.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V3438.java b/ca/spottedleaf/dataconverter/minecraft/versions/V3438.java new file mode 100644 index 0000000000000000000000000000000000000000..30c23572a5989f0bd6bff6e424ee59c84bc8d8f1 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3438.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V3438.java @@ -0,0 +1,47 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -21138,11 +21138,11 @@ index 0000000000000000000000000000000000000000..30c23572a5989f0bd6bff6e424ee59c8 + + private V3438() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3439.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3439.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V3439.java b/ca/spottedleaf/dataconverter/minecraft/versions/V3439.java new file mode 100644 index 0000000000000000000000000000000000000000..5c09f745e5200393cf4ecdcb5b42466c2e2d94d9 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3439.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V3439.java @@ -0,0 +1,96 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -21240,11 +21240,11 @@ index 0000000000000000000000000000000000000000..5c09f745e5200393cf4ecdcb5b42466c + + private V3439() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3440.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3440.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V3440.java b/ca/spottedleaf/dataconverter/minecraft/versions/V3440.java new file mode 100644 index 0000000000000000000000000000000000000000..914df7885582a1fde398e755dbfaf00e19ce16b3 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3440.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V3440.java @@ -0,0 +1,29 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -21275,11 +21275,11 @@ index 0000000000000000000000000000000000000000..914df7885582a1fde398e755dbfaf00e + + private V3440() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3441.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3441.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V3441.java b/ca/spottedleaf/dataconverter/minecraft/versions/V3441.java new file mode 100644 index 0000000000000000000000000000000000000000..2cf41561b4a229ba4d60540f85ba0a8946bb9753 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3441.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V3441.java @@ -0,0 +1,17 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -21298,11 +21298,11 @@ index 0000000000000000000000000000000000000000..2cf41561b4a229ba4d60540f85ba0a89 + + private V3441() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3447.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3447.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V3447.java b/ca/spottedleaf/dataconverter/minecraft/versions/V3447.java new file mode 100644 index 0000000000000000000000000000000000000000..5db4a5222bf80f01c128d97ec849b89003837beb --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3447.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V3447.java @@ -0,0 +1,49 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -21353,11 +21353,11 @@ index 0000000000000000000000000000000000000000..5db4a5222bf80f01c128d97ec849b890 + + private V3447() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3448.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3448.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V3448.java b/ca/spottedleaf/dataconverter/minecraft/versions/V3448.java new file mode 100644 index 0000000000000000000000000000000000000000..6f447d59677be4630b53e948419a0ae2a3414315 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3448.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V3448.java @@ -0,0 +1,28 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -21387,11 +21387,11 @@ index 0000000000000000000000000000000000000000..6f447d59677be4630b53e948419a0ae2 + + private V3448() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3450.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3450.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V3450.java b/ca/spottedleaf/dataconverter/minecraft/versions/V3450.java new file mode 100644 index 0000000000000000000000000000000000000000..9e7f34a40280a7704c4a4d1c03a7dda8e030aff5 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3450.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V3450.java @@ -0,0 +1,23 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -21416,11 +21416,11 @@ index 0000000000000000000000000000000000000000..9e7f34a40280a7704c4a4d1c03a7dda8 + + private V3450() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3451.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3451.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V3451.java b/ca/spottedleaf/dataconverter/minecraft/versions/V3451.java new file mode 100644 index 0000000000000000000000000000000000000000..ea97d596bfb4b9c6b9b7d0534604e042a775ea78 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3451.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V3451.java @@ -0,0 +1,38 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -21460,11 +21460,11 @@ index 0000000000000000000000000000000000000000..ea97d596bfb4b9c6b9b7d0534604e042 + + private V3451() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3459.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3459.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V3459.java b/ca/spottedleaf/dataconverter/minecraft/versions/V3459.java new file mode 100644 index 0000000000000000000000000000000000000000..e8a1fcd9e67b151a360e11089289154a14dde27c --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3459.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V3459.java @@ -0,0 +1,38 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -21504,11 +21504,11 @@ index 0000000000000000000000000000000000000000..e8a1fcd9e67b151a360e11089289154a + + private V3459() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3564.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3564.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V3564.java b/ca/spottedleaf/dataconverter/minecraft/versions/V3564.java new file mode 100644 index 0000000000000000000000000000000000000000..5c64ec5b9bdcc279bc1b86e6bb0b877003b213cb --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3564.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V3564.java @@ -0,0 +1,93 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -21603,11 +21603,11 @@ index 0000000000000000000000000000000000000000..5c64ec5b9bdcc279bc1b86e6bb0b8770 + + private V3564() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3565.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3565.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V3565.java b/ca/spottedleaf/dataconverter/minecraft/versions/V3565.java new file mode 100644 index 0000000000000000000000000000000000000000..685021e87236c5b7ce5ee0b5422d7bf856ea6652 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3565.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V3565.java @@ -0,0 +1,32 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -21641,11 +21641,11 @@ index 0000000000000000000000000000000000000000..685021e87236c5b7ce5ee0b5422d7bf8 + + private V3565() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3566.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3566.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V3566.java b/ca/spottedleaf/dataconverter/minecraft/versions/V3566.java new file mode 100644 index 0000000000000000000000000000000000000000..a5b91dc5eb4e9206cbb4489ce14195d7517ef4e0 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3566.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V3566.java @@ -0,0 +1,58 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -21705,11 +21705,11 @@ index 0000000000000000000000000000000000000000..a5b91dc5eb4e9206cbb4489ce14195d7 + + private V3566() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3568.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3568.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V3568.java b/ca/spottedleaf/dataconverter/minecraft/versions/V3568.java new file mode 100644 index 0000000000000000000000000000000000000000..39b4bd2d0bb36ef242467e89010ef5fc1490de9b --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3568.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V3568.java @@ -0,0 +1,245 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -21956,11 +21956,11 @@ index 0000000000000000000000000000000000000000..39b4bd2d0bb36ef242467e89010ef5fc + + private V3568() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3682.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3682.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V3682.java b/ca/spottedleaf/dataconverter/minecraft/versions/V3682.java new file mode 100644 index 0000000000000000000000000000000000000000..f9e3eb71b268f7bc1940f0199fddfa1ac27401b8 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3682.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V3682.java @@ -0,0 +1,16 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -21978,11 +21978,11 @@ index 0000000000000000000000000000000000000000..f9e3eb71b268f7bc1940f0199fddfa1a + + private V3682() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3683.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3683.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V3683.java b/ca/spottedleaf/dataconverter/minecraft/versions/V3683.java new file mode 100644 index 0000000000000000000000000000000000000000..855a95b4ef686fa9d2cefdef5664290528e4dc60 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3683.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V3683.java @@ -0,0 +1,33 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -22017,11 +22017,11 @@ index 0000000000000000000000000000000000000000..855a95b4ef686fa9d2cefdef56642905 + + private V3683() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3685.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3685.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V3685.java b/ca/spottedleaf/dataconverter/minecraft/versions/V3685.java new file mode 100644 index 0000000000000000000000000000000000000000..603467a7a2b6da93181a0a32eedb30d1614b0069 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3685.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V3685.java @@ -0,0 +1,64 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -22087,11 +22087,11 @@ index 0000000000000000000000000000000000000000..603467a7a2b6da93181a0a32eedb30d1 + + private V3685() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3689.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3689.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V3689.java b/ca/spottedleaf/dataconverter/minecraft/versions/V3689.java new file mode 100644 index 0000000000000000000000000000000000000000..ccda8d0f7c0a284fd4f91622dc33b832b4a95c45 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3689.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V3689.java @@ -0,0 +1,37 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -22130,11 +22130,11 @@ index 0000000000000000000000000000000000000000..ccda8d0f7c0a284fd4f91622dc33b832 + + private V3689() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3692.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3692.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V3692.java b/ca/spottedleaf/dataconverter/minecraft/versions/V3692.java new file mode 100644 index 0000000000000000000000000000000000000000..1fc62f9cadb990790420376d5c80b14775b71a48 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3692.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V3692.java @@ -0,0 +1,25 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -22161,11 +22161,11 @@ index 0000000000000000000000000000000000000000..1fc62f9cadb990790420376d5c80b147 + + private V3692() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3799.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3799.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V3799.java b/ca/spottedleaf/dataconverter/minecraft/versions/V3799.java new file mode 100644 index 0000000000000000000000000000000000000000..0c34d445825e8b49249af852b1f2f09c8b5a2574 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3799.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V3799.java @@ -0,0 +1,14 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -22181,11 +22181,11 @@ index 0000000000000000000000000000000000000000..0c34d445825e8b49249af852b1f2f09c + + private V3799() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3800.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3800.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V3800.java b/ca/spottedleaf/dataconverter/minecraft/versions/V3800.java new file mode 100644 index 0000000000000000000000000000000000000000..a40397feb5962bd5f4a44cc85bb359f5f99ff03a --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3800.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V3800.java @@ -0,0 +1,23 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -22210,11 +22210,11 @@ index 0000000000000000000000000000000000000000..a40397feb5962bd5f4a44cc85bb359f5 + + private V3800() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3803.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3803.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V3803.java b/ca/spottedleaf/dataconverter/minecraft/versions/V3803.java new file mode 100644 index 0000000000000000000000000000000000000000..7ff5e2f1a386d75b6d0d6fc3160f2241bf74b262 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3803.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V3803.java @@ -0,0 +1,24 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -22240,11 +22240,11 @@ index 0000000000000000000000000000000000000000..7ff5e2f1a386d75b6d0d6fc3160f2241 + + private V3803() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3807.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3807.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V3807.java b/ca/spottedleaf/dataconverter/minecraft/versions/V3807.java new file mode 100644 index 0000000000000000000000000000000000000000..a76916cdb7cf91b8ba5461524472b3e455f02885 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3807.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V3807.java @@ -0,0 +1,72 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -22318,11 +22318,11 @@ index 0000000000000000000000000000000000000000..a76916cdb7cf91b8ba5461524472b3e4 + + private V3807() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3808.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3808.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V3808.java b/ca/spottedleaf/dataconverter/minecraft/versions/V3808.java new file mode 100644 index 0000000000000000000000000000000000000000..78a10f89218eb0edf121f88978b4fe13e1b1bf44 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3808.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V3808.java @@ -0,0 +1,82 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -22406,11 +22406,11 @@ index 0000000000000000000000000000000000000000..78a10f89218eb0edf121f88978b4fe13 + + private V3808() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3809.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3809.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V3809.java b/ca/spottedleaf/dataconverter/minecraft/versions/V3809.java new file mode 100644 index 0000000000000000000000000000000000000000..c45a1a77adbb5dc5ba8c3dae0bb480450520c731 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3809.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V3809.java @@ -0,0 +1,41 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -22453,11 +22453,11 @@ index 0000000000000000000000000000000000000000..c45a1a77adbb5dc5ba8c3dae0bb48045 + + private V3809() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3812.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3812.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V3812.java b/ca/spottedleaf/dataconverter/minecraft/versions/V3812.java new file mode 100644 index 0000000000000000000000000000000000000000..f0c0748b003648e5fe06d0b6dd1b21948ac0e54a --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3812.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V3812.java @@ -0,0 +1,48 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -22507,11 +22507,11 @@ index 0000000000000000000000000000000000000000..f0c0748b003648e5fe06d0b6dd1b2194 + + private V3812() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3813.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3813.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V3813.java b/ca/spottedleaf/dataconverter/minecraft/versions/V3813.java new file mode 100644 index 0000000000000000000000000000000000000000..920d7734d883d74e8334102b22cabce24a79db7e --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3813.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V3813.java @@ -0,0 +1,131 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -22644,11 +22644,11 @@ index 0000000000000000000000000000000000000000..920d7734d883d74e8334102b22cabce2 + + private static record RenamePair(String from, String to) {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3814.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3814.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V3814.java b/ca/spottedleaf/dataconverter/minecraft/versions/V3814.java new file mode 100644 index 0000000000000000000000000000000000000000..c4cc52620afb728533efe988bf2066ffc947f2d6 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3814.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V3814.java @@ -0,0 +1,21 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -22671,11 +22671,11 @@ index 0000000000000000000000000000000000000000..c4cc52620afb728533efe988bf2066ff + + private V3814() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3816.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3816.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V3816.java b/ca/spottedleaf/dataconverter/minecraft/versions/V3816.java new file mode 100644 index 0000000000000000000000000000000000000000..f50b81d931a1908d405bb72e0679983a742d5223 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3816.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V3816.java @@ -0,0 +1,14 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -22691,11 +22691,11 @@ index 0000000000000000000000000000000000000000..f50b81d931a1908d405bb72e0679983a + + private V3816() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3818.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3818.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V3818.java b/ca/spottedleaf/dataconverter/minecraft/versions/V3818.java new file mode 100644 index 0000000000000000000000000000000000000000..a1a4659538c8f678319ddc7d61b400051c8a4953 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3818.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V3818.java @@ -0,0 +1,340 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -23037,11 +23037,11 @@ index 0000000000000000000000000000000000000000..a1a4659538c8f678319ddc7d61b40005 + + private V3818() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3820.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3820.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V3820.java b/ca/spottedleaf/dataconverter/minecraft/versions/V3820.java new file mode 100644 index 0000000000000000000000000000000000000000..c45dda60ed8da6802181f7f169a5b97f591b00ee --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3820.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V3820.java @@ -0,0 +1,78 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -23121,11 +23121,11 @@ index 0000000000000000000000000000000000000000..c45dda60ed8da6802181f7f169a5b97f + + private V3820() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3825.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3825.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V3825.java b/ca/spottedleaf/dataconverter/minecraft/versions/V3825.java new file mode 100644 index 0000000000000000000000000000000000000000..26e27331223bc5671db49bb730a754597815b8cc --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3825.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V3825.java @@ -0,0 +1,153 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -23280,11 +23280,11 @@ index 0000000000000000000000000000000000000000..26e27331223bc5671db49bb730a75459 + + private V3825() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3828.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3828.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V3828.java b/ca/spottedleaf/dataconverter/minecraft/versions/V3828.java new file mode 100644 index 0000000000000000000000000000000000000000..f752bb2fca2e4cd438c0540460912d4bc2c6f25e --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3828.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V3828.java @@ -0,0 +1,37 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -23323,11 +23323,11 @@ index 0000000000000000000000000000000000000000..f752bb2fca2e4cd438c0540460912d4b + + private V3828() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3833.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3833.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V3833.java b/ca/spottedleaf/dataconverter/minecraft/versions/V3833.java new file mode 100644 index 0000000000000000000000000000000000000000..f097881401855137f5d4ac25ba1468e635a702b5 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3833.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V3833.java @@ -0,0 +1,36 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -23365,11 +23365,11 @@ index 0000000000000000000000000000000000000000..f097881401855137f5d4ac25ba1468e6 + + private V3833() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3938.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3938.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V3938.java b/ca/spottedleaf/dataconverter/minecraft/versions/V3938.java new file mode 100644 index 0000000000000000000000000000000000000000..2a6d144c2f074403bde8a62377ca6986c0c12a84 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3938.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V3938.java @@ -0,0 +1,24 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -23395,11 +23395,11 @@ index 0000000000000000000000000000000000000000..2a6d144c2f074403bde8a62377ca6986 + + private V3938() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3939.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3939.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V3939.java b/ca/spottedleaf/dataconverter/minecraft/versions/V3939.java new file mode 100644 index 0000000000000000000000000000000000000000..632c8008484e844d962405c6ef8fb9f09fc6c977 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3939.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V3939.java @@ -0,0 +1,22 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -23423,11 +23423,11 @@ index 0000000000000000000000000000000000000000..632c8008484e844d962405c6ef8fb9f0 + + private V3939() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3943.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3943.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V3943.java b/ca/spottedleaf/dataconverter/minecraft/versions/V3943.java new file mode 100644 index 0000000000000000000000000000000000000000..1cd426cf78d62d428406caa319cc5c8649e7f36c --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3943.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V3943.java @@ -0,0 +1,34 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -23463,11 +23463,11 @@ index 0000000000000000000000000000000000000000..1cd426cf78d62d428406caa319cc5c86 + + private V3943() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3945.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3945.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V3945.java b/ca/spottedleaf/dataconverter/minecraft/versions/V3945.java new file mode 100644 index 0000000000000000000000000000000000000000..74c13c46390e4533a9eb2c8ae5d9846db55efa94 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3945.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V3945.java @@ -0,0 +1,244 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -23713,11 +23713,11 @@ index 0000000000000000000000000000000000000000..74c13c46390e4533a9eb2c8ae5d9846d + + private V3945() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V4054.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V4054.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V4054.java b/ca/spottedleaf/dataconverter/minecraft/versions/V4054.java new file mode 100644 index 0000000000000000000000000000000000000000..d65e05285ef238aa8c6d660aa42fcd69e07d9430 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V4054.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V4054.java @@ -0,0 +1,46 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -23765,11 +23765,11 @@ index 0000000000000000000000000000000000000000..d65e05285ef238aa8c6d660aa42fcd69 + + private V4054() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V4055.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V4055.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V4055.java b/ca/spottedleaf/dataconverter/minecraft/versions/V4055.java new file mode 100644 index 0000000000000000000000000000000000000000..45b141a651d954554fcca68f36c0b3344328d902 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V4055.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V4055.java @@ -0,0 +1,41 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -23812,11 +23812,11 @@ index 0000000000000000000000000000000000000000..45b141a651d954554fcca68f36c0b334 + + private V4055() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V4057.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V4057.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V4057.java b/ca/spottedleaf/dataconverter/minecraft/versions/V4057.java new file mode 100644 index 0000000000000000000000000000000000000000..b0949ac2035662ba1c943b4bfab2f19e985e6864 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V4057.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V4057.java @@ -0,0 +1,33 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -23851,11 +23851,11 @@ index 0000000000000000000000000000000000000000..b0949ac2035662ba1c943b4bfab2f19e + + private V4057() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V4059.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V4059.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V4059.java b/ca/spottedleaf/dataconverter/minecraft/versions/V4059.java new file mode 100644 index 0000000000000000000000000000000000000000..0047a20dab2ffd6b39a8bcb8ed9f3878f20e31c2 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V4059.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V4059.java @@ -0,0 +1,128 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -23985,11 +23985,11 @@ index 0000000000000000000000000000000000000000..0047a20dab2ffd6b39a8bcb8ed9f3878 + + private V4059() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V4061.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V4061.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V4061.java b/ca/spottedleaf/dataconverter/minecraft/versions/V4061.java new file mode 100644 index 0000000000000000000000000000000000000000..630263a61b5db4207c1a5051e3e2249ab3dd3957 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V4061.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V4061.java @@ -0,0 +1,112 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -24103,11 +24103,11 @@ index 0000000000000000000000000000000000000000..630263a61b5db4207c1a5051e3e2249a + + private V4061() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V4064.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V4064.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V4064.java b/ca/spottedleaf/dataconverter/minecraft/versions/V4064.java new file mode 100644 index 0000000000000000000000000000000000000000..85eb8f37f89faed8b366c1d1c850b028bfcb2164 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V4064.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V4064.java @@ -0,0 +1,36 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -24145,11 +24145,11 @@ index 0000000000000000000000000000000000000000..85eb8f37f89faed8b366c1d1c850b028 + + private V4064() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V4067.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V4067.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V4067.java b/ca/spottedleaf/dataconverter/minecraft/versions/V4067.java new file mode 100644 index 0000000000000000000000000000000000000000..855c5a99951996ffe4eabb24a69321043cce41d7 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V4067.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V4067.java @@ -0,0 +1,143 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -24294,11 +24294,11 @@ index 0000000000000000000000000000000000000000..855c5a99951996ffe4eabb24a6932104 + + private V4067() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V4068.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V4068.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V4068.java b/ca/spottedleaf/dataconverter/minecraft/versions/V4068.java new file mode 100644 index 0000000000000000000000000000000000000000..817682bb5830242eca25cc1939ed2bda9f1c460b --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V4068.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V4068.java @@ -0,0 +1,65 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -24365,11 +24365,11 @@ index 0000000000000000000000000000000000000000..817682bb5830242eca25cc1939ed2bda + + private V4068() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V4070.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V4070.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V4070.java b/ca/spottedleaf/dataconverter/minecraft/versions/V4070.java new file mode 100644 index 0000000000000000000000000000000000000000..b85673d792d4b1c317d312ba607a0d30c2f57ea9 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V4070.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V4070.java @@ -0,0 +1,22 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -24393,11 +24393,11 @@ index 0000000000000000000000000000000000000000..b85673d792d4b1c317d312ba607a0d30 + + private V4070() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V4071.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V4071.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V4071.java b/ca/spottedleaf/dataconverter/minecraft/versions/V4071.java new file mode 100644 index 0000000000000000000000000000000000000000..3b0855353f40e8ce54b86305152aa35af9154c6f --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V4071.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V4071.java @@ -0,0 +1,21 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -24420,11 +24420,11 @@ index 0000000000000000000000000000000000000000..3b0855353f40e8ce54b86305152aa35a + + private V4071() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V4081.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V4081.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V4081.java b/ca/spottedleaf/dataconverter/minecraft/versions/V4081.java new file mode 100644 index 0000000000000000000000000000000000000000..22eae4d39c3887ef4991fd21856c32c43c543f88 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V4081.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V4081.java @@ -0,0 +1,27 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -24453,11 +24453,11 @@ index 0000000000000000000000000000000000000000..22eae4d39c3887ef4991fd21856c32c4 + + private V4081() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V4173.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V4173.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V4173.java b/ca/spottedleaf/dataconverter/minecraft/versions/V4173.java new file mode 100644 index 0000000000000000000000000000000000000000..4e89460386bbc75b8380835b5df3ca821d6a9c82 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V4173.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V4173.java @@ -0,0 +1,24 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -24483,11 +24483,11 @@ index 0000000000000000000000000000000000000000..4e89460386bbc75b8380835b5df3ca82 + + private V4173() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V4175.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V4175.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V4175.java b/ca/spottedleaf/dataconverter/minecraft/versions/V4175.java new file mode 100644 index 0000000000000000000000000000000000000000..c4c6e75b8aae973fc4e4ac9f6e03ecbb5a38ef99 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V4175.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V4175.java @@ -0,0 +1,40 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -24529,11 +24529,11 @@ index 0000000000000000000000000000000000000000..c4c6e75b8aae973fc4e4ac9f6e03ecbb + + private V4175() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V4176.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V4176.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V4176.java b/ca/spottedleaf/dataconverter/minecraft/versions/V4176.java new file mode 100644 index 0000000000000000000000000000000000000000..c1a74d545333224d9e8c79667bf42b2617fbe346 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V4176.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V4176.java @@ -0,0 +1,44 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -24579,11 +24579,11 @@ index 0000000000000000000000000000000000000000..c1a74d545333224d9e8c79667bf42b26 + + private V4176() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V4180.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V4180.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V4180.java b/ca/spottedleaf/dataconverter/minecraft/versions/V4180.java new file mode 100644 index 0000000000000000000000000000000000000000..c8eb7ba000310d1165c63fb9eef3787872f299bb --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V4180.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V4180.java @@ -0,0 +1,22 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -24607,11 +24607,11 @@ index 0000000000000000000000000000000000000000..c8eb7ba000310d1165c63fb9eef37878 + + private V4180() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V4181.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V4181.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V4181.java b/ca/spottedleaf/dataconverter/minecraft/versions/V4181.java new file mode 100644 index 0000000000000000000000000000000000000000..9119204ef25d78b04c5afc58965df56725ac7079 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V4181.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V4181.java @@ -0,0 +1,36 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -24649,11 +24649,11 @@ index 0000000000000000000000000000000000000000..9119204ef25d78b04c5afc58965df567 + + private V4181() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V4185.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V4185.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V4185.java b/ca/spottedleaf/dataconverter/minecraft/versions/V4185.java new file mode 100644 index 0000000000000000000000000000000000000000..8b4041d3d3a4a001bf06eaedbddad1b297122b12 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V4185.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V4185.java @@ -0,0 +1,17 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -24672,11 +24672,11 @@ index 0000000000000000000000000000000000000000..8b4041d3d3a4a001bf06eaedbddad1b2 + + private V4185() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V4187.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V4187.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V4187.java b/ca/spottedleaf/dataconverter/minecraft/versions/V4187.java new file mode 100644 index 0000000000000000000000000000000000000000..7d09c4218d0db8119d1681bf95900be830557fa3 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V4187.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V4187.java @@ -0,0 +1,69 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -24747,11 +24747,11 @@ index 0000000000000000000000000000000000000000..7d09c4218d0db8119d1681bf95900be8 + + private V4187() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V501.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V501.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V501.java b/ca/spottedleaf/dataconverter/minecraft/versions/V501.java new file mode 100644 index 0000000000000000000000000000000000000000..a7a4d6446b7765ac485af82df660aafab05955bf --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V501.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V501.java @@ -0,0 +1,18 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -24771,11 +24771,11 @@ index 0000000000000000000000000000000000000000..a7a4d6446b7765ac485af82df660aafa + + private V501() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V502.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V502.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V502.java b/ca/spottedleaf/dataconverter/minecraft/versions/V502.java new file mode 100644 index 0000000000000000000000000000000000000000..7f88b435378305a3a66e1e54b85afd9b019513ee --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V502.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V502.java @@ -0,0 +1,45 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -24822,11 +24822,11 @@ index 0000000000000000000000000000000000000000..7f88b435378305a3a66e1e54b85afd9b + + private V502() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V505.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V505.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V505.java b/ca/spottedleaf/dataconverter/minecraft/versions/V505.java new file mode 100644 index 0000000000000000000000000000000000000000..3faf2c3265600141003355771f38a7879e0f769a --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V505.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V505.java @@ -0,0 +1,23 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -24851,11 +24851,11 @@ index 0000000000000000000000000000000000000000..3faf2c3265600141003355771f38a787 + + private V505() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V700.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V700.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V700.java b/ca/spottedleaf/dataconverter/minecraft/versions/V700.java new file mode 100644 index 0000000000000000000000000000000000000000..3b65108c6a1ac469bb8f81a933b6475f3ea9f63f --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V700.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V700.java @@ -0,0 +1,32 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -24889,11 +24889,11 @@ index 0000000000000000000000000000000000000000..3b65108c6a1ac469bb8f81a933b6475f + + private V700() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V701.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V701.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V701.java b/ca/spottedleaf/dataconverter/minecraft/versions/V701.java new file mode 100644 index 0000000000000000000000000000000000000000..55f00e218f04e1e095ccc7d62282d87d7eb8f8c7 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V701.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V701.java @@ -0,0 +1,41 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -24936,11 +24936,11 @@ index 0000000000000000000000000000000000000000..55f00e218f04e1e095ccc7d62282d87d + + private V701() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V702.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V702.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V702.java b/ca/spottedleaf/dataconverter/minecraft/versions/V702.java new file mode 100644 index 0000000000000000000000000000000000000000..c0d74b4822be60c637f26b2ef1e172fdf9e89d01 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V702.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V702.java @@ -0,0 +1,56 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -24998,11 +24998,11 @@ index 0000000000000000000000000000000000000000..c0d74b4822be60c637f26b2ef1e172fd + + private V702() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V703.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V703.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V703.java b/ca/spottedleaf/dataconverter/minecraft/versions/V703.java new file mode 100644 index 0000000000000000000000000000000000000000..cc593df4a09d6cb93196d8cfb34ebac43e61ebbe --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V703.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V703.java @@ -0,0 +1,67 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -25071,11 +25071,11 @@ index 0000000000000000000000000000000000000000..cc593df4a09d6cb93196d8cfb34ebac4 + + private V703() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V704.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V704.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V704.java b/ca/spottedleaf/dataconverter/minecraft/versions/V704.java new file mode 100644 index 0000000000000000000000000000000000000000..e6777f58d7d4722cabd30fa495cee054f58b3e48 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V704.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V704.java @@ -0,0 +1,440 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -25517,11 +25517,11 @@ index 0000000000000000000000000000000000000000..e6777f58d7d4722cabd30fa495cee054 + + private V704() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V705.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V705.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V705.java b/ca/spottedleaf/dataconverter/minecraft/versions/V705.java new file mode 100644 index 0000000000000000000000000000000000000000..e0efac6a303d4c9623e03acdf07f89c2cacc9f04 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V705.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V705.java @@ -0,0 +1,221 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -25744,11 +25744,11 @@ index 0000000000000000000000000000000000000000..e0efac6a303d4c9623e03acdf07f89c2 + + private V705() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V804.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V804.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V804.java b/ca/spottedleaf/dataconverter/minecraft/versions/V804.java new file mode 100644 index 0000000000000000000000000000000000000000..81a2006d5e2059df0979c6380a16255767bcd89a --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V804.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V804.java @@ -0,0 +1,59 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -25809,11 +25809,11 @@ index 0000000000000000000000000000000000000000..81a2006d5e2059df0979c6380a162557 + + private V804() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V806.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V806.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V806.java b/ca/spottedleaf/dataconverter/minecraft/versions/V806.java new file mode 100644 index 0000000000000000000000000000000000000000..f4ebe856d03d9837214e9a1c93f1b1e79aa7bb08 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V806.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V806.java @@ -0,0 +1,39 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -25854,11 +25854,11 @@ index 0000000000000000000000000000000000000000..f4ebe856d03d9837214e9a1c93f1b1e7 + + private V806() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V808.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V808.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V808.java b/ca/spottedleaf/dataconverter/minecraft/versions/V808.java new file mode 100644 index 0000000000000000000000000000000000000000..c6b6038255e16bd15873bb7fe596b721fcec365e --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V808.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V808.java @@ -0,0 +1,29 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -25889,11 +25889,11 @@ index 0000000000000000000000000000000000000000..c6b6038255e16bd15873bb7fe596b721 + + private V808() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V813.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V813.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V813.java b/ca/spottedleaf/dataconverter/minecraft/versions/V813.java new file mode 100644 index 0000000000000000000000000000000000000000..68810919e168f36de160033aa659060487d94bd8 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V813.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V813.java @@ -0,0 +1,64 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -25959,11 +25959,11 @@ index 0000000000000000000000000000000000000000..68810919e168f36de160033aa6590604 + + private V813() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V816.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V816.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V816.java b/ca/spottedleaf/dataconverter/minecraft/versions/V816.java new file mode 100644 index 0000000000000000000000000000000000000000..dc9fba23654262b1489e4f8056a7f4b222ab1179 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V816.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V816.java @@ -0,0 +1,27 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -25992,11 +25992,11 @@ index 0000000000000000000000000000000000000000..dc9fba23654262b1489e4f8056a7f4b2 + + private V816() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V820.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V820.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V820.java b/ca/spottedleaf/dataconverter/minecraft/versions/V820.java new file mode 100644 index 0000000000000000000000000000000000000000..0d59cb380e625bb2658216d4a6cb8faebdd147c5 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V820.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V820.java @@ -0,0 +1,21 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -26019,11 +26019,11 @@ index 0000000000000000000000000000000000000000..0d59cb380e625bb2658216d4a6cb8fae + + private V820() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V99.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V99.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V99.java b/ca/spottedleaf/dataconverter/minecraft/versions/V99.java new file mode 100644 index 0000000000000000000000000000000000000000..f0e26849e28ce7ce362927ec81b281e51bd1e591 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V99.java ++++ b/ca/spottedleaf/dataconverter/minecraft/versions/V99.java @@ -0,0 +1,363 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + @@ -26388,11 +26388,11 @@ index 0000000000000000000000000000000000000000..f0e26849e28ce7ce362927ec81b281e5 + + private V99() {} +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/walkers/block_name/DataWalkerBlockNames.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/walkers/block_name/DataWalkerBlockNames.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/walkers/block_name/DataWalkerBlockNames.java b/ca/spottedleaf/dataconverter/minecraft/walkers/block_name/DataWalkerBlockNames.java new file mode 100644 index 0000000000000000000000000000000000000000..930e014858ef635ebe25f7f92dc81ba0eaac50a8 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/walkers/block_name/DataWalkerBlockNames.java ++++ b/ca/spottedleaf/dataconverter/minecraft/walkers/block_name/DataWalkerBlockNames.java @@ -0,0 +1,11 @@ +package ca.spottedleaf.dataconverter.minecraft.walkers.block_name; + @@ -26405,11 +26405,11 @@ index 0000000000000000000000000000000000000000..930e014858ef635ebe25f7f92dc81ba0 + super(MCTypeRegistry.BLOCK_NAME, paths); + } +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/walkers/game_event/GameEventListenerWalker.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/walkers/game_event/GameEventListenerWalker.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/walkers/game_event/GameEventListenerWalker.java b/ca/spottedleaf/dataconverter/minecraft/walkers/game_event/GameEventListenerWalker.java new file mode 100644 index 0000000000000000000000000000000000000000..64fc063748d4839d787a773d2c7258dcffc6bc21 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/walkers/game_event/GameEventListenerWalker.java ++++ b/ca/spottedleaf/dataconverter/minecraft/walkers/game_event/GameEventListenerWalker.java @@ -0,0 +1,26 @@ +package ca.spottedleaf.dataconverter.minecraft.walkers.game_event; + @@ -26437,11 +26437,11 @@ index 0000000000000000000000000000000000000000..64fc063748d4839d787a773d2c7258dc + return null; + } +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/walkers/generic/DataWalkerListPaths.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/walkers/generic/DataWalkerListPaths.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/walkers/generic/DataWalkerListPaths.java b/ca/spottedleaf/dataconverter/minecraft/walkers/generic/DataWalkerListPaths.java new file mode 100644 index 0000000000000000000000000000000000000000..20c8efdb746c9d3b9d87bf991dc44e11e1ea697c --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/walkers/generic/DataWalkerListPaths.java ++++ b/ca/spottedleaf/dataconverter/minecraft/walkers/generic/DataWalkerListPaths.java @@ -0,0 +1,38 @@ +package ca.spottedleaf.dataconverter.minecraft.walkers.generic; + @@ -26481,11 +26481,11 @@ index 0000000000000000000000000000000000000000..20c8efdb746c9d3b9d87bf991dc44e11 + return null; + } +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/walkers/generic/DataWalkerTypePaths.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/walkers/generic/DataWalkerTypePaths.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/walkers/generic/DataWalkerTypePaths.java b/ca/spottedleaf/dataconverter/minecraft/walkers/generic/DataWalkerTypePaths.java new file mode 100644 index 0000000000000000000000000000000000000000..4205546d7b2c4a07d23a017004989875b7beb3c6 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/walkers/generic/DataWalkerTypePaths.java ++++ b/ca/spottedleaf/dataconverter/minecraft/walkers/generic/DataWalkerTypePaths.java @@ -0,0 +1,34 @@ +package ca.spottedleaf.dataconverter.minecraft.walkers.generic; + @@ -26521,11 +26521,11 @@ index 0000000000000000000000000000000000000000..4205546d7b2c4a07d23a017004989875 + return null; + } +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/walkers/generic/WalkerUtils.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/walkers/generic/WalkerUtils.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/walkers/generic/WalkerUtils.java b/ca/spottedleaf/dataconverter/minecraft/walkers/generic/WalkerUtils.java new file mode 100644 index 0000000000000000000000000000000000000000..4feedd9e48c3a85bd75b9c0a3b09c91fa9532a93 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/walkers/generic/WalkerUtils.java ++++ b/ca/spottedleaf/dataconverter/minecraft/walkers/generic/WalkerUtils.java @@ -0,0 +1,183 @@ +package ca.spottedleaf.dataconverter.minecraft.walkers.generic; + @@ -26710,11 +26710,11 @@ index 0000000000000000000000000000000000000000..4feedd9e48c3a85bd75b9c0a3b09c91f + } + } +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/walkers/item_name/DataWalkerItemNames.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/walkers/item_name/DataWalkerItemNames.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/walkers/item_name/DataWalkerItemNames.java b/ca/spottedleaf/dataconverter/minecraft/walkers/item_name/DataWalkerItemNames.java new file mode 100644 index 0000000000000000000000000000000000000000..14e291efd864d97dcf83db01c09b9daaae1949bd --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/walkers/item_name/DataWalkerItemNames.java ++++ b/ca/spottedleaf/dataconverter/minecraft/walkers/item_name/DataWalkerItemNames.java @@ -0,0 +1,11 @@ +package ca.spottedleaf.dataconverter.minecraft.walkers.item_name; + @@ -26727,11 +26727,11 @@ index 0000000000000000000000000000000000000000..14e291efd864d97dcf83db01c09b9daa + super(MCTypeRegistry.ITEM_NAME, paths); + } +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/walkers/itemstack/DataWalkerItemLists.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/walkers/itemstack/DataWalkerItemLists.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/walkers/itemstack/DataWalkerItemLists.java b/ca/spottedleaf/dataconverter/minecraft/walkers/itemstack/DataWalkerItemLists.java new file mode 100644 index 0000000000000000000000000000000000000000..5b4402c3cc4e68e9c591e8bbb4a2542d8e2214d4 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/walkers/itemstack/DataWalkerItemLists.java ++++ b/ca/spottedleaf/dataconverter/minecraft/walkers/itemstack/DataWalkerItemLists.java @@ -0,0 +1,12 @@ +package ca.spottedleaf.dataconverter.minecraft.walkers.itemstack; + @@ -26745,11 +26745,11 @@ index 0000000000000000000000000000000000000000..5b4402c3cc4e68e9c591e8bbb4a2542d + super(MCTypeRegistry.ITEM_STACK, paths); + } +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/walkers/itemstack/DataWalkerItems.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/walkers/itemstack/DataWalkerItems.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/walkers/itemstack/DataWalkerItems.java b/ca/spottedleaf/dataconverter/minecraft/walkers/itemstack/DataWalkerItems.java new file mode 100644 index 0000000000000000000000000000000000000000..04770e8378ac8784895cdfe400a47b0b601c2187 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/walkers/itemstack/DataWalkerItems.java ++++ b/ca/spottedleaf/dataconverter/minecraft/walkers/itemstack/DataWalkerItems.java @@ -0,0 +1,12 @@ +package ca.spottedleaf.dataconverter.minecraft.walkers.itemstack; + @@ -26763,11 +26763,11 @@ index 0000000000000000000000000000000000000000..04770e8378ac8784895cdfe400a47b0b + super(MCTypeRegistry.ITEM_STACK, paths); + } +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/walkers/tile_entity/DataWalkerTileEntities.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/walkers/tile_entity/DataWalkerTileEntities.java +diff --git a/ca/spottedleaf/dataconverter/minecraft/walkers/tile_entity/DataWalkerTileEntities.java b/ca/spottedleaf/dataconverter/minecraft/walkers/tile_entity/DataWalkerTileEntities.java new file mode 100644 index 0000000000000000000000000000000000000000..d9cc21bf41cb4b377752b684f8e59818cd620103 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/walkers/tile_entity/DataWalkerTileEntities.java ++++ b/ca/spottedleaf/dataconverter/minecraft/walkers/tile_entity/DataWalkerTileEntities.java @@ -0,0 +1,12 @@ +package ca.spottedleaf.dataconverter.minecraft.walkers.tile_entity; + @@ -26781,11 +26781,11 @@ index 0000000000000000000000000000000000000000..d9cc21bf41cb4b377752b684f8e59818 + super(MCTypeRegistry.TILE_ENTITY, paths); + } +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/types/ListType.java b/src/main/java/ca/spottedleaf/dataconverter/types/ListType.java +diff --git a/ca/spottedleaf/dataconverter/types/ListType.java b/ca/spottedleaf/dataconverter/types/ListType.java new file mode 100644 index 0000000000000000000000000000000000000000..19f7e95f754e8385bbe60fd2fb7fc95b6a4ebd7c --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/types/ListType.java ++++ b/ca/spottedleaf/dataconverter/types/ListType.java @@ -0,0 +1,272 @@ +package ca.spottedleaf.dataconverter.types; + @@ -27059,11 +27059,11 @@ index 0000000000000000000000000000000000000000..19f7e95f754e8385bbe60fd2fb7fc95b + public void addString(final int index, final String string); + +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/types/MapType.java b/src/main/java/ca/spottedleaf/dataconverter/types/MapType.java +diff --git a/ca/spottedleaf/dataconverter/types/MapType.java b/ca/spottedleaf/dataconverter/types/MapType.java new file mode 100644 index 0000000000000000000000000000000000000000..b8dad91ad3b8692448134c4f12cf9853dc06fccc --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/types/MapType.java ++++ b/ca/spottedleaf/dataconverter/types/MapType.java @@ -0,0 +1,223 @@ +package ca.spottedleaf.dataconverter.types; + @@ -27288,11 +27288,11 @@ index 0000000000000000000000000000000000000000..b8dad91ad3b8692448134c4f12cf9853 + throw new IllegalArgumentException("Object " + value + " is not a valid type!"); + } +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/types/ObjectType.java b/src/main/java/ca/spottedleaf/dataconverter/types/ObjectType.java +diff --git a/ca/spottedleaf/dataconverter/types/ObjectType.java b/ca/spottedleaf/dataconverter/types/ObjectType.java new file mode 100644 index 0000000000000000000000000000000000000000..1aab91233ddb98c3af5d424bac120891f1ee16c7 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/types/ObjectType.java ++++ b/ca/spottedleaf/dataconverter/types/ObjectType.java @@ -0,0 +1,72 @@ +package ca.spottedleaf.dataconverter.types; + @@ -27366,11 +27366,11 @@ index 0000000000000000000000000000000000000000..1aab91233ddb98c3af5d424bac120891 + return null; + } +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/types/TypeUtil.java b/src/main/java/ca/spottedleaf/dataconverter/types/TypeUtil.java +diff --git a/ca/spottedleaf/dataconverter/types/TypeUtil.java b/ca/spottedleaf/dataconverter/types/TypeUtil.java new file mode 100644 index 0000000000000000000000000000000000000000..156a2ea46f8f88a02e88b50d7bb7be82ecd41919 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/types/TypeUtil.java ++++ b/ca/spottedleaf/dataconverter/types/TypeUtil.java @@ -0,0 +1,9 @@ +package ca.spottedleaf.dataconverter.types; + @@ -27381,11 +27381,11 @@ index 0000000000000000000000000000000000000000..156a2ea46f8f88a02e88b50d7bb7be82 + public <K> MapType<K> createEmptyMap(); + +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/types/Types.java b/src/main/java/ca/spottedleaf/dataconverter/types/Types.java +diff --git a/ca/spottedleaf/dataconverter/types/Types.java b/ca/spottedleaf/dataconverter/types/Types.java new file mode 100644 index 0000000000000000000000000000000000000000..2ab9e3b579f20c9a189518496c522155630a36c4 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/types/Types.java ++++ b/ca/spottedleaf/dataconverter/types/Types.java @@ -0,0 +1,15 @@ +package ca.spottedleaf.dataconverter.types; + @@ -27402,11 +27402,11 @@ index 0000000000000000000000000000000000000000..2ab9e3b579f20c9a189518496c522155 + // why does this exist + public static final TypeUtil JSON_COMPRESSED = new JsonTypeCompressedUtil(); +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/types/json/JsonListType.java b/src/main/java/ca/spottedleaf/dataconverter/types/json/JsonListType.java +diff --git a/ca/spottedleaf/dataconverter/types/json/JsonListType.java b/ca/spottedleaf/dataconverter/types/json/JsonListType.java new file mode 100644 index 0000000000000000000000000000000000000000..f6f57cb3a215876976b5eecae810b8b20925f2e2 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/types/json/JsonListType.java ++++ b/ca/spottedleaf/dataconverter/types/json/JsonListType.java @@ -0,0 +1,415 @@ +package ca.spottedleaf.dataconverter.types.json; + @@ -27823,11 +27823,11 @@ index 0000000000000000000000000000000000000000..f6f57cb3a215876976b5eecae810b8b2 + throw new UnsupportedOperationException(); + } +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/types/json/JsonMapType.java b/src/main/java/ca/spottedleaf/dataconverter/types/json/JsonMapType.java +diff --git a/ca/spottedleaf/dataconverter/types/json/JsonMapType.java b/ca/spottedleaf/dataconverter/types/json/JsonMapType.java new file mode 100644 index 0000000000000000000000000000000000000000..b6ad4623894454675f4be52ecdb4655d6623b385 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/types/json/JsonMapType.java ++++ b/ca/spottedleaf/dataconverter/types/json/JsonMapType.java @@ -0,0 +1,474 @@ +package ca.spottedleaf.dataconverter.types.json; + @@ -28303,11 +28303,11 @@ index 0000000000000000000000000000000000000000..b6ad4623894454675f4be52ecdb4655d + this.map.addProperty(key, val); + } +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/types/json/JsonTypeCompressedUtil.java b/src/main/java/ca/spottedleaf/dataconverter/types/json/JsonTypeCompressedUtil.java +diff --git a/ca/spottedleaf/dataconverter/types/json/JsonTypeCompressedUtil.java b/ca/spottedleaf/dataconverter/types/json/JsonTypeCompressedUtil.java new file mode 100644 index 0000000000000000000000000000000000000000..9c3093b66b847b5248bde923243fce78842bf67f --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/types/json/JsonTypeCompressedUtil.java ++++ b/ca/spottedleaf/dataconverter/types/json/JsonTypeCompressedUtil.java @@ -0,0 +1,18 @@ +package ca.spottedleaf.dataconverter.types.json; + @@ -28327,11 +28327,11 @@ index 0000000000000000000000000000000000000000..9c3093b66b847b5248bde923243fce78 + return new JsonMapType(true); + } +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/types/json/JsonTypeUtil.java b/src/main/java/ca/spottedleaf/dataconverter/types/json/JsonTypeUtil.java +diff --git a/ca/spottedleaf/dataconverter/types/json/JsonTypeUtil.java b/ca/spottedleaf/dataconverter/types/json/JsonTypeUtil.java new file mode 100644 index 0000000000000000000000000000000000000000..9410ae68395a09c7710bdbb2ccc6acf6633cad23 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/types/json/JsonTypeUtil.java ++++ b/ca/spottedleaf/dataconverter/types/json/JsonTypeUtil.java @@ -0,0 +1,81 @@ +package ca.spottedleaf.dataconverter.types.json; + @@ -28414,11 +28414,11 @@ index 0000000000000000000000000000000000000000..9410ae68395a09c7710bdbb2ccc6acf6 + return ret; + } +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/types/nbt/NBTListType.java b/src/main/java/ca/spottedleaf/dataconverter/types/nbt/NBTListType.java +diff --git a/ca/spottedleaf/dataconverter/types/nbt/NBTListType.java b/ca/spottedleaf/dataconverter/types/nbt/NBTListType.java new file mode 100644 index 0000000000000000000000000000000000000000..bf4e9ea17222cfa8f7cee9e46775302c9c2e6328 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/types/nbt/NBTListType.java ++++ b/ca/spottedleaf/dataconverter/types/nbt/NBTListType.java @@ -0,0 +1,440 @@ +package ca.spottedleaf.dataconverter.types.nbt; + @@ -28860,11 +28860,11 @@ index 0000000000000000000000000000000000000000..bf4e9ea17222cfa8f7cee9e46775302c + this.list.add(index, StringTag.valueOf(string)); + } +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/types/nbt/NBTMapType.java b/src/main/java/ca/spottedleaf/dataconverter/types/nbt/NBTMapType.java +diff --git a/ca/spottedleaf/dataconverter/types/nbt/NBTMapType.java b/ca/spottedleaf/dataconverter/types/nbt/NBTMapType.java new file mode 100644 index 0000000000000000000000000000000000000000..01b6796c6ac168a82f41cf4fddbd32a1c8a86484 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/types/nbt/NBTMapType.java ++++ b/ca/spottedleaf/dataconverter/types/nbt/NBTMapType.java @@ -0,0 +1,454 @@ +package ca.spottedleaf.dataconverter.types.nbt; + @@ -29320,11 +29320,11 @@ index 0000000000000000000000000000000000000000..01b6796c6ac168a82f41cf4fddbd32a1 + this.map.putString(key, val); + } +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/types/nbt/NBTTypeUtil.java b/src/main/java/ca/spottedleaf/dataconverter/types/nbt/NBTTypeUtil.java +diff --git a/ca/spottedleaf/dataconverter/types/nbt/NBTTypeUtil.java b/ca/spottedleaf/dataconverter/types/nbt/NBTTypeUtil.java new file mode 100644 index 0000000000000000000000000000000000000000..62c0f4073aff301bf5b3187e0d4446fd8d0ac475 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/types/nbt/NBTTypeUtil.java ++++ b/ca/spottedleaf/dataconverter/types/nbt/NBTTypeUtil.java @@ -0,0 +1,18 @@ +package ca.spottedleaf.dataconverter.types.nbt; + @@ -29344,11 +29344,11 @@ index 0000000000000000000000000000000000000000..62c0f4073aff301bf5b3187e0d4446fd + return new NBTMapType(); + } +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/util/CommandArgumentUpgrader.java b/src/main/java/ca/spottedleaf/dataconverter/util/CommandArgumentUpgrader.java +diff --git a/ca/spottedleaf/dataconverter/util/CommandArgumentUpgrader.java b/ca/spottedleaf/dataconverter/util/CommandArgumentUpgrader.java new file mode 100644 index 0000000000000000000000000000000000000000..40da70d5cf584a9730f9fe81c355cf8513fba475 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/util/CommandArgumentUpgrader.java ++++ b/ca/spottedleaf/dataconverter/util/CommandArgumentUpgrader.java @@ -0,0 +1,592 @@ +package ca.spottedleaf.dataconverter.util; + @@ -29942,11 +29942,11 @@ index 0000000000000000000000000000000000000000..40da70d5cf584a9730f9fe81c355cf85 + ); + } +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/util/Int2IntArraySortedMap.java b/src/main/java/ca/spottedleaf/dataconverter/util/Int2IntArraySortedMap.java +diff --git a/ca/spottedleaf/dataconverter/util/Int2IntArraySortedMap.java b/ca/spottedleaf/dataconverter/util/Int2IntArraySortedMap.java new file mode 100644 index 0000000000000000000000000000000000000000..6596de3d9ebae583c252aa061f0cfdf8778ea1a5 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/util/Int2IntArraySortedMap.java ++++ b/ca/spottedleaf/dataconverter/util/Int2IntArraySortedMap.java @@ -0,0 +1,77 @@ +package ca.spottedleaf.dataconverter.util; + @@ -30025,11 +30025,11 @@ index 0000000000000000000000000000000000000000..6596de3d9ebae583c252aa061f0cfdf8 + return this.val[index]; + } +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/util/Int2ObjectArraySortedMap.java b/src/main/java/ca/spottedleaf/dataconverter/util/Int2ObjectArraySortedMap.java +diff --git a/ca/spottedleaf/dataconverter/util/Int2ObjectArraySortedMap.java b/ca/spottedleaf/dataconverter/util/Int2ObjectArraySortedMap.java new file mode 100644 index 0000000000000000000000000000000000000000..de9d632489609136c712a9adaee941fd38fad440 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/util/Int2ObjectArraySortedMap.java ++++ b/ca/spottedleaf/dataconverter/util/Int2ObjectArraySortedMap.java @@ -0,0 +1,74 @@ +package ca.spottedleaf.dataconverter.util; + @@ -30105,11 +30105,11 @@ index 0000000000000000000000000000000000000000..de9d632489609136c712a9adaee941fd + return this.val[index]; + } +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/util/IntegerUtil.java b/src/main/java/ca/spottedleaf/dataconverter/util/IntegerUtil.java +diff --git a/ca/spottedleaf/dataconverter/util/IntegerUtil.java b/ca/spottedleaf/dataconverter/util/IntegerUtil.java new file mode 100644 index 0000000000000000000000000000000000000000..4bbf38c812feeb30d2aa5f3fcf482bfcbed79d05 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/util/IntegerUtil.java ++++ b/ca/spottedleaf/dataconverter/util/IntegerUtil.java @@ -0,0 +1,239 @@ +package ca.spottedleaf.dataconverter.util; + @@ -30350,11 +30350,11 @@ index 0000000000000000000000000000000000000000..4bbf38c812feeb30d2aa5f3fcf482bfc + throw new RuntimeException(); + } +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/util/Long2IntArraySortedMap.java b/src/main/java/ca/spottedleaf/dataconverter/util/Long2IntArraySortedMap.java +diff --git a/ca/spottedleaf/dataconverter/util/Long2IntArraySortedMap.java b/ca/spottedleaf/dataconverter/util/Long2IntArraySortedMap.java new file mode 100644 index 0000000000000000000000000000000000000000..94705bb141b550589faa9a0408402d8636c61907 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/util/Long2IntArraySortedMap.java ++++ b/ca/spottedleaf/dataconverter/util/Long2IntArraySortedMap.java @@ -0,0 +1,76 @@ +package ca.spottedleaf.dataconverter.util; + @@ -30432,11 +30432,11 @@ index 0000000000000000000000000000000000000000..94705bb141b550589faa9a0408402d86 + return this.val[index]; + } +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/util/Long2ObjectArraySortedMap.java b/src/main/java/ca/spottedleaf/dataconverter/util/Long2ObjectArraySortedMap.java +diff --git a/ca/spottedleaf/dataconverter/util/Long2ObjectArraySortedMap.java b/ca/spottedleaf/dataconverter/util/Long2ObjectArraySortedMap.java new file mode 100644 index 0000000000000000000000000000000000000000..6f634c8825589a23f46ad7b54354475c9a95bd1b --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/util/Long2ObjectArraySortedMap.java ++++ b/ca/spottedleaf/dataconverter/util/Long2ObjectArraySortedMap.java @@ -0,0 +1,76 @@ +package ca.spottedleaf.dataconverter.util; + @@ -30514,11 +30514,11 @@ index 0000000000000000000000000000000000000000..6f634c8825589a23f46ad7b54354475c + return this.val[index]; + } +} -diff --git a/src/main/java/ca/spottedleaf/dataconverter/util/NamespaceUtil.java b/src/main/java/ca/spottedleaf/dataconverter/util/NamespaceUtil.java +diff --git a/ca/spottedleaf/dataconverter/util/NamespaceUtil.java b/ca/spottedleaf/dataconverter/util/NamespaceUtil.java new file mode 100644 index 0000000000000000000000000000000000000000..5a6536377c9c1e1753e930ff2a6bb98ea57055c7 --- /dev/null -+++ b/src/main/java/ca/spottedleaf/dataconverter/util/NamespaceUtil.java ++++ b/ca/spottedleaf/dataconverter/util/NamespaceUtil.java @@ -0,0 +1,39 @@ +package ca.spottedleaf.dataconverter.util; + @@ -30559,10 +30559,10 @@ index 0000000000000000000000000000000000000000..5a6536377c9c1e1753e930ff2a6bb98e + return correct.equals(value) ? null : correct; + } +} -diff --git a/src/main/java/ca/spottedleaf/moonrise/paper/PaperHooks.java b/src/main/java/ca/spottedleaf/moonrise/paper/PaperHooks.java +diff --git a/ca/spottedleaf/moonrise/paper/PaperHooks.java b/ca/spottedleaf/moonrise/paper/PaperHooks.java index 834c5ce238c7adb0164a6282582d709348ef96cc..11cfe9cc29666ce3a6a40281069fb9eb4fa0ded2 100644 ---- a/src/main/java/ca/spottedleaf/moonrise/paper/PaperHooks.java -+++ b/src/main/java/ca/spottedleaf/moonrise/paper/PaperHooks.java +--- a/ca/spottedleaf/moonrise/paper/PaperHooks.java ++++ b/ca/spottedleaf/moonrise/paper/PaperHooks.java @@ -203,6 +203,43 @@ public final class PaperHooks implements PlatformHooks { @Override public CompoundTag convertNBT(final DSL.TypeReference type, final DataFixer dataFixer, final CompoundTag nbt, @@ -30607,68 +30607,68 @@ index 834c5ce238c7adb0164a6282582d709348ef96cc..11cfe9cc29666ce3a6a40281069fb9eb return (CompoundTag)dataFixer.update( type, new Dynamic<>(NbtOps.INSTANCE, nbt), fromVersion, toVersion ).getValue(); -diff --git a/src/main/java/net/minecraft/data/structures/StructureUpdater.java b/src/main/java/net/minecraft/data/structures/StructureUpdater.java -index 96aea6d8cb68dd033c31cbde9d73ee490f320501..c51d71dd24cd28c22cda83cc3128c414ebd71a54 100644 ---- a/src/main/java/net/minecraft/data/structures/StructureUpdater.java -+++ b/src/main/java/net/minecraft/data/structures/StructureUpdater.java +diff --git a/net/minecraft/data/structures/StructureUpdater.java b/net/minecraft/data/structures/StructureUpdater.java +index 1110ca4075a1bbaa46b66686435dab91b275c945..c2218630c3074c8b3f82364e37503b12bd0a0d74 100644 +--- a/net/minecraft/data/structures/StructureUpdater.java ++++ b/net/minecraft/data/structures/StructureUpdater.java @@ -27,7 +27,7 @@ public class StructureUpdater implements SnbtToNbt.Filter { - LOGGER.warn("SNBT Too old, do not forget to update: {} < {}: {}", i, 4173, name); + LOGGER.warn("SNBT Too old, do not forget to update: {} < {}: {}", dataVersion, 4173, structureLocationPath); } -- CompoundTag compoundTag = DataFixTypes.STRUCTURE.updateToCurrentVersion(DataFixers.getDataFixer(), nbt, i); -+ CompoundTag compoundTag = ca.spottedleaf.dataconverter.minecraft.MCDataConverter.convertTag(ca.spottedleaf.dataconverter.minecraft.datatypes.MCTypeRegistry.STRUCTURE, nbt, i, net.minecraft.SharedConstants.getCurrentVersion().getDataVersion().getVersion()); // Paper +- CompoundTag compoundTag = DataFixTypes.STRUCTURE.updateToCurrentVersion(DataFixers.getDataFixer(), tag, dataVersion); ++ CompoundTag compoundTag = ca.spottedleaf.dataconverter.minecraft.MCDataConverter.convertTag(ca.spottedleaf.dataconverter.minecraft.datatypes.MCTypeRegistry.STRUCTURE, tag, dataVersion, net.minecraft.SharedConstants.getCurrentVersion().getDataVersion().getVersion()); // Paper structureTemplate.load(BuiltInRegistries.BLOCK, compoundTag); return structureTemplate.save(new CompoundTag()); } -diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index ccbd76a7d1a3c29759aec86c5780cab6d244915d..807d05097f7313361eadb600187421d25e294413 100644 ---- a/src/main/java/net/minecraft/server/MinecraftServer.java -+++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -331,6 +331,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa +diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java +index d450d4af96716caff4b29a84d1d83ec4010854f0..646c2f2b617ed706021c83c9fc4492860dfdd4e9 100644 +--- a/net/minecraft/server/MinecraftServer.java ++++ b/net/minecraft/server/MinecraftServer.java +@@ -301,6 +301,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa private final Set<String> pluginsBlockingSleep = new java.util.HashSet<>(); // Paper - API to allow/disallow tick sleeping - public static <S extends MinecraftServer> S spin(Function<Thread, S> serverFactory) { + public static <S extends MinecraftServer> S spin(Function<Thread, S> threadFunction) { + ca.spottedleaf.dataconverter.minecraft.datatypes.MCTypeRegistry.init(); // Paper - rewrite data converter system - AtomicReference<S> atomicreference = new AtomicReference(); - Thread thread = new Thread(() -> { - ((MinecraftServer) atomicreference.get()).runServer(); -diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkStorage.java -index 7d5e2e6e96ea9017334dddade54a9dcb37518642..092f7b6bba4e1291f76c2c09155f33803e93eb04 100644 ---- a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkStorage.java -+++ b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkStorage.java -@@ -86,7 +86,7 @@ public class ChunkStorage implements AutoCloseable { + AtomicReference<S> atomicReference = new AtomicReference<>(); + Thread thread = new ca.spottedleaf.moonrise.common.util.TickThread(() -> atomicReference.get().runServer(), "Server thread"); + thread.setUncaughtExceptionHandler((thread1, exception) -> LOGGER.error("Uncaught exception in server thread", exception)); +diff --git a/net/minecraft/world/level/chunk/storage/ChunkStorage.java b/net/minecraft/world/level/chunk/storage/ChunkStorage.java +index 1b931e68634e72c3465a99aa29aa53009163046b..80bc7ad9ad076968d06279dedd845d5946cf2501 100644 +--- a/net/minecraft/world/level/chunk/storage/ChunkStorage.java ++++ b/net/minecraft/world/level/chunk/storage/ChunkStorage.java +@@ -85,7 +85,7 @@ public class ChunkStorage implements AutoCloseable { } else { try { // CraftBukkit start -- if (i < 1466) { -+ if (false && i < 1466) { // Paper - no longer needed, data converter system / DFU handles it now - CompoundTag level = nbttagcompound.getCompound("Level"); +- if (version < 1466) { ++ if (false && version < 1466) { // Paper - no longer needed, data converter system / DFU handles it now + CompoundTag level = chunkData.getCompound("Level"); if (level.getBoolean("TerrainPopulated") && !level.getBoolean("LightPopulated")) { - ServerChunkCache cps = (generatoraccess == null) ? null : ((ServerLevel) generatoraccess).getChunkSource(); -@@ -98,7 +98,7 @@ public class ChunkStorage implements AutoCloseable { + net.minecraft.server.level.ServerChunkCache cps = (generatoraccess == null) ? null : ((net.minecraft.server.level.ServerLevel) generatoraccess).getChunkSource(); +@@ -96,7 +96,7 @@ public class ChunkStorage implements AutoCloseable { + } // CraftBukkit end - - if (i < 1493) { -- nbttagcompound = DataFixTypes.CHUNK.update(this.fixerUpper, nbttagcompound, i, 1493); -+ nbttagcompound = ca.spottedleaf.dataconverter.minecraft.MCDataConverter.convertTag(ca.spottedleaf.dataconverter.minecraft.datatypes.MCTypeRegistry.CHUNK, nbttagcompound, i, 1493); // Paper - replace chunk converter - if (nbttagcompound.getCompound("Level").getBoolean("hasLegacyStructureData")) { - LegacyStructureDataHandler persistentstructurelegacy = this.getLegacyStructureHandler(resourcekey, supplier); - -@@ -116,7 +116,7 @@ public class ChunkStorage implements AutoCloseable { + if (version < 1493) { +- chunkData = DataFixTypes.CHUNK.update(this.fixerUpper, chunkData, version, 1493); ++ chunkData = ca.spottedleaf.dataconverter.minecraft.MCDataConverter.convertTag(ca.spottedleaf.dataconverter.minecraft.datatypes.MCTypeRegistry.CHUNK, chunkData, version, 1493); // Paper - replace chunk converter + if (chunkData.getCompound("Level").getBoolean("hasLegacyStructureData")) { + LegacyStructureDataHandler legacyStructureHandler = this.getLegacyStructureHandler(levelKey, storage); + chunkData = legacyStructureHandler.updateFromLegacy(chunkData); +@@ -113,7 +113,7 @@ public class ChunkStorage implements AutoCloseable { // Spigot end - ChunkStorage.injectDatafixingContext(nbttagcompound, resourcekey, optional); -- nbttagcompound = DataFixTypes.CHUNK.updateToCurrentVersion(this.fixerUpper, nbttagcompound, Math.max(1493, i)); -+ nbttagcompound = ca.spottedleaf.dataconverter.minecraft.MCDataConverter.convertTag(ca.spottedleaf.dataconverter.minecraft.datatypes.MCTypeRegistry.CHUNK, nbttagcompound, Math.max(1493, i), SharedConstants.getCurrentVersion().getDataVersion().getVersion()); // Paper - replace chunk converter + injectDatafixingContext(chunkData, levelKey, chunkGeneratorKey); +- chunkData = DataFixTypes.CHUNK.updateToCurrentVersion(this.fixerUpper, chunkData, Math.max(1493, version)); ++ chunkData = ca.spottedleaf.dataconverter.minecraft.MCDataConverter.convertTag(ca.spottedleaf.dataconverter.minecraft.datatypes.MCTypeRegistry.CHUNK, chunkData, Math.max(1493, version), SharedConstants.getCurrentVersion().getDataVersion().getVersion()); // Paper - replace chunk converter // Spigot start if (stopBelowZero) { - nbttagcompound.putString("Status", net.minecraft.core.registries.BuiltInRegistries.CHUNK_STATUS.getKey(ChunkStatus.SPAWN).toString()); -diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/SimpleRegionStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/SimpleRegionStorage.java -index e0e843f4f69013379ed70cb63d9b4f72163b828b..578d270d5b7efb9ac8f5dde539170f6021e2b786 100644 ---- a/src/main/java/net/minecraft/world/level/chunk/storage/SimpleRegionStorage.java -+++ b/src/main/java/net/minecraft/world/level/chunk/storage/SimpleRegionStorage.java + chunkData.putString("Status", net.minecraft.core.registries.BuiltInRegistries.CHUNK_STATUS.getKey(net.minecraft.world.level.chunk.status.ChunkStatus.SPAWN).toString()); +diff --git a/net/minecraft/world/level/chunk/storage/SimpleRegionStorage.java b/net/minecraft/world/level/chunk/storage/SimpleRegionStorage.java +index 6be673172548c1382c7402ec4e1ec6ef51f702d3..41ddaceb7485626b1f2ee258c2142eb3114c106e 100644 +--- a/net/minecraft/world/level/chunk/storage/SimpleRegionStorage.java ++++ b/net/minecraft/world/level/chunk/storage/SimpleRegionStorage.java @@ -32,13 +32,30 @@ public class SimpleRegionStorage implements AutoCloseable { - return this.worker.store(pos, nbt); + return this.worker.store(chunkPos, data); } + // Paper start - rewrite data conversion system @@ -30683,122 +30683,73 @@ index e0e843f4f69013379ed70cb63d9b4f72163b828b..578d270d5b7efb9ac8f5dde539170f60 + } + // Paper end - rewrite data conversion system + - public CompoundTag upgradeChunkTag(CompoundTag nbt, int oldVersion) { -- int i = NbtUtils.getDataVersion(nbt, oldVersion); -- return this.dataFixType.updateToCurrentVersion(this.fixerUpper, nbt, i); + public CompoundTag upgradeChunkTag(CompoundTag tag, int version) { +- int dataVersion = NbtUtils.getDataVersion(tag, version); +- return this.dataFixType.updateToCurrentVersion(this.fixerUpper, tag, dataVersion); + // Paper start - rewrite data conversion system -+ final int dataVer = NbtUtils.getDataVersion(nbt, oldVersion); -+ return ca.spottedleaf.dataconverter.minecraft.MCDataConverter.convertTag(this.getDataConverterType(), nbt, dataVer, net.minecraft.SharedConstants.getCurrentVersion().getDataVersion().getVersion()); ++ final int dataVer = NbtUtils.getDataVersion(tag, version); ++ return ca.spottedleaf.dataconverter.minecraft.MCDataConverter.convertTag(this.getDataConverterType(), tag, dataVer, net.minecraft.SharedConstants.getCurrentVersion().getDataVersion().getVersion()); + // Paper end - rewrite data conversion system } - public Dynamic<Tag> upgradeChunkTag(Dynamic<Tag> nbt, int oldVersion) { -- return this.dataFixType.updateToCurrentVersion(this.fixerUpper, nbt, oldVersion); + public Dynamic<Tag> upgradeChunkTag(Dynamic<Tag> tag, int version) { +- return this.dataFixType.updateToCurrentVersion(this.fixerUpper, tag, version); + // Paper start - rewrite data conversion system -+ final CompoundTag converted = ca.spottedleaf.dataconverter.minecraft.MCDataConverter.convertTag(this.getDataConverterType(), (CompoundTag)nbt.getValue(), oldVersion, net.minecraft.SharedConstants.getCurrentVersion().getDataVersion().getVersion()); -+ return new Dynamic<>(net.minecraft.nbt.NbtOps.INSTANCE, converted); ++ final CompoundTag converted = ca.spottedleaf.dataconverter.minecraft.MCDataConverter.convertTag(this.getDataConverterType(), (CompoundTag)tag.getValue(), version, net.minecraft.SharedConstants.getCurrentVersion().getDataVersion().getVersion()); ++ return new Dynamic<>(tag.getOps(), converted); + // Paper end - rewrite data conversion system } - public CompletableFuture<Void> synchronize(boolean sync) { -diff --git a/src/main/java/net/minecraft/world/level/levelgen/structure/StructureCheck.java b/src/main/java/net/minecraft/world/level/levelgen/structure/StructureCheck.java -index 5f354b333a39b873915bedd57b647355ae5bdf56..c3586281c9594769593a6027ea0a78f7c76c0262 100644 ---- a/src/main/java/net/minecraft/world/level/levelgen/structure/StructureCheck.java -+++ b/src/main/java/net/minecraft/world/level/levelgen/structure/StructureCheck.java + public CompletableFuture<Void> synchronize(boolean flushStorage) { +diff --git a/net/minecraft/world/level/levelgen/structure/StructureCheck.java b/net/minecraft/world/level/levelgen/structure/StructureCheck.java +index b348d06b261b23eef02c7b14b3010669de9a1b7e..06b54c0bec4031689d5c2da5cfea4ef28dbd16bc 100644 +--- a/net/minecraft/world/level/levelgen/structure/StructureCheck.java ++++ b/net/minecraft/world/level/levelgen/structure/StructureCheck.java @@ -151,7 +151,7 @@ public class StructureCheck { - CompoundTag compoundTag2; + CompoundTag compoundTag1; try { -- compoundTag2 = DataFixTypes.CHUNK.updateToCurrentVersion(this.fixerUpper, compoundTag, i); -+ compoundTag2 = ca.spottedleaf.dataconverter.minecraft.MCDataConverter.convertTag(ca.spottedleaf.dataconverter.minecraft.datatypes.MCTypeRegistry.CHUNK, compoundTag, i, net.minecraft.SharedConstants.getCurrentVersion().getDataVersion().getVersion()); // Paper - replace chunk converter +- compoundTag1 = DataFixTypes.CHUNK.updateToCurrentVersion(this.fixerUpper, compoundTag, version); ++ compoundTag1 = ca.spottedleaf.dataconverter.minecraft.MCDataConverter.convertTag(ca.spottedleaf.dataconverter.minecraft.datatypes.MCTypeRegistry.CHUNK, compoundTag, version, net.minecraft.SharedConstants.getCurrentVersion().getDataVersion().getVersion()); // Paper - replace chunk converter } catch (Exception var12) { - LOGGER.warn("Failed to partially datafix chunk {}", pos, var12); + LOGGER.warn("Failed to partially datafix chunk {}", chunkPos, var12); return StructureCheckResult.CHUNK_LOAD_NEEDED; -diff --git a/src/main/java/net/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplateManager.java b/src/main/java/net/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplateManager.java -index 05a76f9d18638f10218161450470f07524b723ac..3ab22c384bb8a7772d389977a61d0e28975fdb79 100644 ---- a/src/main/java/net/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplateManager.java -+++ b/src/main/java/net/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplateManager.java +diff --git a/net/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplateManager.java b/net/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplateManager.java +index 408ba448c2f127e27e30bfcc6f35f0bdcf86d298..80533af16a59e9ad7e38d1c37b213529a4ecf5b8 100644 +--- a/net/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplateManager.java ++++ b/net/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplateManager.java @@ -245,7 +245,7 @@ public class StructureTemplateManager { public StructureTemplate readStructure(CompoundTag nbt) { StructureTemplate structureTemplate = new StructureTemplate(); - int i = NbtUtils.getDataVersion(nbt, 500); -- structureTemplate.load(this.blockLookup, DataFixTypes.STRUCTURE.updateToCurrentVersion(this.fixerUpper, nbt, i)); -+ structureTemplate.load(this.blockLookup, ca.spottedleaf.dataconverter.minecraft.MCDataConverter.convertTag(ca.spottedleaf.dataconverter.minecraft.datatypes.MCTypeRegistry.STRUCTURE, nbt, i, SharedConstants.getCurrentVersion().getDataVersion().getVersion())); // Paper + int dataVersion = NbtUtils.getDataVersion(nbt, 500); +- structureTemplate.load(this.blockLookup, DataFixTypes.STRUCTURE.updateToCurrentVersion(this.fixerUpper, nbt, dataVersion)); ++ structureTemplate.load(this.blockLookup, ca.spottedleaf.dataconverter.minecraft.MCDataConverter.convertTag(ca.spottedleaf.dataconverter.minecraft.datatypes.MCTypeRegistry.STRUCTURE, nbt, dataVersion, SharedConstants.getCurrentVersion().getDataVersion().getVersion())); // Paper - rewrite data conversion system return structureTemplate; } -diff --git a/src/main/java/net/minecraft/world/level/storage/LevelStorageSource.java b/src/main/java/net/minecraft/world/level/storage/LevelStorageSource.java -index 79397b3c76e4b9d2ee03dfa16c2daf4f71ae8b4d..cdca5ae69991cc068bfbc0686b5defb3604a5440 100644 ---- a/src/main/java/net/minecraft/world/level/storage/LevelStorageSource.java -+++ b/src/main/java/net/minecraft/world/level/storage/LevelStorageSource.java -@@ -277,12 +277,21 @@ public class LevelStorageSource { - static Dynamic<?> readLevelDataTagFixed(Path path, DataFixer dataFixer) throws IOException { - CompoundTag nbttagcompound = LevelStorageSource.readLevelDataTagRaw(path); - CompoundTag nbttagcompound1 = nbttagcompound.getCompound("Data"); -- int i = NbtUtils.getDataVersion(nbttagcompound1, -1); -+ int i = NbtUtils.getDataVersion(nbttagcompound1, -1); final int version = i; // Paper - obfuscation helpers - Dynamic<?> dynamic = DataFixTypes.LEVEL.updateToCurrentVersion(dataFixer, new Dynamic(NbtOps.INSTANCE, nbttagcompound1), i); - -+ // Paper start - replace data conversion system - dynamic = dynamic.update("Player", (dynamic1) -> { -- return DataFixTypes.PLAYER.updateToCurrentVersion(dataFixer, dynamic1, i); -+ return new Dynamic<>( -+ NbtOps.INSTANCE, -+ ca.spottedleaf.dataconverter.minecraft.MCDataConverter.convertTag( -+ ca.spottedleaf.dataconverter.minecraft.datatypes.MCTypeRegistry.PLAYER, -+ (net.minecraft.nbt.CompoundTag)dynamic1.getValue(), -+ version, net.minecraft.SharedConstants.getCurrentVersion().getDataVersion().getVersion() -+ ) -+ ); - }); -+ // Paper end - replace data conversion system - dynamic = dynamic.update("WorldGenSettings", (dynamic1) -> { - return DataFixTypes.WORLD_GEN_SETTINGS.updateToCurrentVersion(dataFixer, dynamic1, i); - }); -diff --git a/src/main/java/net/minecraft/world/level/storage/PlayerDataStorage.java b/src/main/java/net/minecraft/world/level/storage/PlayerDataStorage.java -index b54a3741cd3ba615c83c98985cb4b3c4c586ed7a..b148cf247acdd36f856d0495cde4cc5ad32b5a2f 100644 ---- a/src/main/java/net/minecraft/world/level/storage/PlayerDataStorage.java -+++ b/src/main/java/net/minecraft/world/level/storage/PlayerDataStorage.java -@@ -137,7 +137,7 @@ public class PlayerDataStorage { - }).map((nbttagcompound) -> { - int i = NbtUtils.getDataVersion(nbttagcompound, -1); - -- nbttagcompound = DataFixTypes.PLAYER.updateToCurrentVersion(this.fixerUpper, nbttagcompound, i); -+ nbttagcompound = ca.spottedleaf.dataconverter.minecraft.MCDataConverter.convertTag(ca.spottedleaf.dataconverter.minecraft.datatypes.MCTypeRegistry.PLAYER, nbttagcompound, i, net.minecraft.SharedConstants.getCurrentVersion().getDataVersion().getVersion()); // Paper - rewrite data conversion system - // entityhuman.load(nbttagcompound); // CraftBukkit - handled above - return nbttagcompound; - }); -diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index 0e8f4710c0ce05e8cd42cbbc9fedc05bf8585a19..15892c7769caa15f3d52a1ee2147cf9615aa0e25 100644 ---- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -@@ -523,7 +523,7 @@ public final class CraftMagicNumbers implements UnsafeValues { - - net.minecraft.nbt.CompoundTag compound = deserializeNbtFromBytes(data); - final int dataVersion = compound.getInt("DataVersion"); -- compound = (net.minecraft.nbt.CompoundTag) MinecraftServer.getServer().fixerUpper.update(References.ITEM_STACK, new Dynamic<>(NbtOps.INSTANCE, compound), dataVersion, this.getDataVersion()).getValue(); -+ compound = ca.spottedleaf.dataconverter.minecraft.MCDataConverter.convertTag(ca.spottedleaf.dataconverter.minecraft.datatypes.MCTypeRegistry.ITEM_STACK, compound, dataVersion, this.getDataVersion()); // Paper - replace data conversion system - return CraftItemStack.asCraftMirror(net.minecraft.world.item.ItemStack.parse(MinecraftServer.getServer().registryAccess(), compound).orElseThrow()); +diff --git a/net/minecraft/world/level/storage/LevelStorageSource.java b/net/minecraft/world/level/storage/LevelStorageSource.java +index ed6ea17e9cf3498591f2acd232a48107564b774b..117e8a155937ed5312d544b6de748206c255c84f 100644 +--- a/net/minecraft/world/level/storage/LevelStorageSource.java ++++ b/net/minecraft/world/level/storage/LevelStorageSource.java +@@ -227,7 +227,7 @@ public class LevelStorageSource { + CompoundTag compound = levelDataTagRaw.getCompound("Data"); + int dataVersion = NbtUtils.getDataVersion(compound, -1); + Dynamic<?> dynamic = DataFixTypes.LEVEL.updateToCurrentVersion(dataFixer, new Dynamic<>(NbtOps.INSTANCE, compound), dataVersion); +- dynamic = dynamic.update("Player", dynamic1 -> DataFixTypes.PLAYER.updateToCurrentVersion(dataFixer, dynamic1, dataVersion)); ++ dynamic = dynamic.update("Player", dynamic1 -> new Dynamic(dynamic1.getOps(), ca.spottedleaf.dataconverter.minecraft.MCDataConverter.convertTag(ca.spottedleaf.dataconverter.minecraft.datatypes.MCTypeRegistry.PLAYER, (net.minecraft.nbt.CompoundTag)dynamic1.getValue(), dataVersion, net.minecraft.SharedConstants.getCurrentVersion().getDataVersion().getVersion()))); // Paper - replace data conversion system + return dynamic.update("WorldGenSettings", dynamic1 -> DataFixTypes.WORLD_GEN_SETTINGS.updateToCurrentVersion(dataFixer, dynamic1, dataVersion)); } -@@ -552,7 +552,10 @@ public final class CraftMagicNumbers implements UnsafeValues { +diff --git a/net/minecraft/world/level/storage/PlayerDataStorage.java b/net/minecraft/world/level/storage/PlayerDataStorage.java +index 6ac8f16500e44069b84d862d5f0e5c5cbc07387e..5682f6d601cbf8a7eb0d76eafd52095435252579 100644 +--- a/net/minecraft/world/level/storage/PlayerDataStorage.java ++++ b/net/minecraft/world/level/storage/PlayerDataStorage.java +@@ -115,7 +115,7 @@ public class PlayerDataStorage { - final int dataVersion = data.get("DataVersion").getAsInt(); - final int currentVersion = org.bukkit.craftbukkit.util.CraftMagicNumbers.INSTANCE.getDataVersion(); -- data = (com.google.gson.JsonObject) MinecraftServer.getServer().fixerUpper.update(References.ITEM_STACK, new Dynamic<>(com.mojang.serialization.JsonOps.INSTANCE, data), dataVersion, currentVersion).getValue(); -+ data = ca.spottedleaf.dataconverter.minecraft.MCDataConverter.convertJson( -+ ca.spottedleaf.dataconverter.minecraft.datatypes.MCTypeRegistry.ITEM_STACK, -+ data, false, dataVersion, currentVersion -+ ); - com.mojang.serialization.DynamicOps<com.google.gson.JsonElement> ops = MinecraftServer.getServer().registryAccess().createSerializationContext(com.mojang.serialization.JsonOps.INSTANCE); - return CraftItemStack.asCraftMirror(net.minecraft.world.item.ItemStack.CODEC.parse(ops, data).getOrThrow(IllegalArgumentException::new)); - } -@@ -574,7 +577,7 @@ public final class CraftMagicNumbers implements UnsafeValues { - - net.minecraft.nbt.CompoundTag compound = deserializeNbtFromBytes(data); - int dataVersion = compound.getInt("DataVersion"); -- compound = (net.minecraft.nbt.CompoundTag) MinecraftServer.getServer().fixerUpper.update(References.ENTITY, new Dynamic<>(NbtOps.INSTANCE, compound), dataVersion, this.getDataVersion()).getValue(); -+ compound = ca.spottedleaf.dataconverter.minecraft.MCDataConverter.convertTag(ca.spottedleaf.dataconverter.minecraft.datatypes.MCTypeRegistry.ENTITY, compound, dataVersion, this.getDataVersion()); - if (!preserveUUID) { - // Generate a new UUID so we don't have to worry about deserializing the same entity twice - compound.remove("UUID"); + return optional.or(() -> this.load(name, uuid, ".dat_old")).map(compoundTag -> { // CraftBukkit + int dataVersion = NbtUtils.getDataVersion(compoundTag, -1); +- compoundTag = DataFixTypes.PLAYER.updateToCurrentVersion(this.fixerUpper, compoundTag, dataVersion); ++ compoundTag = ca.spottedleaf.dataconverter.minecraft.MCDataConverter.convertTag(ca.spottedleaf.dataconverter.minecraft.datatypes.MCTypeRegistry.PLAYER, compoundTag, dataVersion, net.minecraft.SharedConstants.getCurrentVersion().getDataVersion().getVersion()); // Paper - rewrite data conversion system + // player.load(compoundTag); // CraftBukkit - handled above + return compoundTag; + }); diff --git a/paper-server/src/main/java/ca/spottedleaf/moonrise/paper/PaperHooks.java b/paper-server/src/main/java/ca/spottedleaf/moonrise/paper/PaperHooks.java deleted file mode 100644 index 834c5ce238..0000000000 --- a/paper-server/src/main/java/ca/spottedleaf/moonrise/paper/PaperHooks.java +++ /dev/null @@ -1,240 +0,0 @@ -package ca.spottedleaf.moonrise.paper; - -import ca.spottedleaf.moonrise.common.PlatformHooks; -import com.mojang.datafixers.DSL; -import com.mojang.datafixers.DataFixer; -import com.mojang.serialization.Dynamic; -import java.util.Collection; -import net.minecraft.core.BlockPos; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.nbt.NbtOps; -import net.minecraft.server.level.ChunkHolder; -import net.minecraft.server.level.GenerationChunkHolder; -import net.minecraft.server.level.ServerLevel; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.boss.EnderDragonPart; -import net.minecraft.world.level.BlockGetter; -import net.minecraft.world.level.ChunkPos; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.chunk.ChunkAccess; -import net.minecraft.world.level.chunk.LevelChunk; -import net.minecraft.world.level.chunk.ProtoChunk; -import net.minecraft.world.level.chunk.storage.SerializableChunkData; -import net.minecraft.world.level.entity.EntityTypeTest; -import net.minecraft.world.phys.AABB; -import java.util.List; -import java.util.function.Predicate; - -public final class PaperHooks implements PlatformHooks { - - @Override - public String getBrand() { - return "Paper"; - } - - @Override - public int getLightEmission(final BlockState blockState, final BlockGetter world, final BlockPos pos) { - return blockState.getLightEmission(); - } - - @Override - public Predicate<BlockState> maybeHasLightEmission() { - return (final BlockState state) -> { - return state.getLightEmission() != 0; - }; - } - - @Override - public boolean hasCurrentlyLoadingChunk() { - return false; - } - - @Override - public LevelChunk getCurrentlyLoadingChunk(final GenerationChunkHolder holder) { - return null; - } - - @Override - public void setCurrentlyLoading(final GenerationChunkHolder holder, final LevelChunk levelChunk) { - - } - - @Override - public void chunkFullStatusComplete(final LevelChunk newChunk, final ProtoChunk original) { - - } - - @Override - public boolean allowAsyncTicketUpdates() { - return true; - } - - @Override - public void onChunkHolderTicketChange(final ServerLevel world, final ChunkHolder holder, final int oldLevel, final int newLevel) { - - } - - @Override - public void chunkUnloadFromWorld(final LevelChunk chunk) { - - } - - @Override - public void chunkSyncSave(final ServerLevel world, final ChunkAccess chunk, final SerializableChunkData data) { - - } - - @Override - public void onChunkWatch(final ServerLevel world, final LevelChunk chunk, final ServerPlayer player) { - - } - - @Override - public void onChunkUnWatch(final ServerLevel world, final ChunkPos chunk, final ServerPlayer player) { - - } - - @Override - public void addToGetEntities(final Level world, final Entity entity, final AABB boundingBox, final Predicate<? super Entity> predicate, final List<Entity> into) { - final Collection<EnderDragonPart> parts = world.dragonParts(); - if (parts.isEmpty()) { - return; - } - - for (final EnderDragonPart part : parts) { - if (part != entity && part.getBoundingBox().intersects(boundingBox) && (predicate == null || predicate.test(part))) { - into.add(part); - } - } - } - - @Override - public <T extends Entity> void addToGetEntities(final Level world, final EntityTypeTest<Entity, T> entityTypeTest, final AABB boundingBox, final Predicate<? super T> predicate, final List<? super T> into, final int maxCount) { - if (into.size() >= maxCount) { - // fix neoforge issue: do not add if list is already full - return; - } - - final Collection<EnderDragonPart> parts = world.dragonParts(); - if (parts.isEmpty()) { - return; - } - for (final EnderDragonPart part : parts) { - if (!part.getBoundingBox().intersects(boundingBox)) { - continue; - } - final T casted = (T)entityTypeTest.tryCast(part); - if (casted != null && (predicate == null || predicate.test(casted))) { - into.add(casted); - if (into.size() >= maxCount) { - break; - } - } - } - } - - @Override - public void entityMove(final Entity entity, final long oldSection, final long newSection) { - - } - - @Override - public boolean screenEntity(final ServerLevel world, final Entity entity, final boolean fromDisk, final boolean event) { - return true; - } - - @Override - public boolean configFixMC224294() { - return true; - } - - @Override - public boolean configAutoConfigSendDistance() { - return io.papermc.paper.configuration.GlobalConfiguration.get().chunkLoadingAdvanced.autoConfigSendDistance; - } - - @Override - public double configPlayerMaxLoadRate() { - return io.papermc.paper.configuration.GlobalConfiguration.get().chunkLoadingBasic.playerMaxChunkLoadRate; - } - - @Override - public double configPlayerMaxGenRate() { - return io.papermc.paper.configuration.GlobalConfiguration.get().chunkLoadingBasic.playerMaxChunkGenerateRate; - } - - @Override - public double configPlayerMaxSendRate() { - return io.papermc.paper.configuration.GlobalConfiguration.get().chunkLoadingBasic.playerMaxChunkSendRate; - } - - @Override - public int configPlayerMaxConcurrentLoads() { - return io.papermc.paper.configuration.GlobalConfiguration.get().chunkLoadingAdvanced.playerMaxConcurrentChunkLoads; - } - - @Override - public int configPlayerMaxConcurrentGens() { - return io.papermc.paper.configuration.GlobalConfiguration.get().chunkLoadingAdvanced.playerMaxConcurrentChunkGenerates; - } - - @Override - public long configAutoSaveInterval(final ServerLevel world) { - return world.paperConfig().chunks.autoSaveInterval.value(); - } - - @Override - public int configMaxAutoSavePerTick(final ServerLevel world) { - return world.paperConfig().chunks.maxAutoSaveChunksPerTick; - } - - @Override - public boolean configFixMC159283() { - return true; - } - - @Override - public boolean forceNoSave(final ChunkAccess chunk) { - return chunk instanceof LevelChunk levelChunk && levelChunk.mustNotSave; - } - - @Override - public CompoundTag convertNBT(final DSL.TypeReference type, final DataFixer dataFixer, final CompoundTag nbt, - final int fromVersion, final int toVersion) { - return (CompoundTag)dataFixer.update( - type, new Dynamic<>(NbtOps.INSTANCE, nbt), fromVersion, toVersion - ).getValue(); - } - - @Override - public boolean hasMainChunkLoadHook() { - return false; - } - - @Override - public void mainChunkLoad(final ChunkAccess chunk, final SerializableChunkData chunkData) { - - } - - @Override - public List<Entity> modifySavedEntities(final ServerLevel world, final int chunkX, final int chunkZ, final List<Entity> entities) { - return entities; - } - - @Override - public void unloadEntity(final Entity entity) { - entity.setRemoved(Entity.RemovalReason.UNLOADED_TO_CHUNK, org.bukkit.event.entity.EntityRemoveEvent.Cause.UNLOAD); - } - - @Override - public void postLoadProtoChunk(final ServerLevel world, final ProtoChunk chunk) { - net.minecraft.world.level.chunk.status.ChunkStatusTasks.postLoadProtoChunk(world, chunk.getEntities()); - } - - @Override - public int modifyEntityTrackingRange(final Entity entity, final int currentRange) { - return org.spigotmc.TrackingRange.getEntityTrackingRange(entity, currentRange); - } -} diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/paper-server/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java index 0e8f4710c0..b6665e1875 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -523,7 +523,7 @@ public final class CraftMagicNumbers implements UnsafeValues { net.minecraft.nbt.CompoundTag compound = deserializeNbtFromBytes(data); final int dataVersion = compound.getInt("DataVersion"); - compound = (net.minecraft.nbt.CompoundTag) MinecraftServer.getServer().fixerUpper.update(References.ITEM_STACK, new Dynamic<>(NbtOps.INSTANCE, compound), dataVersion, this.getDataVersion()).getValue(); + compound = ca.spottedleaf.moonrise.common.PlatformHooks.get().convertNBT(References.ITEM_STACK, MinecraftServer.getServer().fixerUpper, compound, dataVersion, this.getDataVersion()); // Paper - possibly use dataconverter return CraftItemStack.asCraftMirror(net.minecraft.world.item.ItemStack.parse(MinecraftServer.getServer().registryAccess(), compound).orElseThrow()); } @@ -574,7 +574,7 @@ public final class CraftMagicNumbers implements UnsafeValues { net.minecraft.nbt.CompoundTag compound = deserializeNbtFromBytes(data); int dataVersion = compound.getInt("DataVersion"); - compound = (net.minecraft.nbt.CompoundTag) MinecraftServer.getServer().fixerUpper.update(References.ENTITY, new Dynamic<>(NbtOps.INSTANCE, compound), dataVersion, this.getDataVersion()).getValue(); + compound = ca.spottedleaf.moonrise.common.PlatformHooks.get().convertNBT(References.ENTITY, MinecraftServer.getServer().fixerUpper, compound, dataVersion, this.getDataVersion()); // Paper - possibly use dataconverter if (!preserveUUID) { // Generate a new UUID so we don't have to worry about deserializing the same entity twice compound.remove("UUID"); |