Compare commits

...

3 Commits

9 changed files with 31 additions and 6 deletions

View File

@ -7,7 +7,7 @@ modID = totemofreviving
name = Micle's Totem of Reviving name = Micle's Totem of Reviving
author = Micle author = Micle
buildVersion = 2.0.0 buildVersion = 2.0.1
mcVersion = 1.16.5 mcVersion = 1.16.5
forgeVersion = 36.2.20 forgeVersion = 36.2.20

View File

@ -19,7 +19,11 @@ import java.util.List;
public class ChargeItem extends Item { public class ChargeItem extends Item {
public ChargeItem() { 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 @Override

View File

@ -1,6 +1,12 @@
package dev.micle.totemofreviving.item.charge; package dev.micle.totemofreviving.item.charge;
import net.minecraft.item.Rarity;
public class DiamondChargeItem extends ChargeItem { public class DiamondChargeItem extends ChargeItem {
public DiamondChargeItem() {
super(Rarity.RARE);
}
public static String getName() { public static String getName() {
return "diamond_charge"; return "diamond_charge";
} }

View File

@ -1,6 +1,8 @@
package dev.micle.totemofreviving.item.charge; package dev.micle.totemofreviving.item.charge;
public class IronChargeItem extends ChargeItem { public class IronChargeItem extends ChargeItem {
public IronChargeItem() {}
public static String getName() { public static String getName() {
return "iron_charge"; return "iron_charge";
} }

View File

@ -1,6 +1,12 @@
package dev.micle.totemofreviving.item.charge; package dev.micle.totemofreviving.item.charge;
import net.minecraft.item.Rarity;
public class NetheriteChargeItem extends ChargeItem { public class NetheriteChargeItem extends ChargeItem {
public NetheriteChargeItem() {
super(Rarity.EPIC);
}
public static String getName() { public static String getName() {
return "netherite_charge"; return "netherite_charge";
} }

View File

@ -1,6 +1,12 @@
package dev.micle.totemofreviving.item.charge; package dev.micle.totemofreviving.item.charge;
import net.minecraft.item.Rarity;
public class StrawChargeItem extends ChargeItem { public class StrawChargeItem extends ChargeItem {
public StrawChargeItem() {
super(Rarity.UNCOMMON);
}
public static String getName() { public static String getName() {
return "straw_charge"; return "straw_charge";
} }

View File

@ -3,10 +3,11 @@ package dev.micle.totemofreviving.item.totem;
import dev.micle.totemofreviving.config.Config; import dev.micle.totemofreviving.config.Config;
import dev.micle.totemofreviving.item.charge.DiamondChargeItem; import dev.micle.totemofreviving.item.charge.DiamondChargeItem;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.item.Rarity;
public class DiamondTotemItem extends TotemItem { public class DiamondTotemItem extends TotemItem {
public DiamondTotemItem() { public DiamondTotemItem() {
super(Config.Server.getDiamondTotemConfig().getDurability()); super(Rarity.RARE, Config.Server.getDiamondTotemConfig().getDurability());
} }
public static String getName() { public static String getName() {

View File

@ -3,10 +3,11 @@ package dev.micle.totemofreviving.item.totem;
import dev.micle.totemofreviving.config.Config; import dev.micle.totemofreviving.config.Config;
import dev.micle.totemofreviving.item.charge.NetheriteChargeItem; import dev.micle.totemofreviving.item.charge.NetheriteChargeItem;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.item.Rarity;
public class NetheriteTotemItem extends TotemItem { public class NetheriteTotemItem extends TotemItem {
public NetheriteTotemItem() { public NetheriteTotemItem() {
super(Config.Server.getNetheriteTotemConfig().getDurability()); super(Rarity.EPIC, Config.Server.getNetheriteTotemConfig().getDurability());
} }
public static String getName() { public static String getName() {

View File

@ -54,8 +54,7 @@ public class Network {
String clientNetVersion = (senderIsServer) ? VERSION : readNetVersion(buffer); String clientNetVersion = (senderIsServer) ? VERSION : readNetVersion(buffer);
String clientModVersion = (senderIsServer) ? TotemOfReviving.getVersion() : readModVersion(buffer); String clientModVersion = (senderIsServer) ? TotemOfReviving.getVersion() : readModVersion(buffer);
if (!serverNetVersion.equals(clientNetVersion) || if (!serverNetVersion.equals(clientNetVersion)) {
!serverModVersion.equals(clientModVersion) && !serverModVersion.equals("NONE") && !clientModVersion.equals("NONE")) {
throw new MismatchedVersionException( throw new MismatchedVersionException(
String.format("The server and client are running different versions of [Micle's Totem of Reviving]. " + String.format("The server and client are running different versions of [Micle's Totem of Reviving]. " +
"Try updating this mod on either the client and or the server. " + "Try updating this mod on either the client and or the server. " +