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

Commented code is dead code!

Browse Source
This commit is contained in:
Electroblob77
2019-09-04 11:48:19 +01:00
parent 3a788c867c
commit eef48f319a
2 changed files with 1 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/electroblob/wizardry/misc/RecipeRechargeWithFlask.java
+1 -21
View File
@@ -50,7 +50,7 @@ public class RecipeRechargeWithFlask extends ShapelessOreRecipe {
@Override @Override
public ItemStack getCraftingResult(InventoryCrafting inv){ public ItemStack getCraftingResult(InventoryCrafting inv){
ItemStack result = super.getCraftingResult(inv);//lookupForIngredients(inv, true); ItemStack result = super.getCraftingResult(inv);
rechargeItem(result, inv); rechargeItem(result, inv);
return result; return result;
} }
@@ -60,7 +60,6 @@ public class RecipeRechargeWithFlask extends ShapelessOreRecipe {
ItemStack stack = findItemToCharge(inv); ItemStack stack = findItemToCharge(inv);
if(!stack.isEmpty() && chargeable.isManaFull(stack)) return false; if(!stack.isEmpty() && chargeable.isManaFull(stack)) return false;
return super.matches(inv, world); return super.matches(inv, world);
//return !lookupForIngredients(inv, false).isEmpty();
} }
private void rechargeItem(ItemStack toCharge, InventoryCrafting inv){ private void rechargeItem(ItemStack toCharge, InventoryCrafting inv){
@@ -81,25 +80,6 @@ public class RecipeRechargeWithFlask extends ShapelessOreRecipe {
return ItemStack.EMPTY; return ItemStack.EMPTY;
} }
// /** lookup for the needed ingredients && return the rechargeable itemstack */
// private ItemStack lookupForIngredients(InventoryCrafting inv, boolean copy){
// ItemStack flask = ItemStack.EMPTY;
// ItemStack rechargeable = ItemStack.EMPTY;
// for(int i = 0; (flask.isEmpty() || rechargeable.isEmpty()) && i < inv.getSizeInventory(); i++){
// ItemStack itemstack = inv.getStackInSlot(i);
// if(!itemstack.isEmpty()){
// if(flask.isEmpty() && itemstack.getItem() == WizardryItems.mana_flask){
// flask = itemstack;
// }else if(rechargeable.isEmpty() && (itemstack.getItem() instanceof ItemWand || itemstack.getItem() instanceof ItemWizardArmour) && itemstack.getItemDamage() > 0){
// rechargeable = copy ? itemstack.copy() : itemstack;
// }else{
// return ItemStack.EMPTY;
// }
// }
// }
// return flask.isEmpty() || rechargeable.isEmpty() ? ItemStack.EMPTY : rechargeable;
// }
@Override @Override
public boolean isDynamic(){ public boolean isDynamic(){
return true; // Stops it appearing in the recipe book return true; // Stops it appearing in the recipe book
src/main/java/electroblob/wizardry/registry/WizardryRecipes.java
-55
View File
@@ -67,59 +67,4 @@ public final class WizardryRecipes {
} }
} }
// @SubscribeEvent
// public static void onPlayerTickEvent(TickEvent.PlayerTickEvent event){
//
// if(event.phase == TickEvent.Phase.START){
//
// if(event.player.openContainer instanceof ContainerWorkbench){
//
// IInventory craftMatrix = ((ContainerWorkbench)event.player.openContainer).craftMatrix;
// ItemStack output = ((ContainerWorkbench)event.player.openContainer).craftResult.getStackInSlot(0);
// processManaFlaskCrafting(craftMatrix, output);
//
// }else if(event.player.openContainer instanceof ContainerPlayer){
//
// IInventory craftMatrix = ((ContainerPlayer)event.player.openContainer).craftMatrix;
// ItemStack output = ((ContainerPlayer)event.player.openContainer).craftResult.getStackInSlot(0);
// // Unfortunately I have no choice but to call this method every tick when the player isn't using another
// // inventory, since the only thing tracking whether the player is looking at their inventory is the GUI
// // itself, which is client-side only.
// processManaFlaskCrafting(craftMatrix, output);
// }
// }
// }
//
// private static void processManaFlaskCrafting(IInventory craftMatrix, ItemStack output){
//
// // Charges wand using mana flask
//
// ItemManaFlask flask = null;
// ItemStack input = ItemStack.EMPTY;
//
// for(int i = 0; i < craftMatrix.getSizeInventory(); i++){
//
// ItemStack stack = craftMatrix.getStackInSlot(i);
//
// if(stack.getItem() instanceof ItemManaFlask){
// flask = (ItemManaFlask)stack.getItem();
// }
//
// if(stack.getItem() instanceof IManaStoringItem){
// input = stack;
// }
// }
//
// if(flask == null) return;
//
// if(output.getItem() instanceof IManaStoringItem && !input.isEmpty()){
//
// output.setTagCompound((input.getTagCompound()));
//
// int currentMana = ((IManaStoringItem)input.getItem()).getMana(input);
//
// ((IManaStoringItem)output.getItem()).setMana(output, Math.min(currentMana + flask.size.capacity,
// ((IManaStoringItem)input.getItem()).getManaCapacity(input)));
// }
// }
} }