Fixed issue with oculus mod, removed resource pack caching

KubeJS-Mods · Dec 9, 2023 · 6600f28 · 6600f28
1 parent e2db3c9
commit 6600f28
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/common/src/main/java/dev/latvian/mods/kubejs/client/GeneratedClientResourcePack.java b/common/src/main/java/dev/latvian/mods/kubejs/client/GeneratedClientResourcePack.java
@@ -64,6 +64,7 @@ public static List<PackResources> inject(Minecraft client, List<PackResources> p
 	public GeneratedClientResourcePack(Minecraft client) {
 		super(PackType.CLIENT_RESOURCES);
 		this.client = client;
+		getGenerated();
 	}
 
 	@Override
@@ -152,7 +153,8 @@ public void generate(Map<ResourceLocation, GeneratedData> map) {
 
 	@Override
 	protected boolean forgetFile(String path) {
-		return path.endsWith(".png") || path.endsWith(".ogg");
+		// return path.endsWith(".png") || path.endsWith(".ogg");
+		return super.forgetFile(path);
 	}
 
 	@Override

diff --git a/common/src/main/java/dev/latvian/mods/kubejs/script/data/GeneratedResourcePack.java b/common/src/main/java/dev/latvian/mods/kubejs/script/data/GeneratedResourcePack.java
@@ -149,7 +149,7 @@ public Map<ResourceLocation, GeneratedData> getGenerated() {
 	}
 
 	protected boolean forgetFile(String path) {
-		return false;
+		return true;
 	}
 
 	protected boolean skipFile(GeneratedData data) {

diff --git a/common/src/main/java/dev/latvian/mods/kubejs/server/GeneratedServerResourcePack.java b/common/src/main/java/dev/latvian/mods/kubejs/server/GeneratedServerResourcePack.java
@@ -14,6 +14,7 @@
 public class GeneratedServerResourcePack extends GeneratedResourcePack {
 	public GeneratedServerResourcePack() {
 		super(PackType.SERVER_DATA);
+		getGenerated();
 	}
 
 	@Override
@@ -26,4 +27,10 @@ public void generate(Map<ResourceLocation, GeneratedData> map) {
 
 		KubeJSPlugins.forEachPlugin(generator, KubeJSPlugin::generateDataJsons);
 	}
+
+	@Override
+	protected boolean forgetFile(String path) {
+		// return path.endsWith(".png") || path.endsWith(".ogg");
+		return super.forgetFile(path);
+	}
 }