From 0bab3aba474d2685d5d6c32ffa6161753a5435c0 Mon Sep 17 00:00:00 2001 From: UnsafeDodo Date: Sat, 14 Oct 2023 08:44:05 +0200 Subject: [PATCH 1/3] Prepare upgrade 1.20.1 --- build.gradle | 5 +++++ gradle.properties | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 7b3fbf6..8c07549 100644 --- a/build.gradle +++ b/build.gradle @@ -22,6 +22,10 @@ repositories { includeGroup("curse.maven") } } + + /*maven { + url = "https://api.modrinth.com/maven" + }*/ } loom { @@ -47,6 +51,7 @@ dependencies { include(modImplementation('me.lucko:fabric-permissions-api:0.2-SNAPSHOT')) + //modImplementation("maven.modrinth:cobblemon:${property("cobblemon_modrinth_file_id")}") modImplementation("curse.maven:cobblemon-687131:${property("cobblemon_curse_file_id")}") } diff --git a/gradle.properties b/gradle.properties index decbf2e..d2be1fb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,4 +16,6 @@ archives_base_name=cobblemon-explock # Dependencies fabric_version=0.76.0+1.19.2 -cobblemon_curse_file_id=4468330 \ No newline at end of file +cobblemon_curse_file_id=4468330 + +#cobblemon_modrinth_file_id=YEzu8qAH \ No newline at end of file From 59e57106af5dc1cdfe71f5f041700f4221422b8e Mon Sep 17 00:00:00 2001 From: UnsafeDodo Date: Sat, 14 Oct 2023 08:57:26 +0200 Subject: [PATCH 2/3] Upgrade to 1.20.1 --- build.gradle | 12 ++---------- gradle.properties | 14 ++++++-------- .../command/ExpLockToggleCommand.java | 4 ++-- src/main/resources/fabric.mod.json | 4 ++-- 4 files changed, 12 insertions(+), 22 deletions(-) diff --git a/build.gradle b/build.gradle index 8c07549..fa3ae70 100644 --- a/build.gradle +++ b/build.gradle @@ -17,15 +17,8 @@ repositories { } maven { - url = uri("https://cursemaven.com") - content { - includeGroup("curse.maven") - } - } - - /*maven { url = "https://api.modrinth.com/maven" - }*/ + } } loom { @@ -51,8 +44,7 @@ dependencies { include(modImplementation('me.lucko:fabric-permissions-api:0.2-SNAPSHOT')) - //modImplementation("maven.modrinth:cobblemon:${property("cobblemon_modrinth_file_id")}") - modImplementation("curse.maven:cobblemon-687131:${property("cobblemon_curse_file_id")}") + modImplementation("maven.modrinth:cobblemon:${property("cobblemon_modrinth_file_id")}") } processResources { diff --git a/gradle.properties b/gradle.properties index d2be1fb..53c21a8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,18 +4,16 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=1.19.2 -yarn_mappings=1.19.2+build.28 -loader_version=0.14.21 +minecraft_version=1.20.1 +yarn_mappings=1.20.1+build.10 +loader_version=0.14.23 # Mod Properties -mod_version=1.0.0 +mod_version=1.0.0+1.20.1 maven_group=unsafedodo.cobblemonexplock archives_base_name=cobblemon-explock # Dependencies -fabric_version=0.76.0+1.19.2 +fabric_version=0.90.0+1.20.1 -cobblemon_curse_file_id=4468330 - -#cobblemon_modrinth_file_id=YEzu8qAH \ No newline at end of file +cobblemon_modrinth_file_id=YEzu8qAH \ No newline at end of file diff --git a/src/main/java/unsafedodo/cobblemonexplock/command/ExpLockToggleCommand.java b/src/main/java/unsafedodo/cobblemonexplock/command/ExpLockToggleCommand.java index 98a977c..f7b7622 100644 --- a/src/main/java/unsafedodo/cobblemonexplock/command/ExpLockToggleCommand.java +++ b/src/main/java/unsafedodo/cobblemonexplock/command/ExpLockToggleCommand.java @@ -31,9 +31,9 @@ private static int run(CommandContext context) { Pokemon pokemon = partyStore.get(slot); if(pokemon != null){ boolean state = ExpData.setExpState((IPokemonDataSaver) pokemon); - context.getSource().sendFeedback(Text.literal("Exp gain state for "+pokemon.getDisplayName().getString()+" changed to "+state).formatted(Formatting.GREEN), false); + context.getSource().sendFeedback(() -> Text.literal("Exp lock state for "+pokemon.getDisplayName().getString()+" changed to "+state).formatted(Formatting.GREEN), false); } else { - context.getSource().sendFeedback(Text.literal("Invalid slot").formatted(Formatting.RED), false); + context.getSource().sendFeedback(() -> Text.literal("Invalid slot").formatted(Formatting.RED), false); return -1; } } catch (NoPokemonStoreException e){ diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 71d9de6..be2a5ec 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -23,8 +23,8 @@ "cobblemon-explock.mixins.json" ], "depends": { - "fabricloader": ">=0.14.18", - "minecraft": "~1.19.2", + "fabricloader": ">=0.14.23", + "minecraft": "~1.20.1", "java": ">=17", "fabric-api": "*" }, From ca1fd7ae9bbb02c6a22dda92ddc7c512430848b0 Mon Sep 17 00:00:00 2001 From: Stampede Date: Tue, 4 Feb 2025 18:44:11 -0600 Subject: [PATCH 3/3] Updated to 1.21.1, Cobblemon 1.6, and Mojmap --- build.gradle | 18 ++++++++----- gradle.properties | 12 ++++----- gradle/wrapper/gradle-wrapper.properties | 2 +- .../command/ExpLockToggleCommand.java | 26 +++++++++---------- .../cobblemonexplock/mixin/ExpGainMixin.java | 4 +-- .../cobblemonexplock/mixin/SaveNbtMixin.java | 15 ++++++----- .../cobblemonexplock/util/ExpData.java | 4 +-- .../util/IPokemonDataSaver.java | 4 +-- src/main/resources/fabric.mod.json | 11 +++----- 9 files changed, 50 insertions(+), 46 deletions(-) diff --git a/build.gradle b/build.gradle index fa3ae70..31a46d6 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,7 @@ plugins { - id 'fabric-loom' version '1.3-SNAPSHOT' + id 'fabric-loom' version '1.9-SNAPSHOT' id 'maven-publish' + id 'org.jetbrains.kotlin.jvm' version '2.1.0' } version = project.mod_version @@ -36,13 +37,16 @@ loom { dependencies { // To change the versions see the gradle.properties file minecraft "com.mojang:minecraft:${project.minecraft_version}" - mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" + mappings(loom.layered { + officialMojangMappings() + parchment("org.parchmentmc.data:parchment-${project.minecraft_version}:${project.parchment_version}") + }) modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" // Fabric API. This is technically optional, but you probably want it anyway. modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" - include(modImplementation('me.lucko:fabric-permissions-api:0.2-SNAPSHOT')) + include(modImplementation('me.lucko:fabric-permissions-api:0.3.1')) modImplementation("maven.modrinth:cobblemon:${property("cobblemon_modrinth_file_id")}") } @@ -56,7 +60,7 @@ processResources { } tasks.withType(JavaCompile).configureEach { - it.options.release = 17 + it.options.release = 21 } java { @@ -65,8 +69,8 @@ java { // If you remove this line, sources will not be generated. withSourcesJar() - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 } jar { @@ -90,4 +94,4 @@ publishing { // The repositories here will be used for publishing your artifact, not for // retrieving dependencies. } -} \ No newline at end of file +} diff --git a/gradle.properties b/gradle.properties index 53c21a8..af09471 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,16 +4,16 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=1.20.1 -yarn_mappings=1.20.1+build.10 -loader_version=0.14.23 +minecraft_version=1.21.1 +parchment_version=2024.11.17@zip +loader_version=0.16.10 # Mod Properties -mod_version=1.0.0+1.20.1 +mod_version=1.1.0+1.21.1 maven_group=unsafedodo.cobblemonexplock archives_base_name=cobblemon-explock # Dependencies -fabric_version=0.90.0+1.20.1 +fabric_version=0.115.0+1.21.1 -cobblemon_modrinth_file_id=YEzu8qAH \ No newline at end of file +cobblemon_modrinth_file_id=eLcb8xod diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9f4197d..e2847c8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/src/main/java/unsafedodo/cobblemonexplock/command/ExpLockToggleCommand.java b/src/main/java/unsafedodo/cobblemonexplock/command/ExpLockToggleCommand.java index f7b7622..96743e1 100644 --- a/src/main/java/unsafedodo/cobblemonexplock/command/ExpLockToggleCommand.java +++ b/src/main/java/unsafedodo/cobblemonexplock/command/ExpLockToggleCommand.java @@ -8,35 +8,35 @@ import com.mojang.brigadier.arguments.IntegerArgumentType; import com.mojang.brigadier.context.CommandContext; import me.lucko.fabric.api.permissions.v0.Permissions; -import net.minecraft.command.CommandRegistryAccess; -import net.minecraft.server.command.CommandManager; -import net.minecraft.server.command.ServerCommandSource; -import net.minecraft.text.Text; -import net.minecraft.util.Formatting; +import net.minecraft.ChatFormatting; +import net.minecraft.commands.CommandBuildContext; +import net.minecraft.commands.CommandSourceStack; +import net.minecraft.commands.Commands; +import net.minecraft.network.chat.Component; import unsafedodo.cobblemonexplock.util.ExpData; import unsafedodo.cobblemonexplock.util.IPokemonDataSaver; public class ExpLockToggleCommand { - public static void register(CommandDispatcher dispatcher, CommandRegistryAccess commandRegistryAccess, CommandManager.RegistrationEnvironment registrationEnvironment) { - dispatcher.register(CommandManager.literal("explock") - .then(CommandManager.argument("slotNumber", IntegerArgumentType.integer(1,6)) + public static void register(CommandDispatcher dispatcher, CommandBuildContext commandRegistryAccess, Commands.CommandSelection registrationEnvironment) { + dispatcher.register(Commands.literal("explock") + .then(Commands.argument("slotNumber", IntegerArgumentType.integer(1,6)) .requires(Permissions.require("explock.toggle", 0)) .executes(ExpLockToggleCommand::run))); } - private static int run(CommandContext context) { + private static int run(CommandContext context) { try{ - PlayerPartyStore partyStore = Cobblemon.INSTANCE.getStorage().getParty(context.getSource().getPlayer().getUuid()); + PlayerPartyStore partyStore = Cobblemon.INSTANCE.getStorage().getParty(context.getSource().getPlayer()); int slot = (IntegerArgumentType.getInteger(context, "slotNumber")-1); Pokemon pokemon = partyStore.get(slot); if(pokemon != null){ boolean state = ExpData.setExpState((IPokemonDataSaver) pokemon); - context.getSource().sendFeedback(() -> Text.literal("Exp lock state for "+pokemon.getDisplayName().getString()+" changed to "+state).formatted(Formatting.GREEN), false); + context.getSource().sendSuccess(() -> Component.literal("Exp lock state for "+pokemon.getDisplayName()+" changed to "+state).withStyle(ChatFormatting.GREEN), false); } else { - context.getSource().sendFeedback(() -> Text.literal("Invalid slot").formatted(Formatting.RED), false); + context.getSource().sendSuccess(() -> Component.literal("Invalid slot").withStyle(ChatFormatting.RED), false); return -1; } - } catch (NoPokemonStoreException e){ + } catch (Exception e){ e.printStackTrace(); } diff --git a/src/main/java/unsafedodo/cobblemonexplock/mixin/ExpGainMixin.java b/src/main/java/unsafedodo/cobblemonexplock/mixin/ExpGainMixin.java index 60cca9c..1c77ae2 100644 --- a/src/main/java/unsafedodo/cobblemonexplock/mixin/ExpGainMixin.java +++ b/src/main/java/unsafedodo/cobblemonexplock/mixin/ExpGainMixin.java @@ -14,10 +14,10 @@ public class ExpGainMixin { @ModifyVariable(method = "calculate", at = @At("STORE"), name = "term4", remap = false) private double injectedExpGainLock(double term4, BattlePokemon battlePokemon) { Pokemon pokemon = battlePokemon.getOriginalPokemon(); - boolean state = ((IPokemonDataSaver) pokemon).getPersistentData().getBoolean("explock"); + boolean state = ((IPokemonDataSaver) pokemon).cobblemon_explock$getPersistentData().getBoolean("explock"); if(!state) return term4; else return 0.0; } -} \ No newline at end of file +} diff --git a/src/main/java/unsafedodo/cobblemonexplock/mixin/SaveNbtMixin.java b/src/main/java/unsafedodo/cobblemonexplock/mixin/SaveNbtMixin.java index edc598b..cd9c43b 100644 --- a/src/main/java/unsafedodo/cobblemonexplock/mixin/SaveNbtMixin.java +++ b/src/main/java/unsafedodo/cobblemonexplock/mixin/SaveNbtMixin.java @@ -1,8 +1,10 @@ package unsafedodo.cobblemonexplock.mixin; import com.cobblemon.mod.common.pokemon.Pokemon; -import net.minecraft.nbt.NbtCompound; +import net.minecraft.core.RegistryAccess; +import net.minecraft.nbt.CompoundTag; import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; @@ -10,18 +12,19 @@ @Mixin(Pokemon.class) public abstract class SaveNbtMixin implements IPokemonDataSaver { - private NbtCompound persistentData; + @Unique + private CompoundTag persistentData; @Override - public NbtCompound getPersistentData(){ + public CompoundTag cobblemon_explock$getPersistentData(){ if(this.persistentData == null){ - this.persistentData = new NbtCompound(); + this.persistentData = new CompoundTag(); } return persistentData; } @Inject(method = "loadFromNBT", at = @At("TAIL")) - protected void loadFromNbt(NbtCompound nbt, CallbackInfoReturnable cir){ + protected void loadFromNbt(RegistryAccess registryAccess, CompoundTag nbt, CallbackInfoReturnable cir){ if(nbt.contains("explock")){ persistentData = nbt.getCompound("explock"); } @@ -29,7 +32,7 @@ protected void loadFromNbt(NbtCompound nbt, CallbackInfoReturnable cir) @Inject(method = "saveToNBT", at = @At("TAIL")) - protected void saveToNbt(NbtCompound nbt, CallbackInfoReturnable cir){ + protected void saveToNbt(RegistryAccess registryAccess, CompoundTag nbt, CallbackInfoReturnable cir){ if(persistentData != null){ nbt.put("explock", persistentData); } diff --git a/src/main/java/unsafedodo/cobblemonexplock/util/ExpData.java b/src/main/java/unsafedodo/cobblemonexplock/util/ExpData.java index a83b613..7288276 100644 --- a/src/main/java/unsafedodo/cobblemonexplock/util/ExpData.java +++ b/src/main/java/unsafedodo/cobblemonexplock/util/ExpData.java @@ -1,11 +1,11 @@ package unsafedodo.cobblemonexplock.util; -import net.minecraft.nbt.NbtCompound; +import net.minecraft.nbt.CompoundTag; public class ExpData { public static boolean setExpState(IPokemonDataSaver pokemon){ - NbtCompound nbt = pokemon.getPersistentData(); + CompoundTag nbt = pokemon.cobblemon_explock$getPersistentData(); boolean state = nbt.getBoolean("explock"); state = !state; diff --git a/src/main/java/unsafedodo/cobblemonexplock/util/IPokemonDataSaver.java b/src/main/java/unsafedodo/cobblemonexplock/util/IPokemonDataSaver.java index acdee29..52da5e8 100644 --- a/src/main/java/unsafedodo/cobblemonexplock/util/IPokemonDataSaver.java +++ b/src/main/java/unsafedodo/cobblemonexplock/util/IPokemonDataSaver.java @@ -1,7 +1,7 @@ package unsafedodo.cobblemonexplock.util; -import net.minecraft.nbt.NbtCompound; +import net.minecraft.nbt.CompoundTag; public interface IPokemonDataSaver { - NbtCompound getPersistentData(); + CompoundTag cobblemon_explock$getPersistentData(); } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index be2a5ec..f3ba1bb 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -23,12 +23,9 @@ "cobblemon-explock.mixins.json" ], "depends": { - "fabricloader": ">=0.14.23", - "minecraft": "~1.20.1", - "java": ">=17", + "fabricloader": ">=0.16.0", + "minecraft": "~1.21.1", + "java": ">=21", "fabric-api": "*" - }, - "suggests": { - "another-mod": "*" } -} \ No newline at end of file +}