ChargeRecipe and TotemRecipe:

- assemble method returns a copy of the result item which fixes a bug where it gets replaced with air after being crafted once.

.gitignore

@@ -3,3 +3,4 @@
 /build/
 /run/
 /src/test/
+/src/generated/resources/.cache/cache

build.gradle

@@ -1,5 +1,3 @@
-import org.gradle.jvm.toolchain.JavaLanguageVersion
-
 buildscript {
     repositories {
         // These repositories are only for Gradle plugins, put any other repositories in the repository block further below
@@ -13,7 +11,7 @@ buildscript {
 
 apply plugin: 'net.minecraftforge.gradle'
 
-def archiveVersion = "Forge-${project.mcVersion}-${project.buildVersion}" as Object
+def archiveVersion = "${project.mcVersion}-${project.buildVersion}" as Object
 
 java.toolchain.languageVersion = JavaLanguageVersion.of(17)
 

gradle.properties

@@ -2,13 +2,13 @@ org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 
 group = dev.micle
-archivesBaseName = TotemOfReviving
+archivesBaseName = micles-totem-of-reviving-forge
 modID = totemofreviving
 name = Micle's Totem of Reviving
 author = Micle
 
-buildVersion = 2.0.0
-mcVersion = 1.18.1
-forgeVersion = 39.0.44
+buildVersion = 2.0.2
+mcVersion = 1.18.2
+forgeVersion = 40.1.84
 
 jeiVersion = 9.+

src/generated/resources/data/totemofreviving/recipes/diamond_charge.json

@@ -1,5 +1,5 @@
 {
-  "type": "totemofreviving:totem_recipe",
+  "type": "totemofreviving:charge_recipe",
   "pattern": [
     "IDI",
     "PEP",

src/main/java/dev/micle/totemofreviving/TotemOfReviving.java

@@ -1,5 +1,8 @@
 package dev.micle.totemofreviving;
 
+import dev.micle.totemofreviving.proxy.IProxy;
+import dev.micle.totemofreviving.proxy.IProxy;
+import dev.micle.totemofreviving.proxy.Proxy;
 import dev.micle.totemofreviving.setup.ModItems;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.CreativeModeTab;
@@ -8,38 +11,34 @@ import net.minecraftforge.fml.DistExecutor;
 import net.minecraftforge.fml.ModContainer;
 import net.minecraftforge.fml.ModList;
 import net.minecraftforge.fml.common.Mod;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 
 import java.util.Optional;
-import java.util.Random;
 
 @Mod(TotemOfReviving.MOD_ID)
 public final class TotemOfReviving {
 	public static final String MOD_ID = "totemofreviving";
-	public static final String MOD_NAME = "Micle's Totem of Reviving";
 	public static final CreativeModeTab ITEM_GROUP = new CreativeModeTab(MOD_ID) {
 		@Override
 		public ItemStack makeIcon() {
 			return new ItemStack(ModItems.STRAW_TOTEM.get());
 		}
 	};
-	
-	public static final String RESOURCE_PREFIX = MOD_ID + ':';
-	
-	public static final Random RANDOM = new Random();
-	public static final Logger LOGGER = LogManager.getLogger(MOD_NAME);
-	
-	public static TotemOfReviving INSTANCE;
-	public static ISideProxy PROXY;
+
+	private static IProxy proxy;
 
     public TotemOfReviving() {
-		INSTANCE = this;
-		PROXY = DistExecutor.safeRunForDist(
-				() -> SideProxy.Client::new,
-				() -> SideProxy.Server::new
+		proxy = DistExecutor.safeRunForDist(
+				() -> Proxy.Client::new,
+				() -> Proxy.Server::new
 		);
     }
+
+	public static ResourceLocation createResourceLocation(String name) {
+		if (name.contains(":")) {
+			throw new IllegalArgumentException("Name contains namespace");
+		}
+		return new ResourceLocation(MOD_ID, name);
+	}
 	
 	public static String getVersion() {
 		Optional<? extends ModContainer> optional = ModList.get().getModContainerById(MOD_ID);
@@ -48,11 +47,8 @@ public final class TotemOfReviving {
 		}
 		return "0.0.0";
 	}
-	
-	public static ResourceLocation createResourceLocation(String name) {
-		if (name.contains(":")) {
-			throw new IllegalArgumentException("name containes namespace");
-		}
-		return new ResourceLocation(MOD_ID, name);
+
+	public static IProxy getProxy() {
+		return proxy;
 	}
 }

src/main/java/dev/micle/totemofreviving/data/ModRecipeProvider.java

@@ -76,7 +76,7 @@ public class ModRecipeProvider extends RecipeProvider {
 				.pattern("NIN")
 				.unlockedBy("has_item", has(ModItems.IRON_TOTEM.get()))
 				.save(consumer);
-		ExtendedShapedRecipeBuilder.shaped(ModRecipes.TOTEM_RECIPE.get(), ModItems.DIAMOND_CHARGE.get())
+		ExtendedShapedRecipeBuilder.shaped(ModRecipes.CHARGE_RECIPE.get(), ModItems.DIAMOND_CHARGE.get())
 				.define('E', Items.EMERALD)
 				.define('D', Items.DIAMOND)
 				.define('I', Items.IRON_INGOT)

src/main/java/dev/micle/totemofreviving/item/charge/ChargeItem.java

@@ -1,7 +1,7 @@
 package dev.micle.totemofreviving.item.charge;
 
 import dev.micle.totemofreviving.TotemOfReviving;
-import dev.micle.totemofreviving.config.Config;
+import dev.micle.totemofreviving.setup.Config;
 import net.minecraft.ChatFormatting;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.TextComponent;

src/main/java/dev/micle/totemofreviving/item/crafting/ChargeRecipe.java

@@ -28,6 +28,6 @@ public class ChargeRecipe extends ExtendedShapedRecipe {
 	
 	@Override
 	public ItemStack assemble(CraftingContainer inventory) {
-		return getBaseRecipe().getResultItem();
+		return getBaseRecipe().getResultItem().copy();
 	}
 }

src/main/java/dev/micle/totemofreviving/item/crafting/ExtendedShapedRecipeBuilder.java

@@ -12,6 +12,7 @@ import net.minecraft.advancements.critereon.RecipeUnlockedTrigger;
 import net.minecraft.data.recipes.FinishedRecipe;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.tags.Tag;
+import net.minecraft.tags.TagKey;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.crafting.Ingredient;
 import net.minecraft.world.item.crafting.RecipeSerializer;
@@ -45,7 +46,7 @@ public class ExtendedShapedRecipeBuilder {
 		return new ExtendedShapedRecipeBuilder(serializer, result, count);
 	}
 	
-	public ExtendedShapedRecipeBuilder define(Character symbol, Tag<Item> tagIn) {
+	public ExtendedShapedRecipeBuilder define(Character symbol, TagKey<Item> tagIn) {
 		return this.define(symbol, Ingredient.of(tagIn));
 	}
 	

src/main/java/dev/micle/totemofreviving/item/crafting/TotemRecipe.java

@@ -28,6 +28,6 @@ public class TotemRecipe extends ExtendedShapedRecipe {
 	
 	@Override
 	public ItemStack assemble(CraftingContainer inventory) {
-		return getBaseRecipe().getResultItem();
+		return getBaseRecipe().getResultItem().copy();
 	}
 }

src/main/java/dev/micle/totemofreviving/item/totem/DiamondTotemItem.java

@@ -1,6 +1,6 @@
 package dev.micle.totemofreviving.item.totem;
 
-import dev.micle.totemofreviving.config.Config;
+import dev.micle.totemofreviving.setup.Config;
 import dev.micle.totemofreviving.item.charge.DiamondChargeItem;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Rarity;

src/main/java/dev/micle/totemofreviving/item/totem/IronTotemItem.java

@@ -1,6 +1,6 @@
 package dev.micle.totemofreviving.item.totem;
 
-import dev.micle.totemofreviving.config.Config;
+import dev.micle.totemofreviving.setup.Config;
 import dev.micle.totemofreviving.item.charge.IronChargeItem;
 import net.minecraft.world.item.ItemStack;
 

src/main/java/dev/micle/totemofreviving/item/totem/NetheriteTotemItem.java

@@ -1,6 +1,6 @@
 package dev.micle.totemofreviving.item.totem;
 
-import dev.micle.totemofreviving.config.Config;
+import dev.micle.totemofreviving.setup.Config;
 import dev.micle.totemofreviving.item.charge.NetheriteChargeItem;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Rarity;

src/main/java/dev/micle/totemofreviving/item/totem/StrawTotemItem.java

@@ -1,6 +1,6 @@
 package dev.micle.totemofreviving.item.totem;
 
-import dev.micle.totemofreviving.config.Config;
+import dev.micle.totemofreviving.setup.Config;
 import dev.micle.totemofreviving.item.charge.StrawChargeItem;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Rarity;

src/main/java/dev/micle/totemofreviving/item/totem/TotemItem.java

@@ -1,11 +1,11 @@
 package dev.micle.totemofreviving.item.totem;
 
 import dev.micle.totemofreviving.TotemOfReviving;
-import dev.micle.totemofreviving.config.Config;
-import dev.micle.totemofreviving.network.ChangeTargetPacket;
-import dev.micle.totemofreviving.network.ChargeTotemPacket;
-import dev.micle.totemofreviving.network.Network;
-import dev.micle.totemofreviving.network.ReviveTargetPacket;
+import dev.micle.totemofreviving.setup.Config;
+import dev.micle.totemofreviving.network.client.ChangeTargetPacket;
+import dev.micle.totemofreviving.network.client.ChargeTotemPacket;
+import dev.micle.totemofreviving.network.NetworkManager;
+import dev.micle.totemofreviving.network.client.ReviveTargetPacket;
 import dev.micle.totemofreviving.setup.ModKeyMappings;
 import net.minecraft.ChatFormatting;
 import net.minecraft.network.chat.Component;
@@ -214,12 +214,12 @@ public abstract class TotemItem extends Item {
 		ItemStack chargeItem = (hand.equals(InteractionHand.MAIN_HAND)) ? player.getOffhandItem() : player.getMainHandItem();
 		
 		if (player.isCrouching()) {
-			Network.channel.sendToServer(new ChangeTargetPacket(hand));
+			NetworkManager.getChannel().sendToServer(new ChangeTargetPacket(hand));
 		} else {
 			if (isCharge(chargeItem)) {
-				Network.channel.sendToServer(new ChargeTotemPacket(hand));
+				NetworkManager.getChannel().sendToServer(new ChargeTotemPacket(hand));
 			} else {
-				Network.channel.sendToServer(new ReviveTargetPacket(hand));
+				NetworkManager.getChannel().sendToServer(new ReviveTargetPacket(hand));
 			}
 		}
 		return super.use(world, player, hand);

src/main/java/dev/micle/totemofreviving/network/Network.java

@@ -1,83 +0,0 @@
-package dev.micle.totemofreviving.network;
-
-import dev.micle.totemofreviving.TotemOfReviving;
-import dev.micle.totemofreviving.util.MismatchedVersionException;
-import net.minecraft.network.FriendlyByteBuf;
-import net.minecraftforge.network.NetworkRegistry;
-import net.minecraftforge.network.simple.SimpleChannel;
-
-import java.util.Objects;
-import java.util.regex.Pattern;
-
-public class Network {
-	public static final String VERSION = TotemOfReviving.MOD_ID + "-net-1";
-	private static final Pattern NET_VERSION_PATTERN = Pattern.compile(TotemOfReviving.MOD_ID + "-net-\\d+$");
-	private static final Pattern MOD_VERSION_PATTERN = Pattern.compile("Forge-\\d+\\.\\d+\\.\\d+-\\d+\\.\\d+\\.\\d+$");
-	
-	public static SimpleChannel channel;
-	
-	public static void init() {
-		channel = NetworkRegistry.ChannelBuilder.named(TotemOfReviving.createResourceLocation("network"))
-				.clientAcceptedVersions(s -> Objects.equals(s, VERSION))
-				.serverAcceptedVersions(s -> Objects.equals(s, VERSION))
-				.networkProtocolVersion(() -> VERSION)
-				.simpleChannel();
-		
-		int id = 0;
-		channel.messageBuilder(ChangeTargetPacket.class, id++)
-				.encoder(ChangeTargetPacket::encode)
-				.decoder(ChangeTargetPacket::decode)
-				.consumer(ChangeTargetPacket::handle)
-				.add();
-		channel.messageBuilder(ChargeTotemPacket.class, id++)
-				.encoder(ChargeTotemPacket::encode)
-				.decoder(ChargeTotemPacket::decode)
-				.consumer(ChargeTotemPacket::handle)
-				.add();
-		channel.messageBuilder(ReviveTargetPacket.class, id++)
-				.encoder(ReviveTargetPacket::encode)
-				.decoder(ReviveTargetPacket::decode)
-				.consumer(ReviveTargetPacket::handle)
-				.add();
-	}
-	
-	public static void writeVersionInfo(FriendlyByteBuf buffer, boolean senderIsServer) {
-		buffer.writeBoolean(senderIsServer);
-		buffer.writeUtf(VERSION);
-		buffer.writeUtf(TotemOfReviving.getVersion());
-	}
-	
-	public static void checkVersion(FriendlyByteBuf buffer) {
-		boolean senderIsServer = buffer.readBoolean();
-		String serverNetVersion = (senderIsServer) ? readNetVersion(buffer) : VERSION;
-		String serverModVersion = (senderIsServer) ? readModVersion(buffer) : TotemOfReviving.getVersion();
-		String clientNetVersion = (senderIsServer) ? VERSION : readNetVersion(buffer);
-		String clientModVersion = (senderIsServer) ? TotemOfReviving.getVersion() : readModVersion(buffer);
-		
-		if (!serverNetVersion.equals(clientNetVersion)) {
-			throw new MismatchedVersionException(
-					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. " +
-							"Client version is %s (%s). Server version is %s (%s)",
-							clientModVersion, clientNetVersion,
-							serverModVersion, serverNetVersion)
-			);
-		}
-	}
-	
-	public static String readNetVersion(FriendlyByteBuf buffer) {
-		String netVersion = buffer.readUtf();
-		if (!NET_VERSION_PATTERN.matcher(netVersion).matches()) {
-			return "UNKNOWN (" + netVersion + ")";
-		}
-		return netVersion;
-	}
-	
-	public static String readModVersion(FriendlyByteBuf buffer) {
-		String modVersion = buffer.readUtf();
-		if (!modVersion.equals("NONE") && !MOD_VERSION_PATTERN.matcher(modVersion).matches()) {
-			return "UNKNOWN (" + modVersion + ")";
-		}
-		return modVersion;
-	}
-}

src/main/java/dev/micle/totemofreviving/network/NetworkManager.java

@@ -0,0 +1,44 @@
+package dev.micle.totemofreviving.network;
+
+import dev.micle.totemofreviving.TotemOfReviving;
+import dev.micle.totemofreviving.network.client.ChangeTargetPacket;
+import dev.micle.totemofreviving.network.client.ChargeTotemPacket;
+import dev.micle.totemofreviving.network.client.ReviveTargetPacket;
+import net.minecraftforge.network.NetworkRegistry;
+import net.minecraftforge.network.simple.SimpleChannel;
+
+public class NetworkManager {
+	// Initialize variables
+	private static SimpleChannel channel;
+	
+	public static void init() {
+		// Create channel
+		channel = NetworkRegistry.ChannelBuilder.named(TotemOfReviving.createResourceLocation("network"))
+				.clientAcceptedVersions(v -> v.equals(TotemOfReviving.getVersion()))
+				.serverAcceptedVersions(v -> v.equals(TotemOfReviving.getVersion()))
+				.networkProtocolVersion(TotemOfReviving::getVersion)
+				.simpleChannel();
+
+		// Register packets
+		int id = 0;
+		channel.messageBuilder(ChangeTargetPacket.class, id++)
+				.encoder(ChangeTargetPacket::encode)
+				.decoder(ChangeTargetPacket::decode)
+				.consumer(ChangeTargetPacket::handle)
+				.add();
+		channel.messageBuilder(ChargeTotemPacket.class, id++)
+				.encoder(ChargeTotemPacket::encode)
+				.decoder(ChargeTotemPacket::decode)
+				.consumer(ChargeTotemPacket::handle)
+				.add();
+		channel.messageBuilder(ReviveTargetPacket.class, id++)
+				.encoder(ReviveTargetPacket::encode)
+				.decoder(ReviveTargetPacket::decode)
+				.consumer(ReviveTargetPacket::handle)
+				.add();
+	}
+
+	public static SimpleChannel getChannel() {
+		return channel;
+	}
+}

src/main/java/dev/micle/totemofreviving/network/client/ChangeTargetPacket.java

@@ -1,7 +1,8 @@
-package dev.micle.totemofreviving.network;
+package dev.micle.totemofreviving.network.client;
 
 import dev.micle.totemofreviving.TotemOfReviving;
 import dev.micle.totemofreviving.item.totem.TotemItem;
+import dev.micle.totemofreviving.network.NetworkManager;
 import net.minecraft.ChatFormatting;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.network.chat.TextComponent;
@@ -21,12 +22,10 @@ public class ChangeTargetPacket {
 	}
 	
 	public static void encode(final ChangeTargetPacket packet, final FriendlyByteBuf buffer) {
-		Network.writeVersionInfo(buffer, false);
 		buffer.writeEnum(packet.hand);
 	}
 	
 	public static ChangeTargetPacket decode(final FriendlyByteBuf buffer) {
-		Network.checkVersion(buffer);
 		return new ChangeTargetPacket(buffer.readEnum(InteractionHand.class));
 	}
 	
@@ -37,7 +36,7 @@ public class ChangeTargetPacket {
 			if (sender == null) { return; }
 			
 			ItemStack totemStack = sender.getItemInHand(packet.hand);
-			PlayerList playerList = TotemOfReviving.PROXY.getServer().getPlayerList();
+			PlayerList playerList = TotemOfReviving.getProxy().getServer().getPlayerList();
 			int targetIndex = TotemItem.getTargetIndex(totemStack) + 1;
 			
 			if (targetIndex > playerList.getPlayerCount()-1) { targetIndex = 0; }

src/main/java/dev/micle/totemofreviving/network/client/ChargeTotemPacket.java

@@ -1,6 +1,7 @@
-package dev.micle.totemofreviving.network;
+package dev.micle.totemofreviving.network.client;
 
 import dev.micle.totemofreviving.item.totem.TotemItem;
+import dev.micle.totemofreviving.network.NetworkManager;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.InteractionHand;
@@ -17,12 +18,10 @@ public class ChargeTotemPacket {
 	}
 	
 	public static void encode(final ChargeTotemPacket packet, final FriendlyByteBuf buffer) {
-		Network.writeVersionInfo(buffer, false);
 		buffer.writeEnum(packet.hand);
 	}
 	
 	public static ChargeTotemPacket decode(final FriendlyByteBuf buffer) {
-		Network.checkVersion(buffer);
 		return new ChargeTotemPacket(buffer.readEnum(InteractionHand.class));
 	}
 	

src/main/java/dev/micle/totemofreviving/network/client/ReviveTargetPacket.java

@@ -1,7 +1,8 @@
-package dev.micle.totemofreviving.network;
+package dev.micle.totemofreviving.network.client;
 
 import dev.micle.totemofreviving.TotemOfReviving;
 import dev.micle.totemofreviving.item.totem.TotemItem;
+import dev.micle.totemofreviving.network.NetworkManager;
 import net.minecraft.ChatFormatting;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.network.chat.TextComponent;
@@ -20,12 +21,10 @@ public class ReviveTargetPacket {
 	}
 	
 	public static void encode(final ReviveTargetPacket packet, final FriendlyByteBuf buffer) {
-		Network.writeVersionInfo(buffer, false);
 		buffer.writeEnum(packet.hand);
 	}
 	
 	public static ReviveTargetPacket decode(final FriendlyByteBuf buffer) {
-		Network.checkVersion(buffer);
 		return new ReviveTargetPacket(buffer.readEnum(InteractionHand.class));
 	}
 	
@@ -39,7 +38,7 @@ public class ReviveTargetPacket {
 			ServerPlayer target;
 			
 			try {
-				target = TotemOfReviving.PROXY.getServer().getPlayerList().getPlayer(TotemItem.getTargetUUID(totemStack));
+				target = TotemOfReviving.getProxy().getServer().getPlayerList().getPlayer(TotemItem.getTargetUUID(totemStack));
 				if (target == null) { throw new NullPointerException("Target is null!"); }
 			} catch (NullPointerException exception) {
 				sender.sendMessage(new TextComponent(ChatFormatting.WHITE + "Unable to find player!"), sender.getUUID());

src/main/java/dev/micle/totemofreviving/proxy/IProxy.java

@@ -1,13 +1,11 @@
-package dev.micle.totemofreviving;
+package dev.micle.totemofreviving.proxy;
 
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.level.Level;
 
-public interface ISideProxy {
+public interface IProxy {
 	MinecraftServer getServer();
-	
 	Player getClientPlayer();
-	
 	Level getClientWorld();
 }

src/main/java/dev/micle/totemofreviving/proxy/Proxy.java

@@ -1,8 +1,8 @@
-package dev.micle.totemofreviving;
+package dev.micle.totemofreviving.proxy;
 
-import dev.micle.totemofreviving.config.Config;
+import dev.micle.totemofreviving.setup.Config;
 import dev.micle.totemofreviving.data.DataGenerators;
-import dev.micle.totemofreviving.network.Network;
+import dev.micle.totemofreviving.network.NetworkManager;
 import dev.micle.totemofreviving.setup.Registration;
 import net.minecraft.client.Minecraft;
 import net.minecraft.server.MinecraftServer;
@@ -18,24 +18,28 @@ import net.minecraftforge.eventbus.api.IEventBus;
 import net.minecraftforge.fml.event.lifecycle.*;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
 
-class SideProxy implements ISideProxy {
+public class Proxy implements IProxy {
+	// Initialize variables
 	private static MinecraftServer server = null;
 	
 	// Common setup
-	SideProxy() {
+	public Proxy() {
+		// Initialize setup
 		Registration.register();
 		Config.init();
-		Network.init();
-		
+		NetworkManager.init();
+
+		// Register mod event bus listeners
 		IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus();
 		modEventBus.addListener(DataGenerators::gatherData);
-		modEventBus.addListener(SideProxy::setup);
-		modEventBus.addListener(SideProxy::imcEnqueue);
-		modEventBus.addListener(SideProxy::imcProcess);
-		
-		MinecraftForge.EVENT_BUS.addListener(SideProxy::onAddReloadListeners);
-		MinecraftForge.EVENT_BUS.addListener(SideProxy::serverStarted);
-		MinecraftForge.EVENT_BUS.addListener(SideProxy::serverStopping);
+		modEventBus.addListener(Proxy::setup);
+		modEventBus.addListener(Proxy::imcEnqueue);
+		modEventBus.addListener(Proxy::imcProcess);
+
+		// Register event bus listeners
+		MinecraftForge.EVENT_BUS.addListener(Proxy::onAddReloadListeners);
+		MinecraftForge.EVENT_BUS.addListener(Proxy::serverStarted);
+		MinecraftForge.EVENT_BUS.addListener(Proxy::serverStopping);
 	}
 	
 	private static void setup(FMLCommonSetupEvent event) {}
@@ -70,10 +74,12 @@ class SideProxy implements ISideProxy {
 	}
 	
 	// Client setup
-	static class Client extends SideProxy {
-		Client() {
-			FMLJavaModLoadingContext.get().getModEventBus().addListener(Client::setup);
-			FMLJavaModLoadingContext.get().getModEventBus().addListener(Client::postSetup);
+	public static class Client extends Proxy {
+		public Client() {
+			// Register mod event bus listeners
+			IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus();
+			modEventBus.addListener(Client::setup);
+			modEventBus.addListener(Client::postSetup);
 		}
 		
 		private static void setup(FMLClientSetupEvent event) {}
@@ -94,9 +100,11 @@ class SideProxy implements ISideProxy {
 	}
 	
 	// Server setup
-	static class Server extends SideProxy {
-		Server() {
-			FMLJavaModLoadingContext.get().getModEventBus().addListener(Server::setup);
+	public static class Server extends Proxy {
+		public Server() {
+			// Register mod event bus listeners
+			IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus();
+			modEventBus.addListener(Server::setup);
 		}
 		
 		private static void setup(FMLDedicatedServerSetupEvent event) {}

src/main/java/dev/micle/totemofreviving/setup/Config.java

@@ -1,4 +1,4 @@
-package dev.micle.totemofreviving.config;
+package dev.micle.totemofreviving.setup;
 
 import dev.micle.totemofreviving.item.totem.DiamondTotemItem;
 import dev.micle.totemofreviving.item.totem.IronTotemItem;
@@ -15,15 +15,15 @@ public final class Config {
 	
 	public static class Server {
 		private static final ForgeConfigSpec SPEC;
-		
+
 		private static final TotemConfig STRAW_TOTEM_CONFIG;
 		private static final TotemConfig IRON_TOTEM_CONFIG;
 		private static final TotemConfig DIAMOND_TOTEM_CONFIG;
 		private static final TotemConfig NETHERITE_TOTEM_CONFIG;
-		
+
 		static {
 			ForgeConfigSpec.Builder builder = new ForgeConfigSpec.Builder();
-			
+
 			builder.comment("WHEN MAKING CHANGES IT IS RECOMMENDED TO NOT BE IN A WORLD.\n" +
 					"CHANGES WILL MOST LIKELY REQUIRE A RESTART FOR EVERYTHING TO WORK PROPERLY.");
 			STRAW_TOTEM_CONFIG = new TotemConfig(builder, StrawTotemItem.getName(), true, -1, 3,
@@ -34,7 +34,7 @@ public final class Config {
 					0.5, false, false, 10);
 			NETHERITE_TOTEM_CONFIG = new TotemConfig(builder, NetheriteTotemItem.getName(), true, 1, 1,
 					1, true, true, 0);
-			
+
 			SPEC = builder.build();
 		}
 		

src/main/java/dev/micle/totemofreviving/setup/ModKeyMappings.java

@@ -5,5 +5,5 @@ import net.minecraft.client.KeyMapping;
 
 public class ModKeyMappings {
 	public static final KeyMapping ADVANCED_TOOLTIP =
-			new KeyMapping("advanced_tooltip", InputConstants.KEY_LSHIFT, KeyMapping.CATEGORY_INVENTORY);
+			new KeyMapping("advanced_tooltips", InputConstants.KEY_LSHIFT, KeyMapping.CATEGORY_INVENTORY);
 }

src/main/java/dev/micle/totemofreviving/setup/Registration.java

@@ -11,6 +11,7 @@ import net.minecraftforge.registries.IForgeRegistry;
 import net.minecraftforge.registries.IForgeRegistryEntry;
 
 public class Registration {
+    // Initialize variables
     public static final DeferredRegister<Item> ITEMS = create(ForgeRegistries.ITEMS);
 	public static final DeferredRegister<RecipeSerializer<?>> RECIPE_SERIALIZERS = create(ForgeRegistries.RECIPE_SERIALIZERS);
 

src/main/java/dev/micle/totemofreviving/util/MismatchedVersionException.java

@@ -1,7 +0,0 @@
-package dev.micle.totemofreviving.util;
-
-public class MismatchedVersionException extends RuntimeException {
-	public MismatchedVersionException(String msg) {
-		super(msg);
-	}
-}

src/main/resources/META-INF/mods.toml

@@ -6,7 +6,7 @@
 # The name of the mod loader type to load - for regular FML @Mod mods it should be javafml
 modLoader = "javafml" #mandatory
 # A version range to match for said mod loader - for regular FML @Mod it will be the forge version
-loaderVersion = "[39,)" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions.
+loaderVersion = "[40,)" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions.
 # The license for you mod. This is mandatory metadata and allows for easier comprehension of your redistributive properties.
 # Review your options at https://choosealicense.com/. All rights reserved is the default copyright stance, and is thus the default here.
 license = "All Rights Reserved"
@@ -27,7 +27,7 @@ displayName = "Micle's Totem of Reviving" #mandatory
 # A URL for the "homepage" for this mod, displayed in the mod UI
 #displayURL="http://example.com/" #optional
 # A file name (in the root of the mod JAR) containing a logo for display
-#logoFile="totemofreviving.png" #optional
+logoFile="logo.jpg" #optional
 # A text field displayed in the mod UI
 #credits="Thanks for this example mod goes to Java" #optional
 # A text field displayed in the mod UI
@@ -43,7 +43,7 @@ Mod for reviving players in a hardcore world.
     # Does this dependency have to exist - if not, ordering below must be specified
     mandatory = true #mandatory
     # The version range of the dependency
-    versionRange = "[39,)" #mandatory
+    versionRange = "[40,)" #mandatory
     # An ordering relationship for the dependency - BEFORE or AFTER required if the relationship is not mandatory
     ordering = "NONE"
     # Side this dependency is applied on - BOTH, CLIENT or SERVER
@@ -53,6 +53,6 @@ Mod for reviving players in a hardcore world.
     modId = "minecraft"
     mandatory = true
     # This version range declares a minimum of the current minecraft version up to but not including the next major version
-    versionRange = "[1.18.1,1.19)"
+    versionRange = "[1.18.2,1.19)"
     ordering = "NONE"
     side = "BOTH"

src/main/resources/assets/totemofreviving/lang/en_us.json

@@ -7,5 +7,6 @@
   "item.totemofreviving.straw_charge": "Straw reviving charge",
   "item.totemofreviving.iron_charge": "Iron reviving charge",
   "item.totemofreviving.diamond_charge": "Diamond reviving charge",
-  "item.totemofreviving.netherite_charge": "Netherite reviving charge"
+  "item.totemofreviving.netherite_charge": "Netherite reviving charge",
+  "advanced_tooltips": "advanced_tooltips"
 }