From 3b7e58215b640ab95dff987a4211080efab51205 Mon Sep 17 00:00:00 2001 From: WayofTime Date: Fri, 27 Feb 2015 16:31:08 -0500 Subject: [PATCH] Last commit of mine before I update --- .../AlchemicalWizardry.java | 1 + .../common/entity/mob/BookEntityItem.java | 1 - .../items/routing/OutputRoutingFocus.java | 12 ++++++- .../routing/RoutingFocusLogicLimitGlobal.java | 32 ++++++++++++++++++ .../assets/alchemicalwizardry/lang/en_US.lang | 1 + .../items/OutputRoutingFocusGlobal.png | Bin 0 -> 345 bytes 6 files changed, 45 insertions(+), 2 deletions(-) create mode 100644 src/main/java/WayofTime/alchemicalWizardry/common/routing/RoutingFocusLogicLimitGlobal.java create mode 100644 src/main/resources/assets/alchemicalwizardry/textures/items/OutputRoutingFocusGlobal.png diff --git a/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java b/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java index 7362ad05..b7b7e30c 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java +++ b/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java @@ -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); diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/BookEntityItem.java b/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/BookEntityItem.java index 164727a1..14f06b92 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/BookEntityItem.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/BookEntityItem.java @@ -43,7 +43,6 @@ public class BookEntityItem extends EntityItem public void onUpdate() { super.onUpdate(); - System.out.println("I is alive"); } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/routing/OutputRoutingFocus.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/routing/OutputRoutingFocus.java index f519709c..22965e3d 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/routing/OutputRoutingFocus.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/routing/OutputRoutingFocus.java @@ -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); } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/routing/RoutingFocusLogicLimitGlobal.java b/src/main/java/WayofTime/alchemicalWizardry/common/routing/RoutingFocusLogicLimitGlobal.java new file mode 100644 index 00000000..0e370db0 --- /dev/null +++ b/src/main/java/WayofTime/alchemicalWizardry/common/routing/RoutingFocusLogicLimitGlobal.java @@ -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; + } +} \ No newline at end of file diff --git a/src/main/resources/assets/alchemicalwizardry/lang/en_US.lang b/src/main/resources/assets/alchemicalwizardry/lang/en_US.lang index 530bf3b0..8dff14a0 100644 --- a/src/main/resources/assets/alchemicalwizardry/lang/en_US.lang +++ b/src/main/resources/assets/alchemicalwizardry/lang/en_US.lang @@ -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 diff --git a/src/main/resources/assets/alchemicalwizardry/textures/items/OutputRoutingFocusGlobal.png b/src/main/resources/assets/alchemicalwizardry/textures/items/OutputRoutingFocusGlobal.png new file mode 100644 index 0000000000000000000000000000000000000000..d32942d52ef76690132450e8c83cc2a1a6fb8af0 GIT binary patch literal 345 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE(}Esj0};PD&5LV0FMhJw4NZ$OG(DmzeoucwP+h{fr>lMVR}8SuEy7o7eou&9@3FYB4Py9*eO z+?YC%x#TSakB{wv^c7L24?;o|bRxs{{moV1=qq&p#4+ZxKJyb8qV+fEu}SMPY`ESi zI5~yW@zRopS4_RzmIwMzPGC+w_VL7H%cy`Y6B5>Yp0F(X6{higLW{-gQ-R)w!A%*C zw!Mp3&z@8-Tcz>zn8!bJraKh{3zt6j%Z{xRn09Nm#^kL3wMRnl|CsFfY0??%6R{Wf jP4GYI&M_fqdxc>gTe~DWM4f*mZtD literal 0 HcmV?d00001