From 7772f2e97f3f2b87861be1e10f04ab1c7e2295c3 Mon Sep 17 00:00:00 2001
From: Electroblob77 <35599699+Electroblob77@users.noreply.github.com>
Date: Tue, 9 Jun 2020 16:55:13 +0100
Subject: [PATCH] Add new spell indicator icon and tooltip to the wizard trade
GUI
---
.../electroblob/wizardry/CommonProxy.java | 12 +-
.../wizardry/client/ClientProxy.java | 8 ++
.../client/WizardryClientEventHandler.java | 42 ++-----
.../client/gui/WizardTradeTweaksHandler.java | 118 ++++++++++++++++++
.../wizardry/item/ItemSpellBook.java | 11 ++
.../wizardry/misc/WildcardTradeList.java | 13 +-
.../assets/ebwizardry/lang/en_gb.lang | 2 +-
.../assets/ebwizardry/lang/en_us.lang | 2 +-
.../gui/container/new_spell_indicator.png | Bin 0 -> 2344 bytes
9 files changed, 172 insertions(+), 36 deletions(-)
create mode 100644 src/main/java/electroblob/wizardry/client/gui/WizardTradeTweaksHandler.java
create mode 100644 src/main/resources/assets/ebwizardry/textures/gui/container/new_spell_indicator.png
diff --git a/src/main/java/electroblob/wizardry/CommonProxy.java b/src/main/java/electroblob/wizardry/CommonProxy.java
index ef778f9e..a3d959b0 100644
--- a/src/main/java/electroblob/wizardry/CommonProxy.java
+++ b/src/main/java/electroblob/wizardry/CommonProxy.java
@@ -284,13 +284,21 @@ public class CommonProxy {
public void loadShader(EntityPlayer player, ResourceLocation shader){}
/**
- * Gets the client side world using Minecraft.getMinecraft().world. Only to be called client side! Returns
- * null on the server side.
+ * Gets the client-side world using {@code Minecraft.getMinecraft().world}. Only to be called client side!
+ * Returns null on the server side.
*/
public World getTheWorld(){
return null;
}
+ /**
+ * Gets the client-side player using Minecraft.getMinecraft().player. Only to be called client side! Returns
+ * null on the server side.
+ */
+ public EntityPlayer getThePlayer(){
+ return null;
+ }
+
/**
* Returns true if the game is being viewed from the perspective of the given entity and is set to first-person
* view. Always returns false on the server side.
diff --git a/src/main/java/electroblob/wizardry/client/ClientProxy.java b/src/main/java/electroblob/wizardry/client/ClientProxy.java
index 62c9f26b..3aa9a980 100644
--- a/src/main/java/electroblob/wizardry/client/ClientProxy.java
+++ b/src/main/java/electroblob/wizardry/client/ClientProxy.java
@@ -190,6 +190,11 @@ public class ClientProxy extends CommonProxy {
return Minecraft.getMinecraft().world;
}
+ @Override
+ public EntityPlayer getThePlayer(){
+ return Minecraft.getMinecraft().player;
+ }
+
@Override
public boolean isFirstPerson(Entity entity){
return entity == Minecraft.getMinecraft().getRenderViewEntity() && Minecraft.getMinecraft().gameSettings.thirdPersonView == 0;
@@ -261,6 +266,9 @@ public class ClientProxy extends CommonProxy {
if(player == null) return false;
// Displayed recipe
+ // Weirdly, the gui is actually the only way of accessing the current IMerchant or their recipes, other than a
+ // brute-force search through all the entities in the world to find the merchant interacting with the player
+ // Since we only need this client-side anyway, we might as well go via the gui
if(Minecraft.getMinecraft().currentScreen instanceof GuiMerchant){
// It doesn't actually matter if the recipe is selected or not, since the itemstack will only ever
// match one of them anyway - and we'd have to reflect into GuiMerchant to get the selected recipe
diff --git a/src/main/java/electroblob/wizardry/client/WizardryClientEventHandler.java b/src/main/java/electroblob/wizardry/client/WizardryClientEventHandler.java
index c85a8c22..5167635b 100644
--- a/src/main/java/electroblob/wizardry/client/WizardryClientEventHandler.java
+++ b/src/main/java/electroblob/wizardry/client/WizardryClientEventHandler.java
@@ -3,38 +3,46 @@ package electroblob.wizardry.client;
import electroblob.wizardry.client.renderer.overlay.RenderBlinkEffect;
import electroblob.wizardry.data.DispenserCastingData;
import electroblob.wizardry.data.SpellEmitterData;
+import electroblob.wizardry.data.WizardData;
import electroblob.wizardry.item.ItemArtefact;
import electroblob.wizardry.item.ItemSpectralBow;
+import electroblob.wizardry.item.ItemSpellBook;
import electroblob.wizardry.item.ItemWand;
import electroblob.wizardry.potion.PotionSlowTime;
import electroblob.wizardry.registry.WizardryItems;
import electroblob.wizardry.registry.WizardryPotions;
-import electroblob.wizardry.spell.Possession;
-import electroblob.wizardry.spell.SixthSense;
-import electroblob.wizardry.spell.SlowTime;
-import electroblob.wizardry.spell.Transience;
+import electroblob.wizardry.spell.*;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiMerchant;
import net.minecraft.client.gui.ScaledResolution;
import net.minecraft.client.renderer.BufferBuilder;
import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.RenderHelper;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
import net.minecraft.entity.EntityLiving;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.inventory.ContainerMerchant;
import net.minecraft.inventory.Slot;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.tileentity.TileEntityDispenser;
import net.minecraft.util.ResourceLocation;
import net.minecraft.village.MerchantRecipe;
+import net.minecraft.village.MerchantRecipeList;
import net.minecraft.world.World;
import net.minecraftforge.client.event.*;
+import net.minecraftforge.client.event.GuiScreenEvent.ActionPerformedEvent;
+import net.minecraftforge.fml.client.config.GuiUtils;
import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.fml.common.eventhandler.EventPriority;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.common.gameevent.TickEvent;
import net.minecraftforge.fml.relauncher.Side;
import org.lwjgl.opengl.GL11;
import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
/**
@@ -180,32 +188,6 @@ public final class WizardryClientEventHandler {
}
}
- // Brute-force fix for crystals not showing up when a wizard is given a spell book in the trade GUI.
- @SubscribeEvent
- public static void onGuiDrawForegroundEvent(GuiContainerEvent.DrawForeground event){
-
- if(event.getGuiContainer() instanceof GuiMerchant){
-
- GuiMerchant gui = (GuiMerchant)event.getGuiContainer();
- // Note that gui.getMerchant() returns an NpcMerchant, not an EntityWizard.
-
- // Using == the specific item rather than instanceof because that's how trades do it.
- if(gui.inventorySlots.getSlot(0).getStack().getItem() == WizardryItems.spell_book
- || gui.inventorySlots.getSlot(1).getStack().getItem() == WizardryItems.spell_book){
-
- for(MerchantRecipe trade : gui.getMerchant().getRecipes(Minecraft.getMinecraft().player)){
- if(trade.getItemToBuy().getItem() == WizardryItems.spell_book && trade.getSecondItemToBuy().isEmpty()){
- Slot slot = gui.inventorySlots.getSlot(2);
- // It still doesn't look quite right because the slot highlight is behind the item, but it'll do
- // until/unless I find a better solution.
- DrawingUtils.drawItemAndTooltip(gui, trade.getItemToSell(), slot.xPos, slot.yPos, event.getMouseX(), event.getMouseY(),
- gui.getSlotUnderMouse() == slot);
- }
- }
- }
- }
- }
-
/**
* Renders an overlay across the entire screen.
* @param resolution The screen resolution
diff --git a/src/main/java/electroblob/wizardry/client/gui/WizardTradeTweaksHandler.java b/src/main/java/electroblob/wizardry/client/gui/WizardTradeTweaksHandler.java
new file mode 100644
index 00000000..dbf2fec3
--- /dev/null
+++ b/src/main/java/electroblob/wizardry/client/gui/WizardTradeTweaksHandler.java
@@ -0,0 +1,118 @@
+package electroblob.wizardry.client.gui;
+
+import electroblob.wizardry.Wizardry;
+import electroblob.wizardry.client.DrawingUtils;
+import electroblob.wizardry.data.WizardData;
+import electroblob.wizardry.item.ItemSpellBook;
+import electroblob.wizardry.registry.WizardryItems;
+import electroblob.wizardry.spell.Spell;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiMerchant;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.RenderHelper;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.inventory.ContainerMerchant;
+import net.minecraft.inventory.Slot;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.village.MerchantRecipe;
+import net.minecraft.village.MerchantRecipeList;
+import net.minecraftforge.client.event.GuiContainerEvent;
+import net.minecraftforge.client.event.GuiOpenEvent;
+import net.minecraftforge.client.event.GuiScreenEvent.ActionPerformedEvent;
+import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
+import net.minecraftforge.fml.common.eventhandler.EventPriority;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+
+@EventBusSubscriber
+public class WizardTradeTweaksHandler {
+
+ private static final ResourceLocation NEW_SPELL_ICON = new ResourceLocation(Wizardry.MODID, "textures/gui/container/new_spell_indicator.png");
+
+ private static int tradeIndex; // Mirrors GuiMerchant#selectedMerchantRecipe (don't want to reflect into it every frame)
+
+ @SubscribeEvent(priority = EventPriority.LOWEST)
+ public static void onGuiOpenEvent(GuiOpenEvent event){
+ if(event.getGui() instanceof GuiMerchant) tradeIndex = 0;
+ }
+
+ @SubscribeEvent
+ public static void onActionPerformedPostEvent(ActionPerformedEvent.Post event){
+
+ if(event.getGui() instanceof GuiMerchant){
+
+ MerchantRecipeList recipes = ((GuiMerchant)event.getGui()).getMerchant().getRecipes(Minecraft.getMinecraft().player);
+
+ if(recipes == null) return;
+
+ if(event.getButton().id == 1){ // Next
+ tradeIndex = Math.min(tradeIndex + 1, recipes.size());
+ }else if(event.getButton().id == 2){ // Previous
+ tradeIndex = Math.max(tradeIndex - 1, 0);
+ }
+ }
+ }
+
+ // Brute-force fix for crystals not showing up when a wizard is given a spell book in the trade GUI.
+ @SubscribeEvent
+ public static void onGuiDrawForegroundEvent(GuiContainerEvent.DrawForeground event){
+
+ if(event.getGuiContainer() instanceof GuiMerchant){
+
+ GuiMerchant gui = (GuiMerchant)event.getGuiContainer();
+ // Note that gui.getMerchant() returns an NpcMerchant, not an EntityWizard.
+ MerchantRecipeList trades = gui.getMerchant().getRecipes(Minecraft.getMinecraft().player);
+
+ if(trades == null) return;
+
+ // Using == the specific item rather than instanceof because that's how trades do it.
+ if(gui.inventorySlots.getSlot(0).getStack().getItem() == WizardryItems.spell_book
+ || gui.inventorySlots.getSlot(1).getStack().getItem() == WizardryItems.spell_book){
+
+ for(MerchantRecipe trade : trades){
+ if(trade.getItemToBuy().getItem() == WizardryItems.spell_book && trade.getSecondItemToBuy().isEmpty()){
+ Slot slot = gui.inventorySlots.getSlot(2);
+ // It still doesn't look quite right because the slot highlight is behind the item, but it'll do
+ // until/unless I find a better solution.
+ DrawingUtils.drawItemAndTooltip(gui, trade.getItemToSell(), slot.xPos, slot.yPos, event.getMouseX(), event.getMouseY(),
+ gui.getSlotUnderMouse() == slot);
+ }
+ }
+ }
+
+ // New spell indicator
+ if(gui.inventorySlots instanceof ContainerMerchant){
+
+ // Can't use getCurrentRecipe because that only gets updated when the correct items are given
+ MerchantRecipe recipe = trades.get(tradeIndex);
+
+ if(recipe != null && recipe.getItemToSell().getItem() instanceof ItemSpellBook){
+
+ EntityPlayer player = Minecraft.getMinecraft().player;
+
+ if(!WizardData.get(player).hasSpellBeenDiscovered(Spell.byMetadata(recipe.getItemToSell().getMetadata()))){
+
+ int x = gui.inventorySlots.getSlot(2).xPos + 14;
+ int y = gui.inventorySlots.getSlot(2).yPos - 17;
+ int w = 8;
+ int h = 8;
+
+ RenderHelper.enableGUIStandardItemLighting();
+ GlStateManager.color(1, 1, 1);
+ Minecraft.getMinecraft().renderEngine.bindTexture(NEW_SPELL_ICON);
+ DrawingUtils.drawTexturedRect(x, y, 0, Math.max(player.ticksExisted/2 % 40 - 36, 0) * 8, w, h, 8, 32);
+ RenderHelper.disableStandardItemLighting();
+
+// int mouseX = event.getMouseX() - gui.getGuiLeft();
+// int mouseY = event.getMouseY() - gui.getGuiTop();
+//
+// if(mouseX >= x + 1 && mouseX < x + w + 1 && mouseY >= y - 1 && mouseY < y + h + 1){
+// GuiUtils.drawHoveringText(Collections.singletonList("You haven't discovered this spell yet"), mouseX,
+// mouseY, gui.width, gui.height, 150, Minecraft.getMinecraft().fontRenderer);
+// }
+ }
+ }
+ }
+ }
+ }
+
+}
diff --git a/src/main/java/electroblob/wizardry/item/ItemSpellBook.java b/src/main/java/electroblob/wizardry/item/ItemSpellBook.java
index 7cb48615..2a2435ab 100644
--- a/src/main/java/electroblob/wizardry/item/ItemSpellBook.java
+++ b/src/main/java/electroblob/wizardry/item/ItemSpellBook.java
@@ -5,6 +5,7 @@ import electroblob.wizardry.Wizardry;
import electroblob.wizardry.WizardryGuiHandler;
import electroblob.wizardry.constants.Tier;
import electroblob.wizardry.data.SpellGlyphData;
+import electroblob.wizardry.data.WizardData;
import electroblob.wizardry.registry.WizardryTabs;
import electroblob.wizardry.spell.Spell;
import net.minecraft.creativetab.CreativeTabs;
@@ -12,6 +13,8 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.*;
+import net.minecraft.util.text.Style;
+import net.minecraft.util.text.TextFormatting;
import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
@@ -80,6 +83,14 @@ public class ItemSpellBook extends Item {
tooltip.add(spell.getTier().getDisplayNameWithFormatting());
+ EntityPlayer player = Wizardry.proxy.getThePlayer();
+
+ // If the spell should *appear* discovered but isn't *actually* discovered, show a 'new spell' message
+ // A bit annoying to check this again but it's the easiest way
+ if(discovered && WizardData.get(player) != null && !WizardData.get(player).hasSpellBeenDiscovered(spell)){
+ tooltip.add(Wizardry.proxy.translate("item." + this.getRegistryName() + ".new", new Style().setColor(TextFormatting.LIGHT_PURPLE)));
+ }
+
// Advanced tooltips display more information, mainly for searching purposes in creative
if(discovered && advanced.isAdvanced()){ // No cheating!
tooltip.add(spell.getElement().getDisplayName());
diff --git a/src/main/java/electroblob/wizardry/misc/WildcardTradeList.java b/src/main/java/electroblob/wizardry/misc/WildcardTradeList.java
index 991a99fd..46d24d07 100644
--- a/src/main/java/electroblob/wizardry/misc/WildcardTradeList.java
+++ b/src/main/java/electroblob/wizardry/misc/WildcardTradeList.java
@@ -16,6 +16,8 @@ import net.minecraftforge.oredict.OreDictionary;
@SuppressWarnings("serial")
public class WildcardTradeList extends MerchantRecipeList {
+ private int currentIndex;
+
public WildcardTradeList(){
super();
}
@@ -24,19 +26,26 @@ public class WildcardTradeList extends MerchantRecipeList {
super(tag);
}
+ /** Returns the current recipe */
+ public MerchantRecipe getCurrentRecipe(){
+ return get(currentIndex); // Allows events to access the selected recipe without reflection
+ }
+
@Override
public MerchantRecipe canRecipeBeUsed(ItemStack offer1, ItemStack offer2, int index){
+
+ currentIndex = index; // Update the index
if(index > 0 && index < this.size()){
- MerchantRecipe merchantrecipe1 = (MerchantRecipe)this.get(index);
+ MerchantRecipe merchantrecipe1 = this.get(index);
return !this.areItemStacksExactlyEqual(offer1, merchantrecipe1.getItemToBuy()) || (!offer2.isEmpty() || merchantrecipe1.hasSecondItemToBuy()) && (!merchantrecipe1.hasSecondItemToBuy() || !this.areItemStacksExactlyEqual(offer2, merchantrecipe1.getSecondItemToBuy())) || offer1.getCount() < merchantrecipe1.getItemToBuy().getCount() || merchantrecipe1.hasSecondItemToBuy() && offer2.getCount() < merchantrecipe1.getSecondItemToBuy().getCount() ? null : merchantrecipe1;
}else{
for(int i = 0; i < this.size(); ++i){
- MerchantRecipe merchantrecipe = (MerchantRecipe)this.get(i);
+ MerchantRecipe merchantrecipe = this.get(i);
if (this.areItemStacksExactlyEqual(offer1, merchantrecipe.getItemToBuy()) && offer1.getCount() >= merchantrecipe.getItemToBuy().getCount() && (!merchantrecipe.hasSecondItemToBuy() && offer2.isEmpty() || merchantrecipe.hasSecondItemToBuy() && this.areItemStacksExactlyEqual(offer2, merchantrecipe.getSecondItemToBuy()) && offer2.getCount() >= merchantrecipe.getSecondItemToBuy().getCount())){
return merchantrecipe;
diff --git a/src/main/resources/assets/ebwizardry/lang/en_gb.lang b/src/main/resources/assets/ebwizardry/lang/en_gb.lang
index ddb92cc7..85558c2a 100644
--- a/src/main/resources/assets/ebwizardry/lang/en_gb.lang
+++ b/src/main/resources/assets/ebwizardry/lang/en_gb.lang
@@ -69,7 +69,7 @@ item.ebwizardry\:crystal_healing.desc=A crystal that glints a golden yellow in t
item.ebwizardry\:spell_book.name=Spell Book
item.ebwizardry\:spell_book.desc=A book filled with the runes and glyphs of an ancient script. Perhaps with dedication, one might be able to decipher its contents...\n\nRight-click while holding this book to read it.
-
+item.ebwizardry\:spell_book.new=Not yet discovered!
item.ebwizardry\:spell_book.apply_to_wizard=Replaced %1$s's spell %2$s with %3$s
item.ebwizardry\:arcane_tome.name=Tome of Arcana
diff --git a/src/main/resources/assets/ebwizardry/lang/en_us.lang b/src/main/resources/assets/ebwizardry/lang/en_us.lang
index 6b582389..080042b8 100644
--- a/src/main/resources/assets/ebwizardry/lang/en_us.lang
+++ b/src/main/resources/assets/ebwizardry/lang/en_us.lang
@@ -69,7 +69,7 @@ item.ebwizardry\:crystal_healing.desc=A crystal that glints a golden yellow in t
item.ebwizardry\:spell_book.name=Spell Book
item.ebwizardry\:spell_book.desc=A book filled with the runes and glyphs of an ancient script. Perhaps with dedication, one might be able to decipher its contents...\n\nRight-click while holding this book to read it.
-
+item.ebwizardry\:spell_book.new=Not yet discovered!
item.ebwizardry\:spell_book.apply_to_wizard=Replaced %1$s's spell %2$s with %3$s
item.ebwizardry\:arcane_tome.name=Tome of Arcana
diff --git a/src/main/resources/assets/ebwizardry/textures/gui/container/new_spell_indicator.png b/src/main/resources/assets/ebwizardry/textures/gui/container/new_spell_indicator.png
new file mode 100644
index 0000000000000000000000000000000000000000..62381a814706c8d68e6b823df72ee862d1a12cbe
GIT binary patch
literal 2344
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
XW(O>2%$dxgTe~DWM4f4|rZy
literal 0
HcmV?d00001