-
Notifications
You must be signed in to change notification settings - Fork 387
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch '23w45a' into 23w45a-stuff
- Loading branch information
Showing
9 changed files
with
159 additions
and
16 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 2 additions & 0 deletions
2
mappings/net/minecraft/block/entity/TrialSpawnerBlockEntity.mapping
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,7 @@ | ||
| CLASS net/minecraft/class_8961 net/minecraft/block/entity/TrialSpawnerBlockEntity | ||
| FIELD field_47354 LOGGER Lorg/slf4j/Logger; | ||
| FIELD field_47355 spawner Lnet/minecraft/class_8963; | ||
| METHOD <init> (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V | ||
| ARG 1 pos | ||
| ARG 2 state | ||
| METHOD method_55150 getSpawner ()Lnet/minecraft/class_8963; |
4 changes: 2 additions & 2 deletions
4
...net/minecraft/util/EntityDetector.mapping → ...ock/entity/spawner/EntityDetector.mapping
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
62 changes: 62 additions & 0 deletions
62
mappings/net/minecraft/block/entity/spawner/TrialSpawnerData.mapping
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| CLASS net/minecraft/class_8966 net/minecraft/block/entity/spawner/TrialSpawnerData | ||
| FIELD field_47369 SPAWN_DATA_KEY Ljava/lang/String; | ||
| FIELD field_47371 players Ljava/util/Set; | ||
| FIELD field_47372 spawnedMobsAlive Ljava/util/Set; | ||
| FIELD field_47373 cooldownEnd J | ||
| FIELD field_47374 nextMobSpawnsAt J | ||
| FIELD field_47375 totalSpawnedMobs I | ||
| FIELD field_47376 spawnData Ljava/util/Optional; | ||
| FIELD field_47377 rewardLootTable Ljava/util/Optional; | ||
| FIELD field_47378 spawnDataPool Lnet/minecraft/class_6005; | ||
| FIELD field_47379 displayEntity Lnet/minecraft/class_1297; | ||
| FIELD field_47380 displayEntityRotation D | ||
| FIELD field_47381 lastDisplayEntityRotation D | ||
| FIELD field_47382 NEXT_MOB_SPAWNS_AT_KEY Ljava/lang/String; | ||
| METHOD <init> (Ljava/util/Set;Ljava/util/Set;JJILjava/util/Optional;Ljava/util/Optional;)V | ||
| ARG 1 players | ||
| ARG 2 spawnedMobsAlive | ||
| ARG 3 cooldownEnd | ||
| ARG 5 nextMobSpawnsAt | ||
| ARG 7 totalSpawnedMobs | ||
| ARG 8 spawnData | ||
| ARG 9 rewardLootTable | ||
| METHOD method_55182 reset ()V | ||
| METHOD method_55183 isCooldownOver (Lnet/minecraft/class_3218;)Z | ||
| ARG 1 world | ||
| METHOD method_55184 isCooldownPast (Lnet/minecraft/class_3218;Lnet/minecraft/class_8965;F)Z | ||
| ARG 1 world | ||
| ARG 3 position | ||
| METHOD method_55185 canSpawnMore (Lnet/minecraft/class_3218;Lnet/minecraft/class_8965;I)Z | ||
| ARG 1 world | ||
| ARG 3 additionalPlayers | ||
| METHOD method_55186 updatePlayers (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_8962;I)V | ||
| ARG 1 world | ||
| ARG 2 pos | ||
| ARG 3 entityDetector | ||
| ARG 4 range | ||
| METHOD method_55188 getSpawnData (Lnet/minecraft/class_8963;Lnet/minecraft/class_5819;)Lnet/minecraft/class_1952; | ||
| ARG 1 logic | ||
| ARG 2 random | ||
| METHOD method_55189 setEntityType (Lnet/minecraft/class_8963;Lnet/minecraft/class_5819;Lnet/minecraft/class_1299;)V | ||
| ARG 1 logic | ||
| ARG 2 random | ||
| ARG 3 type | ||
| METHOD method_55190 setDisplayEntity (Lnet/minecraft/class_8963;Lnet/minecraft/class_1937;Lnet/minecraft/class_8967;)Lnet/minecraft/class_1297; | ||
| ARG 1 logic | ||
| ARG 2 world | ||
| ARG 3 state | ||
| METHOD method_55192 hasSpawedAllMobs (Lnet/minecraft/class_8965;I)Z | ||
| ARG 2 additionalPlayers | ||
| METHOD method_55194 getSpawnDataNbt (Lnet/minecraft/class_8967;)Lnet/minecraft/class_2487; | ||
| ARG 1 state | ||
| METHOD method_55195 getAdditionalPlayers (Lnet/minecraft/class_2338;)I | ||
| ARG 1 pos | ||
| METHOD method_55196 (Lnet/minecraft/class_2487;Lnet/minecraft/class_1952;)V | ||
| ARG 1 spawnData | ||
| METHOD method_55197 hasSpawnData ()Z | ||
| METHOD method_55198 isCooldownAtRepeating (Lnet/minecraft/class_3218;Lnet/minecraft/class_8965;F)Z | ||
| ARG 1 world | ||
| ARG 3 position | ||
| METHOD method_55200 areMobsDead ()Z | ||
| METHOD method_55202 getDisplayEntityRotation ()D | ||
| METHOD method_55204 getLastDisplayEntityRotation ()D |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
59 changes: 57 additions & 2 deletions
59
mappings/net/minecraft/block/enums/TrialSpawnerState.mapping
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,59 @@ | ||
| CLASS net/minecraft/class_8967 net/minecraft/block/enums/TrialSpawnerState | ||
| FIELD field_47391 name Ljava/lang/String; | ||
| FIELD field_47390 EJECT_REWARDS_COOLDOWN I | ||
| FIELD field_47391 id Ljava/lang/String; | ||
| FIELD field_47392 luminance I | ||
| FIELD field_47393 displayRotationSpeed D | ||
| FIELD field_47394 particleEmitter Lnet/minecraft/class_8967$class_8969; | ||
| FIELD field_47395 playsSound Z | ||
| METHOD <init> (Ljava/lang/String;ILjava/lang/String;ILnet/minecraft/class_8967$class_8969;DZ)V | ||
| ARG 3 name | ||
| ARG 3 id | ||
| ARG 4 luminance | ||
| ARG 5 particleEmitter | ||
| ARG 6 displayRotationSpeed | ||
| ARG 8 playsSound | ||
| METHOD method_55209 getLuminance ()I | ||
| METHOD method_55210 emitParticles (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V | ||
| ARG 1 world | ||
| ARG 2 pos | ||
| METHOD method_55211 (Lnet/minecraft/class_8963;Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_2960;)V | ||
| ARG 3 lootTable | ||
| METHOD method_55212 (Lnet/minecraft/class_8966;Lnet/minecraft/class_3218;Lnet/minecraft/class_8965;Lnet/minecraft/class_8963;Ljava/util/UUID;)V | ||
| ARG 4 uuid | ||
| METHOD method_55213 (Lnet/minecraft/class_8966;Lnet/minecraft/class_8963;Lnet/minecraft/class_6008$class_6010;)V | ||
| ARG 2 spawnData | ||
| METHOD method_55214 tick (Lnet/minecraft/class_2338;Lnet/minecraft/class_8963;Lnet/minecraft/class_3218;)Lnet/minecraft/class_8967; | ||
| ARG 1 pos | ||
| ARG 2 logic | ||
| ARG 3 world | ||
| METHOD method_55215 getDisplayRotationSpeed ()D | ||
| METHOD method_55216 doesDisplayRotate ()Z | ||
| METHOD method_55217 playsSound ()Z | ||
| CLASS class_8969 ParticleEmitter | ||
| FIELD field_47401 NONE Lnet/minecraft/class_8967$class_8969; | ||
| FIELD field_47402 WAITING Lnet/minecraft/class_8967$class_8969; | ||
| FIELD field_47403 ACTIVE Lnet/minecraft/class_8967$class_8969; | ||
| FIELD field_47404 COOLDOWN Lnet/minecraft/class_8967$class_8969; | ||
| METHOD emit (Lnet/minecraft/class_1937;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;)V | ||
| ARG 1 world | ||
| ARG 2 random | ||
| ARG 3 pos | ||
| METHOD method_55219 (Lnet/minecraft/class_1937;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;)V | ||
| ARG 0 world | ||
| ARG 1 random | ||
| ARG 2 pos | ||
| METHOD method_55220 emitParticle (Lnet/minecraft/class_2400;Lnet/minecraft/class_243;Lnet/minecraft/class_1937;)V | ||
| ARG 0 type | ||
| ARG 1 pos | ||
| ARG 2 world | ||
| METHOD method_55221 (Lnet/minecraft/class_1937;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;)V | ||
| ARG 0 wolrd | ||
| ARG 1 random | ||
| ARG 2 pos | ||
| METHOD method_55222 (Lnet/minecraft/class_1937;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;)V | ||
| ARG 0 world | ||
| ARG 1 random | ||
| ARG 2 pos | ||
| METHOD method_55223 (Lnet/minecraft/class_1937;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;)V | ||
| ARG 0 world | ||
| ARG 1 random | ||
| ARG 2 pos |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| CLASS net/minecraft/class_8965 | ||
| METHOD method_55179 getTotalMobs (I)I | ||
| ARG 1 additionalPlayers | ||
| METHOD method_55181 getSimultaneousMobs (I)I | ||
| ARG 1 additionalPlayers |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| CLASS net/minecraft/class_8984 | ||
| FIELD field_47464 entityRenderDispatcher Lnet/minecraft/class_898; | ||
| METHOD <init> (Lnet/minecraft/class_5614$class_5615;)V | ||
| ARG 1 context |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters