mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-07-18 10:12:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Daniel Mills 2021-08-08 06:26:02 -04:00
commit 2ffd1e6e47
1 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/main/java/com/volmit/iris/engine/object/compat/IrisCompat.java
View File

@ -30,6 +30,7 @@ import org.bukkit.Material;
import org.bukkit.block.data.BlockData;
import java.io.File;
import java.io.IOException;
@Data
public class IrisCompat {
@ -154,23 +155,33 @@ public class IrisCompat {
String defa = new JSONObject(new Gson().toJson(def)).toString(4);
J.attemptAsync(() -> IO.writeAll(new File(f.getParentFile(), "compat.default.json"), defa));
if (!f.exists()) {
J.attemptAsync(() -> IO.writeAll(f, defa));
}
J.a(() -> {
try {
IO.writeAll(f, defa);
} catch (IOException e) {
Iris.error("Failed to write to compat file");
Iris.reportError(e);
}
});
} else {
// If the file doesn't exist, no additional mappings are present outside default
// so we shouldn't try getting them
try {
IrisCompat rea = new Gson().fromJson(IO.readAll(f), IrisCompat.class);
try {
IrisCompat rea = new Gson().fromJson(IO.readAll(f), IrisCompat.class);
for (IrisCompatabilityBlockFilter i : rea.getBlockFilters()) {
def.getBlockFilters().add(i);
}
for (IrisCompatabilityBlockFilter i : rea.getBlockFilters()) {
def.getBlockFilters().add(i);
for (IrisCompatabilityItemFilter i : rea.getItemFilters()) {
def.getItemFilters().add(i);
}
} catch (Throwable e) {
e.printStackTrace();
Iris.reportError(e);
}
for (IrisCompatabilityItemFilter i : rea.getItemFilters()) {
def.getItemFilters().add(i);
}
} catch (Throwable e) {
e.printStackTrace();
Iris.reportError(e);
}
return def;