Skip to content

Commit 3021a8b

Browse files
SeanOMikSeanOMik
committed
Update for 1.17
1 parent d0cb987 commit 3021a8b

File tree

5 files changed

+33
-23
lines changed

5 files changed

+33
-23
lines changed

‎.idea/compiler.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/jarRepositories.xml

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dependency-reduced-pom.xml

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<groupId>net.seanomik</groupId>
55
<artifactId>energeticstorage</artifactId>
66
<name>EnergeticStorage</name>
7-
<version>0.4-SNAPSHOT</version>
7+
<version>0.7-SNAPSHOT</version>
88
<build>
99
<defaultGoal>clean package</defaultGoal>
1010
<resources>
@@ -24,7 +24,7 @@
2424
</plugin>
2525
<plugin>
2626
<artifactId>maven-shade-plugin</artifactId>
27-
<version>3.1.0</version>
27+
<version>3.3.0-SNAPSHOT</version>
2828
<executions>
2929
<execution>
3030
<id>shade</id>
@@ -39,6 +39,7 @@
3939
<shadedPattern>de.tr7zw.nbtapi.energeticstorage</shadedPattern>
4040
</relocation>
4141
</relocations>
42+
<outputFile>D:\Code\java\spigotPlugins\servers\${server.version}\plugins\EnergeticStorage-v${project.version}.jar</outputFile>
4243
</configuration>
4344
</execution>
4445
</executions>
@@ -59,10 +60,16 @@
5960
<url>https://repo.codemc.org/repository/maven-public/</url>
6061
</repository>
6162
<repository>
62-
<id>jitpack.io</id>
63-
<url>https://jitpack.io</url>
63+
<id>codemc-snapshots</id>
64+
<url>https://repo.codemc.io/repository/maven-snapshots/</url>
6465
</repository>
6566
</repositories>
67+
<pluginRepositories>
68+
<pluginRepository>
69+
<id>apache.snapshots</id>
70+
<url>https://repository.apache.org/snapshots/</url>
71+
</pluginRepository>
72+
</pluginRepositories>
6673
<dependencies>
6774
<dependency>
6875
<groupId>org.spigotmc</groupId>
@@ -74,6 +81,6 @@
7481
<properties>
7582
<java.version>1.8</java.version>
7683
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
84+
<server.version>1.17</server.version>
7785
</properties>
7886
</project>
79-

‎pom.xml

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,15 @@
66

77
<groupId>net.seanomik</groupId>
88
<artifactId>energeticstorage</artifactId>
9-
<version>0.6.1-SNAPSHOT</version>
9+
<version>0.7-SNAPSHOT</version>
1010
<packaging>jar</packaging>
1111

1212
<name>EnergeticStorage</name>
1313

1414
<properties>
1515
<java.version>1.8</java.version>
1616
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
17+
<server.version>1.17</server.version>
1718
</properties>
1819

1920
<build>
@@ -31,7 +32,7 @@
3132
<plugin>
3233
<groupId>org.apache.maven.plugins</groupId>
3334
<artifactId>maven-shade-plugin</artifactId>
34-
<version>3.1.0</version>
35+
<version>3.3.0-SNAPSHOT</version>
3536
<executions>
3637
<execution>
3738
<id>shade</id>
@@ -47,18 +48,7 @@
4748
</relocation>
4849
</relocations>
4950

50-
<!--<outputFile>D:\Code\java\spigotPlugins\_TEST_SERVER_1.14.4_\plugins\EnergeticStorage-v${project.version}.jar</outputFile>-->
51-
<!--<outputFile>D:\Code\java\spigotPlugins\_TEST_SERVER_1.15.2_\plugins\EnergeticStorage-v${project.version}.jar</outputFile>-->
52-
<!--<outputFile>D:\Code\java\spigotPlugins\_TEST_SERVER_1.16.1_\plugins\EnergeticStorage-v${project.version}.jar</outputFile>-->
53-
<!--<outputFile>D:\Code\java\spigotPlugins\_TEST_SERVER_1.16.2_\plugins\EnergeticStorage-v${project.version}.jar</outputFile>-->
54-
<!--<outputFile>D:\Code\java\spigotPlugins\_TEST_SERVER_1.16.3_\plugins\EnergeticStorage-v${project.version}.jar</outputFile>-->
55-
<!--<outputFile>D:\Code\java\spigotPlugins\_TEST_SERVER_1.16.4_\plugins\EnergeticStorage-v${project.version}.jar</outputFile>-->
56-
<outputFile>D:\Code\java\spigotPlugins\_TEST_SERVER_1.16.5_\plugins\EnergeticStorage-v${project.version}.jar</outputFile>
57-
<!--<outputFile>D:\Code\java\spigotPlugins\_TEST_SERVER_PAPER_1.16.1_\plugins\EnergeticStorage-v${project.version}.jar</outputFile>-->
58-
<!--<outputFile>D:\Code\java\spigotPlugins\_TEST_SERVER_PAPER_1.16.2_\plugins\EnergeticStorage-v${project.version}.jar</outputFile>-->
59-
<!--<outputFile>D:\Code\java\spigotPlugins\_TEST_SERVER_1.16.4_\plugins\EnergeticStorage-v${project.version}.jar</outputFile>-->
60-
<!--<outputFile>D:\Code\java\spigotPlugins\_TEST_SERVER_PAPER_1.16.4_\plugins\EnergeticStorage-v${project.version}.jar</outputFile>-->
61-
51+
<outputFile>D:\Code\java\spigotPlugins\servers\${server.version}\plugins\EnergeticStorage-v${project.version}.jar</outputFile>
6252
</configuration>
6353
</execution>
6454
</executions>
@@ -72,6 +62,14 @@
7262
</resources>
7363
</build>
7464

65+
<!-- For maven-shade-plugin 3.3.0-SNAPSHOT -->
66+
<pluginRepositories>
67+
<pluginRepository>
68+
<id>apache.snapshots</id>
69+
<url>https://repository.apache.org/snapshots/</url>
70+
</pluginRepository>
71+
</pluginRepositories>
72+
7573
<repositories>
7674
<repository>
7775
<id>spigotmc-repo</id>
@@ -102,12 +100,12 @@
102100
<dependency>
103101
<groupId>de.tr7zw</groupId>
104102
<artifactId>item-nbt-api</artifactId>
105-
<version>2.7.1</version>
103+
<version>2.8.0</version>
106104
</dependency>
107105
<dependency>
108106
<groupId>net.wesjd</groupId>
109107
<artifactId>anvilgui</artifactId>
110-
<version>1.5.0-SNAPSHOT</version>
108+
<version>1.5.1-SNAPSHOT</version>
111109
</dependency>
112110
<dependency>
113111
<groupId>com.googlecode.json-simple</groupId>

‎src/main/java/net/seanomik/energeticstorage/utils/Utils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ public static boolean isBlockASystem(Block block) {
136136
String version = Bukkit.getServer().getClass().getPackage().getName().split("\\.")[3];
137137

138138
NBTCompound ownerNBT;
139-
if (version.startsWith("v1_16")) {
139+
if (blockNBT.hasKey("SkullOwner")) {
140140
ownerNBT = blockNBT.getCompound("SkullOwner");
141141
} else {
142142
ownerNBT = blockNBT.getCompound("Owner");

0 commit comments

Comments
 (0)