From c7fe97c48d1b006b0ea971a2beb055080cd15b0b Mon Sep 17 00:00:00 2001 From: nekosune Date: Sun, 28 Aug 2016 22:11:11 +0100 Subject: [PATCH] Fixed #863 --- .../block/tile/transvector/TileTransvectorInterface.java | 2 +- .../thaumic/tinkerer/common/item/foci/ItemModFocus.java | 2 ++ .../tinkerer/common/item/kami/foci/ItemFocusRecall.java | 6 +----- .../tinkerer/common/item/kami/foci/ItemFocusShadowbeam.java | 5 +---- .../tinkerer/common/item/kami/foci/ItemFocusXPDrain.java | 5 +---- .../tinkerer/common/item/kami/foci/ItemModKamiFocus.java | 2 +- 6 files changed, 7 insertions(+), 15 deletions(-) diff --git a/src/main/java/thaumic/tinkerer/common/block/tile/transvector/TileTransvectorInterface.java b/src/main/java/thaumic/tinkerer/common/block/tile/transvector/TileTransvectorInterface.java index d6886039..fa2c502d 100644 --- a/src/main/java/thaumic/tinkerer/common/block/tile/transvector/TileTransvectorInterface.java +++ b/src/main/java/thaumic/tinkerer/common/block/tile/transvector/TileTransvectorInterface.java @@ -48,7 +48,7 @@ import thaumic.tinkerer.common.lib.LibFeatures; @Optional.Interface(iface = "cofh.api.energy.IEnergyReceiver", modid = "CoFHCore"), @Optional.Interface(iface = "cofh.api.energy.IEnergyProvider", modid = "CoFHCore"), @Optional.Interface(iface = "ic2.api.energy.tile.IEnergySink", modid = "IC2"), - @Optional.Interface(iface = "ic2.api.energy.tile.IEnergyEmmiter", modid = "IC2"), + @Optional.Interface(iface = "ic2.api.energy.tile.IEnergyEmiter", modid = "IC2"), @Optional.Interface(iface = "ic2.api.energy.tile.IEnergySource", modid = "IC2"), @Optional.Interface(iface = "ic2.api.energy.tile.IEnergyConductor", modid = "IC2")}) diff --git a/src/main/java/thaumic/tinkerer/common/item/foci/ItemModFocus.java b/src/main/java/thaumic/tinkerer/common/item/foci/ItemModFocus.java index a2d7de26..ab4270ae 100644 --- a/src/main/java/thaumic/tinkerer/common/item/foci/ItemModFocus.java +++ b/src/main/java/thaumic/tinkerer/common/item/foci/ItemModFocus.java @@ -40,6 +40,8 @@ public abstract class ItemModFocus extends ItemFocusBasic implements ITTinkererI private IIcon ornament, depth; + + public ItemModFocus() { super(); setMaxDamage(1); diff --git a/src/main/java/thaumic/tinkerer/common/item/kami/foci/ItemFocusRecall.java b/src/main/java/thaumic/tinkerer/common/item/kami/foci/ItemFocusRecall.java index 809210c7..98721fad 100644 --- a/src/main/java/thaumic/tinkerer/common/item/kami/foci/ItemFocusRecall.java +++ b/src/main/java/thaumic/tinkerer/common/item/kami/foci/ItemFocusRecall.java @@ -94,12 +94,8 @@ public class ItemFocusRecall extends ItemModKamiFocus { @Override public AspectList getVisCost(ItemStack stack) { - return cost; - } - @Override - public FocusUpgradeType[] getPossibleUpgradesByRank(ItemStack itemStack, int i) { - return new FocusUpgradeType[0]; + return cost; } @Override diff --git a/src/main/java/thaumic/tinkerer/common/item/kami/foci/ItemFocusShadowbeam.java b/src/main/java/thaumic/tinkerer/common/item/kami/foci/ItemFocusShadowbeam.java index 6dabf1ac..6e7aa2ee 100644 --- a/src/main/java/thaumic/tinkerer/common/item/kami/foci/ItemFocusShadowbeam.java +++ b/src/main/java/thaumic/tinkerer/common/item/kami/foci/ItemFocusShadowbeam.java @@ -79,10 +79,7 @@ public class ItemFocusShadowbeam extends ItemModKamiFocus { return cost; } - @Override - public FocusUpgradeType[] getPossibleUpgradesByRank(ItemStack itemStack, int rank) { - return new FocusUpgradeType[0]; - } + @Override public EnumRarity getRarity(ItemStack par1ItemStack) { diff --git a/src/main/java/thaumic/tinkerer/common/item/kami/foci/ItemFocusXPDrain.java b/src/main/java/thaumic/tinkerer/common/item/kami/foci/ItemFocusXPDrain.java index 42f67de1..eabdaabe 100644 --- a/src/main/java/thaumic/tinkerer/common/item/kami/foci/ItemFocusXPDrain.java +++ b/src/main/java/thaumic/tinkerer/common/item/kami/foci/ItemFocusXPDrain.java @@ -97,10 +97,7 @@ public class ItemFocusXPDrain extends ItemModKamiFocus { return cost; } - @Override - public FocusUpgradeType[] getPossibleUpgradesByRank(ItemStack itemStack, int i) { - return new FocusUpgradeType[0]; - } + @Override public EnumRarity getRarity(ItemStack par1ItemStack) { diff --git a/src/main/java/thaumic/tinkerer/common/item/kami/foci/ItemModKamiFocus.java b/src/main/java/thaumic/tinkerer/common/item/kami/foci/ItemModKamiFocus.java index 982467ed..7233c25d 100644 --- a/src/main/java/thaumic/tinkerer/common/item/kami/foci/ItemModKamiFocus.java +++ b/src/main/java/thaumic/tinkerer/common/item/kami/foci/ItemModKamiFocus.java @@ -176,7 +176,7 @@ public abstract class ItemModKamiFocus extends ItemFocusBasic implements ITTinke @Override public FocusUpgradeType[] getPossibleUpgradesByRank(ItemStack itemStack, int i) { - return new FocusUpgradeType[]{FocusUpgradeType.treasure}; + return new FocusUpgradeType[]{FocusUpgradeType.frugal}; } }