From 9108dea65bdaf686d7b58c3f4bde726749accc5f Mon Sep 17 00:00:00 2001 From: Micle Date: Wed, 19 Jan 2022 02:29:56 +0000 Subject: [PATCH] Added rarity values to the diamond and netherite totems as well as all the charges. --- .../dev/micle/totemofreviving/item/charge/ChargeItem.java | 6 +++++- .../totemofreviving/item/charge/DiamondChargeItem.java | 6 ++++++ .../micle/totemofreviving/item/charge/IronChargeItem.java | 2 ++ .../totemofreviving/item/charge/NetheriteChargeItem.java | 6 ++++++ .../micle/totemofreviving/item/charge/StrawChargeItem.java | 6 ++++++ .../micle/totemofreviving/item/totem/DiamondTotemItem.java | 3 ++- .../totemofreviving/item/totem/NetheriteTotemItem.java | 3 ++- 7 files changed, 29 insertions(+), 3 deletions(-) diff --git a/src/main/java/dev/micle/totemofreviving/item/charge/ChargeItem.java b/src/main/java/dev/micle/totemofreviving/item/charge/ChargeItem.java index 2ee40f6..6e488f1 100644 --- a/src/main/java/dev/micle/totemofreviving/item/charge/ChargeItem.java +++ b/src/main/java/dev/micle/totemofreviving/item/charge/ChargeItem.java @@ -19,7 +19,11 @@ import java.util.List; public class ChargeItem extends Item { public ChargeItem() { - super(new Item.Properties().tab(TotemOfReviving.ITEM_GROUP).stacksTo(64).rarity(Rarity.COMMON)); + this(Rarity.COMMON); + } + + public ChargeItem(Rarity rarity) { + super(new Item.Properties().tab(TotemOfReviving.ITEM_GROUP).stacksTo(64).rarity(rarity)); } @Override diff --git a/src/main/java/dev/micle/totemofreviving/item/charge/DiamondChargeItem.java b/src/main/java/dev/micle/totemofreviving/item/charge/DiamondChargeItem.java index 917b554..44b84a9 100644 --- a/src/main/java/dev/micle/totemofreviving/item/charge/DiamondChargeItem.java +++ b/src/main/java/dev/micle/totemofreviving/item/charge/DiamondChargeItem.java @@ -1,6 +1,12 @@ package dev.micle.totemofreviving.item.charge; +import net.minecraft.item.Rarity; + public class DiamondChargeItem extends ChargeItem { + public DiamondChargeItem() { + super(Rarity.RARE); + } + public static String getName() { return "diamond_charge"; } diff --git a/src/main/java/dev/micle/totemofreviving/item/charge/IronChargeItem.java b/src/main/java/dev/micle/totemofreviving/item/charge/IronChargeItem.java index 0b5ebac..c9f0443 100644 --- a/src/main/java/dev/micle/totemofreviving/item/charge/IronChargeItem.java +++ b/src/main/java/dev/micle/totemofreviving/item/charge/IronChargeItem.java @@ -1,6 +1,8 @@ package dev.micle.totemofreviving.item.charge; public class IronChargeItem extends ChargeItem { + public IronChargeItem() {} + public static String getName() { return "iron_charge"; } diff --git a/src/main/java/dev/micle/totemofreviving/item/charge/NetheriteChargeItem.java b/src/main/java/dev/micle/totemofreviving/item/charge/NetheriteChargeItem.java index 07ecdb5..2a039f2 100644 --- a/src/main/java/dev/micle/totemofreviving/item/charge/NetheriteChargeItem.java +++ b/src/main/java/dev/micle/totemofreviving/item/charge/NetheriteChargeItem.java @@ -1,6 +1,12 @@ package dev.micle.totemofreviving.item.charge; +import net.minecraft.item.Rarity; + public class NetheriteChargeItem extends ChargeItem { + public NetheriteChargeItem() { + super(Rarity.EPIC); + } + public static String getName() { return "netherite_charge"; } diff --git a/src/main/java/dev/micle/totemofreviving/item/charge/StrawChargeItem.java b/src/main/java/dev/micle/totemofreviving/item/charge/StrawChargeItem.java index d285a1f..2c19297 100644 --- a/src/main/java/dev/micle/totemofreviving/item/charge/StrawChargeItem.java +++ b/src/main/java/dev/micle/totemofreviving/item/charge/StrawChargeItem.java @@ -1,6 +1,12 @@ package dev.micle.totemofreviving.item.charge; +import net.minecraft.item.Rarity; + public class StrawChargeItem extends ChargeItem { + public StrawChargeItem() { + super(Rarity.UNCOMMON); + } + public static String getName() { return "straw_charge"; } diff --git a/src/main/java/dev/micle/totemofreviving/item/totem/DiamondTotemItem.java b/src/main/java/dev/micle/totemofreviving/item/totem/DiamondTotemItem.java index 1216e2b..ce6aafb 100644 --- a/src/main/java/dev/micle/totemofreviving/item/totem/DiamondTotemItem.java +++ b/src/main/java/dev/micle/totemofreviving/item/totem/DiamondTotemItem.java @@ -3,10 +3,11 @@ package dev.micle.totemofreviving.item.totem; import dev.micle.totemofreviving.config.Config; import dev.micle.totemofreviving.item.charge.DiamondChargeItem; import net.minecraft.item.ItemStack; +import net.minecraft.item.Rarity; public class DiamondTotemItem extends TotemItem { public DiamondTotemItem() { - super(Config.Server.getDiamondTotemConfig().getDurability()); + super(Rarity.RARE, Config.Server.getDiamondTotemConfig().getDurability()); } public static String getName() { diff --git a/src/main/java/dev/micle/totemofreviving/item/totem/NetheriteTotemItem.java b/src/main/java/dev/micle/totemofreviving/item/totem/NetheriteTotemItem.java index f3d7c54..6d3797b 100644 --- a/src/main/java/dev/micle/totemofreviving/item/totem/NetheriteTotemItem.java +++ b/src/main/java/dev/micle/totemofreviving/item/totem/NetheriteTotemItem.java @@ -3,10 +3,11 @@ package dev.micle.totemofreviving.item.totem; import dev.micle.totemofreviving.config.Config; import dev.micle.totemofreviving.item.charge.NetheriteChargeItem; import net.minecraft.item.ItemStack; +import net.minecraft.item.Rarity; public class NetheriteTotemItem extends TotemItem { public NetheriteTotemItem() { - super(Config.Server.getNetheriteTotemConfig().getDurability()); + super(Rarity.EPIC, Config.Server.getNetheriteTotemConfig().getDurability()); } public static String getName() {