Update anvilgui in pom.xml and make a shading relocation for it

This commit is contained in:
SeanOMik 2021-12-12 19:54:31 -05:00
parent b3dbca4b21
commit 9beef25970
5 changed files with 95 additions and 12 deletions

View File

@ -6,12 +6,78 @@
<sourceOutputDir name="target/generated-sources/annotations" /> <sourceOutputDir name="target/generated-sources/annotations" />
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" /> <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
<outputRelativeToContentRoot value="true" /> <outputRelativeToContentRoot value="true" />
<module name="anvilgui-1_17_R1" />
<module name="anvilgui-1_14_4_R1" />
<module name="tamablefoxes-util" />
<module name="anvilgui-1_15_R1" />
<module name="anvilgui-1_7_R4" />
<module name="anvilgui-abstraction" />
<module name="tamablefoxes_v1_18_1_R1" />
<module name="anvilgui-1_9_R2" />
<module name="anvilgui-1_9_R1" />
<module name="tamablefoxes_v1_16_R3" />
<module name="anvilgui-1_11_R1" />
<module name="tamablefoxes_v1_16_R2" />
<module name="tamablefoxes_v1_14_R1" />
<module name="tamablefoxes_v1_16_R1" />
<module name="tamablefoxes" />
<module name="anvilgui-1_13_R1" />
<module name="anvilgui-1_13_R2" />
<module name="energeticstorage" /> <module name="energeticstorage" />
<module name="anvilgui-1_16_R1" />
<module name="anvilgui-1_16_R2" />
<module name="anvilgui-1_16_R3" />
<module name="anvilgui-1_14_R1" />
<module name="tamablefoxes_v1_17_1_R1" />
<module name="anvilgui-1_8_R3" />
<module name="anvilgui-1_8_R2" />
<module name="anvilgui-1_8_R1" />
<module name="tamablefoxes_v1_15_R1" />
<module name="anvilgui" />
<module name="anvilgui-1_10_R1" />
<module name="anvilgui-1_12_R1" />
<module name="tamablefoxes_v1_17_R1" />
<module name="tamablefoxes_v1_17_R1 (1)" />
</profile> </profile>
</annotationProcessing> </annotationProcessing>
<bytecodeTargetLevel> <bytecodeTargetLevel>
<module name="EnergeticStorage" target="1.8" /> <module name="anvilgui" target="1.8" />
<module name="anvilgui-1_10_R1" target="1.8" />
<module name="anvilgui-1_11_R1" target="1.8" />
<module name="anvilgui-1_12_R1" target="1.8" />
<module name="anvilgui-1_13_R1" target="1.8" />
<module name="anvilgui-1_13_R2" target="1.8" />
<module name="anvilgui-1_14_4_R1" target="1.8" />
<module name="anvilgui-1_14_R1" target="1.8" />
<module name="anvilgui-1_15_R1" target="1.8" />
<module name="anvilgui-1_16_R1" target="1.8" />
<module name="anvilgui-1_16_R2" target="1.8" />
<module name="anvilgui-1_16_R3" target="1.8" />
<module name="anvilgui-1_17_R1" target="1.8" />
<module name="anvilgui-1_7_R4" target="1.8" />
<module name="anvilgui-1_8_R1" target="1.8" />
<module name="anvilgui-1_8_R2" target="1.8" />
<module name="anvilgui-1_8_R3" target="1.8" />
<module name="anvilgui-1_9_R1" target="1.8" />
<module name="anvilgui-1_9_R2" target="1.8" />
<module name="anvilgui-abstraction" target="1.8" />
<module name="anvilgui-parent" target="1.5" />
<module name="energeticstorage" target="1.8" /> <module name="energeticstorage" target="1.8" />
</bytecodeTargetLevel> </bytecodeTargetLevel>
</component> </component>
<component name="JavacSettings">
<option name="ADDITIONAL_OPTIONS_OVERRIDE">
<module name="tamablefoxes" options="-parameters" />
<module name="tamablefoxes-util" options="-parameters" />
<module name="tamablefoxes_v1_14_R1" options="-parameters" />
<module name="tamablefoxes_v1_15_R1" options="-parameters" />
<module name="tamablefoxes_v1_16_R1" options="-parameters" />
<module name="tamablefoxes_v1_16_R2" options="-parameters" />
<module name="tamablefoxes_v1_16_R3" options="-parameters" />
<module name="tamablefoxes_v1_17_1_R1" options="-parameters" />
<module name="tamablefoxes_v1_17_R1" options="-parameters" />
<module name="tamablefoxes_v1_17_R1 (1)" options="-parameters" />
<module name="tamablefoxes_v1_18_1_R1" options="-parameters" />
</option>
</component>
</project> </project>

