Skip to content

Commit

Permalink
Initial 1.13 support -- it compiles
Browse files Browse the repository at this point in the history
ProgrammerDan committed Aug 25, 2018
1 parent cf7132b commit 1ede7db
Showing 5 changed files with 11 additions and 7 deletions.
10 changes: 6 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@
<groupId>com.programmerdan.minecraft</groupId>
<artifactId>WordBank</artifactId>
<packaging>jar</packaging>
<version>1.1.0</version>
<version>1.2.0</version>
<name>WordBank</name>
<url>https://github.com/DevotedMC/WordBank</url>

@@ -37,6 +37,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.22.0</version>
<configuration>
<testFailureIgnore>true</testFailureIgnore>
</configuration>
@@ -65,19 +66,20 @@
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>1.12.2-R0.1-SNAPSHOT</version>
<version>1.13-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
<version>2.6.2</version>
<version>3.1.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<!-- <version>1.10.19</version>-->
<version>2.21.0</version>
<scope>test</scope>
</dependency>
</dependencies>
Original file line number Diff line number Diff line change
@@ -41,7 +41,7 @@ public WordBankConfig(ConfigurationSection config, WordBank plugin) throws Inval
throw new org.bukkit.plugin.InvalidPluginException("Invalid configuration file");
}

this.cost = config.getItemStack("cost", new ItemStack(Material.EXP_BOTTLE, 10));
this.cost = config.getItemStack("cost", new ItemStack(Material.EXPERIENCE_BOTTLE, 10));
this.debug = config.getBoolean("debug", false);

try (InputStream words = new FileInputStream(
Original file line number Diff line number Diff line change
@@ -62,7 +62,7 @@ public void TableTouch(PlayerInteractEvent event) {
if (plugin().config().isDebug()) plugin().logger().info(" - has player");

Block target = event.getClickedBlock();
if (target == null || target.getType() != Material.ENCHANTMENT_TABLE) return;
if (target == null || target.getType() != Material.ENCHANTING_TABLE) return;
if (plugin().config().isDebug()) plugin().logger().info(" - is touch Enchantment Table");

// no item or item has no custom data
3 changes: 2 additions & 1 deletion src/main/resources/config.yml
Original file line number Diff line number Diff line change
@@ -18,7 +18,8 @@ db:
password: ''
cost:
==: org.bukkit.inventory.ItemStack
type: EXP_BOTTLE
type: EXPERIENCE_BOTTLE
v: 1
amount: 10
color:
chars: [9, 9]
1 change: 1 addition & 0 deletions src/main/resources/plugin.yml
Original file line number Diff line number Diff line change
@@ -3,6 +3,7 @@ main: com.programmerdan.minecraft.wordbank.WordBank
author: ProgrammerDan
authors: []
version: ${project.version}
api-version: 1.13
commands:
wordbank:
description: |

0 comments on commit 1ede7db

Please sign in to comment.