diff --git a/lang b/lang index ea85d2460..62681b197 160000 --- a/lang +++ b/lang @@ -1 +1 @@ -Subproject commit ea85d246017d4d138294235c9f22982363452cb7 +Subproject commit 62681b197f5fff888bb97196b88385dd0375c444 diff --git a/src/main/java/forestry/api/storage/IBackpackDefinition.java b/src/main/java/forestry/api/storage/IBackpackDefinition.java index 70e81fc4a..595b06dc3 100644 --- a/src/main/java/forestry/api/storage/IBackpackDefinition.java +++ b/src/main/java/forestry/api/storage/IBackpackDefinition.java @@ -35,6 +35,8 @@ public interface IBackpackDefinition { void addValidItems(List validItems); + void addValidOreDictName(String oreDictName); + /** * Returns true if the itemstack is a valid item for this backpack type. */ diff --git a/src/main/java/forestry/core/genetics/alleles/AlleleRegistry.java b/src/main/java/forestry/core/genetics/alleles/AlleleRegistry.java index abb53b9bd..2b91c750e 100644 --- a/src/main/java/forestry/core/genetics/alleles/AlleleRegistry.java +++ b/src/main/java/forestry/core/genetics/alleles/AlleleRegistry.java @@ -57,10 +57,7 @@ public class AlleleRegistry implements IAlleleRegistry { @Override public ISpeciesRoot getSpeciesRoot(String uid) { - if (rootMap.containsKey(uid)) { - return rootMap.get(uid); - } - return null; + return rootMap.get(uid); } @Override diff --git a/src/main/java/forestry/core/network/DataOutputStreamForestry.java b/src/main/java/forestry/core/network/DataOutputStreamForestry.java index e78a2c465..7ece7c847 100644 --- a/src/main/java/forestry/core/network/DataOutputStreamForestry.java +++ b/src/main/java/forestry/core/network/DataOutputStreamForestry.java @@ -25,7 +25,7 @@ public class DataOutputStreamForestry extends DataOutputStream { if (itemstack == null) { writeUTF(""); } else { - writeUTF(ItemStackUtil.getItemNameFromRegistryAsSting(itemstack.getItem())); + writeUTF(ItemStackUtil.getItemNameFromRegistryAsString(itemstack.getItem())); writeByte(itemstack.stackSize); writeVarInt(itemstack.getItemDamage()); diff --git a/src/main/java/forestry/core/utils/ItemStackUtil.java b/src/main/java/forestry/core/utils/ItemStackUtil.java index 6a2efbae8..463373edf 100644 --- a/src/main/java/forestry/core/utils/ItemStackUtil.java +++ b/src/main/java/forestry/core/utils/ItemStackUtil.java @@ -76,9 +76,30 @@ public abstract class ItemStackUtil { * * @return The registry name of the item as {@link String} */ - public static String getItemNameFromRegistryAsSting(Item item) { + public static String getItemNameFromRegistryAsString(Item item) { return getItemNameFromRegistry(item).toString(); } + + @Nullable + public static String getStringForItemStack(ItemStack itemStack) { + if (itemStack == null) { + return null; + } + + Item item = itemStack.getItem(); + if (item == null) { + return null; + } + + String itemStackString = getItemNameFromRegistryAsString(item); + + int meta = itemStack.getItemDamage(); + if (meta != OreDictionary.WILDCARD_VALUE) { + return itemStackString + ':' + meta; + } else { + return itemStackString; + } + } /** * @return The item from the item registry diff --git a/src/main/java/forestry/energy/tiles/TileEnginePeat.java b/src/main/java/forestry/energy/tiles/TileEnginePeat.java index 6718a8c4b..4a8a804c7 100644 --- a/src/main/java/forestry/energy/tiles/TileEnginePeat.java +++ b/src/main/java/forestry/energy/tiles/TileEnginePeat.java @@ -289,7 +289,7 @@ public class TileEnginePeat extends TileEngine implements ISidedInventory { super.writeToNBT(nbttagcompound); if (fuelItem != null) { - nbttagcompound.setString("EngineFuelItem", ItemStackUtil.getItemNameFromRegistryAsSting(fuelItem)); + nbttagcompound.setString("EngineFuelItem", ItemStackUtil.getItemNameFromRegistryAsString(fuelItem)); } nbttagcompound.setInteger("EngineFuelMeta", fuelItemMeta); diff --git a/src/main/java/forestry/lepidopterology/PluginLepidopterology.java b/src/main/java/forestry/lepidopterology/PluginLepidopterology.java index be59d5355..5d967fbea 100644 --- a/src/main/java/forestry/lepidopterology/PluginLepidopterology.java +++ b/src/main/java/forestry/lepidopterology/PluginLepidopterology.java @@ -29,14 +29,9 @@ import net.minecraft.item.crafting.CraftingManager; import net.minecraft.world.World; import net.minecraft.world.chunk.IChunkProvider; -import net.minecraftforge.client.event.TextureStitchEvent; -import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.config.Property; import net.minecraftforge.fml.common.SidedProxy; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.RecipeSorter; @@ -68,7 +63,6 @@ import forestry.lepidopterology.genetics.ButterflyRoot; import forestry.lepidopterology.genetics.MothDefinition; import forestry.lepidopterology.genetics.alleles.AlleleButterflyCocoon; import forestry.lepidopterology.genetics.alleles.AlleleButterflyEffect; -import forestry.lepidopterology.items.ItemButterflyGE; import forestry.lepidopterology.items.ItemRegistryLepidopterology; import forestry.lepidopterology.proxy.ProxyLepidopterology; import forestry.lepidopterology.recipes.MatingRecipe; @@ -233,7 +227,7 @@ public class PluginLepidopterology extends BlankForestryPlugin { Map cooconLoot = new HashMap(); List lootList = new ArrayList(); for(Entry entry : cocoon.getCocoonLoot().entrySet()){ - String itemStackString = ItemStackUtil.getItemNameFromRegistryAsSting(entry.getKey().getItem()); + String itemStackString = ItemStackUtil.getItemNameFromRegistryAsString(entry.getKey().getItem()); int meta = entry.getKey().getItemDamage(); if (meta != OreDictionary.WILDCARD_VALUE) { diff --git a/src/main/java/forestry/plugins/compat/PluginBiomesOPlenty.java b/src/main/java/forestry/plugins/compat/PluginBiomesOPlenty.java index 03d35b29e..00c8d6ab6 100644 --- a/src/main/java/forestry/plugins/compat/PluginBiomesOPlenty.java +++ b/src/main/java/forestry/plugins/compat/PluginBiomesOPlenty.java @@ -104,7 +104,7 @@ public class PluginBiomesOPlenty extends BlankForestryPlugin { for (String key : saplingItemKeys) { Item saplingItem = GameRegistry.findItem(BoP, key); - String saplingName = ItemStackUtil.getItemNameFromRegistryAsSting(saplingItem); + String saplingName = ItemStackUtil.getItemNameFromRegistryAsString(saplingItem); FMLInterModComms.sendMessage(Constants.MOD_ID, "add-farmable-sapling", String.format("farmArboreal@%s.-1", saplingName)); } diff --git a/src/main/java/forestry/plugins/compat/PluginIC2.java b/src/main/java/forestry/plugins/compat/PluginIC2.java index 24e18e04c..179193a04 100644 --- a/src/main/java/forestry/plugins/compat/PluginIC2.java +++ b/src/main/java/forestry/plugins/compat/PluginIC2.java @@ -22,6 +22,7 @@ import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fml.common.Optional; import net.minecraftforge.fml.common.event.FMLInterModComms; + import forestry.api.circuits.ChipsetManager; import forestry.api.circuits.CircuitSocketType; import forestry.api.circuits.ICircuitLayout; @@ -246,7 +247,7 @@ public class PluginIC2 extends BlankForestryPlugin { if (rubberSapling != null && resin != null) { String saplingName = ItemStackUtil.getBlockNameFromRegistryAsSting(ItemStackUtil.getBlock(rubberSapling)); - String resinName = ItemStackUtil.getItemNameFromRegistryAsSting(resin.getItem()); + String resinName = ItemStackUtil.getItemNameFromRegistryAsString(resin.getItem()); String imc = String.format("farmArboreal@%s.%s.%s.%s", saplingName, rubberSapling.getItemDamage(), resinName, resin.getItemDamage()); diff --git a/src/main/java/forestry/plugins/compat/PluginNatura.java b/src/main/java/forestry/plugins/compat/PluginNatura.java index 9eb308236..c3ce2f493 100644 --- a/src/main/java/forestry/plugins/compat/PluginNatura.java +++ b/src/main/java/forestry/plugins/compat/PluginNatura.java @@ -96,7 +96,7 @@ public class PluginNatura extends BlankForestryPlugin { ItemStack saplingWild = new ItemStack(saplingItem, 1, OreDictionary.WILDCARD_VALUE); RecipeUtil.addFermenterRecipes(saplingWild, ForestryAPI.activeMode.getIntegerSetting("fermenter.yield.sapling"), Fluids.BIOMASS); - String saplingName = ItemStackUtil.getItemNameFromRegistryAsSting(saplingItem); + String saplingName = ItemStackUtil.getItemNameFromRegistryAsString(saplingItem); FMLInterModComms.sendMessage(Constants.MOD_ID, "add-farmable-sapling", String.format("farmArboreal@%s.-1", saplingName)); } diff --git a/src/main/java/forestry/storage/BackpackDefinition.java b/src/main/java/forestry/storage/BackpackDefinition.java index 224cb5d5f..7ce90ae33 100755 --- a/src/main/java/forestry/storage/BackpackDefinition.java +++ b/src/main/java/forestry/storage/BackpackDefinition.java @@ -16,28 +16,25 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.oredict.OreDictionary; -import forestry.api.apiculture.BeeManager; -import forestry.api.lepidopterology.ButterflyManager; +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.ISpeciesRoot; import forestry.api.storage.IBackpackDefinition; import forestry.core.utils.ItemStackUtil; import forestry.core.utils.Translator; public class BackpackDefinition implements IBackpackDefinition { - private final int primaryColor; // - c03384 + private final int primaryColor; private final int secondaryColor; private final Set validItemStacks = new HashSet<>(); private final Set validOreIds = new HashSet<>(); - private final Set validItemClasses = new HashSet<>(); - private final Set validBlockClasses = new HashSet<>(); public BackpackDefinition(@Nonnull Color primaryColor) { this(primaryColor, new Color(0xffffff)); @@ -76,23 +73,10 @@ public class BackpackDefinition implements IBackpackDefinition { @Override public void addValidItem(ItemStack validItem) { - if (validItem == null) { - return; + String itemStackString = ItemStackUtil.getStringForItemStack(validItem); + if (itemStackString != null) { + this.validItemStacks.add(itemStackString); } - - Item item = validItem.getItem(); - if (item == null) { - return; - } - - String itemStackString = ItemStackUtil.getItemNameFromRegistryAsSting(item); - - int meta = validItem.getItemDamage(); - if (meta != OreDictionary.WILDCARD_VALUE) { - itemStackString = itemStackString + ':' + meta; - } - - this.validItemStacks.add(itemStackString); } public void clearAllValid() { @@ -107,6 +91,7 @@ public class BackpackDefinition implements IBackpackDefinition { } } + @Override public void addValidOreDictName(String oreDictName) { if (OreDictionary.doesOreNameExist(oreDictName)) { int oreId = OreDictionary.getOreID(oreDictName); @@ -120,30 +105,6 @@ public class BackpackDefinition implements IBackpackDefinition { } } - public void addValidItemClass(Class itemClass) { - if (itemClass != null) { - validItemClasses.add(itemClass); - } - } - - public void addValidItemClasses(List itemClasses) { - for (Class itemClass : itemClasses) { - addValidItemClass(itemClass); - } - } - - public void addValidBlockClass(Class blockClass) { - if (blockClass != null) { - validBlockClasses.add(blockClass); - } - } - - public void addValidBlockClasses(List blockClasses) { - for (Class blockClass : blockClasses) { - addValidBlockClass(blockClass); - } - } - public Set getValidItemStacks() { return validItemStacks; } @@ -152,14 +113,6 @@ public class BackpackDefinition implements IBackpackDefinition { return validOreIds; } - public Set getValidBlockClasses() { - return validBlockClasses; - } - - public Set getValidItemClasses() { - return validItemClasses; - } - @Override public boolean isValidItem(ItemStack itemStack) { if (itemStack == null) { @@ -171,7 +124,7 @@ public class BackpackDefinition implements IBackpackDefinition { return false; } - String itemStackStringWild = ItemStackUtil.getItemNameFromRegistryAsSting(item); + String itemStackStringWild = ItemStackUtil.getItemNameFromRegistryAsString(item); if (validItemStacks.contains(itemStackStringWild)) { return true; } @@ -192,47 +145,22 @@ public class BackpackDefinition implements IBackpackDefinition { } } - for (Class itemClass : validItemClasses) { - if (itemClass.isInstance(item)) { - validItemStacks.add(itemStackStringWild); - return true; - } - } - - Block block = Block.getBlockFromItem(item); - if (block != null) { - for (Class blockClass : validBlockClasses) { - if (blockClass.isInstance(block)) { - validItemStacks.add(itemStackStringWild); - return true; - } - } - } - return false; } - public static class BackpackDefinitionApiarist extends BackpackDefinition { + public static class BackpackDefinitionNaturalist extends BackpackDefinition { + @Nonnull + private final String speciesRootUid; - public BackpackDefinitionApiarist(@Nonnull Color primaryColor) { + public BackpackDefinitionNaturalist(@Nonnull Color primaryColor, @Nonnull String speciesRootUid) { super(primaryColor); + this.speciesRootUid = speciesRootUid; } @Override public boolean isValidItem(ItemStack itemStack) { - return BeeManager.beeRoot.isMember(itemStack); - } - } - - public static class BackpackDefinitionLepidopterist extends BackpackDefinition { - - public BackpackDefinitionLepidopterist(@Nonnull Color primaryColor) { - super(primaryColor); - } - - @Override - public boolean isValidItem(ItemStack itemStack) { - return ButterflyManager.butterflyRoot.isMember(itemStack); + ISpeciesRoot speciesRoot = AlleleManager.alleleRegistry.getSpeciesRoot(speciesRootUid); + return speciesRoot.isMember(itemStack); } } } diff --git a/src/main/java/forestry/storage/PluginStorage.java b/src/main/java/forestry/storage/PluginStorage.java index a73cf9d0f..3d5e82bdd 100644 --- a/src/main/java/forestry/storage/PluginStorage.java +++ b/src/main/java/forestry/storage/PluginStorage.java @@ -10,40 +10,25 @@ ******************************************************************************/ package forestry.storage; +import com.google.common.collect.HashMultimap; +import com.google.common.collect.Multimap; + +import javax.annotation.Nonnull; import java.awt.Color; import java.io.File; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; +import java.util.HashSet; import java.util.List; -import java.util.regex.Pattern; +import java.util.Set; -import net.minecraft.block.BlockBasePressurePlate; -import net.minecraft.block.BlockButton; -import net.minecraft.block.BlockChest; -import net.minecraft.block.BlockDoor; -import net.minecraft.block.BlockFence; -import net.minecraft.block.BlockFenceGate; -import net.minecraft.block.BlockFurnace; -import net.minecraft.block.BlockLadder; -import net.minecraft.block.BlockLever; -import net.minecraft.block.BlockRedstoneDiode; -import net.minecraft.block.BlockSlab; -import net.minecraft.block.BlockStairs; -import net.minecraft.block.BlockTorch; -import net.minecraft.block.BlockTrapDoor; -import net.minecraft.block.BlockWall; -import net.minecraft.block.BlockWorkbench; -import net.minecraft.block.IGrowable; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; -import net.minecraft.item.ItemDoor; import net.minecraft.item.ItemStack; import net.minecraftforge.client.event.ModelBakeEvent; -import net.minecraftforge.common.IPlantable; -import net.minecraftforge.common.IShearable; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.config.Property; import net.minecraftforge.fluids.FluidStack; @@ -80,8 +65,6 @@ import forestry.lepidopterology.blocks.BlockTypeLepidopterologyTesr; import forestry.plugins.BlankForestryPlugin; import forestry.plugins.ForestryPlugin; import forestry.plugins.ForestryPluginUids; -import forestry.storage.BackpackDefinition.BackpackDefinitionApiarist; -import forestry.storage.BackpackDefinition.BackpackDefinitionLepidopterist; import forestry.storage.items.ItemRegistryStorage; @ForestryPlugin(pluginID = ForestryPluginUids.STORAGE, name = "Storage", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.plugin.storage.description") @@ -92,6 +75,9 @@ public class PluginStorage extends BlankForestryPlugin { public static ItemRegistryStorage items; + private final Multimap backpackOreDictRegexpDefaults = HashMultimap.create(); + private final Multimap backpackItemDefaults = HashMultimap.create(); + @Override public void setupAPI() { super.setupAPI(); @@ -103,12 +89,12 @@ public class PluginStorage extends BlankForestryPlugin { BackpackDefinition definition; if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.APICULTURE)) { - definition = new BackpackDefinitionApiarist(new Color(0xc4923d)); + definition = new BackpackDefinition.BackpackDefinitionNaturalist(new Color(0xc4923d), "rootBees"); BackpackManager.backpackInterface.registerBackpack("apiarist", definition); } if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.LEPIDOPTEROLOGY)) { - definition = new BackpackDefinitionLepidopterist(new Color(0x995b31)); + definition = new BackpackDefinition.BackpackDefinitionNaturalist(new Color(0x995b31), "rootButterflies"); BackpackManager.backpackInterface.registerBackpack("lepidopterist", definition); } @@ -146,12 +132,10 @@ public class PluginStorage extends BlankForestryPlugin { final String newConfig = CONFIG_CATEGORY + ".cfg"; File configFile = new File(Forestry.instance.getConfigFolder(), newConfig); - if (!configFile.exists()) { - setDefaultsForConfig(); - } - LocalizedConfiguration config = new LocalizedConfiguration(configFile, "1.0.0"); + setDefaultsForConfig(); + handleBackpackConfig(config, BackpackManager.MINER_UID); handleBackpackConfig(config, BackpackManager.DIGGER_UID); handleBackpackConfig(config, BackpackManager.FORESTER_UID); @@ -160,107 +144,69 @@ public class PluginStorage extends BlankForestryPlugin { handleBackpackConfig(config, BackpackManager.BUILDER_UID); config.save(); - - BackpackDefinition forester = (BackpackDefinition) BackpackManager.backpackInterface.getBackpack(BackpackManager.FORESTER_UID); - forester.addValidBlockClasses(Arrays.asList( - IPlantable.class, - IGrowable.class, - IShearable.class - )); - forester.addValidItemClasses(Arrays.asList( - IPlantable.class, - IGrowable.class - )); - - BackpackDefinition builder = (BackpackDefinition) BackpackManager.backpackInterface.getBackpack(BackpackManager.BUILDER_UID); - builder.addValidBlockClasses(Arrays.asList( - BlockStairs.class, - BlockFence.class, - BlockFenceGate.class, - BlockWall.class, - BlockBasePressurePlate.class, - BlockLever.class, - BlockButton.class, - BlockTorch.class, - BlockRedstoneDiode.class, - BlockChest.class, - BlockWorkbench.class, - BlockFurnace.class, - BlockLadder.class, - BlockTrapDoor.class, - BlockDoor.class, - BlockSlab.class - )); - builder.addValidItemClass(ItemDoor.class); } - private static void setDefaultsForConfig() { + private void setDefaultsForConfig() { + backpackOreDictRegexpDefaults.get(BackpackManager.MINER_UID).addAll(Arrays.asList( + "ore[A-Z].*", + "dust[A-Z].*", + "gem[A-Z].*", + "ingot[A-Z].*", + "nugget[A-Z].*", + "crushed[A-Z].*", + "cluster[A-Z].*", + "denseore[A-Z].*" + )); - final BackpackDefinition miner = (BackpackDefinition) BackpackManager.backpackInterface.getBackpack(BackpackManager.MINER_UID); - final BackpackDefinition digger = (BackpackDefinition) BackpackManager.backpackInterface.getBackpack(BackpackManager.DIGGER_UID); - final BackpackDefinition forester = (BackpackDefinition) BackpackManager.backpackInterface.getBackpack(BackpackManager.FORESTER_UID); - final BackpackDefinition adventurer = (BackpackDefinition) BackpackManager.backpackInterface.getBackpack(BackpackManager.ADVENTURER_UID); - final BackpackDefinition builder = (BackpackDefinition) BackpackManager.backpackInterface.getBackpack(BackpackManager.BUILDER_UID); - final BackpackDefinition hunter = (BackpackDefinition) BackpackManager.backpackInterface.getBackpack(BackpackManager.HUNTER_UID); - - final Pattern minerOreDictPattern = Pattern.compile("(ore|dust|gem|ingot|nugget|crushed|cluster|denseore)[A-Z].*"); - final Pattern diggerOreDictPattern = Pattern.compile("(stone)[A-Z].*"); - final Pattern foresterOreDictPattern = Pattern.compile("(crop|seed|tree)[A-Z].*"); - final Pattern builderOreDictPattern = Pattern.compile("(block|paneGlass|slabWood|stainedClay|stainedGlass)[A-Z].*"); - - final List minerOreDictNames = new ArrayList<>(); - final List diggerOreDictNames = new ArrayList<>(Arrays.asList( + backpackOreDictRegexpDefaults.get(BackpackManager.DIGGER_UID).addAll(Arrays.asList( "cobblestone", "stone", + "stone[A-Z].*", "sand" )); - final List foresterOreDictNames = new ArrayList<>(Arrays.asList( + + backpackOreDictRegexpDefaults.get(BackpackManager.FORESTER_UID).addAll(Arrays.asList( "logWood", "stickWood", "woodStick", - "saplingTree" + "saplingTree", + "vine", + "crop[A-Z].*", + "seed[A-Z].*", + "tree[A-Z].*" )); - final List builderOreDictNames = new ArrayList<>(Arrays.asList( + + backpackOreDictRegexpDefaults.get(BackpackManager.BUILDER_UID).addAll(Arrays.asList( + "block[A-Z].*", + "paneGlass[A-Z].*", + "slabWood[A-Z].*", + "stainedClay[A-Z].*", + "stainedGlass[A-Z].*", "stone", "plankWood", "stairWood", "slabWood", "fenceWood", + "fenceGateWood", "glass", - "blockGlass", - "paneGlass" + "paneGlass", + "torch", + "chest", + "chest[A-Z].*", + "workbench", + "doorWood" )); - for (String name : OreDictionary.getOreNames()) { - if (minerOreDictPattern.matcher(name).matches()) { - minerOreDictNames.add(name); - } else if (diggerOreDictPattern.matcher(name).matches()) { - if (name.equals("stoneRod")) { - continue; - } - diggerOreDictNames.add(name); - } else if (foresterOreDictPattern.matcher(name).matches()) { - foresterOreDictNames.add(name); - } else if (builderOreDictPattern.matcher(name).matches()) { - if (name.equals("blockHopper")) { - continue; - } - builderOreDictNames.add(name); - } - } - - miner.addValidOreDictNames(minerOreDictNames); - miner.addValidItems(Arrays.asList( + backpackItemDefaults.get(BackpackManager.MINER_UID).addAll(getItemStrings(Arrays.asList( new ItemStack(Blocks.obsidian), new ItemStack(Blocks.coal_ore), new ItemStack(Items.coal), PluginCore.items.bronzePickaxe.getItemStack(), PluginCore.items.kitPickaxe.getItemStack(), PluginCore.items.brokenBronzePickaxe.getItemStack() - )); + ))); - digger.addValidOreDictNames(diggerOreDictNames); - digger.addValidItems(Arrays.asList( + backpackItemDefaults.get(BackpackManager.DIGGER_UID).addAll(getItemStrings(Arrays.asList( new ItemStack(Blocks.dirt, 1, OreDictionary.WILDCARD_VALUE), new ItemStack(Blocks.gravel), new ItemStack(Items.flint), @@ -271,26 +217,24 @@ public class PluginStorage extends BlankForestryPlugin { PluginCore.items.bronzeShovel.getItemStack(), PluginCore.items.kitShovel.getItemStack(), PluginCore.items.brokenBronzeShovel.getItemStack() - )); + ))); - forester.addValidOreDictNames(foresterOreDictNames); - forester.addValidItems(Arrays.asList( + backpackItemDefaults.get(BackpackManager.FORESTER_UID).addAll(getItemStrings(Arrays.asList( new ItemStack(Blocks.red_mushroom), new ItemStack(Blocks.brown_mushroom), new ItemStack(Blocks.red_flower), new ItemStack(Blocks.yellow_flower), new ItemStack(Blocks.cactus), new ItemStack(Blocks.tallgrass, 1, OreDictionary.WILDCARD_VALUE), - new ItemStack(Blocks.vine), new ItemStack(Blocks.pumpkin), new ItemStack(Blocks.melon_block), new ItemStack(Items.golden_apple), new ItemStack(Items.nether_wart), new ItemStack(Items.pumpkin_seeds), new ItemStack(Items.melon_seeds) - )); + ))); - hunter.addValidItems(Arrays.asList( + backpackItemDefaults.get(BackpackManager.HUNTER_UID).addAll(getItemStrings(Arrays.asList( new ItemStack(Items.feather), new ItemStack(Items.gunpowder), new ItemStack(Items.blaze_powder), @@ -328,11 +272,9 @@ public class PluginStorage extends BlankForestryPlugin { new ItemStack(Items.diamond_horse_armor), new ItemStack(Items.golden_horse_armor), new ItemStack(Items.iron_horse_armor) - )); + ))); - builder.addValidOreDictNames(builderOreDictNames); - builder.addValidItems(Arrays.asList( - new ItemStack(Blocks.torch), + backpackItemDefaults.get(BackpackManager.BUILDER_UID).addAll(getItemStrings(Arrays.asList( new ItemStack(Blocks.redstone_torch), new ItemStack(Blocks.redstone_lamp), new ItemStack(Blocks.stonebrick, 1, OreDictionary.WILDCARD_VALUE), @@ -352,59 +294,82 @@ public class PluginStorage extends BlankForestryPlugin { new ItemStack(Blocks.ladder), new ItemStack(Blocks.iron_bars), new ItemStack(Blocks.quartz_block, 1, OreDictionary.WILDCARD_VALUE), + new ItemStack(Blocks.cobblestone_wall), + new ItemStack(Blocks.stone_button), + new ItemStack(Blocks.wooden_button), + new ItemStack(Blocks.stone_slab), + new ItemStack(Blocks.wooden_slab), + new ItemStack(Blocks.trapdoor), + new ItemStack(Blocks.iron_trapdoor), + new ItemStack(Blocks.stone_pressure_plate), + new ItemStack(Blocks.wooden_pressure_plate), new ItemStack(Items.sign), - new ItemStack(Items.item_frame) - )); + new ItemStack(Items.item_frame), + new ItemStack(Items.acacia_door), + new ItemStack(Items.birch_door), + new ItemStack(Items.dark_oak_door), + new ItemStack(Items.iron_door), + new ItemStack(Items.jungle_door), + new ItemStack(Items.oak_door), + new ItemStack(Items.spruce_door) + ))); BlockRegistryApiculture beeBlocks = PluginApiculture.blocks; if (beeBlocks != null) { - builder.addValidItem(new ItemStack(beeBlocks.candle, 1, OreDictionary.WILDCARD_VALUE)); - builder.addValidItem(new ItemStack(beeBlocks.stump, 1, OreDictionary.WILDCARD_VALUE)); + backpackItemDefaults.get(BackpackManager.BUILDER_UID).addAll(getItemStrings(Arrays.asList( + new ItemStack(beeBlocks.candle, 1, OreDictionary.WILDCARD_VALUE), + new ItemStack(beeBlocks.stump, 1, OreDictionary.WILDCARD_VALUE) + ))); } } - private static void handleBackpackConfig(LocalizedConfiguration config, String backpackName) { - BackpackDefinition backpackDefinition = (BackpackDefinition) BackpackManager.backpackInterface.getBackpack(backpackName); - - List backpackItems; - List backpackOreDict = new ArrayList<>(); - - { - List validItems = new ArrayList<>(backpackDefinition.getValidItemStacks()); - Collections.sort(validItems); - String[] defaultValidItems = validItems.toArray(new String[validItems.size()]); - - Property backpackConf = config.get("backpacks." + backpackName, "item.stacks", defaultValidItems); - backpackConf.comment = Translator.translateToLocalFormatted("for.config.backpacks.item.stacks.format", backpackName); - - String[] backpackItemList = backpackConf.getStringList(); - backpackItems = ItemStackUtil.parseItemStackStrings(backpackItemList, OreDictionary.WILDCARD_VALUE); - } - - { - List oreIds = new ArrayList<>(backpackDefinition.getValidOreIds()); - String[] defaultOreNames = new String[oreIds.size()]; - for (int i = 0; i < oreIds.size(); i++) { - int oreId = oreIds.get(i); - defaultOreNames[i] = OreDictionary.getOreName(oreId); - } - - List defaultOreNamesList = new ArrayList<>(); - Collections.addAll(defaultOreNamesList, defaultOreNames); - Collections.sort(defaultOreNamesList); - defaultOreNames = defaultOreNamesList.toArray(new String[defaultOreNamesList.size()]); - - Property backpackConf = config.get("backpacks." + backpackName, "ore.dict", defaultOreNames); - backpackConf.comment = Translator.translateToLocalFormatted("for.config.backpacks.ore.dict.format", backpackName); - - String[] oreDictNameList = backpackConf.getStringList(); - Collections.addAll(backpackOreDict, oreDictNameList); + @Nonnull + private static Set getItemStrings(List itemStacks) { + Set itemStrings = new HashSet<>(itemStacks.size()); + for (ItemStack itemStack : itemStacks) { + String itemString = ItemStackUtil.getStringForItemStack(itemStack); + itemStrings.add(itemString); } + return itemStrings; + } + private void handleBackpackConfig(LocalizedConfiguration config, String backpackUid) { + BackpackDefinition backpackDefinition = (BackpackDefinition) BackpackManager.backpackInterface.getBackpack(backpackUid); backpackDefinition.clearAllValid(); - backpackDefinition.addValidItems(backpackItems); - backpackDefinition.addValidOreDictNames(backpackOreDict); + { + List defaultItemNames = new ArrayList<>(backpackItemDefaults.get(backpackUid)); + Collections.sort(defaultItemNames); + String[] defaultValidItems = defaultItemNames.toArray(new String[defaultItemNames.size()]); + + Property backpackConf = config.get("backpacks." + backpackUid, "item.stacks", defaultValidItems); + backpackConf.comment = Translator.translateToLocalFormatted("for.config.backpacks.item.stacks.format", backpackUid); + + String[] backpackItemList = backpackConf.getStringList(); + List backpackItems = ItemStackUtil.parseItemStackStrings(backpackItemList, OreDictionary.WILDCARD_VALUE); + backpackDefinition.addValidItems(backpackItems); + } + + { + + List defaultOreRegexpList = new ArrayList<>(backpackOreDictRegexpDefaults.get(backpackUid)); + Collections.sort(defaultOreRegexpList); + String[] defaultOreRegexpNames = defaultOreRegexpList.toArray(new String[defaultOreRegexpList.size()]); + + Property backpackConf = config.get("backpacks." + backpackUid, "ore.dict", defaultOreRegexpNames); + backpackConf.comment = Translator.translateToLocalFormatted("for.config.backpacks.ore.dict.format", backpackUid); + + List oreDictNameList = new ArrayList<>(); + for (String name : OreDictionary.getOreNames()) { + for (String regex : backpackConf.getStringList()) { + if (name.matches(regex)) { + oreDictNameList.add(name); + } + } + } + + backpackDefinition.addValidOreDictNames(oreDictNameList); + } } public static void registerCrate(ItemCrated crate) {