Browse Source

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.
master
Yive 9 years ago
parent
commit
7c2431b757
  1. 2
      build.gradle
  2. 20
      buildSrc/src/main/groovy/kcauldron/InstallBundle.groovy
  3. 3
      src/main/java/kcauldron/updater/DefaultUpdateCallback.java

2
build.gradle

@ -215,7 +215,7 @@ task bundleStub(type: Jar) {
classifier = 'stub' classifier = 'stub'
manifest.attributes([ manifest.attributes([
'Main-Class': 'cpw.mods.fml.relauncher.ServerLaunchWrapper', '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"
]) ])
} }

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

@ -33,13 +33,11 @@ class InstallBundle extends DefaultTask {
installLocation.deleteDir() installLocation.deleteDir()
installLocation.mkdirs() installLocation.mkdirs()
new File(installLocation, "README.txt").withWriter { 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 # 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 # Installation and usage
1. Unpack this zip into server directory 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 ''' java -jar '''
it << jarPath it << jarPath
it << ''' 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 def cp = bootstrapClasspath

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

@ -22,10 +22,9 @@ public class DefaultUpdateCallback implements IVersionCheckCallback {
Player player = event.getPlayer(); Player player = event.getPlayer();
if (hasPermission(player)) { if (hasPermission(player)) {
if (KCauldron.isLegacy()) { if (KCauldron.isLegacy()) {
player.sendMessage(ChatColor.YELLOW + "We're running on legacy version on KCauldron, please update your version");
} }
if (!KCauldron.isOfficial()) { 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) { if (mHasUpdate) {
sendUpdate(player); sendUpdate(player);

Loading…
Cancel
Save