fujin/Wizardry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add new spell indicator icon and tooltip to the wizard trade GUI

Browse Source
This commit is contained in:
Electroblob77
2020-06-09 16:55:13 +01:00
parent 99a9524ee7
commit 7772f2e97f
9 changed files with 172 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/electroblob/wizardry/misc/WildcardTradeList.java
+11 -2
View File
@@ -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;