From da2e38b785834c8e1c8e1f050c38ce8ba1e6af83 Mon Sep 17 00:00:00 2001 From: Adrian Siekierka Date: Sun, 16 Dec 2018 13:37:03 +0100 Subject: [PATCH] fix #313, fix #314 (#317) * fix #313, fix #314 * fix other instances --- .../render/{VertexBuffer.mapping => BufferBuilder.mapping} | 2 +- mappings/net/minecraft/client/render/BufferRenderer.mapping | 2 ++ .../client/render/PartiallyBrokenBlockEntry.mapping | 5 +++++ mappings/net/minecraft/client/render/Tessellator.mapping | 2 +- .../minecraft/client/render/VertexBufferRenderer.mapping | 2 -- .../client/render/chunk/BlockLayeredBufferBuilder.mapping | 4 ++++ .../client/render/chunk/ChunkRenderDataTask.mapping | 6 +++--- .../minecraft/client/render/chunk/ChunkVertexBuffer.mapping | 4 ---- mappings/net/minecraft/server/MinecraftServer.mapping | 6 +++--- .../server/dedicated/MinecraftDedicatedServer.mapping | 2 +- 10 files changed, 20 insertions(+), 15 deletions(-) rename mappings/net/minecraft/client/render/{VertexBuffer.mapping => BufferBuilder.mapping} (97%) create mode 100644 mappings/net/minecraft/client/render/BufferRenderer.mapping delete mode 100644 mappings/net/minecraft/client/render/VertexBufferRenderer.mapping create mode 100644 mappings/net/minecraft/client/render/chunk/BlockLayeredBufferBuilder.mapping delete mode 100644 mappings/net/minecraft/client/render/chunk/ChunkVertexBuffer.mapping diff --git a/mappings/net/minecraft/client/render/VertexBuffer.mapping b/mappings/net/minecraft/client/render/BufferBuilder.mapping similarity index 97% rename from mappings/net/minecraft/client/render/VertexBuffer.mapping rename to mappings/net/minecraft/client/render/BufferBuilder.mapping index 815a1c3aac..757f3b069c 100644 --- a/mappings/net/minecraft/client/render/VertexBuffer.mapping +++ b/mappings/net/minecraft/client/render/BufferBuilder.mapping @@ -1,4 +1,4 @@ -CLASS cou net/minecraft/client/render/VertexBuffer +CLASS cou net/minecraft/client/render/BufferBuilder CLASS cou$a State FIELD b rawBuffer [I FIELD c format Lcpa; diff --git a/mappings/net/minecraft/client/render/BufferRenderer.mapping b/mappings/net/minecraft/client/render/BufferRenderer.mapping new file mode 100644 index 0000000000..140d826e9c --- /dev/null +++ b/mappings/net/minecraft/client/render/BufferRenderer.mapping @@ -0,0 +1,2 @@ +CLASS cov net/minecraft/client/render/BufferRenderer + METHOD a draw (Lcou;)V diff --git a/mappings/net/minecraft/client/render/PartiallyBrokenBlockEntry.mapping b/mappings/net/minecraft/client/render/PartiallyBrokenBlockEntry.mapping index 4fdb78e151..c5295d598f 100644 --- a/mappings/net/minecraft/client/render/PartiallyBrokenBlockEntry.mapping +++ b/mappings/net/minecraft/client/render/PartiallyBrokenBlockEntry.mapping @@ -2,6 +2,11 @@ CLASS ub net/minecraft/client/render/PartiallyBrokenBlockEntry FIELD a breakingEntityId I FIELD b pos Let; FIELD c stage I + FIELD d lastUpdateTicks I METHOD a setStage (I)V + ARG 1 value METHOD b getPos ()Let; + METHOD b setLastUpdateTicks (I)V + ARG 1 value METHOD c getStage ()I + METHOD d getLastUpdateTicks ()I diff --git a/mappings/net/minecraft/client/render/Tessellator.mapping b/mappings/net/minecraft/client/render/Tessellator.mapping index c0df2f371e..a51c695da5 100644 --- a/mappings/net/minecraft/client/render/Tessellator.mapping +++ b/mappings/net/minecraft/client/render/Tessellator.mapping @@ -4,4 +4,4 @@ CLASS cox net/minecraft/client/render/Tessellator FIELD c INSTANCE Lcox; METHOD a getInstance ()Lcox; METHOD b draw ()V - METHOD c getVertexBuffer ()Lcou; + METHOD c getBufferBuilder ()Lcou; diff --git a/mappings/net/minecraft/client/render/VertexBufferRenderer.mapping b/mappings/net/minecraft/client/render/VertexBufferRenderer.mapping deleted file mode 100644 index 4142914241..0000000000 --- a/mappings/net/minecraft/client/render/VertexBufferRenderer.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS cov net/minecraft/client/render/VertexBufferRenderer - METHOD a draw (Lcou;)V diff --git a/mappings/net/minecraft/client/render/chunk/BlockLayeredBufferBuilder.mapping b/mappings/net/minecraft/client/render/chunk/BlockLayeredBufferBuilder.mapping new file mode 100644 index 0000000000..9ba9bd4344 --- /dev/null +++ b/mappings/net/minecraft/client/render/chunk/BlockLayeredBufferBuilder.mapping @@ -0,0 +1,4 @@ +CLASS ddt net/minecraft/client/render/chunk/BlockLayeredBufferBuilder + FIELD a layerBuilders [Lcou; + METHOD a get (I)Lcou; + METHOD a get (Lbbc;)Lcou; diff --git a/mappings/net/minecraft/client/render/chunk/ChunkRenderDataTask.mapping b/mappings/net/minecraft/client/render/chunk/ChunkRenderDataTask.mapping index e4f8d25079..658ba4ec02 100644 --- a/mappings/net/minecraft/client/render/chunk/ChunkRenderDataTask.mapping +++ b/mappings/net/minecraft/client/render/chunk/ChunkRenderDataTask.mapping @@ -7,7 +7,7 @@ CLASS dgp net/minecraft/client/render/chunk/ChunkRenderDataTask FIELD c runnables Ljava/util/List; FIELD d mode Ldgp$b; FIELD e distanceToPlayerSquared D - FIELD g vertexBuffer Lddt; + FIELD g bufferBuilder Lddt; FIELD h renderData Ldgs; FIELD i stage Ldgp$a; METHOD (Ldgu;Ldgp$b;DLdgw;)V @@ -15,13 +15,13 @@ CLASS dgp net/minecraft/client/render/chunk/ChunkRenderDataTask ARG 2 mode ARG 3 distanceToPlayerSquared METHOD a getStage ()Ldgp$a; - METHOD a setVertexBuffer (Lddt;)V + METHOD a setBufferBuilders (Lddt;)V METHOD a setStage (Ldgp$a;)V METHOD a compareTo (Ldgp;)I METHOD a setRenderData (Ldgs;)V METHOD b getChunkRenderer ()Ldgu; METHOD d getRenderData ()Ldgs; - METHOD e getVertexBuffer ()Lddt; + METHOD e getBufferBuilders ()Lddt; METHOD f cancel ()V METHOD g getLock ()Ljava/util/concurrent/locks/ReentrantLock; METHOD h getMode ()Ldgp$b; diff --git a/mappings/net/minecraft/client/render/chunk/ChunkVertexBuffer.mapping b/mappings/net/minecraft/client/render/chunk/ChunkVertexBuffer.mapping deleted file mode 100644 index 368ecd9915..0000000000 --- a/mappings/net/minecraft/client/render/chunk/ChunkVertexBuffer.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS ddt net/minecraft/client/render/chunk/ChunkVertexBuffer - FIELD a renderLayerVertexBuffers [Lcou; - METHOD a getVertexBuffer (I)Lcou; - METHOD a getVertexBuffer (Lbbc;)Lcou; diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index d9a431127e..9d2f0c27df 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -49,7 +49,7 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer FIELD r serverIp Ljava/lang/String; FIELD s serverPort I FIELD t worlds Ljava/util/Map; - FIELD u serverConfigurationManager Lwt; + FIELD u playerManager Lwt; FIELD v running Z FIELD w stopped Z FIELD x ticks I @@ -94,7 +94,7 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer METHOD a appendCommandFeedback (Ljd;)V METHOD a registerTickable (Lqt;)V METHOD a getSpawnRadius (Luq;)I - METHOD a setConfigurationManager (Lwt;)V + METHOD a setPlayerManager (Lwt;)V METHOD a stop (Z)V METHOD a save (ZZ)V ARG 1 silent @@ -116,7 +116,7 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer METHOD ab getServerMotd ()Ljava/lang/String; METHOD ac getWorldHeight ()I METHOD ad isStopped ()Z - METHOD ae getConfigurationManager ()Lwt; + METHOD ae getPlayerManager ()Lwt; METHOD af isRemote ()Z METHOD ag getNetworkIO ()Lvf; METHOD ai hasGui ()Z diff --git a/mappings/net/minecraft/server/dedicated/MinecraftDedicatedServer.mapping b/mappings/net/minecraft/server/dedicated/MinecraftDedicatedServer.mapping index 920147f2ec..1813cf591e 100644 --- a/mappings/net/minecraft/server/dedicated/MinecraftDedicatedServer.mapping +++ b/mappings/net/minecraft/server/dedicated/MinecraftDedicatedServer.mapping @@ -11,7 +11,7 @@ CLASS tr net/minecraft/server/dedicated/MinecraftDedicatedServer METHOD a openToLan (Lbbm;ZI)Z METHOD a isSpawnProtected (Lbbp;Let;Larb;)Z METHOD aa areCommandBlocksEnabled ()Z - METHOD ae getConfigurationManager ()Lwt; + METHOD ae getPlayerManager ()Lwt; METHOD af isRemote ()Z METHOD ai hasGui ()Z METHOD an getSpawnProtectionRadius ()I