etc/BiomesOPlenty
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Use block querys in Generator Splotches to define the blocks to swap

Browse source
This commit is contained in:
Cheeserolls 2015-05-31 00:38:10 +01:00
parent d93113fbfc
commit da3280d85a
1 changed files with 32 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

87
src/main/java/biomesoplenty/common/world/feature/GeneratorSplotches.java
View file

@ -8,11 +8,8 @@
package biomesoplenty.common.world.feature; package biomesoplenty.common.world.feature;
import java.util.ArrayList;
import java.util.Random; import java.util.Random;
import org.apache.commons.lang3.tuple.Pair;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.init.Blocks; import net.minecraft.init.Blocks;
@ -21,14 +18,15 @@ import net.minecraft.util.MathHelper;
import net.minecraft.world.World; import net.minecraft.world.World;
import biomesoplenty.api.biome.generation.GeneratorCustomizable; import biomesoplenty.api.biome.generation.GeneratorCustomizable;
import biomesoplenty.common.util.biome.GeneratorUtils; import biomesoplenty.common.util.biome.GeneratorUtils;
import biomesoplenty.common.util.block.BlockQueryUtils;
import biomesoplenty.common.util.block.BlockQueryUtils.BlockQueryParseException;
import biomesoplenty.common.util.block.BlockQueryUtils.IBlockQuery;
import biomesoplenty.common.util.config.BOPConfig.IConfigObj; import biomesoplenty.common.util.config.BOPConfig.IConfigObj;
public class GeneratorSplotches extends GeneratorCustomizable public class GeneratorSplotches extends GeneratorCustomizable
{ {
public static final int WILDCARD = -1;
protected int amountPerChunk; protected int amountPerChunk;
protected ArrayList<Pair<Block,Integer>> from; protected IBlockQuery from;
protected IBlockState to; protected IBlockState to;
protected int splotchSize; protected int splotchSize;
@ -37,41 +35,28 @@ public class GeneratorSplotches extends GeneratorCustomizable
// default // default
this(1, Blocks.stone.getDefaultState(), 8, Blocks.grass); this(1, Blocks.stone.getDefaultState(), 8, Blocks.grass);
} }
public GeneratorSplotches(int amountPerChunk, IBlockState to, int splotchSize, String from) throws BlockQueryParseException
{
this(amountPerChunk, to, splotchSize, BlockQueryUtils.parseQueryString(from));
}
public GeneratorSplotches(int amountPerChunk, IBlockState to, int splotchSize, Object... from) public GeneratorSplotches(int amountPerChunk, IBlockState to, int splotchSize, Block from)
{
this(amountPerChunk, to, splotchSize, new BlockQueryUtils.BlockQueryBlock(from));
}
public GeneratorSplotches(int amountPerChunk, IBlockState to, int splotchSize, IBlockState from)
{
this(amountPerChunk, to, splotchSize, new BlockQueryUtils.BlockQueryState(from));
}
public GeneratorSplotches(int amountPerChunk, IBlockState to, int splotchSize, IBlockQuery from)
{ {
this.amountPerChunk = amountPerChunk; this.amountPerChunk = amountPerChunk;
this.to = to; this.to = to;
this.splotchSize = splotchSize; this.splotchSize = splotchSize;
this.from = new ArrayList<Pair<Block,Integer>>(); this.from = from;
for (Object obj : from)
{
if (obj instanceof IBlockState)
{
this.addFrom((IBlockState)obj);
}
else if (obj instanceof Block)
{
this.addFrom((Block)obj);
}
else
{
throw new RuntimeException("GeneratorSplotches 'from' argument can accept only Block or IBlockState objects");
}
}
}
// add a specific blockstate to the possibilities for swapping
public void addFrom(IBlockState state)
{
Block block = (state).getBlock();
this.from.add(Pair.of(block, block.getMetaFromState(state)));
}
// add all variants of a block to the possibilities for swapping
public void addFrom(Block block)
{
this.from.add(Pair.of(block, WILDCARD));
} }
@ -163,20 +148,9 @@ public class GeneratorSplotches extends GeneratorCustomizable
public void replaceAt(World world, BlockPos pos) public void replaceAt(World world, BlockPos pos)
{ {
IBlockState state = world.getBlockState(pos); if (from.matches(world.getBlockState(pos)))
Block block = state.getBlock();
int meta = block.getMetaFromState(state);
for (Pair<Block,Integer> pair : this.from)
{ {
if (pair.getLeft() == block) world.setBlockState(pos, this.to, 2);
{
int thisMeta = pair.getRight().intValue();
if (thisMeta == WILDCARD || thisMeta == meta)
{
world.setBlockState(pos, this.to, 2);
return;
}
}
} }
} }
@ -187,12 +161,15 @@ public class GeneratorSplotches extends GeneratorCustomizable
this.amountPerChunk = conf.getInt("amountPerChunk", this.amountPerChunk); this.amountPerChunk = conf.getInt("amountPerChunk", this.amountPerChunk);
this.to = conf.getBlockState("to", this.to); this.to = conf.getBlockState("to", this.to);
this.splotchSize = conf.getInt("splotchSize", this.splotchSize); this.splotchSize = conf.getInt("splotchSize", this.splotchSize);
// TODO: need a better way to configure this - this isn't flexible enough String fromString = conf.getString("from", null);
IBlockState from = conf.getBlockState("from", null); if (fromString != null)
if (from != null)
{ {
this.from = new ArrayList<Pair<Block,Integer>>(); try {
this.addFrom(from); IBlockQuery from = BlockQueryUtils.parseQueryString(fromString);
this.from = from;
} catch (BlockQueryParseException e) {
conf.addMessage("from", e.getMessage());
}
} }
} }