From ea08e25f4f0eb0e4c0cc5c5c7a47e8b2d7f7d3dc Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Tue, 14 Jan 2020 20:22:47 +0000 Subject: [PATCH] 1.15.2-pre1 --- build.gradle | 2 +- .../realmsclient/RealmsMainScreen.mapping | 3 -- .../realmsclient/client/RealmsClient.mapping | 3 -- .../screens/RealmsCreateTrialScreen.mapping | 21 ---------- .../realmsclient/util/RealmsTasks.mapping | 8 ---- .../minecraft/block/NetherPortalBlock.mapping | 1 - .../block/entity/BannerBlockEntity.mapping | 7 ---- .../block/sapling/SaplingGenerator.mapping | 2 +- .../minecraft/client/font/FontManager.mapping | 1 - .../client/font/TrueTypeFont.mapping | 10 ----- .../ingame/AbstractInventoryScreen.mapping | 31 ++++----------- .../gui/screen/ingame/LoomScreen.mapping | 1 - .../client/network/ClientPlayerEntity.mapping | 8 ++-- .../client/render/RenderLayer.mapping | 4 +- .../BlockEntityRenderDispatcher.mapping | 3 -- .../render/model/BasicBakedModel.mapping | 12 ++---- .../render/model/BuiltinBakedModel.mapping | 2 +- .../model/json/JsonUnbakedModel.mapping | 7 +--- .../client/texture/TextureManager.mapping | 4 +- .../minecraft/client/util/Clipboard.mapping | 3 +- .../net/minecraft/entity/LivingEntity.mapping | 39 +++++++++---------- .../entity/effect/StatusEffect.mapping | 12 +++--- .../effect/StatusEffectInstance.mapping | 2 +- .../net/minecraft/fluid/BaseFluid.mapping | 14 +++---- .../world/ThreadedAnvilChunkStorage.mapping | 2 +- .../util/profiler/ProfileResultImpl.mapping | 3 +- .../util/profiler/ProfilerSystem.mapping | 1 - .../minecraft/world/ModifiableWorld.mapping | 1 - 28 files changed, 58 insertions(+), 149 deletions(-) delete mode 100644 mappings/com/mojang/realmsclient/gui/screens/RealmsCreateTrialScreen.mapping diff --git a/build.gradle b/build.gradle index a598b2ea82..266eb85473 100644 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,7 @@ plugins { id 'maven-publish' } -def minecraft_version = "1.15.1" +def minecraft_version = "1.15.2-pre1" def ENV = System.getenv() // Fetch build number from Jenkins diff --git a/mappings/com/mojang/realmsclient/RealmsMainScreen.mapping b/mappings/com/mojang/realmsclient/RealmsMainScreen.mapping index 80c1f079ac..89ccbd460a 100644 --- a/mappings/com/mojang/realmsclient/RealmsMainScreen.mapping +++ b/mappings/com/mojang/realmsclient/RealmsMainScreen.mapping @@ -111,8 +111,6 @@ CLASS net/minecraft/class_4325 com/mojang/realmsclient/RealmsMainScreen ARG 1 msg ARG 2 x ARG 3 y - METHOD method_20869 setCreatedTrial (Z)V - ARG 1 createdTrial METHOD method_20870 shouldShowPopup ()Z METHOD method_20871 inPendingInvitationArea (DD)Z ARG 1 xm @@ -156,7 +154,6 @@ CLASS net/minecraft/class_4325 com/mojang/realmsclient/RealmsMainScreen ARG 1 server METHOD method_20902 newScreen ()Lnet/minecraft/class_4325; METHOD method_20903 configureClicked (Lcom/mojang/realmsclient/dto/RealmsServer;)V - METHOD method_20905 closePopup ()V METHOD method_20906 leaveClicked (Lcom/mojang/realmsclient/dto/RealmsServer;)V ARG 1 selectedServer METHOD method_20909 isSelfOwnedServer (Lcom/mojang/realmsclient/dto/RealmsServer;)Z diff --git a/mappings/com/mojang/realmsclient/client/RealmsClient.mapping b/mappings/com/mojang/realmsclient/client/RealmsClient.mapping index 84aee223a3..237921975f 100644 --- a/mappings/com/mojang/realmsclient/client/RealmsClient.mapping +++ b/mappings/com/mojang/realmsclient/client/RealmsClient.mapping @@ -41,9 +41,6 @@ CLASS net/minecraft/class_4341 com/mojang/realmsclient/client/RealmsClient ARG 1 r METHOD method_20999 acceptInvitation (Ljava/lang/String;)V ARG 1 invitationId - METHOD method_21000 createTrial (Ljava/lang/String;Ljava/lang/String;)Lcom/mojang/realmsclient/dto/RealmsServer; - ARG 1 name - ARG 2 motd METHOD method_21001 switchToStage ()V METHOD method_21003 download (JI)Lcom/mojang/realmsclient/dto/WorldDownload; ARG 1 worldId diff --git a/mappings/com/mojang/realmsclient/gui/screens/RealmsCreateTrialScreen.mapping b/mappings/com/mojang/realmsclient/gui/screens/RealmsCreateTrialScreen.mapping deleted file mode 100644 index 9e0906bdf0..0000000000 --- a/mappings/com/mojang/realmsclient/gui/screens/RealmsCreateTrialScreen.mapping +++ /dev/null @@ -1,21 +0,0 @@ -CLASS net/minecraft/class_4391 com/mojang/realmsclient/gui/screens/RealmsCreateTrialScreen - FIELD field_19837 lastScreen Lnet/minecraft/class_4325; - FIELD field_19838 nameBox Lnet/minecraft/realms/RealmsEditBox; - FIELD field_19839 descriptionBox Lnet/minecraft/realms/RealmsEditBox; - FIELD field_19840 initialized Z - FIELD field_19841 createButton Lnet/minecraft/realms/RealmsButton; - METHOD (Lnet/minecraft/class_4325;)V - ARG 1 lastScreen - METHOD charTyped (CI)Z - ARG 1 character - ARG 2 mods - METHOD keyPressed (III)Z - ARG 1 eventKey - ARG 2 scancode - ARG 3 mods - METHOD method_21249 createWorld ()V - METHOD method_21251 valid ()Z - METHOD render (IIF)V - ARG 1 xm - ARG 2 ym - ARG 3 a diff --git a/mappings/com/mojang/realmsclient/util/RealmsTasks.mapping b/mappings/com/mojang/realmsclient/util/RealmsTasks.mapping index 71a9240ff0..beb9c0c92a 100644 --- a/mappings/com/mojang/realmsclient/util/RealmsTasks.mapping +++ b/mappings/com/mojang/realmsclient/util/RealmsTasks.mapping @@ -95,14 +95,6 @@ CLASS net/minecraft/class_4434 com/mojang/realmsclient/util/RealmsTasks ARG 3 slot ARG 4 listener ARG 5 confirmId - CLASS class_4444 TrialCreationTask - FIELD field_20246 name Ljava/lang/String; - FIELD field_20247 motd Ljava/lang/String; - FIELD field_20248 lastScreen Lnet/minecraft/class_4325; - METHOD (Ljava/lang/String;Ljava/lang/String;Lnet/minecraft/class_4325;)V - ARG 1 name - ARG 2 motd - ARG 3 lastScreen CLASS class_4445 WorldCreationTask FIELD field_20249 name Ljava/lang/String; FIELD field_20250 motd Ljava/lang/String; diff --git a/mappings/net/minecraft/block/NetherPortalBlock.mapping b/mappings/net/minecraft/block/NetherPortalBlock.mapping index 2b6d64ac4d..1d2e98e4f9 100644 --- a/mappings/net/minecraft/block/NetherPortalBlock.mapping +++ b/mappings/net/minecraft/block/NetherPortalBlock.mapping @@ -6,7 +6,6 @@ CLASS net/minecraft/class_2423 net/minecraft/block/NetherPortalBlock ARG 1 settings METHOD method_10350 findPortal (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2700$class_2702; ARG 1 world - ARG 2 pos METHOD method_10351 createAreaHelper (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2423$class_2424; ARG 1 world ARG 2 pos diff --git a/mappings/net/minecraft/block/entity/BannerBlockEntity.mapping b/mappings/net/minecraft/block/entity/BannerBlockEntity.mapping index 60be1f2855..7402ce4f24 100644 --- a/mappings/net/minecraft/block/entity/BannerBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/BannerBlockEntity.mapping @@ -1,27 +1,20 @@ CLASS net/minecraft/class_2573 net/minecraft/block/entity/BannerBlockEntity FIELD field_11769 patterns Ljava/util/List; FIELD field_11770 patternListTagRead Z - FIELD field_11771 patternColors Ljava/util/List; FIELD field_11772 customName Lnet/minecraft/class_2561; FIELD field_11773 patternListTag Lnet/minecraft/class_2499; FIELD field_11774 baseColor Lnet/minecraft/class_1767; - FIELD field_11775 patternCacheKey Ljava/lang/String; - FIELD field_20743 preview Z METHOD (Lnet/minecraft/class_1767;)V ARG 1 baseColor METHOD method_10905 loadFromItemStack (Lnet/minecraft/class_1799;)V ARG 0 stack METHOD method_10907 getPickStack (Lnet/minecraft/class_2680;)Lnet/minecraft/class_1799; METHOD method_10908 getColorForState (Ljava/util/function/Supplier;)Lnet/minecraft/class_1767; - METHOD method_10909 getPatternColors ()Ljava/util/List; METHOD method_10910 getPatternCount (Lnet/minecraft/class_1799;)I ARG 0 stack METHOD method_10911 getPatterns ()Ljava/util/List; METHOD method_10913 readFrom (Lnet/minecraft/class_1799;Lnet/minecraft/class_1767;)V ARG 1 stack ARG 2 baseColor - METHOD method_10914 readPattern ()V METHOD method_16842 setCustomName (Lnet/minecraft/class_2561;)V ARG 1 customName - METHOD method_22534 setPreview (Z)V - METHOD method_22535 isPreview ()Z diff --git a/mappings/net/minecraft/block/sapling/SaplingGenerator.mapping b/mappings/net/minecraft/block/sapling/SaplingGenerator.mapping index c3c1e109d0..8fc7925e7b 100644 --- a/mappings/net/minecraft/block/sapling/SaplingGenerator.mapping +++ b/mappings/net/minecraft/block/sapling/SaplingGenerator.mapping @@ -1,3 +1,3 @@ CLASS net/minecraft/class_2647 net/minecraft/block/sapling/SaplingGenerator - METHOD method_11430 createTreeFeature (Ljava/util/Random;)Lnet/minecraft/class_2975; + METHOD method_11430 createTreeFeature (Ljava/util/Random;Z)Lnet/minecraft/class_2975; METHOD method_11431 generate (Lnet/minecraft/class_1936;Lnet/minecraft/class_2794;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Ljava/util/Random;)Z diff --git a/mappings/net/minecraft/client/font/FontManager.mapping b/mappings/net/minecraft/client/font/FontManager.mapping index e4ed46cced..aca54f64b7 100644 --- a/mappings/net/minecraft/client/font/FontManager.mapping +++ b/mappings/net/minecraft/client/font/FontManager.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_378 net/minecraft/client/font/FontManager - FIELD field_18013 fonts Ljava/util/Set; FIELD field_18215 resourceReloadListener Lnet/minecraft/class_3302; FIELD field_2258 forceUnicodeFont Z FIELD field_2259 textRenderers Ljava/util/Map; diff --git a/mappings/net/minecraft/client/font/TrueTypeFont.mapping b/mappings/net/minecraft/client/font/TrueTypeFont.mapping index 86bbdd05ce..477f3b52d0 100644 --- a/mappings/net/minecraft/client/font/TrueTypeFont.mapping +++ b/mappings/net/minecraft/client/font/TrueTypeFont.mapping @@ -3,19 +3,9 @@ CLASS net/minecraft/class_395 net/minecraft/client/font/TrueTypeFont FIELD field_2319 excludedCharacters Lit/unimi/dsi/fastutil/chars/CharSet; FIELD field_2320 shiftX F FIELD field_2321 oversample F - FIELD field_2322 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_2323 info Lorg/lwjgl/stb/STBTTFontinfo; FIELD field_2324 ascent F FIELD field_2325 scaleFactor F - METHOD (Lorg/lwjgl/stb/STBTTFontinfo;FFFFLjava/lang/String;)V - ARG 1 info - ARG 2 size - ARG 3 oversample - ARG 4 shiftX - ARG 5 shiftY - ARG 6 excludedCharacters - METHOD method_15975 getSTBTTFontInfo (Ljava/nio/ByteBuffer;)Lorg/lwjgl/stb/STBTTFontinfo; - ARG 0 font CLASS class_397 TtfGlyph FIELD field_2332 advance F FIELD field_2333 ascent F diff --git a/mappings/net/minecraft/client/gui/screen/ingame/AbstractInventoryScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/AbstractInventoryScreen.mapping index 32a63cb390..57e3272ede 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/AbstractInventoryScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/AbstractInventoryScreen.mapping @@ -1,28 +1,10 @@ CLASS net/minecraft/class_485 net/minecraft/client/gui/screen/ingame/AbstractInventoryScreen FIELD field_2900 offsetGuiForEffects Z - METHOD method_18642 renderBackground (IILjava/lang/Iterable;)V - ARG 1 x - ARG 2 spacing - ARG 3 effectInstances - METHOD method_18643 renderIcon (IILjava/lang/Iterable;)V - ARG 1 x - ARG 2 spacing - ARG 3 effectInstances - METHOD method_18644 renderText (IILjava/lang/Iterable;)V - ARG 1 x - ARG 2 spacing - ARG 3 effectInstances - METHOD method_2476 applyStatusEffectOffset ()V - METHOD method_2477 drawStatusEffects ()V - METHOD render (IIF)V - ARG 1 mouseX - ARG 2 mouseY - ARG 3 delta - METHOD method_18643 drawStatusEffectSprites (IILjava/lang/Iterable;)V + METHOD method_18642 drawStatusEffectBackgrounds (IILjava/lang/Iterable;)V ARG 1 x ARG 2 yIncrement ARG 3 effects - METHOD method_18642 drawStatusEffectBackgrounds (IILjava/lang/Iterable;)V + METHOD method_18643 drawStatusEffectSprites (IILjava/lang/Iterable;)V ARG 1 x ARG 2 yIncrement ARG 3 effects @@ -30,6 +12,9 @@ CLASS net/minecraft/class_485 net/minecraft/client/gui/screen/ingame/AbstractInv ARG 1 x ARG 2 yIncrement ARG 3 effects - METHOD (Lnet/minecraft/client/gui/screen/ingame/AbstractInventoryScreen$T;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V - ARG 2 inventory - ARG 3 name + METHOD method_2476 applyStatusEffectOffset ()V + METHOD method_2477 drawStatusEffects ()V + METHOD render (IIF)V + ARG 1 mouseX + ARG 2 mouseY + ARG 3 delta diff --git a/mappings/net/minecraft/client/gui/screen/ingame/LoomScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/LoomScreen.mapping index 41b11381fd..4c6702c88e 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/LoomScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/LoomScreen.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_494 net/minecraft/client/gui/screen/ingame/LoomScreen - FIELD field_20785 preview Lnet/minecraft/class_2573; FIELD field_2954 dye Lnet/minecraft/class_1799; FIELD field_2955 banner Lnet/minecraft/class_1799; FIELD field_2958 scrollbarClicked Z diff --git a/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping b/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping index d77b699cb4..a38aa2d8d0 100644 --- a/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping @@ -30,6 +30,10 @@ CLASS net/minecraft/class_746 net/minecraft/client/network/ClientPlayerEntity ARG 1 client METHOD method_18654 updateNausea ()V METHOD method_20303 isHoldingSneakKey ()Z + METHOD method_22120 hasMovementInput ()Z + COMMENT Returns whether the player has movement input. + COMMENT + COMMENT @return True if the player has movement input, else false. METHOD method_22419 showsDeathScreen ()Z METHOD method_22420 setShowsDeathScreen (Z)V ARG 1 shouldShow @@ -56,7 +60,3 @@ CLASS net/minecraft/class_746 net/minecraft/client/network/ClientPlayerEntity METHOD method_3149 getLastAutoJump ()Z METHOD method_3150 cannotFitAt (Lnet/minecraft/class_2338;)Z ARG 1 pos - METHOD method_22120 hasMovementInput ()Z - COMMENT Returns whether the player has movement input. - COMMENT - COMMENT @return True if the player has movement input, else false. diff --git a/mappings/net/minecraft/client/render/RenderLayer.mapping b/mappings/net/minecraft/client/render/RenderLayer.mapping index 820adb08c5..bd60e37f2a 100644 --- a/mappings/net/minecraft/client/render/RenderLayer.mapping +++ b/mappings/net/minecraft/client/render/RenderLayer.mapping @@ -134,9 +134,8 @@ CLASS net/minecraft/class_1921 net/minecraft/client/render/RenderLayer FIELD field_21418 texturing Lnet/minecraft/class_4668$class_4684; FIELD field_21419 writeMaskState Lnet/minecraft/class_4668$class_4686; FIELD field_21420 lineWidth Lnet/minecraft/class_4668$class_4677; - FIELD field_21421 textured Z FIELD field_21422 phases Lcom/google/common/collect/ImmutableList; - METHOD (Lnet/minecraft/class_4668$class_4683;Lnet/minecraft/class_4668$class_4685;Lnet/minecraft/class_4668$class_4673;Lnet/minecraft/class_4668$class_4681;Lnet/minecraft/class_4668$class_4669;Lnet/minecraft/class_4668$class_4672;Lnet/minecraft/class_4668$class_4671;Lnet/minecraft/class_4668$class_4676;Lnet/minecraft/class_4668$class_4679;Lnet/minecraft/class_4668$class_4674;Lnet/minecraft/class_4668$class_4675;Lnet/minecraft/class_4668$class_4678;Lnet/minecraft/class_4668$class_4684;Lnet/minecraft/class_4668$class_4686;Lnet/minecraft/class_4668$class_4677;Z)V + METHOD (Lnet/minecraft/class_4668$class_4683;Lnet/minecraft/class_4668$class_4685;Lnet/minecraft/class_4668$class_4673;Lnet/minecraft/class_4668$class_4681;Lnet/minecraft/class_4668$class_4669;Lnet/minecraft/class_4668$class_4672;Lnet/minecraft/class_4668$class_4671;Lnet/minecraft/class_4668$class_4676;Lnet/minecraft/class_4668$class_4679;Lnet/minecraft/class_4668$class_4674;Lnet/minecraft/class_4668$class_4675;Lnet/minecraft/class_4668$class_4678;Lnet/minecraft/class_4668$class_4684;Lnet/minecraft/class_4668$class_4686;Lnet/minecraft/class_4668$class_4677;Lnet/minecraft/class_1921$class_4750;)V ARG 1 texture ARG 2 transparency ARG 3 diffuseLighting @@ -152,7 +151,6 @@ CLASS net/minecraft/class_1921 net/minecraft/client/render/RenderLayer ARG 13 texturing ARG 14 writeMaskState ARG 15 lineWidth - ARG 16 textured METHOD method_23598 builder ()Lnet/minecraft/class_1921$class_4688$class_4689; CLASS class_4689 Builder FIELD field_21423 texture Lnet/minecraft/class_4668$class_4683; diff --git a/mappings/net/minecraft/client/render/block/entity/BlockEntityRenderDispatcher.mapping b/mappings/net/minecraft/client/render/block/entity/BlockEntityRenderDispatcher.mapping index 1b03a26807..88256e6244 100644 --- a/mappings/net/minecraft/client/render/block/entity/BlockEntityRenderDispatcher.mapping +++ b/mappings/net/minecraft/client/render/block/entity/BlockEntityRenderDispatcher.mapping @@ -28,9 +28,6 @@ CLASS net/minecraft/class_824 net/minecraft/client/render/block/entity/BlockEnti ARG 5 crosshairTarget METHOD method_3550 get (Lnet/minecraft/class_2586;)Lnet/minecraft/class_827; METHOD method_3551 setWorld (Lnet/minecraft/class_1937;)V - METHOD method_3552 renderEntity (Lnet/minecraft/class_2586;Lnet/minecraft/class_4587;)V - ARG 1 entity - ARG 2 matrix METHOD method_3554 runReported (Lnet/minecraft/class_2586;Ljava/lang/Runnable;)V METHOD method_3555 render (Lnet/minecraft/class_2586;FLnet/minecraft/class_4587;Lnet/minecraft/class_4597;)V ARG 1 blockEntity diff --git a/mappings/net/minecraft/client/render/model/BasicBakedModel.mapping b/mappings/net/minecraft/client/render/model/BasicBakedModel.mapping index e7643fefdc..2866861ce9 100644 --- a/mappings/net/minecraft/client/render/model/BasicBakedModel.mapping +++ b/mappings/net/minecraft/client/render/model/BasicBakedModel.mapping @@ -6,14 +6,10 @@ CLASS net/minecraft/class_1093 net/minecraft/client/render/model/BasicBakedModel FIELD field_5415 usesAo Z FIELD field_5416 sprite Lnet/minecraft/class_1058; FIELD field_5417 transformation Lnet/minecraft/class_809; - METHOD (Ljava/util/List;Ljava/util/Map;ZZLnet/minecraft/class_1058;Lnet/minecraft/class_809;Lnet/minecraft/class_806;)V + METHOD (Ljava/util/List;Ljava/util/Map;ZZZLnet/minecraft/class_1058;Lnet/minecraft/class_809;Lnet/minecraft/class_806;)V ARG 1 quads ARG 2 faceQuads ARG 3 usesAo - ARG 4 is3dInGui - ARG 5 sprite - ARG 6 transformation - ARG 7 itemPropertyOverrides CLASS class_1094 Builder FIELD field_5418 transformation Lnet/minecraft/class_809; FIELD field_5419 quads Ljava/util/List; @@ -22,14 +18,12 @@ CLASS net/minecraft/class_1093 net/minecraft/client/render/model/BasicBakedModel FIELD field_5422 faceQuads Ljava/util/Map; FIELD field_5423 itemPropertyOverrides Lnet/minecraft/class_806; FIELD field_5424 particleTexture Lnet/minecraft/class_1058; - METHOD (Lnet/minecraft/class_793;Lnet/minecraft/class_806;)V + METHOD (Lnet/minecraft/class_793;Lnet/minecraft/class_806;Z)V ARG 1 unbakedModel ARG 2 itemPropertyOverrides - METHOD (ZZLnet/minecraft/class_809;Lnet/minecraft/class_806;)V + METHOD (ZZZLnet/minecraft/class_809;Lnet/minecraft/class_806;)V ARG 1 usesAo ARG 2 depthInGui - ARG 3 transformation - ARG 4 itemPropertyOverrides METHOD method_4745 addQuad (Lnet/minecraft/class_2350;Lnet/minecraft/class_777;)Lnet/minecraft/class_1093$class_1094; ARG 1 side ARG 2 quad diff --git a/mappings/net/minecraft/client/render/model/BuiltinBakedModel.mapping b/mappings/net/minecraft/client/render/model/BuiltinBakedModel.mapping index 70b9eb0862..1d377b3c5b 100644 --- a/mappings/net/minecraft/client/render/model/BuiltinBakedModel.mapping +++ b/mappings/net/minecraft/client/render/model/BuiltinBakedModel.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_1090 net/minecraft/client/render/model/BuiltinBakedMod FIELD field_16594 sprite Lnet/minecraft/class_1058; FIELD field_5404 transformation Lnet/minecraft/class_809; FIELD field_5405 itemPropertyOverrides Lnet/minecraft/class_806; - METHOD (Lnet/minecraft/class_809;Lnet/minecraft/class_806;Lnet/minecraft/class_1058;)V + METHOD (Lnet/minecraft/class_809;Lnet/minecraft/class_806;Lnet/minecraft/class_1058;Z)V ARG 1 transformation ARG 2 itemPropertyOverrides ARG 3 sprite diff --git a/mappings/net/minecraft/client/render/model/json/JsonUnbakedModel.mapping b/mappings/net/minecraft/client/render/model/json/JsonUnbakedModel.mapping index 0c37e902d0..06085943df 100644 --- a/mappings/net/minecraft/client/render/model/json/JsonUnbakedModel.mapping +++ b/mappings/net/minecraft/client/render/model/json/JsonUnbakedModel.mapping @@ -1,7 +1,6 @@ CLASS net/minecraft/class_793 net/minecraft/client/render/model/json/JsonUnbakedModel FIELD field_4244 ambientOcclusion Z FIELD field_4245 elements Ljava/util/List; - FIELD field_4246 depthInGui Z FIELD field_4247 parentId Lnet/minecraft/class_2960; FIELD field_4248 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_4249 QUAD_FACTORY Lnet/minecraft/class_796; @@ -11,12 +10,11 @@ CLASS net/minecraft/class_793 net/minecraft/client/render/model/json/JsonUnbaked FIELD field_4253 parent Lnet/minecraft/class_793; FIELD field_4254 GSON Lcom/google/gson/Gson; FIELD field_4255 overrides Ljava/util/List; - METHOD (Lnet/minecraft/class_2960;Ljava/util/List;Ljava/util/Map;ZZLnet/minecraft/class_809;Ljava/util/List;)V + METHOD (Lnet/minecraft/class_2960;Ljava/util/List;Ljava/util/Map;ZLnet/minecraft/class_793$class_4751;Lnet/minecraft/class_809;Ljava/util/List;)V ARG 1 parentId ARG 2 elements ARG 3 textureMap ARG 4 ambientOcclusion - ARG 5 depthInGui ARG 6 transformations ARG 7 overrides METHOD method_24077 resolveSprite (Ljava/lang/String;)Lnet/minecraft/class_4730; @@ -41,8 +39,7 @@ CLASS net/minecraft/class_793 net/minecraft/client/render/model/json/JsonUnbaked ARG 1 name METHOD method_3443 getTransformations ()Lnet/minecraft/class_809; METHOD method_3444 useAmbientOcclusion ()Z - METHOD method_3445 hasDepthInGui ()Z - METHOD method_3446 bake (Lnet/minecraft/class_1088;Lnet/minecraft/class_793;Ljava/util/function/Function;Lnet/minecraft/class_3665;Lnet/minecraft/class_2960;)Lnet/minecraft/class_1087; + METHOD method_3446 bake (Lnet/minecraft/class_1088;Lnet/minecraft/class_793;Ljava/util/function/Function;Lnet/minecraft/class_3665;Lnet/minecraft/class_2960;Z)Lnet/minecraft/class_1087; ARG 1 loader ARG 2 parent ARG 3 textureGetter diff --git a/mappings/net/minecraft/client/texture/TextureManager.mapping b/mappings/net/minecraft/client/texture/TextureManager.mapping index f35bda870b..587c14b0c2 100644 --- a/mappings/net/minecraft/client/texture/TextureManager.mapping +++ b/mappings/net/minecraft/client/texture/TextureManager.mapping @@ -16,9 +16,7 @@ CLASS net/minecraft/class_1060 net/minecraft/client/texture/TextureManager ARG 1 id METHOD method_4615 destroyTexture (Lnet/minecraft/class_2960;)V ARG 1 id - METHOD method_4616 registerTexture (Lnet/minecraft/class_2960;Lnet/minecraft/class_1044;)Z - ARG 1 id - ARG 2 texture + METHOD method_4616 registerTexture (Lnet/minecraft/class_2960;Lnet/minecraft/class_1044;)V METHOD method_4617 registerDynamicTexture (Ljava/lang/String;Lnet/minecraft/class_1043;)Lnet/minecraft/class_2960; ARG 1 prefix ARG 2 texture diff --git a/mappings/net/minecraft/client/util/Clipboard.mapping b/mappings/net/minecraft/client/util/Clipboard.mapping index 5e461f431f..5a0ba66172 100644 --- a/mappings/net/minecraft/client/util/Clipboard.mapping +++ b/mappings/net/minecraft/client/util/Clipboard.mapping @@ -2,7 +2,6 @@ CLASS net/minecraft/class_3674 net/minecraft/client/util/Clipboard FIELD field_16236 clipboardBuffer Ljava/nio/ByteBuffer; METHOD method_15977 getClipboard (JLorg/lwjgl/glfw/GLFWErrorCallbackI;)Ljava/lang/String; ARG 1 window - METHOD method_15978 setClipboard (JLjava/nio/ByteBuffer;Ljava/lang/String;)V - ARG 1 window + METHOD method_15978 setClipboard (JLjava/nio/ByteBuffer;[B)V METHOD method_15979 setClipboard (JLjava/lang/String;)V ARG 1 window diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index ce3c0a379a..24203e322a 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -142,9 +142,24 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity METHOD method_20237 getEquipmentBreakStatus (Lnet/minecraft/class_1304;)B ARG 0 slot METHOD method_21753 getStingerCount ()I + METHOD method_21754 isHoldingOntoLadder ()Z + COMMENT @return {@code true} if this entity should not lose height while in a climbing state + COMMENT @see net.minecraft.entity.LivingEntity METHOD method_21755 setStingerCount (I)V ARG 1 stingerCount + METHOD method_22382 shouldSpawnConsumptionEffects ()Z + METHOD method_23328 playBlockFallSound ()V + METHOD method_23329 computeFallDamage (FF)I + ARG 1 fallDistance + ARG 2 damageMultiplier METHOD method_23667 swingHand (Lnet/minecraft/class_1268;Z)V + METHOD method_23733 onKilledBy (Lnet/minecraft/class_1309;)V + COMMENT Performs secondary effects after this mob has been killed. + COMMENT + COMMENT

