From fe2dbc5d211c2d608c0e0789dab9030de3db8cfe Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Thu, 25 Nov 2021 15:18:06 +0000 Subject: [PATCH] 1.18-rc1 --- build.gradle | 2 +- .../client/render/chunk/ChunkBuilder.mapping | 8 +++---- .../render/chunk/ChunkRendererRegion.mapping | 24 ++----------------- .../client/render/chunk/RenderedChunk.mapping | 11 +++++++++ .../world/chunk/PalettedContainer.mapping | 3 +-- 5 files changed, 19 insertions(+), 29 deletions(-) create mode 100644 mappings/net/minecraft/client/render/chunk/RenderedChunk.mapping diff --git a/build.gradle b/build.gradle index 8155377d03..9451d1211a 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-pre8" +def minecraft_version = "1.18-rc1" def ENV = System.getenv() // Fetch build number from Github Actions diff --git a/mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping b/mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping index 05fdd93fcf..07f14871ec 100644 --- a/mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping +++ b/mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping @@ -42,7 +42,7 @@ CLASS net/minecraft/class_846 net/minecraft/client/render/chunk/ChunkBuilder METHOD method_34847 getFreeBufferCount ()I METHOD method_3619 stop ()V METHOD method_3622 getDebugString ()Ljava/lang/String; - METHOD method_3627 rebuild (Lnet/minecraft/class_846$class_851;)V + METHOD method_3627 rebuild (Lnet/minecraft/class_846$class_851;Lnet/minecraft/class_6850;)V ARG 1 chunk METHOD method_3630 isEmpty ()Z METHOD method_3632 reset ()V @@ -85,11 +85,11 @@ CLASS net/minecraft/class_846 net/minecraft/client/render/chunk/ChunkBuilder METHOD method_22773 scheduleSort (Lnet/minecraft/class_1921;Lnet/minecraft/class_846;)Z ARG 1 layer ARG 2 chunkRenderer - METHOD method_22777 scheduleRebuild (Lnet/minecraft/class_846;)V + METHOD method_22777 scheduleRebuild (Lnet/minecraft/class_846;Lnet/minecraft/class_6850;)V ARG 1 chunkRenderer METHOD method_22778 setNoCullingBlockEntities (Ljava/util/Set;)V ARG 1 noCullingBlockEntities - METHOD method_22781 rebuild ()V + METHOD method_22781 rebuild (Lnet/minecraft/class_6850;)V METHOD method_3651 isChunkNonEmpty (Lnet/minecraft/class_2338;)Z ARG 1 pos METHOD method_3653 setOrigin (III)V @@ -110,7 +110,7 @@ CLASS net/minecraft/class_846 net/minecraft/client/render/chunk/ChunkBuilder METHOD method_3670 getOrigin ()Lnet/minecraft/class_2338; METHOD method_3672 needsRebuild ()Z METHOD method_3673 shouldBuild ()Z - METHOD method_3674 createRebuildTask ()Lnet/minecraft/class_846$class_851$class_4577; + METHOD method_3674 createRebuildTask (Lnet/minecraft/class_6850;)Lnet/minecraft/class_846$class_851$class_4577; METHOD method_3675 clear ()V METHOD method_3676 getNeighborPosition (Lnet/minecraft/class_2350;)Lnet/minecraft/class_2338; ARG 1 direction diff --git a/mappings/net/minecraft/client/render/chunk/ChunkRendererRegion.mapping b/mappings/net/minecraft/client/render/chunk/ChunkRendererRegion.mapping index 2ed70f8f48..93d7158d91 100644 --- a/mappings/net/minecraft/client/render/chunk/ChunkRendererRegion.mapping +++ b/mappings/net/minecraft/client/render/chunk/ChunkRendererRegion.mapping @@ -1,30 +1,10 @@ CLASS net/minecraft/class_853 net/minecraft/client/render/chunk/ChunkRendererRegion - FIELD field_4483 chunks [[Lnet/minecraft/class_853$class_6849; + FIELD field_4483 chunks [[Lnet/minecraft/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_853$class_6849;)V + METHOD (Lnet/minecraft/class_1937;II[[Lnet/minecraft/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_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 - ARG 2 endPos - ARG 3 chunkRadius - CLASS class_6849 RenderedChunk - FIELD field_36310 blockEntities Ljava/util/Map; - FIELD field_36311 blockStateContainers Ljava/util/List; - FIELD field_36312 debugWorld Z - FIELD field_36313 chunk Lnet/minecraft/class_2818; - METHOD (Lnet/minecraft/class_2818;)V - ARG 1 chunk - METHOD method_39962 getBlockEntity (Lnet/minecraft/class_2338;)Lnet/minecraft/class_2586; - ARG 1 pos - METHOD method_39963 getBlockState (Lnet/minecraft/class_2338;)Lnet/minecraft/class_2680; - ARG 1 pos diff --git a/mappings/net/minecraft/client/render/chunk/RenderedChunk.mapping b/mappings/net/minecraft/client/render/chunk/RenderedChunk.mapping new file mode 100644 index 0000000000..616f1e74e3 --- /dev/null +++ b/mappings/net/minecraft/client/render/chunk/RenderedChunk.mapping @@ -0,0 +1,11 @@ +CLASS net/minecraft/class_6849 net/minecraft/client/render/chunk/RenderedChunk + FIELD field_36310 blockEntities Ljava/util/Map; + FIELD field_36311 blockStateContainers Ljava/util/List; + FIELD field_36312 debugWorld Z + FIELD field_36313 chunk Lnet/minecraft/class_2818; + METHOD (Lnet/minecraft/class_2818;)V + ARG 1 chunk + METHOD method_39962 getBlockEntity (Lnet/minecraft/class_2338;)Lnet/minecraft/class_2586; + ARG 1 pos + METHOD method_39963 getBlockState (Lnet/minecraft/class_2338;)Lnet/minecraft/class_2680; + ARG 1 pos diff --git a/mappings/net/minecraft/world/chunk/PalettedContainer.mapping b/mappings/net/minecraft/world/chunk/PalettedContainer.mapping index 50b3e9858b..110a56c278 100644 --- a/mappings/net/minecraft/world/chunk/PalettedContainer.mapping +++ b/mappings/net/minecraft/world/chunk/PalettedContainer.mapping @@ -70,8 +70,7 @@ CLASS net/minecraft/class_2841 net/minecraft/world/chunk/PalettedContainer ARG 1 counter METHOD method_21733 (Lnet/minecraft/class_2841$class_4464;Lit/unimi/dsi/fastutil/ints/Int2IntMap$Entry;)V ARG 2 entry - METHOD method_21734 increment (Lit/unimi/dsi/fastutil/ints/Int2IntMap;I)V - ARG 0 map + METHOD method_21734 increment (Lit/unimi/dsi/fastutil/ints/Int2IntOpenHashMap;I)V ARG 1 key METHOD method_35321 set (IIILjava/lang/Object;)V ARG 1 x