aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/shcm/shsupercm/fabric/citresewn/cit
diff options
context:
space:
mode:
authorSHsuperCM <shsupercm@gmail.com>2022-06-10 08:57:05 +0300
committerSHsuperCM <shsupercm@gmail.com>2022-06-10 08:57:05 +0300
commit0935c49b8432f80350b4dd6c5a4d29e7626ccff7 (patch)
treecdea4d92ce25491a64d2cf8c9c43d9fb1c6144b3 /src/main/java/shcm/shsupercm/fabric/citresewn/cit
parentffa0e186440249e1657268d036ec3036974b9fe9 (diff)
downloadCITResewn-0935c49b8432f80350b4dd6c5a4d29e7626ccff7.tar.gz
CITResewn-0935c49b8432f80350b4dd6c5a4d29e7626ccff7.tar.bz2
CITResewn-0935c49b8432f80350b4dd6c5a4d29e7626ccff7.zip
Updated target version to 1.19
Using combined input from PRs #152 and #155 Thank you so much for your help @HarvelsX and @MeeniMc Co-Authored-By: MeeniMc <68366846+MeeniMC@users.noreply.github.com> Co-Authored-By: HarvelsX <90945793+harvelsx@users.noreply.github.com>
Diffstat (limited to 'src/main/java/shcm/shsupercm/fabric/citresewn/cit')
-rw-r--r--src/main/java/shcm/shsupercm/fabric/citresewn/cit/CITType.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/shcm/shsupercm/fabric/citresewn/cit/CITType.java b/src/main/java/shcm/shsupercm/fabric/citresewn/cit/CITType.java
index 65b3097..f540aa8 100644
--- a/src/main/java/shcm/shsupercm/fabric/citresewn/cit/CITType.java
+++ b/src/main/java/shcm/shsupercm/fabric/citresewn/cit/CITType.java
@@ -55,7 +55,7 @@ public abstract class CITType {
if (!path.endsWith(extension))
path = path + extension;
Identifier pathIdentifier = new Identifier(rootIdentifier.getNamespace(), path);
- return resourceManager.containsResource(pathIdentifier) ? pathIdentifier : null;
+ return resourceManager.getResource(pathIdentifier).isPresent() ? pathIdentifier: null;
}
Identifier pathIdentifier = new Identifier(path);
@@ -68,17 +68,17 @@ public abstract class CITType {
path = path.substring(2);
else if (!path.contains("..")) {
pathIdentifier = new Identifier(pathIdentifier.getNamespace(), path);
- if (resourceManager.containsResource(pathIdentifier))
+ if (resourceManager.getResource(pathIdentifier).isPresent())
return pathIdentifier;
else if (path.startsWith("assets/")) {
path = path.substring(7);
int sep = path.indexOf('/');
pathIdentifier = new Identifier(path.substring(0, sep), path.substring(sep + 1));
- if (resourceManager.containsResource(pathIdentifier))
+ if (resourceManager.getResource(pathIdentifier).isPresent())
return pathIdentifier;
}
pathIdentifier = new Identifier(pathIdentifier.getNamespace(), defaultedTypeDirectory + "/" + path);
- if (resourceManager.containsResource(pathIdentifier))
+ if (resourceManager.getResource(pathIdentifier).isPresent())
return pathIdentifier;
}
@@ -100,7 +100,7 @@ public abstract class CITType {
pathIdentifier = new Identifier(rootIdentifier.getNamespace(), path);
- return resourceManager.containsResource(pathIdentifier) ? pathIdentifier : null;
+ return resourceManager.getResource(pathIdentifier).isPresent() ? pathIdentifier : null;
}
public static Identifier resolveAsset(Identifier rootIdentifier, PropertyValue path, String defaultedTypeDirectory, String extension, ResourceManager resourceManager) {