Skip to content

Commit fe03222

Browse files
committed
Deprecate SimpleMaterial.Builder.diffuse
1 parent 52ac26c commit fe03222

4 files changed

Lines changed: 14 additions & 8 deletions

File tree

common/src/backend/java/dev/engine_room/flywheel/backend/engine/CommonCrumbling.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package dev.engine_room.flywheel.backend.engine;
22

3+
import dev.engine_room.flywheel.api.material.CardinalLightingMode;
34
import dev.engine_room.flywheel.api.material.Material;
45
import dev.engine_room.flywheel.api.material.Transparency;
56
import dev.engine_room.flywheel.api.material.WriteMask;
@@ -19,6 +20,6 @@ public static void applyCrumblingProperties(SimpleMaterial.Builder crumblingMate
1920
.writeMask(WriteMask.COLOR)
2021
.useOverlay(false)
2122
.useLight(false)
22-
.diffuse(false);
23+
.cardinalLightingMode(CardinalLightingMode.OFF);
2324
}
2425
}

common/src/lib/java/dev/engine_room/flywheel/lib/material/Materials.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package dev.engine_room.flywheel.lib.material;
22

3+
import dev.engine_room.flywheel.api.material.CardinalLightingMode;
34
import dev.engine_room.flywheel.api.material.DepthTest;
45
import dev.engine_room.flywheel.api.material.Material;
56
import dev.engine_room.flywheel.api.material.Transparency;
@@ -10,15 +11,15 @@ public final class Materials {
1011
public static final Material SOLID_BLOCK = SimpleMaterial.builder()
1112
.build();
1213
public static final Material SOLID_UNSHADED_BLOCK = SimpleMaterial.builder()
13-
.diffuse(false)
14+
.cardinalLightingMode(CardinalLightingMode.OFF)
1415
.build();
1516

1617
public static final Material CUTOUT_MIPPED_BLOCK = SimpleMaterial.builder()
1718
.cutout(CutoutShaders.HALF)
1819
.build();
1920
public static final Material CUTOUT_MIPPED_UNSHADED_BLOCK = SimpleMaterial.builder()
2021
.cutout(CutoutShaders.HALF)
21-
.diffuse(false)
22+
.cardinalLightingMode(CardinalLightingMode.OFF)
2223
.build();
2324

2425
public static final Material CUTOUT_BLOCK = SimpleMaterial.builder()
@@ -28,15 +29,15 @@ public final class Materials {
2829
public static final Material CUTOUT_UNSHADED_BLOCK = SimpleMaterial.builder()
2930
.cutout(CutoutShaders.ONE_TENTH)
3031
.mipmap(false)
31-
.diffuse(false)
32+
.cardinalLightingMode(CardinalLightingMode.OFF)
3233
.build();
3334

3435
public static final Material TRANSLUCENT_BLOCK = SimpleMaterial.builder()
3536
.transparency(Transparency.ORDER_INDEPENDENT)
3637
.build();
3738
public static final Material TRANSLUCENT_UNSHADED_BLOCK = SimpleMaterial.builder()
3839
.transparency(Transparency.ORDER_INDEPENDENT)
39-
.diffuse(false)
40+
.cardinalLightingMode(CardinalLightingMode.OFF)
4041
.build();
4142

4243
public static final Material TRIPWIRE_BLOCK = SimpleMaterial.builder()
@@ -46,7 +47,7 @@ public final class Materials {
4647
public static final Material TRIPWIRE_UNSHADED_BLOCK = SimpleMaterial.builder()
4748
.cutout(CutoutShaders.ONE_TENTH)
4849
.transparency(Transparency.ORDER_INDEPENDENT)
49-
.diffuse(false)
50+
.cardinalLightingMode(CardinalLightingMode.OFF)
5051
.build();
5152

5253
public static final Material GLINT = SimpleMaterial.builder()
@@ -67,7 +68,6 @@ public final class Materials {
6768
public static final Material TRANSLUCENT_ENTITY = SimpleMaterial.builder()
6869
.transparency(Transparency.TRANSLUCENT)
6970
.cutout(CutoutShaders.ONE_TENTH)
70-
.blur(false)
7171
.mipmap(false)
7272
.build();
7373

common/src/lib/java/dev/engine_room/flywheel/lib/material/SimpleMaterial.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -264,6 +264,10 @@ public Builder useLight(boolean value) {
264264
return this;
265265
}
266266

267+
/**
268+
* @deprecated Use {@link #cardinalLightingMode(CardinalLightingMode)} instead.
269+
*/
270+
@Deprecated(forRemoval = true)
267271
public Builder diffuse(boolean value) {
268272
return cardinalLightingMode(value ? CardinalLightingMode.ENTITY : CardinalLightingMode.OFF);
269273
}

common/src/lib/java/dev/engine_room/flywheel/lib/model/LineModelBuilder.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import org.joml.Vector4fc;
55
import org.lwjgl.system.MemoryUtil;
66

7+
import dev.engine_room.flywheel.api.material.CardinalLightingMode;
78
import dev.engine_room.flywheel.api.material.Material;
89
import dev.engine_room.flywheel.api.model.IndexSequence;
910
import dev.engine_room.flywheel.api.model.Mesh;
@@ -22,7 +23,7 @@ public final class LineModelBuilder {
2223
private static final Material MATERIAL = SimpleMaterial.builder()
2324
.shaders(StandardMaterialShaders.LINE)
2425
.backfaceCulling(false)
25-
.diffuse(false)
26+
.cardinalLightingMode(CardinalLightingMode.OFF)
2627
.build();
2728

2829
@UnknownNullability

0 commit comments

Comments
 (0)