From 4445120f595eb2b8d062a629d3fde5b7d07a06b9 Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Tue, 4 May 2021 18:47:40 +1000 Subject: [PATCH] random misc things (#2376) * random misc things * Update mappings/net/minecraft/block/entity/EndGatewayBlockEntity.mapping Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com> --- .../advancement/AdvancementRewards.mapping | 8 ++++++++ .../criterion/ConstructBeaconCriterion.mapping | 1 + .../net/minecraft/block/BigDripleafBlock.mapping | 1 + mappings/net/minecraft/block/FireBlock.mapping | 1 + .../net/minecraft/block/InfestedBlock.mapping | 15 +++++++++++++-- mappings/net/minecraft/block/KelpBlock.mapping | 1 + mappings/net/minecraft/block/SnowyBlock.mapping | 2 ++ .../BlockPlacementDispenserBehavior.mapping | 1 + .../block/entity/BeaconBlockEntity.mapping | 2 ++ .../block/entity/BeehiveBlockEntity.mapping | 3 +++ .../block/entity/EndGatewayBlockEntity.mapping | 1 + .../block/entity/SignBlockEntity.mapping | 1 + .../minecraft/block/piston/PistonHandler.mapping | 1 + .../net/minecraft/client/MinecraftClient.mapping | 3 +++ mappings/net/minecraft/client/Mouse.mapping | 1 + .../net/minecraft/client/font/FontManager.mapping | 1 + .../client/gui/hud/ClientBossBar.mapping | 9 +++++++++ .../client/gui/hud/InGameOverlayRenderer.mapping | 4 ++++ .../client/gui/screen/GameMenuScreen.mapping | 3 +++ .../client/gui/screen/SplashScreen.mapping | 2 ++ .../minecraft/client/render/GameRenderer.mapping | 12 ++++++++++++ 21 files changed, 71 insertions(+), 2 deletions(-) diff --git a/mappings/net/minecraft/advancement/AdvancementRewards.mapping b/mappings/net/minecraft/advancement/AdvancementRewards.mapping index 864ab440ac..e9e82752be 100644 --- a/mappings/net/minecraft/advancement/AdvancementRewards.mapping +++ b/mappings/net/minecraft/advancement/AdvancementRewards.mapping @@ -20,6 +20,14 @@ CLASS net/minecraft/class_170 net/minecraft/advancement/AdvancementRewards FIELD field_1169 experience I FIELD field_1170 function Lnet/minecraft/class_2960; FIELD field_1171 loot Ljava/util/List; + METHOD method_34899 loot (Lnet/minecraft/class_2960;)Lnet/minecraft/class_170$class_171; + ARG 0 loot + METHOD method_34900 addLoot (Lnet/minecraft/class_2960;)Lnet/minecraft/class_170$class_171; + ARG 1 loot + METHOD method_34901 function (Lnet/minecraft/class_2960;)Lnet/minecraft/class_170$class_171; + ARG 0 function + METHOD method_34902 setFunction (Lnet/minecraft/class_2960;)Lnet/minecraft/class_170$class_171; + ARG 1 function METHOD method_749 setExperience (I)Lnet/minecraft/class_170$class_171; ARG 1 experience METHOD method_750 experience (I)Lnet/minecraft/class_170$class_171; diff --git a/mappings/net/minecraft/advancement/criterion/ConstructBeaconCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ConstructBeaconCriterion.mapping index 654d591f3b..c01d0e4ea6 100644 --- a/mappings/net/minecraft/advancement/criterion/ConstructBeaconCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ConstructBeaconCriterion.mapping @@ -10,6 +10,7 @@ CLASS net/minecraft/class_2006 net/minecraft/advancement/criterion/ConstructBeac METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2096$class_2100;)V ARG 1 player ARG 2 level + METHOD method_35110 create ()Lnet/minecraft/class_2006$class_2008; METHOD method_8817 matches (I)Z ARG 1 level METHOD method_8818 level (Lnet/minecraft/class_2096$class_2100;)Lnet/minecraft/class_2006$class_2008; diff --git a/mappings/net/minecraft/block/BigDripleafBlock.mapping b/mappings/net/minecraft/block/BigDripleafBlock.mapping index b0c4625fb9..04455172e0 100644 --- a/mappings/net/minecraft/block/BigDripleafBlock.mapping +++ b/mappings/net/minecraft/block/BigDripleafBlock.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_5801 net/minecraft/block/BigDripleafBlock FIELD field_28664 SHAPES_FOR_TILT Ljava/util/Map; FIELD field_28665 SHAPES_FOR_DIRECTION Ljava/util/Map; FIELD field_28666 shapes Ljava/util/Map; + FIELD field_31020 BASE_SHAPE Lnet/minecraft/class_265; METHOD method_33601 playTiltSound (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_3414;)V ARG 0 world ARG 1 pos diff --git a/mappings/net/minecraft/block/FireBlock.mapping b/mappings/net/minecraft/block/FireBlock.mapping index 0a07f81312..659585bfbc 100644 --- a/mappings/net/minecraft/block/FireBlock.mapping +++ b/mappings/net/minecraft/block/FireBlock.mapping @@ -46,6 +46,7 @@ CLASS net/minecraft/class_2358 net/minecraft/block/FireBlock ARG 2 pos ARG 3 age METHOD method_26155 getFireTickDelay (Ljava/util/Random;)I + ARG 0 random METHOD method_31016 getShapeForState (Lnet/minecraft/class_2680;)Lnet/minecraft/class_265; ARG 0 state METHOD method_31017 (Lnet/minecraft/class_2680;)Z diff --git a/mappings/net/minecraft/block/InfestedBlock.mapping b/mappings/net/minecraft/block/InfestedBlock.mapping index ae56d74b66..9a4433c0ee 100644 --- a/mappings/net/minecraft/block/InfestedBlock.mapping +++ b/mappings/net/minecraft/block/InfestedBlock.mapping @@ -1,6 +1,8 @@ CLASS net/minecraft/class_2384 net/minecraft/block/InfestedBlock FIELD field_11178 regularBlock Lnet/minecraft/class_2248; - FIELD field_11179 REGULAR_TO_INFESTED Ljava/util/Map; + FIELD field_11179 REGULAR_TO_INFESTED_BLOCK Ljava/util/Map; + FIELD field_33564 REGULAR_TO_INFESTED_STATE Ljava/util/Map; + FIELD field_33565 INFESTED_TO_REGULAR_STATE Ljava/util/Map; METHOD (Lnet/minecraft/class_2248;Lnet/minecraft/class_4970$class_2251;)V COMMENT Creates an infested block ARG 1 regularBlock @@ -9,8 +11,17 @@ CLASS net/minecraft/class_2384 net/minecraft/block/InfestedBlock COMMENT block settings METHOD method_10269 isInfestable (Lnet/minecraft/class_2680;)Z ARG 0 block - METHOD method_10270 fromRegularBlock (Lnet/minecraft/class_2680;)Lnet/minecraft/class_2680; + METHOD method_10270 toRegularState (Lnet/minecraft/class_2680;)Lnet/minecraft/class_2680; + ARG 1 infestedState METHOD method_10271 getRegularBlock ()Lnet/minecraft/class_2248; METHOD method_24797 spawnSilverfish (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)V ARG 1 world ARG 2 pos + METHOD method_36363 copyProperties (Ljava/util/Map;Lnet/minecraft/class_2680;Ljava/util/function/Supplier;)Lnet/minecraft/class_2680; + ARG 0 stateMap + ARG 1 fromState + ARG 2 toStateSupplier + METHOD method_36364 (Ljava/util/function/Supplier;Lnet/minecraft/class_2680;)Lnet/minecraft/class_2680; + ARG 1 infestedState + METHOD method_36366 fromRegularState (Lnet/minecraft/class_2680;)Lnet/minecraft/class_2680; + ARG 0 regularState diff --git a/mappings/net/minecraft/block/KelpBlock.mapping b/mappings/net/minecraft/block/KelpBlock.mapping index f70591edba..371218bcfe 100644 --- a/mappings/net/minecraft/block/KelpBlock.mapping +++ b/mappings/net/minecraft/block/KelpBlock.mapping @@ -1,2 +1,3 @@ CLASS net/minecraft/class_2393 net/minecraft/block/KelpBlock FIELD field_11195 SHAPE Lnet/minecraft/class_265; + FIELD field_31105 GROWTH_CHANCE D diff --git a/mappings/net/minecraft/block/SnowyBlock.mapping b/mappings/net/minecraft/block/SnowyBlock.mapping index efcb8c3d85..a2def98957 100644 --- a/mappings/net/minecraft/block/SnowyBlock.mapping +++ b/mappings/net/minecraft/block/SnowyBlock.mapping @@ -1,2 +1,4 @@ CLASS net/minecraft/class_2493 net/minecraft/block/SnowyBlock FIELD field_11522 SNOWY Lnet/minecraft/class_2746; + METHOD method_35291 isSnow (Lnet/minecraft/class_2680;)Z + ARG 0 state diff --git a/mappings/net/minecraft/block/dispenser/BlockPlacementDispenserBehavior.mapping b/mappings/net/minecraft/block/dispenser/BlockPlacementDispenserBehavior.mapping index 704419578f..b69d3652ee 100644 --- a/mappings/net/minecraft/block/dispenser/BlockPlacementDispenserBehavior.mapping +++ b/mappings/net/minecraft/block/dispenser/BlockPlacementDispenserBehavior.mapping @@ -1 +1,2 @@ CLASS net/minecraft/class_2970 net/minecraft/block/dispenser/BlockPlacementDispenserBehavior + FIELD field_33680 LOGGER Lorg/apache/logging/log4j/Logger; diff --git a/mappings/net/minecraft/block/entity/BeaconBlockEntity.mapping b/mappings/net/minecraft/block/entity/BeaconBlockEntity.mapping index 4e0bdc37bf..3ee2b5da8c 100644 --- a/mappings/net/minecraft/block/entity/BeaconBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/BeaconBlockEntity.mapping @@ -8,6 +8,7 @@ CLASS net/minecraft/class_2580 net/minecraft/block/entity/BeaconBlockEntity FIELD field_17377 lock Lnet/minecraft/class_1273; FIELD field_17378 propertyDelegate Lnet/minecraft/class_3913; FIELD field_19177 beamSegments Ljava/util/List; + FIELD field_19179 minY I METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 1 pos ARG 2 state @@ -32,6 +33,7 @@ CLASS net/minecraft/class_2580 net/minecraft/block/entity/BeaconBlockEntity ARG 2 state ARG 3 blockEntity METHOD method_20293 updateLevel (Lnet/minecraft/class_1937;III)I + ARG 0 world ARG 1 x ARG 2 y ARG 3 z diff --git a/mappings/net/minecraft/block/entity/BeehiveBlockEntity.mapping b/mappings/net/minecraft/block/entity/BeehiveBlockEntity.mapping index 84ffbfeded..13227d3ab5 100644 --- a/mappings/net/minecraft/block/entity/BeehiveBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/BeehiveBlockEntity.mapping @@ -11,6 +11,7 @@ CLASS net/minecraft/class_4482 net/minecraft/block/entity/BeehiveBlockEntity FIELD field_31313 MIN_OCCUPATION_TICKS_WITHOUT_NECTAR I FIELD field_31314 ANGERED_CANNOT_ENTER_HIVE_TICKS I FIELD field_31315 MIN_OCCUPATION_TICKS_WITH_NECTAR I + FIELD field_33570 IRRELEVANT_BEE_NBT_KEYS Ljava/util/List; METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 1 pos ARG 2 state @@ -63,6 +64,8 @@ CLASS net/minecraft/class_4482 net/minecraft/block/entity/BeehiveBlockEntity ARG 1 nbtCompound ARG 2 ticksInHive ARG 3 hasNectar + METHOD method_36379 removeIrrelevantNbtKeys (Lnet/minecraft/class_2487;)V + ARG 0 compound CLASS class_4483 Bee FIELD field_20425 entityData Lnet/minecraft/class_2487; FIELD field_20426 ticksInHive I diff --git a/mappings/net/minecraft/block/entity/EndGatewayBlockEntity.mapping b/mappings/net/minecraft/block/entity/EndGatewayBlockEntity.mapping index c58300e42b..941ca59429 100644 --- a/mappings/net/minecraft/block/entity/EndGatewayBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/EndGatewayBlockEntity.mapping @@ -31,6 +31,7 @@ CLASS net/minecraft/class_2643 net/minecraft/block/entity/EndGatewayBlockEntity METHOD method_11416 createPortal (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_3018;)V ARG 0 world ARG 1 pos + ARG 2 config METHOD method_11417 getRecentlyGeneratedBeamHeight (F)F ARG 1 tickDelta METHOD method_11418 setExitPortalPos (Lnet/minecraft/class_2338;Z)V diff --git a/mappings/net/minecraft/block/entity/SignBlockEntity.mapping b/mappings/net/minecraft/block/entity/SignBlockEntity.mapping index 7405b2074b..795630de9c 100644 --- a/mappings/net/minecraft/block/entity/SignBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/SignBlockEntity.mapping @@ -23,6 +23,7 @@ CLASS net/minecraft/class_2625 net/minecraft/block/entity/SignBlockEntity ARG 1 player METHOD method_11305 getEditor ()Ljava/util/UUID; METHOD method_11306 setEditor (Ljava/util/UUID;)V + ARG 1 editor METHOD method_11307 isEditable ()Z METHOD method_16126 getTextColor ()Lnet/minecraft/class_1767; METHOD method_16127 setTextColor (Lnet/minecraft/class_1767;)Z diff --git a/mappings/net/minecraft/block/piston/PistonHandler.mapping b/mappings/net/minecraft/block/piston/PistonHandler.mapping index d26653b10d..316936cd98 100644 --- a/mappings/net/minecraft/block/piston/PistonHandler.mapping +++ b/mappings/net/minecraft/block/piston/PistonHandler.mapping @@ -7,6 +7,7 @@ CLASS net/minecraft/class_2674 net/minecraft/block/piston/PistonHandler FIELD field_12248 pistonDirection Lnet/minecraft/class_2350; FIELD field_12249 world Lnet/minecraft/class_1937; FIELD field_12250 posFrom Lnet/minecraft/class_2338; + FIELD field_31384 MAX_MOVABLE_BLOCKS I METHOD (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;Z)V ARG 1 world ARG 2 pos diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index 43e11e2c3b..8af00eca83 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -399,6 +399,9 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_34745 toggleDebugProfiler (Ljava/lang/Runnable;Ljava/util/function/Consumer;)V ARG 1 startAction ARG 2 completeAction + METHOD method_35702 getCurrentFps ()I + METHOD method_35703 getWorldGenerationProgressTracker ()Lnet/minecraft/class_3953; + METHOD method_35706 isRealmsEnabled ()Z CLASS class_5366 WorldLoadAction CLASS class_5367 IntegratedResourceManager FIELD field_25439 resourcePackManager Lnet/minecraft/class_3283; diff --git a/mappings/net/minecraft/client/Mouse.mapping b/mappings/net/minecraft/client/Mouse.mapping index 6a08f0379f..f073a2cd5f 100644 --- a/mappings/net/minecraft/client/Mouse.mapping +++ b/mappings/net/minecraft/client/Mouse.mapping @@ -67,3 +67,4 @@ CLASS net/minecraft/class_312 net/minecraft/client/Mouse ARG 1 window ARG 3 paths METHOD method_30134 setResolutionChanged ()V + METHOD method_35707 wasMiddleButtonClicked ()Z diff --git a/mappings/net/minecraft/client/font/FontManager.mapping b/mappings/net/minecraft/client/font/FontManager.mapping index c5fb82f2ec..55eb1ba6c6 100644 --- a/mappings/net/minecraft/client/font/FontManager.mapping +++ b/mappings/net/minecraft/client/font/FontManager.mapping @@ -6,6 +6,7 @@ CLASS net/minecraft/class_378 net/minecraft/client/font/FontManager FIELD field_24254 MISSING_STORAGE_ID Lnet/minecraft/class_2960; FIELD field_24255 missingStorage Lnet/minecraft/class_377; FIELD field_24256 idOverrides Ljava/util/Map; + FIELD field_32226 FONTS_JSON Ljava/lang/String; METHOD (Lnet/minecraft/class_1060;)V ARG 1 manager METHOD method_18627 getResourceReloadListener ()Lnet/minecraft/class_3302; diff --git a/mappings/net/minecraft/client/gui/hud/ClientBossBar.mapping b/mappings/net/minecraft/client/gui/hud/ClientBossBar.mapping index 711f149efb..379840fcfe 100644 --- a/mappings/net/minecraft/client/gui/hud/ClientBossBar.mapping +++ b/mappings/net/minecraft/client/gui/hud/ClientBossBar.mapping @@ -1,3 +1,12 @@ CLASS net/minecraft/class_345 net/minecraft/client/gui/hud/ClientBossBar FIELD field_2128 timeHealthSet J FIELD field_2129 healthLatest F + METHOD (Ljava/util/UUID;Lnet/minecraft/class_2561;FLnet/minecraft/class_1259$class_1260;Lnet/minecraft/class_1259$class_1261;ZZZ)V + ARG 1 uuid + ARG 2 name + ARG 3 percent + ARG 4 color + ARG 5 style + ARG 6 darkenSky + ARG 7 dragonMusic + ARG 8 thickenFog diff --git a/mappings/net/minecraft/client/gui/hud/InGameOverlayRenderer.mapping b/mappings/net/minecraft/client/gui/hud/InGameOverlayRenderer.mapping index c11416c5c9..1e6dc68c9e 100644 --- a/mappings/net/minecraft/client/gui/hud/InGameOverlayRenderer.mapping +++ b/mappings/net/minecraft/client/gui/hud/InGameOverlayRenderer.mapping @@ -4,7 +4,11 @@ CLASS net/minecraft/class_4603 net/minecraft/client/gui/hud/InGameOverlayRendere ARG 0 client ARG 1 matrices METHOD method_23068 renderInWallOverlay (Lnet/minecraft/class_1058;Lnet/minecraft/class_4587;)V + ARG 0 sprite + ARG 1 matrices METHOD method_23069 renderUnderwaterOverlay (Lnet/minecraft/class_310;Lnet/minecraft/class_4587;)V + ARG 0 client + ARG 1 matrices METHOD method_23070 renderFireOverlay (Lnet/minecraft/class_310;Lnet/minecraft/class_4587;)V ARG 0 client ARG 1 matrices diff --git a/mappings/net/minecraft/client/gui/screen/GameMenuScreen.mapping b/mappings/net/minecraft/client/gui/screen/GameMenuScreen.mapping index 65707abce3..cb76a80136 100644 --- a/mappings/net/minecraft/client/gui/screen/GameMenuScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/GameMenuScreen.mapping @@ -1,5 +1,8 @@ CLASS net/minecraft/class_433 net/minecraft/client/gui/screen/GameMenuScreen FIELD field_19319 showMenu Z + FIELD field_32257 SNAPSHOT_FEEDBACK_URL Ljava/lang/String; + FIELD field_32258 JAVA_FEEDBACK_URL Ljava/lang/String; + FIELD field_32259 SNAPSHOT_BUGS_URL Ljava/lang/String; METHOD (Z)V ARG 1 showMenu METHOD method_20543 initWidgets ()V diff --git a/mappings/net/minecraft/client/gui/screen/SplashScreen.mapping b/mappings/net/minecraft/client/gui/screen/SplashScreen.mapping index 2cb93e6847..ea4c222172 100644 --- a/mappings/net/minecraft/client/gui/screen/SplashScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/SplashScreen.mapping @@ -8,6 +8,8 @@ CLASS net/minecraft/class_425 net/minecraft/client/gui/screen/SplashScreen FIELD field_18220 reloadStartTime J FIELD field_2483 LOGO Lnet/minecraft/class_2960; FIELD field_25041 BRAND_ARGB Ljava/util/function/IntSupplier; + FIELD field_32249 MOJANG_RED I + FIELD field_32250 MONOCHROME_BLACK I METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_4011;Ljava/util/function/Consumer;Z)V ARG 1 client ARG 2 monitor diff --git a/mappings/net/minecraft/client/render/GameRenderer.mapping b/mappings/net/minecraft/client/render/GameRenderer.mapping index 3e808159d5..de5daba008 100644 --- a/mappings/net/minecraft/client/render/GameRenderer.mapping +++ b/mappings/net/minecraft/client/render/GameRenderer.mapping @@ -57,6 +57,8 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer FIELD field_29401 renderTypeGlintShader Lnet/minecraft/class_5944; FIELD field_29402 renderTypeGlintDirectShader Lnet/minecraft/class_5944; FIELD field_29403 blitScreenShader Lnet/minecraft/class_5944; + FIELD field_33626 renderTypeTextIntensityShader Lnet/minecraft/class_5944; + FIELD field_33627 renderTypeTextIntensitySeeThroughShader Lnet/minecraft/class_5944; FIELD field_3988 zoomX F FIELD field_3992 renderHand Z FIELD field_3993 LOGGER Lorg/apache/logging/log4j/Logger; @@ -205,3 +207,13 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer METHOD method_34547 getPositionColorLightmapShader ()Lnet/minecraft/class_5944; METHOD method_34548 getPositionColorTexLightmapShader ()Lnet/minecraft/class_5944; METHOD method_34549 getPositionTexColorNormalShader ()Lnet/minecraft/class_5944; + METHOD method_35764 getPositionTexLightmapColorShader ()Lnet/minecraft/class_5944; + METHOD method_35765 isRenderingPanorama ()Z + METHOD method_35768 setRenderHand (Z)V + ARG 1 renderHand + METHOD method_35769 setBlockOutlineEnabled (Z)V + ARG 1 blockOutlineEnabled + METHOD method_35770 setRenderingPanorama (Z)V + ARG 1 renderingPanorama + METHOD method_36432 getRenderTypeTextIntensityShader ()Lnet/minecraft/class_5944; + METHOD method_36433 getRenderTypeTextIntensitySeeThroughShader ()Lnet/minecraft/class_5944;