Skip to content

Commit eb58cff

Browse files
committed
fix upstream merging
1 parent e11152e commit eb58cff

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/main/java/gregtech/client/renderer/scene/VBOWorldSceneRenderer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ protected void disableClientStates() {
151151
}
152152

153153
protected void setupArrayPointers() {
154-
if (Mods.Optifine.isModLoaded()) {
154+
if (Mods.ShadersMod.isModLoaded()) {
155155
ShadersRender.setupArrayPointersVbo();
156156
} else {
157157
// 28 == DefaultVertexFormats.BLOCK.getSize();

src/main/java/gregtech/client/utils/OptiFineHelper.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,18 @@
88
public class OptiFineHelper {
99

1010
public static BlockRenderLayer getOFSafeLayer(BlockRenderLayer layer) {
11-
if (!Mods.Optifine.isModLoaded()) return layer;
11+
if (!Mods.ShadersMod.isModLoaded()) return layer;
1212
return layer == BloomEffectUtil.getBloomLayer() ? BloomEffectUtil.getEffectiveBloomLayer() : layer;
1313
}
1414

1515
public static void preRenderChunkLayer(BlockRenderLayer layer) {
16-
if (Mods.Optifine.isModLoaded()) {
16+
if (Mods.ShadersMod.isModLoaded()) {
1717
ShadersRender.preRenderChunkLayer(getOFSafeLayer(layer));
1818
}
1919
}
2020

2121
public static void postRenderChunkLayer(BlockRenderLayer layer) {
22-
if (Mods.Optifine.isModLoaded()) {
22+
if (Mods.ShadersMod.isModLoaded()) {
2323
ShadersRender.postRenderChunkLayer(getOFSafeLayer(layer));
2424
}
2525
}

0 commit comments

Comments
 (0)