Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RPLE and OptiFine compatibility #43

Merged
merged 11 commits into from
Jan 8, 2024
Merged

RPLE and OptiFine compatibility #43

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
fe22b47
begin shader compat
FalsePattern Dec 5, 2023
ee875ea
disable shaderpack disabling
FalsePattern Dec 5, 2023
ba17ea4
shaders detection
FalsePattern Dec 5, 2023
6a42f82
Dirty OF Shader Compat
basdxz Dec 5, 2023
428f6d3
Skip frustrum check with shaders
basdxz Jan 5, 2024
30f596f
stop renderlists logic from running at all
FalsePattern Jan 7, 2024
988ac0f
more robust mixins
FalsePattern Jan 7, 2024
4412a9f
RPLE shader compat
FalsePattern Jan 7, 2024
25f7580
cleanup run
FalsePattern Jan 7, 2024
9d83b4a
fix frustum check boolean logic
FalsePattern Jan 7, 2024
3dfe82e
Make the multi-implementation methods a bit nicer to work with
FalsePattern Jan 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 18 additions & 3 deletions src/main/java/makamys/neodymium/Neodymium.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,12 @@
import java.util.ArrayList;
import java.util.List;

import makamys.neodymium.renderer.compat.RenderUtil;
import makamys.neodymium.renderer.compat.RenderUtilRPLE;
import makamys.neodymium.renderer.compat.RenderUtilShaderRPLE;
import makamys.neodymium.renderer.compat.RenderUtilShaders;
import makamys.neodymium.renderer.compat.RenderUtilVanilla;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

import cpw.mods.fml.client.event.ConfigChangedEvent;
import cpw.mods.fml.common.FMLCommonHandler;
Expand All @@ -18,7 +21,6 @@
import cpw.mods.fml.common.event.FMLConstructionEvent;
import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.common.event.FMLServerAboutToStartEvent;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.gameevent.TickEvent;
import cpw.mods.fml.common.network.FMLNetworkEvent.ClientConnectedToServerEvent;
Expand Down Expand Up @@ -49,6 +51,8 @@ public class Neodymium
private boolean renderDebugText = false;

public static NeoRenderer renderer;

public static RenderUtil util;

private static World rendererWorld;

Expand Down Expand Up @@ -97,6 +101,17 @@ private void onPlayerWorldChanged(World newWorld) {
List<Warning> criticalWarns = warnsAndCriticalWarns.getRight();

if(criticalWarns.isEmpty()) {
boolean rple = Compat.isRPLEModPresent();
boolean optiFineShaders = Compat.isOptiFineShadersEnabled();
if (rple && optiFineShaders) {
util = RenderUtilShaderRPLE.INSTANCE;
} else if (optiFineShaders) {
util = RenderUtilShaders.INSTANCE;
} else if (rple) {
util = RenderUtilRPLE.INSTANCE;
} else {
util = RenderUtilVanilla.INSTANCE;
}
renderer = new NeoRenderer(newWorld);
renderer.hasIncompatibilities = !warns.isEmpty() || !criticalWarns.isEmpty();
}
Expand Down
12 changes: 6 additions & 6 deletions src/main/java/makamys/neodymium/renderer/ChunkMesh.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ private ByteBuffer createBuffer(List<? extends MeshQuad> quads, int quadCount) {
if(subMeshStart[subMeshStartIdx] == -1) {
subMeshStart[subMeshStartIdx] = i;
}
quad.writeToBuffer(out, stride);
Neodymium.util.writeMeshQuadToBuffer(quad, out, stride);
i++;
} else if(sortByNormals){
break;
Expand Down Expand Up @@ -301,12 +301,12 @@ public double distSq(Entity player) {
public static void setCaptureTarget(ChunkMesh cm) {
meshCaptureTarget = cm;
}

public static class Flags {
boolean hasTexture;
boolean hasBrightness;
boolean hasColor;
boolean hasNormals;
public boolean hasTexture;
public boolean hasBrightness;
public boolean hasColor;
public boolean hasNormals;

public Flags(byte flags) {
hasTexture = (flags & 1) != 0;
Expand Down
Loading