From 80d31c632f161c1e30d96a339dede4d486e1feb7 Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Tue, 9 Dec 2014 16:12:15 +0800 Subject: [PATCH] SAG Mill no longer produces dusts for metals that are not available Added config option to add Ore Dictionary entries and registered names to tooltips (default is off) --- ReleaseNotes.txt | 2 + .../config/AlloySmelterRecipes_Core.xml | 16 +++++ .../enderio/config/SAGMillRecipes_Core.xml | 57 ++++++++++----- .../crazypants/enderio/config/Config.java | 7 +- .../crazypants/enderio/gui/TooltipAddera.java | 42 +++++++++-- .../enderio/material/ItemPowderIngot.java | 4 +- .../enderio/material/MaterialRecipes.java | 69 +++++++++++-------- .../enderio/material/PowderIngot.java | 30 +++++--- .../crazypants/util/OreDictionaryHelper.java | 48 +++++++++++++ 9 files changed, 213 insertions(+), 62 deletions(-) create mode 100644 src/main/java/crazypants/util/OreDictionaryHelper.java diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 8481386d..83dcd579 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -8,9 +8,11 @@ New - 3 tiers - Configurable level / io display - Existing cap banks unchanged but are no longer craftable. Convert them to new version by placing in the crafting grid (power level is maintained) +- Added config option to add Ore Dictionary entries and registered names to tooltips (default is off) Changes - Updated implementation of RF API to correctly handle IEnergyReceivers that are not IEnergyHandlers +- SAG Mill no longer produces dusts for metals that are not available Bugs - #1268 Capacitor bank not honoring input redstone settings diff --git a/resources/assets/enderio/config/AlloySmelterRecipes_Core.xml b/resources/assets/enderio/config/AlloySmelterRecipes_Core.xml index da8764f3..08c4b9d7 100644 --- a/resources/assets/enderio/config/AlloySmelterRecipes_Core.xml +++ b/resources/assets/enderio/config/AlloySmelterRecipes_Core.xml @@ -41,6 +41,22 @@ String recipe = ""; FMLInterModComms.sendMessage("EnderIO", "recipe:alloysmelter", recipe); + + +Item Information and data dumps: + +To show ore dictionary and/or registered names, in the EnderIO config set: +addRegisterdNameTooltip=true +addOreDictionaryTooltips=true + +To write all registered items to config/modObjectsRegistery.txt include in SAGMillRecipes_User.xml: + + + + --> diff --git a/resources/assets/enderio/config/SAGMillRecipes_Core.xml b/resources/assets/enderio/config/SAGMillRecipes_Core.xml index 3f7b1c46..d25cb14b 100644 --- a/resources/assets/enderio/config/SAGMillRecipes_Core.xml +++ b/resources/assets/enderio/config/SAGMillRecipes_Core.xml @@ -53,10 +53,10 @@ - Must have either: modID + itemName or oreDictionary - 'modID' is the identifier registered by the mod with Forge (for example vanilla blocks use 'minecraft' while Ender IO is 'EnderIO'). This value can be found in the details panel of Forge's 'mods' UI. - - 'itemName' the name used to register the block/item with forge. To dump all registered items to config/modObjectsRegistery.txt + - 'itemName' the name used to register the block/item with forge. To write all registered items to config/modObjectsRegistery.txt include: + will be used. To write the contents of the ore dictionary to config/oreDictionaryRegistery.txt include - The item metadata/damage may optionally be specified for all types except oreDictionary. If a '*' is used for the metadata value then meta data will ignored when determining if an input is valid. @@ -124,6 +124,18 @@ Examples: + +Item Information and data dumps: +To write all registered items to config/modObjectsRegistery.txt include: + + +To show ore dictionary and/or registered names, in the EnderIO config set: +addRegisterdNameTooltip=true +addOreDictionaryTooltips=true + --> @@ -148,7 +160,7 @@ Examples: - + @@ -158,9 +170,18 @@ Examples: + + + + + + + + + + - - + @@ -168,9 +189,9 @@ Examples: - - - + + + @@ -181,7 +202,7 @@ Examples: - + @@ -190,8 +211,8 @@ Examples: - - + + @@ -201,7 +222,7 @@ Examples: - + @@ -210,7 +231,7 @@ Examples: - + @@ -446,8 +467,8 @@ Examples: - - + + @@ -457,7 +478,7 @@ Examples: - + @@ -466,7 +487,7 @@ Examples: - + @@ -476,7 +497,7 @@ Examples: - + diff --git a/src/main/java/crazypants/enderio/config/Config.java b/src/main/java/crazypants/enderio/config/Config.java index bf5f0608..3924c9cf 100644 --- a/src/main/java/crazypants/enderio/config/Config.java +++ b/src/main/java/crazypants/enderio/config/Config.java @@ -244,6 +244,8 @@ public final class Config { public static boolean addFuelTooltipsToAllFluidContainers = true; public static boolean addFurnaceFuelTootip = true; public static boolean addDurabilityTootip = true; + public static boolean addOreDictionaryTooltips = false; + public static boolean addRegisterdNameTooltip = false; public static int farmContinuousEnergyUseRF = 40; public static int farmActionEnergyUseRF = 500; @@ -396,7 +398,6 @@ public final class Config { public static boolean enchantmentSoulBoundEnabled = true; - public static void load(FMLPreInitializationEvent event) { FMLCommonHandler.instance().bus().register(new Config()); @@ -862,6 +863,10 @@ public final class Config { addDurabilityTootip); addFurnaceFuelTootip = config.get(sectionPersonal.name, "addFurnaceFuelTootip", addFuelTooltipsToAllFluidContainers, "If true, adds burn duration tooltips to furnace fuels").getBoolean(addFurnaceFuelTootip); + addOreDictionaryTooltips = config.get(sectionPersonal.name, "addOreDictionaryTooltips", addOreDictionaryTooltips, + "If true, adds ore dictionary registrations to tooltips").getBoolean(addOreDictionaryTooltips); + addRegisterdNameTooltip = config.get(sectionPersonal.name, "addRegisterdNameTooltip", addRegisterdNameTooltip, + "If true, adds the registered name for the item").getBoolean(addRegisterdNameTooltip); farmContinuousEnergyUseRF = config.get(sectionFarm.name, "farmContinuousEnergyUseRF", farmContinuousEnergyUseRF, "The amount of power used by a farm per tick ").getInt(farmContinuousEnergyUseRF); diff --git a/src/main/java/crazypants/enderio/gui/TooltipAddera.java b/src/main/java/crazypants/enderio/gui/TooltipAddera.java index 29429ab8..1cee032b 100644 --- a/src/main/java/crazypants/enderio/gui/TooltipAddera.java +++ b/src/main/java/crazypants/enderio/gui/TooltipAddera.java @@ -5,6 +5,7 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemBow; @@ -19,10 +20,13 @@ import net.minecraftforge.event.entity.player.ItemTooltipEvent; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.oredict.OreDictionary; import org.lwjgl.input.Keyboard; import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.common.registry.GameRegistry.UniqueIdentifier; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.config.Config; @@ -89,6 +93,35 @@ public class TooltipAddera { btp.ball = gb; TooltipAddera.instance.addInformation(btp, evt.itemStack, evt.entityPlayer, evt.toolTip, false); } + + if(Config.addRegisterdNameTooltip) { + UniqueIdentifier uid = null; + Block block = Block.getBlockFromItem(evt.itemStack.getItem()); + if(block != null && block != Blocks.air) { + uid = GameRegistry.findUniqueIdentifierFor(block); + } else { + uid = GameRegistry.findUniqueIdentifierFor(evt.itemStack.getItem()); + } + if(uid != null) { + evt.toolTip.add(EnumChatFormatting.AQUA + "UID: " + uid.toString() + " Meta: " + evt.itemStack.getItemDamage()); + } + } + + if(Config.addOreDictionaryTooltips) { + int[] ids = OreDictionary.getOreIDs(evt.itemStack); + if(ids != null && ids.length > 0) { + if(ids.length == 1) { + evt.toolTip.add(EnumChatFormatting.AQUA + "Ore Dictionary: " + OreDictionary.getOreName(ids[0])); + } else { + evt.toolTip.add(EnumChatFormatting.AQUA + "Ore Dictionary:"); + for (int id : ids) { + String name = OreDictionary.getOreName(id); + evt.toolTip.add(EnumChatFormatting.AQUA + " " + name); + } + } + } + + } } public static void addDurabilityTooltip(List toolTip, ItemStack itemStack) { @@ -151,7 +184,7 @@ public class TooltipAddera { } else { addBasicTooltipFromResources(list, name); addCommonTooltipFromResources(list, name); - if (hasDetailedTooltip(tt, itemstack)) { + if(hasDetailedTooltip(tt, itemstack)) { addShowDetailsTooltip(list); } } @@ -168,21 +201,22 @@ public class TooltipAddera { } } } - + private static final List throwaway = new ArrayList(); + private static boolean hasDetailedTooltip(IResourceTooltipProvider tt, ItemStack stack) { throwaway.clear(); String name = tt.getUnlocalizedNameForTooltip(stack); addDetailedTooltipFromResources(throwaway, name); return !throwaway.isEmpty(); } - + private static boolean hasDetailedTooltip(IAdvancedTooltipProvider tt, ItemStack stack, EntityPlayer player, boolean flag) { throwaway.clear(); tt.addDetailedEntries(stack, player, throwaway, flag); return !throwaway.isEmpty(); } - + public static void addShowDetailsTooltip(List list) { list.add(EnumChatFormatting.WHITE + "" + EnumChatFormatting.ITALIC + Lang.localize("item.tooltip.showDetails")); } diff --git a/src/main/java/crazypants/enderio/material/ItemPowderIngot.java b/src/main/java/crazypants/enderio/material/ItemPowderIngot.java index 0fc7563a..b3c4b66e 100644 --- a/src/main/java/crazypants/enderio/material/ItemPowderIngot.java +++ b/src/main/java/crazypants/enderio/material/ItemPowderIngot.java @@ -59,7 +59,9 @@ public class ItemPowderIngot extends Item { @SuppressWarnings({ "rawtypes", "unchecked" }) public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { for (int j = 0; j < PowderIngot.values().length; ++j) { - par3List.add(new ItemStack(par1, 1, j)); + if(PowderIngot.values()[j].isDependancyMet()) { + par3List.add(new ItemStack(par1, 1, j)); + } } } diff --git a/src/main/java/crazypants/enderio/material/MaterialRecipes.java b/src/main/java/crazypants/enderio/material/MaterialRecipes.java index b8d342ce..0e93e66d 100644 --- a/src/main/java/crazypants/enderio/material/MaterialRecipes.java +++ b/src/main/java/crazypants/enderio/material/MaterialRecipes.java @@ -1,7 +1,5 @@ package crazypants.enderio.material; -import static crazypants.enderio.EnderIO.itemBasicCapacitor; - import java.util.ArrayList; import net.minecraft.init.Blocks; @@ -14,6 +12,14 @@ import net.minecraftforge.oredict.ShapedOreRecipe; import cpw.mods.fml.common.registry.GameRegistry; import crazypants.enderio.EnderIO; import crazypants.enderio.config.Config; +import crazypants.util.OreDictionaryHelper; +import static crazypants.enderio.EnderIO.itemBasicCapacitor; + +import static crazypants.util.OreDictionaryHelper.INGOT_TIN; +import static crazypants.util.OreDictionaryHelper.getPreffered; +import static crazypants.util.OreDictionaryHelper.hasCopper; +import static crazypants.util.OreDictionaryHelper.hasEnderPearlDust; +import static crazypants.util.OreDictionaryHelper.hasTin; public class MaterialRecipes { @@ -22,12 +28,17 @@ public class MaterialRecipes { OreDictionary.registerOre("dustCoal", new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_COAL.ordinal())); OreDictionary.registerOre("dustIron", new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_IRON.ordinal())); OreDictionary.registerOre("dustGold", new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_GOLD.ordinal())); - OreDictionary.registerOre("dustCopper", new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_COPPER.ordinal())); - OreDictionary.registerOre("dustTin", new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_TIN.ordinal())); - OreDictionary.registerOre("dustEnderPearl", new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_ENDER.ordinal())); + if(hasCopper()) { + OreDictionary.registerOre("dustCopper", new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_COPPER.ordinal())); + } + if(hasTin()) { + OreDictionary.registerOre("dustTin", new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_TIN.ordinal())); + } + if(hasEnderPearlDust()) { + OreDictionary.registerOre("dustEnderPearl", new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_ENDER.ordinal())); + } OreDictionary.registerOre("gearStone", new ItemStack(EnderIO.itemMachinePart, 1, MachinePart.BASIC_GEAR.ordinal())); - OreDictionary.registerOre("itemSilicon", new ItemStack(EnderIO.itemMaterial, 1, Material.SILICON.ordinal())); for (Alloy alloy : Alloy.values()) { @@ -46,9 +57,9 @@ public class MaterialRecipes { OreDictionary.registerOre("ingotGold", Items.gold_ingot); ItemStack pureGlass = new ItemStack(EnderIO.blockFusedQuartz, 1, BlockFusedQuartz.Type.GLASS.ordinal()); - OreDictionary.registerOre("glass", pureGlass); - OreDictionary.registerOre("blockGlass", pureGlass); - OreDictionary.registerOre("blockGlassHardened", new ItemStack(EnderIO.blockFusedQuartz, 1, BlockFusedQuartz.Type.FUSED_QUARTZ.ordinal())); + OreDictionary.registerOre("glass", pureGlass); + OreDictionary.registerOre("blockGlass", pureGlass); + OreDictionary.registerOre("blockGlassHardened", new ItemStack(EnderIO.blockFusedQuartz, 1, BlockFusedQuartz.Type.FUSED_QUARTZ.ordinal())); //Skulls ItemStack skull = new ItemStack(Items.skull, 1, OreDictionary.WILDCARD_VALUE); @@ -78,7 +89,7 @@ public class MaterialRecipes { ItemStack darkSteel = new ItemStack(EnderIO.itemAlloy, 1, Alloy.DARK_STEEL.ordinal()); ItemStack capacitor = new ItemStack(itemBasicCapacitor, 1, 0); - + //Conduit Binder ItemStack cbc = binderComposite.copy(); cbc.stackSize = 8; @@ -158,36 +169,34 @@ public class MaterialRecipes { if(Config.reinforcedObsidianUseDarkSteelBlocks) { corners = new ItemStack(EnderIO.blockIngotStorage, 1, Alloy.DARK_STEEL.ordinal()); } - GameRegistry.addShapedRecipe(reinfObs , "dbd", "bob", "dbd", 'd', corners, 'b', EnderIO.blockDarkIronBars, 'o', Blocks.obsidian); + GameRegistry.addShapedRecipe(reinfObs, "dbd", "bob", "dbd", 'd', corners, 'b', EnderIO.blockDarkIronBars, 'o', Blocks.obsidian); } - - GameRegistry.addRecipe(new ShapedOreRecipe(EnderIO.blockDarkSteelAnvil, - "bbb", - " i ", - "iii", - - 'b', "blockDarkSteel", - 'i', "ingotDarkSteel" - )); - + + GameRegistry.addRecipe(new ShapedOreRecipe(EnderIO.blockDarkSteelAnvil, + "bbb", + " i ", + "iii", + + 'b', "blockDarkSteel", + 'i', "ingotDarkSteel" + )); + GameRegistry.addRecipe(new ItemStack(EnderIO.blockDarkSteelLadder, 12), "b", "b", "b", 'b', EnderIO.blockDarkIronBars); for (Alloy alloy : Alloy.values()) { - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(EnderIO.blockIngotStorage, 1, alloy.ordinal()), "iii", "iii", "iii", 'i', alloy.oredictIngotName)); + GameRegistry + .addRecipe(new ShapedOreRecipe(new ItemStack(EnderIO.blockIngotStorage, 1, alloy.ordinal()), "iii", "iii", "iii", 'i', alloy.oredictIngotName)); GameRegistry.addShapelessRecipe(new ItemStack(EnderIO.itemAlloy, 9, alloy.ordinal()), new ItemStack(EnderIO.blockIngotStorage, 1, alloy.ordinal())); } } public static void addOreDictionaryRecipes() { - int oreId = OreDictionary.getOreID("ingotCopper"); - ArrayList ingots = OreDictionary.getOres(oreId); - if(!ingots.isEmpty()) { - FurnaceRecipes.smelting().func_151394_a(new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_COPPER.ordinal()), ingots.get(0), 0); + if(OreDictionaryHelper.hasCopper()) { + FurnaceRecipes.smelting().func_151394_a(new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_COPPER.ordinal()), + getPreffered(OreDictionaryHelper.INGOT_COPPER), 0); } - oreId = OreDictionary.getOreID("ingotTin"); - ingots = OreDictionary.getOres(oreId); - if(!ingots.isEmpty()) { - FurnaceRecipes.smelting().func_151394_a(new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_TIN.ordinal()), ingots.get(0), 0); + if(hasTin()) { + FurnaceRecipes.smelting().func_151394_a(new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_TIN.ordinal()), getPreffered(INGOT_TIN), 0); } ItemStack capacitor = new ItemStack(EnderIO.itemBasicCapacitor, 1, 0); diff --git a/src/main/java/crazypants/enderio/material/PowderIngot.java b/src/main/java/crazypants/enderio/material/PowderIngot.java index 4f87a47a..b03a0577 100644 --- a/src/main/java/crazypants/enderio/material/PowderIngot.java +++ b/src/main/java/crazypants/enderio/material/PowderIngot.java @@ -1,14 +1,19 @@ package crazypants.enderio.material; +import static crazypants.util.OreDictionaryHelper.DUST_ENDERPEARL; +import static crazypants.util.OreDictionaryHelper.INGOT_COPPER; +import static crazypants.util.OreDictionaryHelper.INGOT_TIN; +import static crazypants.util.OreDictionaryHelper.isRegistered; + public enum PowderIngot { - POWDER_COAL("powderCoal"), - POWDER_IRON("powderIron"), - POWDER_GOLD("powderGold"), - POWDER_COPPER("powderCopper"), - POWDER_TIN("powderTin"), - POWDER_ENDER("powderEnder"); + POWDER_COAL("powderCoal", null), + POWDER_IRON("powderIron", null), + POWDER_GOLD("powderGold", null), + POWDER_COPPER("powderCopper", INGOT_COPPER), + POWDER_TIN("powderTin", INGOT_TIN), + POWDER_ENDER("powderEnder", DUST_ENDERPEARL); // POWDER_LEAD("powderLead", "Lead Powder", "powderLead"), // POWDER_SILVER("powderSilver", "Silver Powder", "powderSilver"), // POWDER_BRONZE("powderBronze", "Bronze Powder", "powderBronze"), @@ -21,10 +26,19 @@ public enum PowderIngot { public final String unlocalisedName; public final String iconKey; + public final String oreDictDependancy; - private PowderIngot(String unlocalisedName) { + private PowderIngot(String unlocalisedName, String oreDictDependancy) { this.unlocalisedName = "enderio." + unlocalisedName; - this.iconKey = "enderio:" + unlocalisedName; + iconKey = "enderio:" + unlocalisedName; + this.oreDictDependancy = oreDictDependancy; + } + + public boolean isDependancyMet() { + if(oreDictDependancy == null) { + return true; + } + return isRegistered(oreDictDependancy); } } diff --git a/src/main/java/crazypants/util/OreDictionaryHelper.java b/src/main/java/crazypants/util/OreDictionaryHelper.java new file mode 100644 index 00000000..7b18d6e9 --- /dev/null +++ b/src/main/java/crazypants/util/OreDictionaryHelper.java @@ -0,0 +1,48 @@ +package crazypants.util; + +import java.util.List; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; + +public final class OreDictionaryHelper { + + public static final String INGOT_COPPER = "ingotCopper"; + public static final String INGOT_TIN = "ingotTin"; + public static final String DUST_ENDERPEARL = "dustEnderPearl"; + + public static boolean isRegistered(String name) { + if(!getOres(name).isEmpty()) { + return true; + } + return false; + } + + public static List getOres(String name) { + return OreDictionary.getOres(name); + } + + public static boolean hasCopper() { + return isRegistered(INGOT_COPPER); + } + + public static boolean hasTin() { + return isRegistered(INGOT_TIN); + } + + public static boolean hasEnderPearlDust() { + return isRegistered(DUST_ENDERPEARL); + } + + public static ItemStack getPreffered(String oreDictName) { + List ores = getOres(oreDictName); + if(ores.isEmpty()) { + return null; + } + return ores.get(0); + } + + private OreDictionaryHelper() { + } + +}