diff --git a/Assemble/pom.xml b/Assemble/pom.xml index 08d6dde..47f13bb 100644 --- a/Assemble/pom.xml +++ b/Assemble/pom.xml @@ -6,7 +6,7 @@ exposed.hydrogen.resources Resources - ${revision} + 1.0 Resources-all @@ -33,35 +33,6 @@ org.apache.maven.plugins maven-shade-plugin 3.3.1-SNAPSHOT - - true - - - exposed.hydrogen.resources:Core - - ** - - - - exposed.hydrogen.resources:Spigot - - ** - - - - exposed.hydrogen.resources:Minestom - - ** - - - - team.unnamed:creative-api - - ** - - - - package @@ -78,19 +49,19 @@ exposed.hydrogen.resources Core - ${revision} + 1.0 compile exposed.hydrogen.resources Spigot - ${revision} + 1.0 compile exposed.hydrogen.resources Minestom - ${revision} + 1.0 compile diff --git a/Core/pom.xml b/Core/pom.xml index 10b9253..25a1de9 100644 --- a/Core/pom.xml +++ b/Core/pom.xml @@ -3,12 +3,11 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - 1.0 exposed.hydrogen.resources Resources - ${revision} + 1.0 Resources-core diff --git a/Core/src/main/java/exposed/hydrogen/resources/ResourcePackHandler.java b/Core/src/main/java/exposed/hydrogen/resources/ResourcePackHandler.java index 2272ed4..86a5968 100644 --- a/Core/src/main/java/exposed/hydrogen/resources/ResourcePackHandler.java +++ b/Core/src/main/java/exposed/hydrogen/resources/ResourcePackHandler.java @@ -27,7 +27,7 @@ public class ResourcePackHandler { @Getter private byte[] hash; @Getter private final LinkedList resources; @Getter private final LinkedList metadataParts; - @Getter private String credits; + @Getter private String credits = ""; /** * Resource pack handler constructor, generates a empty resource pack. @@ -83,37 +83,37 @@ public void setResourcePack(ResourcePack resourcePack, boolean startServer) thro } } - public void addResource(FileResource resource) { + public void addResource(T resource) { addResource(resource, false); } - public void addResource(FileResource resource, boolean compile) { + public void addResource(T resource, boolean compile) { addResources(List.of(resource), compile); } - public void addMetadataPart(MetadataPart part) { + public void addMetadataPart(T part) { addMetadataPart(part,false); } - public void addMetadataPart(MetadataPart part, boolean compile) { + public void addMetadataPart(T part, boolean compile) { addMetadataParts(List.of(part), compile); } - public void addResources(List resources) { + public void addResources(List resources) { addResources(resources, false); } - public void addResources(List resources, boolean compile) { + public void addResources(List resources, boolean compile) { this.resources.addAll(resources); if(compile) compileAndSetResourcePack(); } - public void addMetadataParts(List parts) { + public void addMetadataParts(List parts) { addMetadataParts(parts, false); } - public void addMetadataParts(List parts, boolean compile) { + public void addMetadataParts(List parts, boolean compile) { metadataParts.addAll(parts); if(compile) compileAndSetResourcePack(); } public void addCredit(String credit) { - credits = credits.concat(credit).concat(System.lineSeparator()); + credits = credits + credit + System.lineSeparator(); } protected static void downloadResourcePack(URL url) throws IOException { diff --git a/Minestom/pom.xml b/Minestom/pom.xml index c9cad80..8f566a1 100644 --- a/Minestom/pom.xml +++ b/Minestom/pom.xml @@ -7,7 +7,7 @@ Resources exposed.hydrogen.resources - ${revision} + 1.0 Minestom @@ -34,7 +34,7 @@ exposed.hydrogen.resources Core - ${revision} + 1.0 provided diff --git a/Minestom/src/main/resources/META-INF/extension.json b/Minestom/src/main/resources/META-INF/extension.json index b62bd39..c1e7d65 100644 --- a/Minestom/src/main/resources/META-INF/extension.json +++ b/Minestom/src/main/resources/META-INF/extension.json @@ -1,5 +1,5 @@ { "entrypoint": "exposed.hydrogen.resources.ResourcesMinestom", "name": "Resources", - "version": "1.0.0" + "version": "1.1.0" } \ No newline at end of file diff --git a/Spigot/pom.xml b/Spigot/pom.xml index 66f9e1a..d931f17 100644 --- a/Spigot/pom.xml +++ b/Spigot/pom.xml @@ -7,7 +7,7 @@ exposed.hydrogen.resources Resources - ${revision} + 1.0 Resources-spigot @@ -30,7 +30,7 @@ exposed.hydrogen.resources Core - ${revision} + 1.0 provided diff --git a/Spigot/src/main/resources/plugin.yml b/Spigot/src/main/resources/plugin.yml index d14fa20..f5b722f 100644 --- a/Spigot/src/main/resources/plugin.yml +++ b/Spigot/src/main/resources/plugin.yml @@ -1,5 +1,5 @@ name: Resources -version: ${project.version} +version: 1.1.0 main: exposed.hydrogen.resources.ResourcesSpigot api-version: 1.18 load: STARTUP diff --git a/pom.xml b/pom.xml index 1f39a3d..852965f 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ exposed.hydrogen.resources Resources pom - ${revision} + 1.0 Core