From d51b4a37282fe943f99d6813892db6fdc873e903 Mon Sep 17 00:00:00 2001 From: granny Date: Sun, 7 Apr 2024 18:38:21 -0700 Subject: [PATCH] [ci-skip] worry about this later --- .../server/0006-Fix-decompile-errors.patch | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/patches/server/0006-Fix-decompile-errors.patch b/patches/server/0006-Fix-decompile-errors.patch index f89a4b10b..69d3ae35d 100644 --- a/patches/server/0006-Fix-decompile-errors.patch +++ b/patches/server/0006-Fix-decompile-errors.patch @@ -17,6 +17,43 @@ index 89f0f68b3e2be64bcbf8b173a51d56ea3a3fb4ea..05e1c94268cf5c6897807cd7acced652 } } else { +diff --git a/src/main/java/net/minecraft/commands/synchronization/ArgumentTypeInfos.java b/src/main/java/net/minecraft/commands/synchronization/ArgumentTypeInfos.java +index 0f43466df9b6a59722d5c311b9bd02f59ac75539..9d96a077e3306718a7aaa7ac62772beafc4b82cd 100644 +--- a/src/main/java/net/minecraft/commands/synchronization/ArgumentTypeInfos.java ++++ b/src/main/java/net/minecraft/commands/synchronization/ArgumentTypeInfos.java +@@ -114,10 +114,10 @@ public class ArgumentTypeInfos { + register(registry, "dimension", DimensionArgument.class, SingletonArgumentInfo.contextFree(DimensionArgument::dimension)); + register(registry, "gamemode", GameModeArgument.class, SingletonArgumentInfo.contextFree(GameModeArgument::gameMode)); + register(registry, "time", TimeArgument.class, new TimeArgument.Info()); +- register(registry, "resource_or_tag", fixClassType(ResourceOrTagArgument.class), new ResourceOrTagArgument.Info()); +- register(registry, "resource_or_tag_key", fixClassType(ResourceOrTagKeyArgument.class), new ResourceOrTagKeyArgument.Info()); +- register(registry, "resource", fixClassType(ResourceArgument.class), new ResourceArgument.Info()); +- register(registry, "resource_key", fixClassType(ResourceKeyArgument.class), new ResourceKeyArgument.Info()); ++ register(registry, "resource_or_tag", fixClassType(ResourceOrTagArgument.class), new ResourceOrTagArgument.Info<>()); // Purpur - decompile error ++ register(registry, "resource_or_tag_key", fixClassType(ResourceOrTagKeyArgument.class), new ResourceOrTagKeyArgument.Info<>()); // Purpur - decompile error ++ register(registry, "resource", fixClassType(ResourceArgument.class), new ResourceArgument.Info<>()); // Purpur - decompile error ++ register(registry, "resource_key", fixClassType(ResourceKeyArgument.class), new ResourceKeyArgument.Info<>()); // Purpur - decompile error + register(registry, "template_mirror", TemplateMirrorArgument.class, SingletonArgumentInfo.contextFree(TemplateMirrorArgument::templateMirror)); + register(registry, "template_rotation", TemplateRotationArgument.class, SingletonArgumentInfo.contextFree(TemplateRotationArgument::templateRotation)); + register(registry, "heightmap", HeightmapTypeArgument.class, SingletonArgumentInfo.contextFree(HeightmapTypeArgument::heightmap)); +@@ -130,7 +130,7 @@ public class ArgumentTypeInfos { + } + + private static > Class fixClassType(Class clazz) { +- return clazz; ++ return (Class) clazz; // Purpur - decompile error + } + + public static boolean isClassRecognized(Class clazz) { +@@ -142,7 +142,7 @@ public class ArgumentTypeInfos { + if (argumentTypeInfo == null) { + throw new IllegalArgumentException(String.format(Locale.ROOT, "Unrecognized argument type %s (%s)", argumentType, argumentType.getClass())); + } else { +- return argumentTypeInfo; ++ return (ArgumentTypeInfo) argumentTypeInfo; // Purpur - decompile error + } + } + diff --git a/src/main/java/net/minecraft/world/entity/decoration/Painting.java b/src/main/java/net/minecraft/world/entity/decoration/Painting.java index d9016807bc21c38a5c38170e1335c79b39355bcb..03c065d0ad97d29f3586ba2bf3cd207b867ed634 100644 --- a/src/main/java/net/minecraft/world/entity/decoration/Painting.java