Skip to content

Update to 1.20-2.1 support #109

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
RealRigBot wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update to 1.20-2.1 support #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
214 changes: 214 additions & 0 deletions dependency-reduced-pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,214 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.trophonix</groupId>
<artifactId>TradePlus</artifactId>
<version>3.84</version>
<build>
<sourceDirectory>${basedir}/src/main/java/</sourceDirectory>
<resources>
<resource>
<targetPath>.</targetPath>
<filtering>true</filtering>
<directory>${basedir}/src/main/resources/</directory>
</resource>
</resources>
<finalName>${project.artifactId}-${revision}</finalName>
<plugins>
<plugin>
<groupId>org.projectlombok</groupId>
<artifactId>lombok-maven-plugin</artifactId>
<version>1.18.20.0</version>
<executions>
<execution>
<phase>generate-sources</phase>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.2</version>
<configuration>
<source>17</source>
<target>17</target>
</configuration>
</plugin>
<plugin>
<artifactId>maven-shade-plugin</artifactId>
<version>3.5.1</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<filters>
<filter>
<artifact>*:*</artifact>
<excludes>
<exclude>META-INF/*.SF</exclude>
<exclude>META-INF/*.DSA</exclude>
<exclude>META-INF/*.RSA</exclude>
</excludes>
</filter>
</filters>
<relocations>
<relocation>
<pattern>com.google.common</pattern>
<shadedPattern>com.trophonix.tradeplus.shaded.guava</shadedPattern>
</relocation>
<relocation>
<pattern>co.aikar.taskchain</pattern>
<shadedPattern>com.trophonix.tradeplus.shaded.taskchain</shadedPattern>
</relocation>
<relocation>
<pattern>net.wesjd.anvilgui</pattern>
<shadedPattern>com.trophonix.tradeplus.shaded.anvilgui</shadedPattern>
</relocation>
<relocation>
<pattern>org.codemc.worldguardwrapper</pattern>
<shadedPattern>com.trophonix.tradeplus.shaded.worldguardwrapper</shadedPattern>
</relocation>
</relocations>
<minimizeJar>true</minimizeJar>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<repositories>
<repository>
<id>spigot-repo</id>
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
</repository>
<repository>
<id>bungeecord-repo</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</repository>
<repository>
<id>vault-repo</id>
<url>https://jitpack.io</url>
</repository>
<repository>
<id>minebench-repo</id>
<url>https://repo.minebench.de/</url>
</repository>
<repository>
<id>jitpack.io</id>
<url>https://jitpack.io</url>
</repository>
<repository>
<id>savagefactions-repo</id>
<url>https://cdn.jsdelivr.net/gh/ProSavage/SavageFactions@1.6.x/</url>
</repository>
<repository>
<id>aikar</id>
<url>https://repo.aikar.co/content/groups/aikar/</url>
</repository>
<repository>
<id>codemc-repo</id>
<url>https://repo.codemc.org/repository/maven-public/</url>
</repository>
</repositories>
<dependencies>
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>1.21-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.30</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.milkbowl.vault</groupId>
<artifactId>VaultAPI</artifactId>
<version>1.7</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.github.ProSavage</groupId>
<artifactId>SavageFactions</artifactId>
<version>1.6.3-RC</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.github.Angeschossen</groupId>
<artifactId>LandsAPI</artifactId>
<version>4.5.2.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.github.TechFortress</groupId>
<artifactId>GriefPrevention</artifactId>
<version>16.7.1</version>
<scope>system</scope>
<systemPath>${res}/GriefPrevention.jar</systemPath>
</dependency>
<dependency>
<groupId>org.black_ixx</groupId>
<artifactId>PlayerPoints</artifactId>
<version>3.1.0</version>
<scope>system</scope>
<systemPath>${res}/PlayerPointsNew.jar</systemPath>
</dependency>
<dependency>
<groupId>BeastTokens</groupId>
<artifactId>BeastTokens</artifactId>
<version>2.0</version>
<scope>system</scope>
<systemPath>${res}/BeastTokensAPI.jar</systemPath>
</dependency>
<dependency>
<groupId>com.enjin.mc</groupId>
<artifactId>enjin-mc-plugin</artifactId>
<version>3.4.3</version>
<scope>system</scope>
<systemPath>${res}/EnjinMinecraftPlugin.jar</systemPath>
</dependency>
<dependency>
<groupId>com.vk2gpz.tokenenchant</groupId>
<artifactId>api</artifactId>
<version>10.0.0</version>
<scope>system</scope>
<systemPath>${res}/TokenEnchantAPI.jar</systemPath>
</dependency>
<dependency>
<groupId>com.github.kicjow</groupId>
<artifactId>Crazy-Crates</artifactId>
<version>v1.8.5</version>
<scope>system</scope>
<systemPath>${res}/CrazyCrates.jar</systemPath>
</dependency>
<dependency>
<groupId>com.github.Realizedd</groupId>
<artifactId>TokenManager</artifactId>
<version>3.2.2</version>
<scope>system</scope>
<systemPath>${res}/TokenManager.jar</systemPath>
</dependency>
<dependency>
<groupId>com.github.Ben12345rocks</groupId>
<artifactId>VotingPlugin</artifactId>
<version>6.6.2</version>
<scope>system</scope>
<systemPath>${res}/VotingPlugin.jar</systemPath>
</dependency>
<dependency>
<groupId>com.earth2me</groupId>
<artifactId>essentials</artifactId>
<version>2.18.0.0</version>
<scope>system</scope>
<systemPath>${res}/EssentialsX-2.18.0.0.jar</systemPath>
</dependency>
</dependencies>
<properties>
<res>${project.basedir}/res/</res>
<revision>3.84.5</revision>
</properties>
</project>
23 changes: 9 additions & 14 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,7 @@

<repository>
<id>vault-repo</id>
<url>http://nexus.hc.to/content/repositories/pub_releases</url>
</repository>

<repository>
<id>dakani</id>
<url>https://repo.dakanilabs.com/repository/maven-public/</url>
<url>https://jitpack.io</url>
</repository>

<repository>
Expand Down Expand Up @@ -64,7 +59,7 @@
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>1.17.1-R0.1-SNAPSHOT</version>
<version>1.21-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>

Expand All @@ -83,9 +78,9 @@
</dependency>

<dependency>
<groupId>com.github.WesJD.AnvilGUI</groupId>
<groupId>net.wesjd</groupId>
<artifactId>anvilgui</artifactId>
<version>478e0c196e</version>
<version>1.10.2-SNAPSHOT</version>
<scope>compile</scope>
</dependency>

Expand All @@ -99,7 +94,7 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.20</version>
<version>1.18.30</version>
<scope>provided</scope>
</dependency>

Expand Down Expand Up @@ -218,7 +213,7 @@
<plugin>
<groupId>org.projectlombok</groupId>
<artifactId>lombok-maven-plugin</artifactId>
<version>1.18.12.0</version>
<version>1.18.20.0</version>
<executions>
<execution>
<phase>generate-sources</phase>
Expand All @@ -231,15 +226,15 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.2</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<source>17</source>
<target>17</target>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.2.0</version>
<version>3.5.1</version>
<executions>
<execution>
<phase>package</phase>
Expand Down
11 changes: 7 additions & 4 deletions src/main/java/com/trophonix/tradeplus/trade/Trade.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1049,14 +1049,17 @@ private boolean isBlocked(ItemStack item) {
String type = item.getType().toString();
List<String> checks = new ArrayList<>();
if (Sounds.version < 113) {
@SuppressWarnings("deprecation")
byte data = item.getData().getData();
checks.add(type + ":" + data);
checks.add(type.replace("_", "") + ":" + data);
checks.add(type.replace("_", " ") + ":" + data);
try { // Throws exception for materials added after the flattening
checks.add(item.getType().getId() + ":" + data);
checks.add(Integer.toString(item.getType().getId()));
} catch (IllegalArgumentException ignored) {
try {
@SuppressWarnings("deprecation")
int materialId = item.getType().getId();
checks.add(materialId + ":" + data);
checks.add(Integer.toString(materialId));
} catch (IllegalArgumentException | NoSuchMethodError ignored) {
}
}
checks.add(type);
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/trophonix/tradeplus/util/InvUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public static Inventory getTradeInventory(Player player1, Player player2) {
public static Inventory getSpectatorInventory(Player player1, Player player2) {
String title =
MsgUtils.color(pl.getTradeConfig().getSpectatorTitle());
if (Sounds.version > 1.8)
if (Sounds.version > 18)
title = title.replace("%PLAYER1%", player1.getName()).replace("%PLAYER2%", player2.getName());
Inventory inv = Bukkit.createInventory(new MenuInventoryHolder(), 54, title);
ItemStack separator = pl.getTradeConfig().getSeparator().build();
Expand Down
22 changes: 20 additions & 2 deletions src/main/java/com/trophonix/tradeplus/util/ItemFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,33 @@ public ItemFactory(String parsable, Material fallback) {
}

if (data > 0) {
this.stack = new ItemStack(mat, 1, data, data);
if (Sounds.version >= 113) {
this.stack = new ItemStack(mat, 1);
ItemMeta meta = this.stack.getItemMeta();
if (meta instanceof org.bukkit.inventory.meta.Damageable) {
((org.bukkit.inventory.meta.Damageable) meta).setDamage(data);
this.stack.setItemMeta(meta);
}
} else {
this.stack = new ItemStack(mat, 1, data, data);
}
} else {
this.stack = new ItemStack(mat);
}
}
}

@SuppressWarnings("deprecation")
public ItemFactory damage(short damage) {
stack.setDurability(damage);
if (Sounds.version >= 113) {
ItemMeta meta = stack.getItemMeta();
if (meta instanceof org.bukkit.inventory.meta.Damageable) {
((org.bukkit.inventory.meta.Damageable) meta).setDamage(damage);
stack.setItemMeta(meta);
}
} else {
stack.setDurability(damage);
}
return this;
}

Expand Down
Loading