From cf2099980cc3293c14565677a166353be615861c Mon Sep 17 00:00:00 2001 From: Rapha149 <49787110+Rapha149@users.noreply.github.com> Date: Tue, 20 Aug 2024 15:06:11 +0200 Subject: [PATCH] Add support for 1.21.1 (#21) --- 1_10_R1/pom.xml | 2 +- 1_11_R1/pom.xml | 2 +- 1_12_R1/pom.xml | 2 +- 1_13_R1/pom.xml | 2 +- 1_13_R2/pom.xml | 2 +- 1_14_R1/pom.xml | 2 +- 1_15_R1/pom.xml | 2 +- 1_16_R1/pom.xml | 2 +- 1_16_R2/pom.xml | 2 +- 1_16_R3/pom.xml | 2 +- 1_17_R1/pom.xml | 2 +- 1_18_R1/pom.xml | 2 +- 1_18_R2/pom.xml | 2 +- 1_19_R1/pom.xml | 2 +- 1_19_R2/pom.xml | 2 +- 1_19_R3/pom.xml | 2 +- 1_20_R1/pom.xml | 2 +- 1_20_R2/pom.xml | 2 +- 1_20_R3/pom.xml | 2 +- 1_20_R4/pom.xml | 2 +- 1_21_R1/pom.xml | 4 ++-- .../main/java/de/rapha149/signgui/version/Wrapper1_21_R1.java | 3 ++- 1_8_R1/pom.xml | 2 +- 1_8_R2/pom.xml | 2 +- 1_8_R3/pom.xml | 2 +- 1_9_R1/pom.xml | 2 +- 1_9_R2/pom.xml | 2 +- Mojang1_20_R4/pom.xml | 2 +- Mojang1_21_R1/pom.xml | 4 ++-- .../de/rapha149/signgui/version/MojangWrapper1_21_R1.java | 3 ++- README.md | 2 +- api/pom.xml | 2 +- pom.xml | 2 +- wrapper/pom.xml | 2 +- 34 files changed, 38 insertions(+), 36 deletions(-) diff --git a/1_10_R1/pom.xml b/1_10_R1/pom.xml index 2a62050..fb0422e 100644 --- a/1_10_R1/pom.xml +++ b/1_10_R1/pom.xml @@ -5,7 +5,7 @@ signgui-parent de.rapha149.signgui - 2.4.0 + 2.4.1 4.0.0 diff --git a/1_11_R1/pom.xml b/1_11_R1/pom.xml index 194467f..d5f97e3 100644 --- a/1_11_R1/pom.xml +++ b/1_11_R1/pom.xml @@ -5,7 +5,7 @@ signgui-parent de.rapha149.signgui - 2.4.0 + 2.4.1 4.0.0 diff --git a/1_12_R1/pom.xml b/1_12_R1/pom.xml index ef748d6..c72e3d1 100644 --- a/1_12_R1/pom.xml +++ b/1_12_R1/pom.xml @@ -5,7 +5,7 @@ signgui-parent de.rapha149.signgui - 2.4.0 + 2.4.1 4.0.0 diff --git a/1_13_R1/pom.xml b/1_13_R1/pom.xml index 244b182..cabcc27 100644 --- a/1_13_R1/pom.xml +++ b/1_13_R1/pom.xml @@ -5,7 +5,7 @@ signgui-parent de.rapha149.signgui - 2.4.0 + 2.4.1 4.0.0 diff --git a/1_13_R2/pom.xml b/1_13_R2/pom.xml index 150b41d..5734134 100644 --- a/1_13_R2/pom.xml +++ b/1_13_R2/pom.xml @@ -5,7 +5,7 @@ signgui-parent de.rapha149.signgui - 2.4.0 + 2.4.1 4.0.0 diff --git a/1_14_R1/pom.xml b/1_14_R1/pom.xml index d62c4f4..9cfdc57 100644 --- a/1_14_R1/pom.xml +++ b/1_14_R1/pom.xml @@ -5,7 +5,7 @@ signgui-parent de.rapha149.signgui - 2.4.0 + 2.4.1 4.0.0 diff --git a/1_15_R1/pom.xml b/1_15_R1/pom.xml index e3e942a..f633015 100644 --- a/1_15_R1/pom.xml +++ b/1_15_R1/pom.xml @@ -5,7 +5,7 @@ signgui-parent de.rapha149.signgui - 2.4.0 + 2.4.1 4.0.0 diff --git a/1_16_R1/pom.xml b/1_16_R1/pom.xml index 54a16ea..93e32d8 100644 --- a/1_16_R1/pom.xml +++ b/1_16_R1/pom.xml @@ -5,7 +5,7 @@ signgui-parent de.rapha149.signgui - 2.4.0 + 2.4.1 4.0.0 diff --git a/1_16_R2/pom.xml b/1_16_R2/pom.xml index 2019053..3c2083f 100644 --- a/1_16_R2/pom.xml +++ b/1_16_R2/pom.xml @@ -5,7 +5,7 @@ signgui-parent de.rapha149.signgui - 2.4.0 + 2.4.1 4.0.0 diff --git a/1_16_R3/pom.xml b/1_16_R3/pom.xml index a15de60..42df25e 100644 --- a/1_16_R3/pom.xml +++ b/1_16_R3/pom.xml @@ -5,7 +5,7 @@ signgui-parent de.rapha149.signgui - 2.4.0 + 2.4.1 4.0.0 diff --git a/1_17_R1/pom.xml b/1_17_R1/pom.xml index 634254e..f915f19 100644 --- a/1_17_R1/pom.xml +++ b/1_17_R1/pom.xml @@ -5,7 +5,7 @@ signgui-parent de.rapha149.signgui - 2.4.0 + 2.4.1 4.0.0 diff --git a/1_18_R1/pom.xml b/1_18_R1/pom.xml index 2602e13..d8b0ef1 100644 --- a/1_18_R1/pom.xml +++ b/1_18_R1/pom.xml @@ -5,7 +5,7 @@ signgui-parent de.rapha149.signgui - 2.4.0 + 2.4.1 4.0.0 diff --git a/1_18_R2/pom.xml b/1_18_R2/pom.xml index 1f03156..830bc34 100644 --- a/1_18_R2/pom.xml +++ b/1_18_R2/pom.xml @@ -5,7 +5,7 @@ signgui-parent de.rapha149.signgui - 2.4.0 + 2.4.1 4.0.0 diff --git a/1_19_R1/pom.xml b/1_19_R1/pom.xml index d72479e..87350ee 100644 --- a/1_19_R1/pom.xml +++ b/1_19_R1/pom.xml @@ -5,7 +5,7 @@ signgui-parent de.rapha149.signgui - 2.4.0 + 2.4.1 4.0.0 diff --git a/1_19_R2/pom.xml b/1_19_R2/pom.xml index c2733b3..5f0bb86 100644 --- a/1_19_R2/pom.xml +++ b/1_19_R2/pom.xml @@ -5,7 +5,7 @@ signgui-parent de.rapha149.signgui - 2.4.0 + 2.4.1 4.0.0 diff --git a/1_19_R3/pom.xml b/1_19_R3/pom.xml index 3819138..faca734 100644 --- a/1_19_R3/pom.xml +++ b/1_19_R3/pom.xml @@ -5,7 +5,7 @@ signgui-parent de.rapha149.signgui - 2.4.0 + 2.4.1 4.0.0 diff --git a/1_20_R1/pom.xml b/1_20_R1/pom.xml index 29a151c..2919f00 100644 --- a/1_20_R1/pom.xml +++ b/1_20_R1/pom.xml @@ -5,7 +5,7 @@ signgui-parent de.rapha149.signgui - 2.4.0 + 2.4.1 4.0.0 diff --git a/1_20_R2/pom.xml b/1_20_R2/pom.xml index 7d7db47..afaa7fa 100644 --- a/1_20_R2/pom.xml +++ b/1_20_R2/pom.xml @@ -5,7 +5,7 @@ signgui-parent de.rapha149.signgui - 2.4.0 + 2.4.1 4.0.0 diff --git a/1_20_R3/pom.xml b/1_20_R3/pom.xml index 0e2f891..afb9436 100644 --- a/1_20_R3/pom.xml +++ b/1_20_R3/pom.xml @@ -5,7 +5,7 @@ signgui-parent de.rapha149.signgui - 2.4.0 + 2.4.1 4.0.0 diff --git a/1_20_R4/pom.xml b/1_20_R4/pom.xml index 36bffdf..0b7ed25 100644 --- a/1_20_R4/pom.xml +++ b/1_20_R4/pom.xml @@ -5,7 +5,7 @@ signgui-parent de.rapha149.signgui - 2.4.0 + 2.4.1 4.0.0 diff --git a/1_21_R1/pom.xml b/1_21_R1/pom.xml index 01babda..c1de3c2 100644 --- a/1_21_R1/pom.xml +++ b/1_21_R1/pom.xml @@ -5,7 +5,7 @@ signgui-parent de.rapha149.signgui - 2.4.0 + 2.4.1 4.0.0 @@ -19,7 +19,7 @@ org.spigotmc spigot - 1.21-R0.1-SNAPSHOT + 1.21.1-R0.1-SNAPSHOT provided diff --git a/1_21_R1/src/main/java/de/rapha149/signgui/version/Wrapper1_21_R1.java b/1_21_R1/src/main/java/de/rapha149/signgui/version/Wrapper1_21_R1.java index 9f3c51c..cee8cca 100644 --- a/1_21_R1/src/main/java/de/rapha149/signgui/version/Wrapper1_21_R1.java +++ b/1_21_R1/src/main/java/de/rapha149/signgui/version/Wrapper1_21_R1.java @@ -16,6 +16,7 @@ import net.minecraft.server.network.ServerCommonPacketListenerImpl; import net.minecraft.world.item.EnumColor; import net.minecraft.world.level.World; +import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.entity.SignText; import net.minecraft.world.level.block.entity.TileEntitySign; import org.bukkit.DyeColor; @@ -76,7 +77,7 @@ public void openSignEditor(Player player, String[] lines, Object[] adventureLine Location loc = signLoc != null ? signLoc : getDefaultLocation(player); BlockPosition pos = new BlockPosition(loc.getBlockX(), loc.getBlockY(), loc.getBlockZ()); - TileEntitySign sign = new TileEntitySign(pos, null); + TileEntitySign sign = new TileEntitySign(pos, Blocks.cE.o()); SignText signText = sign.a(true) // flag = front/back of sign .a(EnumColor.valueOf(color.toString())) .a(glow); diff --git a/1_8_R1/pom.xml b/1_8_R1/pom.xml index 0383afc..08bee22 100644 --- a/1_8_R1/pom.xml +++ b/1_8_R1/pom.xml @@ -5,7 +5,7 @@ signgui-parent de.rapha149.signgui - 2.4.0 + 2.4.1 4.0.0 diff --git a/1_8_R2/pom.xml b/1_8_R2/pom.xml index 8a9dd08..7c436bd 100644 --- a/1_8_R2/pom.xml +++ b/1_8_R2/pom.xml @@ -5,7 +5,7 @@ signgui-parent de.rapha149.signgui - 2.4.0 + 2.4.1 4.0.0 diff --git a/1_8_R3/pom.xml b/1_8_R3/pom.xml index d3c6d4e..421237a 100644 --- a/1_8_R3/pom.xml +++ b/1_8_R3/pom.xml @@ -5,7 +5,7 @@ signgui-parent de.rapha149.signgui - 2.4.0 + 2.4.1 4.0.0 diff --git a/1_9_R1/pom.xml b/1_9_R1/pom.xml index 88dfbcd..3773727 100644 --- a/1_9_R1/pom.xml +++ b/1_9_R1/pom.xml @@ -5,7 +5,7 @@ signgui-parent de.rapha149.signgui - 2.4.0 + 2.4.1 4.0.0 diff --git a/1_9_R2/pom.xml b/1_9_R2/pom.xml index ad3ef9a..345a19d 100644 --- a/1_9_R2/pom.xml +++ b/1_9_R2/pom.xml @@ -5,7 +5,7 @@ signgui-parent de.rapha149.signgui - 2.4.0 + 2.4.1 4.0.0 diff --git a/Mojang1_20_R4/pom.xml b/Mojang1_20_R4/pom.xml index 3503035..fcafee6 100644 --- a/Mojang1_20_R4/pom.xml +++ b/Mojang1_20_R4/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> signgui-parent - 2.4.0 + 2.4.1 de.rapha149.signgui 4.0.0 diff --git a/Mojang1_21_R1/pom.xml b/Mojang1_21_R1/pom.xml index 1f3cd50..ba0b2f2 100644 --- a/Mojang1_21_R1/pom.xml +++ b/Mojang1_21_R1/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> signgui-parent - 2.4.0 + 2.4.1 de.rapha149.signgui 4.0.0 @@ -20,7 +20,7 @@ ca.bkaw paper-nms - 1.21-SNAPSHOT + 1.21.1-SNAPSHOT provided diff --git a/Mojang1_21_R1/src/main/java/de/rapha149/signgui/version/MojangWrapper1_21_R1.java b/Mojang1_21_R1/src/main/java/de/rapha149/signgui/version/MojangWrapper1_21_R1.java index 9cbff0a..0f2ba21 100644 --- a/Mojang1_21_R1/src/main/java/de/rapha149/signgui/version/MojangWrapper1_21_R1.java +++ b/Mojang1_21_R1/src/main/java/de/rapha149/signgui/version/MojangWrapper1_21_R1.java @@ -14,6 +14,7 @@ import net.minecraft.network.protocol.game.ServerboundSignUpdatePacket; import net.minecraft.server.level.ServerPlayer; import net.minecraft.server.network.ServerGamePacketListenerImpl; +import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.entity.SignBlockEntity; import net.minecraft.world.level.block.entity.SignText; import org.bukkit.DyeColor; @@ -70,7 +71,7 @@ public void openSignEditor(Player player, String[] textLines, Object[] adventure Location loc = signLoc != null ? signLoc : getDefaultLocation(player); BlockPos pos = new BlockPos(loc.getBlockX(), loc.getBlockY(), loc.getBlockZ()); - SignBlockEntity sign = new SignBlockEntity(pos, null); + SignBlockEntity sign = new SignBlockEntity(pos, Blocks.OAK_SIGN.defaultBlockState()); SignText signText = sign.getText(true) // flag = front/back of sign .setColor(net.minecraft.world.item.DyeColor.valueOf(color.toString())) .setHasGlowingText(glow); diff --git a/README.md b/README.md index 3ba90fe..40c2887 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ Maven dependency: de.rapha149.signgui signgui - 2.4.0 + 2.4.1 ``` diff --git a/api/pom.xml b/api/pom.xml index 639a2f2..d8f7d9e 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -6,7 +6,7 @@ signgui-parent - 2.4.0 + 2.4.1 de.rapha149.signgui diff --git a/pom.xml b/pom.xml index 44e49c3..f6c996b 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ de.rapha149.signgui signgui-parent pom - 2.4.0 + 2.4.1 api diff --git a/wrapper/pom.xml b/wrapper/pom.xml index 4d375b3..a995ac9 100644 --- a/wrapper/pom.xml +++ b/wrapper/pom.xml @@ -7,7 +7,7 @@ signgui-parent de.rapha149.signgui - 2.4.0 + 2.4.1 signgui-wrapper