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 1283969e3..e9fa50c0f 100644 --- a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java @@ -10,7 +10,6 @@ */ package vazkii.botania.client.core.handler; -import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.block.Block; import net.minecraft.block.BlockState; @@ -33,7 +32,6 @@ import net.minecraft.util.text.TextFormatting; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.client.event.RenderGameOverlayEvent; import net.minecraftforge.client.event.RenderGameOverlayEvent.ElementType; -import net.minecraftforge.eventbus.api.EventPriority; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.items.CapabilityItemHandler; @@ -62,14 +60,12 @@ import vazkii.botania.common.core.handler.EquipmentHandler; import vazkii.botania.common.core.helper.PlayerHelper; import vazkii.botania.common.item.ItemCraftingHalo; import vazkii.botania.common.item.ItemSextant; -import vazkii.botania.common.item.ItemTwigWand; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.bauble.ItemDodgeRing; import vazkii.botania.common.item.equipment.bauble.ItemFlightTiara; import vazkii.botania.common.item.equipment.bauble.ItemMonocle; import vazkii.botania.common.lib.LibMisc; -import java.awt.*; import java.util.List; import java.util.Map; import java.util.Map.Entry; @@ -117,8 +113,6 @@ public final class HUDHandler { if(PlayerHelper.hasAnyHeldItem(mc.player)) { if(PlayerHelper.hasHeldItem(mc.player, ModItems.twigWand)) { - renderWandModeDisplay(PlayerHelper.getFirstHeldItem(mc.player, ModItems.twigWand)); - if(block instanceof IWandHUD) { profiler.startSection("wandItem"); ((IWandHUD) block).renderHUD(mc, mc.world, bpos); @@ -238,29 +232,6 @@ public final class HUDHandler { } } - private static void renderWandModeDisplay(ItemStack stack) { - Minecraft mc = Minecraft.getInstance(); - IProfiler profiler = mc.getProfiler(); - - profiler.startSection("wandMode"); - int ticks = mc.ingameGUI.remainingHighlightTicks; - ticks -= 15; - if(ticks > 0) { - int alpha = Math.min(255, (int) (ticks * 256.0F / 10.0F)); - int color = 0x00CC00 + (alpha << 24); - String disp = I18n.format(ItemTwigWand.getModeString(stack)); - - int x = mc.getWindow().getScaledWidth() / 2 - mc.fontRenderer.getStringWidth(disp) / 2; - int y = mc.getWindow().getScaledHeight() - 70; - - RenderSystem.enableBlend(); - RenderSystem.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - mc.fontRenderer.drawStringWithShadow(disp, x, y, color); - RenderSystem.disableBlend(); - } - profiler.endSection(); - } - private static void renderManaInvBar(boolean hasCreative, int totalMana, int totalMaxMana) { Minecraft mc = Minecraft.getInstance(); int width = 182; diff --git a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java index 17f033641..d511449cf 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java +++ b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java @@ -42,6 +42,7 @@ import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.math.Vec3d; import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.StringTextComponent; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; @@ -346,10 +347,12 @@ public class ItemTwigWand extends Item implements ICoordBoundItem { list.add(new TranslationTextComponent(getModeString(stack)).applyTextStyle(TextFormatting.GRAY)); } - @Nonnull @Override - public Rarity getRarity(ItemStack stack) { - return Rarity.RARE; + public String getHighlightTip(ItemStack stack, String displayName) { + ITextComponent mode = new StringTextComponent(" (") + .appendSibling(new TranslationTextComponent(getModeString(stack)).applyTextStyle(TextFormatting.DARK_GREEN)) + .appendText(")"); + return displayName + mode.getFormattedText(); } public static ItemStack forColors(int color1, int color2) { diff --git a/src/main/java/vazkii/botania/common/item/ModItems.java b/src/main/java/vazkii/botania/common/item/ModItems.java index 93a4545ff..05f250ebf 100644 --- a/src/main/java/vazkii/botania/common/item/ModItems.java +++ b/src/main/java/vazkii/botania/common/item/ModItems.java @@ -454,7 +454,7 @@ public final class ModItems { register(r, new ItemDye(color, defaultBuilder()), color.getName() + LibItemNames.DYE_SUFFIX); } register(r, new ItemSelfReturning(unstackable()), LibItemNames.PESTLE_AND_MORTAR); - register(r, new ItemTwigWand(unstackable()), LibItemNames.TWIG_WAND); + register(r, new ItemTwigWand(unstackable().rarity(Rarity.RARE)), LibItemNames.TWIG_WAND); register(r, new Item(defaultBuilder()), LibItemNames.MANASTEEL_INGOT); register(r, new Item(defaultBuilder()), LibItemNames.MANA_PEARL); register(r, new Item(defaultBuilder()), LibItemNames.MANA_DIAMOND); diff --git a/src/main/resources/META-INF/accesstransformer.cfg b/src/main/resources/META-INF/accesstransformer.cfg index 21e01b9e2..3e03ffa0b 100644 --- a/src/main/resources/META-INF/accesstransformer.cfg +++ b/src/main/resources/META-INF/accesstransformer.cfg @@ -33,8 +33,6 @@ public net.minecraft.world.spawner.AbstractSpawner field_98284_d # prevMobRotati public net.minecraft.world.spawner.AbstractSpawner field_98287_c # mobRotation public net.minecraft.world.spawner.AbstractSpawner field_98282_f # spawnData -public net.minecraft.client.gui.IngameGui field_92017_k # remainingHighlightTicks - public net.minecraft.client.gui.screen.ChatScreen field_146415_a # inputField public net.minecraft.advancements.CriteriaTriggers func_192118_a(Lnet/minecraft/advancements/ICriterionTrigger;)Lnet/minecraft/advancements/ICriterionTrigger; # register