From a663e6776d103e5e28ddd0412515e6812ff2f50e Mon Sep 17 00:00:00 2001 From: Adrian Siekierka Date: Fri, 17 May 2019 16:08:03 +0200 Subject: [PATCH] 1.14.2 Pre-Release 2 --- build.gradle | 2 +- .../chat/ComponentWithSelectors.mapping | 2 +- .../minecraft/network/chat/Components.mapping | 2 +- .../server/world/ChunkHolder.mapping | 2 -- .../world/ThreadedAnvilChunkStorage.mapping | 5 ++- .../minecraft/world/ChunkSerializer.mapping | 2 +- .../minecraft/world/chunk/ChunkStatus.mapping | 32 +++++++++---------- 7 files changed, 22 insertions(+), 25 deletions(-) diff --git a/build.gradle b/build.gradle index bae95ac389..a4a93694a8 100644 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,7 @@ plugins { id 'maven-publish' } -def minecraft_version = "1.14.2 Pre-Release 1" +def minecraft_version = "1.14.2 Pre-Release 2" def ENV = System.getenv() // Fetch build number from Jenkins diff --git a/mappings/net/minecraft/network/chat/ComponentWithSelectors.mapping b/mappings/net/minecraft/network/chat/ComponentWithSelectors.mapping index b79873ecf4..4cfddf7306 100644 --- a/mappings/net/minecraft/network/chat/ComponentWithSelectors.mapping +++ b/mappings/net/minecraft/network/chat/ComponentWithSelectors.mapping @@ -1,3 +1,3 @@ CLASS jo net/minecraft/network/chat/ComponentWithSelectors - METHOD a resolve (Lcd;Laii;)Ljm; + METHOD a resolve (Lcd;Laii;I)Ljm; ARG 1 source diff --git a/mappings/net/minecraft/network/chat/Components.mapping b/mappings/net/minecraft/network/chat/Components.mapping index 47603c5988..b08edc5775 100644 --- a/mappings/net/minecraft/network/chat/Components.mapping +++ b/mappings/net/minecraft/network/chat/Components.mapping @@ -1,5 +1,5 @@ CLASS jn net/minecraft/network/chat/Components - METHOD a resolveAndStyle (Lcd;Ljm;Laii;)Ljm; + METHOD a resolveAndStyle (Lcd;Ljm;Laii;I)Ljm; ARG 0 source ARG 1 component ARG 2 entity diff --git a/mappings/net/minecraft/server/world/ChunkHolder.mapping b/mappings/net/minecraft/server/world/ChunkHolder.mapping index ef1346a81e..f8972efd05 100644 --- a/mappings/net/minecraft/server/world/ChunkHolder.mapping +++ b/mappings/net/minecraft/server/world/ChunkHolder.mapping @@ -69,8 +69,6 @@ CLASS ur net/minecraft/server/world/ChunkHolder METHOD b getEntityTickingFuture ()Ljava/util/concurrent/CompletableFuture; METHOD b getTargetGenerationStatus (I)Lbxd; ARG 0 level - METHOD b getFutureChecked (Lbxd;)Ljava/util/concurrent/CompletableFuture; - ARG 1 leastStatus METHOD c getWorldChunk ()Lbxk; METHOD c getLevelType (I)Lur$b; ARG 0 distance diff --git a/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping b/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping index 484edbbe46..0beb426cde 100644 --- a/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping +++ b/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping @@ -89,7 +89,6 @@ CLASS us net/minecraft/server/world/ThreadedAnvilChunkStorage METHOD a tick (Ljava/util/function/BooleanSupplier;)V METHOD a createTickingFuture (Lur;)Ljava/util/concurrent/CompletableFuture; METHOD a createChunkFuture (Lur;Lbxd;)Ljava/util/concurrent/CompletableFuture; - ARG 1 holder METHOD a updateCameraPosition (Lvh;)V ARG 1 player METHOD a sendWatchPackets (Lvh;Lbgu;[Lka;ZZ)V @@ -131,7 +130,7 @@ CLASS us net/minecraft/server/world/ThreadedAnvilChunkStorage ARG 1 pos METHOD e getTicketManager ()Lus$a; METHOD f entryIterator ()Lit/unimi/dsi/fastutil/objects/ObjectBidirectionalIterator; - METHOD f getUpdatedChunkTag (Lbgu;)Lib; - ARG 1 pos METHOD g tickPlayerMovement ()V + METHOD g getUpdatedChunkTag (Lbgu;)Lib; + ARG 1 pos METHOD h getPointOfInterestStorage ()Laqh; diff --git a/mappings/net/minecraft/world/ChunkSerializer.mapping b/mappings/net/minecraft/world/ChunkSerializer.mapping index d9a4f741a4..b11ec72518 100644 --- a/mappings/net/minecraft/world/ChunkSerializer.mapping +++ b/mappings/net/minecraft/world/ChunkSerializer.mapping @@ -9,7 +9,7 @@ CLASS bxw net/minecraft/world/ChunkSerializer ARG 1 structureManager ARG 2 biomeSource ARG 3 tag - METHOD a getChunkType (Lib;)Lbxd$b; + METHOD a getChunkType (Lib;)Lbxd$a; ARG 0 tag METHOD a writeEntities (Lib;Lbxk;)V ARG 0 tag diff --git a/mappings/net/minecraft/world/chunk/ChunkStatus.mapping b/mappings/net/minecraft/world/chunk/ChunkStatus.mapping index 59df0c8daf..845399354a 100644 --- a/mappings/net/minecraft/world/chunk/ChunkStatus.mapping +++ b/mappings/net/minecraft/world/chunk/ChunkStatus.mapping @@ -1,10 +1,10 @@ CLASS bxd net/minecraft/world/chunk/ChunkStatus - CLASS bxd$a Task + CLASS bxd$a ChunkType + CLASS bxd$b Task METHOD doWork (Lbxd;Lvg;Lbwz;Lcjg;Lvj;Ljava/util/function/Function;Ljava/util/List;Lbwy;)Ljava/util/concurrent/CompletableFuture; ARG 1 targetStatus ARG 3 generator - CLASS bxd$b ChunkType - CLASS bxd$c SimpleTask + CLASS bxd$d SimpleTask METHOD doWork (Lbxd;Lvg;Lbwz;Lcjg;Lvj;Ljava/util/function/Function;Ljava/util/List;Lbwy;)Ljava/util/concurrent/CompletableFuture; ARG 1 targetStatus ARG 3 generator @@ -13,16 +13,16 @@ CLASS bxd net/minecraft/world/chunk/ChunkStatus ARG 4 chunk FIELD n PRE_CARVER_HEIGHTMAPS Ljava/util/EnumSet; FIELD o POST_CARVER_HEIGHTMAPS Ljava/util/EnumSet; - FIELD p DISTANCE_TO_TARGET_GENERATION_STATUS Ljava/util/List; - FIELD q STATUS_TO_TARGET_GENERATION_RADIUS Lit/unimi/dsi/fastutil/ints/IntList; - FIELD r name Ljava/lang/String; - FIELD s index I - FIELD t previous Lbxd; - FIELD u task Lbxd$a; - FIELD v taskMargin I - FIELD w chunkType Lbxd$b; - FIELD x surfaceGenerated Ljava/util/EnumSet; - METHOD (Ljava/lang/String;Lbxd;ILjava/util/EnumSet;Lbxd$b;Lbxd$a;)V + FIELD q DISTANCE_TO_TARGET_GENERATION_STATUS Ljava/util/List; + FIELD r STATUS_TO_TARGET_GENERATION_RADIUS Lit/unimi/dsi/fastutil/ints/IntList; + FIELD s name Ljava/lang/String; + FIELD t index I + FIELD u previous Lbxd; + FIELD v task Lbxd$b; + FIELD x taskMargin I + FIELD y chunkType Lbxd$a; + FIELD z surfaceGenerated Ljava/util/EnumSet; + METHOD (Ljava/lang/String;Lbxd;ILjava/util/EnumSet;Lbxd$a;Lbxd$b;Lbxd$c;)V ARG 1 name ARG 2 previous ARG 3 taskMargin @@ -36,8 +36,8 @@ CLASS bxd net/minecraft/world/chunk/ChunkStatus ARG 0 status METHOD a get (Ljava/lang/String;)Lbxd; ARG 0 id - METHOD a register (Ljava/lang/String;Lbxd;ILjava/util/EnumSet;Lbxd$b;Lbxd$a;)Lbxd; - METHOD a register (Ljava/lang/String;Lbxd;ILjava/util/EnumSet;Lbxd$b;Lbxd$c;)Lbxd; + METHOD a register (Ljava/lang/String;Lbxd;ILjava/util/EnumSet;Lbxd$a;Lbxd$b;)Lbxd; + METHOD a register (Ljava/lang/String;Lbxd;ILjava/util/EnumSet;Lbxd$a;Lbxd$d;)Lbxd; METHOD a runTask (Lvg;Lbwz;Lcjg;Lvj;Ljava/util/function/Function;Ljava/util/List;)Ljava/util/concurrent/CompletableFuture; ARG 2 chunkGenerator METHOD b getMaxTargetGenerationRadius ()I @@ -47,5 +47,5 @@ CLASS bxd net/minecraft/world/chunk/ChunkStatus METHOD d getName ()Ljava/lang/String; METHOD e getPrevious ()Lbxd; METHOD f getTaskMargin ()I - METHOD g getChunkType ()Lbxd$b; + METHOD g getChunkType ()Lbxd$a; METHOD h isSurfaceGenerated ()Ljava/util/EnumSet;