JfMods/Respackopts
JfMods/Respackopts
1
1
Fork 0
Code Issues 4 Pull Requests Projects Releases Wiki Activity

fix: use Identifier.of in new code
All checks were successful
ci/woodpecker/push/docs Pipeline was successful
Details
ci/woodpecker/push/jfmod Pipeline was successful
Details
ci/woodpecker/tag/docs Pipeline was successful
Details
ci/woodpecker/tag/jfmod Pipeline was successful
Details

Browse Source
This commit is contained in:
Johannes Frohnmeyer 2024-06-14 10:56:28 +02:00
parent 7ec7604dd1
commit cf7245c915
Signed by: Johannes
GPG Key ID: E76429612C2929F4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/io/gitlab/jfronny/respackopts/filters/ValidationLayer.java
View File

@ -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;
}
}

4
src/main/java/io/gitlab/jfronny/respackopts/gson/entry/StringEntrySerializer.java
View File

@ -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("");