diff --git a/src/main/java/ab/api/AdvancedBotanyAPI.java b/src/main/java/ab/api/AdvancedBotanyAPI.java index 1fa307e..93f9a20 100644 --- a/src/main/java/ab/api/AdvancedBotanyAPI.java +++ b/src/main/java/ab/api/AdvancedBotanyAPI.java @@ -18,12 +18,12 @@ import ab.common.core.handler.ConfigABHandler; public class AdvancedBotanyAPI { - public static List advancedPlateRecipes = new ArrayList(); - public static List alphirineRecipes = new ArrayList(); - public static List farmlandList = new ArrayList(); - public static List achievements = new ArrayList(); - public static List relicList = new ArrayList(); - public static List diceList = new ArrayList(); + public static List advancedPlateRecipes = new ArrayList<>(); + public static List alphirineRecipes = new ArrayList<>(); + public static List farmlandList = new ArrayList<>(); + public static List achievements = new ArrayList<>(); + public static List relicList = new ArrayList<>(); + public static List diceList = new ArrayList<>(); public static Item.ToolMaterial mithrilToolMaterial = EnumHelper.addToolMaterial("MITHRIL", 7, -1, 8.0F, 4.0F, 24); public static ItemArmor.ArmorMaterial nebulaArmorMaterial = EnumHelper.addArmorMaterial( @@ -47,6 +47,22 @@ public class AdvancedBotanyAPI { return recipe; } + public static RecipeAdvancedPlate registerAdvancedPlateRecipe(ItemStack output, int mana, int color, + Object... inputs) { + RecipeAdvancedPlate recipe = new RecipeAdvancedPlate(output, mana, color, inputs); + advancedPlateRecipes.add(recipe); + return recipe; + } + + public static RecipeAdvancedPlate registerAdvancedPlateRecipe(String output, int mana, int color, + Object... inputs) { + RecipeAdvancedPlate recipe = RecipeAdvancedPlate.fromOreDictOutput(output, mana, color, inputs); + if (recipe != null) { + advancedPlateRecipes.add(recipe); + } + return recipe; + } + public static RecipeAncientAlphirine registerAlphirineRecipe(ItemStack output, ItemStack input, int chance) { RecipeAncientAlphirine recipe = new RecipeAncientAlphirine(output, input, chance); alphirineRecipes.add(recipe); diff --git a/src/main/java/ab/api/recipe/RecipeAdvancedPlate.java b/src/main/java/ab/api/recipe/RecipeAdvancedPlate.java index d17cb8d..36ad34d 100644 --- a/src/main/java/ab/api/recipe/RecipeAdvancedPlate.java +++ b/src/main/java/ab/api/recipe/RecipeAdvancedPlate.java @@ -1,33 +1,26 @@ package ab.api.recipe; -import java.util.ArrayList; import java.util.List; -import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; -public class RecipeAdvancedPlate { +import vazkii.botania.api.recipe.RecipePetals; - private ItemStack output; - private int color; - private List inputs; - private int mana; +public class RecipeAdvancedPlate extends RecipePetals { - public RecipeAdvancedPlate(ItemStack output, int mana, int color, ItemStack... inputs) { - this.output = output; + private final int color; + private final int mana; + + public static RecipeAdvancedPlate fromOreDictOutput(String output, int mana, int color, Object... inputs) { + List ores = OreDictionary.getOres(output); + return !ores.isEmpty() ? new RecipeAdvancedPlate(ores.get(0), mana, color, inputs) : null; + } + + public RecipeAdvancedPlate(ItemStack output, int mana, int color, Object... inputs) { + super(output, inputs); this.mana = mana; this.color = color; - List inputsToSet = new ArrayList(); - for (ItemStack obj : inputs) inputsToSet.add(obj); - this.inputs = inputsToSet; - } - - public List getInputs() { - return new ArrayList(this.inputs); - } - - public ItemStack getOutput() { - return this.output; } public int getManaUsage() { @@ -37,31 +30,4 @@ public class RecipeAdvancedPlate { public int getColor() { return this.color; } - - public boolean matches(IInventory inv) { - List inputsMissing = new ArrayList(this.inputs); - for (int i = 1; i < inv.getSizeInventory(); i++) { - ItemStack stack = inv.getStackInSlot(i); - if (stack == null) break; - int stackIndex = -1; - for (int j = 0; j < inputsMissing.size(); j++) { - ItemStack input = inputsMissing.get(j); - if (input instanceof ItemStack && simpleAreStacksEqual(input.copy(), stack)) { - stackIndex = j; - break; - } - } - if (stackIndex != -1) { - inputsMissing.remove(stackIndex); - } else { - return false; - } - } - return inputsMissing.isEmpty(); - } - - boolean simpleAreStacksEqual(ItemStack input, ItemStack stack) { - if (input.getItemDamage() == 32767) input.setItemDamage(stack.getItemDamage()); - return (input.getItem() == stack.getItem() && input.getItemDamage() == stack.getItemDamage()); - } } diff --git a/src/main/java/ab/api/recipe/lexicon/AdvancedPlateCraftPage.java b/src/main/java/ab/api/recipe/lexicon/AdvancedPlateCraftPage.java index 3fc7db7..182c6bf 100644 --- a/src/main/java/ab/api/recipe/lexicon/AdvancedPlateCraftPage.java +++ b/src/main/java/ab/api/recipe/lexicon/AdvancedPlateCraftPage.java @@ -10,21 +10,22 @@ import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; +import net.minecraftforge.oredict.OreDictionary; import org.lwjgl.opengl.GL11; -import vazkii.botania.api.internal.IGuiLexiconEntry; -import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.api.lexicon.LexiconRecipeMappings; -import vazkii.botania.client.core.handler.ClientTickHandler; -import vazkii.botania.common.core.handler.ConfigHandler; -import vazkii.botania.common.lexicon.page.PageRecipe; import ab.api.AdvancedBotanyAPI; import ab.api.recipe.RecipeAdvancedPlate; import ab.client.core.ClientHelper; import ab.common.lib.register.BlockListAB; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vazkii.botania.api.internal.IGuiLexiconEntry; +import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.lexicon.LexiconRecipeMappings; +import vazkii.botania.client.core.handler.ClientTickHandler; +import vazkii.botania.common.core.handler.ConfigHandler; +import vazkii.botania.common.lexicon.page.PageRecipe; public class AdvancedPlateCraftPage extends PageRecipe { @@ -68,14 +69,24 @@ public class AdvancedPlateCraftPage extends PageRecipe { TextureManager render = (Minecraft.getMinecraft()).renderEngine; renderItemAtGridPos(gui, 3, 0, recipe.getOutput(), false); renderItemAtGridPos(gui, 2, 1, new ItemStack(BlockListAB.blockABPlate), false); - List inputs = recipe.getInputs(); + List inputs = recipe.getInputs(); int degreePerInput = (int) (360.0F / inputs.size()); float currentDegree = ConfigHandler.lexiconRotatingItems ? (GuiScreen.isShiftKeyDown() ? this.ticksElapsed : (this.ticksElapsed + ClientTickHandler.partialTicks)) : 0.0F; - for (ItemStack obj : inputs) { - ItemStack copy = obj.copy(); - if (copy.getItemDamage() == 32767) copy.setItemDamage(0); - renderItemAtAngle(gui, currentDegree, copy); + for (Object obj : inputs) { + ItemStack copy = null; + if (obj instanceof String oreName) { + List ores = OreDictionary.getOres(oreName); + if (!ores.isEmpty()) { + copy = ores.get(0).copy(); + } + } else if (obj instanceof ItemStack itemStack) { + copy = itemStack.copy(); + } + if (copy != null) { + if (copy.getItemDamage() == OreDictionary.WILDCARD_VALUE) copy.setItemDamage(0); + renderItemAtAngle(gui, currentDegree, copy); + } currentDegree += degreePerInput; } renderManaBar(gui, mx, my); @@ -116,7 +127,7 @@ public class AdvancedPlateCraftPage extends PageRecipe { } public List getDisplayedRecipes() { - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); list.add(recipe.getOutput()); return list; } diff --git a/src/main/java/ab/api/recipe/lexicon/AlphirineCraftPage.java b/src/main/java/ab/api/recipe/lexicon/AlphirineCraftPage.java index dffa016..4507b45 100644 --- a/src/main/java/ab/api/recipe/lexicon/AlphirineCraftPage.java +++ b/src/main/java/ab/api/recipe/lexicon/AlphirineCraftPage.java @@ -14,16 +14,16 @@ import net.minecraft.util.StatCollector; import org.lwjgl.opengl.GL11; -import vazkii.botania.api.internal.IGuiLexiconEntry; -import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.api.lexicon.LexiconRecipeMappings; -import vazkii.botania.common.item.block.ItemBlockSpecialFlower; -import vazkii.botania.common.lexicon.page.PageRecipe; import ab.api.AdvancedBotanyAPI; import ab.api.recipe.RecipeAncientAlphirine; import ab.client.core.ClientHelper; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vazkii.botania.api.internal.IGuiLexiconEntry; +import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.lexicon.LexiconRecipeMappings; +import vazkii.botania.common.item.block.ItemBlockSpecialFlower; +import vazkii.botania.common.lexicon.page.PageRecipe; public class AlphirineCraftPage extends PageRecipe { diff --git a/src/main/java/ab/client/core/handler/BoundRenderHandler.java b/src/main/java/ab/client/core/handler/BoundRenderHandler.java index 5ec87a9..3a642a7 100644 --- a/src/main/java/ab/client/core/handler/BoundRenderHandler.java +++ b/src/main/java/ab/client/core/handler/BoundRenderHandler.java @@ -18,11 +18,11 @@ import net.minecraftforge.client.event.RenderWorldLastEvent; import org.lwjgl.opengl.GL11; +import ab.api.IBoundRender; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; import vazkii.botania.api.wand.ICoordBoundItem; import vazkii.botania.api.wand.IWireframeAABBProvider; import vazkii.botania.client.core.handler.ClientTickHandler; -import ab.api.IBoundRender; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; public class BoundRenderHandler { diff --git a/src/main/java/ab/client/core/handler/ClientHandler.java b/src/main/java/ab/client/core/handler/ClientHandler.java index 8eb306a..93495f9 100644 --- a/src/main/java/ab/client/core/handler/ClientHandler.java +++ b/src/main/java/ab/client/core/handler/ClientHandler.java @@ -18,13 +18,13 @@ import net.minecraft.util.StatCollector; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; -import vazkii.botania.client.core.handler.ClientTickHandler; -import vazkii.botania.common.lib.LibObfuscation; import ab.api.IRankItem; import ab.client.core.handler.PlayerItemUsingSound.ClientSoundHandler; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.TickEvent; import cpw.mods.fml.relauncher.ReflectionHelper; +import vazkii.botania.client.core.handler.ClientTickHandler; +import vazkii.botania.common.lib.LibObfuscation; public class ClientHandler { diff --git a/src/main/java/ab/client/core/handler/HudRenderHandler.java b/src/main/java/ab/client/core/handler/HudRenderHandler.java index e0d76a7..59ae268 100644 --- a/src/main/java/ab/client/core/handler/HudRenderHandler.java +++ b/src/main/java/ab/client/core/handler/HudRenderHandler.java @@ -8,11 +8,11 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MovingObjectPosition; import net.minecraftforge.client.event.RenderGameOverlayEvent; -import vazkii.botania.common.item.ItemLexicon; -import vazkii.botania.common.item.ItemTwigWand; import ab.api.IRenderHud; import ab.common.item.equipment.ItemBlackHalo; import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import vazkii.botania.common.item.ItemLexicon; +import vazkii.botania.common.item.ItemTwigWand; public class HudRenderHandler { diff --git a/src/main/java/ab/client/core/handler/PlayerRendererHandler.java b/src/main/java/ab/client/core/handler/PlayerRendererHandler.java index 832d679..5626636 100644 --- a/src/main/java/ab/client/core/handler/PlayerRendererHandler.java +++ b/src/main/java/ab/client/core/handler/PlayerRendererHandler.java @@ -14,12 +14,12 @@ import net.minecraftforge.client.event.RenderPlayerEvent; import org.lwjgl.opengl.GL11; -import vazkii.botania.api.item.IPhantomInkable; -import vazkii.botania.client.core.handler.ClientTickHandler; import ab.client.core.ClientHelper; import ab.common.item.equipment.armor.ItemNebulaArmor; import ab.common.item.equipment.armor.ItemNebulaHelm; import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import vazkii.botania.api.item.IPhantomInkable; +import vazkii.botania.client.core.handler.ClientTickHandler; public class PlayerRendererHandler { diff --git a/src/main/java/ab/client/core/proxy/ClientProxy.java b/src/main/java/ab/client/core/proxy/ClientProxy.java index 54ec5c6..75fdd6a 100644 --- a/src/main/java/ab/client/core/proxy/ClientProxy.java +++ b/src/main/java/ab/client/core/proxy/ClientProxy.java @@ -3,20 +3,47 @@ package ab.client.core.proxy; import net.minecraftforge.client.MinecraftForgeClient; import net.minecraftforge.common.MinecraftForge; -import vazkii.botania.common.Botania; import ab.client.core.handler.BoundRenderHandler; import ab.client.core.handler.ClientHandler; import ab.client.core.handler.HudRenderHandler; import ab.client.core.handler.PlayerRendererHandler; -import ab.client.render.block.*; -import ab.client.render.entity.*; +import ab.client.render.block.RenderBlockABSpreader; +import ab.client.render.block.RenderBlockEngineerHopper; +import ab.client.render.block.RenderBlockManaCharger; +import ab.client.render.block.RenderBlockManaContainer; +import ab.client.render.block.RenderBlockManaCrystalCube; +import ab.client.render.block.RenderBlockNidavellirForge; +import ab.client.render.entity.EntityNullRender; +import ab.client.render.entity.RenderEntityAdvancedSpark; +import ab.client.render.entity.RenderEntityAlphirinePortal; import ab.client.render.item.RenderItemAntigravityCharm; import ab.client.render.item.RenderItemSphereNavigation; -import ab.client.render.tile.*; -import ab.common.block.tile.*; +import ab.client.render.tile.RenderTileABSpreader; +import ab.client.render.tile.RenderTileBoardFate; +import ab.client.render.tile.RenderTileEngineerHopper; +import ab.client.render.tile.RenderTileGameBoard; +import ab.client.render.tile.RenderTileMagicCraftingCrate; +import ab.client.render.tile.RenderTileManaCharger; +import ab.client.render.tile.RenderTileManaContainer; +import ab.client.render.tile.RenderTileManaCrystalCube; +import ab.client.render.tile.RenderTileNidavellirForge; +import ab.common.block.tile.TileABSpreader; +import ab.common.block.tile.TileBoardFate; +import ab.common.block.tile.TileEngineerHopper; +import ab.common.block.tile.TileGameBoard; +import ab.common.block.tile.TileMagicCraftCrate; +import ab.common.block.tile.TileManaCharger; +import ab.common.block.tile.TileManaContainer; +import ab.common.block.tile.TileManaCrystalCube; +import ab.common.block.tile.TileNidavellirForge; import ab.common.core.handler.ConfigABHandler; import ab.common.core.proxy.CommonProxy; -import ab.common.entity.*; +import ab.common.entity.EntityAdvancedSpark; +import ab.common.entity.EntityAlphirinePortal; +import ab.common.entity.EntityManaVine; +import ab.common.entity.EntityNebulaBlaze; +import ab.common.entity.EntitySeed; +import ab.common.entity.EntitySword; import ab.common.lib.register.BlockListAB; import ab.common.lib.register.ItemListAB; import cpw.mods.fml.client.registry.ClientRegistry; @@ -25,6 +52,7 @@ import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import vazkii.botania.common.Botania; public class ClientProxy extends CommonProxy { diff --git a/src/main/java/ab/client/gui/ContainerItemChest.java b/src/main/java/ab/client/gui/ContainerItemChest.java index 1dd827b..72e8bd7 100644 --- a/src/main/java/ab/client/gui/ContainerItemChest.java +++ b/src/main/java/ab/client/gui/ContainerItemChest.java @@ -6,8 +6,8 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import vazkii.botania.client.gui.SlotLocked; import ab.common.item.relic.ItemTalismanHiddenRiches; +import vazkii.botania.client.gui.SlotLocked; public class ContainerItemChest extends Container { diff --git a/src/main/java/ab/client/model/ModelManaCharger.java b/src/main/java/ab/client/model/ModelManaCharger.java index 0865afa..b0f3677 100644 --- a/src/main/java/ab/client/model/ModelManaCharger.java +++ b/src/main/java/ab/client/model/ModelManaCharger.java @@ -7,10 +7,10 @@ import net.minecraft.item.ItemStack; import org.lwjgl.opengl.GL11; -import vazkii.botania.client.core.handler.LightningHandler; -import vazkii.botania.common.core.helper.Vector3; import ab.client.render.tile.RenderTileManaCharger; import ab.common.block.tile.TileManaCharger; +import vazkii.botania.client.core.handler.LightningHandler; +import vazkii.botania.common.core.helper.Vector3; public class ModelManaCharger extends ModelBase { diff --git a/src/main/java/ab/client/nei/RecipeHandlerAdvancedPlate.java b/src/main/java/ab/client/nei/RecipeHandlerAdvancedPlate.java index b0f9294..41026f3 100644 --- a/src/main/java/ab/client/nei/RecipeHandlerAdvancedPlate.java +++ b/src/main/java/ab/client/nei/RecipeHandlerAdvancedPlate.java @@ -6,6 +6,7 @@ import java.util.List; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; +import net.minecraftforge.oredict.OreDictionary; import org.lwjgl.opengl.GL11; @@ -22,7 +23,7 @@ public class RecipeHandlerAdvancedPlate extends TemplateRecipeHandler { public class CachedAdvancedPlateRecipe extends TemplateRecipeHandler.CachedRecipe { - public List inputs = new ArrayList(); + public List inputs = new ArrayList<>(); public PositionedStack output; public int manaUsage; @@ -33,13 +34,17 @@ public class RecipeHandlerAdvancedPlate extends TemplateRecipeHandler { this.manaUsage = recipe.getManaUsage(); } - public void setIngredients(List inputs) { + public void setIngredients(List inputs) { float degreePerInput = 360.0F / inputs.size(); float currentDegree = -90.0F; - for (Object o : inputs) { + for (Object obj : inputs) { int posX = (int) Math.round(73.0D + Math.cos(currentDegree * Math.PI / 180.0D) * 32.0D); int posY = (int) Math.round(55.0D + Math.sin(currentDegree * Math.PI / 180.0D) * 32.0D); - this.inputs.add(new PositionedStack(o, posX, posY)); + if (obj instanceof String oreName) { + this.inputs.add(new PositionedStack(OreDictionary.getOres(oreName), posX, posY)); + } else if (obj instanceof ItemStack itemStack) { + this.inputs.add(new PositionedStack(itemStack, posX, posY)); + } currentDegree += degreePerInput; } } @@ -66,11 +71,8 @@ public class RecipeHandlerAdvancedPlate extends TemplateRecipeHandler { } public void loadTransferRects() { - this.transferRects.add( - new TemplateRecipeHandler.RecipeTransferRect( - new Rectangle(72, 54, 18, 18), - getRecipeID(), - new Object[0])); + this.transferRects + .add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(72, 54, 18, 18), getRecipeID())); } public int recipiesPerPage() { diff --git a/src/main/java/ab/client/nei/RecipeHandlerAlphirine.java b/src/main/java/ab/client/nei/RecipeHandlerAlphirine.java index f0c24cf..cec4a58 100644 --- a/src/main/java/ab/client/nei/RecipeHandlerAlphirine.java +++ b/src/main/java/ab/client/nei/RecipeHandlerAlphirine.java @@ -10,7 +10,6 @@ import net.minecraft.util.StatCollector; import org.lwjgl.opengl.GL11; -import vazkii.botania.common.item.block.ItemBlockSpecialFlower; import ab.api.AdvancedBotanyAPI; import ab.api.recipe.RecipeAncientAlphirine; import ab.client.core.ClientHelper; @@ -18,6 +17,7 @@ import codechicken.lib.gui.GuiDraw; import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; import codechicken.nei.recipe.TemplateRecipeHandler; +import vazkii.botania.common.item.block.ItemBlockSpecialFlower; public class RecipeHandlerAlphirine extends TemplateRecipeHandler { diff --git a/src/main/java/ab/client/render/entity/RenderEntityAdvancedSpark.java b/src/main/java/ab/client/render/entity/RenderEntityAdvancedSpark.java index 158bb55..f1e67ac 100644 --- a/src/main/java/ab/client/render/entity/RenderEntityAdvancedSpark.java +++ b/src/main/java/ab/client/render/entity/RenderEntityAdvancedSpark.java @@ -2,10 +2,10 @@ package ab.client.render.entity; import net.minecraft.util.IIcon; -import vazkii.botania.client.render.entity.RenderSparkBase; -import vazkii.botania.common.item.ItemSparkUpgrade; import ab.common.entity.EntityAdvancedSpark; import ab.common.item.ItemAdvancedSpark; +import vazkii.botania.client.render.entity.RenderSparkBase; +import vazkii.botania.common.item.ItemSparkUpgrade; public class RenderEntityAdvancedSpark extends RenderSparkBase { diff --git a/src/main/java/ab/client/render/entity/RenderEntityAlphirinePortal.java b/src/main/java/ab/client/render/entity/RenderEntityAlphirinePortal.java index 2a81fd9..762ca20 100644 --- a/src/main/java/ab/client/render/entity/RenderEntityAlphirinePortal.java +++ b/src/main/java/ab/client/render/entity/RenderEntityAlphirinePortal.java @@ -11,9 +11,9 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; -import vazkii.botania.client.core.handler.ClientTickHandler; import ab.client.core.ClientHelper; import ab.common.block.BlockLebethronWood; +import vazkii.botania.client.core.handler.ClientTickHandler; public class RenderEntityAlphirinePortal extends Render { diff --git a/src/main/java/ab/client/render/item/RenderItemAntigravityCharm.java b/src/main/java/ab/client/render/item/RenderItemAntigravityCharm.java index e22ff67..75805b9 100644 --- a/src/main/java/ab/client/render/item/RenderItemAntigravityCharm.java +++ b/src/main/java/ab/client/render/item/RenderItemAntigravityCharm.java @@ -10,8 +10,8 @@ import net.minecraftforge.client.IItemRenderer; import org.lwjgl.opengl.GL11; -import vazkii.botania.common.core.helper.ItemNBTHelper; import ab.common.item.ItemAntigravityCharm; +import vazkii.botania.common.core.helper.ItemNBTHelper; public class RenderItemAntigravityCharm implements IItemRenderer { diff --git a/src/main/java/ab/client/render/tile/RenderTileABSpreader.java b/src/main/java/ab/client/render/tile/RenderTileABSpreader.java index ec35ba6..e1fef66 100644 --- a/src/main/java/ab/client/render/tile/RenderTileABSpreader.java +++ b/src/main/java/ab/client/render/tile/RenderTileABSpreader.java @@ -12,12 +12,12 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; +import ab.common.block.tile.TileABSpreader; import vazkii.botania.api.mana.ILens; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.proxy.ClientProxy; import vazkii.botania.client.model.ModelSpreader; import vazkii.botania.client.render.item.RenderLens; -import ab.common.block.tile.TileABSpreader; public class RenderTileABSpreader extends TileEntitySpecialRenderer { diff --git a/src/main/java/ab/client/render/tile/RenderTileBoardFate.java b/src/main/java/ab/client/render/tile/RenderTileBoardFate.java index 4d2f2f4..427e288 100644 --- a/src/main/java/ab/client/render/tile/RenderTileBoardFate.java +++ b/src/main/java/ab/client/render/tile/RenderTileBoardFate.java @@ -10,9 +10,9 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; -import vazkii.botania.client.core.handler.ClientTickHandler; import ab.client.model.ModelDiceFate; import ab.common.block.tile.TileBoardFate; +import vazkii.botania.client.core.handler.ClientTickHandler; public class RenderTileBoardFate extends TileEntitySpecialRenderer { diff --git a/src/main/java/ab/client/render/tile/RenderTileEngineerHopper.java b/src/main/java/ab/client/render/tile/RenderTileEngineerHopper.java index d8202ec..da909b5 100644 --- a/src/main/java/ab/client/render/tile/RenderTileEngineerHopper.java +++ b/src/main/java/ab/client/render/tile/RenderTileEngineerHopper.java @@ -9,8 +9,8 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; -import vazkii.botania.client.core.handler.ClientTickHandler; import ab.client.model.ModelEngineerHopper; +import vazkii.botania.client.core.handler.ClientTickHandler; public class RenderTileEngineerHopper extends TileEntitySpecialRenderer { diff --git a/src/main/java/ab/client/render/tile/RenderTileGameBoard.java b/src/main/java/ab/client/render/tile/RenderTileGameBoard.java index 22b2a35..322be7e 100644 --- a/src/main/java/ab/client/render/tile/RenderTileGameBoard.java +++ b/src/main/java/ab/client/render/tile/RenderTileGameBoard.java @@ -10,9 +10,9 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; -import vazkii.botania.client.core.handler.ClientTickHandler; import ab.client.model.ModelDiceFate; import ab.common.block.tile.TileGameBoard; +import vazkii.botania.client.core.handler.ClientTickHandler; public class RenderTileGameBoard extends TileEntitySpecialRenderer { diff --git a/src/main/java/ab/client/render/tile/RenderTileMagicCraftingCrate.java b/src/main/java/ab/client/render/tile/RenderTileMagicCraftingCrate.java index 4c8636a..f35b6fa 100644 --- a/src/main/java/ab/client/render/tile/RenderTileMagicCraftingCrate.java +++ b/src/main/java/ab/client/render/tile/RenderTileMagicCraftingCrate.java @@ -18,10 +18,10 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; -import vazkii.botania.client.core.handler.ClientTickHandler; import ab.common.block.BlockMagicCraftCrate; import ab.common.block.tile.TileMagicCraftCrate; import ab.common.lib.register.BlockListAB; +import vazkii.botania.client.core.handler.ClientTickHandler; public class RenderTileMagicCraftingCrate extends TileEntitySpecialRenderer { diff --git a/src/main/java/ab/client/render/tile/RenderTileManaCharger.java b/src/main/java/ab/client/render/tile/RenderTileManaCharger.java index c7d08bc..82bcb74 100644 --- a/src/main/java/ab/client/render/tile/RenderTileManaCharger.java +++ b/src/main/java/ab/client/render/tile/RenderTileManaCharger.java @@ -19,9 +19,9 @@ import net.minecraftforge.client.ForgeHooksClient; import org.lwjgl.opengl.GL11; -import vazkii.botania.client.core.handler.ClientTickHandler; import ab.client.model.ModelManaCharger; import ab.common.block.tile.TileManaCharger; +import vazkii.botania.client.core.handler.ClientTickHandler; public class RenderTileManaCharger extends TileEntitySpecialRenderer { diff --git a/src/main/java/ab/client/render/tile/RenderTileManaContainer.java b/src/main/java/ab/client/render/tile/RenderTileManaContainer.java index 34d0803..2cb21b5 100644 --- a/src/main/java/ab/client/render/tile/RenderTileManaContainer.java +++ b/src/main/java/ab/client/render/tile/RenderTileManaContainer.java @@ -12,12 +12,12 @@ import net.minecraft.world.World; import org.lwjgl.opengl.GL11; -import vazkii.botania.client.core.handler.ClientTickHandler; -import vazkii.botania.client.core.helper.ShaderHelper; -import vazkii.botania.common.block.mana.BlockPool; import ab.client.core.ClientHelper; import ab.client.model.ModelManaContainer; import ab.common.block.tile.TileManaContainer; +import vazkii.botania.client.core.handler.ClientTickHandler; +import vazkii.botania.client.core.helper.ShaderHelper; +import vazkii.botania.common.block.mana.BlockPool; public class RenderTileManaContainer extends TileEntitySpecialRenderer { diff --git a/src/main/java/ab/client/render/tile/RenderTileNidavellirForge.java b/src/main/java/ab/client/render/tile/RenderTileNidavellirForge.java index df8aef3..04109f8 100644 --- a/src/main/java/ab/client/render/tile/RenderTileNidavellirForge.java +++ b/src/main/java/ab/client/render/tile/RenderTileNidavellirForge.java @@ -16,9 +16,9 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; -import vazkii.botania.client.core.handler.ClientTickHandler; import ab.client.model.ModelNidavellirForge; import ab.common.block.tile.TileNidavellirForge; +import vazkii.botania.client.core.handler.ClientTickHandler; public class RenderTileNidavellirForge extends TileEntitySpecialRenderer { diff --git a/src/main/java/ab/common/block/BlockABSpreader.java b/src/main/java/ab/common/block/BlockABSpreader.java index 864c21a..fb8d4fa 100644 --- a/src/main/java/ab/common/block/BlockABSpreader.java +++ b/src/main/java/ab/common/block/BlockABSpreader.java @@ -20,16 +20,16 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import ab.AdvancedBotany; +import ab.common.block.tile.TileABSpreader; +import ab.common.lib.register.BlockListAB; +import ab.common.lib.register.RecipeListAB; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; import vazkii.botania.api.wand.IWireframeAABBProvider; import vazkii.botania.common.item.ModItems; -import ab.AdvancedBotany; -import ab.common.block.tile.TileABSpreader; -import ab.common.lib.register.BlockListAB; -import ab.common.lib.register.RecipeListAB; public class BlockABSpreader extends BlockContainer implements IWandable, IWandHUD, IWireframeAABBProvider, ILexiconable { diff --git a/src/main/java/ab/common/block/BlockAntigravitation.java b/src/main/java/ab/common/block/BlockAntigravitation.java index 3b6650f..86eb208 100644 --- a/src/main/java/ab/common/block/BlockAntigravitation.java +++ b/src/main/java/ab/common/block/BlockAntigravitation.java @@ -8,9 +8,9 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import vazkii.botania.common.Botania; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vazkii.botania.common.Botania; public class BlockAntigravitation extends Block { diff --git a/src/main/java/ab/common/block/BlockBoardFate.java b/src/main/java/ab/common/block/BlockBoardFate.java index f3f1645..11ba786 100644 --- a/src/main/java/ab/common/block/BlockBoardFate.java +++ b/src/main/java/ab/common/block/BlockBoardFate.java @@ -18,15 +18,15 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.World; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.common.achievement.IPickupAchievement; import ab.AdvancedBotany; import ab.common.block.tile.TileBoardFate; import ab.common.block.tile.TileGameBoard; import ab.common.block.tile.TileInventory; import ab.common.lib.register.AchievementRegister; import ab.common.lib.register.RecipeListAB; +import vazkii.botania.api.lexicon.ILexiconable; +import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.common.achievement.IPickupAchievement; public class BlockBoardFate extends BlockContainer implements IPickupAchievement, ILexiconable { diff --git a/src/main/java/ab/common/block/BlockEngineerHopper.java b/src/main/java/ab/common/block/BlockEngineerHopper.java index c943e93..71999da 100644 --- a/src/main/java/ab/common/block/BlockEngineerHopper.java +++ b/src/main/java/ab/common/block/BlockEngineerHopper.java @@ -14,16 +14,16 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.World; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.api.wand.IWandHUD; -import vazkii.botania.api.wand.IWandable; -import vazkii.botania.common.block.ModBlocks; import ab.AdvancedBotany; import ab.common.block.tile.TileEngineerHopper; import ab.common.block.tile.TileInventory; import ab.common.lib.register.BlockListAB; import ab.common.lib.register.RecipeListAB; +import vazkii.botania.api.lexicon.ILexiconable; +import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.wand.IWandHUD; +import vazkii.botania.api.wand.IWandable; +import vazkii.botania.common.block.ModBlocks; public class BlockEngineerHopper extends BlockContainer implements IWandable, IWandHUD, ILexiconable { diff --git a/src/main/java/ab/common/block/BlockFreyrLiana.java b/src/main/java/ab/common/block/BlockFreyrLiana.java index e349907..0345109 100644 --- a/src/main/java/ab/common/block/BlockFreyrLiana.java +++ b/src/main/java/ab/common/block/BlockFreyrLiana.java @@ -13,11 +13,11 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; import ab.common.core.CommonHelper; import ab.common.lib.register.BlockListAB; import ab.common.lib.register.RecipeListAB; +import vazkii.botania.api.lexicon.ILexiconable; +import vazkii.botania.api.lexicon.LexiconEntry; public class BlockFreyrLiana extends BlockBush implements ILexiconable { diff --git a/src/main/java/ab/common/block/BlockLebethronWood.java b/src/main/java/ab/common/block/BlockLebethronWood.java index 1566eb3..9aa0bea 100644 --- a/src/main/java/ab/common/block/BlockLebethronWood.java +++ b/src/main/java/ab/common/block/BlockLebethronWood.java @@ -18,14 +18,14 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import vazkii.botania.api.internal.VanillaPacketDispatcher; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; import ab.AdvancedBotany; import ab.common.block.tile.TileLebethronCore; import ab.common.lib.register.RecipeListAB; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vazkii.botania.api.internal.VanillaPacketDispatcher; +import vazkii.botania.api.lexicon.ILexiconable; +import vazkii.botania.api.lexicon.LexiconEntry; public class BlockLebethronWood extends Block implements ILexiconable, ITileEntityProvider { diff --git a/src/main/java/ab/common/block/BlockLuminousFreyrLiana.java b/src/main/java/ab/common/block/BlockLuminousFreyrLiana.java index 4f27cec..105ac8c 100644 --- a/src/main/java/ab/common/block/BlockLuminousFreyrLiana.java +++ b/src/main/java/ab/common/block/BlockLuminousFreyrLiana.java @@ -8,9 +8,9 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import vazkii.botania.common.Botania; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vazkii.botania.common.Botania; public class BlockLuminousFreyrLiana extends BlockFreyrLiana { diff --git a/src/main/java/ab/common/block/BlockMagicCraftCrate.java b/src/main/java/ab/common/block/BlockMagicCraftCrate.java index 1ceee93..87a2ec1 100644 --- a/src/main/java/ab/common/block/BlockMagicCraftCrate.java +++ b/src/main/java/ab/common/block/BlockMagicCraftCrate.java @@ -22,6 +22,10 @@ import net.minecraft.world.World; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; +import ab.AdvancedBotany; +import ab.common.block.tile.TileMagicCraftCrate; +import ab.common.item.ItemCraftingPattern; +import ab.common.lib.register.RecipeListAB; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.client.lib.UtilsFX; @@ -32,10 +36,6 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; import vazkii.botania.common.block.BlockModContainer; -import ab.AdvancedBotany; -import ab.common.block.tile.TileMagicCraftCrate; -import ab.common.item.ItemCraftingPattern; -import ab.common.lib.register.RecipeListAB; public class BlockMagicCraftCrate extends BlockModContainer implements IWandable, IWandHUD, ILexiconable { diff --git a/src/main/java/ab/common/block/BlockManaCharger.java b/src/main/java/ab/common/block/BlockManaCharger.java index c999739..b538e2d 100644 --- a/src/main/java/ab/common/block/BlockManaCharger.java +++ b/src/main/java/ab/common/block/BlockManaCharger.java @@ -14,17 +14,17 @@ import net.minecraft.util.IIcon; import net.minecraft.util.Vec3; import net.minecraft.world.World; +import ab.AdvancedBotany; +import ab.common.block.tile.TileInventory; +import ab.common.block.tile.TileManaCharger; +import ab.common.lib.register.BlockListAB; +import ab.common.lib.register.RecipeListAB; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.IManaItem; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; import vazkii.botania.common.block.ModBlocks; -import ab.AdvancedBotany; -import ab.common.block.tile.TileInventory; -import ab.common.block.tile.TileManaCharger; -import ab.common.lib.register.BlockListAB; -import ab.common.lib.register.RecipeListAB; public class BlockManaCharger extends BlockContainer implements IWandHUD, IWandable, ILexiconable { diff --git a/src/main/java/ab/common/block/BlockManaContainer.java b/src/main/java/ab/common/block/BlockManaContainer.java index 248b2bd..d6ac0dd 100644 --- a/src/main/java/ab/common/block/BlockManaContainer.java +++ b/src/main/java/ab/common/block/BlockManaContainer.java @@ -14,15 +14,15 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import ab.AdvancedBotany; +import ab.common.block.tile.TileManaContainer; +import ab.common.lib.register.BlockListAB; +import ab.common.lib.register.RecipeListAB; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; import vazkii.botania.common.block.ModBlocks; -import ab.AdvancedBotany; -import ab.common.block.tile.TileManaContainer; -import ab.common.lib.register.BlockListAB; -import ab.common.lib.register.RecipeListAB; public class BlockManaContainer extends BlockContainer implements IWandHUD, IWandable, ILexiconable { diff --git a/src/main/java/ab/common/block/BlockManaCrystalCube.java b/src/main/java/ab/common/block/BlockManaCrystalCube.java index 0956fad..a3956a9 100644 --- a/src/main/java/ab/common/block/BlockManaCrystalCube.java +++ b/src/main/java/ab/common/block/BlockManaCrystalCube.java @@ -12,14 +12,14 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.World; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.common.item.ItemTwigWand; import ab.AdvancedBotany; import ab.common.block.tile.TileManaCrystalCube; import ab.common.lib.register.BlockListAB; import ab.common.lib.register.RecipeListAB; +import vazkii.botania.api.lexicon.ILexiconable; +import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.item.ItemTwigWand; public class BlockManaCrystalCube extends BlockContainer implements ILexiconable { diff --git a/src/main/java/ab/common/block/BlockNidavellirForge.java b/src/main/java/ab/common/block/BlockNidavellirForge.java index 34e06f3..1f936ed 100644 --- a/src/main/java/ab/common/block/BlockNidavellirForge.java +++ b/src/main/java/ab/common/block/BlockNidavellirForge.java @@ -15,14 +15,14 @@ import net.minecraft.util.Vec3; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.common.block.ModBlocks; import ab.AdvancedBotany; import ab.common.block.tile.TileInventory; import ab.common.block.tile.TileNidavellirForge; import ab.common.lib.register.BlockListAB; import ab.common.lib.register.RecipeListAB; +import vazkii.botania.api.lexicon.ILexiconable; +import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.common.block.ModBlocks; public class BlockNidavellirForge extends BlockContainer implements ILexiconable { diff --git a/src/main/java/ab/common/block/BlockTerraFarmland.java b/src/main/java/ab/common/block/BlockTerraFarmland.java index ffe1e25..425f813 100644 --- a/src/main/java/ab/common/block/BlockTerraFarmland.java +++ b/src/main/java/ab/common/block/BlockTerraFarmland.java @@ -19,13 +19,13 @@ import net.minecraft.world.World; import net.minecraftforge.common.IPlantable; import net.minecraftforge.common.util.ForgeDirection; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; import ab.api.AdvancedBotanyAPI; import ab.api.TerraFarmlandList; import ab.common.lib.register.RecipeListAB; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vazkii.botania.api.lexicon.ILexiconable; +import vazkii.botania.api.lexicon.LexiconEntry; public class BlockTerraFarmland extends Block implements ILexiconable { diff --git a/src/main/java/ab/common/block/subtile/SubTileAncientAlphirine.java b/src/main/java/ab/common/block/subtile/SubTileAncientAlphirine.java index 46f50e9..5189895 100644 --- a/src/main/java/ab/common/block/subtile/SubTileAncientAlphirine.java +++ b/src/main/java/ab/common/block/subtile/SubTileAncientAlphirine.java @@ -8,14 +8,14 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; -import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.api.subtile.RadiusDescriptor; -import vazkii.botania.api.subtile.SubTileFunctional; -import vazkii.botania.common.item.ItemLexicon; import ab.api.AdvancedBotanyAPI; import ab.api.recipe.RecipeAncientAlphirine; import ab.common.entity.EntityAlphirinePortal; import ab.common.lib.register.RecipeListAB; +import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.subtile.RadiusDescriptor; +import vazkii.botania.api.subtile.SubTileFunctional; +import vazkii.botania.common.item.ItemLexicon; public class SubTileAncientAlphirine extends SubTileFunctional { diff --git a/src/main/java/ab/common/block/subtile/SubTileArdentAzarcissus.java b/src/main/java/ab/common/block/subtile/SubTileArdentAzarcissus.java index d28b895..acb6da6 100644 --- a/src/main/java/ab/common/block/subtile/SubTileArdentAzarcissus.java +++ b/src/main/java/ab/common/block/subtile/SubTileArdentAzarcissus.java @@ -5,12 +5,12 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import ab.common.block.tile.TileGameBoard; +import ab.common.lib.register.RecipeListAB; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileGenerating; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; -import ab.common.block.tile.TileGameBoard; -import ab.common.lib.register.RecipeListAB; public class SubTileArdentAzarcissus extends SubTileGenerating { diff --git a/src/main/java/ab/common/block/subtile/SubTileAspecolus.java b/src/main/java/ab/common/block/subtile/SubTileAspecolus.java index 4762c60..ea80401 100644 --- a/src/main/java/ab/common/block/subtile/SubTileAspecolus.java +++ b/src/main/java/ab/common/block/subtile/SubTileAspecolus.java @@ -9,6 +9,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; +import ab.common.lib.register.RecipeListAB; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.common.Thaumcraft; @@ -17,7 +18,6 @@ import thaumcraft.common.lib.network.playerdata.PacketAspectPool; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; -import ab.common.lib.register.RecipeListAB; public class SubTileAspecolus extends SubTileFunctional { diff --git a/src/main/java/ab/common/block/subtile/SubTileDictarius.java b/src/main/java/ab/common/block/subtile/SubTileDictarius.java index 604c048..15e2e47 100644 --- a/src/main/java/ab/common/block/subtile/SubTileDictarius.java +++ b/src/main/java/ab/common/block/subtile/SubTileDictarius.java @@ -14,12 +14,12 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import ab.common.core.handler.ConfigABHandler; +import ab.common.lib.register.RecipeListAB; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileGenerating; import vazkii.botania.common.block.tile.TileSpecialFlower; -import ab.common.core.handler.ConfigABHandler; -import ab.common.lib.register.RecipeListAB; public class SubTileDictarius extends SubTileGenerating { diff --git a/src/main/java/ab/common/block/subtile/SubTilePureGladiolus.java b/src/main/java/ab/common/block/subtile/SubTilePureGladiolus.java index 43691bd..5cf67c8 100644 --- a/src/main/java/ab/common/block/subtile/SubTilePureGladiolus.java +++ b/src/main/java/ab/common/block/subtile/SubTilePureGladiolus.java @@ -8,13 +8,13 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; +import ab.common.lib.register.RecipeListAB; import thaumcraft.api.aspects.Aspect; import thaumcraft.common.entities.EntityAspectOrb; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.block.ModBlocks; -import ab.common.lib.register.RecipeListAB; public class SubTilePureGladiolus extends SubTileFunctional { diff --git a/src/main/java/ab/common/block/tile/TileABSpreader.java b/src/main/java/ab/common/block/tile/TileABSpreader.java index b98d16e..d7d8719 100644 --- a/src/main/java/ab/common/block/tile/TileABSpreader.java +++ b/src/main/java/ab/common/block/tile/TileABSpreader.java @@ -11,13 +11,13 @@ import net.minecraft.util.StatCollector; import org.lwjgl.opengl.GL11; +import ab.common.core.handler.ConfigABHandler; import vazkii.botania.api.mana.BurstProperties; import vazkii.botania.api.mana.ILensEffect; import vazkii.botania.api.mana.IManaReceiver; import vazkii.botania.client.core.handler.HUDHandler; import vazkii.botania.common.block.tile.mana.TileSpreader; import vazkii.botania.common.entity.EntityManaBurst; -import ab.common.core.handler.ConfigABHandler; public class TileABSpreader extends TileSpreader { diff --git a/src/main/java/ab/common/block/tile/TileBoardFate.java b/src/main/java/ab/common/block/tile/TileBoardFate.java index 09d7439..095319d 100644 --- a/src/main/java/ab/common/block/tile/TileBoardFate.java +++ b/src/main/java/ab/common/block/tile/TileBoardFate.java @@ -13,11 +13,11 @@ import net.minecraft.util.ChatStyle; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.Vec3; +import ab.api.AdvancedBotanyAPI; +import ab.common.core.handler.ConfigABHandler; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.item.IRelic; import vazkii.botania.common.item.relic.ItemRelic; -import ab.api.AdvancedBotanyAPI; -import ab.common.core.handler.ConfigABHandler; public class TileBoardFate extends TileInventory { diff --git a/src/main/java/ab/common/block/tile/TileEngineerHopper.java b/src/main/java/ab/common/block/tile/TileEngineerHopper.java index 8079b6b..8af767e 100644 --- a/src/main/java/ab/common/block/tile/TileEngineerHopper.java +++ b/src/main/java/ab/common/block/tile/TileEngineerHopper.java @@ -19,9 +19,9 @@ import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; -import vazkii.botania.common.item.ModItems; import ab.api.IBoundRender; import ab.client.core.ClientHelper; +import vazkii.botania.common.item.ModItems; public class TileEngineerHopper extends TileInventory implements IHopper, IBoundRender { diff --git a/src/main/java/ab/common/block/tile/TileGameBoard.java b/src/main/java/ab/common/block/tile/TileGameBoard.java index 65976c5..1218ac2 100644 --- a/src/main/java/ab/common/block/tile/TileGameBoard.java +++ b/src/main/java/ab/common/block/tile/TileGameBoard.java @@ -15,9 +15,9 @@ import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.ChatStyle; import net.minecraft.util.EnumChatFormatting; +import ab.api.IRenderHud; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.common.block.tile.TileMod; -import ab.api.IRenderHud; public class TileGameBoard extends TileMod implements IRenderHud { diff --git a/src/main/java/ab/common/block/tile/TileLebethronCore.java b/src/main/java/ab/common/block/tile/TileLebethronCore.java index c91e37a..d3a7484 100644 --- a/src/main/java/ab/common/block/tile/TileLebethronCore.java +++ b/src/main/java/ab/common/block/tile/TileLebethronCore.java @@ -17,13 +17,13 @@ import net.minecraft.world.World; import org.lwjgl.opengl.GL11; +import ab.api.IRenderHud; +import ab.common.lib.register.BlockListAB; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.lexicon.multiblock.Multiblock; import vazkii.botania.api.lexicon.multiblock.MultiblockSet; import vazkii.botania.common.Botania; import vazkii.botania.common.block.tile.TileMod; -import ab.api.IRenderHud; -import ab.common.lib.register.BlockListAB; public class TileLebethronCore extends TileMod implements IRenderHud { diff --git a/src/main/java/ab/common/block/tile/TileMagicCraftCrate.java b/src/main/java/ab/common/block/tile/TileMagicCraftCrate.java index 2b5fc48..1cbdc3e 100644 --- a/src/main/java/ab/common/block/tile/TileMagicCraftCrate.java +++ b/src/main/java/ab/common/block/tile/TileMagicCraftCrate.java @@ -14,6 +14,7 @@ import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; +import cpw.mods.fml.common.gameevent.PlayerEvent.ItemCraftedEvent; import thaumcraft.api.aspects.AspectList; import thaumcraft.common.items.relics.ItemThaumonomicon; import thaumcraft.common.items.wands.ItemWandCasting; @@ -21,7 +22,6 @@ import thaumcraft.common.lib.crafting.ThaumcraftCraftingManager; import thaumcraft.common.tiles.TileMagicWorkbench; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.common.item.ModItems; -import cpw.mods.fml.common.gameevent.PlayerEvent.ItemCraftedEvent; public class TileMagicCraftCrate extends TileMagicWorkbench implements ISidedInventory, IInventory { diff --git a/src/main/java/ab/common/block/tile/TileManaCharger.java b/src/main/java/ab/common/block/tile/TileManaCharger.java index 2399485..172fd27 100644 --- a/src/main/java/ab/common/block/tile/TileManaCharger.java +++ b/src/main/java/ab/common/block/tile/TileManaCharger.java @@ -15,15 +15,15 @@ import net.minecraft.util.StatCollector; import org.lwjgl.opengl.GL11; +import ab.api.IRenderHud; +import ab.client.core.ClientHelper; +import ab.common.core.handler.ConfigABHandler; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.mana.IManaItem; import vazkii.botania.api.mana.IManaReceiver; import vazkii.botania.api.mana.spark.ISparkAttachable; import vazkii.botania.api.wand.IWandBindable; import vazkii.botania.common.block.ModBlocks; -import ab.api.IRenderHud; -import ab.client.core.ClientHelper; -import ab.common.core.handler.ConfigABHandler; public class TileManaCharger extends TileInventory implements ISidedInventory, IRenderHud, IWandBindable { diff --git a/src/main/java/ab/common/block/tile/TileManaContainer.java b/src/main/java/ab/common/block/tile/TileManaContainer.java index 2e056df..782f858 100644 --- a/src/main/java/ab/common/block/tile/TileManaContainer.java +++ b/src/main/java/ab/common/block/tile/TileManaContainer.java @@ -15,13 +15,13 @@ import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.StatCollector; +import ab.client.core.ClientHelper; +import ab.common.core.handler.ConfigABHandler; import vazkii.botania.api.mana.IManaPool; import vazkii.botania.api.mana.spark.ISparkAttachable; import vazkii.botania.api.mana.spark.ISparkEntity; import vazkii.botania.common.Botania; import vazkii.botania.common.block.tile.TileMod; -import ab.client.core.ClientHelper; -import ab.common.core.handler.ConfigABHandler; public class TileManaContainer extends TileMod implements IManaPool, ISparkAttachable { diff --git a/src/main/java/ab/common/block/tile/TileManaCrystalCube.java b/src/main/java/ab/common/block/tile/TileManaCrystalCube.java index 5330950..55ce67d 100644 --- a/src/main/java/ab/common/block/tile/TileManaCrystalCube.java +++ b/src/main/java/ab/common/block/tile/TileManaCrystalCube.java @@ -7,12 +7,12 @@ import net.minecraft.client.gui.ScaledResolution; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; +import ab.api.IRenderHud; +import ab.client.core.ClientHelper; import vazkii.botania.api.mana.spark.ISparkAttachable; import vazkii.botania.api.mana.spark.ISparkEntity; import vazkii.botania.api.mana.spark.SparkHelper; import vazkii.botania.common.block.tile.TileMod; -import ab.api.IRenderHud; -import ab.client.core.ClientHelper; public class TileManaCrystalCube extends TileMod implements IRenderHud { diff --git a/src/main/java/ab/common/block/tile/TileNidavellirForge.java b/src/main/java/ab/common/block/tile/TileNidavellirForge.java index 41ae6e5..8321b69 100644 --- a/src/main/java/ab/common/block/tile/TileNidavellirForge.java +++ b/src/main/java/ab/common/block/tile/TileNidavellirForge.java @@ -11,6 +11,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; +import ab.api.AdvancedBotanyAPI; +import ab.api.recipe.RecipeAdvancedPlate; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.mana.IManaPool; import vazkii.botania.api.mana.spark.ISparkAttachable; @@ -18,8 +20,6 @@ import vazkii.botania.api.mana.spark.ISparkEntity; import vazkii.botania.api.mana.spark.SparkHelper; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.common.Botania; -import ab.api.AdvancedBotanyAPI; -import ab.api.recipe.RecipeAdvancedPlate; public class TileNidavellirForge extends TileInventory implements ISparkAttachable, ISidedInventory { diff --git a/src/main/java/ab/common/entity/EntityAdvancedSpark.java b/src/main/java/ab/common/entity/EntityAdvancedSpark.java index 243151d..2bb9e2e 100644 --- a/src/main/java/ab/common/entity/EntityAdvancedSpark.java +++ b/src/main/java/ab/common/entity/EntityAdvancedSpark.java @@ -19,6 +19,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MathHelper; import net.minecraft.world.World; +import ab.common.lib.register.ItemListAB; +import baubles.common.lib.PlayerHandler; import vazkii.botania.api.mana.IManaItem; import vazkii.botania.api.mana.spark.ISparkAttachable; import vazkii.botania.api.mana.spark.ISparkEntity; @@ -26,8 +28,6 @@ import vazkii.botania.api.mana.spark.SparkHelper; import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ModItems; -import ab.common.lib.register.ItemListAB; -import baubles.common.lib.PlayerHandler; public class EntityAdvancedSpark extends Entity implements ISparkEntity { diff --git a/src/main/java/ab/common/entity/EntityManaVine.java b/src/main/java/ab/common/entity/EntityManaVine.java index 9eddd74..713f7c3 100644 --- a/src/main/java/ab/common/entity/EntityManaVine.java +++ b/src/main/java/ab/common/entity/EntityManaVine.java @@ -17,15 +17,15 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.Vec3; import net.minecraft.world.World; -import vazkii.botania.common.Botania; -import vazkii.botania.common.core.handler.ConfigHandler; -import vazkii.botania.common.lib.LibObfuscation; import ab.client.core.ClientHelper; import ab.common.core.CommonHelper; import ab.common.lib.register.BlockListAB; import cpw.mods.fml.relauncher.ReflectionHelper; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vazkii.botania.common.Botania; +import vazkii.botania.common.core.handler.ConfigHandler; +import vazkii.botania.common.lib.LibObfuscation; public class EntityManaVine extends EntityThrowable { diff --git a/src/main/java/ab/common/entity/EntityNebulaBlaze.java b/src/main/java/ab/common/entity/EntityNebulaBlaze.java index ae3bb6b..74f1180 100644 --- a/src/main/java/ab/common/entity/EntityNebulaBlaze.java +++ b/src/main/java/ab/common/entity/EntityNebulaBlaze.java @@ -13,9 +13,9 @@ import net.minecraft.util.DamageSource; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; -import vazkii.botania.common.Botania; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vazkii.botania.common.Botania; public class EntityNebulaBlaze extends EntityThrowable { diff --git a/src/main/java/ab/common/entity/EntitySeed.java b/src/main/java/ab/common/entity/EntitySeed.java index 834b099..0317315 100644 --- a/src/main/java/ab/common/entity/EntitySeed.java +++ b/src/main/java/ab/common/entity/EntitySeed.java @@ -17,11 +17,11 @@ import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.world.BlockEvent; -import vazkii.botania.common.Botania; -import vazkii.botania.common.item.ItemGrassSeeds; import ab.common.item.equipment.ItemSprawlRod; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vazkii.botania.common.Botania; +import vazkii.botania.common.item.ItemGrassSeeds; public class EntitySeed extends EntityThrowable { diff --git a/src/main/java/ab/common/entity/EntitySword.java b/src/main/java/ab/common/entity/EntitySword.java index 92decd5..ebeff81 100644 --- a/src/main/java/ab/common/entity/EntitySword.java +++ b/src/main/java/ab/common/entity/EntitySword.java @@ -13,9 +13,9 @@ import net.minecraft.util.DamageSource; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; -import vazkii.botania.common.Botania; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vazkii.botania.common.Botania; public class EntitySword extends EntityThrowable { diff --git a/src/main/java/ab/common/item/ItemABResource.java b/src/main/java/ab/common/item/ItemABResource.java index c7d7502..c6d084e 100644 --- a/src/main/java/ab/common/item/ItemABResource.java +++ b/src/main/java/ab/common/item/ItemABResource.java @@ -16,11 +16,11 @@ import net.minecraft.potion.PotionEffect; import net.minecraft.util.IIcon; import net.minecraft.world.World; -import vazkii.botania.api.recipe.IFlowerComponent; import ab.AdvancedBotany; import ab.api.AdvancedBotanyAPI; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vazkii.botania.api.recipe.IFlowerComponent; public class ItemABResource extends Item implements IFlowerComponent { diff --git a/src/main/java/ab/common/item/ItemAdvancedSpark.java b/src/main/java/ab/common/item/ItemAdvancedSpark.java index 2f25c82..2c95a29 100644 --- a/src/main/java/ab/common/item/ItemAdvancedSpark.java +++ b/src/main/java/ab/common/item/ItemAdvancedSpark.java @@ -8,13 +8,13 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import ab.common.entity.EntityAdvancedSpark; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.mana.IManaGivingItem; import vazkii.botania.api.mana.spark.ISparkAttachable; import vazkii.botania.api.mana.spark.ISparkEntity; -import ab.common.entity.EntityAdvancedSpark; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ItemAdvancedSpark extends ItemMod implements IManaGivingItem { diff --git a/src/main/java/ab/common/item/ItemAntigravityCharm.java b/src/main/java/ab/common/item/ItemAntigravityCharm.java index 069d029..6e6efe4 100644 --- a/src/main/java/ab/common/item/ItemAntigravityCharm.java +++ b/src/main/java/ab/common/item/ItemAntigravityCharm.java @@ -13,11 +13,11 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.IIcon; import net.minecraft.world.World; -import vazkii.botania.common.core.helper.ItemNBTHelper; import ab.common.core.CommonHelper; import ab.common.lib.register.BlockListAB; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vazkii.botania.common.core.helper.ItemNBTHelper; public class ItemAntigravityCharm extends ItemMod { diff --git a/src/main/java/ab/common/item/equipment/ItemAquaSword.java b/src/main/java/ab/common/item/equipment/ItemAquaSword.java index 5241b85..4501167 100644 --- a/src/main/java/ab/common/item/equipment/ItemAquaSword.java +++ b/src/main/java/ab/common/item/equipment/ItemAquaSword.java @@ -13,11 +13,11 @@ import net.minecraft.util.DamageSource; import net.minecraft.util.MathHelper; import net.minecraft.util.Vec3; -import vazkii.botania.api.mana.ManaItemHandler; -import vazkii.botania.common.Botania; import ab.AdvancedBotany; import ab.api.AdvancedBotanyAPI; import ab.client.core.handler.PlayerItemUsingSound.ClientSoundHandler; +import vazkii.botania.api.mana.ManaItemHandler; +import vazkii.botania.common.Botania; public class ItemAquaSword extends ItemSword { diff --git a/src/main/java/ab/common/item/equipment/ItemBauble.java b/src/main/java/ab/common/item/equipment/ItemBauble.java index 2d32fe2..76c33cb 100644 --- a/src/main/java/ab/common/item/equipment/ItemBauble.java +++ b/src/main/java/ab/common/item/equipment/ItemBauble.java @@ -14,12 +14,6 @@ import net.minecraft.stats.StatBase; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import vazkii.botania.api.item.ICosmeticAttachable; -import vazkii.botania.api.item.IPhantomInkable; -import vazkii.botania.client.core.helper.RenderHelper; -import vazkii.botania.common.achievement.ModAchievements; -import vazkii.botania.common.core.helper.ItemNBTHelper; -import vazkii.botania.common.entity.EntityDoppleganger; import ab.AdvancedBotany; import baubles.api.BaubleType; import baubles.api.IBauble; @@ -27,6 +21,12 @@ import baubles.common.container.InventoryBaubles; import baubles.common.lib.PlayerHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vazkii.botania.api.item.ICosmeticAttachable; +import vazkii.botania.api.item.IPhantomInkable; +import vazkii.botania.client.core.helper.RenderHelper; +import vazkii.botania.common.achievement.ModAchievements; +import vazkii.botania.common.core.helper.ItemNBTHelper; +import vazkii.botania.common.entity.EntityDoppleganger; public abstract class ItemBauble extends Item implements IBauble, ICosmeticAttachable, IPhantomInkable { diff --git a/src/main/java/ab/common/item/equipment/ItemBlackHalo.java b/src/main/java/ab/common/item/equipment/ItemBlackHalo.java index cf09980..3c2bfb2 100644 --- a/src/main/java/ab/common/item/equipment/ItemBlackHalo.java +++ b/src/main/java/ab/common/item/equipment/ItemBlackHalo.java @@ -29,15 +29,15 @@ import net.minecraftforge.common.MinecraftForge; import org.lwjgl.opengl.GL11; +import ab.common.item.ItemMod; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vazkii.botania.api.item.IBlockProvider; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.common.core.helper.InventoryHelper; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.ItemBlackHoleTalisman; -import ab.common.item.ItemMod; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ItemBlackHalo extends ItemMod implements IBlockProvider { diff --git a/src/main/java/ab/common/item/equipment/ItemManaFlower.java b/src/main/java/ab/common/item/equipment/ItemManaFlower.java index e08e309..be9185a 100644 --- a/src/main/java/ab/common/item/equipment/ItemManaFlower.java +++ b/src/main/java/ab/common/item/equipment/ItemManaFlower.java @@ -4,10 +4,10 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import vazkii.botania.api.mana.IManaGivingItem; -import vazkii.botania.api.mana.ManaItemHandler; import ab.AdvancedBotany; import baubles.api.BaubleType; +import vazkii.botania.api.mana.IManaGivingItem; +import vazkii.botania.api.mana.ManaItemHandler; public class ItemManaFlower extends ItemBauble implements IManaGivingItem { diff --git a/src/main/java/ab/common/item/equipment/ItemMithrillMultiTool.java b/src/main/java/ab/common/item/equipment/ItemMithrillMultiTool.java index ae8fb65..7875ad2 100644 --- a/src/main/java/ab/common/item/equipment/ItemMithrillMultiTool.java +++ b/src/main/java/ab/common/item/equipment/ItemMithrillMultiTool.java @@ -10,11 +10,11 @@ import net.minecraft.item.ItemTool; import net.minecraft.util.IIcon; import net.minecraft.world.World; -import vazkii.botania.common.core.helper.ItemNBTHelper; import ab.AdvancedBotany; import ab.api.AdvancedBotanyAPI; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vazkii.botania.common.core.helper.ItemNBTHelper; public class ItemMithrillMultiTool extends ItemTool { diff --git a/src/main/java/ab/common/item/equipment/ItemMithrillRing.java b/src/main/java/ab/common/item/equipment/ItemMithrillRing.java index 55d8f65..297c91c 100644 --- a/src/main/java/ab/common/item/equipment/ItemMithrillRing.java +++ b/src/main/java/ab/common/item/equipment/ItemMithrillRing.java @@ -8,10 +8,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import baubles.api.BaubleType; import vazkii.botania.api.mana.IManaItem; import vazkii.botania.api.mana.IManaTooltipDisplay; import vazkii.botania.common.core.helper.ItemNBTHelper; -import baubles.api.BaubleType; public class ItemMithrillRing extends ItemBauble implements IManaItem, IManaTooltipDisplay { diff --git a/src/main/java/ab/common/item/equipment/ItemNebulaBlaze.java b/src/main/java/ab/common/item/equipment/ItemNebulaBlaze.java index 9937192..2b5b3cb 100644 --- a/src/main/java/ab/common/item/equipment/ItemNebulaBlaze.java +++ b/src/main/java/ab/common/item/equipment/ItemNebulaBlaze.java @@ -6,11 +6,11 @@ import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import vazkii.botania.api.mana.IManaUsingItem; -import vazkii.botania.api.mana.ManaItemHandler; import ab.api.AdvancedBotanyAPI; import ab.common.entity.EntityNebulaBlaze; import ab.common.item.ItemMod; +import vazkii.botania.api.mana.IManaUsingItem; +import vazkii.botania.api.mana.ManaItemHandler; public class ItemNebulaBlaze extends ItemMod implements IManaUsingItem { diff --git a/src/main/java/ab/common/item/equipment/ItemNebulaRod.java b/src/main/java/ab/common/item/equipment/ItemNebulaRod.java index 2d092da..e536b7a 100644 --- a/src/main/java/ab/common/item/equipment/ItemNebulaRod.java +++ b/src/main/java/ab/common/item/equipment/ItemNebulaRod.java @@ -23,15 +23,15 @@ import net.minecraft.world.chunk.Chunk; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.EnderTeleportEvent; -import vazkii.botania.api.mana.IManaUsingItem; -import vazkii.botania.api.mana.ManaItemHandler; -import vazkii.botania.common.Botania; -import vazkii.botania.common.core.helper.Vector3; import ab.api.AdvancedBotanyAPI; import ab.client.core.ClientHelper; import ab.client.core.handler.PlayerItemUsingSound.ClientSoundHandler; import ab.common.core.handler.ConfigABHandler; import ab.common.item.ItemMod; +import vazkii.botania.api.mana.IManaUsingItem; +import vazkii.botania.api.mana.ManaItemHandler; +import vazkii.botania.common.Botania; +import vazkii.botania.common.core.helper.Vector3; public class ItemNebulaRod extends ItemMod implements IManaUsingItem { diff --git a/src/main/java/ab/common/item/equipment/ItemSpaceBlade.java b/src/main/java/ab/common/item/equipment/ItemSpaceBlade.java index 3205d58..84161e0 100644 --- a/src/main/java/ab/common/item/equipment/ItemSpaceBlade.java +++ b/src/main/java/ab/common/item/equipment/ItemSpaceBlade.java @@ -29,20 +29,20 @@ import net.minecraft.util.StatCollector; import net.minecraft.util.Vec3; import net.minecraft.world.World; +import com.google.common.collect.Multimap; + +import ab.AdvancedBotany; +import ab.api.AdvancedBotanyAPI; +import ab.api.IRankItem; +import ab.common.core.handler.ConfigABHandler; +import ab.common.core.handler.NetworkHandler; +import ab.common.entity.EntitySword; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.ItemNBTHelper; -import ab.AdvancedBotany; -import ab.api.AdvancedBotanyAPI; -import ab.api.IRankItem; -import ab.common.core.handler.*; -import ab.common.entity.EntitySword; - -import com.google.common.collect.Multimap; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ItemSpaceBlade extends ItemSword implements IRankItem, IManaUsingItem { diff --git a/src/main/java/ab/common/item/equipment/ItemSprawlRod.java b/src/main/java/ab/common/item/equipment/ItemSprawlRod.java index 9eb8437..dbb37d4 100644 --- a/src/main/java/ab/common/item/equipment/ItemSprawlRod.java +++ b/src/main/java/ab/common/item/equipment/ItemSprawlRod.java @@ -9,13 +9,13 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.Vec3; import net.minecraft.world.World; +import ab.common.core.handler.ConfigABHandler; +import ab.common.entity.EntitySeed; +import ab.common.item.ItemMod; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.common.Botania; import vazkii.botania.common.item.ModItems; -import ab.common.core.handler.ConfigABHandler; -import ab.common.entity.EntitySeed; -import ab.common.item.ItemMod; public class ItemSprawlRod extends ItemMod implements IManaUsingItem { diff --git a/src/main/java/ab/common/item/equipment/ItemTerraHoe.java b/src/main/java/ab/common/item/equipment/ItemTerraHoe.java index 69f5a16..7865701 100644 --- a/src/main/java/ab/common/item/equipment/ItemTerraHoe.java +++ b/src/main/java/ab/common/item/equipment/ItemTerraHoe.java @@ -11,15 +11,15 @@ import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.UseHoeEvent; +import ab.AdvancedBotany; +import ab.common.lib.register.BlockListAB; +import cpw.mods.fml.common.eventhandler.Event.Result; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.item.ModItems; -import ab.AdvancedBotany; -import ab.common.lib.register.BlockListAB; -import cpw.mods.fml.common.eventhandler.Event.Result; public class ItemTerraHoe extends ItemHoe implements IManaUsingItem { diff --git a/src/main/java/ab/common/item/equipment/armor/ItemNebulaArmor.java b/src/main/java/ab/common/item/equipment/armor/ItemNebulaArmor.java index b9708fe..8d87ad3 100644 --- a/src/main/java/ab/common/item/equipment/armor/ItemNebulaArmor.java +++ b/src/main/java/ab/common/item/equipment/armor/ItemNebulaArmor.java @@ -15,17 +15,17 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.common.ISpecialArmor; -import vazkii.botania.api.mana.IManaItem; -import vazkii.botania.api.mana.IManaTooltipDisplay; -import vazkii.botania.api.mana.ManaItemHandler; -import vazkii.botania.common.core.helper.ItemNBTHelper; -import vazkii.botania.common.item.equipment.armor.manasteel.ItemManasteelArmor; import ab.AdvancedBotany; import ab.api.AdvancedBotanyAPI; import ab.client.model.armor.ModelArmorNebula; import ab.common.lib.register.ItemListAB; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vazkii.botania.api.mana.IManaItem; +import vazkii.botania.api.mana.IManaTooltipDisplay; +import vazkii.botania.api.mana.ManaItemHandler; +import vazkii.botania.common.core.helper.ItemNBTHelper; +import vazkii.botania.common.item.equipment.armor.manasteel.ItemManasteelArmor; public class ItemNebulaArmor extends ItemManasteelArmor implements IManaItem, IManaTooltipDisplay { diff --git a/src/main/java/ab/common/item/equipment/armor/ItemNebulaBoots.java b/src/main/java/ab/common/item/equipment/armor/ItemNebulaBoots.java index 9124bbe..d46d9e0 100644 --- a/src/main/java/ab/common/item/equipment/armor/ItemNebulaBoots.java +++ b/src/main/java/ab/common/item/equipment/armor/ItemNebulaBoots.java @@ -9,8 +9,8 @@ import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingEvent; -import vazkii.botania.common.Botania; import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import vazkii.botania.common.Botania; public class ItemNebulaBoots extends ItemNebulaArmor { diff --git a/src/main/java/ab/common/item/equipment/armor/ItemNebulaChest.java b/src/main/java/ab/common/item/equipment/armor/ItemNebulaChest.java index 7108c53..70ba8c6 100644 --- a/src/main/java/ab/common/item/equipment/armor/ItemNebulaChest.java +++ b/src/main/java/ab/common/item/equipment/armor/ItemNebulaChest.java @@ -13,6 +13,7 @@ import net.minecraftforge.event.entity.living.LivingEvent; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; + import cpw.mods.fml.common.eventhandler.SubscribeEvent; public class ItemNebulaChest extends ItemNebulaArmor { diff --git a/src/main/java/ab/common/item/equipment/armor/ItemNebulaHelm.java b/src/main/java/ab/common/item/equipment/armor/ItemNebulaHelm.java index 663c978..cc63d08 100644 --- a/src/main/java/ab/common/item/equipment/armor/ItemNebulaHelm.java +++ b/src/main/java/ab/common/item/equipment/armor/ItemNebulaHelm.java @@ -14,15 +14,15 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import com.google.common.collect.HashMultimap; +import com.google.common.collect.Multimap; + import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.mana.IManaDiscountArmor; import vazkii.botania.api.mana.IManaGivingItem; import vazkii.botania.api.mana.IManaItem; import vazkii.botania.common.core.helper.ItemNBTHelper; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; - public class ItemNebulaHelm extends ItemNebulaArmor implements IManaDiscountArmor, IManaGivingItem { private static final String TAG_COSMIC_FACE = "enableCosmicFace"; diff --git a/src/main/java/ab/common/item/equipment/armor/ItemNebulaHelmRevealing.java b/src/main/java/ab/common/item/equipment/armor/ItemNebulaHelmRevealing.java index 2f50f26..e6ca5f0 100644 --- a/src/main/java/ab/common/item/equipment/armor/ItemNebulaHelmRevealing.java +++ b/src/main/java/ab/common/item/equipment/armor/ItemNebulaHelmRevealing.java @@ -3,10 +3,10 @@ package ab.common.item.equipment.armor; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; -import thaumcraft.api.IGoggles; -import thaumcraft.api.nodes.IRevealer; import cpw.mods.fml.common.Optional.Interface; import cpw.mods.fml.common.Optional.InterfaceList; +import thaumcraft.api.IGoggles; +import thaumcraft.api.nodes.IRevealer; @InterfaceList({ @Interface(modid = "Thaumcraft", iface = "thaumcraft.api.IGoggles", striprefs = true), @Interface(modid = "Thaumcraft", iface = "thaumcraft.api.nodes.IRevealer", striprefs = true) }) diff --git a/src/main/java/ab/common/item/equipment/armor/ItemWildHuntArmor.java b/src/main/java/ab/common/item/equipment/armor/ItemWildHuntArmor.java index da0aef9..f16222a 100644 --- a/src/main/java/ab/common/item/equipment/armor/ItemWildHuntArmor.java +++ b/src/main/java/ab/common/item/equipment/armor/ItemWildHuntArmor.java @@ -9,13 +9,13 @@ import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; -import vazkii.botania.common.item.equipment.armor.manasteel.ItemManasteelArmor; import ab.AdvancedBotany; import ab.api.AdvancedBotanyAPI; import ab.client.model.armor.ModelArmorWildHunt; import ab.common.lib.register.ItemListAB; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vazkii.botania.common.item.equipment.armor.manasteel.ItemManasteelArmor; public class ItemWildHuntArmor extends ItemManasteelArmor { diff --git a/src/main/java/ab/common/item/relic/ItemFreyrSlingshot.java b/src/main/java/ab/common/item/relic/ItemFreyrSlingshot.java index 7451e1b..b02156f 100644 --- a/src/main/java/ab/common/item/relic/ItemFreyrSlingshot.java +++ b/src/main/java/ab/common/item/relic/ItemFreyrSlingshot.java @@ -5,9 +5,9 @@ import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import ab.common.entity.EntityManaVine; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; -import ab.common.entity.EntityManaVine; public class ItemFreyrSlingshot extends ItemModRelic implements IManaUsingItem { diff --git a/src/main/java/ab/common/item/relic/ItemHornPlenty.java b/src/main/java/ab/common/item/relic/ItemHornPlenty.java index 554d572..60de8ce 100644 --- a/src/main/java/ab/common/item/relic/ItemHornPlenty.java +++ b/src/main/java/ab/common/item/relic/ItemHornPlenty.java @@ -11,8 +11,6 @@ import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingDropsEvent; -import vazkii.botania.api.mana.ManaItemHandler; -import vazkii.botania.common.core.helper.ItemNBTHelper; import ab.client.core.handler.PlayerItemUsingSound.ClientSoundHandler; import ab.common.core.handler.ConfigABHandler; import ab.common.core.handler.NetworkHandler; @@ -20,6 +18,8 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.ReflectionHelper; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vazkii.botania.api.mana.ManaItemHandler; +import vazkii.botania.common.core.helper.ItemNBTHelper; public class ItemHornPlenty extends ItemModRelic { diff --git a/src/main/java/ab/common/item/relic/ItemModRelic.java b/src/main/java/ab/common/item/relic/ItemModRelic.java index 8df26ce..b73b56b 100644 --- a/src/main/java/ab/common/item/relic/ItemModRelic.java +++ b/src/main/java/ab/common/item/relic/ItemModRelic.java @@ -8,10 +8,10 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; -import vazkii.botania.common.item.relic.ItemRelic; import ab.AdvancedBotany; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vazkii.botania.common.item.relic.ItemRelic; public class ItemModRelic extends ItemRelic { diff --git a/src/main/java/ab/common/item/relic/ItemPocketWardrobe.java b/src/main/java/ab/common/item/relic/ItemPocketWardrobe.java index 866d6a4..bd04aa9 100644 --- a/src/main/java/ab/common/item/relic/ItemPocketWardrobe.java +++ b/src/main/java/ab/common/item/relic/ItemPocketWardrobe.java @@ -20,13 +20,13 @@ import net.minecraftforge.event.entity.living.LivingAttackEvent; import org.lwjgl.opengl.GL11; -import vazkii.botania.client.core.handler.ClientTickHandler; -import vazkii.botania.common.core.helper.ItemNBTHelper; import ab.client.core.ClientHelper; import ab.common.entity.EntityAnonymousSteve; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vazkii.botania.client.core.handler.ClientTickHandler; +import vazkii.botania.common.core.helper.ItemNBTHelper; public class ItemPocketWardrobe extends ItemModRelic { diff --git a/src/main/java/ab/common/item/relic/ItemSphereNavigation.java b/src/main/java/ab/common/item/relic/ItemSphereNavigation.java index fdd3eb7..44a0437 100644 --- a/src/main/java/ab/common/item/relic/ItemSphereNavigation.java +++ b/src/main/java/ab/common/item/relic/ItemSphereNavigation.java @@ -16,14 +16,14 @@ import net.minecraft.util.MathHelper; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import vazkii.botania.api.mana.ManaItemHandler; -import vazkii.botania.common.Botania; -import vazkii.botania.common.core.helper.ItemNBTHelper; import ab.client.core.handler.ItemsRemainingRender; import ab.common.core.handler.ConfigABHandler; import ab.common.core.handler.NetworkHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vazkii.botania.api.mana.ManaItemHandler; +import vazkii.botania.common.Botania; +import vazkii.botania.common.core.helper.ItemNBTHelper; public class ItemSphereNavigation extends ItemModRelic { diff --git a/src/main/java/ab/common/item/relic/ItemTalismanHiddenRiches.java b/src/main/java/ab/common/item/relic/ItemTalismanHiddenRiches.java index 7f81f59..6022ceb 100644 --- a/src/main/java/ab/common/item/relic/ItemTalismanHiddenRiches.java +++ b/src/main/java/ab/common/item/relic/ItemTalismanHiddenRiches.java @@ -23,13 +23,13 @@ import net.minecraftforge.common.MinecraftForge; import org.lwjgl.opengl.GL11; -import vazkii.botania.client.core.handler.ClientTickHandler; -import vazkii.botania.common.core.helper.ItemNBTHelper; import ab.AdvancedBotany; import ab.client.core.ClientHelper; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vazkii.botania.client.core.handler.ClientTickHandler; +import vazkii.botania.common.core.helper.ItemNBTHelper; public class ItemTalismanHiddenRiches extends ItemModRelic { diff --git a/src/main/java/ab/common/lib/register/BlockListAB.java b/src/main/java/ab/common/lib/register/BlockListAB.java index 4d183d4..fd45802 100644 --- a/src/main/java/ab/common/lib/register/BlockListAB.java +++ b/src/main/java/ab/common/lib/register/BlockListAB.java @@ -2,7 +2,6 @@ package ab.common.lib.register; import net.minecraft.block.Block; -import vazkii.botania.common.Botania; import ab.common.block.BlockABSpreader; import ab.common.block.BlockABStorage; import ab.common.block.BlockAntigravitation; @@ -31,6 +30,7 @@ import ab.common.core.handler.ConfigABHandler; import ab.common.item.block.ItemBlockBase; import ab.common.item.block.ItemBlockBoard; import cpw.mods.fml.common.registry.GameRegistry; +import vazkii.botania.common.Botania; public class BlockListAB { diff --git a/src/main/java/ab/common/lib/register/FlowerRegister.java b/src/main/java/ab/common/lib/register/FlowerRegister.java index a9ce751..11c9b32 100644 --- a/src/main/java/ab/common/lib/register/FlowerRegister.java +++ b/src/main/java/ab/common/lib/register/FlowerRegister.java @@ -1,14 +1,14 @@ package ab.common.lib.register; -import vazkii.botania.api.BotaniaAPI; -import vazkii.botania.api.subtile.SubTileEntity; -import vazkii.botania.common.Botania; import ab.common.block.subtile.ABSubTileSignature; import ab.common.block.subtile.SubTileAncientAlphirine; 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 vazkii.botania.api.BotaniaAPI; +import vazkii.botania.api.subtile.SubTileEntity; +import vazkii.botania.common.Botania; 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 d5b01e5..e4bfd49 100644 --- a/src/main/java/ab/common/lib/register/ItemListAB.java +++ b/src/main/java/ab/common/lib/register/ItemListAB.java @@ -2,10 +2,22 @@ package ab.common.lib.register; import net.minecraft.item.Item; -import vazkii.botania.common.Botania; import ab.common.core.handler.ConfigABHandler; -import ab.common.item.*; -import ab.common.item.equipment.*; +import ab.common.item.ItemABResource; +import ab.common.item.ItemAdvancedSpark; +import ab.common.item.ItemAntigravityCharm; +import ab.common.item.ItemCraftingPattern; +import ab.common.item.equipment.ItemAquaSword; +import ab.common.item.equipment.ItemBlackHalo; +import ab.common.item.equipment.ItemManaFlower; +import ab.common.item.equipment.ItemMithrillMultiTool; +import ab.common.item.equipment.ItemMithrillRing; +import ab.common.item.equipment.ItemNebulaBlaze; +import ab.common.item.equipment.ItemNebulaRing; +import ab.common.item.equipment.ItemNebulaRod; +import ab.common.item.equipment.ItemSpaceBlade; +import ab.common.item.equipment.ItemSprawlRod; +import ab.common.item.equipment.ItemTerraHoe; import ab.common.item.equipment.armor.ItemNebulaBoots; import ab.common.item.equipment.armor.ItemNebulaChest; import ab.common.item.equipment.armor.ItemNebulaHelm; @@ -17,6 +29,7 @@ import ab.common.item.relic.ItemPocketWardrobe; import ab.common.item.relic.ItemSphereNavigation; import ab.common.item.relic.ItemTalismanHiddenRiches; import cpw.mods.fml.common.registry.GameRegistry; +import vazkii.botania.common.Botania; 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 24d3e7f..dabf6e0 100644 --- a/src/main/java/ab/common/lib/register/RecipeListAB.java +++ b/src/main/java/ab/common/lib/register/RecipeListAB.java @@ -7,7 +7,6 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.ResourceLocation; @@ -15,6 +14,18 @@ import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; +import ab.api.AdvancedBotanyAPI; +import ab.api.recipe.RecipeAdvancedPlate; +import ab.api.recipe.RecipeAncientAlphirine; +import ab.api.recipe.lexicon.AdvancedPlateCraftPage; +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.utils.IModHelper; +import ab.utils.LocalizationManager; +import ab.utils.OreDict; +import cpw.mods.fml.common.registry.GameRegistry; import thaumcraft.api.ThaumcraftApi; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; @@ -28,7 +39,6 @@ import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.KnowledgeType; import vazkii.botania.api.lexicon.LexiconCategory; import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.api.lexicon.LexiconPage; import vazkii.botania.api.recipe.RecipePetals; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; @@ -41,18 +51,6 @@ import vazkii.botania.common.lexicon.RLexiconEntry; import vazkii.botania.common.lexicon.page.PageImage; import vazkii.botania.common.lexicon.page.PageText; import vazkii.botania.common.lib.LibOreDict; -import ab.api.AdvancedBotanyAPI; -import ab.api.recipe.RecipeAdvancedPlate; -import ab.api.recipe.RecipeAncientAlphirine; -import ab.api.recipe.lexicon.AdvancedPlateCraftPage; -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.utils.IModHelper; -import ab.utils.LocalizationManager; -import ab.utils.OreDict; -import cpw.mods.fml.common.registry.GameRegistry; public class RecipeListAB implements IModHelper { @@ -175,7 +173,7 @@ public class RecipeListAB implements IModHelper { 11); manaFlowerRecipe = AdvancedBotanyAPI.registerAlphirineRecipe( new ItemStack(ItemListAB.itemABResource, 1, 4), - new ItemStack(ModBlocks.flower, 1, 32767), + new ItemStack(ModBlocks.flower, 1, OreDictionary.WILDCARD_VALUE), 32); hopperRecipe = AdvancedBotanyAPI.registerAlphirineRecipe( new ItemStack(BlockListAB.blockEngineerHopper), @@ -191,67 +189,67 @@ public class RecipeListAB implements IModHelper { mithrillRecipe = AdvancedBotanyAPI.registerAdvancedPlateRecipe( new ItemStack(ItemListAB.itemABResource, 1, 0), - new ItemStack(ModItems.manaResource, 1, 14), - OreDictionary.getOres("blockManasteel").get(0), - OreDictionary.getOres("blockTerrasteel").get(0), 2500000, - 0x25d6b7); + 0x25d6b7, + new ItemStack(ModItems.manaResource, 1, 14), + "blockManasteel", + "blockTerrasteel"); terrasteelRecipe = AdvancedBotanyAPI.registerAdvancedPlateRecipe( new ItemStack(ModItems.manaResource, 1, 4), + 500000, + 0x29de20, new ItemStack(ModItems.manaResource, 1, 2), new ItemStack(ModItems.manaResource, 1, 0), - new ItemStack(ModItems.manaResource, 1, 1), - 500000, - 0x29de20); + new ItemStack(ModItems.manaResource, 1, 1)); manaStarRecipe = AdvancedBotanyAPI.registerAdvancedPlateRecipe( new ItemStack(ItemListAB.itemABResource, 1, 2), + 250000, + 0x6bc9ec, new ItemStack(ModItems.manaResource, 1, 23), new ItemStack(ModItems.manaResource, 1, 5), - new ItemStack(Items.nether_star), - 250000, - 0x6bc9ec); + new ItemStack(Items.nether_star)); nebulaRecipe = AdvancedBotanyAPI.registerAdvancedPlateRecipe( new ItemStack(ItemListAB.itemABResource, 1, 5), - new ItemStack(ModItems.rainbowRod), - OreDictionary.getOres("blockBotaniaDragonstone").get(0), - new ItemStack(BlockListAB.blockABStorage, 1, 0), 25000000, - 0x8d16e0); + 0x8d16e0, + new ItemStack(ModItems.rainbowRod), + "blockBotaniaDragonstone", + new ItemStack(BlockListAB.blockABStorage, 1, 0)); terrasteelBlockRecipe = AdvancedBotanyAPI.registerAdvancedPlateRecipe( - OreDictionary.getOres("blockTerrasteel").get(0), - new ItemStack(ModItems.rune, 1, 8), - OreDictionary.getOres("blockManasteel").get(0), - OreDictionary.getOres("blockManaDiamond").get(0), + "blockTerrasteel", 4500000, - 0x29de21); + 0x29de21, + new ItemStack(ModItems.rune, 1, 8), + "blockManasteel", + "blockManaDiamond"); FlawlessManaDiamondRecipe = AdvancedBotanyAPI.registerAdvancedPlateRecipe( - OreDictionary.getOres("gemFlawlessManaDiamond").get(0), - new ItemStack(ModItems.manaResource, 1, 2), - new ItemStack(ModItems.manaResource, 1, 2), - new ItemStack(ModItems.manaResource, 1, 2), + "gemFlawlessManaDiamond", 250000, - 0x1dab92); + 0x1dab92, + new ItemStack(ModItems.manaResource, 1, 2), + new ItemStack(ModItems.manaResource, 1, 2), + new ItemStack(ModItems.manaResource, 1, 2)); ExquisiteManaDiamondRecipe = AdvancedBotanyAPI.registerAdvancedPlateRecipe( - OreDictionary.getOres("gemExquisiteManaDiamond").get(0), - OreDictionary.getOres("gemFlawlessManaDiamond").get(0), - OreDictionary.getOres("gemFlawlessManaDiamond").get(0), - new ItemStack(ModItems.manaResource, 1, 2), + "gemExquisiteManaDiamond", 250000, - 0x1dab92); + 0x1dab92, + "gemFlawlessManaDiamond", + "gemFlawlessManaDiamond", + new ItemStack(ModItems.manaResource, 1, 2)); FlawlessDragonstoneRecipe = AdvancedBotanyAPI.registerAdvancedPlateRecipe( - OreDictionary.getOres("gemFlawlessBotaniaDragonstone").get(0), - new ItemStack(ModItems.manaResource, 1, 9), - new ItemStack(ModItems.manaResource, 1, 9), - new ItemStack(ModItems.manaResource, 1, 9), + "gemFlawlessBotaniaDragonstone", 300000, - 0xd6259d); + 0xd6259d, + new ItemStack(ModItems.manaResource, 1, 9), + new ItemStack(ModItems.manaResource, 1, 9), + new ItemStack(ModItems.manaResource, 1, 9)); ExquisiteDragonstoneRecipe = AdvancedBotanyAPI.registerAdvancedPlateRecipe( - OreDictionary.getOres("gemExquisiteBotaniaDragonstone").get(0), - OreDictionary.getOres("gemFlawlessBotaniaDragonstone").get(0), - OreDictionary.getOres("gemFlawlessBotaniaDragonstone").get(0), - new ItemStack(ModItems.manaResource, 1, 9), + "gemExquisiteBotaniaDragonstone", 300000, - 0xd6259d); + 0xd6259d, + "gemFlawlessBotaniaDragonstone", + "gemFlawlessBotaniaDragonstone", + new ItemStack(ModItems.manaResource, 1, 9)); ///////////////////////////////////////////////////////////////////////////////////////// Shaped Recipes // Ancient alphirine recipe @@ -269,127 +267,111 @@ public class RecipeListAB implements IModHelper { new ItemStack(ModItems.rune, 1, 7), new ItemStack(ModItems.petal, 1, 1), new ItemStack(ModItems.petal, 1, 4)); - ancientAlphirine.setPriority().setKnowledgeType(BotaniaAPI.elvenKnowledge).setLexiconPages( - new LexiconPage[] { new PageText("0"), new PageText("1"), + ancientAlphirine.setPriority().setKnowledgeType(BotaniaAPI.elvenKnowledge) + .setLexiconPages( + new PageText("0"), + new PageText("1"), new PageImage("2", "ab:textures/misc/ancientAlphirine.png"), BotaniaAPI.internalHandler.petalRecipePage(".petalCraft", alphirineRecipe), - new AlphirineCraftPage(ancientAlphirine, forgottenLandRecipe.getOutput(), ".alphirineCraft") }) + new AlphirineCraftPage(ancientAlphirine, forgottenLandRecipe.getOutput(), ".alphirineCraft")) .setIcon(ItemBlockSpecialFlower.ofType("ancientAlphirine")); // Forge of Nidavellir recipe advandedAgglomerationPlate = new BLexiconEntry("advancedPlate", categoryForgotten); advandedAgglomerationPlate.setPriority().setKnowledgeType(forgotten).setLexiconPages( - new LexiconPage[] { new PageText("0"), - new AdvancedPlateCraftPage( - advandedAgglomerationPlate, - terrasteelRecipe.getOutput(), - ".abCraft0"), - new AdvancedPlateCraftPage(advandedAgglomerationPlate, manaStarRecipe.getOutput(), ".abCraft0"), - new AdvancedPlateCraftPage( - advandedAgglomerationPlate, - terrasteelBlockRecipe.getOutput(), - ".abCraft1"), - new AdvancedPlateCraftPage(advandedAgglomerationPlate, mithrillRecipe.getOutput(), ".abCraft0"), - new AdvancedPlateCraftPage(advandedAgglomerationPlate, nebulaRecipe.getOutput(), ".abCraft0"), - new AdvancedPlateCraftPage( - advandedAgglomerationPlate, - FlawlessManaDiamondRecipe.getOutput(), - ".abCraft0"), - new AdvancedPlateCraftPage( - advandedAgglomerationPlate, - FlawlessDragonstoneRecipe.getOutput(), - ".abCraft0"), - new AdvancedPlateCraftPage( - advandedAgglomerationPlate, - ExquisiteManaDiamondRecipe.getOutput(), - ".abCraft0"), - new AdvancedPlateCraftPage( - advandedAgglomerationPlate, - ExquisiteDragonstoneRecipe.getOutput(), - ".abCraft0") }) + new PageText("0"), + new AdvancedPlateCraftPage(advandedAgglomerationPlate, terrasteelRecipe.getOutput(), ".abCraft0"), + new AdvancedPlateCraftPage(advandedAgglomerationPlate, manaStarRecipe.getOutput(), ".abCraft0"), + new AdvancedPlateCraftPage(advandedAgglomerationPlate, terrasteelBlockRecipe.getOutput(), ".abCraft1"), + new AdvancedPlateCraftPage(advandedAgglomerationPlate, mithrillRecipe.getOutput(), ".abCraft0"), + new AdvancedPlateCraftPage(advandedAgglomerationPlate, nebulaRecipe.getOutput(), ".abCraft0"), + new AdvancedPlateCraftPage( + advandedAgglomerationPlate, + FlawlessManaDiamondRecipe.getOutput(), + ".abCraft0"), + new AdvancedPlateCraftPage( + advandedAgglomerationPlate, + FlawlessDragonstoneRecipe.getOutput(), + ".abCraft0"), + new AdvancedPlateCraftPage( + advandedAgglomerationPlate, + ExquisiteManaDiamondRecipe.getOutput(), + ".abCraft0"), + new AdvancedPlateCraftPage( + advandedAgglomerationPlate, + ExquisiteDragonstoneRecipe.getOutput(), + ".abCraft0")) .setIcon(new ItemStack(BlockListAB.blockABPlate)); - // Natural mana spreader recipe - - GameRegistry.addRecipe( - new ShapedOreRecipe( - new ItemStack(BlockListAB.blockABSpreader), - "WMW", - "PSP", - "WMW", - 'W', - new ItemStack(BlockListAB.blockLebethron, 1, 4), - 'M', - new ItemStack(ItemListAB.itemABResource, 1, 2), - 'P', - new ItemStack(ModBlocks.pylon), - 'S', - new ItemStack(ModBlocks.spreader, 1, 3))); + IRecipe lebethronSpreaderRecipe = addOreDictRecipe( + new ItemStack(BlockListAB.blockABSpreader), + "WMW", + "PSP", + "WMW", + 'W', + new ItemStack(BlockListAB.blockLebethron, 1, 4), + 'M', + new ItemStack(ItemListAB.itemABResource, 1, 2), + 'P', + new ItemStack(ModBlocks.pylon), + 'S', + new ItemStack(ModBlocks.spreader, 1, 3)); lebethronSpreader = new BLexiconEntry("lebethronSpreader", categoryForgotten); lebethronSpreader.setKnowledgeType(forgotten) .setLexiconPages( - new LexiconPage[] { new PageText("0"), - BotaniaAPI.internalHandler.craftingRecipePage(".craft", getLastRecipe()) }) + new PageText("0"), + BotaniaAPI.internalHandler.craftingRecipePage(".craft", lebethronSpreaderRecipe)) .setIcon(new ItemStack(BlockListAB.blockABSpreader)); - // Lebethorn block variants recipes - addShapelessOreDictRecipe( + IRecipe lebethronWoodRecipe1 = addShapelessOreDictRecipe( new ItemStack(BlockListAB.blockLebethron, 4, 1), - new Object[] { new ItemStack(BlockListAB.blockLebethron) }); - IRecipe leb1 = getLastRecipe(); - addShapelessOreDictRecipe( + new ItemStack(BlockListAB.blockLebethron)); + IRecipe lebethronWoodRecipe2 = addShapelessOreDictRecipe( new ItemStack(BlockListAB.blockLebethron, 1, 2), - new Object[] { new ItemStack(BlockListAB.blockLebethron, 1, 1), new ItemStack(Items.wheat_seeds) }); - IRecipe leb2 = getLastRecipe(); + new ItemStack(BlockListAB.blockLebethron, 1, 1), + new ItemStack(Items.wheat_seeds)); + IRecipe lebethronWoodRecipe3 = addOreDictRecipe( + new ItemStack(BlockListAB.blockLebethron, 4, 3), + "SLS", + "LEL", + "SLS", + 'S', + "ingotSteeleaf", + 'L', + new ItemStack(BlockListAB.blockLebethron, 1, 0), + 'E', + new ItemStack(ModBlocks.pylon)); + IRecipe lebethronWoodRecipe4 = addOreDictRecipe( + new ItemStack(BlockListAB.blockLebethron, 1, 4), + "4W5", + "WPW", + "6W7", + 'W', + new ItemStack(BlockListAB.blockLebethron, 1, 3), + 'P', + new ItemStack(ModBlocks.pylon, 1, 1), + '4', + new ItemStack(ModItems.rune, 1, 4), + '5', + new ItemStack(ModItems.rune, 1, 5), + '6', + new ItemStack(ModItems.rune, 1, 6), + '7', + new ItemStack(ModItems.rune, 1, 7)); - GameRegistry.addRecipe( - new ShapedOreRecipe( - new ItemStack(BlockListAB.blockLebethron, 4, 3), - "SLS", - "LEL", - "SLS", - 'S', - "ingotSteeleaf", - 'L', - new ItemStack(BlockListAB.blockLebethron, 1, 0), - 'E', - new ItemStack(ModBlocks.pylon))); - - IRecipe leb3 = getLastRecipe(); - - GameRegistry.addRecipe( - new ShapedOreRecipe( - new ItemStack(BlockListAB.blockLebethron, 1, 4), - "4W5", - "WPW", - "6W7", - 'W', - new ItemStack(BlockListAB.blockLebethron, 1, 3), - 'P', - new ItemStack(ModBlocks.pylon, 1, 1), - '4', - new ItemStack(ModItems.rune, 1, 4), - '5', - new ItemStack(ModItems.rune, 1, 5), - '6', - new ItemStack(ModItems.rune, 1, 6), - '7', - new ItemStack(ModItems.rune, 1, 7))); - - IRecipe leb4 = getLastRecipe(); lebethronWood = new BLexiconEntry("lebethronWood", categoryForgotten); lebethronWood.setKnowledgeType(forgotten) .setLexiconPages( - new LexiconPage[] { new PageText("0"), - new AlphirineCraftPage(lebethronWood, lebethroneRecipe.getOutput(), ".alphirineCraft"), - BotaniaAPI.internalHandler.craftingRecipePage(".craft0", leb1), - BotaniaAPI.internalHandler.craftingRecipePage(".craft0", leb2), - BotaniaAPI.internalHandler.craftingRecipePage(".craft0", leb3), - BotaniaAPI.internalHandler.craftingRecipePage(".craft0", leb4), new PageText("1"), - BotaniaAPI.internalHandler - .multiblockPage(".structure", TileLebethronCore.makeMultiblockSet()) }) + new PageText("0"), + new AlphirineCraftPage(lebethronWood, lebethroneRecipe.getOutput(), ".alphirineCraft"), + BotaniaAPI.internalHandler.craftingRecipePage(".craft0", lebethronWoodRecipe1), + BotaniaAPI.internalHandler.craftingRecipePage(".craft0", lebethronWoodRecipe2), + BotaniaAPI.internalHandler.craftingRecipePage(".craft0", lebethronWoodRecipe3), + BotaniaAPI.internalHandler.craftingRecipePage(".craft0", lebethronWoodRecipe4), + new PageText("1"), + BotaniaAPI.internalHandler.multiblockPage(".structure", TileLebethronCore.makeMultiblockSet())) .setIcon(new ItemStack(BlockListAB.blockLebethron)); // AB Mithrill recipe @@ -397,163 +379,138 @@ public class RecipeListAB implements IModHelper { mithrill = new BLexiconEntry("mithrill", categoryForgotten); mithrill.setKnowledgeType(forgotten) .setLexiconPages( - new LexiconPage[] { new PageText("0"), - new AdvancedPlateCraftPage(mithrill, mithrillRecipe.getOutput(), ".abCraft"), - new PageText("1"), }) + new PageText("0"), + new AdvancedPlateCraftPage(mithrill, mithrillRecipe.getOutput(), ".abCraft"), + new PageText("1")) .setIcon(new ItemStack(ItemListAB.itemMihrillMultiTool)); - // Advanced mana containers recipe + IRecipe manaContainerRecipe1 = addOreDictRecipe( + new ItemStack(BlockListAB.blockManaContainer), + "MGM", + "LPL", + "M3M", + 'M', + new ItemStack(ItemListAB.itemABResource), + 'G', + new ItemStack(ModItems.rune, 1, 15), + 'L', + new ItemStack(ModBlocks.pool), + 'P', + new ItemStack(ModBlocks.pylon), + '3', + new ItemStack(ModItems.rune, 1, 3)); + IRecipe manaContainerRecipe2 = addOreDictRecipe( + new ItemStack(BlockListAB.blockManaContainer, 1, 1), + "MGM", + "LPL", + "M3M", + 'M', + new ItemStack(ItemListAB.itemABResource, 1, 1), + 'G', + new ItemStack(ModItems.rune, 1, 15), + 'L', + new ItemStack(ModBlocks.pool, 1, 2), + 'P', + new ItemStack(ModBlocks.pylon), + '3', + new ItemStack(ModItems.rune, 1, 3)); + IRecipe manaContainerRecipe3 = addOreDictRecipe( + new ItemStack(BlockListAB.blockManaContainer, 1, 2), + "MGM", + "LPL", + "M3M", + 'M', + new ItemStack(ItemListAB.itemABResource), + 'G', + new ItemStack(ModItems.rune, 1, 15), + 'L', + new ItemStack(ModBlocks.pool, 1, 3), + 'P', + new ItemStack(ModBlocks.pylon), + '3', + new ItemStack(ModItems.rune, 1, 3)); - GameRegistry.addRecipe( - new ShapedOreRecipe( - new ItemStack(BlockListAB.blockManaContainer), - "MGM", - "LPL", - "M3M", - 'M', - new ItemStack(ItemListAB.itemABResource), - 'G', - new ItemStack(ModItems.rune, 1, 15), - 'L', - new ItemStack(ModBlocks.pool), - 'P', - new ItemStack(ModBlocks.pylon), - '3', - new ItemStack(ModItems.rune, 1, 3) - - )); - - IRecipe cont1 = getLastRecipe(); - - GameRegistry.addRecipe( - new ShapedOreRecipe( - new ItemStack(BlockListAB.blockManaContainer, 1, 1), - "MGM", - "LPL", - "M3M", - 'M', - new ItemStack(ItemListAB.itemABResource, 1, 1), - 'G', - new ItemStack(ModItems.rune, 1, 15), - 'L', - new ItemStack(ModBlocks.pool, 1, 2), - 'P', - new ItemStack(ModBlocks.pylon), - '3', - new ItemStack(ModItems.rune, 1, 3))); - IRecipe cont2 = getLastRecipe(); - - GameRegistry.addRecipe( - new ShapedOreRecipe( - new ItemStack(BlockListAB.blockManaContainer, 1, 2), - "MGM", - "LPL", - "M3M", - 'M', - new ItemStack(ItemListAB.itemABResource), - 'G', - new ItemStack(ModItems.rune, 1, 15), - 'L', - new ItemStack(ModBlocks.pool, 1, 3), - 'P', - new ItemStack(ModBlocks.pylon), - '3', - new ItemStack(ModItems.rune, 1, 3))); - - IRecipe cont3 = getLastRecipe(); manaContainer = new BLexiconEntry("manaContainer", categoryForgotten); - manaContainer.setKnowledgeType(forgotten).setLexiconPages( - new LexiconPage[] { new PageText("0"), BotaniaAPI.internalHandler.craftingRecipePage(".craft0", cont1), - BotaniaAPI.internalHandler.craftingRecipePage(".craft1", cont2), - BotaniaAPI.internalHandler.craftingRecipePage(".craft2", cont3), new PageText("1"), - new AlphirineCraftPage(manaContainer, advancedSparkRecipe.getOutput(), ".alphirineCraft") }) + manaContainer.setKnowledgeType(forgotten) + .setLexiconPages( + new PageText("0"), + BotaniaAPI.internalHandler.craftingRecipePage(".craft0", manaContainerRecipe1), + BotaniaAPI.internalHandler.craftingRecipePage(".craft1", manaContainerRecipe2), + BotaniaAPI.internalHandler.craftingRecipePage(".craft2", manaContainerRecipe3), + new PageText("1"), + new AlphirineCraftPage(manaContainer, advancedSparkRecipe.getOutput(), ".alphirineCraft")) .setIcon(new ItemStack(BlockListAB.blockManaContainer)); - // Mana crystal cube recipe - - GameRegistry.addRecipe( - new ShapedOreRecipe( - new ItemStack(BlockListAB.blockManaCrystalCube), - "TST", - "GWG", - "DMD", - 'T', - new ItemStack(ModItems.manaResource, 1, 18), - 'S', - new ItemStack(ModItems.spark), - 'G', - new ItemStack(ModBlocks.manaGlass), - 'W', - new ItemStack(ModItems.twigWand, 1, 32767), - 'D', - new ItemStack(ModBlocks.dreamwood), - 'M', - "blockManasteel" - - )); + IRecipe manaCrystalCubeRecipe = addOreDictRecipe( + new ItemStack(BlockListAB.blockManaCrystalCube), + "TST", + "GWG", + "DMD", + 'T', + new ItemStack(ModItems.manaResource, 1, 18), + 'S', + new ItemStack(ModItems.spark), + 'G', + new ItemStack(ModBlocks.manaGlass), + 'W', + new ItemStack(ModItems.twigWand, 1, OreDictionary.WILDCARD_VALUE), + 'D', + new ItemStack(ModBlocks.dreamwood), + 'M', + "blockManasteel"); manaCrystalCube = new BLexiconEntry("manaCrystalCube", BotaniaAPI.categoryMana); manaCrystalCube.setKnowledgeType(BotaniaAPI.elvenKnowledge) .setLexiconPages( - new LexiconPage[] { new PageText("0"), - BotaniaAPI.internalHandler.craftingRecipePage(".craft", getLastRecipe()) }) + new PageText("0"), + BotaniaAPI.internalHandler.craftingRecipePage(".craft", manaCrystalCubeRecipe)) .setIcon(new ItemStack(BlockListAB.blockManaCrystalCube)); // Terrahoe recipe terraHoe = new BLexiconEntry("terraHoe", BotaniaAPI.categoryTools); - terraHoe.setLexiconPages(new LexiconPage[] { new PageText("0"), }) - .setIcon(new ItemStack(ItemListAB.itemTerraHoe)); + terraHoe.setLexiconPages(new PageText("0")).setIcon(new ItemStack(ItemListAB.itemTerraHoe)); - // Mithrill ring recipe + IRecipe mithrillRingRecipe = addOreDictRecipe( + new ItemStack(ItemListAB.itemMithrillRing), + "LML", + "MRM", + "LML", + 'L', + new ItemStack(ItemListAB.itemABResource, 1, 1), + 'M', + new ItemStack(ItemListAB.itemABResource), + 'R', + new ItemStack(ModItems.manaRingGreater) - GameRegistry.addRecipe( - new ShapedOreRecipe( - new ItemStack(ItemListAB.itemMithrillRing), - "LML", - "MRM", - "LML", - 'L', - new ItemStack(ItemListAB.itemABResource, 1, 1), - 'M', - new ItemStack(ItemListAB.itemABResource), - 'R', - new ItemStack(ModItems.manaRingGreater) + ); + IRecipe nebulaRingRecipe = addOreDictRecipe( + new ItemStack(ItemListAB.itemNebulaRing), + "LML", + "MRM", + "LML", + 'L', + new ItemStack(ModItems.manaResource, 1, 5), + 'M', + new ItemStack(ItemListAB.itemABResource, 1, 6), + 'R', + new ItemStack(ItemListAB.itemMithrillRing) - )); + ); - IRecipe ring1 = getLastRecipe(); - - // Nebula ring recipe - - GameRegistry.addRecipe( - new ShapedOreRecipe( - new ItemStack(ItemListAB.itemNebulaRing), - "LML", - "MRM", - "LML", - 'L', - new ItemStack(ModItems.manaResource, 1, 5), - 'M', - new ItemStack(ItemListAB.itemABResource, 1, 6), - 'R', - new ItemStack(ItemListAB.itemMithrillRing) - - )); - - IRecipe ring2 = getLastRecipe(); manaRings = new BLexiconEntry("manaRings", categoryForgotten); - manaRings.setKnowledgeType(forgotten).setLexiconPages( - new LexiconPage[] { new PageText("0"), BotaniaAPI.internalHandler.craftingRecipePage(".craft0", ring1), - BotaniaAPI.internalHandler.craftingRecipePage(".craft1", ring2) }) + manaRings.setKnowledgeType(forgotten) + .setLexiconPages( + new PageText("0"), + BotaniaAPI.internalHandler.craftingRecipePage(".craft0", mithrillRingRecipe), + BotaniaAPI.internalHandler.craftingRecipePage(".craft1", nebulaRingRecipe)) .setIcon(new ItemStack(ItemListAB.itemMithrillRing)); AdvancedBotanyAPI.registerFarmlandSeed(Blocks.nether_wart, 3); // Blade of space recipe mithrillSword = new BLexiconEntry("mithrillSword", categoryForgotten); - mithrillSword.setKnowledgeType(forgotten) - .setLexiconPages(new LexiconPage[] { new PageText("0"), new PageText("1"), }) + mithrillSword.setKnowledgeType(forgotten).setLexiconPages(new PageText("0"), new PageText("1")) .setIcon(new ItemStack(ItemListAB.itemMithrillSword)); // Dictarius recipe @@ -568,204 +525,187 @@ public class RecipeListAB implements IModHelper { new ItemStack(ModItems.petal, 1, 1)); dictarius = new BLexiconEntry("dictarius", BotaniaAPI.categoryGenerationFlowers); dictarius.setKnowledgeType(forgotten).setLexiconPages( - new LexiconPage[] { new PageText("0"), new PageText("1"), - BotaniaAPI.internalHandler.petalRecipePage(".petalCraft", dictariusRecipe) }); + new PageText("0"), + new PageText("1"), + BotaniaAPI.internalHandler.petalRecipePage(".petalCraft", dictariusRecipe)); nebula = new BLexiconEntry("nebula", categoryForgotten); nebula.setKnowledgeType(forgotten).setLexiconPages( - new LexiconPage[] { new PageText("0"), - new AdvancedPlateCraftPage(nebula, nebulaRecipe.getOutput(), ".abCraft") }); + new PageText("0"), + new AdvancedPlateCraftPage(nebula, nebulaRecipe.getOutput(), ".abCraft")); - // Black hole box recipe + IRecipe blackHaloBoxRecipe = addOreDictRecipe( + new ItemStack(ItemListAB.itemBlackHalo), + " E ", + "DHD", + " E ", + 'E', + "plateElvenElementium", + 'D', + new ItemStack(ModItems.blackHoleTalisman), + 'H', + new ItemStack(ModItems.autocraftingHalo) - GameRegistry.addRecipe( - new ShapedOreRecipe( - new ItemStack(ItemListAB.itemBlackHalo), - " E ", - "DHD", - " E ", - 'E', - "plateElvenElementium", - 'D', - new ItemStack(ModItems.blackHoleTalisman), - 'H', - new ItemStack(ModItems.autocraftingHalo) - - )); + ); blackHalo = new BLexiconEntry("blackHalo", BotaniaAPI.categoryTools); blackHalo.setKnowledgeType(BotaniaAPI.elvenKnowledge).setLexiconPages( - new LexiconPage[] { new PageText("0"), - BotaniaAPI.internalHandler.craftingRecipePage(".craft", getLastRecipe()) }); + new PageText("0"), + BotaniaAPI.internalHandler.craftingRecipePage(".craft", blackHaloBoxRecipe)); - // Sphere of Attraction recipe + IRecipe antigravityCharmRecipe = addOreDictRecipe( + new ItemStack(ItemListAB.itemAntigravityCharm), + " G ", + "GDG", + "ERE", + 'G', + new ItemStack(ModBlocks.elfGlass), + 'D', + new ItemStack(ModBlocks.floatingFlower, 1, OreDictionary.WILDCARD_VALUE), + 'E', + "plateElvenElementium", + 'R', + new ItemStack(ModItems.rune, 1, 3) - GameRegistry.addRecipe( - new ShapedOreRecipe( - new ItemStack(ItemListAB.itemAntigravityCharm), - " G ", - "GDG", - "ERE", - 'G', - new ItemStack(ModBlocks.elfGlass), - 'D', - new ItemStack(ModBlocks.floatingFlower, 1, 32767), - 'E', - "plateElvenElementium", - 'R', - new ItemStack(ModItems.rune, 1, 3) - - )); + ); antigravityCharm = new BLexiconEntry("antigravityCharm", BotaniaAPI.categoryTools); antigravityCharm.setKnowledgeType(BotaniaAPI.elvenKnowledge) .setLexiconPages( - new LexiconPage[] { new PageText("0"), - BotaniaAPI.internalHandler.craftingRecipePage(".craft", getLastRecipe()) }) + new PageText("0"), + BotaniaAPI.internalHandler.craftingRecipePage(".craft", antigravityCharmRecipe)) .setIcon(new ItemStack(ItemListAB.itemAntigravityCharm)); - // Nebula blaze recipe + IRecipe nebulaBlazeRecipe = addOreDictRecipe( + new ItemStack(ItemListAB.itemNebulaBlaze), + " N ", + "MMN", + "AMN", + 'N', + new ItemStack(ItemListAB.itemABResource, 1, 6), + 'M', + "blockManasteel", + 'A', + new ItemStack(ItemListAB.itemABResource, 1, 3) - GameRegistry.addRecipe( - new ShapedOreRecipe( - new ItemStack(ItemListAB.itemNebulaBlaze), - " N ", - "MMN", - "AMN", - 'N', - new ItemStack(ItemListAB.itemABResource, 1, 6), - 'M', - "blockManasteel", - 'A', - new ItemStack(ItemListAB.itemABResource, 1, 3) - - )); + ); nebulaBlaze = new BLexiconEntry("nebulaBlaze", categoryForgotten); nebulaBlaze.setKnowledgeType(forgotten).setLexiconPages( - new LexiconPage[] { new PageText("0"), - BotaniaAPI.internalHandler.craftingRecipePage(".craft", getLastRecipe()) }); + new PageText("0"), + BotaniaAPI.internalHandler.craftingRecipePage(".craft", nebulaBlazeRecipe)); // Mana charger recipe if (ConfigABHandler.hasManaCharger) { manaCharger = new BLexiconEntry("manaCharger", categoryForgotten); - manaCharger.setKnowledgeType(forgotten).setLexiconPages(new LexiconPage[] { new PageText("0"), }); + manaCharger.setKnowledgeType(forgotten).setLexiconPages(new PageText("0")); } ///////////////////////////////////////////////////////////////////////////////////////// Nebula set recipes nebulaArmor = new BLexiconEntry("nebulaArmor", categoryForgotten); - nebulaArmor.setKnowledgeType(forgotten) - .setLexiconPages(new LexiconPage[] { new PageText("0"), new PageText("1"), }); + nebulaArmor.setKnowledgeType(forgotten).setLexiconPages(new PageText("0"), new PageText("1")); // Enginerr hopper recipe engineerHopper = new BLexiconEntry("engineerHopper", categoryForgotten); engineerHopper.setKnowledgeType(forgotten).setLexiconPages( - new LexiconPage[] { new PageText("0"), new PageImage("1", "ab:textures/misc/engineerHopper.png"), - new PageText("2"), new PageText("3"), new PageText("4"), - new AlphirineCraftPage(engineerHopper, hopperRecipe.getOutput(), ".alphirineCraft") }); + new PageText("0"), + new PageImage("1", "ab:textures/misc/engineerHopper.png"), + new PageText("2"), + new PageText("3"), + new PageText("4"), + new AlphirineCraftPage(engineerHopper, hopperRecipe.getOutput(), ".alphirineCraft")); - // Rod of nebula recipe - - GameRegistry.addRecipe( - new ShapedOreRecipe( - new ItemStack(ItemListAB.itemNebulaRod), - " WN", - " RW", - "E ", - 'W', - new ItemStack(ModItems.manaResource, 1, 13), - 'N', - new ItemStack(ItemListAB.itemABResource, 1, 6), - 'R', - new ItemStack(ModItems.rune, 1, 8), - 'E', - "itemEnderCrystal" - - )); + IRecipe nebulaRodRecipe = addOreDictRecipe( + new ItemStack(ItemListAB.itemNebulaRod), + " WN", + " RW", + "E ", + 'W', + new ItemStack(ModItems.manaResource, 1, 13), + 'N', + new ItemStack(ItemListAB.itemABResource, 1, 6), + 'R', + new ItemStack(ModItems.rune, 1, 8), + 'E', + "itemEnderCrystal"); nebulaRod = new BLexiconEntry("nebulaRod", categoryForgotten); nebulaRod.setKnowledgeType(forgotten).setLexiconPages( - new LexiconPage[] { new PageText("0"), - BotaniaAPI.internalHandler.craftingRecipePage(".craft", getLastRecipe()) }); + new PageText("0"), + BotaniaAPI.internalHandler.craftingRecipePage(".craft", nebulaRodRecipe)); - // Playing board recipe + IRecipe gameBoardRecipe = addOreDictRecipe( + new ItemStack(BlockListAB.blockBoardFate), + "G G", + "QDQ", + "MPM", + 'G', + "gearGtSmallInfusedGold", + 'Q', + new ItemStack(ModFluffBlocks.manaQuartz), + 'D', + new ItemStack(ModItems.manaResource, 1, 2), + 'M', + "plateTerrasteel", + 'P', + new ItemStack(ModItems.manaResource, 1, 23) - GameRegistry.addRecipe( - new ShapedOreRecipe( - new ItemStack(BlockListAB.blockBoardFate), - "G G", - "QDQ", - "MPM", - 'G', - "gearGtSmallInfusedGold", - 'Q', - new ItemStack(ModFluffBlocks.manaQuartz), - 'D', - new ItemStack(ModItems.manaResource, 1, 2), - 'M', - "plateTerrasteel", - 'P', - new ItemStack(ModItems.manaResource, 1, 23) - - )); + ); gameBoard = new BLexiconEntry("gameBoard", BotaniaAPI.categoryMisc); gameBoard.setLexiconPages( - new LexiconPage[] { new PageText("0"), - BotaniaAPI.internalHandler.craftingRecipePage(".craft", getLastRecipe()) }); + new PageText("0"), + BotaniaAPI.internalHandler.craftingRecipePage(".craft", gameBoardRecipe)); fateBoard = new BLexiconEntry("fateBoard", categoryForgotten); fateBoard.setKnowledgeType(forgotten).setLexiconPages( - new LexiconPage[] { new PageText("0"), - new AlphirineCraftPage(fateBoard, fateBoardRecipe.getOutput(), ".alphirineCraft") }); + new PageText("0"), + new AlphirineCraftPage(fateBoard, fateBoardRecipe.getOutput(), ".alphirineCraft")); freyrSlingshot = new RLexiconEntry( "freyrSlingshot", BotaniaAPI.categoryAlfhomancy, AchievementRegister.relicSlingshot); - freyrSlingshot.setLexiconPages(new LexiconPage[] { new PageText("0"), new PageText("1") }); + freyrSlingshot.setLexiconPages(new PageText("0"), new PageText("1")); richesKey = new RLexiconEntry("richesKey", BotaniaAPI.categoryAlfhomancy, AchievementRegister.relicItemChest); - richesKey.setLexiconPages(new LexiconPage[] { new PageText("0") }); + richesKey.setLexiconPages(new PageText("0")); cubeWardrobe = new RLexiconEntry( "cubeWardrobe", BotaniaAPI.categoryAlfhomancy, AchievementRegister.relicPocketArmor); - cubeWardrobe.setLexiconPages(new LexiconPage[] { new PageText("0") }); + cubeWardrobe.setLexiconPages(new PageText("0")); sphereNavigation = new RLexiconEntry( "sphereNavigation", BotaniaAPI.categoryAlfhomancy, AchievementRegister.sphereNavigation); - sphereNavigation.setLexiconPages(new LexiconPage[] { new PageText("0") }); + sphereNavigation.setLexiconPages(new PageText("0")); hornPlenty = new RLexiconEntry("hornPlenty", BotaniaAPI.categoryAlfhomancy, AchievementRegister.hornPlenty); - hornPlenty.setLexiconPages(new LexiconPage[] { new PageText("0") }); + hornPlenty.setLexiconPages(new PageText("0")); - // Rod of sprawl recipe + IRecipe sprawlRodRecipe = addOreDictRecipe( + new ItemStack(ItemListAB.itemSprawlRod), + " SC", + " WS", + "W ", + 'S', + new ItemStack(ModItems.grassSeeds, 1, OreDictionary.WILDCARD_VALUE), + 'C', + new ItemStack(BlockListAB.blockLebethron, 1, 4), + 'W', + new ItemStack(ModItems.manaResource, 1, 3) - GameRegistry.addRecipe( - new ShapedOreRecipe( - new ItemStack(ItemListAB.itemSprawlRod), - " SC", - " WS", - "W ", - 'S', - new ItemStack(ModItems.grassSeeds, 1, 32767), - 'C', - new ItemStack(BlockListAB.blockLebethron, 1, 4), - 'W', - new ItemStack(ModItems.manaResource, 1, 3) - - )); + ); sprawlRod = new BLexiconEntry("sprawlRod", categoryForgotten); sprawlRod.setKnowledgeType(forgotten).setLexiconPages( - new LexiconPage[] { new PageText("0"), - BotaniaAPI.internalHandler.craftingRecipePage(".craft", getLastRecipe()) }); + new PageText("0"), + BotaniaAPI.internalHandler.craftingRecipePage(".craft", sprawlRodRecipe)); // Ardent azarcissus recipe azartFlowerRecipe = BotaniaAPI.registerPetalRecipe( @@ -779,13 +719,13 @@ public class RecipeListAB implements IModHelper { new ItemStack(ModItems.manaResource, 1, 5)); azartFlower = new BLexiconEntry("azartFlower", BotaniaAPI.categoryGenerationFlowers); azartFlower.setKnowledgeType(forgotten).setLexiconPages( - new LexiconPage[] { new PageText("0"), - BotaniaAPI.internalHandler.petalRecipePage(".petalCraft", azartFlowerRecipe) }); + new PageText("0"), + BotaniaAPI.internalHandler.petalRecipePage(".petalCraft", azartFlowerRecipe)); // Aqua sword recipe aquaSword = new BLexiconEntry("aquaSword", categoryForgotten); - aquaSword.setKnowledgeType(forgotten).setLexiconPages(new LexiconPage[] { new PageText("0"), }); + aquaSword.setKnowledgeType(forgotten).setLexiconPages(new PageText("0")); ///////////////////////////////////////////////////////////////////////////////////////// Thaumcraft recipes @@ -793,20 +733,27 @@ public class RecipeListAB implements IModHelper { addShapelessOreDictRecipe( new ItemStack(ItemListAB.itemABResource, 9, 1), - new Object[] { new ItemStack(ItemListAB.itemABResource) }); + new ItemStack(ItemListAB.itemABResource)); addShapelessOreDictRecipe( new ItemStack(ItemListAB.itemABResource, 9, 0), - new Object[] { new ItemStack(BlockListAB.blockABStorage) }); + new ItemStack(BlockListAB.blockABStorage)); addShapelessOreDictRecipe( new ItemStack(ItemListAB.itemABResource, 9, 6), - new Object[] { new ItemStack(ItemListAB.itemABResource, 1, 5) }); + new ItemStack(ItemListAB.itemABResource, 1, 5)); GameRegistry.addShapedRecipe( new ItemStack(BlockListAB.blockABStorage), - new Object[] { "III", "III", "III", Character.valueOf('I'), new ItemStack(ItemListAB.itemABResource) }); + "III", + "III", + "III", + 'I', + new ItemStack(ItemListAB.itemABResource)); GameRegistry.addShapedRecipe( new ItemStack(ItemListAB.itemABResource, 1, 5), - new Object[] { "III", "III", "III", Character.valueOf('I'), - new ItemStack(ItemListAB.itemABResource, 1, 6) }); + "III", + "III", + "III", + 'I', + new ItemStack(ItemListAB.itemABResource, 1, 6)); TerraHoe = ThaumcraftApi.addInfusionCraftingRecipe( "TerraHoe", @@ -816,13 +763,13 @@ public class RecipeListAB implements IModHelper { new AspectList().add(Aspect.EARTH, 32).add(Aspect.MAGIC, 16).add(Aspect.HARVEST, 48) .add(Aspect.CROP, 16), new ItemStack((Item) Item.itemRegistry.getObject("Thaumcraft:ItemHoeElemental")), - new ItemStack[] { OreDictionary.getOres("gemFlawlessGreenSapphire").get(0), + new ItemStack[] { OreDict.preference("gemFlawlessGreenSapphire"), new ItemStack(ModItems.manaResource, 1, 3), OreDict.preference("plateTerrasteel", LibOreDict.TERRA_STEEL), new ItemStack(ModItems.rune, 1, 2), new ItemStack(ModItems.fertilizer), new ItemStack((Item) Item.itemRegistry.getObject("Thaumcraft:blockCrystal"), 1, 3), OreDict.preference("plateTerrasteel", LibOreDict.TERRA_STEEL), - new ItemStack(ModItems.manaResource, 1, 3), OreDictionary.getOres("gemFlawlessOlivine").get(0), + new ItemStack(ModItems.manaResource, 1, 3), OreDict.preference("gemFlawlessOlivine"), new ItemStack(ModItems.manaResource, 1, 3), OreDict.preference("plateTerrasteel", LibOreDict.TERRA_STEEL), new ItemStack((Item) Item.itemRegistry.getObject("Thaumcraft:blockCrystal"), 1, 3), @@ -882,8 +829,7 @@ public class RecipeListAB implements IModHelper { new ItemStack((Item) Item.itemRegistry.getObject("Thaumcraft:HandMirror")), new ItemStack(ModBlocks.livingwood, 1, 5), new ItemStack(ItemListAB.itemABResource, 1, 5), new ItemStack(ModBlocks.dreamwood, 1, 5), new ItemStack(ItemListAB.itemNebulaRod), - new ItemStack(ItemListAB.itemABResource, 1, 0), - OreDictionary.getOres("gemFlawlessAmethyst").get(0), + new ItemStack(ItemListAB.itemABResource, 1, 0), OreDict.preference("gemFlawlessAmethyst"), new ItemStack(ItemListAB.itemABResource, 1, 0) }); Forge = ThaumcraftApi.addInfusionCraftingRecipe( @@ -895,16 +841,16 @@ public class RecipeListAB implements IModHelper { .add(Aspect.CRAFT, 32).add(Aspect.CRYSTAL, 20).add(Aspect.METAL, 20), new ItemStack((Item) Item.itemRegistry.getObject("thaumicbases:voidAnvil")), new ItemStack[] { new ItemStack(ModBlocks.terraPlate), new ItemStack(ModItems.rune, 1, 2), - OreDictionary.getOres("blockTerrasteel").get(0), + OreDict.preference("blockTerrasteel"), new ItemStack((Item) Item.itemRegistry.getObject("dreamcraft:item.DiamondCoreChip")), new ItemStack(ModBlocks.terraPlate), new ItemStack(ModItems.rune, 1, 3), - OreDictionary.getOres("blockManasteel").get(0), + OreDict.preference("blockManasteel"), new ItemStack((Item) Item.itemRegistry.getObject("dreamcraft:item.EssentiaCircuit")), new ItemStack(ModBlocks.terraPlate), new ItemStack(ModItems.rune, 1, 2), - OreDictionary.getOres("blockTerrasteel").get(0), + OreDict.preference("blockTerrasteel"), new ItemStack((Item) Item.itemRegistry.getObject("dreamcraft:item.DiamondCoreChip")), new ItemStack(ModBlocks.terraPlate), new ItemStack(ModItems.rune, 1, 3), - OreDictionary.getOres("blockManasteel").get(0), + OreDict.preference("blockManasteel"), new ItemStack((Item) Item.itemRegistry.getObject("dreamcraft:item.EssentiaCircuit")), }); Destroyer = ThaumcraftApi.addInfusionCraftingRecipe( @@ -916,14 +862,13 @@ public class RecipeListAB implements IModHelper { .add(Aspect.CROP, 32).add(Aspect.HARVEST, 32).add(Aspect.TREE, 32), new ItemStack(ItemListAB.itemABResource, 1, 2), new ItemStack[] { new ItemStack(ModItems.terraAxe), new ItemStack(BlockListAB.blockABStorage, 1, 0), - OreDictionary.getOres("gemExquisiteManaDiamond").get(0), - new ItemStack(BlockListAB.blockABStorage, 1, 0), new ItemStack(ModItems.terraPick, 1, 0), // nbt(2147483646), - new ItemStack(ModBlocks.livingwood, 1, 5), OreDictionary.getOres("gemFlawlessAmber").get(0), + OreDict.preference("gemExquisiteManaDiamond"), new ItemStack(BlockListAB.blockABStorage, 1, 0), + new ItemStack(ModItems.terraPick, 1, 0), // nbt(2147483646), + new ItemStack(ModBlocks.livingwood, 1, 5), OreDict.preference("gemFlawlessAmber"), new ItemStack(BlockListAB.blockLebethron, 1, 4), new ItemStack(ModItems.temperanceStone, 1, 0), - new ItemStack(BlockListAB.blockLebethron, 1, 4), - OreDictionary.getOres("gemFlawlessAmber").get(0), new ItemStack(ModBlocks.livingwood, 1, 5), - new ItemStack(ItemListAB.itemTerraHoe), new ItemStack(BlockListAB.blockABStorage, 1, 0), - OreDictionary.getOres("gemExquisiteManaDiamond").get(0), + new ItemStack(BlockListAB.blockLebethron, 1, 4), OreDict.preference("gemFlawlessAmber"), + new ItemStack(ModBlocks.livingwood, 1, 5), new ItemStack(ItemListAB.itemTerraHoe), + new ItemStack(BlockListAB.blockABStorage, 1, 0), OreDict.preference("gemExquisiteManaDiamond"), new ItemStack(BlockListAB.blockABStorage, 1, 0) }); NebulaHelm = ThaumcraftApi.addInfusionCraftingRecipe( @@ -935,7 +880,7 @@ public class RecipeListAB implements IModHelper { .add(Aspect.METAL, 20).add(Aspect.SENSES, 20).add(Aspect.ELDRITCH, 20), new ItemStack(ModItems.gaiaHead), new ItemStack[] { new ItemStack(ModItems.elementiumHelm), new ItemStack(ModItems.laputaShard, 1, 15), - OreDictionary.getOres("gemExquisiteBotaniaDragonstone").get(0), + OreDict.preference("gemExquisiteBotaniaDragonstone"), new ItemStack(ItemListAB.itemABResource, 1, 5), new ItemStack(ItemListAB.itemNebulaRing), new ItemStack(ItemListAB.itemABResource, 1, 5), new ItemStack(ItemListAB.itemABResource, 1, 3), new ItemStack((Item) Item.itemRegistry.getObject("Thaumcraft:ItemAmuletRunic"), 1, 1), @@ -943,7 +888,7 @@ public class RecipeListAB implements IModHelper { new ItemStack((Item) Item.itemRegistry.getObject("Thaumcraft:ItemAmuletRunic"), 1, 1), new ItemStack(ItemListAB.itemABResource, 1, 3), new ItemStack(ItemListAB.itemABResource, 1, 5), new ItemStack(ItemListAB.itemNebulaRing), new ItemStack(ItemListAB.itemABResource, 1, 5), - OreDictionary.getOres("gemExquisiteBotaniaDragonstone").get(0), + OreDict.preference("gemExquisiteBotaniaDragonstone"), new ItemStack(ModItems.laputaShard, 1, 15), }); NebulaChest = ThaumcraftApi.addInfusionCraftingRecipe( @@ -955,16 +900,15 @@ public class RecipeListAB implements IModHelper { .add(Aspect.METAL, 20).add(Aspect.SENSES, 20).add(Aspect.FLIGHT, 20), new ItemStack(ModItems.flightTiara), new ItemStack[] { new ItemStack(ModItems.elementiumChest), new ItemStack(ModItems.laputaShard, 1, 15), - OreDictionary.getOres("blockElvenElementium").get(0), - new ItemStack(ItemListAB.itemABResource, 1, 5), new ItemStack(ItemListAB.itemNebulaRing), - new ItemStack(ItemListAB.itemABResource, 1, 5), new ItemStack(BlockListAB.blockABStorage, 1, 0), + OreDict.preference("blockElvenElementium"), new ItemStack(ItemListAB.itemABResource, 1, 5), + new ItemStack(ItemListAB.itemNebulaRing), new ItemStack(ItemListAB.itemABResource, 1, 5), + new ItemStack(BlockListAB.blockABStorage, 1, 0), new ItemStack((Item) Item.itemRegistry.getObject("Thaumcraft:ItemAmuletRunic"), 1, 1), new ItemStack(ModItems.terrasteelChest), new ItemStack((Item) Item.itemRegistry.getObject("Thaumcraft:ItemAmuletRunic"), 1, 1), new ItemStack(BlockListAB.blockABStorage, 1, 0), new ItemStack(ItemListAB.itemABResource, 1, 5), new ItemStack(ItemListAB.itemNebulaRing), new ItemStack(ItemListAB.itemABResource, 1, 5), - OreDictionary.getOres("blockElvenElementium").get(0), - new ItemStack(ModItems.laputaShard, 1, 15), + OreDict.preference("blockElvenElementium"), new ItemStack(ModItems.laputaShard, 1, 15), }); @@ -977,7 +921,7 @@ public class RecipeListAB implements IModHelper { .add(Aspect.METAL, 20).add(Aspect.SENSES, 20).add(Aspect.BEAST, 20), new ItemStack((Item) Item.itemRegistry.getObject("Thaumcraft:ItemGirdleRunic"), 1, 1), new ItemStack[] { new ItemStack(ModItems.elementiumLegs), new ItemStack(ModItems.laputaShard, 1, 15), - OreDictionary.getOres("gemExquisiteBotaniaDragonstone").get(0), + OreDict.preference("gemExquisiteBotaniaDragonstone"), new ItemStack(ItemListAB.itemABResource, 1, 5), new ItemStack(ItemListAB.itemNebulaRing), new ItemStack(ItemListAB.itemABResource, 1, 5), new ItemStack(ModBlocks.manaBeacon, 1, 5), new ItemStack((Item) Item.itemRegistry.getObject("Thaumcraft:ItemAmuletRunic"), 1, 1), @@ -985,7 +929,7 @@ public class RecipeListAB implements IModHelper { new ItemStack((Item) Item.itemRegistry.getObject("Thaumcraft:ItemAmuletRunic"), 1, 1), new ItemStack(ModBlocks.manaBeacon, 1, 5), new ItemStack(ItemListAB.itemABResource, 1, 5), new ItemStack(ItemListAB.itemNebulaRing), new ItemStack(ItemListAB.itemABResource, 1, 5), - OreDictionary.getOres("gemExquisiteBotaniaDragonstone").get(0), + OreDict.preference("gemExquisiteBotaniaDragonstone"), new ItemStack(ModItems.laputaShard, 1, 15), }); @@ -1027,91 +971,88 @@ public class RecipeListAB implements IModHelper { new ItemStack(ModItems.petal, 1, 13)); aspecolus.setKnowledgeType(forgotten) .setLexiconPages( - new LexiconPage[] { new PageText("0"), - BotaniaAPI.internalHandler.petalRecipePage(".petalCraft", aspecolusRecipe) }) + new PageText("0"), + BotaniaAPI.internalHandler.petalRecipePage(".petalCraft", aspecolusRecipe)) .setIcon(ItemBlockSpecialFlower.ofType("aspecolus")); addShapelessOreDictRecipe( new ItemStack(ItemListAB.itemNebulaHelmReveal), - new Object[] { new ItemStack(ItemListAB.itemNebulaHelm), new ItemStack(ConfigItems.itemGoggles) }); + new ItemStack(ItemListAB.itemNebulaHelm), + new ItemStack(ConfigItems.itemGoggles)); if (ConfigABHandler.hasAutoThaum) { - List recipes = new ArrayList(); + List recipes = new ArrayList<>(); for (int i = 1; i < 10; i++) { boolean[][] patterns = ItemCraftingPattern.getPattern(i); - List str = new ArrayList(); + List str = new ArrayList<>(); for (int j = 0; j < patterns.length; j++) { - String str1 = ""; - for (int k = 0; k < patterns[j].length; k++) str1 += patterns[j][k] ? "T" : "H"; - str.add(str1); + StringBuilder stringBuilder = new StringBuilder(); + for (int k = 0; k < patterns[j].length; k++) stringBuilder.append(patterns[j][k] ? "T" : "H"); + str.add(stringBuilder.toString()); } - GameRegistry.addRecipe( - new ShapedOreRecipe( - new ItemStack(ItemListAB.itemCraftingPattern, 1, i), - str.get(0), - str.get(1), - str.get(2), - 'T', - new ItemStack(ItemListAB.itemCraftingPattern), - 'H', - new ItemStack(ConfigItems.itemNugget, 1, 6))); + IRecipe recipe = addOreDictRecipe( + new ItemStack(ItemListAB.itemCraftingPattern, 1, i), + str.get(0), + str.get(1), + str.get(2), + 'T', + new ItemStack(ItemListAB.itemCraftingPattern), + 'H', + new ItemStack(ConfigItems.itemNugget, 1, 6)); - recipes.add(getLastRecipe()); + recipes.add(recipe); } // Thaumic crafty crate recipe - GameRegistry.addRecipe( - new ShapedOreRecipe( - new ItemStack(BlockListAB.blockMagicCraftCrate), - "TST", - "WCW", - "WEW", - 'T', - new ItemStack(ConfigItems.itemResource, 1, 7), - 'S', - new ItemStack(ConfigItems.itemResource, 1, 14), - 'W', - new ItemStack(ConfigBlocks.blockMagicalLog), - 'C', - new ItemStack(ModBlocks.openCrate, 1, 1), - 'E', - new ItemStack(ModBlocks.openCrate))); + addOreDictRecipe( + new ItemStack(BlockListAB.blockMagicCraftCrate), + "TST", + "WCW", + "WEW", + 'T', + new ItemStack(ConfigItems.itemResource, 1, 7), + 'S', + new ItemStack(ConfigItems.itemResource, 1, 14), + 'W', + new ItemStack(ConfigBlocks.blockMagicalLog), + 'C', + new ItemStack(ModBlocks.openCrate, 1, 1), + 'E', + new ItemStack(ModBlocks.openCrate)); - addShapelessOreDictRecipe( + IRecipe thaumAutoCraftRecipe = addShapelessOreDictRecipe( new ItemStack(ItemListAB.itemCraftingPattern, 48), - new Object[] { new ItemStack(Blocks.crafting_table), new ItemStack(ModBlocks.livingrock), - new ItemStack(ConfigItems.itemResource, 1, 14) }); + new ItemStack(Blocks.crafting_table), + new ItemStack(ModBlocks.livingrock), + new ItemStack(ConfigItems.itemResource, 1, 14)); thaumAutoCraft = new BLexiconEntry("thaumAutoCraft", BotaniaAPI.categoryDevices); thaumAutoCraft.setKnowledgeType(BotaniaAPI.elvenKnowledge).setLexiconPages( - new LexiconPage[] { new PageText("0"), - BotaniaAPI.internalHandler.craftingRecipePage(".craft0", getLastRecipe()), - BotaniaAPI.internalHandler.craftingRecipesPage(".craft1", recipes) }); + new PageText("0"), + BotaniaAPI.internalHandler.craftingRecipePage(".craft0", thaumAutoCraftRecipe), + BotaniaAPI.internalHandler.craftingRecipesPage(".craft1", recipes)); - // Mana flower recipe - - GameRegistry.addRecipe( - new ShapedOreRecipe( - new ItemStack(ItemListAB.itemManaFlower), - "NFN", - "PMP", - "NRN", - 'N', - new ItemStack(ItemListAB.itemABResource, 1, 1), - 'F', - new ItemStack(ItemListAB.itemABResource, 1, 4), - 'P', - new ItemStack(ConfigItems.itemEldritchObject, 1, 3), - 'M', - new ItemStack(ModItems.manaBottle), - 'R', - new ItemStack(ModItems.rune, 1, 8))); + IRecipe manaFlowerCraftingRecipe = addOreDictRecipe( + new ItemStack(ItemListAB.itemManaFlower), + "NFN", + "PMP", + "NRN", + 'N', + new ItemStack(ItemListAB.itemABResource, 1, 1), + 'F', + new ItemStack(ItemListAB.itemABResource, 1, 4), + 'P', + new ItemStack(ConfigItems.itemEldritchObject, 1, 3), + 'M', + new ItemStack(ModItems.manaBottle), + 'R', + new ItemStack(ModItems.rune, 1, 8)); manaFlower = new BLexiconEntry("manaFlower", categoryForgotten); manaFlower.setKnowledgeType(forgotten) .setLexiconPages( - new LexiconPage[] { new PageText("0"), - new AlphirineCraftPage(manaFlower, manaFlowerRecipe.getOutput(), ".alphirineCraft"), - BotaniaAPI.internalHandler.craftingRecipePage(".craft", getLastRecipe()) }) + new PageText("0"), + new AlphirineCraftPage(manaFlower, manaFlowerRecipe.getOutput(), ".alphirineCraft"), + BotaniaAPI.internalHandler.craftingRecipePage(".craft", manaFlowerCraftingRecipe)) .setIcon(new ItemStack(ItemListAB.itemManaFlower)); } @@ -1128,8 +1069,8 @@ public class RecipeListAB implements IModHelper { new ItemStack(ModItems.petal, 1, 11)); gladious = new BLexiconEntry("gladious", BotaniaAPI.categoryFunctionalFlowers); gladious.setKnowledgeType(forgotten).setLexiconPages( - new LexiconPage[] { new PageText("0"), - BotaniaAPI.internalHandler.petalRecipePage(".petalCraft", pureGladRecipe) }); + new PageText("0"), + BotaniaAPI.internalHandler.petalRecipePage(".petalCraft", pureGladRecipe)); } ///////////////////////////////////////////////////////////////////////////////////////// Itemlist @@ -1150,17 +1091,16 @@ public class RecipeListAB implements IModHelper { AdvancedBotanyAPI.relicList.add(new ItemStack(ItemListAB.itemHornPlenty)); } - private static IRecipe getLastRecipe() { - return (IRecipe) CraftingManager.getInstance().getRecipeList() - .get(CraftingManager.getInstance().getRecipeList().size() - 1); + private static IRecipe addOreDictRecipe(ItemStack output, Object... recipe) { + IRecipe finalRecipe = new ShapedOreRecipe(output, recipe); + GameRegistry.addRecipe(finalRecipe); + return finalRecipe; } - private static void addOreDictRecipe(ItemStack output, Object... recipe) { - CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(output, recipe)); - } - - private static void addShapelessOreDictRecipe(ItemStack output, Object... recipe) { - CraftingManager.getInstance().getRecipeList().add(new ShapelessOreRecipe(output, recipe)); + private static IRecipe addShapelessOreDictRecipe(ItemStack output, Object... recipe) { + IRecipe finalRecipe = new ShapelessOreRecipe(output, recipe); + GameRegistry.addRecipe(finalRecipe); + return finalRecipe; } public static void setupResearch() { @@ -1170,38 +1110,7 @@ public class RecipeListAB implements IModHelper { new ResourceLocation("botania", "textures/gui/categories/forgotten.png"), new ResourceLocation("botania", "textures/gui/categories/ABstars.png")); - ResearchItem TerraHoePage; - ResearchPage TerraHoePages; - ResearchPage infTerraHoePages; - - ResearchItem AquaSwordPage; - ResearchPage AquaSwordPages; - ResearchPage infAquaSwordPages; - - ResearchItem ManaChargerPage; - ResearchPage ManaChargerPages; - ResearchPage infManaChargerPages; - - ResearchItem MithrillSwordPage; - ResearchPage MithrillSwordPages; - ResearchPage infMithrillSwordPages; - - ResearchItem ForgePage; - ResearchPage ForgePages; - ResearchPage infForgePages; - - ResearchItem DestroyerPage; - ResearchPage DestroyerPages; - ResearchPage infDestroyerPages; - - ResearchItem NebulaPage; - ResearchPage NebulaPages; - ResearchPage infNebulaHelm; - ResearchPage infNebulaChest; - ResearchPage infNebulaLegs; - ResearchPage infNebulaBoots; - - TerraHoePage = new ResearchItem( + ResearchItem terraHoePage = new ResearchItem( "TerraHoe", category, new AspectList().add(Aspect.MAGIC, 4).add(Aspect.LIFE, 1).add(Aspect.TOOL, 1).add(Aspect.EARTH, 8) @@ -1210,11 +1119,10 @@ public class RecipeListAB implements IModHelper { 2, 0, new ItemStack(ItemListAB.itemTerraHoe)); - + ResearchPage infTerraHoePages = new ResearchPage(TerraHoe); TerraHoePages = new ResearchPage("TerraHoePages"); - infTerraHoePages = new ResearchPage(TerraHoe); - AquaSwordPage = new ResearchItem( + ResearchItem aquaSwordPage = new ResearchItem( "AquaSword", category, new AspectList().add(Aspect.MAGIC, 4).add(Aspect.LIFE, 1).add(Aspect.TOOL, 1).add(Aspect.EARTH, 8) @@ -1223,11 +1131,10 @@ public class RecipeListAB implements IModHelper { 2, 0, new ItemStack(ItemListAB.itemAquaSword)); - + ResearchPage infAquaSwordPages = new ResearchPage(AquaSword); AquaSwordPages = new ResearchPage("AquaSwordPages"); - infAquaSwordPages = new ResearchPage(AquaSword); - ManaChargerPage = new ResearchItem( + ResearchItem manaChargerPage = new ResearchItem( "ManaCharger", category, new AspectList().add(Aspect.MAGIC, 4).add(Aspect.LIFE, 1).add(Aspect.TOOL, 1).add(Aspect.EARTH, 8) @@ -1236,11 +1143,10 @@ public class RecipeListAB implements IModHelper { 6, 0, new ItemStack(BlockListAB.blockManaCharger)); - + ResearchPage infManaChargerPages = new ResearchPage(ManaCharger); ManaChargerPages = new ResearchPage("ManaChargerPages"); - infManaChargerPages = new ResearchPage(ManaCharger); - MithrillSwordPage = new ResearchItem( + ResearchItem mithrillSwordPage = new ResearchItem( "MithrillSword", category, new AspectList().add(Aspect.MAGIC, 4).add(Aspect.LIFE, 1).add(Aspect.TOOL, 1).add(Aspect.EARTH, 8) @@ -1249,11 +1155,10 @@ public class RecipeListAB implements IModHelper { 0, 0, new ItemStack(ItemListAB.itemMithrillSword)); - + ResearchPage infMithrillSwordPages = new ResearchPage(MithrillSword); MithrillSwordPages = new ResearchPage("MithrillSwordPages"); - infMithrillSwordPages = new ResearchPage(MithrillSword); - ForgePage = new ResearchItem( + ResearchItem forgePage = new ResearchItem( "Forge", category, new AspectList().add(Aspect.MAGIC, 4).add(Aspect.LIFE, 1).add(Aspect.TOOL, 1).add(Aspect.EARTH, 8) @@ -1262,11 +1167,10 @@ public class RecipeListAB implements IModHelper { 5, 0, new ItemStack(BlockListAB.blockABPlate)); - + ResearchPage infForgePages = new ResearchPage(Forge); ForgePages = new ResearchPage("ForgePages"); - infForgePages = new ResearchPage(Forge); - DestroyerPage = new ResearchItem( + ResearchItem destroyerPage = new ResearchItem( "Destroyer", category, new AspectList().add(Aspect.MAGIC, 4).add(Aspect.LIFE, 1).add(Aspect.TOOL, 1).add(Aspect.EARTH, 8) @@ -1275,11 +1179,10 @@ public class RecipeListAB implements IModHelper { 0, 0, new ItemStack(ItemListAB.itemMihrillMultiTool)); - + ResearchPage infDestroyerPages = new ResearchPage(Destroyer); DestroyerPages = new ResearchPage("DestroyerPages"); - infDestroyerPages = new ResearchPage(Destroyer); - NebulaPage = new ResearchItem( + ResearchItem nebulaPage = new ResearchItem( "Nebula", category, new AspectList().add(Aspect.MAGIC, 18).add(Aspect.ELDRITCH, 10).add(Aspect.EARTH, 10) @@ -1288,38 +1191,37 @@ public class RecipeListAB implements IModHelper { 8, 0, new ItemStack(ItemListAB.itemABResource, 1, 5)); - + ResearchPage infNebulaHelm = new ResearchPage(NebulaHelm); + ResearchPage infNebulaChest = new ResearchPage(NebulaChest); + ResearchPage infNebulaLegs = new ResearchPage(NebulaLegs); + ResearchPage infNebulaBoots = new ResearchPage(NebulaBoots); NebulaPages = new ResearchPage("NebulaPages"); - infNebulaHelm = new ResearchPage(NebulaHelm); - infNebulaChest = new ResearchPage(NebulaChest); - infNebulaLegs = new ResearchPage(NebulaLegs); - infNebulaBoots = new ResearchPage(NebulaBoots); - TerraHoePage.setPages(TerraHoePages, infTerraHoePages); - AquaSwordPage.setPages(AquaSwordPages, infAquaSwordPages); - ManaChargerPage.setPages(ManaChargerPages, infManaChargerPages); - MithrillSwordPage.setPages(MithrillSwordPages, infMithrillSwordPages); - ForgePage.setPages(ForgePages, infForgePages); - DestroyerPage.setPages(DestroyerPages, infDestroyerPages); - NebulaPage.setPages(NebulaPages, infNebulaHelm, infNebulaChest, infNebulaLegs, infNebulaBoots); + terraHoePage.setPages(TerraHoePages, infTerraHoePages); + aquaSwordPage.setPages(AquaSwordPages, infAquaSwordPages); + manaChargerPage.setPages(ManaChargerPages, infManaChargerPages); + mithrillSwordPage.setPages(MithrillSwordPages, infMithrillSwordPages); + forgePage.setPages(ForgePages, infForgePages); + destroyerPage.setPages(DestroyerPages, infDestroyerPages); + nebulaPage.setPages(NebulaPages, infNebulaHelm, infNebulaChest, infNebulaLegs, infNebulaBoots); - TerraHoePage.setParents("ELEMENTALHOE"); - AquaSwordPage.setParents("Nebula"); - ManaChargerPage.setParents("MIRROR"); - MithrillSwordPage.setParents("AquaSword"); - ForgePage.setParents("ManaCharger"); - DestroyerPage.setParents("TerraHoe", "Nebula"); - NebulaPage.setParents("Forge"); + terraHoePage.setParents("ELEMENTALHOE"); + aquaSwordPage.setParents("Nebula"); + manaChargerPage.setParents("MIRROR"); + mithrillSwordPage.setParents("AquaSword"); + forgePage.setParents("ManaCharger"); + destroyerPage.setParents("TerraHoe", "Nebula"); + nebulaPage.setParents("Forge"); ThaumcraftApi.addWarpToResearch("Nebula", 8); - ResearchCategories.addResearch(TerraHoePage); - ResearchCategories.addResearch(AquaSwordPage); - ResearchCategories.addResearch(ManaChargerPage); - ResearchCategories.addResearch(MithrillSwordPage); - ResearchCategories.addResearch(ForgePage); - ResearchCategories.addResearch(DestroyerPage); - ResearchCategories.addResearch(NebulaPage); + ResearchCategories.addResearch(terraHoePage); + ResearchCategories.addResearch(aquaSwordPage); + ResearchCategories.addResearch(manaChargerPage); + ResearchCategories.addResearch(mithrillSwordPage); + ResearchCategories.addResearch(forgePage); + ResearchCategories.addResearch(destroyerPage); + ResearchCategories.addResearch(nebulaPage); } public static ResearchPage getResearchPage(String ident) { diff --git a/src/main/java/ab/common/minetweaker/AdvancedPlateMT.java b/src/main/java/ab/common/minetweaker/AdvancedPlateMT.java index 32ba90e..d9581f3 100644 --- a/src/main/java/ab/common/minetweaker/AdvancedPlateMT.java +++ b/src/main/java/ab/common/minetweaker/AdvancedPlateMT.java @@ -1,16 +1,15 @@ package ab.common.minetweaker; +import net.minecraft.item.ItemStack; + +import ab.api.AdvancedBotanyAPI; +import ab.api.recipe.RecipeAdvancedPlate; import minetweaker.IUndoableAction; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; import minetweaker.api.minecraft.MineTweakerMC; - -import net.minecraft.item.ItemStack; - import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -import ab.api.AdvancedBotanyAPI; -import ab.api.recipe.RecipeAdvancedPlate; @ZenClass("mods.advBotany.AdvancedPlate") public class AdvancedPlateMT { diff --git a/src/main/java/ab/common/minetweaker/AdvancedPlatePageMT.java b/src/main/java/ab/common/minetweaker/AdvancedPlatePageMT.java index 4af8657..cc7100c 100644 --- a/src/main/java/ab/common/minetweaker/AdvancedPlatePageMT.java +++ b/src/main/java/ab/common/minetweaker/AdvancedPlatePageMT.java @@ -2,19 +2,18 @@ package ab.common.minetweaker; import java.util.List; +import net.minecraft.item.ItemStack; + +import ab.api.recipe.lexicon.AdvancedPlateCraftPage; import minetweaker.IUndoableAction; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; import minetweaker.api.minecraft.MineTweakerMC; - -import net.minecraft.item.ItemStack; - import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.lexicon.LexiconPage; -import ab.api.recipe.lexicon.AdvancedPlateCraftPage; @ZenClass("mods.advBotany.AdvancedPlatePage") public class AdvancedPlatePageMT { diff --git a/src/main/java/ab/common/minetweaker/AlphirineMT.java b/src/main/java/ab/common/minetweaker/AlphirineMT.java index d8fc6cc..f19ec57 100644 --- a/src/main/java/ab/common/minetweaker/AlphirineMT.java +++ b/src/main/java/ab/common/minetweaker/AlphirineMT.java @@ -1,16 +1,15 @@ package ab.common.minetweaker; +import net.minecraft.item.ItemStack; + +import ab.api.AdvancedBotanyAPI; +import ab.api.recipe.RecipeAncientAlphirine; import minetweaker.IUndoableAction; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; import minetweaker.api.minecraft.MineTweakerMC; - -import net.minecraft.item.ItemStack; - import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -import ab.api.AdvancedBotanyAPI; -import ab.api.recipe.RecipeAncientAlphirine; @ZenClass("mods.advBotany.AncientAlphirine") public class AlphirineMT { diff --git a/src/main/java/ab/common/minetweaker/AlphirinePageMT.java b/src/main/java/ab/common/minetweaker/AlphirinePageMT.java index a666468..0b9c33e 100644 --- a/src/main/java/ab/common/minetweaker/AlphirinePageMT.java +++ b/src/main/java/ab/common/minetweaker/AlphirinePageMT.java @@ -2,19 +2,18 @@ package ab.common.minetweaker; import java.util.List; +import net.minecraft.item.ItemStack; + +import ab.api.recipe.lexicon.AlphirineCraftPage; import minetweaker.IUndoableAction; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; import minetweaker.api.minecraft.MineTweakerMC; - -import net.minecraft.item.ItemStack; - import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.lexicon.LexiconPage; -import ab.api.recipe.lexicon.AlphirineCraftPage; @ZenClass("mods.advBotany.AlphirinePage") public class AlphirinePageMT { diff --git a/src/main/java/ab/utils/OreDict.java b/src/main/java/ab/utils/OreDict.java index c8bb008..6bb2816 100644 --- a/src/main/java/ab/utils/OreDict.java +++ b/src/main/java/ab/utils/OreDict.java @@ -37,7 +37,7 @@ public class OreDict { 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); + if (ores != null && !ores.isEmpty()) return ores.get(0); } throw new IllegalArgumentException("Can't find any oreDictionary entry among " + Arrays.toString(oredictKeys)); }