Upstream/UltimateRepairing
1
0
Fork 0
mirror of https://github.com/songoda/UltimateRepairing.git synced 2024-11-26 04:25:17 +01:00
Code Issues Projects Releases Wiki Activity

1.14 support

Browse Source
This commit is contained in:
Brianna 2019-04-23 23:20:27 -04:00
parent add0a91658
commit debc586850
4 changed files with 49 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
pom.xml
View File

@ -2,46 +2,43 @@
<groupId>com.songoda</groupId> <groupId>com.songoda</groupId>
<artifactId>UltimateRepairing</artifactId> <artifactId>UltimateRepairing</artifactId>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<version>1.1</version> <version>maven-version-number</version>
<build> <build>
<defaultGoal>clean package</defaultGoal> <defaultGoal>clean install</defaultGoal>
<finalName>UltimateKits-${project.version}</finalName>
<plugins> <plugins>
<!--<plugin>-->
<!--<groupId>org.codehaus.mojo</groupId>-->
<!--<artifactId>build-helper-maven-plugin</artifactId>-->
<!--<version>1.7</version>-->
<!--<executions>-->
<!--<execution>-->
<!--<id>add-source</id>-->
<!--<phase>generate-sources</phase>-->
<!--<goals>-->
<!--<goal>add-source</goal>-->
<!--</goals>-->
<!--<configuration>-->
<!--<sources>-->
<!--<source>EpicSpawners-API/src/main/java</source>-->
<!--</sources>-->
<!--</configuration>-->
<!--</execution>-->
<!--</executions>-->
<!--</plugin>-->
<plugin> <plugin>
<version>3.6.1</version>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
<configuration> <configuration>
<source>1.8</source> <source>1.8</source>
<target>1.8</target> <target>1.8</target>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>com.google.code.maven-replacer-plugin</groupId>
<artifactId>replacer</artifactId>
<version>1.5.3</version>
<executions>
<execution>
<phase>prepare-package</phase>
<goals>
<goal>replace</goal>
</goals>
</execution>
</executions>
<configuration>
<file>${project.build.directory}/classes/plugin.yml</file>
<replacements>
<replacement>
<token>maven-version-number</token>
<value>${project.version}</value>
</replacement>
</replacements>
</configuration>
</plugin>
</plugins> </plugins>
<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
</resource>
</resources>
<sourceDirectory>src/main/java</sourceDirectory>
</build> </build>
<repositories> <repositories>
<repository> <repository>
@ -53,32 +50,32 @@
<dependency> <dependency>
<groupId>org.spigotmc</groupId> <groupId>org.spigotmc</groupId>
<artifactId>spigot</artifactId> <artifactId>spigot</artifactId>
<version>1.13.2</version> <version>1.14-pre5</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.songoda</groupId> <groupId>com.songoda</groupId>
<artifactId>arconix</artifactId> <artifactId>arconix</artifactId>
<version>LATEST</version> <version>2.0.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org</groupId> <groupId>org</groupId>
<artifactId>kingdoms</artifactId> <artifactId>kingdoms</artifactId>
<version>LATEST</version> <version>13.0.9</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.milkbowl</groupId> <groupId>net.milkbowl</groupId>
<artifactId>vault</artifactId> <artifactId>vault</artifactId>
<version>LATEST</version> <version>1.7.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>me.ryanhamshire</groupId> <groupId>me.ryanhamshire</groupId>
<artifactId>GriefPrevention</artifactId> <artifactId>GriefPrevention</artifactId>
<version>LATEST</version> <version>16.6</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.sk89q</groupId> <groupId>com.sk89q</groupId>
<artifactId>worldedit</artifactId> <artifactId>worldedit</artifactId>
<version>LATEST</version> <version>7.0.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.sk89q</groupId> <groupId>com.sk89q</groupId>
@ -88,12 +85,12 @@
<dependency> <dependency>
<groupId>com</groupId> <groupId>com</groupId>
<artifactId>plotsquared</artifactId> <artifactId>plotsquared</artifactId>
<version>RELEASE</version> <version>3.5.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.palmergames.bukkit</groupId> <groupId>com.palmergames.bukkit</groupId>
<artifactId>towny</artifactId> <artifactId>towny</artifactId>
<version>LATEST</version> <version>0.93.0.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.wasteofplastic</groupId> <groupId>com.wasteofplastic</groupId>
@ -103,7 +100,7 @@
<dependency> <dependency>
<groupId>us.talabrek</groupId> <groupId>us.talabrek</groupId>
<artifactId>ultimateskyblock</artifactId> <artifactId>ultimateskyblock</artifactId>
<version>LATEST</version> <version>2.7.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>me.markeh</groupId> <groupId>me.markeh</groupId>
@ -118,43 +115,43 @@
<dependency> <dependency>
<groupId>com.gmail.filoghost.holographicdisplays</groupId> <groupId>com.gmail.filoghost.holographicdisplays</groupId>
<artifactId>holographicdisplays-api</artifactId> <artifactId>holographicdisplays-api</artifactId>
<version>LATEST</version> <version>2.3.2</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.gmail.nossr50</groupId> <groupId>com.gmail.nossr50</groupId>
<artifactId>mcmmo</artifactId> <artifactId>mcmmo</artifactId>
<version>LATEST</version> <version>1.5.09</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.gamingmesh</groupId> <groupId>com.gamingmesh</groupId>
<artifactId>jobs</artifactId> <artifactId>jobs</artifactId>
<version>LATEST</version> <version>4.6.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>me.botsko</groupId> <groupId>me.botsko</groupId>
<artifactId>prism</artifactId> <artifactId>prism</artifactId>
<version>LATEST</version> <version>2.0.6</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>de.diddiz</groupId> <groupId>de.diddiz</groupId>
<artifactId>logblock</artifactId> <artifactId>logblock</artifactId>
<version>LATEST</version> <version>1.10.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net</groupId> <groupId>net</groupId>
<artifactId>coreprotect</artifactId> <artifactId>coreprotect</artifactId>
<version>LATEST</version> <version>2.14.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>uk.antiperson</groupId> <groupId>uk.antiperson</groupId>
<artifactId>stackmob</artifactId> <artifactId>stackmob</artifactId>
<version>LATEST</version> <version>2.2.6</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.sothatsit</groupId> <groupId>net.sothatsit</groupId>
<artifactId>blockstore</artifactId> <artifactId>blockstore</artifactId>
<version>LATEST</version> <version>1.5.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.black_ixx</groupId> <groupId>org.black_ixx</groupId>
@ -174,12 +171,12 @@
<dependency> <dependency>
<groupId>com.earth2me</groupId> <groupId>com.earth2me</groupId>
<artifactId>essentials</artifactId> <artifactId>essentials</artifactId>
<version>LATEST</version> <version>2.0.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>bammerbom</groupId> <groupId>bammerbom</groupId>
<artifactId>ultimatecore</artifactId> <artifactId>ultimatecore</artifactId>
<version>LATEST</version> <version>2.1.25</version>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

