From d00349cbc72d5e744b1cb03a2de7b0c3f69f4694 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 30 Oct 2019 23:54:03 -0500 Subject: [PATCH] Yeet all the lexicon and multiblock code (this temporarily kills the sextant, which will be reimplemented on top of the patchouli multiblocks --- .../java/vazkii/botania/api/BotaniaAPI.java | 72 - .../api/internal/DummyMethodHandler.java | 56 - .../botania/api/internal/DummyPage.java | 32 - .../api/internal/IGuiLexiconEntry.java | 83 - .../api/internal/IInternalMethodHandler.java | 22 - .../lexicon/BotaniaTutorialStartEvent.java | 29 - .../botania/api/lexicon/IAddonEntry.java | 28 - .../vazkii/botania/api/lexicon/ILexicon.java | 21 - .../botania/api/lexicon/ILexiconable.java | 31 - .../api/lexicon/IRecipeKeyProvider.java | 23 - .../botania/api/lexicon/ITwoNamedPage.java | 23 - .../botania/api/lexicon/KnowledgeType.java | 20 - .../botania/api/lexicon/LexiconCategory.java | 88 - .../botania/api/lexicon/LexiconEntry.java | 377 ----- .../botania/api/lexicon/LexiconPage.java | 98 -- .../api/lexicon/LexiconRecipeMappings.java | 80 - .../multiblock/IMultiblockRenderHook.java | 33 - .../api/lexicon/multiblock/Multiblock.java | 193 --- .../api/lexicon/multiblock/MultiblockSet.java | 39 - .../multiblock/component/AnyComponent.java | 32 - .../multiblock/component/FlowerComponent.java | 41 - .../component/MultiblockComponent.java | 91 - .../multiblock/component/TagComponent.java | 50 - .../api/subtile/TileEntitySpecialFlower.java | 8 - .../core/handler/ClientTickHandler.java | 1 - .../client/core/handler/HUDHandler.java | 67 +- .../client/core/handler/ModelHandler.java | 5 - .../core/handler/MultiblockBlockAccess.java | 78 - .../core/handler/MultiblockRenderHandler.java | 182 -- .../handler/PersistentVariableHelper.java | 40 +- .../client/core/handler/RenderLexicon.java | 85 +- .../client/core/proxy/ClientProxy.java | 63 - .../client/gui/lexicon/GuiLexicon.java | 657 ------- .../gui/lexicon/GuiLexiconChallenge.java | 170 -- .../gui/lexicon/GuiLexiconChallengesList.java | 137 -- .../client/gui/lexicon/GuiLexiconEntry.java | 401 ----- .../client/gui/lexicon/GuiLexiconHistory.java | 59 - .../client/gui/lexicon/GuiLexiconIndex.java | 464 ----- .../botania/client/gui/lexicon/IParented.java | 7 - .../lexicon/button/GuiButtonAchievement.java | 58 - .../gui/lexicon/button/GuiButtonBack.java | 50 - .../button/GuiButtonBackWithShift.java | 30 - .../gui/lexicon/button/GuiButtonBookmark.java | 77 - .../gui/lexicon/button/GuiButtonCategory.java | 146 -- .../button/GuiButtonChallengeIcon.java | 64 - .../button/GuiButtonChallengeInfo.java | 51 - .../lexicon/button/GuiButtonChallenges.java | 50 - .../gui/lexicon/button/GuiButtonDoot.java | 58 - .../gui/lexicon/button/GuiButtonHistory.java | 52 - .../lexicon/button/GuiButtonIndexEntry.java | 120 -- .../gui/lexicon/button/GuiButtonLexicon.java | 30 - .../gui/lexicon/button/GuiButtonNotes.java | 56 - .../gui/lexicon/button/GuiButtonOptions.java | 49 - .../gui/lexicon/button/GuiButtonPage.java | 46 - .../lexicon/button/GuiButtonScaleChange.java | 56 - .../gui/lexicon/button/GuiButtonShare.java | 48 - .../button/GuiButtonUpdateWarning.java | 79 - .../lexicon/button/GuiButtonViewOnline.java | 45 - .../processor/MultiCraftingProcessor.java | 1 - .../client/render/tile/RenderTilePool.java | 13 +- .../client/render/tile/RenderTilePylon.java | 25 +- .../java/vazkii/botania/common/Botania.java | 5 - .../botania/common/block/BlockAlfPortal.java | 10 +- .../botania/common/block/BlockAltGrass.java | 10 +- .../botania/common/block/BlockAltar.java | 10 +- .../common/block/BlockAnimatedTorch.java | 10 +- .../botania/common/block/BlockAvatar.java | 10 +- .../botania/common/block/BlockBifrost.java | 3 +- .../common/block/BlockBifrostPerm.java | 11 +- .../botania/common/block/BlockCell.java | 10 +- .../botania/common/block/BlockCocoon.java | 9 +- .../common/block/BlockCraftyCrate.java | 7 - .../common/block/BlockEnchantedSoil.java | 10 +- .../botania/common/block/BlockEnderEye.java | 10 +- .../botania/common/block/BlockFelPumpkin.java | 10 +- .../block/BlockFloatingSpecialFlower.java | 9 +- .../botania/common/block/BlockForestEye.java | 10 +- .../botania/common/block/BlockGhostRail.java | 10 +- .../botania/common/block/BlockHourglass.java | 10 +- .../common/block/BlockIncensePlate.java | 9 +- .../common/block/BlockLightLauncher.java | 10 +- .../botania/common/block/BlockLightRelay.java | 10 +- .../botania/common/block/BlockManaBomb.java | 10 +- .../common/block/BlockModDoubleFlower.java | 10 +- .../botania/common/block/BlockModFlower.java | 10 +- .../common/block/BlockModLexiconable.java | 22 - .../botania/common/block/BlockOpenCrate.java | 10 +- .../common/block/BlockPistonRelay.java | 10 +- .../botania/common/block/BlockPlatform.java | 10 +- .../botania/common/block/BlockPylon.java | 9 +- .../botania/common/block/BlockRoot.java | 10 +- .../botania/common/block/BlockSolidVines.java | 10 +- .../common/block/BlockSparkChanger.java | 10 +- .../common/block/BlockSpecialFlower.java | 9 +- .../botania/common/block/BlockStorage.java | 10 +- .../common/block/BlockTeruTeruBozu.java | 10 +- .../botania/common/block/BlockTinyPlanet.java | 10 +- .../botania/common/block/ModBlocks.java | 48 +- .../botania/common/block/ModFluffBlocks.java | 18 +- .../botania/common/block/ModMultiblocks.java | 33 - .../corporea/BlockCorporeaCrystalCube.java | 10 +- .../block/corporea/BlockCorporeaFunnel.java | 9 +- .../block/corporea/BlockCorporeaIndex.java | 10 +- .../corporea/BlockCorporeaInterceptor.java | 10 +- .../block/corporea/BlockCorporeaRetainer.java | 10 +- .../common/block/decor/BlockElfGlass.java | 10 +- .../block/decor/BlockFloatingFlower.java | 10 +- .../common/block/decor/BlockManaFlame.java | 10 +- .../common/block/decor/BlockManaGlass.java | 10 +- .../common/block/decor/BlockModMushroom.java | 10 +- .../common/block/decor/BlockPetalBlock.java | 10 +- .../common/block/decor/BlockShinyFlower.java | 7 - .../common/block/decor/BlockStarfield.java | 10 +- .../common/block/decor/BlockTinyPotato.java | 10 +- .../decor/quartz/BlockElfQuartzSlab.java | 7 - .../decor/quartz/BlockElfQuartzStairs.java | 7 - .../quartz/BlockSpecialQuartzPillar.java | 10 +- .../decor/slabs/BlockBiomeStoneSlab.java | 7 - .../block/decor/slabs/BlockModSlab.java | 11 +- .../block/decor/slabs/BlockPavementSlab.java | 7 - .../decor/stairs/BlockBiomeStoneStairs.java | 7 - .../block/decor/stairs/BlockModStairs.java | 10 +- .../decor/stairs/BlockPavementStairs.java | 7 - .../decor/walls/BlockBiomeStoneWall.java | 8 - .../block/decor/walls/BlockModWall.java | 10 +- .../block/mana/BlockAlchemyCatalyst.java | 10 +- .../common/block/mana/BlockBellows.java | 10 +- .../common/block/mana/BlockBrewery.java | 10 +- .../block/mana/BlockConjurationCatalyst.java | 7 - .../common/block/mana/BlockDistributor.java | 10 +- .../common/block/mana/BlockEnchanter.java | 10 +- .../common/block/mana/BlockForestDrum.java | 19 +- .../common/block/mana/BlockManaDetector.java | 10 +- .../common/block/mana/BlockManaVoid.java | 10 +- .../botania/common/block/mana/BlockPool.java | 10 +- .../botania/common/block/mana/BlockPrism.java | 10 +- .../botania/common/block/mana/BlockPump.java | 11 +- .../common/block/mana/BlockRFGenerator.java | 10 +- .../common/block/mana/BlockRuneAltar.java | 9 +- .../common/block/mana/BlockSpawnerClaw.java | 10 +- .../common/block/mana/BlockSpreader.java | 10 +- .../common/block/mana/BlockTerraPlate.java | 10 +- .../common/block/mana/BlockTurntable.java | 10 +- .../common/block/string/BlockRedString.java | 11 +- .../common/block/subtile/SubTileManastar.java | 7 - .../block/subtile/SubTilePureDaisy.java | 6 - .../functional/SubTileAgricarnation.java | 7 - .../subtile/functional/SubTileBellethorn.java | 7 - .../subtile/functional/SubTileBergamute.java | 7 - .../subtile/functional/SubTileBubbell.java | 7 - .../subtile/functional/SubTileClayconia.java | 7 - .../subtile/functional/SubTileDaffomill.java | 7 - .../subtile/functional/SubTileDreadthorn.java | 6 - .../subtile/functional/SubTileExoflame.java | 7 - .../functional/SubTileFallenKanade.java | 7 - .../functional/SubTileHeiseiDream.java | 7 - .../subtile/functional/SubTileHopperhock.java | 7 - .../subtile/functional/SubTileHyacidus.java | 7 - .../functional/SubTileJadedAmaranthus.java | 7 - .../subtile/functional/SubTileJiyuulia.java | 7 - .../subtile/functional/SubTileLoonuim.java | 7 - .../functional/SubTileMarimorphosis.java | 7 - .../subtile/functional/SubTileMedumone.java | 7 - .../subtile/functional/SubTileOrechid.java | 7 - .../functional/SubTileOrechidIgnem.java | 7 - .../functional/SubTilePollidisiac.java | 6 - .../functional/SubTileRannuncarpus.java | 7 - .../subtile/functional/SubTileSolegnolia.java | 7 - .../functional/SubTileSpectranthemum.java | 7 - .../functional/SubTileTangleberrie.java | 7 - .../subtile/functional/SubTileTigerseye.java | 7 - .../subtile/functional/SubTileVinculotus.java | 7 - .../subtile/generating/SubTileArcaneRose.java | 7 - .../generating/SubTileDandelifeon.java | 7 - .../subtile/generating/SubTileEndoflame.java | 7 - .../generating/SubTileEntropinnyum.java | 7 - .../generating/SubTileGourmaryllis.java | 7 - .../generating/SubTileHydroangeas.java | 8 - .../subtile/generating/SubTileKekimurus.java | 7 - .../subtile/generating/SubTileMunchdew.java | 6 - .../subtile/generating/SubTileNarslimmus.java | 7 - .../subtile/generating/SubTileRafflowsia.java | 7 - .../subtile/generating/SubTileShulkMeNot.java | 7 - .../subtile/generating/SubTileSpectrolus.java | 7 - .../subtile/generating/SubTileThermalily.java | 7 - .../common/block/tile/TileAlfPortal.java | 22 - .../common/block/tile/TileEnchanter.java | 20 - .../common/block/tile/TileTerraPlate.java | 16 - .../core/handler/InternalMethodHandler.java | 64 - .../botania/common/core/proxy/IProxy.java | 11 - .../common/core/proxy/ServerProxy.java | 16 - .../botania/common/crafting/SyncHandler.java | 1 - .../common/entity/EntityDoppleganger.java | 44 - .../botania/common/item/ItemLexicon.java | 22 +- .../botania/common/item/ItemSextant.java | 18 +- .../common/lexicon/AlfheimLexiconEntry.java | 13 - .../common/lexicon/BLexiconCategory.java | 27 - .../common/lexicon/BasicLexiconEntry.java | 65 - .../common/lexicon/CompatLexiconEntry.java | 31 - .../common/lexicon/DogLexiconEntry.java | 30 - .../common/lexicon/HeadLexiconEntry.java | 26 - .../botania/common/lexicon/LexiconData.java | 1503 ----------------- .../common/lexicon/RelicLexiconEntry.java | 46 - .../common/lexicon/TutLexiconEntry.java | 30 - .../common/lexicon/WIPLexiconEntry.java | 27 - .../common/lexicon/WelcomeLexiconEntry.java | 44 - .../botania/common/lexicon/page/PageBrew.java | 107 -- .../lexicon/page/PageCraftingRecipe.java | 207 --- .../common/lexicon/page/PageElvenRecipe.java | 171 -- .../common/lexicon/page/PageEntity.java | 108 -- .../common/lexicon/page/PageGuide.java | 51 - .../common/lexicon/page/PageImage.java | 53 - .../common/lexicon/page/PageLoreText.java | 41 - .../lexicon/page/PageManaInfusionRecipe.java | 219 --- .../common/lexicon/page/PageModRecipe.java | 190 --- .../common/lexicon/page/PageMultiblock.java | 144 -- .../common/lexicon/page/PagePetalRecipe.java | 64 - .../common/lexicon/page/PageRecipe.java | 188 --- .../common/lexicon/page/PageRuneRecipe.java | 88 - .../common/lexicon/page/PageTerrasteel.java | 98 -- .../botania/common/lexicon/page/PageText.java | 125 -- .../common/lexicon/page/PageTutorial.java | 75 - .../common/network/PacketSyncRecipes.java | 2 - 223 files changed, 193 insertions(+), 10164 deletions(-) delete mode 100644 src/main/java/vazkii/botania/api/internal/DummyPage.java delete mode 100644 src/main/java/vazkii/botania/api/internal/IGuiLexiconEntry.java delete mode 100644 src/main/java/vazkii/botania/api/lexicon/BotaniaTutorialStartEvent.java delete mode 100644 src/main/java/vazkii/botania/api/lexicon/IAddonEntry.java delete mode 100644 src/main/java/vazkii/botania/api/lexicon/ILexicon.java delete mode 100644 src/main/java/vazkii/botania/api/lexicon/ILexiconable.java delete mode 100644 src/main/java/vazkii/botania/api/lexicon/IRecipeKeyProvider.java delete mode 100644 src/main/java/vazkii/botania/api/lexicon/ITwoNamedPage.java delete mode 100644 src/main/java/vazkii/botania/api/lexicon/KnowledgeType.java delete mode 100644 src/main/java/vazkii/botania/api/lexicon/LexiconCategory.java delete mode 100644 src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java delete mode 100644 src/main/java/vazkii/botania/api/lexicon/LexiconPage.java delete mode 100644 src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java delete mode 100644 src/main/java/vazkii/botania/api/lexicon/multiblock/IMultiblockRenderHook.java delete mode 100644 src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java delete mode 100644 src/main/java/vazkii/botania/api/lexicon/multiblock/MultiblockSet.java delete mode 100644 src/main/java/vazkii/botania/api/lexicon/multiblock/component/AnyComponent.java delete mode 100644 src/main/java/vazkii/botania/api/lexicon/multiblock/component/FlowerComponent.java delete mode 100644 src/main/java/vazkii/botania/api/lexicon/multiblock/component/MultiblockComponent.java delete mode 100644 src/main/java/vazkii/botania/api/lexicon/multiblock/component/TagComponent.java delete mode 100644 src/main/java/vazkii/botania/client/core/handler/MultiblockBlockAccess.java delete mode 100644 src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java delete mode 100644 src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java delete mode 100644 src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallenge.java delete mode 100644 src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallengesList.java delete mode 100644 src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java delete mode 100644 src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconHistory.java delete mode 100644 src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java delete mode 100644 src/main/java/vazkii/botania/client/gui/lexicon/IParented.java delete mode 100644 src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonAchievement.java delete mode 100644 src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBack.java delete mode 100644 src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBackWithShift.java delete mode 100644 src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBookmark.java delete mode 100644 src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonCategory.java delete mode 100644 src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeIcon.java delete mode 100644 src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeInfo.java delete mode 100644 src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallenges.java delete mode 100644 src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonDoot.java delete mode 100644 src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonHistory.java delete mode 100644 src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonIndexEntry.java delete mode 100644 src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonLexicon.java delete mode 100644 src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonNotes.java delete mode 100644 src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonOptions.java delete mode 100644 src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonPage.java delete mode 100644 src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonScaleChange.java delete mode 100644 src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonShare.java delete mode 100644 src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonUpdateWarning.java delete mode 100644 src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonViewOnline.java delete mode 100644 src/main/java/vazkii/botania/common/block/BlockModLexiconable.java delete mode 100644 src/main/java/vazkii/botania/common/block/ModMultiblocks.java delete mode 100644 src/main/java/vazkii/botania/common/lexicon/AlfheimLexiconEntry.java delete mode 100644 src/main/java/vazkii/botania/common/lexicon/BLexiconCategory.java delete mode 100644 src/main/java/vazkii/botania/common/lexicon/BasicLexiconEntry.java delete mode 100644 src/main/java/vazkii/botania/common/lexicon/CompatLexiconEntry.java delete mode 100644 src/main/java/vazkii/botania/common/lexicon/DogLexiconEntry.java delete mode 100644 src/main/java/vazkii/botania/common/lexicon/HeadLexiconEntry.java delete mode 100644 src/main/java/vazkii/botania/common/lexicon/LexiconData.java delete mode 100644 src/main/java/vazkii/botania/common/lexicon/RelicLexiconEntry.java delete mode 100644 src/main/java/vazkii/botania/common/lexicon/TutLexiconEntry.java delete mode 100644 src/main/java/vazkii/botania/common/lexicon/WIPLexiconEntry.java delete mode 100644 src/main/java/vazkii/botania/common/lexicon/WelcomeLexiconEntry.java delete mode 100644 src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java delete mode 100644 src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java delete mode 100644 src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java delete mode 100644 src/main/java/vazkii/botania/common/lexicon/page/PageEntity.java delete mode 100644 src/main/java/vazkii/botania/common/lexicon/page/PageGuide.java delete mode 100644 src/main/java/vazkii/botania/common/lexicon/page/PageImage.java delete mode 100644 src/main/java/vazkii/botania/common/lexicon/page/PageLoreText.java delete mode 100644 src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java delete mode 100644 src/main/java/vazkii/botania/common/lexicon/page/PageModRecipe.java delete mode 100644 src/main/java/vazkii/botania/common/lexicon/page/PageMultiblock.java delete mode 100644 src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java delete mode 100644 src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java delete mode 100644 src/main/java/vazkii/botania/common/lexicon/page/PageRuneRecipe.java delete mode 100644 src/main/java/vazkii/botania/common/lexicon/page/PageTerrasteel.java delete mode 100644 src/main/java/vazkii/botania/common/lexicon/page/PageText.java delete mode 100644 src/main/java/vazkii/botania/common/lexicon/page/PageTutorial.java diff --git a/src/main/java/vazkii/botania/api/BotaniaAPI.java b/src/main/java/vazkii/botania/api/BotaniaAPI.java index 3b919189b..fbb6ed3a8 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPI.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPI.java @@ -38,9 +38,6 @@ import vazkii.botania.api.brew.Brew; import vazkii.botania.api.internal.DummyMethodHandler; import vazkii.botania.api.internal.IInternalMethodHandler; import vazkii.botania.api.item.IFloatingFlower; -import vazkii.botania.api.lexicon.KnowledgeType; -import vazkii.botania.api.lexicon.LexiconCategory; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.recipe.RecipeBrew; import vazkii.botania.api.recipe.RecipeElvenTrade; import vazkii.botania.api.recipe.RecipeManaInfusion; @@ -63,11 +60,6 @@ public final class BotaniaAPI { @CapabilityInject(IFloatingFlower.class) public static Capability FLOATING_FLOWER_CAP; - private static final List categories = new ArrayList<>(); - private static final List allEntries = new ArrayList<>(); - - public static final Map knowledgeTypes = new HashMap<>(); - public static final Map brewMap = new LinkedHashMap<>(); /* @@ -342,32 +334,8 @@ public final class BotaniaAPI { public static final Rarity rarityRelic = Rarity.create("RELIC", TextFormatting.GOLD); - public static final KnowledgeType basicKnowledge; - public static final KnowledgeType elvenKnowledge; - - // This is here for completeness sake, but you shouldn't use it - public static final KnowledgeType relicKnowledge; - - // All of these categories are initialized during botania's PreInit stage. - public static LexiconCategory categoryBasics; - public static LexiconCategory categoryMana; - public static LexiconCategory categoryFunctionalFlowers; - public static LexiconCategory categoryGenerationFlowers; - public static LexiconCategory categoryDevices; - public static LexiconCategory categoryTools; - public static LexiconCategory categoryBaubles; - public static LexiconCategory categoryEnder; - public static LexiconCategory categoryAlfhomancy; - public static LexiconCategory categoryMisc; - public static final Brew fallbackBrew = new Brew("fallback", "botania.brew.fallback", 0, 0); - static { - basicKnowledge = registerKnowledgeType("minecraft", TextFormatting.RESET, true); - elvenKnowledge = registerKnowledgeType("alfheim", TextFormatting.DARK_GREEN, false); - relicKnowledge = registerKnowledgeType("relic", TextFormatting.DARK_PURPLE, false); - } - /** * The internal method handler in use. * DO NOT OVERWRITE THIS OR YOU'RE GOING TO FEEL MY WRATH WHEN I UPDATE THE API. @@ -376,17 +344,6 @@ public final class BotaniaAPI { */ public static volatile IInternalMethodHandler internalHandler = new DummyMethodHandler(); - /** - * Registers a new Knowledge Type. - * @param id The ID for this knowledge type. - * @param color The color to display this knowledge type as. - */ - public static KnowledgeType registerKnowledgeType(String id, TextFormatting color, boolean autoUnlock) { - KnowledgeType type = new KnowledgeType(id, color, autoUnlock); - knowledgeTypes.put(id, type); - return type; - } - /** * Registers a Brew and returns it. */ @@ -405,35 +362,6 @@ public final class BotaniaAPI { return fallbackBrew; } - /** - * Adds a category to the list of registered categories to appear in the Lexicon. - */ - public static void addCategory(LexiconCategory category) { - categories.add(category); - } - - /** - * Gets all registered categories. - */ - public static List getAllCategories() { - return categories; - } - - /** - * Gets all registered entries. - */ - public static List getAllEntries() { - return allEntries; - } - - /** - * Registers a Lexicon Entry and adds it to the category passed in. - */ - public static void addEntry(LexiconEntry entry, LexiconCategory category) { - allEntries.add(entry); - category.entries.add(entry); - } - public static int getOreWeight(ResourceLocation tag) { return oreWeights.get(tag); } diff --git a/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java b/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java index 4876ebc50..2dd95d941 100644 --- a/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java +++ b/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java @@ -23,68 +23,12 @@ 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.subtile.TileEntitySpecialFlower; import java.util.List; public class DummyMethodHandler implements IInternalMethodHandler { - @Override - public LexiconPage textPage(String key) { - return dummyPage(key); - } - - @Override - public LexiconPage elfPaperTextPage(String key) { - return dummyPage(key); - } - - @Override - public LexiconPage imagePage(String key, String resource) { - return dummyPage(key); - } - - @Override - public LexiconPage craftingRecipePage(String key, Item... outputItems) { - return dummyPage(key); - } - - @Override - public LexiconPage petalRecipePage(String key, Item... outputItems) { - return dummyPage(key); - } - - @Override - public LexiconPage runeRecipePage(String key, Item... outputItems) { - return dummyPage(key); - } - - @Override - public LexiconPage manaInfusionRecipePage(String key, Item... outputItems) { - return dummyPage(key); - } - - @Override - public LexiconPage elvenTradePage(String key, Item... outputItems) { - return dummyPage(key); - } - - @Override - public LexiconPage brewPage(String key, String bottomText, Brew outputBrew) { - return dummyPage(key); - } - - @Override - public LexiconPage multiblockPage(String key, MultiblockSet mb) { - return dummyPage(key); - } - - private LexiconPage dummyPage(String key) { - return new DummyPage(key); - } - @Override public IManaNetwork getManaNetworkInstance() { return DummyManaNetwork.instance; diff --git a/src/main/java/vazkii/botania/api/internal/DummyPage.java b/src/main/java/vazkii/botania/api/internal/DummyPage.java deleted file mode 100644 index 20f0759d6..000000000 --- a/src/main/java/vazkii/botania/api/internal/DummyPage.java +++ /dev/null @@ -1,32 +0,0 @@ -/** - * 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 @ [Jan 14, 2014, 6:41:23 PM (GMT)] - */ -package vazkii.botania.api.internal; - -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import vazkii.botania.api.lexicon.LexiconPage; - -/** - * A dummy page. It does absolutely nothing and is only - * existant to make sure everything goes right even if - * Botania isn't loaded. - */ -public class DummyPage extends LexiconPage { - - public DummyPage(String unlocalizedName) { - super(unlocalizedName); - } - - @Override - @OnlyIn(Dist.CLIENT) - public void renderScreen(IGuiLexiconEntry gui, int x, int y) {} - -} diff --git a/src/main/java/vazkii/botania/api/internal/IGuiLexiconEntry.java b/src/main/java/vazkii/botania/api/internal/IGuiLexiconEntry.java deleted file mode 100644 index c62eb5ae4..000000000 --- a/src/main/java/vazkii/botania/api/internal/IGuiLexiconEntry.java +++ /dev/null @@ -1,83 +0,0 @@ -/** - * 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 @ [Jan 14, 2014, 6:48:41 PM (GMT)] - */ -package vazkii.botania.api.internal; - -import net.minecraft.client.gui.widget.Widget; -import net.minecraft.client.gui.widget.button.Button; -import net.minecraft.client.gui.widget.button.Button; -import vazkii.botania.api.lexicon.LexiconEntry; - -import java.util.List; - -/** - * Internal interface for the Lexicon Entry GUI. This contains - * everything that can be accessed from it. It's safe to cast - * this type to GuiScreen. - */ -public interface IGuiLexiconEntry { - - /** - * Gets the entry currently portrayed in this gui. - */ - public LexiconEntry getEntry(); - - /** - * Gets the current page the lexicon GUI is browsing. - */ - public int getPageOn(); - - /** - * Gets the leftmost part of the GUI. - */ - public int getLeft(); - - /** - * Gets the topmost part of the GUI. - */ - public int getTop(); - - /** - * Gets the GUI's width. - */ - public int getWidth(); - - /** - * Gets the GUI's height - */ - public int getHeight(); - - /** - * Gets the GUI's Z level for rendering. - */ - public float getZLevel(); - - /** - * Gets the list of buttons in this gui. - */ - public List getButtonList(); - - /** - * Gets the total amount of ticks (+ partial ticks) the player - * has been in this gui. - */ - public float getElapsedTicks(); - - /** - * Gets the current partial ticks. - */ - public float getPartialTicks(); - - /** - * Gets the delta (1F = 1 tick) between this render call - * and the last one. - */ - public float getTickDelta(); -} diff --git a/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java b/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java index 649af32aa..3fffb5b7c 100644 --- a/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java +++ b/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java @@ -25,8 +25,6 @@ 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.subtile.TileEntitySpecialFlower; import java.util.List; @@ -40,26 +38,6 @@ import java.util.List; */ public interface IInternalMethodHandler { - public LexiconPage textPage(String key); - - public LexiconPage elfPaperTextPage(String key); - - public LexiconPage imagePage(String key, String resource); - - public LexiconPage craftingRecipePage(String key, Item... outputItems); - - public LexiconPage petalRecipePage(String key, Item... outputItems); - - public LexiconPage runeRecipePage(String key, Item... outputItems); - - public LexiconPage manaInfusionRecipePage(String key, Item... outputItems); - - public LexiconPage elvenTradePage(String key, Item... outputItems); - - public LexiconPage brewPage(String key, String bottomText, Brew outputBrew); - - public LexiconPage multiblockPage(String key, MultiblockSet mb); - public IManaNetwork getManaNetworkInstance(); public boolean shouldForceCheck(); diff --git a/src/main/java/vazkii/botania/api/lexicon/BotaniaTutorialStartEvent.java b/src/main/java/vazkii/botania/api/lexicon/BotaniaTutorialStartEvent.java deleted file mode 100644 index 7b4ab8214..000000000 --- a/src/main/java/vazkii/botania/api/lexicon/BotaniaTutorialStartEvent.java +++ /dev/null @@ -1,29 +0,0 @@ -/** - * 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 @ [04/12/2015, 18:29:56 (GMT)] - */ -package vazkii.botania.api.lexicon; - -import net.minecraftforge.eventbus.api.Event; - -import java.util.Queue; - -/** - * Fired when the Lexica Botania's tutorial is started. You can add your - * own entries to the tutorial here. Please use this responsibly. - */ -public class BotaniaTutorialStartEvent extends Event { - - public final Queue tutorial; - - public BotaniaTutorialStartEvent(Queue tutorial) { - this.tutorial = tutorial; - } - -} diff --git a/src/main/java/vazkii/botania/api/lexicon/IAddonEntry.java b/src/main/java/vazkii/botania/api/lexicon/IAddonEntry.java deleted file mode 100644 index b2f871ebb..000000000 --- a/src/main/java/vazkii/botania/api/lexicon/IAddonEntry.java +++ /dev/null @@ -1,28 +0,0 @@ -/** - * 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 @ [Jun 8, 2014, 7:02:48 PM (GMT)] - */ -package vazkii.botania.api.lexicon; - -/** - * Have a LexiconEntry implement this to signify it's an "Addon entry", as - * in, one provided by an Addon. This allows it to draw a subtitle of - * sorts, to prevent the [Mod tag here] nonsense that happened with thaumcraft - * addons. It can also be used for other purposes, such as stating an - * entry is WIP. - */ -public interface IAddonEntry { - - /** - * Returns the unlocalized subtitle to show below the title. Here you'd - * return something like "(This Entry is provided by the Botanic Tinkerer addon)". - */ - public String getSubtitle(); - -} diff --git a/src/main/java/vazkii/botania/api/lexicon/ILexicon.java b/src/main/java/vazkii/botania/api/lexicon/ILexicon.java deleted file mode 100644 index ee07e17fc..000000000 --- a/src/main/java/vazkii/botania/api/lexicon/ILexicon.java +++ /dev/null @@ -1,21 +0,0 @@ -package vazkii.botania.api.lexicon; - -import net.minecraft.item.ItemStack; - -/** - * Basic interface for the Lexica Botania. - */ -public interface ILexicon { - - /** - * Gets if a specific knowledge is unlocked. Check the knowledge types in - * BotaniaAPI. - */ - public boolean isKnowledgeUnlocked(ItemStack stack, KnowledgeType knowledge); - - /** - * Unlocks a specfic type of knowledge. - */ - public void unlockKnowledge(ItemStack stack, KnowledgeType knowledge); - -} diff --git a/src/main/java/vazkii/botania/api/lexicon/ILexiconable.java b/src/main/java/vazkii/botania/api/lexicon/ILexiconable.java deleted file mode 100644 index d4827c52b..000000000 --- a/src/main/java/vazkii/botania/api/lexicon/ILexiconable.java +++ /dev/null @@ -1,31 +0,0 @@ -/** - * 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 @ [Jan 20, 2014, 7:05:44 PM (GMT)] - */ -package vazkii.botania.api.lexicon; - -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -/** - * Any block that implements this can be right clicked with - * a Lexica Botania to open a entry page. - */ -@FunctionalInterface -public interface ILexiconable { - - /** - * Gets the lexicon entry to open at this location. null works too. - */ - public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon); - -} diff --git a/src/main/java/vazkii/botania/api/lexicon/IRecipeKeyProvider.java b/src/main/java/vazkii/botania/api/lexicon/IRecipeKeyProvider.java deleted file mode 100644 index 1d04127d3..000000000 --- a/src/main/java/vazkii/botania/api/lexicon/IRecipeKeyProvider.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * 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 @ [Mar 20, 2014, 6:08:48 PM (GMT)] - */ -package vazkii.botania.api.lexicon; - -import net.minecraft.item.ItemStack; - -/** - * Have an Item implement this so that the method used for mapping it into - * the lexicon recipe mappings isn't the typical id:meta key. - */ -public interface IRecipeKeyProvider { - - public String getKey(ItemStack stack); - -} diff --git a/src/main/java/vazkii/botania/api/lexicon/ITwoNamedPage.java b/src/main/java/vazkii/botania/api/lexicon/ITwoNamedPage.java deleted file mode 100644 index 19592b177..000000000 --- a/src/main/java/vazkii/botania/api/lexicon/ITwoNamedPage.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * 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 @ [Nov 3, 2014, 2:59:55 PM (GMT)] - */ -package vazkii.botania.api.lexicon; - -/** - * A LexiconPage that implements this has two unlocalized names - * rather than one. (See brew pages) - */ -public interface ITwoNamedPage { - - public void setSecondUnlocalizedName(String name); - - public String getSecondUnlocalizedName(); - -} diff --git a/src/main/java/vazkii/botania/api/lexicon/KnowledgeType.java b/src/main/java/vazkii/botania/api/lexicon/KnowledgeType.java deleted file mode 100644 index 26c182067..000000000 --- a/src/main/java/vazkii/botania/api/lexicon/KnowledgeType.java +++ /dev/null @@ -1,20 +0,0 @@ -package vazkii.botania.api.lexicon; - -import net.minecraft.util.text.TextFormatting; - -public class KnowledgeType { - - public final String id; - public final TextFormatting color; - public final boolean autoUnlock; - - public KnowledgeType(String id, TextFormatting color, boolean autoUnlock) { - this.id = id; - this.color = color; - this.autoUnlock = autoUnlock; - } - - public String getUnlocalizedName() { - return "botania.knowledge." + id; - } -} diff --git a/src/main/java/vazkii/botania/api/lexicon/LexiconCategory.java b/src/main/java/vazkii/botania/api/lexicon/LexiconCategory.java deleted file mode 100644 index bfe627b0f..000000000 --- a/src/main/java/vazkii/botania/api/lexicon/LexiconCategory.java +++ /dev/null @@ -1,88 +0,0 @@ -/** - * 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 @ [Jan 14, 2014, 6:23:47 PM (GMT)] - */ -package vazkii.botania.api.lexicon; - -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; - -import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.List; - -public class LexiconCategory implements Comparable { - - private static int count = 0; - - public final String unlocalizedName; - public final List entries = new ArrayList<>(); - private final int sortingId; - private ResourceLocation icon; - private int priority = 5; - - /** - * @param unlocalizedName The unlocalized name of this category. This will be localized by the client display. - */ - public LexiconCategory(String unlocalizedName) { - this.unlocalizedName = unlocalizedName; - sortingId = count; - count++; - } - - public String getUnlocalizedName() { - return unlocalizedName; - } - - /** - * Sets the priority for this category for sorting. Higher numbers - * means they'll appear first in the book. The basics category - * is 9, the miscellaneous category is 0, other vanilla botania categories - * are 5. Using 9 and 0 is not recommended, since having your - * categories before basics or after miscellaneous is a bad idea. - * If two categories have the same priority they'll be sorted - * by insertion order. - */ - public LexiconCategory setPriority(int priority) { - this.priority = priority; - return this; - } - - public int getSortingPriority() { - return priority; - } - - public final int getSortingId() { - return sortingId; - } - - public LexiconCategory setIcon(ResourceLocation icon) { - this.icon = icon; - return this; - } - - public ResourceLocation getIcon() { - return icon; - } - - @Override - public int compareTo(@Nonnull LexiconCategory category) { - return priority == category.priority ? sortingId - category.sortingId : category.priority - priority; - } - - /** - * Determines if the category shows up in the lexicon category index. - * Contained entries will still appear in the lexicon index - * and must be hidden separately if desired. - * @param stack The lexicon stack used by the player - */ - public boolean isVisible(ItemStack stack) { - return true; - } -} diff --git a/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java b/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java deleted file mode 100644 index b4e3bab4d..000000000 --- a/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java +++ /dev/null @@ -1,377 +0,0 @@ -/** - * 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 @ [Jan 14, 2014, 6:17:06 PM (GMT)] - */ -package vazkii.botania.api.lexicon; - -import com.google.common.base.CaseFormat; -import com.google.common.collect.ImmutableMap; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.IRecipe; -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; -import vazkii.botania.api.BotaniaAPI; -import vazkii.botania.api.recipe.IModRecipe; -import vazkii.botania.api.recipe.RecipeManaInfusion; -import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.lexicon.AlfheimLexiconEntry; -import vazkii.botania.common.lexicon.CompatLexiconEntry; -import vazkii.botania.common.lexicon.RelicLexiconEntry; -import vazkii.botania.common.lexicon.WelcomeLexiconEntry; -import vazkii.botania.common.lexicon.page.PageBrew; -import vazkii.botania.common.lexicon.page.PageCraftingRecipe; -import vazkii.botania.common.lexicon.page.PageElvenRecipe; -import vazkii.botania.common.lexicon.page.PageImage; -import vazkii.botania.common.lexicon.page.PageLoreText; -import vazkii.botania.common.lexicon.page.PageManaInfusionRecipe; -import vazkii.botania.common.lexicon.page.PageModRecipe; -import vazkii.botania.common.lexicon.page.PageMultiblock; -import vazkii.botania.common.lexicon.page.PagePetalRecipe; -import vazkii.botania.common.lexicon.page.PageTerrasteel; -import vazkii.botania.common.lexicon.page.PageText; -import vazkii.botania.common.lib.LibLexicon; -import vazkii.botania.common.lib.ModTags; - -import javax.annotation.Nonnull; -import java.io.BufferedOutputStream; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.OutputStreamWriter; -import java.nio.file.Paths; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.function.Predicate; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import static vazkii.botania.common.lib.ResourceLocationHelper.prefix; - -public class LexiconEntry implements Comparable { - - public final String unlocalizedName; - public final LexiconCategory category; - - private KnowledgeType type = BotaniaAPI.basicKnowledge; - - public final List pages = new ArrayList<>(); - private boolean priority = false; - private ItemStack icon = ItemStack.EMPTY; - - private final List extraDisplayedRecipes = new ArrayList<>(); - - /** - * @param unlocalizedName The unlocalized name of this entry. This will be localized by the client display. - */ - public LexiconEntry(String unlocalizedName, LexiconCategory category) { - this.unlocalizedName = unlocalizedName; - this.category = category; - } - - /** - * Sets this page as prioritized, as in, will appear before others in the lexicon. - */ - public LexiconEntry setPriority() { - priority = true; - return this; - } - - /** - * Sets the Knowledge type of this entry. - */ - public LexiconEntry setKnowledgeType(KnowledgeType type) { - this.type = type; - return this; - } - - public KnowledgeType getKnowledgeType() { - return type; - } - - /** - * Sets the display icon for this entry. Overriding the one already there. When adding recipe pages to the - * entry, this will be called once for the result of the first found recipe. - */ - public void setIcon(ItemStack stack) { - icon = stack; - } - - public ItemStack getIcon() { - return icon; - } - - public boolean isPriority() { - return priority; - } - - public String getUnlocalizedName() { - return unlocalizedName; - } - - public String getTagline() { - return ""; // Override this if you want a tagline. You probably do - } - - @OnlyIn(Dist.CLIENT) - public boolean isVisible() { - return true; - } - - private static Map multiblocks = ImmutableMap.builder() - .put("botania.page.terrasteel4", "botania:terra_plate") - .put("botania.page.manaEnchanting2", "botania:enchanter") - .put("botania.page.aIntro4", "botania:alfheim_portal") - .put("botania.page.gaiaRitual2", "botania:gaia_ritual").build(); - - // Basic mapping of input -> advancement, requires manually checking first - private static Map, ResourceLocation> inputsToAdvancements = ImmutableMap., ResourceLocation>builder() - .put(or(ModTags.Items.INGOTS_TERRASTEEL::contains, ModTags.Items.NUGGETS_TERRASTEEL::contains), - prefix("main/terrasteel_pickup")) - .put(ModTags.Items.RUNES::contains, prefix("main/runic_altar_pickup")) - .put(oneOf(ModItems.manaDiamond, ModItems.manaPearl, ModItems.manaSteel, ModItems.manaPowder, ModItems.manaString), - prefix("main/mana_pool_pickup")) - .put(or(ModTags.Items.LIVINGWOOD::contains, ModTags.Items.LIVINGWOOD::contains), prefix("main/pure_daisy_pickup")) - .put(ModTags.Items.PETALS::contains, prefix("main/flower_pickup")) - .build(); - - private static Predicate or(Predicate first, Predicate second) { - return first.or(second); - } - - private static Predicate oneOf(Item... items) { - return item -> { - for(Item i : items) - if(i == item) return true; - return false; - }; - } - - public void dump() { - File dir = Paths.get(".", "entries", fixCamelCase(category.getUnlocalizedName().substring(LibLexicon.CATEGORY_PREFIX.length()))).toFile(); - if(!dir.exists()) - dir.mkdirs(); - File f = new File(dir, fixCamelCase(this.unlocalizedName) + ".json"); - if (f.exists()) - throw new RuntimeException("preexisting file " + f.getAbsolutePath()); - Gson gson = new GsonBuilder().setPrettyPrinting().create(); - try (OutputStreamWriter os = new OutputStreamWriter(new BufferedOutputStream(new FileOutputStream(f)))) { - Map entry = new LinkedHashMap<>(); - - entry.put("name", this.getUnlocalizedName()); - entry.put("category", fixCamelCase(category.getUnlocalizedName().substring("botania.category.".length()))); - entry.put("icon", getIcon().getItem().getRegistryName().toString()); - if(this.getKnowledgeType().color != TextFormatting.RESET) { - entry.put("entry_color", Integer.toString(this.getKnowledgeType().color.getColor(), 16)); - } - if (isPriority()) { - entry.put("priority", true); - } - if (this instanceof WelcomeLexiconEntry) - entry.put("sortnum", -10); - if (this instanceof RelicLexiconEntry) { - ResourceLocation advancement = ((RelicLexiconEntry) this).advancement; - if(advancement != null) - entry.put("advancement", advancement.toString()); - } else if(this instanceof AlfheimLexiconEntry) { - entry.put("advancement", "botania:main/elf_lexicon_pickup"); - } else if(this instanceof CompatLexiconEntry) { - entry.put("flag", "|debug,mod:" + ((CompatLexiconEntry) this).mod.toLowerCase(Locale.ROOT)); - } - - if(!entry.containsKey("advancement")) { - for(Map.Entry, ResourceLocation> thing : inputsToAdvancements.entrySet()) { - if(pages.stream().flatMap(this::getRecipeInputs).map(ItemStack::getItem).anyMatch(thing.getKey())) { - entry.put("advancement", thing.getValue().toString()); - break; - } - } - } - - List pages = new ArrayList<>(); - for (int i = 0; i < this.pages.size(); i++) { - LexiconPage page = this.pages.get(i); - Map json = new LinkedHashMap<>(); - String unlocalizedName = page.getUnlocalizedName(); - if (page instanceof PageLoreText) { - json.put("type", "lore_page"); - json.put("text", unlocalizedName); - json.put(i % 2 == 0 ? "left_side" : "right_side", "true"); - } else if (page instanceof PageText) { - json.put("type", "text"); - json.put("text", unlocalizedName); - } else if (page instanceof PageImage) { - json.put("type", "image"); - json.put("text", unlocalizedName); - json.put("images", Collections.singletonList(((PageImage) page).resource.toString())); - } else if (page instanceof PageCraftingRecipe) { - List> recipes = ((PageCraftingRecipe) page).getRecipes(); - json.put("type", recipes.size() <= 2 ? "crafting" : "crafting_multi"); - json.put("text", unlocalizedName); - if (recipes.size() <= 2) { - json.put("recipe", recipes.get(0).getId().toString()); - if(recipes.size() == 2) - json.put("recipe2", recipes.get(1).getId().toString()); - } else - json.put("recipes", recipes.stream().map(r -> r.getId().toString()).collect(Collectors.joining(";"))); - } else if (page instanceof PageManaInfusionRecipe) { - json.put("type", "mana_infusion"); - json.put("text", unlocalizedName); - json.put("recipes", ((PageManaInfusionRecipe) page).getRecipes().stream().map(r -> r.getId().toString()).collect(Collectors.joining(";"))); - } else if (page instanceof PageModRecipe) { - json.put("type", page instanceof PagePetalRecipe ? "petal_apothecary" : "runic_altar"); - json.put("text", unlocalizedName); - List strings = ((PageModRecipe) page).getRecipes().stream().map(r -> r.getId().toString()).collect(Collectors.toList()); - if(strings.size() == 1) { - json.put("recipe", strings.get(0)); - } else { - json.put("recipes", strings); - } - } else if (page instanceof PageElvenRecipe) { - json.put("type", "elven_trade"); - json.put("text", unlocalizedName); - json.put("recipes", ((PageElvenRecipe) page).getRecipes().stream().map(r -> r.getId().toString()).collect(Collectors.joining(";"))); - } else if (page instanceof PageBrew) { - json.put("type", "brew"); - json.put("text", ((PageBrew) page).text); - json.put("flavor", unlocalizedName); - json.put("recipe", ((PageBrew) page).recipe.getId().toString()); - } else if (page instanceof PageMultiblock) { - json.put("type", "multiblock"); - json.put("multiblock_id", multiblocks.get(unlocalizedName)); - json.put("text", unlocalizedName); - if (unlocalizedName.contains("terrasteel") || unlocalizedName.contains("aIntro")) { - json.put("symmetrical", true); - } - } else if(page instanceof PageTerrasteel) { - json.put("type", "terrasteel"); - json.put("text", unlocalizedName); - } else { - json.put("type", "_unknown_" + page.getClass().getSimpleName().toLowerCase(Locale.ROOT)); - json.put("text", unlocalizedName); - } - pages.add(json); - } - entry.put("pages", pages); - os.write(gson.toJson(entry)); - } catch (IOException e) { - e.printStackTrace(); - } - } - - public Stream getRecipeInputs(LexiconPage page) { - Stream stream; - if(page instanceof PageModRecipe) { - stream = ((PageModRecipe) page).getRecipes().stream().flatMap(o -> o.getInputs().stream()); - } else if(page instanceof PageCraftingRecipe) { - stream = ((PageCraftingRecipe) page).getRecipes().stream().flatMap(o -> o.getIngredients().stream()); - } else if(page instanceof PageManaInfusionRecipe) { - stream = ((PageManaInfusionRecipe) page).getRecipes().stream().map(RecipeManaInfusion::getInput); - } else if(page instanceof PageElvenRecipe) { - stream = ((PageElvenRecipe) page).getRecipes().stream().flatMap(o -> o.getInputs().stream()); - } else if(page instanceof PageBrew) { - stream = ((PageBrew) page).recipe.getInputs().stream(); - } else { - stream = Stream.empty(); - } - return stream.flatMap(ingr -> Stream.of(ingr.getMatchingStacks())); - } - - private static String fixCamelCase(String s) { - if(LibLexicon.CATEGORY_FUNCTIONAL_FLOWERS.equals(s)) { - return "functional_flowers"; - } else if(LibLexicon.CATEGORY_GENERATION_FLOWERS.equals(s)) { - return "generating_flowers"; - } else if(s.length() == 6 && s.endsWith("Intro")) { - return "intro"; - } - return CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, s); - } - - /** - * Sets what pages you want this entry to have. - */ - public LexiconEntry setLexiconPages(LexiconPage... pages) { - this.pages.addAll(Arrays.asList(pages)); - - for(int i = 0; i < this.pages.size(); i++) { - LexiconPage page = this.pages.get(i); - if(!page.skipRegistry) - page.onPageAdded(this, i); - } - - return this; - } - - /** - * Returns the web link for this entry. If this isn't null, looking at this entry will - * show a "View Online" button in the book. The String returned should be the URL to - * open when the button is clicked. - */ - public String getWebLink() { - return null; - } - - /** - * Adds a page to the list of pages. - */ - public void addPage(LexiconPage page) { - pages.add(page); - } - - public final String getNameForSorting() { - // todo used to be localized - return (priority ? 0 : 1) + getUnlocalizedName(); - } - - public List getDisplayedRecipes() { - ArrayList list = new ArrayList<>(); - for(LexiconPage page : pages) { - ArrayList itemsAddedThisPage = new ArrayList<>(); - - for(ItemStack s : page.getDisplayedRecipes()) { - addItem: { - for(ItemStack s1 : itemsAddedThisPage) - if(s1.getItem() == s.getItem()) - break addItem; - for(ItemStack s1 : list) - if(s1.isItemEqual(s) && ItemStack.areItemStackTagsEqual(s1, s)) - break addItem; - - itemsAddedThisPage.add(s); - list.add(s); - } - } - } - - list.addAll(extraDisplayedRecipes); - - return list; - } - - public void addExtraDisplayedRecipe(ItemStack stack) { - extraDisplayedRecipes.add(stack); - } - - @Override - public int compareTo(@Nonnull LexiconEntry o) { - return getNameForSorting().compareTo(o.getNameForSorting()); - } - -} \ No newline at end of file diff --git a/src/main/java/vazkii/botania/api/lexicon/LexiconPage.java b/src/main/java/vazkii/botania/api/lexicon/LexiconPage.java deleted file mode 100644 index 280eff959..000000000 --- a/src/main/java/vazkii/botania/api/lexicon/LexiconPage.java +++ /dev/null @@ -1,98 +0,0 @@ -/** - * 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 @ [Jan 14, 2014, 6:17:24 PM (GMT)] - */ -package vazkii.botania.api.lexicon; - -import com.google.common.collect.ImmutableList; -import net.minecraft.client.gui.widget.button.Button; -import net.minecraft.item.ItemStack; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import vazkii.botania.api.internal.IGuiLexiconEntry; - -import java.util.List; - -public abstract class LexiconPage { - - public String unlocalizedName; - public boolean skipRegistry; - - public LexiconPage(String unlocalizedName) { - this.unlocalizedName = unlocalizedName; - } - - /** - * Does the rendering for this page. - * @param gui The active GuiScreen - * @param mx The mouse's relative X position. - * @param my The mouse's relative Y position. - */ - @OnlyIn(Dist.CLIENT) - public abstract void renderScreen(IGuiLexiconEntry gui, int mx, int my); - - /** - * Called per update tick. Non gui-sensitive version, kept for backwards compatibility only. - */ - @OnlyIn(Dist.CLIENT) - public void updateScreen() {} - - /** - * Called per update tick. Feel free to override fully, the - * call to updateScreen() is for backwards compatibility. - */ - @OnlyIn(Dist.CLIENT) - public void updateScreen(IGuiLexiconEntry gui) { - updateScreen(); - } - - /** - * Called when this page is opened, be it via initGui() or when the player changes page. - * You can add buttons and whatever you'd do on initGui() here. - */ - @OnlyIn(Dist.CLIENT) - public void onOpened(IGuiLexiconEntry gui) {} - - /** - * Called when this page is opened, be it via closing the gui or when the player changes page. - * Make sure to dispose of anything you don't use any more, such as buttons in the gui's buttonList. - */ - @OnlyIn(Dist.CLIENT) - public void onClosed(IGuiLexiconEntry gui) {} - - /** - * Called when a key is pressed. - */ - @OnlyIn(Dist.CLIENT) - public boolean keyPressed(int keyCode, int scanCode, int mods) { - return false; - } - - /** - * Called when {@link LexiconEntry#setLexiconPages(LexiconPage...)} is called. - */ - public void onPageAdded(LexiconEntry entry, int index) {} - - /** - * Shows the list of recipes present in this page for display in the category - * page. - */ - public List getDisplayedRecipes() { - return ImmutableList.of(); - } - - public String getUnlocalizedName() { - return unlocalizedName; - } - - public LexiconPage setSkipRegistry() { - skipRegistry = true; - return this; - } -} diff --git a/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java b/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java deleted file mode 100644 index 7cf37b1b8..000000000 --- a/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java +++ /dev/null @@ -1,80 +0,0 @@ -/** - * 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 @ [Mar 6, 2014, 3:54:12 PM (GMT)] - */ -package vazkii.botania.api.lexicon; - -import net.minecraft.item.ItemStack; - -import java.util.HashMap; -import java.util.Map; - -/** - * This class contains mappings for which entry and page correspond to each - * craftable ItemStack. Use the map method to map an ItemStack to a page in - * an entry in the lexicon. - */ -public final class LexiconRecipeMappings { - - private static final Map mappings = new HashMap<>(); - - /** - * 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); - - if(force || !mappings.containsKey(str)) - mappings.put(str, data); - if(entry.getIcon().isEmpty()) - entry.setIcon(stack.copy()); - } - - public static void map(ItemStack stack, LexiconEntry entry, int page) { - map(stack, entry, page, false); - } - - public static void remove(ItemStack stack) { - mappings.remove(stackToString(stack)); - } - - public static EntryData getDataForStack(ItemStack stack) { - return mappings.get(stackToString(stack)); - } - - private static String stackToString(ItemStack stack) { - if(stack.isEmpty()) - return "NULL"; - - if(stack.hasTag() && stack.getItem() instanceof IRecipeKeyProvider) - return ((IRecipeKeyProvider) stack.getItem()).getKey(stack); - - return stack.getTranslationKey(); - } - - public static void clear() { - mappings.clear(); - } - - public static class EntryData { - - public final LexiconEntry entry; - public final int page; - - EntryData(LexiconEntry entry, int page) { - this.entry = entry; - this.page = page; - } - - } -} diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/IMultiblockRenderHook.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/IMultiblockRenderHook.java deleted file mode 100644 index c8ed031a0..000000000 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/IMultiblockRenderHook.java +++ /dev/null @@ -1,33 +0,0 @@ -/** - * 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 @ [Jun 27, 2015, 7:48:47 PM (GMT)] - */ -package vazkii.botania.api.lexicon.multiblock; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.BlockState; -import net.minecraft.world.IBlockReader; -import vazkii.botania.api.lexicon.multiblock.component.MultiblockComponent; - -import java.util.HashMap; -import java.util.Map; - -/** - * A hook for rendering blocks in the multiblock display. - */ -public interface IMultiblockRenderHook { - - public static Map renderHooks = new HashMap<>(); - - public void renderBlockForMultiblock(IBlockReader world, Multiblock mb, BlockState state, MultiblockComponent comp); - - public boolean needsTranslate(BlockState state); - -} diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java deleted file mode 100644 index 961428bdd..000000000 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java +++ /dev/null @@ -1,193 +0,0 @@ -/** - * 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 @ [Jun 27, 2015, 2:37:22 PM (GMT)] - */ -package vazkii.botania.api.lexicon.multiblock; - -import net.minecraft.block.BlockState; -import net.minecraft.item.ItemStack; -import net.minecraft.util.Direction; -import net.minecraft.util.Direction; -import net.minecraft.util.math.BlockPos; -import vazkii.botania.api.lexicon.multiblock.component.MultiblockComponent; - -import java.util.ArrayList; -import java.util.EnumMap; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * This class describes a Mutiblock object. It's used to display a - * multiblock in the lexicon and to show the player in a ghost-like - * look in the world. - */ -public class Multiblock { - - public final List components = new ArrayList<>(); - public final List materials = new ArrayList<>(); - - public BlockPos minPos = BlockPos.ZERO; - public BlockPos maxPos = BlockPos.ZERO; - public BlockPos offPos = BlockPos.ZERO; - - public final HashMap locationCache = new HashMap<>(); - - /** - * Adds a multiblock component to this multiblock. The component's x y z - * coords should be pivoted to the center of the structure. - */ - public void addComponent(MultiblockComponent component) { - if(getComponentForLocation(component.getRelativePosition()) != null) - throw new IllegalArgumentException("Location in multiblock already occupied"); - components.add(component); - changeAxisForNewComponent(component.getRelativePosition()); - calculateCostForNewComponent(component); - addComponentToLocationCache(component); - } - - /** - * Constructs and adds a multiblock component to this multiblock. The x y z - * coords should be pivoted to the center of the structure. - */ - public void addComponent(BlockPos pos, BlockState state) { - addComponent(new MultiblockComponent(pos, state)); - } - - private void changeAxisForNewComponent(BlockPos pos) { - if(pos.getX() < minPos.getX()) - minPos = new BlockPos(pos.getX(), minPos.getY(), minPos.getZ()); - else if(pos.getX() > maxPos.getX()) - maxPos = new BlockPos(pos.getX(), maxPos.getY(), maxPos.getZ()); - - if(pos.getY() < minPos.getY()) - minPos = new BlockPos(minPos.getX(), pos.getY(), minPos.getZ()); - else if(pos.getY() > maxPos.getY()) - maxPos = new BlockPos(maxPos.getX(), pos.getY(), maxPos.getZ()); - - if(pos.getZ() < minPos.getZ()) - minPos = new BlockPos(minPos.getX(), minPos.getY(), pos.getZ()); - else if(pos.getZ() > maxPos.getZ()) - maxPos = new BlockPos(maxPos.getX(), maxPos.getY(), pos.getZ()); - } - - private void calculateCostForNewComponent(MultiblockComponent comp) { - ItemStack[] materials = comp.getMaterials(); - if(materials != null) - for(ItemStack stack : materials) - addStack(stack); - } - - private void addStack(ItemStack stack) { - if(stack.isEmpty()) - return; - - for(ItemStack oStack : materials) - if(oStack.isItemEqual(stack) && ItemStack.areItemStackTagsEqual(oStack, stack)) { - oStack.grow(stack.getCount()); - return; - } - - materials.add(stack); - } - - public void setRenderOffset(BlockPos pos) { - offPos = pos; - } - - public List getComponents() { - return components; - } - - /** - * Rotates this multiblock by the angle passed in. For the best results, use - * only multiples of pi/2. - */ - public void rotate(double angle) { - for(MultiblockComponent comp : getComponents()) - comp.rotate(angle); - updateLocationCache(); - } - - public Multiblock copy() { - Multiblock mb = new Multiblock(); - for(MultiblockComponent comp : getComponents()) - mb.addComponent(comp.copy()); - - return mb; - } - - /** - * Creates a length 4 array of all the rotations multiple of pi/2 required - * to render this multiblock in the world relevant to the 4 cardinal - * orientations. - */ - public Map createRotations() { - Map ret = new EnumMap<>(Direction.class); - - ret.put(Direction.SOUTH, this); - - ret.put(Direction.WEST, ret.get(Direction.SOUTH).copy()); - ret.get(Direction.WEST).rotate(Math.PI / 2); - - ret.put(Direction.NORTH, ret.get(Direction.WEST).copy()); - ret.get(Direction.NORTH).rotate(Math.PI / 2); - - ret.put(Direction.EAST, ret.get(Direction.NORTH).copy()); - ret.get(Direction.EAST).rotate(Math.PI / 2); - - return ret; - } - - /** - * Makes a MultiblockSet from this Multiblock and its rotations using - * createRotations(). - */ - public MultiblockSet makeSet() { - return new MultiblockSet(this); - } - - public int getXSize() { - return Math.abs(minPos.getX()) + Math.abs(maxPos.getX()) + 1; - } - - public int getYSize() { - return Math.abs(minPos.getY()) + Math.abs(maxPos.getY()) + 1; - } - - public int getZSize() { - return Math.abs(minPos.getZ()) + Math.abs(maxPos.getZ()) + 1; - } - - /** - * Rebuilds the location cache - */ - public void updateLocationCache() { - locationCache.clear(); - for(MultiblockComponent comp : components) - addComponentToLocationCache(comp); - } - - /** - * Adds a single component to the location cache - */ - private void addComponentToLocationCache(MultiblockComponent comp) { - BlockPos pos = comp.getRelativePosition(); - locationCache.put(pos, comp); - } - - /** - * Gets the component for a given location - * @param pos - */ - public MultiblockComponent getComponentForLocation(BlockPos pos) { - return locationCache.get(pos); - } - -} diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/MultiblockSet.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/MultiblockSet.java deleted file mode 100644 index 588ddb3ef..000000000 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/MultiblockSet.java +++ /dev/null @@ -1,39 +0,0 @@ -/** - * 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 @ [Jun 27, 2015, 7:31:58 PM (GMT)] - */ -package vazkii.botania.api.lexicon.multiblock; - -import net.minecraft.entity.Entity; -import net.minecraft.util.Direction; -import net.minecraft.util.Direction; - -import java.util.Collections; -import java.util.Map; - -/** - * A set of Multiblock objects for various rotations. - */ -public class MultiblockSet { - - private final Map mbs; - - public MultiblockSet(Multiblock mb) { - mbs = Collections.unmodifiableMap(mb.createRotations()); - } - - public Multiblock getForEntity(Entity e) { - return getForFacing(e.getHorizontalFacing()); - } - - public Multiblock getForFacing(Direction facing) { - return mbs.get(facing); - } - -} diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/AnyComponent.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/AnyComponent.java deleted file mode 100644 index 515745455..000000000 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/AnyComponent.java +++ /dev/null @@ -1,32 +0,0 @@ -/** - * 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 @ [01/11/2015, 19:05:57 (GMT)] - */ -package vazkii.botania.api.lexicon.multiblock.component; - -import net.minecraft.block.BlockState; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -/** - * A multiblock component that matches any non air blocks that have a collision box. - */ -public class AnyComponent extends MultiblockComponent { - - public AnyComponent(BlockPos relPos, BlockState state) { - super(relPos, state); - } - - @Override - public boolean matches(World world, BlockPos pos) { - BlockState state = world.getBlockState(pos); - return !state.getBlock().isAir(state, world, pos) && !state.getCollisionShape(world, pos).isEmpty(); - } - -} diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/FlowerComponent.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/FlowerComponent.java deleted file mode 100644 index 042fdbf8d..000000000 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/FlowerComponent.java +++ /dev/null @@ -1,41 +0,0 @@ -/** - * 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 @ [Jun 28, 2015, 3:23:15 PM (GMT)] - */ -package vazkii.botania.api.lexicon.multiblock.component; - -import net.minecraft.block.Block; -import net.minecraft.tags.BlockTags; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import vazkii.botania.api.BotaniaAPI; -import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.common.lib.LibMisc; - -/** - * A multiblock component that matches any botania flower. - */ -public class FlowerComponent extends TagComponent { - - public FlowerComponent(BlockPos relPos, Block block) { - super(relPos, block, new BlockTags.Wrapper(new ResourceLocation(LibMisc.MOD_ID, "mystical_flowers"))); - } - - @Override - public boolean matches(World world, BlockPos pos) { - return BotaniaAPI.internalHandler.isBotaniaFlower(world, pos); - } - - @Override - public MultiblockComponent copy() { - return new FlowerComponent(relPos, state.getBlock()); - } - -} diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/MultiblockComponent.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/MultiblockComponent.java deleted file mode 100644 index 297c4a0bd..000000000 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/MultiblockComponent.java +++ /dev/null @@ -1,91 +0,0 @@ -/** - * 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 @ [Jun 27, 2015, 2:42:32 PM (GMT)] - */ -package vazkii.botania.api.lexicon.multiblock.component; - -import net.minecraft.block.BlockState; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; - -/** - * A component of a multiblock, the normal one - * is just a block. - */ -public class MultiblockComponent { - - protected BlockPos relPos; - protected final BlockState state; - protected final TileEntity tileEntity; - private final boolean doFancyRender; - - public MultiblockComponent(BlockPos relPos, BlockState state) { - this(relPos, state, null); - } - - public MultiblockComponent(BlockPos relPos, BlockState state, boolean doFancyRender) { - this(relPos, state, doFancyRender, null); - } - - public MultiblockComponent(BlockPos relPos, BlockState state, TileEntity tileEntity) { - this(relPos, state, state.getBlock().hasTileEntity(state) == (tileEntity != null), tileEntity); - } - - public MultiblockComponent(BlockPos relPos, BlockState state, boolean doFancyRender, TileEntity tileEntity) { - this.relPos = relPos; - this.state = state; - this.tileEntity = tileEntity; - this.doFancyRender = doFancyRender; - } - - public BlockPos getRelativePosition() { - return relPos; - } - - public BlockState getBlockState() { - return state; - } - - public boolean matches(World world, BlockPos pos) { - return world.getBlockState(pos) == state; - } - - public ItemStack[] getMaterials() { - return new ItemStack[] { new ItemStack(state.getBlock()) }; - } - - public void rotate(double angle) { - double x = relPos.getX(); - double z = relPos.getZ(); - double sin = Math.sin(angle); - double cos = Math.cos(angle); - - double xn = x * cos - z * sin; - double zn = x * sin + z * cos; - relPos = new BlockPos((int) Math.round(xn), relPos.getY(), (int) Math.round(zn)); - } - - public MultiblockComponent copy() { - return new MultiblockComponent(relPos, state, tileEntity); - } - - public TileEntity getTileEntity() { - return tileEntity; - } - - @OnlyIn(Dist.CLIENT) - public boolean shouldDoFancyRender() { - return doFancyRender; - } - -} diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/TagComponent.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/TagComponent.java deleted file mode 100644 index eed4d69f5..000000000 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/TagComponent.java +++ /dev/null @@ -1,50 +0,0 @@ -/** - * 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 @ [Jun 27, 2015, 7:20:09 PM (GMT)] - */ -package vazkii.botania.api.lexicon.multiblock.component; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.tags.Tag; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import vazkii.botania.api.BotaniaAPI; - -public class TagComponent extends MultiblockComponent { - - private final Tag tag; - - public TagComponent(BlockPos relPos, Block block, Tag tag) { - super(relPos, block.getDefaultState()); - this.tag = tag; - } - - @Override - public BlockState getBlockState() { - if (tag.getAllElements().isEmpty()) { - return super.getBlockState(); - } else { - Block[] arr = tag.getAllElements().toArray(new Block[0]); - int idx = (int) (BotaniaAPI.internalHandler.getWorldElapsedTicks() / 20) % arr.length; - return arr[idx].getDefaultState(); - } - } - - @Override - public boolean matches(World world, BlockPos pos) { - return world.getBlockState(pos).getBlock().isIn(tag); - } - - @Override - public MultiblockComponent copy() { - return new TagComponent(getRelativePosition(), getBlockState().getBlock(), tag); - } - -} diff --git a/src/main/java/vazkii/botania/api/subtile/TileEntitySpecialFlower.java b/src/main/java/vazkii/botania/api/subtile/TileEntitySpecialFlower.java index 5413ad743..64dc10423 100644 --- a/src/main/java/vazkii/botania/api/subtile/TileEntitySpecialFlower.java +++ b/src/main/java/vazkii/botania/api/subtile/TileEntitySpecialFlower.java @@ -54,7 +54,6 @@ import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.capability.FloatingFlowerImpl; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.item.IFloatingFlower; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.wand.IWandBindable; import vazkii.botania.common.block.ModBlocks; @@ -254,13 +253,6 @@ public class TileEntitySpecialFlower extends TileEntity implements ITickableTile return list; } - /** - * Gets which Lexicon Entry to open when this sub tile is right clicked with a lexicon. - */ - public LexiconEntry getEntry() { - return null; - } - /** * Gets the block coordinates this is bound to, for use with the wireframe render * when the sub tile is being hovered with a wand of the forest. diff --git a/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java b/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java index c54836b15..d1dd2bfd7 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java @@ -21,7 +21,6 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.api.distmarker.Dist; import vazkii.botania.api.mana.IManaCollector; import vazkii.botania.api.mana.TileSignature; -import vazkii.botania.client.gui.lexicon.GuiLexicon; import vazkii.botania.common.block.subtile.functional.SubTileVinculotus; import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex; import vazkii.botania.common.core.handler.ManaNetworkHandler; diff --git a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java index 35052f024..68cbca7ca 100644 --- a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java @@ -41,9 +41,6 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.items.IItemHandler; import org.lwjgl.opengl.GL11; import vazkii.botania.api.BotaniaAPI; -import vazkii.botania.api.lexicon.ILexicon; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.ICreativeManaProvider; import vazkii.botania.api.mana.IManaItem; import vazkii.botania.api.mana.IManaUsingItem; @@ -136,12 +133,11 @@ public final class HUDHandler { ((IWandHUD) block).renderHUD(mc, mc.world, bpos); profiler.endSection(); } - } else if(block != null && PlayerHelper.hasHeldItemClass(mc.player, ILexicon.class)) - drawLexiconHUD(PlayerHelper.getFirstHeldItemClass(mc.player, ILexicon.class), state, (BlockRayTraceResult) pos); + } if(tile instanceof TilePool && !mc.player.getHeldItemMainhand().isEmpty()) renderPoolRecipeHUD((TilePool) tile, mc.player.getHeldItemMainhand()); } - if(!PlayerHelper.hasHeldItemClass(mc.player, ILexicon.class)) { + if(!PlayerHelper.hasHeldItem(mc.player, ModItems.lexicon)) { if(tile instanceof TileAltar) ((TileAltar) tile).renderHUD(mc); else if(tile instanceof TileRuneAltar) @@ -158,13 +154,6 @@ public final class HUDHandler { profiler.endSection(); } - if(MultiblockRenderHandler.currentMultiblock != null && MultiblockRenderHandler.anchor == null) { - profiler.startSection("multiblockRightClick"); - String s = I18n.format("botaniamisc.rightClickToAnchor"); - mc.fontRenderer.drawStringWithShadow(s, mc.mainWindow.getScaledWidth() / 2 - mc.fontRenderer.getStringWidth(s) / 2, mc.mainWindow.getScaledHeight() / 2 - 30, 0xFFFFFF); - profiler.endSection(); - } - if(!main.isEmpty() && main.getItem() instanceof ItemCraftingHalo) { profiler.startSection("craftingHalo_main"); ItemCraftingHalo.renderHUD(mc.player, main); @@ -371,58 +360,6 @@ public final class HUDHandler { profiler.endSection(); } - private static void drawLexiconHUD(ItemStack stack, BlockState state, BlockRayTraceResult pos) { - Minecraft mc = Minecraft.getInstance(); - Block block = state.getBlock(); - IProfiler profiler = mc.getProfiler(); - - profiler.startSection("lexicon"); - FontRenderer font = mc.fontRenderer; - boolean draw = false; - String drawStr = ""; - String secondLine = ""; - - GlStateManager.enableBlend(); - GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - int sx = mc.mainWindow.getScaledWidth() / 2 - 17; - int sy = mc.mainWindow.getScaledHeight() / 2 + 2; - - if(block instanceof ILexiconable) { - LexiconEntry entry = ((ILexiconable) block).getEntry(mc.world, pos.getPos(), mc.player, stack); - if(entry != null) { - if(!((ILexicon) stack.getItem()).isKnowledgeUnlocked(stack, entry.getKnowledgeType())) - font = mc.getFontResourceManager().getFontRenderer(Minecraft.standardGalacticFontRenderer); - - drawStr = I18n.format(entry.getUnlocalizedName()); - secondLine = TextFormatting.ITALIC + I18n.format(entry.getTagline()); - draw = true; - } - } - - if(draw) { - if(!mc.player.isSneaking()) { - drawStr = "?"; - secondLine = ""; - font = mc.fontRenderer; - } - - mc.getItemRenderer().renderItemIntoGUI(new ItemStack(ModItems.lexicon), sx, sy); - GlStateManager.disableLighting(); - font.drawStringWithShadow(drawStr, sx + 20, sy + 4, 0xFFFFFFFF); - font.drawStringWithShadow(secondLine, sx + 20, sy + 14, 0xFFAAAAAA); - - if(!mc.player.isSneaking()) { - GlStateManager.scalef(0.5F, 0.5F, 1F); - mc.fontRenderer.drawStringWithShadow(TextFormatting.BOLD + mc.gameSettings.keyBindSneak.getLocalizedName(), (sx + 10) * 2 - 16, (sy + 8) * 2 + 20, 0xFFFFFFFF); - GlStateManager.scalef(2F, 2F, 1F); - } - } - - GlStateManager.disableBlend(); - GlStateManager.color4f(1F, 1F, 1F, 1F); - profiler.endSection(); - } - private static void renderNearIndexDisplay() { Minecraft mc = Minecraft.getInstance(); String txt0 = I18n.format("botaniamisc.nearIndex0"); diff --git a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java index a19a102e9..de2d3fc56 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -23,7 +23,6 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.api.distmarker.Dist; import vazkii.botania.api.BotaniaAPIClient; import vazkii.botania.api.item.IFloatingFlower; -import vazkii.botania.api.lexicon.multiblock.IMultiblockRenderHook; import vazkii.botania.api.subtile.TileEntitySpecialFlower; import vazkii.botania.client.model.FloatingFlowerModel; import vazkii.botania.client.render.entity.RenderBabylonWeapon; @@ -115,10 +114,6 @@ public final class ModelHandler { RenderingRegistry.registerEntityRenderingHandler(EntityThornChakram.class, renderManager -> new SpriteRenderer<>(renderManager, Minecraft.getInstance().getItemRenderer())); RenderingRegistry.registerEntityRenderingHandler(EntityVineBall.class, renderManager -> new SpriteRenderer<>(renderManager, Minecraft.getInstance().getItemRenderer())); RenderingRegistry.registerEntityRenderingHandler(EntityEnderAirBottle.class, renderManager -> new SpriteRenderer<>(renderManager, Minecraft.getInstance().getItemRenderer())); - - IMultiblockRenderHook.renderHooks.put(ModBlocks.manaPylon, renderTilePylon); - IMultiblockRenderHook.renderHooks.put(ModBlocks.naturaPylon, renderTilePylon); - IMultiblockRenderHook.renderHooks.put(ModBlocks.gaiaPylon, renderTilePylon); } private static void registerSubtiles() { diff --git a/src/main/java/vazkii/botania/client/core/handler/MultiblockBlockAccess.java b/src/main/java/vazkii/botania/client/core/handler/MultiblockBlockAccess.java deleted file mode 100644 index d4a3d322e..000000000 --- a/src/main/java/vazkii/botania/client/core/handler/MultiblockBlockAccess.java +++ /dev/null @@ -1,78 +0,0 @@ -/** - * 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 @ [Aug 31, 2015, 11:40:59 PM (GMT)] - */ -package vazkii.botania.client.core.handler; - -import net.minecraft.block.BlockState; -import net.minecraft.block.BlockState; -import net.minecraft.fluid.IFluidState; -import net.minecraft.block.Blocks; -import net.minecraft.fluid.Fluids; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockReader; -import vazkii.botania.api.lexicon.multiblock.Multiblock; -import vazkii.botania.api.lexicon.multiblock.component.MultiblockComponent; - -import javax.annotation.Nonnull; - -/** - * This class acts as a wrapper around a block access to - * replace blocks with the blocks involved in the multiblock specified - */ -public class MultiblockBlockAccess implements IBlockReader { - - private IBlockReader compose; - private BlockPos anchorPos; - protected Multiblock multiblock; - - @Nonnull - @Override - public BlockState getBlockState(@Nonnull BlockPos pos) { - MultiblockComponent comp=getComponent(pos); - if(comp != null) - return comp.getBlockState(); - if(compose != null) - return compose.getBlockState(pos); - return Blocks.AIR.getDefaultState(); - } - - @Nonnull - @Override - public IFluidState getFluidState(BlockPos pos) { - return compose != null ? compose.getFluidState(pos) : Fluids.EMPTY.getDefaultState(); - } - - @Override - public TileEntity getTileEntity(@Nonnull BlockPos pos) { - MultiblockComponent comp=getComponent(pos); - if(comp != null) - return comp.getTileEntity(); - if(compose != null) - return compose.getTileEntity(pos); - return null; - } - - /** - * Updates the block access to the new parameters - */ - public void update(IBlockReader access, Multiblock mb, BlockPos anchorPos) { - compose = access; - multiblock = mb; - this.anchorPos = anchorPos; - } - - /** - * Returns the multiblock component for the coordinates, adjusted based on the anchor - */ - private MultiblockComponent getComponent(BlockPos pos) { - return multiblock.getComponentForLocation(pos.add(new BlockPos(-anchorPos.getX(), -anchorPos.getY(), -anchorPos.getZ()))); - } -} diff --git a/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java deleted file mode 100644 index 8216d0322..000000000 --- a/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java +++ /dev/null @@ -1,182 +0,0 @@ -/** - * 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 @ [Jun 27, 2015, 7:28:29 PM (GMT)] - */ -package vazkii.botania.client.core.handler; - -import com.mojang.blaze3d.platform.GLX; -import net.minecraft.block.BlockState; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.BlockRendererDispatcher; -import com.mojang.blaze3d.platform.GlStateManager; -import net.minecraft.client.renderer.texture.AtlasTexture; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Direction; -import net.minecraft.util.Util; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.BlockRayTraceResult; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.util.text.Style; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.world.World; -import net.minecraft.world.dimension.DimensionType; -import net.minecraftforge.client.event.RenderWorldLastEvent; -import net.minecraftforge.event.entity.player.PlayerInteractEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.api.distmarker.Dist; -import org.lwjgl.opengl.GL11; -import org.lwjgl.system.MemoryUtil; -import vazkii.botania.api.lexicon.multiblock.IMultiblockRenderHook; -import vazkii.botania.api.lexicon.multiblock.Multiblock; -import vazkii.botania.api.lexicon.multiblock.MultiblockSet; -import vazkii.botania.api.lexicon.multiblock.component.MultiblockComponent; -import vazkii.botania.client.core.helper.ShaderHelper; -import vazkii.botania.common.lib.LibMisc; - -import java.nio.FloatBuffer; - -@Mod.EventBusSubscriber(value = Dist.CLIENT, modid = LibMisc.MOD_ID) -public final class MultiblockRenderHandler { - - private MultiblockRenderHandler() {} - - private static final MultiblockBlockAccess blockAccess = new MultiblockBlockAccess(); - private static DimensionType dimension; - - public static boolean rendering = false; - public static MultiblockSet currentMultiblock; - public static BlockPos anchor; - public static Direction angle; - - public static void setMultiblock(MultiblockSet set) { - currentMultiblock = set; - anchor = null; - angle = Direction.SOUTH; - - Minecraft mc = Minecraft.getInstance(); - if(mc.world != null) - dimension = mc.world.getDimension().getType(); - } - - @SubscribeEvent - public static void onWorldRenderLast(RenderWorldLastEvent event) { - Minecraft mc = Minecraft.getInstance(); - if(mc.player != null && mc.objectMouseOver != null && mc.objectMouseOver.getType() == RayTraceResult.Type.BLOCK - && (!mc.player.isSneaking() || anchor != null)) { - renderPlayerLook(mc.player, (BlockRayTraceResult) mc.objectMouseOver); - } - } - - @SubscribeEvent - public static void onPlayerInteract(PlayerInteractEvent.RightClickBlock event) { - if(currentMultiblock != null && anchor == null && event.getEntityPlayer() == Minecraft.getInstance().player) { - anchor = event.getPos(); - angle = event.getEntityPlayer().getHorizontalFacing(); - event.setCanceled(true); - event.setCancellationResult(ActionResultType.SUCCESS); - } - } - - private static void renderPlayerLook(PlayerEntity player, BlockRayTraceResult src) { - if(currentMultiblock != null && dimension == player.world.getDimension().getType()) { - BlockPos anchorPos = anchor != null ? anchor : src.getPos(); - - GlStateManager.pushMatrix(); - GL11.glPushAttrib(GL11.GL_LIGHTING_BIT); - GlStateManager.enableBlend(); - GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GlStateManager.disableLighting(); - rendering = true; - Multiblock mb = anchor != null ? currentMultiblock.getForFacing(angle) : currentMultiblock.getForEntity(player); - boolean didAny = false; - - blockAccess.update(player.world, mb, anchorPos); - - ShaderHelper.useShader(ShaderHelper.alpha, shader -> { - int alpha = GLX.glGetUniformLocation(shader, "alpha"); - ShaderHelper.FLOAT_BUF.position(0); - ShaderHelper.FLOAT_BUF.put(0, 0.4F); - GLX.glUniform1(alpha, ShaderHelper.FLOAT_BUF); - }); - - for(MultiblockComponent comp : mb.getComponents()) { - if(renderComponentInWorld(player.world, mb, comp, anchorPos)) - didAny = true; - } - - ShaderHelper.releaseShader(); - - rendering = false; - GL11.glPopAttrib(); - GlStateManager.popMatrix(); - - if(!didAny) { - setMultiblock(null); - player.sendMessage(new TranslationTextComponent("botaniamisc.structureComplete").setStyle(new Style().setColor(TextFormatting.GREEN))); - } - } - } - - private static boolean renderComponentInWorld(World world, Multiblock mb, MultiblockComponent comp, BlockPos anchorPos) { - double renderPosX = Minecraft.getInstance().getRenderManager().renderPosX; - double renderPosY = Minecraft.getInstance().getRenderManager().renderPosY; - double renderPosZ = Minecraft.getInstance().getRenderManager().renderPosZ; - - BlockPos pos = comp.getRelativePosition(); - BlockPos pos_ = pos.add(anchorPos); - if(anchor != null && comp.matches(world, pos_)) - return false; - - GlStateManager.pushMatrix(); - GlStateManager.translated(-renderPosX, -renderPosY, -renderPosZ); - GlStateManager.disableDepthTest(); - doRenderComponent(mb, comp, pos_); - GlStateManager.popMatrix(); - return true; - } - - public static void renderMultiblockOnPage(Multiblock mb) { - GlStateManager.translated(-0.5, -0.5, -0.5); - blockAccess.update(null, mb, mb.offPos); - for(MultiblockComponent comp : mb.getComponents()) { - BlockPos pos = comp.getRelativePosition(); - doRenderComponent(mb, comp, pos.add(mb.offPos)); - } - } - - private static void doRenderComponent(Multiblock mb, MultiblockComponent comp, BlockPos pos) { - GlStateManager.pushMatrix(); - GlStateManager.enableBlend(); - GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - BlockState state = comp.getBlockState(); - Minecraft.getInstance().textureManager.bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE); - if(state == null) - return; - if(IMultiblockRenderHook.renderHooks.containsKey(state.getBlock())) { - GlStateManager.color4f(1F, 1F, 1F, 1F); - IMultiblockRenderHook renderHook = IMultiblockRenderHook.renderHooks.get(state.getBlock()); - if(renderHook.needsTranslate(state)) { - GlStateManager.translated(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5); - } - renderHook.renderBlockForMultiblock(blockAccess, mb, state, comp); - } - else { - BlockRendererDispatcher brd = Minecraft.getInstance().getBlockRendererDispatcher(); - GlStateManager.translated(pos.getX(), pos.getY(), pos.getZ() + 1); - GlStateManager.color4f(1, 1, 1, 1); - brd.renderBlockBrightness(state, 1.0F); - } - GlStateManager.color4f(1F, 1F, 1F, 1F); - GlStateManager.enableDepthTest(); - GlStateManager.popMatrix(); - } -} diff --git a/src/main/java/vazkii/botania/client/core/handler/PersistentVariableHelper.java b/src/main/java/vazkii/botania/client/core/handler/PersistentVariableHelper.java index 820948b3a..fea39b81c 100644 --- a/src/main/java/vazkii/botania/client/core/handler/PersistentVariableHelper.java +++ b/src/main/java/vazkii/botania/client/core/handler/PersistentVariableHelper.java @@ -15,7 +15,6 @@ import net.minecraft.nbt.CompressedStreamTools; import net.minecraft.nbt.CompoundNBT; import vazkii.botania.client.challenge.Challenge; import vazkii.botania.client.challenge.ModChallenges; -import vazkii.botania.client.gui.lexicon.GuiLexicon; import vazkii.botania.common.lib.LibMisc; import java.io.File; @@ -29,41 +28,25 @@ public final class PersistentVariableHelper { private static final String TAG_FIRST_LOAD = "firstLoad"; private static final String TAG_DOG = "dog"; - private static final String TAG_BOOKMARK_COUNT = "bookmarkCount"; - private static final String TAG_BOOKMARK_PREFIX = "bookmark"; - private static final String TAG_BOOKMARKS = "bookmarks"; private static final String TAG_CHALLENGES = "challenges"; private static final String TAG_LEXICON_NOTES = "lexiconNotes"; private static final String TAG_LAST_BOTANIA_VERSION = "lastBotaniaVersion"; - private static final String TAG_LEXICON_GUI_SCALE = "lexiconGuiScale"; private static File cacheFile; public static boolean firstLoad = true; public static boolean dog = true; public static String lastBotaniaVersion = ""; - public static int lexiconGuiScale = 0; public static void save() throws IOException { CompoundNBT cmp = new CompoundNBT(); - List bookmarks = GuiLexicon.bookmarks; - int count = bookmarks.size(); - cmp.putInt(TAG_BOOKMARK_COUNT, count); - CompoundNBT bookmarksCmp = new CompoundNBT(); - for(int i = 0; i < count; i++) { - GuiLexicon lex = bookmarks.get(i); - CompoundNBT bookmarkCmp = new CompoundNBT(); - lex.serialize(bookmarkCmp); - bookmarksCmp.put(TAG_BOOKMARK_PREFIX + i, bookmarkCmp); - } - cmp.put(TAG_BOOKMARKS, bookmarksCmp); - CompoundNBT challengesCmp = new CompoundNBT(); for(Challenge c : ModChallenges.challengeLookup.values()) c.writeToNBT(challengesCmp); cmp.put(TAG_CHALLENGES, challengesCmp); + /* CompoundNBT notesCmp = new CompoundNBT(); for(String s : GuiLexicon.notes.keySet()) { String note = GuiLexicon.notes.get(s); @@ -71,11 +54,11 @@ public final class PersistentVariableHelper { notesCmp.putString(s, note); } cmp.put(TAG_LEXICON_NOTES, notesCmp); + */ cmp.putBoolean(TAG_FIRST_LOAD, firstLoad); cmp.putBoolean(TAG_DOG, dog); cmp.putString(TAG_LAST_BOTANIA_VERSION, lastBotaniaVersion); - cmp.putInt(TAG_LEXICON_GUI_SCALE, lexiconGuiScale); injectNBTToFile(cmp, getCacheFile()); } @@ -83,20 +66,6 @@ public final class PersistentVariableHelper { public static void load() throws IOException { CompoundNBT cmp = getCacheCompound(); - int count = cmp.getInt(TAG_BOOKMARK_COUNT); - GuiLexicon.bookmarks.clear(); - if(count > 0) { - CompoundNBT bookmarksCmp = cmp.getCompound(TAG_BOOKMARKS); - for(int i = 0; i < count; i++) { - CompoundNBT bookmarkCmp = bookmarksCmp.getCompound(TAG_BOOKMARK_PREFIX + i); - GuiLexicon gui = GuiLexicon.create(bookmarkCmp); - if(gui != null) { - GuiLexicon.bookmarks.add(gui); - GuiLexicon.bookmarkKeys.add(gui.getNotesKey()); - } - } - } - if(cmp.contains(TAG_CHALLENGES)) { CompoundNBT challengesCmp = cmp.getCompound(TAG_CHALLENGES); for(Challenge c : ModChallenges.challengeLookup.values()) @@ -106,9 +75,9 @@ public final class PersistentVariableHelper { if(cmp.contains(TAG_LEXICON_NOTES)) { CompoundNBT notesCmp = cmp.getCompound(TAG_LEXICON_NOTES); Set keys = notesCmp.keySet(); - GuiLexicon.notes.clear(); + // GuiLexicon.notes.clear(); for(String key : keys) - GuiLexicon.notes.put(key, notesCmp.getString(key)); + ;// GuiLexicon.notes.put(key, notesCmp.getString(key)); } lastBotaniaVersion = cmp.contains(TAG_LAST_BOTANIA_VERSION) ? cmp.getString(TAG_LAST_BOTANIA_VERSION) : "(N/A)"; @@ -118,7 +87,6 @@ public final class PersistentVariableHelper { lastBotaniaVersion = LibMisc.VERSION; dog = cmp.getBoolean(TAG_DOG); - lexiconGuiScale = cmp.getInt(TAG_LEXICON_GUI_SCALE); } public static void saveSafe() { diff --git a/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java b/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java index 2947a1378..8ec17b5da 100644 --- a/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java +++ b/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java @@ -1,5 +1,6 @@ package vazkii.botania.client.core.handler; +import com.google.common.base.Joiner; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.player.AbstractClientPlayerEntity; import net.minecraft.client.entity.player.AbstractClientPlayerEntity; @@ -20,16 +21,17 @@ import net.minecraftforge.client.event.RenderSpecificHandEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.api.distmarker.Dist; -import vazkii.botania.client.gui.lexicon.GuiLexicon; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.Botania; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.ItemLexicon; import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.lexicon.page.PageText; import vazkii.botania.common.lib.LibMisc; import vazkii.patchouli.client.book.gui.GuiBook; +import java.util.ArrayList; +import java.util.List; + // Hacky way to render 3D lexicon, will be reevaluated in the future. @Mod.EventBusSubscriber(value = Dist.CLIENT, modid = LibMisc.MOD_ID) public class RenderLexicon { @@ -132,7 +134,7 @@ public class RenderLexicon { String quoteStr = QUOTES[quote]; GlStateManager.translatef(-5F, 15F, 0F); - PageText.renderText(0, 0, 140, 100, 0, false, 0x79ff92, quoteStr); + renderText(0, 0, 140, 100, 0, false, 0x79ff92, quoteStr); GlStateManager.color3f(1F, 1F, 1F); GlStateManager.translatef(8F, 110F, 0F); @@ -177,4 +179,81 @@ public class RenderLexicon { GlStateManager.rotatef(i * -45.0F, 0.0F, 1.0F, 0.0F); } + private static void renderText(int x, int y, int width, int height, int paragraphSize, boolean useUnicode, int color, String unlocalizedText) { + x += 2; + y += 10; + width -= 4; + + FontRenderer font = Minecraft.getInstance().fontRenderer; + String text = I18n.format(unlocalizedText).replaceAll("&", "\u00a7"); + String[] textEntries = text.split("
"); + + List> lines = new ArrayList<>(); + + String controlCodes; + for(String s : textEntries) { + List words = new ArrayList<>(); + String lineStr = ""; + String[] tokens = s.split(" "); + for(String token : tokens) { + String prev = lineStr; + String spaced = token + " "; + lineStr += spaced; + + controlCodes = toControlCodes(getControlCodes(prev)); + if(font.getStringWidth(lineStr) > width) { + lines.add(words); + lineStr = controlCodes + spaced; + words = new ArrayList<>(); + } + + words.add(controlCodes + token); + } + + if(!lineStr.isEmpty()) + lines.add(words); + lines.add(new ArrayList<>()); + } + + int i = 0; + for(List words : lines) { + words.size(); + int xi = x; + int spacing = 4; + int wcount = words.size(); + int compensationSpaces = 0; + boolean justify = ConfigHandler.CLIENT.lexiconJustifiedText.get() && wcount > 0 && lines.size() > i && !lines.get(i + 1).isEmpty(); + + if(justify) { + String s = Joiner.on("").join(words); + int swidth = font.getStringWidth(s); + int space = width - swidth; + + spacing = wcount == 1 ? 0 : space / (wcount - 1); + compensationSpaces = wcount == 1 ? 0 : space % (wcount - 1); + } + + for(String s : words) { + int extra = 0; + if(compensationSpaces > 0) { + compensationSpaces--; + extra++; + } + font.drawString(s, xi, y, color); + xi += font.getStringWidth(s) + spacing + extra; + } + + y += words.isEmpty() ? paragraphSize : 10; + i++; + } + } + + private static String getControlCodes(String s) { + String controls = s.replaceAll("(?. 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 @ [Jan 14, 2014, 6:48:05 PM (GMT)] - */ -package vazkii.botania.client.gui.lexicon; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.audio.SimpleSound; -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.gui.widget.Widget; -import net.minecraft.client.gui.widget.button.Button; -import com.mojang.blaze3d.platform.GlStateManager; -import net.minecraft.client.resources.I18n; -import net.minecraft.client.util.InputMappings; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.SharedConstants; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraftforge.common.MinecraftForge; -import org.lwjgl.glfw.GLFW; -import org.lwjgl.opengl.GL11; -import vazkii.botania.api.BotaniaAPI; -import vazkii.botania.api.lexicon.BotaniaTutorialStartEvent; -import vazkii.botania.api.lexicon.LexiconCategory; -import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.client.core.handler.ClientTickHandler; -import vazkii.botania.client.core.handler.PersistentVariableHelper; -import vazkii.botania.client.core.helper.RenderHelper; -import vazkii.botania.client.core.proxy.ClientProxy; -import vazkii.botania.client.gui.lexicon.button.GuiButtonAchievement; -import vazkii.botania.client.gui.lexicon.button.GuiButtonBookmark; -import vazkii.botania.client.gui.lexicon.button.GuiButtonCategory; -import vazkii.botania.client.gui.lexicon.button.GuiButtonChallengeInfo; -import vazkii.botania.client.gui.lexicon.button.GuiButtonChallenges; -import vazkii.botania.client.gui.lexicon.button.GuiButtonDoot; -import vazkii.botania.client.gui.lexicon.button.GuiButtonHistory; -import vazkii.botania.client.gui.lexicon.button.GuiButtonIndexEntry; -import vazkii.botania.client.gui.lexicon.button.GuiButtonNotes; -import vazkii.botania.client.gui.lexicon.button.GuiButtonOptions; -import vazkii.botania.client.gui.lexicon.button.GuiButtonScaleChange; -import vazkii.botania.client.gui.lexicon.button.GuiButtonUpdateWarning; -import vazkii.botania.client.lib.LibResources; -import vazkii.botania.common.Botania; -import vazkii.botania.common.core.handler.ModSounds; -import vazkii.botania.common.item.ItemLexicon; -import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.lexicon.LexiconData; -import vazkii.botania.common.lexicon.page.PageText; -import vazkii.botania.common.lib.LibMisc; - -import javax.annotation.Nonnull; -import java.time.LocalDateTime; -import java.time.Month; -import java.util.ArrayDeque; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Queue; - -public class GuiLexicon extends Screen { - - public static GuiLexicon currentOpenLexicon = new GuiLexicon(); - public static ItemStack stackUsed = ItemStack.EMPTY; - - public static final Map notes = new HashMap<>(); - - private static final String TAG_TYPE = "type"; - - private static final int[] KONAMI_CODE = { - GLFW.GLFW_KEY_UP, GLFW.GLFW_KEY_UP, GLFW.GLFW_KEY_DOWN, GLFW.GLFW_KEY_DOWN, - GLFW.GLFW_KEY_LEFT, GLFW.GLFW_KEY_RIGHT, GLFW.GLFW_KEY_LEFT, GLFW.GLFW_KEY_RIGHT, - GLFW.GLFW_KEY_B, GLFW.GLFW_KEY_A - }; - - public static final int BOOKMARK_START = 1337; - public static final int MAX_BOOKMARK_COUNT = 8; - public static final List bookmarks = new ArrayList<>(); - public static final List bookmarkKeys = new ArrayList<>(); - public boolean bookmarksNeedPopulation = false; - - public static final Queue tutorial = new ArrayDeque<>(); - - public static final ResourceLocation texture = new ResourceLocation(LibResources.GUI_LEXICON); - public static final ResourceLocation textureToff = new ResourceLocation(LibResources.GUI_TOFF); - - public float lastTime = 0F; - public float partialTicks = 0F; - public float timeDelta = 0F; - - private static final int TUTORIAL_ARROW_WIDTH = 10; - private static final int TUTORIAL_ARROW_HEIGHT = 12; - boolean hasTutorialArrow; - private int tutorialArrowX, tutorialArrowY; - private int konamiIndex; - private int konamiTime; - - private static final int NOTE_TWEEN_TIME = 5; - public static boolean notesEnabled; - private static int notesMoveTime; - public String note = ""; - public String categoryHighlight = ""; - - final int guiWidth = 146; - final int guiHeight = 180; - protected final Minecraft mc = Minecraft.getInstance(); - int left, top; - - public GuiLexicon() { - this(new TranslationTextComponent(ModItems.lexicon.getTranslationKey())); - } - - protected GuiLexicon(ITextComponent title) { - super(title); - } - - @Override - public final void init() { - super.init(); - - if(PersistentVariableHelper.firstLoad) { - PersistentVariableHelper.firstLoad = false; - PersistentVariableHelper.saveSafe(); - } - - String key = getNotesKey(); - if(notes.containsKey(key)) - note = notes.get(key); - - onInitGui(); - - putTutorialArrow(); - } - - public void onInitGui() { - int guiScale = mc.gameSettings.guiScale; - int persistentScale = Math.min(PersistentVariableHelper.lexiconGuiScale, getMaxAllowedScale()); - - 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(); - -// mc.mainWindow.setGuiScale(guiScale); -// // Change it back -// mc.gameSettings.guiScale = guiScale; -// mc.updateWindowSize(); - } - - lastTime = ClientTickHandler.ticksInGame; - - currentOpenLexicon = this; - - left = width / 2 - guiWidth / 2; - top = height / 2 - guiHeight / 2; - - buttons.clear(); - if(isIndex()) { - int x = 18; - for(int i = 0; i < 12; i++) { - int y = 16 + i * 12; - addButton(new GuiButtonIndexEntry((GuiLexiconIndex) this, i, left + x, top + y, 110, 10, "")); - } - populateIndex(); - } else if(isCategoryIndex()) { - List allCategories = new ArrayList<>(BotaniaAPI.getAllCategories()); - allCategories.removeIf(cat -> !cat.isVisible(stackUsed)); - Collections.sort(allCategories); - - int categories = allCategories.size(); - for(int i = 0; i < categories + 1; i++) { - LexiconCategory category; - category = i >= categories ? null : allCategories.get(i); - int perline = 5; - int x = i % perline; - int y = i / perline; - - int size = 22; - GuiButtonCategory button = new GuiButtonCategory(left + 18 + x * size, top + 50 + y * size, this, category); - addButton(button); - } - } - populateBookmarks(); - if(isMainPage()) { - 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); - addButton(button); - - if(PersistentVariableHelper.lastBotaniaVersion.equals(LibMisc.VERSION)) { - button.active = false; - button.visible = false; - } - - LocalDateTime now = LocalDateTime.now(); - - if(now.getMonth() == Month.NOVEMBER && now.getDayOfMonth() == 22) - addButton(new GuiButtonDoot(left + 100, top + 12)); - } - - addButton(new GuiButtonNotes(this, left - 4, top - 4)); - } - - @Override - public void tick() { - if(notesEnabled && notesMoveTime < NOTE_TWEEN_TIME) - notesMoveTime++; - else if(!notesEnabled && notesMoveTime > 0) - notesMoveTime--; - - if(konamiTime > 0) - konamiTime--; - } - - @Override - public final void render(int x, int y, float partialTicks) { - int guiScale = mc.gameSettings.guiScale; - - GlStateManager.pushMatrix(); - int persistentScale = Math.min(PersistentVariableHelper.lexiconGuiScale, getMaxAllowedScale()); - - if(persistentScale > 0 && persistentScale != guiScale) { - mc.gameSettings.guiScale = persistentScale; - float s = (float) persistentScale / (float) mc.mainWindow.getGuiScaleFactor(); - - GlStateManager.scalef(s, s, s); - - int sw = mc.mainWindow.getScaledWidth(); - int sh = mc.mainWindow.getScaledHeight(); - x = (int) (mc.mouseHelper.getMouseX() * sw / mc.mainWindow.getWidth()); - y = (int) (sh - mc.mouseHelper.getMouseY() * sh / mc.mainWindow.getHeight() - 1); - } - - drawScreenAfterScale(x, y, partialTicks); - - mc.gameSettings.guiScale = guiScale; - GlStateManager.popMatrix(); - - if(konamiTime > 0) { - String meme = I18n.format("botania.subtitle.way"); - GlStateManager.pushMatrix(); - int fullWidth = font.getStringWidth(meme); - int left = width; - double widthPerTick = (fullWidth + width) / 240; - double currWidth = left - widthPerTick * (240 - (konamiTime - partialTicks)) * 3.2; - - GlStateManager.translated(currWidth, height / 2 - 10, 0); - GlStateManager.scalef(4, 4, 4); - mc.fontRenderer.drawStringWithShadow(meme, 0, 0, 0xFFFFFF); - GlStateManager.popMatrix(); - } - } - - public void drawScreenAfterScale(int xCoord, int yCoord, float newPartialTicks) { - float time = ClientTickHandler.ticksInGame + newPartialTicks; - timeDelta = time - lastTime + partialTicks; - lastTime = time; - partialTicks = newPartialTicks; - - GlStateManager.color4f(1F, 1F, 1F, 1F); - mc.textureManager.bindTexture(texture); - drawNotes(newPartialTicks); - - GlStateManager.color4f(1F, 1F, 1F, 1F); - mc.textureManager.bindTexture(texture); - blit(left, top, 0, 0, guiWidth, guiHeight); - - if(ClientProxy.jingleTheBells) - blit(left + 3, top + 1, 0, 212, 138, 6); - - String subtitle = getSubtitle(); - - if(subtitle != null) - drawBookmark(left + guiWidth / 2, top - getTitleHeight() + 10, subtitle, true, 191); - drawBookmark(left + guiWidth / 2, top - getTitleHeight(), getTitle().getFormattedText(), true); - - if(isMainPage()) - drawHeader(); - - if(bookmarksNeedPopulation) { - populateBookmarks(); - bookmarksNeedPopulation = false; - } - - if(mc.player.getGameProfile().getName().equals("haighyorkie")) { - GlStateManager.color4f(1F, 1F, 1F, 1F); - mc.textureManager.bindTexture(texture); - blit(left - 19, top + 42, 67, 180, 19, 26); - if(xCoord >= left - 19 && xCoord < left && yCoord >= top + 62 && yCoord < top + 88) { - mc.textureManager.bindTexture(textureToff); - GlStateManager.pushMatrix(); - GlStateManager.scalef(0.5F, 0.5F, 0.5F); - GlStateManager.enableBlend(); - GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GlStateManager.translatef(0F, 0F, 2F); - - int w = 256; - int h = 152; - int x = (int) ((ClientTickHandler.ticksInGame + newPartialTicks) * 6) % (width + w) - w; - int y = (int) (top + guiHeight / 2 - h / 4 + Math.sin((ClientTickHandler.ticksInGame + newPartialTicks) / 6.0) * 40); - - blit(x * 2, y * 2, 0, 0, w, h); - GlStateManager.disableBlend(); - GlStateManager.popMatrix(); - - RenderHelper.renderTooltip(xCoord, yCoord, Arrays.asList(TextFormatting.GOLD + "#goldfishchris", TextFormatting.AQUA + "IT SAYS MANUAL")); - } - } - - super.render(xCoord, yCoord, newPartialTicks); - - if(hasTutorialArrow) { - mc.textureManager.bindTexture(texture); - GlStateManager.enableBlend(); - GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GlStateManager.color4f(1F, 1F, 1F, 0.7F + (float) (Math.sin((ClientTickHandler.ticksInGame + newPartialTicks) * 0.3F) + 1) * 0.15F); - blit(tutorialArrowX, tutorialArrowY, 20, 200, TUTORIAL_ARROW_WIDTH, TUTORIAL_ARROW_HEIGHT); - GlStateManager.disableBlend(); - } - } - - private void drawNotes(float part) { - int size = 105; - - float time = notesMoveTime; - if(notesMoveTime < NOTE_TWEEN_TIME && notesEnabled) - time += part; - else if(notesMoveTime > 0 && !notesEnabled) - time -= part; - - int drawSize = (int) (size * time / NOTE_TWEEN_TIME); - int x = left - drawSize; - int y = top + 10; - - blit(x, y, 146, 0, drawSize, 125); - - String noteDisplay = note; - if(notesEnabled && ClientTickHandler.ticksInGame % 20 < 10) - noteDisplay += "&r_"; - - font.drawString(I18n.format("botaniamisc.notes"), x + 5, y - 7, 0x666666); - PageText.renderText(x + 5, y - 3, 92, 120, 0, true, 0, TextFormatting.RESET + noteDisplay); - } - - public void drawBookmark(int x, int y, String s, boolean drawLeft) { - drawBookmark(x, y, s, drawLeft, 180); - } - - private void drawBookmark(int x, int y, String s, boolean drawLeft, int v) { - drawBookmark(x, y, s, drawLeft, 0x111111, v); - } - - public void drawBookmark(int x, int y, String s, boolean drawLeft, int color, int v) { - // This function is called from the buttons so I can't use font - FontRenderer font = Minecraft.getInstance().fontRenderer; - int l = font.getStringWidth(s); - int fontOff = 0; - - if(!drawLeft) { - x += l / 2; - fontOff = 2; - } - - Minecraft.getInstance().textureManager.bindTexture(texture); - - GlStateManager.color4f(1F, 1F, 1F, 1F); - blit(x + l / 2 + 3, y - 1, 54, v, 6, 11); - - if(drawLeft) - blit(x - l / 2 - 9, y - 1, 61, v, 6, 11); - for(int i = 0; i < l + 6; i++) - blit(x - l / 2 - 3 + i, y - 1, 60, v, 1, 11); - - font.drawString(s, x - l / 2 + fontOff, y, color); - } - - private void drawHeader() { - GlStateManager.pushMatrix(); - GlStateManager.color4f(1F, 1F, 1F, 1F); - Minecraft.getInstance().textureManager.bindTexture(texture); - blit(left - 8, top + 9, 0, 224, 140, 31); - - int color = 0xffd200; - font.drawString(title.getFormattedText(), left + 18, top + 13, color); - font.drawString(I18n.format("botaniamisc.edition", ItemLexicon.getEdition()), left + 24, top + 22, color); - - String s = TextFormatting.BOLD + categoryHighlight; - font.drawString(s, left + guiWidth / 2 - font.getStringWidth(s) / 2, top + 36, 0); - - GlStateManager.popMatrix(); - - categoryHighlight = ""; - } - - boolean isMainPage() { - return true; - } - - @Override - public boolean isPauseScreen() { - return false; - } - - public int bookmarkWidth(String b) { - if(font == null) - font = Minecraft.getInstance().fontRenderer; - - return font.getStringWidth(b) + 15; - } - - @Nonnull - @Override - public ITextComponent getTitle() { - return ItemLexicon.getTitle(stackUsed); - } - - String getSubtitle() { - return null; - } - - int getTitleHeight() { - return getSubtitle() == null ? 12 : 22; - } - - boolean isIndex() { - return false; - } - - boolean isChallenge() { - return false; - } - - boolean isCategoryIndex() { - return true; - } - - public static int getMaxAllowedScale() { - // Reference: AbstractOption.GUI_SCALE - return Minecraft.getInstance().mainWindow.calcGuiScale(0, Minecraft.getInstance().getForceUnicodeFont()); - } - - void populateIndex() { - List categoryList = BotaniaAPI.getAllCategories(); - int shift = 2; - for(int i = shift; i < 12; i++) { - int i_ = i - shift; - GuiButtonIndexEntry button = (GuiButtonIndexEntry) buttons.get(i); - LexiconCategory category = i_ >= categoryList.size() ? null : categoryList.get(i_); - if(category != null) - button.setMessage(I18n.format(category.getUnlocalizedName())); - else { - button.setMessage(I18n.format("botaniamisc.lexiconIndex")); - break; - } - } - } - - private void populateBookmarks() { - buttons.removeIf(b -> b instanceof GuiButtonBookmark - || b instanceof GuiButtonHistory - || b instanceof GuiButtonChallengeInfo); - - int len = bookmarks.size(); - boolean thisExists = false; - for(GuiLexicon lex : bookmarks) - if(lex.getTitle().equals(getTitle())) - thisExists = true; - - boolean addEnabled = len < MAX_BOOKMARK_COUNT && this instanceof IParented && !thisExists; - for(int i = 0; i < len + (addEnabled ? 1 : 0); i++) { - boolean isAdd = i == bookmarks.size(); - GuiLexicon destination = isAdd ? null : bookmarks.get(i); - addButton(new GuiButtonBookmark(i, left + 138, top + 18 + 14 * i, destination == null ? this : destination, destination == null ? "+" : destination.getTitle().getFormattedText())); - } - - if(isMainPage()) - addButton(new GuiButtonHistory(left + 138, top + guiHeight - 24, I18n.format("botaniamisc.history"), this)); - else if(isChallenge()) - addButton(new GuiButtonChallengeInfo(left + 138, top + guiHeight - 24, I18n.format("botaniamisc.info"), this)); - } - - public static void startTutorial() { - tutorial.clear(); - - tutorial.add(LexiconData.lexicon); - tutorial.add(LexiconData.flowers); - tutorial.add(LexiconData.apothecary); - tutorial.add(LexiconData.pureDaisy); - tutorial.add(LexiconData.wand); - tutorial.add(LexiconData.manaIntro); - tutorial.add(LexiconData.pool); - tutorial.add(LexiconData.spreader); - tutorial.add(LexiconData.generatingIntro); - tutorial.add(LexiconData.endoflame); - tutorial.add(LexiconData.functionalIntro); - tutorial.add(LexiconData.runicAltar); - if(Botania.gardenOfGlassLoaded) - tutorial.add(LexiconData.gardenOfGlass); - - MinecraftForge.EVENT_BUS.post(new BotaniaTutorialStartEvent(tutorial)); - } - - public final void putTutorialArrow() { - hasTutorialArrow = !tutorial.isEmpty(); - if(hasTutorialArrow) - positionTutorialArrow(); - } - - public void positionTutorialArrow() { - LexiconEntry entry = tutorial.peek(); - LexiconCategory category = entry.category; - - for(Widget button : buttons) - if(button instanceof GuiButtonCategory) { - GuiButtonCategory catButton = (GuiButtonCategory) button; - if(catButton.getCategory() == category) { - orientTutorialArrowWithButton(catButton); - break; - } - } - } - - public void orientTutorialArrowWithButton(Button button) { - tutorialArrowX = button.x - TUTORIAL_ARROW_WIDTH; - tutorialArrowY = button.y - TUTORIAL_ARROW_HEIGHT; - } - - boolean closeScreenOnInvKey() { - return true; - } - - @Override - public boolean charTyped(char codePoint, int mods) { - return handleNoteChar(codePoint) || super.charTyped(codePoint, mods); - } - - @Override - public boolean keyPressed(int keyCode, int scanCode, int mods) { - if(!notesEnabled && closeScreenOnInvKey() && mc.gameSettings.keyBindInventory.isActiveAndMatches(InputMappings.getInputByCode(keyCode, scanCode))) { - mc.displayGuiScreen(null); - mc.mouseHelper.grabMouse(); - return true; - } - - if(konamiTime == 0 && keyCode == KONAMI_CODE[konamiIndex]) { - konamiIndex++; - if(konamiIndex >= KONAMI_CODE.length) { - mc.getSoundHandler().play(SimpleSound.master(ModSounds.way, 1.0F)); - konamiIndex = 0; - konamiTime = 240; - } - return true; - } else konamiIndex = 0; - - return super.keyPressed(keyCode, scanCode, mods); - } - - private boolean handleNoteChar(char codePoint) { - if(notesEnabled) { - mc.keyboardListener.enableRepeatEvents(true); - boolean changed = false; - - if(codePoint == 8 && note.length() > 0) { // backspace - if(hasControlDown()) - note = ""; - else { - if(note.endsWith("
")) - note = note.substring(0, note.length() - 4); - else note = note.substring(0, note.length() - 1); - } - changed = true; - } - - if((SharedConstants.isAllowedCharacter(codePoint) || codePoint == 0xA) && note.length() < 250) { - note += codePoint == 0xA ? "
" : codePoint; - changed = true; - } - - if(changed) { - notes.put(getNotesKey(), note); - PersistentVariableHelper.saveSafe(); - return true; - } - } else mc.keyboardListener.enableRepeatEvents(false); - return false; - } - - public static GuiLexicon create(CompoundNBT cmp) { - String type = cmp.getString(TAG_TYPE); - try { - GuiLexicon lex = (GuiLexicon) Class.forName(type).newInstance(); - if(lex != null) - lex.load(cmp); - if(isValidLexiconGui(lex)) - return lex; - return null; - } catch (Exception e) { - e.printStackTrace(); - return null; - } - } - - public void serialize(CompoundNBT cmp) { - cmp.putString(TAG_TYPE, getClass().getName()); - } - - public String getNotesKey() { - return "index"; - } - - public void load(CompoundNBT cmp) {} - - public GuiLexicon copy() { - return new GuiLexicon(); - } - - public static boolean isValidLexiconGui(GuiLexicon gui) { - if(gui == null) - return false; - if(gui.isCategoryIndex() || gui.isChallenge()) - return true; - if(gui.isIndex()) { - GuiLexiconIndex indexGui = (GuiLexiconIndex) gui; - if(indexGui.category == null) - return true; - return BotaniaAPI.getAllCategories().contains(indexGui.category); - } - - GuiLexiconEntry entryGui = (GuiLexiconEntry) gui; - if(!BotaniaAPI.getAllEntries().contains(entryGui.entry)) - return false; - - return entryGui.page < entryGui.entry.pages.size(); - } -} - diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallenge.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallenge.java deleted file mode 100644 index f38e4c85e..000000000 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallenge.java +++ /dev/null @@ -1,170 +0,0 @@ -/** - * 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 @ [Jun 29, 2015, 5:25:06 PM (GMT)] - */ -package vazkii.botania.client.gui.lexicon; - -import net.minecraft.client.gui.widget.button.Button; -import net.minecraft.client.gui.widget.button.Button; -import com.mojang.blaze3d.platform.GlStateManager; -import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.client.resources.I18n; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.StringTextComponent; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.TranslationTextComponent; -import org.lwjgl.glfw.GLFW; -import vazkii.botania.client.challenge.Challenge; -import vazkii.botania.client.challenge.ModChallenges; -import vazkii.botania.client.core.handler.ClientTickHandler; -import vazkii.botania.client.core.handler.PersistentVariableHelper; -import vazkii.botania.client.gui.lexicon.button.GuiButtonBack; -import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.item.material.ItemRune; -import vazkii.botania.common.lexicon.page.PageText; - -import javax.annotation.Nonnull; -import java.io.IOException; - -public class GuiLexiconChallenge extends GuiLexicon implements IParented { - - private static final String TAG_CHALLENGE = "challenge"; - - private Challenge challenge; - private GuiLexicon parent; - private Button backButton, completeButton; - - public GuiLexiconChallenge(GuiLexicon parent, Challenge challenge) { - this.parent = parent; - this.challenge = challenge; - } - - @Override - public void onInitGui() { - super.onInitGui(); - - addButton(backButton = new GuiButtonBack(left + guiWidth / 2 - 8, top + guiHeight + 2, b -> { - mc.displayGuiScreen(parent); - ClientTickHandler.notifyPageChange(); - })); - addButton(completeButton = new Button(left + 20, top + guiHeight - 35, guiWidth - 40, 20, "", b -> { - challenge.complete = !challenge.complete; - setCompleteButtonTitle(); - PersistentVariableHelper.saveSafe(); - })); - setCompleteButtonTitle(); - } - - @Override - public void drawScreenAfterScale(int xCoord, int yCoord, float newPartialTicks) { - super.drawScreenAfterScale(xCoord, yCoord, newPartialTicks); - - RenderHelper.enableGUIStandardItemLighting(); - GlStateManager.enableRescaleNormal(); - mc.getItemRenderer().renderItemIntoGUI(challenge.icon, left + 18, top + 15); - RenderHelper.disableStandardItemLighting(); - GlStateManager.enableBlend(); - - font.drawString(TextFormatting.BOLD + I18n.format(challenge.unlocalizedName), left + 38, top + 13, 0); - font.drawString(I18n.format(challenge.level.getName()) + ((challenge.icon.getItem() instanceof ItemRune) ? "+" : "") + " / " + (challenge.complete ? TextFormatting.DARK_GREEN : TextFormatting.DARK_RED) + I18n.format(challenge.complete ? "botaniamisc.completed" : "botaniamisc.notCompleted"), left + 38, top + 23, 0); - - int width = guiWidth - 30; - int x = left + 16; - int y = top + 28; - - PageText.renderText(x, y, width, guiHeight, challenge.unlocalizedName + ".desc"); - } - - @Override - public boolean keyPressed(int keyCode, int scanCode, int mods) { - if(keyCode == GLFW.GLFW_KEY_BACKSPACE && !notesEnabled) { - back(); - return true; - } else if(keyCode == GLFW.GLFW_KEY_HOME) { - mc.displayGuiScreen(new GuiLexicon()); - ClientTickHandler.notifyPageChange(); - return true; - } - - return super.keyPressed(keyCode, scanCode, mods); - } - - @Override - public boolean mouseClicked(double mouseX, double mouseY, int button) { - if(button == 1) { - back(); - return false; - } - return super.mouseClicked(mouseX, mouseY, button); - } - - private void setCompleteButtonTitle() { - completeButton.setMessage(I18n.format(challenge.complete ? "botaniamisc.markNotCompleted" : "botaniamisc.markCompleted")); - } - - private void back() { - if(backButton.active) { - backButton.playDownSound(mc.getSoundHandler()); - backButton.onClick(backButton.x, backButton.y); - } - } - - @Override - public void setParent(GuiLexicon gui) { - parent = gui; - } - - @Override - boolean isMainPage() { - return false; - } - - @Nonnull - @Override - public ITextComponent getTitle() { - return challenge == null - ? super.getTitle() - : new TranslationTextComponent(challenge.unlocalizedName); - } - - @Override - boolean isChallenge() { - return true; - } - - @Override - boolean isCategoryIndex() { - return false; - } - - @Override - public GuiLexicon copy() { - return new GuiLexiconChallenge(parent, challenge); - } - - @Override - public void serialize(CompoundNBT cmp) { - super.serialize(cmp); - cmp.putString(TAG_CHALLENGE, challenge.unlocalizedName); - } - - @Override - public void load(CompoundNBT cmp) { - super.load(cmp); - String challengeName = cmp.getString(TAG_CHALLENGE); - challenge = ModChallenges.challengeLookup.get(challengeName); - } - - @Override - public String getNotesKey() { - return "challenge_" + challenge.unlocalizedName; - } - -} diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallengesList.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallengesList.java deleted file mode 100644 index 698378ba1..000000000 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallengesList.java +++ /dev/null @@ -1,137 +0,0 @@ -/** - * 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 @ [Jun 29, 2015, 4:24:07 PM (GMT)] - */ -package vazkii.botania.client.gui.lexicon; - -import net.minecraft.client.gui.widget.button.Button; -import net.minecraft.client.resources.I18n; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.TranslationTextComponent; -import org.lwjgl.glfw.GLFW; -import vazkii.botania.client.challenge.Challenge; -import vazkii.botania.client.challenge.EnumChallengeLevel; -import vazkii.botania.client.challenge.ModChallenges; -import vazkii.botania.client.core.handler.ClientTickHandler; -import vazkii.botania.client.gui.lexicon.button.GuiButtonBack; -import vazkii.botania.client.gui.lexicon.button.GuiButtonChallengeIcon; - -import java.io.IOException; -import java.util.List; - -public class GuiLexiconChallengesList extends GuiLexicon implements IParented { - - private GuiLexicon parent; - private Button backButton; - - public GuiLexiconChallengesList() { - super(new TranslationTextComponent("botaniamisc.challenges")); - parent = new GuiLexicon(getTitle()); - } - - @Override - public void onInitGui() { - super.onInitGui(); - - addButton(backButton = new GuiButtonBack(left + guiWidth / 2 - 8, top + guiHeight + 2, b -> { - mc.displayGuiScreen(parent); - ClientTickHandler.notifyPageChange(); - })); - - int perline = 6; - int i = 13; - int y = top + 20; - for(EnumChallengeLevel level : EnumChallengeLevel.class.getEnumConstants()) { - int j = 0; - for(Challenge c : ModChallenges.challenges.get(level)) { - addButton(new GuiButtonChallengeIcon(left + 20 + j % perline * 18, y + j / perline * 17, c, this)); - i++; - j++; - } - y += 44; - } - } - - @Override - public void drawScreenAfterScale(int xCoord, int yCoord, float newPartialTicks) { - super.drawScreenAfterScale(xCoord, yCoord, newPartialTicks); - - for(EnumChallengeLevel level : EnumChallengeLevel.class.getEnumConstants()) { - List list = ModChallenges.challenges.get(level); - int complete = 0; - for(Challenge c : list) - if(c.complete) - complete++; - - font.drawString(TextFormatting.BOLD + I18n.format(level.getName()) + TextFormatting.RESET + " (" + complete + "/" + list.size() + ")", left + 20, top + 11 + level.ordinal() * 44, 0); - } - } - - @Override - public boolean keyPressed(int keyCode, int scanCode, int mods) { - if(keyCode == GLFW.GLFW_KEY_BACKSPACE && !notesEnabled) { - back(); - return true; - } else if(keyCode == GLFW.GLFW_KEY_HOME) { - mc.displayGuiScreen(new GuiLexicon(getTitle())); - ClientTickHandler.notifyPageChange(); - return true; - } - - return super.keyPressed(keyCode, scanCode, mods); - } - - @Override - public boolean mouseClicked(double mouseX, double mouseY, int mods) { - if(mods == GLFW.GLFW_MOUSE_BUTTON_RIGHT) { - back(); - return true; - } - return super.mouseClicked(mouseX, mouseY, mods); - } - - private void back() { - if(backButton.active) { - backButton.playDownSound(mc.getSoundHandler()); - backButton.onClick(backButton.x, backButton.y); - } - } - - @Override - public void setParent(GuiLexicon gui) { - parent = gui; - } - - @Override - boolean isMainPage() { - return false; - } - - @Override - boolean isChallenge() { - return true; - } - - @Override - boolean isCategoryIndex() { - return false; - } - - @Override - public GuiLexicon copy() { - return new GuiLexiconChallengesList(); - } - - @Override - public String getNotesKey() { - return "challengelist"; - } - -} diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java deleted file mode 100644 index ae68abd5a..000000000 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java +++ /dev/null @@ -1,401 +0,0 @@ -/** - * 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 @ [Jan 14, 2014, 6:47:06 PM (GMT)] - */ -package vazkii.botania.client.gui.lexicon; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.widget.Widget; -import net.minecraft.client.gui.widget.button.Button; -import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.gui.widget.button.Button; -import net.minecraft.client.resources.I18n; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.nbt.CompoundNBT; -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 org.lwjgl.glfw.GLFW; -import vazkii.botania.api.BotaniaAPI; -import vazkii.botania.api.internal.IGuiLexiconEntry; -import vazkii.botania.api.lexicon.IAddonEntry; -import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.api.lexicon.LexiconPage; -import vazkii.botania.client.core.handler.ClientTickHandler; -import vazkii.botania.client.gui.lexicon.button.GuiButtonBackWithShift; -import vazkii.botania.client.gui.lexicon.button.GuiButtonPage; -import vazkii.botania.client.gui.lexicon.button.GuiButtonShare; -import vazkii.botania.client.gui.lexicon.button.GuiButtonViewOnline; - -import java.awt.Desktop; -import java.net.URI; -import java.util.List; - -public class GuiLexiconEntry extends GuiLexicon implements IGuiLexiconEntry, IParented { - - private static final String TAG_ENTRY = "entry"; - private static final String TAG_PAGE = "page"; - - public int page = 0; - private boolean firstEntry = false; - LexiconEntry entry; - private Screen parent; - private String title; - private String subtitle; - - private Button leftButton, rightButton, backButton; - - public GuiLexiconEntry() { - parent = new GuiLexicon(); - setTitle(); - } - - public GuiLexiconEntry(LexiconEntry entry, Screen parent) { - this.entry = entry; - this.parent = parent; - setTitle(); - } - - private void setTitle() { - if(entry == null) { - title = "(null)"; - return; - } - - title = I18n.format(entry.getUnlocalizedName()); - if(entry instanceof IAddonEntry) - subtitle = I18n.format(((IAddonEntry) entry).getSubtitle()); - else subtitle = null; - } - - @Override - public void onInitGui() { - super.onInitGui(); - - 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(); - })); - 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); - - ClientTickHandler.notifyPageChange(); - updatePageButtons(); - })); - 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); - - ClientTickHandler.notifyPageChange(); - updatePageButtons(); - })); - addButton(new GuiButtonShare(left + guiWidth - 6, top - 2, b -> { - Minecraft mc = Minecraft.getInstance(); - String cmd = "/botania-share " + entry.getUnlocalizedName(); - - mc.ingameGUI.getChatGUI().addToSentMessages(cmd); - mc.player.sendChatMessage(cmd); - })); - if(entry.getWebLink() != null) - addButton(new GuiButtonViewOnline(left - 8, top + 12, b -> { - try { - if(Desktop.isDesktopSupported()) - Desktop.getDesktop().browse(new URI(entry.getWebLink())); - } catch(Exception e) { - e.printStackTrace(); - } - })); - - if(!GuiLexicon.isValidLexiconGui(this)) { - currentOpenLexicon = new GuiLexicon(); - mc.displayGuiScreen(currentOpenLexicon); - ClientTickHandler.notifyPageChange(); - return; - } - - LexiconPage page = entry.pages.get(this.page); - - page.onOpened(this); - updatePageButtons(); - GuiLexiconHistory.visit(entry); - } - - @Override - public LexiconEntry getEntry() { - return entry; - } - - @Override - public int getPageOn() { - return page; - } - - @Override - boolean isMainPage() { - return false; - } - - @Override - public ITextComponent getTitle() { - return new StringTextComponent(String.format("%s " + TextFormatting.ITALIC + "(%s/%s)", title, page + 1, entry.pages.size())); - } - - @Override - String getSubtitle() { - return subtitle; - } - - @Override - boolean isCategoryIndex() { - return false; - } - - public GuiLexiconEntry setFirstEntry() { - firstEntry = true; - return this; - } - - private void updatePageButtons() { - leftButton.active = page != 0; - rightButton.active = page + 1 < entry.pages.size(); - if(firstEntry) - backButton.active = !rightButton.active; - } - - @Override - public void drawScreenAfterScale(int xCoord, int yCoord, float newPartialTicks) { - super.drawScreenAfterScale(xCoord, yCoord, newPartialTicks); - - LexiconPage page = entry.pages.get(this.page); - page.renderScreen(this, xCoord, yCoord); - } - - @Override - public void tick() { - super.tick(); - - LexiconPage page = entry.pages.get(this.page); - page.updateScreen(this); - - if(this.page == entry.pages.size() - 1) { - LexiconEntry entry = tutorial.peek(); - if(entry == this.entry) { - tutorial.poll(); - positionTutorialArrow(); - if(tutorial.isEmpty()) { - mc.player.sendMessage(new TranslationTextComponent("botaniamisc.tutorialEnded").setStyle(new Style().setColor(TextFormatting.RED))); - hasTutorialArrow = false; - } - } - } - } - - @Override - public void positionTutorialArrow() { - LexiconEntry entry = tutorial.peek(); - if(entry != this.entry) { - orientTutorialArrowWithButton(backButton); - return; - } - - if(rightButton.active && rightButton.visible) - orientTutorialArrowWithButton(rightButton); - } - - @Override - public int getLeft() { - return left; - } - - @Override - public int getTop() { - return top; - } - - @Override - public int getWidth() { - return guiWidth; - } - - @Override - public int getHeight() { - return guiHeight; - } - - @Override - public float getZLevel() { - return blitOffset; - } - - @Override - public void setParent(GuiLexicon gui) { - parent = gui; - } - - private boolean swiped = false; - - @Override - public boolean mouseDragged(double mouseX, double mouseY, int button, double dragX, double dragY) { - if(button == GLFW.GLFW_MOUSE_BUTTON_LEFT && dragX > 100 && mc.gameSettings.touchscreen && !swiped) { - // todo 1.13 correct these constants - if(dragX < 0.5) { - nextPage(); - swiped = true; - } else if(dragX > 0.5) { - prevPage(); - swiped = true; - } - return true; - } - return false; - } - - @Override - public boolean mouseClicked(double mouseX, double mouseY, int button) { - if(button == GLFW.GLFW_MOUSE_BUTTON_LEFT) { - swiped = false; - } - - switch(button) { - case 1: - back(); - return true; - case 3: - nextPage(); - return true; - case 4: - prevPage(); - return true; - default: return super.mouseClicked(mouseX, mouseY, button); - } - } - - @Override - public boolean mouseScrolled(double mouseX, double mouseY, double w) { - if(w < 0) - nextPage(); - else if(w > 0) - prevPage(); - return true; - } - - @Override - public boolean keyPressed(int keyCode, int scanCode, int mods) { - LexiconPage page = entry.pages.get(this.page); - if (page.keyPressed(keyCode, scanCode, mods)) { - return true; - } - - if(keyCode == GLFW.GLFW_KEY_ESCAPE) { - mc.displayGuiScreen(null); - mc.mouseHelper.grabMouse(); - } else if(keyCode == GLFW.GLFW_KEY_LEFT || keyCode == GLFW.GLFW_KEY_UP || keyCode == GLFW.GLFW_KEY_PAGE_UP) - prevPage(); - else if(keyCode == GLFW.GLFW_KEY_RIGHT || keyCode == GLFW.GLFW_KEY_DOWN || keyCode == GLFW.GLFW_KEY_PAGE_DOWN) - nextPage(); - if(keyCode == GLFW.GLFW_KEY_BACKSPACE && !notesEnabled) - back(); - else if(keyCode == GLFW.GLFW_KEY_HOME) { // Home - mc.displayGuiScreen(new GuiLexicon()); - ClientTickHandler.notifyPageChange(); - } - - return super.keyPressed(keyCode, scanCode, mods); - } - - private void back() { - if(backButton.active) { - backButton.playDownSound(mc.getSoundHandler()); - backButton.onClick(backButton.x, backButton.y); - } - } - - private void nextPage() { - if(rightButton.active) { - rightButton.playDownSound(mc.getSoundHandler()); - rightButton.onClick(rightButton.x, rightButton.y); - updateNote(); - } - } - - private void prevPage() { - if(leftButton.active) { - leftButton.playDownSound(mc.getSoundHandler()); - leftButton.onClick(leftButton.x, leftButton.y); - updateNote(); - } - } - - private void updateNote() { - String key = getNotesKey(); - note = notes.getOrDefault(key, ""); - } - - @Override - public List getButtonList() { - return buttons; - } - - @Override - public float getElapsedTicks() { - return lastTime; - } - - @Override - public float getPartialTicks() { - return partialTicks; - } - - @Override - public float getTickDelta() { - return timeDelta; - } - - @Override - public void serialize(CompoundNBT cmp) { - super.serialize(cmp); - cmp.putString(TAG_ENTRY, entry.getUnlocalizedName()); - cmp.putInt(TAG_PAGE, page); - } - - @Override - public void load(CompoundNBT cmp) { - super.load(cmp); - - String entryStr = cmp.getString(TAG_ENTRY); - for(LexiconEntry entry : BotaniaAPI.getAllEntries()) - if(entry.getUnlocalizedName().equals(entryStr)) { - this.entry = entry; - break; - } - - page = cmp.getInt(TAG_PAGE); - - setTitle(); - } - - @Override - public GuiLexicon copy() { - GuiLexiconEntry gui = new GuiLexiconEntry(entry, parent); - gui.page = page; - gui.setTitle(); - return gui; - } - - @Override - public String getNotesKey() { - return "entry_" + entry.unlocalizedName + "_" + page; - } -} diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconHistory.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconHistory.java deleted file mode 100644 index a1b72e624..000000000 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconHistory.java +++ /dev/null @@ -1,59 +0,0 @@ -/** - * 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 @ [Mar 2, 2015, 6:27:58 PM (GMT)] - */ -package vazkii.botania.client.gui.lexicon; - -import net.minecraft.client.resources.I18n; -import net.minecraft.nbt.CompoundNBT; -import vazkii.botania.api.lexicon.ILexicon; -import vazkii.botania.api.lexicon.LexiconEntry; - -import java.util.ArrayList; -import java.util.List; - -public class GuiLexiconHistory extends GuiLexiconIndex { - - public static final List history = new ArrayList<>(); - - public GuiLexiconHistory() { - super(null); - title = I18n.format("botaniamisc.historyLong"); - } - - @Override - void buildEntries() { - entriesToDisplay.clear(); - ILexicon lex = (ILexicon) stackUsed.getItem(); - for(int i = history.size() - 1; i >= 0; i--) { - LexiconEntry entry = history.get(i); - if(lex.isKnowledgeUnlocked(stackUsed, entry.getKnowledgeType()) && I18n.format(entry.getUnlocalizedName()).toLowerCase().contains(searchField.getText().toLowerCase().trim())) - entriesToDisplay.add(entry); - } - } - - public static void visit(LexiconEntry entry) { - history.remove(entry); - history.add(entry); - } - - @Override - public GuiLexicon copy() { - return new GuiLexiconHistory(); - } - - @Override - public void load(CompoundNBT cmp) {} - - @Override - public String getNotesKey() { - return "history"; - } - -} diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java deleted file mode 100644 index 0fe61d3f9..000000000 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java +++ /dev/null @@ -1,464 +0,0 @@ -/** - * 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 @ [Jan 14, 2014, 6:46:59 PM (GMT)] - */ -package vazkii.botania.client.gui.lexicon; - -import net.minecraft.client.gui.AbstractGui; -import net.minecraft.client.gui.widget.TextFieldWidget; -import net.minecraft.client.gui.widget.Widget; -import net.minecraft.client.gui.widget.button.Button; -import com.mojang.blaze3d.platform.GlStateManager; -import net.minecraft.client.resources.I18n; -import net.minecraft.item.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.TranslationTextComponent; -import org.lwjgl.glfw.GLFW; -import vazkii.botania.api.BotaniaAPI; -import vazkii.botania.api.lexicon.ILexicon; -import vazkii.botania.api.lexicon.LexiconCategory; -import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.client.core.handler.ClientTickHandler; -import vazkii.botania.client.gui.lexicon.button.GuiButtonBack; -import vazkii.botania.client.gui.lexicon.button.GuiButtonIndexEntry; -import vazkii.botania.client.gui.lexicon.button.GuiButtonPage; -import vazkii.botania.common.lexicon.DogLexiconEntry; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -public class GuiLexiconIndex extends GuiLexicon implements IParented { - - private static final String TAG_CATEGORY = "category"; - private static final String TAG_PAGE = "page"; - - LexiconCategory category; - String title; - public int page = 0; - - private int tutPage = -1; - - private Button leftButton, rightButton, backButton; - private GuiLexicon parent; - TextFieldWidget searchField; - - private Button currentButton; - private LexiconEntry currentEntry; - private float infoTime; - - final List entriesToDisplay = new ArrayList<>(); - - public GuiLexiconIndex(LexiconCategory category) { - super(new TranslationTextComponent("botaniamisc.lexiconIndex")); - this.category = category; - this.parent = new GuiLexicon(); - } - - // No-arg constructor for bookmark serialization - public GuiLexiconIndex() { - this(BotaniaAPI.categoryBasics); - } - - @Override - boolean isMainPage() { - return false; - } - - @Override - public ITextComponent getTitle() { - return category == null ? super.getTitle() : new TranslationTextComponent(category.getUnlocalizedName()); - } - - @Override - boolean isIndex() { - return true; - } - - @Override - boolean isCategoryIndex() { - return false; - } - - @Override - public void onInitGui() { - super.onInitGui(); - - if(!GuiLexicon.isValidLexiconGui(this)) { - currentOpenLexicon = new GuiLexicon(); - mc.displayGuiScreen(currentOpenLexicon); - ClientTickHandler.notifyPageChange(); - return; - } - - addButton(backButton = new GuiButtonBack(left + guiWidth / 2 - 8, top + guiHeight + 2, b -> { - mc.displayGuiScreen(parent); - ClientTickHandler.notifyPageChange(); - })); - addButton(leftButton = new GuiButtonPage(left, top + guiHeight - 10, false, b -> { - page--; - updatePageButtons(); - populateIndex(); - ClientTickHandler.notifyPageChange(); - })); - addButton(rightButton = new GuiButtonPage(left + guiWidth - 18, top + guiHeight - 10, true, b -> { - page++; - updatePageButtons(); - populateIndex(); - ClientTickHandler.notifyPageChange(); - })); - - searchField = new TextFieldWidget(font, left + guiWidth / 2 + 28, top + guiHeight + 6, 200, 10, ""); - searchField.setCanLoseFocus(false); - searchField.changeFocus(true); - searchField.setEnableBackgroundDrawing(false); - - updateAll(); - } - - private void updateAll() { - buildEntries(); - updatePageButtons(); - populateIndex(); - } - - void buildEntries() { - entriesToDisplay.clear(); - ILexicon lex = (ILexicon) stackUsed.getItem(); - for(LexiconEntry entry : category == null ? BotaniaAPI.getAllEntries() : category.entries) { - if(entry.isVisible() && lex.isKnowledgeUnlocked(stackUsed, entry.getKnowledgeType()) && matchesSearch(entry)) - entriesToDisplay.add(entry); - } - Collections.sort(entriesToDisplay); - } - - private boolean matchesSearch(LexiconEntry e) { - String search = searchField.getText().trim(); - if(search.isEmpty()) - return true; - - search = search.toLowerCase(); - if(I18n.format(e.getUnlocalizedName()).toLowerCase().contains(search)) - return true; - - for(ItemStack stack : e.getDisplayedRecipes()) { - String stackName = stack.getDisplayName().getString().trim(); - if(stackName.contains(search)) - return true; - } - - return false; - } - - @Override - void populateIndex() { - LexiconEntry tutEntry = !tutorial.isEmpty() ? tutorial.peek() : null; - - for(int i = page * 12; i < (page + 1) * 12; i++) { - GuiButtonIndexEntry button = (GuiButtonIndexEntry) buttons.get(i - page * 12); - LexiconEntry entry = i >= entriesToDisplay.size() ? null : entriesToDisplay.get(i); - if(entry != null) { - button.setMessage(entry.getKnowledgeType().color + "" + (entry.isPriority() ? TextFormatting.ITALIC : "") + I18n.format(entry.getUnlocalizedName())); - button.displayStack = entry.getIcon(); - if(entry == tutEntry) - tutPage = page; - - if(entry instanceof DogLexiconEntry) - button.dog = true; - } else button.setMessage(""); - } - } - - public void setHoveredButton(GuiButtonIndexEntry b) { - if(b == null) - currentEntry = null; - else currentEntry = entriesToDisplay.get(b.ordinal + page * 12); - currentButton = b; - } - - @Override - public void drawScreenAfterScale(int xCoord, int yCoord, float newPartialTicks) { - super.drawScreenAfterScale(xCoord, yCoord, newPartialTicks); - - if(!searchField.getText().isEmpty()) { - drawBookmark(left + 138, top + guiHeight - 24, " " + searchField.getText(), false); - mc.textureManager.bindTexture(texture); - GlStateManager.color4f(1F, 1F, 1F, 1F); - blit(left + 134, top + guiHeight - 26, 86, 180, 12, 12); - - if(entriesToDisplay.size() == 1) { - String s = I18n.format("botaniamisc.enterToView"); - mc.fontRenderer.drawString(s, left + guiWidth / 2 - mc.fontRenderer.getStringWidth(s) / 2, top + 30, 0x666666); - } - } else { - String s = I18n.format("botaniamisc.typeToSearch"); - mc.fontRenderer.drawString(s, left + 120 - mc.fontRenderer.getStringWidth(s), top + guiHeight - 18, 0x666666); - } - - float animationTime = 4F; - if(hasShiftDown()) { - if(currentButton != null) - infoTime = Math.min(animationTime, infoTime + timeDelta); - } else { - infoTime = Math.max(0, infoTime - timeDelta); - - if(currentButton != null && infoTime == 0) { - int x; - int y; - - x = currentButton.x - 20; - y = currentButton.y; - - mc.fontRenderer.drawStringWithShadow("?", x, y, 0xFFFFFF); - GlStateManager.scalef(0.5F, 0.5F, 1F); - mc.fontRenderer.drawStringWithShadow(TextFormatting.BOLD + "Shift", x * 2 - 6, y * 2 + 20, 0xFFFFFF); - GlStateManager.scalef(2F, 2F, 1F); - } - } - - if(currentButton != null && infoTime > 0) { - float fract = infoTime / animationTime; - - int x = currentButton.x; - int y = currentButton.y; - String s = I18n.format(currentEntry.getTagline()); - int width = mc.fontRenderer.getStringWidth(s); - - GlStateManager.pushMatrix(); - GlStateManager.translatef(x, y, 0); - GlStateManager.scalef(fract, 1F, 1F); - AbstractGui.fill(12, -30, width + 20, -2, 0x44000000); - AbstractGui.fill(10, -32, width + 22, -2, 0x44000000); - - drawBookmark(width / 2 + 16, -8, s, true, 0xFFFFFF, 180); - - net.minecraft.client.renderer.RenderHelper.enableGUIStandardItemLighting(); - GlStateManager.enableRescaleNormal(); - ItemStack paper = new ItemStack(Items.PAPER, currentEntry.pages.size()); - - mc.getItemRenderer().renderItemAndEffectIntoGUI(paper, 14, -28); - mc.getItemRenderer().renderItemOverlays(mc.fontRenderer, paper, 14, -28); - List stacks = currentEntry.getDisplayedRecipes(); - - if(stacks.size() > 0) { - int spaceForEach = Math.min(18, (width - 30) / stacks.size()); - for(int i = 0; i < stacks.size(); i++) { - ItemStack stack = stacks.get(i); - mc.getItemRenderer().renderItemAndEffectIntoGUI(stack, 38 + spaceForEach * i, -28); - } - } - - net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting(); - - GlStateManager.popMatrix(); - } - - setHoveredButton(null); - } - - @Override - public void positionTutorialArrow() { - LexiconEntry entry = tutorial.peek(); - LexiconCategory category = entry.category; - if(category != this.category) { - orientTutorialArrowWithButton(backButton); - return; - } - - if(tutPage != -1 && tutPage != page) { - orientTutorialArrowWithButton(tutPage < page ? leftButton : rightButton); - return; - } - - for(Widget widget : buttons) { - if(widget instanceof GuiButtonIndexEntry) { - GuiButtonIndexEntry button = (GuiButtonIndexEntry) widget; - int id = button.ordinal; - int index = id + page * 12; - if(index >= entriesToDisplay.size()) - continue; - - if(entry == entriesToDisplay.get(index)) { - orientTutorialArrowWithButton(id >= 12 ? rightButton : button); - break; - } - } - } - } - - public void openEntry(int index) { - if(index >= entriesToDisplay.size()) - return; - - LexiconEntry entry = entriesToDisplay.get(index); - mc.displayGuiScreen(new GuiLexiconEntry(entry, this)); - ClientTickHandler.notifyPageChange(); - } - - private void updatePageButtons() { - leftButton.active = page != 0; - rightButton.active = page < (entriesToDisplay.size() - 1) / 12; - putTutorialArrow(); - } - - @Override - public void setParent(GuiLexicon gui) { - parent = gui; - } - - private boolean swiped = false; - - @Override - public boolean mouseDragged(double mouseX, double mouseY, int button, double dragX, double dragY) { - if(button == GLFW.GLFW_MOUSE_BUTTON_LEFT && dragX > 100 && mc.gameSettings.touchscreen && !swiped) { - // todo 1.13 correct these constants - if(dragX < 0.5) { - nextPage(); - swiped = true; - } else if(dragY > 0.5) { - prevPage(); - swiped = true; - } - return true; - } - return false; - } - - @Override - public boolean mouseClicked(double mouseX, double mouseY, int button) { - if(button == GLFW.GLFW_MOUSE_BUTTON_LEFT) - swiped = false; - - // todo 1.13 might not be needed with focus changes in super? - if (searchField.mouseClicked(mouseX, mouseY, button)) - return true; - - switch(button) { - case 1: - back(); - return true; - case 3: - nextPage(); - return true; - case 4: - prevPage(); - return true; - } - - return super.mouseClicked(mouseX, mouseY, button); - } - - @Override - public boolean mouseScrolled(double x, double y, double w) { - if(w < 0) - nextPage(); - else if(w > 0) - prevPage(); - return true; - } - - @Override - boolean closeScreenOnInvKey() { - return false; - } - - @Override - public boolean charTyped(char codePoint, int mods) { - if(!notesEnabled) { - // todo 1.13 use focus system? - String search = searchField.getText(); - searchField.charTyped(codePoint, mods); - if(!searchField.getText().equalsIgnoreCase(search)) - updateAll(); - return true; - } - return super.charTyped(codePoint, mods); - } - - @Override - public boolean keyPressed(int keyCode, int scanCode, int mods) { - if(keyCode == GLFW.GLFW_KEY_LEFT || keyCode == GLFW.GLFW_KEY_UP || keyCode == GLFW.GLFW_KEY_PAGE_UP) { - prevPage(); - return true; - } else if(keyCode == GLFW.GLFW_KEY_RIGHT || keyCode == GLFW.GLFW_KEY_DOWN || keyCode == GLFW.GLFW_KEY_PAGE_DOWN) { - nextPage(); - return true; - } else if(keyCode == GLFW.GLFW_KEY_BACKSPACE && !notesEnabled && searchField.getText().isEmpty()) { - back(); - return true; - } else if(keyCode == GLFW.GLFW_KEY_HOME) { - mc.displayGuiScreen(new GuiLexicon()); - ClientTickHandler.notifyPageChange(); - return true; - } else if(keyCode == GLFW.GLFW_KEY_ENTER && entriesToDisplay.size() == 1) { - openEntry(0); - return true; - } else { - return super.keyPressed(keyCode, scanCode, mods); - } - } - - private void back() { - if(backButton.active) { - backButton.playDownSound(mc.getSoundHandler()); - backButton.onClick(backButton.x, backButton.y); - } - } - - private void nextPage() { - if(rightButton.active) { - rightButton.playDownSound(mc.getSoundHandler()); - rightButton.onClick(rightButton.x, rightButton.y); - } - } - - private void prevPage() { - if(leftButton.active) { - leftButton.playDownSound(mc.getSoundHandler()); - leftButton.onClick(leftButton.x, leftButton.y); - } - } - - @Override - public void serialize(CompoundNBT cmp) { - super.serialize(cmp); - cmp.putString(TAG_CATEGORY, category == null ? "" : category.getUnlocalizedName()); - cmp.putInt(TAG_PAGE, page); - } - - @Override - public void load(CompoundNBT cmp) { - super.load(cmp); - String categoryStr = cmp.getString(TAG_CATEGORY); - if(categoryStr.isEmpty()) - category = null; - else for(LexiconCategory cat : BotaniaAPI.getAllCategories()) - if(cat.getUnlocalizedName().equals(categoryStr)) { - category = cat; - break; - } - page = cmp.getInt(TAG_PAGE); - } - - @Override - public GuiLexicon copy() { - GuiLexiconIndex gui = new GuiLexiconIndex(category); - gui.page = page; - return gui; - } - - @Override - public String getNotesKey() { - return "category_" + (category == null ? "lexindex" : category.unlocalizedName); - } -} - diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/IParented.java b/src/main/java/vazkii/botania/client/gui/lexicon/IParented.java deleted file mode 100644 index 770593041..000000000 --- a/src/main/java/vazkii/botania/client/gui/lexicon/IParented.java +++ /dev/null @@ -1,7 +0,0 @@ -package vazkii.botania.client.gui.lexicon; - -public interface IParented { - - public void setParent(GuiLexicon gui); - -} diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonAchievement.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonAchievement.java deleted file mode 100644 index 2516b16b9..000000000 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonAchievement.java +++ /dev/null @@ -1,58 +0,0 @@ -/** - * 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 @ [Apr 3, 2015, 5:44:36 PM (GMT)] - */ -package vazkii.botania.client.gui.lexicon.button; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.advancements.AdvancementsScreen; -import net.minecraft.client.gui.advancements.AdvancementsScreen; -import com.mojang.blaze3d.platform.GlStateManager; -import net.minecraft.client.resources.I18n; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.text.TextFormatting; -import vazkii.botania.client.core.helper.RenderHelper; -import vazkii.botania.client.gui.lexicon.GuiLexicon; -import vazkii.botania.common.lib.LibMisc; - -import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.List; - -public class GuiButtonAchievement extends GuiButtonLexicon { - - public GuiButtonAchievement(int x, int y) { - super(x, y, 11, 11, "", b -> { - if(Minecraft.getInstance().player != null) { - AdvancementsScreen gui = new AdvancementsScreen(Minecraft.getInstance().player.connection.getAdvancementManager()); - Minecraft.getInstance().displayGuiScreen(gui); - ResourceLocation tab = new ResourceLocation(LibMisc.MOD_ID, "main/root"); - gui.setSelectedTab(Minecraft.getInstance().player.connection.getAdvancementManager().getAdvancementList().getAdvancement(tab)); - } - }); - } - - @Override - public void render(int mouseX, int mouseY, float partialTicks) { - isHovered = mouseX >= x && mouseY >= y && mouseX < x + width && mouseY < y + height; - int k = getYImage(isHovered()); - - Minecraft.getInstance().textureManager.bindTexture(GuiLexicon.texture); - GlStateManager.color4f(1F, 1F, 1F, 1F); - blit(x, y, k == 2 ? 109 : 98, 191, 11, 11); - - List tooltip = new ArrayList<>(); - tooltip.add(TextFormatting.GREEN + I18n.format("botaniamisc.advancements")); - - int tooltipY = (tooltip.size() - 1) * 10; - if(k == 2) - RenderHelper.renderTooltip(mouseX, mouseY + tooltipY, tooltip); - } - -} \ No newline at end of file diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBack.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBack.java deleted file mode 100644 index 62a135cc0..000000000 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBack.java +++ /dev/null @@ -1,50 +0,0 @@ -/** - * 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 @ [Jan 14, 2014, 9:54:21 PM (GMT)] - */ -package vazkii.botania.client.gui.lexicon.button; - -import net.minecraft.client.Minecraft; -import com.mojang.blaze3d.platform.GlStateManager; -import net.minecraft.client.resources.I18n; -import vazkii.botania.client.core.helper.RenderHelper; -import vazkii.botania.client.gui.lexicon.GuiLexicon; - -import javax.annotation.Nonnull; -import java.util.Collections; -import java.util.List; - -public class GuiButtonBack extends GuiButtonLexicon { - - public GuiButtonBack(int x, int y, IPressable onPress) { - super(x, y, 18, 9, "", onPress); - } - - @Override - public void render(int mouseX, int mouseY, float partialTicks) { - if(active) { - isHovered = mouseX >= x && mouseY >= y && mouseX < x + width && mouseY < y + height; - int k = getYImage(isHovered()); - - Minecraft.getInstance().textureManager.bindTexture(GuiLexicon.texture); - GlStateManager.color4f(1F, 1F, 1F, 1F); - blit(x, y, 36, k == 2 ? 180 : 189, 18, 9); - - List tooltip = getTooltip(); - int tooltipY = (tooltip.size() - 1) * 10; - if(k == 2) - RenderHelper.renderTooltip(mouseX, mouseY + tooltipY, tooltip); - } - } - - public List getTooltip() { - return Collections.singletonList(I18n.format("botaniamisc.back")); - } - -} diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBackWithShift.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBackWithShift.java deleted file mode 100644 index 4f6e13067..000000000 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBackWithShift.java +++ /dev/null @@ -1,30 +0,0 @@ -/** - * 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 @ [Mar 6, 2014, 6:35:32 PM (GMT)] - */ -package vazkii.botania.client.gui.lexicon.button; - -import net.minecraft.client.resources.I18n; -import net.minecraft.util.text.TextFormatting; - -import java.util.Arrays; -import java.util.List; - -public class GuiButtonBackWithShift extends GuiButtonBack { - - public GuiButtonBackWithShift(int x, int y, IPressable onPress) { - super(x, y, onPress); - } - - @Override - public List getTooltip() { - return Arrays.asList(I18n.format("botaniamisc.back"), TextFormatting.GRAY + I18n.format("botaniamisc.clickToIndex")); - } - -} diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBookmark.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBookmark.java deleted file mode 100644 index 1a8d0f6be..000000000 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBookmark.java +++ /dev/null @@ -1,77 +0,0 @@ -package vazkii.botania.client.gui.lexicon.button; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.resources.I18n; -import net.minecraft.util.text.TextFormatting; -import vazkii.botania.client.core.handler.ClientTickHandler; -import vazkii.botania.client.core.handler.PersistentVariableHelper; -import vazkii.botania.client.core.helper.RenderHelper; -import vazkii.botania.client.gui.lexicon.GuiLexicon; -import vazkii.botania.client.gui.lexicon.IParented; - -import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.List; - -public class GuiButtonBookmark extends GuiButtonLexicon { - private final int ordinal; - final GuiLexicon gui; - - public GuiButtonBookmark(int ordinal, int x, int y, GuiLexicon gui, String str) { - super(x, y, gui.bookmarkWidth(str) + 5, 11, str, b -> { - boolean modified = false; - String key = gui.getNotesKey(); - if(ordinal == GuiLexicon.bookmarks.size()) { - if(!GuiLexicon.bookmarkKeys.contains(key)) { - GuiLexicon.bookmarks.add(gui.copy()); - GuiLexicon.bookmarkKeys.add(key); - modified = true; - } - } else { - if(Screen.hasShiftDown()) { - GuiLexicon.bookmarks.remove(ordinal); - GuiLexicon.bookmarkKeys.remove(ordinal); - - modified = true; - } else { - GuiLexicon bookmark = GuiLexicon.bookmarks.get(ordinal).copy(); - if(!bookmark.getTitle().equals(gui.getTitle())) { - Minecraft.getInstance().displayGuiScreen(bookmark); - if(bookmark instanceof IParented) - ((IParented) bookmark).setParent(gui); - ClientTickHandler.notifyPageChange(); - } - } - } - - gui.bookmarksNeedPopulation = true; - if(modified) - PersistentVariableHelper.saveSafe(); - }); - this.ordinal = ordinal; - this.gui = gui; - } - - @Override - public void render(int mouseX, int mouseY, float partialTicks) { - gui.drawBookmark(x, y, getMessage(), false); - isHovered = mouseX >= x && mouseY >= y && mouseX < x + width && mouseY < y + height; - int k = getYImage(isHovered()); - - List tooltip = new ArrayList<>(); - if(getMessage().equals("+")) - tooltip.add(I18n.format("botaniamisc.clickToAdd")); - else { - tooltip.add(I18n.format("botaniamisc.bookmark", ordinal)); - tooltip.add(TextFormatting.GRAY + I18n.format("botaniamisc.clickToSee")); - tooltip.add(TextFormatting.GRAY + I18n.format("botaniamisc.shiftToRemove")); - } - - int tooltipY = (tooltip.size() + 1) * 5; - if(k == 2) - RenderHelper.renderTooltip(mouseX, mouseY + tooltipY, tooltip); - } - -} diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonCategory.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonCategory.java deleted file mode 100644 index a5077b731..000000000 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonCategory.java +++ /dev/null @@ -1,146 +0,0 @@ -/** - * 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 @ [Oct 18, 2014, 4:00:30 PM (GMT)] - */ -package vazkii.botania.client.gui.lexicon.button; - -import net.minecraft.client.Minecraft; -import com.mojang.blaze3d.platform.GlStateManager; -import com.mojang.blaze3d.platform.GLX; -import net.minecraft.client.renderer.texture.TextureManager; -import net.minecraft.client.resources.I18n; -import net.minecraft.util.ResourceLocation; -import org.lwjgl.opengl.ARBMultitexture; -import org.lwjgl.opengl.ARBShaderObjects; -import org.lwjgl.opengl.GL11; -import vazkii.botania.api.internal.ShaderCallback; -import vazkii.botania.api.lexicon.LexiconCategory; -import vazkii.botania.client.core.handler.ClientTickHandler; -import vazkii.botania.client.core.helper.RenderHelper; -import vazkii.botania.client.core.helper.ShaderHelper; -import vazkii.botania.client.gui.lexicon.GuiLexicon; -import vazkii.botania.client.gui.lexicon.GuiLexiconIndex; -import vazkii.botania.client.lib.LibResources; -import vazkii.botania.common.core.handler.ConfigHandler; - -import javax.annotation.Nonnull; - -public class GuiButtonCategory extends GuiButtonLexicon { - - private static final ResourceLocation fallbackResource = new ResourceLocation(LibResources.CATEGORY_INDEX); - private static final ResourceLocation stencilResource = new ResourceLocation(LibResources.GUI_STENCIL); - - private static boolean boundStencil = false; - - final GuiLexicon gui; - private final LexiconCategory category; - private ResourceLocation resource = null; - private float ticksHovered = 0F; - private final float time = 12F; - - private final ShaderCallback shaderCallback = shader -> { - TextureManager r = Minecraft.getInstance().textureManager; - int heightMatchUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "heightMatch"); - int imageUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "image"); - int maskUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "mask"); - - float heightMatch = ticksHovered / time; - GLX.glActiveTexture(ARBMultitexture.GL_TEXTURE0_ARB); - GL11.glBindTexture(GL11.GL_TEXTURE_2D, r.getTexture(resource).getGlTextureId()); - ARBShaderObjects.glUniform1iARB(imageUniform, 0); - - GLX.glActiveTexture(ARBMultitexture.GL_TEXTURE0_ARB + ConfigHandler.CLIENT.glSecondaryTextureUnit.get()); - - GlStateManager.enableTexture(); - GL11.glGetInteger(GL11.GL_TEXTURE_BINDING_2D); - - GL11.glBindTexture(GL11.GL_TEXTURE_2D, r.getTexture(stencilResource).getGlTextureId()); - ARBShaderObjects.glUniform1iARB(maskUniform, ConfigHandler.CLIENT.glSecondaryTextureUnit.get()); - - ARBShaderObjects.glUniform1fARB(heightMatchUniform, heightMatch); - }; - - public GuiButtonCategory(int x, int y, GuiLexicon gui, LexiconCategory category) { - super(x, y, 16, 16, "", b -> { - Minecraft.getInstance().displayGuiScreen(new GuiLexiconIndex(category)); - ClientTickHandler.notifyPageChange(); - }); - this.gui = gui; - this.category = category; - } - - @Override - public void onClick(double mouseX, double mouseY) { - super.onClick(mouseX, mouseY); - } - - @Override - public void render(int mx, int my, float partialTicks) { - boolean inside = isHovered(); - if(inside) - ticksHovered = Math.min(time, ticksHovered + gui.timeDelta); - else ticksHovered = Math.max(0F, ticksHovered - gui.timeDelta); - - if(resource == null) { - if(category == null) - resource = fallbackResource; - else resource = category.getIcon(); - if(resource == null) - resource = fallbackResource; - } - - float s = 1F / 32F; - - GlStateManager.pushMatrix(); - GlStateManager.enableBlend(); - GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GlStateManager.scalef(0.5F, 0.5F, 0.5F); - GlStateManager.color4f(1F, 1F, 1F, 1F); - - if(!boundStencil) { // Allow for the texture manager to take care of the ResourceLocation before we use it directly with gl - Minecraft.getInstance().textureManager.bindTexture(stencilResource); - boundStencil = true; - } - Minecraft.getInstance().textureManager.bindTexture(resource); - - int texture = 0; - boolean shaders = ShaderHelper.useShaders(); - - if(shaders) { - GLX.glActiveTexture(ARBMultitexture.GL_TEXTURE0_ARB + ConfigHandler.CLIENT.glSecondaryTextureUnit.get()); - texture = GL11.glGetInteger(GL11.GL_TEXTURE_BINDING_2D); - } - - ShaderHelper.useShader(ShaderHelper.categoryButton, shaderCallback); - RenderHelper.drawTexturedModalRect(x * 2, y * 2, blitOffset * 2, 0, 0, 32, 32, s, s); - ShaderHelper.releaseShader(); - - if(shaders) { - GLX.glActiveTexture(ARBMultitexture.GL_TEXTURE0_ARB + ConfigHandler.CLIENT.glSecondaryTextureUnit.get()); - GL11.glBindTexture(GL11.GL_TEXTURE_2D, texture); - GLX.glActiveTexture(ARBMultitexture.GL_TEXTURE0_ARB); - } - - GlStateManager.popMatrix(); - - if(inside) - gui.categoryHighlight = I18n.format(getTooltipText()); - } - - private String getTooltipText() { - if(category == null) - return "botaniamisc.lexiconIndex"; - return category.getUnlocalizedName(); - } - - public LexiconCategory getCategory() { - return category; - } - -} diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeIcon.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeIcon.java deleted file mode 100644 index 39f80603a..000000000 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeIcon.java +++ /dev/null @@ -1,64 +0,0 @@ -/** - * 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 @ [Jun 29, 2015, 5:00:30 PM (GMT)] - */ -package vazkii.botania.client.gui.lexicon.button; - -import net.minecraft.client.Minecraft; -import com.mojang.blaze3d.platform.GlStateManager; -import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.client.resources.I18n; -import net.minecraft.util.text.TextFormatting; -import vazkii.botania.client.challenge.Challenge; -import vazkii.botania.client.gui.lexicon.GuiLexicon; -import vazkii.botania.client.gui.lexicon.GuiLexiconChallenge; - -import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.List; - -public class GuiButtonChallengeIcon extends GuiButtonLexicon { - - public final Challenge challenge; - private final GuiLexicon owner; - - public GuiButtonChallengeIcon(int x, int y, Challenge challenge, GuiLexicon owner) { - super(x, y, 16, 16, "", b -> Minecraft.getInstance().displayGuiScreen(new GuiLexiconChallenge(owner, challenge))); - this.challenge = challenge; - this.owner = owner; - } - - @Override - public void render(int mouseX, int mouseY, float partialTicks) { - isHovered = mouseX >= x && mouseY >= y && mouseX < x + width && mouseY < y + height; - int k = getYImage(isHovered()); - - RenderHelper.enableGUIStandardItemLighting(); - GlStateManager.enableRescaleNormal(); - Minecraft.getInstance().getItemRenderer().renderItemIntoGUI(challenge.icon, x, y); - RenderHelper.disableStandardItemLighting(); - GlStateManager.enableBlend(); - - if(challenge.complete) { - GlStateManager.disableDepthTest(); - Minecraft.getInstance().fontRenderer.drawStringWithShadow("\u2714", x + 10, y + 9, 0x004C00); - Minecraft.getInstance().fontRenderer.drawStringWithShadow("\u2714", x + 10, y + 8, 0x0BD20D); - GlStateManager.enableDepthTest(); - } - - - List tooltip = new ArrayList<>(); - tooltip.add(TextFormatting.AQUA + I18n.format(challenge.unlocalizedName)); - - int tooltipY = (tooltip.size() - 1) * 10; - if(k == 2) - vazkii.botania.client.core.helper.RenderHelper.renderTooltip(mouseX, mouseY + tooltipY, tooltip); - } - -} diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeInfo.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeInfo.java deleted file mode 100644 index a691260bd..000000000 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeInfo.java +++ /dev/null @@ -1,51 +0,0 @@ -/** - * 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 @ [Jun 29, 2015, 7:42:52 PM (GMT)] - */ -package vazkii.botania.client.gui.lexicon.button; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.resources.I18n; -import vazkii.botania.client.core.handler.ClientTickHandler; -import vazkii.botania.client.core.helper.RenderHelper; -import vazkii.botania.client.gui.lexicon.GuiLexicon; -import vazkii.botania.client.gui.lexicon.GuiLexiconEntry; -import vazkii.botania.common.lexicon.LexiconData; - -import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.List; - -public class GuiButtonChallengeInfo extends GuiButtonLexicon { - - final GuiLexicon gui; - - public GuiButtonChallengeInfo(int x, int y, String str, GuiLexicon gui) { - super(x, y, gui.bookmarkWidth(str) + 5, 11, str, b -> { - Minecraft.getInstance().displayGuiScreen(new GuiLexiconEntry(LexiconData.challenges, gui)); - ClientTickHandler.notifyPageChange(); - }); - this.gui = gui; - } - - @Override - public void render(int mouseX, int mouseY, float partialTicks) { - gui.drawBookmark(x, y, getMessage(), false); - isHovered = mouseX >= x && mouseY >= y && mouseX < x + width && mouseY < y + height; - int k = getYImage(isHovered()); - - List tooltip = new ArrayList<>(); - tooltip.add(I18n.format("botaniamisc.challengeInfo")); - - int tooltipY = (tooltip.size() + 1) * 5; - if(k == 2) - RenderHelper.renderTooltip(mouseX, mouseY + tooltipY, tooltip); - } - -} \ No newline at end of file diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallenges.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallenges.java deleted file mode 100644 index 9f5ff8894..000000000 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallenges.java +++ /dev/null @@ -1,50 +0,0 @@ -/** - * 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 @ [Jun 29, 2015, 4:16:09 PM (GMT)] - */ -package vazkii.botania.client.gui.lexicon.button; - -import net.minecraft.client.Minecraft; -import com.mojang.blaze3d.platform.GlStateManager; -import net.minecraft.client.resources.I18n; -import net.minecraft.util.text.TextFormatting; -import vazkii.botania.client.core.helper.RenderHelper; -import vazkii.botania.client.gui.lexicon.GuiLexicon; -import vazkii.botania.client.gui.lexicon.GuiLexiconChallengesList; - -import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.List; - -public class GuiButtonChallenges extends GuiButtonLexicon { - - public GuiButtonChallenges(int x, int y) { - super(x, y, 11, 11, "", b -> { - Minecraft.getInstance().displayGuiScreen(new GuiLexiconChallengesList()); - }); - } - - @Override - public void render(int mouseX, int mouseY, float partialTicks) { - isHovered = mouseX >= x && mouseY >= y && mouseX < x + width && mouseY < y + height; - int k = getYImage(isHovered()); - - Minecraft.getInstance().textureManager.bindTexture(GuiLexicon.texture); - GlStateManager.color4f(1F, 1F, 1F, 1F); - blit(x, y, k == 2 ? 131 : 120, 180, 11, 11); - - List tooltip = new ArrayList<>(); - tooltip.add(TextFormatting.GREEN + I18n.format("botaniamisc.challenges")); - - int tooltipY = (tooltip.size() - 1) * 10; - if(k == 2) - RenderHelper.renderTooltip(mouseX, mouseY + tooltipY, tooltip); - } - -} \ No newline at end of file diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonDoot.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonDoot.java deleted file mode 100644 index 4a11c4113..000000000 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonDoot.java +++ /dev/null @@ -1,58 +0,0 @@ -/** - * 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 @ [Oct 11, 2015, 7:04:46 PM (GMT)] - */ -package vazkii.botania.client.gui.lexicon.button; - -import net.minecraft.client.Minecraft; -import com.mojang.blaze3d.platform.GlStateManager; -import net.minecraft.client.renderer.texture.AtlasTexture; -import net.minecraft.client.renderer.texture.AtlasTexture; -import net.minecraft.item.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.util.text.TextFormatting; -import vazkii.botania.client.core.helper.RenderHelper; -import vazkii.botania.common.item.ModItems; - -import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.List; - -// Ssssshhhhhhh -// I should've done this last year -public class GuiButtonDoot extends GuiButtonLexicon { - - public GuiButtonDoot(int x, int y) { - super(x, y, 16, 16, "", b -> {}); - } - - @Override - public void render(int mouseX, int mouseY, float partialTicks) { - isHovered = mouseX >= x && mouseY >= y && mouseX < x + width && mouseY < y + height; - int k = getYImage(isHovered()); - - Minecraft.getInstance().textureManager.bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE); - GlStateManager.color4f(1F, 1F, 1F, 1F); - Minecraft.getInstance().getItemRenderer().renderItemIntoGUI(new ItemStack(ModItems.cacophonium), x, y); - Minecraft.getInstance().getItemRenderer().renderItemIntoGUI(new ItemStack(Items.FIREWORK_ROCKET), x + 8, y + 2); - - GlStateManager.disableLighting(); - - - List tooltip = new ArrayList<>(); - tooltip.add(TextFormatting.LIGHT_PURPLE + "Happy Birthday Vazkii!"); - tooltip.add(TextFormatting.GRAY + "doot doot"); - - if(k == 2) - RenderHelper.renderTooltip(x - 100, y + 36, tooltip); - GlStateManager.enableAlphaTest(); - } - -} - diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonHistory.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonHistory.java deleted file mode 100644 index 82f7b0b78..000000000 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonHistory.java +++ /dev/null @@ -1,52 +0,0 @@ -/** - * 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 @ [Mar 2, 2015, 6:01:26 PM (GMT)] - */ -package vazkii.botania.client.gui.lexicon.button; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.resources.I18n; -import net.minecraft.util.text.TextFormatting; -import vazkii.botania.client.core.handler.ClientTickHandler; -import vazkii.botania.client.core.helper.RenderHelper; -import vazkii.botania.client.gui.lexicon.GuiLexicon; -import vazkii.botania.client.gui.lexicon.GuiLexiconHistory; - -import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.List; - -public class GuiButtonHistory extends GuiButtonLexicon { - - final GuiLexicon gui; - - public GuiButtonHistory(int x, int y, String str, GuiLexicon gui) { - super(x, y, gui.bookmarkWidth(str) + 5, 11, str, b -> { - Minecraft.getInstance().displayGuiScreen(new GuiLexiconHistory()); - ClientTickHandler.notifyPageChange(); - }); - this.gui = gui; - } - - @Override - public void render(int mouseX, int mouseY, float partialTicks) { - gui.drawBookmark(x, y, getMessage(), false); - isHovered = mouseX >= x && mouseY >= y && mouseX < x + width && mouseY < y + height; - int k = getYImage(isHovered()); - - List tooltip = new ArrayList<>(); - tooltip.add(I18n.format("botaniamisc.historyLong")); - tooltip.add(TextFormatting.GRAY + I18n.format("botaniamisc.historyDesc")); - - int tooltipY = (tooltip.size() + 1) * 5; - if(k == 2) - RenderHelper.renderTooltip(mouseX, mouseY + tooltipY, tooltip); - } - -} diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonIndexEntry.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonIndexEntry.java deleted file mode 100644 index 7dd2c7c60..000000000 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonIndexEntry.java +++ /dev/null @@ -1,120 +0,0 @@ -/** - * 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 @ [Jan 14, 2014, 8:34:01 PM (GMT)] - */ -package vazkii.botania.client.gui.lexicon.button; - -import net.minecraft.client.Minecraft; -import com.mojang.blaze3d.platform.GlStateManager; -import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.text.TextFormatting; -import org.lwjgl.opengl.GL11; -import vazkii.botania.client.core.handler.ClientTickHandler; -import vazkii.botania.client.core.handler.PersistentVariableHelper; -import vazkii.botania.client.core.helper.FontHelper; -import vazkii.botania.client.gui.lexicon.GuiLexiconIndex; -import vazkii.botania.client.lib.LibResources; -import vazkii.botania.common.lib.LibMisc; - -public class GuiButtonIndexEntry extends GuiButtonLexicon { - - private static final ResourceLocation dogResource = new ResourceLocation(LibResources.GUI_DOG); - private static final IPressable ON_PRESS = b -> { - GuiButtonIndexEntry button = (GuiButtonIndexEntry) b; - if (button.dog) { - button.enableDog = true; - PersistentVariableHelper.dog = true; - PersistentVariableHelper.saveSafe(); - } else { - int index = button.ordinal + button.gui.page * 12; - button.gui.openEntry(index); - } - }; - - public final int ordinal; - private final GuiLexiconIndex gui; - public ItemStack displayStack = ItemStack.EMPTY; - public boolean dog = false; - private float timeHover = 0; - - private boolean enableDog = false; - private double dogPos = 0; - - public GuiButtonIndexEntry(GuiLexiconIndex gui, int ordinal, int x, int y, int width, int height, String text) { - super(x, y, width, height, text, ON_PRESS); - this.ordinal = ordinal; - this.gui = gui; - } - - @Override - public void render(int mouseX, int mouseY, float partialTicks) { - if(enableDog) { - dogPos += ClientTickHandler.delta * 10; - - Minecraft.getInstance().textureManager.bindTexture(dogResource); - float f = 1F / 64F; - GlStateManager.translated(dogPos, 0, 0); - GlStateManager.color4f(1F, 1F, 1F, 1F); - vazkii.botania.client.core.helper.RenderHelper.drawTexturedModalRect(0, y, blitOffset + 10, dogPos % 100 < 50 ? 23 : 0, 0, 23, 19, f, f); - x = (int) Math.max(x, dogPos + 10); - - GlStateManager.translated(-dogPos, 0, 0); - } - - isHovered = mouseX >= x && mouseY >= y && mouseX < x + width && mouseY < y + height; - int k = getYImage(isHovered()); - boolean showStack = !displayStack.isEmpty() && !getMessage().isEmpty(); - - if(!getMessage().isEmpty() && k == 2) { - timeHover = Math.min(5, timeHover + gui.timeDelta); - gui.setHoveredButton(this); - } else timeHover = Math.max(0, timeHover - gui.timeDelta); - - GlStateManager.pushMatrix(); - GlStateManager.enableBlend(); - GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - - GlStateManager.disableAlphaTest(); - int color = 0; - String format = FontHelper.getFormatFromString(getMessage()); - if(format.length() > 1) { - char key = format.charAt(format.length() - 1); - if(key == 'o' && format.length() > 3) - key = format.charAt(1); - - for(TextFormatting ecf : TextFormatting.class.getEnumConstants()) - if(ecf.toString().indexOf(ecf.toString().length() - 1) == key) { - if(ecf.ordinal() > 15) - ecf = TextFormatting.BLACK; - color = LibMisc.CONTROL_CODE_COLORS[ecf.ordinal()]; - break; - } - } - - int maxalpha = 0x22; - int alpha = Math.min(maxalpha, (int) (timeHover / 4 * maxalpha)); - fill(x - 5, y, (int) (x - 5 + timeHover * 24), y + height, alpha << 24 | color); - GlStateManager.enableAlphaTest(); - - Minecraft.getInstance().fontRenderer.drawString(getMessage(), x + (showStack ? 7 : 0), y + (height - 8) / 2, 0); - - if(showStack) { - GlStateManager.scalef(0.5F, 0.5F, 0.5F); - RenderHelper.enableGUIStandardItemLighting(); - GlStateManager.enableRescaleNormal(); - Minecraft.getInstance().getItemRenderer().renderItemIntoGUI(displayStack, x * 2 - 6, y * 2 + 4); - RenderHelper.disableStandardItemLighting(); - GlStateManager.enableBlend(); - } - GlStateManager.popMatrix(); - } - -} diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonLexicon.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonLexicon.java deleted file mode 100644 index 6e375d41a..000000000 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonLexicon.java +++ /dev/null @@ -1,30 +0,0 @@ -/** - * 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 @ [Aug 7, 2014, 5:53:16 PM (GMT)] - */ -package vazkii.botania.client.gui.lexicon.button; - -import net.minecraft.client.audio.SimpleSound; -import net.minecraft.client.audio.SoundHandler; -import net.minecraft.client.gui.widget.button.Button; -import net.minecraft.client.gui.widget.button.Button; -import vazkii.botania.common.core.handler.ModSounds; - -public class GuiButtonLexicon extends Button { - - public GuiButtonLexicon(int x, int y, int width, int height, String text, IPressable onPress) { - super(x, y, width, height, text, onPress); - } - - @Override - public void playDownSound(SoundHandler handler) { - handler.play(SimpleSound.master(ModSounds.lexiconPage, 1.0F)); - } - -} diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonNotes.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonNotes.java deleted file mode 100644 index 81f9cf755..000000000 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonNotes.java +++ /dev/null @@ -1,56 +0,0 @@ -/** - * 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 @ [Jul 24, 2015, 2:49:36 AM (GMT)] - */ -package vazkii.botania.client.gui.lexicon.button; - -import net.minecraft.client.Minecraft; -import com.mojang.blaze3d.platform.GlStateManager; -import net.minecraft.client.resources.I18n; -import net.minecraft.util.text.TextFormatting; -import vazkii.botania.client.core.helper.RenderHelper; -import vazkii.botania.client.gui.lexicon.GuiLexicon; - -import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.List; - -public class GuiButtonNotes extends GuiButtonLexicon { - - private final GuiLexicon parent; - - public GuiButtonNotes(GuiLexicon parent, int x, int y) { - super(x, y, 11, 11, "", b -> GuiLexicon.notesEnabled = !GuiLexicon.notesEnabled); - this.parent = parent; - } - - @Override - public void render(int x, int y, float partialTicks) { - isHovered = x >= this.x && y >= this.y && x < this.x + width && y < this.y + height; - int k = getYImage(isHovered()); - - Minecraft.getInstance().textureManager.bindTexture(GuiLexicon.texture); - GlStateManager.color4f(1F, 1F, 1F, 1F); - blit(x, y, k == 2 ? 130 : 120, 191, 10, 11); - - List tooltip = new ArrayList<>(); - if(GuiLexicon.notesEnabled) - tooltip.add(TextFormatting.GREEN + I18n.format("botaniamisc.hideNotes")); - else { - tooltip.add(TextFormatting.GREEN + I18n.format("botaniamisc.showNotes")); - if(parent.note != null && !parent.note.isEmpty()) - Minecraft.getInstance().fontRenderer.drawStringWithShadow("!", x + 10, y, 0xFF0000); - } - - int tooltipY = (tooltip.size() - 1) * 10; - if(k == 2) - RenderHelper.renderTooltip(x, y + tooltipY, tooltip); - } - -} diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonOptions.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonOptions.java deleted file mode 100644 index e3ffae394..000000000 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonOptions.java +++ /dev/null @@ -1,49 +0,0 @@ -/** - * 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 @ [Mar 6, 2015, 1:14:05 PM (GMT)] - */ -package vazkii.botania.client.gui.lexicon.button; - -import net.minecraft.client.Minecraft; -import com.mojang.blaze3d.platform.GlStateManager; -import net.minecraft.client.resources.I18n; -import net.minecraft.util.text.TextFormatting; -import vazkii.botania.client.core.helper.RenderHelper; -import vazkii.botania.client.gui.lexicon.GuiLexicon; - -import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.List; - -public class GuiButtonOptions extends GuiButtonLexicon { - - public GuiButtonOptions(int x, int y) { - super(x, y, 11, 11, "", b -> { - // todo 1.14 config gui - }); - } - - @Override - public void render(int mouseX, int mouseY, float partialTicks) { - isHovered = mouseX >= x && mouseY >= y && mouseX < x + width && mouseY < y + height; - int k = getYImage(isHovered()); - - Minecraft.getInstance().textureManager.bindTexture(GuiLexicon.texture); - GlStateManager.color4f(1F, 1F, 1F, 1F); - blit(x, y, k == 2 ? 109 : 98, 180, 11, 11); - - List tooltip = new ArrayList<>(); - for(int i = 0; i < 3; i++) - tooltip.add((i == 0 ? TextFormatting.GREEN : TextFormatting.GRAY) + I18n.format("botaniamisc.lexiconOptions" + i)); - - if(k == 2) - RenderHelper.renderTooltip(mouseX, mouseY, tooltip); - } - -} diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonPage.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonPage.java deleted file mode 100644 index 86a50d0e2..000000000 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonPage.java +++ /dev/null @@ -1,46 +0,0 @@ -/** - * 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 @ [Jan 16, 2014, 4:52:06 PM (GMT)] - */ -package vazkii.botania.client.gui.lexicon.button; - -import net.minecraft.client.Minecraft; -import com.mojang.blaze3d.platform.GlStateManager; -import net.minecraft.client.resources.I18n; -import vazkii.botania.client.core.helper.RenderHelper; -import vazkii.botania.client.gui.lexicon.GuiLexicon; - -import javax.annotation.Nonnull; -import java.util.Collections; - -public class GuiButtonPage extends GuiButtonLexicon { - - private final boolean right; - - public GuiButtonPage(int x, int y, boolean right, IPressable onPress) { - super(x, y, 18, 10, "", onPress); - this.right = right; - } - - @Override - public void render(int mouseX, int mouseY, float partialTicks) { - if(active) { - isHovered = mouseX >= x && mouseY >= y && mouseX < x + width && mouseY < y + height; - int k = getYImage(isHovered()); - - Minecraft.getInstance().textureManager.bindTexture(GuiLexicon.texture); - GlStateManager.color4f(1F, 1F, 1F, 1F); - blit(x, y, k == 2 ? 18 : 0, right ? 180 : 190, 18, 10); - - if(k == 2) - RenderHelper.renderTooltip(mouseX, mouseY, Collections.singletonList(I18n.format(right ? "botaniamisc.nextPage" : "botaniamisc.prevPage"))); - } - } - -} diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonScaleChange.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonScaleChange.java deleted file mode 100644 index 704f0ed88..000000000 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonScaleChange.java +++ /dev/null @@ -1,56 +0,0 @@ -/** - * 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 @ [12/09/2016, 03:17:42 (GMT)] - */ -package vazkii.botania.client.gui.lexicon.button; - -import net.minecraft.client.Minecraft; -import com.mojang.blaze3d.platform.GlStateManager; -import net.minecraft.client.resources.I18n; -import net.minecraft.util.text.TextFormatting; -import vazkii.botania.client.core.handler.PersistentVariableHelper; -import vazkii.botania.client.core.helper.RenderHelper; -import vazkii.botania.client.gui.lexicon.GuiLexicon; - -import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.List; - -public class GuiButtonScaleChange extends GuiButtonLexicon { - - public GuiButtonScaleChange(int x, int y) { - super(x, y, 11, 11, "", b -> { - int maxAllowed = GuiLexicon.getMaxAllowedScale(); - if(PersistentVariableHelper.lexiconGuiScale >= maxAllowed) - PersistentVariableHelper.lexiconGuiScale = 2; - else PersistentVariableHelper.lexiconGuiScale++; - - PersistentVariableHelper.saveSafe(); - Minecraft.getInstance().displayGuiScreen(new GuiLexicon()); - }); - } - - @Override - public void render(int mouseX, int mouseY, float partialTicks) { - isHovered = mouseX >= x && mouseY >= y && mouseX < x + width && mouseY < y + height; - int k = getYImage(isHovered()); - - Minecraft.getInstance().textureManager.bindTexture(GuiLexicon.texture); - GlStateManager.color4f(1F, 1F, 1F, 1F); - blit(x, y, k == 2 ? 152 : 141, 191, 11, 11); - - List tooltip = new ArrayList<>(); - tooltip.add(TextFormatting.GREEN + I18n.format("botaniamisc.scaleChange")); - - int tooltipY = (tooltip.size() - 1) * 10; - if(k == 2) - RenderHelper.renderTooltip(mouseX, mouseY + tooltipY, tooltip); - } - -} diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonShare.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonShare.java deleted file mode 100644 index 0f4277b55..000000000 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonShare.java +++ /dev/null @@ -1,48 +0,0 @@ -/** - * 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 @ [Sep 24, 2014, 3:49:21 PM (GMT)] - */ -package vazkii.botania.client.gui.lexicon.button; - -import net.minecraft.client.Minecraft; -import com.mojang.blaze3d.platform.GlStateManager; -import net.minecraft.client.resources.I18n; -import net.minecraft.util.text.TextFormatting; -import vazkii.botania.client.core.helper.RenderHelper; -import vazkii.botania.client.gui.lexicon.GuiLexicon; - -import javax.annotation.Nonnull; -import java.util.Collections; -import java.util.List; - -public class GuiButtonShare extends GuiButtonLexicon { - - public GuiButtonShare(int x, int y, IPressable onPress) { - super(x, y, 10, 12, "", onPress); - } - - @Override - public void render(int mouseX, int mouseY, float partialTicks) { - isHovered = mouseX >= x && mouseY >= y && mouseX < x + width && mouseY < y + height; - int k = getYImage(isHovered()); - - Minecraft.getInstance().textureManager.bindTexture(GuiLexicon.texture); - GlStateManager.color4f(1F, 1F, 1F, 1F); - blit(x, y, k == 2 ? 10 : 0 , 200, 10, 12); - - List tooltip = getTooltip(); - int tooltipY = (tooltip.size() - 1) * 10; - if(k == 2) - RenderHelper.renderTooltip(mouseX, mouseY + tooltipY, tooltip); - } - - public List getTooltip() { - return Collections.singletonList(TextFormatting.AQUA + I18n.format("botaniamisc.clickToShare")); - } -} diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonUpdateWarning.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonUpdateWarning.java deleted file mode 100644 index c343749d2..000000000 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonUpdateWarning.java +++ /dev/null @@ -1,79 +0,0 @@ -/** - * 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 @ [Aug 25, 2015, 6:13:11 PM (GMT)] - */ -package vazkii.botania.client.gui.lexicon.button; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.gui.screen.Screen; -import com.mojang.blaze3d.platform.GlStateManager; -import net.minecraft.client.resources.I18n; -import net.minecraft.util.text.TextFormatting; -import vazkii.botania.client.core.handler.ClientTickHandler; -import vazkii.botania.client.core.handler.PersistentVariableHelper; -import vazkii.botania.client.core.helper.RenderHelper; -import vazkii.botania.client.gui.lexicon.GuiLexicon; -import vazkii.botania.common.lib.LibMisc; - -import javax.annotation.Nonnull; -import java.awt.*; -import java.net.URI; -import java.util.ArrayList; -import java.util.List; - -public class GuiButtonUpdateWarning extends GuiButtonLexicon { - private static final IPressable OPEN_CHANGELOG = b -> { - if(Screen.hasShiftDown()) { - try { - if(Desktop.isDesktopSupported()) - Desktop.getDesktop().browse(new URI("http://botaniamod.net/changelog.php#" + PersistentVariableHelper.lastBotaniaVersion.replaceAll("\\.|\\s", "-"))); - } catch (Exception e) { - e.printStackTrace(); - } - } else { - PersistentVariableHelper.lastBotaniaVersion = LibMisc.VERSION; - PersistentVariableHelper.saveSafe(); - b.visible = false; - b.active = false; - } - }; - - public GuiButtonUpdateWarning(int x, int y) { - super(x, y, 11, 11, "", OPEN_CHANGELOG); - } - - @Override - public void render(int mouseX, int mouseY, float partialTicks) { - if(!visible || !active) - return; - - isHovered = mouseX >= x && mouseY >= y && mouseX < x + width && mouseY < y + height; - int k = getYImage(isHovered()); - - boolean red = k == 2 || ClientTickHandler.ticksInGame % 10 < 5; - - Minecraft.getInstance().textureManager.bindTexture(GuiLexicon.texture); - GlStateManager.color4f(1F, 1F, 1F, 1F); - blit(x, y, red ? 153 : 142, 180, 11, 11); - - List tooltip = new ArrayList<>(); - String version = PersistentVariableHelper.lastBotaniaVersion; - for(int i = 0; i < 6; i++) { - tooltip.add(TextFormatting.GRAY + I18n.format("botaniamisc.changes" + i, version).replaceAll("&", "\u00a7")); - if(i == 3) - tooltip.add(""); - } - - int tooltipY = (tooltip.size() - 1) * 10 - 25; - if(k == 2) - RenderHelper.renderTooltip(mouseX - 125, mouseY + tooltipY, tooltip); - } - -} diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonViewOnline.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonViewOnline.java deleted file mode 100644 index e57f654fc..000000000 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonViewOnline.java +++ /dev/null @@ -1,45 +0,0 @@ -/** - * 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 @ [Mar 2, 2015, 5:34:05 PM (GMT)] - */ -package vazkii.botania.client.gui.lexicon.button; - -import net.minecraft.client.Minecraft; -import com.mojang.blaze3d.platform.GlStateManager; -import net.minecraft.client.resources.I18n; -import net.minecraft.util.text.TextFormatting; -import vazkii.botania.client.core.helper.RenderHelper; -import vazkii.botania.client.gui.lexicon.GuiLexicon; - -import javax.annotation.Nonnull; -import java.util.Collections; -import java.util.List; - -public class GuiButtonViewOnline extends GuiButtonLexicon { - - public GuiButtonViewOnline(int x, int y, IPressable onPress) { - super(x, y, 11, 11, "", onPress); - } - - @Override - public void render(int mouseX, int mouseY, float partialTicks) { - isHovered = mouseX >= x && mouseY >= y && mouseX < x + width && mouseY < y + height; - int k = getYImage(isHovered()); - - Minecraft.getInstance().textureManager.bindTexture(GuiLexicon.texture); - GlStateManager.color4f(1F, 1F, 1F, 1F); - blit(x, y, k == 2 ? 41 : 30, 200, 11, 11); - - List tooltip = Collections.singletonList(TextFormatting.AQUA + I18n.format("botaniamisc.viewOnline")); - int tooltipY = (tooltip.size() - 1) * 10; - if(k == 2) - RenderHelper.renderTooltip(mouseX, mouseY + tooltipY, tooltip); - } - -} diff --git a/src/main/java/vazkii/botania/client/patchouli/processor/MultiCraftingProcessor.java b/src/main/java/vazkii/botania/client/patchouli/processor/MultiCraftingProcessor.java index ee4428bdd..a28394510 100644 --- a/src/main/java/vazkii/botania/client/patchouli/processor/MultiCraftingProcessor.java +++ b/src/main/java/vazkii/botania/client/patchouli/processor/MultiCraftingProcessor.java @@ -96,7 +96,6 @@ public class MultiCraftingProcessor implements IComponentProcessor { return recipes.stream().map(IRecipe::getRecipeOutput).map(PatchouliAPI.instance::serializeItemStack).collect(Collectors.joining(",")); } if(key.equals("shapeless")) { - return shapeless ? I18n.format("patchouli.gui.lexicon.shapeless") : ""; } return null; } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java index 8788b1123..d5e214e41 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java @@ -18,21 +18,17 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.model.IBakedModel; import net.minecraft.client.renderer.texture.AtlasTexture; import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.renderer.texture.AtlasTexture; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import org.lwjgl.opengl.GL11; import vazkii.botania.api.mana.IPoolOverlayProvider; -import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.handler.MiscellaneousIcons; -import vazkii.botania.client.core.handler.MultiblockRenderHandler; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.client.core.proxy.ClientProxy; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.mana.BlockPool; import vazkii.botania.common.block.tile.mana.TilePool; -import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.awt.Color; import java.util.Random; @@ -53,9 +49,8 @@ public class RenderTilePool extends TileEntityRenderer { GlStateManager.enableBlend(); GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); GlStateManager.enableRescaleNormal(); - float a = MultiblockRenderHandler.rendering ? 0.6F : 1F; - GlStateManager.color4f(1F, 1F, 1F, a); + GlStateManager.color4f(1F, 1F, 1F, 1F); if (pool == null) { // A null pool means we are calling the TESR without a pool (on a minecart). Adjust accordingly GlStateManager.translatef(0, 0, -1); } else { @@ -83,7 +78,7 @@ public class RenderTilePool extends TileEntityRenderer { } GlStateManager.translatef(0.5F, 1.5F, 0.5F); - GlStateManager.color4f(1, 1, 1, a); + GlStateManager.color4f(1, 1, 1, 1); GlStateManager.enableRescaleNormal(); int mana = pool == null ? forceManaNumber : pool.getCurrentMana(); @@ -106,7 +101,7 @@ public class RenderTilePool extends TileEntityRenderer { GlStateManager.enableBlend(); GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); GlStateManager.disableAlphaTest(); - GlStateManager.color4f(1F, 1F, 1F, a * (float) ((Math.sin((ClientTickHandler.ticksInGame + f) / 20.0) + 1) * 0.3 + 0.2)); + GlStateManager.color4f(1F, 1F, 1F, 1 * (float) ((Math.sin((ClientTickHandler.ticksInGame + f) / 20.0) + 1) * 0.3 + 0.2)); GlStateManager.translatef(-0.5F, -1F - 0.43F, -0.5F); GlStateManager.rotatef(90F, 1F, 0F, 0F); GlStateManager.scalef(s, s, s); @@ -126,7 +121,7 @@ public class RenderTilePool extends TileEntityRenderer { GlStateManager.enableBlend(); GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); GlStateManager.disableAlphaTest(); - GlStateManager.color4f(1F, 1F, 1F, a); + GlStateManager.color4f(1F, 1F, 1F, 1F); GlStateManager.translatef(w, -1F - (0.43F - waterLevel), w); GlStateManager.rotatef(90F, 1F, 0F, 0F); GlStateManager.scalef(s, s, s); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java index 64a484532..e28084a4c 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java @@ -24,16 +24,10 @@ import com.mojang.blaze3d.platform.GlStateManager; import net.minecraft.client.renderer.tileentity.ItemStackTileEntityRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.MathHelper; import net.minecraft.world.IBlockReader; -import vazkii.botania.api.lexicon.multiblock.IMultiblockRenderHook; -import vazkii.botania.api.lexicon.multiblock.Multiblock; -import vazkii.botania.api.lexicon.multiblock.component.MultiblockComponent; import vazkii.botania.client.core.handler.ClientTickHandler; -import vazkii.botania.client.core.handler.MultiblockRenderHandler; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.IPylonModel; @@ -41,10 +35,9 @@ import vazkii.botania.client.model.ModelPylonGaia; import vazkii.botania.client.model.ModelPylonMana; import vazkii.botania.client.model.ModelPylonNatura; import vazkii.botania.common.block.BlockPylon; -import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TilePylon; -public class RenderTilePylon extends TileEntityRenderer implements IMultiblockRenderHook { +public class RenderTilePylon extends TileEntityRenderer { private static final ResourceLocation MANA_TEXTURE = new ResourceLocation(LibResources.MODEL_PYLON_MANA); private static final ResourceLocation NATURA_TEXTURE = new ResourceLocation(LibResources.MODEL_PYLON_NATURA); @@ -91,8 +84,7 @@ public class RenderTilePylon extends TileEntityRenderer implements IM GlStateManager.enableRescaleNormal(); GlStateManager.enableBlend(); GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - float a = MultiblockRenderHandler.rendering ? 0.6F : 1F; - GlStateManager.color4f(1F, 1F, 1F, a); + GlStateManager.color4f(1F, 1F, 1F, 1F); double worldTime = (double) (ClientTickHandler.ticksInGame + pticks); @@ -147,17 +139,4 @@ public class RenderTilePylon extends TileEntityRenderer implements IM } } } - - @Override - public void renderBlockForMultiblock(IBlockReader world, Multiblock mb, BlockState state, MultiblockComponent comp) { - forceVariant = ((BlockPylon) state.getBlock()).variant; - GlStateManager.translatef(-0.5F, -0.25F, -0.5F); - renderPylon(null, 0, 0, 0, 0); - forceVariant = BlockPylon.Variant.MANA; - } - - @Override - public boolean needsTranslate(BlockState state) { - return true; - } } diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index d7a63dc39..d5056eec0 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -35,14 +35,10 @@ import org.apache.logging.log4j.Logger; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.capability.FloatingFlowerImpl; import vazkii.botania.api.item.IFloatingFlower; -import vazkii.botania.api.lexicon.ITwoNamedPage; -import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.api.lexicon.LexiconPage; import vazkii.botania.client.core.proxy.ClientProxy; import vazkii.botania.common.advancements.*; import vazkii.botania.common.block.ModBanners; import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.common.block.ModMultiblocks; import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex; import vazkii.botania.common.brew.ModBrews; import vazkii.botania.common.core.command.CommandSkyblockSpread; @@ -116,7 +112,6 @@ public class Botania { PacketHandler.init(); ModBrews.init(); - ModMultiblocks.init(); if(Botania.thaumcraftLoaded) { if(ConfigHandler.COMMON.enableThaumcraftAspects.get()) { diff --git a/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java b/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java index 12a774e0e..83f0fcca6 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java @@ -27,21 +27,18 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.AlfPortalState; import vazkii.botania.api.wand.IWandable; import vazkii.botania.common.advancements.AlfPortalTrigger; import vazkii.botania.common.block.tile.TileAlfPortal; import vazkii.botania.common.core.helper.PlayerHelper; -import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; -public class BlockAlfPortal extends BlockMod implements IWandable, ILexiconable { +public class BlockAlfPortal extends BlockMod implements IWandable { public BlockAlfPortal(Properties builder) { super(builder); @@ -64,11 +61,6 @@ public class BlockAlfPortal extends BlockMod implements IWandable, ILexiconable return new TileAlfPortal(); } - @Override - public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { - return LexiconData.alfhomancyIntro; - } - @Override public boolean onUsedByWand(PlayerEntity player, ItemStack stack, World world, BlockPos pos, Direction side) { boolean did = ((TileAlfPortal) world.getTileEntity(pos)).onWanded(); diff --git a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java index c9b1e8a80..4d75f0594 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java @@ -28,15 +28,12 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.common.PlantType; import net.minecraftforge.common.ToolType; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.fx.SparkleParticleData; -import vazkii.botania.common.lexicon.LexiconData; import javax.annotation.Nonnull; import java.util.Random; -public class BlockAltGrass extends BlockMod implements ILexiconable { +public class BlockAltGrass extends BlockMod { public enum Variant { DRY, @@ -124,9 +121,4 @@ public class BlockAltGrass extends BlockMod implements ILexiconable { break; } } - - @Override - public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { - return LexiconData.grassSeeds; - } } diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index 23d281a82..e68a74958 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -42,8 +42,6 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.items.ItemHandlerHelper; import vazkii.botania.api.internal.VanillaPacketDispatcher; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.common.Botania; import vazkii.botania.common.block.tile.TileAltar; @@ -51,11 +49,10 @@ import vazkii.botania.common.block.tile.TileSimpleInventory; import vazkii.botania.common.core.helper.InventoryHelper; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.rod.ItemWaterRod; -import vazkii.botania.common.lexicon.LexiconData; import javax.annotation.Nonnull; -public class BlockAltar extends BlockMod implements ILexiconable { +public class BlockAltar extends BlockMod { private static final VoxelShape BASE = Block.makeCuboidShape(0, 0, 0, 16, 2, 16); private static final VoxelShape MIDDLE = Block.makeCuboidShape(2, 2, 2, 14, 12, 14); @@ -230,9 +227,4 @@ public class BlockAltar extends BlockMod implements ILexiconable { TileAltar altar = (TileAltar) world.getTileEntity(pos); return altar.getFluid() == Fluids.WATER ? 15 : 0; } - - @Override - public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { - return LexiconData.apothecary; - } } diff --git a/src/main/java/vazkii/botania/common/block/BlockAnimatedTorch.java b/src/main/java/vazkii/botania/common/block/BlockAnimatedTorch.java index 2b11512ed..0502586af 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAnimatedTorch.java +++ b/src/main/java/vazkii/botania/common/block/BlockAnimatedTorch.java @@ -30,17 +30,14 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.item.IHourglassTrigger; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.IManaTrigger; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; import vazkii.botania.common.block.tile.TileAnimatedTorch; -import vazkii.botania.common.lexicon.LexiconData; import javax.annotation.Nonnull; -public class BlockAnimatedTorch extends BlockMod implements IWandable, IManaTrigger, IHourglassTrigger, IWandHUD, ILexiconable { +public class BlockAnimatedTorch extends BlockMod implements IWandable, IManaTrigger, IHourglassTrigger, IWandHUD { private static final VoxelShape SHAPE = makeCuboidShape(0, 0, 0, 16, 4, 16); @@ -138,9 +135,4 @@ public class BlockAnimatedTorch extends BlockMod implements IWandable, IManaTrig super.onPlayerDestroy(world, pos, state); } - @Override - public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { - return LexiconData.animatedTorch; - } - } diff --git a/src/main/java/vazkii/botania/common/block/BlockAvatar.java b/src/main/java/vazkii/botania/common/block/BlockAvatar.java index df4655587..4198a4a47 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAvatar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAvatar.java @@ -30,18 +30,15 @@ import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import net.minecraftforge.items.ItemHandlerHelper; import vazkii.botania.api.item.IAvatarWieldable; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.tile.TileAvatar; import vazkii.botania.common.block.tile.TileSimpleInventory; import vazkii.botania.common.core.helper.InventoryHelper; -import vazkii.botania.common.lexicon.LexiconData; import javax.annotation.Nonnull; import javax.annotation.Nullable; -public class BlockAvatar extends BlockMod implements ILexiconable { +public class BlockAvatar extends BlockMod { private static final VoxelShape X_AABB = makeCuboidShape(5, 0, 3.5, 11, 17, 12.5); private static final VoxelShape Z_AABB = makeCuboidShape(3.5, 0, 5, 12.5, 17, 11); @@ -113,11 +110,6 @@ public class BlockAvatar extends BlockMod implements ILexiconable { return new TileAvatar(); } - @Override - public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { - return LexiconData.avatar; - } - @Nonnull @Override public BlockState mirror(@Nonnull BlockState state, Mirror mirror) { diff --git a/src/main/java/vazkii/botania/common/block/BlockBifrost.java b/src/main/java/vazkii/botania/common/block/BlockBifrost.java index acfc5a272..bf027f92e 100644 --- a/src/main/java/vazkii/botania/common/block/BlockBifrost.java +++ b/src/main/java/vazkii/botania/common/block/BlockBifrost.java @@ -17,14 +17,13 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.IBlockReader; -import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.common.block.tile.TileBifrost; import vazkii.botania.common.item.ModItems; import javax.annotation.Nonnull; import java.util.Random; -public class BlockBifrost extends BlockBifrostPerm implements ILexiconable { +public class BlockBifrost extends BlockBifrostPerm { public BlockBifrost(Properties builder) { super(builder); diff --git a/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java b/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java index 9d92fd746..3515baa18 100644 --- a/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java +++ b/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java @@ -18,15 +18,12 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.fx.SparkleParticleData; -import vazkii.botania.common.lexicon.LexiconData; import javax.annotation.Nonnull; import java.util.Random; -public class BlockBifrostPerm extends BlockMod implements ILexiconable { +public class BlockBifrostPerm extends BlockMod { public BlockBifrostPerm(Properties builder) { super(builder); } @@ -46,10 +43,4 @@ public class BlockBifrostPerm extends BlockMod implements ILexiconable { public BlockRenderLayer getRenderLayer() { return BlockRenderLayer.TRANSLUCENT; } - - @Override - public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { - return LexiconData.rainbowRod; - } - } diff --git a/src/main/java/vazkii/botania/common/block/BlockCell.java b/src/main/java/vazkii/botania/common/block/BlockCell.java index 3b1be6692..35f33b7f2 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCell.java +++ b/src/main/java/vazkii/botania/common/block/BlockCell.java @@ -23,16 +23,13 @@ import net.minecraft.util.IItemProvider; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.tile.TileCell; -import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import javax.annotation.Nonnull; import java.util.Random; -public class BlockCell extends BlockMod implements ILexiconable { +public class BlockCell extends BlockMod { public BlockCell(Properties builder) { super(builder); @@ -49,9 +46,4 @@ public class BlockCell extends BlockMod implements ILexiconable { return new TileCell(); } - @Override - public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { - return LexiconData.dandelifeon; - } - } diff --git a/src/main/java/vazkii/botania/common/block/BlockCocoon.java b/src/main/java/vazkii/botania/common/block/BlockCocoon.java index 264f1c443..7ce32c0ae 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCocoon.java +++ b/src/main/java/vazkii/botania/common/block/BlockCocoon.java @@ -29,14 +29,11 @@ import net.minecraft.world.IBlockReader; import net.minecraft.world.IWorldReader; import net.minecraft.world.server.ServerWorld; import net.minecraft.world.World; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.tile.TileCocoon; -import vazkii.botania.common.lexicon.LexiconData; import javax.annotation.Nonnull; -public class BlockCocoon extends BlockMod implements ILexiconable { +public class BlockCocoon extends BlockMod { private static final VoxelShape SHAPE = makeCuboidShape(3, 0, 3, 13, 14, 13);; @@ -110,8 +107,4 @@ public class BlockCocoon extends BlockMod implements ILexiconable { return new TileCocoon(); } - @Override - public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { - return LexiconData.cocoon; - } } diff --git a/src/main/java/vazkii/botania/common/block/BlockCraftyCrate.java b/src/main/java/vazkii/botania/common/block/BlockCraftyCrate.java index 0b1514c8f..bba6f06c1 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCraftyCrate.java +++ b/src/main/java/vazkii/botania/common/block/BlockCraftyCrate.java @@ -17,12 +17,10 @@ import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.CratePattern; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.common.block.tile.TileCraftCrate; -import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import javax.annotation.Nonnull; @@ -45,11 +43,6 @@ public class BlockCraftyCrate extends BlockOpenCrate implements IWandHUD { return new TileCraftCrate(); } - @Override - public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { - return LexiconData.craftCrate; - } - @OnlyIn(Dist.CLIENT) @Override public void renderHUD(Minecraft mc, World world, BlockPos pos) { diff --git a/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java b/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java index 647275102..8c9053fa3 100644 --- a/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java +++ b/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java @@ -27,15 +27,12 @@ import net.minecraft.world.IWorldReader; import net.minecraft.world.World; import net.minecraftforge.common.IPlantable; import net.minecraftforge.common.PlantType; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import javax.annotation.Nonnull; import java.util.Random; -public class BlockEnchantedSoil extends BlockMod implements ILexiconable { +public class BlockEnchantedSoil extends BlockMod { public BlockEnchantedSoil(Properties builder) { super(builder); @@ -46,9 +43,4 @@ public class BlockEnchantedSoil extends BlockMod implements ILexiconable { return plantable.getPlantType(world, pos.down()) == PlantType.Plains; } - @Override - public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { - return LexiconData.overgrowthSeed; - } - } diff --git a/src/main/java/vazkii/botania/common/block/BlockEnderEye.java b/src/main/java/vazkii/botania/common/block/BlockEnderEye.java index 41eab42cd..79f0ac625 100644 --- a/src/main/java/vazkii/botania/common/block/BlockEnderEye.java +++ b/src/main/java/vazkii/botania/common/block/BlockEnderEye.java @@ -26,17 +26,14 @@ import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.tile.TileEnderEye; -import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import javax.annotation.Nonnull; import java.util.Random; -public class BlockEnderEye extends BlockMod implements ILexiconable { +public class BlockEnderEye extends BlockMod { protected BlockEnderEye(Properties builder) { super(builder); @@ -69,11 +66,6 @@ public class BlockEnderEye extends BlockMod implements ILexiconable { return new TileEnderEye(); } - @Override - public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { - return LexiconData.enderEyeBlock; - } - @Override public void animateTick(BlockState state, World world, BlockPos pos, Random rand) { if(state.get(BotaniaStateProps.POWERED)) { diff --git a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java index 95fb09fc1..46e2ee7d8 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java +++ b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java @@ -26,13 +26,10 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.common.Mod; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; @Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) -public class BlockFelPumpkin extends BlockMod implements ILexiconable { +public class BlockFelPumpkin extends BlockMod { private static final ResourceLocation LOOT_TABLE = new ResourceLocation(LibMisc.MOD_ID, "fel_blaze"); private static final String TAG_FEL_SPAWNED = "Botania-FelSpawned"; @@ -67,9 +64,4 @@ public class BlockFelPumpkin extends BlockMod implements ILexiconable { return getDefaultState().with(BlockStateProperties.HORIZONTAL_FACING, context.getPlacementHorizontalFacing().getOpposite()); } - @Override - public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { - return LexiconData.gardenOfGlass; - } - } diff --git a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java index 1da99a13e..4d68b01b0 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java @@ -37,8 +37,6 @@ import net.minecraft.world.storage.loot.LootContext; import net.minecraft.world.storage.loot.LootParameters; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.ISpecialFlower; import vazkii.botania.api.subtile.TileEntitySpecialFlower; import vazkii.botania.api.wand.IWandHUD; @@ -51,7 +49,7 @@ import java.util.List; import java.util.Random; import java.util.function.Supplier; -public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements ISpecialFlower, IWandable, ILexiconable, IWandHUD { +public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements ISpecialFlower, IWandable, IWandHUD { private final Supplier teProvider; public BlockFloatingSpecialFlower(Properties props, Supplier teProvider) { @@ -144,9 +142,4 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I public TileEntity createTileEntity(@Nonnull BlockState state, @Nonnull IBlockReader world) { return teProvider.get(); } - - @Override - public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { - return ((TileEntitySpecialFlower) world.getTileEntity(pos)).getEntry(); - } } diff --git a/src/main/java/vazkii/botania/common/block/BlockForestEye.java b/src/main/java/vazkii/botania/common/block/BlockForestEye.java index 4aca03042..af6626a4b 100644 --- a/src/main/java/vazkii/botania/common/block/BlockForestEye.java +++ b/src/main/java/vazkii/botania/common/block/BlockForestEye.java @@ -19,14 +19,11 @@ import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.tile.TileForestEye; -import vazkii.botania.common.lexicon.LexiconData; import javax.annotation.Nonnull; -public class BlockForestEye extends BlockMod implements ILexiconable { +public class BlockForestEye extends BlockMod { private static final VoxelShape SHAPE = makeCuboidShape(4, 4, 4, 12, 12, 12); @@ -62,9 +59,4 @@ public class BlockForestEye extends BlockMod implements ILexiconable { return new TileForestEye(); } - @Override - public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { - return LexiconData.forestEye; - } - } diff --git a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java index 819074835..5996b202b 100644 --- a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java +++ b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java @@ -27,9 +27,6 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.TickEvent; import net.minecraftforge.event.entity.EntityJoinWorldEvent; import net.minecraftforge.fml.common.Mod; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; @@ -41,7 +38,7 @@ import java.util.Set; import java.util.WeakHashMap; @Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) -public class BlockGhostRail extends AbstractRailBlock implements ILexiconable { +public class BlockGhostRail extends AbstractRailBlock { private static final String TAG_FLOAT_TICKS = "botania:float_ticks"; @@ -112,11 +109,6 @@ public class BlockGhostRail extends AbstractRailBlock implements ILexiconable { } } - @Override - public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { - return LexiconData.ghostRail; - } - @Nonnull @Override public IProperty getShapeProperty() { diff --git a/src/main/java/vazkii/botania/common/block/BlockHourglass.java b/src/main/java/vazkii/botania/common/block/BlockHourglass.java index 05610373a..3a3d9c86c 100644 --- a/src/main/java/vazkii/botania/common/block/BlockHourglass.java +++ b/src/main/java/vazkii/botania/common/block/BlockHourglass.java @@ -33,8 +33,6 @@ import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.items.ItemHandlerHelper; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.internal.VanillaPacketDispatcher; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.IManaTrigger; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.wand.IWandHUD; @@ -43,12 +41,11 @@ import vazkii.botania.common.block.tile.TileHourglass; import vazkii.botania.common.block.tile.TileSimpleInventory; import vazkii.botania.common.core.helper.InventoryHelper; import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.lexicon.LexiconData; import javax.annotation.Nonnull; import java.util.Random; -public class BlockHourglass extends BlockMod implements IManaTrigger, IWandable, IWandHUD, ILexiconable { +public class BlockHourglass extends BlockMod implements IManaTrigger, IWandable, IWandHUD { private static final VoxelShape SHAPE = makeCuboidShape(4, 0, 4, 12, 18.4, 12); @@ -168,9 +165,4 @@ public class BlockHourglass extends BlockMod implements IManaTrigger, IWandable, tile.renderHUD(); } - @Override - public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { - return LexiconData.hourglass; - } - } diff --git a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java index af01cbe70..6c401e297 100644 --- a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java +++ b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java @@ -28,15 +28,12 @@ import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import net.minecraftforge.items.ItemHandlerHelper; import vazkii.botania.api.internal.VanillaPacketDispatcher; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.tile.TileIncensePlate; -import vazkii.botania.common.lexicon.LexiconData; import javax.annotation.Nonnull; -public class BlockIncensePlate extends BlockMod implements ILexiconable { +public class BlockIncensePlate extends BlockMod { private static final VoxelShape X_SHAPE = makeCuboidShape(6, 0, 2, 10, 1, 14); private static final VoxelShape Z_SHAPE = makeCuboidShape(2, 0, 6, 14, 1, 10); @@ -120,9 +117,5 @@ public class BlockIncensePlate extends BlockMod implements ILexiconable { return new TileIncensePlate(); } - @Override - public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { - return LexiconData.incense; - } } diff --git a/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java b/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java index 3a5a2dce8..afd10788d 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java @@ -26,17 +26,14 @@ import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.tile.TileLightRelay; -import vazkii.botania.common.lexicon.LexiconData; import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; -public class BlockLightLauncher extends BlockMod implements ILexiconable { +public class BlockLightLauncher extends BlockMod { private static final VoxelShape SHAPE = makeCuboidShape(0, 0, 0, 16, 4, 16); @@ -93,9 +90,4 @@ public class BlockLightLauncher extends BlockMod implements ILexiconable { } } - @Override - public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { - return LexiconData.luminizerTransport; - } - } diff --git a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java index 76532f67e..6e9391697 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java @@ -26,18 +26,15 @@ import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; import net.minecraft.world.IWorldReader; import net.minecraft.world.World; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.LuminizerVariant; import vazkii.botania.api.wand.IWandable; import vazkii.botania.common.block.tile.TileLightRelay; -import vazkii.botania.common.lexicon.LexiconData; import javax.annotation.Nonnull; import java.util.Random; -public class BlockLightRelay extends BlockMod implements IWandable, ILexiconable { +public class BlockLightRelay extends BlockMod implements IWandable { private static final VoxelShape SHAPE = makeCuboidShape(5, 5, 5, 11, 11, 11); public final LuminizerVariant variant; @@ -118,9 +115,4 @@ public class BlockLightRelay extends BlockMod implements IWandable, ILexiconable return false; } - @Override - public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { - return LexiconData.luminizerTransport; - } - } diff --git a/src/main/java/vazkii/botania/common/block/BlockManaBomb.java b/src/main/java/vazkii/botania/common/block/BlockManaBomb.java index 4d90eb797..5349e5358 100644 --- a/src/main/java/vazkii/botania/common/block/BlockManaBomb.java +++ b/src/main/java/vazkii/botania/common/block/BlockManaBomb.java @@ -19,14 +19,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.internal.IManaBurst; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.IManaTrigger; import vazkii.botania.common.entity.EntityManaStorm; -import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -public class BlockManaBomb extends BlockMod implements IManaTrigger, ILexiconable { +public class BlockManaBomb extends BlockMod implements IManaTrigger { public BlockManaBomb(Properties builder) { super(builder); @@ -42,9 +39,4 @@ public class BlockManaBomb extends BlockMod implements IManaTrigger, ILexiconabl world.addEntity(storm); } } - - @Override - public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { - return LexiconData.manaBomb; - } } diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java index 42a5c68a5..e0340369b 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java @@ -20,16 +20,13 @@ import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.fx.SparkleParticleData; import vazkii.botania.common.core.handler.ConfigHandler; -import vazkii.botania.common.lexicon.LexiconData; import javax.annotation.Nonnull; import java.util.Random; -public class BlockModDoubleFlower extends TallFlowerBlock implements ILexiconable { +public class BlockModDoubleFlower extends TallFlowerBlock { private final DyeColor color; public BlockModDoubleFlower(DyeColor color, Properties builder) { @@ -56,9 +53,4 @@ public class BlockModDoubleFlower extends TallFlowerBlock implements ILexiconabl } } - - @Override - public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { - return LexiconData.flowers; - } } diff --git a/src/main/java/vazkii/botania/common/block/BlockModFlower.java b/src/main/java/vazkii/botania/common/block/BlockModFlower.java index f664f64c7..69701942a 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModFlower.java @@ -26,16 +26,13 @@ import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.fx.SparkleParticleData; import vazkii.botania.common.core.handler.ConfigHandler; -import vazkii.botania.common.lexicon.LexiconData; import javax.annotation.Nonnull; import java.util.Random; -public class BlockModFlower extends FlowerBlock implements ILexiconable, IGrowable { +public class BlockModFlower extends FlowerBlock implements IGrowable { public final DyeColor color; protected BlockModFlower(DyeColor color, Properties builder) { super(effectForFlower(color), 4, builder); @@ -82,11 +79,6 @@ public class BlockModFlower extends FlowerBlock implements ILexiconable, IGrowab } } - @Override - public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { - return LexiconData.flowers; - } - @Override public boolean canGrow(@Nonnull IBlockReader world, @Nonnull BlockPos pos, @Nonnull BlockState state, boolean fuckifiknow) { return world.getBlockState(pos.up()).isAir(world, pos); diff --git a/src/main/java/vazkii/botania/common/block/BlockModLexiconable.java b/src/main/java/vazkii/botania/common/block/BlockModLexiconable.java deleted file mode 100644 index bb8fc2433..000000000 --- a/src/main/java/vazkii/botania/common/block/BlockModLexiconable.java +++ /dev/null @@ -1,22 +0,0 @@ -package vazkii.botania.common.block; - -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; - -public class BlockModLexiconable extends BlockMod implements ILexiconable { - private final ILexiconable delegate; - - public BlockModLexiconable(Properties builder, ILexiconable delegate) { - super(builder); - this.delegate = delegate; - } - - @Override - public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { - return delegate.getEntry(world, pos, player, lexicon); - } -} diff --git a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java index acdf3fffe..ac651c4ce 100644 --- a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java @@ -22,18 +22,15 @@ import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.wand.IWandable; import vazkii.botania.common.block.tile.TileOpenCrate; import vazkii.botania.common.block.tile.TileSimpleInventory; import vazkii.botania.common.core.helper.InventoryHelper; -import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import javax.annotation.Nonnull; -public class BlockOpenCrate extends BlockMod implements ILexiconable, IWandable { +public class BlockOpenCrate extends BlockMod implements IWandable { protected BlockOpenCrate(Properties builder) { super(builder); @@ -70,11 +67,6 @@ public class BlockOpenCrate extends BlockMod implements ILexiconable, IWandable return new TileOpenCrate(); } - @Override - public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { - return LexiconData.openCrate; - } - @Override public boolean onUsedByWand(PlayerEntity player, ItemStack stack, World world, BlockPos pos, Direction side) { TileOpenCrate crate = (TileOpenCrate) world.getTileEntity(pos); diff --git a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java index 24c158c25..df66a38f2 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java @@ -40,11 +40,8 @@ import net.minecraftforge.event.TickEvent; import net.minecraftforge.event.world.WorldEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.server.ServerLifecycleHooks; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.wand.IWandable; import vazkii.botania.common.core.handler.ModSounds; -import vazkii.botania.common.lexicon.LexiconData; import javax.annotation.Nonnull; import java.util.HashMap; @@ -53,7 +50,7 @@ import java.util.Map; import java.util.Set; import java.util.UUID; -public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconable { +public class BlockPistonRelay extends BlockMod implements IWandable { // Currently active binding attempts public final Map activeBindingAttempts = new HashMap<>(); @@ -250,9 +247,4 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl if(data != null) data.markDirty(); } - - @Override - public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { - return LexiconData.pistonRelay; - } } diff --git a/src/main/java/vazkii/botania/common/block/BlockPlatform.java b/src/main/java/vazkii/botania/common/block/BlockPlatform.java index a556c4259..5327be4ac 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPlatform.java +++ b/src/main/java/vazkii/botania/common/block/BlockPlatform.java @@ -30,16 +30,13 @@ import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.util.math.shapes.VoxelShapes; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.IManaCollisionGhost; import vazkii.botania.api.wand.IWandable; import vazkii.botania.common.block.tile.TilePlatform; -import vazkii.botania.common.lexicon.LexiconData; import javax.annotation.Nonnull; -public class BlockPlatform extends BlockMod implements ILexiconable, IWandable, IManaCollisionGhost { +public class BlockPlatform extends BlockMod implements IWandable, IManaCollisionGhost { public enum Variant { ABSTRUSE, @@ -90,11 +87,6 @@ public class BlockPlatform extends BlockMod implements ILexiconable, IWandable, return new TilePlatform(); } - @Override - public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { - return variant == Variant.ABSTRUSE ? LexiconData.platform : variant == Variant.INFRANGIBLE ? null : LexiconData.spectralPlatform; - } - @Override public boolean onUsedByWand(PlayerEntity player, ItemStack stack, World world, BlockPos pos, Direction side) { TilePlatform tile = (TilePlatform) world.getTileEntity(pos); diff --git a/src/main/java/vazkii/botania/common/block/BlockPylon.java b/src/main/java/vazkii/botania/common/block/BlockPylon.java index d85d16bca..0210d43bf 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPylon.java +++ b/src/main/java/vazkii/botania/common/block/BlockPylon.java @@ -22,14 +22,11 @@ import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; import net.minecraft.world.IWorldReader; import net.minecraft.world.World; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.tile.TilePylon; -import vazkii.botania.common.lexicon.LexiconData; import javax.annotation.Nonnull; -public class BlockPylon extends BlockMod implements ILexiconable { +public class BlockPylon extends BlockMod { private static final VoxelShape SHAPE = Block.makeCuboidShape(2, 0, 2, 14, 21, 14); public enum Variant { @@ -76,8 +73,4 @@ public class BlockPylon extends BlockMod implements ILexiconable { return new TilePylon(); } - @Override - public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { - return variant == Variant.MANA ? LexiconData.pylon : variant == Variant.NATURA ? LexiconData.alfhomancyIntro : LexiconData.gaiaRitual; - } } diff --git a/src/main/java/vazkii/botania/common/block/BlockRoot.java b/src/main/java/vazkii/botania/common/block/BlockRoot.java index 89c974337..00d2cb52e 100644 --- a/src/main/java/vazkii/botania/common/block/BlockRoot.java +++ b/src/main/java/vazkii/botania/common/block/BlockRoot.java @@ -16,23 +16,15 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.lexicon.LexiconData; import javax.annotation.Nonnull; import java.util.Random; -public class BlockRoot extends BlockMod implements ILexiconable { +public class BlockRoot extends BlockMod { public BlockRoot(Properties builder) { super(builder); } - @Override - public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { - return LexiconData.gardenOfGlass; - } - } diff --git a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java index b9ddd8e33..e547a8419 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java +++ b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java @@ -20,14 +20,11 @@ import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.IBlockReader; import net.minecraft.world.IWorldReader; import net.minecraft.world.World; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.common.lexicon.LexiconData; import javax.annotation.Nonnull; import java.util.Random; -public class BlockSolidVines extends VineBlock implements ILexiconable { +public class BlockSolidVines extends VineBlock { public BlockSolidVines(Properties builder) { super(builder); @@ -46,9 +43,4 @@ public class BlockSolidVines extends VineBlock implements ILexiconable { public ItemStack getPickBlock(@Nonnull BlockState state, RayTraceResult target, @Nonnull IBlockReader world, @Nonnull BlockPos pos, PlayerEntity player) { return new ItemStack(Blocks.VINE); } - - @Override - public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { - return LexiconData.vineBall; - } } diff --git a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java index cee69d9d9..70f80d31a 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java +++ b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java @@ -24,18 +24,15 @@ import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import net.minecraftforge.items.ItemHandlerHelper; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.tile.TileSimpleInventory; import vazkii.botania.common.block.tile.TileSparkChanger; import vazkii.botania.common.core.helper.InventoryHelper; import vazkii.botania.common.item.ItemSparkUpgrade; -import vazkii.botania.common.lexicon.LexiconData; import javax.annotation.Nonnull; -public class BlockSparkChanger extends BlockMod implements ILexiconable { +public class BlockSparkChanger extends BlockMod { private static final VoxelShape SHAPE = makeCuboidShape(0, 0, 0, 16, 3, 16); @@ -123,9 +120,4 @@ public class BlockSparkChanger extends BlockMod implements ILexiconable { return new TileSparkChanger(); } - @Override - public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { - return LexiconData.sparkChanger; - } - } diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index 47f1e9afa..21b25554e 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -36,8 +36,6 @@ import net.minecraft.world.storage.loot.LootContext; import net.minecraft.world.storage.loot.LootParameters; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.subtile.ISpecialFlower; import vazkii.botania.api.subtile.TileEntitySpecialFlower; @@ -49,7 +47,7 @@ import javax.annotation.Nonnull; import java.util.List; import java.util.function.Supplier; -public class BlockSpecialFlower extends FlowerBlock implements ISpecialFlower, IWandable, ILexiconable, IWandHUD { +public class BlockSpecialFlower extends FlowerBlock implements ISpecialFlower, IWandable, IWandHUD { private static final VoxelShape SHAPE = makeCuboidShape(4.8, 0, 4.8, 12.8, 16, 12.8); private final Supplier teProvider; @@ -141,11 +139,6 @@ public class BlockSpecialFlower extends FlowerBlock implements ISpecialFlower, I return teProvider.get(); } - @Override - public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { - return ((TileEntitySpecialFlower) world.getTileEntity(pos)).getEntry(); - } - @Override public boolean onUsedByWand(PlayerEntity player, ItemStack stack, World world, BlockPos pos, Direction side) { return ((TileEntitySpecialFlower) world.getTileEntity(pos)).onWanded(player, stack); diff --git a/src/main/java/vazkii/botania/common/block/BlockStorage.java b/src/main/java/vazkii/botania/common/block/BlockStorage.java index 914b45b1f..8348c2d18 100644 --- a/src/main/java/vazkii/botania/common/block/BlockStorage.java +++ b/src/main/java/vazkii/botania/common/block/BlockStorage.java @@ -21,15 +21,12 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockReader; import net.minecraft.world.IWorldReader; import net.minecraft.world.World; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.recipe.IElvenItem; -import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import java.util.Locale; -public class BlockStorage extends BlockMod implements IElvenItem, ILexiconable { +public class BlockStorage extends BlockMod implements IElvenItem { public BlockStorage(Properties builder) { super(builder); @@ -40,11 +37,6 @@ public class BlockStorage extends BlockMod implements IElvenItem, ILexiconable { return true; } - @Override - public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { - return this == ModBlocks.manasteelBlock ? LexiconData.pool : LexiconData.terrasteel; - } - @Override public boolean isElvenItem(ItemStack stack) { return this == ModBlocks.elementiumBlock; diff --git a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java index 39da27487..1e969265b 100644 --- a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java @@ -25,14 +25,11 @@ import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.tile.TileTeruTeruBozu; -import vazkii.botania.common.lexicon.LexiconData; import javax.annotation.Nonnull; -public class BlockTeruTeruBozu extends BlockMod implements ILexiconable { +public class BlockTeruTeruBozu extends BlockMod { private static final VoxelShape SHAPE = makeCuboidShape(4, 0.16, 4, 12, 15.84, 12); @@ -123,9 +120,4 @@ public class BlockTeruTeruBozu extends BlockMod implements ILexiconable { return new TileTeruTeruBozu(); } - @Override - public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { - return LexiconData.teruTeruBozu; - } - } diff --git a/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java b/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java index 84e63931c..86f76e8df 100644 --- a/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java +++ b/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java @@ -19,15 +19,12 @@ import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.IManaCollisionGhost; import vazkii.botania.common.block.tile.TileTinyPlanet; -import vazkii.botania.common.lexicon.LexiconData; import javax.annotation.Nonnull; -public class BlockTinyPlanet extends BlockMod implements ILexiconable, IManaCollisionGhost { +public class BlockTinyPlanet extends BlockMod implements IManaCollisionGhost { private static final VoxelShape AABB = makeCuboidShape(3, 3, 3, 13, 13, 13); @@ -52,11 +49,6 @@ public class BlockTinyPlanet extends BlockMod implements ILexiconable, IManaColl return new TileTinyPlanet(); } - @Override - public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { - return LexiconData.tinyPlanet; - } - @Override public boolean isGhost(BlockState state, World world, BlockPos pos) { return true; diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index 63be25099..6ea1cbf89 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -31,7 +31,6 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.registries.IForgeRegistry; import net.minecraftforge.registries.IForgeRegistryEntry; import net.minecraftforge.registries.ObjectHolder; -import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.state.enums.LuminizerVariant; import vazkii.botania.client.render.tile.RenderTilePylon; import vazkii.botania.client.render.tile.TEISR; @@ -97,7 +96,6 @@ import vazkii.botania.common.item.block.ItemBlockElven; import vazkii.botania.common.item.block.ItemBlockMod; import vazkii.botania.common.item.block.ItemBlockPool; import vazkii.botania.common.item.block.ItemBlockTinyPotato; -import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; @@ -367,8 +365,6 @@ public final class ModBlocks { @SubscribeEvent public static void registerBlocks(RegistryEvent.Register evt) { IForgeRegistry r = evt.getRegistry(); - ILexiconable decorative = (w, po, pl, st) -> LexiconData.decorativeBlocks; - ILexiconable elvenResource = (w, po, pl, st) -> LexiconData.elvenResources; Block.Properties builder = Block.Properties.create(Material.PLANTS).doesNotBlockMovement().hardnessAndResistance(0).sound(SoundType.PLANT); for(DyeColor color : DyeColor.values()) { @@ -382,20 +378,20 @@ public final class ModBlocks { } builder = Block.Properties.create(Material.ROCK).hardnessAndResistance(2, 10).sound(SoundType.STONE); - register(r, new BlockModLexiconable(builder, (w, po, pl, st) -> LexiconData.pureDaisy), LibBlockNames.LIVING_ROCK); - register(r, new BlockModLexiconable(builder, decorative), LibBlockNames.LIVING_ROCK_BRICK); - register(r, new BlockModLexiconable(builder, decorative), LibBlockNames.LIVING_ROCK_BRICK_MOSSY); - register(r, new BlockModLexiconable(builder, decorative), LibBlockNames.LIVING_ROCK_BRICK_CRACKED); - register(r, new BlockModLexiconable(builder, decorative), LibBlockNames.LIVING_ROCK_BRICK_CHISELED); + register(r, new BlockMod(builder), LibBlockNames.LIVING_ROCK); + register(r, new BlockMod(builder), LibBlockNames.LIVING_ROCK_BRICK); + register(r, new BlockMod(builder), LibBlockNames.LIVING_ROCK_BRICK_MOSSY); + register(r, new BlockMod(builder), LibBlockNames.LIVING_ROCK_BRICK_CRACKED); + register(r, new BlockMod(builder), LibBlockNames.LIVING_ROCK_BRICK_CHISELED); builder = Block.Properties.create(Material.WOOD).hardnessAndResistance(2).sound(SoundType.WOOD); // todo 1.13: livingwood should support leaves - register(r, new BlockModLexiconable(builder, (w, po, pl, st) -> LexiconData.pureDaisy), LibBlockNames.LIVING_WOOD); - register(r, new BlockModLexiconable(builder, decorative), LibBlockNames.LIVING_WOOD_PLANKS); - register(r, new BlockModLexiconable(builder, decorative), LibBlockNames.LIVING_WOOD_PLANKS_MOSSY); - register(r, new BlockModLexiconable(builder, decorative), LibBlockNames.LIVING_WOOD_FRAMED); - register(r, new BlockModLexiconable(builder, decorative), LibBlockNames.LIVING_WOOD_PATTERN_FRAMED); - register(r, new BlockModLexiconable(builder.lightValue(12), decorative), LibBlockNames.LIVING_WOOD_GLIMMERING); + register(r, new BlockMod(builder), LibBlockNames.LIVING_WOOD); + register(r, new BlockMod(builder), LibBlockNames.LIVING_WOOD_PLANKS); + register(r, new BlockMod(builder), LibBlockNames.LIVING_WOOD_PLANKS_MOSSY); + register(r, new BlockMod(builder), LibBlockNames.LIVING_WOOD_FRAMED); + register(r, new BlockMod(builder), LibBlockNames.LIVING_WOOD_PATTERN_FRAMED); + register(r, new BlockMod(builder.lightValue(12)), LibBlockNames.LIVING_WOOD_GLIMMERING); builder = Block.Properties.create(Material.WOOD).hardnessAndResistance(2).sound(SoundType.WOOD); register(r, new BlockSpreader(BlockSpreader.Variant.MANA, builder), LibBlockNames.SPREADER); @@ -465,12 +461,12 @@ public final class ModBlocks { builder = Block.Properties.create(Material.WOOD).hardnessAndResistance(2).sound(SoundType.WOOD); // todo 1.13: dreamwood should support leaves? - register(r, new BlockModLexiconable(builder, elvenResource), LibBlockNames.DREAM_WOOD); - register(r, new BlockModLexiconable(builder, elvenResource), LibBlockNames.DREAM_WOOD_PLANKS); - register(r, new BlockModLexiconable(builder, elvenResource), LibBlockNames.DREAM_WOOD_PLANKS_MOSSY); - register(r, new BlockModLexiconable(builder, elvenResource), LibBlockNames.DREAM_WOOD_FRAMED); - register(r, new BlockModLexiconable(builder, elvenResource), LibBlockNames.DREAM_WOOD_PATTERN_FRAMED); - register(r, new BlockModLexiconable(builder.lightValue(12), elvenResource), LibBlockNames.DREAM_WOOD_GLIMMERING); + register(r, new BlockMod(builder), LibBlockNames.DREAM_WOOD); + register(r, new BlockMod(builder), LibBlockNames.DREAM_WOOD_PLANKS); + register(r, new BlockMod(builder), LibBlockNames.DREAM_WOOD_PLANKS_MOSSY); + register(r, new BlockMod(builder), LibBlockNames.DREAM_WOOD_FRAMED); + register(r, new BlockMod(builder), LibBlockNames.DREAM_WOOD_PATTERN_FRAMED); + register(r, new BlockMod(builder.lightValue(12)), LibBlockNames.DREAM_WOOD_GLIMMERING); register(r, new BlockConjurationCatalyst(Block.Properties.create(Material.ROCK).hardnessAndResistance(2, 10).sound(SoundType.STONE)), LibBlockNames.CONJURATION_CATALYST); register(r, new BlockBifrost(Block.Properties.create(Material.GLASS).hardnessAndResistance(-1, 0.3F).lightValue(15).sound(SoundType.GLASS)), LibBlockNames.BIFROST); @@ -490,9 +486,8 @@ public final class ModBlocks { register(r, new BlockSpawnerClaw(Block.Properties.create(Material.IRON).hardnessAndResistance(3)), LibBlockNames.SPAWNER_CLAW); builder = Block.Properties.create(Material.ROCK).hardnessAndResistance(2, 5).sound(SoundType.STONE); - ILexiconable azulejo = (w, po ,pl, st) -> LexiconData.azulejo; for (int i = 0; i < 16; i++) { - register(r, new BlockModLexiconable(builder, azulejo), LibBlockNames.AZULEJO_PREFIX + i); + register(r, new BlockMod(builder), LibBlockNames.AZULEJO_PREFIX + i); } register(r, new BlockEnderEye(Block.Properties.create(Material.IRON).hardnessAndResistance(3, 10).sound(SoundType.METAL)), LibBlockNames.ENDER_EYE_BLOCK); @@ -535,7 +530,7 @@ public final class ModBlocks { } register(r, new BlockFakeAir(Block.Properties.create(Material.STRUCTURE_VOID).tickRandomly()), LibBlockNames.FAKE_AIR); - register(r, new BlockModLexiconable(Block.Properties.create(Material.IRON).hardnessAndResistance(3, 10).sound(SoundType.METAL).lightValue(15), (w, po, pl, st) -> LexiconData.blazeBlock), LibBlockNames.BLAZE_BLOCK); + register(r, new BlockMod(Block.Properties.create(Material.IRON).hardnessAndResistance(3, 10).sound(SoundType.METAL).lightValue(15)), LibBlockNames.BLAZE_BLOCK); register(r, new BlockCorporeaInterceptor(Block.Properties.create(Material.IRON).hardnessAndResistance(5.5F).sound(SoundType.METAL)), LibBlockNames.CORPOREA_INTERCEPTOR); register(r, new BlockCorporeaCrystalCube(Block.Properties.create(Material.IRON).hardnessAndResistance(5.5F).sound(SoundType.METAL)), LibBlockNames.CORPOREA_CRYSTAL_CUBE); register(r, new BlockIncensePlate(Block.Properties.create(Material.WOOD).hardnessAndResistance(2).sound(SoundType.WOOD)), LibBlockNames.INCENSE_PLATE); @@ -562,9 +557,8 @@ public final class ModBlocks { register(r, new BlockGaiaHead(Block.Properties.create(Material.MISCELLANEOUS).hardnessAndResistance(1)), LibBlockNames.GAIA_HEAD); register(r, new BlockCorporeaRetainer(Block.Properties.create(Material.IRON).hardnessAndResistance(5.5F).sound(SoundType.METAL)), LibBlockNames.CORPOREA_RETAINER); register(r, new BlockTeruTeruBozu(Block.Properties.create(Material.WOOL)), LibBlockNames.TERU_TERU_BOZU); - ILexiconable rainbowRod = (w, po, pl, st) -> LexiconData.rainbowRod; - register(r, new BlockModLexiconable(Block.Properties.create(Material.ROCK).hardnessAndResistance(2, 10).sound(SoundType.STONE), rainbowRod), LibBlockNames.SHIMMERROCK); - register(r, new BlockModLexiconable(Block.Properties.create(Material.WOOD).hardnessAndResistance(2).sound(SoundType.WOOD), rainbowRod), LibBlockNames.SHIMMERWOOD_PLANKS); + register(r, new BlockMod(Block.Properties.create(Material.ROCK).hardnessAndResistance(2, 10).sound(SoundType.STONE)), LibBlockNames.SHIMMERROCK); + register(r, new BlockMod(Block.Properties.create(Material.WOOD).hardnessAndResistance(2).sound(SoundType.WOOD)), LibBlockNames.SHIMMERWOOD_PLANKS); register(r, new BlockAvatar(Block.Properties.create(Material.WOOD).hardnessAndResistance(2).sound(SoundType.WOOD)), LibBlockNames.AVATAR); builder = Block.Properties.create(Material.ORGANIC).hardnessAndResistance(0.6F).tickRandomly().sound(SoundType.PLANT); diff --git a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java index 6f53ee1f3..71af42452 100644 --- a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java @@ -21,7 +21,6 @@ import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.registries.IForgeRegistry; import net.minecraftforge.registries.ObjectHolder; -import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.common.block.decor.panes.BlockModPane; import vazkii.botania.common.block.decor.quartz.BlockSpecialQuartzPillar; import vazkii.botania.common.block.decor.quartz.BlockElfQuartzSlab; @@ -36,7 +35,6 @@ import vazkii.botania.common.block.decor.walls.BlockBiomeStoneWall; import vazkii.botania.common.block.decor.walls.BlockModWall; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.block.ItemBlockMod; -import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; @@ -266,11 +264,10 @@ public final class ModFluffBlocks { Block.Properties props = Block.Properties.from(Blocks.QUARTZ_BLOCK); for (String variant : LibBlockNames.QUARTZ_VARIANTS) { - ILexiconable lexicon = (world, pos, player, lex) -> LexiconData.decorativeBlocks; - - base = new BlockModLexiconable(props, lexicon); + + base = new BlockMod(props); register(r, base, variant); - register(r, new BlockModLexiconable(props, lexicon), "chiseled_" + variant); + register(r, new BlockMod(props), "chiseled_" + variant); register(r, new BlockSpecialQuartzPillar(props), variant + "_pillar"); register(r, new BlockModSlab(props), variant + SLAB_SUFFIX); register(r, new BlockModStairs(base.getDefaultState(), props), variant + STAIR_SUFFIX); @@ -285,24 +282,23 @@ public final class ModFluffBlocks { } props = Block.Properties.create(Material.ROCK).hardnessAndResistance(1.5F, 10).sound(SoundType.STONE); - ILexiconable marimorph = (world, pos, player, lex) -> LexiconData.marimorphosis; for (String variant : LibBlockNames.METAMORPHIC_VARIANTS) { - base = new BlockModLexiconable(props, marimorph); + base = new BlockMod(props); register(r, base, LibBlockNames.METAMORPHIC_PREFIX + variant + "_stone"); register(r, new BlockBiomeStoneStairs(base.getDefaultState(), props), base.getRegistryName().getPath() + STAIR_SUFFIX); register(r, new BlockBiomeStoneSlab(props), base.getRegistryName().getPath() + SLAB_SUFFIX); - base = new BlockModLexiconable(props, marimorph); + base = new BlockMod(props); register(r, base, LibBlockNames.METAMORPHIC_PREFIX + variant + "_cobblestone"); register(r, new BlockBiomeStoneStairs(base.getDefaultState(), props), base.getRegistryName().getPath() + STAIR_SUFFIX); register(r, new BlockBiomeStoneSlab(props), base.getRegistryName().getPath() + SLAB_SUFFIX); register(r, new BlockBiomeStoneWall(props), LibBlockNames.METAMORPHIC_PREFIX + variant + "_cobblestone" + WALL_SUFFIX); - base = new BlockModLexiconable(props, marimorph); + base = new BlockMod(props); register(r, base, LibBlockNames.METAMORPHIC_PREFIX + variant + "_bricks"); register(r, new BlockBiomeStoneStairs(base.getDefaultState(), props), base.getRegistryName().getPath() + STAIR_SUFFIX); register(r, new BlockBiomeStoneSlab(props), base.getRegistryName().getPath() + SLAB_SUFFIX); - register(r, new BlockModLexiconable(props, marimorph), "chiseled_" + LibBlockNames.METAMORPHIC_PREFIX + variant + "_bricks"); + register(r, new BlockMod(props), "chiseled_" + LibBlockNames.METAMORPHIC_PREFIX + variant + "_bricks"); } base = r.getValue(new ResourceLocation(LibMisc.MOD_ID, LibBlockNames.SHIMMERROCK)); diff --git a/src/main/java/vazkii/botania/common/block/ModMultiblocks.java b/src/main/java/vazkii/botania/common/block/ModMultiblocks.java deleted file mode 100644 index efbac8842..000000000 --- a/src/main/java/vazkii/botania/common/block/ModMultiblocks.java +++ /dev/null @@ -1,33 +0,0 @@ -/** - * 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 @ [Jun 27, 2015, 3:11:36 PM (GMT)] - */ -package vazkii.botania.common.block; - -import vazkii.botania.api.lexicon.multiblock.MultiblockSet; -import vazkii.botania.common.block.tile.TileAlfPortal; -import vazkii.botania.common.block.tile.TileEnchanter; -import vazkii.botania.common.block.tile.TileTerraPlate; -import vazkii.botania.common.entity.EntityDoppleganger; - -public final class ModMultiblocks { - - public static MultiblockSet enchanter; - public static MultiblockSet alfPortal; - public static MultiblockSet terrasteelPlate; - public static MultiblockSet gaiaRitual; - - public static void init() { - enchanter = TileEnchanter.makeMultiblockSet(); - alfPortal = TileAlfPortal.makeMultiblockSet(); - terrasteelPlate = TileTerraPlate.makeMultiblockSet(); - gaiaRitual = EntityDoppleganger.makeMultiblockSet(); - } - -} diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java index fb1db1c5f..59f58f46c 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java @@ -26,15 +26,12 @@ import net.minecraft.world.IBlockReader; import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; import vazkii.botania.api.internal.VanillaPacketDispatcher; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.wand.IWandable; import vazkii.botania.common.block.tile.corporea.TileCorporeaBase; import vazkii.botania.common.block.tile.corporea.TileCorporeaCrystalCube; import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.lexicon.LexiconData; -public class BlockCorporeaCrystalCube extends BlockCorporeaBase implements ILexiconable, IWandable { +public class BlockCorporeaCrystalCube extends BlockCorporeaBase implements IWandable { private static final VoxelShape SHAPE = makeCuboidShape(3.0, 0, 3.0, 13.0, 16, 13.0); @@ -91,11 +88,6 @@ public class BlockCorporeaCrystalCube extends BlockCorporeaBase implements ILexi return new TileCorporeaCrystalCube(); } - @Override - public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { - return LexiconData.corporeaCrystalCube; - } - @Override public boolean hasComparatorInputOverride(BlockState state) { return true; diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java index 0a535ae65..7526c12ca 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java @@ -20,17 +20,14 @@ import net.minecraft.state.StateContainer; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.tile.corporea.TileCorporeaBase; import vazkii.botania.common.block.tile.corporea.TileCorporeaFunnel; -import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import javax.annotation.Nonnull; -public class BlockCorporeaFunnel extends BlockCorporeaBase implements ILexiconable { +public class BlockCorporeaFunnel extends BlockCorporeaBase { public BlockCorporeaFunnel(Properties builder) { super(builder); @@ -60,8 +57,4 @@ public class BlockCorporeaFunnel extends BlockCorporeaBase implements ILexiconab return new TileCorporeaFunnel(); } - @Override - public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { - return LexiconData.corporeaFunnel; - } } diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java index 57d92a5a9..5ae911ac7 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java @@ -37,19 +37,16 @@ import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.client.ForgeHooksClient; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.corporea.TileCorporeaBase; import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex; -import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import javax.annotation.Nonnull; -public class BlockCorporeaIndex extends BlockCorporeaBase implements ILexiconable { +public class BlockCorporeaIndex extends BlockCorporeaBase { public BlockCorporeaIndex(Block.Properties builder) { super(builder); @@ -67,11 +64,6 @@ public class BlockCorporeaIndex extends BlockCorporeaBase implements ILexiconabl return new TileCorporeaIndex(); } - @Override - public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { - return LexiconData.corporeaIndex; - } - @Override public boolean addLandingEffects(BlockState state, ServerWorld world, BlockPos blockPosition, BlockState iblockstate, LivingEntity entity, int numberOfParticles ) { diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java index f45963a94..6ec1bdb42 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java @@ -25,18 +25,15 @@ import net.minecraft.world.IBlockReader; import net.minecraft.world.IWorldReader; import net.minecraft.world.IWorldReader; import net.minecraft.world.World; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.tile.corporea.TileCorporeaBase; import vazkii.botania.common.block.tile.corporea.TileCorporeaInterceptor; -import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import javax.annotation.Nonnull; import java.util.Random; -public class BlockCorporeaInterceptor extends BlockCorporeaBase implements ILexiconable { +public class BlockCorporeaInterceptor extends BlockCorporeaBase { public BlockCorporeaInterceptor(Block.Properties builder) { super(builder); @@ -74,9 +71,4 @@ public class BlockCorporeaInterceptor extends BlockCorporeaBase implements ILexi return new TileCorporeaInterceptor(); } - @Override - public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { - return LexiconData.corporeaInterceptor; - } - } diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java index cbf52bda5..98c358f6b 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java @@ -20,16 +20,13 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.block.tile.corporea.TileCorporeaRetainer; -import vazkii.botania.common.lexicon.LexiconData; import javax.annotation.Nonnull; -public class BlockCorporeaRetainer extends BlockMod implements ILexiconable { +public class BlockCorporeaRetainer extends BlockMod { public BlockCorporeaRetainer(Block.Properties builder) { super(builder); @@ -74,9 +71,4 @@ public class BlockCorporeaRetainer extends BlockMod implements ILexiconable { return new TileCorporeaRetainer(); } - @Override - public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { - return LexiconData.corporeaRetainer; - } - } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockElfGlass.java b/src/main/java/vazkii/botania/common/block/decor/BlockElfGlass.java index 375885b25..b7551a3b3 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockElfGlass.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockElfGlass.java @@ -15,13 +15,10 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.recipe.IElvenItem; -import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -public class BlockElfGlass extends BlockManaGlass implements IElvenItem, ILexiconable { +public class BlockElfGlass extends BlockManaGlass implements IElvenItem { public BlockElfGlass(Properties builder) { super(builder); @@ -32,9 +29,4 @@ public class BlockElfGlass extends BlockManaGlass implements IElvenItem, ILexico return true; } - @Override - public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { - return LexiconData.elvenResources; - } - } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java index 477d8254c..434430e8a 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java @@ -31,19 +31,16 @@ import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.item.IFloatingFlower; import vazkii.botania.api.item.IFloatingFlower.IslandType; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.fx.SparkleParticleData; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.block.tile.TileFloatingFlower; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.IFloatingFlowerVariant; -import vazkii.botania.common.lexicon.LexiconData; import javax.annotation.Nonnull; import java.util.Random; -public class BlockFloatingFlower extends BlockMod implements ILexiconable { +public class BlockFloatingFlower extends BlockMod { private static final VoxelShape SHAPE = makeCuboidShape(1.6, 1.6, 1.6, 14.4, 14.4, 14.4); public final DyeColor color; @@ -125,9 +122,4 @@ public class BlockFloatingFlower extends BlockMod implements ILexiconable { public TileEntity createTileEntity(@Nonnull BlockState state, @Nonnull IBlockReader world) { return new TileFloatingFlower(); } - - @Override - public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { - return LexiconData.shinyFlowers; - } } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java b/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java index 5d824e257..93af6d2aa 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java @@ -26,17 +26,14 @@ import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import net.minecraftforge.items.ItemHandlerHelper; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.Botania; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.block.tile.TileManaFlame; import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.lexicon.LexiconData; import javax.annotation.Nonnull; -public class BlockManaFlame extends BlockMod implements ILexiconable { +public class BlockManaFlame extends BlockMod { private static final VoxelShape SHAPE = makeCuboidShape(4, 4, 4, 12, 12, 12); @@ -82,9 +79,4 @@ public class BlockManaFlame extends BlockMod implements ILexiconable { public TileEntity createTileEntity(@Nonnull BlockState state, @Nonnull IBlockReader world) { return new TileManaFlame(); } - - @Override - public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { - return LexiconData.lenses; - } } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java b/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java index e74e6bfd8..d9573110d 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java @@ -23,15 +23,12 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.BlockMod; -import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import javax.annotation.Nonnull; -public class BlockManaGlass extends BlockMod implements ILexiconable { +public class BlockManaGlass extends BlockMod { public BlockManaGlass(Properties builder) { super(builder); @@ -44,9 +41,4 @@ public class BlockManaGlass extends BlockMod implements ILexiconable { return BlockRenderLayer.TRANSLUCENT; } - @Override - public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { - return LexiconData.pool; - } - } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java index 47868ab91..709b7b7e0 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java @@ -27,17 +27,14 @@ import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.item.IHornHarvestable; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.recipe.ICustomApothecaryColor; import vazkii.botania.client.fx.SparkleParticleData; import vazkii.botania.common.core.handler.ConfigHandler; -import vazkii.botania.common.lexicon.LexiconData; import javax.annotation.Nonnull; import java.util.Random; -public class BlockModMushroom extends MushroomBlock implements IHornHarvestable, ILexiconable, ICustomApothecaryColor { +public class BlockModMushroom extends MushroomBlock implements IHornHarvestable, ICustomApothecaryColor { private static final VoxelShape SHAPE = makeCuboidShape(4.8, 0, 4.8, 12.8, 16, 12.8); private final DyeColor color; @@ -83,11 +80,6 @@ public class BlockModMushroom extends MushroomBlock implements IHornHarvestable, } } - @Override - public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { - return LexiconData.mushrooms; - } - @Override public boolean canHornHarvest(World world, BlockPos pos, ItemStack stack, EnumHornType hornType) { return false; diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java b/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java index ecee3ac93..a0ec643f7 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java @@ -24,26 +24,18 @@ import net.minecraft.world.World; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.BlockMod; -import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import javax.annotation.Nonnull; -public class BlockPetalBlock extends BlockMod implements ILexiconable { +public class BlockPetalBlock extends BlockMod { public final DyeColor color; public BlockPetalBlock(DyeColor color, Properties builder) { super(builder); this.color = color; } - - @Override - public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { - return LexiconData.flowers; - } } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java b/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java index 378229ab8..4c2506cba 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java @@ -21,9 +21,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import vazkii.botania.api.item.IHornHarvestable; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.BlockModFlower; -import vazkii.botania.common.lexicon.LexiconData; import javax.annotation.Nonnull; @@ -33,11 +31,6 @@ public class BlockShinyFlower extends BlockModFlower implements IHornHarvestable super(color, builder); } - @Override - public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { - return LexiconData.shinyFlowers; - } - @Override public boolean canGrow(@Nonnull IBlockReader world, @Nonnull BlockPos pos, @Nonnull BlockState state, boolean fuckifiknow) { return false; diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java b/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java index 9f5183af3..4aa5eaa50 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java @@ -22,15 +22,12 @@ import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.block.tile.TileStarfield; -import vazkii.botania.common.lexicon.LexiconData; import javax.annotation.Nonnull; -public class BlockStarfield extends BlockMod implements ILexiconable { +public class BlockStarfield extends BlockMod { private static final VoxelShape SHAPE = makeCuboidShape(0, 0, 0, 16, 4, 16); @@ -62,9 +59,4 @@ public class BlockStarfield extends BlockMod implements ILexiconable { return new TileStarfield(); } - @Override - public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { - return LexiconData.starfield; - } - } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java b/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java index 403505d55..c6d00c101 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java @@ -32,18 +32,15 @@ import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.util.text.ITextComponent; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.block.tile.TileSimpleInventory; import vazkii.botania.common.block.tile.TileTinyPotato; import vazkii.botania.common.core.helper.InventoryHelper; -import vazkii.botania.common.lexicon.LexiconData; import javax.annotation.Nonnull; -public class BlockTinyPotato extends BlockMod implements ILexiconable { +public class BlockTinyPotato extends BlockMod { private static final VoxelShape SHAPE = makeCuboidShape(6, 0, 6, 10, 6, 10); @@ -111,9 +108,4 @@ public class BlockTinyPotato extends BlockMod implements ILexiconable { public TileEntity createTileEntity(@Nonnull BlockState state, @Nonnull IBlockReader world) { return new TileTinyPotato(); } - - @Override - public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { - return LexiconData.tinyPotato; - } } diff --git a/src/main/java/vazkii/botania/common/block/decor/quartz/BlockElfQuartzSlab.java b/src/main/java/vazkii/botania/common/block/decor/quartz/BlockElfQuartzSlab.java index 6a7aed53a..2dd8fe4d6 100644 --- a/src/main/java/vazkii/botania/common/block/decor/quartz/BlockElfQuartzSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/quartz/BlockElfQuartzSlab.java @@ -14,10 +14,8 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.block.decor.slabs.BlockModSlab; -import vazkii.botania.common.lexicon.LexiconData; public class BlockElfQuartzSlab extends BlockModSlab { @@ -25,9 +23,4 @@ public class BlockElfQuartzSlab extends BlockModSlab { super(props); } - @Override - public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { - return LexiconData.elvenResources; - } - } diff --git a/src/main/java/vazkii/botania/common/block/decor/quartz/BlockElfQuartzStairs.java b/src/main/java/vazkii/botania/common/block/decor/quartz/BlockElfQuartzStairs.java index 205c41a90..9a6aa2595 100644 --- a/src/main/java/vazkii/botania/common/block/decor/quartz/BlockElfQuartzStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/quartz/BlockElfQuartzStairs.java @@ -16,10 +16,8 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.block.decor.stairs.BlockModStairs; -import vazkii.botania.common.lexicon.LexiconData; public class BlockElfQuartzStairs extends BlockModStairs { @@ -27,9 +25,4 @@ public class BlockElfQuartzStairs extends BlockModStairs { super(state, props); } - @Override - public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { - return LexiconData.elvenResources; - } - } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartzPillar.java b/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartzPillar.java index 387f35f66..07a1283a3 100644 --- a/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartzPillar.java +++ b/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartzPillar.java @@ -6,18 +6,10 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.ModFluffBlocks; -import vazkii.botania.common.lexicon.LexiconData; -public class BlockSpecialQuartzPillar extends RotatedPillarBlock implements ILexiconable { +public class BlockSpecialQuartzPillar extends RotatedPillarBlock { public BlockSpecialQuartzPillar(Properties properties) { super(properties); } - - @Override - public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { - return this == ModFluffBlocks.elfQuartzPillar ? LexiconData.elvenResources : LexiconData.decorativeBlocks; - } } diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockBiomeStoneSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockBiomeStoneSlab.java index b01f4e92f..eca81106b 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockBiomeStoneSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockBiomeStoneSlab.java @@ -17,9 +17,7 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.ModFluffBlocks; -import vazkii.botania.common.lexicon.LexiconData; public class BlockBiomeStoneSlab extends BlockModSlab { @@ -27,9 +25,4 @@ public class BlockBiomeStoneSlab extends BlockModSlab { super(props); } - @Override - public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { - return LexiconData.marimorphosis; - } - } diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java index 8298b2afa..b3a9f61eb 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java @@ -5,18 +5,9 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.common.lexicon.LexiconData; -public class BlockModSlab extends SlabBlock implements ILexiconable { +public class BlockModSlab extends SlabBlock { public BlockModSlab(Properties props) { super(props); } - - @Override - public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { - return LexiconData.decorativeBlocks; - } - } diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockPavementSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockPavementSlab.java index f2212681d..92fd48302 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockPavementSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockPavementSlab.java @@ -17,10 +17,8 @@ import net.minecraft.item.DyeColor; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.ModFluffBlocks; -import vazkii.botania.common.lexicon.LexiconData; public class BlockPavementSlab extends BlockModSlab { @@ -28,9 +26,4 @@ public class BlockPavementSlab extends BlockModSlab { super(props); } - @Override - public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { - return LexiconData.pavement; - } - } diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockBiomeStoneStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockBiomeStoneStairs.java index ebb185dc4..635d5dca1 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockBiomeStoneStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockBiomeStoneStairs.java @@ -16,8 +16,6 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.common.lexicon.LexiconData; public class BlockBiomeStoneStairs extends BlockModStairs { @@ -25,9 +23,4 @@ public class BlockBiomeStoneStairs extends BlockModStairs { super(state, props); } - @Override - public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { - return LexiconData.marimorphosis; - } - } diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java index 56b12336d..c3a0818fd 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java @@ -13,20 +13,12 @@ import net.minecraft.world.World; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.core.BotaniaCreativeTab; -import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; -public class BlockModStairs extends StairsBlock implements ILexiconable { +public class BlockModStairs extends StairsBlock { public BlockModStairs(BlockState state, Block.Properties builder) { super(state, builder); } - - @Override - public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { - return LexiconData.decorativeBlocks; - } } diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockPavementStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockPavementStairs.java index 632ba8c62..9d88832b0 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockPavementStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockPavementStairs.java @@ -16,10 +16,8 @@ import net.minecraft.item.DyeColor; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.ModFluffBlocks; -import vazkii.botania.common.lexicon.LexiconData; public class BlockPavementStairs extends BlockModStairs { @@ -27,9 +25,4 @@ public class BlockPavementStairs extends BlockModStairs { super(state, props); } - @Override - public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { - return LexiconData.pavement; - } - } diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java index 941736214..04031d777 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java @@ -21,11 +21,9 @@ import net.minecraft.world.World; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.ModFluffBlocks; -import vazkii.botania.common.lexicon.LexiconData; import javax.annotation.Nonnull; @@ -34,10 +32,4 @@ public class BlockBiomeStoneWall extends BlockModWall { public BlockBiomeStoneWall(Properties props) { super(props); } - - @Override - public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { - return LexiconData.marimorphosis; - } - } diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java index a88c2c32d..5c6d4135a 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java @@ -23,22 +23,14 @@ import net.minecraft.world.World; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.core.BotaniaCreativeTab; -import vazkii.botania.common.lexicon.LexiconData; import javax.annotation.Nonnull; -public class BlockModWall extends WallBlock implements ILexiconable { +public class BlockModWall extends WallBlock { public BlockModWall(Properties props) { super(props); } - @Override - public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { - return LexiconData.decorativeBlocks; - } - } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockAlchemyCatalyst.java b/src/main/java/vazkii/botania/common/block/mana/BlockAlchemyCatalyst.java index 82ae35d75..c03d1b955 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockAlchemyCatalyst.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockAlchemyCatalyst.java @@ -17,24 +17,16 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.IPoolOverlayProvider; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.common.block.BlockMod; -import vazkii.botania.common.lexicon.LexiconData; -public class BlockAlchemyCatalyst extends BlockMod implements ILexiconable, IPoolOverlayProvider { +public class BlockAlchemyCatalyst extends BlockMod implements IPoolOverlayProvider { public BlockAlchemyCatalyst(Properties builder) { super(builder); } - @Override - public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { - return LexiconData.alchemy; - } - @Override @OnlyIn(Dist.CLIENT) public TextureAtlasSprite getIcon(World world, BlockPos pos) { diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java b/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java index 0277f7fab..57e51c7ba 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java @@ -26,17 +26,14 @@ import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.block.tile.mana.TileBellows; import vazkii.botania.common.entity.EntityDoppleganger; -import vazkii.botania.common.lexicon.LexiconData; import javax.annotation.Nonnull; -public class BlockBellows extends BlockMod implements ILexiconable { +public class BlockBellows extends BlockMod { private static final VoxelShape SHAPE = makeCuboidShape(3, 0, 3, 13, 10.0, 13); @@ -85,9 +82,4 @@ public class BlockBellows extends BlockMod implements ILexiconable { return new TileBellows(); } - @Override - public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { - return LexiconData.bellows; - } - } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java b/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java index 99d48ed21..3c811e5df 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java @@ -27,19 +27,16 @@ import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.block.tile.TileBrewery; import vazkii.botania.common.block.tile.TileSimpleInventory; import vazkii.botania.common.core.helper.InventoryHelper; -import vazkii.botania.common.lexicon.LexiconData; import javax.annotation.Nonnull; -public class BlockBrewery extends BlockMod implements ILexiconable, IWandHUD { +public class BlockBrewery extends BlockMod implements IWandHUD { private static final VoxelShape SHAPE = makeCuboidShape(6, 0.8, 6, 10, 15.2, 10); @@ -115,11 +112,6 @@ public class BlockBrewery extends BlockMod implements ILexiconable, IWandHUD { return new TileBrewery(); } - @Override - public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { - return LexiconData.brewery; - } - @OnlyIn(Dist.CLIENT) @Override public void renderHUD(Minecraft mc, World world, BlockPos pos) { diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockConjurationCatalyst.java b/src/main/java/vazkii/botania/common/block/mana/BlockConjurationCatalyst.java index 2b123a193..cbdbb606b 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockConjurationCatalyst.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockConjurationCatalyst.java @@ -17,9 +17,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.core.handler.MiscellaneousIcons; -import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; public class BlockConjurationCatalyst extends BlockAlchemyCatalyst { @@ -28,11 +26,6 @@ public class BlockConjurationCatalyst extends BlockAlchemyCatalyst { super(builder); } - @Override - public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { - return LexiconData.conjurationCatalyst; - } - @Override @OnlyIn(Dist.CLIENT) public TextureAtlasSprite getIcon(World world, BlockPos pos) { diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java b/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java index 401ca6180..c155fb5fe 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java @@ -20,15 +20,12 @@ import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.block.tile.mana.TileDistributor; -import vazkii.botania.common.lexicon.LexiconData; import javax.annotation.Nonnull; -public class BlockDistributor extends BlockMod implements ILexiconable { +public class BlockDistributor extends BlockMod { private static final VoxelShape SHAPE = Block.makeCuboidShape(4, 0, 4, 12, 16, 12); @@ -53,9 +50,4 @@ public class BlockDistributor extends BlockMod implements ILexiconable { return new TileDistributor(); } - @Override - public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { - return LexiconData.distributor; - } - } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java index 5fc9ca551..969f6da3c 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java @@ -38,8 +38,6 @@ import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.items.ItemHandlerHelper; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; @@ -47,13 +45,12 @@ import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.block.tile.TileEnchanter; import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import javax.annotation.Nonnull; import java.util.Random; -public class BlockEnchanter extends BlockMod implements IWandable, ILexiconable, IWandHUD { +public class BlockEnchanter extends BlockMod implements IWandable, IWandHUD { public BlockEnchanter(Properties builder) { super(builder); @@ -124,11 +121,6 @@ public class BlockEnchanter extends BlockMod implements IWandable, ILexiconable, return true; } - @Override - public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { - return LexiconData.manaEnchanting; - } - @OnlyIn(Dist.CLIENT) @Override public void renderHUD(Minecraft mc, World world, BlockPos pos) { diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java b/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java index 2ddae6a1f..abf1a4336 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java @@ -29,21 +29,18 @@ import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import net.minecraftforge.common.IShearable; import vazkii.botania.api.internal.IManaBurst; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.IManaTrigger; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.item.ItemHorn; import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.lexicon.LexiconData; import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.Collections; import java.util.List; -public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexiconable { +public class BlockForestDrum extends BlockMod implements IManaTrigger { public enum Variant { WILD, @@ -129,18 +126,4 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona for(int i = 0; i < 10; i++) world.playSound(null, pos, SoundEvents.BLOCK_NOTE_BLOCK_BASEDRUM, SoundCategory.BLOCKS, 1F, 1F); } - - @Override - public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { - switch(variant) { - case GATHERING: - return LexiconData.gatherDrum; - case CANOPY: - return LexiconData.canopyDrum; - case WILD: - default: - return LexiconData.forestDrum; - } - } - } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java b/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java index 07e5986f0..3616b295a 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java @@ -24,17 +24,14 @@ import net.minecraft.util.math.shapes.VoxelShapes; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import vazkii.botania.api.internal.IManaBurst; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.IManaCollisionGhost; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.block.tile.mana.TileManaDetector; -import vazkii.botania.common.lexicon.LexiconData; import javax.annotation.Nonnull; -public class BlockManaDetector extends BlockMod implements ILexiconable, IManaCollisionGhost { +public class BlockManaDetector extends BlockMod implements IManaCollisionGhost { public BlockManaDetector(Properties builder) { super(builder); @@ -78,11 +75,6 @@ public class BlockManaDetector extends BlockMod implements ILexiconable, IManaCo return new TileManaDetector(); } - @Override - public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { - return LexiconData.manaDetector; - } - @Override public boolean isGhost(BlockState state, World world, BlockPos pos) { return true; diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java b/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java index 46cbac62c..9e0c21f76 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java @@ -24,18 +24,15 @@ import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.IPoolOverlayProvider; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.block.tile.mana.TileManaVoid; -import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import javax.annotation.Nonnull; -public class BlockManaVoid extends BlockMod implements ILexiconable, IPoolOverlayProvider { +public class BlockManaVoid extends BlockMod implements IPoolOverlayProvider { public BlockManaVoid(Properties builder) { super(builder); @@ -52,11 +49,6 @@ public class BlockManaVoid extends BlockMod implements ILexiconable, IPoolOverla return new TileManaVoid(); } - @Override - public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { - return LexiconData.manaVoid; - } - @Override @OnlyIn(Dist.CLIENT) public TextureAtlasSprite getIcon(World world, BlockPos pos) { diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java index 1a903ffe3..a14033217 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java @@ -33,20 +33,17 @@ import net.minecraft.world.storage.loot.LootParameters; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.internal.VanillaPacketDispatcher; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.block.tile.mana.TilePool; -import vazkii.botania.common.lexicon.LexiconData; import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.util.Collections; import java.util.List; -public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexiconable { +public class BlockPool extends BlockMod implements IWandHUD, IWandable { private static final VoxelShape SLAB = makeCuboidShape(0, 0, 0, 16, 8, 16); private static final VoxelShape CUTOUT = makeCuboidShape(1, 1, 1, 15, 8, 15); private static final VoxelShape REAL_SHAPE = VoxelShapes.combineAndSimplify(SLAB, CUTOUT, IBooleanFunction.ONLY_FIRST); @@ -131,9 +128,4 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon ((TilePool) world.getTileEntity(pos)).onWanded(player, stack); return true; } - - @Override - public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { - return variant == Variant.FABULOUS ? LexiconData.rainbowRod : LexiconData.pool; - } } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java index 55ad4b66f..b02689762 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java @@ -28,8 +28,6 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.items.ItemHandlerHelper; import vazkii.botania.api.internal.IManaBurst; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.ILens; import vazkii.botania.api.mana.IManaCollisionGhost; import vazkii.botania.api.mana.IManaTrigger; @@ -38,11 +36,10 @@ import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.block.tile.TileSimpleInventory; import vazkii.botania.common.block.tile.mana.TilePrism; import vazkii.botania.common.core.helper.InventoryHelper; -import vazkii.botania.common.lexicon.LexiconData; import javax.annotation.Nonnull; -public class BlockPrism extends BlockMod implements IManaTrigger, ILexiconable, IManaCollisionGhost { +public class BlockPrism extends BlockMod implements IManaTrigger, IManaCollisionGhost { private static final VoxelShape SHAPE = makeCuboidShape(4, 0, 4, 12, 16, 12); public BlockPrism(Properties builder) { @@ -134,11 +131,6 @@ public class BlockPrism extends BlockMod implements IManaTrigger, ILexiconable, ((TilePrism) tile).onBurstCollision(burst); } - @Override - public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { - return LexiconData.prism; - } - @Override public boolean isGhost(BlockState state, World world, BlockPos pos) { return true; diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPump.java b/src/main/java/vazkii/botania/common/block/mana/BlockPump.java index 1907bc922..97f34a635 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPump.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPump.java @@ -23,17 +23,14 @@ import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.block.tile.mana.TilePump; -import vazkii.botania.common.lexicon.LexiconData; import javax.annotation.Nonnull; import javax.annotation.Nullable; -public class BlockPump extends BlockMod implements ILexiconable { +public class BlockPump extends BlockMod { private static final VoxelShape X_SHAPE = makeCuboidShape(0, 0, 4, 16, 8, 12); private static final VoxelShape Z_SHAPE = makeCuboidShape(4, 0, 0, 12, 8, 16); @@ -74,12 +71,6 @@ public class BlockPump extends BlockMod implements ILexiconable { return ((TilePump) world.getTileEntity(pos)).comparator; } - @Override - public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { - return LexiconData.poolCart; - } - - @Override public boolean hasTileEntity(BlockState state) { return true; diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockRFGenerator.java b/src/main/java/vazkii/botania/common/block/mana/BlockRFGenerator.java index afdb4faeb..e1b0a313b 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockRFGenerator.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockRFGenerator.java @@ -21,16 +21,13 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.block.tile.mana.TileRFGenerator; -import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import javax.annotation.Nonnull; -public class BlockRFGenerator extends BlockMod implements ILexiconable { +public class BlockRFGenerator extends BlockMod { public BlockRFGenerator(Properties builder) { super(builder); @@ -47,9 +44,4 @@ public class BlockRFGenerator extends BlockMod implements ILexiconable { return new TileRFGenerator(); } - @Override - public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { - return LexiconData.rfGenerator; - } - } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java b/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java index 9f56fb8d4..14d9e842d 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java @@ -26,18 +26,15 @@ import net.minecraft.util.math.shapes.VoxelShapes; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import vazkii.botania.api.internal.VanillaPacketDispatcher; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.wand.IWandable; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.block.tile.TileRuneAltar; import vazkii.botania.common.block.tile.TileSimpleInventory; import vazkii.botania.common.core.helper.InventoryHelper; -import vazkii.botania.common.lexicon.LexiconData; import javax.annotation.Nonnull; -public class BlockRuneAltar extends BlockMod implements IWandable, ILexiconable { +public class BlockRuneAltar extends BlockMod implements IWandable { private static final VoxelShape TOP = Block.makeCuboidShape(0, 6, 0, 16, 12, 16); private static final VoxelShape BOTTOM = Block.makeCuboidShape(2, 0, 2, 14, 6, 14); @@ -117,9 +114,5 @@ public class BlockRuneAltar extends BlockMod implements IWandable, ILexiconable return true; } - @Override - public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { - return LexiconData.runicAltar; - } } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java b/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java index 3f5679c31..e14cbe116 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java @@ -22,15 +22,12 @@ import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.block.tile.TileSpawnerClaw; -import vazkii.botania.common.lexicon.LexiconData; import javax.annotation.Nonnull; -public class BlockSpawnerClaw extends BlockMod implements ILexiconable { +public class BlockSpawnerClaw extends BlockMod { private static final VoxelShape SHAPE = makeCuboidShape(2, 0, 2, 14, 2, 14); @@ -61,9 +58,4 @@ public class BlockSpawnerClaw extends BlockMod implements ILexiconable { return new TileSpawnerClaw(); } - @Override - public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { - return LexiconData.spawnerClaw; - } - } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java index 2178b3dca..dd1704c58 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java @@ -32,8 +32,6 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.items.ItemHandlerHelper; import vazkii.botania.api.ColorHelper; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.ILens; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; @@ -42,12 +40,11 @@ import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.block.tile.mana.TileSpreader; import vazkii.botania.common.core.helper.InventoryHelper; import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.lexicon.LexiconData; import javax.annotation.Nonnull; import java.util.List; -public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILexiconable, IWireframeAABBProvider { +public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, IWireframeAABBProvider { private static final VoxelShape RENDER_SHAPE = makeCuboidShape(1, 1, 1, 15, 15, 15); public enum Variant { MANA, @@ -185,11 +182,6 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex ((TileSpreader) world.getTileEntity(pos)).renderHUD(mc); } - @Override - public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { - return variant == Variant.MANA ? LexiconData.spreader : variant == Variant.REDSTONE ? LexiconData.redstoneSpreader : LexiconData.dreamwoodSpreader; - } - @Override public List getWireframeAABB(World world, BlockPos pos) { return ImmutableList.of(new AxisAlignedBB(pos).shrink(1.0/16.0)); diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java b/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java index b66bc8dce..9c99d2e17 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java @@ -24,16 +24,13 @@ import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.block.tile.TileTerraPlate; import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.lexicon.LexiconData; import javax.annotation.Nonnull; -public class BlockTerraPlate extends BlockMod implements ILexiconable { +public class BlockTerraPlate extends BlockMod { private static final VoxelShape SHAPE = makeCuboidShape(0, 0, 0, 16, 3, 16); @@ -82,11 +79,6 @@ public class BlockTerraPlate extends BlockMod implements ILexiconable { return new TileTerraPlate(); } - @Override - public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { - return LexiconData.terrasteel; - } - @Override public boolean hasComparatorInputOverride(BlockState state) { return true; diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java b/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java index 81f060feb..5b112af22 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java @@ -25,18 +25,15 @@ import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.block.tile.mana.TileTurntable; -import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import javax.annotation.Nonnull; -public class BlockTurntable extends BlockMod implements IWandable, IWandHUD, ILexiconable { +public class BlockTurntable extends BlockMod implements IWandable, IWandHUD { public BlockTurntable(Properties builder) { super(builder); @@ -65,9 +62,4 @@ public class BlockTurntable extends BlockMod implements IWandable, IWandHUD, ILe return true; } - @Override - public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { - return LexiconData.turntable; - } - } diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedString.java b/src/main/java/vazkii/botania/common/block/string/BlockRedString.java index 7b301791f..0cd101a05 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedString.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedString.java @@ -24,16 +24,13 @@ import net.minecraft.state.StateContainer; import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.BlockMod; -import vazkii.botania.common.lexicon.LexiconData; import javax.annotation.Nonnull; -public abstract class BlockRedString extends BlockMod implements ILexiconable { +public abstract class BlockRedString extends BlockMod { public BlockRedString(Block.Properties builder) { super(builder); @@ -53,10 +50,4 @@ public abstract class BlockRedString extends BlockMod implements ILexiconable { public boolean hasTileEntity(BlockState state) { return true; } - - @Override - public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) { - return LexiconData.redString; - } - } diff --git a/src/main/java/vazkii/botania/common/block/subtile/SubTileManastar.java b/src/main/java/vazkii/botania/common/block/subtile/SubTileManastar.java index 5b77c01ad..d03bfb5aa 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/SubTileManastar.java +++ b/src/main/java/vazkii/botania/common/block/subtile/SubTileManastar.java @@ -15,12 +15,10 @@ import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraftforge.registries.ObjectHolder; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.IManaPool; import vazkii.botania.api.subtile.TileEntitySpecialFlower; import vazkii.botania.client.fx.WispParticleData; import vazkii.botania.common.core.helper.MathHelper; -import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; public class SubTileManastar extends TileEntitySpecialFlower { @@ -78,9 +76,4 @@ public class SubTileManastar extends TileEntitySpecialFlower { } } - @Override - public LexiconEntry getEntry() { - return LexiconData.manastar; - } - } diff --git a/src/main/java/vazkii/botania/common/block/subtile/SubTilePureDaisy.java b/src/main/java/vazkii/botania/common/block/subtile/SubTilePureDaisy.java index ecc9b99ca..56a352915 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/SubTilePureDaisy.java +++ b/src/main/java/vazkii/botania/common/block/subtile/SubTilePureDaisy.java @@ -18,14 +18,12 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.BotaniaAPI; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.recipe.RecipePureDaisy; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntitySpecialFlower; import vazkii.botania.client.fx.SparkleParticleData; import vazkii.botania.client.fx.WispParticleData; import vazkii.botania.common.core.handler.ConfigHandler; -import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; import java.util.Arrays; @@ -178,8 +176,4 @@ public class SubTilePureDaisy extends TileEntitySpecialFlower { cmp.putInt(TAG_TICKS_REMAINING + i, ticksRemaining[i]); } - @Override - public LexiconEntry getEntry() { - return LexiconData.pureDaisy; - } } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileAgricarnation.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileAgricarnation.java index ec92061c5..1b90e653e 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileAgricarnation.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileAgricarnation.java @@ -23,12 +23,10 @@ import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraftforge.registries.ObjectHolder; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityFunctionalFlower; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.handler.ModSounds; -import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; public class SubTileAgricarnation extends TileEntityFunctionalFlower { @@ -117,11 +115,6 @@ public class SubTileAgricarnation extends TileEntityFunctionalFlower { return new RadiusDescriptor.Square(getPos(), getRange()); } - @Override - public LexiconEntry getEntry() { - return LexiconData.agricarnation; - } - public static class Mini extends SubTileAgricarnation { @ObjectHolder(LibMisc.MOD_ID + ":agricarnation_chibi") public static TileEntityType TYPE; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java index c3c5b0f13..a0360f055 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java @@ -18,10 +18,8 @@ import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.DamageSource; import net.minecraft.util.math.AxisAlignedBB; import net.minecraftforge.registries.ObjectHolder; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityFunctionalFlower; -import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; import java.util.List; @@ -104,11 +102,6 @@ public class SubTileBellethorn extends TileEntityFunctionalFlower { return new RadiusDescriptor.Square(getPos(), getRange()); } - @Override - public LexiconEntry getEntry() { - return LexiconData.bellethorne; - } - public static class Mini extends SubTileBellethorn { @ObjectHolder(LibMisc.MOD_ID + ":bellethorn_chibi") public static TileEntityType TYPE; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBergamute.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBergamute.java index 25a47fddb..1e98d71e9 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBergamute.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBergamute.java @@ -2,10 +2,8 @@ package vazkii.botania.common.block.subtile.functional; import net.minecraft.tileentity.TileEntityType; import net.minecraftforge.registries.ObjectHolder; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityFunctionalFlower; -import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; import java.util.Collections; @@ -63,9 +61,4 @@ public class SubTileBergamute extends TileEntityFunctionalFlower { return new RadiusDescriptor.Circle(getPos(), RANGE); } - @Override - public LexiconEntry getEntry() { - return LexiconData.bergamute; - } - } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBubbell.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBubbell.java index f8d543d33..cd2ce81a9 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBubbell.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBubbell.java @@ -18,12 +18,10 @@ import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.registries.ObjectHolder; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityFunctionalFlower; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileFakeAir; -import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; public class SubTileBubbell extends TileEntityFunctionalFlower { @@ -115,11 +113,6 @@ public class SubTileBubbell extends TileEntityFunctionalFlower { return new RadiusDescriptor.Circle(getPos(), range); } - @Override - public LexiconEntry getEntry() { - return LexiconData.bubbell; - } - public static class Mini extends SubTileBubbell { @ObjectHolder(LibMisc.MOD_ID + ":bubbell_chibi") public static TileEntityType TYPE; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileClayconia.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileClayconia.java index 307d580e7..412f3f0e0 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileClayconia.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileClayconia.java @@ -18,11 +18,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.math.BlockPos; import net.minecraftforge.registries.ObjectHolder; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityFunctionalFlower; import vazkii.botania.common.core.handler.ConfigHandler; -import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; import java.util.ArrayList; @@ -109,11 +107,6 @@ public class SubTileClayconia extends TileEntityFunctionalFlower { return 640; } - @Override - public LexiconEntry getEntry() { - return LexiconData.clayconia; - } - public static class Mini extends SubTileClayconia { @ObjectHolder(LibMisc.MOD_ID + ":bellethorn_chibi") public static TileEntityType TYPE; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java index 5955090ba..59c512c60 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java @@ -25,11 +25,9 @@ import net.minecraft.world.World; import net.minecraftforge.event.entity.player.PlayerEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.registries.ObjectHolder; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityFunctionalFlower; import vazkii.botania.client.fx.WispParticleData; -import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.network.PacketHandler; import vazkii.botania.common.network.PacketItemAge; @@ -155,11 +153,6 @@ public class SubTileDaffomill extends TileEntityFunctionalFlower { return 100; } - @Override - public LexiconEntry getEntry() { - return LexiconData.daffomill; - } - @Override public void writeToPacketNBT(CompoundNBT cmp) { super.writeToPacketNBT(cmp); diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDreadthorn.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDreadthorn.java index 3b03affad..b60bff295 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDreadthorn.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDreadthorn.java @@ -15,9 +15,7 @@ import net.minecraft.entity.passive.AnimalEntity; import net.minecraft.entity.passive.AnimalEntity; import net.minecraft.tileentity.TileEntityType; import net.minecraftforge.registries.ObjectHolder; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.ModSubtiles; -import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; import java.util.function.Predicate; @@ -45,9 +43,5 @@ public class SubTileDreadthorn extends SubTileBellethorn { return 30; } - @Override - public LexiconEntry getEntry() { - return LexiconData.dreadthorne; - } } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileExoflame.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileExoflame.java index c17be28cf..0a8c195c3 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileExoflame.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileExoflame.java @@ -23,10 +23,8 @@ import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.math.BlockPos; import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.item.IExoflameHeatable; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityFunctionalFlower; -import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; import java.util.Optional; @@ -137,9 +135,4 @@ public class SubTileExoflame extends TileEntityFunctionalFlower { return 0x661600; } - @Override - public LexiconEntry getEntry() { - return LexiconData.exoflame; - } - } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileFallenKanade.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileFallenKanade.java index 20d1033f3..6c3797e91 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileFallenKanade.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileFallenKanade.java @@ -17,10 +17,8 @@ import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.world.dimension.EndDimension; import net.minecraftforge.registries.ObjectHolder; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityFunctionalFlower; -import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; import java.util.List; @@ -70,9 +68,4 @@ public class SubTileFallenKanade extends TileEntityFunctionalFlower { return 900; } - @Override - public LexiconEntry getEntry() { - return LexiconData.fallenKanade; - } - } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java index 5dd68c7c4..e544d5a15 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java @@ -20,10 +20,8 @@ import net.minecraft.entity.monster.IMob; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.math.AxisAlignedBB; import net.minecraftforge.registries.ObjectHolder; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityFunctionalFlower; -import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; import java.util.List; @@ -109,9 +107,4 @@ public class SubTileHeiseiDream extends TileEntityFunctionalFlower { return 1000; } - @Override - public LexiconEntry getEntry() { - return LexiconData.heiseiDream; - } - } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java index 374d09f31..d32ce50d1 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java @@ -32,13 +32,11 @@ import net.minecraftforge.items.ItemHandlerHelper; import net.minecraftforge.registries.ObjectHolder; import org.lwjgl.opengl.GL11; import vazkii.botania.api.corporea.InvWithLocation; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.IManaItem; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityFunctionalFlower; import vazkii.botania.common.core.helper.InventoryHelper; import vazkii.botania.common.core.helper.MathHelper; -import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; import java.util.ArrayList; @@ -246,11 +244,6 @@ public class SubTileHopperhock extends TileEntityFunctionalFlower { GlStateManager.disableBlend(); } - @Override - public LexiconEntry getEntry() { - return LexiconData.hopperhock; - } - @Override public int getMaxMana() { return 20; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHyacidus.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHyacidus.java index 7f9ecae5e..af5a3150f 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHyacidus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHyacidus.java @@ -18,10 +18,8 @@ import net.minecraft.potion.Effects; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.math.AxisAlignedBB; import net.minecraftforge.registries.ObjectHolder; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityFunctionalFlower; -import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; import java.util.List; @@ -74,9 +72,4 @@ public class SubTileHyacidus extends TileEntityFunctionalFlower { return new RadiusDescriptor.Square(getPos(), RANGE); } - @Override - public LexiconEntry getEntry() { - return LexiconData.hyacidus; - } - } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileJadedAmaranthus.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileJadedAmaranthus.java index dcdbb49d8..e3f88ef2a 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileJadedAmaranthus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileJadedAmaranthus.java @@ -17,12 +17,10 @@ import net.minecraft.item.DyeColor; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.math.BlockPos; import net.minecraftforge.registries.ObjectHolder; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityFunctionalFlower; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.handler.ConfigHandler; -import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; public class SubTileJadedAmaranthus extends TileEntityFunctionalFlower { @@ -88,11 +86,6 @@ public class SubTileJadedAmaranthus extends TileEntityFunctionalFlower { return new RadiusDescriptor.Square(getPos(), RANGE); } - @Override - public LexiconEntry getEntry() { - return LexiconData.jadedAmaranthus; - } - @Override public int getMaxMana() { return COST; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileJiyuulia.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileJiyuulia.java index d5579b2d4..e3a6b2a13 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileJiyuulia.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileJiyuulia.java @@ -12,9 +12,7 @@ package vazkii.botania.common.block.subtile.functional; import net.minecraft.tileentity.TileEntityType; import net.minecraftforge.registries.ObjectHolder; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.ModSubtiles; -import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; public class SubTileJiyuulia extends SubTileTangleberrie { @@ -45,9 +43,4 @@ public class SubTileJiyuulia extends SubTileTangleberrie { return 0xBD9ACA; } - @Override - public LexiconEntry getEntry() { - return LexiconData.jiyuulia; - } - } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileLoonuim.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileLoonuim.java index 31f3c1483..ca3b71368 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileLoonuim.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileLoonuim.java @@ -44,10 +44,8 @@ import net.minecraftforge.eventbus.api.EventPriority; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.registries.ObjectHolder; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityFunctionalFlower; -import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.lib.ModTags; @@ -167,11 +165,6 @@ public class SubTileLoonuim extends TileEntityFunctionalFlower { return 0x274A00; } - @Override - public LexiconEntry getEntry() { - return LexiconData.loonium; - } - @Override public int getMaxMana() { return COST; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMarimorphosis.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMarimorphosis.java index a409ede82..9eb0c79f3 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMarimorphosis.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMarimorphosis.java @@ -19,12 +19,10 @@ import net.minecraft.util.math.BlockPos; import net.minecraftforge.common.BiomeDictionary; import net.minecraftforge.common.BiomeDictionary.Type; import net.minecraftforge.registries.ObjectHolder; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityFunctionalFlower; import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.core.handler.ConfigHandler; -import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; import java.util.ArrayList; @@ -161,11 +159,6 @@ public class SubTileMarimorphosis extends TileEntityFunctionalFlower { return 1000; } - @Override - public LexiconEntry getEntry() { - return LexiconData.marimorphosis; - } - public static class Mini extends SubTileMarimorphosis { @ObjectHolder(LibMisc.MOD_ID + ":marimorphosis_chibi") public static TileEntityType TYPE; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMedumone.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMedumone.java index efe82ea1b..e61e98ee3 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMedumone.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMedumone.java @@ -17,10 +17,8 @@ import net.minecraft.potion.Effects; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.math.AxisAlignedBB; import net.minecraftforge.registries.ObjectHolder; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityFunctionalFlower; -import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; import java.util.List; @@ -72,9 +70,4 @@ public class SubTileMedumone extends TileEntityFunctionalFlower { return 4000; } - @Override - public LexiconEntry getEntry() { - return LexiconData.medumone; - } - } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechid.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechid.java index 39bc16db9..533e4b6e1 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechid.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechid.java @@ -22,13 +22,11 @@ import net.minecraft.util.WeightedRandom; import net.minecraft.util.math.BlockPos; import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.BotaniaAPI; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityFunctionalFlower; import vazkii.botania.common.Botania; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.handler.ModSounds; -import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; import java.util.ArrayList; @@ -153,11 +151,6 @@ public class SubTileOrechid extends TileEntityFunctionalFlower { return getCost(); } - @Override - public LexiconEntry getEntry() { - return LexiconData.orechid; - } - private static class TagRandomItem extends WeightedRandom.Item { public final ResourceLocation s; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechidIgnem.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechidIgnem.java index 7aacef225..2a960b321 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechidIgnem.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechidIgnem.java @@ -17,9 +17,7 @@ import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.ResourceLocation; import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.BotaniaAPI; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.ModSubtiles; -import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; import java.util.Map; @@ -60,9 +58,4 @@ public class SubTileOrechidIgnem extends SubTileOrechid { return 0xAE3030; } - @Override - public LexiconEntry getEntry() { - return LexiconData.orechidIgnem; - } - } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java index 3e0c1a475..92c146f67 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java @@ -16,10 +16,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.math.AxisAlignedBB; import net.minecraftforge.registries.ObjectHolder; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityFunctionalFlower; -import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; import java.util.List; @@ -84,8 +82,4 @@ public class SubTilePollidisiac extends TileEntityFunctionalFlower { return 0xCF4919; } - @Override - public LexiconEntry getEntry() { - return LexiconData.pollidisiac; - } } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java index 28312b31f..91176409d 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java @@ -35,11 +35,9 @@ import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.registries.ObjectHolder; import org.lwjgl.opengl.GL11; import vazkii.botania.api.item.IFlowerPlaceable; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityFunctionalFlower; import vazkii.botania.common.core.handler.ConfigHandler; -import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; @@ -191,11 +189,6 @@ public class SubTileRannuncarpus extends TileEntityFunctionalFlower { return 0xFFB27F; } - @Override - public LexiconEntry getEntry() { - return LexiconData.rannuncarpus; - } - public static class Mini extends SubTileRannuncarpus { @ObjectHolder(LibMisc.MOD_ID + ":rannuncarpus_chibi") public static TileEntityType TYPE; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java index e7846d4a2..983f7a9cb 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java @@ -14,10 +14,8 @@ import com.google.common.collect.MapMaker; import net.minecraft.entity.Entity; import net.minecraft.tileentity.TileEntityType; import net.minecraftforge.registries.ObjectHolder; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityFunctionalFlower; -import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; import java.util.Collections; @@ -82,11 +80,6 @@ public class SubTileSolegnolia extends TileEntityFunctionalFlower { return new RadiusDescriptor.Circle(getPos(), getRange()); } - @Override - public LexiconEntry getEntry() { - return LexiconData.solegnolia; - } - public static class Mini extends SubTileSolegnolia { @ObjectHolder(LibMisc.MOD_ID + ":solegnolia_chibi") public static TileEntityType TYPE; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java index d1f38c4d8..1eeb02248 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java @@ -25,11 +25,9 @@ import net.minecraft.util.math.Vec3d; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.registries.ObjectHolder; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.IManaItem; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityFunctionalFlower; -import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.network.PacketBotaniaEffect; import vazkii.botania.common.network.PacketHandler; @@ -158,9 +156,4 @@ public class SubTileSpectranthemum extends TileEntityFunctionalFlower { return Minecraft.getInstance().player.isSneaking() && bindPos.getY() != -1 ? bindPos : super.getBinding(); } - @Override - public LexiconEntry getEntry() { - return LexiconData.spectranthemum; - } - } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTangleberrie.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTangleberrie.java index c1395347d..881810101 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTangleberrie.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTangleberrie.java @@ -15,13 +15,11 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.math.AxisAlignedBB; import net.minecraftforge.registries.ObjectHolder; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityFunctionalFlower; import vazkii.botania.client.fx.SparkleParticleData; import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.core.helper.Vector3; -import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; import java.util.List; @@ -106,9 +104,4 @@ public class SubTileTangleberrie extends TileEntityFunctionalFlower { return 20; } - @Override - public LexiconEntry getEntry() { - return LexiconData.tangleberrie; - } - } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java index d04d74470..98c2a7c7e 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java @@ -21,10 +21,8 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.math.AxisAlignedBB; import net.minecraftforge.registries.ObjectHolder; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityFunctionalFlower; -import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; import java.util.ArrayList; @@ -109,9 +107,4 @@ public class SubTileTigerseye extends TileEntityFunctionalFlower { return 1000; } - @Override - public LexiconEntry getEntry() { - return LexiconData.tigerseye; - } - } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java index be50992b0..f5730fb73 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java @@ -19,11 +19,9 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.registries.ObjectHolder; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityFunctionalFlower; import vazkii.botania.common.core.helper.MathHelper; -import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; import java.util.ArrayList; @@ -76,11 +74,6 @@ public class SubTileVinculotus extends TileEntityFunctionalFlower { return 500; } - @Override - public LexiconEntry getEntry() { - return LexiconData.vinculotus; - } - @SubscribeEvent public static void onEndermanTeleport(EnderTeleportEvent event) { int cost = 50; diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileArcaneRose.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileArcaneRose.java index 56d4bb3ee..26ff71f23 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileArcaneRose.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileArcaneRose.java @@ -15,11 +15,9 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.math.AxisAlignedBB; import net.minecraftforge.registries.ObjectHolder; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityGeneratingFlower; import vazkii.botania.common.core.helper.ExperienceHelper; -import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; import java.util.List; @@ -73,9 +71,4 @@ public class SubTileArcaneRose extends TileEntityGeneratingFlower { return 6000; } - @Override - public LexiconEntry getEntry() { - return LexiconData.arcaneRose; - } - } diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDandelifeon.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDandelifeon.java index 6f3ba197f..96359e50c 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDandelifeon.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDandelifeon.java @@ -17,12 +17,10 @@ import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.registries.ObjectHolder; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityGeneratingFlower; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileCell; -import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; import java.util.ArrayList; @@ -208,9 +206,4 @@ public class SubTileDandelifeon extends TileEntityGeneratingFlower { return 0x9c0a7e; } - @Override - public LexiconEntry getEntry() { - return LexiconData.dandelifeon; - } - } diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java index 70c3ee5b0..14d78d27a 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java @@ -22,12 +22,10 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.Vec3d; import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.registries.ObjectHolder; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityGeneratingFlower; import vazkii.botania.common.block.mana.BlockSpreader; import vazkii.botania.common.core.handler.ModSounds; -import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; public class SubTileEndoflame extends TileEntityGeneratingFlower { @@ -123,11 +121,6 @@ public class SubTileEndoflame extends TileEntityGeneratingFlower { return new RadiusDescriptor.Square(getPos(), RANGE); } - @Override - public LexiconEntry getEntry() { - return LexiconData.endoflame; - } - @Override public void writeToPacketNBT(CompoundNBT cmp) { super.writeToPacketNBT(cmp); diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEntropinnyum.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEntropinnyum.java index 6c96630da..ecf3a6ac9 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEntropinnyum.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEntropinnyum.java @@ -18,11 +18,9 @@ import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraftforge.registries.ObjectHolder; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityGeneratingFlower; import vazkii.botania.client.fx.SparkleParticleData; -import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; import java.util.List; @@ -92,9 +90,4 @@ public class SubTileEntropinnyum extends TileEntityGeneratingFlower { return new RadiusDescriptor.Square(getPos(), RANGE); } - @Override - public LexiconEntry getEntry() { - return LexiconData.entropinnyum; - } - } diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileGourmaryllis.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileGourmaryllis.java index 9925970d6..14e4b7c15 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileGourmaryllis.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileGourmaryllis.java @@ -23,10 +23,8 @@ import net.minecraft.util.math.Vec3d; import net.minecraft.world.server.ServerWorld; import net.minecraftforge.items.ItemHandlerHelper; import net.minecraftforge.registries.ObjectHolder; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityGeneratingFlower; -import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; import java.util.List; @@ -142,9 +140,4 @@ public class SubTileGourmaryllis extends TileEntityGeneratingFlower { return 0xD3D604; } - @Override - public LexiconEntry getEntry() { - return LexiconData.gourmaryllis; - } - } diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileHydroangeas.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileHydroangeas.java index 16327c85e..e59751425 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileHydroangeas.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileHydroangeas.java @@ -28,12 +28,10 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.biome.Biome; import net.minecraftforge.registries.ObjectHolder; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityGeneratingFlower; import vazkii.botania.client.fx.WispParticleData; import vazkii.botania.common.core.helper.ItemNBTHelper; -import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; import java.util.Arrays; @@ -154,12 +152,6 @@ public class SubTileHydroangeas extends TileEntityGeneratingFlower { return 0x532FE0; } - @Override - public LexiconEntry getEntry() { - return LexiconData.hydroangeas; - } - - @Override public void writeToPacketNBT(CompoundNBT cmp) { super.writeToPacketNBT(cmp); diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileKekimurus.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileKekimurus.java index 5e8ac5fcb..95b610623 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileKekimurus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileKekimurus.java @@ -18,10 +18,8 @@ import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraftforge.registries.ObjectHolder; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityGeneratingFlower; -import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; public class SubTileKekimurus extends TileEntityGeneratingFlower { @@ -71,11 +69,6 @@ public class SubTileKekimurus extends TileEntityGeneratingFlower { return new RadiusDescriptor.Square(getPos(), RANGE); } - @Override - public LexiconEntry getEntry() { - return LexiconData.kekimurus; - } - @Override public int getColor() { return 0x935D28; diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileMunchdew.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileMunchdew.java index fc2043135..fb4e664c9 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileMunchdew.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileMunchdew.java @@ -22,12 +22,10 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.storage.loot.LootContext; import net.minecraftforge.registries.ObjectHolder; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityGeneratingFlower; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.helper.ItemNBTHelper; -import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; import java.util.ArrayList; @@ -154,8 +152,4 @@ public class SubTileMunchdew extends TileEntityGeneratingFlower { return 10000; } - @Override - public LexiconEntry getEntry() { - return LexiconData.munchdew; - } } diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileNarslimmus.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileNarslimmus.java index c650a526c..c6fecff20 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileNarslimmus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileNarslimmus.java @@ -25,10 +25,8 @@ import net.minecraftforge.eventbus.api.Event; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.registries.ObjectHolder; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityGeneratingFlower; -import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; import java.util.List; @@ -93,11 +91,6 @@ public class SubTileNarslimmus extends TileEntityGeneratingFlower { return 0x71C373; } - @Override - public LexiconEntry getEntry() { - return LexiconData.narslimmus; - } - @SubscribeEvent public static void onSpawn(LivingSpawnEvent.CheckSpawn event) { if(event.getEntityLiving() instanceof SlimeEntity diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileRafflowsia.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileRafflowsia.java index 70084965b..64e7f7950 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileRafflowsia.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileRafflowsia.java @@ -21,12 +21,10 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.registries.ObjectHolder; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityGeneratingFlower; import vazkii.botania.common.block.ModSubtiles; import vazkii.botania.common.core.helper.ItemNBTHelper; -import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.lib.ModTags; @@ -136,9 +134,4 @@ public class SubTileRafflowsia extends TileEntityGeneratingFlower { return 9000; } - @Override - public LexiconEntry getEntry() { - return LexiconData.rafflowsia; - } - } diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileShulkMeNot.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileShulkMeNot.java index 4bc6ed370..1a832c5d5 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileShulkMeNot.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileShulkMeNot.java @@ -19,11 +19,9 @@ import net.minecraft.world.server.ServerWorld; import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld; import net.minecraftforge.registries.ObjectHolder; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityGeneratingFlower; import vazkii.botania.common.block.ModSubtiles; -import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; public class SubTileShulkMeNot extends TileEntityGeneratingFlower { @@ -97,9 +95,4 @@ public class SubTileShulkMeNot extends TileEntityGeneratingFlower { return 75000; } - @Override - public LexiconEntry getEntry() { - return LexiconData.shulkMeNot; - } - } diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileSpectrolus.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileSpectrolus.java index 03ef5ce74..a1096e0ed 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileSpectrolus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileSpectrolus.java @@ -28,11 +28,9 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.registries.ObjectHolder; import org.lwjgl.opengl.GL11; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityGeneratingFlower; import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; import java.awt.Color; @@ -96,11 +94,6 @@ public class SubTileSpectrolus extends TileEntityGeneratingFlower { return Color.HSBtoRGB(ticksExisted / 100F, 1F, 1F); } - @Override - public LexiconEntry getEntry() { - return LexiconData.spectrolus; - } - @OnlyIn(Dist.CLIENT) @Override public void renderHUD(Minecraft mc) { diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileThermalily.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileThermalily.java index bb317c48d..c9a168d85 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileThermalily.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileThermalily.java @@ -16,10 +16,8 @@ import net.minecraft.tags.Tag; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.SoundCategory; import net.minecraftforge.registries.ObjectHolder; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.fx.WispParticleData; import vazkii.botania.common.core.handler.ModSounds; -import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; public class SubTileThermalily extends SubTileHydroangeas { @@ -35,11 +33,6 @@ public class SubTileThermalily extends SubTileHydroangeas { return 0xD03C00; } - @Override - public LexiconEntry getEntry() { - return LexiconData.thermalily; - } - @Override public void doBurnParticles() { WispParticleData data = WispParticleData.wisp((float) Math.random() / 6, 0.7F, 0.05F, 0.05F, 1); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java b/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java index a6be5c950..be93191ec 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java @@ -27,9 +27,6 @@ import net.minecraft.world.Explosion; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.BotaniaAPI; -import vazkii.botania.api.lexicon.ILexicon; -import vazkii.botania.api.lexicon.multiblock.Multiblock; -import vazkii.botania.api.lexicon.multiblock.MultiblockSet; import vazkii.botania.api.recipe.ElvenPortalUpdateEvent; import vazkii.botania.api.recipe.IElvenItem; import vazkii.botania.api.recipe.RecipeElvenTrade; @@ -42,7 +39,6 @@ import vazkii.botania.common.block.tile.mana.TilePool; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.ItemLexicon; import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; @@ -92,24 +88,6 @@ public class TileAlfPortal extends TileMod implements ITickableTileEntity { private static final Function CONVERTER_Z_SWAP = input -> new BlockPos(input.getX(), input.getY(), -input.getZ()); - public static MultiblockSet makeMultiblockSet() { - Multiblock mb = new Multiblock(); - - for(BlockPos l : LIVINGWOOD_POSITIONS) - mb.addComponent(l.up(), ModBlocks.livingwood.getDefaultState()); - for(BlockPos g : GLIMMERING_LIVINGWOOD_POSITIONS) - mb.addComponent(g.up(), ModBlocks.livingwoodGlimmering.getDefaultState()); - // for(BlockPos p : PYLON_POSITIONS) - // mb.addComponent(new BlockPos(-p.getX(), p.getY() + 1, -p.getZ()), ModBlocks.pylon.getDefaultState().with(BotaniaStateProps.PYLON_VARIANT, PylonVariant.NATURA)); - // for(BlockPos p : POOL_POSITIONS) - // mb.addComponent(new StateInsensitiveComponent(new BlockPos(-p.getX(), p.getY() + 1, -p.getZ()), ModBlocks.pool)); - - mb.addComponent(new BlockPos(0, 1, 0), ModBlocks.alfPortal.getDefaultState()); - mb.setRenderOffset(new BlockPos(0, -1, 0)); - - return mb.makeSet(); - } - public TileAlfPortal() { super(TYPE); } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java index 47179f8b7..0faa42091 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java @@ -39,9 +39,6 @@ import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.VanillaPacketDispatcher; -import vazkii.botania.api.lexicon.multiblock.Multiblock; -import vazkii.botania.api.lexicon.multiblock.MultiblockSet; -import vazkii.botania.api.lexicon.multiblock.component.FlowerComponent; import vazkii.botania.api.mana.IManaPool; import vazkii.botania.api.mana.spark.ISparkAttachable; import vazkii.botania.api.mana.spark.ISparkEntity; @@ -108,23 +105,6 @@ public class TileEnchanter extends TileMod implements ISparkAttachable, ITickabl new BlockPos(-1, 0, -1), new BlockPos(1, 0, -1), new BlockPos(-1, 0, 1), new BlockPos(1, 0, 1) }; - public static MultiblockSet makeMultiblockSet() { - Multiblock mb = new Multiblock(); - - for(BlockPos o : OBSIDIAN_LOCATIONS) - mb.addComponent(o.up(), Blocks.OBSIDIAN.getDefaultState()); - for(BlockPos p : PYLON_LOCATIONS.get(Direction.Axis.X)) { - mb.addComponent(p.up(), ModBlocks.manaPylon.getDefaultState()); - mb.addComponent(new FlowerComponent(p, ModBlocks.whiteFlower)); - } - for(BlockPos f : FLOWER_LOCATIONS) - mb.addComponent(new FlowerComponent(f.up(), ModBlocks.whiteFlower)); - - mb.addComponent(BlockPos.ZERO.up(), Blocks.LAPIS_BLOCK.getDefaultState()); - - return mb.makeSet(); - } - public TileEnchanter() { super(TYPE); } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java b/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java index 3324b4cc5..013c1141c 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java @@ -25,8 +25,6 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.internal.VanillaPacketDispatcher; -import vazkii.botania.api.lexicon.multiblock.Multiblock; -import vazkii.botania.api.lexicon.multiblock.MultiblockSet; import vazkii.botania.api.mana.IManaPool; import vazkii.botania.api.mana.spark.ISparkAttachable; import vazkii.botania.api.mana.spark.ISparkEntity; @@ -62,20 +60,6 @@ public class TileTerraPlate extends TileMod implements ISparkAttachable, ITickab private int mana; - public static MultiblockSet makeMultiblockSet() { - Multiblock mb = new Multiblock(); - - for(BlockPos relativePos : LAPIS_BLOCKS) - mb.addComponent(relativePos, Blocks.LAPIS_BLOCK.getDefaultState()); - for(BlockPos relativePos : LIVINGROCK_BLOCKS) - mb.addComponent(relativePos, ModBlocks.livingrock.getDefaultState()); - - mb.addComponent(new BlockPos(0, 1, 0), ModBlocks.terraPlate.getDefaultState()); - mb.setRenderOffset(new BlockPos(0, 1, 0)); - - return mb.makeSet(); - } - public TileTerraPlate() { super(TYPE); } 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 0d3a4b94a..dd0f1486b 100644 --- a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java @@ -30,8 +30,6 @@ import vazkii.botania.api.corporea.IWrappedInventory; import vazkii.botania.api.corporea.InvWithLocation; 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.subtile.ISpecialFlower; import vazkii.botania.api.subtile.TileEntityFunctionalFlower; import vazkii.botania.api.subtile.TileEntityGeneratingFlower; @@ -47,73 +45,12 @@ import vazkii.botania.common.block.subtile.functional.SubTileSolegnolia; import vazkii.botania.common.integration.corporea.WrappedIInventory; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.relic.ItemLokiRing; -import vazkii.botania.common.lexicon.page.PageBrew; -import vazkii.botania.common.lexicon.page.PageCraftingRecipe; -import vazkii.botania.common.lexicon.page.PageElvenRecipe; -import vazkii.botania.common.lexicon.page.PageImage; -import vazkii.botania.common.lexicon.page.PageLoreText; -import vazkii.botania.common.lexicon.page.PageManaInfusionRecipe; -import vazkii.botania.common.lexicon.page.PageMultiblock; -import vazkii.botania.common.lexicon.page.PagePetalRecipe; -import vazkii.botania.common.lexicon.page.PageRuneRecipe; -import vazkii.botania.common.lexicon.page.PageText; import vazkii.botania.common.lib.LibMisc; import java.util.ArrayList; import java.util.List; public class InternalMethodHandler extends DummyMethodHandler { - - @Override - public LexiconPage textPage(String key) { - return new PageText(key); - } - - @Override - public LexiconPage elfPaperTextPage(String key) { - return new PageLoreText(key); - } - - @Override - public LexiconPage imagePage(String key, String resource) { - return new PageImage(key, resource); - } - - @Override - public LexiconPage craftingRecipePage(String key, Item... outputItems) { - return new PageCraftingRecipe(key, outputItems); - } - - @Override - public LexiconPage petalRecipePage(String key, Item... outputItems) { - return new PagePetalRecipe(key, outputItems); - } - - @Override - public LexiconPage runeRecipePage(String key, Item... outputItems) { - return new PageRuneRecipe(key, outputItems); - } - - @Override - public LexiconPage manaInfusionRecipePage(String key, Item... outputItems) { - return new PageManaInfusionRecipe(key, outputItems); - } - - @Override - public LexiconPage elvenTradePage(String key, Item... outputItems) { - return new PageElvenRecipe(key, outputItems); - } - - @Override - public LexiconPage brewPage(String key, String bottomText, Brew outputBrew) { - return new PageBrew(outputBrew, key, bottomText); - } - - @Override - public LexiconPage multiblockPage(String key, MultiblockSet mb) { - return new PageMultiblock(key, mb); - } - @Override public IManaNetwork getManaNetworkInstance() { return ManaNetworkHandler.instance; @@ -145,7 +82,6 @@ public class InternalMethodHandler extends DummyMethodHandler { @Override public void renderLexiconText(int x, int y, int width, int height, String unlocalizedText) { - PageText.renderText(x, y, width, height, unlocalizedText); } @Override diff --git a/src/main/java/vazkii/botania/common/core/proxy/IProxy.java b/src/main/java/vazkii/botania/common/core/proxy/IProxy.java index 9100ff805..c07c34ac7 100644 --- a/src/main/java/vazkii/botania/common/core/proxy/IProxy.java +++ b/src/main/java/vazkii/botania/common/core/proxy/IProxy.java @@ -8,19 +8,12 @@ import net.minecraft.particles.IParticleData; import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.world.World; import vazkii.botania.api.boss.IBotaniaBoss; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.fx.SparkleParticleData; import vazkii.botania.common.core.helper.Vector3; public interface IProxy { default void registerHandlers() {} - void setEntryToOpen(LexiconEntry entry); - - void setToTutorialIfFirstLaunch(); - - void setLexiconStack(ItemStack stack); - boolean isTheClientPlayer(LivingEntity entity); PlayerEntity getClientPlayer(); @@ -29,10 +22,6 @@ public interface IProxy { String getLastVersion(); - void setMultiblock(World world, int x, int y, int z, double radius, Block block); - - void removeSextantMultiblock(); - long getWorldElapsedTicks(); default void lightningFX(Vector3 vectorStart, Vector3 vectorEnd, float ticksPerMeter, int colorOuter, int colorInner) { diff --git a/src/main/java/vazkii/botania/common/core/proxy/ServerProxy.java b/src/main/java/vazkii/botania/common/core/proxy/ServerProxy.java index 1e6047c47..2a9580f0c 100644 --- a/src/main/java/vazkii/botania/common/core/proxy/ServerProxy.java +++ b/src/main/java/vazkii/botania/common/core/proxy/ServerProxy.java @@ -19,21 +19,11 @@ import net.minecraft.world.World; import net.minecraft.world.dimension.DimensionType; import net.minecraftforge.fml.server.ServerLifecycleHooks; import vazkii.botania.api.boss.IBotaniaBoss; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.lib.LibMisc; public class ServerProxy implements IProxy { - @Override - public void setEntryToOpen(LexiconEntry entry) {} - - @Override - public void setToTutorialIfFirstLaunch() {} - - @Override - public void setLexiconStack(ItemStack stack) {} - @Override public boolean isTheClientPlayer(LivingEntity entity) { return false; @@ -54,12 +44,6 @@ public class ServerProxy implements IProxy { return LibMisc.BUILD; } - @Override - public void setMultiblock(World world, int x, int y, int z, double radius, Block block) {} - - @Override - public void removeSextantMultiblock() {} - @Override public long getWorldElapsedTicks() { return ServerLifecycleHooks.getCurrentServer().getWorld(DimensionType.OVERWORLD).getGameTime(); diff --git a/src/main/java/vazkii/botania/common/crafting/SyncHandler.java b/src/main/java/vazkii/botania/common/crafting/SyncHandler.java index 6cc848f85..2036643a1 100644 --- a/src/main/java/vazkii/botania/common/crafting/SyncHandler.java +++ b/src/main/java/vazkii/botania/common/crafting/SyncHandler.java @@ -20,7 +20,6 @@ import vazkii.botania.api.recipe.RecipePetals; import vazkii.botania.api.recipe.RecipePureDaisy; import vazkii.botania.api.recipe.RecipeRuneAltar; import vazkii.botania.api.recipe.RegisterRecipesEvent; -import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.network.PacketHandler; import vazkii.botania.common.network.PacketSyncRecipes; diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index b220bad43..052dc4dcb 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -69,9 +69,6 @@ import net.minecraftforge.fml.network.NetworkHooks; import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.boss.IBotaniaBoss; import vazkii.botania.api.internal.ShaderCallback; -import vazkii.botania.api.lexicon.multiblock.Multiblock; -import vazkii.botania.api.lexicon.multiblock.MultiblockSet; -import vazkii.botania.api.lexicon.multiblock.component.MultiblockComponent; import vazkii.botania.client.core.handler.BossBarHandler; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.client.fx.WispParticleData; @@ -164,22 +161,6 @@ public class EntityDoppleganger extends MobEntity implements IBotaniaBoss, IEnti this(TYPE, world); } - public static MultiblockSet makeMultiblockSet() { - Multiblock mb = new Multiblock(); - - for(BlockPos p : PYLON_LOCATIONS) - mb.addComponent(p.up(), ModBlocks.gaiaPylon.getDefaultState()); - - for(int i = 0; i < 3; i++) - for(int j = 0; j < 3; j++) - mb.addComponent(new BeaconComponent(new BlockPos(i - 1, 0, j - 1))); - - mb.addComponent(new BeaconBeamComponent(new BlockPos(0, 1, 0))); - mb.setRenderOffset(new BlockPos(0, -1, 0)); - - return mb.makeSet(); - } - public static boolean spawn(PlayerEntity player, ItemStack stack, World world, BlockPos pos, boolean hard) { //initial checks if( @@ -1050,29 +1031,4 @@ public class EntityDoppleganger extends MobEntity implements IBotaniaBoss, IEnti } } } - - private static class BeaconComponent extends MultiblockComponent { - - public BeaconComponent(BlockPos relPos) { - super(relPos, Blocks.IRON_BLOCK.getDefaultState()); - } - - @Override - public boolean matches(World world, BlockPos pos) { - return world.getBlockState(pos).isBeaconBase(world, pos, pos.add(new BlockPos(-relPos.getX(), -relPos.getY(), -relPos.getZ()))); - } - - } - - private static class BeaconBeamComponent extends MultiblockComponent { - - public BeaconBeamComponent(BlockPos relPos) { - super(relPos, Blocks.BEACON.getDefaultState()); - } - - @Override - public boolean matches(World world, BlockPos pos) { - return world.getTileEntity(pos) instanceof BeaconTileEntity; - } - } } diff --git a/src/main/java/vazkii/botania/common/item/ItemLexicon.java b/src/main/java/vazkii/botania/common/item/ItemLexicon.java index be5fe8b53..16b3cdffc 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLexicon.java +++ b/src/main/java/vazkii/botania/common/item/ItemLexicon.java @@ -43,12 +43,7 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.fml.DistExecutor; import vazkii.botania.api.BotaniaAPI; -import vazkii.botania.api.lexicon.ILexicon; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.KnowledgeType; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.recipe.IElvenItem; -import vazkii.botania.client.gui.lexicon.GuiLexicon; import vazkii.botania.common.Botania; import vazkii.botania.common.advancements.UseItemSuccessTrigger; import vazkii.botania.common.core.handler.ModSounds; @@ -68,10 +63,9 @@ import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; -public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { +public class ItemLexicon extends ItemMod implements IElvenItem { public static final String TAG_ELVEN_UNLOCK = "botania:elven_unlock"; - private static final String TAG_KNOWLEDGE_PREFIX = "knowledge."; public ItemLexicon(Properties props) { super(props); @@ -88,10 +82,6 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { list.add(new ItemStack(this)); ItemStack creative = new ItemStack(this); creative.getOrCreateTag().putBoolean(TAG_ELVEN_UNLOCK, true); - for(String s : BotaniaAPI.knowledgeTypes.keySet()) { - KnowledgeType type = BotaniaAPI.knowledgeTypes.get(s); - unlockKnowledge(creative, type); - } list.add(creative); } } @@ -137,16 +127,6 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { } } - @Override - public boolean isKnowledgeUnlocked(ItemStack stack, KnowledgeType knowledge) { - return knowledge.autoUnlock || ItemNBTHelper.getBoolean(stack, TAG_KNOWLEDGE_PREFIX + knowledge.id, false); - } - - @Override - public void unlockKnowledge(ItemStack stack, KnowledgeType knowledge) { - ItemNBTHelper.setBoolean(stack, TAG_KNOWLEDGE_PREFIX + knowledge.id, true); - } - public static ITextComponent getTitle(ItemStack stack) { ITextComponent title = stack.getDisplayName(); diff --git a/src/main/java/vazkii/botania/common/item/ItemSextant.java b/src/main/java/vazkii/botania/common/item/ItemSextant.java index ba9ebfc0f..490b4a56e 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSextant.java +++ b/src/main/java/vazkii/botania/common/item/ItemSextant.java @@ -31,7 +31,6 @@ import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import org.lwjgl.opengl.GL11; -import vazkii.botania.api.lexicon.multiblock.Multiblock; import vazkii.botania.client.fx.WispParticleData; import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.ItemNBTHelper; @@ -100,14 +99,14 @@ public class ItemSextant extends ItemMod { int y = ItemNBTHelper.getInt(stack, TAG_SOURCE_Y, -1); int z = ItemNBTHelper.getInt(stack, TAG_SOURCE_Z, 0); if(y != -1) - Botania.proxy.setMultiblock(world, x, y, z, radius, Blocks.COBBLESTONE); + ; // todo 1.14 use patchouli multiblocks Botania.proxy.setMultiblock(world, x, y, z, radius, Blocks.COBBLESTONE); } } @Nonnull @Override public ActionResult onItemRightClick(World world, PlayerEntity player, @Nonnull Hand hand) { - Botania.proxy.removeSextantMultiblock(); + // todo 1.14 use patchouli multiblocks Botania.proxy.removeSextantMultiblock(); ItemStack stack = player.getHeldItem(hand); if(!player.isSneaking()) { @@ -184,17 +183,4 @@ public class ItemSextant extends ItemMod { } } - public static class MultiblockSextant extends Multiblock { - - @Override - public Map createRotations() { - Map ret = new EnumMap<>(Direction.class); - for (Direction e : Direction.values()) { - ret.put(e, this); - } - return ret; - } - - } - } diff --git a/src/main/java/vazkii/botania/common/lexicon/AlfheimLexiconEntry.java b/src/main/java/vazkii/botania/common/lexicon/AlfheimLexiconEntry.java deleted file mode 100644 index 4fc32c0bc..000000000 --- a/src/main/java/vazkii/botania/common/lexicon/AlfheimLexiconEntry.java +++ /dev/null @@ -1,13 +0,0 @@ -package vazkii.botania.common.lexicon; - -import vazkii.botania.api.BotaniaAPI; -import vazkii.botania.api.lexicon.LexiconCategory; - -public class AlfheimLexiconEntry extends BasicLexiconEntry { - - public AlfheimLexiconEntry(String unlocalizedName, LexiconCategory category) { - super(unlocalizedName, category); - setKnowledgeType(BotaniaAPI.elvenKnowledge); - } - -} diff --git a/src/main/java/vazkii/botania/common/lexicon/BLexiconCategory.java b/src/main/java/vazkii/botania/common/lexicon/BLexiconCategory.java deleted file mode 100644 index d13ad27b9..000000000 --- a/src/main/java/vazkii/botania/common/lexicon/BLexiconCategory.java +++ /dev/null @@ -1,27 +0,0 @@ -/** - * 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 @ [Oct 18, 2014, 3:46:10 PM (GMT)] - */ -package vazkii.botania.common.lexicon; - -import net.minecraft.util.ResourceLocation; -import vazkii.botania.api.lexicon.LexiconCategory; -import vazkii.botania.client.lib.LibResources; -import vazkii.botania.common.lib.LibLexicon; - -public class BLexiconCategory extends LexiconCategory { - - public BLexiconCategory(String unlocalizedName, int priority) { - super(LibLexicon.CATEGORY_PREFIX + unlocalizedName); - setIcon(new ResourceLocation(LibResources.PREFIX_CATEGORIES + unlocalizedName + ".png")); - setPriority(priority); - } - -} - diff --git a/src/main/java/vazkii/botania/common/lexicon/BasicLexiconEntry.java b/src/main/java/vazkii/botania/common/lexicon/BasicLexiconEntry.java deleted file mode 100644 index 9e2f40020..000000000 --- a/src/main/java/vazkii/botania/common/lexicon/BasicLexiconEntry.java +++ /dev/null @@ -1,65 +0,0 @@ -/** - * 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 @ [Jan 14, 2014, 9:47:21 PM (GMT)] - */ -package vazkii.botania.common.lexicon; - -import vazkii.botania.api.BotaniaAPI; -import vazkii.botania.api.lexicon.ITwoNamedPage; -import vazkii.botania.api.lexicon.LexiconCategory; -import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.api.lexicon.LexiconPage; - -import javax.annotation.Nonnull; - -public class BasicLexiconEntry extends LexiconEntry { - - public BasicLexiconEntry(String unlocalizedName, LexiconCategory category) { - super(unlocalizedName, category); - BotaniaAPI.addEntry(this, category); - } - - @Override - public LexiconEntry setLexiconPages(LexiconPage... pages) { - for(LexiconPage page : pages) { - page.unlocalizedName = "botania.page." + getLazyUnlocalizedName() + page.unlocalizedName; - if(page instanceof ITwoNamedPage) { - ITwoNamedPage dou = (ITwoNamedPage) page; - dou.setSecondUnlocalizedName("botania.page." + getLazyUnlocalizedName() + dou.getSecondUnlocalizedName()); - } - } - - return super.setLexiconPages(pages); - } - - @Override - public String getUnlocalizedName() { - return "botania.entry." + super.getUnlocalizedName(); - } - - @Override - public String getTagline() { - return "botania.tagline." + super.getUnlocalizedName(); - } - - public String getLazyUnlocalizedName() { - return super.getUnlocalizedName(); - } - - @Override - public String getWebLink() { - return "http://botaniamod.net/lexicon.php#" + unlocalizedName; - } - - @Override - public int compareTo(@Nonnull LexiconEntry o) { - return o instanceof WelcomeLexiconEntry ? 1 : super.compareTo(o); - } - -} diff --git a/src/main/java/vazkii/botania/common/lexicon/CompatLexiconEntry.java b/src/main/java/vazkii/botania/common/lexicon/CompatLexiconEntry.java deleted file mode 100644 index cda0331da..000000000 --- a/src/main/java/vazkii/botania/common/lexicon/CompatLexiconEntry.java +++ /dev/null @@ -1,31 +0,0 @@ -/** - * 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 @ [Jun 24, 2015, 5:43:11 PM (GMT)] - */ -package vazkii.botania.common.lexicon; - -import vazkii.botania.api.lexicon.IAddonEntry; -import vazkii.botania.api.lexicon.LexiconCategory; -import vazkii.botania.common.lib.LibMisc; - -public class CompatLexiconEntry extends BasicLexiconEntry implements IAddonEntry { - - public final String mod; - - public CompatLexiconEntry(String unlocalizedName, LexiconCategory category, String mod) { - super(unlocalizedName, category); - this.mod = mod; - } - - @Override - public String getSubtitle() { - return "[" + LibMisc.MOD_NAME + " x " + mod + "]"; - } - -} diff --git a/src/main/java/vazkii/botania/common/lexicon/DogLexiconEntry.java b/src/main/java/vazkii/botania/common/lexicon/DogLexiconEntry.java deleted file mode 100644 index e0f308374..000000000 --- a/src/main/java/vazkii/botania/common/lexicon/DogLexiconEntry.java +++ /dev/null @@ -1,30 +0,0 @@ -/** - * 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 @ [16/12/2015, 20:38:33 (GMT)] - */ -package vazkii.botania.common.lexicon; - -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import vazkii.botania.api.lexicon.LexiconCategory; -import vazkii.botania.client.core.handler.PersistentVariableHelper; - -public class DogLexiconEntry extends BasicLexiconEntry { - - public DogLexiconEntry(String unlocalizedName, LexiconCategory category) { - super(unlocalizedName, category); - } - - @Override - @OnlyIn(Dist.CLIENT) - public boolean isVisible() { - return !PersistentVariableHelper.dog; - } - -} diff --git a/src/main/java/vazkii/botania/common/lexicon/HeadLexiconEntry.java b/src/main/java/vazkii/botania/common/lexicon/HeadLexiconEntry.java deleted file mode 100644 index 049fdf880..000000000 --- a/src/main/java/vazkii/botania/common/lexicon/HeadLexiconEntry.java +++ /dev/null @@ -1,26 +0,0 @@ -/** - * 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 @ [Aug 27, 2015, 7:34:43 PM (GMT)] - */ -package vazkii.botania.common.lexicon; - -import vazkii.botania.api.lexicon.LexiconCategory; - -public class HeadLexiconEntry extends AlfheimLexiconEntry { - - public HeadLexiconEntry(String unlocalizedName, LexiconCategory category) { - super(unlocalizedName, category); - } - - @Override - public String getWebLink() { - return "http://heads.freshcoal.com/usernames.php"; - } - -} diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java deleted file mode 100644 index 21ffd11d9..000000000 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ /dev/null @@ -1,1503 +0,0 @@ -/** - * 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 @ [Jan 14, 2014, 9:12:15 PM (GMT)] - */ -package vazkii.botania.common.lexicon; - -import com.google.common.base.Stopwatch; -import net.minecraft.block.Block; -import net.minecraft.block.Blocks; -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.tags.Tag; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.registries.ForgeRegistries; -import net.minecraftforge.registries.ForgeRegistry; -import net.minecraftforge.registries.IForgeRegistryEntry; -import net.minecraftforge.registries.RegistryManager; -import vazkii.botania.api.BotaniaAPI; -import vazkii.botania.api.brew.IBrewContainer; -import vazkii.botania.api.lexicon.LexiconCategory; -import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.api.lexicon.LexiconPage; -import vazkii.botania.api.lexicon.LexiconRecipeMappings; -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.item.ModItems; -import vazkii.botania.common.item.equipment.bauble.ItemBaubleCosmetic; -import vazkii.botania.common.lexicon.page.PageBrew; -import vazkii.botania.common.lexicon.page.PageCraftingRecipe; -import vazkii.botania.common.lexicon.page.PageElvenRecipe; -import vazkii.botania.common.lexicon.page.PageImage; -import vazkii.botania.common.lexicon.page.PageLoreText; -import vazkii.botania.common.lexicon.page.PageManaInfusionRecipe; -import vazkii.botania.common.lexicon.page.PageMultiblock; -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.LibItemNames; -import vazkii.botania.common.lib.LibLexicon; -import vazkii.botania.common.lib.LibMisc; -import vazkii.botania.common.lib.ResourceLocationHelper; - -import java.io.File; -import java.nio.file.Paths; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Comparator; -import java.util.List; -import java.util.Locale; -import java.util.function.Predicate; -import java.util.stream.IntStream; - -public final class LexiconData { - - public static LexiconEntry welcome; - public static LexiconEntry tutorial; - - public static LexiconEntry flowers; - public static LexiconEntry apothecary; - public static LexiconEntry lexicon; - public static LexiconEntry wand; - public static LexiconEntry pureDaisy; - public static LexiconEntry runicAltar; - public static LexiconEntry terrasteel; - public static LexiconEntry blackLotus; - public static LexiconEntry flowerBag; - public static LexiconEntry gardenOfGlass; - - public static LexiconEntry manaIntro; - public static LexiconEntry spreader; - public static LexiconEntry pool; - public static LexiconEntry lenses; - public static LexiconEntry distributor; - public static LexiconEntry manaVoid; - public static LexiconEntry manaTablet; - public static LexiconEntry manaMirror; - public static LexiconEntry manaDetector; - public static LexiconEntry redstoneSpreader; - public static LexiconEntry manastar; - public static LexiconEntry dreamwoodSpreader; - public static LexiconEntry elvenLenses; - public static LexiconEntry sparks; - public static LexiconEntry sparkUpgrades; - public static LexiconEntry rfGenerator; - public static LexiconEntry prism; - public static LexiconEntry poolCart; - public static LexiconEntry sparkChanger; - public static LexiconEntry bellows; - - public static LexiconEntry functionalIntro; - public static LexiconEntry flowerShrinking; - public static LexiconEntry flowerSpeed; - public static LexiconEntry jadedAmaranthus; - public static LexiconEntry bellethorne; - public static LexiconEntry dreadthorne; - public static LexiconEntry heiseiDream; - public static LexiconEntry tigerseye; - public static LexiconEntry orechid; - public static LexiconEntry orechidIgnem; - public static LexiconEntry fallenKanade; - public static LexiconEntry exoflame; - public static LexiconEntry agricarnation; - public static LexiconEntry hopperhock; - public static LexiconEntry tangleberrie; - public static LexiconEntry jiyuulia; - public static LexiconEntry rannuncarpus; - public static LexiconEntry hyacidus; - public static LexiconEntry pollidisiac; - public static LexiconEntry clayconia; - public static LexiconEntry loonium; - public static LexiconEntry daffomill; - public static LexiconEntry vinculotus; - public static LexiconEntry spectranthemum; - public static LexiconEntry medumone; - public static LexiconEntry marimorphosis; - public static LexiconEntry bubbell; - public static LexiconEntry solegnolia; - public static LexiconEntry bergamute; - - public static LexiconEntry generatingIntro; - public static LexiconEntry endoflame; - public static LexiconEntry hydroangeas; - public static LexiconEntry thermalily; - public static LexiconEntry arcaneRose; - public static LexiconEntry munchdew; - public static LexiconEntry entropinnyum; - public static LexiconEntry kekimurus; - public static LexiconEntry gourmaryllis; - public static LexiconEntry narslimmus; - public static LexiconEntry spectrolus; - public static LexiconEntry rafflowsia; - public static LexiconEntry shulkMeNot; - public static LexiconEntry dandelifeon; - - public static LexiconEntry pylon; - public static LexiconEntry manaEnchanting; - public static LexiconEntry turntable; - public static LexiconEntry alchemy; - public static LexiconEntry openCrate; - public static LexiconEntry forestEye; - public static LexiconEntry forestDrum; - public static LexiconEntry platform; - public static LexiconEntry conjurationCatalyst; - public static LexiconEntry spectralPlatform; - public static LexiconEntry gatherDrum; - public static LexiconEntry craftCrate; - public static LexiconEntry brewery; - public static LexiconEntry flasks; - public static LexiconEntry complexBrews; - public static LexiconEntry incense; - public static LexiconEntry hourglass; - public static LexiconEntry ghostRail; - public static LexiconEntry canopyDrum; - public static LexiconEntry cocoon; - public static LexiconEntry manaBomb; - public static LexiconEntry teruTeruBozu; - public static LexiconEntry avatar; - public static LexiconEntry felPumpkin; - public static LexiconEntry animatedTorch; - - public static LexiconEntry manaBlaster; - public static LexiconEntry grassSeeds; - public static LexiconEntry dirtRod; - public static LexiconEntry terraformRod; - public static LexiconEntry manasteelGear; - public static LexiconEntry terrasteelArmor; - public static LexiconEntry grassHorn; - public static LexiconEntry terraBlade; - public static LexiconEntry terraPick; - public static LexiconEntry waterRod; - public static LexiconEntry elfGear; - public static LexiconEntry openBucket; - public static LexiconEntry rainbowRod; - public static LexiconEntry tornadoRod; - public static LexiconEntry fireRod; - public static LexiconEntry vineBall; - public static LexiconEntry laputaShard; - public static LexiconEntry virus; - public static LexiconEntry skyDirtRod; - public static LexiconEntry glassPick; - public static LexiconEntry diviningRod; - public static LexiconEntry gravityRod; - public static LexiconEntry missileRod; - public static LexiconEntry craftingHalo; - public static LexiconEntry clip; - public static LexiconEntry cobbleRod; - public static LexiconEntry smeltRod; - public static LexiconEntry worldSeed; - public static LexiconEntry spellCloth; - public static LexiconEntry thornChakram; - public static LexiconEntry fireChakram; - public static LexiconEntry overgrowthSeed; - public static LexiconEntry livingwoodBow; - public static LexiconEntry crystalBow; - public static LexiconEntry temperanceStone; - public static LexiconEntry terraAxe; - public static LexiconEntry obedienceStick; - public static LexiconEntry slimeBottle; - public static LexiconEntry exchangeRod; - public static LexiconEntry manaweave; - public static LexiconEntry autocraftingHalo; - public static LexiconEntry sextant; - public static LexiconEntry astrolabe; - - public static LexiconEntry enderAir; - public static LexiconEntry enderEyeBlock; - public static LexiconEntry pistonRelay; - public static LexiconEntry enderHand; - public static LexiconEntry enderDagger; - public static LexiconEntry spawnerClaw; - public static LexiconEntry redString; - public static LexiconEntry flightTiara; - public static LexiconEntry corporea; - public static LexiconEntry corporeaIndex; - public static LexiconEntry corporeaFunnel; - public static LexiconEntry corporeaInterceptor; - public static LexiconEntry endStoneDecor; - public static LexiconEntry spawnerMover; - public static LexiconEntry keepIvy; - public static LexiconEntry blackHoleTalisman; - public static LexiconEntry corporeaCrystalCube; - public static LexiconEntry luminizerTransport; - public static LexiconEntry starSword; - public static LexiconEntry thunderSword; - public static LexiconEntry corporeaRetainer; - - public static LexiconEntry baublesIntro; - public static LexiconEntry cosmeticBaubles; - public static LexiconEntry tinyPlanet; - public static LexiconEntry manaRing; - public static LexiconEntry auraRing; - public static LexiconEntry travelBelt; - public static LexiconEntry knockbacklBelt; - public static LexiconEntry icePendant; - public static LexiconEntry lavaPendant; - public static LexiconEntry waterRing; - public static LexiconEntry miningRing; - public static LexiconEntry magnetRing; - public static LexiconEntry divaCharm; - public static LexiconEntry pixieRing; - public static LexiconEntry superTravelBelt; - public static LexiconEntry reachRing; - public static LexiconEntry itemFinder; - public static LexiconEntry superLavaPendant; - public static LexiconEntry bloodPendant; - public static LexiconEntry judgementCloaks; - public static LexiconEntry monocle; - public static LexiconEntry swapRing; - public static LexiconEntry speedUpBelt; - public static LexiconEntry baubleBox; - public static LexiconEntry dodgeRing; - public static LexiconEntry invisibilityCloak; - public static LexiconEntry cloudPendant; - public static LexiconEntry superCloudPendant; - public static LexiconEntry thirdEye; - public static LexiconEntry goddessCharm; - - public static LexiconEntry alfhomancyIntro; - public static LexiconEntry elvenMessage; - public static LexiconEntry elvenResources; - public static LexiconEntry gaiaRitual; - public static LexiconEntry gaiaRitualHardmode; - public static LexiconEntry elvenLore; - public static LexiconEntry relics; - public static LexiconEntry relicInfo; - public static LexiconEntry infiniteFruit; - public static LexiconEntry kingKey; - public static LexiconEntry flugelEye; - public static LexiconEntry thorRing; - public static LexiconEntry lokiRing; - public static LexiconEntry odinRing; - - public static LexiconEntry unstableBlocks; - public static LexiconEntry decorativeBlocks; - public static LexiconEntry dispenserTweaks; - public static LexiconEntry shinyFlowers; - public static LexiconEntry tinyPotato; - public static LexiconEntry headCreating; - public static LexiconEntry azulejo; - public static LexiconEntry starfield; - public static LexiconEntry mushrooms; - public static LexiconEntry phantomInk; - public static LexiconEntry blazeBlock; - public static LexiconEntry challenges; - public static LexiconEntry cacophonium; - public static LexiconEntry pavement; - public static LexiconEntry preventingDecay; - - public static LexiconEntry tcIntegration; - public static LexiconEntry bcIntegration; - 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)); - BotaniaAPI.addCategory(BotaniaAPI.categoryFunctionalFlowers = new BLexiconCategory(LibLexicon.CATEGORY_FUNCTIONAL_FLOWERS, 5)); - BotaniaAPI.addCategory(BotaniaAPI.categoryDevices = new BLexiconCategory(LibLexicon.CATEGORY_DEVICES, 5)); - BotaniaAPI.addCategory(BotaniaAPI.categoryTools = new BLexiconCategory(LibLexicon.CATEGORY_TOOLS, 5)); - BotaniaAPI.addCategory(BotaniaAPI.categoryBaubles = new BLexiconCategory(LibLexicon.CATEGORY_BAUBLES, 5)); - BotaniaAPI.addCategory(BotaniaAPI.categoryEnder = new BLexiconCategory(LibLexicon.CATEGORY_ENDER, 5)); - BotaniaAPI.addCategory(BotaniaAPI.categoryAlfhomancy = new BLexiconCategory(LibLexicon.CATEGORY_ALFHOMANCY, 5)); - BotaniaAPI.addCategory(BotaniaAPI.categoryMisc = new BLexiconCategory(LibLexicon.CATEGORY_MISC, 0)); - - LexiconCategory categoryBasics = BotaniaAPI.categoryBasics; - LexiconCategory categoryMana = BotaniaAPI.categoryMana; - LexiconCategory categoryGenerationFlowers = BotaniaAPI.categoryGenerationFlowers; - LexiconCategory categoryFunctionalFlowers = BotaniaAPI.categoryFunctionalFlowers; - LexiconCategory categoryDevices = BotaniaAPI.categoryDevices; - LexiconCategory categoryTools = BotaniaAPI.categoryTools; - LexiconCategory categoryBaubles = BotaniaAPI.categoryBaubles; - LexiconCategory categoryEnder = BotaniaAPI.categoryEnder; - LexiconCategory categoryAlfhomancy = BotaniaAPI.categoryAlfhomancy; - LexiconCategory categoryMisc = BotaniaAPI.categoryMisc; - - // BASICS ENTRIES - 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", 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", ModBlocks.defaultAltar.asItem())); - - lexicon = new BasicLexiconEntry(LibLexicon.BASICS_LEXICON, categoryBasics); - lexicon.setPriority().setLexiconPages(new PageText("0"), new PageText("3"), - 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", 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", 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); - LexiconRecipeMappings.map(new ItemStack(ModBlocks.livingrock), pureDaisy, 1); - - runicAltar = new BasicLexiconEntry(LibLexicon.BASICS_RUNE_ALTAR, categoryBasics); - runicAltar.setPriority().setLexiconPages(new PageText("21"), new PageText("0"), new PageText("1"), - 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", ModBlocks.terraPlate.asItem()), - new PageText("2"), new PageMultiblock("4", ModMultiblocks.terrasteelPlate), new PageTerrasteel("3")) - .setIcon(new ItemStack(ModItems.terrasteel)); - - blackLotus = new BasicLexiconEntry(LibLexicon.BASICS_BLACK_LOTUS, categoryBasics); - blackLotus.setLexiconPages(new PageText("0")).setIcon(new ItemStack(ModItems.blackLotus)); - blackLotus.addExtraDisplayedRecipe(new ItemStack(ModItems.blackLotus)); - - flowerBag = new BasicLexiconEntry(LibLexicon.BASICS_FLOWER_BAG, categoryBasics); - flowerBag.setLexiconPages(new PageText("0"), new PageText("2"), - new PageCraftingRecipe("1", ModItems.flowerBag)); - - 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", 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 || true) - new CompatLexiconEntry("wrap", categoryBasics, "Thaumcraft").setLexiconPages(new PageText("0")); // lel - - // MANA ENTRIES - manaIntro = new BasicLexiconEntry(LibLexicon.MANA_INTRO, categoryMana); - manaIntro.setPriority().setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2")); - - 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", 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", 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", 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", ModItems.sparkUpgradeDispersive, ModItems.sparkUpgradeDominant, ModItems.sparkUpgradeRecessive, ModItems.sparkUpgradeIsolated)); - - if(ConfigHandler.COMMON.fluxfieldEnabled.get()) { - rfGenerator = new BasicLexiconEntry(LibLexicon.MANA_RF_GENERATOR, categoryMana); - rfGenerator.setLexiconPages(new PageText("0"), - new PageCraftingRecipe("1", ModBlocks.rfGenerator.asItem())); - } - - lenses = new BasicLexiconEntry(LibLexicon.MANA_LENSES, categoryMana); - lenses.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModItems.lensNormal), - new PageText("4"), new PageText("5"), new PageText("6"), - 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", ModBlocks.distributor.asItem())); - - manaVoid = new BasicLexiconEntry(LibLexicon.MANA_VOID, categoryMana); - 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", ModItems.manaTablet)); - - manaMirror = new BasicLexiconEntry(LibLexicon.MANA_MIRROR, categoryMana); - 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", ModBlocks.manaDetector.asItem())); - - redstoneSpreader = new BasicLexiconEntry(LibLexicon.MANA_REDSTONE_SPREADER, categoryMana); - redstoneSpreader.setPriority().setLexiconPages(new PageText("0"), - new PageCraftingRecipe("1", ModBlocks.redstoneSpreader.asItem())); - - manastar = new BasicLexiconEntry(LibLexicon.MANA_MANASTAR, categoryMana); - manastar.setPriority().setLexiconPages(new PageText("0"), - new PagePetalRecipe("1", ModSubtiles.manastar.asItem())); - - dreamwoodSpreader = new AlfheimLexiconEntry(LibLexicon.MANA_DREAMWOOD_SPREADER, categoryMana); - dreamwoodSpreader.setLexiconPages(new PageText("0"), - 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", 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", 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", 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", ModBlocks.sparkChanger.asItem())); - - bellows = new BasicLexiconEntry(LibLexicon.MANA_BELLOWS, categoryMana); - bellows.setLexiconPages(new PageText("0"), new PageText("1"), - 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", ModItems.redstoneRoot)) - .setIcon(ItemStack.EMPTY); - - flowerShrinking = new BasicLexiconEntry(LibLexicon.FFLOWER_SHRINKING, categoryFunctionalFlowers); - flowerShrinking.setPriority() - .setLexiconPages(new PageText("0"), new PageManaInfusionRecipe("1", getSortedTag(new ResourceLocation(LibMisc.MOD_ID, "mini_flowers")))) - .setIcon(new ItemStack(ModSubtiles.bellethornChibi)); - - flowerSpeed = new BasicLexiconEntry(LibLexicon.FFLOWER_SPEED, categoryFunctionalFlowers); - flowerSpeed.setPriority().setLexiconPages(new PageText("0"), new PageText("1")); - flowerSpeed.setIcon(new ItemStack(Blocks.PODZOL)); - - jadedAmaranthus = new BasicLexiconEntry(LibLexicon.FFLOWER_JADED_AMARANTHUS, categoryFunctionalFlowers); - jadedAmaranthus.setLexiconPages(new PageText("0"), - new PagePetalRecipe("1", ModSubtiles.jadedAmaranthus.asItem()), new PageText("2")); - - bellethorne = new BasicLexiconEntry(LibLexicon.FFLOWER_BELLETHORNE, categoryFunctionalFlowers); - 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", ModSubtiles.dreadthorn.asItem())); - - heiseiDream = new AlfheimLexiconEntry(LibLexicon.FFLOWER_HEISEI_DREAM, categoryFunctionalFlowers); - 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", 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", ModSubtiles.orechid.asItem())); - if(Botania.gardenOfGlassLoaded) - orechid.setPriority(); - - orechidIgnem = new AlfheimLexiconEntry(LibLexicon.FFLOWER_ORECHID_IGNEM, categoryFunctionalFlowers); - orechidIgnem.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModSubtiles.orechidIgnem.asItem())); - - if(ConfigHandler.COMMON.fallenKanadeEnabled.get()) { - fallenKanade = new BasicLexiconEntry(LibLexicon.FFLOWER_FALLEN_KANADE, categoryFunctionalFlowers); - fallenKanade.setLexiconPages(new PageText(Botania.bloodMagicLoaded ? "0a" : "0"), - new PagePetalRecipe("1", ModSubtiles.fallenKanade.asItem())); - } - - exoflame = new BasicLexiconEntry(LibLexicon.FFLOWER_EXOFLAME, categoryFunctionalFlowers); - 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", ModSubtiles.agricarnation.asItem())); - - hopperhock = new BasicLexiconEntry(LibLexicon.FFLOWER_HOPPERHOCK, categoryFunctionalFlowers); - hopperhock.setLexiconPages(new PageText("0"), new PageText("1"), - new PagePetalRecipe("2", ModSubtiles.hopperhock.asItem())); - - tangleberrie = new BasicLexiconEntry(LibLexicon.FFLOWER_TANGLEBERRIE, categoryFunctionalFlowers); - 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", ModSubtiles.jiyuulia.asItem())); - - rannuncarpus = new BasicLexiconEntry(LibLexicon.FFLOWER_RANNUNCARPUS, categoryFunctionalFlowers); - rannuncarpus.setLexiconPages(new PageText("0"), new PageText("1"), - new PagePetalRecipe("2", ModSubtiles.rannuncarpus.asItem())); - - hyacidus = new BasicLexiconEntry(LibLexicon.FFLOWER_HYACIDUS, categoryFunctionalFlowers); - 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", ModSubtiles.pollidisiac.asItem())); - - clayconia = new BasicLexiconEntry(LibLexicon.FFLOWER_CLAYCONIA, categoryFunctionalFlowers); - 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", ModSubtiles.loonium.asItem())); - - daffomill = new BasicLexiconEntry(LibLexicon.FFLOWER_DAFFOMILL, categoryFunctionalFlowers); - 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", ModSubtiles.vinculotus.asItem())); - - spectranthemum = new AlfheimLexiconEntry(LibLexicon.FFLOWER_SPECTRANTHEMUN, categoryFunctionalFlowers); - spectranthemum.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), - new PagePetalRecipe("3", ModSubtiles.spectranthemum.asItem())); - - medumone = new BasicLexiconEntry(LibLexicon.FFLOWER_MEDUMONE, categoryFunctionalFlowers); - 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", 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", ModSubtiles.bubbell.asItem())); - - solegnolia = new BasicLexiconEntry(LibLexicon.FFLOWER_SOLEGNOLIA, categoryFunctionalFlowers); - 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", 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")); - - endoflame = new BasicLexiconEntry(LibLexicon.GFLOWER_ENDOFLAME, categoryGenerationFlowers); - endoflame.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("3"), - 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", ModSubtiles.hydroangeas.asItem())); - - thermalily = new BasicLexiconEntry(LibLexicon.GFLOWER_THERMALILY, categoryGenerationFlowers); - thermalily.setLexiconPages(new PageText("0"), new PageText("2"), new PageText("3"), - new PagePetalRecipe("1", ModSubtiles.thermalily.asItem())); - - arcaneRose = new BasicLexiconEntry(LibLexicon.GFLOWER_ARCANE_ROSE, categoryGenerationFlowers); - 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", ModSubtiles.munchdew.asItem())); - - entropinnyum = new BasicLexiconEntry(LibLexicon.GFLOWER_ENTROPINNYUM, categoryGenerationFlowers); - 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", ModSubtiles.kekimurus.asItem())); - - gourmaryllis = new BasicLexiconEntry(LibLexicon.GFLOWER_GOURMARYLLIS, categoryGenerationFlowers); - gourmaryllis.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), - new PagePetalRecipe("3", ModSubtiles.gourmaryllis.asItem())); - - narslimmus = new BasicLexiconEntry(LibLexicon.GFLOWER_NARSLIMMUS, categoryGenerationFlowers); - 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", ModSubtiles.spectrolus.asItem())); - - rafflowsia = new AlfheimLexiconEntry(LibLexicon.GFLOWER_RAFFLOWSIA, categoryGenerationFlowers); - 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", 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", 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", ModBlocks.manaPylon.asItem())); - - 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)); - } - - turntable = new BasicLexiconEntry(LibLexicon.DEVICE_TURNTABLE, categoryDevices); - 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", ModBlocks.alchemyCatalyst.asItem()), - new PageManaInfusionRecipe("2", filter, Items.LEATHER), - new PageManaInfusionRecipe("3", filter, getSortedTag(ItemTags.LOGS)), - new PageManaInfusionRecipe("4", filter, getSortedTag(ItemTags.SAPLINGS)), - 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", ModBlocks.openCrate.asItem())); - - forestEye = new BasicLexiconEntry(LibLexicon.DEVICE_FOREST_EYE, categoryDevices); - forestEye.setLexiconPages(new PageText("0"), new PageText("1"), - 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", ModBlocks.wildDrum.asItem())); - - platform = new BasicLexiconEntry(LibLexicon.DEVICE_PLATFORM, categoryDevices); - platform.setLexiconPages(new PageText("0"), new PageText("2"), - 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", 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, getSortedTag(ItemTags.LEAVES)), - new PageManaInfusionRecipe("11", conjurationFilter, Items.GRASS)); //todos - - spectralPlatform = new AlfheimLexiconEntry(LibLexicon.DEVICE_SPECTRAL_PLATFORM, categoryDevices); - spectralPlatform.setLexiconPages(new PageText("0"), - new PageCraftingRecipe("1", ModBlocks.spectralPlatform.asItem())); - - gatherDrum = new AlfheimLexiconEntry(LibLexicon.DEVICE_GATHER_DRUM, categoryDevices); - 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", 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", 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", ModItems.flask)); - - complexBrews = new BasicLexiconEntry(LibLexicon.DEVICE_COMPLEX_BREWS, categoryDevices); - 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", 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", ModBlocks.hourglass.asItem())); - - ghostRail = new AlfheimLexiconEntry(LibLexicon.DEVICE_GHOST_RAIL, categoryDevices); - 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", 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", ModBlocks.cocoon.asItem())); - - manaBomb = new AlfheimLexiconEntry(LibLexicon.DEVICE_MANA_BOMB, categoryDevices); - 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", ModBlocks.teruTeruBozu.asItem())); - - avatar = new BasicLexiconEntry(LibLexicon.DEVICE_AVATAR, categoryDevices); - avatar.setLexiconPages(new PageText("0"), new PageText("1"), - new PageCraftingRecipe("2", ModBlocks.avatar.asItem())); - - felPumpkin = new BasicLexiconEntry(LibLexicon.DEVICE_FEL_PUMPKIN, categoryDevices); - 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", 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", ModItems.manaGun)); - - grassSeeds = new BasicLexiconEntry(LibLexicon.TOOL_GRASS_SEEDS, categoryTools); - grassSeeds.setLexiconPages(new PageText("0"), - 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", ModItems.dirtRod)); - - terraformRod = new BasicLexiconEntry(LibLexicon.TOOL_TERRAFORM_ROD, categoryTools); - terraformRod.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), - 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", 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", 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", 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", 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", ModItems.terraPick)); - - waterRod = new BasicLexiconEntry(LibLexicon.TOOL_WATER_ROD, categoryTools); - 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", 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", ModItems.openBucket)); - - rainbowRod = new AlfheimLexiconEntry(LibLexicon.TOOL_RAINBOW_ROD, categoryTools); - rainbowRod.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("6"), - 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", ModItems.tornadoRod)); - - fireRod = new BasicLexiconEntry(LibLexicon.TOOL_FIRE_ROD, categoryTools); - fireRod.setLexiconPages(new PageText("0"), new PageText("2"), - new PageCraftingRecipe("1", ModItems.fireRod)); - - vineBall = new BasicLexiconEntry(LibLexicon.TOOL_VINE_BALL, categoryTools); - vineBall.setLexiconPages(new PageText("0"), new PageText("1"), - 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", inGroup("laputa_shard_upgrade").negate(), ModItems.laputaShard), - new PageCraftingRecipe("3", inGroup("laputa_shard_upgrade"), ModItems.laputaShard)); - - virus = new AlfheimLexiconEntry(LibLexicon.TOOL_VIRUS, categoryTools); - 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", ModItems.skyDirtRod)); - - glassPick = new BasicLexiconEntry(LibLexicon.TOOL_GLASS_PICK, categoryTools); - 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", ModItems.diviningRod)); - - gravityRod = new AlfheimLexiconEntry(LibLexicon.TOOL_GRAVITY_ROD, categoryTools); - gravityRod.setLexiconPages(new PageText("0"), new PageText("1"), - new PageCraftingRecipe("2", ModItems.gravityRod)); - - missileRod = new AlfheimLexiconEntry(LibLexicon.TOOL_MISSILE_ROD, categoryTools); - missileRod.setLexiconPages(new PageText("0"), new PageText("2"), - new PageCraftingRecipe("1", ModItems.missileRod)); - - craftingHalo = new BasicLexiconEntry(LibLexicon.TOOL_CRAFTING_HALO, categoryTools); - craftingHalo.setLexiconPages(new PageText("0"), new PageText("1"), - new PageCraftingRecipe("2", ModItems.craftingHalo)); - - clip = new AlfheimLexiconEntry(LibLexicon.TOOL_CLIP, categoryTools); - clip.setLexiconPages(new PageText("0"), new PageText("1"), - new PageCraftingRecipe("2", ModItems.clip)); - - cobbleRod = new BasicLexiconEntry(LibLexicon.TOOL_COBBLE_ROD, categoryTools); - 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", ModItems.smeltRod)); - - worldSeed = new AlfheimLexiconEntry(LibLexicon.TOOL_WORLD_SEED, categoryTools); - 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", ModItems.spellCloth)); - - thornChakram = new BasicLexiconEntry(LibLexicon.TOOL_THORN_CHAKRAM, categoryTools); - thornChakram.setLexiconPages(new PageText("0"), - new PageCraftingRecipe("1", ModItems.thornChakram)); - - fireChakram = new AlfheimLexiconEntry(LibLexicon.TOOL_FIRE_CHAKRAM, categoryTools); - fireChakram.setLexiconPages(new PageText("0"), - 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)); - 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", ModItems.livingwoodBow)); - - crystalBow = new AlfheimLexiconEntry(LibLexicon.TOOL_CRYSTAL_BOW, categoryTools); - 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", ModItems.temperanceStone)); - - terraAxe = new BasicLexiconEntry(LibLexicon.TOOL_TERRA_AXE, categoryTools); - 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", ModItems.obedienceStick)); - - slimeBottle = new AlfheimLexiconEntry(LibLexicon.TOOL_SLIME_BOTTLE, categoryTools); - slimeBottle.setLexiconPages(new PageText("0"), - 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", ModItems.exchangeRod)); - - manaweave = new BasicLexiconEntry(LibLexicon.TOOL_MANAWEAVE, categoryTools); - manaweave.setLexiconPages(new PageText("0"), new PageText("1"), - 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", ModItems.autocraftingHalo)); - - sextant = new BasicLexiconEntry(LibLexicon.TOOL_SEXTANT, categoryTools); - sextant.setLexiconPages(new PageText("0"), new PageText("1"), - new PageCraftingRecipe("2", ModItems.sextant)); - - astrolabe = new AlfheimLexiconEntry(LibLexicon.TOOL_ASTROLABE, categoryTools); - astrolabe.setLexiconPages(new PageText("0"), new PageText("1"), - new PageCraftingRecipe("2", ModItems.astrolabe)); - - // ENDER ENTRIES - enderAir = new BasicLexiconEntry(LibLexicon.ENDER_AIR, categoryEnder); - enderAir.setPriority().setLexiconPages(new PageText("0")); - enderAir.addExtraDisplayedRecipe(new ItemStack(ModItems.enderAirBottle)); - LexiconRecipeMappings.map(new ItemStack(ModItems.enderAirBottle), enderAir, 0); - - enderEyeBlock = new BasicLexiconEntry(LibLexicon.ENDER_ENDER_EYE_BLOCK, categoryEnder); - enderEyeBlock.setLexiconPages(new PageText("0"), - 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", 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", ModItems.enderHand)); - - enderDagger = new BasicLexiconEntry(LibLexicon.ENDER_ENDER_DAGGER, categoryEnder); - enderDagger.setLexiconPages(new PageText("0"), new PageText("1"), - new PageCraftingRecipe("2", ModItems.enderDagger)); - - spawnerClaw = new AlfheimLexiconEntry(LibLexicon.ENDER_SPAWNER_CLAW, categoryEnder); - spawnerClaw.setLexiconPages(new PageText("0"), new PageText("1"), - 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", 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", inGroup("flight_tiara_wings").negate(), ModItems.flightTiara), new PageText("2"), - new PageCraftingRecipe("3", inGroup("flight_tiara_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", 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", ModBlocks.corporeaIndex.asItem())); - - corporeaFunnel = new AlfheimLexiconEntry(LibLexicon.ENDER_CORPOREA_FUNNEL, categoryEnder); - corporeaFunnel.setLexiconPages(new PageText("0"), new PageText("1"), - 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", ModBlocks.corporeaInterceptor.asItem())); - - spawnerMover = new AlfheimLexiconEntry(LibLexicon.ENDER_SPAWNER_MOVER, categoryEnder); - spawnerMover.setLexiconPages(new PageText("0"), - new PageCraftingRecipe("1", ModItems.spawnerMover)); - - keepIvy = new AlfheimLexiconEntry(LibLexicon.ENDER_KEEP_IVY, categoryEnder); - keepIvy.setLexiconPages(new PageText("0"), new PageText("2"), - 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", 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", ModBlocks.corporeaCrystalCube.asItem())); - - luminizerTransport = new AlfheimLexiconEntry(LibLexicon.ENDER_LUMINIZER_TRANSPORT, categoryEnder); - luminizerTransport.setLexiconPages(new PageText("0"), new PageText("1"), - 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", ModItems.starSword)); - - thunderSword = new AlfheimLexiconEntry(LibLexicon.ENDER_THUNDER_SWORD, categoryEnder); - thunderSword.setLexiconPages(new PageText("0"), - 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", ModBlocks.corporeaRetainer.asItem())); - - // BAUBLES ENTRIES - baublesIntro = new BasicLexiconEntry(LibLexicon.BAUBLE_INTRO, categoryBaubles); - baublesIntro.setPriority().setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_BAUBLES), - new PageText("2")); - - 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), 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", ModItems.tinyPlanet), - new PageCraftingRecipe("2", ModBlocks.tinyPlanet.asItem())); - - manaRing = new BasicLexiconEntry(LibLexicon.BAUBLE_MANA_RING, categoryBaubles); - 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", ModItems.auraRing), - new PageCraftingRecipe("2", ModItems.auraRingGreater)); - - travelBelt = new BasicLexiconEntry(LibLexicon.BAUBLE_TRAVEL_BELT, categoryBaubles); - 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", ModItems.knockbackBelt)); - - icePendant = new BasicLexiconEntry(LibLexicon.BAUBLE_ICE_PENDANT, categoryBaubles); - 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", ModItems.lavaPendant)); - - waterRing = new BasicLexiconEntry(LibLexicon.BAUBLE_WATER_RING, categoryBaubles); - 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", ModItems.miningRing)); - - magnetRing = new BasicLexiconEntry(LibLexicon.BAUBLE_MAGNET_RING, categoryBaubles); - 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", ModItems.divaCharm)); - - pixieRing = new AlfheimLexiconEntry(LibLexicon.BAUBLE_PIXIE_RING, categoryBaubles); - 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", ModItems.superTravelBelt)); - - reachRing = new AlfheimLexiconEntry(LibLexicon.BAUBLE_REACH_RING, categoryBaubles); - 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", ModItems.itemFinder)); - - superLavaPendant = new AlfheimLexiconEntry(LibLexicon.BAUBLE_SUPER_LAVA_PENDANT, categoryBaubles); - superLavaPendant.setLexiconPages(new PageText("0"), - new PageCraftingRecipe("1", ModItems.superLavaPendant)); - - bloodPendant = new BasicLexiconEntry(LibLexicon.BAUBLE_BLOOD_PENDANT, categoryBaubles); - bloodPendant.setLexiconPages(new PageText("0"), new PageText("1"), - new PageCraftingRecipe("2", ModItems.bloodPendant)); - - judgementCloaks = new AlfheimLexiconEntry(LibLexicon.BAUBLE_JUDGEMENT_CLOAKS, categoryBaubles); - judgementCloaks.setLexiconPages(new PageText("0"), new PageText("1"), - 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", ModItems.monocle)); - - swapRing = new BasicLexiconEntry(LibLexicon.BAUBLE_SWAP_RING, categoryBaubles); - 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", ModItems.speedUpBelt)); - - baubleBox = new BasicLexiconEntry(LibLexicon.BAUBLE_BOX, categoryBaubles); - 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", ModItems.dodgeRing)); - - invisibilityCloak = new BasicLexiconEntry(LibLexicon.BAUBLE_INVISIBILITY_CLOAK, categoryBaubles); - 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", ModItems.cloudPendant)); - - superCloudPendant = new AlfheimLexiconEntry(LibLexicon.BAUBLE_SUPER_CLOUD_PENDANT, categoryBaubles); - 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", ModItems.thirdEye)); - - goddessCharm = new BasicLexiconEntry(LibLexicon.BAUBLE_GODDESS_CHARM, categoryBaubles); - 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", 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)); - - elvenResources = new AlfheimLexiconEntry(LibLexicon.ALF_RESOURCES, categoryAlfhomancy); - elvenResources.setPriority() - .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", 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", 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)); - - if(ConfigHandler.COMMON.relicsEnabled.get()) { - relics = new AlfheimLexiconEntry(LibLexicon.ALF_RELICS, categoryAlfhomancy); - relics.setLexiconPages(new PageText("0")).setIcon(new ItemStack(ModItems.dice)); - - relicInfo = new RelicLexiconEntry(LibLexicon.ALF_RELIC_INFO, categoryAlfhomancy, null); - relicInfo.setLexiconPages(new PageText("0"), new PageText("1")).setIcon(new ItemStack(ModItems.dice)); - - infiniteFruit = new RelicLexiconEntry(LibLexicon.ALF_INFINITE_FRUIT, categoryAlfhomancy, - new ResourceLocation(LibMisc.MOD_ID, "challenge/infinite_fruit")); - infiniteFruit.setLexiconPages(new PageText("0")).setIcon(new ItemStack(ModItems.infiniteFruit)); - - kingKey = new RelicLexiconEntry(LibLexicon.ALF_KING_KEY, categoryAlfhomancy, new ResourceLocation(LibMisc.MOD_ID, "challenge/king_key")); - kingKey.setLexiconPages(new PageText("0")).setIcon(new ItemStack(ModItems.kingKey)); - - flugelEye = new RelicLexiconEntry(LibLexicon.ALF_FLUGEL_EYE, categoryAlfhomancy, - new ResourceLocation(LibMisc.MOD_ID, "challenge/flugel_eye")); - flugelEye.setLexiconPages(new PageText("0"), new PageText("1")).setIcon(new ItemStack(ModItems.flugelEye)); - - thorRing = new RelicLexiconEntry(LibLexicon.ALF_THOR_RING, categoryAlfhomancy, new ResourceLocation(LibMisc.MOD_ID, "challenge/thor_ring")); - thorRing.setLexiconPages(new PageText("0")).setIcon(new ItemStack(ModItems.thorRing)); - - lokiRing = new RelicLexiconEntry(LibLexicon.ALF_LOKI_RING, categoryAlfhomancy, new ResourceLocation(LibMisc.MOD_ID, "challenge/loki_ring")); - lokiRing.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PageText("3")).setIcon(new ItemStack(ModItems.lokiRing)); - - odinRing = new RelicLexiconEntry(LibLexicon.ALF_ODIN_RING, categoryAlfhomancy, new ResourceLocation(LibMisc.MOD_ID, "challenge/odin_ring")); - odinRing.setLexiconPages(new PageText("0")).setIcon(new ItemStack(ModItems.odinRing)); - } - - decorativeBlocks = new BasicLexiconEntry(LibLexicon.MISC_DECORATIVE_BLOCKS, categoryMisc); - decorativeBlocks.setLexiconPages(new PageText("0"), - 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", shinyFlowerItems), - new PageCraftingRecipe("2", floatingFlowerItems)); - - tinyPotato = new BasicLexiconEntry(LibLexicon.MISC_TINY_POTATO, categoryMisc); - tinyPotato.setLexiconPages(new PageText("0"), new PageText("2"), - 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", 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", 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", ModBlocks.starfield.asItem())); - - mushrooms = new BasicLexiconEntry(LibLexicon.MISC_MUSHROOMS, categoryMisc); - 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", ModItems.phantomInk)); - - blazeBlock = new BasicLexiconEntry(LibLexicon.MISC_BLAZE_BLOCK, categoryMisc); - 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)); - - cacophonium = new BasicLexiconEntry(LibLexicon.MISC_CACOPHONIUM, categoryMisc); - cacophonium.setLexiconPages(new PageText("0"), - new PageCraftingRecipe("1", ModItems.cacophonium), new PageText("2")); - - pavement = new BasicLexiconEntry(LibLexicon.MISC_PAVEMENT, categoryMisc); - 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)); - - banners = new BasicLexiconEntry(LibLexicon.MISC_BANNERS, BotaniaAPI.categoryMisc); - banners.setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_BANNERS)) - .setIcon(new ItemStack(ModItems.lexicon)); - - if(Botania.bcApiLoaded) { - bcIntegration = new CompatLexiconEntry(LibLexicon.MISC_BC_INTEGRATION, categoryMisc, "BuildCraft"); - bcIntegration.setLexiconPages(new PageText("0")).setIcon(new ItemStack(Items.REDSTONE)); - } - - if(true || Botania.thaumcraftLoaded) { - tcIntegration = new CompatLexiconEntry(LibLexicon.MISC_TC_INTEGRATION, BotaniaAPI.categoryMisc, "Thaumcraft"); - - if(true || ConfigHandler.COMMON.enableThaumcraftStablizers.get()) - tcIntegration.setLexiconPages(new PageText("0"), new PageText("1"), - 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", 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()); - - File dir = Paths.get(".", "entries").toFile(); - if(!dir.exists()) { - Botania.LOGGER.info("Dumping lexicon entries"); - for (LexiconEntry e : BotaniaAPI.getAllEntries()) { - e.dump(); - } - } else { - Botania.LOGGER.info("Preexisting file {}, aborting lexicon dump", dir.getAbsolutePath()); - } - } - - private static > Comparator registryOrderComparator() { - return (V a, V b) -> { - ForgeRegistry registry = (ForgeRegistry) RegistryManager.ACTIVE.getRegistry(a.getRegistryType()); - return Integer.compare(registry.getID(a), registry.getID(b)); - }; - } - - private static Item[] getSortedTag(Tag tag) { - Item[] items = tag.getAllElements().toArray(new Item[0]); - Arrays.sort(items, registryOrderComparator()); - return items; - } - - private static Item[] getSortedTag(ResourceLocation tag) { - return getSortedTag(new ItemTags.Wrapper(tag)); - } - - 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/RelicLexiconEntry.java b/src/main/java/vazkii/botania/common/lexicon/RelicLexiconEntry.java deleted file mode 100644 index 78a91017d..000000000 --- a/src/main/java/vazkii/botania/common/lexicon/RelicLexiconEntry.java +++ /dev/null @@ -1,46 +0,0 @@ -/** - * 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 @ [Aug 16, 2015, 10:52:36 PM (GMT)] - */ -package vazkii.botania.common.lexicon; - -import net.minecraft.advancements.Advancement; -import net.minecraft.advancements.AdvancementProgress; -import net.minecraft.client.Minecraft; -import net.minecraft.client.entity.player.ClientPlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import vazkii.botania.api.BotaniaAPI; -import vazkii.botania.api.lexicon.LexiconCategory; - -public class RelicLexiconEntry extends BasicLexiconEntry { - public final ResourceLocation advancement; - - public RelicLexiconEntry(String unlocalizedName, LexiconCategory category, ResourceLocation advancement) { - super(unlocalizedName, category); - setKnowledgeType(BotaniaAPI.relicKnowledge); - this.advancement = advancement; - } - - @Override - @OnlyIn(Dist.CLIENT) - public boolean isVisible() { - ClientPlayerEntity player = Minecraft.getInstance().player; - if(advancement == null || player.abilities.isCreativeMode) { - return true; - } else { - Advancement adv = player.connection.getAdvancementManager().getAdvancementList().getAdvancement(advancement); - AdvancementProgress progress = player.connection.getAdvancementManager().advancementToProgress.get(adv); - return progress != null && progress.isDone(); - } - } - -} diff --git a/src/main/java/vazkii/botania/common/lexicon/TutLexiconEntry.java b/src/main/java/vazkii/botania/common/lexicon/TutLexiconEntry.java deleted file mode 100644 index 8372d9863..000000000 --- a/src/main/java/vazkii/botania/common/lexicon/TutLexiconEntry.java +++ /dev/null @@ -1,30 +0,0 @@ -/** - * 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 @ [Feb 16, 2015, 1:41:58 PM (GMT)] - */ -package vazkii.botania.common.lexicon; - -import net.minecraft.item.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.item.Items; -import vazkii.botania.api.BotaniaAPI; -import vazkii.botania.common.lexicon.page.PageTutorial; -import vazkii.botania.common.lib.LibLexicon; - -public class TutLexiconEntry extends BasicLexiconEntry { - - public TutLexiconEntry() { - super(LibLexicon.BASICS_TUTORIAL, BotaniaAPI.categoryBasics); - setPriority(); - setIcon(new ItemStack(Items.BOOK)); - setLexiconPages(new PageTutorial("0")); - } - - -} diff --git a/src/main/java/vazkii/botania/common/lexicon/WIPLexiconEntry.java b/src/main/java/vazkii/botania/common/lexicon/WIPLexiconEntry.java deleted file mode 100644 index 0ddefd499..000000000 --- a/src/main/java/vazkii/botania/common/lexicon/WIPLexiconEntry.java +++ /dev/null @@ -1,27 +0,0 @@ -/** - * 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 @ [Jun 8, 2014, 7:06:06 PM (GMT)] - */ -package vazkii.botania.common.lexicon; - -import vazkii.botania.api.lexicon.IAddonEntry; -import vazkii.botania.api.lexicon.LexiconCategory; - -public class WIPLexiconEntry extends BasicLexiconEntry implements IAddonEntry { - - public WIPLexiconEntry(String unlocalizedName, LexiconCategory category) { - super(unlocalizedName, category); - } - - @Override - public String getSubtitle() { - return "botania.gui.lexicon.wip"; - } - -} diff --git a/src/main/java/vazkii/botania/common/lexicon/WelcomeLexiconEntry.java b/src/main/java/vazkii/botania/common/lexicon/WelcomeLexiconEntry.java deleted file mode 100644 index 28d454408..000000000 --- a/src/main/java/vazkii/botania/common/lexicon/WelcomeLexiconEntry.java +++ /dev/null @@ -1,44 +0,0 @@ -/** - * 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 @ [May 30, 2015, 10:54:30 PM (GMT)] - */ -package vazkii.botania.common.lexicon; - -import net.minecraft.item.ItemStack; -import vazkii.botania.api.BotaniaAPI; -import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.api.lexicon.LexiconPage; -import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.item.equipment.bauble.ItemBaubleCosmetic; -import vazkii.botania.common.lexicon.page.PageText; -import vazkii.botania.common.lib.LibLexicon; - -import javax.annotation.Nonnull; - -public class WelcomeLexiconEntry extends BasicLexiconEntry { - - private static final int PAGES = 7; - - public WelcomeLexiconEntry() { - super(LibLexicon.BASICS_WELCOME, BotaniaAPI.categoryBasics); - setPriority(); - setIcon(new ItemStack(ModItems.questgiverMark)); - - LexiconPage[] pages = new LexiconPage[PAGES]; - for(int i = 0; i < PAGES; i++) - pages[i] = new PageText("" + i); - setLexiconPages(pages); - } - - @Override - public int compareTo(@Nonnull LexiconEntry o) { - return -1; - } - -} diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java b/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java deleted file mode 100644 index ca56bb1e2..000000000 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java +++ /dev/null @@ -1,107 +0,0 @@ -/** - * 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 @ [Nov 2, 2014, 5:17:46 PM (GMT)] - */ -package vazkii.botania.common.lexicon.page; - -import net.minecraft.client.Minecraft; -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; -import vazkii.botania.api.BotaniaAPI; -import vazkii.botania.api.brew.Brew; -import vazkii.botania.api.internal.IGuiLexiconEntry; -import vazkii.botania.api.lexicon.ILexicon; -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); - - public final RecipeBrew recipe; - public String text; - - public PageBrew(Brew brew, String unlocalizedName, String bottomText) { - super(bottomText); - recipe = BotaniaAPI.brewRecipes.values().stream().filter(recipe -> recipe.getBrew() == brew).findFirst().orElse(DUMMY); - text = unlocalizedName; - } - - @Override - @OnlyIn(Dist.CLIENT) - public void renderRecipe(IGuiLexiconEntry gui, int mx, int my) { - int width = gui.getWidth() - 30; - int height = gui.getHeight(); - int x = gui.getLeft() + 16; - int y = gui.getTop() + 12; - - Brew brew = recipe.getBrew(); - FontRenderer renderer = Minecraft.getInstance().fontRenderer; - String s = TextFormatting.BOLD + I18n.format("botaniamisc.brewOf", I18n.format(brew.getUnlocalizedName())); - renderer.drawString(s, gui.getLeft() + gui.getWidth() / 2 - renderer.getStringWidth(s) / 2, y, 0x222222); - PageText.renderText(x, y + 22, width, height, text); - - ItemStack book = PlayerHelper.getFirstHeldItemClass(Minecraft.getInstance().player, ILexicon.class); - if(book != null && ((ILexicon) book.getItem()).isKnowledgeUnlocked(book, BotaniaAPI.elvenKnowledge)) { - renderItemAtLinePos(gui, 20, 2, y + 12, recipe.getOutput(new ItemStack(ModItems.vial))); - renderItemAtLinePos(gui, 20, 3, y + 12, recipe.getOutput(new ItemStack(ModItems.flask))); - } else renderItemAtLinePos(gui, 0, -1, y + 12, recipe.getOutput(new ItemStack(ModItems.vial))); - - int i = 0; - y = gui.getTop() + gui.getHeight() - 54; - List inputs = new ArrayList<>(recipe.getInputs()); - - int offset = gui.getWidth() / 2 - inputs.size() * 9; - for(Ingredient input : inputs) { - renderItemAtLinePos(gui, offset, i, y, input.getMatchingStacks()[0]); - i++; - } - - super.renderRecipe(gui, mx, my); - } - - @OnlyIn(Dist.CLIENT) - public void renderItemAtLinePos(IGuiLexiconEntry gui, int offset, int pos, int yPos, ItemStack stack) { - if(stack.isEmpty()) - return; - - int xPos = gui.getLeft() + (pos == -1 ? gui.getWidth() / 2 - 8 : pos * 18) + offset; - - renderItem(gui, xPos, yPos, stack, false); - } - - @Override - public List getDisplayedRecipes() { - ArrayList list = new ArrayList<>(); - list.add(recipe.getOutput(new ItemStack(ModItems.vial))); - return list; - } - - @Override - public void setSecondUnlocalizedName(String name) { - text = name; - } - - @Override - public String getSecondUnlocalizedName() { - return text; - } - -} diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java deleted file mode 100644 index ba2465eb2..000000000 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java +++ /dev/null @@ -1,207 +0,0 @@ -/** - * 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 @ [Jan 19, 2014, 4:58:19 PM (GMT)] - */ -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 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.function.Predicate; -import java.util.stream.Collectors; - -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)); - - private final Item[] outputItems; - private final Predicate> recipeFilter; - - private List> recipes; - - private int ticksElapsed = 0; - private int recipeAt = 0; - - public PageCraftingRecipe(String unlocalizedName, Item... outputs) { - this(unlocalizedName, r -> true, outputs); - } - - public PageCraftingRecipe(String unlocalizedName, Predicate> filter, Item... outputs) { - super(unlocalizedName); - this.outputItems = outputs; - this.recipeFilter = filter; - } - - @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) { - - IRecipe recipe = getRecipes().get(recipeAt); - renderCraftingRecipe(gui, recipe); - - TextureManager render = Minecraft.getInstance().textureManager; - render.bindTexture(craftingOverlay); - - 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()); - - int iconX = gui.getLeft() + 115; - int iconY = gui.getTop() + 12; - - GlStateManager.enableBlend(); - GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - - 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"))); - } - - render.bindTexture(craftingOverlay); - } - - @Override - @OnlyIn(Dist.CLIENT) - public void updateScreen() { - if(Screen.hasShiftDown()) - return; - - if(ticksElapsed % 20 == 0) { - recipeAt++; - - if(recipeAt == getRecipes().size()) - recipeAt = 0; - } - ++ticksElapsed; - } - - @OnlyIn(Dist.CLIENT) - public void renderCraftingRecipe(IGuiLexiconEntry gui, IRecipe recipe) { - if(recipe == null) - return; - - if(recipe instanceof ShapedRecipe) { - - int width = ((ShapedRecipe) recipe).getWidth(); - int height = ((ShapedRecipe) recipe).getHeight(); - - for(int y = 0; y < height; y++) - for(int x = 0; x < 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) { - - drawGrid : { - for(int y = 0; y < 3; y++) - for(int x = 0; x < 3; x++) { - int index = y * 3 + x; - - if(index >= recipe.getIngredients().size()) - break drawGrid; - - 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); - } - } - } - } - - 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 crafting recipes for items {}, using dummy for {}", (Object) this.outputItems, this.unlocalizedName); - return DUMMY; - } else { - list.sort((r1, r2) -> { - Item output1 = r1.getRecipeOutput().getItem(); - Item output2 = r2.getRecipeOutput().getItem(); - if(output1 == output2) - return 0; - for(Item outputItem : outputItems) { - if(outputItem == output1) { - return -1; - } else if(outputItem == output2) { - return 1; - } - } - return 0; - }); - } - return list; - } - - @Override - public List getDisplayedRecipes() { - 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 deleted file mode 100644 index 8a465f0af..000000000 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java +++ /dev/null @@ -1,171 +0,0 @@ -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.renderer.texture.AtlasTexture; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.renderer.texture.TextureManager; -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; -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 Item[] outputItems; - private List recipes; - private int ticksElapsed = 0; - private int recipeAt = 0; - - - public PageElvenRecipe(String unlocalizedName, Item... outputs) { - super(unlocalizedName); - this.outputItems = outputs; - } - - @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) { - RecipeElvenTrade recipe = getRecipes().get(recipeAt); - TextureManager render = Minecraft.getInstance().textureManager; - render.bindTexture(elvenTradeOverlay); - 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(); - - List outputs = recipe.getOutputs(); - for(int i = 0; i < outputs.size(); i++) { - renderItemAtOutputPos(gui, i % 2, i / 2, outputs.get(i)); - } - - List inputs = recipe.getInputs(); - int i = 0; - for(Ingredient input : inputs) { - renderItemAtInputPos(gui, i, input.getMatchingStacks()[0]); - i++; - } - - TextureAtlasSprite portalIcon = MiscellaneousIcons.INSTANCE.alfPortalTex; - Minecraft.getInstance().textureManager.bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE); - AbstractGui.blit(gui.getLeft() + 22, gui.getTop() + 36, 48, 48, 0, portalIcon); // todo 1.14 zlevel? - } - - @OnlyIn(Dist.CLIENT) - public void renderItemAtInputPos(IGuiLexiconEntry gui, int x, ItemStack stack) { - if(stack.isEmpty()) - return; - - int xPos = gui.getLeft() + x * 20 + 45; - int yPos = gui.getTop() + 14; - - renderItem(gui, xPos, yPos, stack, false); - } - - @OnlyIn(Dist.CLIENT) - public void renderItemAtOutputPos(IGuiLexiconEntry gui, int x, int y, ItemStack stack) { - if(stack.isEmpty()) - return; - - int xPos = gui.getLeft() + x * 20 + 94; - int yPos = gui.getTop() + y * 20 + 52; - - renderItem(gui, xPos, yPos, stack, false); - } - - - @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; - } - - 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; - } else { - list.sort((r1, r2) -> { - for(Item outputItem : outputItems) { - for(ItemStack stack : r1.getOutputs()) { - if(stack.getItem() == outputItem) { - return -1; - } - } - for(ItemStack stack : r2.getOutputs()) { - if(stack.getItem() == outputItem) { - return 1; - } - } - } - return 0; - }); - } - return list; - } - - @Override - public List getDisplayedRecipes() { - ArrayList list = new ArrayList<>(); - for(RecipeElvenTrade r : getRecipes()) - list.addAll(r.getOutputs()); - - return list; - } -} diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageEntity.java b/src/main/java/vazkii/botania/common/lexicon/page/PageEntity.java deleted file mode 100644 index 8456a88b6..000000000 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageEntity.java +++ /dev/null @@ -1,108 +0,0 @@ -/** - * 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 @ [Jul 4, 2014, 10:38:50 PM (GMT)] - */ -package vazkii.botania.common.lexicon.page; - -import net.minecraft.client.Minecraft; -import com.mojang.blaze3d.platform.GlStateManager; -import com.mojang.blaze3d.platform.GLX; -import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityType; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.MathHelper; -import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import vazkii.botania.api.internal.IGuiLexiconEntry; -import vazkii.botania.api.lexicon.LexiconPage; - -import java.lang.reflect.Constructor; - -public class PageEntity extends LexiconPage{ - - Entity dummyEntity; - int relativeMouseX, relativeMouseY; - boolean tooltipEntity; - final int size; - private final EntityType type; - - public PageEntity(String unlocalizedName, EntityType type, int size) { - super(unlocalizedName); - this.type = type; - this.size = size; - } - - @Override - @OnlyIn(Dist.CLIENT) - public void renderScreen(IGuiLexiconEntry gui, int mx, int my) { - prepDummy(); - int text_x = gui.getLeft() + 16; - int text_y = gui.getTop() + gui.getHeight() - 40; - int entity_scale = getEntityScale(size); - int entity_x = gui.getLeft() + gui.getWidth() / 2; - int entity_y = gui.getTop() + gui.getHeight() / 2 + MathHelper.floor(dummyEntity.getHeight() * entity_scale / 2); - - renderEntity(gui, dummyEntity, entity_x, entity_y, entity_scale, dummyEntity.ticksExisted * 2); - - PageText.renderText(text_x, text_y, gui.getWidth() - 30, gui.getHeight(), getUnlocalizedName()); - } - - @OnlyIn(Dist.CLIENT) - public int getEntityScale(int targetSize) { - float entity_size = dummyEntity.getWidth(); - - if(dummyEntity.getWidth() < dummyEntity.getHeight()) - entity_size = dummyEntity.getHeight(); - - return MathHelper.floor(size / entity_size); - - } - - @Override - public void updateScreen() { - prepDummy(); - dummyEntity.ticksExisted++; - } - - @OnlyIn(Dist.CLIENT) - public void renderEntity(IGuiLexiconEntry gui, Entity entity, int x, int y, int scale, float rotation) { - dummyEntity.world = Minecraft.getInstance() != null ? Minecraft.getInstance().world : null; - - GlStateManager.enableColorMaterial(); - GlStateManager.pushMatrix(); - GlStateManager.translatef(x, y, 50.0F); - GlStateManager.scalef(-scale, scale, scale); - GlStateManager.rotatef(180.0F, 0.0F, 0.0F, 1.0F); - GlStateManager.rotatef(rotation, 0.0F, 1.0F, 0.0F); - RenderHelper.enableStandardItemLighting(); - Minecraft.getInstance().getRenderManager().playerViewY = 180.0F; - Minecraft.getInstance().getRenderManager().renderEntity(entity, 0.0D, 0.0D, 0.0D, 0.0F, 1.0F, false); - GlStateManager.popMatrix(); - RenderHelper.disableStandardItemLighting(); - GlStateManager.disableRescaleNormal(); - GLX.glActiveTexture(GLX.GL_TEXTURE1); - GlStateManager.disableTexture(); - GLX.glActiveTexture(GLX.GL_TEXTURE0); - - if(relativeMouseX >= x - dummyEntity.getWidth() * scale / 2 - 10 && relativeMouseY >= y - dummyEntity.getHeight() * scale - 20 && relativeMouseX <= x + dummyEntity.getWidth() * scale / 2 + 10 && relativeMouseY <= y + 20) - tooltipEntity = true; - } - - public void prepDummy() { - if(dummyEntity == null || !dummyEntity.isAlive()) { - try { - dummyEntity = type.create(Minecraft.getInstance().world); - } catch (Exception e) { - e.printStackTrace(); - } - } - } -} diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageGuide.java b/src/main/java/vazkii/botania/common/lexicon/page/PageGuide.java deleted file mode 100644 index fb82587e7..000000000 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageGuide.java +++ /dev/null @@ -1,51 +0,0 @@ -/** - * 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 @ [Sep 3, 2014, 9:41:47 PM (GMT)] - */ -package vazkii.botania.common.lexicon.page; - -import net.minecraft.client.gui.widget.button.Button; -import net.minecraft.client.gui.widget.button.Button; -import net.minecraft.client.resources.I18n; -import vazkii.botania.api.internal.IGuiLexiconEntry; - -import java.awt.Desktop; -import java.io.IOException; -import java.net.URI; -import java.net.URISyntaxException; - -public class PageGuide extends PageText { - - private Button button; - - public PageGuide(String unlocalizedName) { - super(unlocalizedName); - } - - @Override - public void onOpened(IGuiLexiconEntry gui) { - button = new Button(gui.getLeft() + 30, gui.getTop() + gui.getHeight() - 50, gui.getWidth() - 60, 20, I18n.format("botaniamisc.playVideo"), - b -> { - if(Desktop.isDesktopSupported()) { - try { - Desktop.getDesktop().browse(new URI("https://www.youtube.com/watch?v=rx0xyejC6fI")); - if(Math.random() < 0.01) - Desktop.getDesktop().browse(new URI("https://www.youtube.com/watch?v=dQw4w9WgXcQ")); - } catch(IOException | URISyntaxException ignored) { } - } - }); - gui.getButtonList().add(button); - } - - @Override - public void onClosed(IGuiLexiconEntry gui) { - gui.getButtonList().remove(button); - } - -} diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageImage.java b/src/main/java/vazkii/botania/common/lexicon/page/PageImage.java deleted file mode 100644 index e786f1233..000000000 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageImage.java +++ /dev/null @@ -1,53 +0,0 @@ -/** - * 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 @ [Jan 16, 2014, 6:13:08 PM (GMT)] - */ -package vazkii.botania.common.lexicon.page; - -import net.minecraft.client.Minecraft; -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.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.LexiconPage; - -public class PageImage extends LexiconPage { - - public final ResourceLocation resource; - - public PageImage(String unlocalizedName, String resource) { - super(unlocalizedName); - this.resource = new ResourceLocation(resource); - } - - @Override - @OnlyIn(Dist.CLIENT) - public void renderScreen(IGuiLexiconEntry gui, int mx, int my) { - TextureManager render = Minecraft.getInstance().textureManager; - render.bindTexture(resource); - - 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(); - - int width = gui.getWidth() - 30; - int height = gui.getHeight(); - int x = gui.getLeft() + 16; - int y = gui.getTop() + height - 40; - PageText.renderText(x, y, width, height, getUnlocalizedName()); - } - -} diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageLoreText.java b/src/main/java/vazkii/botania/common/lexicon/page/PageLoreText.java deleted file mode 100644 index 22a3d974b..000000000 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageLoreText.java +++ /dev/null @@ -1,41 +0,0 @@ -/** - * 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 @ [Nov 7, 2014, 11:46:21 PM (GMT)] - */ -package vazkii.botania.common.lexicon.page; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.screen.Screen; -import com.mojang.blaze3d.platform.GlStateManager; -import net.minecraft.util.ResourceLocation; -import org.lwjgl.opengl.GL11; -import vazkii.botania.api.internal.IGuiLexiconEntry; -import vazkii.botania.client.lib.LibResources; - -public class PageLoreText extends PageText { - - private static final ResourceLocation paperOverlay = new ResourceLocation(LibResources.GUI_PAPER); - - public PageLoreText(String unlocalizedName) { - super(unlocalizedName); - } - - @Override - public void renderScreen(IGuiLexiconEntry gui, int mx, int my) { - Minecraft.getInstance().textureManager.bindTexture(paperOverlay); - - 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(); - super.renderScreen(gui, mx, my); - } - -} diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java deleted file mode 100644 index 346f5258e..000000000 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java +++ /dev/null @@ -1,219 +0,0 @@ -/** - * 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 @ [Feb 8, 2014, 1:11:42 PM (GMT)] - */ -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.renderer.texture.TextureManager; -import net.minecraft.client.resources.I18n; -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; -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 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, Item... outputs) { - this(unlocalizedName, r -> true, outputs); - } - - public PageManaInfusionRecipe(String unlocalizedName, Predicate filter, Item... outputs) { - super(unlocalizedName); - this.outputItems = outputs; - this.recipeFilter = filter; - renderStack = new ItemStack(ModBlocks.manaPool); - ItemNBTHelper.setBoolean(renderStack, "RenderFull", true); - } - - 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(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 = getRecipes().get(recipeAt); - TextureManager render = Minecraft.getInstance().textureManager; - FontRenderer font = Minecraft.getInstance().fontRenderer; - - if(recipe.getInput().getMatchingStacks().length > 0) - renderItemAtGridPos(gui, 1, 1, recipe.getInput().getMatchingStacks()[0], false); - - renderItemAtGridPos(gui, 2, 1, renderStack, false); - - renderItemAtGridPos(gui, 3, 1, recipe.getOutput(), false); - - if(recipe.getCatalyst() != null) { - Block block = recipe.getCatalyst().getBlock(); - if (block.asItem() != Items.AIR) { - renderItemAtGridPos(gui, 1, 2, new ItemStack(block), false); - } - } - - GlStateManager.enableBlend(); - GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - String manaUsage = I18n.format("botaniamisc.manaUsage"); - font.drawString(manaUsage, gui.getLeft() + gui.getWidth() / 2 - font.getStringWidth(manaUsage) / 2, gui.getTop() + 105, 0x66000000); - - int ratio = 10; - int x = gui.getLeft() + gui.getWidth() / 2 - 50; - int y = gui.getTop() + 115; - - if(mx > x + 1 && mx <= x + 101 && my > y - 14 && my <= y + 11) - ratio = 1; - - HUDHandler.renderManaBar(x, y, 0x0000FF, 0.75F, recipe.getManaToConsume(), TilePool.MAX_MANA / ratio); - - String ratioString = I18n.format("botaniamisc.ratio", ratio); - String dropString = I18n.format("botaniamisc.drop") + " " + TextFormatting.BOLD + "(?)"; - - boolean hoveringOverDrop = false; - - int dw = font.getStringWidth(dropString); - int dx = x + 35 - dw / 2; - int dy = gui.getTop() + 30; - - if(mx > dx && mx <= dx + dw && my > dy && my <= dy + 10) - hoveringOverDrop = true; - - font.drawString(dropString, dx, dy, 0x77000000); - font.drawString(ratioString, x + 50 - font.getStringWidth(ratioString) / 2, y + 5, 0x99000000); - - GlStateManager.disableBlend(); - - render.bindTexture(manaInfusionOverlay); - - 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(); - - if(hoveringOverDrop) { - String key = RenderHelper.getKeyDisplayString("key.drop"); - String tip0 = I18n.format("botaniamisc.dropTip0", TextFormatting.GREEN + key + TextFormatting.WHITE); - String tip1 = I18n.format("botaniamisc.dropTip1", TextFormatting.GREEN + key + TextFormatting.WHITE); - RenderHelper.renderTooltip(mx, my, Arrays.asList(tip0, tip1)); - } - } - - @Override - @OnlyIn(Dist.CLIENT) - public void updateScreen() { - if(Screen.hasShiftDown()) - return; - - if(ticksElapsed % 20 == 0) { - recipeAt++; - - if(recipeAt == getRecipes().size()) - recipeAt = 0; - } - ++ticksElapsed; - } - - @Override - public List getDisplayedRecipes() { - ArrayList list = new ArrayList<>(); - 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 for {}", (Object) outputItems, this.unlocalizedName); - return DUMMY; - } else { - list.sort((r1, r2) -> { - Item output1 = r1.getOutput().getItem(); - Item output2 = r2.getOutput().getItem(); - if(output1 == output2) - return 0; - for(Item outputItem : outputItems) { - if(outputItem == output1) { - return -1; - } else if(outputItem == output2) { - return 1; - } - } - return 0; - }); - } - 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 deleted file mode 100644 index 79daa77d9..000000000 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageModRecipe.java +++ /dev/null @@ -1,190 +0,0 @@ -/** - * 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; - - list.sort((r1, r2) -> { - Item output1 = r1.getOutput().getItem(); - Item output2 = r2.getOutput().getItem(); - if(output1 == output2) - return 0; - for(Item outputItem : outputItems) { - if(outputItem == output1) { - return -1; - } else if(outputItem == output2) { - return 1; - } - } - return 0; - }); - return list; - } - return recipes; - } -} diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageMultiblock.java b/src/main/java/vazkii/botania/common/lexicon/page/PageMultiblock.java deleted file mode 100644 index 777e744ee..000000000 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageMultiblock.java +++ /dev/null @@ -1,144 +0,0 @@ -/** - * 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 @ [Jun 28, 2015, 1:48:58 AM (GMT)] - */ -package vazkii.botania.common.lexicon.page; - -import net.minecraft.block.Blocks; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.gui.widget.button.Button; -import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.gui.widget.button.Button; -import com.mojang.blaze3d.platform.GlStateManager; -import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.client.renderer.texture.TextureManager; -import net.minecraft.client.resources.I18n; -import net.minecraft.block.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.util.Direction; -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.internal.IGuiLexiconEntry; -import vazkii.botania.api.lexicon.LexiconPage; -import vazkii.botania.api.lexicon.multiblock.Multiblock; -import vazkii.botania.api.lexicon.multiblock.MultiblockSet; -import vazkii.botania.client.core.handler.MultiblockRenderHandler; -import vazkii.botania.client.lib.LibResources; - -import java.util.ArrayList; -import java.util.List; - -public class PageMultiblock extends LexiconPage { - - private static final ResourceLocation multiblockOverlay = new ResourceLocation(LibResources.GUI_MULTIBLOCK_OVERLAY); - - private Button button; - private final MultiblockSet set; - private final Multiblock mb; - private int ticksElapsed; - - public PageMultiblock(String unlocalizedName, MultiblockSet set) { - super(unlocalizedName); - mb = set.getForFacing(Direction.SOUTH); - this.set = set; - } - - @Override - @OnlyIn(Dist.CLIENT) - public void renderScreen(IGuiLexiconEntry gui, int mx, int my) { - TextureManager render = Minecraft.getInstance().textureManager; - render.bindTexture(multiblockOverlay); - - GlStateManager.enableBlend(); - GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GlStateManager.disableAlphaTest(); - GlStateManager.color4f(1F, 1F, 1F, 1F); - ((Screen) gui).blit(gui.getLeft(), gui.getTop(), 0, 0, gui.getWidth(), gui.getHeight()); - GlStateManager.disableBlend(); - GlStateManager.enableAlphaTest(); - - final float maxX = 90, maxY = 60; - GlStateManager.pushMatrix(); - GlStateManager.translatef(gui.getLeft() + gui.getWidth() / 2, gui.getTop() + 90, gui.getZLevel() + 100F); - - float diag = (float) Math.sqrt(mb.getXSize() * mb.getXSize() + mb.getZSize() * mb.getZSize()); - float height = mb.getYSize(); - float scaleX = maxX / diag; - float scaleY = maxY / height; - float scale = -Math.min(scaleY, scaleX); - GlStateManager.scalef(scale, scale, scale); - - GlStateManager.rotatef(-20F, 1, 0, 0); - GlStateManager.rotatef(gui.getElapsedTicks(), 0, 1, 0); - - MultiblockRenderHandler.renderMultiblockOnPage(mb); - - GlStateManager.popMatrix(); - - FontRenderer font = Minecraft.getInstance().fontRenderer; - String s = TextFormatting.BOLD + I18n.format(getUnlocalizedName()); - font.drawString(s, gui.getLeft() + gui.getWidth() / 2 - font.getStringWidth(s) / 2, gui.getTop() + 16, 0x000000); - - GlStateManager.enableRescaleNormal(); - RenderHelper.enableGUIStandardItemLighting(); - int x = gui.getLeft() + 15; - int y = gui.getTop() + 25; - Minecraft.getInstance().getItemRenderer().renderItemIntoGUI(new ItemStack(Blocks.STONE_BRICKS), x, y); - RenderHelper.disableStandardItemLighting(); - GlStateManager.disableRescaleNormal(); - - GlStateManager.pushMatrix(); - GlStateManager.translatef(0F, 0F, 200F); - if(mx >= x && mx < x + 16 && my >= y && my < y + 16) { - List mats = new ArrayList<>(); - mats.add(I18n.format("botaniamisc.materialsRequired")); - for(ItemStack stack : mb.materials) { - String size = "" + stack.getCount(); - if(size.length() < 2) - size = "0" + size; - mats.add(" " + TextFormatting.AQUA + size + " " + TextFormatting.GRAY + stack.getDisplayName()); - } - - vazkii.botania.client.core.helper.RenderHelper.renderTooltip(mx, my, mats); - } - GlStateManager.popMatrix(); - } - - @Override - public void onOpened(IGuiLexiconEntry gui) { - button = new Button(gui.getLeft() + 30, gui.getTop() + gui.getHeight() - 50, gui.getWidth() - 60, 20, getButtonStr(), b -> { - if(MultiblockRenderHandler.currentMultiblock == set) - MultiblockRenderHandler.setMultiblock(null); - else MultiblockRenderHandler.setMultiblock(set); - button.setMessage(getButtonStr()); // todo 1.14 this capture probably wont work - }); - gui.getButtonList().add(button); - } - - @OnlyIn(Dist.CLIENT) - private String getButtonStr() { - return I18n.format(MultiblockRenderHandler.currentMultiblock == set ? "botaniamisc.unvisualize" : "botaniamisc.visualize"); - } - - @Override - public void onClosed(IGuiLexiconEntry gui) { - gui.getButtonList().remove(button); - } - - @Override - @OnlyIn(Dist.CLIENT) - public void updateScreen() { - ++ticksElapsed; - } - -} diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java deleted file mode 100644 index 51fc5677a..000000000 --- a/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java +++ /dev/null @@ -1,64 +0,0 @@ -/** - * 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 @ [Feb 8, 2014, 1:11:35 PM (GMT)] - */ -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; - -public class PagePetalRecipe extends PageModRecipe { - - private static final List DUMMY = Collections.singletonList(new RecipePetals(new ResourceLocation(LibMisc.MOD_ID, "dummy"), ItemStack.EMPTY)); - - public PagePetalRecipe(String unlocalizedName, Predicate filter, Item... outputs) { - super(unlocalizedName, filter, outputs); - } - - public PagePetalRecipe(String unlocalizedName, Item... outputs) { - this(unlocalizedName, r -> true, outputs); - } - - @Override - ItemStack getMiddleStack() { - return new ItemStack(ModBlocks.defaultAltar); - } - - @Override - public List getDisplayedRecipes() { - ArrayList list = new ArrayList<>(); - 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 deleted file mode 100644 index ece1f76cc..000000000 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java +++ /dev/null @@ -1,188 +0,0 @@ -/** - * 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 @ [Feb 8, 2014, 2:46:36 PM (GMT)] - */ -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.ItemRenderer; -import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.client.resources.I18n; -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.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; -import vazkii.botania.api.lexicon.ILexicon; -import vazkii.botania.api.lexicon.LexiconPage; -import vazkii.botania.api.lexicon.LexiconRecipeMappings; -import vazkii.botania.api.lexicon.LexiconRecipeMappings.EntryData; -import vazkii.botania.client.gui.lexicon.GuiLexiconEntry; -import vazkii.botania.common.core.helper.PlayerHelper; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.Comparator; -import java.util.List; - -public class PageRecipe extends LexiconPage { - - private int relativeMouseX, relativeMouseY; - private ItemStack tooltipStack = ItemStack.EMPTY; - private ItemStack tooltipContainerStack = ItemStack.EMPTY; - private boolean tooltipEntry; - - private static boolean mouseDownLastTick = false; - - public PageRecipe(String unlocalizedName) { - super(unlocalizedName); - } - - @Override - @OnlyIn(Dist.CLIENT) - public void renderScreen(IGuiLexiconEntry gui, int mx, int my) { - relativeMouseX = mx; - relativeMouseY = my; - - renderRecipe(gui, mx, my); - - int width = gui.getWidth() - 30; - int height = gui.getHeight(); - int x = gui.getLeft() + 16; - int y = gui.getTop() + height - 40; - PageText.renderText(x, y, width, height, getUnlocalizedName()); - - if(!tooltipStack.isEmpty()) { - List tooltipData = tooltipStack.getTooltip(Minecraft.getInstance().player, ITooltipFlag.TooltipFlags.NORMAL); - List parsedTooltip = new ArrayList<>(); - boolean first = true; - - for(ITextComponent s : tooltipData) { - String s_ = s.getFormattedText(); - if(!first) { - s_ = s.applyTextStyle(TextFormatting.GRAY).getFormattedText(); - } - parsedTooltip.add(s_); - first = false; - } - - FontRenderer font = Minecraft.getInstance().fontRenderer; - int tooltipHeight = tooltipData.size() * 10 + 2; - int tooltipWidth = parsedTooltip.stream().map(font::getStringWidth).max(Comparator.comparingInt(a -> a)).orElse(0); - int rmx = mx + 12; - int rmy = my - 12; - - vazkii.botania.client.core.helper.RenderHelper.renderTooltip(mx, my, parsedTooltip); - GlStateManager.disableDepthTest(); - MinecraftForge.EVENT_BUS.post(new RenderTooltipEvent.PostBackground(tooltipStack, parsedTooltip, rmx, rmy, font, tooltipWidth, tooltipHeight)); - MinecraftForge.EVENT_BUS.post(new RenderTooltipEvent.PostText(tooltipStack, parsedTooltip, rmx, rmy, font, tooltipWidth, tooltipHeight)); - GlStateManager.enableDepthTest(); - - int tooltipY = 8 + tooltipData.size() * 11; - - if(tooltipEntry) { - vazkii.botania.client.core.helper.RenderHelper.renderTooltipOrange(mx, my + tooltipY, Collections.singletonList(TextFormatting.GRAY + I18n.format("botaniamisc.clickToRecipe"))); - tooltipY += 18; - } - - if(!tooltipContainerStack.isEmpty()) - vazkii.botania.client.core.helper.RenderHelper.renderTooltipGreen(mx, my + tooltipY, Arrays.asList(TextFormatting.AQUA + I18n.format("botaniamisc.craftingContainer"), tooltipContainerStack.getDisplayName().getFormattedText())); - } - - tooltipStack = tooltipContainerStack = ItemStack.EMPTY; - tooltipEntry = false; - GlStateManager.disableBlend(); - mouseDownLastTick = GLFW.glfwGetMouseButton(Minecraft.getInstance().mainWindow.getHandle(), GLFW.GLFW_MOUSE_BUTTON_LEFT) == GLFW.GLFW_PRESS; - } - - @OnlyIn(Dist.CLIENT) - public void renderRecipe(IGuiLexiconEntry gui, int mx, int my) {} - - @OnlyIn(Dist.CLIENT) - public void renderItemAtAngle(IGuiLexiconEntry gui, float angle, ItemStack stack) { - if(stack.isEmpty()) - return; - - angle -= 90; - int radius = 32; - double xPos = gui.getLeft() + Math.cos(angle * Math.PI / 180D) * radius + gui.getWidth() / 2 - 8; - double yPos = gui.getTop() + Math.sin(angle * Math.PI / 180D) * radius + 53; - - renderItem(gui, xPos, yPos, stack, false); - } - - @OnlyIn(Dist.CLIENT) - public void renderItemAtGridPos(IGuiLexiconEntry gui, int x, int y, ItemStack stack, boolean accountForContainer) { - if(stack.isEmpty()) - return; - - int xPos = gui.getLeft() + x * 29 + 7 + (y == 0 && x == 3 ? 10 : 0); - int yPos = gui.getTop() + y * 29 + 24 - (y == 0 ? 7 : 0); - - renderItem(gui, xPos, yPos, stack, accountForContainer); - } - - @OnlyIn(Dist.CLIENT) - public void renderItem(IGuiLexiconEntry gui, double xPos, double yPos, ItemStack stack, boolean accountForContainer) { - ItemRenderer render = Minecraft.getInstance().getItemRenderer(); - boolean mouseDown = GLFW.glfwGetMouseButton(Minecraft.getInstance().mainWindow.getHandle(), GLFW.GLFW_MOUSE_BUTTON_LEFT) == GLFW.GLFW_PRESS; - - GlStateManager.pushMatrix(); - GlStateManager.enableBlend(); - GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - RenderHelper.enableGUIStandardItemLighting(); - GlStateManager.enableRescaleNormal(); - GlStateManager.enableDepthTest(); - GlStateManager.pushMatrix(); - GlStateManager.translated(xPos, yPos, 0); - render.renderItemAndEffectIntoGUI(stack, 0, 0); - render.renderItemOverlays(Minecraft.getInstance().fontRenderer, stack, 0, 0); - GlStateManager.popMatrix(); - RenderHelper.disableStandardItemLighting(); - GlStateManager.popMatrix(); - - int xpi = (int) xPos; - int ypi = (int) yPos; - if(relativeMouseX >= xpi && relativeMouseY >= ypi && relativeMouseX <= xpi + 16 && relativeMouseY <= ypi + 16) { - tooltipStack = stack; - - EntryData data = LexiconRecipeMappings.getDataForStack(tooltipStack); - ItemStack book = PlayerHelper.getFirstHeldItemClass(Minecraft.getInstance().player, ILexicon.class); - - if(data != null && (data.entry != gui.getEntry() || data.page != gui.getPageOn()) && book != null && ((ILexicon) book.getItem()).isKnowledgeUnlocked(book, data.entry.getKnowledgeType())) { - tooltipEntry = true; - - if(!mouseDownLastTick && mouseDown && Screen.hasShiftDown()) { - GuiLexiconEntry newGui = new GuiLexiconEntry(data.entry, (Screen) gui); - newGui.page = data.page; - Minecraft.getInstance().displayGuiScreen(newGui); - } - } else tooltipEntry = false; - - if(accountForContainer) { - ItemStack containerStack = stack.getItem().getContainerItem(stack); - if(!containerStack.isEmpty()) - tooltipContainerStack = containerStack; - } - } - - GlStateManager.disableLighting(); - } - -} diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageRuneRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageRuneRecipe.java deleted file mode 100644 index 645cac790..000000000 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageRuneRecipe.java +++ /dev/null @@ -1,88 +0,0 @@ -/** - * 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 @ [Feb 8, 2014, 1:11:48 PM (GMT)] - */ -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.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 PageModRecipe { - - private static final List DUMMY = Collections.singletonList(new RecipeRuneAltar(new ResourceLocation(LibMisc.MOD_ID, "dummy"), ItemStack.EMPTY, 0)); - - public PageRuneRecipe(String unlocalizedName, Item... outputs) { - super(unlocalizedName, outputs); - } - - public PageRuneRecipe(String unlocalizedName, Predicate filter, Item... outputs) { - super(unlocalizedName, filter, outputs); - } - - @Override - ItemStack getMiddleStack() { - return new ItemStack(ModBlocks.runeAltar); - } - - @OnlyIn(Dist.CLIENT) - public void renderManaBar(IGuiLexiconEntry gui, RecipeRuneAltar recipe, int mx, int my) { - FontRenderer font = Minecraft.getInstance().fontRenderer; - GlStateManager.enableBlend(); - GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - String manaUsage = I18n.format("botaniamisc.manaUsage"); - font.drawString(manaUsage, gui.getLeft() + gui.getWidth() / 2 - font.getStringWidth(manaUsage) / 2, gui.getTop() + 110, 0x66000000); - - int ratio = 10; - int x = gui.getLeft() + gui.getWidth() / 2 - 50; - int y = gui.getTop() + 120; - - if(mx > x + 1 && mx <= x + 101 && my > y - 14 && my <= y + 11) - ratio = 1; - - HUDHandler.renderManaBar(x, y, 0x0000FF, 0.75F, recipe.getManaUsage(), TilePool.MAX_MANA / ratio); - - String ratioString = I18n.format("botaniamisc.ratio", ratio); - String stopStr = I18n.format("botaniamisc.shiftToStopSpin"); - - font.drawString(stopStr, x + 50 - font.getStringWidth(stopStr) / 2, y + 15, 0x99000000); - font.drawString(ratioString, x + 50 - font.getStringWidth(ratioString) / 2, y + 5, 0x99000000); - 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/lexicon/page/PageTerrasteel.java b/src/main/java/vazkii/botania/common/lexicon/page/PageTerrasteel.java deleted file mode 100644 index 83fd68b3f..000000000 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageTerrasteel.java +++ /dev/null @@ -1,98 +0,0 @@ -/** - * 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 @ [Apr 14, 2014, 5:57:26 PM (GMT)] - */ -package vazkii.botania.common.lexicon.page; - -import net.minecraft.block.Block; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.gui.screen.Screen; -import com.mojang.blaze3d.platform.GlStateManager; -import net.minecraft.block.Blocks; -import net.minecraft.item.ItemStack; -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.client.lib.LibResources; -import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.common.item.ModItems; - -import java.util.ArrayList; -import java.util.List; - -public class PageTerrasteel extends PageRecipe { - - private static final ResourceLocation terrasteelOverlay = new ResourceLocation(LibResources.GUI_TERRASTEEL_OVERLAY); - - public PageTerrasteel(String unlocalizedName) { - super(unlocalizedName); - } - - @Override - @OnlyIn(Dist.CLIENT) - public void renderRecipe(IGuiLexiconEntry gui, int mx, int my) { - Block block1 = ModBlocks.livingrock; - Block block2 = Blocks.LAPIS_BLOCK; - Block block3 = ModBlocks.terraPlate; - - GlStateManager.translatef(0F, 0F, -10F); - renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8, gui.getTop() + 103, new ItemStack(block1), false); - - GlStateManager.translatef(0F, 0F, 5F); - renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8 + 7, gui.getTop() + 106, new ItemStack(block2), false); - renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8 - 6, gui.getTop() + 106, new ItemStack(block2), false); - - GlStateManager.translatef(0F, 0F, 5F); - renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8, gui.getTop() + 110, new ItemStack(block1), false); - renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8 + 14, gui.getTop() + 110, new ItemStack(block1), false); - renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8 - 13, gui.getTop() + 110, new ItemStack(block1), false); - - GlStateManager.translatef(0F, 0F, 5F); - renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8 - 6, gui.getTop() + 114, new ItemStack(block2), false); - renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8 + 7, gui.getTop() + 114, new ItemStack(block2), false); - - GlStateManager.translatef(0F, 0F, 5F); - renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8 + 1, gui.getTop() + 117, new ItemStack(block1), false); - - GlStateManager.translatef(0F, 0F, 5F); - renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8, gui.getTop() + 102, new ItemStack(block3), false); - GlStateManager.translatef(0F, 0F, -10F); - - renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8, gui.getTop() + 30, new ItemStack(ModItems.terrasteel), false); - renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8, gui.getTop() + 80, new ItemStack(ModItems.manaSteel), false); - renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8 - 20, gui.getTop() + 86, new ItemStack(ModItems.manaPearl), false); - renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8 + 19, gui.getTop() + 86, new ItemStack(ModItems.manaDiamond), false); - - Minecraft.getInstance().textureManager.bindTexture(terrasteelOverlay); - - 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(); - } - - @Override - public void onPageAdded(LexiconEntry entry, int index) { - LexiconRecipeMappings.map(new ItemStack(ModItems.terrasteel), entry, index); - } - - @Override - public List getDisplayedRecipes() { - ArrayList list = new ArrayList<>(); - list.add(new ItemStack(ModItems.terrasteel)); - return list; - } - -} diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageText.java b/src/main/java/vazkii/botania/common/lexicon/page/PageText.java deleted file mode 100644 index 909f1e6f2..000000000 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageText.java +++ /dev/null @@ -1,125 +0,0 @@ -/** - * 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 @ [Jan 14, 2014, 6:45:33 PM (GMT)] - */ -package vazkii.botania.common.lexicon.page; - -import com.google.common.base.Joiner; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.resources.I18n; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import vazkii.botania.api.internal.IGuiLexiconEntry; -import vazkii.botania.api.lexicon.LexiconPage; -import vazkii.botania.common.core.handler.ConfigHandler; - -import java.util.ArrayList; -import java.util.List; - -public class PageText extends LexiconPage { - - public PageText(String unlocalizedName) { - super(unlocalizedName); - } - - @Override - @OnlyIn(Dist.CLIENT) - public void renderScreen(IGuiLexiconEntry gui, int mx, int my) { - int width = gui.getWidth() - 30; - int x = gui.getLeft() + 16; - int y = gui.getTop() + 2; - - renderText(x, y, width, gui.getHeight(), getUnlocalizedName()); - } - - public static void renderText(int x, int y, int width, int height, String unlocalizedText) { - renderText(x, y, width, height, 10, true, 0, unlocalizedText); - } - - @OnlyIn(Dist.CLIENT) - public static void renderText(int x, int y, int width, int height, int paragraphSize, boolean useUnicode, int color, String unlocalizedText) { - x += 2; - y += 10; - width -= 4; - - FontRenderer font = Minecraft.getInstance().fontRenderer; - String text = I18n.format(unlocalizedText).replaceAll("&", "\u00a7"); - String[] textEntries = text.split("
"); - - List> lines = new ArrayList<>(); - - String controlCodes; - for(String s : textEntries) { - List words = new ArrayList<>(); - String lineStr = ""; - String[] tokens = s.split(" "); - for(String token : tokens) { - String prev = lineStr; - String spaced = token + " "; - lineStr += spaced; - - controlCodes = toControlCodes(getControlCodes(prev)); - if(font.getStringWidth(lineStr) > width) { - lines.add(words); - lineStr = controlCodes + spaced; - words = new ArrayList<>(); - } - - words.add(controlCodes + token); - } - - if(!lineStr.isEmpty()) - lines.add(words); - lines.add(new ArrayList<>()); - } - - int i = 0; - for(List words : lines) { - words.size(); - int xi = x; - int spacing = 4; - int wcount = words.size(); - int compensationSpaces = 0; - boolean justify = ConfigHandler.CLIENT.lexiconJustifiedText.get() && wcount > 0 && lines.size() > i && !lines.get(i + 1).isEmpty(); - - if(justify) { - String s = Joiner.on("").join(words); - int swidth = font.getStringWidth(s); - int space = width - swidth; - - spacing = wcount == 1 ? 0 : space / (wcount - 1); - compensationSpaces = wcount == 1 ? 0 : space % (wcount - 1); - } - - for(String s : words) { - int extra = 0; - if(compensationSpaces > 0) { - compensationSpaces--; - extra++; - } - font.drawString(s, xi, y, color); - xi += font.getStringWidth(s) + spacing + extra; - } - - y += words.isEmpty() ? paragraphSize : 10; - i++; - } - } - - private static String getControlCodes(String s) { - String controls = s.replaceAll("(?. 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 @ [Feb 16, 2015, 1:39:10 PM (GMT)] - */ -package vazkii.botania.common.lexicon.page; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.widget.button.Button; -import net.minecraft.client.gui.widget.button.Button; -import net.minecraft.client.resources.I18n; -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 vazkii.botania.api.internal.IGuiLexiconEntry; -import vazkii.botania.client.gui.lexicon.GuiLexicon; - -import java.awt.Desktop; -import java.net.URI; - -public class PageTutorial extends PageText { - - // Turn this on once we have an up to date video - private static final boolean VIDEO_ENABLED = true; - - private Button buttonText, buttonVideo; - - public PageTutorial(String unlocalizedName) { - super(unlocalizedName); - } - - @Override - public void onOpened(IGuiLexiconEntry gui) { - buttonText = new Button(gui.getLeft() + 20, gui.getTop() + gui.getHeight() - 40, 50, 20, I18n.format("botaniamisc.tutorialText"), b -> { - GuiLexicon.startTutorial(); - Minecraft.getInstance().displayGuiScreen(new GuiLexicon()); - Minecraft.getInstance().player.sendMessage(new TranslationTextComponent("botaniamisc.tutorialStarted").setStyle(new Style().setColor(TextFormatting.GREEN))); - }); - if(VIDEO_ENABLED) - buttonVideo = new Button(gui.getLeft() + 75, gui.getTop() + gui.getHeight() - 40, 50, 20, I18n.format("botaniamisc.tutorialVideo"), b -> { - if(Desktop.isDesktopSupported()) { - try { - Desktop.getDesktop().browse(new URI("https://www.youtube.com/watch?v=D75Aad-5QgQ")); - } catch(Exception e) { - e.printStackTrace(); - } - } - }); - - gui.getButtonList().add(buttonText); - if(VIDEO_ENABLED) - gui.getButtonList().add(buttonVideo); - } - - @Override - public void onClosed(IGuiLexiconEntry gui) { - gui.getButtonList().remove(buttonText); - if(VIDEO_ENABLED) - gui.getButtonList().remove(buttonVideo); - } - - @Override - public void renderScreen(IGuiLexiconEntry gui, int mx, int my) { - super.renderScreen(gui, mx, my); - - if(!VIDEO_ENABLED) - PageText.renderText(buttonText.x + buttonText.getWidth() + 4, buttonText.y - 14, 65, 100, "botaniamisc.noVideo"); - } -} diff --git a/src/main/java/vazkii/botania/common/network/PacketSyncRecipes.java b/src/main/java/vazkii/botania/common/network/PacketSyncRecipes.java index c03316b69..d6b24f37e 100644 --- a/src/main/java/vazkii/botania/common/network/PacketSyncRecipes.java +++ b/src/main/java/vazkii/botania/common/network/PacketSyncRecipes.java @@ -10,7 +10,6 @@ import vazkii.botania.api.recipe.RecipeManaInfusion; import vazkii.botania.api.recipe.RecipePetals; import vazkii.botania.api.recipe.RecipePureDaisy; import vazkii.botania.api.recipe.RecipeRuneAltar; -import vazkii.botania.common.lexicon.LexiconData; import java.util.Map; import java.util.function.Supplier; @@ -97,7 +96,6 @@ public class PacketSyncRecipes { BotaniaAPI.petalRecipes = petal; BotaniaAPI.pureDaisyRecipes = pureDaisy; BotaniaAPI.runeAltarRecipes = runeAltar; - LexiconData.reload(); }); ctx.get().setPacketHandled(true); }