bugfix + bump up version to 1.1.0

dev-hydrogen · May 6, 2022 · e08e398 · e08e398
1 parent 7a0e70e
commit e08e398
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 52 deletions.
diff --git a/Assemble/pom.xml b/Assemble/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>exposed.hydrogen.resources</groupId>
         <artifactId>Resources</artifactId>
-        <version>${revision}</version>
+        <version>1.0</version>
     </parent>
 
     <artifactId>Resources-all</artifactId>
@@ -33,35 +33,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
                 <version>3.3.1-SNAPSHOT</version>
-                <configuration>
-                    <minimizeJar>true</minimizeJar>
-                    <filters>
-                        <filter>
-                            <artifact>exposed.hydrogen.resources:Core</artifact>
-                            <includes>
-                                <include>**</include>
-                            </includes>
-                        </filter>
-                        <filter>
-                            <artifact>exposed.hydrogen.resources:Spigot</artifact>
-                            <includes>
-                                <include>**</include>
-                            </includes>
-                        </filter>
-                        <filter>
-                            <artifact>exposed.hydrogen.resources:Minestom</artifact>
-                            <includes>
-                                <include>**</include>
-                            </includes>
-                        </filter>
-                        <filter>
-                            <artifact>team.unnamed:creative-api</artifact>
-                            <includes>
-                                <include>**</include>
-                            </includes>
-                        </filter>
-                    </filters>
-                </configuration>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -78,19 +49,19 @@
         <dependency>
             <groupId>exposed.hydrogen.resources</groupId>
             <artifactId>Core</artifactId>
-            <version>${revision}</version>
+            <version>1.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>exposed.hydrogen.resources</groupId>
             <artifactId>Spigot</artifactId>
-            <version>${revision}</version>
+            <version>1.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>exposed.hydrogen.resources</groupId>
             <artifactId>Minestom</artifactId>
-            <version>${revision}</version>
+            <version>1.0</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

diff --git 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">
     <modelVersion>4.0.0</modelVersion>
-    <version>1.0</version>
 
     <parent>
         <groupId>exposed.hydrogen.resources</groupId>
         <artifactId>Resources</artifactId>
-        <version>${revision}</version>
+        <version>1.0</version>
     </parent>
 
     <name>Resources-core</name>

diff --git 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<FileResource> resources;
     @Getter private final LinkedList<MetadataPart> 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 <T extends FileResource> void addResource(T resource) {
         addResource(resource, false);
     }
-    public void addResource(FileResource resource, boolean compile) {
+    public <T extends FileResource> void addResource(T resource, boolean compile) {
         addResources(List.of(resource), compile);
     }
 
-    public void addMetadataPart(MetadataPart part) {
+    public <T extends MetadataPart> void addMetadataPart(T part) {
         addMetadataPart(part,false);
     }
-    public void addMetadataPart(MetadataPart part, boolean compile) {
+    public <T extends MetadataPart> void addMetadataPart(T part, boolean compile) {
         addMetadataParts(List.of(part), compile);
     }
 
-    public void addResources(List<FileResource> resources) {
+    public <T extends FileResource> void addResources(List<T> resources) {
         addResources(resources, false);
     }
-    public void addResources(List<FileResource> resources, boolean compile) {
+    public <T extends FileResource> void addResources(List<T> resources, boolean compile) {
         this.resources.addAll(resources);
         if(compile) compileAndSetResourcePack();
     }
 
-    public void addMetadataParts(List<MetadataPart> parts) {
+    public <T extends MetadataPart> void addMetadataParts(List<T> parts) {
         addMetadataParts(parts, false);
     }
-    public void addMetadataParts(List<MetadataPart> parts, boolean compile) {
+    public <T extends MetadataPart> void addMetadataParts(List<T> 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
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>Resources</artifactId>
         <groupId>exposed.hydrogen.resources</groupId>
-        <version>${revision}</version>
+        <version>1.0</version>
     </parent>
 
     <artifactId>Minestom</artifactId>
@@ -34,7 +34,7 @@
         <dependency>
             <groupId>exposed.hydrogen.resources</groupId>
             <artifactId>Core</artifactId>
-            <version>${revision}</version>
+            <version>1.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

diff --git 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"
 }
diff --git a/Spigot/pom.xml b/Spigot/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>exposed.hydrogen.resources</groupId>
         <artifactId>Resources</artifactId>
-        <version>${revision}</version>
+        <version>1.0</version>
     </parent>
 
     <name>Resources-spigot</name>
@@ -30,7 +30,7 @@
         <dependency>
             <groupId>exposed.hydrogen.resources</groupId>
             <artifactId>Core</artifactId>
-            <version>${revision}</version>
+            <version>1.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

diff --git 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
@@ -7,7 +7,7 @@
     <groupId>exposed.hydrogen.resources</groupId>
     <artifactId>Resources</artifactId>
     <packaging>pom</packaging>
-    <version>${revision}</version>
+    <version>1.0</version>
 
     <modules>
         <module>Core</module>