diff --git a/build.gradle b/build.gradle index b690b29c05..e72968b008 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.1-pre3" +def minecraft_version = "1.17.1-rc1" def ENV = System.getenv() // Fetch build number from Github Actions diff --git a/mappings/net/minecraft/client/render/GameRenderer.mapping b/mappings/net/minecraft/client/render/GameRenderer.mapping index bcfdb391f0..a3196a1981 100644 --- a/mappings/net/minecraft/client/render/GameRenderer.mapping +++ b/mappings/net/minecraft/client/render/GameRenderer.mapping @@ -115,7 +115,7 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer ARG 3 tickDelta METHOD method_3174 getNightVisionStrength (Lnet/minecraft/class_1309;F)F ARG 0 entity - METHOD method_3176 updateWorldIcon ()V + METHOD method_3176 updateWorldIcon (Ljava/nio/file/Path;)V METHOD method_3182 tick ()V METHOD method_3183 getShader ()Lnet/minecraft/class_279; METHOD method_3184 toggleShadersEnabled ()V diff --git a/mappings/net/minecraft/client/util/ScreenshotRecorder.mapping b/mappings/net/minecraft/client/util/ScreenshotRecorder.mapping index bb43a177ed..201e13827f 100644 --- a/mappings/net/minecraft/client/util/ScreenshotRecorder.mapping +++ b/mappings/net/minecraft/client/util/ScreenshotRecorder.mapping @@ -17,32 +17,17 @@ CLASS net/minecraft/class_318 net/minecraft/client/util/ScreenshotRecorder ARG 2 width ARG 3 height ARG 4 unitHeight - METHOD method_1659 saveScreenshot (Ljava/io/File;IILnet/minecraft/class_276;Ljava/util/function/Consumer;)V + METHOD method_1659 saveScreenshot (Ljava/io/File;Lnet/minecraft/class_276;Ljava/util/function/Consumer;)V ARG 0 gameDirectory - ARG 1 framebufferWidth - ARG 2 framebufferHeight - ARG 3 framebuffer - ARG 4 messageReceiver METHOD method_1660 getScreenshotFilename (Ljava/io/File;)Ljava/io/File; ARG 0 directory - METHOD method_1662 saveScreenshotInner (Ljava/io/File;Ljava/lang/String;IILnet/minecraft/class_276;Ljava/util/function/Consumer;)V + METHOD method_1662 saveScreenshotInner (Ljava/io/File;Ljava/lang/String;Lnet/minecraft/class_276;Ljava/util/function/Consumer;)V ARG 0 gameDirectory ARG 1 fileName - ARG 2 framebufferWidth - ARG 3 framebufferHeight - ARG 4 framebuffer - ARG 5 messageReceiver - METHOD method_1663 takeScreenshot (IILnet/minecraft/class_276;)Lnet/minecraft/class_1011; - ARG 0 width - ARG 1 height - ARG 2 framebuffer - METHOD method_22690 saveScreenshot (Ljava/io/File;Ljava/lang/String;IILnet/minecraft/class_276;Ljava/util/function/Consumer;)V + METHOD method_1663 takeScreenshot (Lnet/minecraft/class_276;)Lnet/minecraft/class_1011; + METHOD method_22690 saveScreenshot (Ljava/io/File;Ljava/lang/String;Lnet/minecraft/class_276;Ljava/util/function/Consumer;)V ARG 0 gameDirectory ARG 1 fileName - ARG 2 framebufferWidth - ARG 3 framebufferHeight - ARG 4 framebuffer - ARG 5 messageReceiver METHOD method_35710 writeToStream ()V COMMENT Writes the contents in the {@link #buffer} into the {@link #stream}. METHOD method_35711 getIntoBuffer (Ljava/nio/ByteBuffer;IIII)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntityDestroyS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntityDestroyS2CPacket.mapping index fa4e637f81..6a3c9a5cbb 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/EntityDestroyS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntityDestroyS2CPacket.mapping @@ -1,7 +1,5 @@ CLASS net/minecraft/class_2716 net/minecraft/network/packet/s2c/play/EntityDestroyS2CPacket - FIELD field_33690 entityId I - METHOD (I)V - ARG 1 entityId + FIELD field_33690 entityId Lit/unimi/dsi/fastutil/ints/IntList; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf - METHOD method_36548 getEntityId ()I + METHOD method_36548 getEntityId ()Lit/unimi/dsi/fastutil/ints/IntList; diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index 3e0c239958..2f737dd86c 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -68,7 +68,6 @@ CLASS net/minecraft/server/MinecraftServer FIELD field_4571 timeReference J FIELD field_4572 ticks I FIELD field_4573 lastTickLengths [J - FIELD field_4577 iconFilePresent Z FIELD field_4578 userName Ljava/lang/String; FIELD field_4582 snooper Lnet/minecraft/class_1276; FIELD field_4584 resourcePackHash Ljava/lang/String; @@ -204,7 +203,7 @@ CLASS net/minecraft/server/MinecraftServer ARG 3 force COMMENT when set to true, all the {@link ServerWorld}s will be saved even if {@link ServerWorld#savingDisabled} is set to true METHOD method_3724 isSinglePlayer ()Z - METHOD method_3725 getIconFile ()Ljava/io/File; + METHOD method_3725 getIconFile ()Ljava/util/Optional; METHOD method_3727 hasGui ()Z METHOD method_3728 kickNonWhitelistedPlayers (Lnet/minecraft/class_2168;)V ARG 1 source @@ -268,7 +267,6 @@ CLASS net/minecraft/server/MinecraftServer ARG 1 preventProxyConnections METHOD method_3765 getServerMetadata ()Lnet/minecraft/class_2926; METHOD method_3767 getGameRules ()Lnet/minecraft/class_1928; - METHOD method_3771 hasIconFile ()Z METHOD method_3772 getRecipeManager ()Lnet/minecraft/class_1863; METHOD method_3773 getNetworkCompressionThreshold ()I METHOD method_3774 prepareStartRegion (Lnet/minecraft/class_3949;)V diff --git a/mappings/net/minecraft/util/UserCache.mapping b/mappings/net/minecraft/util/UserCache.mapping index 3665b924da..1eccfed907 100644 --- a/mappings/net/minecraft/util/UserCache.mapping +++ b/mappings/net/minecraft/util/UserCache.mapping @@ -15,15 +15,15 @@ CLASS net/minecraft/class_3312 net/minecraft/util/UserCache ARG 2 cacheFile METHOD method_14508 add (Lcom/mojang/authlib/GameProfile;)V ARG 1 profile - METHOD method_14509 findProfileByName (Lcom/mojang/authlib/GameProfileRepository;Ljava/lang/String;)Lcom/mojang/authlib/GameProfile; + METHOD method_14509 findProfileByName (Lcom/mojang/authlib/GameProfileRepository;Ljava/lang/String;)Ljava/util/Optional; ARG 0 repository ARG 1 name METHOD method_14510 setUseRemote (Z)V ARG 0 value - METHOD method_14512 getByUuid (Ljava/util/UUID;)Lcom/mojang/authlib/GameProfile; + METHOD method_14512 getByUuid (Ljava/util/UUID;)Ljava/util/Optional; ARG 1 uuid METHOD method_14514 shouldUseRemote ()Z - METHOD method_14515 findByName (Ljava/lang/String;)Lcom/mojang/authlib/GameProfile; + METHOD method_14515 findByName (Ljava/lang/String;)Ljava/util/Optional; ARG 1 name METHOD method_14516 getLastAccessedEntries (I)Ljava/util/stream/Stream; ARG 1 limit @@ -36,26 +36,23 @@ CLASS net/minecraft/class_3312 net/minecraft/util/UserCache ARG 1 dateFormat METHOD method_30166 (Lcom/google/gson/JsonArray;Ljava/text/DateFormat;Lnet/minecraft/class_3312$class_3313;)V ARG 2 entry - METHOD method_30167 entryFromJson (Lcom/google/gson/JsonElement;Ljava/text/DateFormat;)Lnet/minecraft/class_3312$class_3313; + METHOD method_30167 entryFromJson (Lcom/google/gson/JsonElement;Ljava/text/DateFormat;)Ljava/util/Optional; ARG 0 json ARG 1 dateFormat METHOD method_30168 (Ljava/text/DateFormat;Ljava/util/List;Lcom/google/gson/JsonElement;)V ARG 2 json METHOD method_30169 incrementAndGetAccessCount ()J METHOD method_30170 getDateFormat ()Ljava/text/DateFormat; - METHOD method_37155 (Ljava/lang/String;Lcom/mojang/authlib/GameProfile;Ljava/lang/Throwable;)V - ARG 2 profile + METHOD method_37155 (Ljava/lang/String;Ljava/util/Optional;Ljava/lang/Throwable;)V ARG 3 throwable METHOD method_37156 findByNameAsync (Ljava/lang/String;Ljava/util/function/Consumer;)V ARG 1 username ARG 2 consumer METHOD method_37157 setExecutor (Ljava/util/concurrent/Executor;)V ARG 1 executor - METHOD method_37158 (Ljava/util/function/Consumer;Lcom/mojang/authlib/GameProfile;Ljava/lang/Throwable;)V - ARG 1 profile + METHOD method_37158 (Ljava/util/function/Consumer;Ljava/util/Optional;Ljava/lang/Throwable;)V ARG 2 throwable - METHOD method_37160 (Ljava/util/function/Consumer;Lcom/mojang/authlib/GameProfile;Ljava/lang/Throwable;)V - ARG 1 profile + METHOD method_37160 (Ljava/util/function/Consumer;Ljava/util/Optional;Ljava/lang/Throwable;)V ARG 2 throwable CLASS 1 METHOD onProfileLookupFailed (Lcom/mojang/authlib/GameProfile;Ljava/lang/Exception;)V diff --git a/mappings/net/minecraft/world/level/storage/LevelStorage.mapping b/mappings/net/minecraft/world/level/storage/LevelStorage.mapping index 1625c246a8..4602bbee06 100644 --- a/mappings/net/minecraft/world/level/storage/LevelStorage.mapping +++ b/mappings/net/minecraft/world/level/storage/LevelStorage.mapping @@ -51,7 +51,7 @@ CLASS net/minecraft/class_32 net/minecraft/world/level/storage/LevelStorage ARG 1 savePath METHOD method_27012 needsConversion ()Z METHOD method_27013 readLevelProperties (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5359;)Lnet/minecraft/class_5219; - METHOD method_27014 getIconFile ()Ljava/io/File; + METHOD method_27014 getIconFile ()Ljava/util/Optional; METHOD method_27015 deleteSessionLock ()V METHOD method_27016 createBackup ()J METHOD method_27017 checkValid ()V