post merge fixes

Engine-Room · Oct 2, 2024 · 64a0c0d · 64a0c0d
1 parent 08866ed
commit 64a0c0d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/model/ModelUtil.java b/common/src/lib/java/dev/engine_room/flywheel/lib/model/ModelUtil.java
@@ -60,7 +60,7 @@ public static Material getItemMaterial(RenderType renderType) {
 		if (renderType == Sheets.translucentCullBlockSheet() || renderType == Sheets.translucentItemSheet()) {
 			return Materials.CUTOUT_BLOCK;
 		}
-		if (renderType == RenderType.glint() || renderType == RenderType.glintDirect()) {
+		if (renderType == RenderType.glint() || renderType == RenderType.glintTranslucent()) {
 			return Materials.GLINT;
 		}
 		if (renderType == RenderType.entityGlint() || renderType == RenderType.entityGlintDirect()) {

diff --git a/common/src/main/java/dev/engine_room/flywheel/impl/compat/SodiumCompat.java b/common/src/main/java/dev/engine_room/flywheel/impl/compat/SodiumCompat.java
@@ -6,6 +6,7 @@
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.entity.BlockEntityType;
 
+@SuppressWarnings({"unchecked", "UnstableApiUsage"})
 public class SodiumCompat {
 	public static <T extends BlockEntity> Object forBlockEntityType(BlockEntityType<T> type) {
 		BlockEntityRenderPredicate<T> predicate = (getter, pos, be) -> VisualizationHelper.tryAddBlockEntity(be);

diff --git a/common/src/main/java/dev/engine_room/flywheel/impl/mixin/LevelRendererMixin.java b/common/src/main/java/dev/engine_room/flywheel/impl/mixin/LevelRendererMixin.java
@@ -14,6 +14,8 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
+import com.mojang.blaze3d.vertex.PoseStack;
+
 import dev.engine_room.flywheel.api.visualization.VisualizationManager;
 import dev.engine_room.flywheel.impl.FlwImplXplat;
 import dev.engine_room.flywheel.impl.event.RenderContextImpl;
@@ -124,8 +126,8 @@ abstract class LevelRendererMixin {
 	}
 
 	@Inject(method = "renderEntity", at = @At("HEAD"), cancellable = true)
-	private void flywheel$decideNotToRenderEntity(Entity pEntity, double pCamX, double pCamY, double pCamZ, float pPartialTick, PoseStack pPoseStack, MultiBufferSource pBufferSource, CallbackInfo ci) {
-		if (VisualizationManager.supportsVisualization(pEntity.level()) && VisualizationHelper.skipVanillaRender(pEntity)) {
+	private void flywheel$decideNotToRenderEntity(Entity entity, double camX, double camY, double camZ, float partialTick, PoseStack poseStack, MultiBufferSource bufferSource, CallbackInfo ci) {
+		if (VisualizationManager.supportsVisualization(entity.level()) && VisualizationHelper.skipVanillaRender(entity)) {
 			ci.cancel();
 		}
 	}

diff --git a/forge/src/main/java/dev/engine_room/flywheel/impl/ForgeFlwConfig.java b/forge/src/main/java/dev/engine_room/flywheel/impl/ForgeFlwConfig.java
@@ -101,7 +101,7 @@ private ClientConfig(ModConfigSpec.Builder builder) {
 
 	public static class ForgeBackendConfig implements BackendConfig {
 		public final ModConfigSpec.EnumValue<LightSmoothness> lightSmoothness;
-		public final ForgeConfigSpec.BooleanValue useLightDirections;
+		public final ModConfigSpec.BooleanValue useLightDirections;
 
 		public ForgeBackendConfig(ModConfigSpec.Builder builder) {
 			lightSmoothness = builder.comment("How smooth flywheel's shader-based lighting should be. May have a large performance impact.")