diff --git a/base/.gitignore b/base/.gitignore new file mode 100644 index 00000000..3fd14a37 --- /dev/null +++ b/base/.gitignore @@ -0,0 +1,44 @@ +# Eclipse stuff +/.classpath +/.project +/.settings +/.checkstyle + +# netbeans +/nbproject + +# we use maven! +/build.xml + +# maven +/target + +# vim +.*.sw[a-p] + +# various other potential build files +/build +/bin +/dist +/manifest.mf + +/world + +# Mac filesystem dust +*.DS_Store + +# intellij +*.iml +*.ipr +*.iws +.idea/ + +# Fern's utils +uploadtoserver.sh + +# Testing files: +debug.log + +# Doxygen +/docs/html +debug.txt diff --git a/base/pom.xml b/base/pom.xml new file mode 100644 index 00000000..55da1185 --- /dev/null +++ b/base/pom.xml @@ -0,0 +1,204 @@ + + 4.0.0 + + com.onarandombox + MultiverseCore + 3.0-SNAPSHOT + + MultiverseCore-Base + + + + onarandombox + http://repo.onarandombox.com/content/groups/public + + + + + + doodleproject-repo + DoodleProject Maven 2 Repository + http://doodleproject.sourceforge.net/maven2/release + + true + + + + + + + + jenkins + + + env.BUILD_NUMBER + + + + ${env.BUILD_NUMBER} + + + + + + clean package + + + + org.apache.maven.plugins + maven-compiler-plugin + 2.3.2 + + 1.6 + 1.6 + + + + com.google.code.maven-replacer-plugin + maven-replacer-plugin + 1.3.8 + + + prepare-package + + replace + + + + + target/classes/plugin.yml + + + maven-version-number + ${project.version}-b${project.build.number} + + + + + + + org.apache.maven.plugins + maven-jar-plugin + 2.3.1 + + + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.11 + + methods + 10 + + **/TestCommandSender.java + **/TestInstanceCreator.java + + + + + org.apache.maven.surefire + surefire-junit47 + 2.11 + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + 2.8 + + true + ${project.basedir}/config/mv_checks.xml + + + + org.apache.maven.plugins + maven-source-plugin + 2.1.2 + + + attach-sources + package + + jar-no-fork + + + + + + maven-javadoc-plugin + 2.8.1 + + + javadoc-jar + verify + + jar + + + + + + + + + + + com.dumptruckman.minecraft + Plugin + 1.5-SNAPSHOT + jar + compile + + + + + + junit + junit + 4.8.2 + + + org.powermock + powermock-module-junit4 + 1.4.9 + jar + test + + + org.powermock + powermock-api-easymock + 1.4.9 + jar + test + + + org.powermock + powermock-api-mockito + 1.4.9 + jar + test + + + org.easymock + easymock + 3.0 + test + + + + + + + OnARandomBox + http://repo.onarandombox.com/content/repositories/multiverse + + + diff --git a/base/src/main/java/com/onarandombox/multiverse/core/api/Core.java b/base/src/main/java/com/onarandombox/multiverse/core/api/Core.java new file mode 100644 index 00000000..126fe2e2 --- /dev/null +++ b/base/src/main/java/com/onarandombox/multiverse/core/api/Core.java @@ -0,0 +1,12 @@ +package com.onarandombox.multiverse.core.api; + +import com.dumptruckman.minecraft.pluginbase.plugin.PluginBase; + +/** + * Multiverse 3 Core API + *

