Skip to content

Commit

Permalink
Build 49
Browse files Browse the repository at this point in the history
yeah. it's terribly broken with TCon. I know >_>
  • Loading branch information
BluSunrize committed Nov 19, 2016
1 parent f24d9ea commit 3e22ee9
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 20 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
def mainVersion = "0.10"
def buildNumber = "48"
def buildNumber = "49"

// For those who want the bleeding edge
buildscript {
Expand Down
2 changes: 1 addition & 1 deletion changelog.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#####Version 0.10-49
#####Version 0.10-49 - BUILT
- rewrote the shader system
- improved texture performance
- changed API integration
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import net.minecraft.client.resources.I18n;

import javax.annotation.Nonnull;
import javax.annotation.Nullable;

public abstract class IERecipeCategory<T> implements IRecipeCategory, IRecipeHandler<T>
{
Expand All @@ -23,7 +24,14 @@ public IERecipeCategory(String uniqueName, String localKey, IDrawable background
this.background = background;
this.wrapperClass = wrapperClass;
}


@Nullable
@Override
public IDrawable getIcon()
{
return null;
}

@Override
public String getUid()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,22 +44,10 @@ public class JEIHelper implements IModPlugin
public static IJeiHelpers jeiHelpers;

@Override
public void registerIngredients(IModIngredientRegistration registry)
{
}

@Override
public void register(IModRegistry registryIn)
public void registerItemSubtypes(ISubtypeRegistry subtypeRegistry)
{
jeiHelpers = registryIn.getJeiHelpers();
//Blacklist
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(IEContent.blockCrop,1,OreDictionary.WILDCARD_VALUE));
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(IEContent.itemFakeIcons,1,OreDictionary.WILDCARD_VALUE));
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(IEContent.blockStoneDevice,1,OreDictionary.WILDCARD_VALUE));
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(IEContent.blockMetalMultiblock,1,OreDictionary.WILDCARD_VALUE));

//NBT Ignorance
jeiHelpers.getSubtypeRegistry().registerNbtInterpreter(Item.getItemFromBlock(IEContent.blockConveyor), new ISubtypeInterpreter()
subtypeRegistry.registerNbtInterpreter(Item.getItemFromBlock(IEContent.blockConveyor), new ISubtypeInterpreter()
{
@Nullable
@Override
Expand All @@ -70,7 +58,7 @@ public String getSubtypeInfo(@Nonnull ItemStack itemStack)
return null;
}
});
jeiHelpers.getSubtypeRegistry().registerNbtInterpreter(IEContent.itemBullet, new ISubtypeInterpreter()
subtypeRegistry.registerNbtInterpreter(IEContent.itemBullet, new ISubtypeInterpreter()
{
@Nullable
@Override
Expand All @@ -81,8 +69,24 @@ public String getSubtypeInfo(@Nonnull ItemStack itemStack)
return null;
}
});
}

@Override
public void registerIngredients(IModIngredientRegistration registry)
{
}

@Override
public void register(IModRegistry registryIn)
{
jeiHelpers = registryIn.getJeiHelpers();
//Blacklist
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(IEContent.blockCrop,1,OreDictionary.WILDCARD_VALUE));
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(IEContent.itemFakeIcons,1,OreDictionary.WILDCARD_VALUE));
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(IEContent.blockStoneDevice,1,OreDictionary.WILDCARD_VALUE));
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(IEContent.blockMetalMultiblock,1,OreDictionary.WILDCARD_VALUE));

registryIn.getRecipeTransferRegistry().addRecipeTransferHandler(new AssemblerRecipeTransferHandler());
registryIn.getRecipeTransferRegistry().addRecipeTransferHandler(new AssemblerRecipeTransferHandler(), "immersiveengineering:assembler");

//Recipes
IGuiHelper guiHelper = jeiHelpers.getGuiHelper();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public SqueezerRecipeCategory(IGuiHelper helper)
super("squeezer","tile.immersiveengineering.metalMultiblock.squeezer.name", helper.createDrawable(background, 6,12, 164,59), SqueezerRecipeWrapper.class);
tankOverlay = helper.createDrawable(background, 177,31, 16,47, -2,2,-2,2);
}

@Override
@Deprecated
public void setRecipe(IRecipeLayout recipeLayout, IRecipeWrapper recipeWrapper)
Expand Down

0 comments on commit 3e22ee9

Please sign in to comment.