Merge pull request #7 from EnderProyects/feature/advanced_botany_infu

Feature/advanced botany infu

dependencies.gradle

@@ -1,11 +1,11 @@
 dependencies {
-    api('com.github.GTNewHorizons:Botania:1.9.2-GTNH:dev')
+    api('com.github.GTNewHorizons:Botania:1.9.16-GTNH:dev')
+    api('com.github.GTNewHorizons:Botanic-horizons:1.0.15-GTNH:dev')
     api('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev')
-    api('com.github.GTNewHorizons:GT5-Unofficial:5.09.41.254:dev')
-    api('com.github.GTNewHorizons:Baubles:1.0.1.14:dev')
-    compileOnly("com.github.GTNewHorizons:CodeChickenLib:1.1.5.3:dev")
-    compileOnly("com.github.GTNewHorizons:CodeChickenCore:1.1.5:dev")
-    compileOnly("com.github.GTNewHorizons:NotEnoughItems:2.2.8-GTNH:dev")
-    compileOnly("com.github.GTNewHorizons:CraftTweaker:3.2.6:dev")
-    //compileOnly("com.github.stanhebben:MineTweaker3:1.7.10-3.0.10B:dev")
-}
+    api('com.github.GTNewHorizons:Baubles:1.0.1.16:dev')
+    compileOnly("com.github.GTNewHorizons:CodeChickenLib:1.1.8:dev")
+    compileOnly("com.github.GTNewHorizons:CodeChickenCore:1.1.11:dev")
+    compileOnly("com.github.GTNewHorizons:NotEnoughItems:2.3.46-GTNH:dev")
+    compileOnly("com.github.GTNewHorizons:CraftTweaker:3.2.11:dev")
+
+}

src/main/java/ab/AdvancedBotany.java

@@ -13,12 +13,13 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent;
         modid = AdvancedBotany.modid,
         name = "Advanced Botany",
         version = AdvancedBotany.version,
