From 17f993668f75bdb3d1d8591e81ce7ebfb5eb3247 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 29 Apr 2020 16:32:27 -0500 Subject: [PATCH] Remove all remaining deps on patchouli internals --- build.gradle | 3 ++- .../client/core/handler/RenderLexicon.java | 2 +- .../botania/client/core/proxy/ClientProxy.java | 15 +++++++-------- .../vazkii/botania/common/core/proxy/IProxy.java | 3 ++- .../vazkii/botania/common/item/ItemLexicon.java | 15 +++------------ .../vazkii/botania/common/item/ItemSextant.java | 3 ++- src/main/resources/META-INF/mods.toml | 2 +- 7 files changed, 18 insertions(+), 25 deletions(-) diff --git a/build.gradle b/build.gradle index 96b30f9b4..37c6af634 100644 --- a/build.gradle +++ b/build.gradle @@ -103,7 +103,8 @@ test { dependencies { minecraft "net.minecraftforge:forge:${mc_version}-31.1.24" - compile fg.deobf("vazkii.patchouli:Patchouli:1.15.2-1.2-30.156") { transitive = false } + compileOnly fg.deobf("vazkii.patchouli:Patchouli:1.15.2-1.2-32.168:api") + runtimeOnly fg.deobf("vazkii.patchouli:Patchouli:1.15.2-1.2-32.168") compileOnly fg.deobf("mezz.jei:jei-1.15.2:6.0.0.2:api") runtimeOnly fg.deobf("mezz.jei:jei-1.15.2:6.0.0.2") 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 072e4cb31..0c26421e8 100644 --- a/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java +++ b/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java @@ -162,7 +162,7 @@ public class RenderLexicon { ms.translate(0F, 10F, 0F); ms.scale(0.6F, 0.6F, 0.6F); - String edition = TextFormatting.ITALIC + "" + TextFormatting.BOLD + ItemLexicon.getEdition(); + String edition = ItemLexicon.getEdition().applyTextStyles(TextFormatting.ITALIC, TextFormatting.BOLD).getFormattedText(); font.draw(edition, 0, 0, 0xA07100, false, ms.peek().getModel(), buffers, false, 0, light); if (quote == -1) { diff --git a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java index 0103eb588..0c4fbc226 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -29,6 +29,7 @@ import net.minecraft.particles.IParticleData; import net.minecraft.util.Rotation; import net.minecraft.util.math.BlockPos; import net.minecraft.util.registry.Registry; +import net.minecraft.util.text.ITextComponent; import net.minecraft.world.World; import net.minecraftforge.client.settings.KeyConflictContext; import net.minecraftforge.fml.DeferredWorkQueue; @@ -64,7 +65,7 @@ import vazkii.botania.common.item.ItemSextant; import vazkii.botania.common.item.equipment.bauble.ItemMonocle; import vazkii.botania.common.lib.LibMisc; import vazkii.patchouli.api.IMultiblock; -import vazkii.patchouli.client.handler.MultiblockVisualizationHandler; +import vazkii.patchouli.api.PatchouliAPI; import java.io.File; import java.io.IOException; @@ -229,17 +230,15 @@ public class ClientProxy implements IProxy { } @Override - public void showMultiblock(IMultiblock mb, String name, BlockPos anchor, Rotation rot) { - MultiblockVisualizationHandler.setMultiblock(mb, name, null, false); - MultiblockVisualizationHandler.anchorTo(anchor, Rotation.NONE); + public void showMultiblock(IMultiblock mb, ITextComponent name, BlockPos anchor, Rotation rot) { + PatchouliAPI.instance.showMultiblock(mb, name, anchor, rot); } @Override public void clearSextantMultiblock() { - if (MultiblockVisualizationHandler.hasMultiblock - && MultiblockVisualizationHandler.getMultiblock() != null - && MultiblockVisualizationHandler.getMultiblock().getID().equals(ItemSextant.MULTIBLOCK_ID)) { - MultiblockVisualizationHandler.setMultiblock(null, null, null, true); + IMultiblock mb = PatchouliAPI.instance.getCurrentMultiblock(); + if (mb != null && mb.getID().equals(ItemSextant.MULTIBLOCK_ID)) { + PatchouliAPI.instance.clearMultiblock(); } } } 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 25bc4c1d9..640036adc 100644 --- a/src/main/java/vazkii/botania/common/core/proxy/IProxy.java +++ b/src/main/java/vazkii/botania/common/core/proxy/IProxy.java @@ -13,6 +13,7 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.particles.IParticleData; import net.minecraft.util.Rotation; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.ITextComponent; import net.minecraft.world.World; import vazkii.botania.common.core.helper.Vector3; @@ -45,7 +46,7 @@ public interface IProxy { // Side-safe version of world.addParticle with noDistanceLimit flag set to true default void addParticleForce(World world, IParticleData particleData, double x, double y, double z, double xSpeed, double ySpeed, double zSpeed) {} - default void showMultiblock(IMultiblock mb, String name, BlockPos anchor, Rotation rot) {} + default void showMultiblock(IMultiblock mb, ITextComponent name, BlockPos anchor, Rotation rot) {} default void clearSextantMultiblock() {} } diff --git a/src/main/java/vazkii/botania/common/item/ItemLexicon.java b/src/main/java/vazkii/botania/common/item/ItemLexicon.java index 332beac99..2f09b39ef 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLexicon.java +++ b/src/main/java/vazkii/botania/common/item/ItemLexicon.java @@ -33,8 +33,6 @@ import vazkii.botania.common.advancements.UseItemSuccessTrigger; import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.lib.LibMisc; import vazkii.patchouli.api.PatchouliAPI; -import vazkii.patchouli.common.book.Book; -import vazkii.patchouli.common.book.BookRegistry; import javax.annotation.Nonnull; @@ -49,10 +47,6 @@ public class ItemLexicon extends Item implements IElvenItem { addPropertyOverride(new ResourceLocation(LibMisc.MOD_ID, "elven"), (stack, world, living) -> isElvenItem(stack) ? 1 : 0); } - public static Book getBook() { - return BookRegistry.INSTANCE.books.get(ModItems.lexicon.getRegistryName()); - } - public static boolean isOpen() { return ModItems.lexicon.getRegistryName().equals(PatchouliAPI.instance.getOpenBookGui()); } @@ -73,10 +67,7 @@ public class ItemLexicon extends Item implements IElvenItem { super.addInformation(stack, worldIn, tooltip, flagIn); if (Screen.hasShiftDown()) { - Book book = getBook(); - if (book.contents != null) { - tooltip.add(new StringTextComponent(book.contents.getSubtitle()).applyTextStyle(TextFormatting.GRAY)); - } + tooltip.add(getEdition().applyTextStyle(TextFormatting.GRAY)); } else { tooltip.add(new TranslationTextComponent("botaniamisc.shiftinfo")); } @@ -97,8 +88,8 @@ public class ItemLexicon extends Item implements IElvenItem { return new ActionResult<>(ActionResultType.SUCCESS, stack); } - public static String getEdition() { - return getBook().contents.getSubtitle(); + public static ITextComponent getEdition() { + return PatchouliAPI.instance.getSubtitle(ModItems.lexicon.getRegistryName()); } public static ITextComponent getTitle(ItemStack stack) { diff --git a/src/main/java/vazkii/botania/common/item/ItemSextant.java b/src/main/java/vazkii/botania/common/item/ItemSextant.java index 0263ec820..d2b1bd41d 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSextant.java +++ b/src/main/java/vazkii/botania/common/item/ItemSextant.java @@ -27,6 +27,7 @@ import net.minecraft.util.Rotation; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.text.StringTextComponent; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; @@ -126,7 +127,7 @@ public class ItemSextant extends Item { } } IMultiblock sparse = PatchouliAPI.instance.makeSparseMultiblock(map).setId(MULTIBLOCK_ID); - Botania.proxy.showMultiblock(sparse, "r = " + (int) radius, new BlockPos(x, y, z), Rotation.NONE); + Botania.proxy.showMultiblock(sparse, new StringTextComponent("r = " + (int) radius), new BlockPos(x, y, z), Rotation.NONE); } } } diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index cf037d213..fd3d70b24 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -23,7 +23,7 @@ Botania is a mod that adds nature magic to Minecraft''' [[dependencies.botania]] modId="patchouli" mandatory=true - versionRange="[1.15.2-1.2-30,)" + versionRange="[1.15.2-1.2-32,)" side="BOTH" [[dependencies.botania]]