From 61294803ef6694bd6f8ee51370ad85fd9b258ee1 Mon Sep 17 00:00:00 2001 From: Yive Date: Wed, 27 Jan 2016 20:01:35 -0800 Subject: [PATCH 1/5] Change Discord Link Changed to link to the KC-Unofficial channel. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fd78a03..9da98af 100644 --- a/README.md +++ b/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 From 7c2431b7572b4f61df4c2b129e15e31009e83298 Mon Sep 17 00:00:00 2001 From: Yive Date: Wed, 27 Jan 2016 21:52:33 -0800 Subject: [PATCH 2/5] 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); From c766b02838862b405b51a3f9b59d2188938449c6 Mon Sep 17 00:00:00 2001 From: Yive Date: Wed, 27 Jan 2016 23:07:57 -0800 Subject: [PATCH 3/5] Removal of Autoinstall & Autorestart Could possibly cause fatal issues for servers who might accidentally enable these in the kcauldron config. --- src/main/java/kcauldron/KCauldronConfig.java | 6 ------ src/main/java/kcauldron/updater/DefaultUpdateCallback.java | 6 ------ 2 files changed, 12 deletions(-) diff --git a/src/main/java/kcauldron/KCauldronConfig.java b/src/main/java/kcauldron/KCauldronConfig.java index 6654028..1ad33be 100644 --- a/src/main/java/kcauldron/KCauldronConfig.java +++ b/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); diff --git a/src/main/java/kcauldron/updater/DefaultUpdateCallback.java b/src/main/java/kcauldron/updater/DefaultUpdateCallback.java index 5452dea..23aea89 100644 --- a/src/main/java/kcauldron/updater/DefaultUpdateCallback.java +++ b/src/main/java/kcauldron/updater/DefaultUpdateCallback.java @@ -69,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 From 5493b952c4e5fd8d87f2f65e81b2bc88c3e9874b Mon Sep 17 00:00:00 2001 From: Yive Date: Thu, 28 Jan 2016 01:46:03 -0800 Subject: [PATCH 4/5] Small Edits Move back to bin & switch from installBundle to packageBundle --- README.md | 4 ++-- build.gradle | 2 +- buildSrc/src/main/groovy/kcauldron/InstallBundle.groovy | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 9da98af..f5c56f4 100644 --- a/README.md +++ b/README.md @@ -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" diff --git a/build.gradle b/build.gradle index cd553d0..bda1df3 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': "libraries/${project.group.replace('.', '/')}/${project.name}/${project.version}/${project.name}-${project.version}.jar" + 'Class-Path': "bin/${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 569fc57..a0df91c 100644 --- a/buildSrc/src/main/groovy/kcauldron/InstallBundle.groovy +++ b/buildSrc/src/main/groovy/kcauldron/InstallBundle.groovy @@ -33,7 +33,7 @@ class InstallBundle extends DefaultTask { installLocation.deleteDir() installLocation.mkdirs() new File(installLocation, "README.txt").withWriter { - 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' + 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 << '''Unofficial KCauldron installation guide From 4664d31a6c91a55474b1699f588c082744e30992 Mon Sep 17 00:00:00 2001 From: Yive Date: Thu, 28 Jan 2016 02:59:26 -0800 Subject: [PATCH 5/5] Add versioning --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index bda1df3..353f675 100644 --- a/build.gradle +++ b/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', - version : 'NONE' + nextBuildNumber: '9', + version : '1.7.10-1614.8' ] } }