Skip to content
This repository was archived by the owner on Sep 23, 2026. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/dependencies.sha256
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
d52cc0c734a9bb942428a403bb3630123596bcd9c94d3a77ea2782046b113af5 libs/MMOCore-1.11.3.jar
c84700df5942fd969d3e8c2f1ad2c3ebeb17987ef88b426408d1306e49c4aada libs/MMOItems-6.10.jar
660ff2a6ec86bc8d7779948cf65c1637e271a16e1ef812d6a273f4a5c5eec73c libs/MythicLib-1.7.jar
97e0c708c1e319189ce1cda049244551a105860d51e908d2bcbc183fd1f89816 libs/spigot-api-1.20.2-R0.1-SNAPSHOT.jar
1 change: 0 additions & 1 deletion .github/scripts/prepare-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,4 @@ 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/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"
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
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/advancedgunpowder-{version}.jar
secrets:
Expand Down
22 changes: 16 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,16 @@
<version>1.5.0</version>

<properties>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<maven.compiler.release>21</maven.compiler.release>
</properties>

<repositories>
<repository>
<id>spigot-snapshots</id>
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
</repository>
</repositories>

<dependencies>
<dependency>
<groupId>local</groupId>
Expand All @@ -36,11 +42,10 @@
<systemPath>${project.basedir}/libs/MythicLib-1.7.jar</systemPath>
</dependency>
<dependency>
<groupId>local</groupId>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>1.20.2-R0.1-SNAPSHOT</version>
<scope>system</scope>
<systemPath>${project.basedir}/libs/spigot-api-1.20.2-R0.1-SNAPSHOT.jar</systemPath>
<version>1.21.10-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>

Expand All @@ -58,6 +63,11 @@
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.14.1</version>
</plugin>
</plugins>
</build>

Expand Down
12 changes: 6 additions & 6 deletions src/main/java/me/Plugins/AdvancedGunpowder/GunpowderEvents.java
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ public void equipEvent(PlayerItemHeldEvent e) {
loaded = nbtTags.getPersistentDataContainer().get(isLoaded, PersistentDataType.INTEGER);
}
if(loaded == 0) return;
PotionEffect slow = new PotionEffect(PotionEffectType.SLOW, (int) Math.floor(w.getReloadTime()*20), 2, false, false);
PotionEffect slow = new PotionEffect(PotionEffectType.SLOWNESS, (int) Math.floor(w.getReloadTime()*20), 2, false, false);
p.addPotionEffect(slow);
isEquipping.put(p, true);
Double time = w.getEquipTime();
Expand All @@ -100,13 +100,13 @@ public void run()
p.sendTitle(" ", "§eEquipping... §7" + t/10 + "§es", 1, 20, 5);
} else {
p.sendTitle(" ", "§eEquipped!", 1, 20, 10);
p.removePotionEffect(PotionEffectType.SLOW);
p.removePotionEffect(PotionEffectType.SLOWNESS);
isEquipping.put(p, false);
equippedItem.put(p, i);
this.cancel();
}
if(!p.getInventory().getItemInMainHand().equals(i) || isEquipping.get(p) == false) {
p.removePotionEffect(PotionEffectType.SLOW);
p.removePotionEffect(PotionEffectType.SLOWNESS);
isEquipping.put(p, false);
this.cancel();
}
Expand Down Expand Up @@ -306,7 +306,7 @@ public void reloadMusket(HandWeapon w, ItemStack item, Player p) {
ItemMeta model = item.getItemMeta();
model.setCustomModelData(w.getLoadingModel());
item.setItemMeta(model);
PotionEffect slow = new PotionEffect(PotionEffectType.SLOW, (int) Math.floor(w.getReloadTime())*20, 2, false, false);
PotionEffect slow = new PotionEffect(PotionEffectType.SLOWNESS, (int) Math.floor(w.getReloadTime())*20, 2, false, false);
p.addPotionEffect(slow);
isReloading.put(p, true);
Double time = w.getReloadTime();
Expand Down Expand Up @@ -344,13 +344,13 @@ public void run()
cbm.addChargedProjectile(new ItemStack(Material.ARROW, 1));
item.setItemMeta(cbm);
}
p.removePotionEffect(PotionEffectType.SLOW);
p.removePotionEffect(PotionEffectType.SLOWNESS);
equippedItem.put(p, item);
isReloading.put(p, false);
this.cancel();
}
if(!p.getInventory().getItemInMainHand().equals(item)) {
p.removePotionEffect(PotionEffectType.SLOW);
p.removePotionEffect(PotionEffectType.SLOWNESS);
isReloading.put(p, false);
ItemMeta model = item.getItemMeta();
model.setCustomModelData(w.getModel());
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/plugin.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
main: me.Plugins.AdvancedGunpowder.GunpowderMain
api-version: 1.18
api-version: '1.21.10'
name: AdvancedGunpowder
version: ${project.version}
author: Drefvelin
Expand Down