From 7c2431b7572b4f61df4c2b129e15e31009e83298 Mon Sep 17 00:00:00 2001
From: Yive <admin@yive.me>
Date: Wed, 27 Jan 2016 21:52:33 -0800
Subject: [PATCH] Edits

- Possibly change back to libraries instead of bin.
- Remove the legacy warning for OPs & replace the Non Official message
with our own message for OPs.
---
 build.gradle                                  |  2 +-
 .../groovy/kcauldron/InstallBundle.groovy     | 20 ++++---------------
 .../updater/DefaultUpdateCallback.java        |  3 +--
 3 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/build.gradle b/build.gradle
index bda1df3..cd553d0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -215,7 +215,7 @@ task bundleStub(type: Jar) {
     classifier = 'stub'
     manifest.attributes([
             'Main-Class': 'cpw.mods.fml.relauncher.ServerLaunchWrapper',
-            'Class-Path': "bin/${project.group.replace('.', '/')}/${project.name}/${project.version}/${project.name}-${project.version}.jar"
+            'Class-Path': "libraries/${project.group.replace('.', '/')}/${project.name}/${project.version}/${project.name}-${project.version}.jar"
     ])
 }
 
diff --git a/buildSrc/src/main/groovy/kcauldron/InstallBundle.groovy b/buildSrc/src/main/groovy/kcauldron/InstallBundle.groovy
index 6dcfcaf..569fc57 100644
--- a/buildSrc/src/main/groovy/kcauldron/InstallBundle.groovy
+++ b/buildSrc/src/main/groovy/kcauldron/InstallBundle.groovy
@@ -33,13 +33,11 @@ class InstallBundle extends DefaultTask {
         installLocation.deleteDir()
         installLocation.mkdirs()
         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'
+            def String jarPath = 'libraries/' << (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
-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
+# This is an unofficial version of KCauldron from https://github.com/TCPR/KCauldron
 
 # 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
-  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.
+3. Enjoy
 '''
         }
         def cp = bootstrapClasspath
diff --git a/src/main/java/kcauldron/updater/DefaultUpdateCallback.java b/src/main/java/kcauldron/updater/DefaultUpdateCallback.java
index 2980c31..5452dea 100644
--- a/src/main/java/kcauldron/updater/DefaultUpdateCallback.java
+++ b/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);