Finally fix #67
This commit is contained in:
Prototik
@ -9,96 +9,96 @@ import java.util.Properties;
|
||||
import org.spigotmc.RestartCommand;
|
||||
|
||||
public class KCauldron {
|
||||
private static boolean sManifestParsed = false;
|
||||
private static boolean sManifestParsed = false;
|
||||
|
||||
private static void parseManifest() {
|
||||
if (sManifestParsed)
|
||||
return;
|
||||
sManifestParsed = true;
|
||||
private static void parseManifest() {
|
||||
if (sManifestParsed)
|
||||
return;
|
||||
sManifestParsed = true;
|
||||
|
||||
try {
|
||||
Enumeration<URL> resources = KCauldron.class.getClassLoader()
|
||||
.getResources("META-INF/MANIFEST.MF");
|
||||
Properties manifest = new Properties();
|
||||
while (resources.hasMoreElements()) {
|
||||
URL url = resources.nextElement();
|
||||
manifest.load(url.openStream());
|
||||
String version = manifest.getProperty("KCauldron-Version");
|
||||
if (version != null) {
|
||||
String path = url.getPath();
|
||||
String jarFilePath = path.substring(path.indexOf(":") + 1,
|
||||
path.indexOf("!"));
|
||||
jarFilePath = URLDecoder.decode(jarFilePath, "UTF-8");
|
||||
sServerLocation = new File(jarFilePath);
|
||||
try {
|
||||
Enumeration<URL> resources = KCauldron.class.getClassLoader()
|
||||
.getResources("META-INF/MANIFEST.MF");
|
||||
Properties manifest = new Properties();
|
||||
while (resources.hasMoreElements()) {
|
||||
URL url = resources.nextElement();
|
||||
manifest.load(url.openStream());
|
||||
String version = manifest.getProperty("KCauldron-Version");
|
||||
if (version != null) {
|
||||
String path = url.getPath();
|
||||
String jarFilePath = path.substring(path.indexOf(":") + 1,
|
||||
path.indexOf("!"));
|
||||
jarFilePath = URLDecoder.decode(jarFilePath, "UTF-8");
|
||||
sServerLocation = new File(jarFilePath);
|
||||
|
||||
sCurrentVersion = version;
|
||||
sGroup = manifest.getProperty("KCauldron-Group");
|
||||
sBranch = manifest.getProperty("KCauldron-Branch");
|
||||
sChannel = manifest.getProperty("KCauldron-Channel");
|
||||
break;
|
||||
}
|
||||
manifest.clear();
|
||||
}
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
sCurrentVersion = version;
|
||||
sGroup = manifest.getProperty("KCauldron-Group");
|
||||
sBranch = manifest.getProperty("KCauldron-Branch");
|
||||
sChannel = manifest.getProperty("KCauldron-Channel");
|
||||
break;
|
||||
}
|
||||
manifest.clear();
|
||||
}
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
private static String sCurrentVersion;
|
||||
private static String sCurrentVersion;
|
||||
|
||||
public static String getCurrentVersion() {
|
||||
parseManifest();
|
||||
return sCurrentVersion;
|
||||
}
|
||||
public static String getCurrentVersion() {
|
||||
parseManifest();
|
||||
return sCurrentVersion;
|
||||
}
|
||||
|
||||
private static File sServerLocation;
|
||||
private static File sServerLocation;
|
||||
|
||||
public static File getServerLocation() {
|
||||
parseManifest();
|
||||
return sServerLocation;
|
||||
}
|
||||
|
||||
private static File sServerHome;
|
||||
|
||||
public static File getServerHome() {
|
||||
if (sServerHome == null) {
|
||||
String home = System.getenv("KCAULDRON_HOME");
|
||||
if (home != null) {
|
||||
sServerHome = new File(home);
|
||||
} else {
|
||||
parseManifest();
|
||||
sServerHome = sServerLocation.getParentFile();
|
||||
}
|
||||
}
|
||||
return sServerHome;
|
||||
}
|
||||
public static File getServerLocation() {
|
||||
parseManifest();
|
||||
return sServerLocation;
|
||||
}
|
||||
|
||||
private static File sServerHome;
|
||||
|
||||
public static File getServerHome() {
|
||||
if (sServerHome == null) {
|
||||
String home = System.getenv("KCAULDRON_HOME");
|
||||
if (home != null) {
|
||||
sServerHome = new File(home);
|
||||
} else {
|
||||
parseManifest();
|
||||
sServerHome = sServerLocation.getParentFile();
|
||||
}
|
||||
}
|
||||
return sServerHome;
|
||||
}
|
||||
|
||||
private static String sGroup;
|
||||
private static String sGroup;
|
||||
|
||||
public static String getGroup() {
|
||||
parseManifest();
|
||||
return sGroup;
|
||||
}
|
||||
public static String getGroup() {
|
||||
parseManifest();
|
||||
return sGroup;
|
||||
}
|
||||
|
||||
private static String sBranch;
|
||||
private static String sBranch;
|
||||
|
||||
public static String getBranch() {
|
||||
parseManifest();
|
||||
return sBranch;
|
||||
}
|
||||
public static String getBranch() {
|
||||
parseManifest();
|
||||
return sBranch;
|
||||
}
|
||||
|
||||
private static String sChannel;
|
||||
private static String sChannel;
|
||||
|
||||
public static String getChannel() {
|
||||
parseManifest();
|
||||
return sChannel;
|
||||
}
|
||||
public static String getChannel() {
|
||||
parseManifest();
|
||||
return sChannel;
|
||||
}
|
||||
|
||||
public static File sNewServerLocation;
|
||||
public static String sNewServerVersion;
|
||||
public static boolean sUpdateInProgress;
|
||||
public static File sNewServerLocation;
|
||||
public static String sNewServerVersion;
|
||||
public static boolean sUpdateInProgress;
|
||||
|
||||
public static void restart() {
|
||||
RestartCommand.restart(true);
|
||||
}
|
||||
public static void restart() {
|
||||
RestartCommand.restart(true);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,13 +1,10 @@
|
||||
package kcauldron;
|
||||
|
||||
import static org.objectweb.asm.Opcodes.*;
|
||||
import static org.objectweb.asm.Opcodes.ALOAD;
|
||||
import static org.objectweb.asm.Opcodes.ARETURN;
|
||||
import static org.objectweb.asm.Opcodes.GETFIELD;
|
||||
|
||||
import org.apache.logging.log4j.Level;
|
||||
import org.objectweb.asm.ClassReader;
|
||||
import org.objectweb.asm.ClassVisitor;
|
||||
import org.objectweb.asm.ClassWriter;
|
||||
import org.objectweb.asm.FieldVisitor;
|
||||
import org.objectweb.asm.MethodVisitor;
|
||||
import org.objectweb.asm.tree.FieldInsnNode;
|
||||
import org.objectweb.asm.tree.InsnList;
|
||||
import org.objectweb.asm.tree.InsnNode;
|
||||
@ -19,64 +16,28 @@ import cpw.mods.fml.common.FMLLog;
|
||||
|
||||
@Transformer.RegisterTransformer
|
||||
public class KCauldronClassTransformer implements Transformer {
|
||||
@Override
|
||||
public void transform(final ImagineASM asm) {
|
||||
if (asm.is("net.minecraft.world.gen.ChunkProviderServer")
|
||||
|| asm.is("net.minecraftforge.common.chunkio.ChunkIOProvider")
|
||||
|| asm.is("org.bukkit.craftbukkit.CraftWorld")
|
||||
|| asm.is("org.bukkit.craftbukkit.v1_7_R4.CraftWorld")) {
|
||||
FMLLog.log(Level.INFO, "KCauldron: Patching " + asm.getActualName() + " for compatibility with Mystcraft");
|
||||
ClassReader reader = new ClassReader(asm.build());
|
||||
ClassWriter writer = new ClassWriter(ClassWriter.COMPUTE_MAXS);
|
||||
reader.accept(new ClassVisitor(ASM5, writer) {
|
||||
@Override
|
||||
public FieldVisitor visitField(int access, String name,
|
||||
String desc, String signature, Object value) {
|
||||
if ("loadedChunkHashMap_vanilla".equals(name)) {
|
||||
name = asm.isDev() ? "loadedChunkHashMap" : "field_73244_f";
|
||||
}
|
||||
return super.visitField(access, name, desc, signature,
|
||||
value);
|
||||
}
|
||||
@Override
|
||||
public void transform(final ImagineASM asm) {
|
||||
if (asm.is("climateControl.utils.ChunkGeneratorExtractor")) {
|
||||
boolean undergroundBiomesInstalled = false;
|
||||
try {
|
||||
Class.forName("exterminatorJeff.undergroundBiomes.worldGen.ChunkProviderWrapper");
|
||||
undergroundBiomesInstalled = true;
|
||||
} catch (Exception ignored) {
|
||||
}
|
||||
if (!undergroundBiomesInstalled) {
|
||||
FMLLog.log(Level.INFO, "KCauldron: Patching " + asm.getActualName() + " for compatibility with Climate Control");
|
||||
extractFrom(asm, asm.method("extractFrom",
|
||||
"(Lnet/minecraft/world/WorldServer;)Lnet/minecraft/world/chunk/IChunkProvider;").instructions());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public MethodVisitor visitMethod(int access, String name,
|
||||
String desc, String signature, String[] exceptions) {
|
||||
return new MethodVisitor(api, super.visitMethod(access,
|
||||
name, desc, signature, exceptions)) {
|
||||
@Override
|
||||
public void visitFieldInsn(int opcode, String owner,
|
||||
String name, String desc) {
|
||||
if ("loadedChunkHashMap_vanilla".equals(name)) {
|
||||
name = asm.isDev() ? "loadedChunkHashMap" : "field_73244_f";
|
||||
}
|
||||
super.visitFieldInsn(opcode, owner, name, desc);
|
||||
}
|
||||
};
|
||||
}
|
||||
}, 0);
|
||||
asm.loadClass(writer.toByteArray());
|
||||
}
|
||||
if (asm.is("climateControl.utils.ChunkGeneratorExtractor")) {
|
||||
boolean undergroundBiomesInstalled = false;
|
||||
try {
|
||||
Class.forName("exterminatorJeff.undergroundBiomes.worldGen.ChunkProviderWrapper");
|
||||
undergroundBiomesInstalled = true;
|
||||
} catch (Exception ignored) {
|
||||
}
|
||||
if (!undergroundBiomesInstalled) {
|
||||
FMLLog.log(Level.INFO, "KCauldron: Patching " + asm.getActualName() + " for compatibility with Climate Control");
|
||||
extractFrom(asm, asm.method("extractFrom",
|
||||
"(Lnet/minecraft/world/WorldServer;)Lnet/minecraft/world/chunk/IChunkProvider;").instructions());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void extractFrom(ImagineASM asm, InsnList list) {
|
||||
//Pair<String, String> fieldChunkProvider = asm.field("net/minecraft/world/World", "chunkProvider");
|
||||
list.clear();
|
||||
list.add(new IntInsnNode(ALOAD, 1));
|
||||
list.add(new FieldInsnNode(GETFIELD, "ahb", "v", "Lapu;"));
|
||||
list.add(new InsnNode(ARETURN));
|
||||
}
|
||||
public void extractFrom(ImagineASM asm, InsnList list) {
|
||||
//Pair<String, String> fieldChunkProvider = asm.field("net/minecraft/world/World", "chunkProvider");
|
||||
list.clear();
|
||||
list.add(new IntInsnNode(ALOAD, 1));
|
||||
list.add(new FieldInsnNode(GETFIELD, "ahb", "v", "Lapu;"));
|
||||
list.add(new InsnNode(ARETURN));
|
||||
}
|
||||
}
|
||||
|
||||
@ -9,72 +9,72 @@ import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
|
||||
public class KCauldronCommand extends Command {
|
||||
public static final String NAME = "kc";
|
||||
public static final String CHECK = NAME + ".check";
|
||||
public static final String UPDATE = NAME + ".update";
|
||||
public static final String RESTART = NAME + ".restart";
|
||||
public static final String NAME = "kc";
|
||||
public static final String CHECK = NAME + ".check";
|
||||
public static final String UPDATE = NAME + ".update";
|
||||
public static final String RESTART = NAME + ".restart";
|
||||
|
||||
public KCauldronCommand() {
|
||||
super(NAME);
|
||||
public KCauldronCommand() {
|
||||
super(NAME);
|
||||
|
||||
StringBuilder builder = new StringBuilder();
|
||||
builder.append(String.format("/%s check - Check to update\n", NAME));
|
||||
builder.append(String
|
||||
.format("/%s update [version] - Update to specified or latest version\n",
|
||||
NAME));
|
||||
builder.append(String.format("/%s restart - Restart server\n", NAME));
|
||||
setUsage(builder.toString());
|
||||
StringBuilder builder = new StringBuilder();
|
||||
builder.append(String.format("/%s check - Check to update\n", NAME));
|
||||
builder.append(String
|
||||
.format("/%s update [version] - Update to specified or latest version\n",
|
||||
NAME));
|
||||
builder.append(String.format("/%s restart - Restart server\n", NAME));
|
||||
setUsage(builder.toString());
|
||||
|
||||
setPermission("kcauldron");
|
||||
}
|
||||
setPermission("kcauldron");
|
||||
}
|
||||
|
||||
public boolean testPermission(CommandSender target, String permission) {
|
||||
if (testPermissionSilent(target, permission)) {
|
||||
return true;
|
||||
}
|
||||
target.sendMessage(ChatColor.RED
|
||||
+ "I'm sorry, but you do not have permission to perform this command. Please contact the server administrators if you believe that this is in error.");
|
||||
return false;
|
||||
}
|
||||
public boolean testPermission(CommandSender target, String permission) {
|
||||
if (testPermissionSilent(target, permission)) {
|
||||
return true;
|
||||
}
|
||||
target.sendMessage(ChatColor.RED
|
||||
+ "I'm sorry, but you do not have permission to perform this command. Please contact the server administrators if you believe that this is in error.");
|
||||
return false;
|
||||
}
|
||||
|
||||
public boolean testPermissionSilent(CommandSender target, String permission) {
|
||||
if (!super.testPermissionSilent(target)) {
|
||||
return false;
|
||||
}
|
||||
for (String p : permission.split(";"))
|
||||
if (target.hasPermission(p))
|
||||
return true;
|
||||
return false;
|
||||
}
|
||||
public boolean testPermissionSilent(CommandSender target, String permission) {
|
||||
if (!super.testPermissionSilent(target)) {
|
||||
return false;
|
||||
}
|
||||
for (String p : permission.split(";"))
|
||||
if (target.hasPermission(p))
|
||||
return true;
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean execute(CommandSender sender, String commandLabel,
|
||||
String[] args) {
|
||||
if (!testPermission(sender))
|
||||
return true;
|
||||
if (args.length == 0) {
|
||||
sender.sendMessage(ChatColor.YELLOW + "Please specify action");
|
||||
sender.sendMessage(ChatColor.AQUA + usageMessage);
|
||||
return true;
|
||||
}
|
||||
String action = args[0];
|
||||
if ("check".equals(action)) {
|
||||
if (!testPermission(sender, CHECK))
|
||||
return true;
|
||||
sender.sendMessage(ChatColor.GREEN + "Initiated version check...");
|
||||
KVersionRetriever.startServer(new CommandSenderUpdateCallback(
|
||||
sender), false);
|
||||
} else if ("update".equals(action)) {
|
||||
KCauldronUpdater.initUpdate(sender, args.length > 1 ? args[1]
|
||||
: null);
|
||||
} else if ("restart".equals(action)) {
|
||||
if (!testPermission(sender, RESTART))
|
||||
return true;
|
||||
KCauldron.restart();
|
||||
} else {
|
||||
sender.sendMessage(ChatColor.RED + "Unknown action");
|
||||
}
|
||||
return true;
|
||||
}
|
||||
@Override
|
||||
public boolean execute(CommandSender sender, String commandLabel,
|
||||
String[] args) {
|
||||
if (!testPermission(sender))
|
||||
return true;
|
||||
if (args.length == 0) {
|
||||
sender.sendMessage(ChatColor.YELLOW + "Please specify action");
|
||||
sender.sendMessage(ChatColor.AQUA + usageMessage);
|
||||
return true;
|
||||
}
|
||||
String action = args[0];
|
||||
if ("check".equals(action)) {
|
||||
if (!testPermission(sender, CHECK))
|
||||
return true;
|
||||
sender.sendMessage(ChatColor.GREEN + "Initiated version check...");
|
||||
KVersionRetriever.startServer(new CommandSenderUpdateCallback(
|
||||
sender), false);
|
||||
} else if ("update".equals(action)) {
|
||||
KCauldronUpdater.initUpdate(sender, args.length > 1 ? args[1]
|
||||
: null);
|
||||
} else if ("restart".equals(action)) {
|
||||
if (!testPermission(sender, RESTART))
|
||||
return true;
|
||||
KCauldron.restart();
|
||||
} else {
|
||||
sender.sendMessage(ChatColor.RED + "Unknown action");
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -9,71 +9,71 @@ import net.minecraftforge.cauldron.configuration.Setting;
|
||||
import net.minecraftforge.cauldron.configuration.StringSetting;
|
||||
|
||||
public class KCauldronConfig extends ConfigBase {
|
||||
public BoolSetting commandEnable = new BoolSetting(this, "command.enable",
|
||||
true, "Enable KCauldron command");
|
||||
public BoolSetting updatecheckerEnable = new BoolSetting(this,
|
||||
"updatechecker.enable", true, "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 updatecheckerQuite = new BoolSetting(this,
|
||||
"updatechecker.quite", false, "Print less info during update");
|
||||
public BoolSetting commandEnable = new BoolSetting(this, "command.enable",
|
||||
true, "Enable KCauldron command");
|
||||
public BoolSetting updatecheckerEnable = new BoolSetting(this,
|
||||
"updatechecker.enable", true, "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 updatecheckerQuite = new BoolSetting(this,
|
||||
"updatechecker.quite", false, "Print less info during update");
|
||||
|
||||
public BoolSetting loggingMaterialInjection = new BoolSetting(this,
|
||||
"logging.materialInjection", false, "Log material injection event");
|
||||
|
||||
public KCauldronConfig() {
|
||||
super("kcauldron.yml", "kc");
|
||||
register(commandEnable);
|
||||
register(updatecheckerEnable);
|
||||
register(updatecheckerSymlinks);
|
||||
register(updatecheckerAutoinstall);
|
||||
register(updatecheckerAutorestart);
|
||||
register(updatecheckerQuite);
|
||||
register(loggingMaterialInjection);
|
||||
load();
|
||||
}
|
||||
public BoolSetting loggingMaterialInjection = new BoolSetting(this,
|
||||
"logging.materialInjection", false, "Log material injection event");
|
||||
|
||||
public KCauldronConfig() {
|
||||
super("kcauldron.yml", "kc");
|
||||
register(commandEnable);
|
||||
register(updatecheckerEnable);
|
||||
register(updatecheckerSymlinks);
|
||||
register(updatecheckerAutoinstall);
|
||||
register(updatecheckerAutorestart);
|
||||
register(updatecheckerQuite);
|
||||
register(loggingMaterialInjection);
|
||||
load();
|
||||
}
|
||||
|
||||
private void register(Setting<?> setting) {
|
||||
settings.put(setting.path, setting);
|
||||
}
|
||||
private void register(Setting<?> setting) {
|
||||
settings.put(setting.path, setting);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void registerCommands() {
|
||||
if (commandEnable.getValue()) {
|
||||
super.registerCommands();
|
||||
}
|
||||
}
|
||||
@Override
|
||||
public void registerCommands() {
|
||||
if (commandEnable.getValue()) {
|
||||
super.registerCommands();
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void addCommands() {
|
||||
commands.put(commandName, new KCauldronCommand());
|
||||
}
|
||||
@Override
|
||||
protected void addCommands() {
|
||||
commands.put(commandName, new KCauldronCommand());
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void load() {
|
||||
try {
|
||||
config = YamlConfiguration.loadConfiguration(configFile);
|
||||
String header = "";
|
||||
for (Setting<?> toggle : settings.values()) {
|
||||
if (!toggle.description.equals(""))
|
||||
header += "Setting: " + toggle.path + " Default: "
|
||||
+ toggle.def + " # " + toggle.description + "\n";
|
||||
@Override
|
||||
protected void load() {
|
||||
try {
|
||||
config = YamlConfiguration.loadConfiguration(configFile);
|
||||
String header = "";
|
||||
for (Setting<?> toggle : settings.values()) {
|
||||
if (!toggle.description.equals(""))
|
||||
header += "Setting: " + toggle.path + " Default: "
|
||||
+ toggle.def + " # " + toggle.description + "\n";
|
||||
|
||||
config.addDefault(toggle.path, toggle.def);
|
||||
settings.get(toggle.path).setValue(
|
||||
config.getString(toggle.path));
|
||||
}
|
||||
config.options().header(header);
|
||||
config.options().copyDefaults(true);
|
||||
save();
|
||||
} catch (Exception ex) {
|
||||
MinecraftServer.getServer().logSevere(
|
||||
"Could not load " + this.configFile);
|
||||
ex.printStackTrace();
|
||||
}
|
||||
}
|
||||
config.addDefault(toggle.path, toggle.def);
|
||||
settings.get(toggle.path).setValue(
|
||||
config.getString(toggle.path));
|
||||
}
|
||||
config.options().header(header);
|
||||
config.options().copyDefaults(true);
|
||||
save();
|
||||
} catch (Exception ex) {
|
||||
MinecraftServer.getServer().logSevere(
|
||||
"Could not load " + this.configFile);
|
||||
ex.printStackTrace();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -4,16 +4,16 @@ import net.md_5.specialsource.JarMapping;
|
||||
import net.md_5.specialsource.JarRemapper;
|
||||
|
||||
public class KCauldronRemapper extends JarRemapper {
|
||||
public KCauldronRemapper(JarMapping jarMapping) {
|
||||
super(jarMapping);
|
||||
}
|
||||
public KCauldronRemapper(JarMapping jarMapping) {
|
||||
super(jarMapping);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String mapSignature(String signature, boolean typeSignature) {
|
||||
try {
|
||||
return super.mapSignature(signature, typeSignature);
|
||||
} catch (Exception e) {
|
||||
return signature;
|
||||
}
|
||||
}
|
||||
@Override
|
||||
public String mapSignature(String signature, boolean typeSignature) {
|
||||
try {
|
||||
return super.mapSignature(signature, typeSignature);
|
||||
} catch (Exception e) {
|
||||
return signature;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -5,48 +5,48 @@ import org.apache.logging.log4j.Level;
|
||||
import cpw.mods.fml.common.FMLLog;
|
||||
|
||||
public class KLog {
|
||||
private static final KLog DEFAULT_LOGGER = new KLog("KCauldron");
|
||||
private static final KLog DEFAULT_LOGGER = new KLog("KCauldron");
|
||||
|
||||
public static KLog get() {
|
||||
return DEFAULT_LOGGER;
|
||||
}
|
||||
public static KLog get() {
|
||||
return DEFAULT_LOGGER;
|
||||
}
|
||||
|
||||
public static KLog get(String tag) {
|
||||
return new KLog("KCauldron: " + tag);
|
||||
}
|
||||
|
||||
private final String mTag;
|
||||
public static KLog get(String tag) {
|
||||
return new KLog("KCauldron: " + tag);
|
||||
}
|
||||
|
||||
private final String mTag;
|
||||
|
||||
public KLog(String tag) {
|
||||
mTag = tag;
|
||||
}
|
||||
public KLog(String tag) {
|
||||
mTag = tag;
|
||||
}
|
||||
|
||||
public void log(Level level, Throwable throwable, String message,
|
||||
Object... args) {
|
||||
Throwable t = null;
|
||||
if (throwable != null) {
|
||||
t = new Throwable();
|
||||
t.initCause(throwable);
|
||||
t.fillInStackTrace();
|
||||
}
|
||||
FMLLog.log(mTag, level, t, String.format(message, args));
|
||||
}
|
||||
public void log(Level level, Throwable throwable, String message,
|
||||
Object... args) {
|
||||
Throwable t = null;
|
||||
if (throwable != null) {
|
||||
t = new Throwable();
|
||||
t.initCause(throwable);
|
||||
t.fillInStackTrace();
|
||||
}
|
||||
FMLLog.log(mTag, level, t, String.format(message, args));
|
||||
}
|
||||
|
||||
public void warning(String message, Object... args) {
|
||||
log(Level.WARN, null, message, args);
|
||||
}
|
||||
public void warning(String message, Object... args) {
|
||||
log(Level.WARN, null, message, args);
|
||||
}
|
||||
|
||||
public void warning(Throwable throwable, String message,
|
||||
Object... args) {
|
||||
log(Level.WARN, throwable, message, args);
|
||||
}
|
||||
public void warning(Throwable throwable, String message,
|
||||
Object... args) {
|
||||
log(Level.WARN, throwable, message, args);
|
||||
}
|
||||
|
||||
public void info(String message, Object... args) {
|
||||
log(Level.INFO, null, message, args);
|
||||
}
|
||||
public void info(String message, Object... args) {
|
||||
log(Level.INFO, null, message, args);
|
||||
}
|
||||
|
||||
public void info(Throwable throwable, String message,
|
||||
Object... args) {
|
||||
log(Level.INFO, throwable, message, args);
|
||||
}
|
||||
public void info(Throwable throwable, String message,
|
||||
Object... args) {
|
||||
log(Level.INFO, throwable, message, args);
|
||||
}
|
||||
}
|
||||
|
||||
@ -10,52 +10,52 @@ import org.bukkit.ChatColor;
|
||||
import org.bukkit.command.CommandSender;
|
||||
|
||||
public class CommandSenderUpdateCallback implements IVersionCheckCallback {
|
||||
private Reference<CommandSender> mSender;
|
||||
private Reference<CommandSender> mSender;
|
||||
|
||||
public CommandSenderUpdateCallback(CommandSender sender) {
|
||||
mSender = new WeakReference<CommandSender>(sender);
|
||||
}
|
||||
public CommandSenderUpdateCallback(CommandSender sender) {
|
||||
mSender = new WeakReference<CommandSender>(sender);
|
||||
}
|
||||
|
||||
protected CommandSender getSender() {
|
||||
return mSender.get();
|
||||
}
|
||||
protected CommandSender getSender() {
|
||||
return mSender.get();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void upToDate() {
|
||||
CommandSender sender = mSender.get();
|
||||
if (sender != null) {
|
||||
sender.sendMessage(ChatColor.GREEN
|
||||
+ "Running version of KCauldron is up-to-date: "
|
||||
+ KCauldron.getCurrentVersion());
|
||||
}
|
||||
DefaultUpdateCallback.INSTANCE.upToDate();
|
||||
}
|
||||
@Override
|
||||
public void upToDate() {
|
||||
CommandSender sender = mSender.get();
|
||||
if (sender != null) {
|
||||
sender.sendMessage(ChatColor.GREEN
|
||||
+ "Running version of KCauldron is up-to-date: "
|
||||
+ KCauldron.getCurrentVersion());
|
||||
}
|
||||
DefaultUpdateCallback.INSTANCE.upToDate();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void newVersion(String newVersion) {
|
||||
CommandSender sender = mSender.get();
|
||||
if (sender != null) {
|
||||
newVersion(sender, KCauldron.getCurrentVersion(), newVersion);
|
||||
}
|
||||
DefaultUpdateCallback.INSTANCE.newVersion(newVersion);
|
||||
}
|
||||
@Override
|
||||
public void newVersion(String newVersion) {
|
||||
CommandSender sender = mSender.get();
|
||||
if (sender != null) {
|
||||
newVersion(sender, KCauldron.getCurrentVersion(), newVersion);
|
||||
}
|
||||
DefaultUpdateCallback.INSTANCE.newVersion(newVersion);
|
||||
}
|
||||
|
||||
public static void newVersion(CommandSender sender, String currentVersion,
|
||||
String newVersion) {
|
||||
sender.sendMessage(new String[] {
|
||||
ChatColor.YELLOW + "Found new version of KCauldron: "
|
||||
+ newVersion,
|
||||
ChatColor.YELLOW + "Current is " + currentVersion,
|
||||
ChatColor.YELLOW + "Type '" + ChatColor.BLUE + "/kc update"
|
||||
+ ChatColor.YELLOW + "' to update" });
|
||||
}
|
||||
public static void newVersion(CommandSender sender, String currentVersion,
|
||||
String newVersion) {
|
||||
sender.sendMessage(new String[] {
|
||||
ChatColor.YELLOW + "Found new version of KCauldron: "
|
||||
+ newVersion,
|
||||
ChatColor.YELLOW + "Current is " + currentVersion,
|
||||
ChatColor.YELLOW + "Type '" + ChatColor.BLUE + "/kc update"
|
||||
+ ChatColor.YELLOW + "' to update" });
|
||||
}
|
||||
|
||||
@Override
|
||||
public void error(Throwable t) {
|
||||
CommandSender sender = mSender.get();
|
||||
if (sender != null) {
|
||||
sender.sendMessage(ChatColor.RED
|
||||
+ "Error ocurred durring version check, see details in server log");
|
||||
}
|
||||
}
|
||||
@Override
|
||||
public void error(Throwable t) {
|
||||
CommandSender sender = mSender.get();
|
||||
if (sender != null) {
|
||||
sender.sendMessage(ChatColor.RED
|
||||
+ "Error ocurred durring version check, see details in server log");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -11,66 +11,66 @@ import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.player.PlayerJoinEvent;
|
||||
|
||||
public class DefaultUpdateCallback implements IVersionCheckCallback {
|
||||
public static DefaultUpdateCallback INSTANCE;
|
||||
public static DefaultUpdateCallback INSTANCE;
|
||||
|
||||
static {
|
||||
INSTANCE = new DefaultUpdateCallback();
|
||||
}
|
||||
static {
|
||||
INSTANCE = new DefaultUpdateCallback();
|
||||
}
|
||||
|
||||
public void onPlayerJoin(PlayerJoinEvent event) {
|
||||
Player player = event.getPlayer();
|
||||
if (mHasUpdate && hasPermission(player)) {
|
||||
sendUpdate(player);
|
||||
}
|
||||
}
|
||||
public void onPlayerJoin(PlayerJoinEvent event) {
|
||||
Player player = event.getPlayer();
|
||||
if (mHasUpdate && hasPermission(player)) {
|
||||
sendUpdate(player);
|
||||
}
|
||||
}
|
||||
|
||||
private boolean hasPermission(CommandSender player) {
|
||||
return player.hasPermission(KCauldronCommand.UPDATE);
|
||||
}
|
||||
private boolean hasPermission(CommandSender player) {
|
||||
return player.hasPermission(KCauldronCommand.UPDATE);
|
||||
}
|
||||
|
||||
private void sendUpdate(CommandSender player) {
|
||||
CommandSenderUpdateCallback.newVersion(player, mCurrentVersion,
|
||||
mNewVersion);
|
||||
}
|
||||
private void sendUpdate(CommandSender player) {
|
||||
CommandSenderUpdateCallback.newVersion(player, mCurrentVersion,
|
||||
mNewVersion);
|
||||
}
|
||||
|
||||
private boolean mHasUpdate;
|
||||
private String mCurrentVersion;
|
||||
private String mNewVersion;
|
||||
private boolean mHasUpdate;
|
||||
private String mCurrentVersion;
|
||||
private String mNewVersion;
|
||||
|
||||
private DefaultUpdateCallback() {
|
||||
}
|
||||
private DefaultUpdateCallback() {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void upToDate() {
|
||||
mHasUpdate = false;
|
||||
mCurrentVersion = KCauldron.getCurrentVersion();
|
||||
mNewVersion = null;
|
||||
}
|
||||
@Override
|
||||
public void upToDate() {
|
||||
mHasUpdate = false;
|
||||
mCurrentVersion = KCauldron.getCurrentVersion();
|
||||
mNewVersion = null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void newVersion(String newVersion) {
|
||||
mCurrentVersion = KCauldron.getCurrentVersion();
|
||||
mNewVersion = newVersion;
|
||||
if (!mHasUpdate) {
|
||||
Bukkit.getConsoleSender().sendMessage(
|
||||
"New version of KCauldron avaiable: " + newVersion);
|
||||
for (Player player : Bukkit.getOnlinePlayers()) {
|
||||
if (hasPermission(player)) {
|
||||
sendUpdate(player);
|
||||
}
|
||||
}
|
||||
}
|
||||
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
|
||||
public void newVersion(String newVersion) {
|
||||
mCurrentVersion = KCauldron.getCurrentVersion();
|
||||
mNewVersion = newVersion;
|
||||
if (!mHasUpdate) {
|
||||
Bukkit.getConsoleSender().sendMessage(
|
||||
"New version of KCauldron avaiable: " + newVersion);
|
||||
for (Player player : Bukkit.getOnlinePlayers()) {
|
||||
if (hasPermission(player)) {
|
||||
sendUpdate(player);
|
||||
}
|
||||
}
|
||||
}
|
||||
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
|
||||
public void error(Throwable t) {
|
||||
@Override
|
||||
public void error(Throwable t) {
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -26,181 +26,181 @@ import org.bukkit.command.CommandSender;
|
||||
import com.google.common.base.Joiner;
|
||||
|
||||
public class KCauldronUpdater implements Runnable, IVersionCheckCallback {
|
||||
private static final class LatestVersionCallback extends
|
||||
CommandSenderUpdateCallback {
|
||||
public LatestVersionCallback(CommandSender sender) {
|
||||
super(sender);
|
||||
}
|
||||
private static final class LatestVersionCallback extends
|
||||
CommandSenderUpdateCallback {
|
||||
public LatestVersionCallback(CommandSender sender) {
|
||||
super(sender);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void newVersion(String newVersion) {
|
||||
startUpdate(getSender(), newVersion);
|
||||
}
|
||||
@Override
|
||||
public void newVersion(String newVersion) {
|
||||
startUpdate(getSender(), newVersion);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void upToDate() {
|
||||
KCauldron.sUpdateInProgress = false;
|
||||
CommandSender sender = getSender();
|
||||
if (sender != null) {
|
||||
sender.sendMessage(ChatColor.DARK_PURPLE + "Current version ("
|
||||
+ KCauldron.getCurrentVersion() + ") is up to date");
|
||||
}
|
||||
}
|
||||
@Override
|
||||
public void upToDate() {
|
||||
KCauldron.sUpdateInProgress = false;
|
||||
CommandSender sender = getSender();
|
||||
if (sender != null) {
|
||||
sender.sendMessage(ChatColor.DARK_PURPLE + "Current version ("
|
||||
+ KCauldron.getCurrentVersion() + ") is up to date");
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void error(Throwable t) {
|
||||
super.error(t);
|
||||
KCauldron.sUpdateInProgress = false;
|
||||
}
|
||||
}
|
||||
@Override
|
||||
public void error(Throwable t) {
|
||||
super.error(t);
|
||||
KCauldron.sUpdateInProgress = false;
|
||||
}
|
||||
}
|
||||
|
||||
public static void initUpdate(CommandSender sender, String version) {
|
||||
if (KCauldron.sUpdateInProgress) {
|
||||
sender.sendMessage(ChatColor.RED
|
||||
+ "Update stopped: another update in progress");
|
||||
return;
|
||||
}
|
||||
KCauldron.sUpdateInProgress = true;
|
||||
if (version == null) {
|
||||
sender.sendMessage(ChatColor.DARK_PURPLE
|
||||
+ "Fetching latest version...");
|
||||
KVersionRetriever.startServer(new LatestVersionCallback(sender),
|
||||
false);
|
||||
} else {
|
||||
startUpdate(sender, version);
|
||||
}
|
||||
}
|
||||
public static void initUpdate(CommandSender sender, String version) {
|
||||
if (KCauldron.sUpdateInProgress) {
|
||||
sender.sendMessage(ChatColor.RED
|
||||
+ "Update stopped: another update in progress");
|
||||
return;
|
||||
}
|
||||
KCauldron.sUpdateInProgress = true;
|
||||
if (version == null) {
|
||||
sender.sendMessage(ChatColor.DARK_PURPLE
|
||||
+ "Fetching latest version...");
|
||||
KVersionRetriever.startServer(new LatestVersionCallback(sender),
|
||||
false);
|
||||
} else {
|
||||
startUpdate(sender, version);
|
||||
}
|
||||
}
|
||||
|
||||
private static void startUpdate(CommandSender sender, String version) {
|
||||
if (sender != null) {
|
||||
sender.sendMessage(ChatColor.DARK_PURPLE + "Starting update to "
|
||||
+ version + "...");
|
||||
}
|
||||
new KCauldronUpdater(sender, version);
|
||||
}
|
||||
private static void startUpdate(CommandSender sender, String version) {
|
||||
if (sender != null) {
|
||||
sender.sendMessage(ChatColor.DARK_PURPLE + "Starting update to "
|
||||
+ version + "...");
|
||||
}
|
||||
new KCauldronUpdater(sender, version);
|
||||
}
|
||||
|
||||
private final CommandSender mSender;
|
||||
private final String mVersion;
|
||||
private final Thread mThread;
|
||||
private final CommandSender mSender;
|
||||
private final String mVersion;
|
||||
private final Thread mThread;
|
||||
|
||||
public KCauldronUpdater(CommandSender sender, String version) {
|
||||
mSender = sender;
|
||||
mVersion = version;
|
||||
mThread = new Thread(this);
|
||||
mThread.setName("KCauldron updater");
|
||||
mThread.setPriority(Thread.MIN_PRIORITY);
|
||||
mThread.start();
|
||||
}
|
||||
public KCauldronUpdater(CommandSender sender, String version) {
|
||||
mSender = sender;
|
||||
mVersion = version;
|
||||
mThread = new Thread(this);
|
||||
mThread.setName("KCauldron updater");
|
||||
mThread.setPriority(Thread.MIN_PRIORITY);
|
||||
mThread.start();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void run() {
|
||||
if (!MinecraftServer.kcauldronConfig.updatecheckerQuite.getValue()) {
|
||||
mSender.sendMessage(ChatColor.DARK_PURPLE
|
||||
+ "Retrieving latest KBootstrap version...");
|
||||
}
|
||||
new KVersionRetriever(this, false, false, "pw.prok", "KBootstrap");
|
||||
}
|
||||
@Override
|
||||
public void run() {
|
||||
if (!MinecraftServer.kcauldronConfig.updatecheckerQuite.getValue()) {
|
||||
mSender.sendMessage(ChatColor.DARK_PURPLE
|
||||
+ "Retrieving latest KBootstrap version...");
|
||||
}
|
||||
new KVersionRetriever(this, false, false, "pw.prok", "KBootstrap");
|
||||
}
|
||||
|
||||
@Override
|
||||
public void upToDate() {
|
||||
@Override
|
||||
public void upToDate() {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void newVersion(String kbootstrapVersion) {
|
||||
boolean quite = MinecraftServer.kcauldronConfig.updatecheckerQuite
|
||||
.getValue();
|
||||
try {
|
||||
if (!quite) {
|
||||
mSender.sendMessage(ChatColor.DARK_PURPLE
|
||||
+ "Downloading KBootstrap " + kbootstrapVersion + "...");
|
||||
}
|
||||
File kbootstrap = File.createTempFile("kbootstrap",
|
||||
String.valueOf(System.currentTimeMillis()));
|
||||
download(
|
||||
"https://api.prok.pw/repo/blob/pw.prok/KBootstrap/latest/app",
|
||||
kbootstrap);
|
||||
if (!quite) {
|
||||
mSender.sendMessage(ChatColor.DARK_PURPLE
|
||||
+ "Installing KCauldron " + mVersion
|
||||
+ " via KBootstrap " + kbootstrapVersion + "...");
|
||||
}
|
||||
@Override
|
||||
public void newVersion(String kbootstrapVersion) {
|
||||
boolean quite = MinecraftServer.kcauldronConfig.updatecheckerQuite
|
||||
.getValue();
|
||||
try {
|
||||
if (!quite) {
|
||||
mSender.sendMessage(ChatColor.DARK_PURPLE
|
||||
+ "Downloading KBootstrap " + kbootstrapVersion + "...");
|
||||
}
|
||||
File kbootstrap = File.createTempFile("kbootstrap",
|
||||
String.valueOf(System.currentTimeMillis()));
|
||||
download(
|
||||
"https://api.prok.pw/repo/blob/pw.prok/KBootstrap/latest/app",
|
||||
kbootstrap);
|
||||
if (!quite) {
|
||||
mSender.sendMessage(ChatColor.DARK_PURPLE
|
||||
+ "Installing KCauldron " + mVersion
|
||||
+ " via KBootstrap " + kbootstrapVersion + "...");
|
||||
}
|
||||
|
||||
String javahome = System.getProperty("java.home");
|
||||
String javapath = javahome + "/bin/java";
|
||||
String javahome = System.getProperty("java.home");
|
||||
String javapath = javahome + "/bin/java";
|
||||
|
||||
List<String> command = new ArrayList<String>();
|
||||
command.add(javapath);
|
||||
command.add("-jar");
|
||||
command.add(kbootstrap.getCanonicalPath());
|
||||
command.add("--serverDir");
|
||||
command.add(KCauldron.getServerHome().getCanonicalPath());
|
||||
command.add("--installKCauldron");
|
||||
command.add(String.format("%s:%s:%s", KCauldron.getGroup(), KCauldron.getChannel(), mVersion));
|
||||
final String[] symlinks = MinecraftServer.kcauldronConfig.updatecheckerSymlinks
|
||||
.getValue().trim().split(File.pathSeparator);
|
||||
for (String symlink : symlinks) {
|
||||
command.add("--serverSymlinks");
|
||||
command.add(symlink);
|
||||
}
|
||||
List<String> command = new ArrayList<String>();
|
||||
command.add(javapath);
|
||||
command.add("-jar");
|
||||
command.add(kbootstrap.getCanonicalPath());
|
||||
command.add("--serverDir");
|
||||
command.add(KCauldron.getServerHome().getCanonicalPath());
|
||||
command.add("--installKCauldron");
|
||||
command.add(String.format("%s:%s:%s", KCauldron.getGroup(), KCauldron.getChannel(), mVersion));
|
||||
final String[] symlinks = MinecraftServer.kcauldronConfig.updatecheckerSymlinks
|
||||
.getValue().trim().split(File.pathSeparator);
|
||||
for (String symlink : symlinks) {
|
||||
command.add("--serverSymlinks");
|
||||
command.add(symlink);
|
||||
}
|
||||
|
||||
Bukkit.getConsoleSender().sendMessage(
|
||||
"Starting command: " + Joiner.on(' ').join(command));
|
||||
Bukkit.getConsoleSender().sendMessage(
|
||||
"Starting command: " + Joiner.on(' ').join(command));
|
||||
|
||||
ProcessBuilder builder = new ProcessBuilder(command);
|
||||
builder.environment().put("JAVA_HOME", javahome);
|
||||
switch (builder.start().waitFor()) {
|
||||
case 0:
|
||||
mSender.sendMessage(ChatColor.GREEN + "KCauldron " + mVersion
|
||||
+ " installed");
|
||||
break;
|
||||
default:
|
||||
mSender.sendMessage(ChatColor.RED
|
||||
+ "Failed to install KCauldron " + mVersion);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
if (!quite) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
if (mSender != null) {
|
||||
mSender.sendMessage(ChatColor.RED + "Failed update to "
|
||||
+ mVersion);
|
||||
}
|
||||
} finally {
|
||||
KCauldron.sUpdateInProgress = false;
|
||||
}
|
||||
}
|
||||
ProcessBuilder builder = new ProcessBuilder(command);
|
||||
builder.environment().put("JAVA_HOME", javahome);
|
||||
switch (builder.start().waitFor()) {
|
||||
case 0:
|
||||
mSender.sendMessage(ChatColor.GREEN + "KCauldron " + mVersion
|
||||
+ " installed");
|
||||
break;
|
||||
default:
|
||||
mSender.sendMessage(ChatColor.RED
|
||||
+ "Failed to install KCauldron " + mVersion);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
if (!quite) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
if (mSender != null) {
|
||||
mSender.sendMessage(ChatColor.RED + "Failed update to "
|
||||
+ mVersion);
|
||||
}
|
||||
} finally {
|
||||
KCauldron.sUpdateInProgress = false;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void error(Throwable t) {
|
||||
KCauldron.sUpdateInProgress = false;
|
||||
t.printStackTrace();
|
||||
}
|
||||
@Override
|
||||
public void error(Throwable t) {
|
||||
KCauldron.sUpdateInProgress = false;
|
||||
t.printStackTrace();
|
||||
}
|
||||
|
||||
private static void download(String url, File destination)
|
||||
throws IOException {
|
||||
HttpUriRequest request = RequestBuilder
|
||||
.get()
|
||||
.setUri(url)
|
||||
.addParameter("hostname",
|
||||
MinecraftServer.getServer().getHostname())
|
||||
.addParameter("port",
|
||||
String.valueOf(MinecraftServer.getServer().getPort()))
|
||||
.build();
|
||||
CloseableHttpClient client = HttpClientBuilder.create()
|
||||
.setRedirectStrategy(new LaxRedirectStrategy())
|
||||
.setUserAgent("KCauldron Updater").build();
|
||||
private static void download(String url, File destination)
|
||||
throws IOException {
|
||||
HttpUriRequest request = RequestBuilder
|
||||
.get()
|
||||
.setUri(url)
|
||||
.addParameter("hostname",
|
||||
MinecraftServer.getServer().getHostname())
|
||||
.addParameter("port",
|
||||
String.valueOf(MinecraftServer.getServer().getPort()))
|
||||
.build();
|
||||
CloseableHttpClient client = HttpClientBuilder.create()
|
||||
.setRedirectStrategy(new LaxRedirectStrategy())
|
||||
.setUserAgent("KCauldron Updater").build();
|
||||
|
||||
HttpResponse response = client.execute(request);
|
||||
if (response.getStatusLine().getStatusCode() != 200) {
|
||||
client.close();
|
||||
throw new IllegalStateException("Could not download " + url);
|
||||
}
|
||||
InputStream is = response.getEntity().getContent();
|
||||
OutputStream os = new FileOutputStream(destination);
|
||||
IOUtils.copy(is, os);
|
||||
is.close();
|
||||
os.close();
|
||||
client.close();
|
||||
}
|
||||
HttpResponse response = client.execute(request);
|
||||
if (response.getStatusLine().getStatusCode() != 200) {
|
||||
client.close();
|
||||
throw new IllegalStateException("Could not download " + url);
|
||||
}
|
||||
InputStream is = response.getEntity().getContent();
|
||||
OutputStream os = new FileOutputStream(destination);
|
||||
IOUtils.copy(is, os);
|
||||
is.close();
|
||||
os.close();
|
||||
client.close();
|
||||
}
|
||||
}
|
||||
|
||||
@ -16,112 +16,112 @@ import org.json.simple.JSONObject;
|
||||
import org.json.simple.parser.JSONParser;
|
||||
|
||||
public class KVersionRetriever implements Runnable, UncaughtExceptionHandler {
|
||||
private static final boolean DEBUG;
|
||||
private static final KLog sLogger;
|
||||
private static final JSONParser sParser;
|
||||
private static MinecraftServer sServer;
|
||||
private static final boolean DEBUG;
|
||||
private static final KLog sLogger;
|
||||
private static final JSONParser sParser;
|
||||
private static MinecraftServer sServer;
|
||||
|
||||
static {
|
||||
DEBUG = false;
|
||||
sLogger = KLog.get(KVersionRetriever.class.getSimpleName());
|
||||
static {
|
||||
DEBUG = false;
|
||||
sLogger = KLog.get(KVersionRetriever.class.getSimpleName());
|
||||
|
||||
sParser = new JSONParser();
|
||||
}
|
||||
sParser = new JSONParser();
|
||||
}
|
||||
|
||||
public static void init(MinecraftServer server) {
|
||||
sServer = server;
|
||||
if (MinecraftServer.kcauldronConfig.updatecheckerEnable.getValue()) {
|
||||
startServer(DefaultUpdateCallback.INSTANCE, true);
|
||||
}
|
||||
}
|
||||
public static void init(MinecraftServer server) {
|
||||
sServer = server;
|
||||
if (MinecraftServer.kcauldronConfig.updatecheckerEnable.getValue()) {
|
||||
startServer(DefaultUpdateCallback.INSTANCE, true);
|
||||
}
|
||||
}
|
||||
|
||||
public static void startServer(IVersionCheckCallback callback, boolean loop) {
|
||||
new KVersionRetriever(callback, loop, true, KCauldron.getGroup(),
|
||||
KCauldron.getChannel());
|
||||
}
|
||||
public static void startServer(IVersionCheckCallback callback, boolean loop) {
|
||||
new KVersionRetriever(callback, loop, true, KCauldron.getGroup(),
|
||||
KCauldron.getChannel());
|
||||
}
|
||||
|
||||
private final IVersionCheckCallback mCallback;
|
||||
private final boolean mLoop;
|
||||
private final Thread mThread;
|
||||
private final String mGroup;
|
||||
private final String mName;
|
||||
private final boolean mUpToDateSupport;
|
||||
private final IVersionCheckCallback mCallback;
|
||||
private final boolean mLoop;
|
||||
private final Thread mThread;
|
||||
private final String mGroup;
|
||||
private final String mName;
|
||||
private final boolean mUpToDateSupport;
|
||||
|
||||
public KVersionRetriever(IVersionCheckCallback callback, boolean loop,
|
||||
boolean upToDateSupport, String group, String name) {
|
||||
if (DEBUG)
|
||||
sLogger.info("Created new version retrivier");
|
||||
mCallback = callback;
|
||||
mLoop = loop;
|
||||
mUpToDateSupport = upToDateSupport;
|
||||
mGroup = group;
|
||||
mName = name;
|
||||
mThread = new Thread(this);
|
||||
mThread.setName("KCauldron version retrievier");
|
||||
mThread.setPriority(Thread.MIN_PRIORITY);
|
||||
mThread.setDaemon(true);
|
||||
mThread.setUncaughtExceptionHandler(this);
|
||||
mThread.start();
|
||||
}
|
||||
public KVersionRetriever(IVersionCheckCallback callback, boolean loop,
|
||||
boolean upToDateSupport, String group, String name) {
|
||||
if (DEBUG)
|
||||
sLogger.info("Created new version retrivier");
|
||||
mCallback = callback;
|
||||
mLoop = loop;
|
||||
mUpToDateSupport = upToDateSupport;
|
||||
mGroup = group;
|
||||
mName = name;
|
||||
mThread = new Thread(this);
|
||||
mThread.setName("KCauldron version retrievier");
|
||||
mThread.setPriority(Thread.MIN_PRIORITY);
|
||||
mThread.setDaemon(true);
|
||||
mThread.setUncaughtExceptionHandler(this);
|
||||
mThread.start();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void run() {
|
||||
while (!mThread.isInterrupted()) {
|
||||
check();
|
||||
if (!mLoop)
|
||||
break;
|
||||
try {
|
||||
Thread.sleep(1000 * 60 * 10);// Sleep ten minutes
|
||||
} catch (InterruptedException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
}
|
||||
@Override
|
||||
public void run() {
|
||||
while (!mThread.isInterrupted()) {
|
||||
check();
|
||||
if (!mLoop)
|
||||
break;
|
||||
try {
|
||||
Thread.sleep(1000 * 60 * 10);// Sleep ten minutes
|
||||
} catch (InterruptedException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void check() {
|
||||
try {
|
||||
HttpUriRequest request = RequestBuilder
|
||||
.get()
|
||||
.setUri("https://api.prok.pw/repo/version/" + mGroup + "/"
|
||||
+ mName)
|
||||
.addParameter("hostname", sServer.getHostname())
|
||||
.addParameter("port", "" + sServer.getPort()).build();
|
||||
HttpResponse response = HttpClientBuilder.create()
|
||||
.setUserAgent("KCauldron Version Retriever")
|
||||
.setRedirectStrategy(new LaxRedirectStrategy()).build()
|
||||
.execute(request);
|
||||
if (response.getStatusLine().getStatusCode() != 200) {
|
||||
uncaughtException(mThread, new IllegalStateException(
|
||||
"Status code isn't OK"));
|
||||
return;
|
||||
}
|
||||
JSONObject json = (JSONObject) sParser.parse(new InputStreamReader(
|
||||
response.getEntity().getContent()));
|
||||
String version = (String) json.get("version");
|
||||
if (!mUpToDateSupport || KCauldron.getCurrentVersion() == null
|
||||
|| !version.equals(KCauldron.getCurrentVersion())) {
|
||||
mCallback.newVersion(version);
|
||||
} else {
|
||||
mCallback.upToDate();
|
||||
}
|
||||
} catch (Exception e) {
|
||||
uncaughtException(null, e);
|
||||
}
|
||||
}
|
||||
private void check() {
|
||||
try {
|
||||
HttpUriRequest request = RequestBuilder
|
||||
.get()
|
||||
.setUri("https://api.prok.pw/repo/version/" + mGroup + "/"
|
||||
+ mName)
|
||||
.addParameter("hostname", sServer.getHostname())
|
||||
.addParameter("port", "" + sServer.getPort()).build();
|
||||
HttpResponse response = HttpClientBuilder.create()
|
||||
.setUserAgent("KCauldron Version Retriever")
|
||||
.setRedirectStrategy(new LaxRedirectStrategy()).build()
|
||||
.execute(request);
|
||||
if (response.getStatusLine().getStatusCode() != 200) {
|
||||
uncaughtException(mThread, new IllegalStateException(
|
||||
"Status code isn't OK"));
|
||||
return;
|
||||
}
|
||||
JSONObject json = (JSONObject) sParser.parse(new InputStreamReader(
|
||||
response.getEntity().getContent()));
|
||||
String version = (String) json.get("version");
|
||||
if (!mUpToDateSupport || KCauldron.getCurrentVersion() == null
|
||||
|| !version.equals(KCauldron.getCurrentVersion())) {
|
||||
mCallback.newVersion(version);
|
||||
} else {
|
||||
mCallback.upToDate();
|
||||
}
|
||||
} catch (Exception e) {
|
||||
uncaughtException(null, e);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void uncaughtException(Thread t, Throwable e) {
|
||||
sLogger.warning(e, "Error occured during retriving version");
|
||||
if (mCallback != null) {
|
||||
mCallback.error(e);
|
||||
}
|
||||
}
|
||||
@Override
|
||||
public void uncaughtException(Thread t, Throwable e) {
|
||||
sLogger.warning(e, "Error occured during retriving version");
|
||||
if (mCallback != null) {
|
||||
mCallback.error(e);
|
||||
}
|
||||
}
|
||||
|
||||
public interface IVersionCheckCallback {
|
||||
void upToDate();
|
||||
public interface IVersionCheckCallback {
|
||||
void upToDate();
|
||||
|
||||
void newVersion(String newVersion);
|
||||
void newVersion(String newVersion);
|
||||
|
||||
void error(Throwable t);
|
||||
}
|
||||
void error(Throwable t);
|
||||
}
|
||||
}
|
||||
|
||||
40
src/main/java/kcauldron/wrapper/LongHashMapTrove.java
Normal file
40
src/main/java/kcauldron/wrapper/LongHashMapTrove.java
Normal file
@ -0,0 +1,40 @@
|
||||
package kcauldron.wrapper;
|
||||
|
||||
import gnu.trove.map.TLongObjectMap;
|
||||
import net.minecraft.util.LongHashMap;
|
||||
|
||||
public class LongHashMapTrove<T> extends LongHashMap {
|
||||
private final TLongObjectMap<T> mMap;
|
||||
|
||||
public LongHashMapTrove(TLongObjectMap<T> map) {
|
||||
mMap = map;
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
@Override
|
||||
public void add(long key, Object value) {
|
||||
mMap.put(key, (T) value);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getNumHashElements() {
|
||||
return mMap.size();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object getValueByKey(long key) {
|
||||
return mMap.get(key);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean containsItem(long key) {
|
||||
return mMap.containsKey(key);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object remove(long key) {
|
||||
return mMap.remove(key);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
36
src/main/java/kcauldron/wrapper/VanillaChunkHashMap.java
Normal file
36
src/main/java/kcauldron/wrapper/VanillaChunkHashMap.java
Normal file
@ -0,0 +1,36 @@
|
||||
package kcauldron.wrapper;
|
||||
|
||||
import gnu.trove.map.TLongObjectMap;
|
||||
import net.minecraft.world.chunk.Chunk;
|
||||
|
||||
import org.bukkit.craftbukkit.util.LongHash;
|
||||
|
||||
public class VanillaChunkHashMap extends LongHashMapTrove<Chunk> {
|
||||
public VanillaChunkHashMap(TLongObjectMap<Chunk> map) {
|
||||
super(map);
|
||||
}
|
||||
|
||||
private static long V2B(long key) {
|
||||
return LongHash.toLong((int) (key & 0xFFFFFFFFL), (int) (key >>> 32));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void add(long key, Object value) {
|
||||
super.add(V2B(key), value);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean containsItem(long key) {
|
||||
return super.containsItem(V2B(key));
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object getValueByKey(long key) {
|
||||
return super.getValueByKey(V2B(key));
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object remove(long key) {
|
||||
return super.remove(V2B(key));
|
||||
}
|
||||
}
|
||||
@ -332,7 +332,7 @@ public class CauldronHooks
|
||||
writer.name("name").value(world.getWorld().getName());
|
||||
writer.name("dimensionId").value(world.provider.dimensionId);
|
||||
writer.name("players").value(world.playerEntities.size());
|
||||
writer.name("loadedChunks").value(world.theChunkProviderServer.loadedChunkHashMap.size());
|
||||
writer.name("loadedChunks").value(world.theChunkProviderServer.loadedChunkHashMap_KC.size());
|
||||
writer.name("activeChunks").value(world.activeChunkSet.size());
|
||||
writer.name("entities").value(world.loadedEntityList.size());
|
||||
writer.name("tiles").value(world.loadedTileEntityList.size());
|
||||
|
||||
@ -110,7 +110,7 @@ public class CauldronCommand extends Command
|
||||
for (net.minecraft.world.WorldServer world : MinecraftServer.getServer().worlds)
|
||||
{
|
||||
sender.sendMessage(ChatColor.GOLD + "Dimension: " + ChatColor.GRAY + world.provider.dimensionId +
|
||||
ChatColor.GOLD + " Loaded Chunks: " + ChatColor.GRAY + world.theChunkProviderServer.loadedChunkHashMap.size() +
|
||||
ChatColor.GOLD + " Loaded Chunks: " + ChatColor.GRAY + world.theChunkProviderServer.loadedChunkHashMap_KC.size() +
|
||||
ChatColor.GOLD + " Active Chunks: " + ChatColor.GRAY + world.activeChunkSet.size() +
|
||||
ChatColor.GOLD + " Entities: " + ChatColor.GRAY + world.loadedEntityList.size() +
|
||||
ChatColor.GOLD + " Tile Entities: " + ChatColor.GRAY + world.loadedTileEntityList.size()
|
||||
|
||||
@ -138,7 +138,7 @@ public class CraftWorld implements World {
|
||||
}
|
||||
|
||||
public Chunk[] getLoadedChunks() {
|
||||
Object[] chunks = world.theChunkProviderServer.loadedChunkHashMap.values();
|
||||
Object[] chunks = world.theChunkProviderServer.loadedChunkHashMap_KC.values();
|
||||
org.bukkit.Chunk[] craftChunks = new CraftChunk[chunks.length];
|
||||
|
||||
for (int i = 0; i < chunks.length; i++) {
|
||||
@ -262,7 +262,7 @@ public class CraftWorld implements World {
|
||||
}
|
||||
|
||||
world.theChunkProviderServer.chunksToUnload.remove(x, z);
|
||||
net.minecraft.world.chunk.Chunk chunk = world.theChunkProviderServer.loadedChunkHashMap.get(LongHash.toLong(x, z));
|
||||
net.minecraft.world.chunk.Chunk chunk = world.theChunkProviderServer.loadedChunkHashMap_KC.get(LongHash.toLong(x, z));
|
||||
|
||||
if (chunk == null) {
|
||||
world.timings.syncChunkLoadTimer.startTiming(); // Spigot
|
||||
@ -276,9 +276,8 @@ public class CraftWorld implements World {
|
||||
|
||||
private void chunkLoadPostProcess(net.minecraft.world.chunk.Chunk chunk, int x, int z) {
|
||||
if (chunk != null) {
|
||||
world.theChunkProviderServer.loadedChunkHashMap.put(LongHash.toLong(x, z), chunk);
|
||||
world.theChunkProviderServer.loadedChunkHashMap_KC.put(LongHash.toLong(x, z), chunk);
|
||||
world.theChunkProviderServer.loadedChunks.add(chunk); // Cauldron - vanilla compatibility
|
||||
world.theChunkProviderServer.loadedChunkHashMap_vanilla.add(ChunkCoordIntPair.chunkXZ2Int(x, z), chunk);
|
||||
|
||||
chunk.onChunkLoad();
|
||||
|
||||
@ -1395,7 +1394,7 @@ public class CraftWorld implements World {
|
||||
}
|
||||
|
||||
final net.minecraft.world.gen.ChunkProviderServer cps = world.theChunkProviderServer;
|
||||
cps.loadedChunkHashMap.forEachValue(new TObjectProcedure<net.minecraft.world.chunk.Chunk>() {
|
||||
cps.loadedChunkHashMap_KC.forEachValue(new TObjectProcedure<net.minecraft.world.chunk.Chunk>() {
|
||||
@Override
|
||||
public boolean execute(net.minecraft.world.chunk.Chunk chunk) {
|
||||
// If in use, skip it
|
||||
|
||||
@ -89,7 +89,7 @@ public class WatchdogThread extends Thread
|
||||
{
|
||||
log.log(Level.SEVERE, " Dimension:" + world.provider.dimensionId);
|
||||
log.log(Level.SEVERE,
|
||||
" Loaded Chunks: " + world.theChunkProviderServer.loadedChunkHashMap.size() + " Active Chunks: " + world.activeChunkSet.size()
|
||||
" Loaded Chunks: " + world.theChunkProviderServer.loadedChunkHashMap_KC.size() + " Active Chunks: " + world.activeChunkSet.size()
|
||||
+ " Entities: " + world.loadedEntityList.size() + " Tile Entities: " + world.loadedTileEntityList.size());
|
||||
log.log(Level.SEVERE, " Entities Last Tick: " + world.entitiesTicked);
|
||||
log.log(Level.SEVERE, " Tiles Last Tick: " + world.tilesTicked);
|
||||
@ -153,7 +153,7 @@ public class WatchdogThread extends Thread
|
||||
for (net.minecraft.world.WorldServer world : MinecraftServer.getServer().worlds)
|
||||
{
|
||||
log.log(Level.WARNING, " Dimension:" + world.provider.dimensionId);
|
||||
log.log(Level.WARNING, " Loaded Chunks: " + world.theChunkProviderServer.loadedChunkHashMap.size() +
|
||||
log.log(Level.WARNING, " Loaded Chunks: " + world.theChunkProviderServer.loadedChunkHashMap_KC.size() +
|
||||
" Active Chunks: " + world.activeChunkSet.size() +
|
||||
" Entities: " + world.loadedEntityList.size() +
|
||||
" Tile Entities: " + world.loadedTileEntityList.size());
|
||||
|
||||
Reference in New Issue
Block a user