Release 1.3.1 (#45)

Author: rainbowdashlabs

.github/workflows/javadocs.yml

@@ -25,7 +25,7 @@ jobs:
           echo "Creating .nojekyll to have Github pages deploy html as is:"
           touch .nojekyll
       - name: Deploy
-        uses: JamesIves/github-pages-deploy-action@v4.4.1
+        uses: JamesIves/github-pages-deploy-action@v4
         with:
           branch: gh-pages # The branch the action should deploy to.
           folder: build/docs/javadoc # The folder the action should deploy.

build.gradle.kts

@@ -5,11 +5,11 @@ plugins {
     `maven-publish`
     `java-library`
     id("de.chojo.publishdata") version "1.2.4"
-    id("com.diffplug.spotless") version "6.18.0"
+    id("com.diffplug.spotless") version "6.19.0"
 }
 
 group = "de.chojo.universalis"
-version = "1.3.0"
+version = "1.3.1"
 
 repositories {
     maven("https://eldonexus.de/repository/maven-public")

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -130,10 +130,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.

gradlew

@@ -1,5 +1,5 @@
 dependencies {
-    api("com.fasterxml.jackson.core", "jackson-databind", "2.15.0")
+    api("com.fasterxml.jackson.core", "jackson-databind", "2.15.2")
     // Logging
     api("org.slf4j", "slf4j-api", "2.0.7")
 

universalis-core/build.gradle.kts

@@ -0,0 +1,11 @@
+/*
+ *     SPDX-License-Identifier: AGPL-3.0-only
+ *
+ *     Copyright (C) Rainbowdashlabs and Contributor
+ */
+
+package de.chojo.universalis.entities;
+
+public enum Language {
+    ENGLISH, GERMAN, FRENCH, JAPANESE
+}

universalis-core/src/main/java/de/chojo/universalis/entities/Language.java

@@ -30,4 +30,13 @@ public record Name(@JsonProperty("en") String english,
     public static Name empty() {
         return EMPTY;
     }
+
+    public String get(Language language) {
+        return switch (language) {
+            case ENGLISH -> english;
+            case GERMAN -> german;
+            case FRENCH -> french;
+            case JAPANESE -> japanese;
+        };
+    }
 }

universalis-core/src/main/java/de/chojo/universalis/entities/Name.java

@@ -6,9 +6,11 @@
 
 package de.chojo.universalis.provider;
 
+import de.chojo.universalis.entities.Language;
 import de.chojo.universalis.entities.Name;
 
 import java.util.Collections;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Optional;
 
@@ -22,11 +24,6 @@ public Name fromId(int id) {
             return new Name("", "", "", "");
         }
 
-        @Override
-        public Optional<Integer> fromName(String name) {
-            return Optional.empty();
-        }
-
         @Override
         public Map<Integer, Name> ids() {
             return Collections.emptyMap();
@@ -53,18 +50,33 @@ public Map<String, Integer> jp() {
         }
     };
 
-    /**
-     * Returns the name based on an id
-     *
-     * @param id id
-     * @return name
-     */
-    Name fromId(int id);
+    default Name fromId(int id) {
+        return ids().get(id);
+    }
 
-    Optional<Integer> fromName(String name);
+    default Optional<Integer> fromName(String name) {
+        for (Language lang : Language.values()) {
+            Optional<Integer> id = fromName(lang, name);
+            if (id.isPresent()) return id;
+        }
+        return Optional.empty();
+    }
+
+    default Optional<Integer> fromName(Language language, String name) {
+        return Optional.ofNullable(languageMap(language).get(name.toLowerCase(Locale.ROOT)));
+    }
 
     Map<Integer, Name> ids();
 
+    default Map<String, Integer> languageMap(Language language) {
+        return switch (language) {
+            case ENGLISH -> en();
+            case GERMAN -> de();
+            case FRENCH -> fr();
+            case JAPANESE -> jp();
+        };
+    }
+
     Map<String, Integer> en();
 
     Map<String, Integer> de();

universalis-core/src/main/java/de/chojo/universalis/provider/NameSupplier.java

@@ -17,10 +17,8 @@
 import java.net.http.HttpResponse;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Locale;
 import java.util.Map;
-import java.util.Optional;
 
 /**
  * A class which is able to act as a {@link NameSupplier} for items
@@ -68,21 +66,6 @@ public static Items create() throws IOException, InterruptedException {
         return new Items(idNames);
     }
 
-    @Override
-    public Name fromId(int id) {
-        return ids.get(id);
-    }
-
-    @Override
-    public Optional<Integer> fromName(String name) {
-        for (var map : List.of(en, de, fr, jp)) {
-            if (map.containsKey(name.toLowerCase(Locale.ROOT))) {
-                return Optional.ofNullable(map.get(name.toLowerCase(Locale.ROOT)));
-            }
-        }
-        return Optional.empty();
-    }
-
     @Override
     public Map<Integer, Name> ids() {
         return Collections.unmodifiableMap(ids);