Skip to content
This repository was archived by the owner on Sep 9, 2024. It is now read-only.

Commit 19c75f6

Browse files
Puyodead1Puyodead1
committed
[v2.9.9-RC1] Update to RandomPackage 17.0.1 and Spigot 1.16.5
1 parent 037d600 commit 19c75f6

17 files changed

+1809
-2043
lines changed

‎.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,5 @@ bin/
44
.project
55
/target/
66
/.gradle/
7+
.idea/
8+
dependency-reduced-pom.xml

‎.travis.yml

-28
This file was deleted.

‎RPBookGUI.iml

+58
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
3+
<component name="FacetManager">
4+
<facet type="minecraft" name="Minecraft">
5+
<configuration>
6+
<autoDetectTypes>
7+
<platformType>SPIGOT</platformType>
8+
</autoDetectTypes>
9+
</configuration>
10+
</facet>
11+
</component>
12+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
13+
<output url="file://$MODULE_DIR$/target/classes" />
14+
<output-test url="file://$MODULE_DIR$/target/test-classes" />
15+
<content url="file://$MODULE_DIR$">
16+
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
17+
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
18+
<excludeFolder url="file://$MODULE_DIR$/target" />
19+
</content>
20+
<orderEntry type="inheritedJdk" />
21+
<orderEntry type="sourceFolder" forTests="false" />
22+
<orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot-api:1.16.5-R0.1-SNAPSHOT" level="project" />
23+
<orderEntry type="library" scope="PROVIDED" name="Maven: commons-lang:commons-lang:2.6" level="project" />
24+
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:21.0" level="project" />
25+
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.gson:gson:2.8.0" level="project" />
26+
<orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-chat:1.16-R0.4" level="project" />
27+
<orderEntry type="library" scope="PROVIDED" name="Maven: org.yaml:snakeyaml:1.27" level="project" />
28+
<orderEntry type="library" scope="PROVIDED" name="Maven: me.randomhashtags:randompackage:17.0.1" level="project" />
29+
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven.plugins:maven-antrun-plugin:maven-plugin:3.0.0" level="project" />
30+
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven:maven-plugin-api:3.0.5" level="project" />
31+
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven:maven-model:3.0.5" level="project" />
32+
<orderEntry type="library" scope="PROVIDED" name="Maven: org.sonatype.sisu:sisu-inject-plexus:2.3.0" level="project" />
33+
<orderEntry type="library" scope="PROVIDED" name="Maven: org.sonatype.sisu:sisu-inject-bean:2.3.0" level="project" />
34+
<orderEntry type="library" scope="PROVIDED" name="Maven: org.sonatype.sisu:sisu-guice:no_aop:3.1.0" level="project" />
35+
<orderEntry type="library" scope="PROVIDED" name="Maven: org.sonatype.sisu:sisu-guava:0.9.9" level="project" />
36+
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven:maven-core:3.0.5" level="project" />
37+
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven:maven-settings:3.0.5" level="project" />
38+
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven:maven-settings-builder:3.0.5" level="project" />
39+
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven:maven-repository-metadata:3.0.5" level="project" />
40+
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven:maven-model-builder:3.0.5" level="project" />
41+
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven:maven-aether-provider:3.0.5" level="project" />
42+
<orderEntry type="library" scope="PROVIDED" name="Maven: org.sonatype.aether:aether-spi:1.13.1" level="project" />
43+
<orderEntry type="library" scope="PROVIDED" name="Maven: org.sonatype.aether:aether-impl:1.13.1" level="project" />
44+
<orderEntry type="library" scope="PROVIDED" name="Maven: org.sonatype.aether:aether-api:1.13.1" level="project" />
45+
<orderEntry type="library" scope="PROVIDED" name="Maven: org.sonatype.aether:aether-util:1.13.1" level="project" />
46+
<orderEntry type="library" scope="PROVIDED" name="Maven: org.codehaus.plexus:plexus-interpolation:1.14" level="project" />
47+
<orderEntry type="library" scope="PROVIDED" name="Maven: org.codehaus.plexus:plexus-classworlds:2.4" level="project" />
48+
<orderEntry type="library" scope="PROVIDED" name="Maven: org.codehaus.plexus:plexus-component-annotations:1.5.5" level="project" />
49+
<orderEntry type="library" scope="PROVIDED" name="Maven: org.sonatype.plexus:plexus-sec-dispatcher:1.3" level="project" />
50+
<orderEntry type="library" scope="PROVIDED" name="Maven: org.sonatype.plexus:plexus-cipher:1.4" level="project" />
51+
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven:maven-artifact:3.0.5" level="project" />
52+
<orderEntry type="library" scope="PROVIDED" name="Maven: org.codehaus.plexus:plexus-utils:3.3.0" level="project" />
53+
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.ant:ant:1.9.14" level="project" />
54+
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.ant:ant-launcher:1.9.14" level="project" />
55+
<orderEntry type="library" name="Maven: org.bstats:bstats-bukkit:2.2.1" level="project" />
56+
<orderEntry type="library" name="Maven: org.bstats:bstats-base:2.2.1" level="project" />
57+
</component>
58+
</module>

