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

Cleanup

Browse Source
This commit is contained in:
Daniel Mills
2021-07-16 02:25:35 -04:00
parent 22387b2610
commit 71140381e0
198 changed files with 1033 additions and 1146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/com/volmit/iris/engine/object/IrisBiome.java
View File

@@ -19,15 +19,15 @@
package com.volmit.iris.engine.object;
import com.volmit.iris.Iris;
import com.volmit.iris.engine.IrisComplex;
import com.volmit.iris.engine.data.B;
import com.volmit.iris.engine.noise.CNG;
import com.volmit.iris.core.IrisDataManager;
import com.volmit.iris.core.gui.RenderType;
import com.volmit.iris.engine.IrisComplex;
import com.volmit.iris.engine.cache.AtomicCache;
import com.volmit.iris.engine.data.B;
import com.volmit.iris.engine.data.DataProvider;
import com.volmit.iris.engine.framework.Engine;
import com.volmit.iris.engine.framework.IrisAccess;
import com.volmit.iris.engine.noise.CNG;
import com.volmit.iris.engine.object.annotations.*;
import com.volmit.iris.engine.object.common.IRare;
import com.volmit.iris.util.collection.KList;
@@ -405,7 +405,8 @@ public class IrisBiome extends IrisRegistrant implements IRare {
for (int j = 0; j < d; j++) {
try {
data.add(getLayers().get(i).get(random.nextParallelRNG(i + j), (wx + j) / layers.get(i).getZoom(), j, (wz - j) / layers.get(i).getZoom(), rdata));
} catch (Throwable e) {Iris.reportError(e);
} catch (Throwable e) {
Iris.reportError(e);
e.printStackTrace();
}
}
@@ -460,7 +461,8 @@ public class IrisBiome extends IrisRegistrant implements IRare {
try {
data.add(getSeaLayers().get(i).get(random.nextParallelRNG(i + j), (wx + j) / seaLayers.get(i).getZoom(), j, (wz - j) / seaLayers.get(i).getZoom(), rdata));
} catch (Throwable e) {Iris.reportError(e);
} catch (Throwable e) {
Iris.reportError(e);
e.printStackTrace();
}
}
@@ -643,8 +645,7 @@ public class IrisBiome extends IrisRegistrant implements IRare {
return cacheColorObjectDensity.aquire(() -> {
double density = 0;
for(IrisObjectPlacement i : getObjects())
{
for (IrisObjectPlacement i : getObjects()) {
density += i.getDensity() * i.getChance();
}
@@ -655,8 +656,7 @@ public class IrisBiome extends IrisRegistrant implements IRare {
return cacheColorDecoratorLoad.aquire(() -> {
double density = 0;
for(IrisDecorator i : getDecorators())
{
for (IrisDecorator i : getDecorators()) {
density += i.getChance() * Math.min(1, i.getStackMax()) * 256;
}

18
src/main/java/com/volmit/iris/engine/object/IrisBiomeCustom.java
View File

@@ -94,8 +94,7 @@ public class IrisBiomeCustom {
effects.put("water_color", parseColor(getWaterColor()));
effects.put("water_fog_color", parseColor(getWaterFogColor()));
if(ambientParticle != null)
{
if (ambientParticle != null) {
JSONObject particle = new JSONObject();
JSONObject po = new JSONObject();
po.put("type", ambientParticle.getParticle().name().toLowerCase());
@@ -128,18 +127,15 @@ public class IrisBiomeCustom {
j.put("carvers", new JSONObject());
j.put("features", new JSONArray());
if(spawnRarity > 0)
{
if (spawnRarity > 0) {
j.put("creature_spawn_probability", spawnRarity);
}
if(getSpawns() != null && getSpawns().isNotEmpty())
{
if (getSpawns() != null && getSpawns().isNotEmpty()) {
JSONObject spawners = new JSONObject();
KMap<IrisBiomeCustomSpawnType, JSONArray> groups = new KMap<>();
for(IrisBiomeCustomSpawn i : getSpawns())
{
for (IrisBiomeCustomSpawn i : getSpawns()) {
JSONArray g = groups.compute(i.getGroup(), (k, v) -> v != null ? v : new JSONArray());
JSONObject o = new JSONObject();
o.put("type", "minecraft:" + i.getType().name().toLowerCase());
@@ -149,8 +145,7 @@ public class IrisBiomeCustom {
g.put(o);
}
for(IrisBiomeCustomSpawnType i : groups.k())
{
for (IrisBiomeCustomSpawnType i : groups.k()) {
spawners.put(i.name().toLowerCase(Locale.ROOT), groups.get(i));
}
@@ -164,7 +159,8 @@ public class IrisBiomeCustom {
String v = (c.startsWith("#") ? c : "#" + c).trim();
try {
return Color.decode(v).getRGB();
} catch (Throwable e) {Iris.reportError(e);
} catch (Throwable e) {
Iris.reportError(e);
Iris.error("Error Parsing '''color''', (" + c + ")");
}

2
src/main/java/com/volmit/iris/engine/object/IrisBiomeGeneratorLink.java
View File

@@ -20,8 +20,8 @@ package com.volmit.iris.engine.object;
import com.volmit.iris.engine.cache.AtomicCache;
import com.volmit.iris.engine.data.DataProvider;
import com.volmit.iris.engine.object.annotations.*;
import com.volmit.iris.engine.interpolation.IrisInterpolation;
import com.volmit.iris.engine.object.annotations.*;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;

3
src/main/java/com/volmit/iris/engine/object/IrisBiomeMutation.java
View File

@@ -90,8 +90,7 @@ public class IrisBiomeMutation {
} else if (i.startsWith("!*")) {
String name = i.substring(2);
for(String g : xg.getData().getBiomeLoader().load(name).getAllChildren(xg, 7))
{
for (String g : xg.getData().getBiomeLoader().load(name).getAllChildren(xg, 7)) {
r.remove(g);
}
} else {

2
src/main/java/com/volmit/iris/engine/object/IrisBiomePaletteLayer.java
View File

@@ -18,9 +18,9 @@
package com.volmit.iris.engine.object;
import com.volmit.iris.engine.noise.CNG;
import com.volmit.iris.core.IrisDataManager;
import com.volmit.iris.engine.cache.AtomicCache;
import com.volmit.iris.engine.noise.CNG;
import com.volmit.iris.engine.object.annotations.*;
import com.volmit.iris.util.collection.KList;
import com.volmit.iris.util.math.RNG;

6
src/main/java/com/volmit/iris/engine/object/IrisBlockData.java
View File

@@ -200,13 +200,15 @@ public class IrisBlockData extends IrisRegistrant {
try {
return Integer.valueOf(string);
} catch (Throwable e) {Iris.reportError(e);
} catch (Throwable e) {
Iris.reportError(e);
}
try {
return Double.valueOf(string).intValue();
} catch (Throwable e) {Iris.reportError(e);
} catch (Throwable e) {
Iris.reportError(e);
}

4
src/main/java/com/volmit/iris/engine/object/IrisCarveLayer.java
View File

@@ -18,15 +18,15 @@
package com.volmit.iris.engine.object;
import com.volmit.iris.engine.noise.CNG;
import com.volmit.iris.engine.cache.AtomicCache;
import com.volmit.iris.engine.interpolation.IrisInterpolation;
import com.volmit.iris.engine.noise.CNG;
import com.volmit.iris.engine.object.annotations.Desc;
import com.volmit.iris.engine.object.annotations.MaxNumber;
import com.volmit.iris.engine.object.annotations.MinNumber;
import com.volmit.iris.engine.object.annotations.Required;
import com.volmit.iris.util.math.M;
import com.volmit.iris.util.math.RNG;
import com.volmit.iris.engine.interpolation.IrisInterpolation;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;

2
src/main/java/com/volmit/iris/engine/object/IrisDecorator.java
View File

@@ -19,9 +19,9 @@
package com.volmit.iris.engine.object;
import com.volmit.iris.Iris;
import com.volmit.iris.engine.noise.CNG;
import com.volmit.iris.core.IrisDataManager;
import com.volmit.iris.engine.cache.AtomicCache;
import com.volmit.iris.engine.noise.CNG;
import com.volmit.iris.engine.object.annotations.*;
import com.volmit.iris.util.collection.KList;
import com.volmit.iris.util.math.RNG;

8
src/main/java/com/volmit/iris/engine/object/IrisDimension.java
View File

@@ -19,10 +19,10 @@
package com.volmit.iris.engine.object;
import com.volmit.iris.Iris;
import com.volmit.iris.engine.noise.CNG;
import com.volmit.iris.core.IrisDataManager;
import com.volmit.iris.engine.cache.AtomicCache;
import com.volmit.iris.engine.data.DataProvider;
import com.volmit.iris.engine.noise.CNG;
import com.volmit.iris.engine.object.annotations.*;
import com.volmit.iris.util.collection.KList;
import com.volmit.iris.util.io.IO;
@@ -478,7 +478,8 @@ public class IrisDimension extends IrisRegistrant {
output.getParentFile().mkdirs();
try {
IO.writeAll(output, j.generateJson());
} catch (IOException e) {Iris.reportError(e);
} catch (IOException e) {
Iris.reportError(e);
e.printStackTrace();
}
}
@@ -496,7 +497,8 @@ public class IrisDimension extends IrisRegistrant {
}
}
""");
} catch (IOException e) {Iris.reportError(e);
} catch (IOException e) {
Iris.reportError(e);
e.printStackTrace();
}
Iris.verbose(" Installing Data Pack MCMeta: " + mcm.getPath());

3
src/main/java/com/volmit/iris/engine/object/IrisEffect.java
View File

@@ -193,7 +193,8 @@ public class IrisEffect {
return t;
}
}
} catch (Throwable e) {Iris.reportError(e);
} catch (Throwable e) {
Iris.reportError(e);
}

3
src/main/java/com/volmit/iris/engine/object/IrisEnchantment.java
View File

@@ -80,7 +80,8 @@ public class IrisEnchantment {
try {
return (Enchantment) i.get(null);
} catch (IllegalArgumentException | IllegalAccessException e) {
e.printStackTrace();Iris.reportError(e);
e.printStackTrace();
Iris.reportError(e);
}
}
}

2
src/main/java/com/volmit/iris/engine/object/IrisFeature.java
View File

@@ -20,11 +20,11 @@ package com.volmit.iris.engine.object;
import com.google.gson.Gson;
import com.volmit.iris.engine.cache.AtomicCache;
import com.volmit.iris.engine.interpolation.IrisInterpolation;
import com.volmit.iris.engine.object.annotations.Desc;
import com.volmit.iris.engine.object.annotations.MaxNumber;
import com.volmit.iris.engine.object.annotations.MinNumber;
import com.volmit.iris.engine.object.annotations.Required;
import com.volmit.iris.engine.interpolation.IrisInterpolation;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;

2
src/main/java/com/volmit/iris/engine/object/IrisFeaturePositional.java
View File

@@ -20,11 +20,11 @@ package com.volmit.iris.engine.object;
import com.google.gson.Gson;
import com.volmit.iris.engine.cache.AtomicCache;
import com.volmit.iris.engine.interpolation.IrisInterpolation;
import com.volmit.iris.engine.object.annotations.Desc;
import com.volmit.iris.engine.object.annotations.Required;
import com.volmit.iris.util.function.NoiseProvider;
import com.volmit.iris.util.math.M;
import com.volmit.iris.engine.interpolation.IrisInterpolation;
import lombok.Data;
import lombok.NoArgsConstructor;

2
src/main/java/com/volmit/iris/engine/object/IrisFeaturePotential.java
View File

@@ -20,8 +20,8 @@ package com.volmit.iris.engine.object;
import com.volmit.iris.engine.object.annotations.Desc;
import com.volmit.iris.engine.object.annotations.MinNumber;
import com.volmit.iris.util.math.RNG;
import com.volmit.iris.engine.object.annotations.Required;
import com.volmit.iris.util.math.RNG;
import lombok.Data;
@Data

4
src/main/java/com/volmit/iris/engine/object/IrisGenerator.java
View File

@@ -19,13 +19,13 @@
package com.volmit.iris.engine.object;
import com.volmit.iris.Iris;
import com.volmit.iris.engine.noise.CellGenerator;
import com.volmit.iris.engine.cache.AtomicCache;
import com.volmit.iris.engine.interpolation.IrisInterpolation;
import com.volmit.iris.engine.noise.CellGenerator;
import com.volmit.iris.engine.object.annotations.*;
import com.volmit.iris.engine.object.common.IRare;
import com.volmit.iris.util.collection.KList;
import com.volmit.iris.util.math.RNG;
import com.volmit.iris.engine.interpolation.IrisInterpolation;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;

2
src/main/java/com/volmit/iris/engine/object/IrisGeneratorStyle.java
View File

@@ -18,8 +18,8 @@
package com.volmit.iris.engine.object;
import com.volmit.iris.engine.noise.CNG;
import com.volmit.iris.engine.cache.AtomicCache;
import com.volmit.iris.engine.noise.CNG;
import com.volmit.iris.engine.object.annotations.Desc;
import com.volmit.iris.engine.object.annotations.MaxNumber;
import com.volmit.iris.engine.object.annotations.MinNumber;

2
src/main/java/com/volmit/iris/engine/object/IrisInterpolator.java
View File

@@ -18,12 +18,12 @@
package com.volmit.iris.engine.object;
import com.volmit.iris.engine.interpolation.IrisInterpolation;
import com.volmit.iris.engine.object.annotations.Desc;
import com.volmit.iris.engine.object.annotations.MaxNumber;
import com.volmit.iris.engine.object.annotations.MinNumber;
import com.volmit.iris.engine.object.annotations.Required;
import com.volmit.iris.util.function.NoiseProvider;
import com.volmit.iris.engine.interpolation.IrisInterpolation;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;

3
src/main/java/com/volmit/iris/engine/object/IrisJigsawPiece.java
View File

@@ -81,7 +81,8 @@ public class IrisJigsawPiece extends IrisRegistrant {
try {
BlockVector v = IrisObject.sampleSize(getLoader().getObjectLoader().findFile(getObject()));
return Math.max(Math.max(v.getBlockX(), v.getBlockZ()), v.getBlockY());
} catch (IOException e) {Iris.reportError(e);
} catch (IOException e) {
Iris.reportError(e);
e.printStackTrace();
}

8
src/main/java/com/volmit/iris/engine/object/IrisLoot.java
View File

@@ -19,9 +19,9 @@
package com.volmit.iris.engine.object;
import com.volmit.iris.Iris;
import com.volmit.iris.engine.cache.AtomicCache;
import com.volmit.iris.engine.data.B;
import com.volmit.iris.engine.noise.CNG;
import com.volmit.iris.engine.cache.AtomicCache;
import com.volmit.iris.engine.object.annotations.*;
import com.volmit.iris.util.collection.KList;
import com.volmit.iris.util.format.C;
@@ -190,7 +190,8 @@ public class IrisLoot {
is.setItemMeta(m);
return is;
} catch (Throwable e) {Iris.reportError(e);
} catch (Throwable e) {
Iris.reportError(e);
}
@@ -264,7 +265,8 @@ public class IrisLoot {
m.setLore(lore);
is.setItemMeta(m);
return is;
} catch (Throwable e) {Iris.reportError(e);
} catch (Throwable e) {
Iris.reportError(e);
}
}

2
src/main/java/com/volmit/iris/engine/object/IrisMaterialPalette.java
View File

@@ -18,9 +18,9 @@
package com.volmit.iris.engine.object;
import com.volmit.iris.engine.noise.CNG;
import com.volmit.iris.core.IrisDataManager;
import com.volmit.iris.engine.cache.AtomicCache;
import com.volmit.iris.engine.noise.CNG;
import com.volmit.iris.engine.object.annotations.ArrayType;
import com.volmit.iris.engine.object.annotations.Desc;
import com.volmit.iris.engine.object.annotations.MinNumber;

4
src/main/java/com/volmit/iris/engine/object/IrisNoiseGenerator.java
View File

@@ -18,15 +18,15 @@
package com.volmit.iris.engine.object;
import com.volmit.iris.engine.noise.CNG;
import com.volmit.iris.engine.cache.AtomicCache;
import com.volmit.iris.engine.interpolation.IrisInterpolation;
import com.volmit.iris.engine.noise.CNG;
import com.volmit.iris.engine.object.annotations.ArrayType;
import com.volmit.iris.engine.object.annotations.Desc;
import com.volmit.iris.engine.object.annotations.MinNumber;
import com.volmit.iris.engine.object.annotations.Required;
import com.volmit.iris.util.collection.KList;
import com.volmit.iris.util.math.RNG;
import com.volmit.iris.engine.interpolation.IrisInterpolation;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;

16
src/main/java/com/volmit/iris/engine/object/IrisObject.java
View File

@@ -20,18 +20,18 @@ package com.volmit.iris.engine.object;
import com.volmit.iris.Iris;
import com.volmit.iris.core.IrisDataManager;
import com.volmit.iris.engine.cache.AtomicCache;
import com.volmit.iris.engine.data.B;
import com.volmit.iris.engine.interpolation.IrisInterpolation;
import com.volmit.iris.engine.object.common.CarveResult;
import com.volmit.iris.engine.object.common.IObjectPlacer;
import com.volmit.iris.engine.object.tile.TileData;
import com.volmit.iris.engine.cache.AtomicCache;
import com.volmit.iris.util.collection.KList;
import com.volmit.iris.util.collection.KMap;
import com.volmit.iris.util.math.AxisAlignedBB;
import com.volmit.iris.util.math.BlockPosition;
import com.volmit.iris.util.math.ChunkPosition;
import com.volmit.iris.util.math.RNG;
import com.volmit.iris.engine.interpolation.IrisInterpolation;
import com.volmit.iris.util.scheduling.IrisLock;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -249,7 +249,8 @@ public class IrisObject extends IrisRegistrant {
for (int i = 0; i < size; i++) {
getStates().put(new BlockVector(din.readShort(), din.readShort(), din.readShort()), TileData.read(din));
}
} catch (Throwable e) {Iris.reportError(e);
} catch (Throwable e) {
Iris.reportError(e);
}
}
@@ -329,7 +330,8 @@ public class IrisObject extends IrisRegistrant {
try {
read(fin);
fin.close();
} catch (Throwable e) {Iris.reportError(e);
} catch (Throwable e) {
Iris.reportError(e);
fin.close();
fin = new FileInputStream(file);
readLegacy(fin);
@@ -582,7 +584,8 @@ public class IrisObject extends IrisRegistrant {
try {
d = getBlocks().get(g);
tile = getStates().get(g);
} catch (Throwable e) {Iris.reportError(e);
} catch (Throwable e) {
Iris.reportError(e);
Iris.warn("Failed to read block node " + g.getBlockX() + "," + g.getBlockY() + "," + g.getBlockZ() + " in object " + getLoadKey() + " (cme)");
d = AIR;
}
@@ -675,7 +678,8 @@ public class IrisObject extends IrisRegistrant {
try {
d = getBlocks().get(g);
} catch (Throwable e) {Iris.reportError(e);
} catch (Throwable e) {
Iris.reportError(e);
Iris.warn("Failed to read block node " + g.getBlockX() + "," + g.getBlockY() + "," + g.getBlockZ() + " in object " + getLoadKey() + " (stilt cme)");
d = AIR;
}

4
src/main/java/com/volmit/iris/engine/object/IrisObjectPlacement.java
View File

@@ -19,11 +19,11 @@
package com.volmit.iris.engine.object;
import com.volmit.iris.Iris;
import com.volmit.iris.engine.data.B;
import com.volmit.iris.engine.noise.CNG;
import com.volmit.iris.core.IrisDataManager;
import com.volmit.iris.engine.cache.AtomicCache;
import com.volmit.iris.engine.data.B;
import com.volmit.iris.engine.data.DataProvider;
import com.volmit.iris.engine.noise.CNG;
import com.volmit.iris.engine.object.annotations.*;
import com.volmit.iris.util.collection.KList;
import com.volmit.iris.util.collection.KMap;

2
src/main/java/com/volmit/iris/engine/object/IrisObjectReplace.java
View File

@@ -18,9 +18,9 @@
package com.volmit.iris.engine.object;
import com.volmit.iris.engine.noise.CNG;
import com.volmit.iris.core.IrisDataManager;
import com.volmit.iris.engine.cache.AtomicCache;
import com.volmit.iris.engine.noise.CNG;
import com.volmit.iris.engine.object.annotations.*;
import com.volmit.iris.util.collection.KList;
import com.volmit.iris.util.math.RNG;

3
src/main/java/com/volmit/iris/engine/object/IrisPotionEffect.java
View File

@@ -83,7 +83,8 @@ public class IrisPotionEffect {
return t;
}
}
} catch (Throwable e) {Iris.reportError(e);
} catch (Throwable e) {
Iris.reportError(e);
}

7
src/main/java/com/volmit/iris/engine/object/IrisRegion.java
View File

@@ -19,11 +19,11 @@
package com.volmit.iris.engine.object;
import com.volmit.iris.Iris;
import com.volmit.iris.engine.noise.CNG;
import com.volmit.iris.core.IrisDataManager;
import com.volmit.iris.core.gui.RenderType;
import com.volmit.iris.engine.cache.AtomicCache;
import com.volmit.iris.engine.data.DataProvider;
import com.volmit.iris.engine.noise.CNG;
import com.volmit.iris.engine.object.annotations.*;
import com.volmit.iris.engine.object.common.IRare;
import com.volmit.iris.util.collection.KList;
@@ -37,7 +37,8 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import java.awt.Color;
import java.awt.*;
import java.util.Random;
@@ -532,7 +533,7 @@ public class IrisRegion extends IrisRegistrant implements IRare {
while (biomes.size() > 0) {
int index = rand.nextInt(biomes.size());
IrisBiome biome = biomes.get(index);
IrisBiome biome = biomes.get(index);
if (biome.getVanillaDerivative() != null) {
RandomColor.Color col = VanillaBiomeMap.getColorType(biome.getVanillaDerivative());

2
src/main/java/com/volmit/iris/engine/object/IrisRegionRidge.java
View File

@@ -18,8 +18,8 @@
package com.volmit.iris.engine.object;
import com.volmit.iris.engine.noise.CellGenerator;
import com.volmit.iris.engine.cache.AtomicCache;
import com.volmit.iris.engine.noise.CellGenerator;
import com.volmit.iris.engine.object.annotations.*;
import com.volmit.iris.util.math.RNG;
import lombok.AllArgsConstructor;

2
src/main/java/com/volmit/iris/engine/object/IrisRegionSpot.java
View File

@@ -18,8 +18,8 @@
package com.volmit.iris.engine.object;
import com.volmit.iris.engine.noise.CellGenerator;
import com.volmit.iris.engine.cache.AtomicCache;
import com.volmit.iris.engine.noise.CellGenerator;
import com.volmit.iris.engine.object.annotations.Desc;
import com.volmit.iris.engine.object.annotations.MinNumber;
import com.volmit.iris.engine.object.annotations.RegistryListBiome;

3
src/main/java/com/volmit/iris/engine/object/IrisRegistrant.java
View File

@@ -33,8 +33,7 @@ public class IrisRegistrant {
private transient File loadFile;
public File openInVSCode()
{
public File openInVSCode() {
try {
Desktop.getDesktop().open(getLoadFile());
} catch (Throwable e) {

2
src/main/java/com/volmit/iris/engine/object/NoiseStyle.java
View File

@@ -21,8 +21,8 @@ package com.volmit.iris.engine.object;
import com.volmit.iris.engine.noise.CNG;
import com.volmit.iris.engine.noise.CNGFactory;
import com.volmit.iris.engine.noise.NoiseType;
import com.volmit.iris.engine.stream.ProceduralStream;
import com.volmit.iris.engine.object.annotations.Desc;
import com.volmit.iris.engine.stream.ProceduralStream;
import com.volmit.iris.util.math.RNG;
@Desc("Styles of noise")

1
src/main/java/com/volmit/iris/engine/object/common/IPostBlockAccess.java
View File

@@ -18,7 +18,6 @@
package com.volmit.iris.engine.object.common;
import com.volmit.iris.engine.object.common.CaveResult;
import com.volmit.iris.util.collection.KList;
import org.bukkit.block.data.BlockData;
import org.bukkit.generator.ChunkGenerator.ChunkData;

4
src/main/java/com/volmit/iris/engine/object/common/IRare.java
View File

@@ -22,6 +22,6 @@ public interface IRare {
int getRarity();
static int get(Object v) {
return v instanceof IRare ? Math.max(1, ((IRare) v).getRarity()) : 1;
}
return v instanceof IRare ? Math.max(1, ((IRare) v).getRarity()) : 1;
}
}

6
src/main/java/com/volmit/iris/engine/object/tile/TileData.java
View File

@@ -90,7 +90,8 @@ public interface TileData<T extends TileState> extends Cloneable {
//noinspection unchecked
toBukkit((T) t);
return true;
} catch (Throwable e) {Iris.reportError(e);
} catch (Throwable e) {
Iris.reportError(e);
}
@@ -102,7 +103,8 @@ public interface TileData<T extends TileState> extends Cloneable {
//noinspection unchecked
fromBukkit((T) t);
return true;
} catch (Throwable e) {Iris.reportError(e);
} catch (Throwable e) {
Iris.reportError(e);
}