From f1099c782edaf0b6cb0f60894ad70d70f684675a Mon Sep 17 00:00:00 2001 From: Ryan Barlow <7389646+ryanbarlow97@users.noreply.github.com> Date: Tue, 22 Sep 2026 23:35:21 +0000 Subject: [PATCH] fix: resolve build warnings --- .github/scripts/install-local-dependencies.sh | 18 +++++++++++++++++ .github/scripts/prepare-release.sh | 2 +- pom.xml | 20 ++++++++----------- .../geminfusion/InfusedGemBuilder.java | 2 +- .../geminfusion/goldsmith/JewelryOutput.java | 4 ++-- 5 files changed, 30 insertions(+), 16 deletions(-) create mode 100644 .github/scripts/install-local-dependencies.sh diff --git a/.github/scripts/install-local-dependencies.sh b/.github/scripts/install-local-dependencies.sh new file mode 100644 index 0000000..6510890 --- /dev/null +++ b/.github/scripts/install-local-dependencies.sh @@ -0,0 +1,18 @@ +#!/usr/bin/env bash +set -euo pipefail +# Run from the repository root after downloading the pinned JARs. +# Hash-qualified versions prevent different private JARs sharing a Maven cache key. +sha256sum --check .github/dependencies.sha256 + +mvn -B --no-transfer-progress org.apache.maven.plugins:maven-install-plugin:3.1.4:install-file \ + -Dfile="libs/gson-2.10.1.jar" -DgroupId="local" -DartifactId="gson" \ + -Dversion="2.10.1-tfmc-4241c14a7727" -Dpackaging=jar -DgeneratePom=true "$@" +mvn -B --no-transfer-progress org.apache.maven.plugins:maven-install-plugin:3.1.4:install-file \ + -Dfile="libs/MMOCore-1.11.3.jar" -DgroupId="local" -DartifactId="MMOCore" \ + -Dversion="1.11.3-tfmc-d52cc0c734a9" -Dpackaging=jar -DgeneratePom=true "$@" +mvn -B --no-transfer-progress org.apache.maven.plugins:maven-install-plugin:3.1.4:install-file \ + -Dfile="libs/MMOItems-6.10.jar" -DgroupId="local" -DartifactId="MMOItems" \ + -Dversion="6.10-tfmc-c84700df5942" -Dpackaging=jar -DgeneratePom=true "$@" +mvn -B --no-transfer-progress org.apache.maven.plugins:maven-install-plugin:3.1.4:install-file \ + -Dfile="libs/MythicLib-1.7.jar" -DgroupId="local" -DartifactId="MythicLib" \ + -Dversion="1.7-tfmc-660ff2a6ec86" -Dpackaging=jar -DgeneratePom=true "$@" diff --git a/.github/scripts/prepare-release.sh b/.github/scripts/prepare-release.sh index 4ccb1ca..a698073 100644 --- a/.github/scripts/prepare-release.sh +++ b/.github/scripts/prepare-release.sh @@ -7,4 +7,4 @@ curl --fail --location --silent --show-error --retry 3 -H "Authorization: Bearer curl --fail --location --silent --show-error --retry 3 -H "Authorization: Bearer $GH_TOKEN" -H "Accept: application/vnd.github.raw+json" "https://api.github.com/repos/TF-Minecraft/ServerAssets/contents/jars/d52cc0c734a9/MMOCore-1.11.3.jar?ref=$ref" > "libs/MMOCore-1.11.3.jar" curl --fail --location --silent --show-error --retry 3 -H "Authorization: Bearer $GH_TOKEN" -H "Accept: application/vnd.github.raw+json" "https://api.github.com/repos/TF-Minecraft/ServerAssets/contents/jars/c84700df5942/MMOItems-6.10.jar?ref=$ref" > "libs/MMOItems-6.10.jar" curl --fail --location --silent --show-error --retry 3 -H "Authorization: Bearer $GH_TOKEN" -H "Accept: application/vnd.github.raw+json" "https://api.github.com/repos/TF-Minecraft/ServerAssets/contents/jars/660ff2a6ec86/MythicLib-1.7.jar?ref=$ref" > "libs/MythicLib-1.7.jar" -sha256sum --check .github/dependencies.sha256 +bash .github/scripts/install-local-dependencies.sh "$@" diff --git a/pom.xml b/pom.xml index f785274..d3c6c7d 100644 --- a/pom.xml +++ b/pom.xml @@ -18,30 +18,26 @@ local gson - 2.10.1 - system - ${project.basedir}/libs/gson-2.10.1.jar + 2.10.1-tfmc-4241c14a7727 + provided local MMOCore - 1.11.3 - system - ${project.basedir}/libs/MMOCore-1.11.3.jar + 1.11.3-tfmc-d52cc0c734a9 + provided local MMOItems - 6.10 - system - ${project.basedir}/libs/MMOItems-6.10.jar + 6.10-tfmc-c84700df5942 + provided local MythicLib - 1.7 - system - ${project.basedir}/libs/MythicLib-1.7.jar + 1.7-tfmc-660ff2a6ec86 + provided org.spigotmc diff --git a/src/main/java/net/tfminecraft/geminfusion/InfusedGemBuilder.java b/src/main/java/net/tfminecraft/geminfusion/InfusedGemBuilder.java index db37fa9..24b3ac4 100644 --- a/src/main/java/net/tfminecraft/geminfusion/InfusedGemBuilder.java +++ b/src/main/java/net/tfminecraft/geminfusion/InfusedGemBuilder.java @@ -68,7 +68,7 @@ public static void applyCosmetics(MMOItem mmo, Gemstone gem, GemRarity rarity) { itemName.setString(infusedName); } mmo.replaceData(ItemStats.NAME, itemName); - StatHistory hist = StatHistory.from(mmo, ItemStats.NAME); + StatHistory hist = mmo.computeStatHistory(ItemStats.NAME); if (hist != null) { NameData og = (NameData) hist.getOriginalData(); og.setString(infusedName); diff --git a/src/main/java/net/tfminecraft/geminfusion/goldsmith/JewelryOutput.java b/src/main/java/net/tfminecraft/geminfusion/goldsmith/JewelryOutput.java index 6be78ac..305d90b 100644 --- a/src/main/java/net/tfminecraft/geminfusion/goldsmith/JewelryOutput.java +++ b/src/main/java/net/tfminecraft/geminfusion/goldsmith/JewelryOutput.java @@ -147,7 +147,7 @@ private static boolean applyStat(MMOItem mmo, String statId, double value) { DoubleData data = new DoubleData(value); mmo.setData(itemStat, data); @SuppressWarnings("deprecation") - StatHistory hist = StatHistory.from(mmo, itemStat); + StatHistory hist = mmo.computeStatHistory(itemStat); if (hist != null) { hist.registerExternalData(data); mmo.setStatHistory(itemStat, hist); @@ -156,7 +156,7 @@ private static boolean applyStat(MMOItem mmo, String statId, double value) { } private static void zeroOriginal(MMOItem mmo, ItemStat itemStat) { - StatHistory hist = StatHistory.from(mmo, itemStat); + StatHistory hist = mmo.computeStatHistory(itemStat); if (hist != null) { Object og = hist.getOriginalData(); if (og instanceof DoubleData doubleOg) {