diff --git a/build.gradle b/build.gradle index c46a5e2fd8..95fe3cbc65 100644 --- a/build.gradle +++ b/build.gradle @@ -26,7 +26,7 @@ plugins { id 'net.fabricmc.filament' version '0.3.0' } -def minecraft_version = "1.17-pre1" +def minecraft_version = "1.17-pre2" def ENV = System.getenv() // Fetch build number from Github Actions diff --git a/mappings/net/minecraft/client/font/GlyphRenderer.mapping b/mappings/net/minecraft/client/font/GlyphRenderer.mapping index 0314497303..d04e4a552c 100644 --- a/mappings/net/minecraft/client/font/GlyphRenderer.mapping +++ b/mappings/net/minecraft/client/font/GlyphRenderer.mapping @@ -9,17 +9,9 @@ CLASS net/minecraft/class_382 net/minecraft/client/font/GlyphRenderer FIELD field_2278 maxY F FIELD field_2279 minY F FIELD field_2280 maxX F - METHOD (Lnet/minecraft/class_1921;Lnet/minecraft/class_1921;FFFFFFFF)V + METHOD (Lnet/minecraft/class_1921;Lnet/minecraft/class_1921;Lnet/minecraft/class_1921;FFFFFFFF)V ARG 1 textLayer ARG 2 seeThroughTextLayer - ARG 3 minU - ARG 4 maxU - ARG 5 minV - ARG 6 maxV - ARG 7 minX - ARG 8 maxX - ARG 9 minY - ARG 10 maxY METHOD method_2025 draw (ZFFLnet/minecraft/class_1159;Lnet/minecraft/class_4588;FFFFI)V ARG 1 italic ARG 2 x @@ -36,8 +28,7 @@ CLASS net/minecraft/class_382 net/minecraft/client/font/GlyphRenderer ARG 2 matrix ARG 3 vertexConsumer ARG 4 light - METHOD method_24045 getLayer (Z)Lnet/minecraft/class_1921; - ARG 1 seeThrough + METHOD method_24045 getLayer (Lnet/minecraft/class_327$class_6415;)Lnet/minecraft/class_1921; CLASS class_328 Rectangle FIELD field_2003 green F FIELD field_2004 red F diff --git a/mappings/net/minecraft/client/font/TextRenderer.mapping b/mappings/net/minecraft/client/font/TextRenderer.mapping index a6cf354e78..fae8e0ec38 100644 --- a/mappings/net/minecraft/client/font/TextRenderer.mapping +++ b/mappings/net/minecraft/client/font/TextRenderer.mapping @@ -258,7 +258,6 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer FIELD field_24245 blue F FIELD field_24246 alpha F FIELD field_24247 matrix Lnet/minecraft/class_1159; - FIELD field_24248 seeThrough Z FIELD field_24249 light I FIELD field_24250 x F FIELD field_24251 y F diff --git a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookWidget.mapping b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookWidget.mapping index fe2d0fafd5..f507142d5a 100644 --- a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookWidget.mapping @@ -25,8 +25,7 @@ CLASS net/minecraft/class_507 net/minecraft/client/gui/screen/recipebook/RecipeB ARG 1 search METHOD method_2577 (Lnet/minecraft/class_516;)V ARG 1 resultCollection - METHOD method_2579 reset (Z)V - ARG 1 narrow + METHOD method_2579 reset ()V METHOD method_2580 (Lnet/minecraft/class_516;)Z ARG 0 resultCollection METHOD method_2581 drawGhostSlots (Lnet/minecraft/class_4587;IIZF)V @@ -49,10 +48,7 @@ CLASS net/minecraft/class_507 net/minecraft/client/gui/screen/recipebook/RecipeB ARG 1 opened METHOD method_2594 (Lit/unimi/dsi/fastutil/objects/ObjectSet;Lnet/minecraft/class_516;)Z ARG 0 resultCollection - METHOD method_2595 findLeftEdge (ZII)I - ARG 1 narrow - ARG 2 width - ARG 3 parentWidth + METHOD method_2595 findLeftEdge (II)I METHOD method_2596 showGhostRecipe (Lnet/minecraft/class_1860;Ljava/util/List;)V ARG 1 recipe ARG 2 slots diff --git a/mappings/net/minecraft/entity/mob/Angerable.mapping b/mappings/net/minecraft/entity/mob/Angerable.mapping index 7b541927da..e7701e9169 100644 --- a/mappings/net/minecraft/entity/mob/Angerable.mapping +++ b/mappings/net/minecraft/entity/mob/Angerable.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_5354 net/minecraft/entity/mob/Angerable FIELD field_30093 ANGER_TIME_KEY Ljava/lang/String; FIELD field_30094 ANGRY_AT_KEY Ljava/lang/String; + METHOD method_18395 canTarget (Lnet/minecraft/class_1309;)Z METHOD method_29505 setAttacking (Lnet/minecraft/class_1657;)V ARG 1 attacking METHOD method_29507 getAngerTime ()I @@ -17,7 +18,6 @@ CLASS net/minecraft/class_5354 net/minecraft/entity/mob/Angerable METHOD method_29514 setAngerTime (I)V ARG 1 ticks METHOD method_29515 shouldAngerAt (Lnet/minecraft/class_1309;)Z - ARG 1 entity METHOD method_29516 forgive (Lnet/minecraft/class_1657;)V ARG 1 player METHOD method_29517 writeAngerToNbt (Lnet/minecraft/class_2487;)V diff --git a/mappings/net/minecraft/entity/projectile/FireballEntity.mapping b/mappings/net/minecraft/entity/projectile/FireballEntity.mapping index 70ac5c95e1..cf66d1f598 100644 --- a/mappings/net/minecraft/entity/projectile/FireballEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/FireballEntity.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_1674 net/minecraft/entity/projectile/FireballEntity FIELD field_7624 explosionPower I - METHOD (Lnet/minecraft/class_1937;Lnet/minecraft/class_1309;DDD)V + METHOD (Lnet/minecraft/class_1937;Lnet/minecraft/class_1309;DDDI)V ARG 1 world ARG 2 owner ARG 3 velocityX diff --git a/mappings/net/minecraft/item/map/MapIcon.mapping b/mappings/net/minecraft/item/map/MapIcon.mapping index 460a7501c3..8895121754 100644 --- a/mappings/net/minecraft/item/map/MapIcon.mapping +++ b/mappings/net/minecraft/item/map/MapIcon.mapping @@ -23,11 +23,11 @@ CLASS net/minecraft/class_20 net/minecraft/item/map/MapIcon FIELD field_111 alwaysRender Z FIELD field_81 id B FIELD field_82 tintColor I - METHOD (Ljava/lang/String;IZ)V - ARG 3 alwaysRender - METHOD (Ljava/lang/String;IZI)V + METHOD (Ljava/lang/String;IZIZ)V ARG 3 alwaysRender ARG 4 tintColor + METHOD (Ljava/lang/String;IZZ)V + ARG 3 alwaysRender METHOD method_95 isAlwaysRendered ()Z METHOD method_96 getTintColor ()I METHOD method_97 hasTintColor ()Z diff --git a/mappings/net/minecraft/item/map/MapState.mapping b/mappings/net/minecraft/item/map/MapState.mapping index b994b76d8f..bbdab73910 100644 --- a/mappings/net/minecraft/item/map/MapState.mapping +++ b/mappings/net/minecraft/item/map/MapState.mapping @@ -51,7 +51,7 @@ CLASS net/minecraft/class_22 net/minecraft/item/map/MapState ARG 6 z ARG 8 rotation ARG 10 text - METHOD method_108 addBanner (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;)V + METHOD method_108 addBanner (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;)Z ARG 1 world ARG 2 pos METHOD method_109 removeBanner (Lnet/minecraft/class_1922;II)V