From 844ee1c268458abed854b64609ba4e95f7e4ac38 Mon Sep 17 00:00:00 2001 From: pugur Date: Tue, 28 Jan 2025 05:25:30 +0900 Subject: [PATCH 1/5] add 1.20.1 --- settings.gradle | 1 + settings.json | 3 +++ versions/fabric-1.20.1/gradle.properties | 21 +++++++++++++++++++++ versions/fabric-1.20.2/gradle.properties | 4 ++-- versions/forge-1.20.1/gradle.properties | 15 +++++++++++++++ versions/forge-1.20.2/gradle.properties | 4 ++-- versions/paper-1.20.1/gradle.properties | 12 ++++++++++++ versions/paper-1.20.2/gradle.properties | 2 +- 8 files changed, 57 insertions(+), 5 deletions(-) create mode 100644 versions/fabric-1.20.1/gradle.properties create mode 100644 versions/forge-1.20.1/gradle.properties create mode 100644 versions/paper-1.20.1/gradle.properties diff --git a/settings.gradle b/settings.gradle index 047bf7c..f12b3d2 100644 --- a/settings.gradle +++ b/settings.gradle @@ -30,6 +30,7 @@ stonecutter { mc("1.17.1", "fabric", "forge") mc("1.18.2", "fabric", "forge") mc("1.19.4", "fabric", "forge", "paper") + mc("1.20.1", "fabric", "forge", "paper") mc("1.20.2", "fabric", "forge", "paper") mc("1.20.4", "fabric", "forge", "paper") mc("1.20.6", "fabric", "forge", "neoforge", "paper") diff --git a/settings.json b/settings.json index 48e6e76..8f6458d 100644 --- a/settings.json +++ b/settings.json @@ -6,6 +6,7 @@ "fabric-1.17.1", "fabric-1.18.2", "fabric-1.19.4", + "fabric-1.20.1", "fabric-1.20.2", "fabric-1.20.4", "fabric-1.20.6", @@ -18,6 +19,7 @@ "forge-1.17.1", "forge-1.18.2", "forge-1.19.4", + "forge-1.20.1", "forge-1.20.2", "forge-1.20.4", "forge-1.20.6", @@ -29,6 +31,7 @@ "neoforge-1.21.4", "paper-1.19.4", + "paper-1.20.1", "paper-1.20.2", "paper-1.20.4", "paper-1.20.6", diff --git a/versions/fabric-1.20.1/gradle.properties b/versions/fabric-1.20.1/gradle.properties new file mode 100644 index 0000000..3b5c472 --- /dev/null +++ b/versions/fabric-1.20.1/gradle.properties @@ -0,0 +1,21 @@ +# Fabric Properties +# check these on https://fallen-breath.github.io/fabric-versions/?&version=1.20.1 +minecraft_version=1.20.1 +yarn_mappings=1.20.1+build.10 +platform=fabric +loom.platform=fabric + +# Mod Metadata +# https://fabricmc.net/versions.html +fabric_loader_version=0.16.5 +minecraft_dependency=>=1.20 <=1.20.1 + +# Build Information +# The target mc versions for the mod during mod publishing, separated with \n +game_versions=1.20\n1.20.1 + +# Dependencies +fabric_api_version=0.92.3+1.20.1 +modmenu_version=7.2.2 +malilib_version=0.16.3 +litematica_version=0.15.4 diff --git a/versions/fabric-1.20.2/gradle.properties b/versions/fabric-1.20.2/gradle.properties index 06b72da..021b5b1 100644 --- a/versions/fabric-1.20.2/gradle.properties +++ b/versions/fabric-1.20.2/gradle.properties @@ -8,11 +8,11 @@ loom.platform=fabric # Mod Metadata # https://fabricmc.net/versions.html fabric_loader_version=0.16.5 -minecraft_dependency=>=1.20 <=1.20.2 +minecraft_dependency=1.20.2 # Build Information # The target mc versions for the mod during mod publishing, separated with \n -game_versions=1.20\n1.20.1\n1.20.2 +game_versions=1.20.2 # Dependencies fabric_api_version=0.91.6+1.20.2 diff --git a/versions/forge-1.20.1/gradle.properties b/versions/forge-1.20.1/gradle.properties new file mode 100644 index 0000000..4dc4d7d --- /dev/null +++ b/versions/forge-1.20.1/gradle.properties @@ -0,0 +1,15 @@ +# Fabric Properties +# check these on https://fallen-breath.github.io/fabric-versions/?&version=1.20.1 +minecraft_version=1.20.1 +yarn_mappings=1.20.1+build.10 +platform=forge +loom.platform=forge + +# Mod Metadata +# https://files.minecraftforge.net/net/minecraftforge/forge/index_1.20.1.html +forge_version=47.3.0 +minecraft_dependency=[1.20, 1.20.1] + +# Build Information +# The target mc versions for the mod during mod publishing, separated with \n +game_versions=1.20\n1.20.1 diff --git a/versions/forge-1.20.2/gradle.properties b/versions/forge-1.20.2/gradle.properties index dd339dd..2351e48 100644 --- a/versions/forge-1.20.2/gradle.properties +++ b/versions/forge-1.20.2/gradle.properties @@ -8,8 +8,8 @@ loom.platform=forge # Mod Metadata # https://files.minecraftforge.net/net/minecraftforge/forge/index_1.20.2.html forge_version=48.1.0 -minecraft_dependency=[1.20, 1.20.2] +minecraft_dependency=1.20.2 # Build Information # The target mc versions for the mod during mod publishing, separated with \n -game_versions=1.20\n1.20.1\n1.20.2 +game_versions=1.20.2 diff --git a/versions/paper-1.20.1/gradle.properties b/versions/paper-1.20.1/gradle.properties new file mode 100644 index 0000000..4764775 --- /dev/null +++ b/versions/paper-1.20.1/gradle.properties @@ -0,0 +1,12 @@ +# Fabric Properties +# check these on https://fallen-breath.github.io/fabric-versions/?&version=1.20.1 +minecraft_version=1.20.1 +platform=paper + +# Mod Metadata +# https://docs.papermc.io/paper/dev/plugin-yml +minecraft_dependency=1.20.1 + +# Build Information +# The target mc versions for the mod during mod publishing, separated with \n +game_versions=1.20\n1.20.1 diff --git a/versions/paper-1.20.2/gradle.properties b/versions/paper-1.20.2/gradle.properties index 775d56b..44ffab7 100644 --- a/versions/paper-1.20.2/gradle.properties +++ b/versions/paper-1.20.2/gradle.properties @@ -9,4 +9,4 @@ minecraft_dependency=1.20.2 # Build Information # The target mc versions for the mod during mod publishing, separated with \n -game_versions=1.20\n1.20.1\n1.20.2 +game_versions=1.20.2 From f7b836d17ac271a01636634e42af480ec7f9cc2b Mon Sep 17 00:00:00 2001 From: pugur Date: Tue, 28 Jan 2025 05:31:54 +0900 Subject: [PATCH 2/5] Update readme --- README.md | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index b23a948..7b8f2d4 100644 --- a/README.md +++ b/README.md @@ -52,21 +52,22 @@ Just keep in mind that not everything may be implemented 😄 ## Versions -| Version | Client | |｜| Server | | | | -|------------------|------------|-----------|--|------------|-----------|--------------|-----------| -| | **Fabric** | **Forge** |｜| **Fabric** | **Forge** | **NeoForge** | **Paper** | -| 1.14 - 1.14.4 | ✅ | 🚫 |｜| ✅ | ✅ | 🚫 | 🚫 | -| 1.15 - 1.15.2 | ✅ | 🚫 |｜| ✅ | ✅ | 🚫 | 🚫 | -| 1.16 - 1.16.5 | ✅ | ✅[2]|｜| ✅ | ✅ | 🚫 | 🚫 | -| 1.17 - 1.17.1 | ✅ | 🚫 |｜| ✅ | ✅ | 🚫 | 🚫 | -| 1.18 - 1.18.2 | ✅ | 🚫 |｜| ✅ | ✅ | 🚫 | 🚫 | -| 1.19 - 1.19.4 | ✅ | 🚫 |｜| ✅ | ✅ | 🚫 | ⚠️[3]| -| 1.20 - 1.20.2 | ✅ | 🚫 |｜| ✅ | ✅ | 🚫 | ⚠️[3]| -| 1.20.3 - 1.20.4 | ✅ | 🚫 |｜| ✅ | ✅ | 🚫 | ⚠️[3]| -| 1.20.5 - 1.20.6 | ✅ | 🚫 |｜| ✅ | ✅ | ✅ | ⚠️[3]| -| 1.21 - 1.21.3 | ✅ | 🚫 |｜| ✅ | ✅ | ✅ | ⚠️[3]| -| 1.21.4 | ✅ | 🚫 |｜| ✅ | ✅ | ✅ | 🚫 | -||Fabric|Forge||Fabric|Forge|NeoForge|Paper| +| Version | Client | |｜| Server | | | | +|-----------------|------------|-----------|--|------------|-----------|--------------|-----------| +| | **Fabric** | **Forge** |｜| **Fabric** | **Forge** | **NeoForge** | **Paper** | +| 1.14 - 1.14.4 | ✅ | 🚫 |｜| ✅ | ✅ | 🚫 | 🚫 | +| 1.15 - 1.15.2 | ✅ | 🚫 |｜| ✅ | ✅ | 🚫 | 🚫 | +| 1.16 - 1.16.5 | ✅ | ✅[2]|｜| ✅ | ✅ | 🚫 | 🚫 | +| 1.17 - 1.17.1 | ✅ | 🚫 |｜| ✅ | ✅ | 🚫 | 🚫 | +| 1.18 - 1.18.2 | ✅ | 🚫 |｜| ✅ | ✅ | 🚫 | 🚫 | +| 1.19 - 1.19.4 | ✅ | 🚫 |｜| ✅ | ✅ | 🚫 | ⚠️[3]| +| 1.20 - 1.20.1 | ✅ | 🚫 |｜| ✅ | ✅ | 🚫 | ⚠️[3]| +| 1.20.2 | ✅ | 🚫 |｜| ✅ | ✅ | 🚫 | ⚠️[3]| +| 1.20.3 - 1.20.4 | ✅ | 🚫 |｜| ✅ | ✅ | 🚫 | ⚠️[3]| +| 1.20.5 - 1.20.6 | ✅ | 🚫 |｜| ✅ | ✅ | ✅ | ⚠️[3]| +| 1.21 - 1.21.3 | ✅ | 🚫 |｜| ✅ | ✅ | ✅ | ⚠️[3]| +| 1.21.4 | ✅ | 🚫 |｜| ✅ | ✅ | ✅ | 🚫 | +| |Fabric|Forge||Fabric|Forge|NeoForge|Paper| [2]: This is only compatible with builds published by Litematica
[3]: It launches, but cannot share the schematic. @@ -90,4 +91,4 @@ Just keep in mind that not everything may be implemented 😄 🇾 [yamlang](https://github.com/Fallen-Breath/yamlang) by Fallen-Breath
🇬 [Gson](https://github.com/google/gson) by google
-Last README Update `2025/1/14 18:45` UTC+9 +Last README Update `2025/1/28 5:31` UTC+9 From 491cf04b26cd306a1364f76ff597d914d5c0d085 Mon Sep 17 00:00:00 2001 From: topi-banana Date: Tue, 28 Jan 2025 21:37:35 +0900 Subject: [PATCH 3/5] fix compatibility 1.20.1 --- .../mixins/ClientCommonPacketListenerImplMixin.java | 2 +- .../kyoyu/mixins/ServerGamePacketListenerImplMixin.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/vulpeus/kyoyu/client/mixins/ClientCommonPacketListenerImplMixin.java b/src/main/java/com/vulpeus/kyoyu/client/mixins/ClientCommonPacketListenerImplMixin.java index a662bf7..4a3e23c 100644 --- a/src/main/java/com/vulpeus/kyoyu/client/mixins/ClientCommonPacketListenerImplMixin.java +++ b/src/main/java/com/vulpeus/kyoyu/client/mixins/ClientCommonPacketListenerImplMixin.java @@ -12,7 +12,7 @@ //? if >=1.20.2 import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -//? if <=1.19.4 { +//? if <=1.20.1 { /* import net.minecraft.network.protocol.game.ClientboundCustomPayloadPacket; */ //?} else { import net.minecraft.network.protocol.common.ClientboundCustomPayloadPacket; diff --git a/src/main/java/com/vulpeus/kyoyu/mixins/ServerGamePacketListenerImplMixin.java b/src/main/java/com/vulpeus/kyoyu/mixins/ServerGamePacketListenerImplMixin.java index 13fd563..c4fec9e 100644 --- a/src/main/java/com/vulpeus/kyoyu/mixins/ServerGamePacketListenerImplMixin.java +++ b/src/main/java/com/vulpeus/kyoyu/mixins/ServerGamePacketListenerImplMixin.java @@ -15,14 +15,14 @@ //? if >=1.20.2 import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -//? if <=1.19.4 { +//? if <=1.20.1 { /* import net.minecraft.network.protocol.game.ServerboundCustomPayloadPacket; */ //?} else { import net.minecraft.network.protocol.common.ServerboundCustomPayloadPacket; //?} -//? if <=1.19.4 { +//? if <=1.20.1 { /* import net.minecraft.resources.ResourceLocation; import net.minecraft.network.FriendlyByteBuf; @@ -37,7 +37,7 @@ //?} ) public class ServerGamePacketListenerImplMixin { - //? if >1.19.4 { + //? if >1.20.1 { @Shadow protected GameProfile playerProfile() { return null; } //?} else { /* @Shadow net.minecraft.server.level.ServerPlayer player; */ @@ -45,7 +45,7 @@ public class ServerGamePacketListenerImplMixin { @Unique private CompatibleUtils.KyoyuPlayer getPlayer() { - //? if >1.19.4 { + //? if >1.20.1 { return Kyoyu.PLAYERS.getServerPlayer(playerProfile().getId()); //?} else { /* return new CompatibleUtils.KyoyuPlayer(player); */ From e69d0808ea6d9dad239d1c1e9aa01026d3079f38 Mon Sep 17 00:00:00 2001 From: HU_JA_JA <107774991+hu-ja-ja@users.noreply.github.com> Date: Tue, 28 Jan 2025 22:26:42 +0900 Subject: [PATCH 4/5] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7b8f2d4..755049e 100644 --- a/README.md +++ b/README.md @@ -91,4 +91,4 @@ Just keep in mind that not everything may be implemented 😄 🇾 [yamlang](https://github.com/Fallen-Breath/yamlang) by Fallen-Breath
🇬 [Gson](https://github.com/google/gson) by google
-Last README Update `2025/1/28 5:31` UTC+9 +Last README Update `2025/1/28 05:31` UTC+9 From db28b0dffb03236a0eeebedaa01ce3b4019cdd0e Mon Sep 17 00:00:00 2001 From: HU_JA_JA <107774991+hu-ja-ja@users.noreply.github.com> Date: Tue, 28 Jan 2025 22:36:42 +0900 Subject: [PATCH 5/5] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 755049e..23756a9 100644 --- a/README.md +++ b/README.md @@ -67,7 +67,7 @@ Just keep in mind that not everything may be implemented 😄 | 1.20.5 - 1.20.6 | ✅ | 🚫 |｜| ✅ | ✅ | ✅ | ⚠️[3]| | 1.21 - 1.21.3 | ✅ | 🚫 |｜| ✅ | ✅ | ✅ | ⚠️[3]| | 1.21.4 | ✅ | 🚫 |｜| ✅ | ✅ | ✅ | 🚫 | -| |Fabric|Forge||Fabric|Forge|NeoForge|Paper| +||Fabric|Forge||Fabric|Forge|NeoForge|Paper| [2]: This is only compatible with builds published by Litematica
[3]: It launches, but cannot share the schematic.