diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
deleted file mode 100644
index 778b705..0000000
--- a/.github/workflows/release.yml
+++ /dev/null
@@ -1,60 +0,0 @@
-# Publishes a release to Modrinth when a release is published on GitHub.
-name: Release to Modrinth
-
-on:
- release:
- types: [ published ]
-
-permissions:
- contents: read
- checks: write
-
-jobs:
- build:
- runs-on: ubuntu-latest
- steps:
- - uses: actions/checkout@v3
- - name: Set up JDK 17
- uses: actions/setup-java@v3
- with:
- java-version: '17'
- distribution: 'temurin'
- - name: Make Gradlew executable
- run: chmod +x ./gradlew
- - name: Get Gradle Properties
- run: |
- echo "::set-output name=VERSION_NAME::$(${{github.workspace}}/gradlew properties --no-daemon --console=plain -q | grep "^version:" | awk '{printf $2}')"
- id: fetch-version
- - name: Import GPG key
- uses: crazy-max/ghaction-import-gpg@v5
- with:
- gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }}
- passphrase: ${{ secrets.GPG_PASSPHRASE }}
- - name: Build with Gradle
- uses: gradle/gradle-build-action@v2
- with:
- arguments: build publish
- - name: Upload to Modrinth (Release)
- uses: Kir-Antipov/mc-publish@v3.3
- with:
- modrinth-id: ZiFzQAnz
- modrinth-featured: true
- modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
- modrinth-dependencies: |
- nfGCP9fk@2.11.3(required)
- files: "build/libs/NDailyRewards-${{steps.fetch-version.outputs.VERSION_NAME}}.jar"
- version-type: release
- name: NDailyRewards ${{ github.event.release.tag_name }}
- version: ${{ github.event.release.tag_name }}
- game-version-filter: releases | min-major | min-minor
- changelog: ${{ github.event.release.body }}
- loaders: |
- bukkit
- spigot
- paper
- purpur
- game-versions: |
- [1.16,1.20]
- 1.20.1
- fail-mode: fail
- java: 17
diff --git a/README.md b/README.md
index 17378f7..9b6cf7c 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
Reward players for playing on your server.
[](LICENSE)
-[](https://github.com/BX-Team/NDailyRewards/actions)
+[](https://github.com/BX-Team/NDailyRewards/actions)
[](https://discord.gg/p7cxhw7E2M)
@@ -55,7 +55,7 @@ View plugin metrics at [bStats.org](https://bstats.org/plugin/bukkit/NDailyRewar
You can download plugin from [releases tab](https://github.com/BX-Team/NDailyRewards/releases/latest) or also from:
- [Modrinth](https://modrinth.com/plugin/ndailyrewards) (fast updates (recommended))
-### 👩💻 For developers
+### 👩💻 For developers (outdated)
If you want to download and use NDailyRewards in your project, get it on maven and import to `pom.xml` like this:
```xml
diff --git a/gradle.properties b/gradle.properties
index 7307ddc..298e978 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,7 +1,7 @@
group = gq.bxteam
mcVersion = 1.20-R0.1-SNAPSHOT
-version = 2.0
+version = 2.0.1
org.gradle.parallel = true
org.gradle.vfs.watch = false
diff --git a/src/main/java/gq/bxteam/ndailyrewards/cfg/Config.java b/src/main/java/gq/bxteam/ndailyrewards/cfg/Config.java
index 0666058..b2cbf66 100644
--- a/src/main/java/gq/bxteam/ndailyrewards/cfg/Config.java
+++ b/src/main/java/gq/bxteam/ndailyrewards/cfg/Config.java
@@ -79,8 +79,7 @@ public static void setup(final MyConfig mc) {
}
LogUtil.send("&eLoaded &6" + Config.rewards.size() + " &edaily rewards!", LogType.INFO);
path = "gui.";
- String p_title = NDailyRewards.replaceHEXColorCode(cfg.getString(path + "title"));
- String g_title = ChatColor.translateAlternateColorCodes('&', p_title);
+ String g_title = NDailyRewards.replaceHEXColorCode(cfg.getString(path + "title"));
final int g_size = cfg.getInt(path + "size");
final LinkedHashMap g_items = new LinkedHashMap();
for (final String id : cfg.getSection(path + "items")) {
diff --git a/src/main/java/gq/bxteam/ndailyrewards/cfg/Lang.java b/src/main/java/gq/bxteam/ndailyrewards/cfg/Lang.java
index 0336b47..51606bd 100644
--- a/src/main/java/gq/bxteam/ndailyrewards/cfg/Lang.java
+++ b/src/main/java/gq/bxteam/ndailyrewards/cfg/Lang.java
@@ -4,7 +4,6 @@
import java.util.List;
import gq.bxteam.ndailyrewards.NDailyRewards;
-import org.bukkit.ChatColor;
@SuppressWarnings("javadoc")
public enum Lang {
@@ -37,20 +36,19 @@ public String getMsg() {
}
public String toMsg() {
- String pref = NDailyRewards.replaceHEXColorCode(Lang.config.getConfig().getString(this.getPath()));
- return pref;
+ return NDailyRewards.replaceHEXColorCode(Lang.config.getConfig().getString(this.getPath()));
}
public List getList() {
- final List list = new ArrayList();
+ final List list = new ArrayList<>();
for (final String s : Lang.config.getConfig().getStringList(this.getPath())) {
- list.add(ChatColor.translateAlternateColorCodes('&', s));
+ list.add(NDailyRewards.replaceHEXColorCode(s));
}
return list;
}
public static String getCustom(final String path) {
- return ChatColor.translateAlternateColorCodes('&', Lang.config.getConfig().getString(path));
+ return NDailyRewards.replaceHEXColorCode(Lang.config.getConfig().getString(path));
}
public static void setup(final MyConfig config) {
@@ -64,7 +62,7 @@ private static void load() {
final Lang lang = values[i];
if (Lang.config.getConfig().getString(lang.getPath()) == null) {
if (lang.getMsg().contains("\n")) {
- final List list = new ArrayList();
+ final List list = new ArrayList<>();
final String[] ss = lang.getMsg().split("\n");
String[] array;
for (int length2 = (array = ss).length, j = 0; j < length2; ++j) {
diff --git a/src/main/java/gq/bxteam/ndailyrewards/manager/RewardGUI.java b/src/main/java/gq/bxteam/ndailyrewards/manager/RewardGUI.java
index 7f1649d..7cce448 100644
--- a/src/main/java/gq/bxteam/ndailyrewards/manager/RewardGUI.java
+++ b/src/main/java/gq/bxteam/ndailyrewards/manager/RewardGUI.java
@@ -124,7 +124,7 @@ private void replaceLore(final ItemStack icon, final int day2, final DUser user,
}
if (s.equalsIgnoreCase("%reward-lore%")) {
for (final String s2 : rewa.getLore()) {
- lore.add(ChatColor.translateAlternateColorCodes('&', s2.replace("%day%", String.valueOf(day2))));
+ lore.add(NDailyRewards.replaceHEXColorCode(s2.replace("%day%", String.valueOf(day2))));
}
} else {
String pref = NDailyRewards.replaceHEXColorCode(s);
diff --git a/src/main/java/gq/bxteam/ndailyrewards/manager/objects/Reward.java b/src/main/java/gq/bxteam/ndailyrewards/manager/objects/Reward.java
index f1612ee..f23c32c 100644
--- a/src/main/java/gq/bxteam/ndailyrewards/manager/objects/Reward.java
+++ b/src/main/java/gq/bxteam/ndailyrewards/manager/objects/Reward.java
@@ -39,7 +39,7 @@ public void give(final Player p) {
for (final String s : this.cmds) {
ArchUtils.execCmd(s.replace("%day%", String.valueOf(this.day)), p);
}
- for (String s : this.msg) {
+ for (final String s : this.msg) {
String pref = NDailyRewards.replaceHEXColorCode(s);
p.sendMessage(pref.replace("%day%", String.valueOf(this.day)));
}