Last commit of mine before I update
This commit is contained in:
parent
adc14d5f46
commit
3b7e58215b
|
@ -1066,6 +1066,7 @@ public class AlchemicalWizardry
|
|||
GameRegistry.addRecipe(new ItemStack(ModItems.outputRoutingFocus, 1, 1), "sgs", "geg", "sgs", 'e', enderShardStack, 's', stickStack, 'g', new ItemStack(Blocks.sandstone));
|
||||
GameRegistry.addRecipe(new ItemStack(ModItems.outputRoutingFocus, 1, 2), "sgs", "geg", "sgs", 'e', enderShardStack, 's', stickStack, 'g', new ItemStack(Items.dye, 1, craftingConstant));
|
||||
GameRegistry.addRecipe(new ItemStack(ModItems.outputRoutingFocus, 1, 3), "sgs", "geg", "sgs", 'e', enderShardStack, 's', stickStack, 'g', obsidianStack);
|
||||
GameRegistry.addRecipe(new ItemStack(ModItems.outputRoutingFocus, 1, 4), "sgs", "geg", "sgs", 'e', enderShardStack, 's', stickStack, 'g', stringStack);
|
||||
|
||||
|
||||
AlchemyRecipeRegistry.registerRecipe(new ItemStack(Items.flint, 2, 0), 1, new ItemStack[]{new ItemStack(Blocks.gravel), new ItemStack(Items.flint)}, 1);
|
||||
|
|
|
@ -43,7 +43,6 @@ public class BookEntityItem extends EntityItem
|
|||
public void onUpdate()
|
||||
{
|
||||
super.onUpdate();
|
||||
System.out.println("I is alive");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -12,6 +12,7 @@ import net.minecraft.util.IIcon;
|
|||
import net.minecraft.util.StatCollector;
|
||||
import WayofTime.alchemicalWizardry.api.RoutingFocusLogic;
|
||||
import WayofTime.alchemicalWizardry.common.routing.RoutingFocusLogicLimitDefault;
|
||||
import WayofTime.alchemicalWizardry.common.routing.RoutingFocusLogicLimitGlobal;
|
||||
import WayofTime.alchemicalWizardry.common.routing.RoutingFocusLogicLimitIgnMeta;
|
||||
import WayofTime.alchemicalWizardry.common.routing.RoutingFocusLogicLimitMatchNBT;
|
||||
import WayofTime.alchemicalWizardry.common.routing.RoutingFocusLogicLimitModItems;
|
||||
|
@ -23,6 +24,7 @@ public class OutputRoutingFocus extends RoutingFocus implements ILimitedRoutingF
|
|||
IIcon modItemIcon;
|
||||
IIcon ignMetaIcon;
|
||||
IIcon matchNBTIcon;
|
||||
IIcon globalIcon;
|
||||
|
||||
public OutputRoutingFocus()
|
||||
{
|
||||
|
@ -52,6 +54,7 @@ public class OutputRoutingFocus extends RoutingFocus implements ILimitedRoutingF
|
|||
this.modItemIcon = iconRegister.registerIcon("AlchemicalWizardry:OutputRoutingFocusModItems");
|
||||
this.ignMetaIcon = iconRegister.registerIcon("AlchemicalWizardry:OutputRoutingFocusIgnMeta");
|
||||
this.matchNBTIcon = iconRegister.registerIcon("AlchemicalWizardry:OutputRoutingFocusMatchNBT");
|
||||
this.globalIcon = iconRegister.registerIcon("AlchemicalWizardry:OutputRoutingFocusGlobal");
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
|
@ -67,6 +70,8 @@ public class OutputRoutingFocus extends RoutingFocus implements ILimitedRoutingF
|
|||
return this.ignMetaIcon;
|
||||
case 3:
|
||||
return this.matchNBTIcon;
|
||||
case 4:
|
||||
return this.globalIcon;
|
||||
}
|
||||
return this.itemIcon;
|
||||
}
|
||||
|
@ -90,6 +95,9 @@ public class OutputRoutingFocus extends RoutingFocus implements ILimitedRoutingF
|
|||
case 3:
|
||||
addedString = "matchNBT";
|
||||
break;
|
||||
case 4:
|
||||
addedString = "global";
|
||||
break;
|
||||
}
|
||||
|
||||
return super.getUnlocalizedName() + "." + addedString;
|
||||
|
@ -99,7 +107,7 @@ public class OutputRoutingFocus extends RoutingFocus implements ILimitedRoutingF
|
|||
@SideOnly(Side.CLIENT)
|
||||
public void getSubItems(Item id, CreativeTabs creativeTab, List list)
|
||||
{
|
||||
for (int meta = 0; meta < 4; ++meta)
|
||||
for (int meta = 0; meta < 5; ++meta)
|
||||
{
|
||||
list.add(new ItemStack(id, 1, meta));
|
||||
}
|
||||
|
@ -120,6 +128,8 @@ public class OutputRoutingFocus extends RoutingFocus implements ILimitedRoutingF
|
|||
return new RoutingFocusLogicLimitIgnMeta(itemStack);
|
||||
case 3:
|
||||
return new RoutingFocusLogicLimitMatchNBT(itemStack);
|
||||
case 4:
|
||||
return new RoutingFocusLogicLimitGlobal(itemStack);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -0,0 +1,32 @@
|
|||
package WayofTime.alchemicalWizardry.common.routing;
|
||||
|
||||
import net.minecraft.item.ItemStack;
|
||||
import WayofTime.alchemicalWizardry.common.items.routing.ILimitedRoutingFocus;
|
||||
|
||||
public class RoutingFocusLogicLimitGlobal extends RoutingFocusLogicLimit
|
||||
{
|
||||
public int limit = 0;
|
||||
|
||||
public RoutingFocusLogicLimitGlobal(ItemStack stack)
|
||||
{
|
||||
if(stack != null && stack.getItem() instanceof ILimitedRoutingFocus)
|
||||
{
|
||||
limit = ((ILimitedRoutingFocus)stack.getItem()).getRoutingFocusLimit(stack);
|
||||
}else
|
||||
{
|
||||
limit = 0;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getRoutingLimit()
|
||||
{
|
||||
return limit;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean getDefaultMatch(ItemStack keyStack, ItemStack checkedStack)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}
|
|
@ -207,6 +207,7 @@ item.outputRoutingFocus.default.name=Default Output Routing Focus
|
|||
item.outputRoutingFocus.modItem.name=Output Routing Focus (ModItem)
|
||||
item.outputRoutingFocus.ignMeta.name=Output Routing Focus (Ignore Meta)
|
||||
item.outputRoutingFocus.matchNBT.name=Output Routing Focus (MatchNBT)
|
||||
item.outputRoutingFocus.global.name=Output Routing Focus (Global)
|
||||
|
||||
#Creative Tab
|
||||
itemGroup.tabBloodMagic=Blood Magic
|
||||
|
|
Binary file not shown.
After Width: | Height: | Size: 345 B |
Loading…
Reference in a new issue