From 21f285ca0f1d6180f5425ce4a8e809520f7bb9fa Mon Sep 17 00:00:00 2001
From: DBotThePony <dbotthepony@yandex.ru>
Date: Mon, 26 Aug 2024 20:21:28 +0700
Subject: [PATCH] Make main source set compile against 1.21

---
 .../mc/otm/client/model/ExosuitModel.java     | 29 +++++++------------
 .../model/GravitationStabilizerModel.java     |  3 +-
 .../otm/client/model/TritaniumArmorModel.java |  3 +-
 3 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/src/main/java/ru/dbotthepony/mc/otm/client/model/ExosuitModel.java b/src/main/java/ru/dbotthepony/mc/otm/client/model/ExosuitModel.java
index cb9bbadbc..5e4cc73db 100644
--- a/src/main/java/ru/dbotthepony/mc/otm/client/model/ExosuitModel.java
+++ b/src/main/java/ru/dbotthepony/mc/otm/client/model/ExosuitModel.java
@@ -18,9 +18,9 @@ import net.minecraft.client.renderer.entity.RenderLayerParent;
 import net.minecraft.client.renderer.entity.layers.RenderLayer;
 import net.minecraft.client.renderer.entity.player.PlayerRenderer;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraftforge.client.event.RenderPlayerEvent;
+import net.neoforged.neoforge.client.event.RenderPlayerEvent;
 import ru.dbotthepony.mc.otm.OverdriveThatMatters;
-import ru.dbotthepony.mc.otm.capability.MatteryCapability;
+import ru.dbotthepony.mc.otm.capability.IMatteryPlayer;
 
 import javax.annotation.Nonnull;
 import java.util.Set;
@@ -31,8 +31,8 @@ public final class ExosuitModel {
 	public static final HumanoidModel<AbstractClientPlayer> modelNormal;
 	public static final HumanoidModel<AbstractClientPlayer> modelGlow;
 
-	public static final ResourceLocation texture = new ResourceLocation(OverdriveThatMatters.MOD_ID, "textures/models/armor/exosuit.png");
-	public static final ResourceLocation textureColor = new ResourceLocation(OverdriveThatMatters.MOD_ID, "textures/models/armor/exosuit_color.png");
+	public static final ResourceLocation texture = ResourceLocation.fromNamespaceAndPath(OverdriveThatMatters.MOD_ID, "textures/models/armor/exosuit.png");
+	public static final ResourceLocation textureColor = ResourceLocation.fromNamespaceAndPath(OverdriveThatMatters.MOD_ID, "textures/models/armor/exosuit_color.png");
 
 	static {
 		MeshDefinition meshdefinition = new MeshDefinition();
@@ -103,7 +103,6 @@ public final class ExosuitModel {
 			super(p_117346_);
 		}
 
-		@SuppressWarnings("OptionalGetWithoutIsPresent")
 		@Override
 		public void render(
 			@Nonnull PoseStack poseStack,
@@ -120,13 +119,7 @@ public final class ExosuitModel {
 			if (player.isInvisible())
 				return;
 
-			var cap = player.getCapability(MatteryCapability.MATTERY_PLAYER);
-
-			if (!cap.isPresent()) {
-				return;
-			}
-
-			var mattery = cap.resolve().get();
+			var mattery = ((IMatteryPlayer) player).getOtmPlayer();
 
 			if (mattery.getHasExopack() && mattery.isExopackVisible()) {
 				var model = getParentModel();
@@ -141,10 +134,10 @@ public final class ExosuitModel {
 					packedLight,
 					overlayCoords,
 					// rgba
-					1f, 1f, 1f, 1f
+					-1
 				);
 
-				var color = cap.resolve().get().getExopackColor();
+				var color = mattery.getExopackColor();
 
 				if (color != null) {
 					modelNormal.renderToBuffer(
@@ -152,8 +145,7 @@ public final class ExosuitModel {
 						bufferSource.getBuffer(RenderType.entityCutoutNoCull(textureColor)),
 						packedLight,
 						overlayCoords,
-						// rgba
-						color.getRed(), color.getGreen(), color.getBlue(), 1f
+						color.toBGRA()
 					);
 				}
 
@@ -163,8 +155,7 @@ public final class ExosuitModel {
 						bufferSource.getBuffer(RenderType.entityTranslucentEmissive(texture)),
 						packedLight,
 						overlayCoords,
-						// rgba
-						1f, 1f, 1f, 1f
+						-1
 					);
 				} else {
 					modelGlow.renderToBuffer(
@@ -173,7 +164,7 @@ public final class ExosuitModel {
 						packedLight,
 						overlayCoords,
 						// rgba
-						1f, 1f, 1f, 1f
+						-1
 					);
 				}
 
diff --git a/src/main/java/ru/dbotthepony/mc/otm/client/model/GravitationStabilizerModel.java b/src/main/java/ru/dbotthepony/mc/otm/client/model/GravitationStabilizerModel.java
index fbd689852..e73630ba2 100644
--- a/src/main/java/ru/dbotthepony/mc/otm/client/model/GravitationStabilizerModel.java
+++ b/src/main/java/ru/dbotthepony/mc/otm/client/model/GravitationStabilizerModel.java
@@ -4,8 +4,7 @@ import net.minecraft.client.model.HumanoidModel;
 import net.minecraft.client.model.geom.ModelLayerLocation;
 import net.minecraft.client.model.geom.PartPose;
 import net.minecraft.client.model.geom.builders.*;
-import net.minecraftforge.client.ForgeHooksClient;
-import net.minecraftforge.client.event.EntityRenderersEvent;
+import net.neoforged.neoforge.client.event.EntityRenderersEvent;
 import ru.dbotthepony.mc.otm.OverdriveThatMatters;
 import ru.dbotthepony.mc.otm.registry.MNames;
 
diff --git a/src/main/java/ru/dbotthepony/mc/otm/client/model/TritaniumArmorModel.java b/src/main/java/ru/dbotthepony/mc/otm/client/model/TritaniumArmorModel.java
index 028b769e0..b990882c7 100644
--- a/src/main/java/ru/dbotthepony/mc/otm/client/model/TritaniumArmorModel.java
+++ b/src/main/java/ru/dbotthepony/mc/otm/client/model/TritaniumArmorModel.java
@@ -11,8 +11,7 @@ import net.minecraft.client.model.geom.ModelLayerLocation;
 import net.minecraft.client.model.geom.ModelLayers;
 import net.minecraft.client.model.geom.PartPose;
 import net.minecraft.client.model.geom.builders.*;
-import net.minecraftforge.client.ForgeHooksClient;
-import net.minecraftforge.client.event.EntityRenderersEvent;
+import net.neoforged.neoforge.client.event.EntityRenderersEvent;
 
 import javax.annotation.ParametersAreNonnullByDefault;