lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fixed Sentient Sword

Browse source 
Fixed the sentient sword so that it now extends `SwordItem`
This commit is contained in:
WayofTime 2020-10-27 18:32:03 -04:00
parent 6f6f2049c1
commit bacaf114fb
2 changed files with 66 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
src/main/java/wayoftime/bloodmagic/common/item/BMItemTier.java Normal file
View file

@ -0,0 +1,62 @@
package wayoftime.bloodmagic.common.item;
import java.util.function.Supplier;
import net.minecraft.item.IItemTier;
import net.minecraft.item.crafting.Ingredient;
import net.minecraft.util.LazyValue;
public enum BMItemTier implements IItemTier
{
SENTIENT(4, 512, 6.0F, 2.0F, 50, () -> {
return Ingredient.fromItems(BloodMagicItems.IMBUED_SLATE.get());
});
private final int harvestLevel;
private final int maxUses;
private final float efficiency;
private final float attackDamage;
private final int enchantability;
private final LazyValue<Ingredient> repairMaterial;
private BMItemTier(int harvestLevelIn, int maxUsesIn, float efficiencyIn, float attackDamageIn, int enchantabilityIn, Supplier<Ingredient> repairMaterialIn)
{
this.harvestLevel = harvestLevelIn;
this.maxUses = maxUsesIn;
this.efficiency = efficiencyIn;
this.attackDamage = attackDamageIn;
this.enchantability = enchantabilityIn;
this.repairMaterial = new LazyValue<>(repairMaterialIn);
}
public int getMaxUses()
{
return this.maxUses;
}
public float getEfficiency()
{
return this.efficiency;
}
public float getAttackDamage()
{
return this.attackDamage;
}
public int getHarvestLevel()
{
return this.harvestLevel;
}
public int getEnchantability()
{
return this.enchantability;
}
public Ingredient getRepairMaterial()
{
return this.repairMaterial.getValue();
}
}

6
src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSentientSword.java
View file

@ -20,6 +20,7 @@ import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.inventory.EquipmentSlotType; import net.minecraft.inventory.EquipmentSlotType;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.item.SwordItem;
import net.minecraft.nbt.CompoundNBT; import net.minecraft.nbt.CompoundNBT;
import net.minecraft.util.ActionResult; import net.minecraft.util.ActionResult;
import net.minecraft.util.Hand; import net.minecraft.util.Hand;
@ -30,6 +31,7 @@ import net.minecraft.world.World;
import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.api.distmarker.OnlyIn;
import wayoftime.bloodmagic.BloodMagic; import wayoftime.bloodmagic.BloodMagic;
import wayoftime.bloodmagic.common.item.BMItemTier;
import wayoftime.bloodmagic.common.item.BloodMagicItems; import wayoftime.bloodmagic.common.item.BloodMagicItems;
import wayoftime.bloodmagic.iface.IMultiWillTool; import wayoftime.bloodmagic.iface.IMultiWillTool;
import wayoftime.bloodmagic.util.Constants; import wayoftime.bloodmagic.util.Constants;
@ -39,7 +41,7 @@ import wayoftime.bloodmagic.will.IDemonWill;
import wayoftime.bloodmagic.will.IDemonWillWeapon; import wayoftime.bloodmagic.will.IDemonWillWeapon;
import wayoftime.bloodmagic.will.PlayerDemonWillHandler; import wayoftime.bloodmagic.will.PlayerDemonWillHandler;
public class ItemSentientSword extends Item implements IDemonWillWeapon, IMultiWillTool public class ItemSentientSword extends SwordItem implements IDemonWillWeapon, IMultiWillTool
{ {
public static int[] soulBracket = new int[] public static int[] soulBracket = new int[]
{ 16, 60, 200, 400, 1000, 2000, 4000 }; { 16, 60, 200, 400, 1000, 2000, 4000 };
@ -81,7 +83,7 @@ public class ItemSentientSword extends Item implements IDemonWillWeapon, IMultiW
public ItemSentientSword() public ItemSentientSword()
{ {
// super(RegistrarBloodMagicItems.SOUL_TOOL_MATERIAL); // super(RegistrarBloodMagicItems.SOUL_TOOL_MATERIAL);
super(new Item.Properties().maxDamage(520).group(BloodMagic.TAB)); super(BMItemTier.SENTIENT, 6, -2.6f, new Item.Properties().maxDamage(520).group(BloodMagic.TAB));
} }
// @Override // @Override