Skip to content

Commit

Permalink
25w03a gametests
Browse files Browse the repository at this point in the history
  • Loading branch information
apple502j committed Jan 17, 2025
1 parent e846fce commit b01209e
Show file tree
Hide file tree
Showing 26 changed files with 394 additions and 70 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,12 @@ CLASS net/minecraft/class_10638 net/minecraft/block/entity/TestInstanceBlockEnti
ARG 1 testInstance
METHOD method_66741 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2960;)Ljava/util/Optional;
ARG 1 structureId
METHOD method_66742 exportData (Lnet/minecraft/class_3218;Lnet/minecraft/class_2960;Ljava/util/function/Consumer;)Z
ARG 0 world
ARG 1 structureId
ARG 2 messageConsumer
METHOD method_66743 (Lnet/minecraft/class_3218;Lnet/minecraft/class_1923;)V
ARG 1 pos
METHOD method_66744 placeStructure (Lnet/minecraft/class_3218;Lnet/minecraft/class_3499;)V
ARG 1 world
ARG 2 template
Expand All @@ -45,19 +51,21 @@ CLASS net/minecraft/class_10638 net/minecraft/block/entity/TestInstanceBlockEnti
METHOD method_66752 getStructureTemplate (Lnet/minecraft/class_3218;Lnet/minecraft/class_5321;)Ljava/util/Optional;
ARG 0 world
ARG 1 testInstance
METHOD method_66753 (Ljava/util/function/Consumer;)Ljava/util/Optional;
METHOD method_66753 saveStructure (Ljava/util/function/Consumer;)Ljava/util/Optional;
ARG 1 messageConsumer
METHOD method_66754 (Lnet/minecraft/class_2338;)V
ARG 1 pos
METHOD method_66755 (Lnet/minecraft/class_6880$class_6883;)Lnet/minecraft/class_2960;
ARG 0 entry
METHOD method_66756 (Lnet/minecraft/class_3218;Lnet/minecraft/class_5321;)Ljava/util/Optional;
ARG 1 template
METHOD method_66757 (Ljava/util/function/Consumer;)Z
METHOD method_66757 export (Ljava/util/function/Consumer;)Z
ARG 1 messageConsumer
METHOD method_66758 (Lnet/minecraft/class_2338;)V
ARG 1 pos
METHOD method_66759 getBlockBox ()Lnet/minecraft/class_3341;
METHOD method_66760 start (Ljava/util/function/Consumer;)V
ARG 1 messageConsumer
METHOD method_66761 forEachPos (Ljava/util/function/Consumer;)V
ARG 1 posConsumer
METHOD method_66762 getBox ()Lnet/minecraft/class_238;
Expand Down
3 changes: 3 additions & 0 deletions mappings/net/minecraft/gametest/Main.mapping
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
CLASS net/minecraft/gametest/Main
METHOD main ([Ljava/lang/String;)V
ARG 0 args
92 changes: 92 additions & 0 deletions mappings/net/minecraft/server/command/TestCommand.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ CLASS net/minecraft/class_4527 net/minecraft/server/command/TestCommand
ARG 1 variableName
METHOD method_22268 executeCreate (Lnet/minecraft/class_2168;Lnet/minecraft/class_2960;III)I
ARG 0 source
ARG 1 id
ARG 2 x
ARG 3 y
ARG 4 z
Expand All @@ -28,12 +29,16 @@ CLASS net/minecraft/class_4527 net/minecraft/server/command/TestCommand
ARG 0 source
ARG 1 templateId
METHOD method_56254 stop ()I
METHOD method_56255 (ILnet/minecraft/class_2168;Lnet/minecraft/class_9118;Lnet/minecraft/class_6880$class_6883;)Lnet/minecraft/class_4517;
ARG 3 instance
METHOD method_56256 (Lcom/mojang/brigadier/builder/ArgumentBuilder;)Lcom/mojang/brigadier/builder/ArgumentBuilder;
ARG 0 extraConfigAdder
METHOD method_56257 testAttemptConfig (Lcom/mojang/brigadier/builder/ArgumentBuilder;Lnet/minecraft/class_10618;)Lcom/mojang/brigadier/builder/ArgumentBuilder;
ARG 0 builder
ARG 1 finderGetter
METHOD method_56258 testAttemptConfig (Lcom/mojang/brigadier/builder/ArgumentBuilder;Lnet/minecraft/class_10618;Ljava/util/function/Function;)Lcom/mojang/brigadier/builder/ArgumentBuilder;
ARG 0 builder
ARG 1 finderGetter
ARG 2 extraConfigAdder
METHOD method_56259 start (Lnet/minecraft/class_2168;Lnet/minecraft/class_4520;)I
ARG 0 source
Expand All @@ -58,12 +63,99 @@ CLASS net/minecraft/class_4527 net/minecraft/server/command/TestCommand
ARG 1 state
METHOD method_56268 testAttemptAndPlacementConfig (Lcom/mojang/brigadier/builder/ArgumentBuilder;Lnet/minecraft/class_10618;)Lcom/mojang/brigadier/builder/ArgumentBuilder;
ARG 0 builder
ARG 1 finderGetter
METHOD method_56270 (Lnet/minecraft/class_4517;)V
ARG 0 state
METHOD method_56274 (Lcom/mojang/brigadier/context/CommandContext;)I
ARG 0 context
METHOD method_57105 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)V
ARG 1 pos
METHOD method_66999 (Lnet/minecraft/class_10618;Lcom/mojang/brigadier/builder/ArgumentBuilder;)Lcom/mojang/brigadier/builder/ArgumentBuilder;
ARG 1 builder2
METHOD method_67000 (Lnet/minecraft/class_10618;Lcom/mojang/brigadier/context/CommandContext;)I
ARG 1 context
METHOD method_67001 (Lcom/mojang/brigadier/context/CommandContext;)I
ARG 0 context
METHOD method_67002 suggestTestFunctions (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
ARG 0 context
ARG 1 builder
METHOD method_67003 (Lnet/minecraft/class_2168;Lnet/minecraft/class_6880$class_6883;)Z
ARG 1 instance
METHOD method_67004 (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
ARG 0 x
ARG 1 y
ARG 2 z
METHOD method_67007 (Ljava/lang/String;Lnet/minecraft/class_2583;)Lnet/minecraft/class_2583;
ARG 1 style
METHOD method_67009 reset (Lnet/minecraft/class_9123;)I
ARG 0 finder
METHOD method_67010 (Lnet/minecraft/class_9123;Lnet/minecraft/class_2338;Lorg/apache/commons/lang3/mutable/MutableInt;Lnet/minecraft/class_2338;)V
ARG 3 pos
METHOD method_67011 (Lnet/minecraft/class_9123;Lnet/minecraft/class_4517;)Ljava/lang/Integer;
ARG 1 state
METHOD method_67012 start (Lnet/minecraft/class_9123;Lnet/minecraft/class_9118;II)I
ARG 0 finder
ARG 1 config
ARG 2 rotationSteps
ARG 3 testsPerRow
METHOD method_67016 (Lnet/minecraft/class_10618;Lcom/mojang/brigadier/context/CommandContext;)I
ARG 1 context
METHOD method_67017 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)I
ARG 1 pos
METHOD method_67018 (Lcom/mojang/brigadier/context/CommandContext;)I
ARG 0 context
METHOD method_67019 (Lnet/minecraft/class_2168;)Z
ARG 0 source
METHOD method_67020 clear (Lnet/minecraft/class_9123;)I
ARG 0 finder
METHOD method_67021 (Lnet/minecraft/class_10618;Lcom/mojang/brigadier/context/CommandContext;)I
ARG 1 context
METHOD method_67022 (Lcom/mojang/brigadier/context/CommandContext;)I
ARG 0 context
METHOD method_67023 export (Lnet/minecraft/class_9123;)I
ARG 0 finder
METHOD method_67024 (Lnet/minecraft/class_10618;Lcom/mojang/brigadier/context/CommandContext;)I
ARG 1 context
METHOD method_67025 (Lcom/mojang/brigadier/context/CommandContext;)I
ARG 0 context
METHOD method_67026 start (Lnet/minecraft/class_9123;)I
ARG 0 finder
METHOD method_67027 (Lnet/minecraft/class_10618;Lcom/mojang/brigadier/context/CommandContext;)I
ARG 1 context
METHOD method_67028 (Lcom/mojang/brigadier/context/CommandContext;)I
ARG 0 context
METHOD method_67029 locate (Lnet/minecraft/class_9123;)I
ARG 0 finder
METHOD method_67030 (Lcom/mojang/brigadier/context/CommandContext;)I
ARG 0 context
METHOD method_67031 (Lcom/mojang/brigadier/context/CommandContext;)I
ARG 0 context
METHOD method_67032 (Lcom/mojang/brigadier/context/CommandContext;)I
ARG 0 context
METHOD method_67033 (Lcom/mojang/brigadier/context/CommandContext;)I
ARG 0 context
METHOD method_67034 (Lcom/mojang/brigadier/context/CommandContext;)I
ARG 0 context
METHOD method_67035 (Lcom/mojang/brigadier/context/CommandContext;)I
ARG 0 context
METHOD method_67036 (Lcom/mojang/brigadier/context/CommandContext;)I
ARG 0 context
METHOD method_67037 (Lcom/mojang/brigadier/context/CommandContext;)I
ARG 0 context
METHOD method_67038 (Lcom/mojang/brigadier/context/CommandContext;)I
ARG 0 context
METHOD method_67039 (Lcom/mojang/brigadier/context/CommandContext;)I
ARG 0 context
METHOD method_67040 (Lcom/mojang/brigadier/context/CommandContext;)I
ARG 0 context
METHOD method_67041 (Lcom/mojang/brigadier/context/CommandContext;)I
ARG 0 context
METHOD method_67042 (Lcom/mojang/brigadier/context/CommandContext;)I
ARG 0 context
METHOD method_67043 (Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/class_9123;
ARG 0 context
METHOD method_67044 (Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/class_9123;
ARG 0 context
CLASS class_4528 Listener
FIELD comp_2217 tests Lnet/minecraft/class_4524;
METHOD <init> (Lnet/minecraft/class_2168;Lnet/minecraft/class_4524;)V
Expand Down
28 changes: 23 additions & 5 deletions mappings/net/minecraft/server/command/TestFinder.mapping
Original file line number Diff line number Diff line change
@@ -1,14 +1,21 @@
CLASS net/minecraft/class_9123 net/minecraft/server/command/TestFinder
FIELD field_48507 NOOP_TEST_FUNCTION_FINDER Lnet/minecraft/class_10674;
FIELD field_48508 NOOP_STRUCTURE_BLOCK_FINDER Lnet/minecraft/class_10675;
FIELD field_48508 NOOP_TEST_INSTANCE_BLOCK_FINDER Lnet/minecraft/class_10675;
FIELD field_48511 commandSource Lnet/minecraft/class_2168;
FIELD field_56218 instanceFinder Lnet/minecraft/class_10674;
FIELD field_56219 blockFinder Lnet/minecraft/class_10675;
METHOD <init> (Lnet/minecraft/class_2168;Lnet/minecraft/class_10674;Lnet/minecraft/class_10675;)V
ARG 1 commandSource
ARG 2 instanceFinder
ARG 3 blockFinder
METHOD method_56305 getCommandSource ()Lnet/minecraft/class_2168;
CLASS class_9124 Runners
FIELD field_49664 structurePosSupplierMapper Ljava/util/function/UnaryOperator;
METHOD method_67070 builder ()Lnet/minecraft/class_9123$class_9124;
CLASS class_9124 Builder
FIELD field_49664 testInstanceBlockFinderMapper Ljava/util/function/UnaryOperator;
FIELD field_56220 testInstanceFinderMapper Ljava/util/function/UnaryOperator;
METHOD <init> (Ljava/util/function/UnaryOperator;Ljava/util/function/UnaryOperator;)V
ARG 2 testFunctionsSupplierMapper
ARG 1 testInstanceFinderMapper
ARG 2 testInstanceBlockFinderMapper
METHOD method_56309 nearest (Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/class_9123;
ARG 1 context
METHOD method_56310 surface (Lcom/mojang/brigadier/context/CommandContext;I)Lnet/minecraft/class_9123;
Expand All @@ -27,7 +34,18 @@ CLASS net/minecraft/class_9123 net/minecraft/server/command/TestFinder
ARG 1 count
METHOD method_57966 (ILjava/util/function/Supplier;)Ljava/util/function/Supplier;
ARG 1 supplier
METHOD method_57967 createRunner (Lnet/minecraft/class_2168;Lnet/minecraft/class_10674;Lnet/minecraft/class_10675;)Lnet/minecraft/class_9123;
METHOD method_57967 build (Lnet/minecraft/class_2168;Lnet/minecraft/class_10674;Lnet/minecraft/class_10675;)Lnet/minecraft/class_9123;
ARG 1 source
ARG 2 instanceFinder
ARG 3 blockFinder
METHOD method_57970 repeating (I)Ljava/util/function/UnaryOperator;
ARG 0 count
METHOD method_67071 selector (Lcom/mojang/brigadier/context/CommandContext;Ljava/util/Collection;)Lnet/minecraft/class_9123;
ARG 1 context
ARG 2 selected
METHOD method_67072 (Ljava/util/function/Supplier;)Ljava/util/function/Supplier;
ARG 0 finder
METHOD method_67073 (ZLnet/minecraft/class_6880$class_6883;)Z
ARG 1 instance
METHOD method_67074 (Ljava/util/function/Supplier;)Ljava/util/function/Supplier;
ARG 0 finder
25 changes: 25 additions & 0 deletions mappings/net/minecraft/test/Batches.mapping
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
CLASS net/minecraft/class_9113 net/minecraft/test/Batches
FIELD field_48467 BATCH_SIZE I
FIELD field_56170 DEFAULT_DECORATOR Lnet/minecraft/class_9113$class_10658;
METHOD method_56188 defaultBatcher ()Lnet/minecraft/class_4520$class_9116;
METHOD method_56192 (Lnet/minecraft/class_6880;Ljava/util/List;J)Lnet/minecraft/class_4514;
ARG 1 states
Expand All @@ -8,7 +9,31 @@ CLASS net/minecraft/class_9113 net/minecraft/test/Batches
ARG 1 states
METHOD method_56195 create (Ljava/util/Collection;Lnet/minecraft/class_6880;I)Lnet/minecraft/class_4514;
ARG 0 states
ARG 1 environment
ARG 2 index
METHOD method_56196 (ILjava/util/Map$Entry;)Ljava/util/stream/Stream;
ARG 1 entry
METHOD method_61092 batcher (I)Lnet/minecraft/class_4520$class_9116;
ARG 0 batchSize
METHOD method_66925 batch (Ljava/util/Collection;Lnet/minecraft/class_9113$class_10658;Lnet/minecraft/class_3218;)Ljava/util/List;
ARG 0 instances
ARG 1 decorator
ARG 2 world
METHOD method_66926 (Ljava/util/Map$Entry;)Ljava/util/stream/Stream;
ARG 0 entry
METHOD method_66927 (Lnet/minecraft/class_6880$class_6883;Lnet/minecraft/class_3218;)Ljava/util/stream/Stream;
ARG 0 instance
ARG 1 world
METHOD method_66928 (Lnet/minecraft/class_9113$class_10658;Lnet/minecraft/class_3218;Lnet/minecraft/class_6880$class_6883;)Ljava/util/stream/Stream;
ARG 2 instance
METHOD method_66929 (Lnet/minecraft/class_4517;)Lnet/minecraft/class_6880;
ARG 0 state
METHOD method_66930 (Lnet/minecraft/class_6880;Ljava/util/List;J)Lnet/minecraft/class_4514;
ARG 1 states
ARG 2 index
METHOD method_66931 (Lnet/minecraft/class_4517;)Lnet/minecraft/class_6880;
ARG 0 state
CLASS class_10658 Decorator
METHOD decorate (Lnet/minecraft/class_6880$class_6883;Lnet/minecraft/class_3218;)Ljava/util/stream/Stream;
ARG 1 instance
ARG 2 world
11 changes: 8 additions & 3 deletions mappings/net/minecraft/test/BlockBasedTestInstance.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,17 @@ CLASS net/minecraft/class_10654 net/minecraft/test/BlockBasedTestInstance
FIELD field_56162 CODEC Lcom/mojang/serialization/MapCodec;
METHOD method_66906 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
ARG 0 instance
METHOD method_66909 (Lnet/minecraft/class_4516;Lnet/minecraft/class_10641;)Lnet/minecraft/class_2338;
METHOD method_66908 (Lnet/minecraft/class_4516;Lnet/minecraft/class_10637;)V
ARG 1 testBlockEntity
METHOD method_66909 findTestBlock (Lnet/minecraft/class_4516;Lnet/minecraft/class_10641;)Lnet/minecraft/class_2338;
ARG 1 context
ARG 2 mode
METHOD method_66911 (Lnet/minecraft/class_4516;Lnet/minecraft/class_10641;Ljava/util/function/Consumer;)V
METHOD method_66910 (Lnet/minecraft/class_4516;Lnet/minecraft/class_10641;Ljava/util/List;Lnet/minecraft/class_2338;)V
ARG 3 pos
METHOD method_66911 handleTrigger (Lnet/minecraft/class_4516;Lnet/minecraft/class_10641;Ljava/util/function/Consumer;)V
ARG 1 context
ARG 2 mode
METHOD method_66914 (Lnet/minecraft/class_4516;Lnet/minecraft/class_10641;)Ljava/util/List;
ARG 3 callback
METHOD method_66914 findTestBlocks (Lnet/minecraft/class_4516;Lnet/minecraft/class_10641;)Ljava/util/List;
ARG 1 context
ARG 2 mode
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
CLASS net/minecraft/class_10655 net/minecraft/test/TestFunctions
CLASS net/minecraft/class_10655 net/minecraft/test/BuiltinTestFunctions
FIELD field_56164 ALWAYS_PASS_FUNCTION Ljava/util/function/Consumer;
METHOD method_66915 of (Ljava/lang/String;)Lnet/minecraft/class_5321;
ARG 0 id
METHOD method_66917 registerAndGetDefault (Lnet/minecraft/class_2378;)Ljava/util/function/Consumer;
Expand Down
6 changes: 6 additions & 0 deletions mappings/net/minecraft/test/GameTestException.mapping
Original file line number Diff line number Diff line change
@@ -1 +1,7 @@
CLASS net/minecraft/class_4512 net/minecraft/test/GameTestException
FIELD field_56168 message Lnet/minecraft/class_2561;
FIELD field_56169 tick I
METHOD <init> (Lnet/minecraft/class_2561;I)V
ARG 1 message
ARG 2 tick
METHOD method_66924 getText ()Lnet/minecraft/class_2561;
12 changes: 10 additions & 2 deletions mappings/net/minecraft/test/GameTestState.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ CLASS net/minecraft/class_4517 net/minecraft/test/GameTestState
FIELD field_47173 initialized Z
FIELD field_47174 tickedOnce Z
FIELD field_48469 testAttemptConfig Lnet/minecraft/class_9118;
FIELD field_56173 testInstance Lnet/minecraft/class_6880$class_6883;
FIELD field_56173 instanceEntry Lnet/minecraft/class_6880$class_6883;
FIELD field_56174 testBlockPos Lnet/minecraft/class_2338;
FIELD field_56175 rotation Lnet/minecraft/class_2470;
FIELD field_56176 blockEntity Lnet/minecraft/class_10638;
METHOD <init> (Lnet/minecraft/class_6880$class_6883;Lnet/minecraft/class_2470;Lnet/minecraft/class_3218;Lnet/minecraft/class_9118;)V
ARG 1 testInstance
ARG 1 instanceEntry
ARG 2 rotation
ARG 3 world
ARG 4 testAttemptConfig
Expand Down Expand Up @@ -74,6 +74,14 @@ CLASS net/minecraft/class_4517 net/minecraft/test/GameTestState
METHOD method_64385 getOrigin ()Lnet/minecraft/class_2338;
METHOD method_66949 setTestBlockPos (Lnet/minecraft/class_2338;)V
ARG 1 testBlockPos
METHOD method_66950 placeTestInstance (Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_3218;)Lnet/minecraft/class_10638;
ARG 1 pos
ARG 2 rotation
ARG 3 world
METHOD method_66951 getId ()Lnet/minecraft/class_2960;
METHOD method_66952 (Lnet/minecraft/class_4518;)V
ARG 1 listener
METHOD method_66953 getTestInstanceBlockEntity ()Lnet/minecraft/class_10638;
METHOD method_66954 getStructure ()Lnet/minecraft/class_2960;
METHOD method_66955 getInstance ()Lnet/minecraft/class_10660;
METHOD method_66956 getInstanceEntry ()Lnet/minecraft/class_6880$class_6883;
2 changes: 2 additions & 0 deletions mappings/net/minecraft/test/PositionedException.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@ CLASS net/minecraft/class_4513 net/minecraft/test/PositionedException
FIELD field_20541 pos Lnet/minecraft/class_2338;
FIELD field_20542 relativePos Lnet/minecraft/class_2338;
METHOD <init> (Lnet/minecraft/class_2561;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;I)V
ARG 1 message
ARG 2 pos
ARG 3 relativePos
ARG 4 tick
METHOD method_22150 getDebugMessage ()Ljava/lang/String;
METHOD method_22151 getPos ()Lnet/minecraft/class_2338;
METHOD method_35940 getRelativePos ()Lnet/minecraft/class_2338;
6 changes: 6 additions & 0 deletions mappings/net/minecraft/test/RuntimeTestInstances.mapping
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
CLASS net/minecraft/class_10656 net/minecraft/test/RuntimeTestInstances
FIELD field_56165 INSTANCES Ljava/util/Set;
METHOD method_66918 stream ()Ljava/util/stream/Stream;
METHOD method_66919 add (Lnet/minecraft/class_6880$class_6883;)V
ARG 0 instance
METHOD method_66920 clear ()V
8 changes: 8 additions & 0 deletions mappings/net/minecraft/test/StructureTestListener.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,11 @@ CLASS net/minecraft/class_5624 net/minecraft/test/StructureTestListener
ARG 1 state
ARG 2 context
ARG 3 lastPassed
METHOD method_66988 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Ljava/util/Optional;
ARG 1 pos
METHOD method_66989 (Lnet/minecraft/class_10638;)V
ARG 0 testInstanceBlockEntity
METHOD method_66990 (Lnet/minecraft/class_2561;Lnet/minecraft/class_10638;)V
ARG 1 testInstanceBlockEntity
METHOD method_66991 getTestInstanceBlockEntity (Lnet/minecraft/class_4517;)Ljava/util/Optional;
ARG 0 state
Loading

0 comments on commit b01209e

Please sign in to comment.