From c2d1eac59544aa90b08b2a8c26651bb965ba6305 Mon Sep 17 00:00:00 2001
From: apple502j <33279053+apple502j@users.noreply.github.com>
Date: Sun, 20 Mar 2022 00:57:01 +0900
Subject: [PATCH] 22w11a neighbor update (#3047)
---
.../net/minecraft/block/AbstractBlock.mapping | 8 ++---
.../minecraft/block/AbstractRailBlock.mapping | 2 ++
.../minecraft/server/MinecraftServer.mapping | 1 +
.../dedicated/ServerPropertiesHandler.mapping | 1 +
.../server/world/ServerWorld.mapping | 1 +
mappings/net/minecraft/world/World.mapping | 17 +++++++---
.../ChainRestrictedNeighborUpdater.mapping | 34 +++++++++++++++++++
.../world/block/NeighborUpdater.mapping | 24 +++++++++++++
.../world/block/SimpleNeighborUpdater.mapping | 4 +++
9 files changed, 84 insertions(+), 8 deletions(-)
create mode 100644 mappings/net/minecraft/world/block/ChainRestrictedNeighborUpdater.mapping
create mode 100644 mappings/net/minecraft/world/block/NeighborUpdater.mapping
create mode 100644 mappings/net/minecraft/world/block/SimpleNeighborUpdater.mapping
diff --git a/mappings/net/minecraft/block/AbstractBlock.mapping b/mappings/net/minecraft/block/AbstractBlock.mapping
index b2adc25930..d177a346bf 100644
--- a/mappings/net/minecraft/block/AbstractBlock.mapping
+++ b/mappings/net/minecraft/block/AbstractBlock.mapping
@@ -267,8 +267,8 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock
ARG 1 state
ARG 2 world
ARG 3 pos
- ARG 4 block
- ARG 5 fromPos
+ ARG 4 sourceBlock
+ ARG 5 sourcePos
ARG 6 notify
METHOD method_9615 onBlockAdded (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Z)V
COMMENT @deprecated Consider calling {@link AbstractBlockState#onBlockAdded} instead. See the class javadoc.
@@ -498,8 +498,8 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock
METHOD method_26181 neighborUpdate (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2248;Lnet/minecraft/class_2338;Z)V
ARG 1 world
ARG 2 pos
- ARG 3 block
- ARG 4 posFrom
+ ARG 3 sourceBlock
+ ARG 4 sourcePos
ARG 5 notify
METHOD method_26182 onBlockAdded (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Z)V
ARG 1 world
diff --git a/mappings/net/minecraft/block/AbstractRailBlock.mapping b/mappings/net/minecraft/block/AbstractRailBlock.mapping
index 1a942c38f1..4612cfb6c5 100644
--- a/mappings/net/minecraft/block/AbstractRailBlock.mapping
+++ b/mappings/net/minecraft/block/AbstractRailBlock.mapping
@@ -7,6 +7,8 @@ CLASS net/minecraft/class_2241 net/minecraft/block/AbstractRailBlock
ARG 1 allowCurves
ARG 2 settings
METHOD method_24417 updateCurves (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Z)Lnet/minecraft/class_2680;
+ ARG 1 state
+ ARG 2 world
ARG 3 pos
ARG 4 notify
METHOD method_27935 shouldDropRail (Lnet/minecraft/class_2338;Lnet/minecraft/class_1937;Lnet/minecraft/class_2768;)Z
diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping
index 038c3abf64..98801e5a99 100644
--- a/mappings/net/minecraft/server/MinecraftServer.mapping
+++ b/mappings/net/minecraft/server/MinecraftServer.mapping
@@ -436,6 +436,7 @@ CLASS net/minecraft/server/MinecraftServer
ARG 2 throwable
METHOD method_40376 createCrashReport (Ljava/lang/Throwable;)Lnet/minecraft/class_128;
ARG 0 throwable
+ METHOD method_41239 getMaxChainedNeighborUpdates ()I
METHOD method_5387 isMainThread ()Z
CLASS class_6414 DebugStart
FIELD field_33980 time J
diff --git a/mappings/net/minecraft/server/dedicated/ServerPropertiesHandler.mapping b/mappings/net/minecraft/server/dedicated/ServerPropertiesHandler.mapping
index 90602670a6..933d323b1f 100644
--- a/mappings/net/minecraft/server/dedicated/ServerPropertiesHandler.mapping
+++ b/mappings/net/minecraft/server/dedicated/ServerPropertiesHandler.mapping
@@ -51,6 +51,7 @@ CLASS net/minecraft/class_3806 net/minecraft/server/dedicated/ServerPropertiesHa
FIELD field_34883 simulationDistance I
FIELD field_35564 hideOnlinePlayers Z
FIELD field_37039 worldGenProperties Lnet/minecraft/class_3806$class_7044;
+ FIELD field_37275 maxChainedNeighborUpdates I
METHOD method_16714 load (Ljava/nio/file/Path;)Lnet/minecraft/class_3806;
ARG 0 path
METHOD method_16715 (Ljava/lang/Integer;)Ljava/lang/Integer;
diff --git a/mappings/net/minecraft/server/world/ServerWorld.mapping b/mappings/net/minecraft/server/world/ServerWorld.mapping
index d62104e74d..88c6f3f2b8 100644
--- a/mappings/net/minecraft/server/world/ServerWorld.mapping
+++ b/mappings/net/minecraft/server/world/ServerWorld.mapping
@@ -29,6 +29,7 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld
FIELD field_35565 blockEventQueue Ljava/util/List;
FIELD field_36208 structureLocator Lnet/minecraft/class_6832;
FIELD field_36317 duringListenerUpdate Z
+ FIELD field_37279 neighborUpdater Lnet/minecraft/class_7165;
METHOD (Lnet/minecraft/server/MinecraftServer;Ljava/util/concurrent/Executor;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_5268;Lnet/minecraft/class_5321;Lnet/minecraft/class_5363;Lnet/minecraft/class_3949;ZJLjava/util/List;Z)V
ARG 1 server
ARG 2 workerExecutor
diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping
index db6ec08ed3..72bc1f1708 100644
--- a/mappings/net/minecraft/world/World.mapping
+++ b/mappings/net/minecraft/world/World.mapping
@@ -136,6 +136,13 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World
METHOD method_39425 shouldTickBlocksInChunk (J)Z
COMMENT {@return whether the blocks in the specified chunk should get ticked}
ARG 1 chunkPos
+ METHOD method_41249 getNeighborUpdater ()Lnet/minecraft/class_7165;
+ METHOD method_41410 updateNeighbor (Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_2248;Lnet/minecraft/class_2338;Z)V
+ ARG 1 state
+ ARG 2 pos
+ ARG 3 sourceBlock
+ ARG 4 sourcePos
+ ARG 5 notify
METHOD method_41411 shouldTickBlockPos (Lnet/minecraft/class_2338;)Z
ARG 1 pos
METHOD method_8413 updateListeners (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;I)V
@@ -194,7 +201,7 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World
COMMENT
COMMENT @see #updateNeighborsExcept(BlockPos, Block, Direction)
ARG 1 pos
- ARG 2 block
+ ARG 2 sourceBlock
METHOD method_8454 createExplosion (Lnet/minecraft/class_1297;Lnet/minecraft/class_1282;Lnet/minecraft/class_5362;DDDFZLnet/minecraft/class_1927$class_4179;)Lnet/minecraft/class_1927;
COMMENT Creates an explosion.
ARG 1 entity
@@ -275,13 +282,13 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World
METHOD method_8488 getReceivedStrongRedstonePower (Lnet/minecraft/class_2338;)I
ARG 1 pos
METHOD method_8492 updateNeighbor (Lnet/minecraft/class_2338;Lnet/minecraft/class_2248;Lnet/minecraft/class_2338;)V
- COMMENT Triggers a neighbor update originating from {@code pos} at
- COMMENT {@code neighborPos}.
+ COMMENT Triggers a neighbor update originating from {@code sourcePos} at
+ COMMENT {@code pos}.
COMMENT
COMMENT @see #updateNeighborsAlways(BlockPos, Block)
ARG 1 pos
ARG 2 sourceBlock
- ARG 3 neighborPos
+ ARG 3 sourcePos
METHOD method_8494 addImportantParticle (Lnet/minecraft/class_2394;DDDDDD)V
ARG 1 parameters
ARG 2 x
@@ -315,7 +322,9 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World
COMMENT for the one in {@code direction} direction.
COMMENT
COMMENT @see #updateNeighborsAlways(BlockPos, Block)
+ ARG 1 pos
ARG 2 sourceBlock
+ ARG 3 direction
METHOD method_8509 setLightningTicksLeft (I)V
ARG 1 lightningTicksLeft
METHOD method_8510 getTime ()J
diff --git a/mappings/net/minecraft/world/block/ChainRestrictedNeighborUpdater.mapping b/mappings/net/minecraft/world/block/ChainRestrictedNeighborUpdater.mapping
new file mode 100644
index 0000000000..ca158baec7
--- /dev/null
+++ b/mappings/net/minecraft/world/block/ChainRestrictedNeighborUpdater.mapping
@@ -0,0 +1,34 @@
+CLASS net/minecraft/class_7159 net/minecraft/world/block/ChainRestrictedNeighborUpdater
+ FIELD field_37829 LOGGER Lorg/slf4j/Logger;
+ FIELD field_37830 world Lnet/minecraft/class_3218;
+ FIELD field_37831 queue Ljava/util/ArrayDeque;
+ FIELD field_37832 pending Ljava/util/List;
+ FIELD field_37833 depth I
+ METHOD (Lnet/minecraft/class_3218;)V
+ ARG 1 world
+ METHOD method_41702 runQueuedUpdates ()V
+ METHOD method_41706 enqueue (Lnet/minecraft/class_2338;Lnet/minecraft/class_7159$class_7162;)V
+ ARG 1 pos
+ ARG 2 entry
+ CLASS class_7160 StatefulEntry
+ FIELD comp_586 sourceBlock Lnet/minecraft/class_2248;
+ FIELD comp_587 sourcePos Lnet/minecraft/class_2338;
+ METHOD comp_586 sourceBlock ()Lnet/minecraft/class_2248;
+ METHOD comp_587 sourcePos ()Lnet/minecraft/class_2338;
+ CLASS class_7161 SixWayEntry
+ FIELD field_37834 pos Lnet/minecraft/class_2338;
+ FIELD field_37835 sourceBlock Lnet/minecraft/class_2248;
+ FIELD field_37836 except Lnet/minecraft/class_2350;
+ FIELD field_37837 currentDirectionIndex I
+ METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_2248;Lnet/minecraft/class_2350;)V
+ ARG 1 pos
+ ARG 2 sourceBlock
+ ARG 3 except
+ CLASS class_7162 Entry
+ METHOD method_41707 update (Lnet/minecraft/class_3218;)Z
+ ARG 1 world
+ CLASS class_7163 SimpleEntry
+ FIELD comp_590 sourceBlock Lnet/minecraft/class_2248;
+ FIELD comp_591 sourcePos Lnet/minecraft/class_2338;
+ METHOD comp_590 sourceBlock ()Lnet/minecraft/class_2248;
+ METHOD comp_591 sourcePos ()Lnet/minecraft/class_2338;
diff --git a/mappings/net/minecraft/world/block/NeighborUpdater.mapping b/mappings/net/minecraft/world/block/NeighborUpdater.mapping
new file mode 100644
index 0000000000..e4a5e17a40
--- /dev/null
+++ b/mappings/net/minecraft/world/block/NeighborUpdater.mapping
@@ -0,0 +1,24 @@
+CLASS net/minecraft/class_7165 net/minecraft/world/block/NeighborUpdater
+ FIELD field_37839 UPDATE_ORDER [Lnet/minecraft/class_2350;
+ FIELD field_37840 NOOP Lnet/minecraft/class_7165;
+ METHOD method_41703 updateNeighbor (Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_2248;Lnet/minecraft/class_2338;Z)V
+ ARG 1 state
+ ARG 2 pos
+ ARG 3 sourceBlock
+ ARG 4 sourcePos
+ ARG 5 notify
+ METHOD method_41704 updateNeighbor (Lnet/minecraft/class_2338;Lnet/minecraft/class_2248;Lnet/minecraft/class_2338;)V
+ ARG 1 pos
+ ARG 2 sourceBlock
+ ARG 3 sourcePos
+ METHOD method_41705 updateNeighbors (Lnet/minecraft/class_2338;Lnet/minecraft/class_2248;Lnet/minecraft/class_2350;)V
+ ARG 1 pos
+ ARG 2 sourceBlock
+ ARG 3 except
+ METHOD method_41708 tryNeighborUpdate (Lnet/minecraft/class_3218;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_2248;Lnet/minecraft/class_2338;Z)V
+ ARG 0 world
+ ARG 1 state
+ ARG 2 pos
+ ARG 3 sourceBlock
+ ARG 4 sourcePos
+ ARG 5 notify
diff --git a/mappings/net/minecraft/world/block/SimpleNeighborUpdater.mapping b/mappings/net/minecraft/world/block/SimpleNeighborUpdater.mapping
new file mode 100644
index 0000000000..7dc09a6d7d
--- /dev/null
+++ b/mappings/net/minecraft/world/block/SimpleNeighborUpdater.mapping
@@ -0,0 +1,4 @@
+CLASS net/minecraft/class_7164 net/minecraft/world/block/SimpleNeighborUpdater
+ FIELD field_37838 world Lnet/minecraft/class_3218;
+ METHOD (Lnet/minecraft/class_3218;)V
+ ARG 1 world