The default behaviour spawns a wither rose if {@code adversary} is a {@code WitherEntity}. + ARG 1 adversary + COMMENT the main adversary responsible for this entity's death + METHOD method_23883 dropXp ()V METHOD method_5973 canTarget (Lnet/minecraft/class_1299;)Z ARG 1 type METHOD method_5989 getLootTable ()Lnet/minecraft/class_2960; @@ -184,13 +199,14 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity ARG 1 attacker METHOD method_6016 removeStatusEffect (Lnet/minecraft/class_1291;)Z COMMENT Removes a status effect from this entity. - COMMENT + COMMENT COMMENT

Calling this method will call cleanup methods on the status effect and trigger synchronization of effect particles with watching clients. If this entity is a player, COMMENT the change in the list of effects will also be synchronized with the corresponding client. - COMMENT + COMMENT COMMENT @return {@code true} if a {@link net.minecraft.entity.effect.StatusEffectInstance} with the given type was in effect before the removal. ARG 1 type METHOD method_6017 getSoundPitch ()F + METHOD method_6018 setPushCooldown (I)V METHOD method_6019 setCurrentHand (Lnet/minecraft/class_1268;)V ARG 1 hand METHOD method_6020 onStatusEffectApplied (Lnet/minecraft/class_1293;)V @@ -337,7 +353,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity ARG 1 player METHOD method_6111 removeStatusEffectInternal (Lnet/minecraft/class_1291;)Lnet/minecraft/class_1293; COMMENT Removes a status effect from this entity without calling any listener. - COMMENT + COMMENT COMMENT

