mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-07-19 02:36:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ugh

Browse Source
This commit is contained in:
Daniel Mills 2020-09-13 08:57:13 -04:00
parent d317ac5236
commit 9e51a1617f
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,7 +5,6 @@ import org.bukkit.block.data.BlockData;
import com.volmit.iris.gen.atomics.AtomicCache; import com.volmit.iris.gen.atomics.AtomicCache;
import com.volmit.iris.noise.CNG; import com.volmit.iris.noise.CNG;
import com.volmit.iris.util.ArrayType; import com.volmit.iris.util.ArrayType;
import com.volmit.iris.util.B;
import com.volmit.iris.util.Desc; import com.volmit.iris.util.Desc;
import com.volmit.iris.util.DontObfuscate; import com.volmit.iris.util.DontObfuscate;
import com.volmit.iris.util.KList; import com.volmit.iris.util.KList;
@ -24,11 +23,11 @@ import lombok.experimental.Accessors;
@Data @Data
public class IrisObjectReplace public class IrisObjectReplace
{ {
@ArrayType(min = 1, type = String.class) @ArrayType(min = 1, type = IrisBlockData.class)
@Required @Required
@Desc("Find this block") @Desc("Find this block")
@DontObfuscate @DontObfuscate
private KList<String> find = new KList<>(); private KList<IrisBlockData> find = new KList<>();
@Required @Required
@Desc("Replace it with this block palette") @Desc("Replace it with this block palette")
@ -45,7 +44,22 @@ public class IrisObjectReplace
public KList<BlockData> getFind() public KList<BlockData> getFind()
{ {
return findData.aquire(() -> B.getBlockData(find)); return findData.aquire(() ->
{
KList<BlockData> b = new KList<>();
for(IrisBlockData i : find)
{
BlockData bx = i.getBlockData();
if(bx != null)
{
b.add(bx);
}
}
return b;
});
} }
public BlockData getReplace(RNG seed, double x, double y, double z) public BlockData getReplace(RNG seed, double x, double y, double z)