View File

@ -46,5 +46,10 @@
<option name="name" value="apache.snapshots" /> <option name="name" value="apache.snapshots" />
<option name="url" value="https://repository.apache.org/snapshots/" /> <option name="url" value="https://repository.apache.org/snapshots/" />
</remote-repository> </remote-repository>
<remote-repository>
<option name="id" value="minecraft-repo" />
<option name="name" value="minecraft-repo" />
<option name="url" value="https://libraries.minecraft.net/" />
</remote-repository>
</component> </component>
</project> </project>

View File

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RunConfigurationProducerService">
<option name="ignoredProducers">
<set>
<option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
</set>
</option>
</component>
</project>

View File

@ -38,8 +38,12 @@
<pattern>de.tr7zw.changeme.nbtapi</pattern> <pattern>de.tr7zw.changeme.nbtapi</pattern>
<shadedPattern>de.tr7zw.nbtapi.energeticstorage</shadedPattern> <shadedPattern>de.tr7zw.nbtapi.energeticstorage</shadedPattern>
</relocation> </relocation>
<relocation>
<pattern>net.wesjd.anvilgui</pattern>
<shadedPattern>net.seanomik.energeticstorage.anvilgui</shadedPattern>
</relocation>
</relocations> </relocations>
<outputFile>D:\Code\java\spigotPlugins\servers\${server.version}\plugins\EnergeticStorage-v${project.version}.jar</outputFile> <outputFile>C:\Development\Java\Spigot Servers\${server.version}\plugins\EnergeticStorage-v${project.version}.jar</outputFile>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
@ -74,7 +78,7 @@
<dependency> <dependency>
<groupId>org.spigotmc</groupId> <groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId> <artifactId>spigot-api</artifactId>
<version>1.18.1-R0.1-SNAPSHOT</version> <version>1.14-R0.1-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
</dependencies> </dependencies>

16
pom.xml
View File

@ -46,9 +46,13 @@
<pattern>de.tr7zw.changeme.nbtapi</pattern> <pattern>de.tr7zw.changeme.nbtapi</pattern>
<shadedPattern>de.tr7zw.nbtapi.energeticstorage</shadedPattern> <shadedPattern>de.tr7zw.nbtapi.energeticstorage</shadedPattern>
</relocation> </relocation>
<relocation>
<pattern>net.wesjd.anvilgui</pattern>
<shadedPattern>net.seanomik.energeticstorage.anvilgui</shadedPattern>
</relocation>
</relocations> </relocations>
<outputFile>D:\Code\java\spigotPlugins\servers\${server.version}\plugins\EnergeticStorage-v${project.version}.jar</outputFile> <outputFile>C:\Development\Java\Spigot Servers\${server.version}\plugins\EnergeticStorage-v${project.version}.jar</outputFile>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
@ -84,10 +88,6 @@
<url>https://repo.codemc.org/repository/maven-public/</url> <url>https://repo.codemc.org/repository/maven-public/</url>
<layout>default</layout> <layout>default</layout>
</repository> </repository>
<!--<repository>
<id>codemc-snapshots</id>
<url>https://repo.codemc.io/repository/maven-snapshots/</url>
</repository>-->
<repository> <repository>
<id>minecraft-repo</id> <id>minecraft-repo</id>
<url>https://libraries.minecraft.net/</url> <url>https://libraries.minecraft.net/</url>
@ -99,7 +99,7 @@
<dependency> <dependency>
<groupId>org.spigotmc</groupId> <groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId> <artifactId>spigot-api</artifactId>
<version>1.18.1-R0.1-SNAPSHOT</version> <version>1.14-R0.1-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -107,12 +107,10 @@
<artifactId>item-nbt-api</artifactId> <artifactId>item-nbt-api</artifactId>
<version>2.9.0-SNAPSHOT</version> <version>2.9.0-SNAPSHOT</version>
</dependency> </dependency>
<!-- This is currently compiled by myself with some fixes for anything older than Java 16.
Its compiled from SeanOMik/AnvilGUI on github -->
<dependency> <dependency>
<groupId>net.wesjd</groupId> <groupId>net.wesjd</groupId>
<artifactId>anvilgui</artifactId> <artifactId>anvilgui</artifactId>
<version>1.5.1-SNAPSHOT</version> <version>1.5.3-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.googlecode.json-simple</groupId> <groupId>com.googlecode.json-simple</groupId>