fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert DamageableRecipe changes (#3246)

Browse Source 
Forge fixed this after all. This is no longer needed.
This commit is contained in:
fscan
2017-11-26 15:44:56 +01:00
committed by yueh
parent fac4a8f9dc
commit 3063bd887c
3 changed files with 2 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/recipes/factories/recipes/DamagedRecipeFactory.java
-105
View File
@@ -1,105 +0,0 @@
/*
* This file is part of Applied Energistics 2.
* Copyright (c) 2013 - 2017, AlgorithmX2, All rights reserved.
*
* Applied Energistics 2 is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Applied Energistics 2 is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Applied Energistics 2. If not, see <http://www.gnu.org/licenses/lgpl>.
*/
package appeng.recipes.factories.recipes;
import java.util.Iterator;
import javax.annotation.Nonnull;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonParseException;
import net.minecraft.inventory.InventoryCrafting;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.IRecipe;
import net.minecraft.item.crafting.Ingredient;
import net.minecraft.util.JsonUtils;
import net.minecraft.util.NonNullList;
import net.minecraft.util.ResourceLocation;
import net.minecraft.world.World;
import net.minecraftforge.common.crafting.CraftingHelper;
import net.minecraftforge.common.crafting.IRecipeFactory;
import net.minecraftforge.common.crafting.JsonContext;
import net.minecraftforge.oredict.ShapelessOreRecipe;
public class DamagedRecipeFactory implements IRecipeFactory
{
@Override
public IRecipe parse( JsonContext context, JsonObject json )
{
String group = JsonUtils.getString( json, "group", "" );
NonNullList<Ingredient> ings = NonNullList.create();
for( JsonElement ele : JsonUtils.getJsonArray( json, "ingredients" ) )
{
ings.add( CraftingHelper.getIngredient( ele, context ) );
}
if( ings.isEmpty() )
{
throw new JsonParseException( "No ingredients for shapeless recipe" );
}
return new DamagedRecipe( group.isEmpty() ? null : new ResourceLocation( group ), ings, PartRecipeFactory.getResult( json, context ) );
}
private static class DamagedRecipe extends ShapelessOreRecipe
{
public DamagedRecipe( ResourceLocation group, NonNullList<Ingredient> input, ItemStack result )
{
super( group, input, result );
}
@Override
public boolean matches( @Nonnull InventoryCrafting inv, @Nonnull World world )
{
NonNullList<Ingredient> required = NonNullList.create();
required.addAll( input );
for( int i = 0; i < inv.getSizeInventory(); ++i )
{
final ItemStack current = inv.getStackInSlot( i );
if( !current.isEmpty() )
{
boolean inRecipe = false;
final Iterator<Ingredient> req = required.iterator();
while( req.hasNext() )
{
if( req.next().apply( current ) )
{
inRecipe = true;
req.remove();
break;
}
}
if( !inRecipe )
{
return false;
}
}
}
return required.isEmpty();
}
}
}