This commit is contained in:
cyberpwn
2021-08-24 22:28:33 -04:00
parent 432e95e4ec
commit 8df789ae34
84 changed files with 404 additions and 786 deletions

View File

@@ -21,7 +21,6 @@ package com.volmit.iris.util.data;
import com.volmit.iris.Iris;
import com.volmit.iris.core.IrisSettings;
import com.volmit.iris.util.collection.KList;
import com.volmit.iris.util.collection.KMap;
import com.volmit.iris.util.scheduling.ChronoLatch;
import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
import it.unimi.dsi.fastutil.ints.IntSet;
@@ -284,8 +283,7 @@ public class B {
return Material.valueOf(bdx.trim().toUpperCase());
} catch (Throwable e) {
Iris.reportError(e);
if(clw.flip())
{
if (clw.flip()) {
Iris.warn("Unknown Material: " + bdx);
}
return null;
@@ -295,8 +293,7 @@ public class B {
public static Material getMaterial(String bdx) {
Material m = getMaterialOrNull(bdx);
if(m == null)
{
if (m == null) {
return AIR_MATERIAL;
}
@@ -313,8 +310,7 @@ public class B {
BlockData bdx = parseBlockData(bd);
if (bdx == null) {
if(clw.flip())
{
if (clw.flip()) {
Iris.warn("Unknown Block Data '" + bd + "'");
}
return AIR;
@@ -324,8 +320,7 @@ public class B {
} catch (Throwable e) {
Iris.reportError(e);
if(clw.flip())
{
if (clw.flip()) {
Iris.warn("Unknown Block Data '" + bdxf + "'");
}
}
@@ -363,8 +358,7 @@ public class B {
return bx;
} catch (Throwable e) {
if(clw.flip())
{
if (clw.flip()) {
Iris.warn("Unknown Block Data: " + ix);
}

View File

@@ -20,11 +20,9 @@ package com.volmit.iris.util.data;
import com.volmit.iris.Iris;
import com.volmit.iris.core.service.StudioSVC;
import com.volmit.iris.util.collection.KList;
import com.volmit.iris.util.format.Form;
import com.volmit.iris.util.plugin.VolmitSender;
import com.volmit.iris.util.scheduling.jobs.DownloadJob;
import com.volmit.iris.util.scheduling.jobs.Job;
import com.volmit.iris.util.scheduling.jobs.JobCollection;
import com.volmit.iris.util.scheduling.jobs.SingleJob;
import lombok.Builder;
@@ -111,8 +109,7 @@ public class IrisPackRepository {
public void install(VolmitSender sender) throws MalformedURLException {
File pack = Iris.instance.getDataFolder(StudioSVC.WORKSPACE_NAME, getRepo());
if(!pack.exists())
{
if (!pack.exists()) {
File dl = new File(Iris.getTemp(), "dltk-" + UUID.randomUUID() + ".zip");
File work = new File(Iris.getTemp(), "extk-" + UUID.randomUUID());
new JobCollection(Form.capitalize(getRepo()),