This method does not perform any cleanup or synchronization operation. COMMENT Under most circumstances, calling {@link net.minecraft.entity.LivingEntity#removeStatusEffect(net.minecraft.entity.effect.StatusEffect)} is highly preferable. ARG 1 type @@ -375,20 +391,3 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity METHOD method_6132 applyArmorToDamage (Lnet/minecraft/class_1282;F)F ARG 1 source ARG 2 amount - METHOD method_23883 dropXp ()V - METHOD method_23733 onKilledBy (Lnet/minecraft/class_1309;)V - COMMENT Performs secondary effects after this mob has been killed. - COMMENT - COMMENT

The default behaviour spawns a wither rose if {@code adversary} is a {@code WitherEntity}. - COMMENT - ARG 1 adversary - COMMENT the main adversary responsible for this entity's death - METHOD method_23329 computeFallDamage (FF)I - ARG 1 fallDistance - ARG 2 damageMultiplier - METHOD method_23328 playBlockFallSound ()V - METHOD method_21754 isHoldingOntoLadder ()Z - COMMENT @return {@code true} if this entity should not lose height while in a climbing state - COMMENT @see net.minecraft.entity.LivingEntity#applyClimbingSpeed(net.minecraft.util.math.Vec3d) - METHOD method_22382 shouldSpawnConsumptionEffects ()Z - METHOD method_6018 setPushCooldown (I)V diff --git a/mappings/net/minecraft/entity/effect/StatusEffect.mapping b/mappings/net/minecraft/entity/effect/StatusEffect.mapping index bb58a62a77..d256178483 100644 --- a/mappings/net/minecraft/entity/effect/StatusEffect.mapping +++ b/mappings/net/minecraft/entity/effect/StatusEffect.mapping @@ -3,6 +3,9 @@ CLASS net/minecraft/class_1291 net/minecraft/entity/effect/StatusEffect FIELD field_5883 translationKey Ljava/lang/String; FIELD field_5885 attributeModifiers Ljava/util/Map; FIELD field_5886 color I + METHOD (Lnet/minecraft/class_4081;I)V + ARG 1 type + ARG 2 color METHOD method_18792 getType ()Lnet/minecraft/class_4081; METHOD method_5552 canApplyUpdateEffect (II)Z ARG 1 duration @@ -20,6 +23,9 @@ CLASS net/minecraft/class_1291 net/minecraft/entity/effect/StatusEffect ARG 1 entity ARG 2 attributes ARG 3 amplifier + METHOD method_5563 adjustModifierAmount (ILnet/minecraft/class_1322;)D + ARG 1 amplifier + ARG 2 modifier METHOD method_5564 applyInstantEffect (Lnet/minecraft/class_1297;Lnet/minecraft/class_1297;Lnet/minecraft/class_1309;ID)V ARG 1 source ARG 2 attacker @@ -36,10 +42,4 @@ CLASS net/minecraft/class_1291 net/minecraft/entity/effect/StatusEffect ARG 0 rawId METHOD method_5572 applyUpdateEffect (Lnet/minecraft/class_1309;I)V ARG 1 entity - METHOD method_5563 adjustModifierAmount (ILnet/minecraft/class_1322;)D - ARG 1 amplifier - ARG 2 modifier METHOD method_5573 isBeneficial ()Z - METHOD (Lnet/minecraft/class_4081;I)V - ARG 1 type - ARG 2 color diff --git a/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping b/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping index d4854c89a1..fede3bb101 100644 --- a/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping +++ b/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping @@ -23,7 +23,7 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance ARG 3 amplifier ARG 4 ambient ARG 5 visible - METHOD (Lnet/minecraft/class_1291;IIZZZ)V + METHOD (Lnet/minecraft/class_1291;IIZZZLnet/minecraft/class_1293;)V ARG 1 type ARG 2 duration ARG 3 amplifier diff --git a/mappings/net/minecraft/fluid/BaseFluid.mapping b/mappings/net/minecraft/fluid/BaseFluid.mapping index 54726aabc2..7db92eed2b 100644 --- a/mappings/net/minecraft/fluid/BaseFluid.mapping +++ b/mappings/net/minecraft/fluid/BaseFluid.mapping @@ -27,6 +27,13 @@ CLASS net/minecraft/class_3609 net/minecraft/fluid/BaseFluid ARG 5 fromPos ARG 6 fromState METHOD method_15737 isInfinite ()Z + METHOD method_15738 canFlow (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2350;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_3610;Lnet/minecraft/class_3611;)Z + ARG 1 view + ARG 2 fluidPos + ARG 3 fluidBlockState + ARG 4 flowDirection + ARG 5 flowTo + ARG 6 flowToBlockState METHOD method_15739 getLevelDecreasePerBlock (Lnet/minecraft/class_4538;)I ARG 1 view METHOD method_15745 flow (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2350;Lnet/minecraft/class_3610;)V @@ -45,10 +52,3 @@ CLASS net/minecraft/class_3609 net/minecraft/fluid/BaseFluid ARG 0 state ARG 1 view ARG 2 pos - METHOD method_15738 canFlow (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2350;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_3610;Lnet/minecraft/class_3611;)Z - ARG 1 view - ARG 2 fluidPos - ARG 3 fluidBlockState - ARG 4 flowDirection - ARG 5 flowTo - ARG 6 flowToBlockState diff --git a/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping b/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping index 7a5a1a0cd5..fa357c4f4f 100644 --- a/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping +++ b/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping @@ -21,8 +21,8 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor FIELD field_18241 playerChunkWatchingManager Lnet/minecraft/class_3210; FIELD field_18242 entityTrackers Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; FIELD field_18243 watchDistance I - FIELD field_18808 pointOfInterestStorage Lnet/minecraft/class_4153; FIELD field_18307 loadedChunks Lit/unimi/dsi/fastutil/longs/LongSet; + FIELD field_18808 pointOfInterestStorage Lnet/minecraft/class_4153; METHOD (Lnet/minecraft/class_3218;Ljava/io/File;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_3485;Ljava/util/concurrent/Executor;Lnet/minecraft/class_1255;Lnet/minecraft/class_2823;Lnet/minecraft/class_2794;Lnet/minecraft/class_3949;Ljava/util/function/Supplier;I)V ARG 1 world ARG 3 dataFixer diff --git a/mappings/net/minecraft/util/profiler/ProfileResultImpl.mapping b/mappings/net/minecraft/util/profiler/ProfileResultImpl.mapping index 21237393ac..a892c26f1a 100644 --- a/mappings/net/minecraft/util/profiler/ProfileResultImpl.mapping +++ b/mappings/net/minecraft/util/profiler/ProfileResultImpl.mapping @@ -2,10 +2,9 @@ CLASS net/minecraft/class_3692 net/minecraft/util/profiler/ProfileResultImpl FIELD field_16274 endTick I FIELD field_16275 startTick I FIELD field_16276 endTime J - FIELD field_16277 timings Ljava/util/Map; FIELD field_16278 startTime J FIELD field_16279 LOGGER Lorg/apache/logging/log4j/Logger; - METHOD (Ljava/util/Map;Ljava/util/Map;JIJI)V + METHOD (Ljava/util/Map;JIJI)V ARG 1 timings METHOD method_16061 appendTiming (ILjava/lang/String;Ljava/lang/StringBuilder;)V ARG 1 level diff --git a/mappings/net/minecraft/util/profiler/ProfilerSystem.mapping b/mappings/net/minecraft/util/profiler/ProfilerSystem.mapping index 9356f66403..edd968fd2e 100644 --- a/mappings/net/minecraft/util/profiler/ProfilerSystem.mapping +++ b/mappings/net/minecraft/util/profiler/ProfilerSystem.mapping @@ -1,6 +1,5 @@ CLASS net/minecraft/class_3533 net/minecraft/util/profiler/ProfilerSystem FIELD field_15730 timeList Lit/unimi/dsi/fastutil/longs/LongList; - FIELD field_15731 nameDurationMap Lit/unimi/dsi/fastutil/objects/Object2LongMap; FIELD field_15733 tickStarted Z FIELD field_15734 location Ljava/lang/String; FIELD field_15735 LOGGER Lorg/apache/logging/log4j/Logger; diff --git a/mappings/net/minecraft/world/ModifiableWorld.mapping b/mappings/net/minecraft/world/ModifiableWorld.mapping index bb9224910e..fed242e8e1 100644 --- a/mappings/net/minecraft/world/ModifiableWorld.mapping +++ b/mappings/net/minecraft/world/ModifiableWorld.mapping @@ -29,7 +29,6 @@ CLASS net/minecraft/class_1945 net/minecraft/world/ModifiableWorld COMMENT

  • 0b0100000 // 32 - SKIP_DROPS - Prevents the previous block (container) from dropping items when destroyed.
    • COMMENT
  • 0b1000000 // 64 - MECHANICAL_UPDATE - Signals that this is a mechanical update, usually caused by pistons moving blocks.
    • COMMENT - COMMENT ARG 1 pos COMMENT the target position ARG 2 state