Upstream/WorldSystem
1
0
Fork 0
mirror of https://github.com/trainerlord/WorldSystem.git synced 2024-11-29 12:55:11 +01:00
Code Issues Projects Releases Wiki Activity

Added site generation to pom.xml

Browse Source 
Fixed encoding of some files
This commit is contained in:
Butzlabben 2019-03-03 16:28:19 +01:00
parent 664f66e541
commit cbf41729a9
5 changed files with 143 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

256
pom.xml
View File

@ -1,134 +1,142 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>de.butzlabben.world</groupId>
<artifactId>WorldSystem</artifactId>
<version>2.4.4.1</version>
<properties>
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>de.butzlabben.world</groupId>
<artifactId>WorldSystem</artifactId>
<version>2.4.4.1</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.build.number>-</project.build.number>
<project.build.version>${project.version}
Build:${project.build.number}</project.build.version>
</properties>
Build:${project.build.number}
</project.build.version>
</properties>
<reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.0.1</version>
</plugin>
</plugins>
</reporting>
<reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.0.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>2.6</version>
</plugin>
</plugins>
</reporting>
<build>
<defaultGoal>package</defaultGoal>
<sourceDirectory>src/main/java</sourceDirectory>
<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
<excludes><exclude>LICENSE.txt</exclude></excludes>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.0.1</version>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.1.0</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<build>
<defaultGoal>package</defaultGoal>
<sourceDirectory>src/main/java</sourceDirectory>
<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
<excludes>
<exclude>LICENSE.txt</exclude>
</excludes>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.0.1</version>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.1.0</version>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>shade</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<repositories>
<repository>
<id>spigot-repo</id>
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
</repository>
<repository>
<id>fawe-repo</id>
<url>http://ci.athion.net/job/FastAsyncWorldEdit/ws/mvn/</url>
</repository>
<repository>
<id>we-repo</id>
<url>>http://maven.sk89q.com/repo/</url>
</repository>
<!--Repo for CommandFramework-->
<repository>
<id>pp-public</id>
<url>http://nexus.myplayplanet.net/repository/public/</url>
</repository>
<repositories>
<repository>
<id>spigot-repo</id>
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
</repository>
<repository>
<id>fawe-repo</id>
<url>http://ci.athion.net/job/FastAsyncWorldEdit/ws/mvn/</url>
</repository>
<repository>
<id>we-repo</id>
<url>>http://maven.sk89q.com/repo/</url>
</repository>
<!--Repo for CommandFramework-->
<repository>
<id>pp-public</id>
<url>http://nexus.myplayplanet.net/repository/public/</url>
</repository>
<!-- Repo for Vault support-->
<repository>
<id>vault-repo</id>
<url>http://nexus.hc.to/content/repositories/pub_releases</url>
</repository>
<!-- Mojang repo for GameProfileBuilder -->
<!-- Repo for Vault support-->
<repository>
<id>vault-repo</id>
<url>http://nexus.hc.to/content/repositories/pub_releases</url>
</repository>
<!-- Mojang repo for GameProfileBuilder -->
<repository>
<id>mojang</id>
<name>Mojang's Repository</name>
<url>https://libraries.minecraft.net/</url>
</repository>
</repositories>
</repositories>
<dependencies>
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>1.13-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependencies>
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>1.13-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.mojang</groupId>
<artifactId>authlib</artifactId>
<version>1.5.21</version>
<scope>provided</scope>
<scope>provided</scope>
</dependency>
<!--
AsyncWorld is not in the api so I have to use a local file
Issue: https://github.com/boy0001/FastAsyncWorldedit/issues/1060
<dependency>
<groupId>com.boydti</groupId>
<artifactId>fawe-api</artifactId>
<scope>provided</scope>
<version>latest</version>
</dependency>
-->
<dependency>
<groupId>com.sk98q.worldedit</groupId>
<artifactId>FastAsnycWorldEdit</artifactId>
<scope>system</scope>
<version>1.0</version>
<systemPath>${pom.basedir}/lib/FastAsyncWorldEdit.jar</systemPath>
</dependency>
<!--
AsyncWorld is not in the api so I have to use a local file
Issue: https://github.com/boy0001/FastAsyncWorldedit/issues/1060
<dependency>
<groupId>com.boydti</groupId>
<artifactId>fawe-api</artifactId>
<scope>provided</scope>
<version>latest</version>
</dependency>
-->
<dependency>
<groupId>com.sk98q.worldedit</groupId>
<artifactId>FastAsnycWorldEdit</artifactId>
<scope>system</scope>
<version>1.0</version>
<systemPath>${pom.basedir}/lib/FastAsyncWorldEdit.jar</systemPath>
</dependency>
<dependency>
<groupId>com.sk89q</groupId>
<artifactId>worldedit</artifactId>
@ -136,18 +144,18 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.myplayplanet</groupId>
<artifactId>CommandFramework</artifactId>
<version>2.0.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>net.myplayplanet</groupId>
<artifactId>CommandFramework</artifactId>
<version>2.0.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>net.milkbowl.vault</groupId>
<artifactId>VaultAPI</artifactId>
<version>1.6</version>
<scope>provided</scope>
</dependency>
</dependencies>
<dependency>
<groupId>net.milkbowl.vault</groupId>
<artifactId>VaultAPI</artifactId>
<version>1.6</version>
<scope>provided</scope>
</dependency>
</dependencies>
</project>

