diff --git a/commit.sha b/commit.sha index a5ca09f..3895a0f 100644 --- a/commit.sha +++ b/commit.sha @@ -1 +1 @@ -8bb17f3c4c5f95ff348437d622e37c547148528d \ No newline at end of file +a4a51b7cd8f85610b9a47d5b575de7e777e88376 \ No newline at end of file diff --git a/patches/1.18.2/.jenkins/Jenkinsfile.snapshot.patch b/patches/1.18.2/.jenkins/Jenkinsfile.snapshot.patch index 52b31c0..4249c1b 100644 --- a/patches/1.18.2/.jenkins/Jenkinsfile.snapshot.patch +++ b/patches/1.18.2/.jenkins/Jenkinsfile.snapshot.patch @@ -6,7 +6,7 @@ -def JDK = "21"; -def majorMc = "1.21.6"; -def modLoaders = "neoforge|fabric|quilt|paper"; --def supportedMc = "25w17a"; +-def supportedMc = "25w19a"; -def reltype = "experimental"; +def JDK = "17"; +def majorMc = "1.18.2"; diff --git a/patches/1.18.2/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch b/patches/1.18.2/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch index d0babae..e21a632 100644 --- a/patches/1.18.2/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch +++ b/patches/1.18.2/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch @@ -1,14 +1,18 @@ --- a/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java +++ b/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java -@@ -1,7 +1,5 @@ +@@ -1,11 +1,6 @@ package com.hypherionmc.craterlib.utils; +-import com.google.gson.JsonElement; +-import com.google.gson.JsonParseException; -import com.hypherionmc.craterlib.core.platform.CommonPlatform; -import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment; import com.hypherionmc.craterlib.nojang.resources.ResourceIdentifier; +-import com.mojang.serialization.JsonOps; import lombok.Getter; import me.hypherionmc.mcdiscordformatter.discord.DiscordSerializer; -@@ -13,55 +11,40 @@ + import me.hypherionmc.mcdiscordformatter.minecraft.MinecraftSerializer; +@@ -16,65 +11,40 @@ import net.minecraft.ChatFormatting; import net.minecraft.SharedConstants; import net.minecraft.Util; @@ -18,7 +22,9 @@ -import net.minecraft.core.HolderLookup; -import net.minecraft.core.RegistryAccess; import net.minecraft.network.chat.Component; +-import net.minecraft.network.chat.ComponentSerialization; import net.minecraft.network.chat.Style; +-import net.minecraft.util.StrictJsonParser; +import net.minecraft.network.chat.TextComponent; +import net.minecraft.network.chat.TranslatableComponent; @@ -33,16 +39,26 @@ private static final MiniMessage miniMessage = MiniMessage.miniMessage(); public static Component adventureToMojang(net.kyori.adventure.text.Component inComponent) { - final String serialised = adventureSerializer.serialize(inComponent); -- return Component.Serializer.fromJson(serialised, getRegistryLookup()); +- final JsonElement serialised = adventureSerializer.serializeToTree(inComponent); +- +- // FUCK YOU MOJANG. SERIOUSLY. FUCK OFF WITH THIS SHIT +- return ComponentSerialization.CODEC +- .parse(getRegistryLookup().createSerializationContext(JsonOps.INSTANCE), serialised) +- .getOrThrow(JsonParseException::new); ++ final String serialised = adventureSerializer.serialize(inComponent); + return Component.Serializer.fromJson(serialised); } public static net.kyori.adventure.text.Component mojangToAdventure(Component inComponent) { try { -- final String serialised = Component.Serializer.toJson(inComponent, getRegistryLookup()); +- // FUCK YOU MOJANG. SERIOUSLY. FUCK OFF WITH THIS SHIT +- final JsonElement serialised = ComponentSerialization.CODEC +- .encodeStart(JsonOps.INSTANCE, inComponent) +- .getOrThrow(JsonParseException::new); +- +- return adventureSerializer.deserializeFromTree(serialised); + final String serialised = Component.Serializer.toJson(inComponent); - return adventureSerializer.deserialize(serialised); ++ return adventureSerializer.deserialize(serialised); } catch (Exception e) { return net.kyori.adventure.text.Component.text(inComponent.getString()); } @@ -70,7 +86,7 @@ } public static String strip(String inString, String... toStrip) { -@@ -90,7 +73,7 @@ +@@ -103,7 +73,7 @@ } public static net.kyori.adventure.text.Component resolve(String component, boolean formatted) { @@ -79,7 +95,7 @@ if (formatted) { returnVal = MinecraftSerializer.INSTANCE.serialize(component); } -@@ -118,7 +101,7 @@ +@@ -131,7 +101,7 @@ if (identifier == null) return net.kyori.adventure.text.Component.text("Unknown"); diff --git a/patches/1.18.2/Fabric/src/main/java/com/hypherionmc/craterlib/network/CraterFabricNetworkHandler.java.patch b/patches/1.18.2/Fabric/src/main/java/com/hypherionmc/craterlib/network/CraterFabricNetworkHandler.java.patch index 32e58e0..0b037c7 100644 --- a/patches/1.18.2/Fabric/src/main/java/com/hypherionmc/craterlib/network/CraterFabricNetworkHandler.java.patch +++ b/patches/1.18.2/Fabric/src/main/java/com/hypherionmc/craterlib/network/CraterFabricNetworkHandler.java.patch @@ -52,7 +52,7 @@ - } - - ServerPlayNetworking.registerGlobalReceiver(holder.getType(), -- (ServerPlayNetworking.PlayPayloadHandler>) (payload, context) -> context.player().server.execute(() -> +- (ServerPlayNetworking.PlayPayloadHandler>) (payload, context) -> context.player().getServer().execute(() -> - holder.handler().accept( - new PacketContext<>(BridgedPlayer.of(context.player()), payload.packet(), side)))); + if (CHANNELS.get(holder.messageType()) == null) { diff --git a/patches/1.18.2/NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeCompatHelper.java.patch b/patches/1.18.2/NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeCompatHelper.java.patch index 7eb98b8..9489b73 100644 --- a/patches/1.18.2/NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeCompatHelper.java.patch +++ b/patches/1.18.2/NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeCompatHelper.java.patch @@ -1,11 +1,12 @@ --- a/NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeCompatHelper.java +++ /dev/null -@@ -1,60 +1,0 @@ +@@ -1,61 +1,0 @@ -package com.hypherionmc.craterlib.common; - -import com.hypherionmc.craterlib.core.platform.CompatUtils; -import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment; -import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer; +-import net.kyori.adventure.text.Component; -import redstonedubstep.mods.vanishmod.VanishUtil; -import team.creative.playerrevive.api.IBleeding; -import team.creative.playerrevive.server.PlayerReviveServer; diff --git a/patches/1.18.2/Paper/build.gradle.patch b/patches/1.18.2/Paper/build.gradle.patch index 554ddc0..aed483c 100644 --- a/patches/1.18.2/Paper/build.gradle.patch +++ b/patches/1.18.2/Paper/build.gradle.patch @@ -2,7 +2,7 @@ +++ /dev/null @@ -1,78 +1,0 @@ -plugins { -- id "io.papermc.paperweight.userdev" version "1.7.3" +- id "io.papermc.paperweight.userdev" version "2.0.0-beta.17" - id "xyz.jpenilla.run-paper" version "2.3.0" -} - @@ -59,7 +59,7 @@ -compileTestJava.enabled = false - -tasks.assemble { -- dependsOn(tasks.reobfJar) +- dependsOn(tasks.shadowJar) -} - -publisher { diff --git a/patches/1.18.2/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperCompatHelper.java.patch b/patches/1.18.2/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperCompatHelper.java.patch index de03b43..09f46bf 100644 --- a/patches/1.18.2/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperCompatHelper.java.patch +++ b/patches/1.18.2/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperCompatHelper.java.patch @@ -1,12 +1,13 @@ --- a/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperCompatHelper.java +++ /dev/null -@@ -1,102 +1,0 @@ +@@ -1,103 +1,0 @@ -package com.hypherionmc.craterlib.common; - -import com.hypherionmc.craterlib.core.platform.CompatUtils; -import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment; -import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer; -import com.hypherionmc.craterlib.utils.ChatUtils; +-import net.kyori.adventure.text.Component; -import org.bukkit.Bukkit; -import org.bukkit.entity.Player; -import org.bukkit.metadata.MetadataValue; diff --git a/patches/1.18.2/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperLoaderHelper.java.patch b/patches/1.18.2/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperLoaderHelper.java.patch index a401f11..13abb26 100644 --- a/patches/1.18.2/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperLoaderHelper.java.patch +++ b/patches/1.18.2/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperLoaderHelper.java.patch @@ -33,7 +33,7 @@ - - @Override - public String getGameVersion() { -- return SharedConstants.getCurrentVersion().getName(); +- return SharedConstants.getCurrentVersion().name(); - } - - @Override diff --git a/patches/1.18.2/build.gradle.patch b/patches/1.18.2/build.gradle.patch index e64c002..ffec565 100644 --- a/patches/1.18.2/build.gradle.patch +++ b/patches/1.18.2/build.gradle.patch @@ -1,6 +1,13 @@ --- a/build.gradle +++ b/build.gradle -@@ -8,21 +8,15 @@ +@@ -3,26 +3,20 @@ + id 'com.github.johnrengelman.shadow' version '8.1.1' apply false + id "xyz.wagyourtail.unimined" version "1.3.9" apply false + id "com.hypherionmc.modutils.modpublisher" version "2.1.6" +- id "com.hypherionmc.modutils.orion" version "1.0.28" +- id "com.hypherionmc.modutils.orion.origami" version "1.0.28" apply false ++ id "com.hypherionmc.modutils.orion" version "1.0.24" ++ id "com.hypherionmc.modutils.orion.origami" version "1.0.24" apply false id 'maven-publish' } diff --git a/patches/1.18.2/gradle.properties.patch b/patches/1.18.2/gradle.properties.patch index 2266acc..982df11 100644 --- a/patches/1.18.2/gradle.properties.patch +++ b/patches/1.18.2/gradle.properties.patch @@ -4,13 +4,13 @@ mod_name=CraterLib # Shared --minecraft_version=25w17a +-minecraft_version=1.21.6 +minecraft_version=1.18.2 project_group=com.hypherionmc.craterlib # Fabric -fabric_loader=0.16.13 --fabric_api=0.119.10+1.21.6 +-fabric_api=0.126.0+1.21.6 +fabric_loader=0.15.11 +fabric_api=0.76.0+1.18.2 diff --git a/patches/1.18.2/gradle/wrapper/gradle-wrapper.properties.patch b/patches/1.18.2/gradle/wrapper/gradle-wrapper.properties.patch new file mode 100644 index 0000000..a73508b --- /dev/null +++ b/patches/1.18.2/gradle/wrapper/gradle-wrapper.properties.patch @@ -0,0 +1,9 @@ +--- a/gradle/wrapper/gradle-wrapper.properties ++++ b/gradle/wrapper/gradle-wrapper.properties +@@ -1,5 +1,5 @@ + distributionBase=GRADLE_USER_HOME + distributionPath=wrapper/dists +-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip ++distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip + zipStoreBase=GRADLE_USER_HOME + zipStorePath=wrapper/dists diff --git a/patches/1.18.2/settings.gradle.patch b/patches/1.18.2/settings.gradle.patch index f4eada2..e3a189b 100644 --- a/patches/1.18.2/settings.gradle.patch +++ b/patches/1.18.2/settings.gradle.patch @@ -5,8 +5,8 @@ } -rootProject.name = 'CraterLib' --include("Common", "Fabric"/*, "NeoForge"*/) --//include 'Paper' +-include("Common", "Fabric", "NeoForge") +-include 'Paper' - +rootProject.name = 'CraterLib-1.18.2' +include("Common", "Fabric", "Forge") diff --git a/patches/1.19.2/.jenkins/Jenkinsfile.snapshot.patch b/patches/1.19.2/.jenkins/Jenkinsfile.snapshot.patch index b4b0ce1..ad7600a 100644 --- a/patches/1.19.2/.jenkins/Jenkinsfile.snapshot.patch +++ b/patches/1.19.2/.jenkins/Jenkinsfile.snapshot.patch @@ -6,7 +6,7 @@ -def JDK = "21"; -def majorMc = "1.21.6"; -def modLoaders = "neoforge|fabric|quilt|paper"; --def supportedMc = "25w17a"; +-def supportedMc = "25w19a"; -def reltype = "experimental"; +def JDK = "17"; +def majorMc = "1.19.2"; diff --git a/patches/1.19.2/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch b/patches/1.19.2/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch index 13e2baf..549402c 100644 --- a/patches/1.19.2/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch +++ b/patches/1.19.2/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch @@ -1,14 +1,18 @@ --- a/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java +++ b/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java -@@ -1,7 +1,5 @@ +@@ -1,11 +1,6 @@ package com.hypherionmc.craterlib.utils; +-import com.google.gson.JsonElement; +-import com.google.gson.JsonParseException; -import com.hypherionmc.craterlib.core.platform.CommonPlatform; -import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment; import com.hypherionmc.craterlib.nojang.resources.ResourceIdentifier; +-import com.mojang.serialization.JsonOps; import lombok.Getter; import me.hypherionmc.mcdiscordformatter.discord.DiscordSerializer; -@@ -13,11 +11,6 @@ + import me.hypherionmc.mcdiscordformatter.minecraft.MinecraftSerializer; +@@ -16,57 +11,30 @@ import net.minecraft.ChatFormatting; import net.minecraft.SharedConstants; import net.minecraft.Util; @@ -18,9 +22,11 @@ -import net.minecraft.core.HolderLookup; -import net.minecraft.core.RegistryAccess; import net.minecraft.network.chat.Component; +-import net.minecraft.network.chat.ComponentSerialization; import net.minecraft.network.chat.Style; +-import net.minecraft.util.StrictJsonParser; -@@ -25,35 +18,23 @@ + public class ChatUtils { @Getter private static final GsonComponentSerializer adventureSerializer = GsonComponentSerializer.builder().options( @@ -31,16 +37,26 @@ private static final MiniMessage miniMessage = MiniMessage.miniMessage(); public static Component adventureToMojang(net.kyori.adventure.text.Component inComponent) { - final String serialised = adventureSerializer.serialize(inComponent); -- return Component.Serializer.fromJson(serialised, getRegistryLookup()); +- final JsonElement serialised = adventureSerializer.serializeToTree(inComponent); +- +- // FUCK YOU MOJANG. SERIOUSLY. FUCK OFF WITH THIS SHIT +- return ComponentSerialization.CODEC +- .parse(getRegistryLookup().createSerializationContext(JsonOps.INSTANCE), serialised) +- .getOrThrow(JsonParseException::new); ++ final String serialised = adventureSerializer.serialize(inComponent); + return Component.Serializer.fromJson(serialised); } public static net.kyori.adventure.text.Component mojangToAdventure(Component inComponent) { try { -- final String serialised = Component.Serializer.toJson(inComponent, getRegistryLookup()); +- // FUCK YOU MOJANG. SERIOUSLY. FUCK OFF WITH THIS SHIT +- final JsonElement serialised = ComponentSerialization.CODEC +- .encodeStart(JsonOps.INSTANCE, inComponent) +- .getOrThrow(JsonParseException::new); +- +- return adventureSerializer.deserializeFromTree(serialised); + final String serialised = Component.Serializer.toJson(inComponent); - return adventureSerializer.deserialize(serialised); ++ return adventureSerializer.deserialize(serialised); } catch (Exception e) { return net.kyori.adventure.text.Component.text(inComponent.getString()); } diff --git a/patches/1.19.2/Fabric/src/main/java/com/hypherionmc/craterlib/network/CraterFabricNetworkHandler.java.patch b/patches/1.19.2/Fabric/src/main/java/com/hypherionmc/craterlib/network/CraterFabricNetworkHandler.java.patch index 32e58e0..0b037c7 100644 --- a/patches/1.19.2/Fabric/src/main/java/com/hypherionmc/craterlib/network/CraterFabricNetworkHandler.java.patch +++ b/patches/1.19.2/Fabric/src/main/java/com/hypherionmc/craterlib/network/CraterFabricNetworkHandler.java.patch @@ -52,7 +52,7 @@ - } - - ServerPlayNetworking.registerGlobalReceiver(holder.getType(), -- (ServerPlayNetworking.PlayPayloadHandler>) (payload, context) -> context.player().server.execute(() -> +- (ServerPlayNetworking.PlayPayloadHandler>) (payload, context) -> context.player().getServer().execute(() -> - holder.handler().accept( - new PacketContext<>(BridgedPlayer.of(context.player()), payload.packet(), side)))); + if (CHANNELS.get(holder.messageType()) == null) { diff --git a/patches/1.19.2/NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeCompatHelper.java.patch b/patches/1.19.2/NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeCompatHelper.java.patch index 7eb98b8..9489b73 100644 --- a/patches/1.19.2/NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeCompatHelper.java.patch +++ b/patches/1.19.2/NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeCompatHelper.java.patch @@ -1,11 +1,12 @@ --- a/NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeCompatHelper.java +++ /dev/null -@@ -1,60 +1,0 @@ +@@ -1,61 +1,0 @@ -package com.hypherionmc.craterlib.common; - -import com.hypherionmc.craterlib.core.platform.CompatUtils; -import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment; -import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer; +-import net.kyori.adventure.text.Component; -import redstonedubstep.mods.vanishmod.VanishUtil; -import team.creative.playerrevive.api.IBleeding; -import team.creative.playerrevive.server.PlayerReviveServer; diff --git a/patches/1.19.2/Paper/build.gradle.patch b/patches/1.19.2/Paper/build.gradle.patch index 554ddc0..aed483c 100644 --- a/patches/1.19.2/Paper/build.gradle.patch +++ b/patches/1.19.2/Paper/build.gradle.patch @@ -2,7 +2,7 @@ +++ /dev/null @@ -1,78 +1,0 @@ -plugins { -- id "io.papermc.paperweight.userdev" version "1.7.3" +- id "io.papermc.paperweight.userdev" version "2.0.0-beta.17" - id "xyz.jpenilla.run-paper" version "2.3.0" -} - @@ -59,7 +59,7 @@ -compileTestJava.enabled = false - -tasks.assemble { -- dependsOn(tasks.reobfJar) +- dependsOn(tasks.shadowJar) -} - -publisher { diff --git a/patches/1.19.2/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperCompatHelper.java.patch b/patches/1.19.2/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperCompatHelper.java.patch index de03b43..09f46bf 100644 --- a/patches/1.19.2/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperCompatHelper.java.patch +++ b/patches/1.19.2/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperCompatHelper.java.patch @@ -1,12 +1,13 @@ --- a/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperCompatHelper.java +++ /dev/null -@@ -1,102 +1,0 @@ +@@ -1,103 +1,0 @@ -package com.hypherionmc.craterlib.common; - -import com.hypherionmc.craterlib.core.platform.CompatUtils; -import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment; -import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer; -import com.hypherionmc.craterlib.utils.ChatUtils; +-import net.kyori.adventure.text.Component; -import org.bukkit.Bukkit; -import org.bukkit.entity.Player; -import org.bukkit.metadata.MetadataValue; diff --git a/patches/1.19.2/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperLoaderHelper.java.patch b/patches/1.19.2/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperLoaderHelper.java.patch index a401f11..13abb26 100644 --- a/patches/1.19.2/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperLoaderHelper.java.patch +++ b/patches/1.19.2/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperLoaderHelper.java.patch @@ -33,7 +33,7 @@ - - @Override - public String getGameVersion() { -- return SharedConstants.getCurrentVersion().getName(); +- return SharedConstants.getCurrentVersion().name(); - } - - @Override diff --git a/patches/1.19.2/build.gradle.patch b/patches/1.19.2/build.gradle.patch index 044d8a0..e120577 100644 --- a/patches/1.19.2/build.gradle.patch +++ b/patches/1.19.2/build.gradle.patch @@ -1,6 +1,13 @@ --- a/build.gradle +++ b/build.gradle -@@ -8,21 +8,15 @@ +@@ -3,26 +3,20 @@ + id 'com.github.johnrengelman.shadow' version '8.1.1' apply false + id "xyz.wagyourtail.unimined" version "1.3.9" apply false + id "com.hypherionmc.modutils.modpublisher" version "2.1.6" +- id "com.hypherionmc.modutils.orion" version "1.0.28" +- id "com.hypherionmc.modutils.orion.origami" version "1.0.28" apply false ++ id "com.hypherionmc.modutils.orion" version "1.0.24" ++ id "com.hypherionmc.modutils.orion.origami" version "1.0.24" apply false id 'maven-publish' } diff --git a/patches/1.19.2/gradle.properties.patch b/patches/1.19.2/gradle.properties.patch index 50b77d4..a6499ee 100644 --- a/patches/1.19.2/gradle.properties.patch +++ b/patches/1.19.2/gradle.properties.patch @@ -4,13 +4,13 @@ mod_name=CraterLib # Shared --minecraft_version=25w17a +-minecraft_version=1.21.6 +minecraft_version=1.19.2 project_group=com.hypherionmc.craterlib # Fabric -fabric_loader=0.16.13 --fabric_api=0.119.10+1.21.6 +-fabric_api=0.126.0+1.21.6 +fabric_loader=0.15.11 +fabric_api=0.76.0+1.19.2 diff --git a/patches/1.19.2/gradle/wrapper/gradle-wrapper.properties.patch b/patches/1.19.2/gradle/wrapper/gradle-wrapper.properties.patch new file mode 100644 index 0000000..a73508b --- /dev/null +++ b/patches/1.19.2/gradle/wrapper/gradle-wrapper.properties.patch @@ -0,0 +1,9 @@ +--- a/gradle/wrapper/gradle-wrapper.properties ++++ b/gradle/wrapper/gradle-wrapper.properties +@@ -1,5 +1,5 @@ + distributionBase=GRADLE_USER_HOME + distributionPath=wrapper/dists +-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip ++distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip + zipStoreBase=GRADLE_USER_HOME + zipStorePath=wrapper/dists diff --git a/patches/1.19.2/settings.gradle.patch b/patches/1.19.2/settings.gradle.patch index f42bf4e..8e6b747 100644 --- a/patches/1.19.2/settings.gradle.patch +++ b/patches/1.19.2/settings.gradle.patch @@ -5,8 +5,8 @@ } -rootProject.name = 'CraterLib' --include("Common", "Fabric"/*, "NeoForge"*/) --//include 'Paper' +-include("Common", "Fabric", "NeoForge") +-include 'Paper' - +rootProject.name = 'CraterLib-1.19.2' +include("Common", "Fabric", "Forge") diff --git a/patches/1.19.3/.jenkins/Jenkinsfile.snapshot.patch b/patches/1.19.3/.jenkins/Jenkinsfile.snapshot.patch index cdb457f..facc318 100644 --- a/patches/1.19.3/.jenkins/Jenkinsfile.snapshot.patch +++ b/patches/1.19.3/.jenkins/Jenkinsfile.snapshot.patch @@ -6,7 +6,7 @@ -def JDK = "21"; -def majorMc = "1.21.6"; -def modLoaders = "neoforge|fabric|quilt|paper"; --def supportedMc = "25w17a"; +-def supportedMc = "25w19a"; -def reltype = "experimental"; +def JDK = "17"; +def majorMc = "1.19.3"; diff --git a/patches/1.19.3/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch b/patches/1.19.3/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch index 57d675a..379a48b 100644 --- a/patches/1.19.3/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch +++ b/patches/1.19.3/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch @@ -1,14 +1,19 @@ --- a/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java +++ b/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java -@@ -1,6 +1,6 @@ +@@ -1,11 +1,8 @@ package com.hypherionmc.craterlib.utils; +-import com.google.gson.JsonElement; +-import com.google.gson.JsonParseException; -import com.hypherionmc.craterlib.core.platform.CommonPlatform; +import com.hypherionmc.craterlib.core.platform.LoaderType; import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment; import com.hypherionmc.craterlib.nojang.resources.ResourceIdentifier; +-import com.mojang.serialization.JsonOps; import lombok.Getter; -@@ -10,50 +10,33 @@ + import me.hypherionmc.mcdiscordformatter.discord.DiscordSerializer; + import me.hypherionmc.mcdiscordformatter.minecraft.MinecraftSerializer; +@@ -13,60 +10,33 @@ import net.kyori.adventure.text.minimessage.MiniMessage; import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer; import net.kyori.adventure.text.serializer.json.JSONOptions; @@ -22,7 +27,9 @@ -import net.minecraft.core.HolderLookup; -import net.minecraft.core.RegistryAccess; import net.minecraft.network.chat.Component; +-import net.minecraft.network.chat.ComponentSerialization; import net.minecraft.network.chat.Style; +-import net.minecraft.util.StrictJsonParser; public class ChatUtils { @@ -36,16 +43,26 @@ private static final MiniMessage miniMessage = MiniMessage.miniMessage(); public static Component adventureToMojang(net.kyori.adventure.text.Component inComponent) { - final String serialised = adventureSerializer.serialize(inComponent); -- return Component.Serializer.fromJson(serialised, getRegistryLookup()); +- final JsonElement serialised = adventureSerializer.serializeToTree(inComponent); +- +- // FUCK YOU MOJANG. SERIOUSLY. FUCK OFF WITH THIS SHIT +- return ComponentSerialization.CODEC +- .parse(getRegistryLookup().createSerializationContext(JsonOps.INSTANCE), serialised) +- .getOrThrow(JsonParseException::new); ++ final String serialised = adventureSerializer.serialize(inComponent); + return Component.Serializer.fromJson(serialised); } public static net.kyori.adventure.text.Component mojangToAdventure(Component inComponent) { try { -- final String serialised = Component.Serializer.toJson(inComponent, getRegistryLookup()); +- // FUCK YOU MOJANG. SERIOUSLY. FUCK OFF WITH THIS SHIT +- final JsonElement serialised = ComponentSerialization.CODEC +- .encodeStart(JsonOps.INSTANCE, inComponent) +- .getOrThrow(JsonParseException::new); +- +- return adventureSerializer.deserializeFromTree(serialised); + final String serialised = Component.Serializer.toJson(inComponent); - return adventureSerializer.deserialize(serialised); ++ return adventureSerializer.deserialize(serialised); } catch (Exception e) { return net.kyori.adventure.text.Component.text(inComponent.getString()); } diff --git a/patches/1.19.3/Fabric/src/main/java/com/hypherionmc/craterlib/network/CraterFabricNetworkHandler.java.patch b/patches/1.19.3/Fabric/src/main/java/com/hypherionmc/craterlib/network/CraterFabricNetworkHandler.java.patch index 32e58e0..0b037c7 100644 --- a/patches/1.19.3/Fabric/src/main/java/com/hypherionmc/craterlib/network/CraterFabricNetworkHandler.java.patch +++ b/patches/1.19.3/Fabric/src/main/java/com/hypherionmc/craterlib/network/CraterFabricNetworkHandler.java.patch @@ -52,7 +52,7 @@ - } - - ServerPlayNetworking.registerGlobalReceiver(holder.getType(), -- (ServerPlayNetworking.PlayPayloadHandler>) (payload, context) -> context.player().server.execute(() -> +- (ServerPlayNetworking.PlayPayloadHandler>) (payload, context) -> context.player().getServer().execute(() -> - holder.handler().accept( - new PacketContext<>(BridgedPlayer.of(context.player()), payload.packet(), side)))); + if (CHANNELS.get(holder.messageType()) == null) { diff --git a/patches/1.19.3/NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeCompatHelper.java.patch b/patches/1.19.3/NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeCompatHelper.java.patch index 7eb98b8..9489b73 100644 --- a/patches/1.19.3/NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeCompatHelper.java.patch +++ b/patches/1.19.3/NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeCompatHelper.java.patch @@ -1,11 +1,12 @@ --- a/NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeCompatHelper.java +++ /dev/null -@@ -1,60 +1,0 @@ +@@ -1,61 +1,0 @@ -package com.hypherionmc.craterlib.common; - -import com.hypherionmc.craterlib.core.platform.CompatUtils; -import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment; -import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer; +-import net.kyori.adventure.text.Component; -import redstonedubstep.mods.vanishmod.VanishUtil; -import team.creative.playerrevive.api.IBleeding; -import team.creative.playerrevive.server.PlayerReviveServer; diff --git a/patches/1.19.3/Paper/build.gradle.patch b/patches/1.19.3/Paper/build.gradle.patch index 81d7885..7204d93 100644 --- a/patches/1.19.3/Paper/build.gradle.patch +++ b/patches/1.19.3/Paper/build.gradle.patch @@ -1,5 +1,21 @@ --- a/Paper/build.gradle +++ b/Paper/build.gradle +@@ -1,5 +1,5 @@ + plugins { +- id "io.papermc.paperweight.userdev" version "2.0.0-beta.17" ++ id "io.papermc.paperweight.userdev" version "1.7.3" + id "xyz.jpenilla.run-paper" version "2.3.0" + } + +@@ -56,7 +56,7 @@ + compileTestJava.enabled = false + + tasks.assemble { +- dependsOn(tasks.shadowJar) ++ dependsOn(tasks.reobfJar) + } + + publisher { @@ -68,8 +68,8 @@ setVersionType("alpha") setChangelog(rootProject.file("changelog.md")) diff --git a/patches/1.19.3/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperLoaderHelper.java.patch b/patches/1.19.3/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperLoaderHelper.java.patch new file mode 100644 index 0000000..667bba7 --- /dev/null +++ b/patches/1.19.3/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperLoaderHelper.java.patch @@ -0,0 +1,11 @@ +--- a/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperLoaderHelper.java ++++ b/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperLoaderHelper.java +@@ -30,7 +30,7 @@ + + @Override + public String getGameVersion() { +- return SharedConstants.getCurrentVersion().name(); ++ return SharedConstants.getCurrentVersion().getName(); + } + + @Override diff --git a/patches/1.19.3/build.gradle.patch b/patches/1.19.3/build.gradle.patch index 044d8a0..e120577 100644 --- a/patches/1.19.3/build.gradle.patch +++ b/patches/1.19.3/build.gradle.patch @@ -1,6 +1,13 @@ --- a/build.gradle +++ b/build.gradle -@@ -8,21 +8,15 @@ +@@ -3,26 +3,20 @@ + id 'com.github.johnrengelman.shadow' version '8.1.1' apply false + id "xyz.wagyourtail.unimined" version "1.3.9" apply false + id "com.hypherionmc.modutils.modpublisher" version "2.1.6" +- id "com.hypherionmc.modutils.orion" version "1.0.28" +- id "com.hypherionmc.modutils.orion.origami" version "1.0.28" apply false ++ id "com.hypherionmc.modutils.orion" version "1.0.24" ++ id "com.hypherionmc.modutils.orion.origami" version "1.0.24" apply false id 'maven-publish' } diff --git a/patches/1.19.3/gradle.properties.patch b/patches/1.19.3/gradle.properties.patch index 7e51edf..f14b1b6 100644 --- a/patches/1.19.3/gradle.properties.patch +++ b/patches/1.19.3/gradle.properties.patch @@ -4,13 +4,13 @@ mod_name=CraterLib # Shared --minecraft_version=25w17a +-minecraft_version=1.21.6 +minecraft_version=1.19.4 project_group=com.hypherionmc.craterlib # Fabric -fabric_loader=0.16.13 --fabric_api=0.119.10+1.21.6 +-fabric_api=0.126.0+1.21.6 +fabric_loader=0.15.11 +fabric_api=0.87.2+1.19.4 diff --git a/patches/1.19.3/gradle/wrapper/gradle-wrapper.properties.patch b/patches/1.19.3/gradle/wrapper/gradle-wrapper.properties.patch new file mode 100644 index 0000000..a73508b --- /dev/null +++ b/patches/1.19.3/gradle/wrapper/gradle-wrapper.properties.patch @@ -0,0 +1,9 @@ +--- a/gradle/wrapper/gradle-wrapper.properties ++++ b/gradle/wrapper/gradle-wrapper.properties +@@ -1,5 +1,5 @@ + distributionBase=GRADLE_USER_HOME + distributionPath=wrapper/dists +-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip ++distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip + zipStoreBase=GRADLE_USER_HOME + zipStorePath=wrapper/dists diff --git a/patches/1.19.3/settings.gradle.patch b/patches/1.19.3/settings.gradle.patch index f808b27..3e9a96f 100644 --- a/patches/1.19.3/settings.gradle.patch +++ b/patches/1.19.3/settings.gradle.patch @@ -5,9 +5,8 @@ } -rootProject.name = 'CraterLib' --include("Common", "Fabric"/*, "NeoForge"*/) --//include 'Paper' -- +-include("Common", "Fabric", "NeoForge") +rootProject.name = 'CraterLib-1.19.3' +include("Common", "Fabric", "Forge") -+include 'Paper' + include 'Paper' +- diff --git a/patches/1.20.2/.jenkins/Jenkinsfile.snapshot.patch b/patches/1.20.2/.jenkins/Jenkinsfile.snapshot.patch index 9d70748..ca1cfbe 100644 --- a/patches/1.20.2/.jenkins/Jenkinsfile.snapshot.patch +++ b/patches/1.20.2/.jenkins/Jenkinsfile.snapshot.patch @@ -6,7 +6,7 @@ -def JDK = "21"; -def majorMc = "1.21.6"; -def modLoaders = "neoforge|fabric|quilt|paper"; --def supportedMc = "25w17a"; +-def supportedMc = "25w19a"; -def reltype = "experimental"; +def JDK = "17"; +def majorMc = "1.20.2"; diff --git a/patches/1.20.2/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch b/patches/1.20.2/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch index 57d675a..379a48b 100644 --- a/patches/1.20.2/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch +++ b/patches/1.20.2/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch @@ -1,14 +1,19 @@ --- a/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java +++ b/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java -@@ -1,6 +1,6 @@ +@@ -1,11 +1,8 @@ package com.hypherionmc.craterlib.utils; +-import com.google.gson.JsonElement; +-import com.google.gson.JsonParseException; -import com.hypherionmc.craterlib.core.platform.CommonPlatform; +import com.hypherionmc.craterlib.core.platform.LoaderType; import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment; import com.hypherionmc.craterlib.nojang.resources.ResourceIdentifier; +-import com.mojang.serialization.JsonOps; import lombok.Getter; -@@ -10,50 +10,33 @@ + import me.hypherionmc.mcdiscordformatter.discord.DiscordSerializer; + import me.hypherionmc.mcdiscordformatter.minecraft.MinecraftSerializer; +@@ -13,60 +10,33 @@ import net.kyori.adventure.text.minimessage.MiniMessage; import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer; import net.kyori.adventure.text.serializer.json.JSONOptions; @@ -22,7 +27,9 @@ -import net.minecraft.core.HolderLookup; -import net.minecraft.core.RegistryAccess; import net.minecraft.network.chat.Component; +-import net.minecraft.network.chat.ComponentSerialization; import net.minecraft.network.chat.Style; +-import net.minecraft.util.StrictJsonParser; public class ChatUtils { @@ -36,16 +43,26 @@ private static final MiniMessage miniMessage = MiniMessage.miniMessage(); public static Component adventureToMojang(net.kyori.adventure.text.Component inComponent) { - final String serialised = adventureSerializer.serialize(inComponent); -- return Component.Serializer.fromJson(serialised, getRegistryLookup()); +- final JsonElement serialised = adventureSerializer.serializeToTree(inComponent); +- +- // FUCK YOU MOJANG. SERIOUSLY. FUCK OFF WITH THIS SHIT +- return ComponentSerialization.CODEC +- .parse(getRegistryLookup().createSerializationContext(JsonOps.INSTANCE), serialised) +- .getOrThrow(JsonParseException::new); ++ final String serialised = adventureSerializer.serialize(inComponent); + return Component.Serializer.fromJson(serialised); } public static net.kyori.adventure.text.Component mojangToAdventure(Component inComponent) { try { -- final String serialised = Component.Serializer.toJson(inComponent, getRegistryLookup()); +- // FUCK YOU MOJANG. SERIOUSLY. FUCK OFF WITH THIS SHIT +- final JsonElement serialised = ComponentSerialization.CODEC +- .encodeStart(JsonOps.INSTANCE, inComponent) +- .getOrThrow(JsonParseException::new); +- +- return adventureSerializer.deserializeFromTree(serialised); + final String serialised = Component.Serializer.toJson(inComponent); - return adventureSerializer.deserialize(serialised); ++ return adventureSerializer.deserialize(serialised); } catch (Exception e) { return net.kyori.adventure.text.Component.text(inComponent.getString()); } diff --git a/patches/1.20.2/Fabric/src/main/java/com/hypherionmc/craterlib/network/CraterFabricNetworkHandler.java.patch b/patches/1.20.2/Fabric/src/main/java/com/hypherionmc/craterlib/network/CraterFabricNetworkHandler.java.patch index 32e58e0..0b037c7 100644 --- a/patches/1.20.2/Fabric/src/main/java/com/hypherionmc/craterlib/network/CraterFabricNetworkHandler.java.patch +++ b/patches/1.20.2/Fabric/src/main/java/com/hypherionmc/craterlib/network/CraterFabricNetworkHandler.java.patch @@ -52,7 +52,7 @@ - } - - ServerPlayNetworking.registerGlobalReceiver(holder.getType(), -- (ServerPlayNetworking.PlayPayloadHandler>) (payload, context) -> context.player().server.execute(() -> +- (ServerPlayNetworking.PlayPayloadHandler>) (payload, context) -> context.player().getServer().execute(() -> - holder.handler().accept( - new PacketContext<>(BridgedPlayer.of(context.player()), payload.packet(), side)))); + if (CHANNELS.get(holder.messageType()) == null) { diff --git a/patches/1.20.2/NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeCompatHelper.java.patch b/patches/1.20.2/NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeCompatHelper.java.patch index 7eb98b8..9489b73 100644 --- a/patches/1.20.2/NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeCompatHelper.java.patch +++ b/patches/1.20.2/NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeCompatHelper.java.patch @@ -1,11 +1,12 @@ --- a/NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeCompatHelper.java +++ /dev/null -@@ -1,60 +1,0 @@ +@@ -1,61 +1,0 @@ -package com.hypherionmc.craterlib.common; - -import com.hypherionmc.craterlib.core.platform.CompatUtils; -import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment; -import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer; +-import net.kyori.adventure.text.Component; -import redstonedubstep.mods.vanishmod.VanishUtil; -import team.creative.playerrevive.api.IBleeding; -import team.creative.playerrevive.server.PlayerReviveServer; diff --git a/patches/1.20.2/Paper/build.gradle.patch b/patches/1.20.2/Paper/build.gradle.patch index a1cdc70..07f9a6e 100644 --- a/patches/1.20.2/Paper/build.gradle.patch +++ b/patches/1.20.2/Paper/build.gradle.patch @@ -1,5 +1,21 @@ --- a/Paper/build.gradle +++ b/Paper/build.gradle +@@ -1,5 +1,5 @@ + plugins { +- id "io.papermc.paperweight.userdev" version "2.0.0-beta.17" ++ id "io.papermc.paperweight.userdev" version "1.7.3" + id "xyz.jpenilla.run-paper" version "2.3.0" + } + +@@ -56,7 +56,7 @@ + compileTestJava.enabled = false + + tasks.assemble { +- dependsOn(tasks.shadowJar) ++ dependsOn(tasks.reobfJar) + } + + publisher { @@ -68,8 +68,8 @@ setVersionType("alpha") setChangelog(rootProject.file("changelog.md")) diff --git a/patches/1.20.2/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperCompatHelper.java.patch b/patches/1.20.2/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperCompatHelper.java.patch deleted file mode 100644 index d65db6b..0000000 --- a/patches/1.20.2/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperCompatHelper.java.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperCompatHelper.java -+++ b/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperCompatHelper.java -@@ -4,6 +4,7 @@ - import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment; - import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer; - import com.hypherionmc.craterlib.utils.ChatUtils; -+import net.kyori.adventure.text.Component; - import org.bukkit.Bukkit; - import org.bukkit.entity.Player; - import org.bukkit.metadata.MetadataValue; diff --git a/patches/1.20.2/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperLoaderHelper.java.patch b/patches/1.20.2/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperLoaderHelper.java.patch new file mode 100644 index 0000000..667bba7 --- /dev/null +++ b/patches/1.20.2/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperLoaderHelper.java.patch @@ -0,0 +1,11 @@ +--- a/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperLoaderHelper.java ++++ b/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperLoaderHelper.java +@@ -30,7 +30,7 @@ + + @Override + public String getGameVersion() { +- return SharedConstants.getCurrentVersion().name(); ++ return SharedConstants.getCurrentVersion().getName(); + } + + @Override diff --git a/patches/1.20.2/build.gradle.patch b/patches/1.20.2/build.gradle.patch index 044d8a0..e120577 100644 --- a/patches/1.20.2/build.gradle.patch +++ b/patches/1.20.2/build.gradle.patch @@ -1,6 +1,13 @@ --- a/build.gradle +++ b/build.gradle -@@ -8,21 +8,15 @@ +@@ -3,26 +3,20 @@ + id 'com.github.johnrengelman.shadow' version '8.1.1' apply false + id "xyz.wagyourtail.unimined" version "1.3.9" apply false + id "com.hypherionmc.modutils.modpublisher" version "2.1.6" +- id "com.hypherionmc.modutils.orion" version "1.0.28" +- id "com.hypherionmc.modutils.orion.origami" version "1.0.28" apply false ++ id "com.hypherionmc.modutils.orion" version "1.0.24" ++ id "com.hypherionmc.modutils.orion.origami" version "1.0.24" apply false id 'maven-publish' } diff --git a/patches/1.20.2/gradle.properties.patch b/patches/1.20.2/gradle.properties.patch index 45ba9fc..3e81c25 100644 --- a/patches/1.20.2/gradle.properties.patch +++ b/patches/1.20.2/gradle.properties.patch @@ -4,13 +4,13 @@ mod_name=CraterLib # Shared --minecraft_version=25w17a +-minecraft_version=1.21.6 +minecraft_version=1.20.2 project_group=com.hypherionmc.craterlib # Fabric -fabric_loader=0.16.13 --fabric_api=0.119.10+1.21.6 +-fabric_api=0.126.0+1.21.6 +fabric_loader=0.15.11 +fabric_api=0.91.6+1.20.2 diff --git a/patches/1.20.2/gradle/wrapper/gradle-wrapper.properties.patch b/patches/1.20.2/gradle/wrapper/gradle-wrapper.properties.patch new file mode 100644 index 0000000..a73508b --- /dev/null +++ b/patches/1.20.2/gradle/wrapper/gradle-wrapper.properties.patch @@ -0,0 +1,9 @@ +--- a/gradle/wrapper/gradle-wrapper.properties ++++ b/gradle/wrapper/gradle-wrapper.properties +@@ -1,5 +1,5 @@ + distributionBase=GRADLE_USER_HOME + distributionPath=wrapper/dists +-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip ++distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip + zipStoreBase=GRADLE_USER_HOME + zipStorePath=wrapper/dists diff --git a/patches/1.20.2/settings.gradle.patch b/patches/1.20.2/settings.gradle.patch index b8f8192..a20d780 100644 --- a/patches/1.20.2/settings.gradle.patch +++ b/patches/1.20.2/settings.gradle.patch @@ -5,9 +5,8 @@ } -rootProject.name = 'CraterLib' --include("Common", "Fabric"/*, "NeoForge"*/) --//include 'Paper' -- +-include("Common", "Fabric", "NeoForge") +rootProject.name = 'CraterLib-1.20.2' +include("Common", "Fabric", "Forge") -+include 'Paper' + include 'Paper' +- diff --git a/patches/1.20.4/.jenkins/Jenkinsfile.snapshot.patch b/patches/1.20.4/.jenkins/Jenkinsfile.snapshot.patch index cf56377..aa50137 100644 --- a/patches/1.20.4/.jenkins/Jenkinsfile.snapshot.patch +++ b/patches/1.20.4/.jenkins/Jenkinsfile.snapshot.patch @@ -6,7 +6,7 @@ -def JDK = "21"; -def majorMc = "1.21.6"; -def modLoaders = "neoforge|fabric|quilt|paper"; --def supportedMc = "25w17a"; +-def supportedMc = "25w19a"; -def reltype = "experimental"; +def JDK = "17"; +def majorMc = "1.20.4"; diff --git a/patches/1.20.4/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch b/patches/1.20.4/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch index 13e2baf..549402c 100644 --- a/patches/1.20.4/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch +++ b/patches/1.20.4/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch @@ -1,14 +1,18 @@ --- a/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java +++ b/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java -@@ -1,7 +1,5 @@ +@@ -1,11 +1,6 @@ package com.hypherionmc.craterlib.utils; +-import com.google.gson.JsonElement; +-import com.google.gson.JsonParseException; -import com.hypherionmc.craterlib.core.platform.CommonPlatform; -import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment; import com.hypherionmc.craterlib.nojang.resources.ResourceIdentifier; +-import com.mojang.serialization.JsonOps; import lombok.Getter; import me.hypherionmc.mcdiscordformatter.discord.DiscordSerializer; -@@ -13,11 +11,6 @@ + import me.hypherionmc.mcdiscordformatter.minecraft.MinecraftSerializer; +@@ -16,57 +11,30 @@ import net.minecraft.ChatFormatting; import net.minecraft.SharedConstants; import net.minecraft.Util; @@ -18,9 +22,11 @@ -import net.minecraft.core.HolderLookup; -import net.minecraft.core.RegistryAccess; import net.minecraft.network.chat.Component; +-import net.minecraft.network.chat.ComponentSerialization; import net.minecraft.network.chat.Style; +-import net.minecraft.util.StrictJsonParser; -@@ -25,35 +18,23 @@ + public class ChatUtils { @Getter private static final GsonComponentSerializer adventureSerializer = GsonComponentSerializer.builder().options( @@ -31,16 +37,26 @@ private static final MiniMessage miniMessage = MiniMessage.miniMessage(); public static Component adventureToMojang(net.kyori.adventure.text.Component inComponent) { - final String serialised = adventureSerializer.serialize(inComponent); -- return Component.Serializer.fromJson(serialised, getRegistryLookup()); +- final JsonElement serialised = adventureSerializer.serializeToTree(inComponent); +- +- // FUCK YOU MOJANG. SERIOUSLY. FUCK OFF WITH THIS SHIT +- return ComponentSerialization.CODEC +- .parse(getRegistryLookup().createSerializationContext(JsonOps.INSTANCE), serialised) +- .getOrThrow(JsonParseException::new); ++ final String serialised = adventureSerializer.serialize(inComponent); + return Component.Serializer.fromJson(serialised); } public static net.kyori.adventure.text.Component mojangToAdventure(Component inComponent) { try { -- final String serialised = Component.Serializer.toJson(inComponent, getRegistryLookup()); +- // FUCK YOU MOJANG. SERIOUSLY. FUCK OFF WITH THIS SHIT +- final JsonElement serialised = ComponentSerialization.CODEC +- .encodeStart(JsonOps.INSTANCE, inComponent) +- .getOrThrow(JsonParseException::new); +- +- return adventureSerializer.deserializeFromTree(serialised); + final String serialised = Component.Serializer.toJson(inComponent); - return adventureSerializer.deserialize(serialised); ++ return adventureSerializer.deserialize(serialised); } catch (Exception e) { return net.kyori.adventure.text.Component.text(inComponent.getString()); } diff --git a/patches/1.20.4/Fabric/src/main/java/com/hypherionmc/craterlib/network/CraterFabricNetworkHandler.java.patch b/patches/1.20.4/Fabric/src/main/java/com/hypherionmc/craterlib/network/CraterFabricNetworkHandler.java.patch index 32e58e0..0b037c7 100644 --- a/patches/1.20.4/Fabric/src/main/java/com/hypherionmc/craterlib/network/CraterFabricNetworkHandler.java.patch +++ b/patches/1.20.4/Fabric/src/main/java/com/hypherionmc/craterlib/network/CraterFabricNetworkHandler.java.patch @@ -52,7 +52,7 @@ - } - - ServerPlayNetworking.registerGlobalReceiver(holder.getType(), -- (ServerPlayNetworking.PlayPayloadHandler>) (payload, context) -> context.player().server.execute(() -> +- (ServerPlayNetworking.PlayPayloadHandler>) (payload, context) -> context.player().getServer().execute(() -> - holder.handler().accept( - new PacketContext<>(BridgedPlayer.of(context.player()), payload.packet(), side)))); + if (CHANNELS.get(holder.messageType()) == null) { diff --git a/patches/1.20.4/NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeCompatHelper.java.patch b/patches/1.20.4/NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeCompatHelper.java.patch deleted file mode 100644 index cc8cde4..0000000 --- a/patches/1.20.4/NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeCompatHelper.java.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeCompatHelper.java -+++ b/NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeCompatHelper.java -@@ -3,6 +3,7 @@ - import com.hypherionmc.craterlib.core.platform.CompatUtils; - import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment; - import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer; -+import net.kyori.adventure.text.Component; - import redstonedubstep.mods.vanishmod.VanishUtil; - import team.creative.playerrevive.api.IBleeding; - import team.creative.playerrevive.server.PlayerReviveServer; diff --git a/patches/1.20.4/Paper/build.gradle.patch b/patches/1.20.4/Paper/build.gradle.patch index b95fd44..7d489e3 100644 --- a/patches/1.20.4/Paper/build.gradle.patch +++ b/patches/1.20.4/Paper/build.gradle.patch @@ -1,5 +1,21 @@ --- a/Paper/build.gradle +++ b/Paper/build.gradle +@@ -1,5 +1,5 @@ + plugins { +- id "io.papermc.paperweight.userdev" version "2.0.0-beta.17" ++ id "io.papermc.paperweight.userdev" version "1.7.3" + id "xyz.jpenilla.run-paper" version "2.3.0" + } + +@@ -56,7 +56,7 @@ + compileTestJava.enabled = false + + tasks.assemble { +- dependsOn(tasks.shadowJar) ++ dependsOn(tasks.reobfJar) + } + + publisher { @@ -68,8 +68,8 @@ setVersionType("alpha") setChangelog(rootProject.file("changelog.md")) diff --git a/patches/1.20.4/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperCompatHelper.java.patch b/patches/1.20.4/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperCompatHelper.java.patch deleted file mode 100644 index d65db6b..0000000 --- a/patches/1.20.4/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperCompatHelper.java.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperCompatHelper.java -+++ b/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperCompatHelper.java -@@ -4,6 +4,7 @@ - import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment; - import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer; - import com.hypherionmc.craterlib.utils.ChatUtils; -+import net.kyori.adventure.text.Component; - import org.bukkit.Bukkit; - import org.bukkit.entity.Player; - import org.bukkit.metadata.MetadataValue; diff --git a/patches/1.20.4/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperLoaderHelper.java.patch b/patches/1.20.4/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperLoaderHelper.java.patch new file mode 100644 index 0000000..667bba7 --- /dev/null +++ b/patches/1.20.4/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperLoaderHelper.java.patch @@ -0,0 +1,11 @@ +--- a/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperLoaderHelper.java ++++ b/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperLoaderHelper.java +@@ -30,7 +30,7 @@ + + @Override + public String getGameVersion() { +- return SharedConstants.getCurrentVersion().name(); ++ return SharedConstants.getCurrentVersion().getName(); + } + + @Override diff --git a/patches/1.20.4/build.gradle.patch b/patches/1.20.4/build.gradle.patch index 7ee54f1..ecca6cd 100644 --- a/patches/1.20.4/build.gradle.patch +++ b/patches/1.20.4/build.gradle.patch @@ -1,6 +1,13 @@ --- a/build.gradle +++ b/build.gradle -@@ -8,21 +8,15 @@ +@@ -3,26 +3,20 @@ + id 'com.github.johnrengelman.shadow' version '8.1.1' apply false + id "xyz.wagyourtail.unimined" version "1.3.9" apply false + id "com.hypherionmc.modutils.modpublisher" version "2.1.6" +- id "com.hypherionmc.modutils.orion" version "1.0.28" +- id "com.hypherionmc.modutils.orion.origami" version "1.0.28" apply false ++ id "com.hypherionmc.modutils.orion" version "1.0.24" ++ id "com.hypherionmc.modutils.orion.origami" version "1.0.24" apply false id 'maven-publish' } diff --git a/patches/1.20.4/gradle.properties.patch b/patches/1.20.4/gradle.properties.patch index 4d6a643..3efaeb9 100644 --- a/patches/1.20.4/gradle.properties.patch +++ b/patches/1.20.4/gradle.properties.patch @@ -4,13 +4,13 @@ mod_name=CraterLib # Shared --minecraft_version=25w17a +-minecraft_version=1.21.6 +minecraft_version=1.20.4 project_group=com.hypherionmc.craterlib # Fabric -fabric_loader=0.16.13 --fabric_api=0.119.10+1.21.6 +-fabric_api=0.126.0+1.21.6 +fabric_loader=0.15.11 +fabric_api=0.97.0+1.20.4 diff --git a/patches/1.20.4/gradle/wrapper/gradle-wrapper.properties.patch b/patches/1.20.4/gradle/wrapper/gradle-wrapper.properties.patch new file mode 100644 index 0000000..a73508b --- /dev/null +++ b/patches/1.20.4/gradle/wrapper/gradle-wrapper.properties.patch @@ -0,0 +1,9 @@ +--- a/gradle/wrapper/gradle-wrapper.properties ++++ b/gradle/wrapper/gradle-wrapper.properties +@@ -1,5 +1,5 @@ + distributionBase=GRADLE_USER_HOME + distributionPath=wrapper/dists +-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip ++distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip + zipStoreBase=GRADLE_USER_HOME + zipStorePath=wrapper/dists diff --git a/patches/1.20.4/settings.gradle.patch b/patches/1.20.4/settings.gradle.patch index d4a07c4..f0c94af 100644 --- a/patches/1.20.4/settings.gradle.patch +++ b/patches/1.20.4/settings.gradle.patch @@ -5,9 +5,8 @@ } -rootProject.name = 'CraterLib' --include("Common", "Fabric"/*, "NeoForge"*/) --//include 'Paper' -- +-include("Common", "Fabric", "NeoForge") +rootProject.name = 'CraterLib-1.20.4' +include("Common", "Fabric", "Forge", "NeoForge") -+include 'Paper' + include 'Paper' +- diff --git a/patches/1.20/.jenkins/Jenkinsfile.snapshot.patch b/patches/1.20/.jenkins/Jenkinsfile.snapshot.patch index e3dd94e..0d7c0a4 100644 --- a/patches/1.20/.jenkins/Jenkinsfile.snapshot.patch +++ b/patches/1.20/.jenkins/Jenkinsfile.snapshot.patch @@ -6,7 +6,7 @@ -def JDK = "21"; -def majorMc = "1.21.6"; -def modLoaders = "neoforge|fabric|quilt|paper"; --def supportedMc = "25w17a"; +-def supportedMc = "25w19a"; -def reltype = "experimental"; +def JDK = "17"; +def majorMc = "1.20"; diff --git a/patches/1.20/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch b/patches/1.20/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch index 57d675a..379a48b 100644 --- a/patches/1.20/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch +++ b/patches/1.20/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch @@ -1,14 +1,19 @@ --- a/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java +++ b/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java -@@ -1,6 +1,6 @@ +@@ -1,11 +1,8 @@ package com.hypherionmc.craterlib.utils; +-import com.google.gson.JsonElement; +-import com.google.gson.JsonParseException; -import com.hypherionmc.craterlib.core.platform.CommonPlatform; +import com.hypherionmc.craterlib.core.platform.LoaderType; import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment; import com.hypherionmc.craterlib.nojang.resources.ResourceIdentifier; +-import com.mojang.serialization.JsonOps; import lombok.Getter; -@@ -10,50 +10,33 @@ + import me.hypherionmc.mcdiscordformatter.discord.DiscordSerializer; + import me.hypherionmc.mcdiscordformatter.minecraft.MinecraftSerializer; +@@ -13,60 +10,33 @@ import net.kyori.adventure.text.minimessage.MiniMessage; import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer; import net.kyori.adventure.text.serializer.json.JSONOptions; @@ -22,7 +27,9 @@ -import net.minecraft.core.HolderLookup; -import net.minecraft.core.RegistryAccess; import net.minecraft.network.chat.Component; +-import net.minecraft.network.chat.ComponentSerialization; import net.minecraft.network.chat.Style; +-import net.minecraft.util.StrictJsonParser; public class ChatUtils { @@ -36,16 +43,26 @@ private static final MiniMessage miniMessage = MiniMessage.miniMessage(); public static Component adventureToMojang(net.kyori.adventure.text.Component inComponent) { - final String serialised = adventureSerializer.serialize(inComponent); -- return Component.Serializer.fromJson(serialised, getRegistryLookup()); +- final JsonElement serialised = adventureSerializer.serializeToTree(inComponent); +- +- // FUCK YOU MOJANG. SERIOUSLY. FUCK OFF WITH THIS SHIT +- return ComponentSerialization.CODEC +- .parse(getRegistryLookup().createSerializationContext(JsonOps.INSTANCE), serialised) +- .getOrThrow(JsonParseException::new); ++ final String serialised = adventureSerializer.serialize(inComponent); + return Component.Serializer.fromJson(serialised); } public static net.kyori.adventure.text.Component mojangToAdventure(Component inComponent) { try { -- final String serialised = Component.Serializer.toJson(inComponent, getRegistryLookup()); +- // FUCK YOU MOJANG. SERIOUSLY. FUCK OFF WITH THIS SHIT +- final JsonElement serialised = ComponentSerialization.CODEC +- .encodeStart(JsonOps.INSTANCE, inComponent) +- .getOrThrow(JsonParseException::new); +- +- return adventureSerializer.deserializeFromTree(serialised); + final String serialised = Component.Serializer.toJson(inComponent); - return adventureSerializer.deserialize(serialised); ++ return adventureSerializer.deserialize(serialised); } catch (Exception e) { return net.kyori.adventure.text.Component.text(inComponent.getString()); } diff --git a/patches/1.20/Fabric/src/main/java/com/hypherionmc/craterlib/network/CraterFabricNetworkHandler.java.patch b/patches/1.20/Fabric/src/main/java/com/hypherionmc/craterlib/network/CraterFabricNetworkHandler.java.patch index 32e58e0..0b037c7 100644 --- a/patches/1.20/Fabric/src/main/java/com/hypherionmc/craterlib/network/CraterFabricNetworkHandler.java.patch +++ b/patches/1.20/Fabric/src/main/java/com/hypherionmc/craterlib/network/CraterFabricNetworkHandler.java.patch @@ -52,7 +52,7 @@ - } - - ServerPlayNetworking.registerGlobalReceiver(holder.getType(), -- (ServerPlayNetworking.PlayPayloadHandler>) (payload, context) -> context.player().server.execute(() -> +- (ServerPlayNetworking.PlayPayloadHandler>) (payload, context) -> context.player().getServer().execute(() -> - holder.handler().accept( - new PacketContext<>(BridgedPlayer.of(context.player()), payload.packet(), side)))); + if (CHANNELS.get(holder.messageType()) == null) { diff --git a/patches/1.20/NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeCompatHelper.java.patch b/patches/1.20/NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeCompatHelper.java.patch index 7eb98b8..9489b73 100644 --- a/patches/1.20/NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeCompatHelper.java.patch +++ b/patches/1.20/NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeCompatHelper.java.patch @@ -1,11 +1,12 @@ --- a/NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeCompatHelper.java +++ /dev/null -@@ -1,60 +1,0 @@ +@@ -1,61 +1,0 @@ -package com.hypherionmc.craterlib.common; - -import com.hypherionmc.craterlib.core.platform.CompatUtils; -import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment; -import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer; +-import net.kyori.adventure.text.Component; -import redstonedubstep.mods.vanishmod.VanishUtil; -import team.creative.playerrevive.api.IBleeding; -import team.creative.playerrevive.server.PlayerReviveServer; diff --git a/patches/1.20/Paper/build.gradle.patch b/patches/1.20/Paper/build.gradle.patch index 12b9ff7..eeec878 100644 --- a/patches/1.20/Paper/build.gradle.patch +++ b/patches/1.20/Paper/build.gradle.patch @@ -1,5 +1,21 @@ --- a/Paper/build.gradle +++ b/Paper/build.gradle +@@ -1,5 +1,5 @@ + plugins { +- id "io.papermc.paperweight.userdev" version "2.0.0-beta.17" ++ id "io.papermc.paperweight.userdev" version "1.7.3" + id "xyz.jpenilla.run-paper" version "2.3.0" + } + +@@ -56,7 +56,7 @@ + compileTestJava.enabled = false + + tasks.assemble { +- dependsOn(tasks.shadowJar) ++ dependsOn(tasks.reobfJar) + } + + publisher { @@ -68,8 +68,8 @@ setVersionType("alpha") setChangelog(rootProject.file("changelog.md")) diff --git a/patches/1.20/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperCompatHelper.java.patch b/patches/1.20/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperCompatHelper.java.patch deleted file mode 100644 index d65db6b..0000000 --- a/patches/1.20/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperCompatHelper.java.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperCompatHelper.java -+++ b/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperCompatHelper.java -@@ -4,6 +4,7 @@ - import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment; - import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer; - import com.hypherionmc.craterlib.utils.ChatUtils; -+import net.kyori.adventure.text.Component; - import org.bukkit.Bukkit; - import org.bukkit.entity.Player; - import org.bukkit.metadata.MetadataValue; diff --git a/patches/1.20/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperLoaderHelper.java.patch b/patches/1.20/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperLoaderHelper.java.patch new file mode 100644 index 0000000..667bba7 --- /dev/null +++ b/patches/1.20/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperLoaderHelper.java.patch @@ -0,0 +1,11 @@ +--- a/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperLoaderHelper.java ++++ b/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperLoaderHelper.java +@@ -30,7 +30,7 @@ + + @Override + public String getGameVersion() { +- return SharedConstants.getCurrentVersion().name(); ++ return SharedConstants.getCurrentVersion().getName(); + } + + @Override diff --git a/patches/1.20/build.gradle.patch b/patches/1.20/build.gradle.patch index 1671bfe..1955290 100644 --- a/patches/1.20/build.gradle.patch +++ b/patches/1.20/build.gradle.patch @@ -1,6 +1,13 @@ --- a/build.gradle +++ b/build.gradle -@@ -8,21 +8,14 @@ +@@ -3,26 +3,19 @@ + id 'com.github.johnrengelman.shadow' version '8.1.1' apply false + id "xyz.wagyourtail.unimined" version "1.3.9" apply false + id "com.hypherionmc.modutils.modpublisher" version "2.1.6" +- id "com.hypherionmc.modutils.orion" version "1.0.28" +- id "com.hypherionmc.modutils.orion.origami" version "1.0.28" apply false ++ id "com.hypherionmc.modutils.orion" version "1.0.24" ++ id "com.hypherionmc.modutils.orion.origami" version "1.0.24" apply false id 'maven-publish' } diff --git a/patches/1.20/gradle.properties.patch b/patches/1.20/gradle.properties.patch index a636f1e..ffd2394 100644 --- a/patches/1.20/gradle.properties.patch +++ b/patches/1.20/gradle.properties.patch @@ -4,13 +4,13 @@ mod_name=CraterLib # Shared --minecraft_version=25w17a +-minecraft_version=1.21.6 +minecraft_version=1.20 project_group=com.hypherionmc.craterlib # Fabric -fabric_loader=0.16.13 --fabric_api=0.119.10+1.21.6 +-fabric_api=0.126.0+1.21.6 +fabric_loader=0.15.11 +fabric_api=0.83.0+1.20 diff --git a/patches/1.20/gradle/wrapper/gradle-wrapper.properties.patch b/patches/1.20/gradle/wrapper/gradle-wrapper.properties.patch new file mode 100644 index 0000000..a73508b --- /dev/null +++ b/patches/1.20/gradle/wrapper/gradle-wrapper.properties.patch @@ -0,0 +1,9 @@ +--- a/gradle/wrapper/gradle-wrapper.properties ++++ b/gradle/wrapper/gradle-wrapper.properties +@@ -1,5 +1,5 @@ + distributionBase=GRADLE_USER_HOME + distributionPath=wrapper/dists +-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip ++distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip + zipStoreBase=GRADLE_USER_HOME + zipStorePath=wrapper/dists diff --git a/patches/1.20/settings.gradle.patch b/patches/1.20/settings.gradle.patch index 2fabd8f..77df3fd 100644 --- a/patches/1.20/settings.gradle.patch +++ b/patches/1.20/settings.gradle.patch @@ -5,9 +5,8 @@ } -rootProject.name = 'CraterLib' --include("Common", "Fabric"/*, "NeoForge"*/) --//include 'Paper' -- +-include("Common", "Fabric", "NeoForge") +rootProject.name = 'CraterLib-1.20' +include("Common", "Fabric", "Forge") -+include 'Paper' + include 'Paper' +- diff --git a/patches/1.21.2/.jenkins/Jenkinsfile.snapshot.patch b/patches/1.21.2/.jenkins/Jenkinsfile.snapshot.patch index 9b9b808..4fe6be4 100644 --- a/patches/1.21.2/.jenkins/Jenkinsfile.snapshot.patch +++ b/patches/1.21.2/.jenkins/Jenkinsfile.snapshot.patch @@ -7,7 +7,7 @@ -def majorMc = "1.21.6"; +def majorMc = "1.21.2"; def modLoaders = "neoforge|fabric|quilt|paper"; --def supportedMc = "25w17a"; +-def supportedMc = "25w19a"; -def reltype = "experimental"; +def supportedMc = "1.21.3|1.21.4"; +def reltype = "snapshot"; diff --git a/patches/1.21.2/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch b/patches/1.21.2/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch index 4f50ed7..3895d61 100644 --- a/patches/1.21.2/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch +++ b/patches/1.21.2/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch @@ -1,6 +1,26 @@ --- a/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java +++ b/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java -@@ -25,7 +25,7 @@ +@@ -1,11 +1,8 @@ + package com.hypherionmc.craterlib.utils; + +-import com.google.gson.JsonElement; +-import com.google.gson.JsonParseException; + import com.hypherionmc.craterlib.core.platform.CommonPlatform; + import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment; + import com.hypherionmc.craterlib.nojang.resources.ResourceIdentifier; +-import com.mojang.serialization.JsonOps; + import lombok.Getter; + import me.hypherionmc.mcdiscordformatter.discord.DiscordSerializer; + import me.hypherionmc.mcdiscordformatter.minecraft.MinecraftSerializer; +@@ -22,36 +19,26 @@ + import net.minecraft.core.HolderLookup; + import net.minecraft.core.RegistryAccess; + import net.minecraft.network.chat.Component; +-import net.minecraft.network.chat.ComponentSerialization; + import net.minecraft.network.chat.Style; +-import net.minecraft.util.StrictJsonParser; + + public class ChatUtils { @Getter private static final GsonComponentSerializer adventureSerializer = GsonComponentSerializer.builder().options( @@ -9,3 +29,28 @@ ).build(); private static final MiniMessage miniMessage = MiniMessage.miniMessage(); + + public static Component adventureToMojang(net.kyori.adventure.text.Component inComponent) { +- final JsonElement serialised = adventureSerializer.serializeToTree(inComponent); +- +- // FUCK YOU MOJANG. SERIOUSLY. FUCK OFF WITH THIS SHIT +- return ComponentSerialization.CODEC +- .parse(getRegistryLookup().createSerializationContext(JsonOps.INSTANCE), serialised) +- .getOrThrow(JsonParseException::new); ++ final String serialised = adventureSerializer.serialize(inComponent); ++ return Component.Serializer.fromJson(serialised, getRegistryLookup()); + } + + public static net.kyori.adventure.text.Component mojangToAdventure(Component inComponent) { + try { +- // FUCK YOU MOJANG. SERIOUSLY. FUCK OFF WITH THIS SHIT +- final JsonElement serialised = ComponentSerialization.CODEC +- .encodeStart(JsonOps.INSTANCE, inComponent) +- .getOrThrow(JsonParseException::new); +- +- return adventureSerializer.deserializeFromTree(serialised); ++ final String serialised = Component.Serializer.toJson(inComponent, getRegistryLookup()); ++ return adventureSerializer.deserialize(serialised); + } catch (Exception e) { + return net.kyori.adventure.text.Component.text(inComponent.getString()); + } diff --git a/patches/1.21.2/Fabric/src/main/java/com/hypherionmc/craterlib/network/CraterFabricNetworkHandler.java.patch b/patches/1.21.2/Fabric/src/main/java/com/hypherionmc/craterlib/network/CraterFabricNetworkHandler.java.patch new file mode 100644 index 0000000..ca994cc --- /dev/null +++ b/patches/1.21.2/Fabric/src/main/java/com/hypherionmc/craterlib/network/CraterFabricNetworkHandler.java.patch @@ -0,0 +1,11 @@ +--- a/Fabric/src/main/java/com/hypherionmc/craterlib/network/CraterFabricNetworkHandler.java ++++ b/Fabric/src/main/java/com/hypherionmc/craterlib/network/CraterFabricNetworkHandler.java +@@ -38,7 +38,7 @@ + } + + ServerPlayNetworking.registerGlobalReceiver(holder.getType(), +- (ServerPlayNetworking.PlayPayloadHandler>) (payload, context) -> context.player().getServer().execute(() -> ++ (ServerPlayNetworking.PlayPayloadHandler>) (payload, context) -> context.player().server.execute(() -> + holder.handler().accept( + new PacketContext<>(BridgedPlayer.of(context.player()), payload.packet(), side)))); + } diff --git a/patches/1.21.2/NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeCompatHelper.java.patch b/patches/1.21.2/NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeCompatHelper.java.patch deleted file mode 100644 index cc8cde4..0000000 --- a/patches/1.21.2/NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeCompatHelper.java.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeCompatHelper.java -+++ b/NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeCompatHelper.java -@@ -3,6 +3,7 @@ - import com.hypherionmc.craterlib.core.platform.CompatUtils; - import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment; - import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer; -+import net.kyori.adventure.text.Component; - import redstonedubstep.mods.vanishmod.VanishUtil; - import team.creative.playerrevive.api.IBleeding; - import team.creative.playerrevive.server.PlayerReviveServer; diff --git a/patches/1.21.2/Paper/build.gradle.patch b/patches/1.21.2/Paper/build.gradle.patch index f0d2cb2..5c1df7e 100644 --- a/patches/1.21.2/Paper/build.gradle.patch +++ b/patches/1.21.2/Paper/build.gradle.patch @@ -1,11 +1,14 @@ --- a/Paper/build.gradle +++ b/Paper/build.gradle -@@ -1,3 +1,5 @@ +@@ -1,5 +1,7 @@ +import io.papermc.paperweight.userdev.ReobfArtifactConfiguration + plugins { - id "io.papermc.paperweight.userdev" version "1.7.3" +- id "io.papermc.paperweight.userdev" version "2.0.0-beta.17" ++ id "io.papermc.paperweight.userdev" version "1.7.3" id "xyz.jpenilla.run-paper" version "2.3.0" + } + @@ -10,6 +12,8 @@ excludedResources = ["pack.mcmeta", "craterlib.mixins.json"] } @@ -20,7 +23,7 @@ compileTestJava.enabled = false -tasks.assemble { -- dependsOn(tasks.reobfJar) +- dependsOn(tasks.shadowJar) -} - publisher { diff --git a/patches/1.21.2/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperCompatHelper.java.patch b/patches/1.21.2/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperCompatHelper.java.patch deleted file mode 100644 index d65db6b..0000000 --- a/patches/1.21.2/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperCompatHelper.java.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperCompatHelper.java -+++ b/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperCompatHelper.java -@@ -4,6 +4,7 @@ - import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment; - import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer; - import com.hypherionmc.craterlib.utils.ChatUtils; -+import net.kyori.adventure.text.Component; - import org.bukkit.Bukkit; - import org.bukkit.entity.Player; - import org.bukkit.metadata.MetadataValue; diff --git a/patches/1.21.2/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperLoaderHelper.java.patch b/patches/1.21.2/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperLoaderHelper.java.patch new file mode 100644 index 0000000..667bba7 --- /dev/null +++ b/patches/1.21.2/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperLoaderHelper.java.patch @@ -0,0 +1,11 @@ +--- a/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperLoaderHelper.java ++++ b/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperLoaderHelper.java +@@ -30,7 +30,7 @@ + + @Override + public String getGameVersion() { +- return SharedConstants.getCurrentVersion().name(); ++ return SharedConstants.getCurrentVersion().getName(); + } + + @Override diff --git a/patches/1.21.2/build.gradle.patch b/patches/1.21.2/build.gradle.patch index e034cac..386513c 100644 --- a/patches/1.21.2/build.gradle.patch +++ b/patches/1.21.2/build.gradle.patch @@ -1,6 +1,15 @@ --- a/build.gradle +++ b/build.gradle -@@ -10,15 +10,10 @@ +@@ -3,22 +3,17 @@ + id 'com.github.johnrengelman.shadow' version '8.1.1' apply false + id "xyz.wagyourtail.unimined" version "1.3.9" apply false + id "com.hypherionmc.modutils.modpublisher" version "2.1.6" +- id "com.hypherionmc.modutils.orion" version "1.0.28" +- id "com.hypherionmc.modutils.orion.origami" version "1.0.28" apply false ++ id "com.hypherionmc.modutils.orion" version "1.0.24" ++ id "com.hypherionmc.modutils.orion.origami" version "1.0.24" apply false + id 'maven-publish' + } var relType = project.properties["releaseType"] ?: "${release_type}" diff --git a/patches/1.21.2/gradle.properties.patch b/patches/1.21.2/gradle.properties.patch index c391cb9..fa5c966 100644 --- a/patches/1.21.2/gradle.properties.patch +++ b/patches/1.21.2/gradle.properties.patch @@ -4,13 +4,13 @@ mod_name=CraterLib # Shared --minecraft_version=25w17a +-minecraft_version=1.21.6 +minecraft_version=1.21.3 project_group=com.hypherionmc.craterlib # Fabric -fabric_loader=0.16.13 --fabric_api=0.119.10+1.21.6 +-fabric_api=0.126.0+1.21.6 +fabric_loader=0.16.7 +fabric_api=0.107.3+1.21.3 diff --git a/patches/1.21.2/gradle/wrapper/gradle-wrapper.properties.patch b/patches/1.21.2/gradle/wrapper/gradle-wrapper.properties.patch new file mode 100644 index 0000000..a73508b --- /dev/null +++ b/patches/1.21.2/gradle/wrapper/gradle-wrapper.properties.patch @@ -0,0 +1,9 @@ +--- a/gradle/wrapper/gradle-wrapper.properties ++++ b/gradle/wrapper/gradle-wrapper.properties +@@ -1,5 +1,5 @@ + distributionBase=GRADLE_USER_HOME + distributionPath=wrapper/dists +-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip ++distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip + zipStoreBase=GRADLE_USER_HOME + zipStorePath=wrapper/dists diff --git a/patches/1.21.2/settings.gradle.patch b/patches/1.21.2/settings.gradle.patch index 40d3a7b..ce100fb 100644 --- a/patches/1.21.2/settings.gradle.patch +++ b/patches/1.21.2/settings.gradle.patch @@ -1,11 +1,7 @@ --- a/settings.gradle +++ b/settings.gradle -@@ -14,6 +14,5 @@ - } - +@@ -16,4 +16,3 @@ rootProject.name = 'CraterLib' --include("Common", "Fabric"/*, "NeoForge"*/) --//include 'Paper' + include("Common", "Fabric", "NeoForge") + include 'Paper' - -+include("Common", "Fabric", "NeoForge") -+include 'Paper' diff --git a/patches/1.21.5/.jenkins/Jenkinsfile.snapshot.patch b/patches/1.21.5/.jenkins/Jenkinsfile.snapshot.patch index a4584d2..0bffaa8 100644 --- a/patches/1.21.5/.jenkins/Jenkinsfile.snapshot.patch +++ b/patches/1.21.5/.jenkins/Jenkinsfile.snapshot.patch @@ -7,7 +7,7 @@ -def majorMc = "1.21.6"; +def majorMc = "1.21.5"; def modLoaders = "neoforge|fabric|quilt|paper"; --def supportedMc = "25w17a"; +-def supportedMc = "25w19a"; -def reltype = "experimental"; +def supportedMc = "1.21.5"; +def reltype = "snapshot"; diff --git a/patches/1.21.5/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch b/patches/1.21.5/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch index 4f50ed7..3895d61 100644 --- a/patches/1.21.5/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch +++ b/patches/1.21.5/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch @@ -1,6 +1,26 @@ --- a/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java +++ b/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java -@@ -25,7 +25,7 @@ +@@ -1,11 +1,8 @@ + package com.hypherionmc.craterlib.utils; + +-import com.google.gson.JsonElement; +-import com.google.gson.JsonParseException; + import com.hypherionmc.craterlib.core.platform.CommonPlatform; + import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment; + import com.hypherionmc.craterlib.nojang.resources.ResourceIdentifier; +-import com.mojang.serialization.JsonOps; + import lombok.Getter; + import me.hypherionmc.mcdiscordformatter.discord.DiscordSerializer; + import me.hypherionmc.mcdiscordformatter.minecraft.MinecraftSerializer; +@@ -22,36 +19,26 @@ + import net.minecraft.core.HolderLookup; + import net.minecraft.core.RegistryAccess; + import net.minecraft.network.chat.Component; +-import net.minecraft.network.chat.ComponentSerialization; + import net.minecraft.network.chat.Style; +-import net.minecraft.util.StrictJsonParser; + + public class ChatUtils { @Getter private static final GsonComponentSerializer adventureSerializer = GsonComponentSerializer.builder().options( @@ -9,3 +29,28 @@ ).build(); private static final MiniMessage miniMessage = MiniMessage.miniMessage(); + + public static Component adventureToMojang(net.kyori.adventure.text.Component inComponent) { +- final JsonElement serialised = adventureSerializer.serializeToTree(inComponent); +- +- // FUCK YOU MOJANG. SERIOUSLY. FUCK OFF WITH THIS SHIT +- return ComponentSerialization.CODEC +- .parse(getRegistryLookup().createSerializationContext(JsonOps.INSTANCE), serialised) +- .getOrThrow(JsonParseException::new); ++ final String serialised = adventureSerializer.serialize(inComponent); ++ return Component.Serializer.fromJson(serialised, getRegistryLookup()); + } + + public static net.kyori.adventure.text.Component mojangToAdventure(Component inComponent) { + try { +- // FUCK YOU MOJANG. SERIOUSLY. FUCK OFF WITH THIS SHIT +- final JsonElement serialised = ComponentSerialization.CODEC +- .encodeStart(JsonOps.INSTANCE, inComponent) +- .getOrThrow(JsonParseException::new); +- +- return adventureSerializer.deserializeFromTree(serialised); ++ final String serialised = Component.Serializer.toJson(inComponent, getRegistryLookup()); ++ return adventureSerializer.deserialize(serialised); + } catch (Exception e) { + return net.kyori.adventure.text.Component.text(inComponent.getString()); + } diff --git a/patches/1.21.5/Fabric/src/main/java/com/hypherionmc/craterlib/network/CraterFabricNetworkHandler.java.patch b/patches/1.21.5/Fabric/src/main/java/com/hypherionmc/craterlib/network/CraterFabricNetworkHandler.java.patch new file mode 100644 index 0000000..ca994cc --- /dev/null +++ b/patches/1.21.5/Fabric/src/main/java/com/hypherionmc/craterlib/network/CraterFabricNetworkHandler.java.patch @@ -0,0 +1,11 @@ +--- a/Fabric/src/main/java/com/hypherionmc/craterlib/network/CraterFabricNetworkHandler.java ++++ b/Fabric/src/main/java/com/hypherionmc/craterlib/network/CraterFabricNetworkHandler.java +@@ -38,7 +38,7 @@ + } + + ServerPlayNetworking.registerGlobalReceiver(holder.getType(), +- (ServerPlayNetworking.PlayPayloadHandler>) (payload, context) -> context.player().getServer().execute(() -> ++ (ServerPlayNetworking.PlayPayloadHandler>) (payload, context) -> context.player().server.execute(() -> + holder.handler().accept( + new PacketContext<>(BridgedPlayer.of(context.player()), payload.packet(), side)))); + } diff --git a/patches/1.21.5/NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeCompatHelper.java.patch b/patches/1.21.5/NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeCompatHelper.java.patch deleted file mode 100644 index cc8cde4..0000000 --- a/patches/1.21.5/NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeCompatHelper.java.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeCompatHelper.java -+++ b/NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeCompatHelper.java -@@ -3,6 +3,7 @@ - import com.hypherionmc.craterlib.core.platform.CompatUtils; - import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment; - import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer; -+import net.kyori.adventure.text.Component; - import redstonedubstep.mods.vanishmod.VanishUtil; - import team.creative.playerrevive.api.IBleeding; - import team.creative.playerrevive.server.PlayerReviveServer; diff --git a/patches/1.21.5/Paper/build.gradle.patch b/patches/1.21.5/Paper/build.gradle.patch index 1bac6a4..b72244a 100644 --- a/patches/1.21.5/Paper/build.gradle.patch +++ b/patches/1.21.5/Paper/build.gradle.patch @@ -2,11 +2,20 @@ +++ b/Paper/build.gradle @@ -1,5 +1,5 @@ plugins { -- id "io.papermc.paperweight.userdev" version "1.7.3" +- id "io.papermc.paperweight.userdev" version "2.0.0-beta.17" + id "io.papermc.paperweight.userdev" version "1.7.7" id "xyz.jpenilla.run-paper" version "2.3.0" } +@@ -56,7 +56,7 @@ + compileTestJava.enabled = false + + tasks.assemble { +- dependsOn(tasks.shadowJar) ++ dependsOn(tasks.reobfJar) + } + + publisher { @@ -68,8 +68,8 @@ setVersionType("alpha") setChangelog(rootProject.file("changelog.md")) diff --git a/patches/1.19.3/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperCompatHelper.java.patch b/patches/1.21.5/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperCompatHelper.java.patch similarity index 88% rename from patches/1.19.3/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperCompatHelper.java.patch rename to patches/1.21.5/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperCompatHelper.java.patch index d65db6b..fc1c358 100644 --- a/patches/1.19.3/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperCompatHelper.java.patch +++ b/patches/1.21.5/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperCompatHelper.java.patch @@ -1,10 +1,10 @@ --- a/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperCompatHelper.java +++ b/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperCompatHelper.java -@@ -4,6 +4,7 @@ +@@ -4,7 +4,6 @@ import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment; import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer; import com.hypherionmc.craterlib.utils.ChatUtils; -+import net.kyori.adventure.text.Component; +-import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.metadata.MetadataValue; diff --git a/patches/1.21.5/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperLoaderHelper.java.patch b/patches/1.21.5/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperLoaderHelper.java.patch new file mode 100644 index 0000000..667bba7 --- /dev/null +++ b/patches/1.21.5/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperLoaderHelper.java.patch @@ -0,0 +1,11 @@ +--- a/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperLoaderHelper.java ++++ b/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperLoaderHelper.java +@@ -30,7 +30,7 @@ + + @Override + public String getGameVersion() { +- return SharedConstants.getCurrentVersion().name(); ++ return SharedConstants.getCurrentVersion().getName(); + } + + @Override diff --git a/patches/1.21.5/build.gradle.patch b/patches/1.21.5/build.gradle.patch new file mode 100644 index 0000000..bdad432 --- /dev/null +++ b/patches/1.21.5/build.gradle.patch @@ -0,0 +1,13 @@ +--- a/build.gradle ++++ b/build.gradle +@@ -3,8 +3,8 @@ + id 'com.github.johnrengelman.shadow' version '8.1.1' apply false + id "xyz.wagyourtail.unimined" version "1.3.9" apply false + id "com.hypherionmc.modutils.modpublisher" version "2.1.6" +- id "com.hypherionmc.modutils.orion" version "1.0.28" +- id "com.hypherionmc.modutils.orion.origami" version "1.0.28" apply false ++ id "com.hypherionmc.modutils.orion" version "1.0.24" ++ id "com.hypherionmc.modutils.orion.origami" version "1.0.24" apply false + id 'maven-publish' + } + diff --git a/patches/1.21.5/gradle.properties.patch b/patches/1.21.5/gradle.properties.patch index d1021d9..ceb0f93 100644 --- a/patches/1.21.5/gradle.properties.patch +++ b/patches/1.21.5/gradle.properties.patch @@ -4,13 +4,13 @@ mod_name=CraterLib # Shared --minecraft_version=25w17a +-minecraft_version=1.21.6 +minecraft_version=1.21.5 project_group=com.hypherionmc.craterlib # Fabric -fabric_loader=0.16.13 --fabric_api=0.119.10+1.21.6 +-fabric_api=0.126.0+1.21.6 +fabric_loader=0.16.10 +fabric_api=0.119.5+1.21.5 diff --git a/patches/1.21.5/gradle/wrapper/gradle-wrapper.properties.patch b/patches/1.21.5/gradle/wrapper/gradle-wrapper.properties.patch new file mode 100644 index 0000000..a73508b --- /dev/null +++ b/patches/1.21.5/gradle/wrapper/gradle-wrapper.properties.patch @@ -0,0 +1,9 @@ +--- a/gradle/wrapper/gradle-wrapper.properties ++++ b/gradle/wrapper/gradle-wrapper.properties +@@ -1,5 +1,5 @@ + distributionBase=GRADLE_USER_HOME + distributionPath=wrapper/dists +-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip ++distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip + zipStoreBase=GRADLE_USER_HOME + zipStorePath=wrapper/dists diff --git a/patches/1.21.5/settings.gradle.patch b/patches/1.21.5/settings.gradle.patch index 52aaa25..03983e2 100644 --- a/patches/1.21.5/settings.gradle.patch +++ b/patches/1.21.5/settings.gradle.patch @@ -1,10 +1,9 @@ --- a/settings.gradle +++ b/settings.gradle -@@ -14,6 +14,5 @@ - } +@@ -15,5 +15,4 @@ rootProject.name = 'CraterLib' --include("Common", "Fabric"/*, "NeoForge"*/) -+include("Common", "Fabric", "NeoForge") - //include 'Paper' + include("Common", "Fabric", "NeoForge") +-include 'Paper' - ++//include 'Paper' diff --git a/patches/1.21/.jenkins/Jenkinsfile.snapshot.patch b/patches/1.21/.jenkins/Jenkinsfile.snapshot.patch index b66161e..16f0b50 100644 --- a/patches/1.21/.jenkins/Jenkinsfile.snapshot.patch +++ b/patches/1.21/.jenkins/Jenkinsfile.snapshot.patch @@ -7,7 +7,7 @@ -def majorMc = "1.21.6"; +def majorMc = "1.21"; def modLoaders = "neoforge|fabric|quilt|paper"; --def supportedMc = "25w17a"; +-def supportedMc = "25w19a"; -def reltype = "experimental"; +def supportedMc = "1.21|1.21.1"; +def reltype = "snapshot"; diff --git a/patches/1.21/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch b/patches/1.21/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch index 4f50ed7..3895d61 100644 --- a/patches/1.21/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch +++ b/patches/1.21/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch @@ -1,6 +1,26 @@ --- a/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java +++ b/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java -@@ -25,7 +25,7 @@ +@@ -1,11 +1,8 @@ + package com.hypherionmc.craterlib.utils; + +-import com.google.gson.JsonElement; +-import com.google.gson.JsonParseException; + import com.hypherionmc.craterlib.core.platform.CommonPlatform; + import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment; + import com.hypherionmc.craterlib.nojang.resources.ResourceIdentifier; +-import com.mojang.serialization.JsonOps; + import lombok.Getter; + import me.hypherionmc.mcdiscordformatter.discord.DiscordSerializer; + import me.hypherionmc.mcdiscordformatter.minecraft.MinecraftSerializer; +@@ -22,36 +19,26 @@ + import net.minecraft.core.HolderLookup; + import net.minecraft.core.RegistryAccess; + import net.minecraft.network.chat.Component; +-import net.minecraft.network.chat.ComponentSerialization; + import net.minecraft.network.chat.Style; +-import net.minecraft.util.StrictJsonParser; + + public class ChatUtils { @Getter private static final GsonComponentSerializer adventureSerializer = GsonComponentSerializer.builder().options( @@ -9,3 +29,28 @@ ).build(); private static final MiniMessage miniMessage = MiniMessage.miniMessage(); + + public static Component adventureToMojang(net.kyori.adventure.text.Component inComponent) { +- final JsonElement serialised = adventureSerializer.serializeToTree(inComponent); +- +- // FUCK YOU MOJANG. SERIOUSLY. FUCK OFF WITH THIS SHIT +- return ComponentSerialization.CODEC +- .parse(getRegistryLookup().createSerializationContext(JsonOps.INSTANCE), serialised) +- .getOrThrow(JsonParseException::new); ++ final String serialised = adventureSerializer.serialize(inComponent); ++ return Component.Serializer.fromJson(serialised, getRegistryLookup()); + } + + public static net.kyori.adventure.text.Component mojangToAdventure(Component inComponent) { + try { +- // FUCK YOU MOJANG. SERIOUSLY. FUCK OFF WITH THIS SHIT +- final JsonElement serialised = ComponentSerialization.CODEC +- .encodeStart(JsonOps.INSTANCE, inComponent) +- .getOrThrow(JsonParseException::new); +- +- return adventureSerializer.deserializeFromTree(serialised); ++ final String serialised = Component.Serializer.toJson(inComponent, getRegistryLookup()); ++ return adventureSerializer.deserialize(serialised); + } catch (Exception e) { + return net.kyori.adventure.text.Component.text(inComponent.getString()); + } diff --git a/patches/1.21/Fabric/src/main/java/com/hypherionmc/craterlib/network/CraterFabricNetworkHandler.java.patch b/patches/1.21/Fabric/src/main/java/com/hypherionmc/craterlib/network/CraterFabricNetworkHandler.java.patch new file mode 100644 index 0000000..ca994cc --- /dev/null +++ b/patches/1.21/Fabric/src/main/java/com/hypherionmc/craterlib/network/CraterFabricNetworkHandler.java.patch @@ -0,0 +1,11 @@ +--- a/Fabric/src/main/java/com/hypherionmc/craterlib/network/CraterFabricNetworkHandler.java ++++ b/Fabric/src/main/java/com/hypherionmc/craterlib/network/CraterFabricNetworkHandler.java +@@ -38,7 +38,7 @@ + } + + ServerPlayNetworking.registerGlobalReceiver(holder.getType(), +- (ServerPlayNetworking.PlayPayloadHandler>) (payload, context) -> context.player().getServer().execute(() -> ++ (ServerPlayNetworking.PlayPayloadHandler>) (payload, context) -> context.player().server.execute(() -> + holder.handler().accept( + new PacketContext<>(BridgedPlayer.of(context.player()), payload.packet(), side)))); + } diff --git a/patches/1.21/NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeCompatHelper.java.patch b/patches/1.21/NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeCompatHelper.java.patch deleted file mode 100644 index cc8cde4..0000000 --- a/patches/1.21/NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeCompatHelper.java.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeCompatHelper.java -+++ b/NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeCompatHelper.java -@@ -3,6 +3,7 @@ - import com.hypherionmc.craterlib.core.platform.CompatUtils; - import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment; - import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer; -+import net.kyori.adventure.text.Component; - import redstonedubstep.mods.vanishmod.VanishUtil; - import team.creative.playerrevive.api.IBleeding; - import team.creative.playerrevive.server.PlayerReviveServer; diff --git a/patches/1.21/Paper/build.gradle.patch b/patches/1.21/Paper/build.gradle.patch index 6c6d4b3..875b5fc 100644 --- a/patches/1.21/Paper/build.gradle.patch +++ b/patches/1.21/Paper/build.gradle.patch @@ -1,5 +1,21 @@ --- a/Paper/build.gradle +++ b/Paper/build.gradle +@@ -1,5 +1,5 @@ + plugins { +- id "io.papermc.paperweight.userdev" version "2.0.0-beta.17" ++ id "io.papermc.paperweight.userdev" version "1.7.3" + id "xyz.jpenilla.run-paper" version "2.3.0" + } + +@@ -56,7 +56,7 @@ + compileTestJava.enabled = false + + tasks.assemble { +- dependsOn(tasks.shadowJar) ++ dependsOn(tasks.reobfJar) + } + + publisher { @@ -68,8 +68,8 @@ setVersionType("alpha") setChangelog(rootProject.file("changelog.md")) diff --git a/patches/1.21/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperCompatHelper.java.patch b/patches/1.21/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperCompatHelper.java.patch deleted file mode 100644 index d65db6b..0000000 --- a/patches/1.21/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperCompatHelper.java.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperCompatHelper.java -+++ b/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperCompatHelper.java -@@ -4,6 +4,7 @@ - import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment; - import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer; - import com.hypherionmc.craterlib.utils.ChatUtils; -+import net.kyori.adventure.text.Component; - import org.bukkit.Bukkit; - import org.bukkit.entity.Player; - import org.bukkit.metadata.MetadataValue; diff --git a/patches/1.21/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperLoaderHelper.java.patch b/patches/1.21/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperLoaderHelper.java.patch new file mode 100644 index 0000000..667bba7 --- /dev/null +++ b/patches/1.21/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperLoaderHelper.java.patch @@ -0,0 +1,11 @@ +--- a/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperLoaderHelper.java ++++ b/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperLoaderHelper.java +@@ -30,7 +30,7 @@ + + @Override + public String getGameVersion() { +- return SharedConstants.getCurrentVersion().name(); ++ return SharedConstants.getCurrentVersion().getName(); + } + + @Override diff --git a/patches/1.21/build.gradle.patch b/patches/1.21/build.gradle.patch index c481f86..7c34913 100644 --- a/patches/1.21/build.gradle.patch +++ b/patches/1.21/build.gradle.patch @@ -1,6 +1,13 @@ --- a/build.gradle +++ b/build.gradle -@@ -8,21 +8,15 @@ +@@ -3,26 +3,20 @@ + id 'com.github.johnrengelman.shadow' version '8.1.1' apply false + id "xyz.wagyourtail.unimined" version "1.3.9" apply false + id "com.hypherionmc.modutils.modpublisher" version "2.1.6" +- id "com.hypherionmc.modutils.orion" version "1.0.28" +- id "com.hypherionmc.modutils.orion.origami" version "1.0.28" apply false ++ id "com.hypherionmc.modutils.orion" version "1.0.24" ++ id "com.hypherionmc.modutils.orion.origami" version "1.0.24" apply false id 'maven-publish' } diff --git a/patches/1.21/gradle.properties.patch b/patches/1.21/gradle.properties.patch index a6c33fd..0da92d7 100644 --- a/patches/1.21/gradle.properties.patch +++ b/patches/1.21/gradle.properties.patch @@ -4,13 +4,13 @@ mod_name=CraterLib # Shared --minecraft_version=25w17a +-minecraft_version=1.21.6 +minecraft_version=1.21 project_group=com.hypherionmc.craterlib # Fabric -fabric_loader=0.16.13 --fabric_api=0.119.10+1.21.6 +-fabric_api=0.126.0+1.21.6 +fabric_loader=0.15.11 +fabric_api=0.100.1+1.21 diff --git a/patches/1.21/gradle/wrapper/gradle-wrapper.properties.patch b/patches/1.21/gradle/wrapper/gradle-wrapper.properties.patch new file mode 100644 index 0000000..a73508b --- /dev/null +++ b/patches/1.21/gradle/wrapper/gradle-wrapper.properties.patch @@ -0,0 +1,9 @@ +--- a/gradle/wrapper/gradle-wrapper.properties ++++ b/gradle/wrapper/gradle-wrapper.properties +@@ -1,5 +1,5 @@ + distributionBase=GRADLE_USER_HOME + distributionPath=wrapper/dists +-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip ++distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip + zipStoreBase=GRADLE_USER_HOME + zipStorePath=wrapper/dists diff --git a/patches/1.21/settings.gradle.patch b/patches/1.21/settings.gradle.patch index 40d3a7b..ce100fb 100644 --- a/patches/1.21/settings.gradle.patch +++ b/patches/1.21/settings.gradle.patch @@ -1,11 +1,7 @@ --- a/settings.gradle +++ b/settings.gradle -@@ -14,6 +14,5 @@ - } - +@@ -16,4 +16,3 @@ rootProject.name = 'CraterLib' --include("Common", "Fabric"/*, "NeoForge"*/) --//include 'Paper' + include("Common", "Fabric", "NeoForge") + include 'Paper' - -+include("Common", "Fabric", "NeoForge") -+include 'Paper'