Skip to content

Commit e48be6b

Browse files
committed
hyperlib demo
1 parent c0d79fd commit e48be6b

17 files changed

+61
-184
lines changed

pom.xml

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,8 @@
6464
<configuration>
6565
<relocations>
6666
<relocation>
67-
<pattern>org.bstats</pattern>
68-
<shadedPattern>lol.hyper.toolstats.bstats</shadedPattern>
69-
</relocation>
70-
<relocation>
71-
<pattern>lol.hyper.githubreleaseapi</pattern>
72-
<shadedPattern>lol.hyper.toolstats.updater</shadedPattern>
67+
<pattern>lol.hyper.hyperlib</pattern>
68+
<shadedPattern>lol.hyper.toolstats.hyperlib</shadedPattern>
7369
</relocation>
7470
</relocations>
7571
</configuration>
@@ -99,6 +95,10 @@
9995
<id>papermc</id>
10096
<url>https://repo.papermc.io/repository/maven-public/</url>
10197
</repository>
98+
<repository>
99+
<id>jitpack.io</id>
100+
<url>https://jitpack.io</url>
101+
</repository>
102102
</repositories>
103103

104104
<dependencies>
@@ -109,15 +109,9 @@
109109
<scope>provided</scope>
110110
</dependency>
111111
<dependency>
112-
<groupId>org.bstats</groupId>
113-
<artifactId>bstats-bukkit</artifactId>
114-
<version>3.1.0</version>
115-
<scope>compile</scope>
116-
</dependency>
117-
<dependency>
118-
<groupId>lol.hyper</groupId>
119-
<artifactId>github-release-api</artifactId>
120-
<version>1.0.5</version>
112+
<groupId>com.github.hyperdefined</groupId>
113+
<artifactId>hyperlib</artifactId>
114+
<version>1.0.2</version>
121115
<scope>compile</scope>
122116
</dependency>
123117
</dependencies>

src/main/java/lol/hyper/toolstats/ToolStats.java

Lines changed: 37 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,24 @@
1717

1818
package lol.hyper.toolstats;
1919

20-
import lol.hyper.githubreleaseapi.GitHubRelease;
21-
import lol.hyper.githubreleaseapi.GitHubReleaseAPI;
22-
import lol.hyper.githubreleaseapi.ReleaseNotFoundException;
20+
import lol.hyper.hyperlib.HyperLib;
21+
import lol.hyper.hyperlib.bstats.bStats;
22+
import lol.hyper.hyperlib.releases.hangar.HangarRelease;
23+
import lol.hyper.hyperlib.releases.modrinth.ModrinthPlugin;
24+
import lol.hyper.hyperlib.releases.modrinth.ModrinthRelease;
25+
import lol.hyper.hyperlib.utils.TextUtils;
2326
import lol.hyper.toolstats.commands.CommandToolStats;
2427
import lol.hyper.toolstats.events.*;
2528
import lol.hyper.toolstats.tools.*;
2629
import lol.hyper.toolstats.tools.config.ConfigTools;
2730
import lol.hyper.toolstats.tools.config.ConfigUpdater;
28-
import org.bstats.bukkit.Metrics;
2931
import org.bukkit.Bukkit;
3032
import org.bukkit.NamespacedKey;
3133
import org.bukkit.configuration.file.YamlConfiguration;
3234
import org.bukkit.inventory.ShapedRecipe;
3335
import org.bukkit.plugin.java.JavaPlugin;
3436

