DBot/overdrive_that_matters
DBot/overdrive_that_matters
3
1
Fork 0
Code Issues 63 Pull Requests Packages Releases Wiki Activity

Make main source set compile against 1.21

Browse Source
This commit is contained in:
DBotThePony 2024-08-26 20:21:28 +07:00
parent e3990d7fb5
commit 21f285ca0f
Signed by: DBot
GPG Key ID: DCC23B5715498507
3 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/main/java/ru/dbotthepony/mc/otm/client/model/ExosuitModel.java
View File

@ -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.layers.RenderLayer;
import net.minecraft.client.renderer.entity.player.PlayerRenderer; import net.minecraft.client.renderer.entity.player.PlayerRenderer;
import net.minecraft.resources.ResourceLocation; 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.OverdriveThatMatters;
import ru.dbotthepony.mc.otm.capability.MatteryCapability; import ru.dbotthepony.mc.otm.capability.IMatteryPlayer;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
import java.util.Set; import java.util.Set;
@ -31,8 +31,8 @@ public final class ExosuitModel {
public static final HumanoidModel<AbstractClientPlayer> modelNormal; public static final HumanoidModel<AbstractClientPlayer> modelNormal;
public static final HumanoidModel<AbstractClientPlayer> modelGlow; 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 texture = ResourceLocation.fromNamespaceAndPath(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 textureColor = ResourceLocation.fromNamespaceAndPath(OverdriveThatMatters.MOD_ID, "textures/models/armor/exosuit_color.png");
static { static {
MeshDefinition meshdefinition = new MeshDefinition(); MeshDefinition meshdefinition = new MeshDefinition();
@ -103,7 +103,6 @@ public final class ExosuitModel {
super(p_117346_); super(p_117346_);
} }
@SuppressWarnings("OptionalGetWithoutIsPresent")
@Override @Override
public void render( public void render(
@Nonnull PoseStack poseStack, @Nonnull PoseStack poseStack,
@ -120,13 +119,7 @@ public final class ExosuitModel {
if (player.isInvisible()) if (player.isInvisible())
return; return;
var cap = player.getCapability(MatteryCapability.MATTERY_PLAYER); var mattery = ((IMatteryPlayer) player).getOtmPlayer();
if (!cap.isPresent()) {
return;
}
var mattery = cap.resolve().get();
if (mattery.getHasExopack() && mattery.isExopackVisible()) { if (mattery.getHasExopack() && mattery.isExopackVisible()) {
var model = getParentModel(); var model = getParentModel();
@ -141,10 +134,10 @@ public final class ExosuitModel {
packedLight, packedLight,
overlayCoords, overlayCoords,
// rgba // rgba
1f, 1f, 1f, 1f -1
); );
var color = cap.resolve().get().getExopackColor(); var color = mattery.getExopackColor();
if (color != null) { if (color != null) {
modelNormal.renderToBuffer( modelNormal.renderToBuffer(
@ -152,8 +145,7 @@ public final class ExosuitModel {
bufferSource.getBuffer(RenderType.entityCutoutNoCull(textureColor)), bufferSource.getBuffer(RenderType.entityCutoutNoCull(textureColor)),
packedLight, packedLight,
overlayCoords, overlayCoords,
// rgba color.toBGRA()
color.getRed(), color.getGreen(), color.getBlue(), 1f
); );
} }
@ -163,8 +155,7 @@ public final class ExosuitModel {
bufferSource.getBuffer(RenderType.entityTranslucentEmissive(texture)), bufferSource.getBuffer(RenderType.entityTranslucentEmissive(texture)),
packedLight, packedLight,
overlayCoords, overlayCoords,
// rgba -1
1f, 1f, 1f, 1f
); );
} else { } else {
modelGlow.renderToBuffer( modelGlow.renderToBuffer(
@ -173,7 +164,7 @@ public final class ExosuitModel {
packedLight, packedLight,
overlayCoords, overlayCoords,
// rgba // rgba
1f, 1f, 1f, 1f -1
); );
} }

3
src/main/java/ru/dbotthepony/mc/otm/client/model/GravitationStabilizerModel.java
View File

@ -4,8 +4,7 @@ import net.minecraft.client.model.HumanoidModel;
import net.minecraft.client.model.geom.ModelLayerLocation; import net.minecraft.client.model.geom.ModelLayerLocation;
import net.minecraft.client.model.geom.PartPose; import net.minecraft.client.model.geom.PartPose;
import net.minecraft.client.model.geom.builders.*; import net.minecraft.client.model.geom.builders.*;
import net.minecraftforge.client.ForgeHooksClient; import net.neoforged.neoforge.client.event.EntityRenderersEvent;
import net.minecraftforge.client.event.EntityRenderersEvent;
import ru.dbotthepony.mc.otm.OverdriveThatMatters; import ru.dbotthepony.mc.otm.OverdriveThatMatters;
import ru.dbotthepony.mc.otm.registry.MNames; import ru.dbotthepony.mc.otm.registry.MNames;

3
src/main/java/ru/dbotthepony/mc/otm/client/model/TritaniumArmorModel.java
View File

@ -11,8 +11,7 @@ import net.minecraft.client.model.geom.ModelLayerLocation;
import net.minecraft.client.model.geom.ModelLayers; import net.minecraft.client.model.geom.ModelLayers;
import net.minecraft.client.model.geom.PartPose; import net.minecraft.client.model.geom.PartPose;
import net.minecraft.client.model.geom.builders.*; import net.minecraft.client.model.geom.builders.*;
import net.minecraftforge.client.ForgeHooksClient; import net.neoforged.neoforge.client.event.EntityRenderersEvent;
import net.minecraftforge.client.event.EntityRenderersEvent;
import javax.annotation.ParametersAreNonnullByDefault; import javax.annotation.ParametersAreNonnullByDefault;