mirrors/Flywheel
0
0
Fork 0
mirror of https://github.com/Jozufozu/Flywheel.git synced 2024-11-14 22:43:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

post merge fixes

Browse Source
This commit is contained in:
IThundxr 2024-10-01 21:06:00 -04:00
parent 08866edf09
commit ae4e4e79f5
No known key found for this signature in database
GPG Key ID: E291EC97BAF935E6
7 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/lib/java/dev/engine_room/flywheel/lib/model/ModelUtil.java
View File

@ -60,7 +60,7 @@ public final class ModelUtil {
if (renderType == Sheets.translucentCullBlockSheet() || renderType == Sheets.translucentItemSheet()) { if (renderType == Sheets.translucentCullBlockSheet() || renderType == Sheets.translucentItemSheet()) {
return Materials.CUTOUT_BLOCK; return Materials.CUTOUT_BLOCK;
} }
if (renderType == RenderType.glint() || renderType == RenderType.glintDirect()) { if (renderType == RenderType.glint() || renderType == RenderType.glintTranslucent()) {
return Materials.GLINT; return Materials.GLINT;
} }
if (renderType == RenderType.entityGlint() || renderType == RenderType.entityGlintDirect()) { if (renderType == RenderType.entityGlint() || renderType == RenderType.entityGlintDirect()) {

1
common/src/main/java/dev/engine_room/flywheel/impl/compat/SodiumCompat.java
View File

@ -6,6 +6,7 @@ import net.caffeinemc.mods.sodium.api.blockentity.BlockEntityRenderPredicate;
import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.entity.BlockEntityType;
@SuppressWarnings({"unchecked", "UnstableApiUsage"})
public class SodiumCompat { public class SodiumCompat {
public static <T extends BlockEntity> Object forBlockEntityType(BlockEntityType<T> type) { public static <T extends BlockEntity> Object forBlockEntityType(BlockEntityType<T> type) {
BlockEntityRenderPredicate<T> predicate = (getter, pos, be) -> VisualizationHelper.tryAddBlockEntity(be); BlockEntityRenderPredicate<T> predicate = (getter, pos, be) -> VisualizationHelper.tryAddBlockEntity(be);

6
common/src/main/java/dev/engine_room/flywheel/impl/mixin/LevelRendererMixin.java
View File

@ -14,6 +14,8 @@ import org.spongepowered.asm.mixin.injection.Group;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; 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.api.visualization.VisualizationManager;
import dev.engine_room.flywheel.impl.FlwImplXplat; import dev.engine_room.flywheel.impl.FlwImplXplat;
import dev.engine_room.flywheel.impl.event.RenderContextImpl; import dev.engine_room.flywheel.impl.event.RenderContextImpl;
@ -124,8 +126,8 @@ abstract class LevelRendererMixin {
} }
@Inject(method = "renderEntity", at = @At("HEAD"), cancellable = true) @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) { private void flywheel$decideNotToRenderEntity(Entity entity, double camX, double camY, double camZ, float partialTick, PoseStack poseStack, MultiBufferSource bufferSource, CallbackInfo ci) {
if (VisualizationManager.supportsVisualization(pEntity.level()) && VisualizationHelper.skipVanillaRender(pEntity)) { if (VisualizationManager.supportsVisualization(entity.level()) && VisualizationHelper.skipVanillaRender(entity)) {
ci.cancel(); ci.cancel();
} }
} }

3
forge/build.gradle.kts
View File

@ -85,9 +85,6 @@ dependencies {
modCompileOnly(":sodium-neoforge-0.6.0-beta.2+mc1.21.1") modCompileOnly(":sodium-neoforge-0.6.0-beta.2+mc1.21.1")
modCompileOnly("maven.modrinth:iris:${property("iris_version")}-neoforge") modCompileOnly("maven.modrinth:iris:${property("iris_version")}-neoforge")
//modCompileOnly("maven.modrinth:embeddium:${property("embeddium_version")}")
//modCompileOnly("maven.modrinth:oculus:${property("oculus_version")}")
"forApi"(project(path = ":common", configuration = "commonApiOnly")) "forApi"(project(path = ":common", configuration = "commonApiOnly"))
"forLib"(project(path = ":common", configuration = "commonLib")) "forLib"(project(path = ":common", configuration = "commonLib"))
"forBackend"(project(path = ":common", configuration = "commonBackend")) "forBackend"(project(path = ":common", configuration = "commonBackend"))

2
forge/src/main/java/dev/engine_room/flywheel/impl/ForgeFlwConfig.java
View File

@ -101,7 +101,7 @@ public class ForgeFlwConfig implements FlwConfig {
public static class ForgeBackendConfig implements BackendConfig { public static class ForgeBackendConfig implements BackendConfig {
public final ModConfigSpec.EnumValue<LightSmoothness> lightSmoothness; public final ModConfigSpec.EnumValue<LightSmoothness> lightSmoothness;
public final ForgeConfigSpec.BooleanValue useLightDirections; public final ModConfigSpec.BooleanValue useLightDirections;
public ForgeBackendConfig(ModConfigSpec.Builder builder) { public ForgeBackendConfig(ModConfigSpec.Builder builder) {
lightSmoothness = builder.comment("How smooth flywheel's shader-based lighting should be. May have a large performance impact.") lightSmoothness = builder.comment("How smooth flywheel's shader-based lighting should be. May have a large performance impact.")

5
forge/src/main/resources/META-INF/neoforge.mods.toml
View File

@ -30,3 +30,8 @@ modId = "neoforge"
type = "required" type = "required"
versionRange = "${neoforge_version_range}" versionRange = "${neoforge_version_range}"
side = "CLIENT" side = "CLIENT"
[[dependencies.${mod_id}]]
modId = "embeddium"
type = "incompatible"
reason = "Remove Embeddium and install Sodium"

3
gradle.properties
View File

@ -32,9 +32,6 @@ fabric_api_version = 0.100.6+1.21
# Build dependency mod versions # Build dependency mod versions
sodium_version = mc1.21-0.6.0-beta.1 sodium_version = mc1.21-0.6.0-beta.1
iris_version = 1.8.0-beta.1+1.21 iris_version = 1.8.0-beta.1+1.21
#embeddium_version = 1.0.4+mc1.21
# no 1.21 :(
#oculus_version = 1.20.1-1.6.15a
# Publication info # Publication info
group = dev.engine_room.flywheel group = dev.engine_room.flywheel