minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-09-08 21:50:45 +02:00
Code Issues Releases Wiki Activity

Bump Bukkit version and hopefully fix building!

Browse Source
This commit is contained in:
md_5
2012-04-10 13:07:59 +10:00
parent fe8fb70db2
commit 3ac7823678
8 changed files with 61 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@@ -11,6 +11,7 @@ build.xml
# maven
target
jars
# vim
.*.sw[a-p]
@@ -29,6 +30,3 @@ manifest.mf
*.ipr
*.iws
.idea/
EssentialsRelease/
jars/

4
Essentials/pom.xml
View File

@@ -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>

18
Essentials/src/com/earth2me/essentials/craftbukkit/FakeInventory.java
View File

@@ -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.");
}
}

19
Essentials/test/com/earth2me/essentials/FakeServer.java
View File

@@ -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.");
}
}

6
Essentials/test/com/earth2me/essentials/FakeWorld.java
View File

@@ -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.");
}
}

2
EssentialsAntiCheat/pom.xml
View File

@@ -15,7 +15,7 @@
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>craftbukkit</artifactId>
<version>${bukkitversion}</version>
<version>${bukkit.version}</version>
</dependency>
</dependencies>
</project>

1
packager.xml
View File

@@ -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" />

56
pom.xml
View File

@@ -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>
@@ -52,6 +53,14 @@
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.4</version>
<configuration>
<outputDirectory>../jars</outputDirectory>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
@@ -61,47 +70,12 @@
<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>
</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>