Add blacklists.

This commit is contained in:
James McKay committed 2016-12-13 14:45:33 +11:00
1 parent 86ea85db91
commit 4f2d564fb3
2 files changed
+35 -6

No files matched your search

@@ -1,8 +1,13 @@
package portablejim.bbw.core;
import net.minecraftforge.common.config.Configuration;
import scala.actors.threadpool.Arrays;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import java.util.TreeSet;
/**
* Config file
@@ -38,6 +43,18 @@ public class ConfigValues {
public static final String OVERRIDES_RECIPES_NAME = "forced_blocks";
public static final String OVERRIDES_RECIPES_DESCRIPTION = "Specify forced mappings for what to build from certain blocks.\n(what you are looking at)=>(number required)*(item required)=>(block to build)";
public String[] HARD_BLACKLIST;
public Set<String> HARD_BLACKLIST_SET;
public static final String[] HARD_BLACKLIST_DEFAULT = new String[]{};
public static final String HARD_BLACKLIST_NAME = "blacklisted_blocks";
public static final String HARD_BLACKLIST_DESCRIPTION = "Blocks that won't work at all with the wands";
public String[] SOFT_BLACKLIST;
public Set<String> SOFT_BLACKLIST_SET;
public static final String[] SOFT_BLACKLIST_DEFAULT = new String[]{};
public static final String SOFT_BLACKLIST_NAME = "no_assumption_blocks";
public static final String SOFT_BLACKLIST_DESCRIPTION = "Blocks that break assumptions. When the placed block is not what you expect.";
public ConfigValues(File file) {
configFile = new Configuration(file);
}
@@ -48,6 +65,13 @@ public class ConfigValues {
ENABLE_STONE_WAND = configFile.get(CONFIG_GENERAL, ENABLE_STONE_WAND_NAME, ENABLE_STONE_WAND_DEFAULT, ENABLE_STONE_WAND_DESCRIPTION).getBoolean();
ENABLE_IRON_WAND = configFile.get(CONFIG_GENERAL, ENABLE_IRON_WAND_NAME, ENABLE_IRON_WAND_DEFAULT, ENABLE_IRON_WAND_DESCRIPTION).getBoolean();
ENABLE_DIAMOND_WAND = configFile.get(CONFIG_GENERAL, ENABLE_DIAMOND_WAND_NAME, ENABLE_DIAMOND_WAND_DEFAULT, ENABLE_DIAMOND_WAND_DESCRIPTION).getBoolean();
HARD_BLACKLIST = configFile.get(CONFIG_GENERAL, HARD_BLACKLIST_NAME, HARD_BLACKLIST_DEFAULT, HARD_BLACKLIST_DESCRIPTION).getStringList();
SOFT_BLACKLIST = configFile.get(CONFIG_GENERAL, SOFT_BLACKLIST_NAME, SOFT_BLACKLIST_DEFAULT, SOFT_BLACKLIST_DESCRIPTION).getStringList();
//noinspection unchecked
HARD_BLACKLIST_SET = new TreeSet<String>(Arrays.asList(HARD_BLACKLIST));
//noinspection unchecked
SOFT_BLACKLIST_SET = new TreeSet<String>(Arrays.asList(SOFT_BLACKLIST));
configFile.save();
}
@@ -46,11 +46,15 @@ public class WandWorker {
public ItemStack getProperItemStack(IWorldShim world, IPlayerShim player, Point3d blockPos) {
Block block = world.getBlock(blockPos);
int meta = world.getMetadata(blockPos);
ItemStack exactItemstack = new ItemStack(block, 1, meta);
if(player.countItems(exactItemstack) > 0) {
return exactItemstack;
}
return getEquivalentItemStack(blockPos);
String blockString = String.format("%s/%s", Block.blockRegistry.getNameForObject(block), meta);
if(!BetterBuildersWandsMod.instance.configValues.HARD_BLACKLIST_SET.contains(blockString)) {
ItemStack exactItemstack = new ItemStack(block, 1, meta);
if (player.countItems(exactItemstack) > 0) {
return exactItemstack;
}
return getEquivalentItemStack(blockPos);
}
return null;
}
public ItemStack getEquivalentItemStack(Point3d blockPos) {
@@ -59,13 +63,14 @@ public class WandWorker {
//ArrayList<ItemStack> items = new ArrayList<ItemStack>();
ItemStack stack = null;
CustomMapping customMapping = BetterBuildersWandsMod.instance.mappingManager.getMapping(block, meta);
String blockString = String.format("%s/%s", Block.blockRegistry.getNameForObject(block), meta);
if(customMapping != null) {
stack = customMapping.getItems();
}
else if(block.canSilkHarvest(world.getWorld(), player.getPlayer(), blockPos.x, blockPos.y, blockPos.z, meta)) {
stack = BetterBuildersWandsMod.instance.blockCache.getStackedBlock(world, blockPos);
}
else {
else if(!BetterBuildersWandsMod.instance.configValues.SOFT_BLACKLIST_SET.contains(blockString)) {
Item dropped = block.getItemDropped(meta, new Random(), 0);
if (dropped != null) {
stack = new ItemStack(dropped, block.quantityDropped(meta, 0, new Random()), block.damageDropped(meta));