‎pom.xml

+64-3
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@
55
<modelVersion>4.0.0</modelVersion>
66
<groupId>me.puyodead1</groupId>
77
<artifactId>RPBookGUI</artifactId>
8-
<version>2.9.8-rc6</version>
8+
<version>2.9.9-RC1</version>
99
<name>RPBookGUI</name>
10+
1011
<repositories>
1112
<repository>
1213
<id>spigot-repo</id>
@@ -22,16 +23,30 @@
2223
<dependency>
2324
<groupId>org.spigotmc</groupId>
2425
<artifactId>spigot-api</artifactId>
25-
<version>1.14.4-R0.1-SNAPSHOT</version>
26+
<version>1.16.5-R0.1-SNAPSHOT</version>
2627
<scope>provided</scope>
2728
</dependency>
2829
<dependency>
2930
<groupId>me.randomhashtags</groupId>
3031
<artifactId>randompackage</artifactId>
31-
<version>16.5.5</version>
32+
<version>17.0.1</version>
33+
<scope>provided</scope>
34+
</dependency>
35+
<dependency>
36+
<groupId>org.apache.maven.plugins</groupId>
37+
<artifactId>maven-antrun-plugin</artifactId>
38+
<version>3.0.0</version>
39+
<type>maven-plugin</type>
3240
<scope>provided</scope>
3341
</dependency>
42+
<dependency>
43+
<groupId>org.bstats</groupId>
44+
<artifactId>bstats-bukkit</artifactId>
45+
<version>2.2.1</version>
46+
<scope>compile</scope>
47+
</dependency>
3448
</dependencies>
49+
3550
<build>
3651
<sourceDirectory>src/main/java</sourceDirectory>
3752
<plugins>
@@ -43,6 +58,52 @@
4358
<target>1.8</target>
4459
</configuration>
4560
</plugin>
61+
<plugin>
62+
<groupId>org.apache.maven.plugins</groupId>
63+
<artifactId>maven-shade-plugin</artifactId>
64+
<version>3.1.0</version>
65+
<configuration>
66+
<relocations>
67+
<relocation>
68+
<pattern>org.bstats</pattern>
69+
<shadedPattern>io.github.puyodead1.rpbookgui.bstats</shadedPattern>
70+
</relocation>
71+
</relocations>
72+
</configuration>
73+
<executions>
74+
<execution>
75+
<phase>package</phase>
76+
<goals>
77+
<goal>shade</goal>
78+
</goals>
79+
</execution>
80+
</executions>
81+
</plugin>
82+
<plugin>
83+
<artifactId>maven-antrun-plugin</artifactId>
84+
<version>3.0.0</version>
85+
<executions>
86+
<execution>
87+
<phase>package</phase>
88+
<configuration>
89+
<target>
90+
<copy file="target/${project.name}-${project.version}.jar"
91+
toFile="C:\Users\23562\Desktop\Plugin Test Server\1.16.5\plugins\${project.name}-${project.version}.jar"/>
92+
</target>
93+
</configuration>
94+
<goals>
95+
<goal>run</goal>
96+
</goals>
97+
</execution>
98+
</executions>
99+
</plugin>
46100
</plugins>
101+
102+
<resources>
103+
<resource>
104+
<directory>src/main/resources</directory>
105+
<filtering>true</filtering>
106+
</resource>
107+
</resources>
47108
</build>
48109
</project>

‎src/main/java/io/github/puyodead1/rpbookgui/Inventories.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
******************************************************************************/
1616
package io.github.puyodead1.rpbookgui;
1717

18+
import me.randomhashtags.randompackage.RandomPackage;
19+
import me.randomhashtags.randompackage.RandomPackageAPI;
1820
import org.bukkit.Bukkit;
1921
import org.bukkit.inventory.Inventory;
2022
import org.bukkit.inventory.ItemStack;
@@ -75,7 +77,7 @@ public static Inventory rarityInventory(EnchantRarity rarity) {
7577
* @return inventory
7678
*/
7779
public static Inventory enchantInventory(CustomEnchant ce) {
78-
EnchantRarity rarity = RPStorage.valueOfEnchantRarity(ce);
80+
EnchantRarity rarity = RandomPackageAPI.INSTANCE.valueOfCustomEnchantRarity(ce);
7981
Inventory inv = Bukkit.createInventory(null, RPBookGUIUtils.toNineDenom(ce.getMaxLevel() + 1),
8082
rarity.getNameColors() + ce.getName());
8183
int x = 0;

0 commit comments

Comments
 (0)