From afae2e2033bcf5b3d07c2d0998c22eb19a1386b3 Mon Sep 17 00:00:00 2001 From: Juuxel <6596629+Juuxel@users.noreply.github.com> Date: Fri, 23 Jul 2021 01:21:26 +0300 Subject: [PATCH] Game test fixes and additional docs (#2598) * Game test fixes and additional docs * Update mappings/net/minecraft/server/command/TestCommand.mapping Co-authored-by: liach <7806504+liach@users.noreply.github.com> Co-authored-by: liach <7806504+liach@users.noreply.github.com> --- mappings/net/minecraft/server/command/TestCommand.mapping | 2 +- mappings/net/minecraft/test/AfterBatch.mapping | 2 ++ mappings/net/minecraft/test/BeforeBatch.mapping | 2 ++ mappings/net/minecraft/test/TestFunction.mapping | 2 +- mappings/net/minecraft/test/TestFunctions.mapping | 4 ++-- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/mappings/net/minecraft/server/command/TestCommand.mapping b/mappings/net/minecraft/server/command/TestCommand.mapping index f11bd364da..b193db97ec 100644 --- a/mappings/net/minecraft/server/command/TestCommand.mapping +++ b/mappings/net/minecraft/server/command/TestCommand.mapping @@ -86,7 +86,7 @@ CLASS net/minecraft/class_4527 net/minecraft/server/command/TestCommand ARG 0 context METHOD method_22295 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context - METHOD method_23647 setWorld (Lnet/minecraft/class_4529;Lnet/minecraft/class_3218;)V + METHOD method_23647 beforeBatch (Lnet/minecraft/class_4529;Lnet/minecraft/class_3218;)V ARG 0 testFunction ARG 1 world METHOD method_23648 (Lcom/mojang/brigadier/context/CommandContext;)I diff --git a/mappings/net/minecraft/test/AfterBatch.mapping b/mappings/net/minecraft/test/AfterBatch.mapping index 573f0ad6c2..1ca672b675 100644 --- a/mappings/net/minecraft/test/AfterBatch.mapping +++ b/mappings/net/minecraft/test/AfterBatch.mapping @@ -1,3 +1,5 @@ CLASS net/minecraft/class_6300 net/minecraft/test/AfterBatch COMMENT {@code AfterBatch} methods are ran once the batch specified has finished. + COMMENT + COMMENT

{@code AfterBatch} methods must take 1 parameter of {@link net.minecraft.server.world.ServerWorld}. METHOD method_35930 batchId ()Ljava/lang/String; diff --git a/mappings/net/minecraft/test/BeforeBatch.mapping b/mappings/net/minecraft/test/BeforeBatch.mapping index 05df8cfec6..c5ac4eaf46 100644 --- a/mappings/net/minecraft/test/BeforeBatch.mapping +++ b/mappings/net/minecraft/test/BeforeBatch.mapping @@ -1,3 +1,5 @@ CLASS net/minecraft/class_6301 net/minecraft/test/BeforeBatch COMMENT {@code BeforeBatch} methods are ran before the batch specified has started. + COMMENT + COMMENT

{@code BeforeBatch} methods must take 1 parameter of {@link net.minecraft.server.world.ServerWorld}. METHOD method_35931 batchId ()Ljava/lang/String; diff --git a/mappings/net/minecraft/test/TestFunction.mapping b/mappings/net/minecraft/test/TestFunction.mapping index d2bd629446..f4607de1a8 100644 --- a/mappings/net/minecraft/test/TestFunction.mapping +++ b/mappings/net/minecraft/test/TestFunction.mapping @@ -39,7 +39,7 @@ CLASS net/minecraft/class_4529 net/minecraft/test/TestFunction ARG 9 starter METHOD method_22296 getStructurePath ()Ljava/lang/String; METHOD method_22297 start (Lnet/minecraft/class_4516;)V - ARG 1 parameter + ARG 1 context METHOD method_22298 getStructureName ()Ljava/lang/String; METHOD method_22299 getTickLimit ()I METHOD method_22300 isRequired ()Z diff --git a/mappings/net/minecraft/test/TestFunctions.mapping b/mappings/net/minecraft/test/TestFunctions.mapping index fd15d3a7a7..9d040b7073 100644 --- a/mappings/net/minecraft/test/TestFunctions.mapping +++ b/mappings/net/minecraft/test/TestFunctions.mapping @@ -17,7 +17,7 @@ CLASS net/minecraft/class_4519 net/minecraft/test/TestFunctions ARG 0 testClass METHOD method_22197 (Ljava/lang/String;Lnet/minecraft/class_4529;)Z ARG 1 testFunction - METHOD method_22198 getAfterBatchConsumer (Ljava/lang/String;)Ljava/util/function/Consumer; + METHOD method_22198 getBeforeBatchConsumer (Ljava/lang/String;)Ljava/util/function/Consumer; ARG 0 batchId METHOD method_22199 getTestFunction (Ljava/lang/String;)Ljava/util/Optional; ARG 0 structurePath @@ -27,7 +27,7 @@ CLASS net/minecraft/class_4519 net/minecraft/test/TestFunctions ARG 0 testFunction METHOD method_29405 getFailedTestFunctions ()Ljava/util/Collection; METHOD method_29406 clearFailedTestFunctions ()V - METHOD method_32244 getBeforeBatchConsumer (Ljava/lang/String;)Ljava/util/function/Consumer; + METHOD method_32244 getAfterBatchConsumer (Ljava/lang/String;)Ljava/util/function/Consumer; ARG 0 batchId METHOD method_36068 register (Ljava/lang/Class;)V ARG 0 testClass