Fixed Server crashes accessing minecraft instance, closes #479

InnovativeOnlineIndustries · Dec 22, 2018 · 56da364 · 56da364
1 parent e7a12f5
commit 56da364
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,7 +1,7 @@
 # Sets default memory used for gradle commands. Can be overridden by user or command line properties.
 # This is required to provide enough memory for the Minecraft decompilation process.
 org.gradle.jvmargs=-Xmx3G
-mod_version=1.12.1
+mod_version=1.12.2
 minecraft_version=1.12.2
 teslacorelib_version=1.0.15.+
 teslacorelib_mc_version=1.12.2

diff --git a/src/main/java/com/buuz135/industrial/api/recipe/LaserDrillEntry.java b/src/main/java/com/buuz135/industrial/api/recipe/LaserDrillEntry.java
@@ -26,7 +26,6 @@
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import com.google.gson.stream.JsonReader;
-import net.minecraft.client.Minecraft;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
@@ -90,7 +89,7 @@ public static void loadLaserConfigs(File configDir) {
             if (!Files.exists(l_path)) {
                 InputStream in = null;
                 try {
-                    in = Minecraft.getMinecraft().getResourceManager().getResource(l).getInputStream();
+                    in = LaserDrillEntry.class.getClassLoader().getResourceAsStream("assets" + "/" + l.getNamespace() + "/" + l.getPath());
                     OutputStream out = new FileOutputStream(l_path.toFile());
                     int read;
                     byte[] buffer = new byte[4096];