mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2026-04-14 11:46:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix tiles & decor

Browse Source
This commit is contained in:
Daniel Mills
2020-08-21 23:50:07 -04:00
parent 83772bed42
commit ccc7a947cd
13 changed files with 266 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/volmit/iris/util/ObjectResourceLoader.java
View File

@@ -74,7 +74,7 @@ public class ObjectResourceLoader extends ResourceLoader<IrisObject>
useCache.remove(v);
loadCache.remove(v);
lock.unlock();
Iris.info("Unloaded Object: " + v);
J.a(() -> Iris.verbose("Unloaded Object: " + v));
}
public IrisObject loadFile(File j, String key, String name)
@@ -86,7 +86,7 @@ public class ObjectResourceLoader extends ResourceLoader<IrisObject>
t.read(j);
loadCache.put(key, t);
Iris.hotloader.track(j);
Iris.info("Loading " + resourceTypeName + ": " + j.getPath());
J.a(() -> Iris.verbose("Loading " + resourceTypeName + ": " + j.getPath()));
t.setLoadKey(name);
lock.unlock();
return t;

6
src/main/java/com/volmit/iris/util/ResourceLoader.java
View File

@@ -84,7 +84,7 @@ public class ResourceLoader<T extends IrisRegistrant>
T t = new Gson().fromJson(IO.readAll(j), objectClass);
loadCache.put(key, t);
Iris.hotloader.track(j);
Iris.info("Loading " + resourceTypeName + ": " + j.getPath());
J.a(() -> Iris.verbose("Loading " + resourceTypeName + ": " + j.getPath()));
t.setLoadKey(name);
t.setLoadFile(j);
lock.unlock();
@@ -94,7 +94,7 @@ public class ResourceLoader<T extends IrisRegistrant>
catch(Throwable e)
{
lock.unlock();
Iris.warn("Couldn't read " + resourceTypeName + " file: " + j.getPath() + ": " + e.getMessage());
J.a(() -> Iris.warn("Couldn't read " + resourceTypeName + " file: " + j.getPath() + ": " + e.getMessage()));
return null;
}
}
@@ -128,7 +128,7 @@ public class ResourceLoader<T extends IrisRegistrant>
}
}
Iris.warn("Couldn't find " + resourceTypeName + ": " + name);
J.a(() -> Iris.warn("Couldn't find " + resourceTypeName + ": " + name));
lock.unlock();
return null;