diff --git a/build.gradle b/build.gradle index 30f7e04aa3..eee2f8de4d 100644 --- a/build.gradle +++ b/build.gradle @@ -23,7 +23,7 @@ plugins { id 'java' // for jd gen } -def minecraft_version = "20w18a" +def minecraft_version = "20w19a" def ENV = System.getenv() // Fetch build number from Jenkins diff --git a/mappings/net/minecraft/client/font/TextRenderer.mapping b/mappings/net/minecraft/client/font/TextRenderer.mapping index c90b7ea049..a2cfb34821 100644 --- a/mappings/net/minecraft/client/font/TextRenderer.mapping +++ b/mappings/net/minecraft/client/font/TextRenderer.mapping @@ -110,7 +110,7 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer ARG 4 color ARG 5 matrix ARG 6 shadow - ARG 7 rightToLeft + ARG 7 mirror METHOD method_27521 draw (Ljava/lang/String;FFIZLnet/minecraft/class_1159;Lnet/minecraft/class_4597;ZII)I ARG 1 text ARG 2 x @@ -141,7 +141,7 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer ARG 1 text ARG 2 maxWidth ARG 3 backwards - METHOD method_27525 getWidth (Lnet/minecraft/class_2561;)I + METHOD method_27525 getStringWidth (Lnet/minecraft/class_2561;)I ARG 1 text METHOD method_27526 getFontStorage (Lnet/minecraft/class_2960;)Lnet/minecraft/class_377; ARG 1 id @@ -163,35 +163,6 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer ARG 8 seeThrough ARG 9 backgroundColor ARG 10 light - ARG 11 rightToLeft - METHOD method_27517 drawWithShadow (Lnet/minecraft/class_4587;Lnet/minecraft/class_2561;FFI)I - ARG 1 matrices - ARG 2 text - ARG 3 x - ARG 4 y - ARG 5 color - METHOD method_27520 draw (Ljava/lang/String;FFILnet/minecraft/class_1159;ZZ)I - ARG 1 text - ARG 2 x - ARG 3 y - ARG 4 color - ARG 5 matrix - ARG 6 shadow - ARG 7 mirror - METHOD method_27525 getStringWidth (Lnet/minecraft/class_2561;)I - ARG 1 text - METHOD method_27528 draw (Lnet/minecraft/class_4587;Lnet/minecraft/class_2561;FFI)I - ARG 1 matrices - ARG 2 text - ARG 3 x - ARG 4 y - ARG 5 color - METHOD method_27529 (Ljava/lang/String;FFIZLnet/minecraft/class_1159;Lnet/minecraft/class_4597;ZIIZ)I - ARG 1 text - ARG 2 x - ARG 3 y - ARG 4 color - ARG 5 shadow ARG 11 mirror METHOD method_27530 drawLayer (Lnet/minecraft/class_2561;FFIZLnet/minecraft/class_1159;Lnet/minecraft/class_4597;ZII)F ARG 1 text diff --git a/mappings/net/minecraft/client/render/entity/EntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/EntityRenderer.mapping index 8a8342f666..478834fc88 100644 --- a/mappings/net/minecraft/client/render/entity/EntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/EntityRenderer.mapping @@ -7,9 +7,7 @@ CLASS net/minecraft/class_897 net/minecraft/client/render/entity/EntityRenderer METHOD method_23169 getPositionOffset (Lnet/minecraft/class_1297;F)Lnet/minecraft/class_243; ARG 1 entity ARG 2 tickDelta - METHOD method_24087 getBlockLight (Lnet/minecraft/class_1297;F)I - ARG 1 entity - ARG 2 tickDelta + METHOD method_24087 getBlockLight (Lnet/minecraft/class_1297;Lnet/minecraft/class_2338;)I METHOD method_24088 getLight (Lnet/minecraft/class_1297;F)I ARG 1 entity ARG 2 tickDelta diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index c87af63c22..65a3392398 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -5,7 +5,6 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity FIELD field_18066 standingEyeHeight F FIELD field_18276 velocity Lnet/minecraft/class_243; FIELD field_19271 inLava Z - FIELD field_22417 POSE_HEIGHTS Lcom/google/common/collect/ImmutableMap; FIELD field_22467 pos Lnet/minecraft/class_243; FIELD field_22468 blockPos Lnet/minecraft/class_2338; FIELD field_23807 inanimate Z diff --git a/mappings/net/minecraft/entity/EntityCategory.mapping b/mappings/net/minecraft/entity/EntityCategory.mapping index bad293ea53..9f4f3f128b 100644 --- a/mappings/net/minecraft/entity/EntityCategory.mapping +++ b/mappings/net/minecraft/entity/EntityCategory.mapping @@ -4,11 +4,9 @@ CLASS net/minecraft/class_1311 net/minecraft/entity/EntityCategory FIELD field_6297 spawnCap I FIELD field_6298 peaceful Z FIELD field_6304 name Ljava/lang/String; - METHOD (Ljava/lang/String;ILjava/lang/String;IZZ)V - ARG 3 name + METHOD (Ljava/lang/String;ILjava/lang/String;IZI)V ARG 4 spawnCap ARG 5 peaceful - ARG 6 animal METHOD method_6133 getName ()Ljava/lang/String; METHOD method_6134 getSpawnCap ()I METHOD method_6135 isAnimal ()Z diff --git a/mappings/net/minecraft/entity/EntityType.mapping b/mappings/net/minecraft/entity/EntityType.mapping index 847e7075ac..ad5d2d3d17 100644 --- a/mappings/net/minecraft/entity/EntityType.mapping +++ b/mappings/net/minecraft/entity/EntityType.mapping @@ -3,8 +3,6 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType FIELD field_18070 dimensions Lnet/minecraft/class_4048; FIELD field_18981 fireImmune Z FIELD field_19423 spawnableFarFromPlayer Z - FIELD field_22469 immediateDespawnRange I - FIELD field_22470 despawnStartRange I FIELD field_24085 maxTrackDistance I FIELD field_24086 trackTickInterval I FIELD field_6056 saveable Z @@ -14,18 +12,14 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType FIELD field_6094 category Lnet/minecraft/class_1311; FIELD field_6101 factory Lnet/minecraft/class_1299$class_4049; FIELD field_6106 translationKey Ljava/lang/String; - METHOD (Lnet/minecraft/class_1299$class_4049;Lnet/minecraft/class_1311;ZZZZIILnet/minecraft/class_4048;II)V + METHOD (Lnet/minecraft/class_1299$class_4049;Lnet/minecraft/class_1311;ZZZZLnet/minecraft/class_4048;II)V ARG 1 factory ARG 2 category ARG 3 saveable ARG 4 summonable ARG 5 fireImmune ARG 6 spawnableFarFromPlayer - ARG 7 immediateDespawnRange ARG 8 despawnStartRange - ARG 9 dimensions - ARG 10 maxTrackDistance - ARG 11 trackTickInterval METHOD method_16351 getLootTableId ()Lnet/minecraft/class_2960; METHOD method_17683 createSimpleBoundingBox (DDD)Lnet/minecraft/class_238; ARG 1 feetX @@ -53,8 +47,6 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType METHOD method_20210 isIn (Lnet/minecraft/class_3494;)Z ARG 1 tag METHOD method_20814 isSpawnableFarFromPlayer ()Z - METHOD method_24908 getImmediateDespawnRange ()I - METHOD method_24909 getDespawnStartRange ()I METHOD method_5881 loadFromEntityTag (Lnet/minecraft/class_1937;Lnet/minecraft/class_1657;Lnet/minecraft/class_1297;Lnet/minecraft/class_2487;)V ARG 0 world ARG 1 player @@ -118,8 +110,6 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType FIELD field_18071 dimensions Lnet/minecraft/class_4048; FIELD field_18982 fireImmune Z FIELD field_19424 spawnableFarFromPlayer Z - FIELD field_22471 immediateDespawnRange I - FIELD field_22472 despawnStartRange I FIELD field_24087 maxTrackingRange I FIELD field_24088 trackingTickInterval I FIELD field_6148 factory Lnet/minecraft/class_1299$class_4049; @@ -134,8 +124,6 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType ARG 2 height METHOD method_19947 makeFireImmune ()Lnet/minecraft/class_1299$class_1300; METHOD method_20815 spawnableFarFromPlayer ()Lnet/minecraft/class_1299$class_1300; - METHOD method_24910 immediateDespawnRange (I)Lnet/minecraft/class_1299$class_1300; - ARG 1 immediateDespawnRange METHOD method_27299 maxTrackingRange (I)Lnet/minecraft/class_1299$class_1300; ARG 1 maxTrackingRange METHOD method_27300 trackingTickInterval (I)Lnet/minecraft/class_1299$class_1300; diff --git a/mappings/net/minecraft/entity/mob/PiglinBrain.mapping b/mappings/net/minecraft/entity/mob/PiglinBrain.mapping index e55f8140a3..70cf6064fd 100644 --- a/mappings/net/minecraft/entity/mob/PiglinBrain.mapping +++ b/mappings/net/minecraft/entity/mob/PiglinBrain.mapping @@ -27,10 +27,9 @@ CLASS net/minecraft/class_4838 net/minecraft/entity/mob/PiglinBrain METHOD method_24726 loot (Lnet/minecraft/class_4836;Lnet/minecraft/class_1542;)V ARG 0 piglin ARG 1 drop - METHOD method_24727 dropBarteredItem (Lnet/minecraft/class_4836;Lnet/minecraft/class_1657;Lnet/minecraft/class_1799;)V + METHOD method_24727 dropBarteredItem (Lnet/minecraft/class_4836;Lnet/minecraft/class_1657;Ljava/util/List;)V ARG 0 piglin ARG 1 player - ARG 2 stack METHOD method_24728 playerInteract (Lnet/minecraft/class_4836;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;)Z ARG 0 piglin ARG 1 player @@ -40,10 +39,7 @@ CLASS net/minecraft/class_4838 net/minecraft/entity/mob/PiglinBrain METHOD method_24730 canGather (Lnet/minecraft/class_4836;Lnet/minecraft/class_1799;)Z ARG 0 piglin ARG 1 stack - METHOD method_24731 drop (Lnet/minecraft/class_4836;Lnet/minecraft/class_1799;Lnet/minecraft/class_243;)V - ARG 0 piglin - ARG 1 stack - ARG 2 pos + METHOD method_24731 drop (Lnet/minecraft/class_4836;Ljava/util/List;Lnet/minecraft/class_243;)V METHOD method_24732 create (Lnet/minecraft/class_4836;Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_4095; ARG 0 piglin ARG 1 data @@ -119,16 +115,14 @@ CLASS net/minecraft/class_4838 net/minecraft/entity/mob/PiglinBrain METHOD method_24771 runAwayFromClosestTarget (Lnet/minecraft/class_4836;Lnet/minecraft/class_1309;)V ARG 0 piglin ARG 1 target - METHOD method_24772 doBarter (Lnet/minecraft/class_4836;Lnet/minecraft/class_1799;)V + METHOD method_24772 doBarter (Lnet/minecraft/class_4836;Ljava/util/List;)V ARG 0 piglin - ARG 1 stack METHOD method_24773 runAwayFrom (Lnet/minecraft/class_4836;Lnet/minecraft/class_1309;)V ARG 0 piglin ARG 1 target - METHOD method_24774 dropBarteredItem (Lnet/minecraft/class_4836;Lnet/minecraft/class_1799;)V + METHOD method_24774 dropBarteredItem (Lnet/minecraft/class_4836;Ljava/util/List;)V ARG 0 piglin - ARG 1 stack - METHOD method_24776 getBarteredItem (Lnet/minecraft/class_4836;)Lnet/minecraft/class_1799; + METHOD method_24776 getBarteredItem (Lnet/minecraft/class_4836;)Ljava/util/List; ARG 0 piglin METHOD method_24777 getPreferredTarget (Lnet/minecraft/class_4836;)Ljava/util/Optional; ARG 0 piglin diff --git a/mappings/net/minecraft/world/SpawnHelper.mapping b/mappings/net/minecraft/world/SpawnHelper.mapping index fe4b50319f..7ea5d26abd 100644 --- a/mappings/net/minecraft/world/SpawnHelper.mapping +++ b/mappings/net/minecraft/world/SpawnHelper.mapping @@ -99,15 +99,14 @@ CLASS net/minecraft/class_1948 net/minecraft/world/SpawnHelper ARG 3 chunk CLASS class_5262 Info FIELD field_24394 spawningChunkCount I - FIELD field_24395 categoryToCount Lit/unimi/dsi/fastutil/objects/Object2IntMap; + FIELD field_24395 categoryToCount Lit/unimi/dsi/fastutil/objects/Object2IntOpenHashMap; FIELD field_24396 densityField Lnet/minecraft/class_5263; FIELD field_24397 categoryToCountView Lit/unimi/dsi/fastutil/objects/Object2IntMap; FIELD field_24398 cachedPos Lnet/minecraft/class_2338; FIELD field_24399 cachedEntityType Lnet/minecraft/class_1299; FIELD field_24400 cachedDensityMass D - METHOD (ILit/unimi/dsi/fastutil/objects/Object2IntMap;Lnet/minecraft/class_5263;)V + METHOD (ILit/unimi/dsi/fastutil/objects/Object2IntOpenHashMap;Lnet/minecraft/class_5263;)V ARG 1 spawningChunkCount - ARG 2 categoryToCount ARG 3 densityField METHOD method_27823 getSpawningChunkCount ()I METHOD method_27824 test (Lnet/minecraft/class_1299;Lnet/minecraft/class_2338;Lnet/minecraft/class_2791;)Z diff --git a/mappings/net/minecraft/world/storage/StorageIoWorker.mapping b/mappings/net/minecraft/world/storage/StorageIoWorker.mapping index 450145a5b8..8875842ec9 100644 --- a/mappings/net/minecraft/world/storage/StorageIoWorker.mapping +++ b/mappings/net/minecraft/world/storage/StorageIoWorker.mapping @@ -1,15 +1,8 @@ CLASS net/minecraft/class_4698 net/minecraft/world/storage/StorageIoWorker FIELD field_21495 LOGGER Lorg/apache/logging/log4j/Logger; - FIELD field_21496 thread Ljava/lang/Thread; FIELD field_21497 closed Ljava/util/concurrent/atomic/AtomicBoolean; - FIELD field_21498 tasks Ljava/util/Queue; FIELD field_21499 storage Lnet/minecraft/class_2867; FIELD field_21500 results Ljava/util/Map; - FIELD field_21501 active Z - FIELD field_21502 future Ljava/util/concurrent/CompletableFuture; - METHOD (Lnet/minecraft/class_2867;Ljava/lang/String;)V - ARG 1 storage - ARG 2 name METHOD method_23698 completeAll ()Ljava/util/concurrent/CompletableFuture; METHOD method_23700 getNbt (Lnet/minecraft/class_1923;)Lnet/minecraft/class_2487; ARG 1 pos @@ -18,15 +11,8 @@ CLASS net/minecraft/class_4698 net/minecraft/world/storage/StorageIoWorker METHOD method_23703 setResult (Lnet/minecraft/class_1923;Lnet/minecraft/class_2487;)Ljava/util/concurrent/CompletableFuture; ARG 1 pos ARG 2 nbt - METHOD method_23709 run (Ljava/util/function/Function;)Ljava/util/concurrent/CompletableFuture; - ARG 1 taskFactory - METHOD method_23710 shutdown ()Ljava/util/concurrent/CompletableFuture; - METHOD method_23715 park ()V - METHOD method_23717 work ()V - METHOD method_23719 writeResult ()Z - METHOD method_23720 writeAll ()V - METHOD method_23721 finish ()V - METHOD method_23722 runTask ()Z + METHOD method_23709 run (Ljava/util/function/Supplier;)Ljava/util/concurrent/CompletableFuture; + METHOD method_23719 writeResult ()V CLASS class_4699 Result FIELD field_21503 nbt Lnet/minecraft/class_2487; FIELD field_21504 future Ljava/util/concurrent/CompletableFuture;