From f717d5059db934815d4ef4043bbfbabcdbadb31c Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Fri, 12 Mar 2021 08:46:31 +0900 Subject: [PATCH] Map block entitiy methods (#2118) * Map block entitiy methods * Rename getOrCreateTeleportIsland to setupExitPortalLocation * Rename isChunkEmptyAt to isChunkEmpty * Map 21w10a block entity methods --- .../block/entity/EndGatewayBlockEntity.mapping | 13 ++++++++++--- .../block/entity/PistonBlockEntity.mapping | 11 +++++++++++ .../block/entity/SculkSensorBlockEntity.mapping | 3 ++- .../block/entity/SignBlockEntity.mapping | 5 +++++ .../entity/StructureBlockBlockEntity.mapping | 15 +++++++++++++++ 5 files changed, 43 insertions(+), 4 deletions(-) diff --git a/mappings/net/minecraft/block/entity/EndGatewayBlockEntity.mapping b/mappings/net/minecraft/block/entity/EndGatewayBlockEntity.mapping index 8e5be17366..c58300e42b 100644 --- a/mappings/net/minecraft/block/entity/EndGatewayBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/EndGatewayBlockEntity.mapping @@ -14,6 +14,7 @@ CLASS net/minecraft/class_2643 net/minecraft/block/entity/EndGatewayBlockEntity ARG 0 world ARG 1 pos ARG 2 searchRadius + ARG 3 force METHOD method_11411 startTeleportCooldown (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2643;)V ARG 0 world ARG 1 pos @@ -42,9 +43,15 @@ CLASS net/minecraft/class_2643 net/minecraft/block/entity/EndGatewayBlockEntity METHOD method_11421 needsCooldownBeforeTeleporting ()Z METHOD method_30276 canTeleport (Lnet/minecraft/class_1297;)Z ARG 0 entity - METHOD method_31698 (Lnet/minecraft/class_3218;Lnet/minecraft/class_243;)Z + METHOD method_31698 isChunkEmpty (Lnet/minecraft/class_3218;Lnet/minecraft/class_243;)Z ARG 0 world - METHOD method_31699 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2338; + ARG 1 pos + METHOD method_31699 setupExitPortalLocation (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2338; + COMMENT Finds teleport location and creates an island to teleport to (if there is none). + COMMENT + COMMENT
This does not create an exit portal.
+ COMMENT
+ COMMENT @return the position of the exit portal
ARG 0 world
ARG 1 pos
METHOD method_31700 clientTick (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2643;)V
@@ -52,7 +59,7 @@ CLASS net/minecraft/class_2643 net/minecraft/block/entity/EndGatewayBlockEntity
ARG 1 pos
ARG 2 state
ARG 3 blockEntity
- METHOD method_31701 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Lnet/minecraft/class_243;
+ METHOD method_31701 findTeleportLocation (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Lnet/minecraft/class_243;
ARG 0 world
ARG 1 pos
METHOD method_31702 serverTick (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2643;)V
diff --git a/mappings/net/minecraft/block/entity/PistonBlockEntity.mapping b/mappings/net/minecraft/block/entity/PistonBlockEntity.mapping
index db02ea6b92..168a0cd40d 100644
--- a/mappings/net/minecraft/block/entity/PistonBlockEntity.mapping
+++ b/mappings/net/minecraft/block/entity/PistonBlockEntity.mapping
@@ -53,6 +53,17 @@ CLASS net/minecraft/class_2669 net/minecraft/block/entity/PistonBlockEntity
ARG 3 amount
METHOD method_11515 isSource ()Z
METHOD method_23364 isPushingHoneyBlock ()Z
+ METHOD method_23671 canMoveEntity (Lnet/minecraft/class_238;Lnet/minecraft/class_1297;)Z
+ ARG 0 box
+ ARG 1 entity
+ METHOD method_23672 moveEntity (Lnet/minecraft/class_2350;Lnet/minecraft/class_1297;DLnet/minecraft/class_2350;)V
+ ARG 1 entity
+ METHOD method_23673 (Lnet/minecraft/class_238;Lnet/minecraft/class_1297;)Z
+ ARG 1 entity
+ METHOD method_23674 moveEntitiesInHoneyBlock (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;FLnet/minecraft/class_2669;)V
+ ARG 0 world
+ ARG 1 pos
+ ARG 3 blockEntity
METHOD method_31707 tick (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2669;)V
ARG 0 world
ARG 1 pos
diff --git a/mappings/net/minecraft/block/entity/SculkSensorBlockEntity.mapping b/mappings/net/minecraft/block/entity/SculkSensorBlockEntity.mapping
index 254597d45e..7732579942 100644
--- a/mappings/net/minecraft/block/entity/SculkSensorBlockEntity.mapping
+++ b/mappings/net/minecraft/block/entity/SculkSensorBlockEntity.mapping
@@ -4,7 +4,8 @@ CLASS net/minecraft/class_5704 net/minecraft/block/entity/SculkSensorBlockEntity
METHOD