update code style

This commit is contained in:
huangyuhui
2016-01-01 11:03:09 +08:00
parent 1f7eb04215
commit b82243a9c0
298 changed files with 3902 additions and 3998 deletions

View File

@@ -1,7 +1,7 @@
/*
* Hello Minecraft! Launcher.
* Copyright (C) 2013 huangyuhui
*
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
@@ -26,7 +26,7 @@ import java.util.List;
public class PluginInfo {
public String website, dbo_page, description, slug, plugin_name,
link, stage, main;
link, stage, main;
public List<String> authors, categories;
public List<PluginVersion> versions;
}

View File

@@ -1,7 +1,7 @@
/*
* Hello Minecraft! Launcher.
* Copyright (C) 2013 huangyuhui
*
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
@@ -52,32 +52,32 @@ public class PluginManager {
String result = NetUtils.get("http://api.bukget.org/3//plugins?fields=slug,plugin_name,description,versions.version,versions.game_versions");
Gson gson = new Gson();
List<BukkitPlugin> list = gson.fromJson(result, new TypeToken<List<BukkitPlugin>>() {
}.getType());
}.getType());
return list;
}
public static final String CATEGORY_ADMIN_TOOLS = "Admin Tools",
CATEGORY_DEVELOPER_TOOLS = "Developer Tools",
CATEGORY_FUN = "Fun",
CATEGORY_GENERAL = "General",
CATEGORY_ANTI_GRIEFING_TOOLS = "Anti Griefing Tools",
CATEGORY_MECHAICS = "Mechanics",
CATEGORY_FIXES = "Fixes",
CATEGORY_ROLE_PLAYING = "Role Playing",
CATEGORY_WORLD_EDITING_AND_MANAGEMENT = "World Editing and Management",
CATEGORY_TELEPORTATION = "Teleportation",
CATEGORY_INFORMATIONAL = "Informational",
CATEGORY_ECONOMY = "Economy",
CATEGORY_CHAT_RELATED = "Chat Related",
CATEGORY_MISCELLANEOUS = "Miscellaneous",
CATEGORY_WORLD_GENERATORS = "World Generators",
CATEGORY_WEBSITE_ADMINISTRATION = "Website Administration";
CATEGORY_DEVELOPER_TOOLS = "Developer Tools",
CATEGORY_FUN = "Fun",
CATEGORY_GENERAL = "General",
CATEGORY_ANTI_GRIEFING_TOOLS = "Anti Griefing Tools",
CATEGORY_MECHAICS = "Mechanics",
CATEGORY_FIXES = "Fixes",
CATEGORY_ROLE_PLAYING = "Role Playing",
CATEGORY_WORLD_EDITING_AND_MANAGEMENT = "World Editing and Management",
CATEGORY_TELEPORTATION = "Teleportation",
CATEGORY_INFORMATIONAL = "Informational",
CATEGORY_ECONOMY = "Economy",
CATEGORY_CHAT_RELATED = "Chat Related",
CATEGORY_MISCELLANEOUS = "Miscellaneous",
CATEGORY_WORLD_GENERATORS = "World Generators",
CATEGORY_WEBSITE_ADMINISTRATION = "Website Administration";
public static List<BukkitPlugin> getPluginsByCategory(String category) throws Exception {
String result = NetUtils.get("http://api.bukget.org/3//categories/" + category + "?fields=slug,plugin_name,description,versions.version,versions.game_versions");
Gson gson = new Gson();
List<BukkitPlugin> list = gson.fromJson(result, new TypeToken<List<BukkitPlugin>>() {
}.getType());
}.getType());
return list;
}
@@ -85,7 +85,7 @@ public class PluginManager {
String result = NetUtils.get("http://api.bukget.org/3//categories/");
Gson gson = new Gson();
List<Category> list = gson.fromJson(result, new TypeToken<List<Category>>() {
}.getType());
}.getType());
return list;
}

View File

@@ -1,7 +1,7 @@
/*
* Hello Minecraft! Launcher.
* Copyright (C) 2013 huangyuhui
*
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
@@ -136,7 +136,7 @@ public class ForgeInstaller {
}
public static void unpackLibrary(File output, byte[] data)
throws IOException {
throws IOException {
if (output.exists())
output.delete();

View File

@@ -1,7 +1,7 @@
/*
* Hello Minecraft! Launcher.
* Copyright (C) 2013 huangyuhui
*
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
@@ -26,7 +26,7 @@ import java.util.List;
public class MinecraftVersion {
public String minecraftArguments, mainClass, time, id, type, processArguments,
releaseTime, assets, jar, inheritsFrom;
releaseTime, assets, jar, inheritsFrom;
public int minimumLauncherVersion;
public List<MinecraftLibrary> libraries;

View File

@@ -1,7 +1,7 @@
/*
* Hello Minecraft! Launcher.
* Copyright (C) 2013 huangyuhui
*
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
@@ -29,48 +29,48 @@ public class ScheduleTranslator {
public static TimerTask translate(Server ser, Schedule s) {
switch (s.type) {
case Schedule.TYPE_AUTO_SAVE:
return new AutoSaveSchedule(s, ser);
case Schedule.TYPE_AUTO_RESTART:
return new AutoRestartSchedule(s, ser);
case Schedule.TYPE_AUTO_BACKUP:
return new AutoBackupSchedule(s, ser);
case Schedule.TYPE_AUTO_BROADCAST:
return new AutoBroadcastSchedule(s, ser);
case Schedule.TYPE_AUTO_SEND_COMMAND:
return new AutoBroadcastSchedule(s, ser);
case Schedule.TYPE_AUTO_SAVE:
return new AutoSaveSchedule(s, ser);
case Schedule.TYPE_AUTO_RESTART:
return new AutoRestartSchedule(s, ser);
case Schedule.TYPE_AUTO_BACKUP:
return new AutoBackupSchedule(s, ser);
case Schedule.TYPE_AUTO_BROADCAST:
return new AutoBroadcastSchedule(s, ser);
case Schedule.TYPE_AUTO_SEND_COMMAND:
return new AutoBroadcastSchedule(s, ser);
}
return null;
}
public static String getName(Schedule s) {
switch (s.type) {
case Schedule.TYPE_AUTO_SAVE:
return "自动保存";
case Schedule.TYPE_AUTO_RESTART:
return "自动重启";
case Schedule.TYPE_AUTO_BACKUP:
return "自动备份";
case Schedule.TYPE_AUTO_BROADCAST:
return "自动广播";
case Schedule.TYPE_AUTO_SEND_COMMAND:
return "自动发送命令";
case Schedule.TYPE_AUTO_SAVE:
return "自动保存";
case Schedule.TYPE_AUTO_RESTART:
return "自动重启";
case Schedule.TYPE_AUTO_BACKUP:
return "自动备份";
case Schedule.TYPE_AUTO_BROADCAST:
return "自动广播";
case Schedule.TYPE_AUTO_SEND_COMMAND:
return "自动发送命令";
}
return "";
}
public static String getTimeTypeName(Schedule s) {
switch (s.timeType) {
case Schedule.TIME_TYPE_PER:
return "每x分钟";
case Schedule.TIME_TYPE_PAST_HOUR:
return "整点后x分钟";
case Schedule.TIME_TYPE_SERVER_STARTED:
return "当服务器启动";
case Schedule.TIME_TYPE_SERVER_STOPPED:
return "当服务器关闭";
case Schedule.TIME_TYPE_SERVER_CRASHED:
return "当服务器崩溃";
case Schedule.TIME_TYPE_PER:
return "每x分钟";
case Schedule.TIME_TYPE_PAST_HOUR:
return "整点后x分钟";
case Schedule.TIME_TYPE_SERVER_STARTED:
return "当服务器启动";
case Schedule.TIME_TYPE_SERVER_STOPPED:
return "当服务器关闭";
case Schedule.TIME_TYPE_SERVER_CRASHED:
return "当服务器崩溃";
}
return "";
}

View File

@@ -1,7 +1,7 @@
/*
* Hello Minecraft! Launcher.
* Copyright (C) 2013 huangyuhui
*
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
@@ -24,19 +24,19 @@ package org.jackhuang.hellominecraft.svrmgr.settings;
public class Schedule {
public static final int TYPE_AUTO_SAVE = 0,
TYPE_AUTO_RESTART = 1,
TYPE_AUTO_BACKUP = 2,
TYPE_AUTO_BROADCAST = 3,
TYPE_AUTO_SEND_COMMAND = 4,
TYPE_AUTO_EXECUTE = 5;
TYPE_AUTO_RESTART = 1,
TYPE_AUTO_BACKUP = 2,
TYPE_AUTO_BROADCAST = 3,
TYPE_AUTO_SEND_COMMAND = 4,
TYPE_AUTO_EXECUTE = 5;
public static final int TYPE2_AUTO_BACKUP_PLUGINS = 1,
TYPE2_AUTH_BACKUP_CONFIG = 2,
TYPE3_AUTH_BACKUP_WORLD = 3;
TYPE2_AUTH_BACKUP_CONFIG = 2,
TYPE3_AUTH_BACKUP_WORLD = 3;
public static final int TIME_TYPE_PER = 0,
TIME_TYPE_PAST_HOUR = 1,
TIME_TYPE_SERVER_STARTED = 2,
TIME_TYPE_SERVER_STOPPED = 3,
TIME_TYPE_SERVER_CRASHED = 4;
TIME_TYPE_PAST_HOUR = 1,
TIME_TYPE_SERVER_STARTED = 2,
TIME_TYPE_SERVER_STOPPED = 3,
TIME_TYPE_SERVER_CRASHED = 4;
public int type, type2, timeType;
public String content;

View File

@@ -1,7 +1,7 @@
/*
* Hello Minecraft! Launcher.
* Copyright (C) 2013 huangyuhui
*
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
@@ -29,7 +29,7 @@ public class Settings {
public String maxMemory;
public String mainjar, bgPath, javaDir, javaArgs;
public ArrayList<String> inactiveExtMods, inactiveCoreMods, inactivePlugins,
inactiveWorlds;
inactiveWorlds;
public ArrayList<Schedule> schedules;
public Settings() {

View File

@@ -1,7 +1,7 @@
/*
* Hello Minecraft! Launcher.
* Copyright (C) 2013 huangyuhui
*
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
@@ -71,24 +71,24 @@ public class InputDialog extends javax.swing.JDialog {
javax.swing.GroupLayout jPanelLayout = new javax.swing.GroupLayout(panel);
panel.setLayout(jPanelLayout);
jPanelLayout.setHorizontalGroup(
jPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(jPanelLayout.createSequentialGroup()
.addContainerGap()
.addGroup(jPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(jPanelLayout.createSequentialGroup()
.addComponent(label)
.addGap(0, 0, Short.MAX_VALUE))
.addComponent(textField))
.addContainerGap())
jPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(jPanelLayout.createSequentialGroup()
.addContainerGap()
.addGroup(jPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(jPanelLayout.createSequentialGroup()
.addComponent(label)
.addGap(0, 0, Short.MAX_VALUE))
.addComponent(textField))
.addContainerGap())
);
jPanelLayout.setVerticalGroup(
jPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(jPanelLayout.createSequentialGroup()
.addContainerGap()
.addComponent(label)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(textField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
jPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(jPanelLayout.createSequentialGroup()
.addContainerGap()
.addComponent(label)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(textField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
);
textFields.add(textField);
panels.add(panel);
@@ -104,22 +104,22 @@ public class InputDialog extends javax.swing.JDialog {
.addGap(0, 0, Short.MAX_VALUE)
.addComponent(jButton1));
layout.setHorizontalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup()
.addContainerGap()
.addGroup(g)
.addContainerGap())
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup()
.addContainerGap()
.addGroup(g)
.addContainerGap())
);
GroupLayout.SequentialGroup g2 = layout.createSequentialGroup()
.addContainerGap();
.addContainerGap();
for (JPanel p : panels)
g2 = g2.addComponent(p, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED);
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED);
g2 = g2.addComponent(jButton1)
.addContainerGap();
.addContainerGap();
layout.setVerticalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(g2)
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(g2)
);
pack();

View File

@@ -238,7 +238,7 @@ public final class MainWindow extends javax.swing.JFrame
itm.addActionListener(new ActionListenerImpl("me " + JOptionPane.showInputDialog("广播讯息")));
itm = new JMenuItem("私聊");
itm.addActionListener(e -> {
InputDialog id = new InputDialog(MainWindow.this, true, new String[] {"玩家", "讯息"});
InputDialog id = new InputDialog(MainWindow.this, true, new String[] { "玩家", "讯息" });
id.setVisible(true);
Server.getInstance().sendCommand("tell " + id.result[0] + " " + id.result[1]);
});
@@ -318,7 +318,7 @@ public final class MainWindow extends javax.swing.JFrame
ppmBasically.add(itm);
itm = new JMenuItem("给予玩家物品");
itm.addActionListener(e -> {
InputDialog id = new InputDialog(MainWindow.this, true, new String[] {"玩家", "物品ID", "数量"});
InputDialog id = new InputDialog(MainWindow.this, true, new String[] { "玩家", "物品ID", "数量" });
id.setVisible(true);
if (id.result != null)
Server.getInstance().sendCommand("give " + id.result[0] + " " + id.result[1] + " " + id.result[2]);
@@ -2779,7 +2779,7 @@ public final class MainWindow extends javax.swing.JFrame
while (model.getRowCount() > 0)
model.removeRow(0);
for (String s : sl)
model.addRow(new Object[] {!SettingsManager.settings.inactiveExtMods.contains(s), s, ModType.getModTypeShowName(ModType.getModType(IOUtils.addSeparator(path) + s))});
model.addRow(new Object[] { !SettingsManager.settings.inactiveExtMods.contains(s), s, ModType.getModTypeShowName(ModType.getModType(IOUtils.addSeparator(path) + s)) });
lstExternalMods.updateUI();
}
@@ -2795,11 +2795,11 @@ public final class MainWindow extends javax.swing.JFrame
for (String s : sl) {
PluginInformation p = PluginManager.getPluginYML(new File(Utilities.getGameDir() + "plugins" + File.separator + s));
if (p == null)
model.addRow(new Object[] {!SettingsManager.settings.inactivePlugins.contains(s), s,
"", "", "", ""});
model.addRow(new Object[] { !SettingsManager.settings.inactivePlugins.contains(s), s,
"", "", "", "" });
else
model.addRow(new Object[] {!SettingsManager.settings.inactivePlugins.contains(s), s,
p.name, p.version, p.author, p.description});
model.addRow(new Object[] { !SettingsManager.settings.inactivePlugins.contains(s), s,
p.name, p.version, p.author, p.description });
}
lstPlugins.updateUI();
@@ -2814,7 +2814,7 @@ public final class MainWindow extends javax.swing.JFrame
while (model.getRowCount() > 0)
model.removeRow(0);
for (String s : sl)
model.addRow(new Object[] {!SettingsManager.settings.inactiveCoreMods.contains(s), s, ModType.getModTypeShowName(ModType.getModType(IOUtils.addSeparator(path) + s))});
model.addRow(new Object[] { !SettingsManager.settings.inactiveCoreMods.contains(s), s, ModType.getModTypeShowName(ModType.getModType(IOUtils.addSeparator(path) + s)) });
lstCoreMods.updateUI();
}
@@ -3003,7 +3003,7 @@ public final class MainWindow extends javax.swing.JFrame
ArrayList<String> al = IOUtils.findAllFile(new File(Utilities.getGameDir() + "infos-HMCSM"));
DefaultTableModel model = (DefaultTableModel) lstInfos.getModel();
for (String s : al)
model.addRow(new Object[] {s, FileUtils.getExtension(s)});
model.addRow(new Object[] { s, FileUtils.getExtension(s) });
lstInfos.updateUI();
}
@@ -3416,7 +3416,7 @@ public final class MainWindow extends javax.swing.JFrame
FileUtils.copyFile(new File(path), newf);
DefaultTableModel model = (DefaultTableModel) lstExternalMods.getModel();
model.addRow(new Object[] {fc.getSelectedFile().getName(), ModType.getModTypeShowName(ModType.getModType(newf))});
model.addRow(new Object[] { fc.getSelectedFile().getName(), ModType.getModTypeShowName(ModType.getModType(newf)) });
lstExternalMods.updateUI();
} catch (IOException e) {
MessageBox.Show(C.i18n("mods.failed"));
@@ -3455,7 +3455,7 @@ public final class MainWindow extends javax.swing.JFrame
DefaultTableModel model = (DefaultTableModel) lstCoreMods.getModel();
lstCoreMods.updateUI();
model.addRow(new Object[] {fc.getSelectedFile().getName(), ModType.getModTypeShowName(ModType.getModType(newf))});
model.addRow(new Object[] { fc.getSelectedFile().getName(), ModType.getModTypeShowName(ModType.getModType(newf)) });
FileUtils.copyFile(new File(path), newf);
} catch (IOException e) {
MessageBox.Show(C.i18n("mods.failed"));
@@ -3495,7 +3495,7 @@ public final class MainWindow extends javax.swing.JFrame
DefaultTableModel model = (DefaultTableModel) lstPlugins.getModel();
lstPlugins.updateUI();
model.addRow(new Object[] {fc.getSelectedFile().getName(), ModType.getModTypeShowName(ModType.getModType(newf))});
model.addRow(new Object[] { fc.getSelectedFile().getName(), ModType.getModTypeShowName(ModType.getModType(newf)) });
FileUtils.copyFile(new File(path), newf);
} catch (IOException e) {
MessageBox.Show(C.i18n("mods.failed"));

View File

@@ -1,7 +1,7 @@
/*
* Hello Minecraft! Launcher.
* Copyright (C) 2013 huangyuhui
*
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
@@ -232,9 +232,9 @@ public class PluginInfoDialog extends javax.swing.JDialog {
return;
String url = pi.versions.get(index).download;
TaskWindow.getInstance()
.addTask(new FileDownloadTask(url, new File(Utilities.getGameDir() + "plugins"
+ File.separator + pi.versions.get(index).filename)))
.start();
.addTask(new FileDownloadTask(url, new File(Utilities.getGameDir() + "plugins"
+ File.separator + pi.versions.get(index).filename)))
.start();
}//GEN-LAST:event_jButton1ActionPerformed
// Variables declaration - do not modify//GEN-BEGIN:variables