From c66b99b535a78f5e00443d133a52511430618af9 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Thu, 19 May 2016 17:46:11 -0700 Subject: [PATCH] Remove things that shouldn't be there --- .../direwolf/CompatibilityDirewolf.java | 59 -------- .../compat/direwolf/package-info.java | 7 - .../guideapi/CompatibilityGuideAPI.java | 41 ------ .../compat/guideapi/GuideBloodMagic.java | 56 -------- .../compat/guideapi/book/CategoryAlchemy.java | 20 --- .../guideapi/book/CategoryArchitect.java | 20 --- .../compat/guideapi/book/CategoryDemon.java | 20 --- .../compat/guideapi/book/CategoryRitual.java | 34 ----- .../compat/guideapi/book/CategorySpell.java | 20 --- .../compat/guideapi/book/package-info.java | 7 - .../compat/guideapi/entry/EntryText.java | 34 ----- .../compat/guideapi/entry/package-info.java | 7 - .../compat/guideapi/package-info.java | 7 - .../compat/guideapi/page/PageAltarRecipe.java | 70 ---------- .../compat/guideapi/page/package-info.java | 7 - .../recipeRenderer/OrbRecipeRenderer.java | 128 ------------------ .../page/recipeRenderer/package-info.java | 7 - .../textures/gui/bullet_point.png | Bin 17840 -> 0 bytes 18 files changed, 544 deletions(-) delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/direwolf/CompatibilityDirewolf.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/direwolf/package-info.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/guideapi/CompatibilityGuideAPI.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/guideapi/GuideBloodMagic.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryAlchemy.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryArchitect.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryDemon.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryRitual.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategorySpell.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/guideapi/book/package-info.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/guideapi/entry/EntryText.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/guideapi/entry/package-info.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/guideapi/package-info.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageAltarRecipe.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/guideapi/page/package-info.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/guideapi/page/recipeRenderer/OrbRecipeRenderer.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/guideapi/page/recipeRenderer/package-info.java delete mode 100644 src/main/resources/assets/bloodmagicguide/textures/gui/bullet_point.png diff --git a/src/main/java/WayofTime/bloodmagic/compat/direwolf/CompatibilityDirewolf.java b/src/main/java/WayofTime/bloodmagic/compat/direwolf/CompatibilityDirewolf.java deleted file mode 100644 index 5cbb1b51..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/direwolf/CompatibilityDirewolf.java +++ /dev/null @@ -1,59 +0,0 @@ -package WayofTime.bloodmagic.compat.direwolf; - -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.altar.EnumAltarTier; -import WayofTime.bloodmagic.api.event.AltarCraftedEvent; -import WayofTime.bloodmagic.api.registry.AltarRecipeRegistry; -import WayofTime.bloodmagic.compat.ICompatibility; -import WayofTime.bloodmagic.util.helper.TextHelper; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.entity.player.ItemTooltipEvent; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; - -public class CompatibilityDirewolf implements ICompatibility -{ - @Override - public void loadCompatibility(InitializationPhase phase) - { - if (phase == InitializationPhase.POST_INIT) - { - AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(Items.BREAD), new ItemStack(Items.BREAD), EnumAltarTier.ONE, 10, 1, 0)); - MinecraftForge.EVENT_BUS.register(this); - } - } - - @Override - public String getModId() - { - return Constants.Mod.MODID; - } - - @Override - public boolean enableCompat() - { - return true; - } - - @SubscribeEvent - public void onAltarCrafted(AltarCraftedEvent event) - { - if (event.getOutput().getItem() == Items.BREAD) - { - event.getOutput().setTagCompound(new NBTTagCompound()); - event.getOutput().setStackDisplayName(TextHelper.localizeEffect("secret.BloodMagic.bread.bloody")); - event.getOutput().getTagCompound().setBoolean("bloody", true); - } - } - - @SubscribeEvent - public void onTooltip(ItemTooltipEvent event) - { - if (event.getItemStack().getItem() == Items.BREAD) - if (event.getItemStack().hasTagCompound()) - if (event.getItemStack().getTagCompound().hasKey("bloody")) - event.getToolTip().add(TextHelper.localizeEffect("secret.BloodMagic.bread.bloody.desc")); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/compat/direwolf/package-info.java b/src/main/java/WayofTime/bloodmagic/compat/direwolf/package-info.java deleted file mode 100644 index 86162678..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/direwolf/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package WayofTime.bloodmagic.compat.direwolf; - -import mcp.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/CompatibilityGuideAPI.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/CompatibilityGuideAPI.java deleted file mode 100644 index e403a49b..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/CompatibilityGuideAPI.java +++ /dev/null @@ -1,41 +0,0 @@ -//package WayofTime.bloodmagic.compat.guideapi; -// -//import WayofTime.bloodmagic.api.altar.EnumAltarTier; -//import WayofTime.bloodmagic.api.registry.AltarRecipeRegistry; -//import WayofTime.bloodmagic.compat.ICompatibility; -//import amerifrance.guideapi.api.GuideAPI; -//import net.minecraft.init.Items; -//import net.minecraft.item.ItemStack; -//import net.minecraftforge.fml.common.registry.GameRegistry; -// -//public class CompatibilityGuideAPI implements ICompatibility { -// -// @Override -// public void loadCompatibility(InitializationPhase phase) { -// switch (phase) { -// case PRE_INIT: { -// GuideBloodMagic.initBook(); -// AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(Items.BOOK), GuideAPI.getStackFromBook(GuideBloodMagic.guideBook), EnumAltarTier.ONE, 500, 2, 0)); -// break; -// } -// case INIT: { -// break; -// } -// case POST_INIT: { -// GuideBloodMagic.initCategories(); -// GameRegistry.register(GuideBloodMagic.guideBook); -// break; -// } -// } -// } -// -// @Override -// public String getModId() { -// return "guideapi"; -// } -// -// @Override -// public boolean enableCompat() { -// return true; -// } -//} diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/GuideBloodMagic.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/GuideBloodMagic.java deleted file mode 100644 index ac6bd0a5..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/GuideBloodMagic.java +++ /dev/null @@ -1,56 +0,0 @@ -//package WayofTime.bloodmagic.compat.guideapi; -// -//import WayofTime.bloodmagic.compat.guideapi.book.*; -//import WayofTime.bloodmagic.compat.jei.BloodMagicPlugin; -//import WayofTime.bloodmagic.registry.ModBlocks; -//import WayofTime.bloodmagic.registry.ModItems; -//import amerifrance.guideapi.api.GuideAPI; -//import amerifrance.guideapi.api.impl.Book; -//import amerifrance.guideapi.api.util.NBTBookTags; -//import amerifrance.guideapi.category.CategoryItemStack; -//import net.minecraft.item.ItemStack; -//import net.minecraftforge.fml.common.FMLCommonHandler; -//import net.minecraftforge.fml.common.Loader; -//import net.minecraftforge.fml.relauncher.Side; -// -//import java.awt.Color; -// -//public class GuideBloodMagic { -// -// public static Book guideBook; -// -// public static void initBook() { -// guideBook = new Book(); -// guideBook.setTitle("guide.BloodMagic.title"); -// guideBook.setDisplayName("guide.BloodMagic.display"); -// guideBook.setWelcomeMessage("guide.BloodMagic.welcome"); -// guideBook.setAuthor("guide.BloodMagic.author"); -// guideBook.setRegistryName("BloodMagic"); -// guideBook.setColor(Color.RED); -// -// if (FMLCommonHandler.instance().getSide() == Side.CLIENT) -// GuideAPI.setModel(guideBook); -// } -// -// public static void initCategories() { -// guideBook.addCategory(new CategoryItemStack(CategoryAlchemy.buildCategory(), "guide.BloodMagic.category.alchemy", new ItemStack(ModItems.arcaneAshes))); -// guideBook.addCategory(new CategoryItemStack(CategoryArchitect.buildCategory(), "guide.BloodMagic.category.architect", new ItemStack(ModItems.sigilDivination))); -// guideBook.addCategory(new CategoryItemStack(CategoryDemon.buildCategory(), "guide.BloodMagic.category.demon", new ItemStack(ModItems.bloodShard))); -// guideBook.addCategory(new CategoryItemStack(CategoryRitual.buildCategory(), "guide.BloodMagic.category.ritual", new ItemStack(ModBlocks.ritualController))); -// guideBook.addCategory(new CategoryItemStack(CategorySpell.buildCategory(), "guide.BloodMagic.category.spell", new ItemStack(ModItems.ritualDiviner))); -// } -// -// public static void initJEIBlacklist() { -// if (Loader.isModLoaded("JEI")) -// BloodMagicPlugin.jeiHelper.getNbtIgnoreList().ignoreNbtTagNames( -// GuideAPI.guideBook, -// NBTBookTags.BOOK_TAG, -// NBTBookTags.CATEGORY_PAGE_TAG, -// NBTBookTags.CATEGORY_TAG, -// NBTBookTags.ENTRY_PAGE_TAG, -// NBTBookTags.ENTRY_TAG, -// NBTBookTags.KEY_TAG, -// NBTBookTags.PAGE_TAG -// ); -// } -//} diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryAlchemy.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryAlchemy.java deleted file mode 100644 index 937227df..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryAlchemy.java +++ /dev/null @@ -1,20 +0,0 @@ -//package WayofTime.bloodmagic.compat.guideapi.book; -// -//import WayofTime.bloodmagic.api.Constants; -//import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; -//import net.minecraft.util.ResourceLocation; -// -//import java.util.HashMap; -//import java.util.Map; -// -//public class CategoryAlchemy { -// -// public static Map buildCategory() { -// Map entries = new HashMap(); -// String keyBase = Constants.Mod.DOMAIN + "alchemy_"; -// -// -// -// return entries; -// } -//} diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryArchitect.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryArchitect.java deleted file mode 100644 index 29fe089d..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryArchitect.java +++ /dev/null @@ -1,20 +0,0 @@ -//package WayofTime.bloodmagic.compat.guideapi.book; -// -//import WayofTime.bloodmagic.api.Constants; -//import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; -//import net.minecraft.util.ResourceLocation; -// -//import java.util.HashMap; -//import java.util.Map; -// -//public class CategoryArchitect { -// -// public static Map buildCategory() { -// Map entries = new HashMap(); -// String keyBase = Constants.Mod.DOMAIN + "architect_"; -// -// -// -// return entries; -// } -//} diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryDemon.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryDemon.java deleted file mode 100644 index 0216889c..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryDemon.java +++ /dev/null @@ -1,20 +0,0 @@ -//package WayofTime.bloodmagic.compat.guideapi.book; -// -//import WayofTime.bloodmagic.api.Constants; -//import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; -//import net.minecraft.util.ResourceLocation; -// -//import java.util.HashMap; -//import java.util.Map; -// -//public class CategoryDemon { -// -// public static Map buildCategory() { -// Map entries = new HashMap(); -// String keyBase = Constants.Mod.DOMAIN + "demon_"; -// -// -// -// return entries; -// } -//} diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryRitual.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryRitual.java deleted file mode 100644 index 286d5b72..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryRitual.java +++ /dev/null @@ -1,34 +0,0 @@ -//package WayofTime.bloodmagic.compat.guideapi.book; -// -//import WayofTime.bloodmagic.api.Constants; -//import WayofTime.bloodmagic.api.registry.RitualRegistry; -//import WayofTime.bloodmagic.api.ritual.Ritual; -//import WayofTime.bloodmagic.compat.guideapi.entry.EntryText; -//import WayofTime.bloodmagic.util.helper.TextHelper; -//import amerifrance.guideapi.api.IPage; -//import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; -//import amerifrance.guideapi.api.util.PageHelper; -//import amerifrance.guideapi.page.PageImage; -//import net.minecraft.util.ResourceLocation; -// -//import java.util.ArrayList; -//import java.util.HashMap; -//import java.util.List; -//import java.util.Map; -// -//public class CategoryRitual { -// -// public static Map buildCategory() { -// Map entries = new HashMap(); -// String keyBase = Constants.Mod.DOMAIN + "ritual_"; -// -// for (Ritual ritual : RitualRegistry.getRituals()) { -// List ritualPages = new ArrayList(); -// ritualPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(ritual.getUnlocalizedName() + ".desc"))); -// ritualPages.add(new PageImage(new ResourceLocation("bloodmagicguide", "textures/guide/" + ritual.getName() + ".png"))); -// entries.put(new ResourceLocation(keyBase + ritual.getName()), new EntryText(ritualPages, TextHelper.localize(ritual.getUnlocalizedName()), true)); -// } -// -// return entries; -// } -//} diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategorySpell.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategorySpell.java deleted file mode 100644 index 0909afc1..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategorySpell.java +++ /dev/null @@ -1,20 +0,0 @@ -//package WayofTime.bloodmagic.compat.guideapi.book; -// -//import WayofTime.bloodmagic.api.Constants; -//import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; -//import net.minecraft.util.ResourceLocation; -// -//import java.util.HashMap; -//import java.util.Map; -// -//public class CategorySpell { -// -// public static Map buildCategory() { -// Map entries = new HashMap(); -// String keyBase = Constants.Mod.DOMAIN + "spell_"; -// -// -// -// return entries; -// } -//} diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/package-info.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/package-info.java deleted file mode 100644 index 45901a67..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package WayofTime.bloodmagic.compat.guideapi.book; - -import mcp.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/entry/EntryText.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/entry/EntryText.java deleted file mode 100644 index 4a731f4d..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/entry/EntryText.java +++ /dev/null @@ -1,34 +0,0 @@ -//package WayofTime.bloodmagic.compat.guideapi.entry; -// -//import amerifrance.guideapi.api.IPage; -//import amerifrance.guideapi.api.impl.Book; -//import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; -//import amerifrance.guideapi.api.util.GuiHelper; -//import amerifrance.guideapi.entry.EntryResourceLocation; -//import amerifrance.guideapi.gui.GuiBase; -//import net.minecraft.client.Minecraft; -//import net.minecraft.client.gui.FontRenderer; -//import net.minecraft.client.renderer.GlStateManager; -//import net.minecraft.util.ResourceLocation; -//import net.minecraftforge.fml.relauncher.Side; -//import net.minecraftforge.fml.relauncher.SideOnly; -// -//import java.util.List; -// -//public class EntryText extends EntryResourceLocation { -// -// public EntryText(List pageList, String unlocEntryName, boolean unicode) { -// super(pageList, unlocEntryName, new ResourceLocation("bloodmagicguide", "textures/gui/bullet_point.png"), unicode); -// } -// -// public EntryText(List pageList, String unlocEntryName) { -// this(pageList, unlocEntryName, false); -// } -// -// @Override -// @SideOnly(Side.CLIENT) -// public void drawExtras(Book book, CategoryAbstract category, int entryX, int entryY, int entryWidth, int entryHeight, int mouseX, int mouseY, GuiBase guiBase, FontRenderer fontRendererObj) { -// Minecraft.getMinecraft().getTextureManager().bindTexture(image); -// GuiHelper.drawSizedIconWithoutColor(entryX + 4, entryY + 2, 8, 8, 1F); -// } -//} diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/entry/package-info.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/entry/package-info.java deleted file mode 100644 index 6e1727c4..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/entry/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package WayofTime.bloodmagic.compat.guideapi.entry; - -import mcp.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/package-info.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/package-info.java deleted file mode 100644 index bce3b3b8..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -//@ParametersAreNonnullByDefault -//@MethodsReturnNonnullByDefault -//package WayofTime.bloodmagic.compat.guideapi; -// -//import mcp.MethodsReturnNonnullByDefault; -// -//import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageAltarRecipe.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageAltarRecipe.java deleted file mode 100644 index 5447749e..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageAltarRecipe.java +++ /dev/null @@ -1,70 +0,0 @@ -//package WayofTime.bloodmagic.compat.guideapi.page; -// -//import WayofTime.bloodmagic.api.registry.AltarRecipeRegistry; -//import WayofTime.bloodmagic.util.helper.TextHelper; -//import amerifrance.guideapi.api.impl.Book; -//import amerifrance.guideapi.api.impl.Page; -//import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; -//import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; -//import amerifrance.guideapi.api.util.GuiHelper; -//import amerifrance.guideapi.gui.GuiBase; -//import net.minecraft.client.Minecraft; -//import net.minecraft.client.gui.FontRenderer; -//import net.minecraft.init.Blocks; -//import net.minecraft.item.Item; -//import net.minecraft.item.ItemStack; -//import net.minecraft.util.ResourceLocation; -//import net.minecraftforge.fml.relauncher.Side; -//import net.minecraftforge.fml.relauncher.SideOnly; -// -//import java.util.List; -// -//public class PageAltarRecipe extends Page { -// -// public List input; -// public ItemStack output; -// public int tier; -// public int bloodRequired; -// -// public PageAltarRecipe(AltarRecipeRegistry.AltarRecipe recipe) { -// this.input = recipe.getInput(); -// this.output = recipe.getOutput(); -// this.tier = recipe.getMinTier().toInt(); -// this.bloodRequired = recipe.getSyphon(); -// } -// -// @Override -// @SideOnly(Side.CLIENT) -// public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, GuiBase guiBase, FontRenderer fontRenderer) { -// -// Minecraft.getMinecraft().getTextureManager().bindTexture(new ResourceLocation("alchemicalwizardry" + ":textures/gui/guide/altar.png")); -// guiBase.drawTexturedModalRect(guiLeft + 42, guiTop + 53, 0, 87, 146, 104); -// -// guiBase.drawCenteredString(fontRenderer, TextHelper.localize("text.recipe.altar"), guiLeft + guiBase.xSize / 2, guiTop + 12, 0); -// -// int inputX = (1 + 1) * 20 + (guiLeft + guiBase.xSize / 7) + 1; -// int inputY = (20) + (guiTop + guiBase.ySize / 5) - 1; //1 * 20 -// GuiHelper.drawItemStack(input.get(0), inputX, inputY); -// if (GuiHelper.isMouseBetween(mouseX, mouseY, inputX, inputY, 15, 15)) { -// guiBase.renderToolTip(input.get(0), mouseX, mouseY); -// } -// -// if (output == null) { -// output = new ItemStack(Blocks.BARRIER); -// } -// int outputX = (5 * 20) + (guiLeft + guiBase.xSize / 7) + 1; -// int outputY = (20) + (guiTop + guiBase.xSize / 5) - 1; // 1 * 20 -// GuiHelper.drawItemStack(output, outputX, outputY); -// if (GuiHelper.isMouseBetween(mouseX, mouseY, outputX, outputY, 15, 15)) { -// guiBase.renderToolTip(output, outputX, outputY); -// } -// -// if (output.getItem() == Item.getItemFromBlock(Blocks.BARRIER)) { -// guiBase.drawCenteredString(fontRenderer, TextHelper.localize("text.furnace.error"), guiLeft + guiBase.xSize / 2, guiTop + 4 * guiBase.ySize / 6, 0xED073D); -// guiBase.drawCenteredString(fontRenderer, TextHelper.localize("bm.string.tier") + ": " + String.valueOf(tier), guiLeft + guiBase.xSize / 2, guiTop + 4 * guiBase.ySize / 6 + 15, 0); -// guiBase.drawCenteredString(fontRenderer, "LP: " + String.valueOf(bloodRequired), guiLeft + guiBase.xSize / 2, guiTop + 4 * guiBase.ySize / 6 + 30, 0); -// } -// guiBase.drawCenteredString(fontRenderer, TextHelper.localize("text.recipe.altar.tier", String.valueOf(tier)), guiLeft + guiBase.xSize / 2, guiTop + 4 * guiBase.ySize / 6, 0); -// guiBase.drawCenteredString(fontRenderer, TextHelper.localize("text.recipe.altar.bloodRequired", String.valueOf(bloodRequired)), guiLeft + guiBase.xSize / 2, guiTop + 4 * guiBase.ySize / 6 + 15, 0); -// } -//} diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/package-info.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/package-info.java deleted file mode 100644 index 01727b53..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package WayofTime.bloodmagic.compat.guideapi.page; - -import mcp.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/recipeRenderer/OrbRecipeRenderer.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/recipeRenderer/OrbRecipeRenderer.java deleted file mode 100644 index 882ad750..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/recipeRenderer/OrbRecipeRenderer.java +++ /dev/null @@ -1,128 +0,0 @@ -//package WayofTime.bloodmagic.compat.guideapi.page.recipeRenderer; -// -//import WayofTime.bloodmagic.api.recipe.ShapedBloodOrbRecipe; -//import WayofTime.bloodmagic.api.recipe.ShapelessBloodOrbRecipe; -//import WayofTime.bloodmagic.api.registry.OrbRegistry; -//import WayofTime.bloodmagic.util.helper.TextHelper; -//import amerifrance.guideapi.GuideMod; -//import amerifrance.guideapi.api.IRecipeRenderer; -//import amerifrance.guideapi.api.impl.Book; -//import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; -//import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; -//import amerifrance.guideapi.api.util.GuiHelper; -//import amerifrance.guideapi.gui.GuiBase; -//import net.minecraft.client.Minecraft; -//import net.minecraft.client.gui.FontRenderer; -//import net.minecraft.item.ItemStack; -//import net.minecraft.item.crafting.IRecipe; -//import net.minecraft.util.ResourceLocation; -//import net.minecraftforge.fml.relauncher.ReflectionHelper; -// -//import java.util.ArrayList; -//import java.util.List; -// -//public class OrbRecipeRenderer implements IRecipeRenderer -//{ -// public IRecipe recipe; -// -// public OrbRecipeRenderer(IRecipe recipe) -// { -// this.recipe = recipe; -// } -// -// @Override -// public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, GuiBase guiBase, FontRenderer fontRenderer) { -// Minecraft.getMinecraft().getTextureManager().bindTexture(new ResourceLocation(GuideMod.GUITEXLOC + "recipe_elements.png")); -// guiBase.drawTexturedModalRect(guiLeft + 42, guiTop + 53, 0, 0, 105, 65); -// -// guiBase.drawCenteredString(fontRenderer, TextHelper.localize("text.recipe.shapedOrb"), guiLeft + guiBase.xSize / 2, guiTop + 12, 0); -// if(recipe instanceof ShapelessBloodOrbRecipe) -// { -// ShapelessBloodOrbRecipe shapelessBloodOrbRecipe = (ShapelessBloodOrbRecipe) recipe; -// List list = shapelessBloodOrbRecipe.getInput(); -// -// int width = 3; -// int height = 3; -// for (int y = 0; y < height; y++) { -// for (int x = 0; x < width; x++) { -// if(list.size() - 1 < y * width + x) -// { -// continue; -// } -// -// int stackX = (x + 1) * 18 + (guiLeft + guiBase.xSize / 7); -// int stackY = (y + 1) * 18 + (guiTop + guiBase.ySize / 5); -// -// Object component = list.get(y * width + x); -// if (component != null) { -// if (component instanceof ItemStack) { -// GuiHelper.drawItemStack((ItemStack) component, stackX, stackY); -// if (GuiHelper.isMouseBetween(mouseX, mouseY, stackX, stackY, 15, 15)) { -// guiBase.renderToolTip((ItemStack) component, stackX, stackY); -// } -// } else if (component instanceof Integer) { -// GuiHelper.drawItemStack(OrbRegistry.getOrbsForTier((Integer) component).get(0), stackX, stackY); -// if (GuiHelper.isMouseBetween(mouseX, mouseY, stackX, stackY, 15, 15)) { -// guiBase.renderToolTip(OrbRegistry.getOrbsForTier((Integer) component).get(0), stackX, stackY); -// } -// } else { -// if (((ArrayList) component).isEmpty()) return; -// GuiHelper.drawItemStack(((ArrayList) component).get(0), stackX, stackY); -// if (GuiHelper.isMouseBetween(mouseX, mouseY, stackX, stackY, 15, 15)) { -// guiBase.renderToolTip(((ArrayList) component).get(0), stackX, stackY); -// } -// } -// } -// } -// } -// int outputX = (5 * 18) + (guiLeft + guiBase.xSize / 7); -// int outputY = (2 * 18) + (guiTop + guiBase.xSize / 5); -// GuiHelper.drawItemStack(shapelessBloodOrbRecipe.getRecipeOutput(), outputX, outputY); -// if (GuiHelper.isMouseBetween(mouseX, mouseY, outputX, outputY, 15, 15)) { -// guiBase.renderToolTip(shapelessBloodOrbRecipe.getRecipeOutput(), outputX, outputY); -// } -// }else if (recipe instanceof ShapedBloodOrbRecipe) -// { -// ShapedBloodOrbRecipe shapedBloodOrbRecipe = (ShapedBloodOrbRecipe) recipe; -// int width = ReflectionHelper.getPrivateValue(ShapedBloodOrbRecipe.class, shapedBloodOrbRecipe, 4); -// int height = ReflectionHelper.getPrivateValue(ShapedBloodOrbRecipe.class, shapedBloodOrbRecipe, 5); -// for (int y = 0; y < height; y++) { -// for (int x = 0; x < width; x++) { -// int stackX = (x + 1) * 18 + (guiLeft + guiBase.xSize / 7); -// int stackY = (y + 1) * 18 + (guiTop + guiBase.ySize / 5); -// Object component = shapedBloodOrbRecipe.getInput()[y * width + x]; -// if (component != null) { -// if (component instanceof ItemStack) { -// GuiHelper.drawItemStack((ItemStack) component, stackX, stackY); -// if (GuiHelper.isMouseBetween(mouseX, mouseY, stackX, stackY, 15, 15)) { -// guiBase.renderToolTip((ItemStack) component, stackX, stackY); -// } -// } else if (component instanceof Integer) { -// GuiHelper.drawItemStack(OrbRegistry.getOrbsForTier((Integer) component).get(0), stackX, stackY); -// if (GuiHelper.isMouseBetween(mouseX, mouseY, stackX, stackY, 15, 15)) { -// guiBase.renderToolTip(OrbRegistry.getOrbsForTier((Integer) component).get(0), stackX, stackY); -// } -// } else { -// if (((ArrayList) component).isEmpty()) return; -// GuiHelper.drawItemStack(((ArrayList) component).get(0), stackX, stackY); -// if (GuiHelper.isMouseBetween(mouseX, mouseY, stackX, stackY, 15, 15)) { -// guiBase.renderToolTip(((ArrayList) component).get(0), stackX, stackY); -// } -// } -// } -// } -// } -// int outputX = (5 * 18) + (guiLeft + guiBase.xSize / 7); -// int outputY = (2 * 18) + (guiTop + guiBase.xSize / 5); -// GuiHelper.drawItemStack(shapedBloodOrbRecipe.getRecipeOutput(), outputX, outputY); -// if (GuiHelper.isMouseBetween(mouseX, mouseY, outputX, outputY, 15, 15)) { -// guiBase.renderToolTip(shapedBloodOrbRecipe.getRecipeOutput(), outputX, outputY); -// } -// } -// } -// -// @Override -// public void drawExtras(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, GuiBase guiBase, FontRenderer fontRenderer) { -// -// } -//} diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/recipeRenderer/package-info.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/recipeRenderer/package-info.java deleted file mode 100644 index e108a88f..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/recipeRenderer/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package WayofTime.bloodmagic.compat.guideapi.page.recipeRenderer; - -import mcp.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagicguide/textures/gui/bullet_point.png b/src/main/resources/assets/bloodmagicguide/textures/gui/bullet_point.png deleted file mode 100644 index fd56d1bb0d67abaac3273f095eca6568630f53a3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17840 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