Skip to content

Commit

Permalink
Merge pull request #13 from pugur523/main
Browse files Browse the repository at this point in the history
Fix #12
  • Loading branch information
hu-ja-ja authored Jan 28, 2025
2 parents 7c0c7c1 + db28b0d commit d6a95c8
Show file tree
Hide file tree
Showing 11 changed files with 78 additions and 25 deletions.
31 changes: 16 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,20 +52,21 @@ 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 || ✅<a><sup>[2]</sup></a>|||| 🚫 | 🚫 |
| 1.17 - 1.17.1 || 🚫 |||| 🚫 | 🚫 |
| 1.18 - 1.18.2 || 🚫 |||| 🚫 | 🚫 |
| 1.19 - 1.19.4 || 🚫 |||| 🚫 | ⚠️<a><sup>[3]</sup></a>|
| 1.20 - 1.20.2 || 🚫 |||| 🚫 | ⚠️<a><sup>[3]</sup></a>|
| 1.20.3 - 1.20.4 || 🚫 |||| 🚫 | ⚠️<a><sup>[3]</sup></a>|
| 1.20.5 - 1.20.6 || 🚫 ||||| ⚠️<a><sup>[3]</sup></a>|
| 1.21 - 1.21.3 || 🚫 ||||| ⚠️<a><sup>[3]</sup></a>|
| 1.21.4 || 🚫 ||||| 🚫 |
| Version | Client | || Server | | | |
|-----------------|------------|-----------|--|------------|-----------|--------------|-----------|
| | **Fabric** | **Forge** || **Fabric** | **Forge** | **NeoForge** | **Paper** |
| 1.14 - 1.14.4 || 🚫 |||| 🚫 | 🚫 |
| 1.15 - 1.15.2 || 🚫 |||| 🚫 | 🚫 |
| 1.16 - 1.16.5 || ✅<a><sup>[2]</sup></a>|||| 🚫 | 🚫 |
| 1.17 - 1.17.1 || 🚫 |||| 🚫 | 🚫 |
| 1.18 - 1.18.2 || 🚫 |||| 🚫 | 🚫 |
| 1.19 - 1.19.4 || 🚫 |||| 🚫 | ⚠️<a><sup>[3]</sup></a>|
| 1.20 - 1.20.1 || 🚫 |||| 🚫 | ⚠️<a><sup>[3]</sup></a>|
| 1.20.2 || 🚫 |||| 🚫 | ⚠️<a><sup>[3]</sup></a>|
| 1.20.3 - 1.20.4 || 🚫 |||| 🚫 | ⚠️<a><sup>[3]</sup></a>|
| 1.20.5 - 1.20.6 || 🚫 ||||| ⚠️<a><sup>[3]</sup></a>|
| 1.21 - 1.21.3 || 🚫 ||||| ⚠️<a><sup>[3]</sup></a>|
| 1.21.4 || 🚫 ||||| 🚫 |
||<a href="https://fabricmc.net/" target="_blank"><img src="https://raw.githubusercontent.com/FabricMC/fabric/refs/heads/1.21.4/src/main/resources/assets/fabric/icon.png" width="18px" alt="Fabric"></a>|<a href="https://files.minecraftforge.net/net/minecraftforge/forge/" target="_blank"><img src="https://raw.githubusercontent.com/MinecraftForge/MinecraftForge/refs/heads/1.21.x/icon.ico" width="18px" alt="Forge"></a>||<a href="https://fabricmc.net/" target="_blank"><img src="https://raw.githubusercontent.com/FabricMC/fabric/refs/heads/1.21.4/src/main/resources/assets/fabric/icon.png" width="18px" alt="Fabric"></a>|<a href="https://files.minecraftforge.net/net/minecraftforge/forge/" target="_blank"><img src="https://raw.githubusercontent.com/MinecraftForge/MinecraftForge/refs/heads/1.21.x/icon.ico" width="18px" alt="Forge"></a>|<a href="https://neoforged.net/" target="_blank"><img src="https://raw.githubusercontent.com/neoforged/NeoForge/ac7a3bc021d604509763dd8d310aefc8fc4a4039/.idea/icon.svg" width="18px" alt="NeoForge"></a>|<a href="https://papermc.io/software/paper" target="_blank"><img src="https://forums.papermc.io/data/assets/logo/paperlogo512.png" width="18px" alt="Paper"></a>|

<a>[2]</a>: This is only compatible with <a href="https://modrinth.com/mod/litematica/versions?g=1.16.5&l=forge" target="_blank">builds published by Litematica</a><br>
Expand All @@ -90,4 +91,4 @@ Just keep in mind that not everything may be implemented 😄
🇾 [yamlang](https://github.com/Fallen-Breath/yamlang) by Fallen-Breath <br>
🇬 [Gson](https://github.com/google/gson) by google<br>

<small>Last README Update `2025/1/14 18:45` UTC+9
<small>Last README Update `2025/1/28 05:31` UTC+9
1 change: 1 addition & 0 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
3 changes: 3 additions & 0 deletions settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -37,15 +37,15 @@
//?}
)
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; */
//?}

@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); */
Expand Down
21 changes: 21 additions & 0 deletions versions/fabric-1.20.1/gradle.properties
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions versions/fabric-1.20.2/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
15 changes: 15 additions & 0 deletions versions/forge-1.20.1/gradle.properties
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions versions/forge-1.20.2/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
12 changes: 12 additions & 0 deletions versions/paper-1.20.1/gradle.properties
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion versions/paper-1.20.2/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit d6a95c8

Please sign in to comment.