diff --git a/mappings/net/minecraft/test/AfterBatch.mapping b/mappings/net/minecraft/test/AfterBatch.mapping new file mode 100644 index 0000000000..738ee2cbd5 --- /dev/null +++ b/mappings/net/minecraft/test/AfterBatch.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_6300 net/minecraft/test/AfterBatch + COMMENT {@code AfterBatch} methods are ran once the batch specificied has finished. + METHOD method_35930 batchId ()Ljava/lang/String; diff --git a/mappings/net/minecraft/test/BeforeBatch.mapping b/mappings/net/minecraft/test/BeforeBatch.mapping new file mode 100644 index 0000000000..252459dbee --- /dev/null +++ b/mappings/net/minecraft/test/BeforeBatch.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_6301 net/minecraft/test/BeforeBatch + COMMENT {@code BeforeBatch} methods are ran before the batch specificied has started. + METHOD method_35931 batchId ()Ljava/lang/String; diff --git a/mappings/net/minecraft/test/CustomTestProvider.mapping b/mappings/net/minecraft/test/CustomTestProvider.mapping new file mode 100644 index 0000000000..20eba85047 --- /dev/null +++ b/mappings/net/minecraft/test/CustomTestProvider.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_6303 net/minecraft/test/CustomTestProvider + COMMENT {@code CustomTestProvider} methods return a {@code Collection}. diff --git a/mappings/net/minecraft/test/GameTest.mapping b/mappings/net/minecraft/test/GameTest.mapping index 5a4b54ff49..2dc010ac23 100644 --- a/mappings/net/minecraft/test/GameTest.mapping +++ b/mappings/net/minecraft/test/GameTest.mapping @@ -1,4 +1,7 @@ CLASS net/minecraft/class_6302 net/minecraft/test/GameTest + COMMENT {@code GameTest} is used to tell the test framework that the annotated method is a test. + COMMENT + COMMENT

