diff --git a/src/main/java/ab/common/core/proxy/CommonProxy.java b/src/main/java/ab/common/core/proxy/CommonProxy.java index 9b9de5f..730731e 100644 --- a/src/main/java/ab/common/core/proxy/CommonProxy.java +++ b/src/main/java/ab/common/core/proxy/CommonProxy.java @@ -10,8 +10,8 @@ import ab.common.lib.register.EntityListAB; import ab.common.lib.register.FlowerRegister; import ab.common.lib.register.ItemListAB; import ab.common.minetweaker.MineTweakerConfig; -import ab.common.utils.CraftingManager; -import ab.common.utils.ModHelperManager; +import ab.utils.CraftingManager; +import ab.utils.ModHelperManager; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; diff --git a/src/main/java/ab/common/lib/register/AchievementRegister.java b/src/main/java/ab/common/lib/register/AchievementRegister.java index a94cfad..6eaccea 100644 --- a/src/main/java/ab/common/lib/register/AchievementRegister.java +++ b/src/main/java/ab/common/lib/register/AchievementRegister.java @@ -6,7 +6,7 @@ import net.minecraftforge.common.AchievementPage; import ab.api.AchievementAB; import ab.api.AdvancedBotanyAPI; -import ab.common.utils.*; +import ab.utils.*; public class AchievementRegister { diff --git a/src/main/java/ab/common/lib/register/BlockListAB.java b/src/main/java/ab/common/lib/register/BlockListAB.java index bd0d435..ad5e7c1 100644 --- a/src/main/java/ab/common/lib/register/BlockListAB.java +++ b/src/main/java/ab/common/lib/register/BlockListAB.java @@ -30,7 +30,7 @@ import ab.common.block.tile.TileNidavellirForge; import ab.common.core.handler.ConfigABHandler; import ab.common.item.block.ItemBlockBase; import ab.common.item.block.ItemBlockBoard; -import ab.common.utils.*; +import ab.utils.*; import cpw.mods.fml.common.registry.GameRegistry; public class BlockListAB { diff --git a/src/main/java/ab/common/lib/register/EntityListAB.java b/src/main/java/ab/common/lib/register/EntityListAB.java index ad8adf2..a81b28f 100644 --- a/src/main/java/ab/common/lib/register/EntityListAB.java +++ b/src/main/java/ab/common/lib/register/EntityListAB.java @@ -7,7 +7,7 @@ import ab.common.entity.EntityManaVine; import ab.common.entity.EntityNebulaBlaze; import ab.common.entity.EntitySeed; import ab.common.entity.EntitySword; -import ab.common.utils.*; +import ab.utils.*; import cpw.mods.fml.common.registry.EntityRegistry; public class EntityListAB { diff --git a/src/main/java/ab/common/lib/register/FlowerRegister.java b/src/main/java/ab/common/lib/register/FlowerRegister.java index 1396259..2083312 100644 --- a/src/main/java/ab/common/lib/register/FlowerRegister.java +++ b/src/main/java/ab/common/lib/register/FlowerRegister.java @@ -9,7 +9,7 @@ import ab.common.block.subtile.SubTileArdentAzarcissus; import ab.common.block.subtile.SubTileAspecolus; import ab.common.block.subtile.SubTileDictarius; import ab.common.block.subtile.SubTilePureGladiolus; -import ab.common.utils.*; +import ab.utils.*; public class FlowerRegister { diff --git a/src/main/java/ab/common/lib/register/ItemListAB.java b/src/main/java/ab/common/lib/register/ItemListAB.java index c2bc82c..7edb375 100644 --- a/src/main/java/ab/common/lib/register/ItemListAB.java +++ b/src/main/java/ab/common/lib/register/ItemListAB.java @@ -16,7 +16,7 @@ import ab.common.item.relic.ItemHornPlenty; import ab.common.item.relic.ItemPocketWardrobe; import ab.common.item.relic.ItemSphereNavigation; import ab.common.item.relic.ItemTalismanHiddenRiches; -import ab.common.utils.*; +import ab.utils.*; import cpw.mods.fml.common.registry.GameRegistry; public class ItemListAB { diff --git a/src/main/java/ab/common/lib/register/RecipeListAB.java b/src/main/java/ab/common/lib/register/RecipeListAB.java index 1fafaf6..b827fa3 100644 --- a/src/main/java/ab/common/lib/register/RecipeListAB.java +++ b/src/main/java/ab/common/lib/register/RecipeListAB.java @@ -3,7 +3,6 @@ package ab.common.lib.register; import java.util.ArrayList; import java.util.List; -import net.fuzzycraft.botanichorizons.util.OreDict; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; @@ -53,9 +52,10 @@ import ab.api.recipe.lexicon.AlphirineCraftPage; import ab.common.block.tile.TileLebethronCore; import ab.common.core.handler.ConfigABHandler; import ab.common.item.ItemCraftingPattern; -import ab.common.utils.*; -import ab.common.utils.LocalizationManager; -import ab.common.utils.VersionInfo; +import ab.utils.*; +import ab.utils.LocalizationManager; +import ab.utils.OreDict; +import ab.utils.VersionInfo; import cpw.mods.fml.common.registry.GameRegistry; public class RecipeListAB implements IModHelper { diff --git a/src/main/java/ab/common/utils/VersionInfo.java b/src/main/java/ab/common/utils/VersionInfo.java deleted file mode 100644 index 17a66e8..0000000 --- a/src/main/java/ab/common/utils/VersionInfo.java +++ /dev/null @@ -1,9 +0,0 @@ -package ab.common.utils; - -public class VersionInfo { - - public static final String ModID = "GRADLETOKEN_MODID"; - public static final String ModName = "GRADLETOKEN_MODNAME"; - public static final String Version = "GRADLETOKEN_VERSION"; - public static final String Depends = "required-after:Thaumcraft; "; -} diff --git a/src/main/java/ab/utils/CraftingManager.java b/src/main/java/ab/utils/CraftingManager.java index c1af574..67045d2 100644 --- a/src/main/java/ab/utils/CraftingManager.java +++ b/src/main/java/ab/utils/CraftingManager.java @@ -1,4 +1,4 @@ -package ab.common.utils; +package ab.utils; public class CraftingManager { diff --git a/src/main/java/ab/utils/IModHelper.java b/src/main/java/ab/utils/IModHelper.java index c9de689..f80abaa 100644 --- a/src/main/java/ab/utils/IModHelper.java +++ b/src/main/java/ab/utils/IModHelper.java @@ -1,4 +1,4 @@ -package ab.common.utils; +package ab.utils; public interface IModHelper { diff --git a/src/main/java/ab/utils/LocalizationManager.java b/src/main/java/ab/utils/LocalizationManager.java index 6421c20..6f2d545 100644 --- a/src/main/java/ab/utils/LocalizationManager.java +++ b/src/main/java/ab/utils/LocalizationManager.java @@ -1,4 +1,4 @@ -package ab.common.utils; +package ab.utils; import net.minecraft.util.StatCollector; diff --git a/src/main/java/ab/utils/ModHelperManager.java b/src/main/java/ab/utils/ModHelperManager.java index 341db7e..f67f3a3 100644 --- a/src/main/java/ab/utils/ModHelperManager.java +++ b/src/main/java/ab/utils/ModHelperManager.java @@ -1,4 +1,4 @@ -package ab.common.utils; +package ab.utils; import ab.common.lib.register.RecipeListAB; diff --git a/src/main/java/ab/utils/OreDict.java b/src/main/java/ab/utils/OreDict.java new file mode 100644 index 0000000..c8bb008 --- /dev/null +++ b/src/main/java/ab/utils/OreDict.java @@ -0,0 +1,44 @@ +package ab.utils; + +import java.util.Arrays; +import java.util.List; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; + +import vazkii.botania.common.lib.LibOreDict; + +public class OreDict { + + public static final String[] FLOWER_INGREDIENT = new String[] { "flowerIngredientWhite", "flowerIngredientOrange", + "flowerIngredientMagenta", "flowerIngredientLightBlue", "flowerIngredientYellow", "flowerIngredientLime", + "flowerIngredientPink", "flowerIngredientGray", "flowerIngredientLightGray", "flowerIngredientCyan", + "flowerIngredientPurple", "flowerIngredientBlue", "flowerIngredientBrown", "flowerIngredientGreen", + "flowerIngredientRed", "flowerIngredientBlack" }; + + public static final String[] FLOWER_VANILLA = new String[] { "flowerWhite", "flowerOrange", "flowerMagenta", + "flowerLightBlue", "flowerYellow", "flowerLime", "flowerPink", "flowerGray", "flowerLightGray", + "flowerCyan", "flowerPurple", "flowerBlue", "flowerBrown", "flowerGreen", "flowerRed", "flowerBlack" }; + + public static final String GAIA_SPIRIT = LibOreDict.LIFE_ESSENCE; + + public static final String MUSHROOM = "listMagicMushroom"; + + public static final String FLOWER_NONMAGICAL = "flowerNonmagical"; + + // GT Material references + public static final String MANA_STEEL_PLATE = "plateManasteel"; + public static final String DENSE_MANA_STEEL_PLATE = "plateDenseManasteel"; + public static final String TERRA_STEEL_PLATE = "plateTerrasteel"; + public static final String DENSE_TERRA_STEEL_PLATE = "plateDenseTerrasteel"; + public static final String ELEMENTIUM_PLATE = "plateElvenElementium"; + public static final String DENSE_ELEMENTIUM_STEEL_PLATE = "plateDenseElvenElementium"; + + public static final ItemStack preference(String... oredictKeys) { + for (String key : oredictKeys) { + List ores = OreDictionary.getOres(key); + if (ores != null && ores.size() > 0) return ores.get(0); + } + throw new IllegalArgumentException("Can't find any oreDictionary entry among " + Arrays.toString(oredictKeys)); + } +} diff --git a/src/main/java/ab/utils/VersionInfo.java b/src/main/java/ab/utils/VersionInfo.java index 17a66e8..8cd572d 100644 --- a/src/main/java/ab/utils/VersionInfo.java +++ b/src/main/java/ab/utils/VersionInfo.java @@ -1,4 +1,4 @@ -package ab.common.utils; +package ab.utils; public class VersionInfo {