From ffb25756278548cadf272cf909eb9e4f2a859fb5 Mon Sep 17 00:00:00 2001 From: tanyaofei Date: Fri, 16 Aug 2024 09:41:15 +0800 Subject: [PATCH] Supports 1.21.1 --- README.md | 5 + .../fakeplayer/core/FakeplayerModule.java | 10 +- .../core/manager/action/ActionManager.java | 20 ++- .../FakeplayerPlaceholderExpansionImpl.java | 11 +- fakeplayer-dist/pom.xml | 33 +++- ...thub.hello09x.fakeplayer.api.spi.NMSBridge | 13 +- .../pom.xml | 2 +- .../v1_20_1}/action/AttackAction.java | 2 +- .../v1_20_1}/action/MineAction.java | 2 +- .../v1_20_1}/action/TraceAction.java | 4 +- .../fakeplayer/v1_20_1}/action/UseAction.java | 2 +- .../v1_20_1}/action/util/Tracer.java | 2 +- .../v1_20_1}/network/FakeConnection.java | 2 +- .../network/FakePlayerAdvancements.java | 2 +- .../FakeServerGamePacketListenerImpl.java | 2 +- .../v1_20_1}/spi/ActionTickerImpl.java | 8 +- .../v1_20_1}/spi/NMSBridgeImpl.java | 2 +- .../v1_20_1}/spi/NMSEntityImpl.java | 2 +- .../v1_20_1}/spi/NMSNetworkImpl.java | 6 +- .../v1_20_1}/spi/NMSServerImpl.java | 2 +- .../v1_20_1}/spi/NMSServerLevelImpl.java | 2 +- .../v1_20_1}/spi/NMSServerPlayerImpl.java | 4 +- .../pom.xml | 2 +- .../v1_20_2}/action/AttackAction.java | 2 +- .../v1_20_2}/action/MineAction.java | 2 +- .../v1_20_2}/action/TraceAction.java | 4 +- .../fakeplayer/v1_20_2}/action/UseAction.java | 2 +- .../v1_20_2}/action/util/Tracer.java | 2 +- .../v1_20_2}/network/FakeConnection.java | 2 +- .../network/FakePlayerAdvancements.java | 2 +- .../FakeServerGamePacketListenerImpl.java | 2 +- .../v1_20_2}/spi/ActionTickerImpl.java | 8 +- .../v1_20_2}/spi/NMSBridgeImpl.java | 2 +- .../v1_20_2}/spi/NMSEntityImpl.java | 2 +- .../v1_20_2}/spi/NMSNetworkImpl.java | 6 +- .../v1_20_2}/spi/NMSServerImpl.java | 2 +- .../v1_20_2}/spi/NMSServerLevelImpl.java | 2 +- .../v1_20_2}/spi/NMSServerPlayerImpl.java | 4 +- fakeplayer-v1_20_3/pom.xml | 102 +++++++++++ .../fakeplayer/v1_20_3/spi/NMSBridgeImpl.java | 55 ++++++ .../pom.xml | 2 +- .../v1_20_4}/action/AttackAction.java | 2 +- .../v1_20_4}/action/MineAction.java | 2 +- .../v1_20_4}/action/TraceAction.java | 4 +- .../fakeplayer/v1_20_4}/action/UseAction.java | 2 +- .../v1_20_4}/action/util/Tracer.java | 2 +- .../v1_20_4}/network/FakeConnection.java | 2 +- .../network/FakePlayerAdvancements.java | 2 +- .../FakeServerGamePacketListenerImpl.java | 2 +- .../v1_20_4}/spi/ActionTickerImpl.java | 8 +- .../v1_20_4}/spi/NMSBridgeImpl.java | 2 +- .../v1_20_4}/spi/NMSEntityImpl.java | 2 +- .../v1_20_4}/spi/NMSNetworkImpl.java | 6 +- .../v1_20_4}/spi/NMSServerImpl.java | 2 +- .../v1_20_4}/spi/NMSServerLevelImpl.java | 2 +- .../v1_20_4}/spi/NMSServerPlayerImpl.java | 4 +- fakeplayer-v1_20_5/pom.xml | 102 +++++++++++ .../fakeplayer/v1_20_5/spi/NMSBridgeImpl.java | 55 ++++++ .../pom.xml | 2 +- .../v1_20_6}/action/AttackAction.java | 2 +- .../v1_20_6}/action/MineAction.java | 2 +- .../v1_20_6}/action/TraceAction.java | 4 +- .../fakeplayer/v1_20_6}/action/UseAction.java | 2 +- .../v1_20_6}/action/util/Tracer.java | 2 +- .../v1_20_6}/network/FakeConnection.java | 2 +- .../network/FakePlayerAdvancements.java | 2 +- .../FakeServerGamePacketListenerImpl.java | 2 +- .../v1_20_6}/spi/ActionTickerImpl.java | 8 +- .../v1_20_6}/spi/NMSBridgeImpl.java | 2 +- .../v1_20_6}/spi/NMSEntityImpl.java | 2 +- .../v1_20_6}/spi/NMSNetworkImpl.java | 6 +- .../v1_20_6}/spi/NMSServerImpl.java | 2 +- .../v1_20_6}/spi/NMSServerLevelImpl.java | 2 +- .../v1_20_6}/spi/NMSServerPlayerImpl.java | 4 +- .../v1_20_R3_R4/action/AttackAction.java | 49 ------ .../v1_20_R3_R4/action/MineAction.java | 160 ------------------ .../v1_20_R3_R4/action/TraceAction.java | 24 --- .../v1_20_R3_R4/action/UseAction.java | 97 ----------- .../v1_20_R3_R4/action/util/Tracer.java | 105 ------------ fakeplayer-v1_21/pom.xml | 100 +++++++++++ .../fakeplayer/v1_21/action/AttackAction.java | 49 ++++++ .../fakeplayer/v1_21/action/MineAction.java | 160 ++++++++++++++++++ .../fakeplayer/v1_21/action/TraceAction.java | 24 +++ .../fakeplayer/v1_21/action/UseAction.java | 97 +++++++++++ .../fakeplayer/v1_21/action/util/Tracer.java | 105 ++++++++++++ .../v1_21}/network/FakeConnection.java | 2 +- .../network/FakePlayerAdvancements.java | 2 +- .../FakeServerGamePacketListenerImpl.java | 2 +- .../v1_21}/spi/ActionTickerImpl.java | 8 +- .../fakeplayer/v1_21}/spi/NMSBridgeImpl.java | 2 +- .../fakeplayer/v1_21}/spi/NMSEntityImpl.java | 2 +- .../fakeplayer/v1_21}/spi/NMSNetworkImpl.java | 6 +- .../fakeplayer/v1_21}/spi/NMSServerImpl.java | 2 +- .../v1_21}/spi/NMSServerLevelImpl.java | 2 +- .../v1_21}/spi/NMSServerPlayerImpl.java | 4 +- fakeplayer-v1_21_1/pom.xml | 107 ++++++++++++ .../fakeplayer/v1_21_1/spi/NMSBridgeImpl.java | 55 ++++++ fakeplayer-v1_21_R1/pom.xml | 125 -------------- pom.xml | 15 +- 99 files changed, 1201 insertions(+), 693 deletions(-) rename {fakeplayer-v1_20_R1 => fakeplayer-v1_20_1}/pom.xml (98%) rename {fakeplayer-v1_21_R1/src/main/java/io/github/hello09x/fakeplayer/v1_21_R1 => fakeplayer-v1_20_1/src/main/java/io/github/hello09x/fakeplayer/v1_20_1}/action/AttackAction.java (94%) rename {fakeplayer-v1_21_R1/src/main/java/io/github/hello09x/fakeplayer/v1_21_R1 => fakeplayer-v1_20_1/src/main/java/io/github/hello09x/fakeplayer/v1_20_1}/action/MineAction.java (98%) rename {fakeplayer-v1_20_R2/src/main/java/io/github/hello09x/fakeplayer/v1_20_R2 => fakeplayer-v1_20_1/src/main/java/io/github/hello09x/fakeplayer/v1_20_1}/action/TraceAction.java (83%) rename {fakeplayer-v1_21_R1/src/main/java/io/github/hello09x/fakeplayer/v1_21_R1 => fakeplayer-v1_20_1/src/main/java/io/github/hello09x/fakeplayer/v1_20_1}/action/UseAction.java (98%) rename {fakeplayer-v1_21_R1/src/main/java/io/github/hello09x/fakeplayer/v1_21_R1 => fakeplayer-v1_20_1/src/main/java/io/github/hello09x/fakeplayer/v1_20_1}/action/util/Tracer.java (98%) rename {fakeplayer-v1_20_R1/src/main/java/io/github/hello09x/fakeplayer/v1_20_R1 => fakeplayer-v1_20_1/src/main/java/io/github/hello09x/fakeplayer/v1_20_1}/network/FakeConnection.java (93%) rename {fakeplayer-v1_20_R1/src/main/java/io/github/hello09x/fakeplayer/v1_20_R1 => fakeplayer-v1_20_1/src/main/java/io/github/hello09x/fakeplayer/v1_20_1}/network/FakePlayerAdvancements.java (96%) rename {fakeplayer-v1_20_R1/src/main/java/io/github/hello09x/fakeplayer/v1_20_R1 => fakeplayer-v1_20_1/src/main/java/io/github/hello09x/fakeplayer/v1_20_1}/network/FakeServerGamePacketListenerImpl.java (97%) rename {fakeplayer-v1_20_R1/src/main/java/io/github/hello09x/fakeplayer/v1_20_R1 => fakeplayer-v1_20_1/src/main/java/io/github/hello09x/fakeplayer/v1_20_1}/spi/ActionTickerImpl.java (83%) rename {fakeplayer-v1_20_R1/src/main/java/io/github/hello09x/fakeplayer/v1_20_R1 => fakeplayer-v1_20_1/src/main/java/io/github/hello09x/fakeplayer/v1_20_1}/spi/NMSBridgeImpl.java (96%) rename {fakeplayer-v1_20_R1/src/main/java/io/github/hello09x/fakeplayer/v1_20_R1 => fakeplayer-v1_20_1/src/main/java/io/github/hello09x/fakeplayer/v1_20_1}/spi/NMSEntityImpl.java (89%) rename {fakeplayer-v1_20_R1/src/main/java/io/github/hello09x/fakeplayer/v1_20_R1 => fakeplayer-v1_20_1/src/main/java/io/github/hello09x/fakeplayer/v1_20_1}/spi/NMSNetworkImpl.java (88%) rename {fakeplayer-v1_20_R1/src/main/java/io/github/hello09x/fakeplayer/v1_20_R1 => fakeplayer-v1_20_1/src/main/java/io/github/hello09x/fakeplayer/v1_20_1}/spi/NMSServerImpl.java (95%) rename {fakeplayer-v1_20_R1/src/main/java/io/github/hello09x/fakeplayer/v1_20_R1 => fakeplayer-v1_20_1/src/main/java/io/github/hello09x/fakeplayer/v1_20_1}/spi/NMSServerLevelImpl.java (90%) rename {fakeplayer-v1_20_R1/src/main/java/io/github/hello09x/fakeplayer/v1_20_R1 => fakeplayer-v1_20_1/src/main/java/io/github/hello09x/fakeplayer/v1_20_1}/spi/NMSServerPlayerImpl.java (97%) rename {fakeplayer-v1_20_R2 => fakeplayer-v1_20_2}/pom.xml (98%) rename {fakeplayer-v1_20_R1/src/main/java/io/github/hello09x/fakeplayer/v1_20_R1 => fakeplayer-v1_20_2/src/main/java/io/github/hello09x/fakeplayer/v1_20_2}/action/AttackAction.java (94%) rename {fakeplayer-v1_20_R1/src/main/java/io/github/hello09x/fakeplayer/v1_20_R1 => fakeplayer-v1_20_2/src/main/java/io/github/hello09x/fakeplayer/v1_20_2}/action/MineAction.java (98%) rename {fakeplayer-v1_21_R1/src/main/java/io/github/hello09x/fakeplayer/v1_21_R1 => fakeplayer-v1_20_2/src/main/java/io/github/hello09x/fakeplayer/v1_20_2}/action/TraceAction.java (83%) rename {fakeplayer-v1_20_R1/src/main/java/io/github/hello09x/fakeplayer/v1_20_R1 => fakeplayer-v1_20_2/src/main/java/io/github/hello09x/fakeplayer/v1_20_2}/action/UseAction.java (98%) rename {fakeplayer-v1_20_R2/src/main/java/io/github/hello09x/fakeplayer/v1_20_R2 => fakeplayer-v1_20_2/src/main/java/io/github/hello09x/fakeplayer/v1_20_2}/action/util/Tracer.java (98%) rename {fakeplayer-v1_20_R2/src/main/java/io/github/hello09x/fakeplayer/v1_20_R2 => fakeplayer-v1_20_2/src/main/java/io/github/hello09x/fakeplayer/v1_20_2}/network/FakeConnection.java (95%) rename {fakeplayer-v1_20_R2/src/main/java/io/github/hello09x/fakeplayer/v1_20_R2 => fakeplayer-v1_20_2/src/main/java/io/github/hello09x/fakeplayer/v1_20_2}/network/FakePlayerAdvancements.java (96%) rename {fakeplayer-v1_20_R2/src/main/java/io/github/hello09x/fakeplayer/v1_20_R2 => fakeplayer-v1_20_2/src/main/java/io/github/hello09x/fakeplayer/v1_20_2}/network/FakeServerGamePacketListenerImpl.java (97%) rename {fakeplayer-v1_20_R2/src/main/java/io/github/hello09x/fakeplayer/v1_20_R2 => fakeplayer-v1_20_2/src/main/java/io/github/hello09x/fakeplayer/v1_20_2}/spi/ActionTickerImpl.java (83%) rename {fakeplayer-v1_20_R2/src/main/java/io/github/hello09x/fakeplayer/v1_20_R2 => fakeplayer-v1_20_2/src/main/java/io/github/hello09x/fakeplayer/v1_20_2}/spi/NMSBridgeImpl.java (96%) rename {fakeplayer-v1_20_R2/src/main/java/io/github/hello09x/fakeplayer/v1_20_R2 => fakeplayer-v1_20_2/src/main/java/io/github/hello09x/fakeplayer/v1_20_2}/spi/NMSEntityImpl.java (89%) rename {fakeplayer-v1_20_R2/src/main/java/io/github/hello09x/fakeplayer/v1_20_R2 => fakeplayer-v1_20_2/src/main/java/io/github/hello09x/fakeplayer/v1_20_2}/spi/NMSNetworkImpl.java (90%) rename {fakeplayer-v1_20_R2/src/main/java/io/github/hello09x/fakeplayer/v1_20_R2 => fakeplayer-v1_20_2/src/main/java/io/github/hello09x/fakeplayer/v1_20_2}/spi/NMSServerImpl.java (95%) rename {fakeplayer-v1_20_R2/src/main/java/io/github/hello09x/fakeplayer/v1_20_R2 => fakeplayer-v1_20_2/src/main/java/io/github/hello09x/fakeplayer/v1_20_2}/spi/NMSServerLevelImpl.java (90%) rename {fakeplayer-v1_20_R2/src/main/java/io/github/hello09x/fakeplayer/v1_20_R2 => fakeplayer-v1_20_2/src/main/java/io/github/hello09x/fakeplayer/v1_20_2}/spi/NMSServerPlayerImpl.java (97%) create mode 100644 fakeplayer-v1_20_3/pom.xml create mode 100644 fakeplayer-v1_20_3/src/main/java/io/github/hello09x/fakeplayer/v1_20_3/spi/NMSBridgeImpl.java rename {fakeplayer-v1_20_R3_R4 => fakeplayer-v1_20_4}/pom.xml (98%) rename {fakeplayer-v1_20_R2/src/main/java/io/github/hello09x/fakeplayer/v1_20_R2 => fakeplayer-v1_20_4/src/main/java/io/github/hello09x/fakeplayer/v1_20_4}/action/AttackAction.java (94%) rename {fakeplayer-v1_20_R2/src/main/java/io/github/hello09x/fakeplayer/v1_20_R2 => fakeplayer-v1_20_4/src/main/java/io/github/hello09x/fakeplayer/v1_20_4}/action/MineAction.java (98%) rename {fakeplayer-v1_20_R1/src/main/java/io/github/hello09x/fakeplayer/v1_20_R1 => fakeplayer-v1_20_4/src/main/java/io/github/hello09x/fakeplayer/v1_20_4}/action/TraceAction.java (83%) rename {fakeplayer-v1_20_R2/src/main/java/io/github/hello09x/fakeplayer/v1_20_R2 => fakeplayer-v1_20_4/src/main/java/io/github/hello09x/fakeplayer/v1_20_4}/action/UseAction.java (98%) rename {fakeplayer-v1_20_R1/src/main/java/io/github/hello09x/fakeplayer/v1_20_R1 => fakeplayer-v1_20_4/src/main/java/io/github/hello09x/fakeplayer/v1_20_4}/action/util/Tracer.java (98%) rename {fakeplayer-v1_20_R3_R4/src/main/java/io/github/hello09x/fakeplayer/v1_20_R3_R4 => fakeplayer-v1_20_4/src/main/java/io/github/hello09x/fakeplayer/v1_20_4}/network/FakeConnection.java (95%) rename {fakeplayer-v1_21_R1/src/main/java/io/github/hello09x/fakeplayer/v1_21_R1 => fakeplayer-v1_20_4/src/main/java/io/github/hello09x/fakeplayer/v1_20_4}/network/FakePlayerAdvancements.java (96%) rename {fakeplayer-v1_20_R3_R4/src/main/java/io/github/hello09x/fakeplayer/v1_20_R3_R4 => fakeplayer-v1_20_4/src/main/java/io/github/hello09x/fakeplayer/v1_20_4}/network/FakeServerGamePacketListenerImpl.java (97%) rename {fakeplayer-v1_20_R3_R4/src/main/java/io/github/hello09x/fakeplayer/v1_20_R3_R4 => fakeplayer-v1_20_4/src/main/java/io/github/hello09x/fakeplayer/v1_20_4}/spi/ActionTickerImpl.java (82%) rename {fakeplayer-v1_20_R3_R4/src/main/java/io/github/hello09x/fakeplayer/v1_20_R3_R4 => fakeplayer-v1_20_4/src/main/java/io/github/hello09x/fakeplayer/v1_20_4}/spi/NMSBridgeImpl.java (96%) rename {fakeplayer-v1_20_R3_R4/src/main/java/io/github/hello09x/fakeplayer/v1_20_R3_R4 => fakeplayer-v1_20_4/src/main/java/io/github/hello09x/fakeplayer/v1_20_4}/spi/NMSEntityImpl.java (89%) rename {fakeplayer-v1_20_R3_R4/src/main/java/io/github/hello09x/fakeplayer/v1_20_R3_R4 => fakeplayer-v1_20_4/src/main/java/io/github/hello09x/fakeplayer/v1_20_4}/spi/NMSNetworkImpl.java (89%) rename {fakeplayer-v1_20_R3_R4/src/main/java/io/github/hello09x/fakeplayer/v1_20_R3_R4 => fakeplayer-v1_20_4/src/main/java/io/github/hello09x/fakeplayer/v1_20_4}/spi/NMSServerImpl.java (95%) rename {fakeplayer-v1_20_R3_R4/src/main/java/io/github/hello09x/fakeplayer/v1_20_R3_R4 => fakeplayer-v1_20_4/src/main/java/io/github/hello09x/fakeplayer/v1_20_4}/spi/NMSServerLevelImpl.java (89%) rename {fakeplayer-v1_20_R3_R4/src/main/java/io/github/hello09x/fakeplayer/v1_20_R3_R4 => fakeplayer-v1_20_4/src/main/java/io/github/hello09x/fakeplayer/v1_20_4}/spi/NMSServerPlayerImpl.java (97%) create mode 100644 fakeplayer-v1_20_5/pom.xml create mode 100644 fakeplayer-v1_20_5/src/main/java/io/github/hello09x/fakeplayer/v1_20_5/spi/NMSBridgeImpl.java rename {fakeplayer-v1_20_R5_R6 => fakeplayer-v1_20_6}/pom.xml (98%) rename {fakeplayer-v1_20_R5_R6/src/main/java/io/github/hello09x/fakeplayer/v1_20_R5_R6 => fakeplayer-v1_20_6/src/main/java/io/github/hello09x/fakeplayer/v1_20_6}/action/AttackAction.java (94%) rename {fakeplayer-v1_20_R5_R6/src/main/java/io/github/hello09x/fakeplayer/v1_20_R5_R6 => fakeplayer-v1_20_6/src/main/java/io/github/hello09x/fakeplayer/v1_20_6}/action/MineAction.java (98%) rename {fakeplayer-v1_20_R5_R6/src/main/java/io/github/hello09x/fakeplayer/v1_20_R5_R6 => fakeplayer-v1_20_6/src/main/java/io/github/hello09x/fakeplayer/v1_20_6}/action/TraceAction.java (82%) rename {fakeplayer-v1_20_R5_R6/src/main/java/io/github/hello09x/fakeplayer/v1_20_R5_R6 => fakeplayer-v1_20_6/src/main/java/io/github/hello09x/fakeplayer/v1_20_6}/action/UseAction.java (98%) rename {fakeplayer-v1_20_R5_R6/src/main/java/io/github/hello09x/fakeplayer/v1_20_R5_R6 => fakeplayer-v1_20_6/src/main/java/io/github/hello09x/fakeplayer/v1_20_6}/action/util/Tracer.java (98%) rename {fakeplayer-v1_20_R5_R6/src/main/java/io/github/hello09x/fakeplayer/v1_20_R5_R6 => fakeplayer-v1_20_6/src/main/java/io/github/hello09x/fakeplayer/v1_20_6}/network/FakeConnection.java (93%) rename {fakeplayer-v1_20_R5_R6/src/main/java/io/github/hello09x/fakeplayer/v1_20_R5_R6 => fakeplayer-v1_20_6/src/main/java/io/github/hello09x/fakeplayer/v1_20_6}/network/FakePlayerAdvancements.java (96%) rename {fakeplayer-v1_20_R5_R6/src/main/java/io/github/hello09x/fakeplayer/v1_20_R5_R6 => fakeplayer-v1_20_6/src/main/java/io/github/hello09x/fakeplayer/v1_20_6}/network/FakeServerGamePacketListenerImpl.java (97%) rename {fakeplayer-v1_20_R5_R6/src/main/java/io/github/hello09x/fakeplayer/v1_20_R5_R6 => fakeplayer-v1_20_6/src/main/java/io/github/hello09x/fakeplayer/v1_20_6}/spi/ActionTickerImpl.java (82%) rename {fakeplayer-v1_20_R5_R6/src/main/java/io/github/hello09x/fakeplayer/v1_20_R5_R6 => fakeplayer-v1_20_6/src/main/java/io/github/hello09x/fakeplayer/v1_20_6}/spi/NMSBridgeImpl.java (96%) rename {fakeplayer-v1_20_R5_R6/src/main/java/io/github/hello09x/fakeplayer/v1_20_R5_R6 => fakeplayer-v1_20_6/src/main/java/io/github/hello09x/fakeplayer/v1_20_6}/spi/NMSEntityImpl.java (89%) rename {fakeplayer-v1_20_R5_R6/src/main/java/io/github/hello09x/fakeplayer/v1_20_R5_R6 => fakeplayer-v1_20_6/src/main/java/io/github/hello09x/fakeplayer/v1_20_6}/spi/NMSNetworkImpl.java (89%) rename {fakeplayer-v1_20_R5_R6/src/main/java/io/github/hello09x/fakeplayer/v1_20_R5_R6 => fakeplayer-v1_20_6/src/main/java/io/github/hello09x/fakeplayer/v1_20_6}/spi/NMSServerImpl.java (95%) rename {fakeplayer-v1_20_R5_R6/src/main/java/io/github/hello09x/fakeplayer/v1_20_R5_R6 => fakeplayer-v1_20_6/src/main/java/io/github/hello09x/fakeplayer/v1_20_6}/spi/NMSServerLevelImpl.java (89%) rename {fakeplayer-v1_20_R5_R6/src/main/java/io/github/hello09x/fakeplayer/v1_20_R5_R6 => fakeplayer-v1_20_6/src/main/java/io/github/hello09x/fakeplayer/v1_20_6}/spi/NMSServerPlayerImpl.java (97%) delete mode 100644 fakeplayer-v1_20_R3_R4/src/main/java/io/github/hello09x/fakeplayer/v1_20_R3_R4/action/AttackAction.java delete mode 100644 fakeplayer-v1_20_R3_R4/src/main/java/io/github/hello09x/fakeplayer/v1_20_R3_R4/action/MineAction.java delete mode 100644 fakeplayer-v1_20_R3_R4/src/main/java/io/github/hello09x/fakeplayer/v1_20_R3_R4/action/TraceAction.java delete mode 100644 fakeplayer-v1_20_R3_R4/src/main/java/io/github/hello09x/fakeplayer/v1_20_R3_R4/action/UseAction.java delete mode 100644 fakeplayer-v1_20_R3_R4/src/main/java/io/github/hello09x/fakeplayer/v1_20_R3_R4/action/util/Tracer.java create mode 100644 fakeplayer-v1_21/pom.xml create mode 100644 fakeplayer-v1_21/src/main/java/io/github/hello09x/fakeplayer/v1_21/action/AttackAction.java create mode 100644 fakeplayer-v1_21/src/main/java/io/github/hello09x/fakeplayer/v1_21/action/MineAction.java create mode 100644 fakeplayer-v1_21/src/main/java/io/github/hello09x/fakeplayer/v1_21/action/TraceAction.java create mode 100644 fakeplayer-v1_21/src/main/java/io/github/hello09x/fakeplayer/v1_21/action/UseAction.java create mode 100644 fakeplayer-v1_21/src/main/java/io/github/hello09x/fakeplayer/v1_21/action/util/Tracer.java rename {fakeplayer-v1_21_R1/src/main/java/io/github/hello09x/fakeplayer/v1_21_R1 => fakeplayer-v1_21/src/main/java/io/github/hello09x/fakeplayer/v1_21}/network/FakeConnection.java (95%) rename {fakeplayer-v1_20_R3_R4/src/main/java/io/github/hello09x/fakeplayer/v1_20_R3_R4 => fakeplayer-v1_21/src/main/java/io/github/hello09x/fakeplayer/v1_21}/network/FakePlayerAdvancements.java (96%) rename {fakeplayer-v1_21_R1/src/main/java/io/github/hello09x/fakeplayer/v1_21_R1 => fakeplayer-v1_21/src/main/java/io/github/hello09x/fakeplayer/v1_21}/network/FakeServerGamePacketListenerImpl.java (98%) rename {fakeplayer-v1_21_R1/src/main/java/io/github/hello09x/fakeplayer/v1_21_R1 => fakeplayer-v1_21/src/main/java/io/github/hello09x/fakeplayer/v1_21}/spi/ActionTickerImpl.java (83%) rename {fakeplayer-v1_21_R1/src/main/java/io/github/hello09x/fakeplayer/v1_21_R1 => fakeplayer-v1_21/src/main/java/io/github/hello09x/fakeplayer/v1_21}/spi/NMSBridgeImpl.java (96%) rename {fakeplayer-v1_21_R1/src/main/java/io/github/hello09x/fakeplayer/v1_21_R1 => fakeplayer-v1_21/src/main/java/io/github/hello09x/fakeplayer/v1_21}/spi/NMSEntityImpl.java (89%) rename {fakeplayer-v1_21_R1/src/main/java/io/github/hello09x/fakeplayer/v1_21_R1 => fakeplayer-v1_21/src/main/java/io/github/hello09x/fakeplayer/v1_21}/spi/NMSNetworkImpl.java (89%) rename {fakeplayer-v1_21_R1/src/main/java/io/github/hello09x/fakeplayer/v1_21_R1 => fakeplayer-v1_21/src/main/java/io/github/hello09x/fakeplayer/v1_21}/spi/NMSServerImpl.java (95%) rename {fakeplayer-v1_21_R1/src/main/java/io/github/hello09x/fakeplayer/v1_21_R1 => fakeplayer-v1_21/src/main/java/io/github/hello09x/fakeplayer/v1_21}/spi/NMSServerLevelImpl.java (90%) rename {fakeplayer-v1_21_R1/src/main/java/io/github/hello09x/fakeplayer/v1_21_R1 => fakeplayer-v1_21/src/main/java/io/github/hello09x/fakeplayer/v1_21}/spi/NMSServerPlayerImpl.java (97%) create mode 100644 fakeplayer-v1_21_1/pom.xml create mode 100644 fakeplayer-v1_21_1/src/main/java/io/github/hello09x/fakeplayer/v1_21_1/spi/NMSBridgeImpl.java delete mode 100644 fakeplayer-v1_21_R1/pom.xml diff --git a/README.md b/README.md index 93d0709..9fe0773 100644 --- a/README.md +++ b/README.md @@ -161,6 +161,11 @@ If your server does not restrict various player commands, you can use this direc `fakeplayer.basic` includes all secure permissions, except for `/fp cmd` commands. +## Placeholder Variables ++ `%fakeplayer_total%`: Total count of fake players ++ `%fakeplayer_creator%`: The creator name of a fake player ++ `%fakeplayer_actions`: Active actions of a fake player such as : `USE|ATTACK` + # Custom Translation 1. Create a `message` folder in `plugins/fakeplayer` 2. Copy [this file](fakeplayer-core/src/main/resources/message/message.properties) to `message` folder diff --git a/fakeplayer-core/src/main/java/io/github/hello09x/fakeplayer/core/FakeplayerModule.java b/fakeplayer-core/src/main/java/io/github/hello09x/fakeplayer/core/FakeplayerModule.java index ff018b3..f33319b 100644 --- a/fakeplayer-core/src/main/java/io/github/hello09x/fakeplayer/core/FakeplayerModule.java +++ b/fakeplayer-core/src/main/java/io/github/hello09x/fakeplayer/core/FakeplayerModule.java @@ -7,6 +7,7 @@ import io.github.hello09x.fakeplayer.api.spi.NMSBridge; import io.github.hello09x.fakeplayer.core.config.FakeplayerConfig; import io.github.hello09x.fakeplayer.core.manager.FakeplayerList; import io.github.hello09x.fakeplayer.core.manager.FakeplayerManager; +import io.github.hello09x.fakeplayer.core.manager.action.ActionManager; import io.github.hello09x.fakeplayer.core.manager.invsee.InvseeManager; import io.github.hello09x.fakeplayer.core.manager.invsee.OpenInvInvseeManagerImpl; import io.github.hello09x.fakeplayer.core.manager.invsee.SimpleInvseeManagerImpl; @@ -15,6 +16,7 @@ import io.github.hello09x.fakeplayer.core.placeholder.FakeplayerPlaceholderExpan import io.github.hello09x.fakeplayer.core.util.ClassUtils; import org.bukkit.Bukkit; import org.bukkit.plugin.Plugin; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.util.ServiceLoader; @@ -31,7 +33,7 @@ public class FakeplayerModule extends AbstractModule { @Provides @Singleton - public InvseeManager invseeManager(FakeplayerConfig config, FakeplayerManager fakeplayerManager, FakeplayerList fakeplayerList) { + public @NotNull InvseeManager invseeManager(FakeplayerConfig config, FakeplayerManager fakeplayerManager, FakeplayerList fakeplayerList) { return switch (config.getInvseeImplement()) { case SIMPLE -> new SimpleInvseeManagerImpl(fakeplayerManager, fakeplayerList); case AUTO -> { @@ -47,7 +49,7 @@ public class FakeplayerModule extends AbstractModule { @Provides @Singleton - private NMSBridge nmsBridge() { + private @NotNull NMSBridge nmsBridge() { var bridge = ServiceLoader .load(NMSBridge.class, NMSBridge.class.getClassLoader()) .stream() @@ -64,11 +66,11 @@ public class FakeplayerModule extends AbstractModule { @Singleton @Provides - private @Nullable FakeplayerPlaceholderExpansion fakeplayerPlaceholderExpansion(FakeplayerManager fakeplayerManager) { + private @Nullable FakeplayerPlaceholderExpansion fakeplayerPlaceholderExpansion(FakeplayerManager fakeplayerManager, ActionManager actionManager) { if (!Bukkit.getPluginManager().isPluginEnabled("PlaceholderAPI") || !ClassUtils.isClassExists("me.clip.placeholderapi.expansion.PlaceholderExpansion")) { return null; } - return new FakeplayerPlaceholderExpansionImpl(fakeplayerManager); + return new FakeplayerPlaceholderExpansionImpl(fakeplayerManager, actionManager); } } diff --git a/fakeplayer-core/src/main/java/io/github/hello09x/fakeplayer/core/manager/action/ActionManager.java b/fakeplayer-core/src/main/java/io/github/hello09x/fakeplayer/core/manager/action/ActionManager.java index 564e899..523efa2 100644 --- a/fakeplayer-core/src/main/java/io/github/hello09x/fakeplayer/core/manager/action/ActionManager.java +++ b/fakeplayer-core/src/main/java/io/github/hello09x/fakeplayer/core/manager/action/ActionManager.java @@ -11,12 +11,11 @@ import io.github.hello09x.fakeplayer.core.Main; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Unmodifiable; -import java.util.HashMap; -import java.util.Map; -import java.util.Optional; -import java.util.UUID; +import java.util.*; import java.util.logging.Logger; +import java.util.stream.Collectors; @Singleton public class ActionManager { @@ -44,6 +43,19 @@ public class ActionManager { .isPresent(); } + public @NotNull @Unmodifiable Set getActiveActions(@NotNull Player player) { + var manager = this.managers.get(player.getUniqueId()); + if (manager == null || managers.isEmpty()) { + return Collections.emptySet(); + } + + return manager.entrySet() + .stream() + .filter(actions -> actions.getValue().getSetting().remains > 0) + .map(Map.Entry::getKey) + .collect(Collectors.toSet()); + } + public void setAction( @NotNull Player player, @NotNull ActionType action, diff --git a/fakeplayer-core/src/main/java/io/github/hello09x/fakeplayer/core/placeholder/FakeplayerPlaceholderExpansionImpl.java b/fakeplayer-core/src/main/java/io/github/hello09x/fakeplayer/core/placeholder/FakeplayerPlaceholderExpansionImpl.java index 88e3b71..0e49403 100644 --- a/fakeplayer-core/src/main/java/io/github/hello09x/fakeplayer/core/placeholder/FakeplayerPlaceholderExpansionImpl.java +++ b/fakeplayer-core/src/main/java/io/github/hello09x/fakeplayer/core/placeholder/FakeplayerPlaceholderExpansionImpl.java @@ -5,6 +5,7 @@ import com.google.inject.Inject; import com.google.inject.Singleton; import io.github.hello09x.fakeplayer.core.Main; import io.github.hello09x.fakeplayer.core.manager.FakeplayerManager; +import io.github.hello09x.fakeplayer.core.manager.action.ActionManager; import me.clip.placeholderapi.expansion.PlaceholderExpansion; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; @@ -13,6 +14,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.util.Optional; +import java.util.stream.Collectors; /** * @author tanyaofei @@ -22,10 +24,12 @@ import java.util.Optional; public class FakeplayerPlaceholderExpansionImpl extends PlaceholderExpansion implements FakeplayerPlaceholderExpansion { private final FakeplayerManager manager; + private final ActionManager actionManager; @Inject - public FakeplayerPlaceholderExpansionImpl(FakeplayerManager manager) { + public FakeplayerPlaceholderExpansionImpl(FakeplayerManager manager, ActionManager actionManager) { this.manager = manager; + this.actionManager = actionManager; } @Override @@ -55,6 +59,11 @@ public class FakeplayerPlaceholderExpansionImpl extends PlaceholderExpansion imp return Optional.ofNullable(manager.getCreatorName(player)).orElse(params); } + // papi parse CONSOLE_1 fakeplayer_actions + if (params.equalsIgnoreCase("actions") && player != null && manager.isFake(player)) { + return actionManager.getActiveActions(player).stream().map(Enum::name).collect(Collectors.joining("|")); + } + return params; } diff --git a/fakeplayer-dist/pom.xml b/fakeplayer-dist/pom.xml index 9310f37..80bf96b 100644 --- a/fakeplayer-dist/pom.xml +++ b/fakeplayer-dist/pom.xml @@ -32,31 +32,49 @@ io.github.hello09x.fakeplayer - fakeplayer-v1_20_R1 + fakeplayer-v1_20_1 ${revision} io.github.hello09x.fakeplayer - fakeplayer-v1_20_R2 + fakeplayer-v1_20_2 ${revision} io.github.hello09x.fakeplayer - fakeplayer-v1_20_R3_R4 + fakeplayer-v1_20_3 ${revision} io.github.hello09x.fakeplayer - fakeplayer-v1_20_R5_R6 + fakeplayer-v1_20_4 ${revision} io.github.hello09x.fakeplayer - fakeplayer-v1_21_R1 + fakeplayer-v1_20_5 + ${revision} + + + + io.github.hello09x.fakeplayer + fakeplayer-v1_20_6 + ${revision} + + + + io.github.hello09x.fakeplayer + fakeplayer-v1_21 + ${revision} + + + + io.github.hello09x.fakeplayer + fakeplayer-v1_21_1 ${revision} @@ -119,6 +137,11 @@ + + + + + diff --git a/fakeplayer-dist/src/main/resources/META-INF/services/io.github.hello09x.fakeplayer.api.spi.NMSBridge b/fakeplayer-dist/src/main/resources/META-INF/services/io.github.hello09x.fakeplayer.api.spi.NMSBridge index 3d1b91c..cccc7f5 100644 --- a/fakeplayer-dist/src/main/resources/META-INF/services/io.github.hello09x.fakeplayer.api.spi.NMSBridge +++ b/fakeplayer-dist/src/main/resources/META-INF/services/io.github.hello09x.fakeplayer.api.spi.NMSBridge @@ -1,5 +1,8 @@ -io.github.hello09x.fakeplayer.v1_20_R1.spi.NMSBridgeImpl -io.github.hello09x.fakeplayer.v1_20_R2.spi.NMSBridgeImpl -io.github.hello09x.fakeplayer.v1_20_R3_R4.spi.NMSBridgeImpl -io.github.hello09x.fakeplayer.v1_20_R5_R6.spi.NMSBridgeImpl -io.github.hello09x.fakeplayer.v1_21_R1.spi.NMSBridgeImpl +io.github.hello09x.fakeplayer.v1_20_1.spi.NMSBridgeImpl +io.github.hello09x.fakeplayer.v1_20_2.spi.NMSBridgeImpl +io.github.hello09x.fakeplayer.v1_20_3.spi.NMSBridgeImpl +io.github.hello09x.fakeplayer.v1_20_4.spi.NMSBridgeImpl +io.github.hello09x.fakeplayer.v1_20_5.spi.NMSBridgeImpl +io.github.hello09x.fakeplayer.v1_20_6.spi.NMSBridgeImpl +io.github.hello09x.fakeplayer.v1_21.spi.NMSBridgeImpl +io.github.hello09x.fakeplayer.v1_21_1.spi.NMSBridgeImpl diff --git a/fakeplayer-v1_20_R1/pom.xml b/fakeplayer-v1_20_1/pom.xml similarity index 98% rename from fakeplayer-v1_20_R1/pom.xml rename to fakeplayer-v1_20_1/pom.xml index 3745ca8..c5b874d 100644 --- a/fakeplayer-v1_20_R1/pom.xml +++ b/fakeplayer-v1_20_1/pom.xml @@ -9,7 +9,7 @@ ${revision} - fakeplayer-v1_20_R1 + fakeplayer-v1_20_1 17 diff --git a/fakeplayer-v1_21_R1/src/main/java/io/github/hello09x/fakeplayer/v1_21_R1/action/AttackAction.java b/fakeplayer-v1_20_1/src/main/java/io/github/hello09x/fakeplayer/v1_20_1/action/AttackAction.java similarity index 94% rename from fakeplayer-v1_21_R1/src/main/java/io/github/hello09x/fakeplayer/v1_21_R1/action/AttackAction.java rename to fakeplayer-v1_20_1/src/main/java/io/github/hello09x/fakeplayer/v1_20_1/action/AttackAction.java index c8c3f5c..822943b 100644 --- a/fakeplayer-v1_21_R1/src/main/java/io/github/hello09x/fakeplayer/v1_21_R1/action/AttackAction.java +++ b/fakeplayer-v1_20_1/src/main/java/io/github/hello09x/fakeplayer/v1_20_1/action/AttackAction.java @@ -1,4 +1,4 @@ -package io.github.hello09x.fakeplayer.v1_21_R1.action; +package io.github.hello09x.fakeplayer.v1_20_1.action; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.InteractionHand; diff --git a/fakeplayer-v1_21_R1/src/main/java/io/github/hello09x/fakeplayer/v1_21_R1/action/MineAction.java b/fakeplayer-v1_20_1/src/main/java/io/github/hello09x/fakeplayer/v1_20_1/action/MineAction.java similarity index 98% rename from fakeplayer-v1_21_R1/src/main/java/io/github/hello09x/fakeplayer/v1_21_R1/action/MineAction.java rename to fakeplayer-v1_20_1/src/main/java/io/github/hello09x/fakeplayer/v1_20_1/action/MineAction.java index f5a2398..f325d71 100644 --- a/fakeplayer-v1_21_R1/src/main/java/io/github/hello09x/fakeplayer/v1_21_R1/action/MineAction.java +++ b/fakeplayer-v1_20_1/src/main/java/io/github/hello09x/fakeplayer/v1_20_1/action/MineAction.java @@ -1,4 +1,4 @@ -package io.github.hello09x.fakeplayer.v1_21_R1.action; +package io.github.hello09x.fakeplayer.v1_20_1.action; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/fakeplayer-v1_20_R2/src/main/java/io/github/hello09x/fakeplayer/v1_20_R2/action/TraceAction.java b/fakeplayer-v1_20_1/src/main/java/io/github/hello09x/fakeplayer/v1_20_1/action/TraceAction.java similarity index 83% rename from fakeplayer-v1_20_R2/src/main/java/io/github/hello09x/fakeplayer/v1_20_R2/action/TraceAction.java rename to fakeplayer-v1_20_1/src/main/java/io/github/hello09x/fakeplayer/v1_20_1/action/TraceAction.java index d71025b..3037c26 100644 --- a/fakeplayer-v1_20_R2/src/main/java/io/github/hello09x/fakeplayer/v1_20_R2/action/TraceAction.java +++ b/fakeplayer-v1_20_1/src/main/java/io/github/hello09x/fakeplayer/v1_20_1/action/TraceAction.java @@ -1,7 +1,7 @@ -package io.github.hello09x.fakeplayer.v1_20_R2.action; +package io.github.hello09x.fakeplayer.v1_20_1.action; import io.github.hello09x.fakeplayer.api.spi.Action; -import io.github.hello09x.fakeplayer.v1_20_R2.action.util.Tracer; +import io.github.hello09x.fakeplayer.v1_20_1.action.util.Tracer; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.phys.HitResult; import org.jetbrains.annotations.NotNull; diff --git a/fakeplayer-v1_21_R1/src/main/java/io/github/hello09x/fakeplayer/v1_21_R1/action/UseAction.java b/fakeplayer-v1_20_1/src/main/java/io/github/hello09x/fakeplayer/v1_20_1/action/UseAction.java similarity index 98% rename from fakeplayer-v1_21_R1/src/main/java/io/github/hello09x/fakeplayer/v1_21_R1/action/UseAction.java rename to fakeplayer-v1_20_1/src/main/java/io/github/hello09x/fakeplayer/v1_20_1/action/UseAction.java index b50745f..c429d43 100644 --- a/fakeplayer-v1_21_R1/src/main/java/io/github/hello09x/fakeplayer/v1_21_R1/action/UseAction.java +++ b/fakeplayer-v1_20_1/src/main/java/io/github/hello09x/fakeplayer/v1_20_1/action/UseAction.java @@ -1,4 +1,4 @@ -package io.github.hello09x.fakeplayer.v1_21_R1.action; +package io.github.hello09x.fakeplayer.v1_20_1.action; import net.minecraft.core.Direction; import net.minecraft.server.level.ServerPlayer; diff --git a/fakeplayer-v1_21_R1/src/main/java/io/github/hello09x/fakeplayer/v1_21_R1/action/util/Tracer.java b/fakeplayer-v1_20_1/src/main/java/io/github/hello09x/fakeplayer/v1_20_1/action/util/Tracer.java similarity index 98% rename from fakeplayer-v1_21_R1/src/main/java/io/github/hello09x/fakeplayer/v1_21_R1/action/util/Tracer.java rename to fakeplayer-v1_20_1/src/main/java/io/github/hello09x/fakeplayer/v1_20_1/action/util/Tracer.java index f6bc336..f042075 100644 --- a/fakeplayer-v1_21_R1/src/main/java/io/github/hello09x/fakeplayer/v1_21_R1/action/util/Tracer.java +++ b/fakeplayer-v1_20_1/src/main/java/io/github/hello09x/fakeplayer/v1_20_1/action/util/Tracer.java @@ -1,4 +1,4 @@ -package io.github.hello09x.fakeplayer.v1_21_R1.action.util; +package io.github.hello09x.fakeplayer.v1_20_1.action.util; import net.minecraft.world.entity.Entity; import net.minecraft.world.level.ClipContext; diff --git a/fakeplayer-v1_20_R1/src/main/java/io/github/hello09x/fakeplayer/v1_20_R1/network/FakeConnection.java b/fakeplayer-v1_20_1/src/main/java/io/github/hello09x/fakeplayer/v1_20_1/network/FakeConnection.java similarity index 93% rename from fakeplayer-v1_20_R1/src/main/java/io/github/hello09x/fakeplayer/v1_20_R1/network/FakeConnection.java rename to fakeplayer-v1_20_1/src/main/java/io/github/hello09x/fakeplayer/v1_20_1/network/FakeConnection.java index e27ff64..58416a3 100644 --- a/fakeplayer-v1_20_R1/src/main/java/io/github/hello09x/fakeplayer/v1_20_R1/network/FakeConnection.java +++ b/fakeplayer-v1_20_1/src/main/java/io/github/hello09x/fakeplayer/v1_20_1/network/FakeConnection.java @@ -1,4 +1,4 @@ -package io.github.hello09x.fakeplayer.v1_20_R1.network; +package io.github.hello09x.fakeplayer.v1_20_1.network; import io.github.hello09x.fakeplayer.core.network.FakeChannel; import net.minecraft.network.Connection; diff --git a/fakeplayer-v1_20_R1/src/main/java/io/github/hello09x/fakeplayer/v1_20_R1/network/FakePlayerAdvancements.java b/fakeplayer-v1_20_1/src/main/java/io/github/hello09x/fakeplayer/v1_20_1/network/FakePlayerAdvancements.java similarity index 96% rename from fakeplayer-v1_20_R1/src/main/java/io/github/hello09x/fakeplayer/v1_20_R1/network/FakePlayerAdvancements.java rename to fakeplayer-v1_20_1/src/main/java/io/github/hello09x/fakeplayer/v1_20_1/network/FakePlayerAdvancements.java index e359512..9009986 100644 --- a/fakeplayer-v1_20_R1/src/main/java/io/github/hello09x/fakeplayer/v1_20_R1/network/FakePlayerAdvancements.java +++ b/fakeplayer-v1_20_1/src/main/java/io/github/hello09x/fakeplayer/v1_20_1/network/FakePlayerAdvancements.java @@ -1,4 +1,4 @@ -package io.github.hello09x.fakeplayer.v1_20_R1.network; +package io.github.hello09x.fakeplayer.v1_20_1.network; import com.mojang.datafixers.DataFixer; import net.minecraft.advancements.Advancement; diff --git a/fakeplayer-v1_20_R1/src/main/java/io/github/hello09x/fakeplayer/v1_20_R1/network/FakeServerGamePacketListenerImpl.java b/fakeplayer-v1_20_1/src/main/java/io/github/hello09x/fakeplayer/v1_20_1/network/FakeServerGamePacketListenerImpl.java similarity index 97% rename from fakeplayer-v1_20_R1/src/main/java/io/github/hello09x/fakeplayer/v1_20_R1/network/FakeServerGamePacketListenerImpl.java rename to fakeplayer-v1_20_1/src/main/java/io/github/hello09x/fakeplayer/v1_20_1/network/FakeServerGamePacketListenerImpl.java index ed35005..e70a6bb 100644 --- a/fakeplayer-v1_20_R1/src/main/java/io/github/hello09x/fakeplayer/v1_20_R1/network/FakeServerGamePacketListenerImpl.java +++ b/fakeplayer-v1_20_1/src/main/java/io/github/hello09x/fakeplayer/v1_20_1/network/FakeServerGamePacketListenerImpl.java @@ -1,4 +1,4 @@ -package io.github.hello09x.fakeplayer.v1_20_R1.network; +package io.github.hello09x.fakeplayer.v1_20_1.network; import io.github.hello09x.fakeplayer.api.spi.NMSServerGamePacketListener; import io.github.hello09x.fakeplayer.core.Main; diff --git a/fakeplayer-v1_20_R1/src/main/java/io/github/hello09x/fakeplayer/v1_20_R1/spi/ActionTickerImpl.java b/fakeplayer-v1_20_1/src/main/java/io/github/hello09x/fakeplayer/v1_20_1/spi/ActionTickerImpl.java similarity index 83% rename from fakeplayer-v1_20_R1/src/main/java/io/github/hello09x/fakeplayer/v1_20_R1/spi/ActionTickerImpl.java rename to fakeplayer-v1_20_1/src/main/java/io/github/hello09x/fakeplayer/v1_20_1/spi/ActionTickerImpl.java index a5cfbaf..87301d8 100644 --- a/fakeplayer-v1_20_R1/src/main/java/io/github/hello09x/fakeplayer/v1_20_R1/spi/ActionTickerImpl.java +++ b/fakeplayer-v1_20_1/src/main/java/io/github/hello09x/fakeplayer/v1_20_1/spi/ActionTickerImpl.java @@ -1,4 +1,4 @@ -package io.github.hello09x.fakeplayer.v1_20_R1.spi; +package io.github.hello09x.fakeplayer.v1_20_1.spi; import io.github.hello09x.fakeplayer.api.spi.ActionSetting; @@ -6,9 +6,9 @@ import io.github.hello09x.fakeplayer.api.spi.ActionTicker; import io.github.hello09x.fakeplayer.api.spi.ActionType; import io.github.hello09x.fakeplayer.api.spi.NMSBridge; import io.github.hello09x.fakeplayer.core.entity.action.BaseActionTicker; -import io.github.hello09x.fakeplayer.v1_20_R1.action.AttackAction; -import io.github.hello09x.fakeplayer.v1_20_R1.action.MineAction; -import io.github.hello09x.fakeplayer.v1_20_R1.action.UseAction; +import io.github.hello09x.fakeplayer.v1_20_1.action.AttackAction; +import io.github.hello09x.fakeplayer.v1_20_1.action.MineAction; +import io.github.hello09x.fakeplayer.v1_20_1.action.UseAction; import org.bukkit.craftbukkit.v1_20_R1.entity.CraftPlayer; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; diff --git a/fakeplayer-v1_20_R1/src/main/java/io/github/hello09x/fakeplayer/v1_20_R1/spi/NMSBridgeImpl.java b/fakeplayer-v1_20_1/src/main/java/io/github/hello09x/fakeplayer/v1_20_1/spi/NMSBridgeImpl.java similarity index 96% rename from fakeplayer-v1_20_R1/src/main/java/io/github/hello09x/fakeplayer/v1_20_R1/spi/NMSBridgeImpl.java rename to fakeplayer-v1_20_1/src/main/java/io/github/hello09x/fakeplayer/v1_20_1/spi/NMSBridgeImpl.java index 8ef40af..93fba25 100644 --- a/fakeplayer-v1_20_R1/src/main/java/io/github/hello09x/fakeplayer/v1_20_R1/spi/NMSBridgeImpl.java +++ b/fakeplayer-v1_20_1/src/main/java/io/github/hello09x/fakeplayer/v1_20_1/spi/NMSBridgeImpl.java @@ -1,4 +1,4 @@ -package io.github.hello09x.fakeplayer.v1_20_R1.spi; +package io.github.hello09x.fakeplayer.v1_20_1.spi; import io.github.hello09x.fakeplayer.api.spi.*; import io.github.hello09x.fakeplayer.core.Main; diff --git a/fakeplayer-v1_20_R1/src/main/java/io/github/hello09x/fakeplayer/v1_20_R1/spi/NMSEntityImpl.java b/fakeplayer-v1_20_1/src/main/java/io/github/hello09x/fakeplayer/v1_20_1/spi/NMSEntityImpl.java similarity index 89% rename from fakeplayer-v1_20_R1/src/main/java/io/github/hello09x/fakeplayer/v1_20_R1/spi/NMSEntityImpl.java rename to fakeplayer-v1_20_1/src/main/java/io/github/hello09x/fakeplayer/v1_20_1/spi/NMSEntityImpl.java index 66dcd01..57a5808 100644 --- a/fakeplayer-v1_20_R1/src/main/java/io/github/hello09x/fakeplayer/v1_20_R1/spi/NMSEntityImpl.java +++ b/fakeplayer-v1_20_1/src/main/java/io/github/hello09x/fakeplayer/v1_20_1/spi/NMSEntityImpl.java @@ -1,4 +1,4 @@ -package io.github.hello09x.fakeplayer.v1_20_R1.spi; +package io.github.hello09x.fakeplayer.v1_20_1.spi; import io.github.hello09x.fakeplayer.api.spi.NMSEntity; import lombok.Getter; diff --git a/fakeplayer-v1_20_R1/src/main/java/io/github/hello09x/fakeplayer/v1_20_R1/spi/NMSNetworkImpl.java b/fakeplayer-v1_20_1/src/main/java/io/github/hello09x/fakeplayer/v1_20_1/spi/NMSNetworkImpl.java similarity index 88% rename from fakeplayer-v1_20_R1/src/main/java/io/github/hello09x/fakeplayer/v1_20_R1/spi/NMSNetworkImpl.java rename to fakeplayer-v1_20_1/src/main/java/io/github/hello09x/fakeplayer/v1_20_1/spi/NMSNetworkImpl.java index 482393c..2aba03a 100644 --- a/fakeplayer-v1_20_R1/src/main/java/io/github/hello09x/fakeplayer/v1_20_R1/spi/NMSNetworkImpl.java +++ b/fakeplayer-v1_20_1/src/main/java/io/github/hello09x/fakeplayer/v1_20_1/spi/NMSNetworkImpl.java @@ -1,9 +1,9 @@ -package io.github.hello09x.fakeplayer.v1_20_R1.spi; +package io.github.hello09x.fakeplayer.v1_20_1.spi; import io.github.hello09x.fakeplayer.api.spi.NMSNetwork; import io.github.hello09x.fakeplayer.api.spi.NMSServerGamePacketListener; -import io.github.hello09x.fakeplayer.v1_20_R1.network.FakeConnection; -import io.github.hello09x.fakeplayer.v1_20_R1.network.FakeServerGamePacketListenerImpl; +import io.github.hello09x.fakeplayer.v1_20_1.network.FakeConnection; +import io.github.hello09x.fakeplayer.v1_20_1.network.FakeServerGamePacketListenerImpl; import org.bukkit.Server; import org.bukkit.craftbukkit.v1_20_R1.CraftServer; import org.bukkit.craftbukkit.v1_20_R1.entity.CraftPlayer; diff --git a/fakeplayer-v1_20_R1/src/main/java/io/github/hello09x/fakeplayer/v1_20_R1/spi/NMSServerImpl.java b/fakeplayer-v1_20_1/src/main/java/io/github/hello09x/fakeplayer/v1_20_1/spi/NMSServerImpl.java similarity index 95% rename from fakeplayer-v1_20_R1/src/main/java/io/github/hello09x/fakeplayer/v1_20_R1/spi/NMSServerImpl.java rename to fakeplayer-v1_20_1/src/main/java/io/github/hello09x/fakeplayer/v1_20_1/spi/NMSServerImpl.java index 0eb7093..cd4252d 100644 --- a/fakeplayer-v1_20_R1/src/main/java/io/github/hello09x/fakeplayer/v1_20_R1/spi/NMSServerImpl.java +++ b/fakeplayer-v1_20_1/src/main/java/io/github/hello09x/fakeplayer/v1_20_1/spi/NMSServerImpl.java @@ -1,4 +1,4 @@ -package io.github.hello09x.fakeplayer.v1_20_R1.spi; +package io.github.hello09x.fakeplayer.v1_20_1.spi; import com.mojang.authlib.GameProfile; import io.github.hello09x.devtools.core.utils.WorldUtils; diff --git a/fakeplayer-v1_20_R1/src/main/java/io/github/hello09x/fakeplayer/v1_20_R1/spi/NMSServerLevelImpl.java b/fakeplayer-v1_20_1/src/main/java/io/github/hello09x/fakeplayer/v1_20_1/spi/NMSServerLevelImpl.java similarity index 90% rename from fakeplayer-v1_20_R1/src/main/java/io/github/hello09x/fakeplayer/v1_20_R1/spi/NMSServerLevelImpl.java rename to fakeplayer-v1_20_1/src/main/java/io/github/hello09x/fakeplayer/v1_20_1/spi/NMSServerLevelImpl.java index 4c1b895..faea82a 100644 --- a/fakeplayer-v1_20_R1/src/main/java/io/github/hello09x/fakeplayer/v1_20_R1/spi/NMSServerLevelImpl.java +++ b/fakeplayer-v1_20_1/src/main/java/io/github/hello09x/fakeplayer/v1_20_1/spi/NMSServerLevelImpl.java @@ -1,4 +1,4 @@ -package io.github.hello09x.fakeplayer.v1_20_R1.spi; +package io.github.hello09x.fakeplayer.v1_20_1.spi; import io.github.hello09x.fakeplayer.api.spi.NMSServerLevel; import lombok.Getter; diff --git a/fakeplayer-v1_20_R1/src/main/java/io/github/hello09x/fakeplayer/v1_20_R1/spi/NMSServerPlayerImpl.java b/fakeplayer-v1_20_1/src/main/java/io/github/hello09x/fakeplayer/v1_20_1/spi/NMSServerPlayerImpl.java similarity index 97% rename from fakeplayer-v1_20_R1/src/main/java/io/github/hello09x/fakeplayer/v1_20_R1/spi/NMSServerPlayerImpl.java rename to fakeplayer-v1_20_1/src/main/java/io/github/hello09x/fakeplayer/v1_20_1/spi/NMSServerPlayerImpl.java index cb7b043..1727e98 100644 --- a/fakeplayer-v1_20_R1/src/main/java/io/github/hello09x/fakeplayer/v1_20_R1/spi/NMSServerPlayerImpl.java +++ b/fakeplayer-v1_20_1/src/main/java/io/github/hello09x/fakeplayer/v1_20_1/spi/NMSServerPlayerImpl.java @@ -1,9 +1,9 @@ -package io.github.hello09x.fakeplayer.v1_20_R1.spi; +package io.github.hello09x.fakeplayer.v1_20_1.spi; import io.github.hello09x.fakeplayer.api.spi.NMSServerPlayer; import io.github.hello09x.fakeplayer.core.constant.ConstantPool; import io.github.hello09x.fakeplayer.core.util.Reflections; -import io.github.hello09x.fakeplayer.v1_20_R1.network.FakePlayerAdvancements; +import io.github.hello09x.fakeplayer.v1_20_1.network.FakePlayerAdvancements; import lombok.Getter; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/fakeplayer-v1_20_R2/pom.xml b/fakeplayer-v1_20_2/pom.xml similarity index 98% rename from fakeplayer-v1_20_R2/pom.xml rename to fakeplayer-v1_20_2/pom.xml index c0a2ddd..88bdec4 100644 --- a/fakeplayer-v1_20_R2/pom.xml +++ b/fakeplayer-v1_20_2/pom.xml @@ -9,7 +9,7 @@ ${revision} - fakeplayer-v1_20_R2 + fakeplayer-v1_20_2 17 diff --git a/fakeplayer-v1_20_R1/src/main/java/io/github/hello09x/fakeplayer/v1_20_R1/action/AttackAction.java b/fakeplayer-v1_20_2/src/main/java/io/github/hello09x/fakeplayer/v1_20_2/action/AttackAction.java similarity index 94% rename from fakeplayer-v1_20_R1/src/main/java/io/github/hello09x/fakeplayer/v1_20_R1/action/AttackAction.java rename to fakeplayer-v1_20_2/src/main/java/io/github/hello09x/fakeplayer/v1_20_2/action/AttackAction.java index 8e060e0..a929f8f 100644 --- a/fakeplayer-v1_20_R1/src/main/java/io/github/hello09x/fakeplayer/v1_20_R1/action/AttackAction.java +++ b/fakeplayer-v1_20_2/src/main/java/io/github/hello09x/fakeplayer/v1_20_2/action/AttackAction.java @@ -1,4 +1,4 @@ -package io.github.hello09x.fakeplayer.v1_20_R1.action; +package io.github.hello09x.fakeplayer.v1_20_2.action; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.InteractionHand; diff --git a/fakeplayer-v1_20_R1/src/main/java/io/github/hello09x/fakeplayer/v1_20_R1/action/MineAction.java b/fakeplayer-v1_20_2/src/main/java/io/github/hello09x/fakeplayer/v1_20_2/action/MineAction.java similarity index 98% rename from fakeplayer-v1_20_R1/src/main/java/io/github/hello09x/fakeplayer/v1_20_R1/action/MineAction.java rename to fakeplayer-v1_20_2/src/main/java/io/github/hello09x/fakeplayer/v1_20_2/action/MineAction.java index 55936c5..1a82f2e 100644 --- a/fakeplayer-v1_20_R1/src/main/java/io/github/hello09x/fakeplayer/v1_20_R1/action/MineAction.java +++ b/fakeplayer-v1_20_2/src/main/java/io/github/hello09x/fakeplayer/v1_20_2/action/MineAction.java @@ -1,4 +1,4 @@ -package io.github.hello09x.fakeplayer.v1_20_R1.action; +package io.github.hello09x.fakeplayer.v1_20_2.action; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/fakeplayer-v1_21_R1/src/main/java/io/github/hello09x/fakeplayer/v1_21_R1/action/TraceAction.java b/fakeplayer-v1_20_2/src/main/java/io/github/hello09x/fakeplayer/v1_20_2/action/TraceAction.java similarity index 83% rename from fakeplayer-v1_21_R1/src/main/java/io/github/hello09x/fakeplayer/v1_21_R1/action/TraceAction.java rename to fakeplayer-v1_20_2/src/main/java/io/github/hello09x/fakeplayer/v1_20_2/action/TraceAction.java index b04d347..8b7dd3b 100644 --- a/fakeplayer-v1_21_R1/src/main/java/io/github/hello09x/fakeplayer/v1_21_R1/action/TraceAction.java +++ b/fakeplayer-v1_20_2/src/main/java/io/github/hello09x/fakeplayer/v1_20_2/action/TraceAction.java @@ -1,7 +1,7 @@ -package io.github.hello09x.fakeplayer.v1_21_R1.action; +package io.github.hello09x.fakeplayer.v1_20_2.action; import io.github.hello09x.fakeplayer.api.spi.Action; -import io.github.hello09x.fakeplayer.v1_21_R1.action.util.Tracer; +import io.github.hello09x.fakeplayer.v1_20_2.action.util.Tracer; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.phys.HitResult; import org.jetbrains.annotations.NotNull; diff --git a/fakeplayer-v1_20_R1/src/main/java/io/github/hello09x/fakeplayer/v1_20_R1/action/UseAction.java b/fakeplayer-v1_20_2/src/main/java/io/github/hello09x/fakeplayer/v1_20_2/action/UseAction.java similarity index 98% rename from fakeplayer-v1_20_R1/src/main/java/io/github/hello09x/fakeplayer/v1_20_R1/action/UseAction.java rename to fakeplayer-v1_20_2/src/main/java/io/github/hello09x/fakeplayer/v1_20_2/action/UseAction.java index 0066f96..27f07ef 100644 --- a/fakeplayer-v1_20_R1/src/main/java/io/github/hello09x/fakeplayer/v1_20_R1/action/UseAction.java +++ b/fakeplayer-v1_20_2/src/main/java/io/github/hello09x/fakeplayer/v1_20_2/action/UseAction.java @@ -1,4 +1,4 @@ -package io.github.hello09x.fakeplayer.v1_20_R1.action; +package io.github.hello09x.fakeplayer.v1_20_2.action; import net.minecraft.core.Direction; import net.minecraft.server.level.ServerPlayer; diff --git a/fakeplayer-v1_20_R2/src/main/java/io/github/hello09x/fakeplayer/v1_20_R2/action/util/Tracer.java b/fakeplayer-v1_20_2/src/main/java/io/github/hello09x/fakeplayer/v1_20_2/action/util/Tracer.java similarity index 98% rename from fakeplayer-v1_20_R2/src/main/java/io/github/hello09x/fakeplayer/v1_20_R2/action/util/Tracer.java rename to fakeplayer-v1_20_2/src/main/java/io/github/hello09x/fakeplayer/v1_20_2/action/util/Tracer.java index 4bef3ee..83d783d 100644 --- a/fakeplayer-v1_20_R2/src/main/java/io/github/hello09x/fakeplayer/v1_20_R2/action/util/Tracer.java +++ b/fakeplayer-v1_20_2/src/main/java/io/github/hello09x/fakeplayer/v1_20_2/action/util/Tracer.java @@ -1,4 +1,4 @@ -package io.github.hello09x.fakeplayer.v1_20_R2.action.util; +package io.github.hello09x.fakeplayer.v1_20_2.action.util; import net.minecraft.world.entity.Entity; import net.minecraft.world.level.ClipContext; diff --git a/fakeplayer-v1_20_R2/src/main/java/io/github/hello09x/fakeplayer/v1_20_R2/network/FakeConnection.java b/fakeplayer-v1_20_2/src/main/java/io/github/hello09x/fakeplayer/v1_20_2/network/FakeConnection.java similarity index 95% rename from fakeplayer-v1_20_R2/src/main/java/io/github/hello09x/fakeplayer/v1_20_R2/network/FakeConnection.java rename to fakeplayer-v1_20_2/src/main/java/io/github/hello09x/fakeplayer/v1_20_2/network/FakeConnection.java index ab3d62c..d504955 100644 --- a/fakeplayer-v1_20_R2/src/main/java/io/github/hello09x/fakeplayer/v1_20_R2/network/FakeConnection.java +++ b/fakeplayer-v1_20_2/src/main/java/io/github/hello09x/fakeplayer/v1_20_2/network/FakeConnection.java @@ -1,4 +1,4 @@ -package io.github.hello09x.fakeplayer.v1_20_R2.network; +package io.github.hello09x.fakeplayer.v1_20_2.network; import io.github.hello09x.fakeplayer.core.network.FakeChannel; import net.minecraft.network.Connection; diff --git a/fakeplayer-v1_20_R2/src/main/java/io/github/hello09x/fakeplayer/v1_20_R2/network/FakePlayerAdvancements.java b/fakeplayer-v1_20_2/src/main/java/io/github/hello09x/fakeplayer/v1_20_2/network/FakePlayerAdvancements.java similarity index 96% rename from fakeplayer-v1_20_R2/src/main/java/io/github/hello09x/fakeplayer/v1_20_R2/network/FakePlayerAdvancements.java rename to fakeplayer-v1_20_2/src/main/java/io/github/hello09x/fakeplayer/v1_20_2/network/FakePlayerAdvancements.java index d5f70bc..eced2ab 100644 --- a/fakeplayer-v1_20_R2/src/main/java/io/github/hello09x/fakeplayer/v1_20_R2/network/FakePlayerAdvancements.java +++ b/fakeplayer-v1_20_2/src/main/java/io/github/hello09x/fakeplayer/v1_20_2/network/FakePlayerAdvancements.java @@ -1,4 +1,4 @@ -package io.github.hello09x.fakeplayer.v1_20_R2.network; +package io.github.hello09x.fakeplayer.v1_20_2.network; import com.mojang.datafixers.DataFixer; import net.minecraft.advancements.AdvancementHolder; diff --git a/fakeplayer-v1_20_R2/src/main/java/io/github/hello09x/fakeplayer/v1_20_R2/network/FakeServerGamePacketListenerImpl.java b/fakeplayer-v1_20_2/src/main/java/io/github/hello09x/fakeplayer/v1_20_2/network/FakeServerGamePacketListenerImpl.java similarity index 97% rename from fakeplayer-v1_20_R2/src/main/java/io/github/hello09x/fakeplayer/v1_20_R2/network/FakeServerGamePacketListenerImpl.java rename to fakeplayer-v1_20_2/src/main/java/io/github/hello09x/fakeplayer/v1_20_2/network/FakeServerGamePacketListenerImpl.java index 3411317..896da8c 100644 --- a/fakeplayer-v1_20_R2/src/main/java/io/github/hello09x/fakeplayer/v1_20_R2/network/FakeServerGamePacketListenerImpl.java +++ b/fakeplayer-v1_20_2/src/main/java/io/github/hello09x/fakeplayer/v1_20_2/network/FakeServerGamePacketListenerImpl.java @@ -1,4 +1,4 @@ -package io.github.hello09x.fakeplayer.v1_20_R2.network; +package io.github.hello09x.fakeplayer.v1_20_2.network; import io.github.hello09x.fakeplayer.api.spi.NMSServerGamePacketListener; import io.github.hello09x.fakeplayer.core.Main; diff --git a/fakeplayer-v1_20_R2/src/main/java/io/github/hello09x/fakeplayer/v1_20_R2/spi/ActionTickerImpl.java b/fakeplayer-v1_20_2/src/main/java/io/github/hello09x/fakeplayer/v1_20_2/spi/ActionTickerImpl.java similarity index 83% rename from fakeplayer-v1_20_R2/src/main/java/io/github/hello09x/fakeplayer/v1_20_R2/spi/ActionTickerImpl.java rename to fakeplayer-v1_20_2/src/main/java/io/github/hello09x/fakeplayer/v1_20_2/spi/ActionTickerImpl.java index 97e47b1..e58a025 100644 --- a/fakeplayer-v1_20_R2/src/main/java/io/github/hello09x/fakeplayer/v1_20_R2/spi/ActionTickerImpl.java +++ b/fakeplayer-v1_20_2/src/main/java/io/github/hello09x/fakeplayer/v1_20_2/spi/ActionTickerImpl.java @@ -1,4 +1,4 @@ -package io.github.hello09x.fakeplayer.v1_20_R2.spi; +package io.github.hello09x.fakeplayer.v1_20_2.spi; import io.github.hello09x.fakeplayer.api.spi.ActionSetting; @@ -6,9 +6,9 @@ import io.github.hello09x.fakeplayer.api.spi.ActionTicker; import io.github.hello09x.fakeplayer.api.spi.ActionType; import io.github.hello09x.fakeplayer.api.spi.NMSBridge; import io.github.hello09x.fakeplayer.core.entity.action.BaseActionTicker; -import io.github.hello09x.fakeplayer.v1_20_R2.action.AttackAction; -import io.github.hello09x.fakeplayer.v1_20_R2.action.MineAction; -import io.github.hello09x.fakeplayer.v1_20_R2.action.UseAction; +import io.github.hello09x.fakeplayer.v1_20_2.action.AttackAction; +import io.github.hello09x.fakeplayer.v1_20_2.action.MineAction; +import io.github.hello09x.fakeplayer.v1_20_2.action.UseAction; import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; diff --git a/fakeplayer-v1_20_R2/src/main/java/io/github/hello09x/fakeplayer/v1_20_R2/spi/NMSBridgeImpl.java b/fakeplayer-v1_20_2/src/main/java/io/github/hello09x/fakeplayer/v1_20_2/spi/NMSBridgeImpl.java similarity index 96% rename from fakeplayer-v1_20_R2/src/main/java/io/github/hello09x/fakeplayer/v1_20_R2/spi/NMSBridgeImpl.java rename to fakeplayer-v1_20_2/src/main/java/io/github/hello09x/fakeplayer/v1_20_2/spi/NMSBridgeImpl.java index 0019b7a..5be7528 100644 --- a/fakeplayer-v1_20_R2/src/main/java/io/github/hello09x/fakeplayer/v1_20_R2/spi/NMSBridgeImpl.java +++ b/fakeplayer-v1_20_2/src/main/java/io/github/hello09x/fakeplayer/v1_20_2/spi/NMSBridgeImpl.java @@ -1,4 +1,4 @@ -package io.github.hello09x.fakeplayer.v1_20_R2.spi; +package io.github.hello09x.fakeplayer.v1_20_2.spi; import io.github.hello09x.fakeplayer.api.spi.*; import io.github.hello09x.fakeplayer.core.Main; diff --git a/fakeplayer-v1_20_R2/src/main/java/io/github/hello09x/fakeplayer/v1_20_R2/spi/NMSEntityImpl.java b/fakeplayer-v1_20_2/src/main/java/io/github/hello09x/fakeplayer/v1_20_2/spi/NMSEntityImpl.java similarity index 89% rename from fakeplayer-v1_20_R2/src/main/java/io/github/hello09x/fakeplayer/v1_20_R2/spi/NMSEntityImpl.java rename to fakeplayer-v1_20_2/src/main/java/io/github/hello09x/fakeplayer/v1_20_2/spi/NMSEntityImpl.java index 52b9f4e..13a26e0 100644 --- a/fakeplayer-v1_20_R2/src/main/java/io/github/hello09x/fakeplayer/v1_20_R2/spi/NMSEntityImpl.java +++ b/fakeplayer-v1_20_2/src/main/java/io/github/hello09x/fakeplayer/v1_20_2/spi/NMSEntityImpl.java @@ -1,4 +1,4 @@ -package io.github.hello09x.fakeplayer.v1_20_R2.spi; +package io.github.hello09x.fakeplayer.v1_20_2.spi; import io.github.hello09x.fakeplayer.api.spi.NMSEntity; import lombok.Getter; diff --git a/fakeplayer-v1_20_R2/src/main/java/io/github/hello09x/fakeplayer/v1_20_R2/spi/NMSNetworkImpl.java b/fakeplayer-v1_20_2/src/main/java/io/github/hello09x/fakeplayer/v1_20_2/spi/NMSNetworkImpl.java similarity index 90% rename from fakeplayer-v1_20_R2/src/main/java/io/github/hello09x/fakeplayer/v1_20_R2/spi/NMSNetworkImpl.java rename to fakeplayer-v1_20_2/src/main/java/io/github/hello09x/fakeplayer/v1_20_2/spi/NMSNetworkImpl.java index f44d03d..bc32cef 100644 --- a/fakeplayer-v1_20_R2/src/main/java/io/github/hello09x/fakeplayer/v1_20_R2/spi/NMSNetworkImpl.java +++ b/fakeplayer-v1_20_2/src/main/java/io/github/hello09x/fakeplayer/v1_20_2/spi/NMSNetworkImpl.java @@ -1,9 +1,9 @@ -package io.github.hello09x.fakeplayer.v1_20_R2.spi; +package io.github.hello09x.fakeplayer.v1_20_2.spi; import io.github.hello09x.fakeplayer.api.spi.NMSNetwork; import io.github.hello09x.fakeplayer.api.spi.NMSServerGamePacketListener; -import io.github.hello09x.fakeplayer.v1_20_R2.network.FakeConnection; -import io.github.hello09x.fakeplayer.v1_20_R2.network.FakeServerGamePacketListenerImpl; +import io.github.hello09x.fakeplayer.v1_20_2.network.FakeConnection; +import io.github.hello09x.fakeplayer.v1_20_2.network.FakeServerGamePacketListenerImpl; import net.minecraft.network.ConnectionProtocol; import net.minecraft.server.network.CommonListenerCookie; import org.bukkit.Server; diff --git a/fakeplayer-v1_20_R2/src/main/java/io/github/hello09x/fakeplayer/v1_20_R2/spi/NMSServerImpl.java b/fakeplayer-v1_20_2/src/main/java/io/github/hello09x/fakeplayer/v1_20_2/spi/NMSServerImpl.java similarity index 95% rename from fakeplayer-v1_20_R2/src/main/java/io/github/hello09x/fakeplayer/v1_20_R2/spi/NMSServerImpl.java rename to fakeplayer-v1_20_2/src/main/java/io/github/hello09x/fakeplayer/v1_20_2/spi/NMSServerImpl.java index e953f6e..1bd538b 100644 --- a/fakeplayer-v1_20_R2/src/main/java/io/github/hello09x/fakeplayer/v1_20_R2/spi/NMSServerImpl.java +++ b/fakeplayer-v1_20_2/src/main/java/io/github/hello09x/fakeplayer/v1_20_2/spi/NMSServerImpl.java @@ -1,4 +1,4 @@ -package io.github.hello09x.fakeplayer.v1_20_R2.spi; +package io.github.hello09x.fakeplayer.v1_20_2.spi; import com.mojang.authlib.GameProfile; import io.github.hello09x.devtools.core.utils.WorldUtils; diff --git a/fakeplayer-v1_20_R2/src/main/java/io/github/hello09x/fakeplayer/v1_20_R2/spi/NMSServerLevelImpl.java b/fakeplayer-v1_20_2/src/main/java/io/github/hello09x/fakeplayer/v1_20_2/spi/NMSServerLevelImpl.java similarity index 90% rename from fakeplayer-v1_20_R2/src/main/java/io/github/hello09x/fakeplayer/v1_20_R2/spi/NMSServerLevelImpl.java rename to fakeplayer-v1_20_2/src/main/java/io/github/hello09x/fakeplayer/v1_20_2/spi/NMSServerLevelImpl.java index 69f9dae..4678fa4 100644 --- a/fakeplayer-v1_20_R2/src/main/java/io/github/hello09x/fakeplayer/v1_20_R2/spi/NMSServerLevelImpl.java +++ b/fakeplayer-v1_20_2/src/main/java/io/github/hello09x/fakeplayer/v1_20_2/spi/NMSServerLevelImpl.java @@ -1,4 +1,4 @@ -package io.github.hello09x.fakeplayer.v1_20_R2.spi; +package io.github.hello09x.fakeplayer.v1_20_2.spi; import io.github.hello09x.fakeplayer.api.spi.NMSServerLevel; import lombok.Getter; diff --git a/fakeplayer-v1_20_R2/src/main/java/io/github/hello09x/fakeplayer/v1_20_R2/spi/NMSServerPlayerImpl.java b/fakeplayer-v1_20_2/src/main/java/io/github/hello09x/fakeplayer/v1_20_2/spi/NMSServerPlayerImpl.java similarity index 97% rename from fakeplayer-v1_20_R2/src/main/java/io/github/hello09x/fakeplayer/v1_20_R2/spi/NMSServerPlayerImpl.java rename to fakeplayer-v1_20_2/src/main/java/io/github/hello09x/fakeplayer/v1_20_2/spi/NMSServerPlayerImpl.java index c355539..d75b28d 100644 --- a/fakeplayer-v1_20_R2/src/main/java/io/github/hello09x/fakeplayer/v1_20_R2/spi/NMSServerPlayerImpl.java +++ b/fakeplayer-v1_20_2/src/main/java/io/github/hello09x/fakeplayer/v1_20_2/spi/NMSServerPlayerImpl.java @@ -1,9 +1,9 @@ -package io.github.hello09x.fakeplayer.v1_20_R2.spi; +package io.github.hello09x.fakeplayer.v1_20_2.spi; import io.github.hello09x.fakeplayer.api.spi.NMSServerPlayer; import io.github.hello09x.fakeplayer.core.constant.ConstantPool; import io.github.hello09x.fakeplayer.core.util.Reflections; -import io.github.hello09x.fakeplayer.v1_20_R2.network.FakePlayerAdvancements; +import io.github.hello09x.fakeplayer.v1_20_2.network.FakePlayerAdvancements; import lombok.Getter; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/fakeplayer-v1_20_3/pom.xml b/fakeplayer-v1_20_3/pom.xml new file mode 100644 index 0000000..d4a706b --- /dev/null +++ b/fakeplayer-v1_20_3/pom.xml @@ -0,0 +1,102 @@ + + + 4.0.0 + + io.github.hello09x.fakeplayer + fakeplayer-parent + ${revision} + + + fakeplayer-v1_20_3 + + + 17 + 17 + UTF-8 + + 1.20.4-R0.1-SNAPSHOT + + + + + + io.papermc.paper + paper-api + provided + + + + io.github.hello09x.fakeplayer + fakeplayer-core + provided + + + + io.github.hello09x.fakeplayer + fakeplayer-api + provided + + + + io.github.hello09x.fakeplayer + fakeplayer-v1_20_4 + ${revision} + provided + + + + org.spigotmc + spigot + ${nms.version} + remapped-mojang + provided + + + + + + + + net.md-5 + specialsource-maven-plugin + 2.0.3 + + + package + + remap + + remap-obf + + org.spigotmc:minecraft-server:${nms.version}:txt:maps-mojang + true + + org.spigotmc:spigot:${nms.version}:jar:remapped-mojang + + true + remapped-obf + + + + package + + remap + + remap-spigot + + + ${project.build.directory}/${project.artifactId}-${project.version}-remapped-obf.jar + + org.spigotmc:minecraft-server:${nms.version}:csrg:maps-spigot + org.spigotmc:spigot:${nms.version}:jar:remapped-obf + + + + + + + + + \ No newline at end of file diff --git a/fakeplayer-v1_20_3/src/main/java/io/github/hello09x/fakeplayer/v1_20_3/spi/NMSBridgeImpl.java b/fakeplayer-v1_20_3/src/main/java/io/github/hello09x/fakeplayer/v1_20_3/spi/NMSBridgeImpl.java new file mode 100644 index 0000000..513c613 --- /dev/null +++ b/fakeplayer-v1_20_3/src/main/java/io/github/hello09x/fakeplayer/v1_20_3/spi/NMSBridgeImpl.java @@ -0,0 +1,55 @@ +package io.github.hello09x.fakeplayer.v1_20_3.spi; + +import io.github.hello09x.fakeplayer.api.spi.*; +import io.github.hello09x.fakeplayer.core.Main; +import io.github.hello09x.fakeplayer.v1_20_4.spi.*; +import org.bukkit.Bukkit; +import org.bukkit.Server; +import org.bukkit.World; +import org.bukkit.entity.Entity; +import org.bukkit.entity.Player; +import org.jetbrains.annotations.NotNull; + +import java.net.InetAddress; +import java.util.Set; + +public class NMSBridgeImpl implements NMSBridge { + + private final static Set SUPPORTS = Set.of("1.20.3"); + + @Override + public @NotNull NMSEntity fromEntity(@NotNull Entity entity) { + return new NMSEntityImpl(entity); + } + + @Override + public @NotNull NMSServer fromServer(@NotNull Server server) { + return new NMSServerImpl(server); + } + + @Override + public @NotNull NMSServerLevel fromWorld(@NotNull World world) { + return new NMSServerLevelImpl(world); + } + + @Override + public @NotNull NMSServerPlayer fromPlayer(@NotNull Player player) { + return new NMSServerPlayerImpl(player); + } + + @Override + public @NotNull NMSNetwork createNetwork(@NotNull InetAddress address) { + return new NMSNetworkImpl(address); + } + + @Override + public boolean isSupported() { + return SUPPORTS.contains(Bukkit.getMinecraftVersion()); + } + + @Override + public @NotNull ActionTicker createAction(@NotNull Player player, @NotNull ActionType action, @NotNull ActionSetting setting) { + return new ActionTickerImpl(Main.getInjector().getInstance(NMSBridge.class), player, action, setting); + } + +} diff --git a/fakeplayer-v1_20_R3_R4/pom.xml b/fakeplayer-v1_20_4/pom.xml similarity index 98% rename from fakeplayer-v1_20_R3_R4/pom.xml rename to fakeplayer-v1_20_4/pom.xml index 88224bc..6ca28dc 100644 --- a/fakeplayer-v1_20_R3_R4/pom.xml +++ b/fakeplayer-v1_20_4/pom.xml @@ -9,7 +9,7 @@ ${revision} - fakeplayer-v1_20_R3_R4 + fakeplayer-v1_20_4 17 diff --git a/fakeplayer-v1_20_R2/src/main/java/io/github/hello09x/fakeplayer/v1_20_R2/action/AttackAction.java b/fakeplayer-v1_20_4/src/main/java/io/github/hello09x/fakeplayer/v1_20_4/action/AttackAction.java similarity index 94% rename from fakeplayer-v1_20_R2/src/main/java/io/github/hello09x/fakeplayer/v1_20_R2/action/AttackAction.java rename to fakeplayer-v1_20_4/src/main/java/io/github/hello09x/fakeplayer/v1_20_4/action/AttackAction.java index d79468f..1b5be14 100644 --- a/fakeplayer-v1_20_R2/src/main/java/io/github/hello09x/fakeplayer/v1_20_R2/action/AttackAction.java +++ b/fakeplayer-v1_20_4/src/main/java/io/github/hello09x/fakeplayer/v1_20_4/action/AttackAction.java @@ -1,4 +1,4 @@ -package io.github.hello09x.fakeplayer.v1_20_R2.action; +package io.github.hello09x.fakeplayer.v1_20_4.action; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.InteractionHand; diff --git a/fakeplayer-v1_20_R2/src/main/java/io/github/hello09x/fakeplayer/v1_20_R2/action/MineAction.java b/fakeplayer-v1_20_4/src/main/java/io/github/hello09x/fakeplayer/v1_20_4/action/MineAction.java similarity index 98% rename from fakeplayer-v1_20_R2/src/main/java/io/github/hello09x/fakeplayer/v1_20_R2/action/MineAction.java rename to fakeplayer-v1_20_4/src/main/java/io/github/hello09x/fakeplayer/v1_20_4/action/MineAction.java index 8b63810..a5a4c21 100644 --- a/fakeplayer-v1_20_R2/src/main/java/io/github/hello09x/fakeplayer/v1_20_R2/action/MineAction.java +++ b/fakeplayer-v1_20_4/src/main/java/io/github/hello09x/fakeplayer/v1_20_4/action/MineAction.java @@ -1,4 +1,4 @@ -package io.github.hello09x.fakeplayer.v1_20_R2.action; +package io.github.hello09x.fakeplayer.v1_20_4.action; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/fakeplayer-v1_20_R1/src/main/java/io/github/hello09x/fakeplayer/v1_20_R1/action/TraceAction.java b/fakeplayer-v1_20_4/src/main/java/io/github/hello09x/fakeplayer/v1_20_4/action/TraceAction.java similarity index 83% rename from fakeplayer-v1_20_R1/src/main/java/io/github/hello09x/fakeplayer/v1_20_R1/action/TraceAction.java rename to fakeplayer-v1_20_4/src/main/java/io/github/hello09x/fakeplayer/v1_20_4/action/TraceAction.java index feaa840..5452f60 100644 --- a/fakeplayer-v1_20_R1/src/main/java/io/github/hello09x/fakeplayer/v1_20_R1/action/TraceAction.java +++ b/fakeplayer-v1_20_4/src/main/java/io/github/hello09x/fakeplayer/v1_20_4/action/TraceAction.java @@ -1,7 +1,7 @@ -package io.github.hello09x.fakeplayer.v1_20_R1.action; +package io.github.hello09x.fakeplayer.v1_20_4.action; import io.github.hello09x.fakeplayer.api.spi.Action; -import io.github.hello09x.fakeplayer.v1_20_R1.action.util.Tracer; +import io.github.hello09x.fakeplayer.v1_20_4.action.util.Tracer; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.phys.HitResult; import org.jetbrains.annotations.NotNull; diff --git a/fakeplayer-v1_20_R2/src/main/java/io/github/hello09x/fakeplayer/v1_20_R2/action/UseAction.java b/fakeplayer-v1_20_4/src/main/java/io/github/hello09x/fakeplayer/v1_20_4/action/UseAction.java similarity index 98% rename from fakeplayer-v1_20_R2/src/main/java/io/github/hello09x/fakeplayer/v1_20_R2/action/UseAction.java rename to fakeplayer-v1_20_4/src/main/java/io/github/hello09x/fakeplayer/v1_20_4/action/UseAction.java index d2e3439..c1f534c 100644 --- a/fakeplayer-v1_20_R2/src/main/java/io/github/hello09x/fakeplayer/v1_20_R2/action/UseAction.java +++ b/fakeplayer-v1_20_4/src/main/java/io/github/hello09x/fakeplayer/v1_20_4/action/UseAction.java @@ -1,4 +1,4 @@ -package io.github.hello09x.fakeplayer.v1_20_R2.action; +package io.github.hello09x.fakeplayer.v1_20_4.action; import net.minecraft.core.Direction; import net.minecraft.server.level.ServerPlayer; diff --git a/fakeplayer-v1_20_R1/src/main/java/io/github/hello09x/fakeplayer/v1_20_R1/action/util/Tracer.java b/fakeplayer-v1_20_4/src/main/java/io/github/hello09x/fakeplayer/v1_20_4/action/util/Tracer.java similarity index 98% rename from fakeplayer-v1_20_R1/src/main/java/io/github/hello09x/fakeplayer/v1_20_R1/action/util/Tracer.java rename to fakeplayer-v1_20_4/src/main/java/io/github/hello09x/fakeplayer/v1_20_4/action/util/Tracer.java index f22ef0e..004daa5 100644 --- a/fakeplayer-v1_20_R1/src/main/java/io/github/hello09x/fakeplayer/v1_20_R1/action/util/Tracer.java +++ b/fakeplayer-v1_20_4/src/main/java/io/github/hello09x/fakeplayer/v1_20_4/action/util/Tracer.java @@ -1,4 +1,4 @@ -package io.github.hello09x.fakeplayer.v1_20_R1.action.util; +package io.github.hello09x.fakeplayer.v1_20_4.action.util; import net.minecraft.world.entity.Entity; import net.minecraft.world.level.ClipContext; diff --git a/fakeplayer-v1_20_R3_R4/src/main/java/io/github/hello09x/fakeplayer/v1_20_R3_R4/network/FakeConnection.java b/fakeplayer-v1_20_4/src/main/java/io/github/hello09x/fakeplayer/v1_20_4/network/FakeConnection.java similarity index 95% rename from fakeplayer-v1_20_R3_R4/src/main/java/io/github/hello09x/fakeplayer/v1_20_R3_R4/network/FakeConnection.java rename to fakeplayer-v1_20_4/src/main/java/io/github/hello09x/fakeplayer/v1_20_4/network/FakeConnection.java index 6286b43..3ce88f8 100644 --- a/fakeplayer-v1_20_R3_R4/src/main/java/io/github/hello09x/fakeplayer/v1_20_R3_R4/network/FakeConnection.java +++ b/fakeplayer-v1_20_4/src/main/java/io/github/hello09x/fakeplayer/v1_20_4/network/FakeConnection.java @@ -1,4 +1,4 @@ -package io.github.hello09x.fakeplayer.v1_20_R3_R4.network; +package io.github.hello09x.fakeplayer.v1_20_4.network; import io.github.hello09x.fakeplayer.core.network.FakeChannel; import net.minecraft.network.Connection; diff --git a/fakeplayer-v1_21_R1/src/main/java/io/github/hello09x/fakeplayer/v1_21_R1/network/FakePlayerAdvancements.java b/fakeplayer-v1_20_4/src/main/java/io/github/hello09x/fakeplayer/v1_20_4/network/FakePlayerAdvancements.java similarity index 96% rename from fakeplayer-v1_21_R1/src/main/java/io/github/hello09x/fakeplayer/v1_21_R1/network/FakePlayerAdvancements.java rename to fakeplayer-v1_20_4/src/main/java/io/github/hello09x/fakeplayer/v1_20_4/network/FakePlayerAdvancements.java index 2675faa..85bd2b7 100644 --- a/fakeplayer-v1_21_R1/src/main/java/io/github/hello09x/fakeplayer/v1_21_R1/network/FakePlayerAdvancements.java +++ b/fakeplayer-v1_20_4/src/main/java/io/github/hello09x/fakeplayer/v1_20_4/network/FakePlayerAdvancements.java @@ -1,4 +1,4 @@ -package io.github.hello09x.fakeplayer.v1_21_R1.network; +package io.github.hello09x.fakeplayer.v1_20_4.network; import com.mojang.datafixers.DataFixer; import net.minecraft.advancements.AdvancementHolder; diff --git a/fakeplayer-v1_20_R3_R4/src/main/java/io/github/hello09x/fakeplayer/v1_20_R3_R4/network/FakeServerGamePacketListenerImpl.java b/fakeplayer-v1_20_4/src/main/java/io/github/hello09x/fakeplayer/v1_20_4/network/FakeServerGamePacketListenerImpl.java similarity index 97% rename from fakeplayer-v1_20_R3_R4/src/main/java/io/github/hello09x/fakeplayer/v1_20_R3_R4/network/FakeServerGamePacketListenerImpl.java rename to fakeplayer-v1_20_4/src/main/java/io/github/hello09x/fakeplayer/v1_20_4/network/FakeServerGamePacketListenerImpl.java index bf77cef..87c9bb4 100644 --- a/fakeplayer-v1_20_R3_R4/src/main/java/io/github/hello09x/fakeplayer/v1_20_R3_R4/network/FakeServerGamePacketListenerImpl.java +++ b/fakeplayer-v1_20_4/src/main/java/io/github/hello09x/fakeplayer/v1_20_4/network/FakeServerGamePacketListenerImpl.java @@ -1,4 +1,4 @@ -package io.github.hello09x.fakeplayer.v1_20_R3_R4.network; +package io.github.hello09x.fakeplayer.v1_20_4.network; import io.github.hello09x.fakeplayer.api.spi.NMSServerGamePacketListener; import io.github.hello09x.fakeplayer.core.Main; diff --git a/fakeplayer-v1_20_R3_R4/src/main/java/io/github/hello09x/fakeplayer/v1_20_R3_R4/spi/ActionTickerImpl.java b/fakeplayer-v1_20_4/src/main/java/io/github/hello09x/fakeplayer/v1_20_4/spi/ActionTickerImpl.java similarity index 82% rename from fakeplayer-v1_20_R3_R4/src/main/java/io/github/hello09x/fakeplayer/v1_20_R3_R4/spi/ActionTickerImpl.java rename to fakeplayer-v1_20_4/src/main/java/io/github/hello09x/fakeplayer/v1_20_4/spi/ActionTickerImpl.java index aa3c278..ead3627 100644 --- a/fakeplayer-v1_20_R3_R4/src/main/java/io/github/hello09x/fakeplayer/v1_20_R3_R4/spi/ActionTickerImpl.java +++ b/fakeplayer-v1_20_4/src/main/java/io/github/hello09x/fakeplayer/v1_20_4/spi/ActionTickerImpl.java @@ -1,4 +1,4 @@ -package io.github.hello09x.fakeplayer.v1_20_R3_R4.spi; +package io.github.hello09x.fakeplayer.v1_20_4.spi; import io.github.hello09x.fakeplayer.api.spi.ActionSetting; @@ -6,9 +6,9 @@ import io.github.hello09x.fakeplayer.api.spi.ActionTicker; import io.github.hello09x.fakeplayer.api.spi.ActionType; import io.github.hello09x.fakeplayer.api.spi.NMSBridge; import io.github.hello09x.fakeplayer.core.entity.action.BaseActionTicker; -import io.github.hello09x.fakeplayer.v1_20_R3_R4.action.AttackAction; -import io.github.hello09x.fakeplayer.v1_20_R3_R4.action.MineAction; -import io.github.hello09x.fakeplayer.v1_20_R3_R4.action.UseAction; +import io.github.hello09x.fakeplayer.v1_20_4.action.AttackAction; +import io.github.hello09x.fakeplayer.v1_20_4.action.MineAction; +import io.github.hello09x.fakeplayer.v1_20_4.action.UseAction; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; diff --git a/fakeplayer-v1_20_R3_R4/src/main/java/io/github/hello09x/fakeplayer/v1_20_R3_R4/spi/NMSBridgeImpl.java b/fakeplayer-v1_20_4/src/main/java/io/github/hello09x/fakeplayer/v1_20_4/spi/NMSBridgeImpl.java similarity index 96% rename from fakeplayer-v1_20_R3_R4/src/main/java/io/github/hello09x/fakeplayer/v1_20_R3_R4/spi/NMSBridgeImpl.java rename to fakeplayer-v1_20_4/src/main/java/io/github/hello09x/fakeplayer/v1_20_4/spi/NMSBridgeImpl.java index 10663ce..a0a1de2 100644 --- a/fakeplayer-v1_20_R3_R4/src/main/java/io/github/hello09x/fakeplayer/v1_20_R3_R4/spi/NMSBridgeImpl.java +++ b/fakeplayer-v1_20_4/src/main/java/io/github/hello09x/fakeplayer/v1_20_4/spi/NMSBridgeImpl.java @@ -1,4 +1,4 @@ -package io.github.hello09x.fakeplayer.v1_20_R3_R4.spi; +package io.github.hello09x.fakeplayer.v1_20_4.spi; import io.github.hello09x.fakeplayer.api.spi.*; import io.github.hello09x.fakeplayer.core.Main; diff --git a/fakeplayer-v1_20_R3_R4/src/main/java/io/github/hello09x/fakeplayer/v1_20_R3_R4/spi/NMSEntityImpl.java b/fakeplayer-v1_20_4/src/main/java/io/github/hello09x/fakeplayer/v1_20_4/spi/NMSEntityImpl.java similarity index 89% rename from fakeplayer-v1_20_R3_R4/src/main/java/io/github/hello09x/fakeplayer/v1_20_R3_R4/spi/NMSEntityImpl.java rename to fakeplayer-v1_20_4/src/main/java/io/github/hello09x/fakeplayer/v1_20_4/spi/NMSEntityImpl.java index 36ac029..a8dae45 100644 --- a/fakeplayer-v1_20_R3_R4/src/main/java/io/github/hello09x/fakeplayer/v1_20_R3_R4/spi/NMSEntityImpl.java +++ b/fakeplayer-v1_20_4/src/main/java/io/github/hello09x/fakeplayer/v1_20_4/spi/NMSEntityImpl.java @@ -1,4 +1,4 @@ -package io.github.hello09x.fakeplayer.v1_20_R3_R4.spi; +package io.github.hello09x.fakeplayer.v1_20_4.spi; import io.github.hello09x.fakeplayer.api.spi.NMSEntity; import lombok.Getter; diff --git a/fakeplayer-v1_20_R3_R4/src/main/java/io/github/hello09x/fakeplayer/v1_20_R3_R4/spi/NMSNetworkImpl.java b/fakeplayer-v1_20_4/src/main/java/io/github/hello09x/fakeplayer/v1_20_4/spi/NMSNetworkImpl.java similarity index 89% rename from fakeplayer-v1_20_R3_R4/src/main/java/io/github/hello09x/fakeplayer/v1_20_R3_R4/spi/NMSNetworkImpl.java rename to fakeplayer-v1_20_4/src/main/java/io/github/hello09x/fakeplayer/v1_20_4/spi/NMSNetworkImpl.java index 563661a..aacfd64 100644 --- a/fakeplayer-v1_20_R3_R4/src/main/java/io/github/hello09x/fakeplayer/v1_20_R3_R4/spi/NMSNetworkImpl.java +++ b/fakeplayer-v1_20_4/src/main/java/io/github/hello09x/fakeplayer/v1_20_4/spi/NMSNetworkImpl.java @@ -1,9 +1,9 @@ -package io.github.hello09x.fakeplayer.v1_20_R3_R4.spi; +package io.github.hello09x.fakeplayer.v1_20_4.spi; import io.github.hello09x.fakeplayer.api.spi.NMSNetwork; import io.github.hello09x.fakeplayer.api.spi.NMSServerGamePacketListener; -import io.github.hello09x.fakeplayer.v1_20_R3_R4.network.FakeConnection; -import io.github.hello09x.fakeplayer.v1_20_R3_R4.network.FakeServerGamePacketListenerImpl; +import io.github.hello09x.fakeplayer.v1_20_4.network.FakeConnection; +import io.github.hello09x.fakeplayer.v1_20_4.network.FakeServerGamePacketListenerImpl; import net.minecraft.network.ConnectionProtocol; import net.minecraft.server.network.CommonListenerCookie; import org.bukkit.Server; diff --git a/fakeplayer-v1_20_R3_R4/src/main/java/io/github/hello09x/fakeplayer/v1_20_R3_R4/spi/NMSServerImpl.java b/fakeplayer-v1_20_4/src/main/java/io/github/hello09x/fakeplayer/v1_20_4/spi/NMSServerImpl.java similarity index 95% rename from fakeplayer-v1_20_R3_R4/src/main/java/io/github/hello09x/fakeplayer/v1_20_R3_R4/spi/NMSServerImpl.java rename to fakeplayer-v1_20_4/src/main/java/io/github/hello09x/fakeplayer/v1_20_4/spi/NMSServerImpl.java index 101700f..f3ade66 100644 --- a/fakeplayer-v1_20_R3_R4/src/main/java/io/github/hello09x/fakeplayer/v1_20_R3_R4/spi/NMSServerImpl.java +++ b/fakeplayer-v1_20_4/src/main/java/io/github/hello09x/fakeplayer/v1_20_4/spi/NMSServerImpl.java @@ -1,4 +1,4 @@ -package io.github.hello09x.fakeplayer.v1_20_R3_R4.spi; +package io.github.hello09x.fakeplayer.v1_20_4.spi; import com.mojang.authlib.GameProfile; import io.github.hello09x.devtools.core.utils.WorldUtils; diff --git a/fakeplayer-v1_20_R3_R4/src/main/java/io/github/hello09x/fakeplayer/v1_20_R3_R4/spi/NMSServerLevelImpl.java b/fakeplayer-v1_20_4/src/main/java/io/github/hello09x/fakeplayer/v1_20_4/spi/NMSServerLevelImpl.java similarity index 89% rename from fakeplayer-v1_20_R3_R4/src/main/java/io/github/hello09x/fakeplayer/v1_20_R3_R4/spi/NMSServerLevelImpl.java rename to fakeplayer-v1_20_4/src/main/java/io/github/hello09x/fakeplayer/v1_20_4/spi/NMSServerLevelImpl.java index 64f0167..538f3fd 100644 --- a/fakeplayer-v1_20_R3_R4/src/main/java/io/github/hello09x/fakeplayer/v1_20_R3_R4/spi/NMSServerLevelImpl.java +++ b/fakeplayer-v1_20_4/src/main/java/io/github/hello09x/fakeplayer/v1_20_4/spi/NMSServerLevelImpl.java @@ -1,4 +1,4 @@ -package io.github.hello09x.fakeplayer.v1_20_R3_R4.spi; +package io.github.hello09x.fakeplayer.v1_20_4.spi; import io.github.hello09x.fakeplayer.api.spi.NMSServerLevel; import lombok.Getter; diff --git a/fakeplayer-v1_20_R3_R4/src/main/java/io/github/hello09x/fakeplayer/v1_20_R3_R4/spi/NMSServerPlayerImpl.java b/fakeplayer-v1_20_4/src/main/java/io/github/hello09x/fakeplayer/v1_20_4/spi/NMSServerPlayerImpl.java similarity index 97% rename from fakeplayer-v1_20_R3_R4/src/main/java/io/github/hello09x/fakeplayer/v1_20_R3_R4/spi/NMSServerPlayerImpl.java rename to fakeplayer-v1_20_4/src/main/java/io/github/hello09x/fakeplayer/v1_20_4/spi/NMSServerPlayerImpl.java index 02a30fa..ea9b14a 100644 --- a/fakeplayer-v1_20_R3_R4/src/main/java/io/github/hello09x/fakeplayer/v1_20_R3_R4/spi/NMSServerPlayerImpl.java +++ b/fakeplayer-v1_20_4/src/main/java/io/github/hello09x/fakeplayer/v1_20_4/spi/NMSServerPlayerImpl.java @@ -1,9 +1,9 @@ -package io.github.hello09x.fakeplayer.v1_20_R3_R4.spi; +package io.github.hello09x.fakeplayer.v1_20_4.spi; import io.github.hello09x.fakeplayer.api.spi.NMSServerPlayer; import io.github.hello09x.fakeplayer.core.constant.ConstantPool; import io.github.hello09x.fakeplayer.core.util.Reflections; -import io.github.hello09x.fakeplayer.v1_20_R3_R4.network.FakePlayerAdvancements; +import io.github.hello09x.fakeplayer.v1_20_4.network.FakePlayerAdvancements; import lombok.Getter; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/fakeplayer-v1_20_5/pom.xml b/fakeplayer-v1_20_5/pom.xml new file mode 100644 index 0000000..8b6cda3 --- /dev/null +++ b/fakeplayer-v1_20_5/pom.xml @@ -0,0 +1,102 @@ + + + 4.0.0 + + io.github.hello09x.fakeplayer + fakeplayer-parent + ${revision} + + + fakeplayer-v1_20_5 + + + 17 + 17 + UTF-8 + + 1.20.6-R0.1-SNAPSHOT + + + + + + io.papermc.paper + paper-api + provided + + + + io.github.hello09x.fakeplayer + fakeplayer-core + provided + + + + io.github.hello09x.fakeplayer + fakeplayer-api + provided + + + + io.github.hello09x.fakeplayer + fakeplayer-v1_20_6 + ${revision} + provided + + + + org.spigotmc + spigot + ${nms.version} + remapped-mojang + provided + + + + + + + + net.md-5 + specialsource-maven-plugin + 2.0.3 + + + package + + remap + + remap-obf + + org.spigotmc:minecraft-server:${nms.version}:txt:maps-mojang + true + + org.spigotmc:spigot:${nms.version}:jar:remapped-mojang + + true + remapped-obf + + + + package + + remap + + remap-spigot + + + ${project.build.directory}/${project.artifactId}-${project.version}-remapped-obf.jar + + org.spigotmc:minecraft-server:${nms.version}:csrg:maps-spigot + org.spigotmc:spigot:${nms.version}:jar:remapped-obf + + + + + + + + + \ No newline at end of file diff --git a/fakeplayer-v1_20_5/src/main/java/io/github/hello09x/fakeplayer/v1_20_5/spi/NMSBridgeImpl.java b/fakeplayer-v1_20_5/src/main/java/io/github/hello09x/fakeplayer/v1_20_5/spi/NMSBridgeImpl.java new file mode 100644 index 0000000..7c946b3 --- /dev/null +++ b/fakeplayer-v1_20_5/src/main/java/io/github/hello09x/fakeplayer/v1_20_5/spi/NMSBridgeImpl.java @@ -0,0 +1,55 @@ +package io.github.hello09x.fakeplayer.v1_20_5.spi; + +import io.github.hello09x.fakeplayer.api.spi.*; +import io.github.hello09x.fakeplayer.core.Main; +import io.github.hello09x.fakeplayer.v1_20_6.spi.*; +import org.bukkit.Bukkit; +import org.bukkit.Server; +import org.bukkit.World; +import org.bukkit.entity.Entity; +import org.bukkit.entity.Player; +import org.jetbrains.annotations.NotNull; + +import java.net.InetAddress; +import java.util.Set; + +public class NMSBridgeImpl implements NMSBridge { + + private final static Set SUPPORTS = Set.of("1.20.5"); + + @Override + public @NotNull NMSEntity fromEntity(@NotNull Entity entity) { + return new NMSEntityImpl(entity); + } + + @Override + public @NotNull NMSServer fromServer(@NotNull Server server) { + return new NMSServerImpl(server); + } + + @Override + public @NotNull NMSServerLevel fromWorld(@NotNull World world) { + return new NMSServerLevelImpl(world); + } + + @Override + public @NotNull NMSServerPlayer fromPlayer(@NotNull Player player) { + return new NMSServerPlayerImpl(player); + } + + @Override + public @NotNull NMSNetwork createNetwork(@NotNull InetAddress address) { + return new NMSNetworkImpl(address); + } + + @Override + public boolean isSupported() { + return SUPPORTS.contains(Bukkit.getMinecraftVersion()); + } + + @Override + public @NotNull ActionTicker createAction(@NotNull Player player, @NotNull ActionType action, @NotNull ActionSetting setting) { + return new ActionTickerImpl(Main.getInjector().getInstance(NMSBridge.class), player, action, setting); + } + +} diff --git a/fakeplayer-v1_20_R5_R6/pom.xml b/fakeplayer-v1_20_6/pom.xml similarity index 98% rename from fakeplayer-v1_20_R5_R6/pom.xml rename to fakeplayer-v1_20_6/pom.xml index 2d097f3..df54bc3 100644 --- a/fakeplayer-v1_20_R5_R6/pom.xml +++ b/fakeplayer-v1_20_6/pom.xml @@ -9,7 +9,7 @@ ${revision} - fakeplayer-v1_20_R5_R6 + fakeplayer-v1_20_6 17 diff --git a/fakeplayer-v1_20_R5_R6/src/main/java/io/github/hello09x/fakeplayer/v1_20_R5_R6/action/AttackAction.java b/fakeplayer-v1_20_6/src/main/java/io/github/hello09x/fakeplayer/v1_20_6/action/AttackAction.java similarity index 94% rename from fakeplayer-v1_20_R5_R6/src/main/java/io/github/hello09x/fakeplayer/v1_20_R5_R6/action/AttackAction.java rename to fakeplayer-v1_20_6/src/main/java/io/github/hello09x/fakeplayer/v1_20_6/action/AttackAction.java index a37f6d6..5456df1 100644 --- a/fakeplayer-v1_20_R5_R6/src/main/java/io/github/hello09x/fakeplayer/v1_20_R5_R6/action/AttackAction.java +++ b/fakeplayer-v1_20_6/src/main/java/io/github/hello09x/fakeplayer/v1_20_6/action/AttackAction.java @@ -1,4 +1,4 @@ -package io.github.hello09x.fakeplayer.v1_20_R5_R6.action; +package io.github.hello09x.fakeplayer.v1_20_6.action; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.InteractionHand; diff --git a/fakeplayer-v1_20_R5_R6/src/main/java/io/github/hello09x/fakeplayer/v1_20_R5_R6/action/MineAction.java b/fakeplayer-v1_20_6/src/main/java/io/github/hello09x/fakeplayer/v1_20_6/action/MineAction.java similarity index 98% rename from fakeplayer-v1_20_R5_R6/src/main/java/io/github/hello09x/fakeplayer/v1_20_R5_R6/action/MineAction.java rename to fakeplayer-v1_20_6/src/main/java/io/github/hello09x/fakeplayer/v1_20_6/action/MineAction.java index ad133c8..ae9e581 100644 --- a/fakeplayer-v1_20_R5_R6/src/main/java/io/github/hello09x/fakeplayer/v1_20_R5_R6/action/MineAction.java +++ b/fakeplayer-v1_20_6/src/main/java/io/github/hello09x/fakeplayer/v1_20_6/action/MineAction.java @@ -1,4 +1,4 @@ -package io.github.hello09x.fakeplayer.v1_20_R5_R6.action; +package io.github.hello09x.fakeplayer.v1_20_6.action; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/fakeplayer-v1_20_R5_R6/src/main/java/io/github/hello09x/fakeplayer/v1_20_R5_R6/action/TraceAction.java b/fakeplayer-v1_20_6/src/main/java/io/github/hello09x/fakeplayer/v1_20_6/action/TraceAction.java similarity index 82% rename from fakeplayer-v1_20_R5_R6/src/main/java/io/github/hello09x/fakeplayer/v1_20_R5_R6/action/TraceAction.java rename to fakeplayer-v1_20_6/src/main/java/io/github/hello09x/fakeplayer/v1_20_6/action/TraceAction.java index ddf048e..f772a5a 100644 --- a/fakeplayer-v1_20_R5_R6/src/main/java/io/github/hello09x/fakeplayer/v1_20_R5_R6/action/TraceAction.java +++ b/fakeplayer-v1_20_6/src/main/java/io/github/hello09x/fakeplayer/v1_20_6/action/TraceAction.java @@ -1,7 +1,7 @@ -package io.github.hello09x.fakeplayer.v1_20_R5_R6.action; +package io.github.hello09x.fakeplayer.v1_20_6.action; import io.github.hello09x.fakeplayer.api.spi.Action; -import io.github.hello09x.fakeplayer.v1_20_R5_R6.action.util.Tracer; +import io.github.hello09x.fakeplayer.v1_20_6.action.util.Tracer; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.phys.HitResult; import org.jetbrains.annotations.NotNull; diff --git a/fakeplayer-v1_20_R5_R6/src/main/java/io/github/hello09x/fakeplayer/v1_20_R5_R6/action/UseAction.java b/fakeplayer-v1_20_6/src/main/java/io/github/hello09x/fakeplayer/v1_20_6/action/UseAction.java similarity index 98% rename from fakeplayer-v1_20_R5_R6/src/main/java/io/github/hello09x/fakeplayer/v1_20_R5_R6/action/UseAction.java rename to fakeplayer-v1_20_6/src/main/java/io/github/hello09x/fakeplayer/v1_20_6/action/UseAction.java index e864617..c5289e3 100644 --- a/fakeplayer-v1_20_R5_R6/src/main/java/io/github/hello09x/fakeplayer/v1_20_R5_R6/action/UseAction.java +++ b/fakeplayer-v1_20_6/src/main/java/io/github/hello09x/fakeplayer/v1_20_6/action/UseAction.java @@ -1,4 +1,4 @@ -package io.github.hello09x.fakeplayer.v1_20_R5_R6.action; +package io.github.hello09x.fakeplayer.v1_20_6.action; import net.minecraft.core.Direction; import net.minecraft.server.level.ServerPlayer; diff --git a/fakeplayer-v1_20_R5_R6/src/main/java/io/github/hello09x/fakeplayer/v1_20_R5_R6/action/util/Tracer.java b/fakeplayer-v1_20_6/src/main/java/io/github/hello09x/fakeplayer/v1_20_6/action/util/Tracer.java similarity index 98% rename from fakeplayer-v1_20_R5_R6/src/main/java/io/github/hello09x/fakeplayer/v1_20_R5_R6/action/util/Tracer.java rename to fakeplayer-v1_20_6/src/main/java/io/github/hello09x/fakeplayer/v1_20_6/action/util/Tracer.java index 681cdec..384c6af 100644 --- a/fakeplayer-v1_20_R5_R6/src/main/java/io/github/hello09x/fakeplayer/v1_20_R5_R6/action/util/Tracer.java +++ b/fakeplayer-v1_20_6/src/main/java/io/github/hello09x/fakeplayer/v1_20_6/action/util/Tracer.java @@ -1,4 +1,4 @@ -package io.github.hello09x.fakeplayer.v1_20_R5_R6.action.util; +package io.github.hello09x.fakeplayer.v1_20_6.action.util; import net.minecraft.world.entity.Entity; import net.minecraft.world.level.ClipContext; diff --git a/fakeplayer-v1_20_R5_R6/src/main/java/io/github/hello09x/fakeplayer/v1_20_R5_R6/network/FakeConnection.java b/fakeplayer-v1_20_6/src/main/java/io/github/hello09x/fakeplayer/v1_20_6/network/FakeConnection.java similarity index 93% rename from fakeplayer-v1_20_R5_R6/src/main/java/io/github/hello09x/fakeplayer/v1_20_R5_R6/network/FakeConnection.java rename to fakeplayer-v1_20_6/src/main/java/io/github/hello09x/fakeplayer/v1_20_6/network/FakeConnection.java index bb91a06..1d91a1a 100644 --- a/fakeplayer-v1_20_R5_R6/src/main/java/io/github/hello09x/fakeplayer/v1_20_R5_R6/network/FakeConnection.java +++ b/fakeplayer-v1_20_6/src/main/java/io/github/hello09x/fakeplayer/v1_20_6/network/FakeConnection.java @@ -1,4 +1,4 @@ -package io.github.hello09x.fakeplayer.v1_20_R5_R6.network; +package io.github.hello09x.fakeplayer.v1_20_6.network; import io.github.hello09x.fakeplayer.core.network.FakeChannel; import net.minecraft.network.Connection; diff --git a/fakeplayer-v1_20_R5_R6/src/main/java/io/github/hello09x/fakeplayer/v1_20_R5_R6/network/FakePlayerAdvancements.java b/fakeplayer-v1_20_6/src/main/java/io/github/hello09x/fakeplayer/v1_20_6/network/FakePlayerAdvancements.java similarity index 96% rename from fakeplayer-v1_20_R5_R6/src/main/java/io/github/hello09x/fakeplayer/v1_20_R5_R6/network/FakePlayerAdvancements.java rename to fakeplayer-v1_20_6/src/main/java/io/github/hello09x/fakeplayer/v1_20_6/network/FakePlayerAdvancements.java index 85bc4ce..0ac9787 100644 --- a/fakeplayer-v1_20_R5_R6/src/main/java/io/github/hello09x/fakeplayer/v1_20_R5_R6/network/FakePlayerAdvancements.java +++ b/fakeplayer-v1_20_6/src/main/java/io/github/hello09x/fakeplayer/v1_20_6/network/FakePlayerAdvancements.java @@ -1,4 +1,4 @@ -package io.github.hello09x.fakeplayer.v1_20_R5_R6.network; +package io.github.hello09x.fakeplayer.v1_20_6.network; import com.mojang.datafixers.DataFixer; import net.minecraft.advancements.AdvancementHolder; diff --git a/fakeplayer-v1_20_R5_R6/src/main/java/io/github/hello09x/fakeplayer/v1_20_R5_R6/network/FakeServerGamePacketListenerImpl.java b/fakeplayer-v1_20_6/src/main/java/io/github/hello09x/fakeplayer/v1_20_6/network/FakeServerGamePacketListenerImpl.java similarity index 97% rename from fakeplayer-v1_20_R5_R6/src/main/java/io/github/hello09x/fakeplayer/v1_20_R5_R6/network/FakeServerGamePacketListenerImpl.java rename to fakeplayer-v1_20_6/src/main/java/io/github/hello09x/fakeplayer/v1_20_6/network/FakeServerGamePacketListenerImpl.java index 90e83ff..5dc0afb 100644 --- a/fakeplayer-v1_20_R5_R6/src/main/java/io/github/hello09x/fakeplayer/v1_20_R5_R6/network/FakeServerGamePacketListenerImpl.java +++ b/fakeplayer-v1_20_6/src/main/java/io/github/hello09x/fakeplayer/v1_20_6/network/FakeServerGamePacketListenerImpl.java @@ -1,4 +1,4 @@ -package io.github.hello09x.fakeplayer.v1_20_R5_R6.network; +package io.github.hello09x.fakeplayer.v1_20_6.network; import io.github.hello09x.fakeplayer.api.spi.NMSServerGamePacketListener; import io.github.hello09x.fakeplayer.core.Main; diff --git a/fakeplayer-v1_20_R5_R6/src/main/java/io/github/hello09x/fakeplayer/v1_20_R5_R6/spi/ActionTickerImpl.java b/fakeplayer-v1_20_6/src/main/java/io/github/hello09x/fakeplayer/v1_20_6/spi/ActionTickerImpl.java similarity index 82% rename from fakeplayer-v1_20_R5_R6/src/main/java/io/github/hello09x/fakeplayer/v1_20_R5_R6/spi/ActionTickerImpl.java rename to fakeplayer-v1_20_6/src/main/java/io/github/hello09x/fakeplayer/v1_20_6/spi/ActionTickerImpl.java index 2bf9fbc..15fedfe 100644 --- a/fakeplayer-v1_20_R5_R6/src/main/java/io/github/hello09x/fakeplayer/v1_20_R5_R6/spi/ActionTickerImpl.java +++ b/fakeplayer-v1_20_6/src/main/java/io/github/hello09x/fakeplayer/v1_20_6/spi/ActionTickerImpl.java @@ -1,4 +1,4 @@ -package io.github.hello09x.fakeplayer.v1_20_R5_R6.spi; +package io.github.hello09x.fakeplayer.v1_20_6.spi; import io.github.hello09x.fakeplayer.api.spi.ActionSetting; @@ -6,9 +6,9 @@ import io.github.hello09x.fakeplayer.api.spi.ActionTicker; import io.github.hello09x.fakeplayer.api.spi.ActionType; import io.github.hello09x.fakeplayer.api.spi.NMSBridge; import io.github.hello09x.fakeplayer.core.entity.action.BaseActionTicker; -import io.github.hello09x.fakeplayer.v1_20_R5_R6.action.AttackAction; -import io.github.hello09x.fakeplayer.v1_20_R5_R6.action.MineAction; -import io.github.hello09x.fakeplayer.v1_20_R5_R6.action.UseAction; +import io.github.hello09x.fakeplayer.v1_20_6.action.AttackAction; +import io.github.hello09x.fakeplayer.v1_20_6.action.MineAction; +import io.github.hello09x.fakeplayer.v1_20_6.action.UseAction; import org.bukkit.craftbukkit.v1_20_R4.entity.CraftPlayer; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; diff --git a/fakeplayer-v1_20_R5_R6/src/main/java/io/github/hello09x/fakeplayer/v1_20_R5_R6/spi/NMSBridgeImpl.java b/fakeplayer-v1_20_6/src/main/java/io/github/hello09x/fakeplayer/v1_20_6/spi/NMSBridgeImpl.java similarity index 96% rename from fakeplayer-v1_20_R5_R6/src/main/java/io/github/hello09x/fakeplayer/v1_20_R5_R6/spi/NMSBridgeImpl.java rename to fakeplayer-v1_20_6/src/main/java/io/github/hello09x/fakeplayer/v1_20_6/spi/NMSBridgeImpl.java index 6c711ff..ea7d37e 100644 --- a/fakeplayer-v1_20_R5_R6/src/main/java/io/github/hello09x/fakeplayer/v1_20_R5_R6/spi/NMSBridgeImpl.java +++ b/fakeplayer-v1_20_6/src/main/java/io/github/hello09x/fakeplayer/v1_20_6/spi/NMSBridgeImpl.java @@ -1,4 +1,4 @@ -package io.github.hello09x.fakeplayer.v1_20_R5_R6.spi; +package io.github.hello09x.fakeplayer.v1_20_6.spi; import io.github.hello09x.fakeplayer.api.spi.*; import io.github.hello09x.fakeplayer.core.Main; diff --git a/fakeplayer-v1_20_R5_R6/src/main/java/io/github/hello09x/fakeplayer/v1_20_R5_R6/spi/NMSEntityImpl.java b/fakeplayer-v1_20_6/src/main/java/io/github/hello09x/fakeplayer/v1_20_6/spi/NMSEntityImpl.java similarity index 89% rename from fakeplayer-v1_20_R5_R6/src/main/java/io/github/hello09x/fakeplayer/v1_20_R5_R6/spi/NMSEntityImpl.java rename to fakeplayer-v1_20_6/src/main/java/io/github/hello09x/fakeplayer/v1_20_6/spi/NMSEntityImpl.java index 1697b28..2d08def 100644 --- a/fakeplayer-v1_20_R5_R6/src/main/java/io/github/hello09x/fakeplayer/v1_20_R5_R6/spi/NMSEntityImpl.java +++ b/fakeplayer-v1_20_6/src/main/java/io/github/hello09x/fakeplayer/v1_20_6/spi/NMSEntityImpl.java @@ -1,4 +1,4 @@ -package io.github.hello09x.fakeplayer.v1_20_R5_R6.spi; +package io.github.hello09x.fakeplayer.v1_20_6.spi; import io.github.hello09x.fakeplayer.api.spi.NMSEntity; import lombok.Getter; diff --git a/fakeplayer-v1_20_R5_R6/src/main/java/io/github/hello09x/fakeplayer/v1_20_R5_R6/spi/NMSNetworkImpl.java b/fakeplayer-v1_20_6/src/main/java/io/github/hello09x/fakeplayer/v1_20_6/spi/NMSNetworkImpl.java similarity index 89% rename from fakeplayer-v1_20_R5_R6/src/main/java/io/github/hello09x/fakeplayer/v1_20_R5_R6/spi/NMSNetworkImpl.java rename to fakeplayer-v1_20_6/src/main/java/io/github/hello09x/fakeplayer/v1_20_6/spi/NMSNetworkImpl.java index 97bc0f3..41c5ca7 100644 --- a/fakeplayer-v1_20_R5_R6/src/main/java/io/github/hello09x/fakeplayer/v1_20_R5_R6/spi/NMSNetworkImpl.java +++ b/fakeplayer-v1_20_6/src/main/java/io/github/hello09x/fakeplayer/v1_20_6/spi/NMSNetworkImpl.java @@ -1,9 +1,9 @@ -package io.github.hello09x.fakeplayer.v1_20_R5_R6.spi; +package io.github.hello09x.fakeplayer.v1_20_6.spi; import io.github.hello09x.fakeplayer.api.spi.NMSNetwork; import io.github.hello09x.fakeplayer.api.spi.NMSServerGamePacketListener; -import io.github.hello09x.fakeplayer.v1_20_R5_R6.network.FakeConnection; -import io.github.hello09x.fakeplayer.v1_20_R5_R6.network.FakeServerGamePacketListenerImpl; +import io.github.hello09x.fakeplayer.v1_20_6.network.FakeConnection; +import io.github.hello09x.fakeplayer.v1_20_6.network.FakeServerGamePacketListenerImpl; import net.minecraft.server.network.CommonListenerCookie; import org.bukkit.Server; import org.bukkit.craftbukkit.v1_20_R4.CraftServer; diff --git a/fakeplayer-v1_20_R5_R6/src/main/java/io/github/hello09x/fakeplayer/v1_20_R5_R6/spi/NMSServerImpl.java b/fakeplayer-v1_20_6/src/main/java/io/github/hello09x/fakeplayer/v1_20_6/spi/NMSServerImpl.java similarity index 95% rename from fakeplayer-v1_20_R5_R6/src/main/java/io/github/hello09x/fakeplayer/v1_20_R5_R6/spi/NMSServerImpl.java rename to fakeplayer-v1_20_6/src/main/java/io/github/hello09x/fakeplayer/v1_20_6/spi/NMSServerImpl.java index 2e5370b..e7aaa2e 100644 --- a/fakeplayer-v1_20_R5_R6/src/main/java/io/github/hello09x/fakeplayer/v1_20_R5_R6/spi/NMSServerImpl.java +++ b/fakeplayer-v1_20_6/src/main/java/io/github/hello09x/fakeplayer/v1_20_6/spi/NMSServerImpl.java @@ -1,4 +1,4 @@ -package io.github.hello09x.fakeplayer.v1_20_R5_R6.spi; +package io.github.hello09x.fakeplayer.v1_20_6.spi; import com.mojang.authlib.GameProfile; import io.github.hello09x.devtools.core.utils.WorldUtils; diff --git a/fakeplayer-v1_20_R5_R6/src/main/java/io/github/hello09x/fakeplayer/v1_20_R5_R6/spi/NMSServerLevelImpl.java b/fakeplayer-v1_20_6/src/main/java/io/github/hello09x/fakeplayer/v1_20_6/spi/NMSServerLevelImpl.java similarity index 89% rename from fakeplayer-v1_20_R5_R6/src/main/java/io/github/hello09x/fakeplayer/v1_20_R5_R6/spi/NMSServerLevelImpl.java rename to fakeplayer-v1_20_6/src/main/java/io/github/hello09x/fakeplayer/v1_20_6/spi/NMSServerLevelImpl.java index 3ba51ec..dad4be5 100644 --- a/fakeplayer-v1_20_R5_R6/src/main/java/io/github/hello09x/fakeplayer/v1_20_R5_R6/spi/NMSServerLevelImpl.java +++ b/fakeplayer-v1_20_6/src/main/java/io/github/hello09x/fakeplayer/v1_20_6/spi/NMSServerLevelImpl.java @@ -1,4 +1,4 @@ -package io.github.hello09x.fakeplayer.v1_20_R5_R6.spi; +package io.github.hello09x.fakeplayer.v1_20_6.spi; import io.github.hello09x.fakeplayer.api.spi.NMSServerLevel; import lombok.Getter; diff --git a/fakeplayer-v1_20_R5_R6/src/main/java/io/github/hello09x/fakeplayer/v1_20_R5_R6/spi/NMSServerPlayerImpl.java b/fakeplayer-v1_20_6/src/main/java/io/github/hello09x/fakeplayer/v1_20_6/spi/NMSServerPlayerImpl.java similarity index 97% rename from fakeplayer-v1_20_R5_R6/src/main/java/io/github/hello09x/fakeplayer/v1_20_R5_R6/spi/NMSServerPlayerImpl.java rename to fakeplayer-v1_20_6/src/main/java/io/github/hello09x/fakeplayer/v1_20_6/spi/NMSServerPlayerImpl.java index 4a81328..273bce2 100644 --- a/fakeplayer-v1_20_R5_R6/src/main/java/io/github/hello09x/fakeplayer/v1_20_R5_R6/spi/NMSServerPlayerImpl.java +++ b/fakeplayer-v1_20_6/src/main/java/io/github/hello09x/fakeplayer/v1_20_6/spi/NMSServerPlayerImpl.java @@ -1,9 +1,9 @@ -package io.github.hello09x.fakeplayer.v1_20_R5_R6.spi; +package io.github.hello09x.fakeplayer.v1_20_6.spi; import io.github.hello09x.fakeplayer.api.spi.NMSServerPlayer; import io.github.hello09x.fakeplayer.core.constant.ConstantPool; import io.github.hello09x.fakeplayer.core.util.Reflections; -import io.github.hello09x.fakeplayer.v1_20_R5_R6.network.FakePlayerAdvancements; +import io.github.hello09x.fakeplayer.v1_20_6.network.FakePlayerAdvancements; import lombok.Getter; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/fakeplayer-v1_20_R3_R4/src/main/java/io/github/hello09x/fakeplayer/v1_20_R3_R4/action/AttackAction.java b/fakeplayer-v1_20_R3_R4/src/main/java/io/github/hello09x/fakeplayer/v1_20_R3_R4/action/AttackAction.java deleted file mode 100644 index 76f3f35..0000000 --- a/fakeplayer-v1_20_R3_R4/src/main/java/io/github/hello09x/fakeplayer/v1_20_R3_R4/action/AttackAction.java +++ /dev/null @@ -1,49 +0,0 @@ -package io.github.hello09x.fakeplayer.v1_20_R3_R4.action; - -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.InteractionHand; -import net.minecraft.world.phys.EntityHitResult; -import net.minecraft.world.phys.HitResult; - - -public class AttackAction extends TraceAction { - - private final ServerPlayer player; - - public AttackAction(ServerPlayer player) { - super(player); - this.player = player; - } - - - @Override - public boolean tick() { - var hit = this.getTarget(); - if (hit == null) { - return false; - } - - if (hit.getType() != HitResult.Type.ENTITY) { - return false; - } - - var entityHit = (EntityHitResult) hit; - player.attack(entityHit.getEntity()); - player.swing(InteractionHand.MAIN_HAND); - player.resetAttackStrengthTicker(); - player.resetLastActionTime(); - return true; - } - - @Override - public void inactiveTick() { - - } - - @Override - public void stop() { - - } - - -} diff --git a/fakeplayer-v1_20_R3_R4/src/main/java/io/github/hello09x/fakeplayer/v1_20_R3_R4/action/MineAction.java b/fakeplayer-v1_20_R3_R4/src/main/java/io/github/hello09x/fakeplayer/v1_20_R3_R4/action/MineAction.java deleted file mode 100644 index 2ede556..0000000 --- a/fakeplayer-v1_20_R3_R4/src/main/java/io/github/hello09x/fakeplayer/v1_20_R3_R4/action/MineAction.java +++ /dev/null @@ -1,160 +0,0 @@ -package io.github.hello09x.fakeplayer.v1_20_R3_R4.action; - -import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.InteractionHand; -import net.minecraft.world.phys.BlockHitResult; -import net.minecraft.world.phys.HitResult; -import org.jetbrains.annotations.Nullable; - -import static net.minecraft.network.protocol.game.ServerboundPlayerActionPacket.Action.*; - -public class MineAction extends TraceAction { - - private final Current current = new Current(); - - public MineAction(ServerPlayer player) { - super(player); - } - - @Override - @SuppressWarnings("resource") - public boolean tick() { - var hit = this.getTarget(); - if (hit == null) { - return false; - } - - if (hit.getType() != HitResult.Type.BLOCK) { - return false; - } - - if (current.freeze > 0) { - current.freeze--; - return false; - } - - var blockHit = (BlockHitResult) hit; - var pos = blockHit.getBlockPos(); - var side = blockHit.getDirection(); - - if (player.blockActionRestricted(player.level(), pos, player.gameMode.getGameModeForPlayer())) { - return false; - } - - if (current.pos != null && player.level().getBlockState(current.pos).isAir()) { - current.pos = null; - return false; - } - - var state = player.level().getBlockState(pos); - var broken = false; - if (player.gameMode.getGameModeForPlayer().isCreative()) { - player.gameMode.handleBlockBreakAction( - pos, - START_DESTROY_BLOCK, - side, - player.level().getMaxBuildHeight(), - -1 - ); - current.freeze = 5; - broken = true; - } else if (current.pos == null || !current.pos.equals(pos)) { - if (current.pos != null) { - player.gameMode.handleBlockBreakAction( - current.pos, - ABORT_DESTROY_BLOCK, - side, - player.level().getMaxBuildHeight(), - -1 - ); - } - - player.gameMode.handleBlockBreakAction( - pos, - START_DESTROY_BLOCK, - side, - player.level().getMaxBuildHeight(), - -1 - ); - - if (!state.isAir() && current.progress == 0) { - state.attack(player.level(), pos, player); - } - - if (!state.isAir() && state.getDestroyProgress(player, player.level(), pos) >= 1) { - current.pos = null; - broken = true; - } else { - current.pos = pos; - current.progress = 0; - } - } else { - current.progress += state.getDestroyProgress(player, player.level(), pos); - if (current.progress >= 1) { - player.gameMode.handleBlockBreakAction( - pos, - STOP_DESTROY_BLOCK, - side, - player.level().getMaxBuildHeight(), - -1 - ); - current.pos = null; - current.freeze = 5; - broken = true; - } - player.level().destroyBlockProgress(-1, pos, (int) (current.progress * 10)); - } - - player.resetLastActionTime(); - player.swing(InteractionHand.MAIN_HAND); - return broken; - } - - @Override - public void inactiveTick() { - stop(); - } - - @Override - @SuppressWarnings("resource") - public void stop() { - if (current.pos == null) { - return; - } - - player.level().destroyBlockProgress(-1, current.pos, -1); - player.gameMode.handleBlockBreakAction( - current.pos, - ABORT_DESTROY_BLOCK, - Direction.DOWN, - player.level().getMaxBuildHeight(), - -1 - ); - current.pos = null; - current.freeze = 0; - current.progress = 0; - } - - private static class Current { - - /** - * 当前左键的目标位置 - */ - @Nullable - public BlockPos pos; - - /** - * 破坏方块的进度 - */ - public float progress; - - /** - * 冷却, 单位: tick - */ - public int freeze; - - } - -} diff --git a/fakeplayer-v1_20_R3_R4/src/main/java/io/github/hello09x/fakeplayer/v1_20_R3_R4/action/TraceAction.java b/fakeplayer-v1_20_R3_R4/src/main/java/io/github/hello09x/fakeplayer/v1_20_R3_R4/action/TraceAction.java deleted file mode 100644 index b02b5ac..0000000 --- a/fakeplayer-v1_20_R3_R4/src/main/java/io/github/hello09x/fakeplayer/v1_20_R3_R4/action/TraceAction.java +++ /dev/null @@ -1,24 +0,0 @@ -package io.github.hello09x.fakeplayer.v1_20_R3_R4.action; - -import io.github.hello09x.fakeplayer.api.spi.Action; -import io.github.hello09x.fakeplayer.v1_20_R3_R4.action.util.Tracer; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.phys.HitResult; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -public abstract class TraceAction implements Action { - - protected final ServerPlayer player; - - protected TraceAction(@NotNull ServerPlayer player) { - this.player = player; - } - - protected @Nullable HitResult getTarget() { - double reach = player.gameMode.isCreative() ? 5 : 4.5f; - return Tracer.rayTrace(player, 1, reach, false); - } - - -} diff --git a/fakeplayer-v1_20_R3_R4/src/main/java/io/github/hello09x/fakeplayer/v1_20_R3_R4/action/UseAction.java b/fakeplayer-v1_20_R3_R4/src/main/java/io/github/hello09x/fakeplayer/v1_20_R3_R4/action/UseAction.java deleted file mode 100644 index 676cb56..0000000 --- a/fakeplayer-v1_20_R3_R4/src/main/java/io/github/hello09x/fakeplayer/v1_20_R3_R4/action/UseAction.java +++ /dev/null @@ -1,97 +0,0 @@ -package io.github.hello09x.fakeplayer.v1_20_R3_R4.action; - -import net.minecraft.core.Direction; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.InteractionHand; -import net.minecraft.world.entity.decoration.ItemFrame; -import net.minecraft.world.phys.BlockHitResult; -import net.minecraft.world.phys.EntityHitResult; -import org.jetbrains.annotations.NotNull; - -public class UseAction extends TraceAction { - - private final Current current = new Current(); - - public UseAction(@NotNull ServerPlayer player) { - super(player); - } - - @Override - @SuppressWarnings("resource") - public boolean tick() { - if (current.freeze > 0) { - current.freeze--; - return false; - } - - if (player.isUsingItem()) { - return true; - } - - var hit = this.getTarget(); - if (hit == null) { - return false; - } - - for (var hand : InteractionHand.values()) { - switch (hit.getType()) { - case BLOCK -> { - player.resetLastActionTime(); - var world = player.serverLevel(); - var blockHit = (BlockHitResult) hit; - var pos = blockHit.getBlockPos(); - var side = blockHit.getDirection(); - if (pos.getY() < player.level().getMaxBuildHeight() - (side == Direction.UP ? 1 : 0) && world.mayInteract(player, pos)) { - var result = player.gameMode.useItemOn(player, world, player.getItemInHand(hand), hand, blockHit); - if (result.consumesAction()) { - player.swing(hand); - current.freeze = 3; - return true; - } - } - } - case ENTITY -> { - player.resetLastActionTime(); - var entityHit = (EntityHitResult) hit; - var entity = entityHit.getEntity(); - boolean handWasEmpty = player.getItemInHand(hand).isEmpty(); - boolean itemFrameEmpty = (entity instanceof ItemFrame) && ((ItemFrame) entity).getItem().isEmpty(); - var pos = entityHit.getLocation().subtract(entity.getX(), entity.getY(), entity.getZ()); - if (entity.interactAt(player, pos, hand).consumesAction()) { - current.freeze = 3; - return true; - } - if (player.interactOn(entity, hand).consumesAction() && !(handWasEmpty && itemFrameEmpty)) { - current.freeze = 3; - return true; - } - } - } - var handItem = player.getItemInHand(hand); - if (player.gameMode.useItem(player, player.level(), handItem, hand).consumesAction()) { - player.resetLastActionTime(); - current.freeze = 3; - return true; - } - } - return false; - } - - @Override - public void inactiveTick() { - } - - @Override - public void stop() { - current.freeze = 0; - player.releaseUsingItem(); - } - - private final static class Current { - - /** - * 冷却, 单位: tick - */ - public int freeze; - } -} diff --git a/fakeplayer-v1_20_R3_R4/src/main/java/io/github/hello09x/fakeplayer/v1_20_R3_R4/action/util/Tracer.java b/fakeplayer-v1_20_R3_R4/src/main/java/io/github/hello09x/fakeplayer/v1_20_R3_R4/action/util/Tracer.java deleted file mode 100644 index 34cc752..0000000 --- a/fakeplayer-v1_20_R3_R4/src/main/java/io/github/hello09x/fakeplayer/v1_20_R3_R4/action/util/Tracer.java +++ /dev/null @@ -1,105 +0,0 @@ -package io.github.hello09x.fakeplayer.v1_20_R3_R4.action.util; - -import net.minecraft.world.entity.Entity; -import net.minecraft.world.level.ClipContext; -import net.minecraft.world.phys.*; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import java.util.function.Predicate; - -/** - * copy from fabric carpet mod - */ -public class Tracer { - - public static @Nullable HitResult rayTrace( - @NotNull Entity source, - float partialTicks, - double reach, - boolean fluids - ) { - var blockHit = rayTraceBlocks(source, partialTicks, reach, fluids); - double maxSqDist = reach * reach; - if (blockHit != null) { - maxSqDist = blockHit.getLocation().distanceToSqr(source.getEyePosition(partialTicks)); - } - EntityHitResult entityHit = rayTraceEntities(source, partialTicks, reach, maxSqDist); - return entityHit == null ? blockHit : entityHit; - } - - @SuppressWarnings("resource") - public static @Nullable BlockHitResult rayTraceBlocks( - @NotNull Entity source, - float partialTicks, - double reach, - boolean fluids - ) { - var pos = source.getEyePosition(partialTicks); - var rotation = source.getViewVector(partialTicks); - var reachEnd = pos.add(rotation.x * reach, rotation.y * reach, rotation.z * reach); - return source.level().clip(new ClipContext(pos, reachEnd, ClipContext.Block.OUTLINE, fluids ? - ClipContext.Fluid.ANY : ClipContext.Fluid.NONE, source)); - } - - public static @Nullable EntityHitResult rayTraceEntities( - @NotNull Entity source, - float partialTicks, - double reach, - double maxSqDist - ) { - var pos = source.getEyePosition(partialTicks); - var reachVec = source.getViewVector(partialTicks).scale(reach); - var box = source.getBoundingBox().expandTowards(reachVec).inflate(1); - return rayTraceEntities(source, - pos, - pos.add(reachVec), - box, - e -> !e.isSpectator() && e.isPickable(), - maxSqDist); - } - - public static @Nullable EntityHitResult rayTraceEntities( - @NotNull Entity source, - @NotNull Vec3 start, - @NotNull Vec3 end, - @NotNull AABB box, - @NotNull Predicate predicate, - double maxSqDistance - ) { - @SuppressWarnings("resource") - var world = source.level(); - double targetDistance = maxSqDistance; - Entity target = null; - Vec3 targetHitPos = null; - for (Entity current : world.getEntities(source, box, predicate)) { - var currentBox = current.getBoundingBox().inflate(current.getPickRadius()); - var currentHit = currentBox.clip(start, end); - if (currentBox.contains(start)) { - if (targetDistance >= 0) { - target = current; - targetHitPos = currentHit.orElse(start); - targetDistance = 0; - } - } else if (currentHit.isPresent()) { - var currentHitPos = currentHit.get(); - var currentDistance = start.distanceToSqr(currentHitPos); - if (currentDistance < targetDistance || targetDistance == 0) { - if (current.getRootVehicle() == source.getRootVehicle()) { - if (targetDistance == 0) { - target = current; - targetHitPos = currentHitPos; - } - } - else - { - target = current; - targetHitPos = currentHitPos; - targetDistance = currentDistance; - } - } - } - } - return target == null ? null : new EntityHitResult(target, targetHitPos); - } -} diff --git a/fakeplayer-v1_21/pom.xml b/fakeplayer-v1_21/pom.xml new file mode 100644 index 0000000..2435c8b --- /dev/null +++ b/fakeplayer-v1_21/pom.xml @@ -0,0 +1,100 @@ + + + 4.0.0 + + io.github.hello09x.fakeplayer + fakeplayer-parent + ${revision} + + + fakeplayer-v1_21 + + + 21 + 21 + UTF-8 + + 1.21-R0.1-SNAPSHOT + + + + + io.papermc.paper + paper-api + provided + + + + io.github.hello09x.fakeplayer + fakeplayer-core + provided + + + + io.github.hello09x.fakeplayer + fakeplayer-api + provided + + + + org.spigotmc + spigot + ${nms.version} + remapped-mojang + provided + + + + org.projectlombok + lombok + provided + + + + + + + + net.md-5 + specialsource-maven-plugin + 2.0.3 + + + package + + remap + + remap-obf + + org.spigotmc:minecraft-server:${nms.version}:txt:maps-mojang + true + + org.spigotmc:spigot:${nms.version}:jar:remapped-mojang + + true + remapped-obf + + + + package + + remap + + remap-spigot + + + ${project.build.directory}/${project.artifactId}-${project.version}-remapped-obf.jar + + org.spigotmc:minecraft-server:${nms.version}:csrg:maps-spigot + org.spigotmc:spigot:${nms.version}:jar:remapped-obf + + + + + + + + + \ No newline at end of file diff --git a/fakeplayer-v1_21/src/main/java/io/github/hello09x/fakeplayer/v1_21/action/AttackAction.java b/fakeplayer-v1_21/src/main/java/io/github/hello09x/fakeplayer/v1_21/action/AttackAction.java new file mode 100644 index 0000000..1ecd0f1 --- /dev/null +++ b/fakeplayer-v1_21/src/main/java/io/github/hello09x/fakeplayer/v1_21/action/AttackAction.java @@ -0,0 +1,49 @@ +package io.github.hello09x.fakeplayer.v1_21.action; + +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.phys.EntityHitResult; +import net.minecraft.world.phys.HitResult; + + +public class AttackAction extends TraceAction { + + private final ServerPlayer player; + + public AttackAction(ServerPlayer player) { + super(player); + this.player = player; + } + + + @Override + public boolean tick() { + var hit = this.getTarget(); + if (hit == null) { + return false; + } + + if (hit.getType() != HitResult.Type.ENTITY) { + return false; + } + + var entityHit = (EntityHitResult) hit; + player.attack(entityHit.getEntity()); + player.swing(InteractionHand.MAIN_HAND); + player.resetAttackStrengthTicker(); + player.resetLastActionTime(); + return true; + } + + @Override + public void inactiveTick() { + + } + + @Override + public void stop() { + + } + + +} diff --git a/fakeplayer-v1_21/src/main/java/io/github/hello09x/fakeplayer/v1_21/action/MineAction.java b/fakeplayer-v1_21/src/main/java/io/github/hello09x/fakeplayer/v1_21/action/MineAction.java new file mode 100644 index 0000000..f1c0860 --- /dev/null +++ b/fakeplayer-v1_21/src/main/java/io/github/hello09x/fakeplayer/v1_21/action/MineAction.java @@ -0,0 +1,160 @@ +package io.github.hello09x.fakeplayer.v1_21.action; + +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.phys.BlockHitResult; +import net.minecraft.world.phys.HitResult; +import org.jetbrains.annotations.Nullable; + +import static net.minecraft.network.protocol.game.ServerboundPlayerActionPacket.Action.*; + +public class MineAction extends TraceAction { + + private final Current current = new Current(); + + public MineAction(ServerPlayer player) { + super(player); + } + + @Override + @SuppressWarnings("resource") + public boolean tick() { + var hit = this.getTarget(); + if (hit == null) { + return false; + } + + if (hit.getType() != HitResult.Type.BLOCK) { + return false; + } + + if (current.freeze > 0) { + current.freeze--; + return false; + } + + var blockHit = (BlockHitResult) hit; + var pos = blockHit.getBlockPos(); + var side = blockHit.getDirection(); + + if (player.blockActionRestricted(player.level(), pos, player.gameMode.getGameModeForPlayer())) { + return false; + } + + if (current.pos != null && player.level().getBlockState(current.pos).isAir()) { + current.pos = null; + return false; + } + + var state = player.level().getBlockState(pos); + var broken = false; + if (player.gameMode.getGameModeForPlayer().isCreative()) { + player.gameMode.handleBlockBreakAction( + pos, + START_DESTROY_BLOCK, + side, + player.level().getMaxBuildHeight(), + -1 + ); + current.freeze = 5; + broken = true; + } else if (current.pos == null || !current.pos.equals(pos)) { + if (current.pos != null) { + player.gameMode.handleBlockBreakAction( + current.pos, + ABORT_DESTROY_BLOCK, + side, + player.level().getMaxBuildHeight(), + -1 + ); + } + + player.gameMode.handleBlockBreakAction( + pos, + START_DESTROY_BLOCK, + side, + player.level().getMaxBuildHeight(), + -1 + ); + + if (!state.isAir() && current.progress == 0) { + state.attack(player.level(), pos, player); + } + + if (!state.isAir() && state.getDestroyProgress(player, player.level(), pos) >= 1) { + current.pos = null; + broken = true; + } else { + current.pos = pos; + current.progress = 0; + } + } else { + current.progress += state.getDestroyProgress(player, player.level(), pos); + if (current.progress >= 1) { + player.gameMode.handleBlockBreakAction( + pos, + STOP_DESTROY_BLOCK, + side, + player.level().getMaxBuildHeight(), + -1 + ); + current.pos = null; + current.freeze = 5; + broken = true; + } + player.level().destroyBlockProgress(-1, pos, (int) (current.progress * 10)); + } + + player.resetLastActionTime(); + player.swing(InteractionHand.MAIN_HAND); + return broken; + } + + @Override + public void inactiveTick() { + stop(); + } + + @Override + @SuppressWarnings("resource") + public void stop() { + if (current.pos == null) { + return; + } + + player.level().destroyBlockProgress(-1, current.pos, -1); + player.gameMode.handleBlockBreakAction( + current.pos, + ABORT_DESTROY_BLOCK, + Direction.DOWN, + player.level().getMaxBuildHeight(), + -1 + ); + current.pos = null; + current.freeze = 0; + current.progress = 0; + } + + private static class Current { + + /** + * 当前左键的目标位置 + */ + @Nullable + public BlockPos pos; + + /** + * 破坏方块的进度 + */ + public float progress; + + /** + * 冷却, 单位: tick + */ + public int freeze; + + } + +} diff --git a/fakeplayer-v1_21/src/main/java/io/github/hello09x/fakeplayer/v1_21/action/TraceAction.java b/fakeplayer-v1_21/src/main/java/io/github/hello09x/fakeplayer/v1_21/action/TraceAction.java new file mode 100644 index 0000000..cc7ec75 --- /dev/null +++ b/fakeplayer-v1_21/src/main/java/io/github/hello09x/fakeplayer/v1_21/action/TraceAction.java @@ -0,0 +1,24 @@ +package io.github.hello09x.fakeplayer.v1_21.action; + +import io.github.hello09x.fakeplayer.api.spi.Action; +import io.github.hello09x.fakeplayer.v1_21.action.util.Tracer; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.phys.HitResult; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +public abstract class TraceAction implements Action { + + protected final ServerPlayer player; + + protected TraceAction(@NotNull ServerPlayer player) { + this.player = player; + } + + protected @Nullable HitResult getTarget() { + double reach = player.gameMode.isCreative() ? 5 : 4.5f; + return Tracer.rayTrace(player, 1, reach, false); + } + + +} diff --git a/fakeplayer-v1_21/src/main/java/io/github/hello09x/fakeplayer/v1_21/action/UseAction.java b/fakeplayer-v1_21/src/main/java/io/github/hello09x/fakeplayer/v1_21/action/UseAction.java new file mode 100644 index 0000000..aba69bf --- /dev/null +++ b/fakeplayer-v1_21/src/main/java/io/github/hello09x/fakeplayer/v1_21/action/UseAction.java @@ -0,0 +1,97 @@ +package io.github.hello09x.fakeplayer.v1_21.action; + +import net.minecraft.core.Direction; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.entity.decoration.ItemFrame; +import net.minecraft.world.phys.BlockHitResult; +import net.minecraft.world.phys.EntityHitResult; +import org.jetbrains.annotations.NotNull; + +public class UseAction extends TraceAction { + + private final Current current = new Current(); + + public UseAction(@NotNull ServerPlayer player) { + super(player); + } + + @Override + @SuppressWarnings("resource") + public boolean tick() { + if (current.freeze > 0) { + current.freeze--; + return false; + } + + if (player.isUsingItem()) { + return true; + } + + var hit = this.getTarget(); + if (hit == null) { + return false; + } + + for (var hand : InteractionHand.values()) { + switch (hit.getType()) { + case BLOCK -> { + player.resetLastActionTime(); + var world = player.serverLevel(); + var blockHit = (BlockHitResult) hit; + var pos = blockHit.getBlockPos(); + var side = blockHit.getDirection(); + if (pos.getY() < player.level().getMaxBuildHeight() - (side == Direction.UP ? 1 : 0) && world.mayInteract(player, pos)) { + var result = player.gameMode.useItemOn(player, world, player.getItemInHand(hand), hand, blockHit); + if (result.consumesAction()) { + player.swing(hand); + current.freeze = 3; + return true; + } + } + } + case ENTITY -> { + player.resetLastActionTime(); + var entityHit = (EntityHitResult) hit; + var entity = entityHit.getEntity(); + boolean handWasEmpty = player.getItemInHand(hand).isEmpty(); + boolean itemFrameEmpty = (entity instanceof ItemFrame) && ((ItemFrame) entity).getItem().isEmpty(); + var pos = entityHit.getLocation().subtract(entity.getX(), entity.getY(), entity.getZ()); + if (entity.interactAt(player, pos, hand).consumesAction()) { + current.freeze = 3; + return true; + } + if (player.interactOn(entity, hand).consumesAction() && !(handWasEmpty && itemFrameEmpty)) { + current.freeze = 3; + return true; + } + } + } + var handItem = player.getItemInHand(hand); + if (player.gameMode.useItem(player, player.level(), handItem, hand).consumesAction()) { + player.resetLastActionTime(); + current.freeze = 3; + return true; + } + } + return false; + } + + @Override + public void inactiveTick() { + } + + @Override + public void stop() { + current.freeze = 0; + player.releaseUsingItem(); + } + + private final static class Current { + + /** + * 冷却, 单位: tick + */ + public int freeze; + } +} diff --git a/fakeplayer-v1_21/src/main/java/io/github/hello09x/fakeplayer/v1_21/action/util/Tracer.java b/fakeplayer-v1_21/src/main/java/io/github/hello09x/fakeplayer/v1_21/action/util/Tracer.java new file mode 100644 index 0000000..abcae0f --- /dev/null +++ b/fakeplayer-v1_21/src/main/java/io/github/hello09x/fakeplayer/v1_21/action/util/Tracer.java @@ -0,0 +1,105 @@ +package io.github.hello09x.fakeplayer.v1_21.action.util; + +import net.minecraft.world.entity.Entity; +import net.minecraft.world.level.ClipContext; +import net.minecraft.world.phys.*; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import java.util.function.Predicate; + +/** + * copy from fabric carpet mod + */ +public class Tracer { + + public static @Nullable HitResult rayTrace( + @NotNull Entity source, + float partialTicks, + double reach, + boolean fluids + ) { + var blockHit = rayTraceBlocks(source, partialTicks, reach, fluids); + double maxSqDist = reach * reach; + if (blockHit != null) { + maxSqDist = blockHit.getLocation().distanceToSqr(source.getEyePosition(partialTicks)); + } + EntityHitResult entityHit = rayTraceEntities(source, partialTicks, reach, maxSqDist); + return entityHit == null ? blockHit : entityHit; + } + + @SuppressWarnings("resource") + public static @Nullable BlockHitResult rayTraceBlocks( + @NotNull Entity source, + float partialTicks, + double reach, + boolean fluids + ) { + var pos = source.getEyePosition(partialTicks); + var rotation = source.getViewVector(partialTicks); + var reachEnd = pos.add(rotation.x * reach, rotation.y * reach, rotation.z * reach); + return source.level().clip(new ClipContext(pos, reachEnd, ClipContext.Block.OUTLINE, fluids ? + ClipContext.Fluid.ANY : ClipContext.Fluid.NONE, source)); + } + + public static @Nullable EntityHitResult rayTraceEntities( + @NotNull Entity source, + float partialTicks, + double reach, + double maxSqDist + ) { + var pos = source.getEyePosition(partialTicks); + var reachVec = source.getViewVector(partialTicks).scale(reach); + var box = source.getBoundingBox().expandTowards(reachVec).inflate(1); + return rayTraceEntities(source, + pos, + pos.add(reachVec), + box, + e -> !e.isSpectator() && e.isPickable(), + maxSqDist); + } + + public static @Nullable EntityHitResult rayTraceEntities( + @NotNull Entity source, + @NotNull Vec3 start, + @NotNull Vec3 end, + @NotNull AABB box, + @NotNull Predicate predicate, + double maxSqDistance + ) { + @SuppressWarnings("resource") + var world = source.level(); + double targetDistance = maxSqDistance; + Entity target = null; + Vec3 targetHitPos = null; + for (Entity current : world.getEntities(source, box, predicate)) { + var currentBox = current.getBoundingBox().inflate(current.getPickRadius()); + var currentHit = currentBox.clip(start, end); + if (currentBox.contains(start)) { + if (targetDistance >= 0) { + target = current; + targetHitPos = currentHit.orElse(start); + targetDistance = 0; + } + } else if (currentHit.isPresent()) { + var currentHitPos = currentHit.get(); + var currentDistance = start.distanceToSqr(currentHitPos); + if (currentDistance < targetDistance || targetDistance == 0) { + if (current.getRootVehicle() == source.getRootVehicle()) { + if (targetDistance == 0) { + target = current; + targetHitPos = currentHitPos; + } + } + else + { + target = current; + targetHitPos = currentHitPos; + targetDistance = currentDistance; + } + } + } + } + return target == null ? null : new EntityHitResult(target, targetHitPos); + } +} diff --git a/fakeplayer-v1_21_R1/src/main/java/io/github/hello09x/fakeplayer/v1_21_R1/network/FakeConnection.java b/fakeplayer-v1_21/src/main/java/io/github/hello09x/fakeplayer/v1_21/network/FakeConnection.java similarity index 95% rename from fakeplayer-v1_21_R1/src/main/java/io/github/hello09x/fakeplayer/v1_21_R1/network/FakeConnection.java rename to fakeplayer-v1_21/src/main/java/io/github/hello09x/fakeplayer/v1_21/network/FakeConnection.java index bb274da..f181893 100644 --- a/fakeplayer-v1_21_R1/src/main/java/io/github/hello09x/fakeplayer/v1_21_R1/network/FakeConnection.java +++ b/fakeplayer-v1_21/src/main/java/io/github/hello09x/fakeplayer/v1_21/network/FakeConnection.java @@ -1,4 +1,4 @@ -package io.github.hello09x.fakeplayer.v1_21_R1.network; +package io.github.hello09x.fakeplayer.v1_21.network; import io.github.hello09x.fakeplayer.core.Main; import io.github.hello09x.fakeplayer.core.manager.FakeplayerManager; diff --git a/fakeplayer-v1_20_R3_R4/src/main/java/io/github/hello09x/fakeplayer/v1_20_R3_R4/network/FakePlayerAdvancements.java b/fakeplayer-v1_21/src/main/java/io/github/hello09x/fakeplayer/v1_21/network/FakePlayerAdvancements.java similarity index 96% rename from fakeplayer-v1_20_R3_R4/src/main/java/io/github/hello09x/fakeplayer/v1_20_R3_R4/network/FakePlayerAdvancements.java rename to fakeplayer-v1_21/src/main/java/io/github/hello09x/fakeplayer/v1_21/network/FakePlayerAdvancements.java index 9ed8c23..2613227 100644 --- a/fakeplayer-v1_20_R3_R4/src/main/java/io/github/hello09x/fakeplayer/v1_20_R3_R4/network/FakePlayerAdvancements.java +++ b/fakeplayer-v1_21/src/main/java/io/github/hello09x/fakeplayer/v1_21/network/FakePlayerAdvancements.java @@ -1,4 +1,4 @@ -package io.github.hello09x.fakeplayer.v1_20_R3_R4.network; +package io.github.hello09x.fakeplayer.v1_21.network; import com.mojang.datafixers.DataFixer; import net.minecraft.advancements.AdvancementHolder; diff --git a/fakeplayer-v1_21_R1/src/main/java/io/github/hello09x/fakeplayer/v1_21_R1/network/FakeServerGamePacketListenerImpl.java b/fakeplayer-v1_21/src/main/java/io/github/hello09x/fakeplayer/v1_21/network/FakeServerGamePacketListenerImpl.java similarity index 98% rename from fakeplayer-v1_21_R1/src/main/java/io/github/hello09x/fakeplayer/v1_21_R1/network/FakeServerGamePacketListenerImpl.java rename to fakeplayer-v1_21/src/main/java/io/github/hello09x/fakeplayer/v1_21/network/FakeServerGamePacketListenerImpl.java index 65ecf91..f28910a 100644 --- a/fakeplayer-v1_21_R1/src/main/java/io/github/hello09x/fakeplayer/v1_21_R1/network/FakeServerGamePacketListenerImpl.java +++ b/fakeplayer-v1_21/src/main/java/io/github/hello09x/fakeplayer/v1_21/network/FakeServerGamePacketListenerImpl.java @@ -1,4 +1,4 @@ -package io.github.hello09x.fakeplayer.v1_21_R1.network; +package io.github.hello09x.fakeplayer.v1_21.network; import io.github.hello09x.fakeplayer.api.spi.NMSServerGamePacketListener; import io.github.hello09x.fakeplayer.core.Main; diff --git a/fakeplayer-v1_21_R1/src/main/java/io/github/hello09x/fakeplayer/v1_21_R1/spi/ActionTickerImpl.java b/fakeplayer-v1_21/src/main/java/io/github/hello09x/fakeplayer/v1_21/spi/ActionTickerImpl.java similarity index 83% rename from fakeplayer-v1_21_R1/src/main/java/io/github/hello09x/fakeplayer/v1_21_R1/spi/ActionTickerImpl.java rename to fakeplayer-v1_21/src/main/java/io/github/hello09x/fakeplayer/v1_21/spi/ActionTickerImpl.java index 3f6733f..52fa351 100644 --- a/fakeplayer-v1_21_R1/src/main/java/io/github/hello09x/fakeplayer/v1_21_R1/spi/ActionTickerImpl.java +++ b/fakeplayer-v1_21/src/main/java/io/github/hello09x/fakeplayer/v1_21/spi/ActionTickerImpl.java @@ -1,4 +1,4 @@ -package io.github.hello09x.fakeplayer.v1_21_R1.spi; +package io.github.hello09x.fakeplayer.v1_21.spi; import io.github.hello09x.fakeplayer.api.spi.ActionSetting; @@ -6,9 +6,9 @@ import io.github.hello09x.fakeplayer.api.spi.ActionTicker; import io.github.hello09x.fakeplayer.api.spi.ActionType; import io.github.hello09x.fakeplayer.api.spi.NMSBridge; import io.github.hello09x.fakeplayer.core.entity.action.BaseActionTicker; -import io.github.hello09x.fakeplayer.v1_21_R1.action.AttackAction; -import io.github.hello09x.fakeplayer.v1_21_R1.action.MineAction; -import io.github.hello09x.fakeplayer.v1_21_R1.action.UseAction; +import io.github.hello09x.fakeplayer.v1_21.action.AttackAction; +import io.github.hello09x.fakeplayer.v1_21.action.MineAction; +import io.github.hello09x.fakeplayer.v1_21.action.UseAction; import org.bukkit.craftbukkit.v1_21_R1.entity.CraftPlayer; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; diff --git a/fakeplayer-v1_21_R1/src/main/java/io/github/hello09x/fakeplayer/v1_21_R1/spi/NMSBridgeImpl.java b/fakeplayer-v1_21/src/main/java/io/github/hello09x/fakeplayer/v1_21/spi/NMSBridgeImpl.java similarity index 96% rename from fakeplayer-v1_21_R1/src/main/java/io/github/hello09x/fakeplayer/v1_21_R1/spi/NMSBridgeImpl.java rename to fakeplayer-v1_21/src/main/java/io/github/hello09x/fakeplayer/v1_21/spi/NMSBridgeImpl.java index d0499c6..5e805f1 100644 --- a/fakeplayer-v1_21_R1/src/main/java/io/github/hello09x/fakeplayer/v1_21_R1/spi/NMSBridgeImpl.java +++ b/fakeplayer-v1_21/src/main/java/io/github/hello09x/fakeplayer/v1_21/spi/NMSBridgeImpl.java @@ -1,4 +1,4 @@ -package io.github.hello09x.fakeplayer.v1_21_R1.spi; +package io.github.hello09x.fakeplayer.v1_21.spi; import io.github.hello09x.fakeplayer.api.spi.*; import io.github.hello09x.fakeplayer.core.Main; diff --git a/fakeplayer-v1_21_R1/src/main/java/io/github/hello09x/fakeplayer/v1_21_R1/spi/NMSEntityImpl.java b/fakeplayer-v1_21/src/main/java/io/github/hello09x/fakeplayer/v1_21/spi/NMSEntityImpl.java similarity index 89% rename from fakeplayer-v1_21_R1/src/main/java/io/github/hello09x/fakeplayer/v1_21_R1/spi/NMSEntityImpl.java rename to fakeplayer-v1_21/src/main/java/io/github/hello09x/fakeplayer/v1_21/spi/NMSEntityImpl.java index 392f32d..e835d98 100644 --- a/fakeplayer-v1_21_R1/src/main/java/io/github/hello09x/fakeplayer/v1_21_R1/spi/NMSEntityImpl.java +++ b/fakeplayer-v1_21/src/main/java/io/github/hello09x/fakeplayer/v1_21/spi/NMSEntityImpl.java @@ -1,4 +1,4 @@ -package io.github.hello09x.fakeplayer.v1_21_R1.spi; +package io.github.hello09x.fakeplayer.v1_21.spi; import io.github.hello09x.fakeplayer.api.spi.NMSEntity; import lombok.Getter; diff --git a/fakeplayer-v1_21_R1/src/main/java/io/github/hello09x/fakeplayer/v1_21_R1/spi/NMSNetworkImpl.java b/fakeplayer-v1_21/src/main/java/io/github/hello09x/fakeplayer/v1_21/spi/NMSNetworkImpl.java similarity index 89% rename from fakeplayer-v1_21_R1/src/main/java/io/github/hello09x/fakeplayer/v1_21_R1/spi/NMSNetworkImpl.java rename to fakeplayer-v1_21/src/main/java/io/github/hello09x/fakeplayer/v1_21/spi/NMSNetworkImpl.java index 5e75c21..6d58542 100644 --- a/fakeplayer-v1_21_R1/src/main/java/io/github/hello09x/fakeplayer/v1_21_R1/spi/NMSNetworkImpl.java +++ b/fakeplayer-v1_21/src/main/java/io/github/hello09x/fakeplayer/v1_21/spi/NMSNetworkImpl.java @@ -1,9 +1,9 @@ -package io.github.hello09x.fakeplayer.v1_21_R1.spi; +package io.github.hello09x.fakeplayer.v1_21.spi; import io.github.hello09x.fakeplayer.api.spi.NMSNetwork; import io.github.hello09x.fakeplayer.api.spi.NMSServerGamePacketListener; -import io.github.hello09x.fakeplayer.v1_21_R1.network.FakeConnection; -import io.github.hello09x.fakeplayer.v1_21_R1.network.FakeServerGamePacketListenerImpl; +import io.github.hello09x.fakeplayer.v1_21.network.FakeConnection; +import io.github.hello09x.fakeplayer.v1_21.network.FakeServerGamePacketListenerImpl; import net.minecraft.server.network.CommonListenerCookie; import org.bukkit.Server; import org.bukkit.craftbukkit.v1_21_R1.CraftServer; diff --git a/fakeplayer-v1_21_R1/src/main/java/io/github/hello09x/fakeplayer/v1_21_R1/spi/NMSServerImpl.java b/fakeplayer-v1_21/src/main/java/io/github/hello09x/fakeplayer/v1_21/spi/NMSServerImpl.java similarity index 95% rename from fakeplayer-v1_21_R1/src/main/java/io/github/hello09x/fakeplayer/v1_21_R1/spi/NMSServerImpl.java rename to fakeplayer-v1_21/src/main/java/io/github/hello09x/fakeplayer/v1_21/spi/NMSServerImpl.java index c3a818e..e337a7a 100644 --- a/fakeplayer-v1_21_R1/src/main/java/io/github/hello09x/fakeplayer/v1_21_R1/spi/NMSServerImpl.java +++ b/fakeplayer-v1_21/src/main/java/io/github/hello09x/fakeplayer/v1_21/spi/NMSServerImpl.java @@ -1,4 +1,4 @@ -package io.github.hello09x.fakeplayer.v1_21_R1.spi; +package io.github.hello09x.fakeplayer.v1_21.spi; import com.mojang.authlib.GameProfile; import io.github.hello09x.devtools.core.utils.WorldUtils; diff --git a/fakeplayer-v1_21_R1/src/main/java/io/github/hello09x/fakeplayer/v1_21_R1/spi/NMSServerLevelImpl.java b/fakeplayer-v1_21/src/main/java/io/github/hello09x/fakeplayer/v1_21/spi/NMSServerLevelImpl.java similarity index 90% rename from fakeplayer-v1_21_R1/src/main/java/io/github/hello09x/fakeplayer/v1_21_R1/spi/NMSServerLevelImpl.java rename to fakeplayer-v1_21/src/main/java/io/github/hello09x/fakeplayer/v1_21/spi/NMSServerLevelImpl.java index 062d52b..848c334 100644 --- a/fakeplayer-v1_21_R1/src/main/java/io/github/hello09x/fakeplayer/v1_21_R1/spi/NMSServerLevelImpl.java +++ b/fakeplayer-v1_21/src/main/java/io/github/hello09x/fakeplayer/v1_21/spi/NMSServerLevelImpl.java @@ -1,4 +1,4 @@ -package io.github.hello09x.fakeplayer.v1_21_R1.spi; +package io.github.hello09x.fakeplayer.v1_21.spi; import io.github.hello09x.fakeplayer.api.spi.NMSServerLevel; import lombok.Getter; diff --git a/fakeplayer-v1_21_R1/src/main/java/io/github/hello09x/fakeplayer/v1_21_R1/spi/NMSServerPlayerImpl.java b/fakeplayer-v1_21/src/main/java/io/github/hello09x/fakeplayer/v1_21/spi/NMSServerPlayerImpl.java similarity index 97% rename from fakeplayer-v1_21_R1/src/main/java/io/github/hello09x/fakeplayer/v1_21_R1/spi/NMSServerPlayerImpl.java rename to fakeplayer-v1_21/src/main/java/io/github/hello09x/fakeplayer/v1_21/spi/NMSServerPlayerImpl.java index 5588f68..2d83ab3 100644 --- a/fakeplayer-v1_21_R1/src/main/java/io/github/hello09x/fakeplayer/v1_21_R1/spi/NMSServerPlayerImpl.java +++ b/fakeplayer-v1_21/src/main/java/io/github/hello09x/fakeplayer/v1_21/spi/NMSServerPlayerImpl.java @@ -1,9 +1,9 @@ -package io.github.hello09x.fakeplayer.v1_21_R1.spi; +package io.github.hello09x.fakeplayer.v1_21.spi; import io.github.hello09x.fakeplayer.api.spi.NMSServerPlayer; import io.github.hello09x.fakeplayer.core.constant.ConstantPool; import io.github.hello09x.fakeplayer.core.util.Reflections; -import io.github.hello09x.fakeplayer.v1_21_R1.network.FakePlayerAdvancements; +import io.github.hello09x.fakeplayer.v1_21.network.FakePlayerAdvancements; import lombok.Getter; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/fakeplayer-v1_21_1/pom.xml b/fakeplayer-v1_21_1/pom.xml new file mode 100644 index 0000000..2163625 --- /dev/null +++ b/fakeplayer-v1_21_1/pom.xml @@ -0,0 +1,107 @@ + + + 4.0.0 + + io.github.hello09x.fakeplayer + fakeplayer-parent + ${revision} + + + fakeplayer-v1_21_1 + + + 21 + 21 + UTF-8 + 1.21.1-R0.1-SNAPSHOT + + + + + + io.papermc.paper + paper-api + provided + + + + io.github.hello09x.fakeplayer + fakeplayer-core + provided + + + + io.github.hello09x.fakeplayer + fakeplayer-api + provided + + + + io.github.hello09x.fakeplayer + fakeplayer-v1_21 + ${revision} + provided + + + * + * + + + + + + org.spigotmc + spigot + ${nms.version} + remapped-mojang + provided + + + + + + + + net.md-5 + specialsource-maven-plugin + 2.0.3 + + + package + + remap + + remap-obf + + org.spigotmc:minecraft-server:${nms.version}:txt:maps-mojang + true + + org.spigotmc:spigot:${nms.version}:jar:remapped-mojang + + true + remapped-obf + + + + package + + remap + + remap-spigot + + + ${project.build.directory}/${project.artifactId}-${project.version}-remapped-obf.jar + + org.spigotmc:minecraft-server:${nms.version}:csrg:maps-spigot + org.spigotmc:spigot:${nms.version}:jar:remapped-obf + + + + + + + + + \ No newline at end of file diff --git a/fakeplayer-v1_21_1/src/main/java/io/github/hello09x/fakeplayer/v1_21_1/spi/NMSBridgeImpl.java b/fakeplayer-v1_21_1/src/main/java/io/github/hello09x/fakeplayer/v1_21_1/spi/NMSBridgeImpl.java new file mode 100644 index 0000000..1962b76 --- /dev/null +++ b/fakeplayer-v1_21_1/src/main/java/io/github/hello09x/fakeplayer/v1_21_1/spi/NMSBridgeImpl.java @@ -0,0 +1,55 @@ +package io.github.hello09x.fakeplayer.v1_21_1.spi; + +import io.github.hello09x.fakeplayer.api.spi.*; +import io.github.hello09x.fakeplayer.core.Main; +import io.github.hello09x.fakeplayer.v1_21.spi.*; +import org.bukkit.Bukkit; +import org.bukkit.Server; +import org.bukkit.World; +import org.bukkit.entity.Entity; +import org.bukkit.entity.Player; +import org.jetbrains.annotations.NotNull; + +import java.net.InetAddress; +import java.util.Set; + +public class NMSBridgeImpl implements NMSBridge { + + private final static Set SUPPORTS = Set.of("1.21.1"); + + @Override + public @NotNull NMSEntity fromEntity(@NotNull Entity entity) { + return new NMSEntityImpl(entity); + } + + @Override + public @NotNull NMSServer fromServer(@NotNull Server server) { + return new NMSServerImpl(server); + } + + @Override + public @NotNull NMSServerLevel fromWorld(@NotNull World world) { + return new NMSServerLevelImpl(world); + } + + @Override + public @NotNull NMSServerPlayer fromPlayer(@NotNull Player player) { + return new NMSServerPlayerImpl(player); + } + + @Override + public @NotNull NMSNetwork createNetwork(@NotNull InetAddress address) { + return new NMSNetworkImpl(address); + } + + @Override + public boolean isSupported() { + return SUPPORTS.contains(Bukkit.getMinecraftVersion()); + } + + @Override + public @NotNull ActionTicker createAction(@NotNull Player player, @NotNull ActionType action, @NotNull ActionSetting setting) { + return new ActionTickerImpl(Main.getInjector().getInstance(NMSBridge.class), player, action, setting); + } + +} diff --git a/fakeplayer-v1_21_R1/pom.xml b/fakeplayer-v1_21_R1/pom.xml deleted file mode 100644 index 4cca32e..0000000 --- a/fakeplayer-v1_21_R1/pom.xml +++ /dev/null @@ -1,125 +0,0 @@ - - - 4.0.0 - - io.github.hello09x.fakeplayer - fakeplayer-parent - ${revision} - - - fakeplayer-v1_21_R1 - - - 21 - 21 - UTF-8 - - 1.21-R0.1-SNAPSHOT - - - - - io.papermc.paper - paper-api - provided - - - - io.github.hello09x.fakeplayer - fakeplayer-core - provided - - - - io.github.hello09x.fakeplayer - fakeplayer-api - provided - - - - org.spigotmc - spigot - ${nms.version} - remapped-mojang - provided - - - - org.projectlombok - lombok - provided - - - - - - - - org.codehaus.mojo - flatten-maven-plugin - 1.6.0 - - true - resolveCiFriendliesOnly - - - - flatten - process-resources - - flatten - - - - flatten.clean - clean - - clean - - - - - - net.md-5 - specialsource-maven-plugin - 2.0.3 - - - package - - remap - - remap-obf - - org.spigotmc:minecraft-server:${nms.version}:txt:maps-mojang - true - - org.spigotmc:spigot:${nms.version}:jar:remapped-mojang - - true - remapped-obf - - - - package - - remap - - remap-spigot - - - ${project.build.directory}/${project.artifactId}-${project.version}-remapped-obf.jar - - org.spigotmc:minecraft-server:${nms.version}:csrg:maps-spigot - org.spigotmc:spigot:${nms.version}:jar:remapped-obf - - - - - - - - - \ No newline at end of file diff --git a/pom.xml b/pom.xml index e7ed476..791280b 100644 --- a/pom.xml +++ b/pom.xml @@ -14,17 +14,20 @@ fakeplayer-api fakeplayer-core fakeplayer-dist - fakeplayer-v1_20_R1 - fakeplayer-v1_20_R2 - fakeplayer-v1_20_R3_R4 - fakeplayer-v1_20_R5_R6 - fakeplayer-v1_21_R1 + fakeplayer-v1_20_1 + fakeplayer-v1_20_2 + fakeplayer-v1_20_3 + fakeplayer-v1_20_4 + fakeplayer-v1_20_6 + fakeplayer-v1_21 + fakeplayer-v1_21_1 + fakeplayer-v1_20_5 21 UTF-8 - 0.3.9-b.4 + 0.3.9-rc.1 0.1.4-SNAPSHOT