EpicKnarvik97/Blacksmith
1
0
Fork 0
Code Issues Pull Requests Projects Releases 8 Wiki Activity

minimal update to 1.13

Browse Source
This commit is contained in:
mcmonkey
2018-10-12 12:00:54 -07:00
parent 9d8ed3a85b
commit bc1b5a3559
6 changed files with 40 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -2,3 +2,5 @@
.project .project
.settings/ .settings/
target/ target/
.idea/
*.iml

2
README.md
View File

@@ -3,4 +3,6 @@ Blacksmith
A blacksmith plugin for Spigot! A blacksmith plugin for Spigot!
Builds available at: http://ci.citizensnpcs.co/job/Blacksmith/
Backed by Citizens2: https://github.com/CitizensDev/Citizens2 Backed by Citizens2: https://github.com/CitizensDev/Citizens2

BIN
lib/HyperConomy.jar
View File

Binary file not shown.

27
pom.xml
View File

@@ -6,15 +6,15 @@
<groupId>net.apunch</groupId> <groupId>net.apunch</groupId>
<artifactId>blacksmith</artifactId> <artifactId>blacksmith</artifactId>
<version>1.12-SNAPSHOT</version> <version>1.13-SNAPSHOT</version>
<name>Blacksmith</name> <name>Blacksmith</name>
<description>Blacksmith Character for the CitizensAPI</description> <description>Blacksmith Character for the CitizensAPI</description>
<!-- Properties --> <!-- Properties -->
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<bukkit.version>1.10.2-R0.1-SNAPSHOT</bukkit.version> <bukkit.version>1.13.1-R0.1-SNAPSHOT</bukkit.version>
<citizensapi.version>2.0.20-SNAPSHOT</citizensapi.version> <citizensapi.version>2.0.24-SNAPSHOT</citizensapi.version>
<vault.version>1.5.6</vault.version> <vault.version>1.5.6</vault.version>
<hyperconomy.version>0.975.7-SNAPSHOT</hyperconomy.version> <hyperconomy.version>0.975.7-SNAPSHOT</hyperconomy.version>
<build.number>Unknown</build.number> <build.number>Unknown</build.number>
@@ -34,18 +34,14 @@
<id>vault-repo</id> <id>vault-repo</id>
<url>http://nexus.hc.to/content/repositories/pub_releases</url> <url>http://nexus.hc.to/content/repositories/pub_releases</url>
</repository> </repository>
<repository>
<id>grokswell-repo</id>
<url>http://www.grokswell.com:8000/repo/</url>
</repository>
</repositories> </repositories>
<!-- Dependencies --> <!-- Dependencies -->
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>net.citizensnpcs</groupId> <groupId>net.citizensnpcs</groupId>
<artifactId>citizensapi</artifactId> <artifactId>citizens</artifactId>
<version>2.0.22-SNAPSHOT</version> <version>${citizensapi.version}</version>
<type>jar</type> <type>jar</type>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
@@ -65,12 +61,23 @@
<groupId>regalowl.hyperconomy</groupId> <groupId>regalowl.hyperconomy</groupId>
<artifactId>hyperconomy</artifactId> <artifactId>hyperconomy</artifactId>
<version>${hyperconomy.version}</version> <version>${hyperconomy.version}</version>
<scope>provided</scope> <scope>system</scope>
<systemPath>${project.basedir}/lib/HyperConomy.jar</systemPath>
</dependency> </dependency>
</dependencies> </dependencies>
<!-- Build information --> <!-- Build information -->
<build> <build>
<defaultGoal>clean package install</defaultGoal>
<resources>
<resource>
<filtering>true</filtering>
<directory>${basedir}/src/main/resources</directory>
<includes>
<include>*.yml</include>
</includes>
</resource>
</resources>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>

35
src/main/java/net/apunch/blacksmith/BlacksmithPlugin.java
View File

@@ -31,7 +31,6 @@ import regalowl.hyperconomy.bukkit.BukkitConnector;
import regalowl.hyperconomy.inventory.HItemStack; import regalowl.hyperconomy.inventory.HItemStack;
import regalowl.hyperconomy.tradeobject.TradeObject; import regalowl.hyperconomy.tradeobject.TradeObject;
public class BlacksmithPlugin extends JavaPlugin { public class BlacksmithPlugin extends JavaPlugin {
public BlacksmithPlugin plugin; public BlacksmithPlugin plugin;
private Settings config; private Settings config;
@@ -127,28 +126,28 @@ public class BlacksmithPlugin extends JavaPlugin {
public boolean isTool(ItemStack item) { public boolean isTool(ItemStack item) {
switch (item.getType()) { switch (item.getType()) {
case WOOD_PICKAXE: case WOODEN_PICKAXE:
case WOOD_SPADE: case WOODEN_SHOVEL:
case WOOD_HOE: case WOODEN_HOE:
case WOOD_SWORD: case WOODEN_SWORD:
case WOOD_AXE: case WOODEN_AXE:
case STONE_PICKAXE: case STONE_PICKAXE:
case STONE_SPADE: case STONE_SHOVEL:
case STONE_HOE: case STONE_HOE:
case STONE_SWORD: case STONE_SWORD:
case STONE_AXE: case STONE_AXE:
case GOLD_PICKAXE: case GOLDEN_PICKAXE:
case GOLD_SPADE: case GOLDEN_SHOVEL:
case GOLD_HOE: case GOLDEN_HOE:
case GOLD_SWORD: case GOLDEN_SWORD:
case GOLD_AXE: case GOLDEN_AXE:
case IRON_PICKAXE: case IRON_PICKAXE:
case IRON_SPADE: case IRON_SHOVEL:
case IRON_HOE: case IRON_HOE:
case IRON_SWORD: case IRON_SWORD:
case IRON_AXE: case IRON_AXE:
case DIAMOND_PICKAXE: case DIAMOND_PICKAXE:
case DIAMOND_SPADE: case DIAMOND_SHOVEL:
case DIAMOND_HOE: case DIAMOND_HOE:
case DIAMOND_SWORD: case DIAMOND_SWORD:
case DIAMOND_AXE: case DIAMOND_AXE:
@@ -172,10 +171,10 @@ public class BlacksmithPlugin extends JavaPlugin {
case CHAINMAIL_CHESTPLATE: case CHAINMAIL_CHESTPLATE:
case CHAINMAIL_LEGGINGS: case CHAINMAIL_LEGGINGS:
case CHAINMAIL_BOOTS: case CHAINMAIL_BOOTS:
case GOLD_HELMET: case GOLDEN_HELMET:
case GOLD_CHESTPLATE: case GOLDEN_CHESTPLATE:
case GOLD_LEGGINGS: case GOLDEN_LEGGINGS:
case GOLD_BOOTS: case GOLDEN_BOOTS:
case IRON_HELMET: case IRON_HELMET:
case IRON_CHESTPLATE: case IRON_CHESTPLATE:
case IRON_LEGGINGS: case IRON_LEGGINGS:

2
plugin.yml → src/main/resources/plugin.yml
View File

@@ -5,6 +5,8 @@ main: net.apunch.blacksmith.BlacksmithPlugin
depend: [Citizens, Vault] depend: [Citizens, Vault]
softdepend: [HyperConomy] softdepend: [HyperConomy]
api-version: 1.13
commands: commands:
blacksmithreload: blacksmithreload:
permission: blacksmith.reload permission: blacksmith.reload