2
src/main/java/com/songoda/ultimaterepairing/UltimateRepairing.java
View File

@ -2,8 +2,8 @@ package com.songoda.ultimaterepairing;
import com.songoda.ultimaterepairing.anvil.AnvilManager; import com.songoda.ultimaterepairing.anvil.AnvilManager;
import com.songoda.ultimaterepairing.anvil.UAnvil; import com.songoda.ultimaterepairing.anvil.UAnvil;
import com.songoda.ultimaterepairing.command.CommandManager;
import com.songoda.ultimaterepairing.anvil.editor.Editor; import com.songoda.ultimaterepairing.anvil.editor.Editor;
import com.songoda.ultimaterepairing.command.CommandManager;
import com.songoda.ultimaterepairing.events.BlockListeners; import com.songoda.ultimaterepairing.events.BlockListeners;
import com.songoda.ultimaterepairing.events.InteractListeners; import com.songoda.ultimaterepairing.events.InteractListeners;
import com.songoda.ultimaterepairing.events.InventoryListeners; import com.songoda.ultimaterepairing.events.InventoryListeners;

2
src/main/java/com/songoda/ultimaterepairing/events/InventoryListeners.java
View File

@ -52,7 +52,7 @@ public class InventoryListeners implements Listener {
instance.getRepairHandler().finish(false, p); instance.getRepairHandler().finish(false, p);
p.closeInventory(); p.closeInventory();
} }
} else if (event.getInventory().getTitle().equals(instance.getLocale().getMessage("interface.repair.title"))) { } else if (event.getView().getTitle().equals(instance.getLocale().getMessage("interface.repair.title"))) {
event.setCancelled(true); event.setCancelled(true);
Location loc = instance.getRepairHandler().getDataFor(p).getLocation(); Location loc = instance.getRepairHandler().getDataFor(p).getLocation();
if (event.getSlot() == 11) { if (event.getSlot() == 11) {

4
src/main/java/com/songoda/ultimaterepairing/utils/SettingsManager.java
View File

@ -49,14 +49,14 @@ public class SettingsManager implements Listener {
return; return;
} }
if (event.getInventory().getTitle().equals(pluginName + " Settings Manager")) { if (event.getView().getTitle().equals(pluginName + " Settings Manager")) {
event.setCancelled(true); event.setCancelled(true);
if (clickedItem.getType().name().contains("STAINED_GLASS")) return; if (clickedItem.getType().name().contains("STAINED_GLASS")) return;
String type = ChatColor.stripColor(clickedItem.getItemMeta().getDisplayName()); String type = ChatColor.stripColor(clickedItem.getItemMeta().getDisplayName());
this.cat.put((Player) event.getWhoClicked(), type); this.cat.put((Player) event.getWhoClicked(), type);
this.openEditor((Player) event.getWhoClicked()); this.openEditor((Player) event.getWhoClicked());
} else if (event.getInventory().getTitle().equals(pluginName + " Settings Editor")) { } else if (event.getView().getTitle().equals(pluginName + " Settings Editor")) {
event.setCancelled(true); event.setCancelled(true);
if (clickedItem.getType().name().contains("STAINED_GLASS")) return; if (clickedItem.getType().name().contains("STAINED_GLASS")) return;