Initial release of AreaShop-OG fork by TrueOG Network

.github/ISSUE_TEMPLATE/bug_report.md

@@ -29,7 +29,7 @@ assignees: ''
 <!--- Use '/version' for the Platform version and '/version <plugin>' for plugin versions -->
 * Server platform (Bukkit, Spigot, etc.): 
 * Server version: 
-* AreaShop version: 
+* AreaShop-OG version: 
 * WorldEdit version: 
 * WorldGuard version: 
 * DiamondBank-OG version: 
@@ -37,4 +37,4 @@ assignees: ''
 
 
 **Your config files**
-<!--- Attach a '.zip' file of the '/plugins/AreaShop' and '/plugins/WorldGuard' directories to show your configuration setup -->
+<!--- Attach a '.zip' file of the '/plugins/AreaShop-OG' and '/plugins/WorldGuard' directories to show your configuration setup -->

.github/ISSUE_TEMPLATE/support-question.md

@@ -21,7 +21,7 @@ assignees: ''
 <!--- Use '/version' for the Platform version and '/version <plugin>' for plugin versions -->
 * Server platform (Bukkit, Spigot, etc.): 
 * Server version: 
-* AreaShop version: 
+* AreaShop-OG version: 
 * WorldEdit version: 
 * WorldGuard version: 
 * DiamondBank-OG version: 
@@ -29,4 +29,4 @@ assignees: ''
 
 
 **Your config files**
-<!--- Attach a '.zip' file of the '/plugins/AreaShop' and '/plugins/WorldGuard' directories to show your configuration setup -->
+<!--- Attach a '.zip' file of the '/plugins/AreaShop-OG' and '/plugins/WorldGuard' directories to show your configuration setup -->

.gitignore

@@ -32,7 +32,7 @@
 .idea/**/gradle.xml
 .idea/**/libraries
 .settings
-AreaShop/.settings
+AreaShop-OG/.settings
 adapters/.settings
 adapters/platform/.settings/
 adapters/platform/bukkit-modern/.settings/

AreaShop-OG/build.gradle.kts

@@ -5,7 +5,10 @@ plugins {
 
 idea { module { isDownloadSources = true } }
 
-description = "AreaShop"
+description = "AreaShop-OG"
+
+// The gradle project is still called 'areashop', name every archive after the plugin instead.
+base { archivesName.set("AreaShop-OG") }
 
 dependencies {
     // Platform
@@ -41,7 +44,6 @@ dependencies {
         // We don't need these adapters if we are only publishing an api jar
         runtimeOnly(projects.adapters.plugins.worldedit)
         runtimeOnly(projects.adapters.plugins.worldguard)
-        runtimeOnly(projects.adapters.plugins.fastasyncworldedit)
         runtimeOnly(projects.adapters.plugins.essentials)
         runtimeOnly(projects.adapters.platform.bukkitModern)
     }
@@ -63,7 +65,7 @@ tasks {
     }
 
     jar {
-        archiveBaseName.set("AreaShop")
+        archiveBaseName.set("AreaShop-OG")
         if (!providers.environmentVariable("JITPACK").isPresent) {
             archiveClassifier.set("original")
         } else {
@@ -82,7 +84,7 @@ tasks {
 
     shadowJar {
         archiveClassifier.set("")
-        base { archiveBaseName.set("AreaShop") }
+        base { archiveBaseName.set("AreaShop-OG") }
         val base = "me.wiefferink.areashop.libraries"
         relocate("org.incendo.cloud", "${base}.cloud")
         relocate("me.wiefferink.interactivemessenger", "${base}.interactivemessenger")

AreaShop-OG/src/main/java/me/wiefferink/areashop/ASLanguageManager.java

@@ -240,7 +240,7 @@ public class ASLanguageManager extends LanguageManager {
             if (!Transifex.convertFrom(file)) {
 
                 Log.warn("Failed to convert " + file.getName()
-                        + " from the Transifex layout to the AreaShop layout, check the errors above");
+                        + " from the Transifex layout to the AreaShop-OG layout, check the errors above");
 
             }
 

AreaShop-OG/src/main/java/me/wiefferink/areashop/AreaShop.java

@@ -257,7 +257,7 @@ public final class AreaShop extends JavaPlugin implements AreaShopApi {
         }
 
         // Find WorldEdit integration version to load
-        String weHandlerVersion;
+        String weHandlerVersion = "WorldEditHandler";
         Plugin plugin = getServer().getPluginManager().getPlugin("WorldEdit");
         if (!(plugin instanceof WorldEditPlugin) || !plugin.isEnabled()) {
 
@@ -267,17 +267,6 @@ public final class AreaShop extends JavaPlugin implements AreaShopApi {
         } else {
 
             this.worldEdit = (WorldEditPlugin) plugin;
-            Plugin fawePlugin = getServer().getPluginManager().getPlugin("FastAsyncWorldEdit");
-            if (fawePlugin != null && fawePlugin.isEnabled()) {
-
-                weHandlerVersion = "FastAsyncWorldEditHandler";
-                info("Detected FastAsyncWorldEdit, using the fawe handler");
-
-            } else {
-
-                weHandlerVersion = "WorldEditHandler";
-
-            }
 
         }
 
@@ -420,7 +409,7 @@ public final class AreaShop extends JavaPlugin implements AreaShopApi {
         // Don't initialize the updatechecker if disabled in the config
         if (getConfig().getBoolean("checkForUpdates")) {
 
-            githubUpdateCheck = new GithubUpdateCheck(this, "md5sha256", "AreaShop")
+            githubUpdateCheck = new GithubUpdateCheck(this, "true-og", "AreaShop-OG")
                     .withVersionComparator((latestVersion, currentVersion) ->
                     {
 
@@ -437,9 +426,9 @@ public final class AreaShop extends JavaPlugin implements AreaShopApi {
 
                         }
 
-                        AreaShop.info("Update from AreaShop V" + cleanVersion(result.getCurrentVersion())
-                                + " to AreaShop V" + cleanVersion(result.getLatestVersion())
-                                + " available, get the latest version at https://github.com/md5sha256/AreaShop/releases");
+                        AreaShop.info("Update from AreaShop-OG V" + cleanVersion(result.getCurrentVersion())
+                                + " to AreaShop-OG V" + cleanVersion(result.getLatestVersion())
+                                + " available, get the latest version at https://github.com/true-og/AreaShop-OG/releases");
                         for (Player player : Utils.getOnlinePlayers()) {
 
                             notifyUpdate(player);