From b8cf5bdaef86c114c9d8ceaef5744dc7d3678289 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Wed, 5 May 2021 18:45:23 +0100 Subject: [PATCH] 21w18a --- build.gradle | 2 +- mappings/net/minecraft/block/AbstractBlock.mapping | 3 --- mappings/net/minecraft/client/MinecraftClient.mapping | 7 +------ .../client/sound/EntityTrackingSoundInstance.mapping | 4 ---- mappings/net/minecraft/entity/LivingEntity.mapping | 2 +- mappings/net/minecraft/server/MinecraftServer.mapping | 3 +-- mappings/net/minecraft/world/gen/OreVeinGenerator.mapping | 2 +- 7 files changed, 5 insertions(+), 18 deletions(-) diff --git a/build.gradle b/build.gradle index f34fc96e89..cb2533b02a 100644 --- a/build.gradle +++ b/build.gradle @@ -26,7 +26,7 @@ plugins { id 'net.fabricmc.filament' version '0.2.0' } -def minecraft_version = "21w17a" +def minecraft_version = "21w18a" def ENV = System.getenv() // Fetch build number from Github Actions diff --git a/mappings/net/minecraft/block/AbstractBlock.mapping b/mappings/net/minecraft/block/AbstractBlock.mapping index 123893e8ed..2f7df73e19 100644 --- a/mappings/net/minecraft/block/AbstractBlock.mapping +++ b/mappings/net/minecraft/block/AbstractBlock.mapping @@ -323,9 +323,6 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock ARG 1 soundGroup METHOD method_9628 slipperiness (F)Lnet/minecraft/class_4970$class_2251; ARG 1 slipperiness - METHOD method_9629 strength (FF)Lnet/minecraft/class_4970$class_2251; - ARG 1 hardness - ARG 2 resistance METHOD method_9630 copy (Lnet/minecraft/class_4970;)Lnet/minecraft/class_4970$class_2251; ARG 0 block METHOD method_9631 luminance (Ljava/util/function/ToIntFunction;)Lnet/minecraft/class_4970$class_2251; diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index 8af00eca83..432d01c547 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -264,7 +264,6 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient ARG 1 serverEntry METHOD method_1586 getLevelStorage ()Lnet/minecraft/class_32; METHOD method_1587 addDetailsToCrashReport (Lnet/minecraft/class_128;)Lnet/minecraft/class_128; - ARG 1 report METHOD method_1588 isAmbientOcclusionEnabled ()Z METHOD method_1589 isConnectedToRealms ()Z METHOD method_1590 handleBlockBreaking (Z)V @@ -290,11 +289,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient ARG 1 pause METHOD method_22107 shouldRenderAsync ()Z METHOD method_22108 isRunning ()Z - METHOD method_22681 addSystemDetailsToCrashReport (Lnet/minecraft/class_1076;Ljava/lang/String;Lnet/minecraft/class_315;Lnet/minecraft/class_128;)V - ARG 0 languageManager - ARG 1 version - ARG 2 options - ARG 3 report + METHOD method_22681 addSystemDetailsToCrashReport (Lnet/minecraft/class_310;Lnet/minecraft/class_1076;Ljava/lang/String;Lnet/minecraft/class_315;Lnet/minecraft/class_128;)V METHOD method_22683 getWindow ()Lnet/minecraft/class_1041; METHOD method_22940 getBufferBuilders ()Lnet/minecraft/class_4599; METHOD method_24038 createResourcePackProfile (Ljava/lang/String;Lnet/minecraft/class_2561;ZLjava/util/function/Supplier;Lnet/minecraft/class_3272;Lnet/minecraft/class_3288$class_3289;Lnet/minecraft/class_5352;)Lnet/minecraft/class_3288; diff --git a/mappings/net/minecraft/client/sound/EntityTrackingSoundInstance.mapping b/mappings/net/minecraft/client/sound/EntityTrackingSoundInstance.mapping index ad0b4331e4..31ebf9459c 100644 --- a/mappings/net/minecraft/client/sound/EntityTrackingSoundInstance.mapping +++ b/mappings/net/minecraft/client/sound/EntityTrackingSoundInstance.mapping @@ -6,7 +6,3 @@ CLASS net/minecraft/class_1106 net/minecraft/client/sound/EntityTrackingSoundIns ARG 3 volume ARG 4 pitch ARG 5 entity - METHOD (Lnet/minecraft/class_3414;Lnet/minecraft/class_3419;Lnet/minecraft/class_1297;)V - ARG 1 sound - ARG 2 category - ARG 3 entity diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index 16f189fe50..cbef281876 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -281,7 +281,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity METHOD method_6000 enterCombat ()V METHOD method_6002 getDeathSound ()Lnet/minecraft/class_3414; METHOD method_6003 getRoll ()I - METHOD method_6005 takeKnockback (FDD)V + METHOD method_6005 takeKnockback (DDD)V METHOD method_6006 setNearbySongPlaying (Lnet/minecraft/class_2338;Z)V ARG 1 songPosition ARG 2 playing diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index 3cfb5a1f6f..f6b4bf73ee 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -336,8 +336,7 @@ CLASS net/minecraft/server/MinecraftServer METHOD method_3856 forcePlayerSampleUpdate ()V METHOD method_3857 getLootManager ()Lnet/minecraft/class_60; METHOD method_3858 getPlayerNames ()[Ljava/lang/String; - METHOD method_3859 populateCrashReport (Lnet/minecraft/class_128;)Lnet/minecraft/class_128; - ARG 1 report + METHOD method_3859 populateCrashReport (Lnet/minecraft/class_129;)V METHOD method_3860 isRemote ()Z METHOD method_3861 loadWorldResourcePack ()V METHOD method_3862 getPlayerIdleTimeout ()I diff --git a/mappings/net/minecraft/world/gen/OreVeinGenerator.mapping b/mappings/net/minecraft/world/gen/OreVeinGenerator.mapping index 930f34839e..0dffdfbee4 100644 --- a/mappings/net/minecraft/world/gen/OreVeinGenerator.mapping +++ b/mappings/net/minecraft/world/gen/OreVeinGenerator.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_6353 net/minecraft/world/gen/OreVeinGenerator METHOD (JLnet/minecraft/class_2680;III)V ARG 1 seed ARG 3 defaultState - METHOD method_36397 getVeinType (D)Lnet/minecraft/class_6353$class_6354; + METHOD method_36397 getVeinType (DI)Lnet/minecraft/class_6353$class_6354; METHOD method_36400 sample (Lnet/minecraft/class_5819;IIIDDD)Lnet/minecraft/class_2680; ARG 1 random ARG 2 x