-        dependencies = "required-after:Botania",
+        dependencies = AdvancedBotany.DEPENDENCIES,
         guiFactory = "ab.client.core.handler.GuiABFactory")
 public class AdvancedBotany {
 
     public static final String modid = "AdvancedBotany";
-    public static final String version = "1.3.1.5";
+    public static final String version = "GRADLETOKEN_VERSION";
+    public static final String DEPENDENCIES = "required-after:Botania";
 
     @Mod.Instance("AdvancedBotany")
     public static AdvancedBotany instance;

src/main/java/ab/common/core/proxy/CommonProxy.java

@@ -9,20 +9,24 @@ import ab.common.lib.register.BlockListAB;
 import ab.common.lib.register.EntityListAB;
 import ab.common.lib.register.FlowerRegister;
 import ab.common.lib.register.ItemListAB;
-import ab.common.lib.register.RecipeListAB;
 import ab.common.minetweaker.MineTweakerConfig;
+import ab.nei.IMCForNEI;
+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;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import cpw.mods.fml.common.network.NetworkRegistry;
 
+@SuppressWarnings("unused")
 public class CommonProxy {
 
     public void preInit(FMLPreInitializationEvent event) {
         BlockListAB.init();
         ItemListAB.init();
         AchievementRegister.init();
+        ModHelperManager.preInit();
         EntityListAB.init();
         FlowerRegister.init();
         ConfigABHandler.loadConfig(event.getSuggestedConfigurationFile());
@@ -30,11 +34,14 @@ public class CommonProxy {
 
     public void init(FMLInitializationEvent event) {
         NetworkRegistry.INSTANCE.registerGuiHandler(AdvancedBotany.instance, new GuiHandler());
-        RecipeListAB.init();
         NetworkHandler.registerPackets();
+        IMCForNEI.IMCSender();
+        ModHelperManager.init();
     }
 
     public void postInit(FMLPostInitializationEvent event) {
+        ModHelperManager.postInit();
+        CraftingManager.setupCrafting();
         ConfigABHandler.loadPostInit();
         if (Loader.isModLoaded("MineTweaker3")) MineTweakerConfig.registerMT();
     }

src/main/java/ab/nei/IMCForNEI.java

@@ -0,0 +1,47 @@
+package ab.nei;
+
+import net.minecraft.nbt.NBTTagCompound;
+
+import cpw.mods.fml.common.event.FMLInterModComms;
+
+public class IMCForNEI {
+
+    public static void IMCSender() {
+        sendHandler("ab.client.nei.RecipeHandlerAlphirine", "Botania:lexicon");
+        sendCatalyst("ab.client.nei.RecipeHandlerAlphirine", "Botania:lexicon");
+
+        sendHandler("ab.client.nei.RecipeHandlerAdvancedPlate", "AdvancedBotany:blockABPlate");
+        sendCatalyst("ab.client.nei.RecipeHandlerAdvancedPlate", "AdvancedBotany:blockABPlate");
+
+    }
+
+    private static void sendHandler(String aName, String aBlock) {
+        sendHandler(aName, aBlock, 1);
+    }
+
+    private static void sendHandler(String aName, String aBlock, int maxRecipesPerPage) {
+        NBTTagCompound aNBT = new NBTTagCompound();
+        aNBT.setString("handler", aName);
+        aNBT.setString("modName", "Advanced Botany");
+        aNBT.setString("modId", "AdvancedBotany");
+        aNBT.setBoolean("modRequired", true);
+        aNBT.setString("itemName", aBlock);
+        aNBT.setInteger("handlerHeight", 135);
+        aNBT.setInteger("handlerWidth", 166);
+        aNBT.setInteger("maxRecipesPerPage", maxRecipesPerPage);
+        aNBT.setInteger("yShift", 6);
+        FMLInterModComms.sendMessage("NotEnoughItems", "registerHandlerInfo", aNBT);
+    }
+
+    private static void sendCatalyst(String aName, String aStack, int aPriority) {
+        NBTTagCompound aNBT = new NBTTagCompound();
+        aNBT.setString("handlerID", aName);
+        aNBT.setString("itemName", aStack);
+        aNBT.setInteger("priority", aPriority);
+        FMLInterModComms.sendMessage("NotEnoughItems", "registerCatalystInfo", aNBT);
+    }
+
+    private static void sendCatalyst(String aName, String aStack) {
+        sendCatalyst(aName, aStack, 0);
+    }
+}

src/main/java/ab/nei/NEI_Config.java

@@ -0,0 +1,38 @@
+package ab.nei;
+
+import net.minecraft.block.Block;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+
+import ab.AdvancedBotany;
+import codechicken.nei.api.API;
+import codechicken.nei.api.IConfigureNEI;
+
+public class NEI_Config implements IConfigureNEI {
+
+    public static boolean isAdded = true;
+
+    @Override
+    public void loadConfig() {
+        NEI_Config.isAdded = false;
+        NEI_Config.isAdded = true;
+    }
+
+    public static void hide(Block aBlock) {
+        API.hideItem(new ItemStack(aBlock, 1));
+    }
+
+    public static void hide(Item aItem) {
+        API.hideItem(new ItemStack(aItem, 1));
+    }
+
+    @Override
+    public String getName() {
+        return "Advanced Botany NEI Plugin";
+    }
+
+    @Override
+    public String getVersion() {
+        return AdvancedBotany.version;
+    }
+}

src/main/java/ab/utils/Constants.java

@@ -0,0 +1,129 @@
+package ab.utils;
+
+import net.minecraft.block.Block;
+import net.minecraft.item.ItemStack;
+
+public final class Constants {
+
+    private Constants() {}
+
+    public static final int POOL_META_DILUTE = 2;
+    public static final int POOL_META_REGULAR = 0;
+    public static final int POOL_META_REGULAR_FABULOUS = 3;
+    public static final int POOL_META_CREATIVE = 1;
+
+    public static final int SPREADER_META_REGULAR = 0;
+    public static final int SPREADER_META_ALFHEIM = 2;
+    public static final int SPREADER_META_GAIA = 3;
+    public static final int SPREADER_META_PULSE = 1;
+
+    public static final int MANARESOURCE_META_MANASTEEL = 0;
+    public static final int MANARESOURCE_META_DIAMOND = 2;
+    public static final int MANARESOURCE_META_PEARL = 1;
+    public static final int MANARESOURCE_META_TWIG_WOOD = 3;
+    public static final int MANARESOURCE_META_TERRASTEEL = 4;
+    public static final int MANARESOURCE_META_GAIA_SPIRIT = 5;
+    public static final int MANARESOURCE_META_ROOT = 6;
+    public static final int MANARESOURCE_META_ELEMENTIUM = 7;
+    public static final int MANARESOURCE_META_PIXIE_DUST = 8;
+    public static final int MANARESOURCE_META_DRAGONSTONE = 9;
+    public static final int MANARESOURCE_META_PRISMARINE = 10;
+    public static final int MANARESOURCE_META_CRAFT = 11;
+    public static final int MANARESOURCE_META_TWIG_DREAM = 13;
+    public static final int MANARESOURCE_META_GAIA_INGOT = 14;
+    public static final int MANARESOURCE_META_STRING = 16;
+    public static final int MANARESOURCE_META_CLOTH = 22;
+    public static final int MANARESOURCE_META_MANAPOWDER = 23;
+
+    public static final int STORAGE_META_MANASTEELBLOCK = 0;
+    public static final int STORAGE_META_TERRASTEELBLOCK = 1;
+    public static final int STORAGE_META_ELEMENTIUMBLOCK = 2;
+    public static final int STORAGE_META_DIAMONDBLOCK = 3;
+    public static final int STORAGE_META_DRAGONSTONEBLOCK = 4;
+
+    public static final int STORAGE_META_MITHRILL = 0;
+
+    public static final int SEEDS_META_GRASS = 0;
+    public static final int SEEDS_META_PODZOL = 1;
+    public static final int SEEDS_META_MYCELIUM = 2;
+    public static final int SEEDS_META_DRY = 3;
+    public static final int SEEDS_META_GOLD = 4;
+    public static final int SEEDS_META_VIVID = 5;
+    public static final int SEEDS_META_SCORCHED = 6;
+    public static final int SEEDS_META_INFUSED = 7;
+    public static final int SEEDS_META_MUTATED = 8;
+
+    public static final int LIVINGWOOD_META_BLOCK = 0;
+    public static final int LIVINGWOOD_META_PLANK = 1;
+    public static final int LIVINGWOOD_META_MOSSY = 2;
+    public static final int LIVINGWOOD_META_FRAMED = 3;
+    public static final int LIVINGWOOD_META_PATTERNED = 4;
+    public static final int LIVINGWOOD_META_GLIMMERING = 5;
+
+    public static final int LIVINGSTONE_META_BLOCK = 0;
+    public static final int LIVINGSTONE_META_BRICK = 1;
+    public static final int LIVINGSTONE_META_MOSSY = 2;
+    public static final int LIVINGSTONE_META_CRACKED = 3;
+    public static final int LIVINGSTONE_META_CHISELED = 4;
+
+    public static final int PYLON_META_MANA = 0;
+    public static final int PYLON_META_NATURA = 1;
+    public static final int PYLON_META_GAIA = 2;
+
+    public static final int VIAL_META_MANAGLASS = 0;
+    public static final int VIAL_META_ALFGLASS = 1;
+
+    public static final int QUARTZ_META_DARK = 0;
+    public static final int QUARTZ_META_MANA = 1;
+    public static final int QUARTZ_META_BLAZE = 2;
+    public static final int QUARTZ_META_LAVENDER = 3;
+    public static final int QUARTZ_META_RED = 4;
+    public static final int QUARTZ_META_ELVEN = 5;
+    public static final int QUARTZ_META_SUNNY = 6;
+
+    public static final int VIRUS_METADATA_NECRO = 0;
+    public static final int VIRUS_METADATA_NULL = 1;
+
+    public static final int PRISMARINE_META_BLOCK = 0;
+    public static final int PRISMARINE_META_BRICK = 1;
+    public static final int PRISMARINE_META_DARK = 2;
+
+    public static final int BRICK_META_HELL = 0;
+    public static final int BRICK_META_SOUL = 1;
+    public static final int BRICK_META_FROST = 2;
+    public static final int BRICK_META_ROOF = 3;
+
+    public static final int ENDSTONE_META_BRICK_YELLOW = 0;
+    public static final int ENDSTONE_META_BRICK_PURPLE = 2;
+
+    public static final String THAUMCRAFT_METAL_DEVICE = "Thaumcraft:blockMetalDevice";
+    public static final String THAUMCRAFT_STONE_DEVICE = "Thaumcraft:blockStoneDevice";
+    public static final int THAUMCRAFT_METAL_META_CRUCIBLE = 0;
+    public static final int THAUMCRAFT_METAL_META_CONSTRUCT = 9;
+    public static final int THAUMCRAFT_STONE_META_PEDESTAL = 1;
+    public static final int THAUMCRAFT_STONE_META_RUNIC_MATRIX = 2;
+
+    public static final String GT_CASING_ID = "gregtech:gt.blockcasings4";
+    public static final int GT_CASING_META = 1;
+
+    public static final int POOL_MAX_MANA_DILUTED = 10000;
+    public static final int POOL_MAX_MANA_REGULAR = 1000000;
+
+    public static final int MANA_TABLET_MAGIC_META = 10000;
+
+    public static ItemStack thaumcraftCrucible() {
+        return new ItemStack(Block.getBlockFromName(THAUMCRAFT_METAL_DEVICE), 1, THAUMCRAFT_METAL_META_CRUCIBLE);
+    }
+
+    public static ItemStack thaumcraftMatrix() {
+        return new ItemStack(Block.getBlockFromName(THAUMCRAFT_STONE_DEVICE), 1, THAUMCRAFT_STONE_META_RUNIC_MATRIX);
+    }
+
+    public static ItemStack thaumcraftConstruct() {
+        return new ItemStack(Block.getBlockFromName(THAUMCRAFT_METAL_DEVICE), 1, THAUMCRAFT_METAL_META_CONSTRUCT);
+    }
+
+    public static ItemStack gtTradeCasing() {
+        return new ItemStack(Block.getBlockFromName(GT_CASING_ID), 1, GT_CASING_META);
+    }
+}

src/main/java/ab/utils/CraftingManager.java

@@ -0,0 +1,13 @@
+package ab.utils;
+
+public class CraftingManager {
+
+    public static void setupCrafting() {
+
+        setupVanillaCrafting();
+    }
+
+    private static void setupVanillaCrafting() {
+
+    }
+}

src/main/java/ab/utils/IModHelper.java

@@ -0,0 +1,10 @@
+package ab.utils;
+
+public interface IModHelper {
+
+    public void preInit();
+
+    public void init();
+
+    public void postInit();
+}

src/main/java/ab/utils/LocalizationManager.java

@@ -0,0 +1,22 @@
+package ab.utils;
+
+import net.minecraft.util.StatCollector;
+
+public class LocalizationManager {
+
+    public static String getLocalizedString(String key) {
+        if (StatCollector.canTranslate(key)) {
+            return StatCollector.translateToLocal(key);
+        } else {
+            return StatCollector.translateToFallback(key);
+        }
+    }
+
+    public static String getLocalizedString(String key, Object... objects) {
+        if (StatCollector.canTranslate(key)) {
+            return String.format(StatCollector.translateToLocal(key), objects);
+        } else {
+            return String.format(StatCollector.translateToFallback(key), objects);
+        }
+    }
+}

src/main/java/ab/utils/ModHelperManager.java

@@ -0,0 +1,27 @@
+package ab.utils;
+
+import ab.common.lib.register.RecipeListAB;
+
+public class ModHelperManager {
+
+    private static IModHelper helper;
+
+    public static void preInit() {
+        setupHelpers();
+
+        helper.preInit();
+    }
+
+    public static void init() {
+        // helper.init();
+    }
+
+    public static void postInit() {
+        helper.postInit();
+    }
+
+    private static void setupHelpers() {
+
+        helper = new RecipeListAB();
+    }
+}

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<ItemStack> 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));
+    }
+}

