From 34cbe4975fcf31a93df3ab7cd1f2c4879e1b56b9 Mon Sep 17 00:00:00 2001 From: Ryan Barlow <7389646+ryanbarlow97@users.noreply.github.com> Date: Tue, 22 Sep 2026 18:18:31 +0000 Subject: [PATCH] build: target Java 21 and Minecraft 1.21.10 --- .github/dependencies.sha256 | 1 - .github/scripts/prepare-release.sh | 1 - .github/workflows/build.yml | 2 +- .github/workflows/release.yml | 2 +- pom.xml | 22 ++++++++++++++----- .../Plugins/Goldsmithing/SmithingEvents.java | 12 +++++----- src/main/resources/plugin.yml | 2 +- 7 files changed, 25 insertions(+), 17 deletions(-) diff --git a/.github/dependencies.sha256 b/.github/dependencies.sha256 index 19c956a..e3af101 100644 --- a/.github/dependencies.sha256 +++ b/.github/dependencies.sha256 @@ -1,3 +1,2 @@ c84700df5942fd969d3e8c2f1ad2c3ebeb17987ef88b426408d1306e49c4aada libs/MMOItems-6.10.jar 660ff2a6ec86bc8d7779948cf65c1637e271a16e1ef812d6a273f4a5c5eec73c libs/MythicLib-1.7.jar -97e0c708c1e319189ce1cda049244551a105860d51e908d2bcbc183fd1f89816 libs/spigot-api-1.20.2-R0.1-SNAPSHOT.jar diff --git a/.github/scripts/prepare-release.sh b/.github/scripts/prepare-release.sh index ce74fb1..d600a11 100644 --- a/.github/scripts/prepare-release.sh +++ b/.github/scripts/prepare-release.sh @@ -5,5 +5,4 @@ ref=2fe025eb9879bab7dfe48e32395d8a8c1dff75f7 mkdir -p libs 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" -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/97e0c708c1e3/spigot-api-1.20.2-R0.1-SNAPSHOT.jar?ref=$ref" > "libs/spigot-api-1.20.2-R0.1-SNAPSHOT.jar" sha256sum --check .github/dependencies.sha256 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 66b7bea..1a7a55c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,7 +20,7 @@ jobs: - uses: actions/setup-java@v6 with: distribution: temurin - java-version: '25' + java-version: '21' - name: Prepare pinned dependencies env: GH_TOKEN: ${{ secrets.DEPS_TOKEN }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 92bfe9f..e0e1b7d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,7 +13,7 @@ jobs: contents: write uses: ./.github/workflows/maven-release.yml with: - java-version: '25' + java-version: '21' # Exact path, not a glob. {version} is replaced with the tag without v. artifact-path: target/goldsmithing-{version}.jar secrets: diff --git a/pom.xml b/pom.xml index 25ff519..6972358 100644 --- a/pom.xml +++ b/pom.xml @@ -9,10 +9,16 @@ 2.0 - 17 - 17 + 21 + + + spigot-snapshots + https://hub.spigotmc.org/nexus/content/repositories/snapshots/ + + + local @@ -29,11 +35,10 @@ ${project.basedir}/libs/MythicLib-1.7.jar - local + org.spigotmc spigot-api - 1.20.2-R0.1-SNAPSHOT - system - ${project.basedir}/libs/spigot-api-1.20.2-R0.1-SNAPSHOT.jar + 1.21.10-R0.1-SNAPSHOT + provided @@ -51,6 +56,11 @@ + + org.apache.maven.plugins + maven-compiler-plugin + 3.14.1 + diff --git a/src/main/java/me/Plugins/Goldsmithing/SmithingEvents.java b/src/main/java/me/Plugins/Goldsmithing/SmithingEvents.java index df14864..a6b6fbb 100644 --- a/src/main/java/me/Plugins/Goldsmithing/SmithingEvents.java +++ b/src/main/java/me/Plugins/Goldsmithing/SmithingEvents.java @@ -108,7 +108,7 @@ public void smithHitEvent(PlayerInteractEvent e) { if(nbt.getType().equalsIgnoreCase(brandingType) && nbt.getString("MMOITEMS_ITEM_ID").equalsIgnoreCase(brandingID)) { if(t.getCurrentHits() > 2 || t.getCurrentSmallHits() > 2 || t.getCurrentTinkerHits() > 2) { BlockData blockDustData = Material.GOLD_BLOCK.createBlockData(); - t.getLocation().getWorld().spawnParticle(Particle.BLOCK_DUST, t.getLocation(), 20, blockDustData); + t.getLocation().getWorld().spawnParticle(Particle.BLOCK, t.getLocation(), 20, blockDustData); p.getWorld().playSound(p.getLocation(), Sound.BLOCK_ANVIL_LAND, 0.4f, 1); Integer level = 3; if(getSmithingPercentage(p, t) >= 100.0) { @@ -150,7 +150,7 @@ public void smithHitEvent(PlayerInteractEvent e) { if(t.getCurrentGoldItems().equals(t.getMaxGoldItems()) && t.getCurrentJewelItems().equals(t.getMaxJewelItems())) { t.setCurrentHits(t.getCurrentHits()+1); BlockData blockDustData = Material.GOLD_BLOCK.createBlockData(); - t.getLocation().getWorld().spawnParticle(Particle.BLOCK_DUST, t.getLocation(), 20, blockDustData); + t.getLocation().getWorld().spawnParticle(Particle.BLOCK, t.getLocation(), 20, blockDustData); p.getWorld().playSound(p.getLocation(), Sound.BLOCK_ANVIL_USE, 0.4f, 1); p.sendTitle(" ", ChatColor.GRAY + " Current regular hits: " + ChatColor.YELLOW + t.getCurrentHits(), 1, 40, 20); } else { @@ -163,7 +163,7 @@ public void smithHitEvent(PlayerInteractEvent e) { if(t.getCurrentGoldItems().equals(t.getMaxGoldItems()) && t.getCurrentJewelItems().equals(t.getMaxJewelItems())) { t.setCurrentSmallHits(t.getCurrentSmallHits()+1); BlockData blockDustData = Material.GOLD_BLOCK.createBlockData(); - t.getLocation().getWorld().spawnParticle(Particle.BLOCK_DUST, t.getLocation(), 20, blockDustData); + t.getLocation().getWorld().spawnParticle(Particle.BLOCK, t.getLocation(), 20, blockDustData); p.getWorld().playSound(p.getLocation(), Sound.BLOCK_ANVIL_USE, 0.7f, 2); p.sendTitle(" ", ChatColor.GRAY + " Current small hits: " + ChatColor.YELLOW + t.getCurrentSmallHits(), 1, 40, 20); } else { @@ -176,7 +176,7 @@ public void smithHitEvent(PlayerInteractEvent e) { if(t.getCurrentGoldItems().equals(t.getMaxGoldItems()) && t.getCurrentJewelItems().equals(t.getMaxJewelItems())) { t.setCurrentTinkerHits(t.getCurrentTinkerHits()+1); BlockData blockDustData = Material.GOLD_BLOCK.createBlockData(); - t.getLocation().getWorld().spawnParticle(Particle.BLOCK_DUST, t.getLocation(), 20, blockDustData); + t.getLocation().getWorld().spawnParticle(Particle.BLOCK, t.getLocation(), 20, blockDustData); p.getWorld().playSound(p.getLocation(), Sound.BLOCK_ANVIL_LAND, 0.7f, 2); p.sendTitle(" ", ChatColor.GRAY + " Current tinker hits: " + ChatColor.YELLOW + t.getCurrentTinkerHits(), 1, 40, 20); } else { @@ -209,7 +209,7 @@ public void addItemEvent(PlayerInteractEvent e) { } item.setAmount(item.getAmount()-1); BlockData blockDustData = Material.GOLD_BLOCK.createBlockData(); - t.getLocation().getWorld().spawnParticle(Particle.BLOCK_DUST, t.getLocation(), 10, blockDustData); + t.getLocation().getWorld().spawnParticle(Particle.BLOCK, t.getLocation(), 10, blockDustData); p.getWorld().playSound(p.getLocation(), Sound.ITEM_AXE_WAX_OFF, 0.7f, 2); t.setCurrentGoldItems(t.getCurrentGoldItems()+1); p.sendTitle(" ", ChatColor.GOLD + "Gold " + ChatColor.GRAY + " ingredients: " + ChatColor.YELLOW + t.getCurrentGoldItems() + "/" + t.getMaxGoldItems(), 1, 40, 20); @@ -221,7 +221,7 @@ public void addItemEvent(PlayerInteractEvent e) { } item.setAmount(item.getAmount()-1); BlockData blockDustData = Material.AMETHYST_BLOCK.createBlockData(); - t.getLocation().getWorld().spawnParticle(Particle.BLOCK_DUST, t.getLocation(), 10, blockDustData); + t.getLocation().getWorld().spawnParticle(Particle.BLOCK, t.getLocation(), 10, blockDustData); p.getWorld().playSound(p.getLocation(), Sound.ITEM_AXE_WAX_OFF, 0.7f, 2); t.setCurrentJewelItems(t.getCurrentJewelItems()+1); p.sendTitle(" ", ChatColor.LIGHT_PURPLE + "Jewel " + ChatColor.GRAY + " ingredients: " + ChatColor.YELLOW + t.getCurrentJewelItems() + "/" + t.getMaxJewelItems(), 1, 40, 20); diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 49d1d32..169c0d7 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,5 +1,5 @@ main: me.Plugins.Goldsmithing.Goldsmithing -api-version: 1.18 +api-version: '1.21.10' name: Goldsmithing version: ${project.version} author: Drefvelin