From cf7245c915599f445497a23a62c6ca1493a4220a Mon Sep 17 00:00:00 2001
From: JFronny <git@akbvopenfl1.hopto.org>
Date: Fri, 14 Jun 2024 10:56:28 +0200
Subject: [PATCH] fix: use Identifier.of in new code

---
 .../gitlab/jfronny/respackopts/filters/ValidationLayer.java   | 4 ++--
 .../jfronny/respackopts/gson/entry/StringEntrySerializer.java | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/io/gitlab/jfronny/respackopts/filters/ValidationLayer.java b/src/main/java/io/gitlab/jfronny/respackopts/filters/ValidationLayer.java
index 7d2c82b..8324a5d 100644
--- a/src/main/java/io/gitlab/jfronny/respackopts/filters/ValidationLayer.java
+++ b/src/main/java/io/gitlab/jfronny/respackopts/filters/ValidationLayer.java
@@ -67,12 +67,12 @@ public class ValidationLayer {
             if (isPermittedWithoutScan(pack, name)) return true;
             if (name.equals(Respackopts.ID + ".json5")) return true;
             for (ResourceType value : ResourceType.values()) {
-                if (name.equals(new ResourcePath(value, new Identifier(Respackopts.ID, "conf.json")).getName())) {
+                if (name.equals(new ResourcePath(value, Identifier.of(Respackopts.ID, "conf.json")).getName())) {
                     return true;
                 }
             }
             for (String namespace : pack.getNamespaces(ResourceType.CLIENT_RESOURCES)) {
-                if (name.equals(new ResourcePath(ResourceType.CLIENT_RESOURCES, new Identifier(namespace, "lang/en_us.json")).getName())) {
+                if (name.equals(new ResourcePath(ResourceType.CLIENT_RESOURCES, Identifier.of(namespace, "lang/en_us.json")).getName())) {
                     return true;
                 }
             }
diff --git a/src/main/java/io/gitlab/jfronny/respackopts/gson/entry/StringEntrySerializer.java b/src/main/java/io/gitlab/jfronny/respackopts/gson/entry/StringEntrySerializer.java
index 6de3f20..633f922 100644
--- a/src/main/java/io/gitlab/jfronny/respackopts/gson/entry/StringEntrySerializer.java
+++ b/src/main/java/io/gitlab/jfronny/respackopts/gson/entry/StringEntrySerializer.java
@@ -18,12 +18,12 @@ public class StringEntrySerializer extends TypeAdapter<ConfigStringEntry> {
     public static final Set<String> TYPES = Set.of("string", "text");
 
     @Override
-    public <TEx extends Exception, Writer extends SerializeWriter<TEx, Writer>> void serialize(ConfigStringEntry configBooleanEntry, Writer writer) throws TEx, MalformedDataException {
+    public <TEx extends Exception, Writer extends SerializeWriter<TEx, ?>> void serialize(ConfigStringEntry configBooleanEntry, Writer writer) throws TEx, MalformedDataException {
         writer.value(configBooleanEntry.getValue());
     }
 
     @Override
-    public <TEx extends Exception, Reader extends SerializeReader<TEx, Reader>> ConfigStringEntry deserialize(Reader reader) throws TEx, MalformedDataException {
+    public <TEx extends Exception, Reader extends SerializeReader<TEx, ?>> ConfigStringEntry deserialize(Reader reader) throws TEx, MalformedDataException {
         if (reader.peek() == Token.BEGIN_OBJECT) {
             reader.beginObject();
             ConfigStringEntry result = new ConfigStringEntry("");