From 7cdc5c9ce0fc8e8c4d0e372381eff45b4e8d4844 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 1 Jul 2019 00:31:06 -0700 Subject: [PATCH] Almost there --- build.gradle | 4 +- .../api/internal/IGuiLexiconEntry.java | 3 +- .../api/internal/VanillaPacketDispatcher.java | 13 ++- .../client/core/helper/ShaderHelper.java | 50 +++++--- .../vazkii/botania/client/fx/FXSparkle.java | 107 +++++++----------- .../java/vazkii/botania/client/fx/FXWisp.java | 3 +- .../client/gui/lexicon/GuiLexicon.java | 30 +++-- .../client/gui/lexicon/GuiLexiconEntry.java | 7 +- .../gui/lexicon/button/GuiButtonBookmark.java | 16 +-- .../gui/lexicon/button/GuiButtonCategory.java | 2 +- .../lexicon/button/GuiButtonInvisible.java | 9 +- .../common/block/BlockSpecialFlower.java | 3 +- .../block/dispenser/BehaviourCocoaBeans.java | 7 +- .../common/core/handler/EquipmentHandler.java | 1 - .../common/core/helper/PlayerHelper.java | 32 ++++++ .../common/crafting/ModCraftingRecipes.java | 3 +- .../integration/curios/CurioIntegration.java | 11 +- .../common/item/ItemBlackHoleTalisman.java | 5 +- .../botania/common/item/ItemOpenBucket.java | 38 ++++--- .../botania/common/item/ItemSpawnerMover.java | 5 +- .../item/equipment/bauble/ItemMagnetRing.java | 1 - .../item/equipment/tool/ItemGlassPick.java | 4 +- .../tool/manasteel/ItemManasteelAxe.java | 10 +- .../tool/manasteel/ItemManasteelPick.java | 10 +- .../botania/common/item/rod/ItemDirtRod.java | 8 +- .../common/item/rod/ItemSkyDirtRod.java | 7 +- .../common/world/WorldTypeSkyblock.java | 2 +- .../resources/META-INF/accesstransformer.cfg | 8 +- 28 files changed, 215 insertions(+), 184 deletions(-) diff --git a/build.gradle b/build.gradle index 9c5663d37..fa8dd5372 100644 --- a/build.gradle +++ b/build.gradle @@ -94,8 +94,8 @@ dependencies { //compileOnly fg.deobf("mezz.jei:jei-1.13.2:5.0.0.20:api") // runtimeOnly fg.deobf("mezz.jei:jei-1.13.2:5.0.0.20") - //compileOnly fg.deobf("top.theillusivec4.curios:curios:1.13.2-0.11:api") - //runtimeOnly fg.deobf("top.theillusivec4.curios:curios:1.13.2-0.11") + compileOnly fg.deobf("top.theillusivec4.curios:curios:FORGE-1.14.3-0.14:api") + runtimeOnly fg.deobf("top.theillusivec4.curios:curios:FORGE-1.14.3-0.14") //deobfCompile "thaumcraft:Thaumcraft:1.12.2:6.1.BETA26" //and a bit more for SCP diff --git a/src/main/java/vazkii/botania/api/internal/IGuiLexiconEntry.java b/src/main/java/vazkii/botania/api/internal/IGuiLexiconEntry.java index 27eaefc4e..c62eb5ae4 100644 --- a/src/main/java/vazkii/botania/api/internal/IGuiLexiconEntry.java +++ b/src/main/java/vazkii/botania/api/internal/IGuiLexiconEntry.java @@ -10,6 +10,7 @@ */ 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; @@ -61,7 +62,7 @@ public interface IGuiLexiconEntry { /** * Gets the list of buttons in this gui. */ - public List