From 7f0d3ff0880bee288b8cf33cec665b95e5f523ed Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Fri, 7 Aug 2020 17:13:30 +0100 Subject: [PATCH] 1.16.2-rc1 --- build.gradle | 2 +- mappings/net/minecraft/client/MinecraftClient.mapping | 1 - mappings/net/minecraft/client/render/SkyProperties.mapping | 2 +- .../net/minecraft/util/dynamic/RegistryElementCodec.mapping | 2 +- mappings/net/minecraft/util/dynamic/RegistryOps.mapping | 2 +- mappings/net/minecraft/world/dimension/DimensionType.mapping | 4 ++-- .../world/gen/chunk/FlatChunkGeneratorConfig.mapping | 2 +- 7 files changed, 7 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index 95ba4ce1ed..9f95223db5 100644 --- a/build.gradle +++ b/build.gradle @@ -23,7 +23,7 @@ plugins { id 'java' // for jd gen } -def minecraft_version = "1.16.2-pre3" +def minecraft_version = "1.16.2-rc1" def ENV = System.getenv() // Fetch build number from Jenkins diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index 56e4a92e0b..83559ae011 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -244,7 +244,6 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_24043 createV4ResourcePackFactory (Ljava/util/function/Supplier;)Ljava/util/function/Supplier; ARG 0 packFactory METHOD method_24226 handleResourceReloadException (Ljava/lang/Throwable;)V - ARG 1 throwable METHOD method_24287 getWindowTitle ()Ljava/lang/String; METHOD method_24288 updateWindowTitle ()V METHOD method_24289 isModded ()Z diff --git a/mappings/net/minecraft/client/render/SkyProperties.mapping b/mappings/net/minecraft/client/render/SkyProperties.mapping index 3e4f08d912..4cf079c164 100644 --- a/mappings/net/minecraft/client/render/SkyProperties.mapping +++ b/mappings/net/minecraft/client/render/SkyProperties.mapping @@ -19,7 +19,7 @@ CLASS net/minecraft/class_5294 net/minecraft/client/render/SkyProperties METHOD method_28110 useThickFog (II)Z ARG 1 camX ARG 2 camY - METHOD method_28111 byDimensionType (Ljava/util/Optional;)Lnet/minecraft/class_5294; + METHOD method_28111 byDimensionType (Lnet/minecraft/class_2874;)Lnet/minecraft/class_5294; METHOD method_28112 adjustSkyColor (Lnet/minecraft/class_243;F)Lnet/minecraft/class_243; ARG 1 color ARG 2 sunHeight diff --git a/mappings/net/minecraft/util/dynamic/RegistryElementCodec.mapping b/mappings/net/minecraft/util/dynamic/RegistryElementCodec.mapping index 1158fafc61..dbe7efdc6f 100644 --- a/mappings/net/minecraft/util/dynamic/RegistryElementCodec.mapping +++ b/mappings/net/minecraft/util/dynamic/RegistryElementCodec.mapping @@ -12,7 +12,7 @@ CLASS net/minecraft/class_5381 net/minecraft/util/dynamic/RegistryElementCodec COMMENT @see RegistryOps FIELD field_25507 registryRef Lnet/minecraft/class_5321; FIELD field_25508 elementCodec Lcom/mojang/serialization/Codec; - METHOD (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Codec;)V + METHOD (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Codec;Z)V ARG 1 registryRef METHOD decode (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult; ARG 1 ops diff --git a/mappings/net/minecraft/util/dynamic/RegistryOps.mapping b/mappings/net/minecraft/util/dynamic/RegistryOps.mapping index 3a7400238c..34d81317c2 100644 --- a/mappings/net/minecraft/util/dynamic/RegistryOps.mapping +++ b/mappings/net/minecraft/util/dynamic/RegistryOps.mapping @@ -10,7 +10,7 @@ CLASS net/minecraft/class_5382 net/minecraft/util/dynamic/RegistryOps METHOD method_29755 loadToRegistry (Lnet/minecraft/class_2370;Lnet/minecraft/class_5321;Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/DataResult; COMMENT Loads elements into a registry just loaded from a decoder. ARG 1 registry - METHOD method_29759 decodeOrId (Ljava/lang/Object;Lnet/minecraft/class_5321;Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/DataResult; + METHOD method_29759 decodeOrId (Ljava/lang/Object;Lnet/minecraft/class_5321;Lcom/mojang/serialization/Codec;Z)Lcom/mojang/serialization/DataResult; COMMENT Encode an id for a registry element than a full object if possible. COMMENT COMMENT

This method is called by casting an arbitrary dynamic ops to a registry diff --git a/mappings/net/minecraft/world/dimension/DimensionType.mapping b/mappings/net/minecraft/world/dimension/DimensionType.mapping index ff545a4b38..cd88c18429 100644 --- a/mappings/net/minecraft/world/dimension/DimensionType.mapping +++ b/mappings/net/minecraft/world/dimension/DimensionType.mapping @@ -24,13 +24,13 @@ CLASS net/minecraft/class_2874 net/minecraft/world/dimension/DimensionType FIELD field_25615 hasRaids Z FIELD field_25616 logicalHeight I FIELD field_25617 infiniburn Lnet/minecraft/class_2960; - METHOD (Ljava/util/OptionalLong;ZZZZDZZZZILnet/minecraft/class_2960;F)V + METHOD (Ljava/util/OptionalLong;ZZZZDZZZZILnet/minecraft/class_2960;Lnet/minecraft/class_2960;F)V ARG 1 fixedTime ARG 2 hasSkylight ARG 3 hasCeiling ARG 4 ultrawarm ARG 5 natural - METHOD (Ljava/util/OptionalLong;ZZZZDZZZZZILnet/minecraft/class_4545;Lnet/minecraft/class_2960;F)V + METHOD (Ljava/util/OptionalLong;ZZZZDZZZZZILnet/minecraft/class_4545;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;F)V ARG 1 fixedTime ARG 2 hasSkylight ARG 3 hasCeiling diff --git a/mappings/net/minecraft/world/gen/chunk/FlatChunkGeneratorConfig.mapping b/mappings/net/minecraft/world/gen/chunk/FlatChunkGeneratorConfig.mapping index f997770b24..1b8b86704b 100644 --- a/mappings/net/minecraft/world/gen/chunk/FlatChunkGeneratorConfig.mapping +++ b/mappings/net/minecraft/world/gen/chunk/FlatChunkGeneratorConfig.mapping @@ -9,7 +9,7 @@ CLASS net/minecraft/class_3232 net/minecraft/world/gen/chunk/FlatChunkGeneratorC FIELD field_24975 CODEC Lcom/mojang/serialization/Codec; METHOD method_14309 getDefaultConfig (Lnet/minecraft/class_2378;)Lnet/minecraft/class_3232; METHOD method_14312 getLayerBlocks ()[Lnet/minecraft/class_2680; - METHOD method_14325 setBiome (Lnet/minecraft/class_1959;)V + METHOD method_14325 setBiome (Ljava/util/function/Supplier;)V METHOD method_14326 getBiome ()Lnet/minecraft/class_1959; METHOD method_14327 getLayers ()Ljava/util/List; METHOD method_14330 updateLayerBlocks ()V