diff options
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | Essentials/pom.xml | 4 | ||||
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/craftbukkit/FakeInventory.java | 18 | ||||
| -rw-r--r-- | Essentials/test/com/earth2me/essentials/FakeServer.java | 19 | ||||
| -rw-r--r-- | Essentials/test/com/earth2me/essentials/FakeWorld.java | 6 | ||||
| -rw-r--r-- | EssentialsAntiCheat/pom.xml | 2 | ||||
| -rw-r--r-- | packager.xml | 1 | ||||
| -rw-r--r-- | pom.xml | 52 |
8 files changed, 59 insertions, 47 deletions
diff --git a/.gitignore b/.gitignore index a76656100..5846e1e28 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,7 @@ build.xml # maven target +jars # vim .*.sw[a-p] @@ -29,6 +30,3 @@ manifest.mf *.ipr *.iws .idea/ - -EssentialsRelease/ -jars/
\ No newline at end of file diff --git a/Essentials/pom.xml b/Essentials/pom.xml index 057253fc7..76d9eeb04 100644 --- a/Essentials/pom.xml +++ b/Essentials/pom.xml @@ -20,7 +20,7 @@ <dependency> <groupId>org.bukkit</groupId> <artifactId>craftbukkit</artifactId> - <version>1.2.3-R0.1-SNAPSHOT</version> + <version>${bukkit.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> @@ -44,7 +44,7 @@ <version>1.15</version> </dependency> <!-- - None of these jars are manually added to our maven repo + Note: these jars are manually added to our maven repo --> <dependency> <groupId>cosine</groupId> diff --git a/Essentials/src/com/earth2me/essentials/craftbukkit/FakeInventory.java b/Essentials/src/com/earth2me/essentials/craftbukkit/FakeInventory.java index 01e7bd5b2..8456c956e 100644 --- a/Essentials/src/com/earth2me/essentials/craftbukkit/FakeInventory.java +++ b/Essentials/src/com/earth2me/essentials/craftbukkit/FakeInventory.java @@ -222,4 +222,22 @@ public class FakeInventory implements Inventory { throw new UnsupportedOperationException("Not supported yet."); } + + @Override + public int getMaxStackSize() + { + throw new UnsupportedOperationException("Not supported yet."); + } + + @Override + public void setMaxStackSize(int size) + { + throw new UnsupportedOperationException("Not supported yet."); + } + + @Override + public ListIterator<ItemStack> iterator(int index) + { + throw new UnsupportedOperationException("Not supported yet."); + } } diff --git a/Essentials/test/com/earth2me/essentials/FakeServer.java b/Essentials/test/com/earth2me/essentials/FakeServer.java index c0e0812d7..d673963c5 100644 --- a/Essentials/test/com/earth2me/essentials/FakeServer.java +++ b/Essentials/test/com/earth2me/essentials/FakeServer.java @@ -16,7 +16,6 @@ import org.bukkit.event.Event; import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; import org.bukkit.event.inventory.InventoryType; -import org.bukkit.generator.ChunkGenerator; import org.bukkit.help.HelpMap; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.InventoryHolder; @@ -884,4 +883,22 @@ public class FakeServer implements Server { throw new UnsupportedOperationException("Not supported yet."); } + + @Override + public String getWorldType() + { + throw new UnsupportedOperationException("Not supported yet."); + } + + @Override + public boolean getGenerateStructures() + { + throw new UnsupportedOperationException("Not supported yet."); + } + + @Override + public long getConnectionThrottle() + { + throw new UnsupportedOperationException("Not supported yet."); + } } diff --git a/Essentials/test/com/earth2me/essentials/FakeWorld.java b/Essentials/test/com/earth2me/essentials/FakeWorld.java index 38026611f..faf0c21e8 100644 --- a/Essentials/test/com/earth2me/essentials/FakeWorld.java +++ b/Essentials/test/com/earth2me/essentials/FakeWorld.java @@ -627,4 +627,10 @@ public class FakeWorld implements World { throw new UnsupportedOperationException("Not supported yet."); } + + @Override + public void setBiome(int x, int z, Biome bio) + { + throw new UnsupportedOperationException("Not supported yet."); + } } diff --git a/EssentialsAntiCheat/pom.xml b/EssentialsAntiCheat/pom.xml index f80fa4656..23161e6b5 100644 --- a/EssentialsAntiCheat/pom.xml +++ b/EssentialsAntiCheat/pom.xml @@ -15,7 +15,7 @@ <dependency> <groupId>org.bukkit</groupId> <artifactId>craftbukkit</artifactId> - <version>${bukkitversion}</version> + <version>${bukkit.version}</version> </dependency> </dependencies> </project> diff --git a/packager.xml b/packager.xml index 86cd572d2..f5c2b161a 100644 --- a/packager.xml +++ b/packager.xml @@ -4,7 +4,6 @@ <mkdir dir="jars"/> <copy todir="jars"> <fileset dir="."> - <!-- include name="**/target/Essentials*.jar"/ --> <include name="**/Essentials/src/config.yml" /> <include name="**/target/classes/messages*.properties" /> <include name="**/target/classes/items.csv" /> @@ -9,7 +9,7 @@ <packaging>pom</packaging> <name>BuildAll</name> <url>http://tiny.cc/EssentialsWiki</url> - + <modules> <module>Essentials</module> <module>Essentials2Compat</module> @@ -35,16 +35,17 @@ <dependency> <groupId>org.bukkit</groupId> <artifactId>bukkit</artifactId> - <version>${bukkitversion}</version> + <version>${bukkit.version}</version> </dependency> </dependencies> <build> - <sourceDirectory>${basedir}/src</sourceDirectory> - <testSourceDirectory>${basedir}/test</testSourceDirectory> + <finalName>${project.name}</finalName> + <sourceDirectory>${project.basedir}/src</sourceDirectory> + <testSourceDirectory>${project.basedir}/test</testSourceDirectory> <resources> <resource> - <directory>${basedir}/src</directory> + <directory>${project.basedir}/src</directory> <filtering>true</filtering> <includes> <include>*.*</include> @@ -54,54 +55,27 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.3.2</version> - <configuration> - <source>1.6</source> - <target>1.6</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> <version>2.4</version> <configuration> - <finalName>${project.artifactId}</finalName> <outputDirectory>../jars</outputDirectory> </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.4</version> - <executions> - <execution> - <id>copy</id> - <phase>package</phase> - <goals> - <goal>copy</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.bukkit</groupId> - <artifactId>craftbukkit</artifactId> - <version>${bukkitversion}</version> - <overWrite>true</overWrite> - <outputDirectory>../jars</outputDirectory> - <destFileName>craftbukkit.jar</destFileName> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.3.2</version> + <configuration> + <source>1.6</source> + <target>1.6</target> + </configuration> </plugin> </plugins> </build> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <bukkitversion>1.2.3-R0.3-SNAPSHOT</bukkitversion> + <bukkit.version>1.2.5-R1.2-SNAPSHOT</bukkit.version> <build.number>Unknown</build.number> <org-netbeans-modules-editor-indent.CodeStyle.project.expand-tabs>true</org-netbeans-modules-editor-indent.CodeStyle.project.expand-tabs> <org-netbeans-modules-editor-indent.CodeStyle.project.indent-shift-width>2</org-netbeans-modules-editor-indent.CodeStyle.project.indent-shift-width> |