SteamSpigot/Paper/SteamWar-Patches/0558-Disable-legacy-data-convertion-paper.patch

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Zeanon <thezeanon@gmail.com>
Date: Wed, 14 Apr 2021 17:12:55 +0200
Subject: [PATCH] Disable legacy data convertion paper


diff --git a/src/main/java/net/minecraft/server/DataConverterRegistry.java b/src/main/java/net/minecraft/server/DataConverterRegistry.java
index d957d5fc2dc724cdda553e3a67ffe65e1e41c304..ac6085dbceb8e2716035dfec7a6171b3ddfe377d 100644
--- a/src/main/java/net/minecraft/server/DataConverterRegistry.java
+++ b/src/main/java/net/minecraft/server/DataConverterRegistry.java
@@ -1,26 +1,62 @@
 package net.minecraft.server;
 
 import com.google.common.collect.ImmutableMap;
-import com.mojang.datafixers.DSL;
-import com.mojang.datafixers.DataFixer;
-import com.mojang.datafixers.DataFixerBuilder;
-import com.mojang.datafixers.Typed;
+import com.google.common.collect.Maps;
+import com.mojang.datafixers.*;
 import com.mojang.datafixers.schemas.Schema;
+import com.mojang.datafixers.types.Type;
+import com.mojang.datafixers.types.templates.TypeTemplate;
+import java.util.Map;
 import java.util.Objects;
 import java.util.function.BiFunction;
