WIP port to 1.21 (PART 1)

build.gradle

@@ -3,7 +3,7 @@ plugins {
     id 'eclipse'
     id 'idea'
     id 'maven-publish'
-    id 'net.neoforged.gradle.userdev' version '7.0.134'
+    id 'net.neoforged.gradle.userdev' version '7.0.161'
     id 'net.darkhax.curseforgegradle' version '1.1.24'
     id 'com.modrinth.minotaur' version "2.+"
 }
@@ -14,8 +14,8 @@ base {
     archivesName = "${mod_archive_name}-${mc_version}"
 }
 
-// Mojang ships Java 17 to end users in 1.18+, so your mod should target Java 17.
-java.toolchain.languageVersion = JavaLanguageVersion.of(17)
+// Mojang ships Java 21 to end users in 1.20.5+, so your mod should target Java 21.
+java.toolchain.languageVersion = JavaLanguageVersion.of(21)
 
 minecraft.accessTransformers.file rootProject.file('src/main/resources/META-INF/accesstransformer.cfg')
 //minecraft.accessTransformers.entry public net.minecraft.client.Minecraft textureManager # textureManager
@@ -75,10 +75,10 @@ repositories {
 dependencies {
     implementation "net.neoforged:neoforge:${neo_version}"
 
-    compileOnly "mezz.jei:jei-${mc_version}-common-api:${jei_version}"
-    compileOnly "mezz.jei:jei-${mc_version}-neoforge-api:${jei_version}"
+    compileOnly "mezz.jei:jei-${jei_minecraft}-common-api:${jei_version}"
+    compileOnly "mezz.jei:jei-${jei_minecraft}-neoforge-api:${jei_version}"
 
-    runtimeOnly "mezz.jei:jei-${mc_version}-neoforge:${jei_version}"
+    localRuntime "mezz.jei:jei-${jei_minecraft}-neoforge:${jei_version}"
 
     compileOnly "vazkii.patchouli:Patchouli:${patchouli_version}:api"
     runtimeOnly "vazkii.patchouli:Patchouli:${patchouli_version}"
@@ -168,6 +168,10 @@ if (System.getenv().MODRINTH_KEY) {
     }
 }
 
-tasks.withType(JavaCompile).configureEach {
-    options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation
-}
+// IDEA no longer automatically downloads sources/javadoc jars for dependencies, so we need to explicitly enable the behavior.
+idea {
+    module {
+        downloadSources = true
+        downloadJavadoc = true
+    }
+}

gradle.properties

@@ -5,10 +5,10 @@ org.gradle.daemon=false
 org.gradle.debug=false
 
 # Base info
-mc_version=1.20.4
-neo_version=20.4.232
-neogradle.subsystems.parchment.minecraftVersion=1.20.4
-neogradle.subsystems.parchment.mappingsVersion=2024.04.14
+mc_version=1.21.1
+neo_version=21.1.15
+neogradle.subsystems.parchment.minecraftVersion=1.21
+neogradle.subsystems.parchment.mappingsVersion=2024.07.28
 neogradle.subsystems.conventions.runs.create-default-run-per-type=false
 mod_group=com.mrbysco.forcecraft
 mod_id=forcecraft
@@ -23,6 +23,7 @@ curseforge_id=454802
 modrinth_id=Nwz7U1QT
 
 # Dependencies
-jei_version=17.3.0.49
-patchouli_version=1.20.4-85-NEOFORGE
-patchouli_provider_version=1.20.4-1.0.10-Snapshot.7
+jei_minecraft=1.21.1
+jei_version=19.8.5.118
+patchouli_version=1.21-87-NEOFORGE-SNAPSHOT
+patchouli_provider_version=1.21-1.0.11-Snapshot.2

src/main/java/com/mrbysco/forcecraft/ForceCraft.java

@@ -30,12 +30,16 @@
 import com.mrbysco.forcecraft.world.feature.ForceFeatures;
 import net.minecraft.core.dispenser.ShearsDispenseItemBehavior;
 import net.minecraft.world.level.block.DispenserBlock;
+import net.neoforged.api.distmarker.Dist;
 import net.neoforged.bus.api.IEventBus;
+import net.neoforged.fml.ModContainer;
 import net.neoforged.fml.ModLoadingContext;
 import net.neoforged.fml.common.Mod;
 import net.neoforged.fml.config.ModConfig;
 import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent;
 import net.neoforged.fml.loading.FMLEnvironment;
+import net.neoforged.neoforge.client.gui.ConfigurationScreen;
+import net.neoforged.neoforge.client.gui.IConfigScreenFactory;
 import net.neoforged.neoforge.common.NeoForge;
 import net.neoforged.neoforge.common.NeoForgeMod;
 import org.apache.logging.log4j.LogManager;
@@ -46,8 +50,8 @@ public class ForceCraft {
 
 	public static final Logger LOGGER = LogManager.getLogger(Reference.MOD_ID);
 
-	public ForceCraft(IEventBus eventBus) {
-		ModLoadingContext.get().registerConfig(ModConfig.Type.COMMON, ConfigHandler.commonSpec);
+	public ForceCraft(IEventBus eventBus, ModContainer container, Dist dist) {
+		container.registerConfig(ModConfig.Type.COMMON, ConfigHandler.commonSpec);
 		eventBus.register(ConfigHandler.class);
 
 		eventBus.addListener(CapabilityHandler::registerCapabilities);
@@ -90,7 +94,8 @@ public ForceCraft(IEventBus eventBus) {
 
 		NeoForgeMod.enableMilkFluid(); //Enable milk from forge
 
-		if (FMLEnvironment.dist.isClient()) {
+		if (dist.isClient()) {
+			container.registerExtensionPoint(IConfigScreenFactory.class, ConfigurationScreen::new);
 			eventBus.addListener(ClientHandler::onClientSetup);
 			eventBus.addListener(ClientHandler::onRegisterMenu);
 			eventBus.addListener(ClientHandler::registerKeymapping);

src/main/java/com/mrbysco/forcecraft/Reference.java

@@ -1,6 +1,7 @@
 package com.mrbysco.forcecraft;
 
 import com.mrbysco.forcecraft.registry.ForceDamageTypes;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.world.entity.Entity;
 
@@ -48,4 +49,8 @@ public static DamageSource causeBleedingDamage(Entity entity) {
 	public static DamageSource causeLiquidForceDamage(Entity entity) {
 		return entity.damageSources().source(ForceDamageTypes.LIQUID_FORCE, entity);
 	}
+
+	public static ResourceLocation modLoc(String path) {
+		return ResourceLocation.fromNamespaceAndPath(MOD_ID, path);
+	}
 }

src/main/java/com/mrbysco/forcecraft/client/ClientHandler.java

@@ -47,9 +47,9 @@
 import static com.mrbysco.forcecraft.attachment.ForceAttachments.MAGNET;
 
 public class ClientHandler {
-	public static final ModelLayerLocation CREEPER_TOT = new ModelLayerLocation(new ResourceLocation(Reference.MOD_ID, "creeper_tot"), "main");
-	public static final ModelLayerLocation FAIRY = new ModelLayerLocation(new ResourceLocation(Reference.MOD_ID, "fairy"), "main");
-	public static final ModelLayerLocation ENDERTOT = new ModelLayerLocation(new ResourceLocation(Reference.MOD_ID, "endertot"), "main");
+	public static final ModelLayerLocation CREEPER_TOT = new ModelLayerLocation(Reference.modLoc("creeper_tot"), "main");
+	public static final ModelLayerLocation FAIRY = new ModelLayerLocation(Reference.modLoc("fairy"), "main");
+	public static final ModelLayerLocation ENDERTOT = new ModelLayerLocation(Reference.modLoc("endertot"), "main");
 
 	public static void onClientSetup(final FMLClientSetupEvent event) {
 		ItemBlockRenderTypes.setRenderLayer(ForceFluids.FORCE_FLUID_FLOWING.get(), RenderType.translucent());

src/main/java/com/mrbysco/forcecraft/client/ShakeUtil.java

@@ -3,22 +3,24 @@
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.math.Axis;
 import com.mrbysco.forcecraft.registry.ForceEffects;
+import net.minecraft.client.DeltaTracker;
 import net.minecraft.client.Minecraft;
 import net.minecraft.util.Mth;
 import net.minecraft.world.entity.player.Player;
 
 public class ShakeUtil {
 
-	public static void shakeScreen(Minecraft minecraft, float partialTicks, long finishTimeNano, PoseStack poseStack) {
-		float effectScale = minecraft.options.screenEffectScale().get().floatValue();
-		if (minecraft.getCameraEntity() instanceof Player player && player.hasEffect(ForceEffects.SHAKING.get()) & effectScale > 0.0F) {
+	public static void shakeScreen(Minecraft minecraft, DeltaTracker deltaTracker, PoseStack poseStack) {
+		final float effectScale = minecraft.options.screenEffectScale().get().floatValue();
+		final float partialTicks = deltaTracker.getGameTimeDeltaPartialTick(false);
+		if (minecraft.getCameraEntity() instanceof Player player && player.hasEffect(ForceEffects.SHAKING) & effectScale > 0.0F) {
 			float f = player.walkDist - player.walkDistO;
 			float f1 = -(player.walkDist + f * partialTicks);
 			float f2 = Mth.lerp(partialTicks, player.oBob, player.bob);
 
 			// Calculate screen shake offsets based on the provided strength
 			float shakeAmount = effectScale * 0.005F; // Adjust this value to control the intensity of the shake
-			float time = finishTimeNano / 1000.0f; // Use time for animation
+			float time = 0 / 1000.0f; // Use time for animation
 
 			// Calculate the X-axis offset for rocking back and forth
 			float offsetX = (float) Math.sin(time * 0.5f) * shakeAmount;

src/main/java/com/mrbysco/forcecraft/client/gui/belt/ForceBeltScreen.java

@@ -9,7 +9,7 @@
 import net.minecraft.world.entity.player.Inventory;
 
 public class ForceBeltScreen extends AbstractContainerScreen<ForceBeltMenu> {
-	private final ResourceLocation TEXTURE = new ResourceLocation(Reference.MOD_ID, "textures/gui/container/forcebelt.png");
+	private final ResourceLocation TEXTURE = Reference.modLoc("textures/gui/container/forcebelt.png");
 
 	public ForceBeltScreen(ForceBeltMenu screenContainer, Inventory inv, Component titleIn) {
 		super(screenContainer, inv, titleIn);

src/main/java/com/mrbysco/forcecraft/client/gui/card/ItemCardScreen.java

@@ -14,7 +14,7 @@
 import net.neoforged.neoforge.network.PacketDistributor;
 
 public class ItemCardScreen extends AbstractContainerScreen<ItemCardMenu> {
-	private static final ResourceLocation ITEM_CARD_GUI = new ResourceLocation(Reference.MOD_ID, "textures/gui/crafting3x3.png");
+	private static final ResourceLocation ITEM_CARD_GUI = Reference.modLoc("textures/gui/crafting3x3.png");
 	private static final Component saveText = Component.literal("\u2714");
 	private static final Component invalidText = Component.literal("\u2718");
 	private Button buttonSave;

src/main/java/com/mrbysco/forcecraft/client/gui/engine/ForceEngineScreen.java

@@ -16,7 +16,7 @@
 import java.util.List;
 
 public class ForceEngineScreen extends AbstractContainerScreen<ForceEngineMenu> {
-	private final ResourceLocation TEXTURE = new ResourceLocation(Reference.MOD_ID, "textures/gui/container/force_engine.png");
+	private final ResourceLocation TEXTURE = Reference.modLoc("textures/gui/container/force_engine.png");
 
 	public ForceEngineScreen(ForceEngineMenu screenContainer, Inventory inv, Component titleIn) {
 		super(screenContainer, inv, titleIn);

src/main/java/com/mrbysco/forcecraft/client/gui/furnace/ForceFurnaceScreen.java

@@ -8,7 +8,7 @@
 
 
 public class ForceFurnaceScreen extends AbstractForceFurnaceScreen<ForceFurnaceMenu> {
-	private static final ResourceLocation FURNACE_GUI_TEXTURES = new ResourceLocation(Reference.MOD_ID, "textures/gui/container/furnace_gui.png");
+	private static final ResourceLocation FURNACE_GUI_TEXTURES = Reference.modLoc("textures/gui/container/furnace_gui.png");
 
 	public ForceFurnaceScreen(ForceFurnaceMenu container, Inventory playerInventory, Component title) {
 		super(container, playerInventory, title, FURNACE_GUI_TEXTURES);

src/main/java/com/mrbysco/forcecraft/client/gui/infuser/InfuserScreen.java

@@ -27,17 +27,17 @@ public class InfuserScreen extends AbstractContainerScreen<InfuserMenu> {
 	private Inventory inventory;
 	private ProgressBar infuserProgress;
 	// 12 by 107
-	private final ResourceLocation INFO = new ResourceLocation(Reference.MOD_ID, "textures/gui/container/info.png");
-	private final ResourceLocation ENERGY = new ResourceLocation(Reference.MOD_ID, "textures/gui/container/energy.png");
-	private final ResourceLocation TEXTURE = new ResourceLocation(Reference.MOD_ID, "textures/gui/container/forceinfuser.png");
+	private final ResourceLocation INFO = Reference.modLoc("textures/gui/container/info.png");
+	private final ResourceLocation ENERGY = Reference.modLoc("textures/gui/container/energy.png");
+	private final ResourceLocation TEXTURE = Reference.modLoc("textures/gui/container/forceinfuser.png");
 
 	private static final WidgetSprites GUIDE_SPRITE = new WidgetSprites(
-			new ResourceLocation(Reference.MOD_ID, "infuser/guide"),
-			new ResourceLocation(Reference.MOD_ID, "infuser/guide_highlighted")
+			Reference.modLoc("infuser/guide"),
+			Reference.modLoc("infuser/guide_highlighted")
 	);
 	private static final WidgetSprites CHISEL = new WidgetSprites(
-			new ResourceLocation(Reference.MOD_ID, "infuser/chisel"),
-			new ResourceLocation(Reference.MOD_ID, "infuser/chisel_highlight")
+			Reference.modLoc("infuser/chisel"),
+			Reference.modLoc("infuser/chisel_highlight")
 	);
 
 	private Button buttonInfuse;

src/main/java/com/mrbysco/forcecraft/client/gui/pack/ForcePackScreen.java

@@ -10,11 +10,11 @@
 
 public class ForcePackScreen extends AbstractContainerScreen<ForcePackMenu> {
 
-	private final ResourceLocation TEXTURE = new ResourceLocation(Reference.MOD_ID, "textures/gui/container/forcepack.png");
-	private final ResourceLocation TEXTURE_UPGRADE_1 = new ResourceLocation(Reference.MOD_ID, "textures/gui/container/forcepack_upgrade_1.png");
-	private final ResourceLocation TEXTURE_UPGRADE_2 = new ResourceLocation(Reference.MOD_ID, "textures/gui/container/forcepack_upgrade_2.png");
-	private final ResourceLocation TEXTURE_UPGRADE_3 = new ResourceLocation(Reference.MOD_ID, "textures/gui/container/forcepack_upgrade_3.png");
-	private final ResourceLocation TEXTURE_UPGRADE_4 = new ResourceLocation(Reference.MOD_ID, "textures/gui/container/forcepack_upgrade_4.png");
+	private final ResourceLocation TEXTURE = Reference.modLoc("textures/gui/container/forcepack.png");
+	private final ResourceLocation TEXTURE_UPGRADE_1 = Reference.modLoc("textures/gui/container/forcepack_upgrade_1.png");
+	private final ResourceLocation TEXTURE_UPGRADE_2 = Reference.modLoc("textures/gui/container/forcepack_upgrade_2.png");
+	private final ResourceLocation TEXTURE_UPGRADE_3 = Reference.modLoc("textures/gui/container/forcepack_upgrade_3.png");
+	private final ResourceLocation TEXTURE_UPGRADE_4 = Reference.modLoc("textures/gui/container/forcepack_upgrade_4.png");
 
 	public ForcePackScreen(ForcePackMenu screenContainer, Inventory inv, Component titleIn) {
 		super(screenContainer, inv, titleIn);

src/main/java/com/mrbysco/forcecraft/client/gui/pack/RenameAndRecolorScreen.java

@@ -17,7 +17,7 @@
 import net.neoforged.neoforge.network.PacketDistributor;
 
 public class RenameAndRecolorScreen extends Screen {
-	private static final ResourceLocation TEXTURE = new ResourceLocation(Reference.MOD_ID, "textures/gui/container/rename_screen.png");
+	private static final ResourceLocation TEXTURE = Reference.modLoc("textures/gui/container/rename_screen.png");
 	private ItemStack itemstack;
 	private final InteractionHand usedHand;
 	private EditBox textfield;

src/main/java/com/mrbysco/forcecraft/client/gui/spoils/SpoilsBagScreen.java

@@ -9,7 +9,7 @@
 import net.minecraft.world.entity.player.Inventory;
 
 public class SpoilsBagScreen extends AbstractContainerScreen<SpoilsBagMenu> {
-	private final ResourceLocation TEXTURE = new ResourceLocation(Reference.MOD_ID, "textures/gui/container/spoilsbag.png");
+	private final ResourceLocation TEXTURE = Reference.modLoc("textures/gui/container/spoilsbag.png");
 
 	public SpoilsBagScreen(SpoilsBagMenu screenContainer, Inventory inv, Component titleIn) {
 		super(screenContainer, inv, titleIn);

src/main/java/com/mrbysco/forcecraft/client/renderer/BlueChuChuRenderer.java

@@ -7,7 +7,7 @@
 import net.minecraft.world.entity.monster.Slime;
 
 public class BlueChuChuRenderer extends SlimeRenderer {
-	private static final ResourceLocation CHU_CHU_TEXTURE = new ResourceLocation(Reference.MOD_ID, "textures/entity/blue_chu_chu.png");
+	private static final ResourceLocation CHU_CHU_TEXTURE = Reference.modLoc("textures/entity/blue_chu_chu.png");
 
 	public BlueChuChuRenderer(EntityRendererProvider.Context context) {
 		super(context);

src/main/java/com/mrbysco/forcecraft/client/renderer/ColdChickenRenderer.java

@@ -10,7 +10,7 @@
 import net.minecraft.util.Mth;
 
 public class ColdChickenRenderer extends MobRenderer<ColdChickenEntity, ColdChickenModel<ColdChickenEntity>> {
-	private static final ResourceLocation CHICKEN_TEXTURES = new ResourceLocation(Reference.MOD_ID, "textures/entity/cold_chicken.png");
+	private static final ResourceLocation CHICKEN_TEXTURES = Reference.modLoc("textures/entity/cold_chicken.png");
 
 	public ColdChickenRenderer(EntityRendererProvider.Context context) {
 		super(context, new ColdChickenModel<>(context.bakeLayer(ModelLayers.CHICKEN)), 0.3F);

src/main/java/com/mrbysco/forcecraft/client/renderer/ColdCowRenderer.java

@@ -9,7 +9,7 @@
 import net.minecraft.resources.ResourceLocation;
 
 public class ColdCowRenderer extends MobRenderer<ColdCowEntity, ColdCowModel<ColdCowEntity>> {
-	private static final ResourceLocation COW_TEXTURES = new ResourceLocation(Reference.MOD_ID, "textures/entity/cold_cow.png");
+	private static final ResourceLocation COW_TEXTURES = Reference.modLoc("textures/entity/cold_cow.png");
 
 	public ColdCowRenderer(EntityRendererProvider.Context context) {
 		super(context, new ColdCowModel<>(context.bakeLayer(ModelLayers.COW)), 0.7F);

src/main/java/com/mrbysco/forcecraft/client/renderer/ColdPigRenderer.java

@@ -10,7 +10,7 @@
 import net.minecraft.resources.ResourceLocation;
 
 public class ColdPigRenderer extends MobRenderer<ColdPigEntity, ColdPigModel<ColdPigEntity>> {
-	private static final ResourceLocation PIG_TEXTURES = new ResourceLocation(Reference.MOD_ID, "textures/entity/cold_pig.png");
+	private static final ResourceLocation PIG_TEXTURES = Reference.modLoc("textures/entity/cold_pig.png");
 
 	public ColdPigRenderer(EntityRendererProvider.Context context) {
 		super(context, new ColdPigModel<>(context.bakeLayer(ModelLayers.PIG)), 0.7F);

src/main/java/com/mrbysco/forcecraft/client/renderer/CreeperTotRenderer.java

@@ -12,7 +12,7 @@
 import net.minecraft.util.Mth;
 
 public class CreeperTotRenderer extends MobRenderer<CreeperTotEntity, CreeperTotModel<CreeperTotEntity>> {
-	private static final ResourceLocation CREEPER_TEXTURES = new ResourceLocation(Reference.MOD_ID, "textures/entity/creeper_tot.png");
+	private static final ResourceLocation CREEPER_TEXTURES = Reference.modLoc("textures/entity/creeper_tot.png");
 
 	public CreeperTotRenderer(EntityRendererProvider.Context context) {
 		super(context, new CreeperTotModel<>(context.bakeLayer(ClientHandler.CREEPER_TOT)), 0.2F);

src/main/java/com/mrbysco/forcecraft/client/renderer/EnderTotRenderer.java

@@ -17,7 +17,7 @@
 import java.util.Random;
 
 public class EnderTotRenderer extends MobRenderer<EnderTotEntity, EnderTotModel<EnderTotEntity>> {
-	private static final ResourceLocation ENDERTOT_TEXTURES = new ResourceLocation(Reference.MOD_ID, "textures/entity/ender_tot.png");
+	private static final ResourceLocation ENDERTOT_TEXTURES = Reference.modLoc("textures/entity/ender_tot.png");
 	private final Random rnd = new Random();
 
 	public EnderTotRenderer(EntityRendererProvider.Context context) {

src/main/java/com/mrbysco/forcecraft/client/renderer/FairyRenderer.java

@@ -9,7 +9,7 @@
 import net.minecraft.resources.ResourceLocation;
 
 public class FairyRenderer extends MobRenderer<FairyEntity, FairyModel<FairyEntity>> {
-	private static final ResourceLocation FAIRY_TEXTURES = new ResourceLocation(Reference.MOD_ID, "textures/entity/fairy.png");
+	private static final ResourceLocation FAIRY_TEXTURES = Reference.modLoc("textures/entity/fairy.png");
 
 	public FairyRenderer(EntityRendererProvider.Context context) {
 		super(context, new FairyModel<>(context.bakeLayer(ClientHandler.FAIRY)), 0.2F);

src/main/java/com/mrbysco/forcecraft/client/renderer/ForceArrowRenderer.java

@@ -7,7 +7,7 @@
 import net.minecraft.resources.ResourceLocation;
 
 public class ForceArrowRenderer extends ArrowRenderer<ForceArrowEntity> {
-	public static final ResourceLocation FORCE_ARROW = new ResourceLocation(Reference.MOD_ID, "textures/entity/projectiles/force_arrow.png");
+	public static final ResourceLocation FORCE_ARROW = Reference.modLoc("textures/entity/projectiles/force_arrow.png");
 
 	public ForceArrowRenderer(EntityRendererProvider.Context context) {
 		super(context);

src/main/java/com/mrbysco/forcecraft/client/renderer/GoldChuChuRenderer.java

@@ -7,7 +7,7 @@
 import net.minecraft.world.entity.monster.Slime;
 
 public class GoldChuChuRenderer extends SlimeRenderer {
-	private static final ResourceLocation CHU_CHU_TEXTURE = new ResourceLocation(Reference.MOD_ID, "textures/entity/gold_chu_chu.png");
+	private static final ResourceLocation CHU_CHU_TEXTURE = Reference.modLoc("textures/entity/gold_chu_chu.png");
 
 	public GoldChuChuRenderer(EntityRendererProvider.Context context) {
 		super(context);

src/main/java/com/mrbysco/forcecraft/client/renderer/GreenChuChuRenderer.java

@@ -7,7 +7,7 @@
 import net.minecraft.world.entity.monster.Slime;
 
 public class GreenChuChuRenderer extends SlimeRenderer {
-	private static final ResourceLocation CHU_CHU_TEXTURE = new ResourceLocation(Reference.MOD_ID, "textures/entity/green_chu_chu.png");
+	private static final ResourceLocation CHU_CHU_TEXTURE = Reference.modLoc("textures/entity/green_chu_chu.png");
 
 	public GreenChuChuRenderer(EntityRendererProvider.Context context) {
 		super(context);

src/main/java/com/mrbysco/forcecraft/client/renderer/RedChuChuRenderer.java

@@ -7,7 +7,7 @@
 import net.minecraft.world.entity.monster.Slime;
 
 public class RedChuChuRenderer extends SlimeRenderer {
-	private static final ResourceLocation CHU_CHU_TEXTURE = new ResourceLocation(Reference.MOD_ID, "textures/entity/red_chu_chu.png");
+	private static final ResourceLocation CHU_CHU_TEXTURE = Reference.modLoc("textures/entity/red_chu_chu.png");
 
 	public RedChuChuRenderer(EntityRendererProvider.Context context) {
 		super(context);

src/main/java/com/mrbysco/forcecraft/client/renderer/layer/EndertotEyesLayer.java

@@ -9,7 +9,7 @@
 import net.minecraft.resources.ResourceLocation;
 
 public class EndertotEyesLayer<T extends EnderTotEntity> extends EyesLayer<T, EnderTotModel<T>> {
-	private static final RenderType RENDER_TYPE = RenderType.eyes(new ResourceLocation(Reference.MOD_ID, "textures/entity/ender_tot_eyes.png"));
+	private static final RenderType RENDER_TYPE = RenderType.eyes(Reference.modLoc("textures/entity/ender_tot_eyes.png"));
 
 	public EndertotEyesLayer(RenderLayerParent<T, EnderTotModel<T>> renderLayerParent) {
 		super(renderLayerParent);