Merge branch 'master' of https://github.com/TCPR/KCauldron

README.md

@@ -9,7 +9,7 @@
 
 ## Chat
 
-Feel free to drop in on the TCPR Discord chat [here](https://discord.gg/0VmBoNh2sE2t5yKh)
+Feel free to drop in on the TCPR Discord chat [here](https://discord.gg/0VmBoNh2sE2XaJ4m)
 
 ##Patreon
 
@@ -76,7 +76,7 @@ P.S. **PLEASE** look at the release notes before downloading! :smile:
   * If you have gradle integration in IDE - you can still use gui
   * Auto: `build.sh`
   * Manual:
-  `./gradlew setupCauldron jar installBundle`
+  `./gradlew setupCauldron jar packageBundle`
 
 All builds will be in `build/distributions`
   
@@ -84,7 +84,7 @@ All builds will be in `build/distributions`
 * Update sources
   * `git pull origin master`
 * Re apply patches & build binaries
-  * `./gradlew clean setupCauldron jar installBundle`
+  * `./gradlew clean setupCauldron jar packageBundle`
 
 [forge]: https://img.shields.io/badge/Minecraft%20Forge-v10.13.4.1614-green.svg "Minecraft Forge v10.13.4.1614"
 [mc]: https://img.shields.io/badge/Minecraft-v1.7.10-green.svg "Minecraft 1.7.10"

build.gradle

@@ -65,8 +65,8 @@ def buildInfo(String key) {
             buildInfoCached = new JsonSlurper().parse(new URL("https://api.prok.pw/repo/version/${group}/${name}"))
         } else {
             buildInfoCached = [
-                    nextBuildNumber: 'UNOFFICIAL',
+                    nextBuildNumber: '9',
-                    version        : 'NONE'
+                    version        : '1.7.10-1614.8'
             ]
         }
     }

buildSrc/src/main/groovy/kcauldron/InstallBundle.groovy

@@ -35,11 +35,9 @@ class InstallBundle extends DefaultTask {
         new File(installLocation, "README.txt").withWriter {
             def String jarPath = 'bin/' << (project.group as String).replace('.', File.separator) << File.separator << project.name << File.separator << project.version << File.separator << project.name << '-' << project.version << '.jar'
 
-            it << '''KCauldron installation guide
+            it << '''Unofficial KCauldron installation guide
 
-# Understanding this bundle
+# This is an unofficial version of KCauldron from https://github.com/TCPR/KCauldron
-You're reading this guide because you're using deprecated installation method
-If you want use easier & safer method please read about KBootstrap at https://prok.pw/KBootstrap
 
 # Installation and usage
 1. Unpack this zip into server directory
@@ -47,17 +45,7 @@ If you want use easier & safer method please read about KBootstrap at https://pr
   java -jar '''
             it << jarPath
             it << '''
-    ... or
+3. Enjoy
-  java -jar KCauldron.jar
-3. That's end, enjoy
-
-# Why I should use KBootstrap?
-1. Easiest server installation
-2. Built-in libraries management
-3. Update & run server in one line
-4. Ability to not read this boring guide
-5. What else?
-If you are not yet convinced and want to use bundles instead KBootstrap... Meh, this is your choice.
 '''
         }
         def cp = bootstrapClasspath

src/main/java/kcauldron/KCauldronConfig.java

@@ -15,10 +15,6 @@ public class KCauldronConfig extends ConfigBase {
             "updatechecker.enable", false, "Enable KCauldron update checker");
     public StringSetting updatecheckerSymlinks = new StringSetting(this,
             "updatechecker.symlinks", "KCauldron.jar", "(Re)create symlinks after update");
-    public BoolSetting updatecheckerAutoinstall = new BoolSetting(this,
-            "updatechecker.autoinstall", false, "Install updates without confirming");
-    public BoolSetting updatecheckerAutorestart = new BoolSetting(this,
-            "updatechecker.autorestart", false, "Restart server after updating without confirming (set restart script in spigot.yml)");
     public BoolSetting updatecheckerQuiet = new BoolSetting(this,
             "updatechecker.quiet", false, "Print less info during update");
 
@@ -35,8 +31,6 @@ public class KCauldronConfig extends ConfigBase {
         register(commandEnable);
         register(updatecheckerEnable);
         register(updatecheckerSymlinks);
-        register(updatecheckerAutoinstall);
-        register(updatecheckerAutorestart);
         register(updatecheckerQuiet);
         register(loggingMaterialInjection);
         register(loggingClientModList);

src/main/java/kcauldron/updater/DefaultUpdateCallback.java

@@ -22,10 +22,9 @@ public class DefaultUpdateCallback implements IVersionCheckCallback {
         Player player = event.getPlayer();
         if (hasPermission(player)) {
             if (KCauldron.isLegacy()) {
-                player.sendMessage(ChatColor.YELLOW + "We're running on legacy version on KCauldron, please update your version");
             }            
             if (!KCauldron.isOfficial()) {
-                player.sendMessage(ChatColor.YELLOW + "We're running on non-official version on KCauldron, please update your version");
+                player.sendMessage(ChatColor.YELLOW + "[KC-Unofficial] " + ChatColor.GOLD + "You're running KC-Unofficial, make sure to check https://github.com/TCPR/KCauldron for updates or to report bugs.");
             }            
             if (mHasUpdate) {
                 sendUpdate(player);
@@ -70,12 +69,6 @@ public class DefaultUpdateCallback implements IVersionCheckCallback {
             }
         }
         mHasUpdate = true;
-        if (MinecraftServer.kcauldronConfig.updatecheckerAutoinstall.getValue()
-                && !mNewVersion.equals(KCauldron.sNewServerVersion)
-                && !KCauldron.sUpdateInProgress) {
-            Bukkit.getConsoleSender().sendMessage("Triggering auto update");
-            KCauldronUpdater.initUpdate(Bukkit.getConsoleSender(), newVersion);
-        }
     }
 
     @Override