RESTRICTOR_MODEL_CACHE = GTMemoizer
.memoizeFunctionWeakIdent(PipeModelBuilder::makeRestrictorModels);
private static BlockModelBuilder[] makeRestrictorModels(BlockModelProvider provider, float thickness) {
diff --git a/src/main/java/com/gregtechceu/gtceu/data/model/builder/package-info.java b/src/main/java/com/gregtechceu/gtceu/data/model/builder/package-info.java
new file mode 100644
index 00000000000..2f6102b3cd1
--- /dev/null
+++ b/src/main/java/com/gregtechceu/gtceu/data/model/builder/package-info.java
@@ -0,0 +1,4 @@
+@NotNullByDefault
+package com.gregtechceu.gtceu.data.model.builder;
+
+import org.jetbrains.annotations.NotNullByDefault;
diff --git a/src/main/java/com/gregtechceu/gtceu/utils/data/RuntimeExistingFileHelper.java b/src/main/java/com/gregtechceu/gtceu/utils/data/RuntimeExistingFileHelper.java
index e6e7c50d4c4..f2d04d3629d 100644
--- a/src/main/java/com/gregtechceu/gtceu/utils/data/RuntimeExistingFileHelper.java
+++ b/src/main/java/com/gregtechceu/gtceu/utils/data/RuntimeExistingFileHelper.java
@@ -12,7 +12,7 @@
import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap;
-import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import java.io.FileNotFoundException;
import java.util.Collections;
@@ -23,25 +23,41 @@
/**
* Existing file helper that wraps the client/server resource manager instead of creating its own.
* Useful for using data generators outside datagen.
+ *
+ * By default, this class assumes all resources exist and does not check any references' validity.
+ * To enable actual checking, you may use a try-with-resources statement like this:
+ *
+ *
{@code
+ * try (var helper = RuntimeExistingFileHelper.INSTANCE.activeHelper()) {
+ * // If you don't use a try-with-resources or try-finally block to
+ * // enable checking, calling `exists` will always return true.
+ * if (helper.exists(texture, GTBlockstateProvider.TEXTURE)) {
+ * // do stuff
+ * }
+ * }
+ * }
+ *
*/
@ParametersAreNonnullByDefault
@MethodsReturnNonnullByDefault
public class RuntimeExistingFileHelper extends ExistingFileHelper {
- public static final RuntimeExistingFileHelper INSTANCE = new RuntimeExistingFileHelper();
+ public static final RuntimeExistingFileHelper INSTANCE = new RuntimeExistingFileHelper(HashMultimap.create());
- protected final Multimap generated = HashMultimap.create();
+ protected final Multimap generated;
+ protected @Nullable Active activeHelper;
- protected RuntimeExistingFileHelper() {
+ protected RuntimeExistingFileHelper(Multimap generated) {
super(Collections.emptySet(), Collections.emptySet(), false, null, null);
+ this.generated = generated;
}
- public static @NotNull ResourceManager getManager(PackType packType) {
+ public static ResourceManager getManager(PackType packType) {
if (packType == PackType.CLIENT_RESOURCES) {
return Minecraft.getInstance().getResourceManager();
} else if (packType == PackType.SERVER_DATA) {
if (GTCEu.getMinecraftServer() == null) {
- throw new IllegalStateException("Cannot get server resources without a server or on a remote client.");
+ throw new IllegalStateException("Cannot get server resources without a server / on a remote client.");
}
return GTCEu.getMinecraftServer().getResourceManager();
} else {
@@ -53,11 +69,26 @@ protected ResourceLocation getLocation(ResourceLocation base, String prefix, Str
return base.withPath(path -> prefix + "/" + path + suffix);
}
+ public RuntimeExistingFileHelper.Active activeHelper() {
+ if (this.activeHelper == null) {
+ // pass the same generated resources map into the subclass
+ // so any resources added/checked by it are automatically updated here
+ this.activeHelper = new Active(this.generated);
+ }
+ return this.activeHelper;
+ }
+
+ /**
+ * Bypass the normal {@code exists} function so missing/invalid references etc. don't cause runtime errors.
+ * A toggle for enabling proper functionality is implemented in the form of {@link #activeHelper()}-
+ */
@Override
public boolean exists(ResourceLocation loc, PackType packType) {
- return generated.get(packType).contains(loc) || getManager(packType).getResource(loc).isPresent();
+ return true;
}
+ /// Implement a copy of the normal {@code exists} function that we can use for checking
+
@Override
public void trackGenerated(ResourceLocation loc, IResourceType type) {
trackGenerated(loc, type.getPackType(), type.getSuffix(), type.getPrefix());
@@ -83,4 +114,31 @@ public Resource getResource(ResourceLocation loc, PackType packType) throws File
public List getResourceStack(ResourceLocation loc, PackType packType) {
return getManager(packType).getResourceStack(loc);
}
+
+ /**
+ * This class implements {@link AutoCloseable} for ease of enabling actual checking when it is required.
+ *
+ * Note that it's safe to ignore "unclosed AutoCloseable"/{@code resource} warnings on this class, as is done in
+ * {@linkplain com.gregtechceu.gtceu.client.model.machine.overlays.WorkableOverlays#get WorkableOverlays#get}.
+ *
+ */
+ public static class Active extends RuntimeExistingFileHelper implements AutoCloseable {
+
+ protected Active(Multimap parentGenerated) {
+ super(parentGenerated);
+ }
+
+ @Override
+ public Active activeHelper() {
+ return this;
+ }
+
+ @Override
+ public boolean exists(ResourceLocation loc, PackType packType) {
+ return this.generated.get(packType).contains(loc) || getManager(packType).getResource(loc).isPresent();
+ }
+
+ @Override
+ public void close() {}
+ }
}