Port to 1.11

This commit is contained in:
yueh
2016-12-08 12:42:00 +01:00
parent 589730bfad
commit ed9e6dd21c
262 changed files with 4027 additions and 3954 deletions
@@ -92,15 +92,10 @@ class CondenserCategory extends BlankRecipeCategory<CondenserOutputWrapper>
return background;
}
@Override
public void drawAnimations( Minecraft minecraft )
{
progress.draw( minecraft );
}
@Override
public void drawExtras( Minecraft minecraft )
{
progress.draw( minecraft );
iconTrash.draw( minecraft );
iconButton.draw( minecraft );
}
@@ -55,12 +55,6 @@ class CondenserOutputHandler implements IRecipeHandler<CondenserOutput>
return CondenserOutput.class;
}
@Override
public String getRecipeCategoryUid()
{
return CondenserCategory.UID;
}
@Override
public String getRecipeCategoryUid( CondenserOutput recipe )
{
@@ -110,4 +110,10 @@ class FacadeRegistryPlugin implements IRecipeRegistryPlugin
return Collections.emptyList();
}
@Override
public <T extends IRecipeWrapper> List<T> getRecipeWrappers( IRecipeCategory<T> recipeCategory )
{
return Collections.emptyList();
}
}
@@ -34,13 +34,6 @@ class GrinderRecipeHandler implements IRecipeHandler<IGrinderRecipe>
return IGrinderRecipe.class;
}
@Override
public String getRecipeCategoryUid()
{
return GrinderRecipeCategory.UID;
}
@Override
public String getRecipeCategoryUid( IGrinderRecipe recipe )
{
return GrinderRecipeCategory.UID;
@@ -80,7 +80,7 @@ class InscriberRecipeCategory extends BlankRecipeCategory<InscriberRecipeWrapper
}
@Override
public void drawAnimations( Minecraft minecraft )
public void drawExtras( Minecraft minecraft )
{
this.progress.draw( minecraft );
}
@@ -34,12 +34,6 @@ class InscriberRecipeHandler implements IRecipeHandler<IInscriberRecipe>
return IInscriberRecipe.class;
}
@Override
public String getRecipeCategoryUid()
{
return InscriberRecipeCategory.UID;
}
@Override
public String getRecipeCategoryUid( IInscriberRecipe recipe )
{
@@ -66,4 +66,10 @@ class InscriberRegistryPlugin implements IRecipeRegistryPlugin
{
return null;
}
@Override
public <T extends IRecipeWrapper> List<T> getRecipeWrappers( IRecipeCategory<T> recipeCategory )
{
return null;
}
}
@@ -199,7 +199,7 @@ public class JEIPlugin extends BlankModPlugin
@Override
public void onRuntimeAvailable( IJeiRuntime jeiRuntime )
{
JEIModule jeiModule = (JEIModule) Integrations.jei();
jeiModule.setJei( new JeiRuntimeAdapter( jeiRuntime ) );
//JEIModule jeiModule = (JEIModule) Integrations.jei();
//jeiModule.setJei( new JeiRuntimeAdapter( jeiRuntime ) );
}
}
@@ -35,7 +35,6 @@ import net.minecraft.nbt.NBTTagList;
import mezz.jei.api.gui.IGuiIngredient;
import mezz.jei.api.gui.IRecipeLayout;
import mezz.jei.api.recipe.VanillaRecipeCategoryUid;
import mezz.jei.api.recipe.transfer.IRecipeTransferError;
import mezz.jei.api.recipe.transfer.IRecipeTransferHandler;
@@ -63,12 +62,6 @@ class RecipeTransferHandler<T extends Container> implements IRecipeTransferHandl
return containerClass;
}
@Override
public String getRecipeCategoryUid()
{
return VanillaRecipeCategoryUid.CRAFTING;
}
@Nullable
@Override
public IRecipeTransferError transferRecipe( T container, IRecipeLayout recipeLayout, EntityPlayer player, boolean maxTransfer, boolean doTransfer )
@@ -35,12 +35,6 @@ class ShapedRecipeHandler implements IRecipeHandler<ShapedRecipe>
return ShapedRecipe.class;
}
@Override
public String getRecipeCategoryUid()
{
return VanillaRecipeCategoryUid.CRAFTING;
}
@Override
public String getRecipeCategoryUid( ShapedRecipe recipe )
{
@@ -35,12 +35,6 @@ class ShapelessRecipeHandler implements IRecipeHandler<ShapelessRecipe>
return ShapelessRecipe.class;
}
@Override
public String getRecipeCategoryUid()
{
return VanillaRecipeCategoryUid.CRAFTING;
}
@Override
public String getRecipeCategoryUid( ShapelessRecipe recipe )
{