From 421513aa831615295ef6f4081767cf69ce5689b9 Mon Sep 17 00:00:00 2001 From: Zoey Date: Thu, 1 Dec 2022 21:19:50 +0100 Subject: [PATCH] Update Links and Names Signed-off-by: Zoey --- README.md | 22 ++++++++-------- pom.xml | 2 +- .../Listener/EntityInteractListener.java | 8 +++--- .../stacker/Listener/JoinListener.java | 6 ++--- .../stacker/Listener/QuitListener.java | 6 ++--- .../stacker/Listener/ShiftListener.java | 2 +- .../zoeyvid}/stacker/StackerCommand.java | 2 +- .../zoeyvid}/stacker/loadConfig.java | 2 +- .../zoeyvid}/stacker/loadLanguage.java | 2 +- .../sancraft => de/zoeyvid}/stacker/main.java | 26 +++++++++---------- src/main/resources/config.yml | 12 ++++----- src/main/resources/plugin.yml | 2 +- 12 files changed, 46 insertions(+), 46 deletions(-) rename src/main/java/{dev/sancraft => de/zoeyvid}/stacker/Listener/EntityInteractListener.java (86%) rename src/main/java/{dev/sancraft => de/zoeyvid}/stacker/Listener/JoinListener.java (84%) rename src/main/java/{dev/sancraft => de/zoeyvid}/stacker/Listener/QuitListener.java (80%) rename src/main/java/{dev/sancraft => de/zoeyvid}/stacker/Listener/ShiftListener.java (91%) rename src/main/java/{dev/sancraft => de/zoeyvid}/stacker/StackerCommand.java (99%) rename src/main/java/{dev/sancraft => de/zoeyvid}/stacker/loadConfig.java (99%) rename src/main/java/{dev/sancraft => de/zoeyvid}/stacker/loadLanguage.java (99%) rename src/main/java/{dev/sancraft => de/zoeyvid}/stacker/main.java (79%) diff --git a/README.md b/README.md index ea1e7669..5b2c9bbb 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# [Stacker](https://github.com/SanCraftDev/Stacker) +# [Stacker](https://github.com/ZoeyVid/Stacker) A plugin to stack player above player!
This plugin works with the Minecraft versions 1.11-1.19 @@ -15,18 +15,18 @@ This plugin works with the Minecraft versions 1.11-1.19 ## Translate the Plugin -[Read more here](https://github.com/SanCraftDev/Stacker/tree/main/languages/README.md) +[Read more here](https://github.com/ZoeyVid/Stacker/tree/main/languages/README.md) ## The project is also on: -[GitHub](https://github.com/SanCraftDev/Stacker)
+[GitHub](https://github.com/ZoeyVid/Stacker)
[SpigotMC](https://www.spigotmc.org/resources/stacker.94586)
[Curseforge](https://www.curseforge.com/minecraft/bukkit-plugins/playerstackerplugin)
[(dev.bukkit.org)](https://dev.bukkit.org/projects/playerstackerplugin)
-[Jenkins (Ci)](https://ci.sancraft.dev/job/Stacker)
-[Jenkins (Ci) - Dev-Version](https://ci.sancraft.dev/job/Stacker-Dev)
-[Instant download](https://ci.sancraft.dev/job/Stacker/lastSuccessfulBuild/artifact/target/stacker.jar)
-[Instant download Dev-Version](https://ci.sancraft.dev/job/Stacker-Dev/lastSuccessfulBuild/artifact/target/stacker.jar)
+[Jenkins (Ci)](https://ci.zvcdn.de/job/Stacker)
+[Jenkins (Ci) - Dev-Version](https://ci.zvcdn.de/job/Stacker-Dev)
+[Instant download](https://ci.zvcdn.de/job/Stacker/lastSuccessfulBuild/artifact/target/stacker.jar)
+[Instant download Dev-Version](https://ci.zvcdn.de/job/Stacker-Dev/lastSuccessfulBuild/artifact/target/stacker.jar)
# Security Policy @@ -46,10 +46,10 @@ Bugs and feature ideas can be submitted in the issues! ## Contact us -[Discord](https://sancraft.de/dc) (Main Language: German) (DavidCraft#2905)
-[Twitter](https://twitter.com/SanCraftDev)
-[GitHub](https://github.com/SanCraftDev)
+[Mastodon](https://social.zoeyvid.de/@ZoeyVid)
+[Twitter](https://twitter.com/ZoeyVid)
+[GitHub](https://github.com/ZoeyVid)
## License -Mozilla Public License 2.0 Copyright © 2022 SanCraft +Mozilla Public License 2.0 Copyright © 2022 ZoeyVid diff --git a/pom.xml b/pom.xml index e23f3927..10e4a116 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - dev.sancraft + de.zoeyvid stacker 0.0.0 jar diff --git a/src/main/java/dev/sancraft/stacker/Listener/EntityInteractListener.java b/src/main/java/de/zoeyvid/stacker/Listener/EntityInteractListener.java similarity index 86% rename from src/main/java/dev/sancraft/stacker/Listener/EntityInteractListener.java rename to src/main/java/de/zoeyvid/stacker/Listener/EntityInteractListener.java index 8c4e5f3a..45e94b95 100644 --- a/src/main/java/dev/sancraft/stacker/Listener/EntityInteractListener.java +++ b/src/main/java/de/zoeyvid/stacker/Listener/EntityInteractListener.java @@ -1,8 +1,8 @@ -package dev.sancraft.stacker.Listener; +package de.zoeyvid.stacker.Listener; -import dev.sancraft.stacker.loadConfig; -import dev.sancraft.stacker.loadLanguage; -import dev.sancraft.stacker.main; +import de.zoeyvid.stacker.loadConfig; +import de.zoeyvid.stacker.loadLanguage; +import de.zoeyvid.stacker.main; import org.bukkit.ChatColor; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; diff --git a/src/main/java/dev/sancraft/stacker/Listener/JoinListener.java b/src/main/java/de/zoeyvid/stacker/Listener/JoinListener.java similarity index 84% rename from src/main/java/dev/sancraft/stacker/Listener/JoinListener.java rename to src/main/java/de/zoeyvid/stacker/Listener/JoinListener.java index fb9846a3..5f5f89ec 100644 --- a/src/main/java/dev/sancraft/stacker/Listener/JoinListener.java +++ b/src/main/java/de/zoeyvid/stacker/Listener/JoinListener.java @@ -1,7 +1,7 @@ -package dev.sancraft.stacker.Listener; +package de.zoeyvid.stacker.Listener; -import dev.sancraft.stacker.loadConfig; -import dev.sancraft.stacker.main; +import de.zoeyvid.stacker.loadConfig; +import de.zoeyvid.stacker.main; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; diff --git a/src/main/java/dev/sancraft/stacker/Listener/QuitListener.java b/src/main/java/de/zoeyvid/stacker/Listener/QuitListener.java similarity index 80% rename from src/main/java/dev/sancraft/stacker/Listener/QuitListener.java rename to src/main/java/de/zoeyvid/stacker/Listener/QuitListener.java index 584f67e6..8b50897c 100644 --- a/src/main/java/dev/sancraft/stacker/Listener/QuitListener.java +++ b/src/main/java/de/zoeyvid/stacker/Listener/QuitListener.java @@ -1,7 +1,7 @@ -package dev.sancraft.stacker.Listener; +package de.zoeyvid.stacker.Listener; -import dev.sancraft.stacker.loadConfig; -import dev.sancraft.stacker.main; +import de.zoeyvid.stacker.loadConfig; +import de.zoeyvid.stacker.main; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; diff --git a/src/main/java/dev/sancraft/stacker/Listener/ShiftListener.java b/src/main/java/de/zoeyvid/stacker/Listener/ShiftListener.java similarity index 91% rename from src/main/java/dev/sancraft/stacker/Listener/ShiftListener.java rename to src/main/java/de/zoeyvid/stacker/Listener/ShiftListener.java index e31fa57c..8d46dd10 100644 --- a/src/main/java/dev/sancraft/stacker/Listener/ShiftListener.java +++ b/src/main/java/de/zoeyvid/stacker/Listener/ShiftListener.java @@ -1,4 +1,4 @@ -package dev.sancraft.stacker.Listener; +package de.zoeyvid.stacker.Listener; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; diff --git a/src/main/java/dev/sancraft/stacker/StackerCommand.java b/src/main/java/de/zoeyvid/stacker/StackerCommand.java similarity index 99% rename from src/main/java/dev/sancraft/stacker/StackerCommand.java rename to src/main/java/de/zoeyvid/stacker/StackerCommand.java index d239848a..96537925 100644 --- a/src/main/java/dev/sancraft/stacker/StackerCommand.java +++ b/src/main/java/de/zoeyvid/stacker/StackerCommand.java @@ -1,4 +1,4 @@ -package dev.sancraft.stacker; +package de.zoeyvid.stacker; import org.bukkit.Bukkit; import org.bukkit.ChatColor; diff --git a/src/main/java/dev/sancraft/stacker/loadConfig.java b/src/main/java/de/zoeyvid/stacker/loadConfig.java similarity index 99% rename from src/main/java/dev/sancraft/stacker/loadConfig.java rename to src/main/java/de/zoeyvid/stacker/loadConfig.java index 5c906131..8f2d5107 100644 --- a/src/main/java/dev/sancraft/stacker/loadConfig.java +++ b/src/main/java/de/zoeyvid/stacker/loadConfig.java @@ -1,4 +1,4 @@ -package dev.sancraft.stacker; +package de.zoeyvid.stacker; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.YamlConfiguration; diff --git a/src/main/java/dev/sancraft/stacker/loadLanguage.java b/src/main/java/de/zoeyvid/stacker/loadLanguage.java similarity index 99% rename from src/main/java/dev/sancraft/stacker/loadLanguage.java rename to src/main/java/de/zoeyvid/stacker/loadLanguage.java index 3768be0d..51fb7dd3 100644 --- a/src/main/java/dev/sancraft/stacker/loadLanguage.java +++ b/src/main/java/de/zoeyvid/stacker/loadLanguage.java @@ -1,4 +1,4 @@ -package dev.sancraft.stacker; +package de.zoeyvid.stacker; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.YamlConfiguration; diff --git a/src/main/java/dev/sancraft/stacker/main.java b/src/main/java/de/zoeyvid/stacker/main.java similarity index 79% rename from src/main/java/dev/sancraft/stacker/main.java rename to src/main/java/de/zoeyvid/stacker/main.java index 5d338b9d..aafedac1 100644 --- a/src/main/java/dev/sancraft/stacker/main.java +++ b/src/main/java/de/zoeyvid/stacker/main.java @@ -1,9 +1,9 @@ -package dev.sancraft.stacker; +package de.zoeyvid.stacker; -import dev.sancraft.stacker.Listener.EntityInteractListener; -import dev.sancraft.stacker.Listener.JoinListener; -import dev.sancraft.stacker.Listener.QuitListener; -import dev.sancraft.stacker.Listener.ShiftListener; +import de.zoeyvid.stacker.Listener.EntityInteractListener; +import de.zoeyvid.stacker.Listener.JoinListener; +import de.zoeyvid.stacker.Listener.QuitListener; +import de.zoeyvid.stacker.Listener.ShiftListener; import org.apache.commons.io.FileUtils; import org.bukkit.Bukkit; import org.bukkit.ChatColor; @@ -86,13 +86,13 @@ private void loadLanguages() { Bukkit.getConsoleSender().sendMessage(main.getPrefix() + ChatColor.WHITE + "Language file loaded! (" + loadConfig.language() + ")"); } else { try { - FileUtils.copyURLToFile(new URL("https://raw.githubusercontent.com/SanCraftDev/Stacker/" + loadConfig.updateChannel() + "/languages/" + loadConfig.language() + ".yml"), new File("plugins/Stacker/language/" + loadConfig.language() + ".yml")); + FileUtils.copyURLToFile(new URL("https://raw.githubusercontent.com/ZoeyVid/Stacker/" + loadConfig.updateChannel() + "/languages/" + loadConfig.language() + ".yml"), new File("plugins/Stacker/language/" + loadConfig.language() + ".yml")); } catch (Exception e) { try { - FileUtils.copyURLToFile(new URL("https://raw.githubusercontent.com/SanCraftDev/Stacker/" + loadConfig.updateChannel() + "/languages/en.yml"), new File("plugins/Stacker/language/" + loadConfig.language() + ".yml")); + FileUtils.copyURLToFile(new URL("https://raw.githubusercontent.com/ZoeyVid/Stacker/" + loadConfig.updateChannel() + "/languages/en.yml"), new File("plugins/Stacker/language/" + loadConfig.language() + ".yml")); } catch (Exception e1) { try { - FileUtils.copyURLToFile(new URL("https://raw.githubusercontent.com/SanCraftDev/Stacker/Stable/languages/en.yml"), new File("plugins/Stacker/language/" + loadConfig.language() + ".yml")); + FileUtils.copyURLToFile(new URL("https://raw.githubusercontent.com/ZoeyVid/Stacker/Stable/languages/en.yml"), new File("plugins/Stacker/language/" + loadConfig.language() + ".yml")); } catch (Exception e2) { Bukkit.getConsoleSender().sendMessage(main.getPrefix() + ChatColor.RED + "Error while downloading language file!"); Bukkit.getServer().getPluginManager().disablePlugin(this); @@ -109,11 +109,11 @@ private void updatePlugin() { if (loadConfig.updateChannel().equalsIgnoreCase("dev")) { File oldFile = new File("plugins/stacker.jar"); if(oldFile.exists()) FileUtils.delete(oldFile); - FileUtils.copyURLToFile(new URL("https://ci.sancraft.dev/job/Stacker-Dev/lastSuccessfulBuild/artifact/target/stacker.jar"), new File("plugins/stacker.jar")); + FileUtils.copyURLToFile(new URL("https://ci.zvcdn.de/job/Stacker-Dev/lastSuccessfulBuild/artifact/target/stacker.jar"), new File("plugins/stacker.jar")); } else { File oldFile = new File("plugins/stacker.jar"); if(oldFile.exists()) FileUtils.delete(oldFile); - FileUtils.copyURLToFile(new URL("https://ci.sancraft.dev/job/Stacker/lastSuccessfulBuild/artifact/target/stacker.jar"), new File("plugins/stacker.jar")); + FileUtils.copyURLToFile(new URL("https://ci.zvcdn.de/job/Stacker/lastSuccessfulBuild/artifact/target/stacker.jar"), new File("plugins/stacker.jar")); } } catch (Exception e) { Bukkit.getConsoleSender().sendMessage(main.getPrefix() + ChatColor.RED + "Error while updating the plugin!"); @@ -124,13 +124,13 @@ private void updatePlugin() { private void updateLanguage() { if (loadConfig.autoUpdateLanguage() && loadLanguage.getVersion() != langVersion) { try { - FileUtils.copyURLToFile(new URL("https://raw.githubusercontent.com/SanCraftDev/Stacker/" + loadConfig.updateChannel() + "/languages/" + loadConfig.language() + ".yml"), new File("plugins/Stacker/language/" + loadConfig.language() + ".yml")); + FileUtils.copyURLToFile(new URL("https://raw.githubusercontent.com/ZoeyVid/Stacker/" + loadConfig.updateChannel() + "/languages/" + loadConfig.language() + ".yml"), new File("plugins/Stacker/language/" + loadConfig.language() + ".yml")); } catch (Exception e) { try { - FileUtils.copyURLToFile(new URL("https://raw.githubusercontent.com/SanCraftDev/Stacker/" + loadConfig.updateChannel() + "/languages/en.yml"), new File("plugins/Stacker/language/" + loadConfig.language() + ".yml")); + FileUtils.copyURLToFile(new URL("https://raw.githubusercontent.com/ZoeyVid/Stacker/" + loadConfig.updateChannel() + "/languages/en.yml"), new File("plugins/Stacker/language/" + loadConfig.language() + ".yml")); } catch (Exception e1) { try { - FileUtils.copyURLToFile(new URL("https://raw.githubusercontent.com/SanCraftDev/Stacker/Stable/languages/en.yml"), new File("plugins/Stacker/language/" + loadConfig.language() + ".yml")); + FileUtils.copyURLToFile(new URL("https://raw.githubusercontent.com/ZoeyVid/Stacker/Stable/languages/en.yml"), new File("plugins/Stacker/language/" + loadConfig.language() + ".yml")); } catch (Exception e2) { Bukkit.getConsoleSender().sendMessage(main.getPrefix() + ChatColor.RED + "Error while downloading language file!"); Bukkit.getServer().getPluginManager().disablePlugin(this); diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 966e3805..a46e778e 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -1,9 +1,9 @@ # Stacker # A Plugin to Stack Player on the top of another Player -# by DavidCraftDev for SanCraft -# GitHub: https://github.com/SanCraftDev -# Twitter: https://twitter.com/SanCraftDev -# Discord: https://discord.gg/y8DhYhv427 +# by DavidCraftDev for ZoeyVid +# GitHub: https://github.com/ZoeyVid +# Mastodon: https://social.zoeyvid.de/@ZoeyVid +# Twitter: https://twitter.com/ZoeyVid # # Should the stackmode enabled default on join? defaultOn: false @@ -20,13 +20,13 @@ saveState: true # Should a Player be on join default immune? defaultImmune: false # -# Language (Available Languages: https://github.com/SanCraftDev/Stacker/tree/master/languages) +# Language (Available Languages: https://github.com/ZoeyVid/Stacker/tree/master/languages) languageFile: "en" # # Should the plugin automatically update? autoUpdate: true # -# Update Channel (Available Channels: stable & dev) - Downloaded from our ci (https://ci.sancraft.dev) +# Update Channel (Available Channels: stable & dev) - Downloaded from our ci (https://ci.zvcdn.de) updateChannel: "dev" # # Should the plugin automatically update the Language File? (This will delete your custom changes) diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 5d7f7dfa..329c659e 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,6 +1,6 @@ name: Stacker version: ${project.version} -main: dev.sancraft.stacker.main +main: de.zoeyvid.stacker.main authors: [ DavidCraft ] description: A Plugin to Stack Player on the top of a other Player