3537
import java.io.File;
36-
import java.io.IOException;
3738
import java.util.HashSet;
3839
import java.util.Set;
3940
import java.util.logging.Logger;
@@ -152,9 +153,19 @@ public final class ToolStats extends JavaPlugin {
152153
public TokenData tokenData;
153154
public AnvilEvent anvilEvent;
154155
public PrepareCraft prepareCraft;
156+
public HyperLib hyperLib;
157+
public TextUtils textUtils;
155158

156159
@Override
157160
public void onEnable() {
161+
hyperLib = new HyperLib(this);
162+
hyperLib.setup();
163+
164+
bStats bstats = new bStats(hyperLib, 14110);
165+
bstats.setup();
166+
167+
textUtils = new TextUtils(hyperLib);
168+
158169
if (!configFile.exists()) {
159170
this.saveResource("config.yml", true);
160171
logger.info("Copying default config!");
@@ -225,8 +236,27 @@ public void onEnable() {
225236

226237
this.getCommand("toolstats").setExecutor(commandToolStats);
227238

228-
new Metrics(this, 14110);
229-
Bukkit.getAsyncScheduler().runNow(this, scheduledTask -> checkForUpdates());
239+
Bukkit.getAsyncScheduler().runNow(this, scheduledTask -> {
240+
ModrinthPlugin modrinthPlugin = new ModrinthPlugin("oBZj9E15");
241+
modrinthPlugin.get();
242+
243+
ModrinthRelease release = modrinthPlugin.getReleaseByVersion(this.getPluginMeta().getVersion());
244+
if (release == null) {
245+
logger.warning("You are running a version not published.");
246+
} else {
247+
int buildsBehind = modrinthPlugin.buildsVersionsBehind(release);
248+
if (buildsBehind > 0) {
249+
ModrinthRelease latest = modrinthPlugin.getLatestRelease();
250+
if (latest != null) {
251+
logger.info("You are " + buildsBehind + " versions behind. Please update!");
252+
logger.info("The latest version is " + latest.getVersion());
253+
logger.info(latest.getVersionPage());
254+
}
255+
} else {
256+
logger.info("Yay! You are running the latest version.");
257+
}
258+
}
259+
});
230260
}
231261

232262
public void loadConfig() {
@@ -247,29 +277,4 @@ public void loadConfig() {
247277

248278
numberFormat = new NumberFormat(this);
249279
}
250-
251-
public void checkForUpdates() {
252-
GitHubReleaseAPI api;
253-
try {
254-
api = new GitHubReleaseAPI("ToolStats", "hyperdefined");
255-
} catch (IOException e) {
256-
logger.warning("Unable to check updates!");
257-
e.printStackTrace();
258-
return;
259-
}
260-
GitHubRelease current;
261-
try {
262-
current = api.getReleaseByTag(this.getPluginMeta().getVersion());
263-
} catch (ReleaseNotFoundException e) {
264-
logger.warning("You are running a version that does not exist on GitHub. If you are in a dev environment, you can ignore this. Otherwise, this is a bug!");
265-
return;
266-
}
267-
GitHubRelease latest = api.getLatestVersion();
268-
int buildsBehind = api.getBuildsBehind(current);
269-
if (buildsBehind == 0) {
270-
logger.info("You are running the latest version.");
271-
} else {
272-
logger.warning("A new version is available (" + latest.getTagVersion() + ")! You are running version " + current.getTagVersion() + ". You are " + buildsBehind + " version(s) behind.");
273-
}
274-
}
275280
}

src/main/java/lol/hyper/toolstats/commands/CommandToolStats.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,11 @@
1717

1818
package lol.hyper.toolstats.commands;
1919

20+
import lol.hyper.hyperlib.datatypes.UUIDDataType;
2021
import lol.hyper.toolstats.ToolStats;
21-
import lol.hyper.toolstats.tools.UUIDDataType;
2222
import net.kyori.adventure.text.Component;
2323
import net.kyori.adventure.text.format.NamedTextColor;
2424
import org.bukkit.Bukkit;
25-
import org.bukkit.Material;
2625
import org.bukkit.OfflinePlayer;
2726
import org.bukkit.command.Command;
2827
import org.bukkit.command.CommandSender;

src/main/java/lol/hyper/toolstats/events/AnvilEvent.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
package lol.hyper.toolstats.events;
1919

2020
import lol.hyper.toolstats.ToolStats;
21-
import net.kyori.adventure.text.Component;
2221
import org.bukkit.Material;
2322
import org.bukkit.event.EventHandler;
2423
import org.bukkit.event.EventPriority;

src/main/java/lol/hyper/toolstats/events/CraftItem.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818
package lol.hyper.toolstats.events;
1919

20+
import lol.hyper.hyperlib.datatypes.UUIDDataType;
2021
import lol.hyper.toolstats.ToolStats;
21-
import lol.hyper.toolstats.tools.UUIDDataType;
2222
import net.kyori.adventure.text.Component;
2323
import org.bukkit.GameMode;
2424
import org.bukkit.Material;

src/main/java/lol/hyper/toolstats/events/CreativeEvent.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818
package lol.hyper.toolstats.events;
1919

20+
import lol.hyper.hyperlib.datatypes.UUIDDataType;
2021
import lol.hyper.toolstats.ToolStats;
21-
import lol.hyper.toolstats.tools.UUIDDataType;
2222
import net.kyori.adventure.text.Component;
2323
import org.bukkit.GameMode;
2424
import org.bukkit.entity.Player;

src/main/java/lol/hyper/toolstats/events/EntityDeath.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
package lol.hyper.toolstats.events;
1919

2020
import lol.hyper.toolstats.ToolStats;
21-
import lol.hyper.toolstats.tools.UUIDDataType;
2221
import net.kyori.adventure.text.Component;
2322
import org.bukkit.entity.LivingEntity;
2423
import org.bukkit.entity.Player;

src/main/java/lol/hyper/toolstats/events/GenerateLoot.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818
package lol.hyper.toolstats.events;
1919

20+
import lol.hyper.hyperlib.datatypes.UUIDDataType;
2021
import lol.hyper.toolstats.ToolStats;
21-
import lol.hyper.toolstats.tools.UUIDDataType;
2222
import net.kyori.adventure.text.Component;
2323
import org.bukkit.Location;
2424
import org.bukkit.Material;

src/main/java/lol/hyper/toolstats/events/InventoryOpen.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818
package lol.hyper.toolstats.events;
1919

20+
import lol.hyper.hyperlib.datatypes.UUIDDataType;
2021
import lol.hyper.toolstats.ToolStats;
21-
import lol.hyper.toolstats.tools.UUIDDataType;
2222
import org.bukkit.entity.Player;
2323
import org.bukkit.event.EventHandler;
2424
import org.bukkit.event.Listener;

src/main/java/lol/hyper/toolstats/events/PickupItem.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818
package lol.hyper.toolstats.events;
1919

20+
import lol.hyper.hyperlib.datatypes.UUIDDataType;
2021
import lol.hyper.toolstats.ToolStats;
21-
import lol.hyper.toolstats.tools.UUIDDataType;
2222
import net.kyori.adventure.text.Component;
2323
import org.bukkit.GameMode;
2424
import org.bukkit.Material;

0 commit comments

Comments
 (0)