From f2ff5966a6f578690059489071f25804f60e6ec7 Mon Sep 17 00:00:00 2001 From: Nassim Jahnke Date: Fri, 13 Dec 2024 16:52:45 +0100 Subject: [PATCH] First few files and initial rebuild --- build-data/paper.at | 23 +++++-------------- paper-server/patches/features/.gitkeep | 0 .../intersection_barrel.json.patch | 2 +- .../CommandSyntaxException.java.patch | 4 ++-- .../datafixers/DataFixerBuilder.java.patch | 4 ++-- .../mojang/datafixers/util/Either.java.patch | 8 +++---- .../com/mojang/logging/LogUtils.java.patch | 2 +- .../mojang/math/OctahedralGroup.java.patch | 12 +++++----- 8 files changed, 22 insertions(+), 33 deletions(-) delete mode 100644 paper-server/patches/features/.gitkeep rename paper-server/patches/{unapplied => sources}/com/mojang/datafixers/DataFixerBuilder.java.patch (97%) rename paper-server/patches/{unapplied => sources}/com/mojang/datafixers/util/Either.java.patch (94%) rename paper-server/patches/{unapplied => sources}/com/mojang/logging/LogUtils.java.patch (95%) rename paper-server/patches/{unapplied => sources}/com/mojang/math/OctahedralGroup.java.patch (74%) diff --git a/build-data/paper.at b/build-data/paper.at index 48a44de360..da400007ff 100644 --- a/build-data/paper.at +++ b/build-data/paper.at @@ -1,18 +1,7 @@ -# You can use this file to change the access modifiers on a member -# This line would make the field rollAmount public in Bee -#public net.minecraft.world.entity.animal.Bee rollAmount -# This line would make the field public and remove the final modifier -#public-f net.minecraft.network.protocol.game.ClientboundChatPacket sender -# Leave out the member and it will apply to the class itself -# More info, see here https://mcforge.readthedocs.io/en/latest/advanced/accesstransformers/#access-modifiers - -# Remap/Decompile fix (unclear why this is happening) -public net.minecraft.server.MinecraftServer doRunTask(Lnet/minecraft/server/TickTask;)V - -# AT remap issue? todo 1.18 -public net.minecraft.world.level.dimension.end.EndDragonFight findExitPortal()Lnet/minecraft/world/level/block/state/pattern/BlockPattern$BlockPatternMatch; +# This file is auto generated, any changes may be overridden! +# See CONTRIBUTING.md on how to add access transformers. public net.minecraft.nbt.TagParser readArrayTag()Lnet/minecraft/nbt/Tag; - -# TODO 1.20 remapSpigotAt.at doesn't remap the return type for this method for some reason -public net/minecraft/world/entity/Display$TextDisplay getText()Lnet/minecraft/network/chat/Component; -public net/minecraft/world/entity/Display$BlockDisplay getBlockState()Lnet/minecraft/world/level/block/state/BlockState; +public net.minecraft.server.MinecraftServer doRunTask(Lnet/minecraft/server/TickTask;)V +public net.minecraft.world.entity.Display$BlockDisplay getBlockState()Lnet/minecraft/world/level/block/state/BlockState; +public net.minecraft.world.entity.Display$TextDisplay getText()Lnet/minecraft/network/chat/Component; +public net.minecraft.world.level.dimension.end.EndDragonFight findExitPortal()Lnet/minecraft/world/level/block/state/pattern/BlockPattern$BlockPatternMatch; diff --git a/paper-server/patches/features/.gitkeep b/paper-server/patches/features/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/paper-server/patches/resources/data/minecraft/loot_table/chests/trial_chambers/intersection_barrel.json.patch b/paper-server/patches/resources/data/minecraft/loot_table/chests/trial_chambers/intersection_barrel.json.patch index 572f83673b..7eb4e3632c 100644 --- a/paper-server/patches/resources/data/minecraft/loot_table/chests/trial_chambers/intersection_barrel.json.patch +++ b/paper-server/patches/resources/data/minecraft/loot_table/chests/trial_chambers/intersection_barrel.json.patch @@ -1,6 +1,6 @@ --- a/data/minecraft/loot_table/chests/trial_chambers/intersection_barrel.json +++ b/data/minecraft/loot_table/chests/trial_chambers/intersection_barrel.json -@@ -70,15 +70,6 @@ +@@ -70,15 +_,6 @@ "add": false, "count": 1.0, "function": "minecraft:set_count" diff --git a/paper-server/patches/sources/com/mojang/brigadier/exceptions/CommandSyntaxException.java.patch b/paper-server/patches/sources/com/mojang/brigadier/exceptions/CommandSyntaxException.java.patch index b3bbcc46e5..5a9ff8c8d0 100644 --- a/paper-server/patches/sources/com/mojang/brigadier/exceptions/CommandSyntaxException.java.patch +++ b/paper-server/patches/sources/com/mojang/brigadier/exceptions/CommandSyntaxException.java.patch @@ -1,6 +1,6 @@ --- a/com/mojang/brigadier/exceptions/CommandSyntaxException.java +++ b/com/mojang/brigadier/exceptions/CommandSyntaxException.java -@@ -5,7 +5,7 @@ +@@ -5,7 +_,7 @@ import com.mojang.brigadier.Message; @@ -9,7 +9,7 @@ public static final int CONTEXT_AMOUNT = 10; public static boolean ENABLE_COMMAND_STACK_TRACES = true; public static BuiltInExceptionProvider BUILT_IN_EXCEPTIONS = new BuiltInExceptions(); -@@ -73,4 +73,11 @@ +@@ -73,4 +_,11 @@ public int getCursor() { return cursor; } diff --git a/paper-server/patches/unapplied/com/mojang/datafixers/DataFixerBuilder.java.patch b/paper-server/patches/sources/com/mojang/datafixers/DataFixerBuilder.java.patch similarity index 97% rename from paper-server/patches/unapplied/com/mojang/datafixers/DataFixerBuilder.java.patch rename to paper-server/patches/sources/com/mojang/datafixers/DataFixerBuilder.java.patch index 6d1be183b0..70f040476a 100644 --- a/paper-server/patches/unapplied/com/mojang/datafixers/DataFixerBuilder.java.patch +++ b/paper-server/patches/sources/com/mojang/datafixers/DataFixerBuilder.java.patch @@ -1,6 +1,6 @@ --- a/com/mojang/datafixers/DataFixerBuilder.java +++ b/com/mojang/datafixers/DataFixerBuilder.java -@@ -29,8 +29,10 @@ +@@ -29,8 +_,10 @@ private final Int2ObjectSortedMap schemas = new Int2ObjectAVLTreeMap<>(); private final List globalList = new ArrayList<>(); private final IntSortedSet fixerVersions = new IntAVLTreeSet(); @@ -11,7 +11,7 @@ this.dataVersion = dataVersion; } -@@ -88,6 +90,7 @@ +@@ -88,6 +_,7 @@ final IntIterator iterator = fixerUpper.fixerVersions().iterator(); while (iterator.hasNext()) { final int versionKey = iterator.nextInt(); diff --git a/paper-server/patches/unapplied/com/mojang/datafixers/util/Either.java.patch b/paper-server/patches/sources/com/mojang/datafixers/util/Either.java.patch similarity index 94% rename from paper-server/patches/unapplied/com/mojang/datafixers/util/Either.java.patch rename to paper-server/patches/sources/com/mojang/datafixers/util/Either.java.patch index 810603f8a3..7f682f9002 100644 --- a/paper-server/patches/unapplied/com/mojang/datafixers/util/Either.java.patch +++ b/paper-server/patches/sources/com/mojang/datafixers/util/Either.java.patch @@ -1,6 +1,6 @@ --- a/com/mojang/datafixers/util/Either.java +++ b/com/mojang/datafixers/util/Either.java -@@ -22,7 +22,7 @@ +@@ -22,7 +_,7 @@ } private static final class Left extends Either { @@ -9,7 +9,7 @@ public Left(final L value) { this.value = value; -@@ -51,7 +51,7 @@ +@@ -51,7 +_,7 @@ @Override public Optional left() { @@ -18,7 +18,7 @@ } @Override -@@ -83,7 +83,7 @@ +@@ -83,7 +_,7 @@ } private static final class Right extends Either { @@ -27,7 +27,7 @@ public Right(final R value) { this.value = value; -@@ -117,7 +117,7 @@ +@@ -117,7 +_,7 @@ @Override public Optional right() { diff --git a/paper-server/patches/unapplied/com/mojang/logging/LogUtils.java.patch b/paper-server/patches/sources/com/mojang/logging/LogUtils.java.patch similarity index 95% rename from paper-server/patches/unapplied/com/mojang/logging/LogUtils.java.patch rename to paper-server/patches/sources/com/mojang/logging/LogUtils.java.patch index 1cabed3cc3..b05ea2c1ed 100644 --- a/paper-server/patches/unapplied/com/mojang/logging/LogUtils.java.patch +++ b/paper-server/patches/sources/com/mojang/logging/LogUtils.java.patch @@ -1,6 +1,6 @@ --- a/com/mojang/logging/LogUtils.java +++ b/com/mojang/logging/LogUtils.java -@@ -61,4 +61,9 @@ +@@ -61,4 +_,9 @@ public static Logger getLogger() { return LoggerFactory.getLogger(STACK_WALKER.getCallerClass()); } diff --git a/paper-server/patches/unapplied/com/mojang/math/OctahedralGroup.java.patch b/paper-server/patches/sources/com/mojang/math/OctahedralGroup.java.patch similarity index 74% rename from paper-server/patches/unapplied/com/mojang/math/OctahedralGroup.java.patch rename to paper-server/patches/sources/com/mojang/math/OctahedralGroup.java.patch index 64c7d5d058..671c030fac 100644 --- a/paper-server/patches/unapplied/com/mojang/math/OctahedralGroup.java.patch +++ b/paper-server/patches/sources/com/mojang/math/OctahedralGroup.java.patch @@ -1,14 +1,14 @@ --- a/com/mojang/math/OctahedralGroup.java +++ b/com/mojang/math/OctahedralGroup.java -@@ -110,6 +110,7 @@ - this.permutation = axisTransformation; - this.transformation = new Matrix3f().scaling(flipX ? -1.0F : 1.0F, flipY ? -1.0F : 1.0F, flipZ ? -1.0F : 1.0F); - this.transformation.mul(axisTransformation.transformation()); +@@ -111,6 +_,7 @@ + this.permutation = permutation; + this.transformation = new Matrix3f().scaling(invertX ? -1.0F : 1.0F, invertY ? -1.0F : 1.0F, invertZ ? -1.0F : 1.0F); + this.transformation.mul(permutation.transformation()); + this.initializeRotationDirections(); // Paper - Avoid Lazy Initialization for Enum Fields } private BooleanList packInversions() { -@@ -138,7 +139,7 @@ +@@ -139,7 +_,7 @@ return this.name; } @@ -17,7 +17,7 @@ if (this.rotatedDirections == null) { this.rotatedDirections = Maps.newEnumMap(Direction.class); Direction.Axis[] axiss = Direction.Axis.values(); -@@ -153,6 +154,10 @@ +@@ -154,6 +_,10 @@ } }