diff --git a/mappings/net/minecraft/block/Blocks.mapping b/mappings/net/minecraft/block/Blocks.mapping index c483b23495..94668f620c 100644 --- a/mappings/net/minecraft/block/Blocks.mapping +++ b/mappings/net/minecraft/block/Blocks.mapping @@ -192,6 +192,8 @@ CLASS net/minecraft/class_2246 net/minecraft/block/Blocks ARG 0 state ARG 1 world ARG 2 pos + METHOD method_55132 (Lnet/minecraft/class_2680;)I + ARG 0 state METHOD method_55133 createOldStairsBlock (Lnet/minecraft/class_2248;)Lnet/minecraft/class_2248; ARG 0 block METHOD method_9492 register (Ljava/lang/String;Lnet/minecraft/class_2248;)Lnet/minecraft/class_2248; diff --git a/mappings/net/minecraft/block/entity/TrialSpawnerBlockEntity.mapping b/mappings/net/minecraft/block/entity/TrialSpawnerBlockEntity.mapping index 38409db27b..846759018d 100644 --- a/mappings/net/minecraft/block/entity/TrialSpawnerBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/TrialSpawnerBlockEntity.mapping @@ -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 (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 1 pos ARG 2 state + METHOD method_55150 getSpawner ()Lnet/minecraft/class_8963; diff --git a/mappings/net/minecraft/util/EntityDetector.mapping b/mappings/net/minecraft/block/entity/spawner/EntityDetector.mapping similarity index 79% rename from mappings/net/minecraft/util/EntityDetector.mapping rename to mappings/net/minecraft/block/entity/spawner/EntityDetector.mapping index 0a31961317..92eba2c5c7 100644 --- a/mappings/net/minecraft/util/EntityDetector.mapping +++ b/mappings/net/minecraft/block/entity/spawner/EntityDetector.mapping @@ -1,5 +1,5 @@ -CLASS net/minecraft/class_8962 net/minecraft/util/EntityDetector - FIELD field_47356 SURVIVAL_PLAYERS Lnet/minecraft/class_8962; +CLASS net/minecraft/class_8962 net/minecraft/block/entity/spawner/EntityDetector + FIELD field_47356 SURVIVAL_PLAYER Lnet/minecraft/class_8962; FIELD field_47357 SHEEP Lnet/minecraft/class_8962; METHOD detect (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;I)Ljava/util/List; ARG 1 world diff --git a/mappings/net/minecraft/block/entity/spawner/TrialSpawnerData.mapping b/mappings/net/minecraft/block/entity/spawner/TrialSpawnerData.mapping new file mode 100644 index 0000000000..d9d0811197 --- /dev/null +++ b/mappings/net/minecraft/block/entity/spawner/TrialSpawnerData.mapping @@ -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 (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 diff --git a/mappings/net/minecraft/block/entity/TrialSpawnerManager.mapping b/mappings/net/minecraft/block/entity/spawner/TrialSpawnerLogic.mapping similarity index 63% rename from mappings/net/minecraft/block/entity/TrialSpawnerManager.mapping rename to mappings/net/minecraft/block/entity/spawner/TrialSpawnerLogic.mapping index df748f542c..d3579a83d0 100644 --- a/mappings/net/minecraft/block/entity/TrialSpawnerManager.mapping +++ b/mappings/net/minecraft/block/entity/spawner/TrialSpawnerLogic.mapping @@ -1,33 +1,34 @@ -CLASS net/minecraft/class_8963 net/minecraft/block/entity/TrialSpawnerManager +CLASS net/minecraft/class_8963 net/minecraft/block/entity/spawner/TrialSpawnerLogic FIELD field_47359 MAX_ENTITY_DISTANCE I FIELD field_47360 MAX_ENTITY_DISTANCE_SQUARED I + FIELD field_47363 data Lnet/minecraft/class_8966; FIELD field_47364 trialSpawner Lnet/minecraft/class_8963$class_8964; FIELD field_47365 entityDetector Lnet/minecraft/class_8962; METHOD (Lnet/minecraft/class_8963$class_8964;Lnet/minecraft/class_8962;)V ARG 1 trialSpawner ARG 2 entityDetector METHOD (Lnet/minecraft/class_8965;Lnet/minecraft/class_8966;Lnet/minecraft/class_8963$class_8964;Lnet/minecraft/class_8962;)V + ARG 2 data ARG 3 trialSpawner ARG 4 entityDetector - METHOD method_55158 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Ljava/util/Optional; + METHOD method_55156 codec ()Lcom/mojang/serialization/Codec; + METHOD method_55158 trySpawnMob (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Ljava/util/Optional; ARG 1 world ARG 2 pos - METHOD method_55159 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_2960;)V + METHOD method_55159 ejectLootTable (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_2960;)V ARG 1 world ARG 2 pos - ARG 3 lootTableId - METHOD method_55160 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Ljava/util/UUID;)Z - ARG 0 world - ARG 1 pos - ARG 2 uuid - METHOD method_55162 shouldTrySpawnMobs (Lnet/minecraft/class_1937;)Z + ARG 3 lootTable + METHOD method_55161 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 1 instance + METHOD method_55162 canActivate (Lnet/minecraft/class_1937;)Z ARG 1 world METHOD method_55163 setSpawnerState (Lnet/minecraft/class_1937;Lnet/minecraft/class_8967;)V ARG 1 world ARG 2 spawnerState METHOD method_55164 (Lnet/minecraft/class_1937;Lnet/minecraft/class_243;Lnet/minecraft/class_243;)Z ARG 0 world - METHOD method_55165 (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V + METHOD method_55165 tickClient (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V ARG 1 world ARG 2 pos METHOD method_55166 (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)V @@ -39,18 +40,21 @@ CLASS net/minecraft/class_8963 net/minecraft/block/entity/TrialSpawnerManager ARG 1 pos ARG 2 random METHOD method_55168 setEntityDetector (Lnet/minecraft/class_8962;)V - ARG 1 entityDetector - METHOD method_55171 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)V + ARG 1 detector + METHOD method_55171 tickServer (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)V ARG 1 world ARG 2 pos METHOD method_55173 (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)V ARG 0 world ARG 1 pos ARG 2 random + METHOD method_55174 getData ()Lnet/minecraft/class_8966; METHOD method_55175 getSpawnerState ()Lnet/minecraft/class_8967; + METHOD method_55176 updateListeners ()V METHOD method_55177 getEntityDetector ()Lnet/minecraft/class_8962; CLASS class_8964 TrialSpawner METHOD method_55146 setSpawnerState (Lnet/minecraft/class_1937;Lnet/minecraft/class_8967;)V ARG 1 world ARG 2 spawnerState METHOD method_55151 getSpawnerState ()Lnet/minecraft/class_8967; + METHOD method_55152 updateListeners ()V diff --git a/mappings/net/minecraft/block/enums/TrialSpawnerState.mapping b/mappings/net/minecraft/block/enums/TrialSpawnerState.mapping index 8aa07eb3dc..127071bf2d 100644 --- a/mappings/net/minecraft/block/enums/TrialSpawnerState.mapping +++ b/mappings/net/minecraft/block/enums/TrialSpawnerState.mapping @@ -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 (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 diff --git a/mappings/net/minecraft/class_8965.mapping b/mappings/net/minecraft/class_8965.mapping new file mode 100644 index 0000000000..c7d4c40b29 --- /dev/null +++ b/mappings/net/minecraft/class_8965.mapping @@ -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 diff --git a/mappings/net/minecraft/class_8984.mapping b/mappings/net/minecraft/class_8984.mapping new file mode 100644 index 0000000000..37b4a514bb --- /dev/null +++ b/mappings/net/minecraft/class_8984.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_8984 + FIELD field_47464 entityRenderDispatcher Lnet/minecraft/class_898; + METHOD (Lnet/minecraft/class_5614$class_5615;)V + ARG 1 context diff --git a/mappings/net/minecraft/client/render/block/entity/MobSpawnerBlockEntityRenderer.mapping b/mappings/net/minecraft/client/render/block/entity/MobSpawnerBlockEntityRenderer.mapping index 0723e89d9e..9e514b41ab 100644 --- a/mappings/net/minecraft/client/render/block/entity/MobSpawnerBlockEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/block/entity/MobSpawnerBlockEntityRenderer.mapping @@ -2,3 +2,12 @@ CLASS net/minecraft/class_839 net/minecraft/client/render/block/entity/MobSpawne FIELD field_38885 entityRenderDispatcher Lnet/minecraft/class_898; METHOD (Lnet/minecraft/class_5614$class_5615;)V ARG 1 ctx + METHOD method_55253 render (FLnet/minecraft/class_4587;Lnet/minecraft/class_4597;ILnet/minecraft/class_1297;Lnet/minecraft/class_898;DD)V + ARG 0 tickDelta + ARG 1 matrices + ARG 2 vertexConsumers + ARG 3 light + ARG 4 entity + ARG 5 entityRenderDispatcher + ARG 6 lastRotation + ARG 8 rotation