diff --git a/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java b/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java index 40f43d591..57a27a745 100644 --- a/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java +++ b/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java @@ -12,7 +12,6 @@ package vazkii.botania.api.internal; import net.minecraft.entity.Entity; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -21,15 +20,11 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.items.IItemHandlerModifiable; +import vazkii.botania.api.brew.Brew; import vazkii.botania.api.corporea.IWrappedInventory; import vazkii.botania.api.corporea.InvWithLocation; import vazkii.botania.api.lexicon.LexiconPage; import vazkii.botania.api.lexicon.multiblock.MultiblockSet; -import vazkii.botania.api.recipe.RecipeBrew; -import vazkii.botania.api.recipe.RecipeElvenTrade; -import vazkii.botania.api.recipe.RecipeManaInfusion; -import vazkii.botania.api.recipe.RecipePetals; -import vazkii.botania.api.recipe.RecipeRuneAltar; import vazkii.botania.api.subtile.TileEntitySpecialFlower; import java.util.List; @@ -52,57 +47,32 @@ public class DummyMethodHandler implements IInternalMethodHandler { } @Override - public LexiconPage craftingRecipesPage(String key, List recipes) { + public LexiconPage craftingRecipePage(String key, Item... outputItems) { return dummyPage(key); } @Override - public LexiconPage craftingRecipePage(String key, ResourceLocation recipe) { + public LexiconPage petalRecipePage(String key, Item... outputItems) { return dummyPage(key); } @Override - public LexiconPage petalRecipesPage(String key, List recipes) { + public LexiconPage runeRecipePage(String key, Item... outputItems) { return dummyPage(key); } @Override - public LexiconPage petalRecipePage(String key, RecipePetals recipe) { + public LexiconPage manaInfusionRecipePage(String key, Item... outputItems) { return dummyPage(key); } @Override - public LexiconPage runeRecipesPage(String key, List recipes) { + public LexiconPage elvenTradePage(String key, Item... outputItems) { return dummyPage(key); } @Override - public LexiconPage runeRecipePage(String key, RecipeRuneAltar recipe) { - return dummyPage(key); - } - - @Override - public LexiconPage manaInfusionRecipesPage(String key, List recipes) { - return dummyPage(key); - } - - @Override - public LexiconPage manaInfusionRecipePage(String key, RecipeManaInfusion recipe) { - return dummyPage(key); - } - - @Override - public LexiconPage elvenTradePage(String key, List recipes) { - return dummyPage(key); - } - - @Override - public LexiconPage elvenTradesPage(String key, RecipeElvenTrade recipe) { - return dummyPage(key); - } - - @Override - public LexiconPage brewPage(String key, String bottomText, RecipeBrew recipe) { + public LexiconPage brewPage(String key, String bottomText, Brew outputBrew) { return dummyPage(key); } diff --git a/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java b/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java index e05c0a1f4..767b06f06 100644 --- a/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java +++ b/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java @@ -10,10 +10,8 @@ */ package vazkii.botania.api.internal; -import net.minecraft.client.renderer.model.ModelResourceLocation; import net.minecraft.entity.Entity; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -24,15 +22,11 @@ import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.items.IItemHandlerModifiable; +import vazkii.botania.api.brew.Brew; import vazkii.botania.api.corporea.IWrappedInventory; import vazkii.botania.api.corporea.InvWithLocation; import vazkii.botania.api.lexicon.LexiconPage; import vazkii.botania.api.lexicon.multiblock.MultiblockSet; -import vazkii.botania.api.recipe.RecipeBrew; -import vazkii.botania.api.recipe.RecipeElvenTrade; -import vazkii.botania.api.recipe.RecipeManaInfusion; -import vazkii.botania.api.recipe.RecipePetals; -import vazkii.botania.api.recipe.RecipeRuneAltar; import vazkii.botania.api.subtile.TileEntitySpecialFlower; import java.util.List; @@ -52,27 +46,17 @@ public interface IInternalMethodHandler { public LexiconPage imagePage(String key, String resource); - public LexiconPage craftingRecipesPage(String key, List recipes); + public LexiconPage craftingRecipePage(String key, Item... outputItems); - public LexiconPage craftingRecipePage(String key, ResourceLocation recipe); + public LexiconPage petalRecipePage(String key, Item... outputItems); - public LexiconPage petalRecipesPage(String key, List recipes); + public LexiconPage runeRecipePage(String key, Item... outputItems); - public LexiconPage petalRecipePage(String key, RecipePetals recipe); + public LexiconPage manaInfusionRecipePage(String key, Item... outputItems); - public LexiconPage runeRecipesPage(String key, List recipes); + public LexiconPage elvenTradePage(String key, Item... outputItems); - public LexiconPage runeRecipePage(String key, RecipeRuneAltar recipe); - - public LexiconPage manaInfusionRecipesPage(String key, List recipes); - - public LexiconPage manaInfusionRecipePage(String key, RecipeManaInfusion recipe); - - public LexiconPage elvenTradePage(String key, List recipes); - - public LexiconPage elvenTradesPage(String key, RecipeElvenTrade recipe); - - public LexiconPage brewPage(String key, String bottomText, RecipeBrew recipe); + public LexiconPage brewPage(String key, String bottomText, Brew outputBrew); public LexiconPage multiblockPage(String key, MultiblockSet mb); diff --git a/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java b/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java index 1ad543ab8..7cf37b1b8 100644 --- a/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java +++ b/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java @@ -28,6 +28,9 @@ public final class LexiconRecipeMappings { * Maps the given stack to the given page of the entry. */ public static void map(ItemStack stack, LexiconEntry entry, int page, boolean force) { + if(stack.isEmpty()) + return; + EntryData data = new EntryData(entry, page); String str = stackToString(stack); @@ -46,9 +49,6 @@ public final class LexiconRecipeMappings { } public static EntryData getDataForStack(ItemStack stack) { - String wildKey = stackToString(stack); - if (mappings.containsKey(wildKey)) - return mappings.get(wildKey); return mappings.get(stackToString(stack)); } @@ -62,6 +62,10 @@ public final class LexiconRecipeMappings { return stack.getTranslationKey(); } + public static void clear() { + mappings.clear(); + } + public static class EntryData { public final LexiconEntry entry; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java index 5b0141c73..71c0dc912 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java @@ -148,18 +148,21 @@ public class GuiLexicon extends Screen { int guiScale = mc.gameSettings.guiScale; int persistentScale = Math.min(PersistentVariableHelper.lexiconGuiScale, getMaxAllowedScale()); - if(persistentScale > 0 && persistentScale != guiScale) { - // Fake the scale temporarily so we can get the scaled width from mainWindow - mc.gameSettings.guiScale = persistentScale; - mc.updateWindowSize(); + if(persistentScale > 0 && persistentScale != guiScale) { //todo changing gui scale with this now results in endless recursion +// // Fake the scale temporarily so we can get the scaled width from mainWindow +// mc.gameSettings.guiScale = persistentScale; +// mc.updateWindowSize(); + +// mc.mainWindow.setGuiScale(mc.mainWindow.calcGuiScale(persistentScale, Minecraft.getInstance().getForceUnicodeFont())); // Get the info width = mc.mainWindow.getScaledWidth(); height = mc.mainWindow.getScaledHeight(); - - // Change it back - mc.gameSettings.guiScale = guiScale; - mc.updateWindowSize(); + +// mc.mainWindow.setGuiScale(guiScale); +// // Change it back +// mc.gameSettings.guiScale = guiScale; +// mc.updateWindowSize(); } List allCategories = new ArrayList<>(BotaniaAPI.getAllCategories()); @@ -177,7 +180,7 @@ public class GuiLexicon extends Screen { int x = 18; for(int i = 0; i < 12; i++) { int y = 16 + i * 12; - buttons.add(new GuiButtonIndexEntry((GuiLexiconIndex) this, i, left + x, top + y, 110, 10, "")); + addButton(new GuiButtonIndexEntry((GuiLexiconIndex) this, i, left + x, top + y, 110, 10, "")); } populateIndex(); } else if(isCategoryIndex()) { @@ -191,18 +194,18 @@ public class GuiLexicon extends Screen { int size = 22; GuiButtonCategory button = new GuiButtonCategory(left + 18 + x * size, top + 50 + y * size, this, category); - buttons.add(button); + addButton(button); } } populateBookmarks(); if(isMainPage()) { - buttons.add(new GuiButtonOptions(left + 20, top + guiHeight - 25)); - buttons.add(new GuiButtonAchievement(left + 33, top + guiHeight - 25)); - buttons.add(new GuiButtonChallenges(left + 45, top + guiHeight - 25)); - buttons.add(new GuiButtonScaleChange(left + 57, top + guiHeight - 25)); + addButton(new GuiButtonOptions(left + 20, top + guiHeight - 25)); + addButton(new GuiButtonAchievement(left + 33, top + guiHeight - 25)); + addButton(new GuiButtonChallenges(left + 45, top + guiHeight - 25)); + addButton(new GuiButtonScaleChange(left + 57, top + guiHeight - 25)); GuiButtonUpdateWarning button = new GuiButtonUpdateWarning(left - 6, top + guiHeight - 70); - buttons.add(button); + addButton(button); if(PersistentVariableHelper.lastBotaniaVersion.equals(LibMisc.VERSION)) { button.active = false; @@ -212,10 +215,10 @@ public class GuiLexicon extends Screen { LocalDateTime now = LocalDateTime.now(); if(now.getMonth() == Month.NOVEMBER && now.getDayOfMonth() == 22) - buttons.add(new GuiButtonDoot(left + 100, top + 12)); + addButton(new GuiButtonDoot(left + 100, top + 12)); } - buttons.add(new GuiButtonNotes(this, left - 4, top - 4)); + addButton(new GuiButtonNotes(this, left - 4, top - 4)); } @Override @@ -487,13 +490,13 @@ public class GuiLexicon extends Screen { for(int i = 0; i < len + (addEnabled ? 1 : 0); i++) { boolean isAdd = i == bookmarks.size(); GuiLexicon destination = isAdd ? null : bookmarks.get(i); - buttons.add(new GuiButtonBookmark(i, left + 138, top + 18 + 14 * i, destination == null ? this : destination, destination == null ? "+" : destination.getTitle().getFormattedText())); + addButton(new GuiButtonBookmark(i, left + 138, top + 18 + 14 * i, destination == null ? this : destination, destination == null ? "+" : destination.getTitle().getFormattedText())); } if(isMainPage()) - buttons.add(new GuiButtonHistory(left + 138, top + guiHeight - 24, I18n.format("botaniamisc.history"), this)); + addButton(new GuiButtonHistory(left + 138, top + guiHeight - 24, I18n.format("botaniamisc.history"), this)); else if(isChallenge()) - buttons.add(new GuiButtonChallengeInfo(left + 138, top + guiHeight - 24, I18n.format("botaniamisc.info"), this)); + addButton(new GuiButtonChallengeInfo(left + 138, top + guiHeight - 24, I18n.format("botaniamisc.info"), this)); } public static void startTutorial() { diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallenge.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallenge.java index a17f90b64..f38e4c85e 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallenge.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallenge.java @@ -50,11 +50,11 @@ public class GuiLexiconChallenge extends GuiLexicon implements IParented { public void onInitGui() { super.onInitGui(); - buttons.add(backButton = new GuiButtonBack(left + guiWidth / 2 - 8, top + guiHeight + 2, b -> { + addButton(backButton = new GuiButtonBack(left + guiWidth / 2 - 8, top + guiHeight + 2, b -> { mc.displayGuiScreen(parent); ClientTickHandler.notifyPageChange(); })); - buttons.add(completeButton = new Button(left + 20, top + guiHeight - 35, guiWidth - 40, 20, "", b -> { + addButton(completeButton = new Button(left + 20, top + guiHeight - 35, guiWidth - 40, 20, "", b -> { challenge.complete = !challenge.complete; setCompleteButtonTitle(); PersistentVariableHelper.saveSafe(); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallengesList.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallengesList.java index afde77ae9..698378ba1 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallengesList.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallengesList.java @@ -40,7 +40,7 @@ public class GuiLexiconChallengesList extends GuiLexicon implements IParented { public void onInitGui() { super.onInitGui(); - buttons.add(backButton = new GuiButtonBack(left + guiWidth / 2 - 8, top + guiHeight + 2, b -> { + addButton(backButton = new GuiButtonBack(left + guiWidth / 2 - 8, top + guiHeight + 2, b -> { mc.displayGuiScreen(parent); ClientTickHandler.notifyPageChange(); })); @@ -51,7 +51,7 @@ public class GuiLexiconChallengesList extends GuiLexicon implements IParented { for(EnumChallengeLevel level : EnumChallengeLevel.class.getEnumConstants()) { int j = 0; for(Challenge c : ModChallenges.challenges.get(level)) { - buttons.add(new GuiButtonChallengeIcon(left + 20 + j % perline * 18, y + j / perline * 17, c, this)); + addButton(new GuiButtonChallengeIcon(left + 20 + j % perline * 18, y + j / perline * 17, c, this)); i++; j++; } diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java index 91722cef7..ae68abd5a 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java @@ -80,12 +80,12 @@ public class GuiLexiconEntry extends GuiLexicon implements IGuiLexiconEntry, IPa public void onInitGui() { super.onInitGui(); - buttons.add(backButton = new GuiButtonBackWithShift(left + guiWidth / 2 - 8, top + guiHeight + 2, b -> { + addButton(backButton = new GuiButtonBackWithShift(left + guiWidth / 2 - 8, top + guiHeight + 2, b -> { entry.pages.get(page).onClosed(GuiLexiconEntry.this); mc.displayGuiScreen(Screen.hasShiftDown() ? new GuiLexicon() : parent); ClientTickHandler.notifyPageChange(); })); - buttons.add(leftButton = new GuiButtonPage(left, top + guiHeight - 10, false, b -> { + addButton(leftButton = new GuiButtonPage(left, top + guiHeight - 10, false, b -> { entry.pages.get(page).onClosed(GuiLexiconEntry.this); page--; entry.pages.get(page).onOpened(GuiLexiconEntry.this); @@ -93,7 +93,7 @@ public class GuiLexiconEntry extends GuiLexicon implements IGuiLexiconEntry, IPa ClientTickHandler.notifyPageChange(); updatePageButtons(); })); - buttons.add(rightButton = new GuiButtonPage(left + guiWidth - 18, top + guiHeight - 10, true, b -> { + addButton(rightButton = new GuiButtonPage(left + guiWidth - 18, top + guiHeight - 10, true, b -> { entry.pages.get(page).onClosed(GuiLexiconEntry.this); page++; entry.pages.get(page).onOpened(GuiLexiconEntry.this); @@ -101,7 +101,7 @@ public class GuiLexiconEntry extends GuiLexicon implements IGuiLexiconEntry, IPa ClientTickHandler.notifyPageChange(); updatePageButtons(); })); - buttons.add(new GuiButtonShare(left + guiWidth - 6, top - 2, b -> { + addButton(new GuiButtonShare(left + guiWidth - 6, top - 2, b -> { Minecraft mc = Minecraft.getInstance(); String cmd = "/botania-share " + entry.getUnlocalizedName(); @@ -109,7 +109,7 @@ public class GuiLexiconEntry extends GuiLexicon implements IGuiLexiconEntry, IPa mc.player.sendChatMessage(cmd); })); if(entry.getWebLink() != null) - buttons.add(new GuiButtonViewOnline(left - 8, top + 12, b -> { + addButton(new GuiButtonViewOnline(left - 8, top + 12, b -> { try { if(Desktop.isDesktopSupported()) Desktop.getDesktop().browse(new URI(entry.getWebLink())); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java index 970c5e7bc..a95f5ead3 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java @@ -95,17 +95,17 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented { return; } - buttons.add(backButton = new GuiButtonBack(left + guiWidth / 2 - 8, top + guiHeight + 2, b -> { + addButton(backButton = new GuiButtonBack(left + guiWidth / 2 - 8, top + guiHeight + 2, b -> { mc.displayGuiScreen(parent); ClientTickHandler.notifyPageChange(); })); - buttons.add(leftButton = new GuiButtonPage(left, top + guiHeight - 10, false, b -> { + addButton(leftButton = new GuiButtonPage(left, top + guiHeight - 10, false, b -> { page--; updatePageButtons(); populateIndex(); ClientTickHandler.notifyPageChange(); })); - buttons.add(rightButton = new GuiButtonPage(left + guiWidth - 18, top + guiHeight - 10, true, b -> { + addButton(rightButton = new GuiButtonPage(left + guiWidth - 18, top + guiHeight - 10, true, b -> { page++; updatePageButtons(); populateIndex(); diff --git a/src/main/java/vazkii/botania/client/lib/LibResources.java b/src/main/java/vazkii/botania/client/lib/LibResources.java index 20c76c719..87627c980 100644 --- a/src/main/java/vazkii/botania/client/lib/LibResources.java +++ b/src/main/java/vazkii/botania/client/lib/LibResources.java @@ -58,7 +58,6 @@ public final class LibResources { public static final String ENTRY_SPREADER = PREFIX_ENTRIES + "spreader.png"; public static final String ENTRY_BAUBLES = PREFIX_ENTRIES + "baubles.png"; public static final String ENTRY_ELVEN_GARDE = PREFIX_ENTRIES + "elven_garde.png"; - public static final String ENTRY_DIMINISHING_RETURNS = PREFIX_ENTRIES + "diminishing_returns.png"; public static final String ENTRY_HYDROANGEAS = PREFIX_ENTRIES + "hydroangeas.png"; public static final String ENTRY_CRAFT_CRATE = PREFIX_ENTRIES + "craft_crate.png"; public static final String ENTRY_AZULEJOS = PREFIX_ENTRIES + "azulejos.png"; diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index f17dffbf7..1ad4e7a41 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -119,6 +119,7 @@ public class Botania { MinecraftForge.EVENT_BUS.addListener(this::serverAboutToStart); MinecraftForge.EVENT_BUS.addListener(this::serverStarting); MinecraftForge.EVENT_BUS.addListener(this::serverStopping); +// MinecraftForge.EVENT_BUS.addListener(LexiconData::reload); } private void commonSetup(FMLCommonSetupEvent event) { @@ -135,7 +136,6 @@ public class Botania { PacketHandler.init(); ModBrews.init(); ModMultiblocks.init(); - ModCraftingRecipes.init(); if(Botania.thaumcraftLoaded) { if(ConfigHandler.COMMON.enableThaumcraftAspects.get()) { diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index a2c0609e7..d9194ec01 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -1060,5 +1060,25 @@ public final class ModBlocks { case BLACK: return doubleFlowerBlack; } } - + public static Block getPetalBlock(DyeColor color) { + switch (color) { + default: + case WHITE: return petalBlockWhite; + case ORANGE: return petalBlockOrange; + case MAGENTA: return petalBlockMagenta; + case LIGHT_BLUE: return petalBlockLightBlue; + case YELLOW: return petalBlockYellow; + case LIME: return petalBlockLime; + case PINK: return petalBlockPink; + case GRAY: return petalBlockGray; + case LIGHT_GRAY: return petalBlockSilver; + case CYAN: return petalBlockCyan; + case PURPLE: return petalBlockPurple; + case BLUE: return petalBlockBlue; + case BROWN: return petalBlockBrown; + case GREEN: return petalBlockGreen; + case RED: return petalBlockRed; + case BLACK: return petalBlockBlack; + } + } } diff --git a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java b/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java index 62372f8db..341560611 100644 --- a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java @@ -13,18 +13,17 @@ package vazkii.botania.common.core.handler; import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Direction; -import net.minecraft.util.Direction; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.items.IItemHandlerModifiable; import net.minecraftforge.items.wrapper.EmptyHandler; +import vazkii.botania.api.brew.Brew; import vazkii.botania.api.corporea.CorporeaHelper; import vazkii.botania.api.corporea.ICorporeaSpark; import vazkii.botania.api.corporea.IWrappedInventory; @@ -33,11 +32,6 @@ import vazkii.botania.api.internal.DummyMethodHandler; import vazkii.botania.api.internal.IManaNetwork; import vazkii.botania.api.lexicon.LexiconPage; import vazkii.botania.api.lexicon.multiblock.MultiblockSet; -import vazkii.botania.api.recipe.RecipeBrew; -import vazkii.botania.api.recipe.RecipeElvenTrade; -import vazkii.botania.api.recipe.RecipeManaInfusion; -import vazkii.botania.api.recipe.RecipePetals; -import vazkii.botania.api.recipe.RecipeRuneAltar; import vazkii.botania.api.subtile.ISpecialFlower; import vazkii.botania.api.subtile.TileEntityFunctionalFlower; import vazkii.botania.api.subtile.TileEntityGeneratingFlower; @@ -85,58 +79,33 @@ public class InternalMethodHandler extends DummyMethodHandler { } @Override - public LexiconPage craftingRecipesPage(String key, List recipes) { - return new PageCraftingRecipe(key, recipes); + public LexiconPage craftingRecipePage(String key, Item... outputItems) { + return new PageCraftingRecipe(key, outputItems); } @Override - public LexiconPage craftingRecipePage(String key, ResourceLocation recipe) { - return new PageCraftingRecipe(key, recipe); + public LexiconPage petalRecipePage(String key, Item... outputItems) { + return new PagePetalRecipe(key, outputItems); } @Override - public LexiconPage petalRecipesPage(String key, List recipes) { - return new PagePetalRecipe<>(key, recipes); + public LexiconPage runeRecipePage(String key, Item... outputItems) { + return new PageRuneRecipe(key, outputItems); } @Override - public LexiconPage petalRecipePage(String key, RecipePetals recipe) { - return new PagePetalRecipe<>(key, recipe); + public LexiconPage manaInfusionRecipePage(String key, Item... outputItems) { + return new PageManaInfusionRecipe(key, outputItems); } @Override - public LexiconPage runeRecipesPage(String key, List recipes) { - return new PageRuneRecipe(key, recipes); + public LexiconPage elvenTradePage(String key, Item... outputItems) { + return new PageElvenRecipe(key, outputItems); } @Override - public LexiconPage runeRecipePage(String key, RecipeRuneAltar recipe) { - return new PageRuneRecipe(key, recipe); - } - - @Override - public LexiconPage manaInfusionRecipesPage(String key, List recipes) { - return new PageManaInfusionRecipe(key, recipes); - } - - @Override - public LexiconPage manaInfusionRecipePage(String key, RecipeManaInfusion recipe) { - return new PageManaInfusionRecipe(key, recipe); - } - - @Override - public LexiconPage elvenTradePage(String key, List recipes) { - return new PageElvenRecipe(key, recipes); - } - - @Override - public LexiconPage elvenTradesPage(String key, RecipeElvenTrade recipe) { - return new PageElvenRecipe(key, recipe); - } - - @Override - public LexiconPage brewPage(String key, String bottomText, RecipeBrew recipe) { - return new PageBrew(recipe, key, bottomText); + public LexiconPage brewPage(String key, String bottomText, Brew outputBrew) { + return new PageBrew(outputBrew, key, bottomText); } @Override diff --git a/src/main/java/vazkii/botania/common/crafting/ModBrewRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModBrewRecipes.java index e720589e0..7b520cf61 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModBrewRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModBrewRecipes.java @@ -37,30 +37,6 @@ import static vazkii.botania.common.lib.ResourceLocationHelper.prefix; @Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) public class ModBrewRecipes { - public static RecipeBrew speedBrew; - public static RecipeBrew strengthBrew; - public static RecipeBrew hasteBrew; - public static RecipeBrew healingBrew; - public static RecipeBrew jumpBoostBrew; - public static RecipeBrew regenerationBrew; - public static RecipeBrew weakRegenerationBrew; - public static RecipeBrew resistanceBrew; - public static RecipeBrew fireResistanceBrew; - public static RecipeBrew waterBreathingBrew; - public static RecipeBrew invisibilityBrew; - public static RecipeBrew nightVisionBrew; - public static RecipeBrew absorptionBrew; - - public static RecipeBrew overloadBrew; - public static RecipeBrew soulCrossBrew; - public static RecipeBrew featherFeetBrew; - public static RecipeBrew emptinessBrew; - public static RecipeBrew bloodthirstBrew; - public static RecipeBrew allureBrew; - public static RecipeBrew clearBrew; - - public static RecipeBrew warpWardBrew; - @SubscribeEvent public static void register(RegisterRecipesEvent evt) { evt.brew().accept(new RecipeBrew(prefix("speed"), ModBrews.speed, Ingredient.fromItems(Items.NETHER_WART), Ingredient.fromItems(Items.SUGAR), Ingredient.fromItems(Items.REDSTONE))); diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index ca60b8491..3d4321db2 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -10,571 +10,22 @@ */ package vazkii.botania.common.crafting; -import com.google.common.collect.ImmutableList; -import net.minecraft.item.crafting.ICraftingRecipe; import net.minecraft.item.crafting.IRecipe; import net.minecraft.item.crafting.IRecipeType; import net.minecraft.server.MinecraftServer; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.server.ServerLifecycleHooks; import vazkii.botania.common.Botania; -import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.item.equipment.bauble.ItemBaubleCosmetic; -import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibMisc; import java.util.Collections; import java.util.List; import java.util.stream.Collectors; -import java.util.stream.IntStream; public final class ModCraftingRecipes { - public static ResourceLocation recipeLexicon; - public static List recipesPetals; - public static List recipesDyes; - public static List recipesPetalBlocks; - public static List recipesReversePetalBlocks; - public static ResourceLocation recipePestleAndMortar; - public static List recipesTwigWand; - public static ResourceLocation recipeApothecary; - public static List recipesSpreader; - public static List recipesManaLens; - public static ResourceLocation recipePool; - public static ResourceLocation recipePoolDiluted; - public static ResourceLocation recipePoolFabulous; - public static ResourceLocation recipeRuneAltar; - public static ResourceLocation recipeLensVelocity; - public static ResourceLocation recipeLensPotency; - public static ResourceLocation recipeLensResistance; - public static ResourceLocation recipeLensEfficiency; - public static ResourceLocation recipeLensBounce; - public static ResourceLocation recipeLensGravity; - public static ResourceLocation recipeLensBore; - public static ResourceLocation recipeLensDamaging; - public static ResourceLocation recipeLensPhantom; - public static ResourceLocation recipeLensMagnet; - public static ResourceLocation recipeLensExplosive; - public static ResourceLocation recipePylon; - public static ResourceLocation recipeDistributor; - public static ResourceLocation recipeLivingrockDecor1; - public static ResourceLocation recipeLivingrockDecor2; - public static ResourceLocation recipeLivingrockDecor3; - public static ResourceLocation recipeLivingrockDecor4; - public static ResourceLocation recipeLivingwoodDecor1; - public static ResourceLocation recipeLivingwoodDecor2; - public static ResourceLocation recipeLivingwoodDecor3; - public static ResourceLocation recipeLivingwoodDecor4; - public static ResourceLocation recipeLivingwoodDecor5; - public static ResourceLocation recipeManaVoid; - public static ResourceLocation recipeManaTablet; - public static ResourceLocation recipeManaDetector; - public static ResourceLocation recipeManaBlaster; - public static ResourceLocation recipeTurntable; - public static ResourceLocation recipeFertilizerPowder; - public static ResourceLocation recipeFerilizerDye; - public static ResourceLocation recipeLivingwoodTwig; - public static ResourceLocation recipeDirtRod; - public static ResourceLocation recipeTerraformRod; - public static ResourceLocation recipeRedstoneSpreader; - public static ResourceLocation recipeManaMirror; - public static ResourceLocation recipeManasteelHelm; - public static ResourceLocation recipeManasteelChest; - public static ResourceLocation recipeManasteelLegs; - public static ResourceLocation recipeManasteelBoots; - public static ResourceLocation recipeManasteelPick; - public static ResourceLocation recipeManasteelShovel; - public static ResourceLocation recipeManasteelAxe; - public static ResourceLocation recipeManasteelShears; - public static ResourceLocation recipeManasteelSword; - public static ResourceLocation recipeGrassHorn; - public static ResourceLocation recipeTerrasteelHelm; - public static ResourceLocation recipeTerrasteelChest; - public static ResourceLocation recipeTerrasteelLegs; - public static ResourceLocation recipeTerrasteelBoots; - public static ResourceLocation recipeTerraSword; - public static ResourceLocation recipeTinyPlanet; - public static ResourceLocation recipeManaRing; - public static ResourceLocation recipeAuraRing; - public static ResourceLocation recipeGreaterManaRing; - public static ResourceLocation recipeGreaterAuraRing; - public static ResourceLocation recipeTravelBelt; - public static ResourceLocation recipeKnockbackBelt; - public static ResourceLocation recipeIcePendant; - public static ResourceLocation recipeLavaPendant; - public static ResourceLocation recipeTinyPlanetBlock; - public static ResourceLocation recipeAlchemyCatalyst; - public static ResourceLocation recipeOpenCrate; - public static ResourceLocation recipeForestEye; - public static ResourceLocation recipeRedstoneRoot; - public static ResourceLocation recipeForestDrum; - public static ResourceLocation recipeWaterRing; - public static ResourceLocation recipeMiningRing; - public static ResourceLocation recipeMagnetRing; - public static ResourceLocation recipeTerraPick; - public static ResourceLocation recipeDivaCharm; - public static ResourceLocation recipeFlightTiara; - public static List recipesShinyFlowers; - public static ResourceLocation recipePlatform; - public static ResourceLocation recipeEnderDagger; - public static ResourceLocation recipeDarkQuartz; - public static ResourceLocation recipeBlazeQuartz; - public static ResourceLocation recipeLavenderQuartz; - public static ResourceLocation recipeRedQuartz; - public static ResourceLocation recipeSunnyQuartz; - public static ResourceLocation recipeAlfPortal; - public static ResourceLocation recipeNaturaPylon; - public static ResourceLocation recipeWaterRod; - public static ResourceLocation recipeElementiumHelm; - public static ResourceLocation recipeElementiumChest; - public static ResourceLocation recipeElementiumLegs; - public static ResourceLocation recipeElementiumBoots; - public static ResourceLocation recipeElementiumPick; - public static ResourceLocation recipeElementiumShovel; - public static ResourceLocation recipeElementiumAxe; - public static ResourceLocation recipeElementiumShears; - public static ResourceLocation recipeElementiumSword; - public static ResourceLocation recipeOpenBucket; - public static ResourceLocation recipeConjurationCatalyst; - public static ResourceLocation recipeSpawnerMover; - public static ResourceLocation recipePixieRing; - public static ResourceLocation recipeSuperTravelBelt; - public static ResourceLocation recipeRainbowRod; - public static ResourceLocation recipeSpectralPlatform; - public static ResourceLocation recipeDreamwoodSpreader; - public static ResourceLocation recipeTornadoRod; - public static ResourceLocation recipeFireRod; - public static ResourceLocation recipeVineBall; - public static ResourceLocation recipeSlingshot; - public static ResourceLocation recipeLensInfluence; - public static ResourceLocation recipeLensWeight; - public static ResourceLocation recipeLensPaint; - public static ResourceLocation recipeLensWarp; - public static ResourceLocation recipeLensRedirect; - public static ResourceLocation recipeLensFirework; - public static ResourceLocation recipeLensFlare; - public static ResourceLocation recipeLensMessenger; - public static ResourceLocation recipeLensTripwire; - public static List recipesMiniIsland; - public static ResourceLocation recipeGaiaPylon; - public static ResourceLocation recipeGatherDrum; - public static ResourceLocation recipeLensFire; - public static ResourceLocation recipeLensPiston; - public static ResourceLocation recipeLaputaShard; - public static List recipesLaputaShardUpgrade; - public static ResourceLocation recipeVirusZombie; - public static ResourceLocation recipeVirusSkeleton; - public static ResourceLocation recipeReachRing; - public static ResourceLocation recipeSkyDirtRod; - public static ResourceLocation recipeSpawnerClaw; - public static ResourceLocation recipeCraftCrate; - public static ResourceLocation recipePlaceholder; - public static ResourceLocation recipeAzulejo; - public static List recipesAzulejoCycling; - public static ResourceLocation recipeEnderEyeBlock; - public static ResourceLocation recipeItemFinder; - public static ResourceLocation recipeSuperLavaPendant; - public static ResourceLocation recipeEnderHand; - public static ResourceLocation recipeGlassPick; - public static ResourceLocation recipeStarfield; - public static ResourceLocation recipeSpark; - public static List recipesSparkUpgrades; - public static ResourceLocation recipeLeafHorn; - public static ResourceLocation recipeDiviningRod; - public static List recipesWings; - public static ResourceLocation recipeRFGenerator; - public static ResourceLocation recipeGravityRod; - public static ResourceLocation recipeUltraSpreader; - public static List recipeHelmetOfRevealing; - public static ResourceLocation recipeVial; - public static ResourceLocation recipeFlask; - public static ResourceLocation recipeBrewery; - public static ResourceLocation recipeBloodPendant; - public static ResourceLocation recipeTerraPlate; - public static ResourceLocation recipeRedString; - public static ResourceLocation recipeRedStringContainer; - public static ResourceLocation recipeRedStringDispenser; - public static ResourceLocation recipeRedStringFertilizer; - public static ResourceLocation recipeRedStringComparator; - public static ResourceLocation recipeRedStringRelay; - public static ResourceLocation recipeRedStringInterceptor; - public static ResourceLocation recipeMissileRod; - public static ResourceLocation recipeHolyCloak; - public static ResourceLocation recipeUnholyCloak; - public static ResourceLocation recipeBalanceCloak; - public static ResourceLocation recipeCraftingHalo; - public static List recipesLensFlash; - public static ResourceLocation recipePrism; - public static ResourceLocation recipeDreamwoodTwig; - public static ResourceLocation recipeMonocle; - public static ResourceLocation recipeClip; - public static ResourceLocation recipeCobbleRod; - public static ResourceLocation recipeSmeltRod; - public static ResourceLocation recipeWorldSeed; - public static ResourceLocation recipeSpellCloth; - public static ResourceLocation recipeThornChakram; - public static ResourceLocation recipeDirtPathSlab; - public static List recipesPatterns; - public static ResourceLocation recipeGaiaIngot; - public static ResourceLocation recipeCorporeaSpark; - public static ResourceLocation recipeMasterCorporeaSpark; - public static ResourceLocation recipeCorporeaIndex; - public static ResourceLocation recipeCorporeaFunnel; - public static ResourceLocation recipeCorporeaInterceptor; - public static ResourceLocation recipeLivingwoodBow; - public static ResourceLocation recipeCrystalBow; - public static List recipesCosmeticItems; - public static List recipesMushrooms; - public static ResourceLocation recipeSwapRing; - public static ResourceLocation recipeSnowHorn; - public static ResourceLocation recipeFlowerBag; - public static ResourceLocation recipePhantomInk; - public static ResourceLocation recipePoolCart; - public static ResourceLocation recipePump; - public static List recipesPetalsDouble; - public static ResourceLocation recipeKeepIvy; - public static ResourceLocation recipeBlackHoleTalisman; - public static ResourceLocation recipeBlazeBlock; - public static List recipesAltarMeta; - public static ResourceLocation recipeCorporeaCrystalCube; - public static ResourceLocation recipeTemperanceStone; - public static ResourceLocation recipeIncenseStick; - public static ResourceLocation recipeIncensePlate; - public static ResourceLocation recipeTerraAxe; - public static ResourceLocation recipeHourglass; - public static ResourceLocation recipeGhostRail; - public static ResourceLocation recipeCanopyDrum; - public static ResourceLocation recipeSparkChanger; - public static ResourceLocation recipeCocoon; - public static ResourceLocation recipeLuminizer; - public static ResourceLocation recipeDetectorLuminizer; - public static ResourceLocation recipeLuminizerLauncher; - public static ResourceLocation recipeObedienceStick; - public static ResourceLocation recipeCacophonium; - public static ResourceLocation recipeManaBomb; - public static ResourceLocation recipeCobweb; - public static ResourceLocation recipeSlimeBottle; - public static ResourceLocation recipeStarSword; - public static ResourceLocation recipeExchangeRod; - public static ResourceLocation recipeGreaterMagnetRing; - public static ResourceLocation recipeFireChakram; - public static ResourceLocation recipeThunderSword; - public static ResourceLocation recipeBellows; - public static ResourceLocation recipeManaweaveCloth; - public static ResourceLocation recipeManaweaveHelm; - public static ResourceLocation recipeManaweaveChest; - public static ResourceLocation recipeManaweaveLegs; - public static ResourceLocation recipeManaweaveBoots; - public static ResourceLocation recipeBifrost; - public static ResourceLocation recipeShimmerrock; - public static ResourceLocation recipeShimmerwoodPlanks; - public static ResourceLocation recipeAutocraftingHalo; - public static List recipesPavement; - public static ResourceLocation recipeCellBlock; - public static ResourceLocation recipeCorporeaRetainer; - public static ResourceLocation recipeTeruTeruBozu; - public static ResourceLocation recipeAvatar; - public static ResourceLocation recipeSextant; - public static List recipesAltGrassSeeds; - public static ResourceLocation recipeSpeedUpBelt; - public static ResourceLocation recipeBaubleCase; - public static ResourceLocation recipeDodgeRing; - public static ResourceLocation recipeAnimatedTorch; - public static ResourceLocation recipeForkLuminizer; - public static ResourceLocation recipeToggleLuminizer; - public static ResourceLocation recipeInvisibilityCloak; - public static ResourceLocation recipeCloudPendant; - public static ResourceLocation recipeSuperCloudPendant; - public static ResourceLocation recipeThirdEye; - public static ResourceLocation recipeAstrolabe; - public static ResourceLocation recipeGoddessCharm; - - // Garden of Glass - public static ResourceLocation recipeRootToSapling; - public static ResourceLocation recipeRootToFertilizer; - public static ResourceLocation recipePebbleCobblestone; - public static ResourceLocation recipeMagmaToSlimeball; - public static ResourceLocation recipeFelPumpkin; - public static ResourceLocation recipeEndPortal; public static void init() { - // Can't do this in RegistryEvent.Register event handler since it seems JSON recipes aren't loaded yet - recipesPetals = allOfGroup(new ResourceLocation(LibMisc.MOD_ID, LibItemNames.PETAL)); - recipePestleAndMortar = ModItems.pestleAndMortar.getRegistryName(); - recipesDyes = allOfGroup(new ResourceLocation(LibMisc.MOD_ID, LibItemNames.DYE)); - recipeFertilizerPowder = gogPath("fertilizer_powder"); - recipeFerilizerDye = path("fertilizer_dye"); - recipesPetalsDouble = allOfGroup("petal_double"); - recipesPetalBlocks = allOfGroup("petal_block"); - recipesReversePetalBlocks = allOfGroup("petal_block_deconstruct"); - - recipeApothecary = ModBlocks.defaultAltar.getRegistryName(); - recipeLexicon = ModItems.lexicon.getRegistryName(); - recipesTwigWand = allOfGroup(ModItems.twigWand.getRegistryName()); - recipeLivingwoodTwig = ModItems.livingwoodTwig.getRegistryName(); - recipeRuneAltar = ModBlocks.runeAltar.getRegistryName(); - recipeTerraPlate = ModBlocks.terraPlate.getRegistryName(); - recipeFlowerBag = ModItems.flowerBag.getRegistryName(); - - if(Botania.gardenOfGlassLoaded) { - recipeRootToSapling = gogPath("root_to_sapling"); - recipeRootToFertilizer = gogPath("root_to_fertilizer"); - recipePebbleCobblestone = gogPath("pebble_to_cobblestone"); - recipeMagmaToSlimeball = gogPath("magma_cream_to_slime_ball"); - recipeEndPortal = gogPath("end_portal_frame"); - } - - recipesSpreader = allOfGroup("spreader"); - - recipePool = ModBlocks.manaPool.getRegistryName(); - recipePoolDiluted = ModBlocks.dilutedPool.getRegistryName(); - recipePoolFabulous = ModBlocks.fabulousPool.getRegistryName(); - recipeCobweb = path("web"); - - recipeSpark = ModItems.spark.getRegistryName(); - recipesSparkUpgrades = allOfGroup("spark_upgrade"); - recipeRFGenerator = ModBlocks.rfGenerator.getRegistryName(); - - ResourceLocation name = ModItems.lensNormal.getRegistryName(); - recipesManaLens = ImmutableList.of(path(name.getPath() + "_glass_block"), path(name.getPath() + "_glass_pane")); - recipeLensVelocity = ModItems.lensSpeed.getRegistryName(); - recipeLensPotency = ModItems.lensPower.getRegistryName(); - recipeLensResistance = ModItems.lensTime.getRegistryName(); - recipeLensEfficiency = ModItems.lensEfficiency.getRegistryName(); - recipeLensBounce = ModItems.lensBounce.getRegistryName(); - recipeLensGravity = ModItems.lensGravity.getRegistryName(); - recipeLensBore = ModItems.lensMine.getRegistryName(); - recipeLensDamaging = ModItems.lensDamage.getRegistryName(); - recipeLensPhantom = ModItems.lensPhantom.getRegistryName(); - recipeLensMagnet = ModItems.lensMagnet.getRegistryName(); - recipeLensExplosive = ModItems.lensExplosive.getRegistryName(); - recipeLensInfluence = ModItems.lensInfluence.getRegistryName(); - recipeLensWeight = ModItems.lensWeight.getRegistryName(); - recipeLensPaint = ModItems.lensPaint.getRegistryName(); - recipeLensFire = ModItems.lensFire.getRegistryName(); - recipeLensPiston = ModItems.lensPiston.getRegistryName(); - name = ModItems.lensLight.getRegistryName(); - recipesLensFlash = ImmutableList.of(name, path(name.getPath() + "_alt")); - recipeLensWarp = ModItems.lensWarp.getRegistryName(); - recipeLensRedirect = ModItems.lensRedirect.getRegistryName(); - recipeLensFirework = ModItems.lensFirework.getRegistryName(); - recipeLensFlare = ModItems.lensFlare.getRegistryName(); - recipeLensMessenger = ModItems.lensMessenger.getRegistryName(); - recipeLensTripwire = ModItems.lensTripwire.getRegistryName(); - - recipeDistributor = ModBlocks.distributor.getRegistryName(); - recipeManaVoid = ModBlocks.manaVoid.getRegistryName(); - recipeManaTablet = ModItems.manaTablet.getRegistryName(); - recipeManaMirror = ModItems.manaMirror.getRegistryName(); - recipeManaDetector = ModBlocks.manaDetector.getRegistryName(); - recipeRedstoneSpreader = ModBlocks.redstoneSpreader.getRegistryName(); - recipeDreamwoodSpreader = ModBlocks.elvenSpreader.getRegistryName(); - recipeUltraSpreader = ModBlocks.gaiaSpreader.getRegistryName(); - recipeHelmetOfRevealing = allOfGroup("helm_revealing"); - recipePrism = ModBlocks.prism.getRegistryName(); - recipePoolCart = ModItems.poolMinecart.getRegistryName(); - recipePump = ModBlocks.pump.getRegistryName(); - recipeSparkChanger = ModBlocks.sparkChanger.getRegistryName(); - recipeBellows = ModBlocks.bellows.getRegistryName(); - recipeRedstoneRoot = ModItems.redstoneRoot.getRegistryName(); - recipesAltarMeta = allOfGroup("metamorphic_apothecary"); - recipePylon = ModBlocks.manaPylon.getRegistryName(); - recipeTurntable = ModBlocks.turntable.getRegistryName(); - recipeAlchemyCatalyst = ModBlocks.alchemyCatalyst.getRegistryName(); - recipeOpenCrate = ModBlocks.openCrate.getRegistryName(); - recipeForestEye = ModBlocks.forestEye.getRegistryName(); - recipeForestDrum = ModBlocks.wildDrum.getRegistryName(); - recipePlatform = ModBlocks.abstrusePlatform.getRegistryName(); - recipeConjurationCatalyst = ModBlocks.conjurationCatalyst.getRegistryName(); - recipeSpectralPlatform = ModBlocks.spectralPlatform.getRegistryName(); - recipeGatherDrum = ModBlocks.gatheringDrum.getRegistryName(); - recipePlaceholder = ModItems.placeholder.getRegistryName(); - recipeCraftCrate = ModBlocks.craftCrate.getRegistryName(); - recipesPatterns = allOfGroup("craft_pattern"); - recipeBrewery = ModBlocks.brewery.getRegistryName(); - recipeVial = ModItems.vial.getRegistryName(); - recipeFlask = ModItems.flask.getRegistryName(); - recipeIncenseStick = ModItems.incenseStick.getRegistryName(); - recipeIncensePlate = ModBlocks.incensePlate.getRegistryName(); - recipeHourglass = ModBlocks.hourglass.getRegistryName(); - recipeGhostRail = ModBlocks.ghostRail.getRegistryName(); - recipeCanopyDrum = ModBlocks.canopyDrum.getRegistryName(); - recipeCocoon = gogPath("cocoon"); - recipeManaBomb = ModBlocks.manaBomb.getRegistryName(); - recipeTeruTeruBozu = ModBlocks.teruTeruBozu.getRegistryName(); - recipeAvatar = ModBlocks.avatar.getRegistryName(); - recipeFelPumpkin = ModBlocks.felPumpkin.getRegistryName(); - recipeAnimatedTorch = ModBlocks.animatedTorch.getRegistryName(); - recipeManaBlaster = ModItems.manaGun.getRegistryName(); - recipesAltGrassSeeds = allOfGroup(new ResourceLocation(LibMisc.MOD_ID, LibItemNames.GRASS_SEEDS)); - recipeDirtRod = ModItems.dirtRod.getRegistryName(); - recipeTerraformRod = ModItems.terraformRod.getRegistryName(); - recipeManasteelPick = ModItems.manasteelPick.getRegistryName(); - recipeManasteelShovel = ModItems.manasteelShovel.getRegistryName(); - recipeManasteelAxe = ModItems.manasteelAxe.getRegistryName(); - recipeManasteelShears = ModItems.manasteelShears.getRegistryName(); - recipeManasteelSword = ModItems.manasteelSword.getRegistryName(); - recipeManasteelHelm = ModItems.manasteelHelm.getRegistryName(); - recipeManasteelChest = ModItems.manasteelChest.getRegistryName(); - recipeManasteelLegs = ModItems.manasteelLegs.getRegistryName(); - recipeManasteelBoots = ModItems.manasteelBoots.getRegistryName(); - recipeTerrasteelHelm = ModItems.terrasteelHelm.getRegistryName(); - recipeTerrasteelChest = ModItems.terrasteelChest.getRegistryName(); - recipeTerrasteelLegs = ModItems.terrasteelLegs.getRegistryName(); - recipeTerrasteelBoots = ModItems.terrasteelBoots.getRegistryName(); - recipeGrassHorn = ModItems.grassHorn.getRegistryName(); - recipeLeafHorn = ModItems.leavesHorn.getRegistryName(); - recipeSnowHorn = ModItems.snowHorn.getRegistryName(); - recipeTerraSword = ModItems.terraSword.getRegistryName(); - recipeTerraPick = ModItems.terraPick.getRegistryName(); - recipeWaterRod = ModItems.waterRod.getRegistryName(); - recipeElementiumPick = ModItems.elementiumPick.getRegistryName(); - recipeElementiumShovel = ModItems.elementiumShovel.getRegistryName(); - recipeElementiumAxe = ModItems.elementiumAxe.getRegistryName(); - recipeElementiumShears = ModItems.elementiumShears.getRegistryName(); - recipeElementiumSword = ModItems.elementiumSword.getRegistryName(); - recipeElementiumHelm = ModItems.elementiumHelm.getRegistryName(); - recipeElementiumChest = ModItems.elementiumChest.getRegistryName(); - recipeElementiumLegs = ModItems.elementiumLegs.getRegistryName(); - recipeElementiumBoots = ModItems.elementiumBoots.getRegistryName(); - recipeOpenBucket = ModItems.openBucket.getRegistryName(); - recipeRainbowRod = ModItems.rainbowRod.getRegistryName(); - recipeBifrost = ModBlocks.bifrostPerm.getRegistryName(); - recipeShimmerrock = ModBlocks.shimmerrock.getRegistryName(); - recipeShimmerwoodPlanks = ModBlocks.shimmerwoodPlanks.getRegistryName(); - recipeTornadoRod = ModItems.tornadoRod.getRegistryName(); - recipeFireRod = ModItems.fireRod.getRegistryName(); - recipeVineBall = ModItems.vineBall.getRegistryName(); - recipeSlingshot = ModItems.slingshot.getRegistryName(); - recipeLaputaShard = path("laputashard_0"); - recipesLaputaShardUpgrade = allOfGroup("laputashard_upgrade"); - recipeVirusZombie = ModItems.necroVirus.getRegistryName(); - recipeVirusSkeleton = ModItems.nullVirus.getRegistryName(); - recipeSkyDirtRod = ModItems.skyDirtRod.getRegistryName(); - recipeGlassPick = ModItems.glassPick.getRegistryName(); - recipeDiviningRod = ModItems.diviningRod.getRegistryName(); - recipeGravityRod = ModItems.gravityRod.getRegistryName(); - recipeMissileRod = ModItems.missileRod.getRegistryName(); - recipeCraftingHalo = ModItems.craftingHalo.getRegistryName(); - recipeClip = ModItems.clip.getRegistryName(); - recipeCobbleRod = ModItems.cobbleRod.getRegistryName(); - recipeSmeltRod = ModItems.smeltRod.getRegistryName(); - recipeWorldSeed = ModItems.worldSeed.getRegistryName(); - recipeSpellCloth = ModItems.spellCloth.getRegistryName(); - recipeThornChakram = ModItems.thornChakram.getRegistryName(); - recipeFireChakram = ModItems.flareChakram.getRegistryName(); - recipeLivingwoodBow = ModItems.livingwoodBow.getRegistryName(); - recipeCrystalBow = ModItems.crystalBow.getRegistryName(); - recipeTemperanceStone = ModItems.temperanceStone.getRegistryName(); - recipeTerraAxe = ModItems.terraAxe.getRegistryName(); - recipeObedienceStick = ModItems.obedienceStick.getRegistryName(); - recipeSlimeBottle = ModItems.slimeBottle.getRegistryName(); - recipeExchangeRod = ModItems.exchangeRod.getRegistryName(); - recipeManaweaveCloth = ModItems.manaweaveCloth.getRegistryName(); - recipeManaweaveHelm = ModItems.manaweaveHelm.getRegistryName(); - recipeManaweaveChest = ModItems.manaweaveChest.getRegistryName(); - recipeManaweaveLegs = ModItems.manaweaveLegs.getRegistryName(); - recipeManaweaveBoots = ModItems.manaweaveBoots.getRegistryName(); - recipeAutocraftingHalo = ModItems.autocraftingHalo.getRegistryName(); - recipeSextant = ModItems.sextant.getRegistryName(); - recipeAstrolabe = ModItems.astrolabe.getRegistryName(); - recipeEnderEyeBlock = ModBlocks.enderEye.getRegistryName(); - recipeEnderHand = ModItems.enderHand.getRegistryName(); - recipeEnderDagger = ModItems.enderDagger.getRegistryName(); - recipeSpawnerClaw = ModBlocks.spawnerClaw.getRegistryName(); - recipeRedString = ModItems.redString.getRegistryName(); - recipeRedStringContainer = ModBlocks.redStringContainer.getRegistryName(); - recipeRedStringDispenser = ModBlocks.redStringDispenser.getRegistryName(); - recipeRedStringFertilizer = ModBlocks.redStringFertilizer.getRegistryName(); - recipeRedStringComparator = ModBlocks.redStringComparator.getRegistryName(); - recipeRedStringRelay = ModBlocks.redStringRelay.getRegistryName(); - recipeRedStringInterceptor = ModBlocks.redStringInterceptor.getRegistryName(); - recipeFlightTiara = path("flighttiara_0"); - recipesWings = allOfGroup("flighttiara_wings"); - recipeCorporeaSpark = ModItems.corporeaSpark.getRegistryName(); - recipeMasterCorporeaSpark = ModItems.corporeaSparkMaster.getRegistryName(); - recipeCorporeaIndex = ModBlocks.corporeaIndex.getRegistryName(); - recipeCorporeaFunnel = ModBlocks.corporeaFunnel.getRegistryName(); - recipeCorporeaInterceptor = ModBlocks.corporeaInterceptor.getRegistryName(); - recipeSpawnerMover = ModItems.spawnerMover.getRegistryName(); - recipeKeepIvy = ModItems.keepIvy.getRegistryName(); - recipeBlackHoleTalisman = path("blackholetalisman_0"); - recipeCorporeaCrystalCube = ModBlocks.corporeaCrystalCube.getRegistryName(); - recipeLuminizer = path("lightrelay_0"); - recipeDetectorLuminizer = path("lightrelay_1"); - recipeToggleLuminizer = path("lightrelay_2"); - recipeForkLuminizer = path("lightrelay_3"); - recipeLuminizerLauncher = ModBlocks.lightLauncher.getRegistryName(); - recipeStarSword = ModItems.starSword.getRegistryName(); - recipeThunderSword = ModItems.thunderSword.getRegistryName(); - recipeCorporeaRetainer = ModBlocks.corporeaRetainer.getRegistryName(); - recipesCosmeticItems = IntStream.range(0, ItemBaubleCosmetic.SUBTYPES).mapToObj(i -> path("cosmetic_" + i)).collect(Collectors.toList()); - recipeTinyPlanet = ModItems.tinyPlanet.getRegistryName(); - recipeTinyPlanetBlock = ModBlocks.tinyPlanet.getRegistryName(); - recipeManaRing = ModItems.manaRing.getRegistryName(); - recipeAuraRing = ModItems.auraRing.getRegistryName(); - recipeGreaterManaRing = ModItems.manaRingGreater.getRegistryName(); - recipeGreaterAuraRing = ModItems.auraRingGreater.getRegistryName(); - recipeTravelBelt = ModItems.travelBelt.getRegistryName(); - recipeKnockbackBelt = ModItems.knockbackBelt.getRegistryName(); - recipeIcePendant = ModItems.icePendant.getRegistryName(); - recipeLavaPendant = ModItems.lavaPendant.getRegistryName(); - recipeWaterRing = ModItems.waterRing.getRegistryName(); - recipeMiningRing = ModItems.miningRing.getRegistryName(); - recipeMagnetRing = ModItems.magnetRing.getRegistryName(); - recipeGreaterMagnetRing = ModItems.magnetRingGreater.getRegistryName(); - recipeDivaCharm = ModItems.divaCharm.getRegistryName(); - recipePixieRing = ModItems.pixieRing.getRegistryName(); - recipeSuperTravelBelt = ModItems.superTravelBelt.getRegistryName(); - recipeReachRing = ModItems.reachRing.getRegistryName(); - recipeItemFinder = ModItems.itemFinder.getRegistryName(); - recipeSuperLavaPendant = ModItems.superLavaPendant.getRegistryName(); - recipeBloodPendant = ModItems.bloodPendant.getRegistryName(); - recipeHolyCloak = ModItems.holyCloak.getRegistryName(); - recipeUnholyCloak = ModItems.unholyCloak.getRegistryName(); - recipeBalanceCloak = ModItems.balanceCloak.getRegistryName(); - recipeMonocle = ModItems.monocle.getRegistryName(); - recipeSwapRing = ModItems.swapRing.getRegistryName(); - recipeSpeedUpBelt = ModItems.speedUpBelt.getRegistryName(); - recipeBaubleCase = ModItems.baubleBox.getRegistryName(); - recipeDodgeRing = ModItems.dodgeRing.getRegistryName(); - recipeInvisibilityCloak = ModItems.invisibilityCloak.getRegistryName(); - recipeCloudPendant = ModItems.cloudPendant.getRegistryName(); - recipeSuperCloudPendant = ModItems.superCloudPendant.getRegistryName(); - recipeThirdEye = ModItems.thirdEye.getRegistryName(); - recipeGoddessCharm = ModItems.goddessCharm.getRegistryName(); - recipeAlfPortal = ModBlocks.alfPortal.getRegistryName(); - recipeNaturaPylon = ModBlocks.naturaPylon.getRegistryName(); - recipeDreamwoodTwig = ModItems.dreamwoodTwig.getRegistryName(); - recipeGaiaPylon = ModBlocks.gaiaPylon.getRegistryName(); - recipeGaiaIngot = ModItems.gaiaIngot.getRegistryName(); - recipeLivingrockDecor1 = path("livingrock_1"); - recipeLivingrockDecor2 = path("livingrock_2"); - recipeLivingrockDecor3 = path("livingrock_3"); - recipeLivingrockDecor4 = path("livingrock_4"); - recipeLivingwoodDecor1 = path("livingwood_1"); - recipeLivingwoodDecor2 = path("livingwood_2"); - recipeLivingwoodDecor3 = path("livingwood_3"); - recipeLivingwoodDecor4 = path("livingwood_4"); - recipeLivingwoodDecor5 = path("livingwood_5"); - recipeDarkQuartz = ModItems.darkQuartz.getRegistryName(); - recipeBlazeQuartz = ModItems.blazeQuartz.getRegistryName(); - recipeLavenderQuartz = ModItems.lavenderQuartz.getRegistryName(); - recipeRedQuartz = ModItems.redQuartz.getRegistryName(); - recipeSunnyQuartz = ModItems.sunnyQuartz.getRegistryName(); - recipesShinyFlowers = allOfGroup("shiny_flower"); - recipesMiniIsland = allOfGroup("mini_island"); - recipeAzulejo = ModBlocks.azulejo0.getRegistryName(); - recipesAzulejoCycling = allOfGroup("azulejo_cycling"); - recipeStarfield = ModBlocks.starfield.getRegistryName(); - recipesMushrooms = allOfGroup("mushroom"); - recipePhantomInk = ModItems.phantomInk.getRegistryName(); - recipeBlazeBlock = gogPath("blazeblock"); - recipeCacophonium = ModItems.cacophonium.getRegistryName(); - recipesPavement = allOfGroup("pavement"); - recipeCellBlock = ModBlocks.cellBlock.getRegistryName(); - } private static ResourceLocation gogPath(String path) { diff --git a/src/main/java/vazkii/botania/common/crafting/ModElvenTradeRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModElvenTradeRecipes.java index f3ab9726e..438ec2819 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModElvenTradeRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModElvenTradeRecipes.java @@ -26,13 +26,6 @@ import static vazkii.botania.common.lib.ResourceLocationHelper.prefix; @Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) public class ModElvenTradeRecipes { - public static RecipeElvenTrade dreamwoodRecipe; - public static List elementiumRecipes; - public static RecipeElvenTrade pixieDustRecipe; - public static List dragonstoneRecipes; - public static RecipeElvenTrade elvenQuartzRecipe; - public static RecipeElvenTrade alfglassRecipe; - @SubscribeEvent public static void register(RegisterRecipesEvent evt) { Ingredient livingwood = Ingredient.fromTag(new ItemTags.Wrapper(new ResourceLocation(LibMisc.MOD_ID, "livingwood"))); diff --git a/src/main/java/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java index d0bd5a0a2..efa7ab756 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java @@ -11,8 +11,6 @@ package vazkii.botania.common.crafting; import net.minecraft.block.Blocks; -import net.minecraft.block.Blocks; -import net.minecraft.item.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; @@ -22,53 +20,19 @@ import net.minecraft.util.IItemProvider; import net.minecraft.util.ResourceLocation; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; -import vazkii.botania.api.imc.IMC; import vazkii.botania.api.recipe.RecipeManaInfusion; import vazkii.botania.api.recipe.RegisterRecipesEvent; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.block.ModSubtiles; -import vazkii.botania.common.core.handler.IMCSender; import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.item.block.ItemBlockSpecialFlower; import vazkii.botania.common.lib.LibMisc; -import java.util.List; import static vazkii.botania.common.lib.ResourceLocationHelper.prefix; @Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) public final class ModManaAlchemyRecipes { - public static RecipeManaInfusion leatherRecipe; - public static List woodRecipes; - public static List saplingRecipes; - public static RecipeManaInfusion glowstoneDustRecipe; - public static List quartzRecipes; - public static RecipeManaInfusion chiseledBrickRecipe; - public static RecipeManaInfusion iceRecipe; - public static List swampFolliageRecipes; - public static List fishRecipes; - public static List cropRecipes; - public static RecipeManaInfusion potatoRecipe; - public static RecipeManaInfusion netherWartRecipe; - public static List gunpowderAndFlintRecipes; - public static RecipeManaInfusion nameTagRecipe; - public static List stringRecipes; - public static List slimeballCactusRecipes; - public static RecipeManaInfusion enderPearlRecipe; - public static List redstoneToGlowstoneRecipes; - public static RecipeManaInfusion sandRecipe; - public static RecipeManaInfusion redSandRecipe; - public static List clayBreakdownRecipes; - public static RecipeManaInfusion coarseDirtRecipe; - public static List stoneRecipes; - public static List tallgrassRecipes; - public static List flowersRecipes; - public static RecipeManaInfusion chorusRecipe; - - // Garden of Glass - public static List prismarineRecipes; - @SubscribeEvent public static void register(RegisterRecipesEvent evt) { evt.manaInfusion().accept(RecipeManaInfusion.alchemy(prefix("rotten_flesh_to_leather"), new ItemStack(Items.LEATHER), Ingredient.fromItems(Items.ROTTEN_FLESH), 600)); diff --git a/src/main/java/vazkii/botania/common/crafting/ModManaInfusionRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModManaInfusionRecipes.java index 5969192be..70bf1516a 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModManaInfusionRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModManaInfusionRecipes.java @@ -11,9 +11,6 @@ package vazkii.botania.common.crafting; import net.minecraft.block.Blocks; -import net.minecraft.block.Blocks; -import net.minecraft.item.DyeColor; -import net.minecraft.item.Items; import net.minecraft.item.DyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -24,41 +21,20 @@ import net.minecraftforge.common.Tags; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.registries.ForgeRegistries; -import vazkii.botania.api.imc.IMC; import vazkii.botania.api.recipe.RecipeManaInfusion; import vazkii.botania.api.recipe.RegisterRecipesEvent; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.common.core.handler.IMCSender; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibMisc; -import java.util.ArrayList; import java.util.Arrays; -import java.util.List; import static vazkii.botania.common.lib.ResourceLocationHelper.prefix; @Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) public final class ModManaInfusionRecipes { - public static List manasteelRecipes; - public static RecipeManaInfusion manaPearlRecipe; - public static List manaDiamondRecipes; - public static List manaPowderRecipes; - public static RecipeManaInfusion pistonRelayRecipe; - public static RecipeManaInfusion manaCookieRecipe; - public static RecipeManaInfusion grassSeedsRecipe; - public static RecipeManaInfusion podzolSeedsRecipe; - public static List mycelSeedsRecipes; - public static RecipeManaInfusion manaQuartzRecipe; - public static RecipeManaInfusion tinyPotatoRecipe; - public static RecipeManaInfusion manaInkwellRecipe; - public static RecipeManaInfusion managlassRecipe; - public static RecipeManaInfusion manaStringRecipe; - - public static RecipeManaInfusion sugarCaneRecipe; - @SubscribeEvent public static void register(RegisterRecipesEvent evt) { evt.manaInfusion().accept(new RecipeManaInfusion(prefix("manasteel"), new ItemStack(ModItems.manaSteel), Ingredient.fromTag(Tags.Items.INGOTS_IRON), 3000)); diff --git a/src/main/java/vazkii/botania/common/crafting/ModRuneRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModRuneRecipes.java index 2a7897982..b81b74115 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModRuneRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModRuneRecipes.java @@ -11,8 +11,6 @@ package vazkii.botania.common.crafting; import net.minecraft.block.Blocks; -import net.minecraft.block.Blocks; -import net.minecraft.item.Items; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.item.crafting.Ingredient; @@ -21,41 +19,17 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.Tags; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; -import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.recipe.RecipeRuneAltar; import vazkii.botania.api.recipe.RegisterRecipesEvent; import vazkii.botania.common.crafting.recipe.HeadRecipe; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibMisc; -import vazkii.botania.common.lib.LibOreDict; - -import java.util.ArrayList; -import java.util.List; import static vazkii.botania.common.lib.ResourceLocationHelper.prefix; @Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) public final class ModRuneRecipes { - public static RecipeRuneAltar recipeWaterRune; - public static RecipeRuneAltar recipeFireRune; - public static List recipesEarthRune; - public static List recipesAirRune; - public static RecipeRuneAltar recipeSpringRune; - public static RecipeRuneAltar recipeSummerRune; - public static RecipeRuneAltar recipeAutumnRune; - public static List recipesWinterRune; - public static RecipeRuneAltar recipeManaRune; - public static RecipeRuneAltar recipeLustRune; - public static RecipeRuneAltar recipeGluttonyRune; - public static RecipeRuneAltar recipeGreedRune; - public static RecipeRuneAltar recipeSlothRune; - public static RecipeRuneAltar recipeWrathRune; - public static RecipeRuneAltar recipeEnvyRune; - public static RecipeRuneAltar recipePrideRune; - - public static RecipeRuneAltar recipeHead; - // todo 1.13 re-tagify these once the community settles down on some names @SubscribeEvent public static void register(RegisterRecipesEvent evt) { @@ -104,7 +78,6 @@ public final class ModRuneRecipes { evt.runeAltar().accept(new RecipeRuneAltar(prefix("envy"), new ItemStack(ModItems.runeEnvy), costTier3, manaDiamond, manaDiamond, winter, water)); evt.runeAltar().accept(new RecipeRuneAltar(prefix("pride"), new ItemStack(ModItems.runePride), costTier3, manaDiamond, manaDiamond, summer, fire)); - recipeHead = new HeadRecipe(prefix("head"), new ItemStack(Items.PLAYER_HEAD), 22500, Ingredient.fromItems(Items.SKELETON_SKULL), Ingredient.fromItems(ModItems.pixieDust), Ingredient.fromItems(Items.PRISMARINE_CRYSTALS), Ingredient.fromItems(Items.NAME_TAG), Ingredient.fromItems(Items.GOLDEN_APPLE)); - evt.runeAltar().accept(recipeHead); + evt.runeAltar().accept(new HeadRecipe(prefix("head"), new ItemStack(Items.PLAYER_HEAD), 22500, Ingredient.fromItems(Items.SKELETON_SKULL), Ingredient.fromItems(ModItems.pixieDust), Ingredient.fromItems(Items.PRISMARINE_CRYSTALS), Ingredient.fromItems(Items.NAME_TAG), Ingredient.fromItems(Items.GOLDEN_APPLE))); } } diff --git a/src/main/java/vazkii/botania/common/item/ItemLexicon.java b/src/main/java/vazkii/botania/common/item/ItemLexicon.java index 39ac12b88..03e18f744 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLexicon.java +++ b/src/main/java/vazkii/botania/common/item/ItemLexicon.java @@ -18,11 +18,11 @@ import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.Entity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; -import net.minecraft.item.Rarity; import net.minecraft.item.Item; import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUseContext; +import net.minecraft.item.Rarity; import net.minecraft.util.ActionResult; import net.minecraft.util.ActionResultType; import net.minecraft.util.Hand; @@ -31,13 +31,11 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.util.math.Vec3d; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.StringTextComponent; import net.minecraft.util.text.Style; -import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.util.text.TextFormatting; +import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.server.ServerWorld; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; @@ -175,8 +173,7 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { Botania.proxy.setToTutorialIfFirstLaunch(); if(!l.isKnowledgeUnlocked(stack, BotaniaAPI.relicKnowledge) && l.isKnowledgeUnlocked(stack, BotaniaAPI.elvenKnowledge)) - for(ItemStack rstack : ItemDice.relicStacks) { - Item item = rstack.getItem(); + for(Item item : ItemDice.getRelics()) { if(PlayerHelper.hasItem(player, s -> s != null && s.getItem() == item)) { l.unlockKnowledge(stack, BotaniaAPI.relicKnowledge); break; @@ -184,7 +181,8 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { } Botania.proxy.setLexiconStack(stack); - DistExecutor.runWhenOn(Dist.CLIENT, () -> () -> Minecraft.getInstance().displayGuiScreen(GuiLexicon.currentOpenLexicon)); + if(world.isRemote) + DistExecutor.runWhenOn(Dist.CLIENT, () -> () -> Minecraft.getInstance().displayGuiScreen(GuiLexicon.currentOpenLexicon)); if(!world.isRemote) { if(!skipSound) world.playSound(null, player.posX, player.posY, player.posZ, ModSounds.lexiconOpen, SoundCategory.PLAYERS, 0.5F, 1F); diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemDice.java b/src/main/java/vazkii/botania/common/item/relic/ItemDice.java index e56720ddc..86afdaa8a 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemDice.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemDice.java @@ -13,17 +13,17 @@ package vazkii.botania.common.item.relic; import net.minecraft.advancements.Advancement; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.SoundEvents; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; +import net.minecraft.util.ActionResultType; import net.minecraft.util.Hand; import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundCategory; +import net.minecraft.util.SoundEvents; import net.minecraft.util.text.Style; -import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.util.text.TextFormatting; +import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; import net.minecraftforge.fml.server.ServerLifecycleHooks; import vazkii.botania.api.item.IRelic; @@ -34,18 +34,18 @@ import java.util.ArrayList; import java.util.List; public class ItemDice extends ItemRelic { - public static ItemStack[] relicStacks; - public ItemDice(Properties props) { super(props); + } - relicStacks = new ItemStack[] { - new ItemStack(ModItems.infiniteFruit), - new ItemStack(ModItems.kingKey), - new ItemStack(ModItems.flugelEye), - new ItemStack(ModItems.thorRing), - new ItemStack(ModItems.odinRing), - new ItemStack(ModItems.lokiRing) + public static Item[] getRelics() { + return new Item[]{ + ModItems.infiniteFruit, + ModItems.kingKey, + ModItems.flugelEye, + ModItems.thorRing, + ModItems.odinRing, + ModItems.lokiRing }; } @@ -73,7 +73,7 @@ public class ItemDice extends ItemRelic { } else { int relic = possible.get(world.rand.nextInt(possible.size())); player.sendMessage(new TranslationTextComponent("botaniamisc.diceRoll", relic + 1).setStyle(new Style().setColor(TextFormatting.DARK_GREEN))); - return ActionResult.newResult(ActionResultType.SUCCESS, relicStacks[relic].copy()); + return ActionResult.newResult(ActionResultType.SUCCESS, new ItemStack(getRelics()[relic])); } } @@ -86,11 +86,11 @@ public class ItemDice extends ItemRelic { } private boolean hasRelicAlready(PlayerEntity player, int relic) { - if(relic < 0 || relic > relicStacks.length || !(player instanceof ServerPlayerEntity)) + if(relic < 0 || relic > 6 || !(player instanceof ServerPlayerEntity)) return true; ServerPlayerEntity mpPlayer = (ServerPlayerEntity) player; - Item item = relicStacks[relic].getItem(); + Item item = getRelics()[relic]; ResourceLocation advId = ((IRelic) item).getAdvancement(); if(advId != null) { diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index 67d5917b4..73fc279e5 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -10,11 +10,17 @@ */ package vazkii.botania.common.lexicon; +import com.google.common.base.Stopwatch; +import net.minecraft.block.Block; import net.minecraft.block.Blocks; -import net.minecraft.block.Blocks; -import net.minecraft.item.Items; +import net.minecraft.item.DyeColor; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.item.Items; +import net.minecraft.item.crafting.IRecipe; +import net.minecraft.tags.ItemTags; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.registries.ForgeRegistries; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.brew.IBrewContainer; import vazkii.botania.api.lexicon.LexiconCategory; @@ -25,20 +31,12 @@ import vazkii.botania.api.recipe.RecipeManaInfusion; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.block.ModMultiblocks; import vazkii.botania.common.block.ModSubtiles; import vazkii.botania.common.brew.ModBrews; import vazkii.botania.common.core.handler.ConfigHandler; -import vazkii.botania.common.crafting.ModBrewRecipes; -import vazkii.botania.common.crafting.ModCraftingRecipes; -import vazkii.botania.common.crafting.ModElvenTradeRecipes; -import vazkii.botania.common.crafting.ModManaAlchemyRecipes; -import vazkii.botania.common.crafting.ModManaConjurationRecipes; -import vazkii.botania.common.crafting.ModManaInfusionRecipes; -import vazkii.botania.common.crafting.ModPetalRecipes; -import vazkii.botania.common.crafting.ModRuneRecipes; import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.item.block.ItemBlockSpecialFlower; import vazkii.botania.common.item.equipment.bauble.ItemBaubleCosmetic; import vazkii.botania.common.lexicon.page.PageBrew; import vazkii.botania.common.lexicon.page.PageCraftingRecipe; @@ -51,13 +49,17 @@ import vazkii.botania.common.lexicon.page.PagePetalRecipe; import vazkii.botania.common.lexicon.page.PageRuneRecipe; import vazkii.botania.common.lexicon.page.PageTerrasteel; import vazkii.botania.common.lexicon.page.PageText; -import vazkii.botania.common.lib.LibBlockNames; +import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibLexicon; import vazkii.botania.common.lib.LibMisc; +import vazkii.botania.common.lib.ResourceLocationHelper; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; -import java.util.stream.Collectors; +import java.util.Locale; +import java.util.function.Predicate; +import java.util.stream.IntStream; public final class LexiconData { @@ -300,9 +302,13 @@ public final class LexiconData { public static LexiconEntry banners; public static void reload() { + Stopwatch stopwatch = Stopwatch.createStarted(); + BotaniaAPI.getAllCategories().clear(); BotaniaAPI.getAllEntries().clear(); + LexiconRecipeMappings.clear(); + BotaniaAPI.addCategory(BotaniaAPI.categoryBasics = new BLexiconCategory(LibLexicon.CATEGORY_BASICS, 9)); BotaniaAPI.addCategory(BotaniaAPI.categoryMana = new BLexiconCategory(LibLexicon.CATEGORY_MANA, 5)); BotaniaAPI.addCategory(BotaniaAPI.categoryGenerationFlowers = new BLexiconCategory(LibLexicon.CATEGORY_GENERATION_FLOWERS, 5)); @@ -329,40 +335,47 @@ public final class LexiconData { welcome = new WelcomeLexiconEntry(); tutorial = new TutLexiconEntry(); + Item[] petals = Arrays.stream(DyeColor.values()).map(ModItems::getPetal).toArray(Item[]::new); + Item[] dyes = Arrays.stream(DyeColor.values()).map(ModItems::getDye).toArray(Item[]::new); + Item[] petalBlocks = Arrays.stream(DyeColor.values()).map(ModBlocks::getPetalBlock).map(Block::asItem).toArray(Item[]::new); + Item[] shinyFlowerItems = Arrays.stream(DyeColor.values()).map(ModBlocks::getShinyFlower).map(Block::asItem).toArray(Item[]::new); + Item[] floatingFlowerItems = Arrays.stream(DyeColor.values()).map(ModBlocks::getFloatingFlower).map(Block::asItem).toArray(Item[]::new); + Item[] mushroomItems = Arrays.stream(DyeColor.values()).map(ModBlocks::getMushroom).map(Block::asItem).toArray(Item[]::new); + flowers = new BasicLexiconEntry(LibLexicon.BASICS_FLOWERS, categoryBasics); flowers.setPriority() - .setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_FLOWERS), new PageText("2"), - new PageCraftingRecipe("3", ModCraftingRecipes.recipesPetals), - new PageCraftingRecipe("4", ModCraftingRecipes.recipePestleAndMortar), - new PageCraftingRecipe("5", ModCraftingRecipes.recipesDyes), - // todo 1.12 new PageCraftingRecipe("5.5", ModCraftingRecipes.recipesDyesVanilla), - new PageText("6"), - new PageCraftingRecipe("7", ModCraftingRecipes.recipeFertilizerPowder), - new PageCraftingRecipe("8", ModCraftingRecipes.recipeFerilizerDye), new PageText("10"), - new PageText("12"), new PageCraftingRecipe("11", ModCraftingRecipes.recipesPetalsDouble), - new PageCraftingRecipe("9", ModCraftingRecipes.recipesPetalBlocks), - new PageCraftingRecipe("13", ModCraftingRecipes.recipesReversePetalBlocks)) - .setIcon(new ItemStack(ModBlocks.pinkFlower)); + .setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_FLOWERS), new PageText("2"), + new PageCraftingRecipe("3", inGroup(LibItemNames.PETAL), petals), + new PageCraftingRecipe("4", ModItems.pestleAndMortar), + new PageCraftingRecipe("5", inGroup(LibItemNames.DYE), dyes), + // todo 1.12 new PageCraftingRecipe("5.5", ModCraftingRecipes.recipesDyesVanilla), + new PageText("6"), + new PageCraftingRecipe("7", idEndsWith("powder"), ModItems.fertilizer), + new PageCraftingRecipe("8", idEndsWith("dye"), ModItems.fertilizer), new PageText("10"), + new PageText("12"), new PageCraftingRecipe("11", inGroup("petal_double"), petals), + new PageCraftingRecipe("9", petalBlocks), + new PageCraftingRecipe("13", inGroup("petal_block_deconstruct"), petals)) + .setIcon(new ItemStack(ModBlocks.pinkFlower)); apothecary = new BasicLexiconEntry(LibLexicon.BASICS_APOTHECARY, categoryBasics); apothecary.setPriority().setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_APOTHECARY), new PageText("2"), new PageText("3"), new PageText("4"), new PageText("7"), new PageText("6"), - new PageCraftingRecipe("5", ModCraftingRecipes.recipeApothecary)); + new PageCraftingRecipe("5", ModBlocks.defaultAltar.asItem())); lexicon = new BasicLexiconEntry(LibLexicon.BASICS_LEXICON, categoryBasics); lexicon.setPriority().setLexiconPages(new PageText("0"), new PageText("3"), - new PageCraftingRecipe("1", ModCraftingRecipes.recipeLexicon), new PageText("2")); + new PageCraftingRecipe("1", ModItems.lexicon), new PageText("2")); wand = new BasicLexiconEntry(LibLexicon.BASICS_WAND, categoryBasics); wand.setPriority().setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), - new PageCraftingRecipe("3", ModCraftingRecipes.recipesTwigWand)); + new PageCraftingRecipe("3", ModItems.twigWand)); pureDaisy = new BasicLexiconEntry(LibLexicon.BASICS_PURE_DAISY, categoryBasics); pureDaisy.setPriority() - .setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_PURE_DAISY), - new PageCraftingRecipe("2", ModCraftingRecipes.recipeLivingwoodTwig), new PageText("4"), - new PagePetalRecipe<>("3", ModPetalRecipes.pureDaisyRecipe)) - .setIcon(new ItemStack(ModSubtiles.pureDaisy)); + .setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_PURE_DAISY), + new PageCraftingRecipe("2", ModItems.livingwoodTwig), new PageText("4"), + new PagePetalRecipe("3", ModSubtiles.pureDaisy.asItem())) + .setIcon(new ItemStack(ModSubtiles.pureDaisy)); pureDaisy.addExtraDisplayedRecipe(new ItemStack(ModBlocks.livingwood)); pureDaisy.addExtraDisplayedRecipe(new ItemStack(ModBlocks.livingrock)); LexiconRecipeMappings.map(new ItemStack(ModBlocks.livingwood), pureDaisy, 1); @@ -370,28 +383,28 @@ public final class LexiconData { runicAltar = new BasicLexiconEntry(LibLexicon.BASICS_RUNE_ALTAR, categoryBasics); runicAltar.setPriority().setLexiconPages(new PageText("21"), new PageText("0"), new PageText("1"), - new PageCraftingRecipe("2", ModCraftingRecipes.recipeRuneAltar), new PageText("3"), new PageText("20"), - new PageText("22"), new PageRuneRecipe("4", ModRuneRecipes.recipeWaterRune), - new PageRuneRecipe("5", ModRuneRecipes.recipesEarthRune), - new PageRuneRecipe("6", ModRuneRecipes.recipesAirRune), - new PageRuneRecipe("7", ModRuneRecipes.recipeFireRune), - new PageRuneRecipe("8", ModRuneRecipes.recipeSpringRune), - new PageRuneRecipe("9", ModRuneRecipes.recipeSummerRune), - new PageRuneRecipe("10", ModRuneRecipes.recipeAutumnRune), - new PageRuneRecipe("11", ModRuneRecipes.recipesWinterRune), - new PageRuneRecipe("12", ModRuneRecipes.recipeManaRune), - new PageRuneRecipe("13", ModRuneRecipes.recipeLustRune), - new PageRuneRecipe("14", ModRuneRecipes.recipeGluttonyRune), - new PageRuneRecipe("15", ModRuneRecipes.recipeGreedRune), - new PageRuneRecipe("16", ModRuneRecipes.recipeSlothRune), - new PageRuneRecipe("17", ModRuneRecipes.recipeWrathRune), - new PageRuneRecipe("18", ModRuneRecipes.recipeEnvyRune), - new PageRuneRecipe("19", ModRuneRecipes.recipePrideRune)); + new PageCraftingRecipe("2", ModBlocks.runeAltar.asItem()), new PageText("3"), new PageText("20"), + new PageText("22"), new PageRuneRecipe("4", ModItems.runeWater), + new PageRuneRecipe("5", ModItems.runeEarth), + new PageRuneRecipe("6", ModItems.runeAir), + new PageRuneRecipe("7", ModItems.runeFire), + new PageRuneRecipe("8", ModItems.runeSpring), + new PageRuneRecipe("9", ModItems.runeSummer), + new PageRuneRecipe("10", ModItems.runeAutumn), + new PageRuneRecipe("11", ModItems.runeWinter), + new PageRuneRecipe("12", ModItems.runeMana), + new PageRuneRecipe("13", ModItems.runeLust), + new PageRuneRecipe("14", ModItems.runeGluttony), + new PageRuneRecipe("15", ModItems.runeGreed), + new PageRuneRecipe("16", ModItems.runeSloth), + new PageRuneRecipe("17", ModItems.runeWrath), + new PageRuneRecipe("18", ModItems.runeEnvy), + new PageRuneRecipe("19", ModItems.runePride)); terrasteel = new BasicLexiconEntry(LibLexicon.BASICS_TERRASTEEL, categoryBasics); - terrasteel.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeTerraPlate), + terrasteel.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModBlocks.terraPlate.asItem()), new PageText("2"), new PageMultiblock("4", ModMultiblocks.terrasteelPlate), new PageTerrasteel("3")) - .setIcon(new ItemStack(ModItems.terrasteel)); + .setIcon(new ItemStack(ModItems.terrasteel)); blackLotus = new BasicLexiconEntry(LibLexicon.BASICS_BLACK_LOTUS, categoryBasics); blackLotus.setLexiconPages(new PageText("0")).setIcon(new ItemStack(ModItems.blackLotus)); @@ -399,22 +412,22 @@ public final class LexiconData { flowerBag = new BasicLexiconEntry(LibLexicon.BASICS_FLOWER_BAG, categoryBasics); flowerBag.setLexiconPages(new PageText("0"), new PageText("2"), - new PageCraftingRecipe("1", ModCraftingRecipes.recipeFlowerBag)); + new PageCraftingRecipe("1", ModItems.flowerBag)); - if (Botania.gardenOfGlassLoaded) { + if(Botania.gardenOfGlassLoaded) { gardenOfGlass = new BasicLexiconEntry(LibLexicon.BASICS_GARDEN_OF_GLASS, categoryBasics); gardenOfGlass.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), - new PageCraftingRecipe("3", ModCraftingRecipes.recipeRootToSapling), - new PageCraftingRecipe("4", ModCraftingRecipes.recipeRootToFertilizer), - new PageCraftingRecipe("5", ModCraftingRecipes.recipePebbleCobblestone), new PageText("6"), - new PageManaInfusionRecipe("7", ModManaInfusionRecipes.sugarCaneRecipe), - new PageCraftingRecipe("8", ModCraftingRecipes.recipeMagmaToSlimeball), - new PageManaInfusionRecipe("13", ModManaAlchemyRecipes.prismarineRecipes), new PageText("9"), - new PageText("11"), new PageCraftingRecipe("12", ModCraftingRecipes.recipeEndPortal)); + new PageCraftingRecipe("3", GOG_RECIPE, Items.OAK_SAPLING), + new PageCraftingRecipe("4", GOG_RECIPE, ModItems.fertilizer), + new PageCraftingRecipe("5", GOG_RECIPE, Items.COBBLESTONE), new PageText("6"), + new PageManaInfusionRecipe("7", Items.SUGAR_CANE), + new PageCraftingRecipe("8", GOG_RECIPE, Items.SLIME_BALL), + new PageManaInfusionRecipe("13", Items.PRISMARINE_SHARD, Items.PRISMARINE_CRYSTALS), new PageText("9"), + new PageText("11"), new PageCraftingRecipe("12", Items.END_PORTAL_FRAME)); gardenOfGlass.setPriority().setIcon(new ItemStack(ModItems.livingroot)); } - if (Botania.thaumcraftLoaded) + if(Botania.thaumcraftLoaded) new CompatLexiconEntry("wrap", categoryBasics, "Thaumcraft").setLexiconPages(new PageText("0")); // lel // MANA ENTRIES @@ -424,131 +437,128 @@ public final class LexiconData { spreader = new BasicLexiconEntry(LibLexicon.MANA_SPREADER, categoryMana); spreader.setPriority().setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_SPREADER), new PageText("2"), new PageText("3"), new PageText("4"), new PageText("11"), - new PageCraftingRecipe("5", ModCraftingRecipes.recipesSpreader), new PageText("10")); + new PageCraftingRecipe("5", ModBlocks.manaSpreader.asItem()), new PageText("10")); pool = new BasicLexiconEntry(LibLexicon.MANA_POOL, categoryMana); pool.setPriority() - .setLexiconPages(new PageText("0"), new PageText("9"), - new PageCraftingRecipe("1", ModCraftingRecipes.recipePool), - new PageCraftingRecipe("10", ModCraftingRecipes.recipePoolDiluted), new PageText("14"), - new PageText("2"), new PageText("8"), - new PageManaInfusionRecipe("3", ModManaInfusionRecipes.manasteelRecipes), - new PageManaInfusionRecipe("4", ModManaInfusionRecipes.manaPearlRecipe), - new PageManaInfusionRecipe("5", ModManaInfusionRecipes.manaDiamondRecipes), - new PageManaInfusionRecipe("6", ModManaInfusionRecipes.manaPowderRecipes), - new PageManaInfusionRecipe("11", ModManaInfusionRecipes.managlassRecipe), - new PageManaInfusionRecipe("12", ModManaInfusionRecipes.manaStringRecipe), - new PageCraftingRecipe("13", ModCraftingRecipes.recipeCobweb), - new PageManaInfusionRecipe("7", ModManaInfusionRecipes.manaCookieRecipe)) - .setIcon(new ItemStack(ModBlocks.manaPool)); + .setLexiconPages(new PageText("0"), new PageText("9"), + new PageCraftingRecipe("1", ModBlocks.manaPool.asItem()), + new PageCraftingRecipe("10", ModBlocks.dilutedPool.asItem()), new PageText("14"), + new PageText("2"), new PageText("8"), + new PageManaInfusionRecipe("3", ModItems.manaSteel), + new PageManaInfusionRecipe("4", ModItems.manaPearl), + new PageManaInfusionRecipe("5", ModItems.manaDiamond), + new PageManaInfusionRecipe("6", ModItems.manaPowder), + new PageManaInfusionRecipe("11", ModBlocks.manaGlass.asItem()), + new PageManaInfusionRecipe("12", ModItems.manaString), + new PageCraftingRecipe("13", Items.COBWEB), + new PageManaInfusionRecipe("7", ModItems.manaCookie)) + .setIcon(new ItemStack(ModBlocks.manaPool)); sparks = new BasicLexiconEntry(LibLexicon.MANA_SPARKS, categoryMana); sparks.setPriority().setLexiconPages(new PageText("0"), new PageText("1"), new PageText("3"), - new PageCraftingRecipe("2", ModCraftingRecipes.recipeSpark)); + new PageCraftingRecipe("2", ModItems.spark)); sparkUpgrades = new AlfheimLexiconEntry(LibLexicon.MANA_SPARK_UPGRADES, categoryMana); sparkUpgrades.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PageText("3"), - new PageText("4"), new PageCraftingRecipe("5", ModCraftingRecipes.recipesSparkUpgrades)); + new PageText("4"), new PageCraftingRecipe("5", ModItems.sparkUpgradeDispersive, ModItems.sparkUpgradeDominant, ModItems.sparkUpgradeRecessive, ModItems.sparkUpgradeIsolated)); - if (ConfigHandler.COMMON.fluxfieldEnabled.get()) { + if(ConfigHandler.COMMON.fluxfieldEnabled.get()) { rfGenerator = new BasicLexiconEntry(LibLexicon.MANA_RF_GENERATOR, categoryMana); rfGenerator.setLexiconPages(new PageText("0"), - new PageCraftingRecipe("1", ModCraftingRecipes.recipeRFGenerator)); + new PageCraftingRecipe("1", ModBlocks.rfGenerator.asItem())); } lenses = new BasicLexiconEntry(LibLexicon.MANA_LENSES, categoryMana); - lenses.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipesManaLens), + lenses.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModItems.lensNormal), new PageText("4"), new PageText("5"), new PageText("6"), - new PageCraftingRecipe("7", ModCraftingRecipes.recipeLensVelocity), new PageText("8"), - new PageCraftingRecipe("9", ModCraftingRecipes.recipeLensPotency), new PageText("10"), - new PageCraftingRecipe("11", ModCraftingRecipes.recipeLensResistance), new PageText("12"), - new PageCraftingRecipe("13", ModCraftingRecipes.recipeLensEfficiency), new PageText("38"), - new PageCraftingRecipe("39", ModCraftingRecipes.recipeLensMessenger), new PageText("14"), - new PageCraftingRecipe("15", ModCraftingRecipes.recipeLensBounce), new PageText("16"), - new PageCraftingRecipe("17", ModCraftingRecipes.recipeLensGravity), new PageText("18"), - new PageCraftingRecipe("19", ModCraftingRecipes.recipeLensBore), new PageText("20"), - new PageCraftingRecipe("21", ModCraftingRecipes.recipeLensDamaging), new PageText("22"), - new PageCraftingRecipe("23", ModCraftingRecipes.recipeLensPhantom), new PageText("24"), - new PageCraftingRecipe("25", ModCraftingRecipes.recipeLensMagnet), new PageText("26"), - new PageCraftingRecipe("27", ModCraftingRecipes.recipeLensExplosive), new PageText("28"), - new PageCraftingRecipe("29", ModCraftingRecipes.recipeLensInfluence), new PageText("30"), - new PageCraftingRecipe("31", ModCraftingRecipes.recipeLensWeight), new PageText("32"), - new PageCraftingRecipe("33", ModCraftingRecipes.recipeLensFire), new PageText("34"), - new PageCraftingRecipe("35", ModCraftingRecipes.recipeLensPiston), new PageText("36"), - new PageCraftingRecipe("37", ModCraftingRecipes.recipesLensFlash)); + new PageCraftingRecipe("7", ModItems.lensSpeed), new PageText("8"), + new PageCraftingRecipe("9", ModItems.lensPower), new PageText("10"), + new PageCraftingRecipe("11", ModItems.lensTime), new PageText("12"), + new PageCraftingRecipe("13", ModItems.lensEfficiency), new PageText("38"), + new PageCraftingRecipe("39", ModItems.lensMessenger), new PageText("14"), + new PageCraftingRecipe("15", ModItems.lensBounce), new PageText("16"), + new PageCraftingRecipe("17", ModItems.lensGravity), new PageText("18"), + new PageCraftingRecipe("19", ModItems.lensMine), new PageText("20"), + new PageCraftingRecipe("21", ModItems.lensDamage), new PageText("22"), + new PageCraftingRecipe("23", ModItems.lensPhantom), new PageText("24"), + new PageCraftingRecipe("25", ModItems.lensMagnet), new PageText("26"), + new PageCraftingRecipe("27", ModItems.lensExplosive), new PageText("28"), + new PageCraftingRecipe("29", ModItems.lensInfluence), new PageText("30"), + new PageCraftingRecipe("31", ModItems.lensWeight), new PageText("32"), + new PageCraftingRecipe("33", ModItems.lensFire), new PageText("34"), + new PageCraftingRecipe("35", ModItems.lensPiston), new PageText("36"), + new PageCraftingRecipe("37", ModItems.lensLight)); distributor = new BasicLexiconEntry(LibLexicon.MANA_DISTRIBUTOR, categoryMana); distributor.setLexiconPages(new PageText("0"), - new PageCraftingRecipe("1", ModCraftingRecipes.recipeDistributor)); + new PageCraftingRecipe("1", ModBlocks.distributor.asItem())); manaVoid = new BasicLexiconEntry(LibLexicon.MANA_VOID, categoryMana); - manaVoid.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeManaVoid)); + manaVoid.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModBlocks.manaVoid.asItem())); manaTablet = new BasicLexiconEntry(LibLexicon.MANA_TABLET, categoryMana); manaTablet.setPriority().setLexiconPages(new PageText("0"), new PageText("1"), - new PageCraftingRecipe("2", ModCraftingRecipes.recipeManaTablet)); + new PageCraftingRecipe("2", ModItems.manaTablet)); manaMirror = new BasicLexiconEntry(LibLexicon.MANA_MIRROR, categoryMana); - manaMirror.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeManaMirror)); + manaMirror.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModItems.manaMirror)); manaDetector = new BasicLexiconEntry(LibLexicon.MANA_DETECTOR, categoryMana); manaDetector.setLexiconPages(new PageText("0"), - new PageCraftingRecipe("1", ModCraftingRecipes.recipeManaDetector)); + new PageCraftingRecipe("1", ModBlocks.manaDetector.asItem())); redstoneSpreader = new BasicLexiconEntry(LibLexicon.MANA_REDSTONE_SPREADER, categoryMana); redstoneSpreader.setPriority().setLexiconPages(new PageText("0"), - new PageCraftingRecipe("1", ModCraftingRecipes.recipeRedstoneSpreader)); + new PageCraftingRecipe("1", ModBlocks.redstoneSpreader.asItem())); manastar = new BasicLexiconEntry(LibLexicon.MANA_MANASTAR, categoryMana); manastar.setPriority().setLexiconPages(new PageText("0"), - new PagePetalRecipe<>("1", ModPetalRecipes.manastarRecipe)); + new PagePetalRecipe("1", ModSubtiles.manastar.asItem())); dreamwoodSpreader = new AlfheimLexiconEntry(LibLexicon.MANA_DREAMWOOD_SPREADER, categoryMana); dreamwoodSpreader.setLexiconPages(new PageText("0"), - new PageCraftingRecipe("1", ModCraftingRecipes.recipeDreamwoodSpreader), new PageText("2"), - new PageCraftingRecipe("3", ModCraftingRecipes.recipeUltraSpreader)); + new PageCraftingRecipe("1", ModBlocks.elvenSpreader.asItem()), new PageText("2"), + new PageCraftingRecipe("3", ModBlocks.gaiaSpreader.asItem())); elvenLenses = new AlfheimLexiconEntry(LibLexicon.MANA_ELVEN_LENSES, categoryMana); elvenLenses.setLexiconPages(new PageText("0"), new PageText("1"), - new PageCraftingRecipe("2", ModCraftingRecipes.recipeLensPaint), new PageText("3"), - new PageCraftingRecipe("4", ModCraftingRecipes.recipeLensWarp), new PageText("5"), - new PageCraftingRecipe("6", ModCraftingRecipes.recipeLensRedirect), new PageText("7"), - new PageCraftingRecipe("8", ModCraftingRecipes.recipeLensFirework), new PageText("9"), - new PageCraftingRecipe("10", ModCraftingRecipes.recipeLensFlare), new PageText("11"), - new PageCraftingRecipe("12", ModCraftingRecipes.recipeLensTripwire)); + new PageCraftingRecipe("2", ModItems.lensPaint), new PageText("3"), + new PageCraftingRecipe("4", ModItems.lensWarp), new PageText("5"), + new PageCraftingRecipe("6", ModItems.lensRedirect), new PageText("7"), + new PageCraftingRecipe("8", ModItems.lensFirework), new PageText("9"), + new PageCraftingRecipe("10", ModItems.lensFlare), new PageText("11"), + new PageCraftingRecipe("12", ModItems.lensTripwire)); prism = new AlfheimLexiconEntry(LibLexicon.MANA_PRISM, categoryMana); prism.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), - new PageCraftingRecipe("3", ModCraftingRecipes.recipePrism)); + new PageCraftingRecipe("3", ModBlocks.prism.asItem())); poolCart = new BasicLexiconEntry(LibLexicon.MANA_POOL_CART, categoryMana); poolCart.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), - new PageCraftingRecipe("3", ModCraftingRecipes.recipePoolCart), - new PageCraftingRecipe("4", ModCraftingRecipes.recipePump)); + new PageCraftingRecipe("3", ModItems.poolMinecart), + new PageCraftingRecipe("4", ModBlocks.pump.asItem())); sparkChanger = new AlfheimLexiconEntry(LibLexicon.MANA_SPARK_CHANGER, categoryMana); sparkChanger.setLexiconPages(new PageText("0"), new PageText("1"), - new PageCraftingRecipe("2", ModCraftingRecipes.recipeSparkChanger)); + new PageCraftingRecipe("2", ModBlocks.sparkChanger.asItem())); bellows = new BasicLexiconEntry(LibLexicon.MANA_BELLOWS, categoryMana); bellows.setLexiconPages(new PageText("0"), new PageText("1"), - new PageCraftingRecipe("2", ModCraftingRecipes.recipeBellows)); + new PageCraftingRecipe("2", ModBlocks.bellows.asItem())); // FUNCTIONAL FLOWERS ENTRIES functionalIntro = new BasicLexiconEntry(LibLexicon.FFLOWER_INTRO, categoryFunctionalFlowers); functionalIntro - .setPriority().setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), - new PageText("3"), new PageCraftingRecipe("4", ModCraftingRecipes.recipeRedstoneRoot)) - .setIcon(ItemStack.EMPTY); + .setPriority().setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), + new PageText("3"), new PageCraftingRecipe("4", ModItems.redstoneRoot)) + .setIcon(ItemStack.EMPTY); - // todo 1.14 make this a tag or something instead of this dumb thing - List miniRecipes = BotaniaAPI.manaInfusionRecipes.values().stream() - .filter(r -> r.getOutput().getItem().getRegistryName().getPath().contains("chibi")) - .collect(Collectors.toList()); + Item[] miniFlowers = new ItemTags.Wrapper(new ResourceLocation(LibMisc.MOD_ID, "mini_flowers")).getAllElements().toArray(new Item[0]); flowerShrinking = new BasicLexiconEntry(LibLexicon.FFLOWER_SHRINKING, categoryFunctionalFlowers); flowerShrinking.setPriority() - .setLexiconPages(new PageText("0"), new PageManaInfusionRecipe("1", miniRecipes)) - .setIcon(new ItemStack(ModSubtiles.bellethornChibi)); + .setLexiconPages(new PageText("0"), new PageManaInfusionRecipe("1", miniFlowers)) + .setIcon(new ItemStack(ModSubtiles.bellethornChibi)); flowerSpeed = new BasicLexiconEntry(LibLexicon.FFLOWER_SPEED, categoryFunctionalFlowers); flowerSpeed.setPriority().setLexiconPages(new PageText("0"), new PageText("1")); @@ -556,502 +566,511 @@ public final class LexiconData { jadedAmaranthus = new BasicLexiconEntry(LibLexicon.FFLOWER_JADED_AMARANTHUS, categoryFunctionalFlowers); jadedAmaranthus.setLexiconPages(new PageText("0"), - new PagePetalRecipe<>("1", ModPetalRecipes.jadedAmaranthusRecipe), new PageText("2")); + new PagePetalRecipe("1", ModSubtiles.jadedAmaranthus.asItem()), new PageText("2")); bellethorne = new BasicLexiconEntry(LibLexicon.FFLOWER_BELLETHORNE, categoryFunctionalFlowers); - bellethorne.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.bellethorneRecipe)); + bellethorne.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModSubtiles.bellethorn.asItem())); dreadthorne = new BasicLexiconEntry(LibLexicon.FFLOWER_DREADTHORNE, categoryFunctionalFlowers); - dreadthorne.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.dreadthorneRecipe)); + dreadthorne.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModSubtiles.dreadthorn.asItem())); heiseiDream = new AlfheimLexiconEntry(LibLexicon.FFLOWER_HEISEI_DREAM, categoryFunctionalFlowers); - heiseiDream.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.heiseiDreamRecipe)); + heiseiDream.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModSubtiles.heiseiDream.asItem())); tigerseye = new BasicLexiconEntry(LibLexicon.FFLOWER_TIGERSEYE, categoryFunctionalFlowers); - tigerseye.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.tigerseyeRecipe)); + tigerseye.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModSubtiles.tigerseye.asItem())); orechid = Botania.gardenOfGlassLoaded ? new BasicLexiconEntry(LibLexicon.FFLOWER_ORECHID, categoryFunctionalFlowers) : new AlfheimLexiconEntry(LibLexicon.FFLOWER_ORECHID, categoryFunctionalFlowers); - orechid.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.orechidRecipe)); - if (Botania.gardenOfGlassLoaded) + orechid.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModSubtiles.orechid.asItem())); + if(Botania.gardenOfGlassLoaded) orechid.setPriority(); orechidIgnem = new AlfheimLexiconEntry(LibLexicon.FFLOWER_ORECHID_IGNEM, categoryFunctionalFlowers); - orechidIgnem.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.orechidIgnemRecipe)); + orechidIgnem.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModSubtiles.orechidIgnem.asItem())); - if (ConfigHandler.COMMON.fallenKanadeEnabled.get()) { + if(ConfigHandler.COMMON.fallenKanadeEnabled.get()) { fallenKanade = new BasicLexiconEntry(LibLexicon.FFLOWER_FALLEN_KANADE, categoryFunctionalFlowers); fallenKanade.setLexiconPages(new PageText(Botania.bloodMagicLoaded ? "0a" : "0"), - new PagePetalRecipe<>("1", ModPetalRecipes.fallenKanadeRecipe)); + new PagePetalRecipe("1", ModSubtiles.fallenKanade.asItem())); } exoflame = new BasicLexiconEntry(LibLexicon.FFLOWER_EXOFLAME, categoryFunctionalFlowers); - exoflame.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.exoflameRecipe)); + exoflame.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModSubtiles.exoflame.asItem())); agricarnation = new BasicLexiconEntry(LibLexicon.FFLOWER_AGRICARNATION, categoryFunctionalFlowers); - agricarnation.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.agricarnationRecipe)); + agricarnation.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModSubtiles.agricarnation.asItem())); hopperhock = new BasicLexiconEntry(LibLexicon.FFLOWER_HOPPERHOCK, categoryFunctionalFlowers); hopperhock.setLexiconPages(new PageText("0"), new PageText("1"), - new PagePetalRecipe<>("2", ModPetalRecipes.hopperhockRecipe)); + new PagePetalRecipe("2", ModSubtiles.hopperhock.asItem())); tangleberrie = new BasicLexiconEntry(LibLexicon.FFLOWER_TANGLEBERRIE, categoryFunctionalFlowers); - tangleberrie.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.tangleberrieRecipe)); + tangleberrie.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModSubtiles.tangleberrie.asItem())); jiyuulia = new BasicLexiconEntry(LibLexicon.FFLOWER_JIYUULIA, categoryFunctionalFlowers); - jiyuulia.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.jiyuuliaRecipe)); + jiyuulia.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModSubtiles.jiyuulia.asItem())); rannuncarpus = new BasicLexiconEntry(LibLexicon.FFLOWER_RANNUNCARPUS, categoryFunctionalFlowers); rannuncarpus.setLexiconPages(new PageText("0"), new PageText("1"), - new PagePetalRecipe<>("2", ModPetalRecipes.rannuncarpusRecipe)); + new PagePetalRecipe("2", ModSubtiles.rannuncarpus.asItem())); hyacidus = new BasicLexiconEntry(LibLexicon.FFLOWER_HYACIDUS, categoryFunctionalFlowers); - hyacidus.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.hyacidusRecipe)); + hyacidus.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModSubtiles.hyacidus.asItem())); pollidisiac = new BasicLexiconEntry(LibLexicon.FFLOWER_POLLIDISIAC, categoryFunctionalFlowers); - pollidisiac.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.pollidisiacRecipe)); + pollidisiac.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModSubtiles.pollidisiac.asItem())); clayconia = new BasicLexiconEntry(LibLexicon.FFLOWER_CLAYCONIA, categoryFunctionalFlowers); - clayconia.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.clayconiaRecipe)); + clayconia.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModSubtiles.clayconia.asItem())); loonium = new AlfheimLexiconEntry(LibLexicon.FFLOWER_LOONIUM, categoryFunctionalFlowers); - loonium.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.looniumRecipe)); + loonium.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModSubtiles.loonium.asItem())); daffomill = new BasicLexiconEntry(LibLexicon.FFLOWER_DAFFOMILL, categoryFunctionalFlowers); - daffomill.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.daffomillRecipe)); + daffomill.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModSubtiles.daffomill.asItem())); vinculotus = new BasicLexiconEntry(LibLexicon.FFLOWER_VINCULOTUS, categoryFunctionalFlowers); - vinculotus.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.vinculotusRecipe)); + vinculotus.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModSubtiles.vinculotus.asItem())); spectranthemum = new AlfheimLexiconEntry(LibLexicon.FFLOWER_SPECTRANTHEMUN, categoryFunctionalFlowers); spectranthemum.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), - new PagePetalRecipe<>("3", ModPetalRecipes.spectranthemumRecipe)); + new PagePetalRecipe("3", ModSubtiles.spectranthemum.asItem())); medumone = new BasicLexiconEntry(LibLexicon.FFLOWER_MEDUMONE, categoryFunctionalFlowers); - medumone.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.medumoneRecipe)); + medumone.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModSubtiles.medumone.asItem())); marimorphosis = new BasicLexiconEntry(LibLexicon.FFLOWER_MARIMORPHOSIS, categoryFunctionalFlowers); marimorphosis.setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_METAMORPHIC_STONES), - new PagePetalRecipe<>("2", ModPetalRecipes.marimorphosisRecipe), - new PageCraftingRecipe("3", ModCraftingRecipes.recipesAltarMeta)); - + new PagePetalRecipe("2", ModSubtiles.marimorphosis.asItem()), + new PageCraftingRecipe("3", ModBlocks.forestAltar.asItem(), ModBlocks.plainsAltar.asItem(), ModBlocks.mountainAltar.asItem(), ModBlocks.fungalAltar.asItem(), + ModBlocks.swampAltar.asItem(), ModBlocks.desertAltar.asItem(), ModBlocks.taigaAltar.asItem(), ModBlocks.mesaAltar.asItem(), ModBlocks.mossyAltar.asItem())); + bubbell = new AlfheimLexiconEntry(LibLexicon.FFLOWER_BUBBELL, categoryFunctionalFlowers); - bubbell.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.bubbellRecipe)); + bubbell.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModSubtiles.bubbell.asItem())); solegnolia = new BasicLexiconEntry(LibLexicon.FFLOWER_SOLEGNOLIA, categoryFunctionalFlowers); - solegnolia.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.solegnoliaRecipe)); + solegnolia.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModSubtiles.solegnolia.asItem())); bergamute = new BasicLexiconEntry(LibLexicon.FFLOWER_BERGAMUTE, categoryFunctionalFlowers); - bergamute.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.bergamuteRecipe)); + bergamute.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModSubtiles.bergamute.asItem())); // GENERATING FLOWERS ENTRIES generatingIntro = new BasicLexiconEntry(LibLexicon.GFLOWER_INTRO, categoryGenerationFlowers); - generatingIntro.setPriority().setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PageText("3")); + generatingIntro.setPriority().setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PageText("3")); endoflame = new BasicLexiconEntry(LibLexicon.GFLOWER_ENDOFLAME, categoryGenerationFlowers); endoflame.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("3"), - new PagePetalRecipe<>("2", ModPetalRecipes.endoflameRecipe)); + new PagePetalRecipe("2", ModSubtiles.endoflame.asItem())); hydroangeas = new BasicLexiconEntry(LibLexicon.GFLOWER_HYDROANGEAS, categoryGenerationFlowers); hydroangeas.setLexiconPages(new PageText("0"), new PageImage("2", LibResources.ENTRY_HYDROANGEAS), - new PagePetalRecipe<>("1", ModPetalRecipes.hydroangeasRecipe)); + new PagePetalRecipe("1", ModSubtiles.hydroangeas.asItem())); thermalily = new BasicLexiconEntry(LibLexicon.GFLOWER_THERMALILY, categoryGenerationFlowers); thermalily.setLexiconPages(new PageText("0"), new PageText("2"), new PageText("3"), - new PagePetalRecipe<>("1", ModPetalRecipes.thermalilyRecipe)); + new PagePetalRecipe("1", ModSubtiles.thermalily.asItem())); arcaneRose = new BasicLexiconEntry(LibLexicon.GFLOWER_ARCANE_ROSE, categoryGenerationFlowers); - arcaneRose.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.arcaneRoseRecipe)); + arcaneRose.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModSubtiles.rosaArcana.asItem())); munchdew = new BasicLexiconEntry(LibLexicon.GFLOWER_MUNCHDEW, categoryGenerationFlowers); munchdew.setLexiconPages(new PageText("0"), new PageText("1"), - new PagePetalRecipe<>("2", ModPetalRecipes.munchdewRecipe)); + new PagePetalRecipe("2", ModSubtiles.munchdew.asItem())); entropinnyum = new BasicLexiconEntry(LibLexicon.GFLOWER_ENTROPINNYUM, categoryGenerationFlowers); - entropinnyum.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.entropinnyumRecipe)); + entropinnyum.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModSubtiles.entropinnyum.asItem())); kekimurus = new AlfheimLexiconEntry(LibLexicon.GFLOWER_KEKIMURUS, categoryGenerationFlowers); - kekimurus.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.kekimurusRecipe)); + kekimurus.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModSubtiles.kekimurus.asItem())); gourmaryllis = new BasicLexiconEntry(LibLexicon.GFLOWER_GOURMARYLLIS, categoryGenerationFlowers); gourmaryllis.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), - new PagePetalRecipe<>("3", ModPetalRecipes.gourmaryllisRecipe)); + new PagePetalRecipe("3", ModSubtiles.gourmaryllis.asItem())); narslimmus = new BasicLexiconEntry(LibLexicon.GFLOWER_NARSLIMMUS, categoryGenerationFlowers); - narslimmus.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.narslimmusRecipe)); + narslimmus.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModSubtiles.narslimmus.asItem())); spectrolus = new AlfheimLexiconEntry(LibLexicon.GFLOWER_SPECTROLUS, categoryGenerationFlowers); spectrolus.setLexiconPages(new PageText("0"), new PageText("1"), - new PagePetalRecipe<>("2", ModPetalRecipes.spectrolusRecipe)); + new PagePetalRecipe("2", ModSubtiles.spectrolus.asItem())); rafflowsia = new AlfheimLexiconEntry(LibLexicon.GFLOWER_RAFFLOWSIA, categoryGenerationFlowers); - rafflowsia.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.rafflowsiaRecipe)); + rafflowsia.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModSubtiles.rafflowsia.asItem())); shulkMeNot = new AlfheimLexiconEntry(LibLexicon.GFLOWER_SHULK_ME_NOT, categoryGenerationFlowers); - shulkMeNot.setLexiconPages(new PageText("0"), new PageText("1"), new PagePetalRecipe<>("2", ModPetalRecipes.shulkMeNotRecipe)); - + shulkMeNot.setLexiconPages(new PageText("0"), new PageText("1"), new PagePetalRecipe("2", ModSubtiles.shulkMeNot.asItem())); + dandelifeon = new AlfheimLexiconEntry(LibLexicon.GFLOWER_DANDELIFEON, categoryGenerationFlowers); dandelifeon.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PageText("3"), new PageText("4"), new PageText("5"), new PageText("6"), new PageText("10"), - new PageText("7"), new PagePetalRecipe<>("8", ModPetalRecipes.dandelifeonRecipe), - new PageCraftingRecipe("9", ModCraftingRecipes.recipeCellBlock)); + new PageText("7"), new PagePetalRecipe("8", ModSubtiles.dandelifeon.asItem()), + new PageCraftingRecipe("9", ModBlocks.cellBlock.asItem())); // DEVICES ENTRIES pylon = new BasicLexiconEntry(LibLexicon.DEVICE_PYLON, categoryDevices); - pylon.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipePylon)); + pylon.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModBlocks.manaPylon.asItem())); - if (ConfigHandler.COMMON.enchanterEnabled.get()) { + if(ConfigHandler.COMMON.enchanterEnabled.get()) { manaEnchanting = new BasicLexiconEntry(LibLexicon.DEVICE_MANA_ENCHANTING, categoryDevices); manaEnchanting - .setLexiconPages(new PageText("0"), new PageText("1"), - new PageMultiblock("2", ModMultiblocks.enchanter), new PageText("5"), new PageText("6"), - new PageText("7"), new PageText("8"), new PageText("9")) - .setIcon(new ItemStack(ModBlocks.enchanter)); + .setLexiconPages(new PageText("0"), new PageText("1"), + new PageMultiblock("2", ModMultiblocks.enchanter), new PageText("5"), new PageText("6"), + new PageText("7"), new PageText("8"), new PageText("9")) + .setIcon(new ItemStack(ModBlocks.enchanter)); } turntable = new BasicLexiconEntry(LibLexicon.DEVICE_TURNTABLE, categoryDevices); - turntable.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeTurntable)); + turntable.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModBlocks.turntable.asItem())); + + Predicate filter = r -> r.getCatalyst() == ModBlocks.alchemyCatalyst.getDefaultState(); alchemy = new BasicLexiconEntry(LibLexicon.DEVICE_ALCHEMY, categoryDevices); alchemy.setLexiconPages(new PageText("0"), - new PageCraftingRecipe("1", ModCraftingRecipes.recipeAlchemyCatalyst), - new PageManaInfusionRecipe("2", ModManaAlchemyRecipes.leatherRecipe), - new PageManaInfusionRecipe("3", ModManaAlchemyRecipes.woodRecipes), - new PageManaInfusionRecipe("4", ModManaAlchemyRecipes.saplingRecipes), - new PageManaInfusionRecipe("5", ModManaAlchemyRecipes.glowstoneDustRecipe), - new PageManaInfusionRecipe("6", ModManaAlchemyRecipes.quartzRecipes).setSkipRegistry(), - new PageManaInfusionRecipe("7", ModManaAlchemyRecipes.chiseledBrickRecipe), - new PageManaInfusionRecipe("8", ModManaAlchemyRecipes.iceRecipe), - new PageManaInfusionRecipe("9", ModManaAlchemyRecipes.swampFolliageRecipes), - new PageManaInfusionRecipe("10", ModManaAlchemyRecipes.fishRecipes), - new PageManaInfusionRecipe("11", ModManaAlchemyRecipes.cropRecipes), - new PageManaInfusionRecipe("12", ModManaAlchemyRecipes.potatoRecipe), - new PageManaInfusionRecipe("13", ModManaAlchemyRecipes.netherWartRecipe), - new PageManaInfusionRecipe("14", ModManaAlchemyRecipes.gunpowderAndFlintRecipes), - new PageManaInfusionRecipe("15", ModManaAlchemyRecipes.nameTagRecipe), - new PageManaInfusionRecipe("16", ModManaAlchemyRecipes.stringRecipes), - new PageManaInfusionRecipe("17", ModManaAlchemyRecipes.slimeballCactusRecipes), - new PageManaInfusionRecipe("18", ModManaAlchemyRecipes.enderPearlRecipe), - new PageManaInfusionRecipe("19", ModManaAlchemyRecipes.redstoneToGlowstoneRecipes), - new PageManaInfusionRecipe("20", ModManaAlchemyRecipes.sandRecipe), - new PageManaInfusionRecipe("21", ModManaAlchemyRecipes.redSandRecipe), - new PageManaInfusionRecipe("26", ModManaAlchemyRecipes.stoneRecipes), - new PageManaInfusionRecipe("22", ModManaAlchemyRecipes.clayBreakdownRecipes), - new PageManaInfusionRecipe("27", ModManaAlchemyRecipes.chorusRecipe), - new PageManaInfusionRecipe("24", ModManaAlchemyRecipes.tallgrassRecipes), - new PageManaInfusionRecipe("25", ModManaAlchemyRecipes.flowersRecipes), - new PageManaInfusionRecipe("23", ModManaAlchemyRecipes.coarseDirtRecipe)); + new PageCraftingRecipe("1", ModBlocks.alchemyCatalyst.asItem()), + new PageManaInfusionRecipe("2", filter, Items.LEATHER), + new PageManaInfusionRecipe("3", filter, ItemTags.LOGS.getAllElements().toArray(new Item[0])), + new PageManaInfusionRecipe("4", filter, ItemTags.SAPLINGS.getAllElements().toArray(new Item[0])), + new PageManaInfusionRecipe("5", filter, Items.GLOWSTONE_DUST), + new PageManaInfusionRecipe("6", filter, Items.QUARTZ, ModItems.darkQuartz, ModItems.manaQuartz, + ModItems.blazeQuartz, ModItems.lavenderQuartz, ModItems.redQuartz, ModItems.elfQuartz).setSkipRegistry(), + new PageManaInfusionRecipe("7", filter, Items.CHISELED_STONE_BRICKS), + new PageManaInfusionRecipe("8", filter, Items.ICE), + new PageManaInfusionRecipe("9", filter, Items.LILY_PAD, Items.VINE), + new PageManaInfusionRecipe("10", filter, Items.COD, Items.SALMON, Items.TROPICAL_FISH, Items.PUFFERFISH), + new PageManaInfusionRecipe("11", filter, Items.WHEAT_SEEDS, Items.POTATO, Items.CARROT, Items.BEETROOT_SEEDS, Items.MELON_SEEDS, Items.PUMPKIN_SEEDS, Items.COCOA_BEANS), + new PageManaInfusionRecipe("12", filter, Items.POTATO), + new PageManaInfusionRecipe("13", filter, Items.NETHER_WART), + new PageManaInfusionRecipe("14", filter, Items.GUNPOWDER, Items.GRAVEL), + new PageManaInfusionRecipe("15", filter, Items.NAME_TAG), + new PageManaInfusionRecipe("16", filter, Items.STRING), + new PageManaInfusionRecipe("17", filter, Items.SLIME_BALL, Items.CACTUS), + new PageManaInfusionRecipe("18", filter, Items.ENDER_PEARL), + new PageManaInfusionRecipe("19", filter, Items.REDSTONE, Items.GLOWSTONE_DUST), + new PageManaInfusionRecipe("20", filter, Items.SAND), + new PageManaInfusionRecipe("21", filter, Items.RED_SAND), + new PageManaInfusionRecipe("26", filter, Items.ANDESITE, Items.DIORITE, Items.GRANITE), + new PageManaInfusionRecipe("22", filter, Items.CLAY_BALL, Items.BRICK), + new PageManaInfusionRecipe("27", filter, Items.CHORUS_FLOWER), + new PageManaInfusionRecipe("24", filter, Items.DEAD_BUSH, Items.GRASS, Items.FERN), + new PageManaInfusionRecipe("25", filter, Items.POPPY, Items.BLUE_ORCHID, Items.ALLIUM, Items.AZURE_BLUET, Items.RED_TULIP, + Items.ORANGE_TULIP, Items.WHITE_TULIP, Items.PINK_TULIP, Items.OXEYE_DAISY, Items.SUNFLOWER, Items.LILAC, Items.ROSE_BUSH, Items.PEONY, Items.DANDELION), + new PageManaInfusionRecipe("23", filter, Items.COARSE_DIRT)); openCrate = new BasicLexiconEntry(LibLexicon.DEVICE_OPEN_CRATE, categoryDevices); openCrate.setPriority().setLexiconPages(new PageText("0"), new PageText("1"), - new PageCraftingRecipe("2", ModCraftingRecipes.recipeOpenCrate)); + new PageCraftingRecipe("2", ModBlocks.openCrate.asItem())); forestEye = new BasicLexiconEntry(LibLexicon.DEVICE_FOREST_EYE, categoryDevices); forestEye.setLexiconPages(new PageText("0"), new PageText("1"), - new PageCraftingRecipe("2", ModCraftingRecipes.recipeForestEye)); + new PageCraftingRecipe("2", ModBlocks.forestEye.asItem())); forestDrum = new BasicLexiconEntry(LibLexicon.DEVICE_FOREST_DRUM, categoryDevices); forestDrum.setLexiconPages(new PageText("0"), new PageText("1"), - new PageCraftingRecipe("2", ModCraftingRecipes.recipeForestDrum)); + new PageCraftingRecipe("2", ModBlocks.wildDrum.asItem())); platform = new BasicLexiconEntry(LibLexicon.DEVICE_PLATFORM, categoryDevices); platform.setLexiconPages(new PageText("0"), new PageText("2"), - new PageCraftingRecipe("1", ModCraftingRecipes.recipePlatform)); + new PageCraftingRecipe("1", ModBlocks.abstrusePlatform.asItem())); + + Predicate conjurationFilter = recipe -> recipe.getCatalyst() == RecipeManaInfusion.conjuration.getDefaultState(); conjurationCatalyst = new AlfheimLexiconEntry(LibLexicon.DEVICE_MANA_CONJURATION, categoryDevices); conjurationCatalyst.setLexiconPages(new PageText("0"), - new PageCraftingRecipe("1", ModCraftingRecipes.recipeConjurationCatalyst), - new PageManaInfusionRecipe("2", ModManaConjurationRecipes.redstoneRecipe), - new PageManaInfusionRecipe("3", ModManaConjurationRecipes.glowstoneRecipe), - new PageManaInfusionRecipe("4", ModManaConjurationRecipes.quartzRecipe), - new PageManaInfusionRecipe("5", ModManaConjurationRecipes.coalRecipe), - new PageManaInfusionRecipe("6", ModManaConjurationRecipes.snowballRecipe), - new PageManaInfusionRecipe("7", ModManaConjurationRecipes.netherrackRecipe), - new PageManaInfusionRecipe("8", ModManaConjurationRecipes.soulSandRecipe), - new PageManaInfusionRecipe("9", ModManaConjurationRecipes.gravelRecipe), - new PageManaInfusionRecipe("10", ModManaConjurationRecipes.leavesRecipes), - new PageManaInfusionRecipe("11", ModManaConjurationRecipes.grassRecipe)); + new PageCraftingRecipe("1", ModBlocks.conjurationCatalyst.asItem()), + new PageManaInfusionRecipe("2", conjurationFilter, Items.REDSTONE), + new PageManaInfusionRecipe("3", conjurationFilter, Items.GLOWSTONE_DUST), + new PageManaInfusionRecipe("4", conjurationFilter, Items.QUARTZ), + new PageManaInfusionRecipe("5", conjurationFilter, Items.COAL), + new PageManaInfusionRecipe("6", conjurationFilter, Items.SNOWBALL), + new PageManaInfusionRecipe("7", conjurationFilter, Items.NETHERRACK), + new PageManaInfusionRecipe("8", conjurationFilter, Items.SOUL_SAND), + new PageManaInfusionRecipe("9", conjurationFilter, Items.GRAVEL), + new PageManaInfusionRecipe("10", conjurationFilter, ItemTags.LEAVES.getAllElements().toArray(new Item[0])), + new PageManaInfusionRecipe("11", conjurationFilter, Items.GRASS)); //todos spectralPlatform = new AlfheimLexiconEntry(LibLexicon.DEVICE_SPECTRAL_PLATFORM, categoryDevices); spectralPlatform.setLexiconPages(new PageText("0"), - new PageCraftingRecipe("1", ModCraftingRecipes.recipeSpectralPlatform)); + new PageCraftingRecipe("1", ModBlocks.spectralPlatform.asItem())); gatherDrum = new AlfheimLexiconEntry(LibLexicon.DEVICE_GATHER_DRUM, categoryDevices); - gatherDrum.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeGatherDrum)); + gatherDrum.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModBlocks.gatheringDrum.asItem())); craftCrate = new AlfheimLexiconEntry(LibLexicon.DEVICE_CRAFT_CRATE, categoryDevices); craftCrate - .setLexiconPages(new PageText("0"), new PageText("1"), - new PageCraftingRecipe("2", ModCraftingRecipes.recipePlaceholder), new PageText("3"), - new PageText("4"), new PageText("7"), new PageImage("5", LibResources.ENTRY_CRAFT_CRATE), - new PageCraftingRecipe("6", ModCraftingRecipes.recipeCraftCrate), new PageText("8"), - new PageCraftingRecipe("9", ModCraftingRecipes.recipesPatterns)) - .setIcon(new ItemStack(ModBlocks.craftCrate)); + .setLexiconPages(new PageText("0"), new PageText("1"), + new PageCraftingRecipe("2", ModItems.placeholder), new PageText("3"), + new PageText("4"), new PageText("7"), new PageImage("5", LibResources.ENTRY_CRAFT_CRATE), + new PageCraftingRecipe("6", ModBlocks.craftCrate.asItem()), new PageText("8"), + new PageCraftingRecipe("9", ModItems.craftPattern1_1, ModItems.craftPattern2_2, ModItems.craftPattern1_2, + ModItems.craftPattern2_1, ModItems.craftPattern1_3, ModItems.craftPattern3_1, + ModItems.craftPattern2_3, ModItems.craftPattern3_2, ModItems.craftPatternDonut)) + .setIcon(new ItemStack(ModBlocks.craftCrate)); brewery = new BasicLexiconEntry(LibLexicon.DEVICE_BREWERY, categoryDevices); brewery.setLexiconPages(new PageText("0"), new PageText("1"), - new PageCraftingRecipe("2", ModCraftingRecipes.recipeBrewery), - new PageCraftingRecipe("3", ModCraftingRecipes.recipeVial), new PageText("4"), - new PageBrew(ModBrewRecipes.speedBrew, "5a", "5b"), - new PageBrew(ModBrewRecipes.strengthBrew, "6a", "6b"), - new PageBrew(ModBrewRecipes.hasteBrew, "7a", "7b"), - new PageBrew(ModBrewRecipes.healingBrew, "8a", "8b"), - new PageBrew(ModBrewRecipes.jumpBoostBrew, "9a", "9b"), - new PageBrew(ModBrewRecipes.regenerationBrew, "10a", "10b"), - new PageBrew(ModBrewRecipes.weakRegenerationBrew, "17a", "17b"), - new PageBrew(ModBrewRecipes.resistanceBrew, "11a", "11b"), - new PageBrew(ModBrewRecipes.fireResistanceBrew, "12a", "12b"), - new PageBrew(ModBrewRecipes.waterBreathingBrew, "13a", "13b"), - new PageBrew(ModBrewRecipes.invisibilityBrew, "14a", "14b"), - new PageBrew(ModBrewRecipes.nightVisionBrew, "15a", "15b"), - new PageBrew(ModBrewRecipes.absorptionBrew, "16a", "16b")); + new PageCraftingRecipe("2", ModBlocks.brewery.asItem()), + new PageCraftingRecipe("3", ModItems.vial), new PageText("4"), + new PageBrew(ModBrews.speed, "5a", "5b"), + new PageBrew(ModBrews.strength, "6a", "6b"), + new PageBrew(ModBrews.haste, "7a", "7b"), + new PageBrew(ModBrews.healing, "8a", "8b"), + new PageBrew(ModBrews.jumpBoost, "9a", "9b"), + new PageBrew(ModBrews.regen, "10a", "10b"), + new PageBrew(ModBrews.regenWeak, "17a", "17b"), + new PageBrew(ModBrews.resistance, "11a", "11b"), + new PageBrew(ModBrews.fireResistance, "12a", "12b"), + new PageBrew(ModBrews.waterBreathing, "13a", "13b"), + new PageBrew(ModBrews.invisibility, "14a", "14b"), + new PageBrew(ModBrews.nightVision, "15a", "15b"), + new PageBrew(ModBrews.absorption, "16a", "16b")); flasks = new AlfheimLexiconEntry(LibLexicon.DEVICE_FLASKS, categoryDevices); flasks.setLexiconPages(new PageText("0"), new PageText("1"), - new PageCraftingRecipe("2", ModCraftingRecipes.recipeFlask)); + new PageCraftingRecipe("2", ModItems.flask)); complexBrews = new BasicLexiconEntry(LibLexicon.DEVICE_COMPLEX_BREWS, categoryDevices); - complexBrews.setLexiconPages(new PageText("0"), new PageBrew(ModBrewRecipes.overloadBrew, "1a", "1b"), - new PageBrew(ModBrewRecipes.soulCrossBrew, "2a", "2b"), - new PageBrew(ModBrewRecipes.featherFeetBrew, "3a", "3b"), - new PageBrew(ModBrewRecipes.emptinessBrew, "4a", "4b"), - new PageBrew(ModBrewRecipes.bloodthirstBrew, "5a", "5b"), - new PageBrew(ModBrewRecipes.allureBrew, "6a", "6b"), new PageBrew(ModBrewRecipes.clearBrew, "7a", "7b")) - .setIcon(((IBrewContainer) ModItems.vial).getItemForBrew(ModBrews.jumpBoost, - new ItemStack(ModItems.vial))); + complexBrews.setLexiconPages(new PageText("0"), new PageBrew(ModBrews.overload, "1a", "1b"), + new PageBrew(ModBrews.soulCross, "2a", "2b"), + new PageBrew(ModBrews.featherfeet, "3a", "3b"), + new PageBrew(ModBrews.emptiness, "4a", "4b"), + new PageBrew(ModBrews.bloodthirst, "5a", "5b"), + new PageBrew(ModBrews.allure, "6a", "6b"), new PageBrew(ModBrews.clear, "7a", "7b")) + .setIcon(((IBrewContainer) ModItems.vial).getItemForBrew(ModBrews.jumpBoost, + new ItemStack(ModItems.vial))); incense = new BasicLexiconEntry(LibLexicon.DEVICE_INCENSE, categoryDevices); incense.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PageText("5"), - new PageCraftingRecipe("3", ModCraftingRecipes.recipeIncenseStick), - new PageCraftingRecipe("4", ModCraftingRecipes.recipeIncensePlate)); + new PageCraftingRecipe("3", ModItems.incenseStick), + new PageCraftingRecipe("4", ModBlocks.incensePlate.asItem())); hourglass = new BasicLexiconEntry(LibLexicon.DEVICE_HOURGLASS, categoryDevices); hourglass.setPriority().setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), - new PageText("3"), new PageText("4"), new PageText("6"), new PageCraftingRecipe("5", ModCraftingRecipes.recipeHourglass)); + new PageText("3"), new PageText("4"), new PageText("6"), new PageCraftingRecipe("5", ModBlocks.hourglass.asItem())); ghostRail = new AlfheimLexiconEntry(LibLexicon.DEVICE_GHOST_RAIL, categoryDevices); - ghostRail.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeGhostRail)); + ghostRail.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModBlocks.ghostRail.asItem())); canopyDrum = new BasicLexiconEntry(LibLexicon.DEVICE_CANOPY_DRUM, categoryDevices); - canopyDrum.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeCanopyDrum)); + canopyDrum.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModBlocks.canopyDrum.asItem())); cocoon = Botania.gardenOfGlassLoaded ? new BasicLexiconEntry(LibLexicon.DEVICE_COCOON, categoryDevices) : new AlfheimLexiconEntry(LibLexicon.DEVICE_COCOON, categoryDevices); cocoon.setLexiconPages(new PageText("0"), new PageText("1"), - new PageCraftingRecipe("2", ModCraftingRecipes.recipeCocoon)); + new PageCraftingRecipe("2", ModBlocks.cocoon.asItem())); manaBomb = new AlfheimLexiconEntry(LibLexicon.DEVICE_MANA_BOMB, categoryDevices); - manaBomb.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeManaBomb)); + manaBomb.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModBlocks.manaBomb.asItem())); teruTeruBozu = new BasicLexiconEntry(LibLexicon.DEVICE_TERU_TERU_BOZU, categoryDevices); teruTeruBozu.setLexiconPages(new PageText("0"), - new PageCraftingRecipe("1", ModCraftingRecipes.recipeTeruTeruBozu)); + new PageCraftingRecipe("1", ModBlocks.teruTeruBozu.asItem())); avatar = new BasicLexiconEntry(LibLexicon.DEVICE_AVATAR, categoryDevices); avatar.setLexiconPages(new PageText("0"), new PageText("1"), - new PageCraftingRecipe("2", ModCraftingRecipes.recipeAvatar)); + new PageCraftingRecipe("2", ModBlocks.avatar.asItem())); felPumpkin = new BasicLexiconEntry(LibLexicon.DEVICE_FEL_PUMPKIN, categoryDevices); - felPumpkin.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeFelPumpkin)); + felPumpkin.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModBlocks.felPumpkin.asItem())); animatedTorch = new BasicLexiconEntry(LibLexicon.DEVICE_ANIMATED_TORCH, categoryDevices); - animatedTorch.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PageCraftingRecipe("3", ModCraftingRecipes.recipeAnimatedTorch)); + animatedTorch.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PageCraftingRecipe("3", ModBlocks.animatedTorch.asItem())); // TOOLS ENTRIES manaBlaster = new BasicLexiconEntry(LibLexicon.TOOL_MANA_BLASTER, categoryTools); manaBlaster.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), - new PageCraftingRecipe("3", ModCraftingRecipes.recipeManaBlaster)); + new PageCraftingRecipe("3", ModItems.manaGun)); grassSeeds = new BasicLexiconEntry(LibLexicon.TOOL_GRASS_SEEDS, categoryTools); grassSeeds.setLexiconPages(new PageText("0"), - new PageManaInfusionRecipe("1", ModManaInfusionRecipes.grassSeedsRecipe), - new PageManaInfusionRecipe("2", ModManaInfusionRecipes.podzolSeedsRecipe), - new PageManaInfusionRecipe("3", ModManaInfusionRecipes.mycelSeedsRecipes), new PageText("4"), - new PageCraftingRecipe("5", ModCraftingRecipes.recipesAltGrassSeeds)); + new PageManaInfusionRecipe("1", ModItems.grassSeeds), + new PageManaInfusionRecipe("2", ModItems.podzolSeeds), + new PageManaInfusionRecipe("3", ModItems.mycelSeeds), new PageText("4"), + new PageCraftingRecipe("5", ModItems.drySeeds, ModItems.goldenSeeds, ModItems.vividSeeds, ModItems.scorchedSeeds, ModItems.infusedSeeds, ModItems.mutatedSeeds)); dirtRod = new BasicLexiconEntry(LibLexicon.TOOL_DIRT_ROD, categoryTools); - dirtRod.setLexiconPages(new PageText("0"), new PageText("2"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeDirtRod)); + dirtRod.setLexiconPages(new PageText("0"), new PageText("2"), new PageCraftingRecipe("1", ModItems.dirtRod)); terraformRod = new BasicLexiconEntry(LibLexicon.TOOL_TERRAFORM_ROD, categoryTools); terraformRod.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), - new PageCraftingRecipe("3", ModCraftingRecipes.recipeTerraformRod)); + new PageCraftingRecipe("3", ModItems.terraformRod)); manasteelGear = new BasicLexiconEntry(LibLexicon.TOOL_MANASTEEL_GEAR, categoryTools); manasteelGear.setPriority().setLexiconPages(new PageText("0"), new PageText("10"), - new PageCraftingRecipe("1", ModCraftingRecipes.recipeManasteelPick), - new PageCraftingRecipe("2", ModCraftingRecipes.recipeManasteelShovel), - new PageCraftingRecipe("3", ModCraftingRecipes.recipeManasteelAxe), - new PageCraftingRecipe("4", ModCraftingRecipes.recipeManasteelShears), - new PageCraftingRecipe("5", ModCraftingRecipes.recipeManasteelSword), - new PageCraftingRecipe("6", ModCraftingRecipes.recipeManasteelHelm), - new PageCraftingRecipe("7", ModCraftingRecipes.recipeManasteelChest), - new PageCraftingRecipe("8", ModCraftingRecipes.recipeManasteelLegs), - new PageCraftingRecipe("9", ModCraftingRecipes.recipeManasteelBoots)); + new PageCraftingRecipe("1", ModItems.manasteelPick), + new PageCraftingRecipe("2", ModItems.manasteelShovel), + new PageCraftingRecipe("3", ModItems.manasteelAxe), + new PageCraftingRecipe("4", ModItems.manasteelShears), + new PageCraftingRecipe("5", ModItems.manasteelSword), + new PageCraftingRecipe("6", ModItems.manasteelHelm), + new PageCraftingRecipe("7", ModItems.manasteelChest), + new PageCraftingRecipe("8", ModItems.manasteelLegs), + new PageCraftingRecipe("9", ModItems.manasteelBoots)); terrasteelArmor = new BasicLexiconEntry(LibLexicon.TOOL_TERRASTEEL_ARMOR, categoryTools); terrasteelArmor.setLexiconPages(new PageText("0"), - new PageCraftingRecipe("1", ModCraftingRecipes.recipeTerrasteelHelm), - new PageCraftingRecipe("2", ModCraftingRecipes.recipeTerrasteelChest), - new PageCraftingRecipe("3", ModCraftingRecipes.recipeTerrasteelLegs), - new PageCraftingRecipe("4", ModCraftingRecipes.recipeTerrasteelBoots)); + new PageCraftingRecipe("1", ModItems.terrasteelHelm), + new PageCraftingRecipe("2", ModItems.terrasteelChest), + new PageCraftingRecipe("3", ModItems.terrasteelLegs), + new PageCraftingRecipe("4", ModItems.terrasteelBoots)); grassHorn = new BasicLexiconEntry(LibLexicon.TOOL_GRASS_HORN, categoryTools); - grassHorn.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeGrassHorn), - new PageCraftingRecipe("2", ModCraftingRecipes.recipeLeafHorn), - new PageCraftingRecipe("3", ModCraftingRecipes.recipeSnowHorn)); + grassHorn.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModItems.grassHorn), + new PageCraftingRecipe("2", ModItems.leavesHorn), + new PageCraftingRecipe("3", ModItems.snowHorn)); terraBlade = new BasicLexiconEntry(LibLexicon.TOOL_TERRA_SWORD, categoryTools); - terraBlade.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeTerraSword)); + terraBlade.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModItems.terraSword)); terraPick = new BasicLexiconEntry(LibLexicon.TOOL_TERRA_PICK, categoryTools); terraPick.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PageText("3"), - new PageText("4"), new PageCraftingRecipe("5", ModCraftingRecipes.recipeTerraPick)); + new PageText("4"), new PageCraftingRecipe("5", ModItems.terraPick)); waterRod = new BasicLexiconEntry(LibLexicon.TOOL_WATER_ROD, categoryTools); - waterRod.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeWaterRod)); + waterRod.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModItems.waterRod)); elfGear = new AlfheimLexiconEntry(LibLexicon.TOOL_ELF_GEAR, categoryTools); elfGear.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), - new PageCraftingRecipe("3", ModCraftingRecipes.recipeElementiumPick), new PageText("4"), - new PageCraftingRecipe("5", ModCraftingRecipes.recipeElementiumShovel), new PageText("6"), - new PageCraftingRecipe("7", ModCraftingRecipes.recipeElementiumAxe), new PageText("8"), - new PageCraftingRecipe("9", ModCraftingRecipes.recipeElementiumShears), new PageText("10"), - new PageCraftingRecipe("11", ModCraftingRecipes.recipeElementiumSword), - new PageCraftingRecipe("12", ModCraftingRecipes.recipeElementiumHelm), - new PageCraftingRecipe("13", ModCraftingRecipes.recipeElementiumChest), - new PageCraftingRecipe("14", ModCraftingRecipes.recipeElementiumLegs), - new PageCraftingRecipe("15", ModCraftingRecipes.recipeElementiumBoots)); + new PageCraftingRecipe("3", ModItems.elementiumPick), new PageText("4"), + new PageCraftingRecipe("5", ModItems.elementiumShovel), new PageText("6"), + new PageCraftingRecipe("7", ModItems.elementiumAxe), new PageText("8"), + new PageCraftingRecipe("9", ModItems.elementiumShears), new PageText("10"), + new PageCraftingRecipe("11", ModItems.elementiumSword), + new PageCraftingRecipe("12", ModItems.elementiumHelm), + new PageCraftingRecipe("13", ModItems.elementiumChest), + new PageCraftingRecipe("14", ModItems.elementiumLegs), + new PageCraftingRecipe("15", ModItems.elementiumBoots)); openBucket = new AlfheimLexiconEntry(LibLexicon.TOOL_OPEN_BUCKET, categoryTools); - openBucket.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeOpenBucket)); + openBucket.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModItems.openBucket)); rainbowRod = new AlfheimLexiconEntry(LibLexicon.TOOL_RAINBOW_ROD, categoryTools); rainbowRod.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("6"), - new PageCraftingRecipe("2", ModCraftingRecipes.recipeRainbowRod), - new PageCraftingRecipe("3", ModCraftingRecipes.recipeBifrost), - new PageCraftingRecipe("4", ModCraftingRecipes.recipeShimmerrock), - new PageCraftingRecipe("5", ModCraftingRecipes.recipeShimmerwoodPlanks), - new PageCraftingRecipe("7", ModCraftingRecipes.recipePoolFabulous)); + new PageCraftingRecipe("2", ModItems.rainbowRod), + new PageCraftingRecipe("3", ModBlocks.bifrostPerm.asItem()), + new PageCraftingRecipe("4", ModBlocks.shimmerrock.asItem()), + new PageCraftingRecipe("5", ModBlocks.shimmerwoodPlanks.asItem()), + new PageCraftingRecipe("7", ModBlocks.fabulousPool.asItem())); tornadoRod = new BasicLexiconEntry(LibLexicon.TOOL_TORNADO_ROD, categoryTools); tornadoRod.setLexiconPages(new PageText("0"), new PageText("2"), - new PageCraftingRecipe("1", ModCraftingRecipes.recipeTornadoRod)); + new PageCraftingRecipe("1", ModItems.tornadoRod)); fireRod = new BasicLexiconEntry(LibLexicon.TOOL_FIRE_ROD, categoryTools); fireRod.setLexiconPages(new PageText("0"), new PageText("2"), - new PageCraftingRecipe("1", ModCraftingRecipes.recipeFireRod)); + new PageCraftingRecipe("1", ModItems.fireRod)); vineBall = new BasicLexiconEntry(LibLexicon.TOOL_VINE_BALL, categoryTools); vineBall.setLexiconPages(new PageText("0"), new PageText("1"), - new PageCraftingRecipe("2", ModCraftingRecipes.recipeVineBall), - new PageCraftingRecipe("3", ModCraftingRecipes.recipeSlingshot)); + new PageCraftingRecipe("2", ModItems.vineBall), + new PageCraftingRecipe("3", ModItems.slingshot)); laputaShard = new AlfheimLexiconEntry(LibLexicon.TOOL_LAPUTA_SHARD, categoryTools); laputaShard.setLexiconPages(new PageText("0"), new PageText("2"), - new PageCraftingRecipe("1", ModCraftingRecipes.recipeLaputaShard), - new PageCraftingRecipe("3", ModCraftingRecipes.recipesLaputaShardUpgrade)); + new PageCraftingRecipe("1", inGroup("laputashard_upgrade").negate(), ModItems.laputaShard), + new PageCraftingRecipe("3", inGroup("laputashard_upgrade"), ModItems.laputaShard)); virus = new AlfheimLexiconEntry(LibLexicon.TOOL_VIRUS, categoryTools); - virus.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeVirusZombie), - new PageCraftingRecipe("2", ModCraftingRecipes.recipeVirusSkeleton)); + virus.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModItems.necroVirus), + new PageCraftingRecipe("2", ModItems.nullVirus)); skyDirtRod = new AlfheimLexiconEntry(LibLexicon.TOOL_SKY_DIRT_ROD, categoryTools); - skyDirtRod.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeSkyDirtRod)); + skyDirtRod.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModItems.skyDirtRod)); glassPick = new BasicLexiconEntry(LibLexicon.TOOL_GLASS_PICK, categoryTools); - glassPick.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeGlassPick)); + glassPick.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModItems.glassPick)); diviningRod = new BasicLexiconEntry(LibLexicon.TOOL_DIVINING_ROD, categoryTools); diviningRod.setLexiconPages(new PageText("0"), new PageText("2"), - new PageCraftingRecipe("1", ModCraftingRecipes.recipeDiviningRod)); + new PageCraftingRecipe("1", ModItems.diviningRod)); gravityRod = new AlfheimLexiconEntry(LibLexicon.TOOL_GRAVITY_ROD, categoryTools); gravityRod.setLexiconPages(new PageText("0"), new PageText("1"), - new PageCraftingRecipe("2", ModCraftingRecipes.recipeGravityRod)); + new PageCraftingRecipe("2", ModItems.gravityRod)); missileRod = new AlfheimLexiconEntry(LibLexicon.TOOL_MISSILE_ROD, categoryTools); missileRod.setLexiconPages(new PageText("0"), new PageText("2"), - new PageCraftingRecipe("1", ModCraftingRecipes.recipeMissileRod)); + new PageCraftingRecipe("1", ModItems.missileRod)); craftingHalo = new BasicLexiconEntry(LibLexicon.TOOL_CRAFTING_HALO, categoryTools); craftingHalo.setLexiconPages(new PageText("0"), new PageText("1"), - new PageCraftingRecipe("2", ModCraftingRecipes.recipeCraftingHalo)); + new PageCraftingRecipe("2", ModItems.craftingHalo)); clip = new AlfheimLexiconEntry(LibLexicon.TOOL_CLIP, categoryTools); clip.setLexiconPages(new PageText("0"), new PageText("1"), - new PageCraftingRecipe("2", ModCraftingRecipes.recipeClip)); + new PageCraftingRecipe("2", ModItems.clip)); cobbleRod = new BasicLexiconEntry(LibLexicon.TOOL_COBBLE_ROD, categoryTools); - cobbleRod.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeCobbleRod)); + cobbleRod.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModItems.cobbleRod)); smeltRod = new BasicLexiconEntry(LibLexicon.TOOL_SMELT_ROD, categoryTools); - smeltRod.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeSmeltRod)); + smeltRod.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModItems.smeltRod)); worldSeed = new AlfheimLexiconEntry(LibLexicon.TOOL_WORLD_SEED, categoryTools); - worldSeed.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeWorldSeed)); + worldSeed.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModItems.worldSeed)); spellCloth = new BasicLexiconEntry(LibLexicon.TOOL_SPELL_CLOTH, categoryTools); - spellCloth.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeSpellCloth)); + spellCloth.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModItems.spellCloth)); thornChakram = new BasicLexiconEntry(LibLexicon.TOOL_THORN_CHAKRAM, categoryTools); thornChakram.setLexiconPages(new PageText("0"), - new PageCraftingRecipe("1", ModCraftingRecipes.recipeThornChakram)); + new PageCraftingRecipe("1", ModItems.thornChakram)); fireChakram = new AlfheimLexiconEntry(LibLexicon.TOOL_FIRE_CHAKRAM, categoryTools); fireChakram.setLexiconPages(new PageText("0"), - new PageCraftingRecipe("1", ModCraftingRecipes.recipeFireChakram)); + new PageCraftingRecipe("1", ModItems.flareChakram)); overgrowthSeed = new BasicLexiconEntry(LibLexicon.TOOL_OVERGROWTH_SEED, categoryTools); overgrowthSeed.setPriority().setLexiconPages(new PageText("0"), new PageText("1")) - .setIcon(new ItemStack(ModItems.overgrowthSeed)); + .setIcon(new ItemStack(ModItems.overgrowthSeed)); overgrowthSeed.addExtraDisplayedRecipe(new ItemStack(ModItems.overgrowthSeed)); overgrowthSeed.addExtraDisplayedRecipe(new ItemStack(ModBlocks.enchantedSoil)); livingwoodBow = new BasicLexiconEntry(LibLexicon.TOOL_LIVINGWOOD_BOW, categoryTools); livingwoodBow.setLexiconPages(new PageText("0"), - new PageCraftingRecipe("1", ModCraftingRecipes.recipeLivingwoodBow)); + new PageCraftingRecipe("1", ModItems.livingwoodBow)); crystalBow = new AlfheimLexiconEntry(LibLexicon.TOOL_CRYSTAL_BOW, categoryTools); - crystalBow.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeCrystalBow)); + crystalBow.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModItems.crystalBow)); temperanceStone = new BasicLexiconEntry(LibLexicon.TOOL_TEMPERANCE_STONE, categoryTools); temperanceStone.setLexiconPages(new PageText("0"), - new PageCraftingRecipe("1", ModCraftingRecipes.recipeTemperanceStone)); + new PageCraftingRecipe("1", ModItems.temperanceStone)); terraAxe = new BasicLexiconEntry(LibLexicon.TOOL_TERRA_AXE, categoryTools); - terraAxe.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeTerraAxe)); + terraAxe.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModItems.terraAxe)); obedienceStick = new BasicLexiconEntry(LibLexicon.TOOL_OBEDIENCE_STICK, categoryTools); obedienceStick.setPriority().setLexiconPages(new PageText("0"), - new PageCraftingRecipe("1", ModCraftingRecipes.recipeObedienceStick)); + new PageCraftingRecipe("1", ModItems.obedienceStick)); slimeBottle = new AlfheimLexiconEntry(LibLexicon.TOOL_SLIME_BOTTLE, categoryTools); slimeBottle.setLexiconPages(new PageText("0"), - new PageCraftingRecipe("1", ModCraftingRecipes.recipeSlimeBottle)); + new PageCraftingRecipe("1", ModItems.slimeBottle)); exchangeRod = new BasicLexiconEntry(LibLexicon.TOOL_EXCHANGE_ROD, categoryTools); exchangeRod.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), - new PageCraftingRecipe("3", ModCraftingRecipes.recipeExchangeRod)); + new PageCraftingRecipe("3", ModItems.exchangeRod)); manaweave = new BasicLexiconEntry(LibLexicon.TOOL_MANAWEAVE, categoryTools); manaweave.setLexiconPages(new PageText("0"), new PageText("1"), - new PageCraftingRecipe("2", ModCraftingRecipes.recipeManaweaveCloth), - new PageCraftingRecipe("3", ModCraftingRecipes.recipeManaweaveHelm), - new PageCraftingRecipe("4", ModCraftingRecipes.recipeManaweaveChest), - new PageCraftingRecipe("5", ModCraftingRecipes.recipeManaweaveLegs), - new PageCraftingRecipe("6", ModCraftingRecipes.recipeManaweaveBoots)); + new PageCraftingRecipe("2", ModItems.manaweaveCloth), + new PageCraftingRecipe("3", ModItems.manaweaveHelm), + new PageCraftingRecipe("4", ModItems.manaweaveChest), + new PageCraftingRecipe("5", ModItems.manaweaveLegs), + new PageCraftingRecipe("6", ModItems.manaweaveBoots)); autocraftingHalo = new BasicLexiconEntry(LibLexicon.TOOL_AUTOCRAFTING_HALO, categoryTools); autocraftingHalo.setLexiconPages(new PageText("0"), - new PageCraftingRecipe("1", ModCraftingRecipes.recipeAutocraftingHalo)); + new PageCraftingRecipe("1", ModItems.autocraftingHalo)); sextant = new BasicLexiconEntry(LibLexicon.TOOL_SEXTANT, categoryTools); sextant.setLexiconPages(new PageText("0"), new PageText("1"), - new PageCraftingRecipe("2", ModCraftingRecipes.recipeSextant)); + new PageCraftingRecipe("2", ModItems.sextant)); astrolabe = new AlfheimLexiconEntry(LibLexicon.TOOL_ASTROLABE, categoryTools); astrolabe.setLexiconPages(new PageText("0"), new PageText("1"), - new PageCraftingRecipe("2", ModCraftingRecipes.recipeAstrolabe)); + new PageCraftingRecipe("2", ModItems.astrolabe)); // ENDER ENTRIES enderAir = new BasicLexiconEntry(LibLexicon.ENDER_AIR, categoryEnder); @@ -1061,93 +1080,92 @@ public final class LexiconData { enderEyeBlock = new BasicLexiconEntry(LibLexicon.ENDER_ENDER_EYE_BLOCK, categoryEnder); enderEyeBlock.setLexiconPages(new PageText("0"), - new PageCraftingRecipe("1", ModCraftingRecipes.recipeEnderEyeBlock)); + new PageCraftingRecipe("1", ModBlocks.enderEye.asItem())); pistonRelay = new BasicLexiconEntry(LibLexicon.ENDER_PISTON_RELAY, categoryEnder); pistonRelay.setLexiconPages(new PageText("0"), new PageText("1"), - new PageManaInfusionRecipe("2", ModManaInfusionRecipes.pistonRelayRecipe)); + new PageManaInfusionRecipe("2", ModBlocks.pistonRelay.asItem())); enderHand = new BasicLexiconEntry(LibLexicon.ENDER_ENDER_HAND, categoryEnder); enderHand.setLexiconPages(new PageText(ConfigHandler.COMMON.enderPickpocketEnabled.get() ? "0" : "0a"), new PageText("2"), - new PageCraftingRecipe(ConfigHandler.COMMON.enderPickpocketEnabled.get() ? "1" : "1a", - ModCraftingRecipes.recipeEnderHand)); + new PageCraftingRecipe(ConfigHandler.COMMON.enderPickpocketEnabled.get() ? "1" : "1a", ModItems.enderHand)); enderDagger = new BasicLexiconEntry(LibLexicon.ENDER_ENDER_DAGGER, categoryEnder); enderDagger.setLexiconPages(new PageText("0"), new PageText("1"), - new PageCraftingRecipe("2", ModCraftingRecipes.recipeEnderDagger)); + new PageCraftingRecipe("2", ModItems.enderDagger)); spawnerClaw = new AlfheimLexiconEntry(LibLexicon.ENDER_SPAWNER_CLAW, categoryEnder); spawnerClaw.setLexiconPages(new PageText("0"), new PageText("1"), - new PageCraftingRecipe("2", ModCraftingRecipes.recipeSpawnerClaw)); + new PageCraftingRecipe("2", ModBlocks.spawnerClaw.asItem())); redString = new AlfheimLexiconEntry(LibLexicon.ENDER_RED_STRING, categoryEnder); redString.setLexiconPages(new PageText("0"), new PageText("1"), - new PageCraftingRecipe("2", ModCraftingRecipes.recipeRedString), new PageText("3"), - new PageCraftingRecipe("4", ModCraftingRecipes.recipeRedStringContainer), new PageText("5"), - new PageCraftingRecipe("6", ModCraftingRecipes.recipeRedStringDispenser), new PageText("7"), - new PageCraftingRecipe("8", ModCraftingRecipes.recipeRedStringFertilizer), new PageText("9"), - new PageCraftingRecipe("10", ModCraftingRecipes.recipeRedStringComparator), new PageText("11"), - new PageCraftingRecipe("12", ModCraftingRecipes.recipeRedStringRelay), new PageText("13"), - new PageCraftingRecipe("14", ModCraftingRecipes.recipeRedStringInterceptor)); + new PageCraftingRecipe("2", ModItems.redString), new PageText("3"), + new PageCraftingRecipe("4", ModBlocks.redStringContainer.asItem()), new PageText("5"), + new PageCraftingRecipe("6", ModBlocks.redStringDispenser.asItem()), new PageText("7"), + new PageCraftingRecipe("8", ModBlocks.redStringFertilizer.asItem()), new PageText("9"), + new PageCraftingRecipe("10", ModBlocks.redStringComparator.asItem()), new PageText("11"), + new PageCraftingRecipe("12", ModBlocks.redStringRelay.asItem()), new PageText("13"), + new PageCraftingRecipe("14", ModBlocks.redStringInterceptor.asItem())); flightTiara = new AlfheimLexiconEntry(LibLexicon.ENDER_FLIGHT_TIARA, categoryEnder); flightTiara.setLexiconPages(new PageText("0"), new PageText("4"), new PageText("5"), new PageText("6"), - new PageCraftingRecipe("1", ModCraftingRecipes.recipeFlightTiara), new PageText("2"), - new PageCraftingRecipe("3", ModCraftingRecipes.recipesWings)); + new PageCraftingRecipe("1", inGroup("flighttiara_wings").negate(), ModItems.flightTiara), new PageText("2"), + new PageCraftingRecipe("3", inGroup("flighttiara_wings"), ModItems.flightTiara)); corporea = new AlfheimLexiconEntry(LibLexicon.ENDER_CORPOREA, categoryEnder); corporea.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PageText("3"), new PageText("4"), new PageText("5"), new PageText("6"), - new PageCraftingRecipe("7", ModCraftingRecipes.recipeCorporeaSpark), - new PageCraftingRecipe("8", ModCraftingRecipes.recipeMasterCorporeaSpark)); + new PageCraftingRecipe("7", ModItems.corporeaSpark), + new PageCraftingRecipe("8", ModItems.corporeaSparkMaster)); corporeaIndex = new AlfheimLexiconEntry(LibLexicon.ENDER_CORPOREA_INDEX, categoryEnder); corporeaIndex.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PageText("3"), new PageText("4"), new PageText("5"), new PageText("8"), new PageText("6"), - new PageCraftingRecipe("7", ModCraftingRecipes.recipeCorporeaIndex)); + new PageCraftingRecipe("7", ModBlocks.corporeaIndex.asItem())); corporeaFunnel = new AlfheimLexiconEntry(LibLexicon.ENDER_CORPOREA_FUNNEL, categoryEnder); corporeaFunnel.setLexiconPages(new PageText("0"), new PageText("1"), - new PageCraftingRecipe("2", ModCraftingRecipes.recipeCorporeaFunnel)); + new PageCraftingRecipe("2", ModBlocks.corporeaFunnel.asItem())); corporeaInterceptor = new AlfheimLexiconEntry(LibLexicon.ENDER_CORPOREA_INTERCEPTOR, categoryEnder); corporeaInterceptor.setLexiconPages(new PageText("0"), new PageText("1"), - new PageCraftingRecipe("2", ModCraftingRecipes.recipeCorporeaInterceptor)); + new PageCraftingRecipe("2", ModBlocks.corporeaInterceptor.asItem())); spawnerMover = new AlfheimLexiconEntry(LibLexicon.ENDER_SPAWNER_MOVER, categoryEnder); spawnerMover.setLexiconPages(new PageText("0"), - new PageCraftingRecipe("1", ModCraftingRecipes.recipeSpawnerMover)); + new PageCraftingRecipe("1", ModItems.spawnerMover)); keepIvy = new AlfheimLexiconEntry(LibLexicon.ENDER_KEEP_IVY, categoryEnder); keepIvy.setLexiconPages(new PageText("0"), new PageText("2"), - new PageCraftingRecipe("1", ModCraftingRecipes.recipeKeepIvy)); + new PageCraftingRecipe("1", ModItems.keepIvy)); blackHoleTalisman = new AlfheimLexiconEntry(LibLexicon.ENDER_BLACK_HOLE_TALISMAN, categoryEnder); blackHoleTalisman.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), - new PageCraftingRecipe("3", ModCraftingRecipes.recipeBlackHoleTalisman)); + new PageCraftingRecipe("3", ModItems.blackHoleTalisman)); corporeaCrystalCube = new AlfheimLexiconEntry(LibLexicon.ENDER_CORPOREA_CRYSTAL_CUBE, categoryEnder); corporeaCrystalCube.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("3"), new PageText("4"), - new PageCraftingRecipe("2", ModCraftingRecipes.recipeCorporeaCrystalCube)); + new PageCraftingRecipe("2", ModBlocks.corporeaCrystalCube.asItem())); luminizerTransport = new AlfheimLexiconEntry(LibLexicon.ENDER_LUMINIZER_TRANSPORT, categoryEnder); luminizerTransport.setLexiconPages(new PageText("0"), new PageText("1"), - new PageCraftingRecipe("2", ModCraftingRecipes.recipeLuminizer), new PageText("3"), - new PageCraftingRecipe("4", ModCraftingRecipes.recipeDetectorLuminizer), new PageText("7"), - new PageCraftingRecipe("8", ModCraftingRecipes.recipeForkLuminizer), new PageText("9"), new PageText("10"), - new PageCraftingRecipe("11", ModCraftingRecipes.recipeToggleLuminizer), new PageText("5"), - new PageCraftingRecipe("6", ModCraftingRecipes.recipeLuminizerLauncher)); + new PageCraftingRecipe("2", ModBlocks.lightRelayDefault.asItem()), new PageText("3"), + new PageCraftingRecipe("4", ModBlocks.lightRelayDetector.asItem()), new PageText("7"), + new PageCraftingRecipe("8", ModBlocks.lightRelayFork.asItem()), new PageText("9"), new PageText("10"), + new PageCraftingRecipe("11", ModBlocks.lightRelayToggle.asItem()), new PageText("5"), + new PageCraftingRecipe("6", ModBlocks.lightLauncher.asItem())); starSword = new AlfheimLexiconEntry(LibLexicon.ENDER_STAR_SWORD, categoryEnder); - starSword.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeStarSword)); + starSword.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModItems.starSword)); thunderSword = new AlfheimLexiconEntry(LibLexicon.ENDER_THUNDER_SWORD, categoryEnder); thunderSword.setLexiconPages(new PageText("0"), - new PageCraftingRecipe("1", ModCraftingRecipes.recipeThunderSword)); + new PageCraftingRecipe("1", ModItems.thunderSword)); corporeaRetainer = new AlfheimLexiconEntry(LibLexicon.ENDER_CORPOREA_RETAINER, categoryEnder); corporeaRetainer.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), - new PageCraftingRecipe("3", ModCraftingRecipes.recipeCorporeaRetainer)); + new PageCraftingRecipe("3", ModBlocks.corporeaRetainer.asItem())); // BAUBLES ENTRIES baublesIntro = new BasicLexiconEntry(LibLexicon.BAUBLE_INTRO, categoryBaubles); @@ -1156,161 +1174,166 @@ public final class LexiconData { cosmeticBaubles = new BasicLexiconEntry(LibLexicon.BAUBLE_COSMETIC, categoryBaubles); { + Item[] cosmetics = Arrays.stream(ItemBaubleCosmetic.Variant.values()) + .map(v -> LibItemNames.COSMETIC_PREFIX + v.name().toLowerCase(Locale.ROOT)) + .map(ResourceLocationHelper::prefix) + .map(ForgeRegistries.ITEMS::getValue) + .toArray(Item[]::new); List pages = new ArrayList<>(); pages.add(new PageText("0")); pages.add(new PageText("1")); - for (int i = 0; i < ItemBaubleCosmetic.SUBTYPES; i++) - pages.add(new PageCraftingRecipe("" + (i + 2), ModCraftingRecipes.recipesCosmeticItems.get(i))); - cosmeticBaubles.setPriority().setLexiconPages(pages.toArray(new LexiconPage[pages.size()])); + for(int i = 0; i < ItemBaubleCosmetic.SUBTYPES; i++) + pages.add(new PageCraftingRecipe("" + (i + 2), cosmetics[i])); + cosmeticBaubles.setPriority().setLexiconPages(pages.toArray(new LexiconPage[0])); } tinyPlanet = new BasicLexiconEntry(LibLexicon.BAUBLE_TINY_PLANET, categoryBaubles); - tinyPlanet.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeTinyPlanet), - new PageCraftingRecipe("2", ModCraftingRecipes.recipeTinyPlanetBlock)); + tinyPlanet.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModItems.tinyPlanet), + new PageCraftingRecipe("2", ModBlocks.tinyPlanet.asItem())); manaRing = new BasicLexiconEntry(LibLexicon.BAUBLE_MANA_RING, categoryBaubles); - manaRing.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeManaRing), - new PageCraftingRecipe("2", ModCraftingRecipes.recipeGreaterManaRing)); + manaRing.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModItems.manaRing), + new PageCraftingRecipe("2", ModItems.manaRingGreater)); auraRing = new BasicLexiconEntry(LibLexicon.BAUBLE_AURA_RING, categoryBaubles); - auraRing.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeAuraRing), - new PageCraftingRecipe("2", ModCraftingRecipes.recipeGreaterAuraRing)); + auraRing.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModItems.auraRing), + new PageCraftingRecipe("2", ModItems.auraRingGreater)); travelBelt = new BasicLexiconEntry(LibLexicon.BAUBLE_TRAVEL_BELT, categoryBaubles); - travelBelt.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeTravelBelt)); + travelBelt.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModItems.travelBelt)); knockbacklBelt = new BasicLexiconEntry(LibLexicon.BAUBLE_KNOCKBACK_BELT, categoryBaubles); knockbacklBelt.setLexiconPages(new PageText("0"), - new PageCraftingRecipe("1", ModCraftingRecipes.recipeKnockbackBelt)); + new PageCraftingRecipe("1", ModItems.knockbackBelt)); icePendant = new BasicLexiconEntry(LibLexicon.BAUBLE_ICE_PENDANT, categoryBaubles); - icePendant.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeIcePendant)); + icePendant.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModItems.icePendant)); lavaPendant = new BasicLexiconEntry(LibLexicon.BAUBLE_LAVA_PENDANT, categoryBaubles); lavaPendant.setLexiconPages(new PageText("0"), - new PageCraftingRecipe("1", ModCraftingRecipes.recipeLavaPendant)); + new PageCraftingRecipe("1", ModItems.lavaPendant)); waterRing = new BasicLexiconEntry(LibLexicon.BAUBLE_WATER_RING, categoryBaubles); - waterRing.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeWaterRing)); + waterRing.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModItems.waterRing)); miningRing = new BasicLexiconEntry(LibLexicon.BAUBLE_MINING_RING, categoryBaubles); - miningRing.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeMiningRing)); + miningRing.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModItems.miningRing)); magnetRing = new BasicLexiconEntry(LibLexicon.BAUBLE_MAGNET_RING, categoryBaubles); - magnetRing.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeMagnetRing), - new PageCraftingRecipe("2", ModCraftingRecipes.recipeGreaterMagnetRing)); + magnetRing.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModItems.magnetRing), + new PageCraftingRecipe("2", ModItems.magnetRingGreater)); divaCharm = new AlfheimLexiconEntry(LibLexicon.BAUBLE_DIVA_CHARM, categoryBaubles); - divaCharm.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeDivaCharm)); + divaCharm.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModItems.divaCharm)); pixieRing = new AlfheimLexiconEntry(LibLexicon.BAUBLE_PIXIE_RING, categoryBaubles); - pixieRing.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipePixieRing)); + pixieRing.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModItems.pixieRing)); superTravelBelt = new AlfheimLexiconEntry(LibLexicon.BAUBLE_SUPER_TRAVEL_BELT, categoryBaubles); superTravelBelt.setLexiconPages(new PageText("0"), - new PageCraftingRecipe("1", ModCraftingRecipes.recipeSuperTravelBelt)); + new PageCraftingRecipe("1", ModItems.superTravelBelt)); reachRing = new AlfheimLexiconEntry(LibLexicon.BAUBLE_REACH_RING, categoryBaubles); - reachRing.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeReachRing)); + reachRing.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModItems.reachRing)); itemFinder = new BasicLexiconEntry(LibLexicon.BAUBLE_ITEM_FINDER, categoryBaubles); itemFinder.setLexiconPages(new PageText("0"), new PageText("1"), - new PageCraftingRecipe("2", ModCraftingRecipes.recipeItemFinder)); + new PageCraftingRecipe("2", ModItems.itemFinder)); superLavaPendant = new AlfheimLexiconEntry(LibLexicon.BAUBLE_SUPER_LAVA_PENDANT, categoryBaubles); superLavaPendant.setLexiconPages(new PageText("0"), - new PageCraftingRecipe("1", ModCraftingRecipes.recipeSuperLavaPendant)); + new PageCraftingRecipe("1", ModItems.superLavaPendant)); bloodPendant = new BasicLexiconEntry(LibLexicon.BAUBLE_BLOOD_PENDANT, categoryBaubles); bloodPendant.setLexiconPages(new PageText("0"), new PageText("1"), - new PageCraftingRecipe("2", ModCraftingRecipes.recipeBloodPendant)); + new PageCraftingRecipe("2", ModItems.bloodPendant)); judgementCloaks = new AlfheimLexiconEntry(LibLexicon.BAUBLE_JUDGEMENT_CLOAKS, categoryBaubles); judgementCloaks.setLexiconPages(new PageText("0"), new PageText("1"), - new PageCraftingRecipe("2", ModCraftingRecipes.recipeHolyCloak), - new PageCraftingRecipe("3", ModCraftingRecipes.recipeUnholyCloak), - new PageCraftingRecipe("4", ModCraftingRecipes.recipeBalanceCloak)); + new PageCraftingRecipe("2", ModItems.holyCloak), + new PageCraftingRecipe("3", ModItems.unholyCloak), + new PageCraftingRecipe("4", ModItems.balanceCloak)); monocle = new BasicLexiconEntry(LibLexicon.BAUBLE_MONOCLE, categoryBaubles); monocle.setPriority().setLexiconPages(new PageText("0"), new PageText("2"), - new PageCraftingRecipe("1", ModCraftingRecipes.recipeMonocle)); + new PageCraftingRecipe("1", ModItems.monocle)); swapRing = new BasicLexiconEntry(LibLexicon.BAUBLE_SWAP_RING, categoryBaubles); - swapRing.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeSwapRing)); + swapRing.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModItems.swapRing)); speedUpBelt = new BasicLexiconEntry(LibLexicon.BAUBLE_SPEED_UP_BELT, categoryBaubles); speedUpBelt.setLexiconPages(new PageText("0"), - new PageCraftingRecipe("1", ModCraftingRecipes.recipeSpeedUpBelt)); + new PageCraftingRecipe("1", ModItems.speedUpBelt)); baubleBox = new BasicLexiconEntry(LibLexicon.BAUBLE_BOX, categoryBaubles); - baubleBox.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeBaubleCase)) - .setPriority(); + baubleBox.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModItems.baubleBox)) + .setPriority(); dodgeRing = new BasicLexiconEntry(LibLexicon.BAUBLE_DODGE_RING, categoryBaubles); - dodgeRing.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeDodgeRing)); + dodgeRing.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModItems.dodgeRing)); invisibilityCloak = new BasicLexiconEntry(LibLexicon.BAUBLE_INVISIBILITY_CLOAK, categoryBaubles); - invisibilityCloak.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeInvisibilityCloak)); - + invisibilityCloak.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModItems.invisibilityCloak)); + cloudPendant = new BasicLexiconEntry(LibLexicon.BAUBLE_CLOUD_PENDANT, categoryBaubles); - cloudPendant.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeCloudPendant)); - + cloudPendant.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModItems.cloudPendant)); + superCloudPendant = new AlfheimLexiconEntry(LibLexicon.BAUBLE_SUPER_CLOUD_PENDANT, categoryBaubles); - superCloudPendant.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeSuperCloudPendant)); - + superCloudPendant.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModItems.superCloudPendant)); + thirdEye = new BasicLexiconEntry(LibLexicon.BAUBLE_THIRD_EYE, categoryBaubles); - thirdEye.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeThirdEye)); - + thirdEye.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModItems.thirdEye)); + goddessCharm = new BasicLexiconEntry(LibLexicon.BAUBLE_GODDESS_CHARM, categoryBaubles); - goddessCharm.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeGoddessCharm)); - + goddessCharm.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModItems.goddessCharm)); + // ALFHOMANCY ENTRIES alfhomancyIntro = new BasicLexiconEntry(LibLexicon.ALF_INTRO, categoryAlfhomancy); alfhomancyIntro.setPriority() - .setLexiconPages(new PageText("0"), new PageText("1"), - new PageCraftingRecipe("2", ModCraftingRecipes.recipeAlfPortal), - new PageCraftingRecipe("3", ModCraftingRecipes.recipeNaturaPylon), - new PageMultiblock("4", ModMultiblocks.alfPortal), new PageText("5"), new PageText("6"), - new PageText("7")) - .setIcon(new ItemStack(ModItems.lexicon)); + .setLexiconPages(new PageText("0"), new PageText("1"), + new PageCraftingRecipe("2", ModBlocks.alfPortal.asItem()), + new PageCraftingRecipe("3", ModBlocks.naturaPylon.asItem()), + new PageMultiblock("4", ModMultiblocks.alfPortal), new PageText("5"), new PageText("6"), + new PageText("7")) + .setIcon(new ItemStack(ModItems.lexicon)); elvenMessage = new AlfheimLexiconEntry(LibLexicon.ALF_MESSAGE, categoryAlfhomancy); elvenMessage.setPriority() - .setLexiconPages(new PageImage("0", LibResources.ENTRY_ELVEN_GARDE), new PageLoreText("1"), - new PageLoreText("2"), new PageLoreText("3"), new PageLoreText("4"), new PageLoreText("5"), - new PageLoreText("6")) - .setIcon(new ItemStack(Items.WRITABLE_BOOK)); + .setLexiconPages(new PageImage("0", LibResources.ENTRY_ELVEN_GARDE), new PageLoreText("1"), + new PageLoreText("2"), new PageLoreText("3"), new PageLoreText("4"), new PageLoreText("5"), + new PageLoreText("6")) + .setIcon(new ItemStack(Items.WRITABLE_BOOK)); elvenResources = new AlfheimLexiconEntry(LibLexicon.ALF_RESOURCES, categoryAlfhomancy); elvenResources.setPriority() - .setLexiconPages(new PageText("0"), new PageElvenRecipe("1", ModElvenTradeRecipes.dreamwoodRecipe), - new PageText("2"), new PageCraftingRecipe("10", ModCraftingRecipes.recipeDreamwoodTwig), - new PageElvenRecipe("3", ModElvenTradeRecipes.elementiumRecipes), - new PageElvenRecipe("4", ModElvenTradeRecipes.pixieDustRecipe), - new PageElvenRecipe("5", ModElvenTradeRecipes.dragonstoneRecipes), new PageText("6"), - new PageElvenRecipe("7", ModElvenTradeRecipes.elvenQuartzRecipe), new PageText("8"), - new PageElvenRecipe("9", ModElvenTradeRecipes.alfglassRecipe)) - .setIcon(new ItemStack(ModItems.dragonstone)); + .setLexiconPages(new PageText("0"), new PageElvenRecipe("1", ModBlocks.dreamwood.asItem()), + new PageText("2"), new PageCraftingRecipe("10", ModItems.dreamwoodTwig), + new PageElvenRecipe("3", ModItems.elementium, ModBlocks.elementiumBlock.asItem()), + new PageElvenRecipe("4", ModItems.pixieDust), + new PageElvenRecipe("5", ModItems.dragonstone, ModBlocks.dragonstoneBlock.asItem()), new PageText("6"), + new PageElvenRecipe("7", ModItems.elfQuartz), new PageText("8"), + new PageElvenRecipe("9", ModBlocks.elfGlass.asItem())) + .setIcon(new ItemStack(ModItems.dragonstone)); gaiaRitual = new AlfheimLexiconEntry(LibLexicon.ALF_GAIA_RITUAL, categoryAlfhomancy); - gaiaRitual.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeGaiaPylon), + gaiaRitual.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModBlocks.gaiaPylon.asItem()), new PageMultiblock("2", ModMultiblocks.gaiaRitual), new PageText("3"), new PageText("4"), new PageText("5")).setIcon(new ItemStack(ModItems.lifeEssence)); LexiconRecipeMappings.map(new ItemStack(ModItems.lifeEssence), gaiaRitual, 0); gaiaRitualHardmode = new AlfheimLexiconEntry(LibLexicon.ALF_GAIA_RITUAL_HARDMODE, categoryAlfhomancy); gaiaRitualHardmode - .setLexiconPages(new PageText("0"), new PageText("1"), - new PageCraftingRecipe("2", ModCraftingRecipes.recipeGaiaIngot)) - .setIcon(new ItemStack(ModItems.gaiaIngot)); + .setLexiconPages(new PageText("0"), new PageText("1"), + new PageCraftingRecipe("2", ModItems.gaiaIngot)) + .setIcon(new ItemStack(ModItems.gaiaIngot)); elvenLore = new AlfheimLexiconEntry(LibLexicon.ALF_LORE, categoryAlfhomancy); elvenLore - .setLexiconPages(new PageText("0"), new PageLoreText("1"), new PageLoreText("2"), new PageLoreText("3"), - new PageLoreText("4"), new PageLoreText("5"), new PageLoreText("6"), new PageLoreText("7")) - .setIcon(new ItemStack(Items.WRITABLE_BOOK)); + .setLexiconPages(new PageText("0"), new PageLoreText("1"), new PageLoreText("2"), new PageLoreText("3"), + new PageLoreText("4"), new PageLoreText("5"), new PageLoreText("6"), new PageLoreText("7")) + .setIcon(new ItemStack(Items.WRITABLE_BOOK)); - if (ConfigHandler.COMMON.relicsEnabled.get()) { + if(ConfigHandler.COMMON.relicsEnabled.get()) { relics = new AlfheimLexiconEntry(LibLexicon.ALF_RELICS, categoryAlfhomancy); relics.setLexiconPages(new PageText("0")).setIcon(new ItemStack(ModItems.dice)); @@ -1340,66 +1363,68 @@ public final class LexiconData { decorativeBlocks = new BasicLexiconEntry(LibLexicon.MISC_DECORATIVE_BLOCKS, categoryMisc); decorativeBlocks.setLexiconPages(new PageText("0"), - new PageCraftingRecipe("1", ModCraftingRecipes.recipeLivingrockDecor1), - new PageCraftingRecipe("2", ModCraftingRecipes.recipeLivingrockDecor2), - new PageCraftingRecipe("3", ModCraftingRecipes.recipeLivingrockDecor3), - new PageCraftingRecipe("4", ModCraftingRecipes.recipeLivingrockDecor4), - new PageCraftingRecipe("5", ModCraftingRecipes.recipeLivingwoodDecor1), - new PageCraftingRecipe("6", ModCraftingRecipes.recipeLivingwoodDecor2), - new PageCraftingRecipe("7", ModCraftingRecipes.recipeLivingwoodDecor3), - new PageCraftingRecipe("8", ModCraftingRecipes.recipeLivingwoodDecor4), - new PageCraftingRecipe("9", ModCraftingRecipes.recipeLivingwoodDecor5), new PageText("10"), - new PageCraftingRecipe("11", ModCraftingRecipes.recipeDarkQuartz), - new PageManaInfusionRecipe("12", ModManaInfusionRecipes.manaQuartzRecipe), - new PageCraftingRecipe("13", ModCraftingRecipes.recipeBlazeQuartz), - new PageCraftingRecipe("14", ModCraftingRecipes.recipeLavenderQuartz), - new PageCraftingRecipe("15", ModCraftingRecipes.recipeRedQuartz), - new PageCraftingRecipe("23", ModCraftingRecipes.recipeSunnyQuartz), new PageText("16")); + new PageCraftingRecipe("1", ModBlocks.livingrockBrick.asItem()), + new PageCraftingRecipe("2", ModBlocks.livingrockBrickMossy.asItem()), + new PageCraftingRecipe("3", ModBlocks.livingrockBrickCracked.asItem()), + new PageCraftingRecipe("4", ModBlocks.livingrockBrickChiseled.asItem()), + new PageCraftingRecipe("5", ModBlocks.livingwoodPlanks.asItem()), + new PageCraftingRecipe("6", ModBlocks.livingwoodPlanksMossy.asItem()), + new PageCraftingRecipe("7", ModBlocks.livingwoodFramed.asItem()), + new PageCraftingRecipe("8", ModBlocks.livingwoodPatternFramed.asItem()), + new PageCraftingRecipe("9", ModBlocks.livingwoodGlimmering.asItem()), new PageText("10"), + new PageCraftingRecipe("11", ModItems.darkQuartz), + new PageManaInfusionRecipe("12", ModItems.manaQuartz), + new PageCraftingRecipe("13", ModItems.blazeQuartz), + new PageCraftingRecipe("14", ModItems.lavenderQuartz), + new PageCraftingRecipe("15", ModItems.redQuartz), + new PageCraftingRecipe("23", ModItems.sunnyQuartz), new PageText("16")); dispenserTweaks = new BasicLexiconEntry(LibLexicon.MISC_DISPENSER_TWEAKS, categoryMisc); dispenserTweaks.setLexiconPages(new PageText("0")).setPriority().setIcon(new ItemStack(Blocks.DISPENSER)); shinyFlowers = new BasicLexiconEntry(LibLexicon.MISC_SHINY_FLOWERS, categoryMisc); shinyFlowers.setLexiconPages(new PageText("0"), new PageText("3"), - new PageCraftingRecipe("1", ModCraftingRecipes.recipesShinyFlowers), - new PageCraftingRecipe("2", ModCraftingRecipes.recipesMiniIsland)); + new PageCraftingRecipe("1", shinyFlowerItems), + new PageCraftingRecipe("2", floatingFlowerItems)); tinyPotato = new BasicLexiconEntry(LibLexicon.MISC_TINY_POTATO, categoryMisc); tinyPotato.setLexiconPages(new PageText("0"), new PageText("2"), - new PageManaInfusionRecipe("1", ModManaInfusionRecipes.tinyPotatoRecipe)); + new PageManaInfusionRecipe("1", ModBlocks.tinyPotato.asItem())); headCreating = new HeadLexiconEntry(LibLexicon.MISC_HEAD_CREATING, categoryMisc); headCreating.setLexiconPages(new PageText("0"), new PageText("2"), - new PageRuneRecipe("1", ModRuneRecipes.recipeHead)); + new PageRuneRecipe("1", Items.PLAYER_HEAD)); + Item[] azulejos = IntStream.range(0, 16).mapToObj(i -> ForgeRegistries.ITEMS.getValue(new ResourceLocation(LibMisc.MOD_ID, "azulejo_" + i))).toArray(Item[]::new); azulejo = new BasicLexiconEntry(LibLexicon.MISC_AZULEJO, categoryMisc); azulejo.setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_AZULEJOS), - new PageCraftingRecipe("2", ModCraftingRecipes.recipeAzulejo), - new PageCraftingRecipe("3", ModCraftingRecipes.recipesAzulejoCycling)); + new PageCraftingRecipe("2", inGroup("azulejo_cycling").negate(), ModBlocks.azulejo0.asItem()), + new PageCraftingRecipe("3", inGroup("azulejo_cycling"), azulejos)); starfield = new AlfheimLexiconEntry(LibLexicon.MISC_STARFIELD, categoryMisc); - starfield.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeStarfield)); + starfield.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModBlocks.starfield.asItem())); mushrooms = new BasicLexiconEntry(LibLexicon.MISC_MUSHROOMS, categoryMisc); - mushrooms.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipesMushrooms)); + mushrooms.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", mushroomItems)); phantomInk = new BasicLexiconEntry(LibLexicon.MISC_PHANTOM_INK, categoryMisc); - phantomInk.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipePhantomInk)); + phantomInk.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModItems.phantomInk)); blazeBlock = new BasicLexiconEntry(LibLexicon.MISC_BLAZE_BLOCK, categoryMisc); - blazeBlock.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeBlazeBlock)); + blazeBlock.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModBlocks.blazeBlock.asItem())); LexiconRecipeMappings.map(new ItemStack(Blocks.OBSIDIAN), blazeBlock, 0); challenges = new BasicLexiconEntry(LibLexicon.MISC_CHALLENGES, categoryMisc); challenges.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2")).setPriority() - .setIcon(new ItemStack(ModItems.questgiverMark)); + .setIcon(new ItemStack(ModItems.questgiverMark)); cacophonium = new BasicLexiconEntry(LibLexicon.MISC_CACOPHONIUM, categoryMisc); cacophonium.setLexiconPages(new PageText("0"), - new PageCraftingRecipe("1", ModCraftingRecipes.recipeCacophonium), new PageText("2")); + new PageCraftingRecipe("1", ModItems.cacophonium), new PageText("2")); pavement = new BasicLexiconEntry(LibLexicon.MISC_PAVEMENT, categoryMisc); - pavement.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipesPavement)); + pavement.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", inGroup("pavement"), ModFluffBlocks.whitePavement.asItem(), ModFluffBlocks.blackPavement.asItem(), + ModFluffBlocks.bluePavement.asItem(), ModFluffBlocks.yellowPavement.asItem(), ModFluffBlocks.redPavement.asItem(), ModFluffBlocks.greenPavement.asItem())); preventingDecay = new DogLexiconEntry(LibLexicon.MISC_PRENTING_DECAY, categoryMisc); preventingDecay.setLexiconPages(new PageText("0")).setIcon(new ItemStack(ModItems.monocle)); @@ -1408,26 +1433,38 @@ public final class LexiconData { banners.setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_BANNERS)) .setIcon(new ItemStack(ModItems.lexicon)); - if (Botania.bcApiLoaded) { + if(Botania.bcApiLoaded) { bcIntegration = new CompatLexiconEntry(LibLexicon.MISC_BC_INTEGRATION, categoryMisc, "BuildCraft"); bcIntegration.setLexiconPages(new PageText("0")).setIcon(new ItemStack(Items.REDSTONE)); } - if (Botania.thaumcraftLoaded) { + if(Botania.thaumcraftLoaded) { tcIntegration = new CompatLexiconEntry(LibLexicon.MISC_TC_INTEGRATION, BotaniaAPI.categoryMisc, "Thaumcraft"); - if (ConfigHandler.COMMON.enableThaumcraftStablizers.get()) + if(ConfigHandler.COMMON.enableThaumcraftStablizers.get()) tcIntegration.setLexiconPages(new PageText("0"), new PageText("1"), - new PageCraftingRecipe("2", ModCraftingRecipes.recipeHelmetOfRevealing), new PageText("3"), - new PageManaInfusionRecipe("4", ModManaInfusionRecipes.manaInkwellRecipe), new PageText("5"), - new PageBrew(ModBrewRecipes.warpWardBrew, "6a", "6b")) + new PageCraftingRecipe("2", ModItems.manasteelHelmRevealing, ModItems.elementiumHelmRevealing, ModItems.terrasteelHelmRevealing), new PageText("3"), + new PageManaInfusionRecipe("4", ModItems.manaInkwell), new PageText("5"), + new PageBrew(ModBrews.warpWard, "6a", "6b")) .setIcon(new ItemStack(ModItems.manaInkwell)); else tcIntegration.setLexiconPages(new PageText("0"), new PageText("1"), - new PageCraftingRecipe("2", ModCraftingRecipes.recipeHelmetOfRevealing), new PageText("3"), - new PageManaInfusionRecipe("4", ModManaInfusionRecipes.manaInkwellRecipe), - new PageBrew(ModBrewRecipes.warpWardBrew, "6a", "6b")) + new PageCraftingRecipe("2", ModItems.manasteelHelmRevealing, ModItems.elementiumHelmRevealing, ModItems.terrasteelHelmRevealing), new PageText("3"), + new PageManaInfusionRecipe("4", ModItems.manaInkwell), + new PageBrew(ModBrews.warpWard, "6a", "6b")) .setIcon(new ItemStack(ModItems.manaInkwell)); } + Botania.LOGGER.info("Reloaded lexicon in {}", stopwatch.stop()); + } + + private static Predicate> GOG_RECIPE = recipe -> recipe.getId().getPath().contains("garden_of_glass"); + + private static Predicate> inGroup(String group) { + String recipeGroup = LibMisc.MOD_ID + ":" + group; + return recipe -> recipe.getGroup().equals(recipeGroup); + } + + private static Predicate> idEndsWith(String end) { + return recipe -> recipe.getId().getPath().endsWith(end); } } diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java b/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java index 785b3de90..8cc2e7271 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java @@ -15,6 +15,7 @@ import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.resources.I18n; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.Ingredient; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.TextFormatting; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @@ -26,18 +27,20 @@ import vazkii.botania.api.lexicon.ITwoNamedPage; import vazkii.botania.api.recipe.RecipeBrew; import vazkii.botania.common.core.helper.PlayerHelper; import vazkii.botania.common.item.ModItems; +import vazkii.botania.common.lib.LibMisc; import java.util.ArrayList; import java.util.List; public class PageBrew extends PageRecipe implements ITwoNamedPage { + private static final RecipeBrew DUMMY = new RecipeBrew(new ResourceLocation(LibMisc.MOD_ID, "dummy"), BotaniaAPI.fallbackBrew); - final RecipeBrew recipe; - String text; + private final RecipeBrew recipe; + private String text; - public PageBrew(RecipeBrew recipe, String unlocalizedName, String bottomText) { + public PageBrew(Brew brew, String unlocalizedName, String bottomText) { super(bottomText); - this.recipe = recipe; + recipe = BotaniaAPI.brewRecipes.values().stream().filter(recipe -> recipe.getBrew() == brew).findFirst().orElse(DUMMY); text = unlocalizedName; } diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java index 3d078ac77..7272f7256 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java @@ -10,76 +10,75 @@ */ package vazkii.botania.common.lexicon.page; +import com.mojang.blaze3d.platform.GlStateManager; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screen.Screen; -import com.mojang.blaze3d.platform.GlStateManager; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.client.resources.I18n; +import net.minecraft.inventory.CraftingInventory; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.item.crafting.IRecipeType; import net.minecraft.item.crafting.Ingredient; import net.minecraft.item.crafting.ShapedRecipe; import net.minecraft.item.crafting.ShapelessRecipe; +import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.fml.server.ServerLifecycleHooks; 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.helper.RenderHelper; import vazkii.botania.client.lib.LibResources; +import vazkii.botania.common.Botania; +import vazkii.botania.common.lib.LibMisc; +import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; import java.util.List; -import java.util.Objects; +import java.util.function.Predicate; import java.util.stream.Collectors; -import javax.annotation.Resource; - public class PageCraftingRecipe extends PageRecipe { private static final ResourceLocation craftingOverlay = new ResourceLocation(LibResources.GUI_CRAFTING_OVERLAY); + private static final List> DUMMY = Collections.singletonList(new ShapedRecipe(new ResourceLocation(LibMisc.MOD_ID, "dummy"), "", 1, 1, NonNullList.withSize(1, Ingredient.EMPTY), ItemStack.EMPTY)); - final List recipes; - int ticksElapsed = 0; - int recipeAt = 0; + private final Item[] outputItems; + private final Predicate> recipeFilter; + + private List> recipes; + + private int ticksElapsed = 0; + private int recipeAt = 0; - boolean shapelessRecipe; - - public PageCraftingRecipe(String unlocalizedName, List recipes) { - super(unlocalizedName); - this.recipes = recipes; - - for(ResourceLocation res : recipes) - if(res == null) - throw new IllegalArgumentException("Null recipes arent allowed"); + public PageCraftingRecipe(String unlocalizedName, Item... outputs) { + this(unlocalizedName, r -> true, outputs); } - public PageCraftingRecipe(String unlocalizedName, ResourceLocation recipe) { - this(unlocalizedName, Collections.singletonList(recipe)); + public PageCraftingRecipe(String unlocalizedName, Predicate> filter, Item... outputs) { + super(unlocalizedName); + this.outputItems = outputs; + this.recipeFilter = filter; } @Override public void onPageAdded(LexiconEntry entry, int index) { - /* todo 1.13 - for(ResourceLocation name : recipes) { - IRecipe recipe = ForgeRegistries.RECIPES.getValue(name); - if(recipe != null && !recipe.getRecipeOutput().isEmpty()) { - LexiconRecipeMappings.map(recipe.getRecipeOutput(), entry, index); - } + for(Item item : outputItems) { + LexiconRecipeMappings.map(new ItemStack(item), entry, index); } - */ } @Override @OnlyIn(Dist.CLIENT) public void renderRecipe(IGuiLexiconEntry gui, int mx, int my) { - shapelessRecipe = false; - ResourceLocation recipeId = recipes.get(recipeAt); - IRecipe recipe = Minecraft.getInstance().world.getRecipeManager().getRecipes(IRecipeType.CRAFTING).get(recipeId); + IRecipe recipe = getRecipes().get(recipeAt); renderCraftingRecipe(gui, recipe); TextureManager render = Minecraft.getInstance().textureManager; @@ -96,13 +95,11 @@ public class PageCraftingRecipe extends PageRecipe { GlStateManager.enableBlend(); GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - if(shapelessRecipe) { + if(recipe instanceof ShapelessRecipe) { ((Screen) gui).blit(iconX, iconY, 240, 0, 16, 16); if(mx >= iconX && my >= iconY && mx < iconX + 16 && my < iconY + 16) RenderHelper.renderTooltip(mx, my, Collections.singletonList(I18n.format("botaniamisc.shapeless"))); - - iconY += 20; } render.bindTexture(craftingOverlay); @@ -117,14 +114,14 @@ public class PageCraftingRecipe extends PageRecipe { if(ticksElapsed % 20 == 0) { recipeAt++; - if(recipeAt == recipes.size()) + if(recipeAt == getRecipes().size()) recipeAt = 0; } ++ticksElapsed; } @OnlyIn(Dist.CLIENT) - public void renderCraftingRecipe(IGuiLexiconEntry gui, IRecipe recipe) { + public void renderCraftingRecipe(IGuiLexiconEntry gui, IRecipe recipe) { if(recipe == null) return; @@ -135,14 +132,13 @@ public class PageCraftingRecipe extends PageRecipe { for(int y = 0; y < height; y++) for(int x = 0; x < width; x++) { - Ingredient input = (Ingredient) recipe.getIngredients().get(y * width + x); + Ingredient input = recipe.getIngredients().get(y * width + x); ItemStack[] stacks = input.getMatchingStacks(); if(stacks.length > 0) { renderItemAtGridPos(gui, 1 + x, 1 + y, stacks[(ticksElapsed / 40) % stacks.length], true); } } } else if(recipe instanceof ShapelessRecipe) { - shapelessRecipe = true; drawGrid : { for(int y = 0; y < 3; y++) @@ -152,7 +148,7 @@ public class PageCraftingRecipe extends PageRecipe { if(index >= recipe.getIngredients().size()) break drawGrid; - Ingredient input = (Ingredient) recipe.getIngredients().get(index); + Ingredient input = recipe.getIngredients().get(index); if(input != Ingredient.EMPTY) { ItemStack[] stacks = input.getMatchingStacks(); renderItemAtGridPos(gui, 1 + x, 1 + y, stacks[(ticksElapsed / 40) % stacks.length], true); @@ -164,16 +160,33 @@ public class PageCraftingRecipe extends PageRecipe { renderItemAtGridPos(gui, 2, 0, recipe.getRecipeOutput(), false); } + public List> getRecipes() { + if(recipes == null) { + recipes = findRecipes(); + } + return recipes; + } + + private List> findRecipes() { + List> list = new ArrayList<>(); + for(IRecipe recipe : ServerLifecycleHooks.getCurrentServer().getRecipeManager().getRecipes(IRecipeType.CRAFTING).values()) { + if(recipeFilter.test(recipe)) { + for(Item output : outputItems) { + if(recipe.getRecipeOutput().getItem() == output) { + list.add(recipe); + } + } + } + } + if(list.isEmpty()) { + Botania.LOGGER.info("Could not find mana infusion recipes for items {}, using dummy", (Object) this.outputItems); + return DUMMY; + } + return list; + } + @Override public List getDisplayedRecipes() { - /* todo 1.13 - return recipes.stream() - .map(ForgeRegistries.RECIPES::getValue) - .filter(Objects::nonNull) - .map(IRecipe::getRecipeOutput) - .filter(s -> !s.isEmpty()) - .collect(Collectors.toList()); - */ - return Collections.emptyList(); + return Arrays.stream(outputItems).map(ItemStack::new).collect(Collectors.toList()); } } diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java index b3c918508..103d22f98 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java @@ -1,25 +1,28 @@ package vazkii.botania.common.lexicon.page; +import com.mojang.blaze3d.platform.GlStateManager; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.AbstractGui; import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.gui.screen.Screen; -import com.mojang.blaze3d.platform.GlStateManager; +import net.minecraft.client.renderer.texture.AtlasTexture; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureManager; -import net.minecraft.client.renderer.texture.AtlasTexture; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.Ingredient; import net.minecraft.util.ResourceLocation; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import org.lwjgl.opengl.GL11; +import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.IGuiLexiconEntry; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.lexicon.LexiconRecipeMappings; import vazkii.botania.api.recipe.RecipeElvenTrade; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.lib.LibResources; +import vazkii.botania.common.Botania; +import vazkii.botania.common.lib.ResourceLocationHelper; import java.util.ArrayList; import java.util.Collections; @@ -28,31 +31,30 @@ import java.util.List; public class PageElvenRecipe extends PageRecipe { private static final ResourceLocation elvenTradeOverlay = new ResourceLocation(LibResources.GUI_ELVEN_TRADE_OVERLAY); + private static final List DUMMY = Collections.singletonList(new RecipeElvenTrade(ResourceLocationHelper.prefix("dummy"), ItemStack.EMPTY, Ingredient.EMPTY)); - private final List recipes; + private final Item[] outputItems; + private List recipes; private int ticksElapsed = 0; private int recipeAt = 0; - public PageElvenRecipe(String unlocalizedName, List recipes) { - super(unlocalizedName); - this.recipes = recipes; - } - public PageElvenRecipe(String unlocalizedName, RecipeElvenTrade recipe) { - this(unlocalizedName, Collections.singletonList(recipe)); + public PageElvenRecipe(String unlocalizedName, Item... outputs) { + super(unlocalizedName); + this.outputItems = outputs; } @Override public void onPageAdded(LexiconEntry entry, int index) { - for(RecipeElvenTrade recipe : recipes) - for(ItemStack output : recipe.getOutputs()) - LexiconRecipeMappings.map(output, entry, index); + for(Item item : outputItems) { + LexiconRecipeMappings.map(new ItemStack(item), entry, index); + } } @Override @OnlyIn(Dist.CLIENT) public void renderRecipe(IGuiLexiconEntry gui, int mx, int my) { - RecipeElvenTrade recipe = recipes.get(recipeAt); + RecipeElvenTrade recipe = getRecipes().get(recipeAt); TextureManager render = Minecraft.getInstance().textureManager; render.bindTexture(elvenTradeOverlay); GlStateManager.enableBlend(); @@ -110,19 +112,44 @@ public class PageElvenRecipe extends PageRecipe { if(ticksElapsed % 20 == 0) { recipeAt++; - if(recipeAt == recipes.size()) + if(recipeAt == getRecipes().size()) recipeAt = 0; } ++ticksElapsed; } + public List getRecipes() { + if(recipes == null) { + recipes = findRecipes(); + } + return recipes; + } + + private List findRecipes() { + List list = new ArrayList<>(); + for(RecipeElvenTrade recipe : BotaniaAPI.elvenTradeRecipes.values()) { + recipe: for(ItemStack output : recipe.getOutputs()) { + for(Item item : outputItems) { + if(output.getItem() == item) { + list.add(recipe); + break recipe; + } + } + } + } + if(list.isEmpty()) { + Botania.LOGGER.warn("Could not find elven trade recipes for item {}, using dummy", (Object) outputItems); + return DUMMY; + } + return list; + } + @Override public List getDisplayedRecipes() { ArrayList list = new ArrayList<>(); - for(RecipeElvenTrade r : recipes) + for(RecipeElvenTrade r : getRecipes()) list.addAll(r.getOutputs()); return list; } - } diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java index 5dbce827d..cf6b01705 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java @@ -10,22 +10,24 @@ */ package vazkii.botania.common.lexicon.page; +import com.mojang.blaze3d.platform.GlStateManager; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.gui.screen.Screen; -import com.mojang.blaze3d.platform.GlStateManager; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.client.resources.I18n; -import net.minecraft.item.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.item.Items; +import net.minecraft.item.crafting.Ingredient; +import net.minecraft.tags.Tag; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.TextFormatting; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import org.lwjgl.opengl.GL11; +import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.IGuiLexiconEntry; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.lexicon.LexiconRecipeMappings; @@ -33,45 +35,58 @@ import vazkii.botania.api.recipe.RecipeManaInfusion; import vazkii.botania.client.core.handler.HUDHandler; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.lib.LibResources; +import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.mana.TilePool; import vazkii.botania.common.core.helper.ItemNBTHelper; +import vazkii.botania.common.lib.LibMisc; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; +import java.util.function.Predicate; public class PageManaInfusionRecipe extends PageRecipe { private static final ResourceLocation manaInfusionOverlay = new ResourceLocation(LibResources.GUI_MANA_INFUSION_OVERLAY); + private static final List DUMMY = Collections.singletonList(new RecipeManaInfusion(new ResourceLocation(LibMisc.MOD_ID, "dummy"), ItemStack.EMPTY, Ingredient.EMPTY, 0)); - private final List recipes; + private List recipes = null; + private final Item[] outputItems; + private final Predicate recipeFilter; private int ticksElapsed = 0; private int recipeAt = 0; private final ItemStack renderStack; - public PageManaInfusionRecipe(String unlocalizedName, List recipes) { + + public PageManaInfusionRecipe(String unlocalizedName, Item... outputs) { + this(unlocalizedName, r -> true, outputs); + } + + public PageManaInfusionRecipe(String unlocalizedName, Predicate filter, Item... outputs) { super(unlocalizedName); - this.recipes = recipes; + this.outputItems = outputs; + this.recipeFilter = filter; renderStack = new ItemStack(ModBlocks.manaPool); ItemNBTHelper.setBoolean(renderStack, "RenderFull", true); } - public PageManaInfusionRecipe(String unlocalizedName, RecipeManaInfusion recipe) { - this(unlocalizedName, Collections.singletonList(recipe)); + public PageManaInfusionRecipe(String unlocalizedName, Predicate filter, Tag tag) { + this(unlocalizedName, filter, tag.getAllElements().toArray(new Item[0])); } @Override public void onPageAdded(LexiconEntry entry, int index) { - for(RecipeManaInfusion recipe : recipes) - LexiconRecipeMappings.map(recipe.getOutput(), entry, index); + for(Item item : outputItems) { + LexiconRecipeMappings.map(new ItemStack(item), entry, index); + } } @Override @OnlyIn(Dist.CLIENT) public void renderRecipe(IGuiLexiconEntry gui, int mx, int my) { - RecipeManaInfusion recipe = recipes.get(recipeAt); + RecipeManaInfusion recipe = getRecipes().get(recipeAt); TextureManager render = Minecraft.getInstance().textureManager; FontRenderer font = Minecraft.getInstance().fontRenderer; @@ -145,7 +160,7 @@ public class PageManaInfusionRecipe extends PageRecipe { if(ticksElapsed % 20 == 0) { recipeAt++; - if(recipeAt == recipes.size()) + if(recipeAt == getRecipes().size()) recipeAt = 0; } ++ticksElapsed; @@ -154,10 +169,36 @@ public class PageManaInfusionRecipe extends PageRecipe { @Override public List getDisplayedRecipes() { ArrayList list = new ArrayList<>(); - for(RecipeManaInfusion r : recipes) + for(RecipeManaInfusion r : getRecipes()) list.add(r.getOutput()); return list; } + private List findRecipes() { + List list = new ArrayList<>(); + for(RecipeManaInfusion recipe : BotaniaAPI.manaInfusionRecipes.values()) { + if(recipeFilter.test(recipe)) { + Item recipeOutput = recipe.getOutput().getItem(); + for(Item output : outputItems) { + if(recipeOutput == output) { + list.add(recipe); + break; + } + } + } + } + if(list.isEmpty()) { + Botania.LOGGER.warn("Could not find mana infusion recipes for items {}, using dummy", (Object) outputItems); + return DUMMY; + } + return list; + } + + public List getRecipes() { + if(recipes == null) { + recipes = findRecipes(); + } + return recipes; + } } diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageModRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageModRecipe.java new file mode 100644 index 000000000..a9cb5a12a --- /dev/null +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageModRecipe.java @@ -0,0 +1,175 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [sie 08 2019, 11:43] + */ +package vazkii.botania.common.lexicon.page; + +import com.mojang.blaze3d.platform.GlStateManager; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.gui.screen.Screen; +import net.minecraft.client.renderer.texture.TextureManager; +import net.minecraft.client.resources.I18n; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.Ingredient; +import net.minecraft.tags.Tag; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; +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.api.recipe.IModRecipe; +import vazkii.botania.client.core.handler.ClientTickHandler; +import vazkii.botania.client.lib.LibResources; +import vazkii.botania.common.core.handler.ConfigHandler; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; +import java.util.function.Predicate; +import java.util.stream.Collectors; + +public abstract class PageModRecipe extends PageRecipe { + private static final ResourceLocation petalOverlay = new ResourceLocation(LibResources.GUI_PETAL_OVERLAY); + + protected final Item[] outputItems; + private final Predicate recipeFilter; + + private List recipes = null; + private int ticksElapsed = 0; + private int recipeAt = 0; + + public PageModRecipe(String unlocalizedName, Predicate filter, Item... outputs) { + super(unlocalizedName); + this.recipeFilter = filter; + this.outputItems = outputs; + } + + public PageModRecipe(String unlocalizedName, Item... outputItems) { + this(unlocalizedName, r -> true, outputItems); + } + + public PageModRecipe(String unlocalizedName, Predicate filter, Tag outputs) { + this(unlocalizedName, filter, outputs.getAllElements().toArray(new Item[0])); + } + + @Override + public void onPageAdded(LexiconEntry entry, int index) { + for(Item item : outputItems) + LexiconRecipeMappings.map(new ItemStack(item), entry, index); + } + + @Override + @OnlyIn(Dist.CLIENT) + public void renderRecipe(IGuiLexiconEntry gui, int mx, int my) { + T recipe = getRecipes().get(recipeAt); + TextureManager render = Minecraft.getInstance().textureManager; + + renderItemAtGridPos(gui, 3, 0, recipe.getOutput(), false); + renderItemAtGridPos(gui, 2, 1, getMiddleStack(), false); + + List inputs = recipe.getInputs(); + int degreePerInput = (int) (360F / inputs.size()); + float currentDegree = ConfigHandler.CLIENT.lexiconRotatingItems.get() + ? Screen.hasShiftDown() + ? ticksElapsed + : ticksElapsed + ClientTickHandler.partialTicks + : 0; + int inputIndex = ticksElapsed / 40; + + for(Ingredient input : inputs) { + ItemStack[] stacks = input.getMatchingStacks(); + int size = stacks.length; + ItemStack stack = stacks[size - inputIndex % size - 1]; + // todo 1.13 can't we just use inputIndex % size? + + renderItemAtAngle(gui, currentDegree, stack); + + currentDegree += degreePerInput; + } + + renderManaBar(gui, recipe, mx, my); + + render.bindTexture(petalOverlay); + + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.color4f(1F, 1F, 1F, 1F); + ((Screen) gui).blit(gui.getLeft(), gui.getTop(), 0, 0, gui.getWidth(), gui.getHeight()); + GlStateManager.disableBlend(); + } + + abstract ItemStack getMiddleStack(); + + @OnlyIn(Dist.CLIENT) + public void renderManaBar(IGuiLexiconEntry gui, T recipe, int mx, int my) { + FontRenderer font = Minecraft.getInstance().fontRenderer; + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + + int x = gui.getLeft() + gui.getWidth() / 2 - 50; + int y = gui.getTop() + 120; + + String stopStr = I18n.format("botaniamisc.shiftToStopSpin"); + font.drawString(stopStr, x + 50 - font.getStringWidth(stopStr) / 2, y + 15, 0x99000000); + + GlStateManager.disableBlend(); + } + + @Override + @OnlyIn(Dist.CLIENT) + public void updateScreen() { + if(Screen.hasShiftDown()) + return; + + if(ticksElapsed % 20 == 0) { + recipeAt++; + + if(recipeAt == getRecipes().size()) + recipeAt = 0; + } + ++ticksElapsed; + } + + public List getRecipes(){ + if(recipes == null) { + recipes = findRecipes(); + } + return recipes; + } + + @Override + public List getDisplayedRecipes() { + return Arrays.stream(outputItems).map(ItemStack::new).collect(Collectors.toList()); + } + + protected abstract List findRecipes(); + + protected List findRecipes(Collection recipeList) { + if(recipes == null) { + List list = new ArrayList<>(); + for(T recipe : recipeList) { + if(recipeFilter.test(recipe)) { + for(Item output : outputItems) { + if(recipe.getOutput().getItem() == output) { + list.add(recipe); + } + } + } + } + recipes = list; + return list; + } + return recipes; + } +} diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java index 444ded73c..51fc5677a 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java @@ -10,139 +10,55 @@ */ package vazkii.botania.common.lexicon.page; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.api.recipe.RecipePetals; +import vazkii.botania.common.Botania; +import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.lib.LibMisc; + import java.util.ArrayList; import java.util.Collections; import java.util.List; +import java.util.function.Predicate; -import net.minecraft.client.gui.screen.Screen; -import net.minecraft.item.crafting.Ingredient; -import org.lwjgl.opengl.GL11; +public class PagePetalRecipe extends PageModRecipe { -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.gui.screen.Screen; -import com.mojang.blaze3d.platform.GlStateManager; -import net.minecraft.client.renderer.texture.TextureManager; -import net.minecraft.client.resources.I18n; -import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import vazkii.botania.api.internal.IGuiLexiconEntry; -import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.api.lexicon.LexiconRecipeMappings; -import vazkii.botania.api.recipe.IModRecipe; -import vazkii.botania.api.recipe.RecipePetals; -import vazkii.botania.client.core.handler.ClientTickHandler; -import vazkii.botania.client.lib.LibResources; -import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.common.core.handler.ConfigHandler; + private static final List DUMMY = Collections.singletonList(new RecipePetals(new ResourceLocation(LibMisc.MOD_ID, "dummy"), ItemStack.EMPTY)); -public class PagePetalRecipe extends PageRecipe { - - private static final ResourceLocation petalOverlay = new ResourceLocation(LibResources.GUI_PETAL_OVERLAY); - - private final List recipes; - private int ticksElapsed = 0; - private int recipeAt = 0; - - public PagePetalRecipe(String unlocalizedName, List recipes) { - super(unlocalizedName); - this.recipes = recipes; + public PagePetalRecipe(String unlocalizedName, Predicate filter, Item... outputs) { + super(unlocalizedName, filter, outputs); } - public PagePetalRecipe(String unlocalizedName, T recipe) { - this(unlocalizedName, Collections.singletonList(recipe)); + public PagePetalRecipe(String unlocalizedName, Item... outputs) { + this(unlocalizedName, r -> true, outputs); } @Override - public void onPageAdded(LexiconEntry entry, int index) { - for(T recipe : recipes) - LexiconRecipeMappings.map(recipe.getOutput(), entry, index); - } - - @Override - @OnlyIn(Dist.CLIENT) - public void renderRecipe(IGuiLexiconEntry gui, int mx, int my) { - T recipe = recipes.get(recipeAt); - TextureManager render = Minecraft.getInstance().textureManager; - - renderItemAtGridPos(gui, 3, 0, recipe.getOutput(), false); - renderItemAtGridPos(gui, 2, 1, getMiddleStack(), false); - - List inputs = recipe.getInputs(); - int degreePerInput = (int) (360F / inputs.size()); - float currentDegree = ConfigHandler.CLIENT.lexiconRotatingItems.get() - ? Screen.hasShiftDown() - ? ticksElapsed - : ticksElapsed + ClientTickHandler.partialTicks - : 0; - int inputIndex = ticksElapsed / 40; - - for(Ingredient input : inputs) { - ItemStack[] stacks = input.getMatchingStacks(); - int size = stacks.length; - ItemStack stack = stacks[size - inputIndex % size - 1]; - // todo 1.13 can't we just use inputIndex % size? - - renderItemAtAngle(gui, currentDegree, stack); - - currentDegree += degreePerInput; - } - - renderManaBar(gui, recipe, mx, my); - - render.bindTexture(petalOverlay); - - GlStateManager.enableBlend(); - GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GlStateManager.color4f(1F, 1F, 1F, 1F); - ((Screen) gui).blit(gui.getLeft(), gui.getTop(), 0, 0, gui.getWidth(), gui.getHeight()); - GlStateManager.disableBlend(); - } - ItemStack getMiddleStack() { return new ItemStack(ModBlocks.defaultAltar); } - @OnlyIn(Dist.CLIENT) - public void renderManaBar(IGuiLexiconEntry gui, T recipe, int mx, int my) { - FontRenderer font = Minecraft.getInstance().fontRenderer; - GlStateManager.enableBlend(); - GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - - int x = gui.getLeft() + gui.getWidth() / 2 - 50; - int y = gui.getTop() + 120; - - String stopStr = I18n.format("botaniamisc.shiftToStopSpin"); - font.drawString(stopStr, x + 50 - font.getStringWidth(stopStr) / 2, y + 15, 0x99000000); - - GlStateManager.disableBlend(); - } - - @Override - @OnlyIn(Dist.CLIENT) - public void updateScreen() { - if(Screen.hasShiftDown()) - return; - - if(ticksElapsed % 20 == 0) { - recipeAt++; - - if(recipeAt == recipes.size()) - recipeAt = 0; - } - ++ticksElapsed; - } - @Override public List getDisplayedRecipes() { ArrayList list = new ArrayList<>(); - for(T r : recipes) + for(RecipePetals r : getRecipes()) list.add(r.getOutput()); return list; } + + @Override + protected List findRecipes() { + List recipes = findRecipes(BotaniaAPI.petalRecipes.values()); + if(recipes.isEmpty()) { + Botania.LOGGER.warn("Could not find petal apothecary recipes for items {}, using dummy", (Object) outputItems); + return DUMMY; + } + return recipes; + } + } diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java index 54ff73c14..ece1f76cc 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java @@ -10,11 +10,10 @@ */ package vazkii.botania.common.lexicon.page; +import com.mojang.blaze3d.platform.GlStateManager; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.gui.screen.Screen; -import com.mojang.blaze3d.platform.GlStateManager; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.resources.I18n; @@ -22,11 +21,10 @@ import net.minecraft.client.util.ITooltipFlag; import net.minecraft.item.ItemStack; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextFormatting; -import net.minecraftforge.client.ForgeHooksClient; -import net.minecraftforge.client.event.RenderTooltipEvent; -import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.client.event.RenderTooltipEvent; +import net.minecraftforge.common.MinecraftForge; import org.lwjgl.glfw.GLFW; import org.lwjgl.opengl.GL11; import vazkii.botania.api.internal.IGuiLexiconEntry; @@ -37,22 +35,20 @@ import vazkii.botania.api.lexicon.LexiconRecipeMappings.EntryData; import vazkii.botania.client.gui.lexicon.GuiLexiconEntry; import vazkii.botania.common.core.helper.PlayerHelper; -import java.awt.font.FontRenderContext; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.Comparator; import java.util.List; -import java.util.stream.Collectors; -import java.util.stream.Stream; public class PageRecipe extends LexiconPage { - int relativeMouseX, relativeMouseY; - ItemStack tooltipStack = ItemStack.EMPTY, tooltipContainerStack = ItemStack.EMPTY; - boolean tooltipEntry; + private int relativeMouseX, relativeMouseY; + private ItemStack tooltipStack = ItemStack.EMPTY; + private ItemStack tooltipContainerStack = ItemStack.EMPTY; + private boolean tooltipEntry; - static boolean mouseDownLastTick = false; + private static boolean mouseDownLastTick = false; public PageRecipe(String unlocalizedName) { super(unlocalizedName); diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageRuneRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageRuneRecipe.java index 9049df6bb..645cac790 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageRuneRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageRuneRecipe.java @@ -10,30 +10,40 @@ */ package vazkii.botania.common.lexicon.page; +import com.mojang.blaze3d.platform.GlStateManager; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; -import com.mojang.blaze3d.platform.GlStateManager; import net.minecraft.client.resources.I18n; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.tags.Tag; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import org.lwjgl.opengl.GL11; +import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.IGuiLexiconEntry; import vazkii.botania.api.recipe.RecipeRuneAltar; import vazkii.botania.client.core.handler.HUDHandler; +import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.mana.TilePool; +import vazkii.botania.common.lib.LibMisc; +import java.util.Collections; import java.util.List; +import java.util.function.Predicate; -public class PageRuneRecipe extends PagePetalRecipe { +public class PageRuneRecipe extends PageModRecipe { + + private static final List DUMMY = Collections.singletonList(new RecipeRuneAltar(new ResourceLocation(LibMisc.MOD_ID, "dummy"), ItemStack.EMPTY, 0)); - public PageRuneRecipe(String unlocalizedName, List recipes) { - super(unlocalizedName, recipes); + public PageRuneRecipe(String unlocalizedName, Item... outputs) { + super(unlocalizedName, outputs); } - public PageRuneRecipe(String unlocalizedName, RecipeRuneAltar recipes) { - super(unlocalizedName, recipes); + public PageRuneRecipe(String unlocalizedName, Predicate filter, Item... outputs) { + super(unlocalizedName, filter, outputs); } @Override @@ -41,7 +51,6 @@ public class PageRuneRecipe extends PagePetalRecipe { return new ItemStack(ModBlocks.runeAltar); } - @Override @OnlyIn(Dist.CLIENT) public void renderManaBar(IGuiLexiconEntry gui, RecipeRuneAltar recipe, int mx, int my) { FontRenderer font = Minecraft.getInstance().fontRenderer; @@ -67,4 +76,13 @@ public class PageRuneRecipe extends PagePetalRecipe { GlStateManager.disableBlend(); } + @Override + protected List findRecipes() { + List recipes = findRecipes(BotaniaAPI.runeAltarRecipes.values()); + if(recipes.isEmpty()) { + Botania.LOGGER.warn("Could not find runic altar recipes for items {}, using dummy", (Object) outputItems); + return DUMMY; + } + return recipes; + } } diff --git a/src/main/java/vazkii/botania/common/lib/LibLexicon.java b/src/main/java/vazkii/botania/common/lib/LibLexicon.java index c5a2969a5..cf59b086f 100644 --- a/src/main/java/vazkii/botania/common/lib/LibLexicon.java +++ b/src/main/java/vazkii/botania/common/lib/LibLexicon.java @@ -16,8 +16,8 @@ public final class LibLexicon { public static final String CATEGORY_BASICS = "basics"; public static final String CATEGORY_MANA = "mana"; - public static final String CATEGORY_FUNCTIONAL_FLOWERS = "functionalFlowers"; - public static final String CATEGORY_GENERATION_FLOWERS = "generationFlowers"; + public static final String CATEGORY_FUNCTIONAL_FLOWERS = "functionalflowers"; + public static final String CATEGORY_GENERATION_FLOWERS = "generationflowers"; public static final String CATEGORY_DEVICES = "devices"; public static final String CATEGORY_TOOLS = "tools"; public static final String CATEGORY_BAUBLES = "baubles"; diff --git a/src/main/resources/assets/botania/textures/gui/entries/craftcrate.png b/src/main/resources/assets/botania/textures/gui/entries/craft_crate.png similarity index 100% rename from src/main/resources/assets/botania/textures/gui/entries/craftcrate.png rename to src/main/resources/assets/botania/textures/gui/entries/craft_crate.png diff --git a/src/main/resources/assets/botania/textures/gui/entries/diminishingreturns.png b/src/main/resources/assets/botania/textures/gui/entries/diminishingreturns.png deleted file mode 100644 index 8c36a6684..000000000 Binary files a/src/main/resources/assets/botania/textures/gui/entries/diminishingreturns.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/gui/entries/elvengarde.png b/src/main/resources/assets/botania/textures/gui/entries/elven_garde.png similarity index 100% rename from src/main/resources/assets/botania/textures/gui/entries/elvengarde.png rename to src/main/resources/assets/botania/textures/gui/entries/elven_garde.png diff --git a/src/main/resources/assets/botania/textures/gui/entries/metamorphicstones.png b/src/main/resources/assets/botania/textures/gui/entries/metamorphic_stones.png similarity index 100% rename from src/main/resources/assets/botania/textures/gui/entries/metamorphicstones.png rename to src/main/resources/assets/botania/textures/gui/entries/metamorphic_stones.png diff --git a/src/main/resources/assets/botania/textures/gui/entries/puredaisy.png b/src/main/resources/assets/botania/textures/gui/entries/pure_daisy.png similarity index 100% rename from src/main/resources/assets/botania/textures/gui/entries/puredaisy.png rename to src/main/resources/assets/botania/textures/gui/entries/pure_daisy.png diff --git a/src/main/resources/data/botania/recipes/_constants.json b/src/main/resources/data/botania/recipes/_constants.json deleted file mode 100644 index 4855941d2..000000000 --- a/src/main/resources/data/botania/recipes/_constants.json +++ /dev/null @@ -1,66 +0,0 @@ -[ - { - "items": [ - { "item": "botania:white_dye" }, - { "item": "botania:orange_dye" }, - { "item": "botania:magenta_dye" }, - { "item": "botania:light_blue_dye" }, - { "item": "botania:yellow_dye" }, - { "item": "botania:lime_dye" }, - { "item": "botania:pink_dye" }, - { "item": "botania:gray_dye" }, - { "item": "botania:light_gray_dye" }, - { "item": "botania:cyan_dye" }, - { "item": "botania:purple_dye" }, - { "item": "botania:blue_dye" }, - { "item": "botania:brown_dye" }, - { "item": "botania:green_dye" }, - { "item": "botania:red_dye" }, - { "item": "botania:black_dye" } - ], - "name": "all_dyes" - }, - { - "items": [ - { "item": "botania:white_mushroom" }, - { "item": "botania:orange_mushroom" }, - { "item": "botania:magenta_mushroom" }, - { "item": "botania:light_blue_mushroom" }, - { "item": "botania:yellow_mushroom" }, - { "item": "botania:lime_mushroom" }, - { "item": "botania:pink_mushroom" }, - { "item": "botania:gray_mushroom" }, - { "item": "botania:light_gray_mushroom" }, - { "item": "botania:cyan_mushroom" }, - { "item": "botania:purple_mushroom" }, - { "item": "botania:blue_mushroom" }, - { "item": "botania:brown_mushroom" }, - { "item": "botania:green_mushroom" }, - { "item": "botania:red_mushroom" }, - { "item": "botania:black_mushroom" } - ], - "name": "all_mushrooms" - }, - { - "items": [ - { "item": "minecraft:glass" }, - { "item": "minecraft:white_stained_glass" }, - { "item": "minecraft:orange_stained_glass" }, - { "item": "minecraft:magenta_stained_glass" }, - { "item": "minecraft:light_blue_stained_glass" }, - { "item": "minecraft:yellow_stained_glass" }, - { "item": "minecraft:lime_stained_glass" }, - { "item": "minecraft:pink_stained_glass" }, - { "item": "minecraft:gray_stained_glass" }, - { "item": "minecraft:light_gray_stained_glass" }, - { "item": "minecraft:cyan_stained_glass" }, - { "item": "minecraft:purple_stained_glass" }, - { "item": "minecraft:blue_stained_glass" }, - { "item": "minecraft:brown_stained_glass" }, - { "item": "minecraft:green_stained_glass" }, - { "item": "minecraft:red_stained_glass" }, - { "item": "minecraft:black_stained_glass" } - ], - "name": "glass" - } -] \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/fertilizer_powder.json b/src/main/resources/data/botania/recipes/fertilizer_powder.json index 0221b702c..2311db921 100644 --- a/src/main/resources/data/botania/recipes/fertilizer_powder.json +++ b/src/main/resources/data/botania/recipes/fertilizer_powder.json @@ -15,18 +15,78 @@ { "item": "minecraft:bone_meal" }, - { - "constant": "botania:all_dyes" - }, - { - "constant": "botania:all_dyes" - }, - { - "constant": "botania:all_dyes" - }, - { - "constant": "botania:all_dyes" - } + [ + { "item": "botania:white_dye" }, + { "item": "botania:orange_dye" }, + { "item": "botania:magenta_dye" }, + { "item": "botania:light_blue_dye" }, + { "item": "botania:yellow_dye" }, + { "item": "botania:lime_dye" }, + { "item": "botania:pink_dye" }, + { "item": "botania:gray_dye" }, + { "item": "botania:light_gray_dye" }, + { "item": "botania:cyan_dye" }, + { "item": "botania:purple_dye" }, + { "item": "botania:blue_dye" }, + { "item": "botania:brown_dye" }, + { "item": "botania:green_dye" }, + { "item": "botania:red_dye" }, + { "item": "botania:black_dye" } + ], + [ + { "item": "botania:white_dye" }, + { "item": "botania:orange_dye" }, + { "item": "botania:magenta_dye" }, + { "item": "botania:light_blue_dye" }, + { "item": "botania:yellow_dye" }, + { "item": "botania:lime_dye" }, + { "item": "botania:pink_dye" }, + { "item": "botania:gray_dye" }, + { "item": "botania:light_gray_dye" }, + { "item": "botania:cyan_dye" }, + { "item": "botania:purple_dye" }, + { "item": "botania:blue_dye" }, + { "item": "botania:brown_dye" }, + { "item": "botania:green_dye" }, + { "item": "botania:red_dye" }, + { "item": "botania:black_dye" } + ], + [ + { "item": "botania:white_dye" }, + { "item": "botania:orange_dye" }, + { "item": "botania:magenta_dye" }, + { "item": "botania:light_blue_dye" }, + { "item": "botania:yellow_dye" }, + { "item": "botania:lime_dye" }, + { "item": "botania:pink_dye" }, + { "item": "botania:gray_dye" }, + { "item": "botania:light_gray_dye" }, + { "item": "botania:cyan_dye" }, + { "item": "botania:purple_dye" }, + { "item": "botania:blue_dye" }, + { "item": "botania:brown_dye" }, + { "item": "botania:green_dye" }, + { "item": "botania:red_dye" }, + { "item": "botania:black_dye" } + ], + [ + { "item": "botania:white_dye" }, + { "item": "botania:orange_dye" }, + { "item": "botania:magenta_dye" }, + { "item": "botania:light_blue_dye" }, + { "item": "botania:yellow_dye" }, + { "item": "botania:lime_dye" }, + { "item": "botania:pink_dye" }, + { "item": "botania:gray_dye" }, + { "item": "botania:light_gray_dye" }, + { "item": "botania:cyan_dye" }, + { "item": "botania:purple_dye" }, + { "item": "botania:blue_dye" }, + { "item": "botania:brown_dye" }, + { "item": "botania:green_dye" }, + { "item": "botania:red_dye" }, + { "item": "botania:black_dye" } + ] ], "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/garden_of_glass/fertilizer_powder.json b/src/main/resources/data/botania/recipes/garden_of_glass/fertilizer_powder.json index c67070246..7ca38f1ea 100644 --- a/src/main/resources/data/botania/recipes/garden_of_glass/fertilizer_powder.json +++ b/src/main/resources/data/botania/recipes/garden_of_glass/fertilizer_powder.json @@ -14,16 +14,16 @@ "item": "minecraft:bone_meal" }, { - "constant": "botania:all_dyes" + "tag": "botania:floral_powder" }, { - "constant": "botania:all_dyes" + "tag": "botania:floral_powder" }, { - "constant": "botania:all_dyes" + "tag": "botania:floral_powder" }, { - "constant": "botania:all_dyes" + "tag": "botania:floral_powder" } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/data/botania/recipes/mushroom_stew.json b/src/main/resources/data/botania/recipes/mushroom_stew.json index 26a18d0ac..e0d25e810 100644 --- a/src/main/resources/data/botania/recipes/mushroom_stew.json +++ b/src/main/resources/data/botania/recipes/mushroom_stew.json @@ -3,12 +3,42 @@ "item": "minecraft:mushroom_stew" }, "ingredients": [ - { - "constant": "botania:all_mushrooms" - }, - { - "constant": "botania:all_mushrooms" - }, + [ + { "item": "botania:white_mushroom" }, + { "item": "botania:orange_mushroom" }, + { "item": "botania:magenta_mushroom" }, + { "item": "botania:light_blue_mushroom" }, + { "item": "botania:yellow_mushroom" }, + { "item": "botania:lime_mushroom" }, + { "item": "botania:pink_mushroom" }, + { "item": "botania:gray_mushroom" }, + { "item": "botania:light_gray_mushroom" }, + { "item": "botania:cyan_mushroom" }, + { "item": "botania:purple_mushroom" }, + { "item": "botania:blue_mushroom" }, + { "item": "botania:brown_mushroom" }, + { "item": "botania:green_mushroom" }, + { "item": "botania:red_mushroom" }, + { "item": "botania:black_mushroom" } + ], + [ + { "item": "botania:white_mushroom" }, + { "item": "botania:orange_mushroom" }, + { "item": "botania:magenta_mushroom" }, + { "item": "botania:light_blue_mushroom" }, + { "item": "botania:yellow_mushroom" }, + { "item": "botania:lime_mushroom" }, + { "item": "botania:pink_mushroom" }, + { "item": "botania:gray_mushroom" }, + { "item": "botania:light_gray_mushroom" }, + { "item": "botania:cyan_mushroom" }, + { "item": "botania:purple_mushroom" }, + { "item": "botania:blue_mushroom" }, + { "item": "botania:brown_mushroom" }, + { "item": "botania:green_mushroom" }, + { "item": "botania:red_mushroom" }, + { "item": "botania:black_mushroom" } + ], { "item": "minecraft:bowl" } diff --git a/src/main/resources/data/botania/recipes/phantom_ink.json b/src/main/resources/data/botania/recipes/phantom_ink.json index 97d1962fe..5284d9995 100644 --- a/src/main/resources/data/botania/recipes/phantom_ink.json +++ b/src/main/resources/data/botania/recipes/phantom_ink.json @@ -10,9 +10,25 @@ { "tag": "forge:dyes" }, - { - "constant": "botania:glass" - }, + [ + { "item": "minecraft:glass" }, + { "item": "minecraft:white_stained_glass" }, + { "item": "minecraft:orange_stained_glass" }, + { "item": "minecraft:magenta_stained_glass" }, + { "item": "minecraft:light_blue_stained_glass" }, + { "item": "minecraft:yellow_stained_glass" }, + { "item": "minecraft:lime_stained_glass" }, + { "item": "minecraft:pink_stained_glass" }, + { "item": "minecraft:gray_stained_glass" }, + { "item": "minecraft:light_gray_stained_glass" }, + { "item": "minecraft:cyan_stained_glass" }, + { "item": "minecraft:purple_stained_glass" }, + { "item": "minecraft:blue_stained_glass" }, + { "item": "minecraft:brown_stained_glass" }, + { "item": "minecraft:green_stained_glass" }, + { "item": "minecraft:red_stained_glass" }, + { "item": "minecraft:black_stained_glass" } + ], { "item": "minecraft:glass_bottle" }, diff --git a/src/main/resources/data/botania/tags/blocks/mini_flowers.json b/src/main/resources/data/botania/tags/blocks/mini_flowers.json new file mode 100644 index 000000000..1c0b98488 --- /dev/null +++ b/src/main/resources/data/botania/tags/blocks/mini_flowers.json @@ -0,0 +1,13 @@ +{ + "replace": false, + "values": [ + "botania:agricarnation_chibi", + "botania:bellethorn_chibi", + "botania:bubbell_chibi", + "botania:clayconia_chibi", + "botania:hopperhock_chibi", + "botania:marimorphosis_chibi", + "botania:rannuncarpus_chibi", + "botania:solegnolia_chibi" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/blocks/mystical_flowers.json b/src/main/resources/data/botania/tags/blocks/mystical_flowers.json index e36823d65..b868f7c71 100644 --- a/src/main/resources/data/botania/tags/blocks/mystical_flowers.json +++ b/src/main/resources/data/botania/tags/blocks/mystical_flowers.json @@ -1,5 +1,5 @@ { - "replace": "false", + "replace": false, "values": [ "botania:white_mystical_flower", "botania:orange_mystical_flower", diff --git a/src/main/resources/data/botania/tags/items/mini_flowers.json b/src/main/resources/data/botania/tags/items/mini_flowers.json new file mode 100644 index 000000000..1c0b98488 --- /dev/null +++ b/src/main/resources/data/botania/tags/items/mini_flowers.json @@ -0,0 +1,13 @@ +{ + "replace": false, + "values": [ + "botania:agricarnation_chibi", + "botania:bellethorn_chibi", + "botania:bubbell_chibi", + "botania:clayconia_chibi", + "botania:hopperhock_chibi", + "botania:marimorphosis_chibi", + "botania:rannuncarpus_chibi", + "botania:solegnolia_chibi" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/mystical_flowers.json b/src/main/resources/data/botania/tags/items/mystical_flowers.json new file mode 100644 index 000000000..b868f7c71 --- /dev/null +++ b/src/main/resources/data/botania/tags/items/mystical_flowers.json @@ -0,0 +1,21 @@ +{ + "replace": false, + "values": [ + "botania:white_mystical_flower", + "botania:orange_mystical_flower", + "botania:magenta_mystical_flower", + "botania:light_blue_mystical_flower", + "botania:yellow_mystical_flower", + "botania:lime_mystical_flower", + "botania:pink_mystical_flower", + "botania:gray_mystical_flower", + "botania:light_gray_mystical_flower", + "botania:cyan_mystical_flower", + "botania:purple_mystical_flower", + "botania:blue_mystical_flower", + "botania:brown_mystical_flower", + "botania:green_mystical_flower", + "botania:red_mystical_flower", + "botania:black_mystical_flower" + ] +} \ No newline at end of file