4
src/main/java/de/butzlabben/world/config/GuiConfig.java
View File

@ -105,7 +105,7 @@ public class GuiConfig {
try {
return Material.valueOf(cfg.getString(path + ".material").toUpperCase());
} catch (IllegalArgumentException ex) {
Bukkit.getConsoleSender().sendMessage(PluginConfig.getPrefix() + "§cUnknown material: " + path);
Bukkit.getConsoleSender().sendMessage(PluginConfig.getPrefix() + "§cUnknown material: " + path);
return null;
}
}
@ -120,7 +120,7 @@ public class GuiConfig {
return new OrcItem(getMaterial(cfg, path), getDisplay(cfg, path), getLore(cfg, path));
} catch (Exception e) {
}
return OrcItem.error.clone().setDisplay("§c" + path);
return OrcItem.error.clone().setDisplay("§c" + path);
}
public static OrcItem getEnabled() {

10
src/main/java/de/butzlabben/world/config/PluginConfig.java
View File

@ -36,13 +36,13 @@ public class PluginConfig {
file = f;
if (file.exists()) {
YamlConfiguration cfg = getConfig();
if (false == (cfg.isString("worldfolder") && cfg.isInt("unloadingtime")
if (!(cfg.isString("worldfolder") && cfg.isInt("unloadingtime")
&& cfg.isBoolean("survival") && cfg.isString("language") && cfg.isString("prefix")
&& cfg.isInt("request_expires") && cfg.isBoolean("need_confirm")
&& cfg.isBoolean("contact_authserver") && cfg.isBoolean("spawn_teleportation")
&& cfg.isInt("delete_after") && cfg.isBoolean("worldtemplates.multi_choose")
&& cfg.isInt("delete_after") && cfg.isBoolean("worldtemplates.multi_choose")
&& cfg.isString("worldtemplates.default") &&
cfg.isInt("lagsystem.period_in_seconds") && cfg.isInt("lagsystem.entities_per_world")
&& cfg.isBoolean("lagsystem.garbagecollector.use")
&& cfg.isInt("lagsystem.garbagecollector.period_in_minutes") &&
@ -88,7 +88,7 @@ public class PluginConfig {
// Should fix #2
if (getSpawn().getWorld() == null) {
Bukkit.getConsoleSender().sendMessage(getPrefix() + "§cWorld is null in spawn.world!");
Bukkit.getConsoleSender().sendMessage(getPrefix() + "§cWorld is null in spawn.world!");
}
}
@ -154,7 +154,7 @@ public class PluginConfig {
}
public static String getPrefix() {
return ChatColor.translateAlternateColorCodes('&', getConfig().getString("prefix", "§8[§3WorldSystem§8] §6"));
return ChatColor.translateAlternateColorCodes('&', getConfig().getString("prefix", "§8[§3WorldSystem§8] §6"));
}
public static Location getWorldSpawn(World w) {

2
src/main/java/de/butzlabben/world/gui/clicklistener/ComingSoonClickListener.java
View File

@ -11,7 +11,7 @@ public class ComingSoonClickListener implements OrcClickListener {
@Override
public void onClick(Player p, OrcInventory inv, OrcItem item) {
p.closeInventory();
p.sendMessage("§cComing soon...");
p.sendMessage("§cComing soon...");
}
}

6
src/main/java/de/butzlabben/world/wrapper/SystemWorld.java
View File

@ -207,7 +207,7 @@ public class SystemWorld {
// FileUtils.deleteDirectory(new
// File(Bukkit.getWorldContainer(), worldname));
// } catch (IOException e) {
// p.sendMessage(PluginConfig.getPrefix() + "§cError");
// p.sendMessage(PluginConfig.getPrefix() + "§cError");
// e.printStackTrace();
// }
}
@ -215,7 +215,7 @@ public class SystemWorld {
FileUtils.moveDirectoryToDirectory(world, Bukkit.getWorldContainer(), false);
} catch (IOException e) {
System.err.println("Couldn't load world of " + p.getName());
p.sendMessage(PluginConfig.getPrefix() + "§cError: " + e.getMessage());
p.sendMessage(PluginConfig.getPrefix() + "§cError: " + e.getMessage());
e.printStackTrace();
}
}
@ -302,7 +302,7 @@ public class SystemWorld {
try {
FileUtils.moveDirectoryToDirectory(world, Bukkit.getWorldContainer(), false);
} catch (IOException e) {
p.sendMessage(PluginConfig.getPrefix() + "§cError: " + e.getMessage());
p.sendMessage(PluginConfig.getPrefix() + "§cError: " + e.getMessage());
System.err.println("Couldn't load world of " + p.getName());
e.printStackTrace();
return false;