+ * This API contains a bunch of useful things you can get out of Multiverse in general! + * This is the class you should cast your plugin to. + */ +public interface Core extends PluginBase { +} diff --git a/base/src/main/java/com/onarandombox/multiverse/core/api/CoreConfig.java b/base/src/main/java/com/onarandombox/multiverse/core/api/CoreConfig.java new file mode 100644 index 00000000..5e2f41b1 --- /dev/null +++ b/base/src/main/java/com/onarandombox/multiverse/core/api/CoreConfig.java @@ -0,0 +1,6 @@ +package com.onarandombox.multiverse.core.api; + +import com.dumptruckman.minecraft.pluginbase.config.BaseConfig; + +public interface CoreConfig extends BaseConfig { +} diff --git a/bukkit/.gitignore b/bukkit/.gitignore new file mode 100644 index 00000000..3fd14a37 --- /dev/null +++ b/bukkit/.gitignore @@ -0,0 +1,44 @@ +# Eclipse stuff +/.classpath +/.project +/.settings +/.checkstyle + +# netbeans +/nbproject + +# we use maven! +/build.xml + +# maven +/target + +# vim +.*.sw[a-p] + +# various other potential build files +/build +/bin +/dist +/manifest.mf + +/world + +# Mac filesystem dust +*.DS_Store + +# intellij +*.iml +*.ipr +*.iws +.idea/ + +# Fern's utils +uploadtoserver.sh + +# Testing files: +debug.log + +# Doxygen +/docs/html +debug.txt diff --git a/bukkit/pom.xml b/bukkit/pom.xml new file mode 100644 index 00000000..482bf1e0 --- /dev/null +++ b/bukkit/pom.xml @@ -0,0 +1,306 @@ + + 4.0.0 + + com.onarandombox + MultiverseCore + 3.0-SNAPSHOT + + MultiverseCore-Bukkit + + + + onarandombox + http://repo.onarandombox.com/content/groups/public + + + Bukkit Official + http://repo.bukkit.org/content/repositories/public + + + + mcstats + http://repo.mcstats.org/content/repositories/snapshots + + + + herocraft + http://ci.herocraftonline.com/plugin/repository/everything/ + + + + + + doodleproject-repo + DoodleProject Maven 2 Repository + http://doodleproject.sourceforge.net/maven2/release + + true + + + + + + jenkins + http://ci.onarandombox.com + + + + + + jenkins + + + env.BUILD_NUMBER + + + + ${env.BUILD_NUMBER} + + + + + + clean package + + + + org.apache.maven.plugins + maven-compiler-plugin + 2.3.2 + + 1.6 + 1.6 + + + + com.google.code.maven-replacer-plugin + maven-replacer-plugin + 1.3.8 + + + prepare-package + + replace + + + + + target/classes/plugin.yml + + + maven-version-number + ${project.version}-b${project.build.number} + + + + + + + org.apache.maven.plugins + maven-jar-plugin + 2.3.1 + + + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.11 + + methods + 10 + + **/TestCommandSender.java + **/TestInstanceCreator.java + + + + + org.apache.maven.surefire + surefire-junit47 + 2.11 + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + 2.8 + + true + ${project.basedir}/config/mv_checks.xml + + + + org.apache.maven.plugins + maven-source-plugin + 2.1.2 + + + attach-sources + package + + jar-no-fork + + + + + + maven-javadoc-plugin + 2.8.1 + + + javadoc-jar + verify + + jar + + + + + + org.apache.maven.plugins + maven-shade-plugin + 1.5 + + + package + + shade + + + + + me.main__.util:SerializationConfig + com.pneumaticraft.commandhandler:CommandHandler + com.dumptruckman.minecraft:buscript + com.dumptruckman.minecraft:BukkitPlugin + org.mcstats:metrics + com.fernferret.allpay:AllPay + + + + + com.fernferret.allpay + com.fernferret.allpay.multiverse + + + me.main__.util + me.main__.util.multiverse + + + com.pneumaticraft.commandhandler + com.pneumaticraft.commandhandler.multiverse + + + buscript + buscript.multiverse + + + com.dumptruckman.minecraft.pluginbase.util.Logging + com.onarandombox.multiverse.core.util.CoreLogging + + + com.dumptruckman.minecraft.pluginbase.util.DebugLog + com.onarandombox.multiverse.util.DebugFileLogger + + + com.dumptruckman.minecraft.pluginbase + com.dumptruckman.minecraft.pluginbase.multiverse + + + org.mcstats + org.mcstats.multiverse + + + + + + + + + + + + + com.onarandombox + MultiverseCore-Base + 3.0-SNAPSHOT + jar + compile + + + + com.dumptruckman.minecraft + BukkitPlugin + 1.5-SNAPSHOT + jar + compile + + + + org.bukkit + bukkit + 1.3.2-R2.1-SNAPSHOT + + + jar + compile + + + + com.fernferret.allpay + AllPay + 10 + jar + compile + + + net.milkbowl.vault + Vault + 1.2.19-SNAPSHOT + jar + compile + + + + + com.pneumaticraft.commandhandler + CommandHandler + 7 + jar + compile + + + + + com.dumptruckman.minecraft + buscript + 1.0 + jar + compile + + + + + org.mcstats + metrics + 1.2-SNAPSHOT + jar + compile + + + + + + OnARandomBox + http://repo.onarandombox.com/content/repositories/multiverse + + + diff --git a/bukkit/src/main/java/com/onarandombox/multiverse/core/MultiverseCore.java b/bukkit/src/main/java/com/onarandombox/multiverse/core/MultiverseCore.java new file mode 100644 index 00000000..6ffda2c4 --- /dev/null +++ b/bukkit/src/main/java/com/onarandombox/multiverse/core/MultiverseCore.java @@ -0,0 +1,28 @@ +package com.onarandombox.multiverse.core; + +import com.dumptruckman.minecraft.pluginbase.plugin.AbstractBukkitPlugin; +import com.onarandombox.multiverse.core.api.Core; +import com.onarandombox.multiverse.core.api.CoreConfig; + +import java.io.IOException; + +/** + * The primary Bukkit plugin implementation of Multiverse-Core. + */ +public class MultiverseCore extends AbstractBukkitPlugin implements Core { + + @Override + public String getCommandPrefix() { + return "mv"; + } + + @Override + protected CoreConfig newConfigInstance() throws IOException { + return new YamlCoreConfig(this); + } + + @Override + protected boolean useDatabase() { + return false; + } +} diff --git a/bukkit/src/main/java/com/onarandombox/multiverse/core/YamlCoreConfig.java b/bukkit/src/main/java/com/onarandombox/multiverse/core/YamlCoreConfig.java new file mode 100644 index 00000000..54fda68e --- /dev/null +++ b/bukkit/src/main/java/com/onarandombox/multiverse/core/YamlCoreConfig.java @@ -0,0 +1,17 @@ +package com.onarandombox.multiverse.core; + +import com.dumptruckman.minecraft.pluginbase.config.AbstractYamlConfig; +import com.onarandombox.multiverse.core.api.CoreConfig; + +import java.io.File; +import java.io.IOException; + +/** + * A yaml implementation of Multiverse-Core's primary configuration file. + */ +class YamlCoreConfig extends AbstractYamlConfig implements CoreConfig { + + public YamlCoreConfig(MultiverseCore plugin) throws IOException { + super(plugin, true, true, new File(plugin.getDataFolder(), "config.yml"), CoreConfig.class); + } +} diff --git a/pom.xml b/pom.xml index 4d5793aa..bdc62f2b 100644 --- a/pom.xml +++ b/pom.xml @@ -1,349 +1,40 @@ 4.0.0 - com.onarandombox.multiversecore - Multiverse-Core - 2.5 + com.onarandombox + MultiverseCore + 3.0-SNAPSHOT Multiverse-Core + http://ci.onarandombox.org World Management Plugin + pom + UTF-8 - UNKNOWN + LOCAL - - - onarandombox - http://repo.onarandombox.com/content/groups/public - - - Bukkit Official - http://repo.bukkit.org/content/repositories/public - - - - mcstats - http://repo.mcstats.org/content/repositories/snapshots - - - - herocraft - http://ci.herocraftonline.com/plugin/repository/everything/ - - - - - - doodleproject-repo - DoodleProject Maven 2 Repository - http://doodleproject.sourceforge.net/maven2/release - - true - - - + + + base + bukkit + jenkins http://ci.onarandombox.com - - - - jenkins - - - env.BUILD_NUMBER - - - - ${env.BUILD_NUMBER} - - - - - - clean package - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.3.2 - - 1.6 - 1.6 - - - - com.google.code.maven-replacer-plugin - maven-replacer-plugin - 1.3.8 - - - prepare-package - - replace - - - - - target/classes/plugin.yml - - - maven-version-number - ${project.version}-b${project.build.number} - - - - - - - org.apache.maven.plugins - maven-jar-plugin - 2.3.1 - - - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.11 - - methods - 10 - - **/TestCommandSender.java - **/TestInstanceCreator.java - - - - - org.apache.maven.surefire - surefire-junit47 - 2.11 - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - 2.8 - - true - ${project.basedir}/config/mv_checks.xml - - - - org.apache.maven.plugins - maven-source-plugin - 2.1.2 - - - attach-sources - package - - jar-no-fork - - - - - - maven-javadoc-plugin - 2.8.1 - - - javadoc-jar - verify - - jar - - - - - - org.apache.maven.plugins - maven-shade-plugin - 1.5 - - - package - - shade - - - - - me.main__.util:SerializationConfig - com.pneumaticraft.commandhandler:CommandHandler - com.dumptruckman.minecraft:buscript - org.mcstats:metrics - com.dumptruckman.minecraft:Logging - com.fernferret.allpay:AllPay - - - - - com.fernferret.allpay - com.fernferret.allpay.multiverse - - - me.main__.util - me.main__.util.multiverse - - - com.pneumaticraft.commandhandler - com.pneumaticraft.commandhandler.multiverse - - - buscript - buscript.multiverse - - - org.mcstats - org.mcstats.multiverse - - - com.dumptruckman.minecraft.util.Logging - com.onarandombox.MultiverseCore.utils.CoreLogging - - - com.dumptruckman.minecraft.util.DebugLog - com.onarandombox.MultiverseCore.utils.DebugFileLogger - - - - - - - - - - - - - org.bukkit - bukkit - 1.3.2-R2.1-SNAPSHOT - - - jar - compile - - - - - - me.main__.util - SerializationConfig - 1.6c - jar - compile - - - - - com.fernferret.allpay - AllPay - 10 - jar - compile - - - net.milkbowl.vault - Vault - 1.2.19-SNAPSHOT - jar - compile - - - - - com.pneumaticraft.commandhandler - CommandHandler - 7 - jar - compile - - - - - com.dumptruckman.minecraft - buscript - 1.0 - jar - compile - - - - - org.mcstats - metrics - 1.2-SNAPSHOT - jar - compile - - - - - com.dumptruckman.minecraft - Logging - 1.0.9 - jar - compile - - - - - junit - junit - 4.8.2 - - - org.powermock - powermock-module-junit4 - 1.4.9 - jar - test - - - org.powermock - powermock-api-easymock - 1.4.9 - jar - test - - - org.powermock - powermock-api-mockito - 1.4.9 - jar - test - - - org.easymock - easymock - 3.0 - test - - - OnARandomBox http://repo.onarandombox.com/content/repositories/multiverse + + + scm:git:git://github.com/multiverse/Multiverse-Core.git + https://github.com/multiverse/Multiverse-Core + scm:git:git@github.com:multiverse/Multiverse-Core.git +