src/main/java/ab/utils/VersionInfo.java

@@ -0,0 +1,9 @@
+package ab.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; ";
+}

src/main/resources/assets/ab/lang/en_US.lang

@@ -120,6 +120,29 @@ ab.sphereNavigation.founded=Found
 abmisc.fateBoard.info0=The opportunity to play on this board, he dreamed of 
 abmisc.fateBoard.info1=every Elf, hoping to get a valuable prize...
 
+//THAUMCRAFT
+
+tc.research_category.AdvancedBotany=Advanced Botany
+tc.research_category.AB_botania=Advanced Botany
+tc.research_name.TerraHoe=Terra Hoe
+tc.research_name.AquaSword=Blade of sea
+tc.research_name.ManaCharger=Mana Charger
+tc.research_name.MithrillSword=Blade of Space
+tc.research_name.Forge=Forge of Nidavellir
+tc.research_name.Destroyer=Material Destroyer
+tc.research_name.Nebula=Nebula Fragments
+
+TerraHoePages=The standard way of harvesting is getting boring over time. Terrahoe, or rather its unique ability to transform the soil into a more fertile and automated soil, can help with this very problem.<BR>The harvest in the new soil gathers itself after a certain period of time!
+DestroyerPages=A harsh tool based on a global catastrophe in the past. <BR>He is perfectly capable of breaking any block almost instantly. His speed is so high that it was necessary to create a *Fuse* in him - that is, to turn him off/on.
+MithrillSwordPages=A melee weapon that uses mana to communicate with the cosmic forces, the more mana in the blade, the stronger the connection. <BR>The power of connection to cosmic forces is divided into Ranks, like Terra Shatterer. Each rank unlocks a new magical property for the Space Blade
+AquaSwordPages=A mystical melee weapon imbued with the powers of the seas!<BR>An attack with Blade of the Sea is resisted by a water splash, and pushes everyone around in the direction the player is looking<BR>The block, on the other hand, is resisted by a water shield, which prevents enemies from approaching to you.
+ForgePages=A really powerful Dwarf invention for fusing different materials into one whole, the main thing is to know the proportions!<BR>This forge was given to the Elves, that is, it came to our land at the time of "Destruction," but... Not for long - it was soon destroyed.
+ManaChargerPages=The mana charger is a device that allows you to charge up to 4 portable mana sources at once, as well as to discharge one of them. <BR>To start the charger, you must bind a mana source to it, such as a Mana Pool or Mana Container
+NebulaPages=A nebula fragment is a material filled with part of the power of space. It allows you to create instruments and weapons that are unearthly in power.
+
+
+
+
 //ACHIEVEMENT
 
 achievement.ab:fateBoard=Playing with fate