{@code GameTest} methods must take 1 parameter of {@link net.minecraft.test.TestContext} METHOD method_35932 tickLimit ()I METHOD method_35933 batchId ()Ljava/lang/String; METHOD method_35934 rotation ()I diff --git a/mappings/net/minecraft/test/GameTestBatch.mapping b/mappings/net/minecraft/test/GameTestBatch.mapping index e5e755f395..1631c8ba6b 100644 --- a/mappings/net/minecraft/test/GameTestBatch.mapping +++ b/mappings/net/minecraft/test/GameTestBatch.mapping @@ -1,15 +1,17 @@ CLASS net/minecraft/class_4514 net/minecraft/test/GameTestBatch FIELD field_20543 id Ljava/lang/String; FIELD field_20544 testFunctions Ljava/util/Collection; - FIELD field_20545 worldSetter Ljava/util/function/Consumer; + FIELD field_20545 beforeBatchConsumer Ljava/util/function/Consumer; + FIELD field_27801 afterBatchConsumer Ljava/util/function/Consumer; FIELD field_33145 DEFAULT_BATCH Ljava/lang/String; METHOD (Ljava/lang/String;Ljava/util/Collection;Ljava/util/function/Consumer;Ljava/util/function/Consumer;)V ARG 1 id ARG 2 testFunctions - ARG 3 worldSetter + ARG 3 beforeBatchConsumer + ARG 4 afterBatchConsumer METHOD method_22152 getId ()Ljava/lang/String; - METHOD method_22153 setWorld (Lnet/minecraft/class_3218;)V + METHOD method_22153 startBatch (Lnet/minecraft/class_3218;)V ARG 1 world METHOD method_22154 getTestFunctions ()Ljava/util/Collection; - METHOD method_32237 (Lnet/minecraft/class_3218;)V + METHOD method_32237 finishBatch (Lnet/minecraft/class_3218;)V ARG 1 world diff --git a/mappings/net/minecraft/test/GameTestException.mapping b/mappings/net/minecraft/test/GameTestException.mapping new file mode 100644 index 0000000000..8b5ff6215a --- /dev/null +++ b/mappings/net/minecraft/test/GameTestException.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_4512 net/minecraft/test/GameTestException + METHOD (Ljava/lang/String;)V + ARG 1 message diff --git a/mappings/net/minecraft/test/StructureTestUtil.mapping b/mappings/net/minecraft/test/StructureTestUtil.mapping index f6a0d52397..f2851d88ae 100644 --- a/mappings/net/minecraft/test/StructureTestUtil.mapping +++ b/mappings/net/minecraft/test/StructureTestUtil.mapping @@ -74,6 +74,8 @@ CLASS net/minecraft/class_4525 net/minecraft/test/StructureTestUtil ARG 0 structureBlockEntity METHOD method_36105 getRotationSteps (Lnet/minecraft/class_2470;)I ARG 0 rotation + METHOD method_36106 main ([Ljava/lang/String;)V + ARG 0 args METHOD method_36107 (Ljava/nio/file/Path;)V ARG 0 path METHOD method_36108 (Ljava/nio/file/Path;)Z diff --git a/mappings/net/minecraft/test/TeamCityTestCompletionListener.mapping b/mappings/net/minecraft/test/TeamCityTestCompletionListener.mapping new file mode 100644 index 0000000000..30be47a318 --- /dev/null +++ b/mappings/net/minecraft/test/TeamCityTestCompletionListener.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_6308 net/minecraft/test/TeamCityTestCompletionListener + FIELD field_33176 LOGGER Lorg/apache/logging/log4j/Logger; + FIELD field_33177 ESCAPER Lcom/google/common/escape/Escaper; diff --git a/mappings/net/minecraft/test/StartupParameter.mapping b/mappings/net/minecraft/test/TestContext.mapping similarity index 99% rename from mappings/net/minecraft/test/StartupParameter.mapping rename to mappings/net/minecraft/test/TestContext.mapping index ec8962c8d8..2e127e8edf 100644 --- a/mappings/net/minecraft/test/StartupParameter.mapping +++ b/mappings/net/minecraft/test/TestContext.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4516 net/minecraft/test/StartupParameter +CLASS net/minecraft/class_4516 net/minecraft/test/TestContext FIELD field_20558 test Lnet/minecraft/class_4517; FIELD field_33146 hasFinalClause Z METHOD (Lnet/minecraft/class_4517;)V diff --git a/mappings/net/minecraft/test/TestFunctions.mapping b/mappings/net/minecraft/test/TestFunctions.mapping index 8a8ef8b540..fd15d3a7a7 100644 --- a/mappings/net/minecraft/test/TestFunctions.mapping +++ b/mappings/net/minecraft/test/TestFunctions.mapping @@ -1,8 +1,9 @@ CLASS net/minecraft/class_4519 net/minecraft/test/TestFunctions FIELD field_20570 TEST_FUNCTIONS Ljava/util/Collection; FIELD field_20571 testClasses Ljava/util/Set; - FIELD field_20572 WORLD_SETTERS Ljava/util/Map; + FIELD field_20572 BEFORE_BATCH_CONSUMERS Ljava/util/Map; FIELD field_25302 FAILED_TEST_FUNCTIONS Ljava/util/Collection; + FIELD field_27806 AFTER_BATCH_CONSUMERS Ljava/util/Map; METHOD method_22191 getTestFunctions ()Ljava/util/Collection; METHOD method_22192 isInClass (Lnet/minecraft/class_4529;Ljava/lang/String;)Z ARG 0 testFunction @@ -16,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 getWorldSetter (Ljava/lang/String;)Ljava/util/function/Consumer; + METHOD method_22198 getAfterBatchConsumer (Ljava/lang/String;)Ljava/util/function/Consumer; ARG 0 batchId METHOD method_22199 getTestFunction (Ljava/lang/String;)Ljava/util/Optional; ARG 0 structurePath @@ -26,18 +27,22 @@ 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 (Ljava/lang/String;)Ljava/util/function/Consumer; + METHOD method_32244 getBeforeBatchConsumer (Ljava/lang/String;)Ljava/util/function/Consumer; ARG 0 batchId - METHOD method_36069 (Ljava/lang/reflect/Method;)V + METHOD method_36068 register (Ljava/lang/Class;)V + ARG 0 testClass + METHOD method_36069 register (Ljava/lang/reflect/Method;)V ARG 0 method - METHOD method_36070 validateCount (Ljava/lang/reflect/Method;Ljava/lang/Class;Ljava/util/function/Function;Ljava/util/Map;)V + METHOD method_36070 registerBatchConsumers (Ljava/lang/reflect/Method;Ljava/lang/Class;Ljava/util/function/Function;Ljava/util/Map;)V ARG 0 method ARG 1 clazz + ARG 2 batchIdFunction + ARG 3 batchConsumerMap METHOD method_36071 (Ljava/lang/reflect/Method;Ljava/lang/Object;)V ARG 1 args - METHOD method_36072 invoke (Ljava/lang/reflect/Method;)Ljava/util/Collection; + METHOD method_36072 getCustomTestFunctions (Ljava/lang/reflect/Method;)Ljava/util/Collection; ARG 0 method - METHOD method_36073 parseTestMethod (Ljava/lang/reflect/Method;)Lnet/minecraft/class_4529; + METHOD method_36073 getTestFunction (Ljava/lang/reflect/Method;)Lnet/minecraft/class_4529; ARG 0 method METHOD method_36074 getInvoker (Ljava/lang/reflect/Method;)Ljava/util/function/Consumer; ARG 0 method diff --git a/mappings/net/minecraft/test/TimeMismatchException.mapping b/mappings/net/minecraft/test/TimeMismatchException.mapping deleted file mode 100644 index 8f9f4287b4..0000000000 --- a/mappings/net/minecraft/test/TimeMismatchException.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/class_4512 net/minecraft/test/TimeMismatchException - METHOD (Ljava/lang/String;)V - ARG 1 message