diff --git a/build.gradle.kts b/build.gradle.kts index d248c63..4f21d3c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,30 +3,20 @@ import net.fabricmc.loom.api.LoomGradleExtensionAPI plugins { java id("architectury-plugin") version "3.4-SNAPSHOT" - id("dev.architectury.loom") version "1.6-SNAPSHOT" apply false - id("com.github.johnrengelman.shadow") version "8.1.1" apply false + id("dev.architectury.loom") version "1.7-SNAPSHOT" apply false + id("com.gradleup.shadow") version "8.3.5" apply false } val modVersion: String by extra val minecraftVersion: String by extra -val minecraftVersionRange: String by extra architectury { minecraft = minecraftVersion } -allprojects { - apply(plugin = "java") - - val versionArray = minecraftVersionRange.split(",") - version = "$modVersion-${versionArray[0]}-to-${versionArray[1]}" - group = "dev.tonimatas.packetfixer" -} - - subprojects { apply(plugin = "dev.architectury.loom") - apply(plugin = "architectury-plugin") + apply(plugin = "com.gradleup.shadow") base { archivesName.set("packetfixer-" + project.name) @@ -40,8 +30,17 @@ subprojects { "minecraft"("com.mojang:minecraft:$minecraftVersion") "mappings"(project.the().officialMojangMappings()) } - +} + +allprojects { + apply(plugin = "java") + apply(plugin = "architectury-plugin") + + version = "$modVersion-$minecraftVersion" + group = "dev.tonimatas" + tasks.withType { + options.encoding = "UTF-8" options.release.set(21) } diff --git a/common/build.gradle.kts b/common/build.gradle.kts index b799fac..ee08b8e 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -1,7 +1,7 @@ val fabricLoaderVersion: String by extra architectury { - common("fabric", /*"forge",*/ "neoforge") + common("fabric", "neoforge") } dependencies { diff --git a/common/src/main/java/dev/tonimatas/packetfixer/mixins/CompressionDecoderMixin.java b/common/src/main/java/dev/tonimatas/packetfixer/mixins/CompressionDecoderMixin.java index f2c99d2..f10a2ee 100644 --- a/common/src/main/java/dev/tonimatas/packetfixer/mixins/CompressionDecoderMixin.java +++ b/common/src/main/java/dev/tonimatas/packetfixer/mixins/CompressionDecoderMixin.java @@ -3,8 +3,7 @@ import dev.tonimatas.packetfixer.util.Config; import net.minecraft.network.CompressionDecoder; import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.Constant; -import org.spongepowered.asm.mixin.injection.ModifyConstant; +import org.spongepowered.asm.mixin.injection.*; @Mixin(value = CompressionDecoder.class, priority = 9999) public class CompressionDecoderMixin { diff --git a/common/src/main/java/dev/tonimatas/packetfixer/mixins/CompressionEncoderMixin.java b/common/src/main/java/dev/tonimatas/packetfixer/mixins/CompressionEncoderMixin.java index d203323..3f31479 100644 --- a/common/src/main/java/dev/tonimatas/packetfixer/mixins/CompressionEncoderMixin.java +++ b/common/src/main/java/dev/tonimatas/packetfixer/mixins/CompressionEncoderMixin.java @@ -3,7 +3,9 @@ import dev.tonimatas.packetfixer.util.Config; import net.minecraft.network.CompressionEncoder; import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Constant; +import org.spongepowered.asm.mixin.injection.ModifyArg; import org.spongepowered.asm.mixin.injection.ModifyConstant; @Mixin(value = CompressionEncoder.class, priority = 9999) @@ -12,4 +14,9 @@ public class CompressionEncoderMixin { private int newSize(int value) { return Config.getDecoderSize(); } + + @ModifyArg(method = "encode(Lio/netty/channel/ChannelHandlerContext;Lio/netty/buffer/ByteBuf;Lio/netty/buffer/ByteBuf;)V", at = @At(value = "INVOKE", target = "Ljava/lang/IllegalArgumentException;(Ljava/lang/String;)V")) + private String newSizeString(String value) { + return value.replaceAll("8388608", String.valueOf(Config.getDecoderSize())) + ". You can modify it in the Packet Fixer config."; + } } diff --git a/fabric/src/main/resources/assets/packetfixer/icon.png b/common/src/main/resources/icon.png similarity index 100% rename from fabric/src/main/resources/assets/packetfixer/icon.png rename to common/src/main/resources/icon.png diff --git a/fabric/build.gradle.kts b/fabric/build.gradle.kts index cc172f1..3dfb2e0 100644 --- a/fabric/build.gradle.kts +++ b/fabric/build.gradle.kts @@ -1,12 +1,5 @@ -@file:Suppress("DEPRECATION", "HasPlatformType") - import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar import net.fabricmc.loom.task.RemapJarTask -import org.gradle.api.component.AdhocComponentWithVariants - -plugins { - id("com.github.johnrengelman.shadow") -} architectury { platformSetupLoomIde() @@ -14,12 +7,11 @@ architectury { } val minecraftVersion: String by extra -val minecraftVersionRange: String by extra val fabricLoaderVersion: String by extra val modVersion: String by extra -val common by configurations.creating -val shadowCommon by configurations.creating +val common: Configuration by configurations.creating +val shadowCommon: Configuration by configurations.creating configurations["compileClasspath"].extendsFrom(common) configurations["runtimeClasspath"].extendsFrom(common) @@ -33,7 +25,7 @@ dependencies { } tasks.withType { - val replaceProperties = mapOf("modVersion" to modVersion, "minimumMinecraftVersion" to minecraftVersionRange.split(",")[0], "minecraftVersion" to minecraftVersion) + val replaceProperties = mapOf("modVersion" to modVersion, "minecraftVersion" to minecraftVersion) inputs.properties(replaceProperties) @@ -49,5 +41,5 @@ tasks.withType { tasks.withType { val shadowTask = tasks.shadowJar.get() - input.set(shadowTask.archiveFile) + inputFile.set(shadowTask.archiveFile) } diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index 2a569df..5e4a4f4 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -11,7 +11,7 @@ "repo": "https://github.com/TonimatasDEV/PacketFixer" }, "license": "MIT", - "icon": "assets/packetfixer/icon.png", + "icon": "icon.png", "environment": "*", "entrypoints": { "main": [ @@ -24,6 +24,6 @@ ], "depends": { "fabricloader": "*", - "minecraft": ">=${minimumMinecraftVersion} <=${minecraftVersion}" + "minecraft": "${minecraftVersion}" } } diff --git a/fabric/src/main/resources/packetfixer-fabric.mixins.json b/fabric/src/main/resources/packetfixer-fabric.mixins.json index e470a93..fddb810 100644 --- a/fabric/src/main/resources/packetfixer-fabric.mixins.json +++ b/fabric/src/main/resources/packetfixer-fabric.mixins.json @@ -1,7 +1,7 @@ { "required": true, "minVersion": "0.8", - "package": "dev.tonimatas.packetfixer.mixin", + "package": "dev.tonimatas.packetfixer.mixins", "compatibilityLevel": "JAVA_21", "mixins": [ ], diff --git a/forge/build.gradle.kts b/forge/build.gradle.kts deleted file mode 100644 index b6367b6..0000000 --- a/forge/build.gradle.kts +++ /dev/null @@ -1,61 +0,0 @@ -@file:Suppress("DEPRECATION") - -import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar -import net.fabricmc.loom.task.RemapJarTask -import org.gradle.api.component.AdhocComponentWithVariants - -plugins { - id("com.github.johnrengelman.shadow") -} - -val modVersion: String by extra -val minecraftVersion: String by extra -val minecraftVersionRange: String by extra -val forgeVersion: String by extra - -architectury { - platformSetupLoomIde() - forge() -} - -loom { - forge { - mixinConfig("packetfixer-common.mixins.json") - mixinConfig("packetfixer-forge.mixins.json") - } -} - -val common by configurations.creating -val shadowCommon by configurations.creating - -configurations["compileClasspath"].extendsFrom(common) -configurations["runtimeClasspath"].extendsFrom(common) -configurations["developmentForge"].extendsFrom(common) - -dependencies { - forge("net.minecraftforge:forge:$minecraftVersion-$forgeVersion") - - common(project(path = ":common", configuration = "namedElements")) { isTransitive = false } - shadowCommon(project(path = ":common", configuration = "transformProductionForge")) { isTransitive = false } -} - -tasks.withType { - val replaceProperties = mapOf("minecraftVersionRange" to minecraftVersionRange, "modVersion" to modVersion) - inputs.properties(replaceProperties) - - filesMatching("META-INF/mods.toml") { - expand(replaceProperties) - } -} - -tasks.withType { - exclude("fabric.mod.json") - - configurations = listOf(shadowCommon) - archiveClassifier.set("dev-shadow") -} - -tasks.withType { - val shadowTask = tasks.shadowJar.get() - input.set(shadowTask.archiveFile) -} \ No newline at end of file diff --git a/forge/gradle.properties b/forge/gradle.properties deleted file mode 100644 index 32f842a..0000000 --- a/forge/gradle.properties +++ /dev/null @@ -1 +0,0 @@ -loom.platform=forge \ No newline at end of file diff --git a/forge/src/main/java/dev/tonimatas/packetfixer/PacketFixerForge.java b/forge/src/main/java/dev/tonimatas/packetfixer/PacketFixerForge.java deleted file mode 100644 index f5f4ad4..0000000 --- a/forge/src/main/java/dev/tonimatas/packetfixer/PacketFixerForge.java +++ /dev/null @@ -1,10 +0,0 @@ -package dev.tonimatas.packetfixer; - -import net.minecraftforge.fml.common.Mod; - -@Mod(PacketFixer.MOD_ID) -public class PacketFixerForge { - public PacketFixerForge() { - PacketFixer.init(); - } -} diff --git a/forge/src/main/java/dev/tonimatas/packetfixer/mixin/MixinConfigPluginForge.java b/forge/src/main/java/dev/tonimatas/packetfixer/mixin/MixinConfigPluginForge.java deleted file mode 100644 index 29cad6f..0000000 --- a/forge/src/main/java/dev/tonimatas/packetfixer/mixin/MixinConfigPluginForge.java +++ /dev/null @@ -1,46 +0,0 @@ -package dev.tonimatas.packetfixer.mixin; - -import org.objectweb.asm.tree.ClassNode; -import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin; -import org.spongepowered.asm.mixin.extensibility.IMixinInfo; - -import java.util.List; -import java.util.Set; - -public class MixinConfigPluginForge implements IMixinConfigPlugin { - - @Override - public void onLoad(String mixinPackage) { - System.getProperties().setProperty("forge.disablePacketCompressionDebug", "true"); - } - - @Override - public String getRefMapperConfig() { - return null; - } - - @Override - public boolean shouldApplyMixin(String targetClassName, String mixinClassName) { - return true; - } - - @Override - public void acceptTargets(Set myTargets, Set otherTargets) { - - } - - @Override - public List getMixins() { - return null; - } - - @Override - public void preApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) { - - } - - @Override - public void postApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) { - - } -} diff --git a/forge/src/main/java/dev/tonimatas/packetfixer/util/forge/HooksImpl.java b/forge/src/main/java/dev/tonimatas/packetfixer/util/forge/HooksImpl.java deleted file mode 100644 index 578a525..0000000 --- a/forge/src/main/java/dev/tonimatas/packetfixer/util/forge/HooksImpl.java +++ /dev/null @@ -1,10 +0,0 @@ -package dev.tonimatas.packetfixer.util.forge; - -import net.minecraftforge.fml.loading.FMLLoader; - -@SuppressWarnings("unused") -public class HooksImpl { - public static boolean isModLoaded(String modId) { - return FMLLoader.getLoadingModList().getModFileById(modId) != null; - } -} diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml deleted file mode 100644 index cfddaff..0000000 --- a/forge/src/main/resources/META-INF/mods.toml +++ /dev/null @@ -1,29 +0,0 @@ -modLoader="javafml" -loaderVersion="[0,)" -license="MIT" -issueTrackerURL="https://github.com/TonimatasDEV/PacketFixer/issues" - -[[mods]] -modId="packetfixer" -version="${modVersion}" -displayName="Packet Fixer" -logoFile="icon.png" -updateJSONURL="https://api.modrinth.com/updates/packet-fixer/forge_updates.json" -authors="TonimatasDEV" -description=''' -A simple mod to solve various problems with packets/NBT's. -''' - -[[dependencies.packetfixer]] -modId="forge" -mandatory=true -versionRange="[0,)" -ordering="NONE" -side="BOTH" - -[[dependencies.packetfixer]] -modId="minecraft" -mandatory=true -versionRange="[${minecraftVersionRange}]" -ordering="NONE" -side="BOTH" diff --git a/forge/src/main/resources/icon.png b/forge/src/main/resources/icon.png deleted file mode 100644 index dc341c2..0000000 Binary files a/forge/src/main/resources/icon.png and /dev/null differ diff --git a/forge/src/main/resources/pack.mcmeta b/forge/src/main/resources/pack.mcmeta deleted file mode 100644 index 676df77..0000000 --- a/forge/src/main/resources/pack.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "pack": { - "description": "Packet Fixer resources", - "pack_format": 9 - } -} diff --git a/forge/src/main/resources/packetfixer-forge.mixins.json b/forge/src/main/resources/packetfixer-forge.mixins.json deleted file mode 100644 index 843fd56..0000000 --- a/forge/src/main/resources/packetfixer-forge.mixins.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "required": true, - "minVersion": "0.8", - "package": "dev.tonimatas.packetfixer.mixin", - "compatibilityLevel": "JAVA_21", - "plugin": "dev.tonimatas.packetfixer.mixin.MixinConfigPluginForge", - "injectors": { - "defaultRequire": 1 - }, - "mixins": [ - ] -} diff --git a/gradle.properties b/gradle.properties index fa534f2..9b8f5e0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,18 +1,17 @@ org.gradle.jvmargs=-Xmx5G # Mod Properties -modVersion=1.4.2 +modVersion=1.5.0 # Minecraft -minecraftVersion=1.21.3 -minecraftVersionRange=1.21,1.21.3 +minecraftVersion=1.21.4 # Forge Properties #forgeVersion=51.0.18 # Fabric Properties -fabricLoaderVersion=0.16.7 +fabricLoaderVersion=0.16.9 yarnMappings=1 # NeoForge Properties -neoforgeVersion=21.3.0-beta \ No newline at end of file +neoforgeVersion=21.4.7-beta \ No newline at end of file diff --git a/neoforge/build.gradle.kts b/neoforge/build.gradle.kts index 538f34e..7ba5cc1 100644 --- a/neoforge/build.gradle.kts +++ b/neoforge/build.gradle.kts @@ -1,14 +1,7 @@ -@file:Suppress("DEPRECATION", "UnstableApiUsage") - import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar import net.fabricmc.loom.task.RemapJarTask -plugins { - id("com.github.johnrengelman.shadow") -} - val minecraftVersion: String by extra -val minecraftVersionRange: String by extra val neoforgeVersion: String by extra val modVersion: String by extra @@ -17,8 +10,8 @@ architectury { neoForge() } -val common by configurations.creating -val shadowCommon by configurations.creating +val common: Configuration by configurations.creating +val shadowCommon: Configuration by configurations.creating configurations["compileClasspath"].extendsFrom(common) configurations["runtimeClasspath"].extendsFrom(common) @@ -36,11 +29,7 @@ dependencies { } tasks.withType { - val versionRangeSplit = minecraftVersionRange.split(",") - var versionRange = minecraftVersionRange - if (versionRangeSplit[0] == versionRangeSplit[1]) versionRange = versionRangeSplit[0] - - val replaceProperties = mapOf("minecraftVersionRange" to versionRange, "modVersion" to modVersion) + val replaceProperties = mapOf("minecraftVersion" to minecraftVersion, "modVersion" to modVersion) inputs.properties(replaceProperties) filesMatching("META-INF/neoforge.mods.toml") { @@ -55,5 +44,5 @@ tasks.withType { tasks.withType { val shadowTask = tasks.shadowJar.get() - input.set(shadowTask.archiveFile) + inputFile.set(shadowTask.archiveFile) } diff --git a/neoforge/src/main/java/dev/tonimatas/packetfixer/mixin/MixinConfigPluginNeoForge.java b/neoforge/src/main/java/dev/tonimatas/packetfixer/mixins/MixinConfigPluginNeoForge.java similarity index 96% rename from neoforge/src/main/java/dev/tonimatas/packetfixer/mixin/MixinConfigPluginNeoForge.java rename to neoforge/src/main/java/dev/tonimatas/packetfixer/mixins/MixinConfigPluginNeoForge.java index 3ddbed4..09f839c 100644 --- a/neoforge/src/main/java/dev/tonimatas/packetfixer/mixin/MixinConfigPluginNeoForge.java +++ b/neoforge/src/main/java/dev/tonimatas/packetfixer/mixins/MixinConfigPluginNeoForge.java @@ -1,4 +1,4 @@ -package dev.tonimatas.packetfixer.mixin; +package dev.tonimatas.packetfixer.mixins; import org.objectweb.asm.tree.ClassNode; import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin; diff --git a/neoforge/src/main/resources/META-INF/neoforge.mods.toml b/neoforge/src/main/resources/META-INF/neoforge.mods.toml index 5592de1..4ed1a7d 100644 --- a/neoforge/src/main/resources/META-INF/neoforge.mods.toml +++ b/neoforge/src/main/resources/META-INF/neoforge.mods.toml @@ -14,7 +14,7 @@ modId="packetfixer" version="${modVersion}" displayName="Packet Fixer" logoFile="icon.png" -updateJSONURL="https://api.modrinth.com/updates/packet-fixer/forge_updates.json" +#updateJSONURL="https://api.modrinth.com/updates/packet-fixer/forge_updates.json" authors="TonimatasDEV" description=''' A simple mod to solve various problems with packets/NBT's. @@ -30,6 +30,6 @@ side="BOTH" [[dependencies.packetfixer]] modId="minecraft" type="required" -versionRange="[${minecraftVersionRange}]" +versionRange="[${minecraftVersion}]" ordering="NONE" side="BOTH" \ No newline at end of file diff --git a/neoforge/src/main/resources/icon.png b/neoforge/src/main/resources/icon.png deleted file mode 100644 index dc341c2..0000000 Binary files a/neoforge/src/main/resources/icon.png and /dev/null differ diff --git a/neoforge/src/main/resources/packetfixer-neoforge.mixins.json b/neoforge/src/main/resources/packetfixer-neoforge.mixins.json index 58fa0a3..263c2bc 100644 --- a/neoforge/src/main/resources/packetfixer-neoforge.mixins.json +++ b/neoforge/src/main/resources/packetfixer-neoforge.mixins.json @@ -1,9 +1,9 @@ { "required": true, "minVersion": "0.8", - "package": "dev.tonimatas.packetfixer.mixin", + "package": "dev.tonimatas.packetfixer.mixins", "compatibilityLevel": "JAVA_21", - "plugin": "dev.tonimatas.packetfixer.mixin.MixinConfigPluginNeoForge", + "plugin": "dev.tonimatas.packetfixer.mixins.MixinConfigPluginNeoForge", "injectors": { "defaultRequire": 1 }, diff --git a/settings.gradle.kts b/settings.gradle.kts index 34a01f4..6a645ef 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -7,5 +7,5 @@ pluginManagement { } } -include("common", "fabric", /*"forge",*/ "neoforge") +include("common", "fabric", "neoforge") rootProject.name = "PacketFixer"