Remove all remaining deps on patchouli internals

This commit is contained in:
Vincent Lee committed 2020-04-29 16:32:43 -05:00
1 parent e503591a8b
commit 17f993668f
7 files changed
+18 -25

No files matched your search

@@ -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) {
@@ -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();
}
}
}
@@ -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() {}
}
@@ -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) {
@@ -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);
}
}
}