From 8dc444e87e163bfe2d4a898f0b597b2535aa73c1 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Wed, 24 Nov 2021 15:45:45 +0000 Subject: [PATCH] 1.18-pre8 --- build.gradle | 2 +- mappings/net/minecraft/client/MinecraftClient.mapping | 5 ++--- .../client/render/chunk/ChunkRendererRegion.mapping | 8 ++------ mappings/net/minecraft/recipe/RecipeManager.mapping | 4 ---- mappings/net/minecraft/text/TranslatableText.mapping | 2 +- .../net/minecraft/world/chunk/PalettedContainer.mapping | 3 --- 6 files changed, 6 insertions(+), 18 deletions(-) diff --git a/build.gradle b/build.gradle index 6a86c7bb05..8155377d03 100644 --- a/build.gradle +++ b/build.gradle @@ -27,7 +27,7 @@ plugins { id 'net.fabricmc.filament' version '0.3.0' } -def minecraft_version = "1.18-pre7" +def minecraft_version = "1.18-pre8" def ENV = System.getenv() // Fetch build number from Github Actions diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index fa37dfc24f..a55c2659c7 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -106,7 +106,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient COMMENT This is only used when connecting to the integrated server. COMMENT COMMENT @see net.minecraft.client.gui.screen.ConnectScreen - FIELD field_1747 crashReport Lnet/minecraft/class_128; + FIELD field_1747 crashReport Ljava/util/function/Supplier; FIELD field_1748 levelStorage Lnet/minecraft/class_32; FIELD field_1749 ALT_TEXT_RENDERER_ID Lnet/minecraft/class_2960; FIELD field_1750 lastMetricsSampleTime J @@ -188,8 +188,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient ARG 1 matrices ARG 2 profileResult METHOD method_1493 isPaused ()Z - METHOD method_1494 setCrashReport (Lnet/minecraft/class_128;)V - ARG 1 report + METHOD method_1494 setCrashReport (Ljava/util/function/Supplier;)V METHOD method_1495 getSessionService ()Lcom/mojang/authlib/minecraft/MinecraftSessionService; METHOD method_1496 isIntegratedServerRunning ()Z METHOD method_1498 isHudEnabled ()Z diff --git a/mappings/net/minecraft/client/render/chunk/ChunkRendererRegion.mapping b/mappings/net/minecraft/client/render/chunk/ChunkRendererRegion.mapping index 017778e999..2ec3061e6e 100644 --- a/mappings/net/minecraft/client/render/chunk/ChunkRendererRegion.mapping +++ b/mappings/net/minecraft/client/render/chunk/ChunkRendererRegion.mapping @@ -1,20 +1,16 @@ CLASS net/minecraft/class_853 net/minecraft/client/render/chunk/ChunkRendererRegion - FIELD field_4483 chunks [[Lnet/minecraft/class_2818; + FIELD field_4483 chunks [[Lnet/minecraft/class_853$class_6849; FIELD field_4487 chunkZOffset I FIELD field_4488 chunkXOffset I FIELD field_4490 world Lnet/minecraft/class_1937; - METHOD (Lnet/minecraft/class_1937;II[[Lnet/minecraft/class_2818;)V + METHOD (Lnet/minecraft/class_1937;II[[Lnet/minecraft/class_853$class_6849;)V ARG 1 world ARG 2 chunkX ARG 3 chunkZ - ARG 4 chunks METHOD method_30000 isEmptyBetween (Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;II[[Lnet/minecraft/class_2818;)Z ARG 0 from ARG 1 to ARG 4 chunks - METHOD method_3688 getBlockEntity (Lnet/minecraft/class_2338;Lnet/minecraft/class_2818$class_2819;)Lnet/minecraft/class_2586; - ARG 1 pos - ARG 2 creationType METHOD method_3689 create (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;I)Lnet/minecraft/class_853; ARG 0 world ARG 1 startPos diff --git a/mappings/net/minecraft/recipe/RecipeManager.mapping b/mappings/net/minecraft/recipe/RecipeManager.mapping index 06bdf58ee2..4edfae0455 100644 --- a/mappings/net/minecraft/recipe/RecipeManager.mapping +++ b/mappings/net/minecraft/recipe/RecipeManager.mapping @@ -27,8 +27,6 @@ CLASS net/minecraft/class_1863 net/minecraft/recipe/RecipeManager COMMENT the recipe's ID ARG 1 json COMMENT the recipe JSON - METHOD method_17721 (Lnet/minecraft/class_2960;Ljava/util/Map;)Lnet/minecraft/class_1860; - ARG 1 map METHOD method_17722 (Ljava/util/Map;)Ljava/util/stream/Stream; ARG 0 map METHOD method_17723 (Ljava/util/Map;)Ljava/util/stream/Stream; @@ -57,8 +55,6 @@ CLASS net/minecraft/class_1863 net/minecraft/recipe/RecipeManager COMMENT side recipes. ARG 1 recipes COMMENT the recipes to set - METHOD method_20704 (Ljava/util/Map;Lnet/minecraft/class_1860;)V - ARG 1 recipe METHOD method_20706 (Lnet/minecraft/class_3956;)Ljava/util/Map; ARG 0 t METHOD method_20707 (Lnet/minecraft/class_3956;)Lcom/google/common/collect/ImmutableMap$Builder; diff --git a/mappings/net/minecraft/text/TranslatableText.mapping b/mappings/net/minecraft/text/TranslatableText.mapping index 347454fcc2..03ab998122 100644 --- a/mappings/net/minecraft/text/TranslatableText.mapping +++ b/mappings/net/minecraft/text/TranslatableText.mapping @@ -14,7 +14,7 @@ CLASS net/minecraft/class_2588 net/minecraft/text/TranslatableText ARG 2 args METHOD method_11022 getKey ()Ljava/lang/String; METHOD method_11023 getArgs ()[Ljava/lang/Object; - METHOD method_11024 setTranslation (Ljava/lang/String;)V + METHOD method_11024 setTranslation (Ljava/lang/String;Ljava/util/function/Consumer;)V ARG 1 translation METHOD method_11025 updateTranslations ()V METHOD method_29434 getArg (I)Lnet/minecraft/class_5348; diff --git a/mappings/net/minecraft/world/chunk/PalettedContainer.mapping b/mappings/net/minecraft/world/chunk/PalettedContainer.mapping index 21de5aecc8..dba211e1c6 100644 --- a/mappings/net/minecraft/world/chunk/PalettedContainer.mapping +++ b/mappings/net/minecraft/world/chunk/PalettedContainer.mapping @@ -12,10 +12,7 @@ CLASS net/minecraft/class_2841 net/minecraft/world/chunk/PalettedContainer ARG 2 object ARG 3 paletteProvider METHOD (Lnet/minecraft/class_2359;Lnet/minecraft/class_2841$class_6563;Lnet/minecraft/class_2841$class_6560;Lnet/minecraft/class_6490;Ljava/util/List;)V - ARG 1 idList ARG 2 paletteProvider - ARG 3 dataProvider - ARG 4 storage METHOD method_12321 get (III)Ljava/lang/Object; ARG 1 x ARG 2 y