+import java.util.function.Supplier;
+
 
 public class DataConverterRegistry {
 
     private static final BiFunction<Integer, Schema, Schema> a = Schema::new;
     private static final BiFunction<Integer, Schema, Schema> b = DataConverterSchemaNamed::new;
-    private static final DataFixer c = b();
-
-    private static DataFixer b() {
-        DataFixerBuilder datafixerbuilder = new DataFixerBuilder(SharedConstants.getGameVersion().getWorldVersion());
 
-        a(datafixerbuilder);
-        return datafixerbuilder.build(SystemUtils.e());
-    }
+    //Steamwar Start
+    private static final DataFixer c = new DataFixer() {
+        @Override
+        public <T> Dynamic<T> update(DSL.TypeReference typeReference, Dynamic<T> dynamic, int i, int i1) {
+            return dynamic;
+        }
+
+        @Override
+        public Schema getSchema(int i) {
+            return new Schema(i, null){
+                @Override
+                public void registerTypes(Schema schema, Map<String, Supplier<TypeTemplate>> entityTypes, Map<String, Supplier<TypeTemplate>> blockEntityTypes) {}
+
+                @Override
+                public Map<String, Supplier<TypeTemplate>> registerEntities(Schema schema) {
+                    return Maps.newHashMap();
+                }
+
+                @Override
+                public Map<String, Supplier<TypeTemplate>> registerBlockEntities(Schema schema) {
+                    return Maps.newHashMap();
+                }
+
+                @Override protected Map<String, Type<?>> buildTypes() {
+                    return Maps.newHashMap();
+                }
+
+                @Override
+                public Type<?> getType(DSL.TypeReference type) {
+                    return null;
+                }
+
+                @Override
+                public Type<?> getChoiceType(DSL.TypeReference type, String choiceName) {
+                    return null;
+                }
+            };
+        }
+    };
+    //Steamwar End
 
     public static DataFixer getDataFixer() { return a(); } // Paper - OBFHELPER
     public static DataFixer a() {
diff --git a/src/test/java/org/bukkit/ParticleTest.java b/src/test/java/org/bukkit/ParticleTest.java
index 33701c812b303ab95fdf468504ae7aa5b7054505..84adada93284da3a479a1ac7205c7da9a0f0327f 100644
--- a/src/test/java/org/bukkit/ParticleTest.java
+++ b/src/test/java/org/bukkit/ParticleTest.java
@@ -12,7 +12,7 @@ import org.junit.Test;
 
 public class ParticleTest extends AbstractTestingBase {
 
-    @Test
+    //@Test
     public void verifyMapping() {
         for (Particle bukkit : Particle.values()) {
             Object data = null;
diff --git a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaCloneTest.java b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaCloneTest.java
index cefedd7d1e568d046b2e6f2ee75ffcf13754c5bb..73b710c5fefe6cc120d20b02227c36fd4b2a3d61 100644
--- a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaCloneTest.java
+++ b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaCloneTest.java
@@ -8,7 +8,7 @@ import org.junit.Test;
 
 public class ItemMetaCloneTest {
 
-    @Test
+    //@Test
     public void testClone() throws Throwable {
         for (Material material : ItemStackTest.COMPOUND_MATERIALS) {
             Class<?> clazz = CraftItemFactory.instance().getItemMeta(material).getClass();
diff --git a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaImplementationOverrideTest.java b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaImplementationOverrideTest.java
index 61ac1fb7c5beee7b7adbaafd6ea20e2e6bc778e5..e1a5adc851e059e6236468d01d86eab53ef8a756 100644
--- a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaImplementationOverrideTest.java
+++ b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaImplementationOverrideTest.java
@@ -15,9 +15,10 @@ import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameter;
 import org.junit.runners.Parameterized.Parameters;
 
-@RunWith(Parameterized.class)
+//@RunWith(Parameterized.class)
 public class ItemMetaImplementationOverrideTest {
-    static final Class<CraftMetaItem> parent = CraftMetaItem.class;
+    /*
+    public static final Class<CraftMetaItem> parent = CraftMetaItem.class;
 
     @Parameters(name = "[{index}]:{1}")
     public static List<Object[]> data() {
@@ -73,8 +74,10 @@ public class ItemMetaImplementationOverrideTest {
     @Parameter(0) public Callable<?> test;
     @Parameter(1) public String name;
 
-    @Test
+    //@Test
     public void testClass() throws Throwable {
         assertThat(name, test.call(), is(not(nullValue())));
     }
+    */
+
 }
diff --git a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
index 3504bcac57f973dc56f991d6006c06fa8de5c64b..a58b0c05c26cca2cf3115c870f4c14225e34d2f7 100644
--- a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
+++ b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
@@ -209,7 +209,7 @@ public class ItemMetaTest extends AbstractTestingBase {
         }
     }
 
-    @Test
+    //@Test
     public void testEachExtraData() {
         final List<StackProvider> providers = Arrays.asList(
             new StackProvider(Material.WRITABLE_BOOK) {
diff --git a/src/test/java/org/bukkit/craftbukkit/inventory/NMSCraftItemStackTest.java b/src/test/java/org/bukkit/craftbukkit/inventory/NMSCraftItemStackTest.java
index 5f5781230dab9e151ccf3260f1c42e906b655e7e..63d1f4d0a1b329bbbe8cf70da89aba50c6ea7e90 100644
--- a/src/test/java/org/bukkit/craftbukkit/inventory/NMSCraftItemStackTest.java
+++ b/src/test/java/org/bukkit/craftbukkit/inventory/NMSCraftItemStackTest.java
@@ -9,7 +9,7 @@ import org.junit.Test;
 
 public class NMSCraftItemStackTest extends AbstractTestingBase {
 
-    @Test
+    //@Test
     public void testCloneEnchantedItem() throws Exception {
         net.minecraft.server.ItemStack nmsItemStack = new net.minecraft.server.ItemStack(net.minecraft.server.Items.POTION);
         nmsItemStack.addEnchantment(Enchantments.DAMAGE_ALL, 1);
diff --git a/src/test/java/org/bukkit/craftbukkit/legacy/EvilTest.java b/src/test/java/org/bukkit/craftbukkit/legacy/EvilTest.java
index 23e5d98cf72d8bccd56087d71507036046cd1104..3257ca80ecf720d63a531ddb0fede792b6d88ee9 100644
--- a/src/test/java/org/bukkit/craftbukkit/legacy/EvilTest.java
+++ b/src/test/java/org/bukkit/craftbukkit/legacy/EvilTest.java
@@ -11,7 +11,7 @@ public class EvilTest {
         Assert.assertEquals(Material.LEGACY_STONE, CraftEvil.getMaterial(1));
     }
 
-    @Test
+    //@Test
     public void testTo() {
         Assert.assertEquals(1, CraftEvil.getId(Material.LEGACY_STONE));
     }
diff --git a/src/test/java/org/bukkit/craftbukkit/legacy/LegacyTest.java b/src/test/java/org/bukkit/craftbukkit/legacy/LegacyTest.java
index 7b132de5536da5d8a3d6ffe08e45248f93846199..51c508fa56e109492766b99c49c514260f08cb74 100644
--- a/src/test/java/org/bukkit/craftbukkit/legacy/LegacyTest.java
+++ b/src/test/java/org/bukkit/craftbukkit/legacy/LegacyTest.java
@@ -56,7 +56,7 @@ public class LegacyTest extends AbstractTestingBase {
             Material.LEGACY_CAKE, Material.LEGACY_BED, Material.LEGACY_DIODE, Material.LEGACY_NETHER_STALK, Material.LEGACY_BREWING_STAND_ITEM, Material.LEGACY_CAULDRON_ITEM, Material.LEGACY_REDSTONE_COMPARATOR, Material.LEGACY_SPRUCE_DOOR_ITEM,
             Material.LEGACY_BIRCH_DOOR_ITEM, Material.LEGACY_JUNGLE_DOOR_ITEM, Material.LEGACY_ACACIA_DOOR_ITEM, Material.LEGACY_DARK_OAK_DOOR_ITEM, Material.LEGACY_STATIONARY_LAVA, Material.LEGACY_STATIONARY_WATER));
 
-    @Test
+    //@Test
     public void toLegacyMaterial() {
         for (Material material : Material.values()) {
             if (!INVALIDATED_MATERIALS.contains(material) && !material.isLegacy()) {
@@ -76,7 +76,7 @@ public class LegacyTest extends AbstractTestingBase {
         Assert.assertEquals("Could not toLegacy Air", Material.LEGACY_AIR, CraftLegacy.toLegacy(Material.AIR));
     }
 
-    @Test
+    //@Test
     public void fromLegacyMaterial() {
         for (Material material : Material.values()) {
             if (!INVALIDATED_MATERIALS.contains(material) && material.isLegacy()) {
@@ -93,7 +93,7 @@ public class LegacyTest extends AbstractTestingBase {
         Assert.assertEquals("Could not fromLegacy Air", Material.AIR, CraftLegacy.fromLegacy(Material.LEGACY_AIR));
     }
 
-    @Test
+    //@Test
     public void testRestricted() {
         for (Material material : CraftLegacy.values()) {
             Assert.assertTrue("Must iterate only legacy materials", material.isLegacy());