From e7a6052a84708a892f1ff943f5332a5751737248 Mon Sep 17 00:00:00 2001 From: PepperCode1 <44146161+PepperCode1@users.noreply.github.com> Date: Sat, 18 Nov 2023 11:53:01 -0800 Subject: [PATCH] Missed renames --- .../flywheel/lib/material/Materials.java | 28 +++++++++---------- .../flywheel/lib/material/SimpleMaterial.java | 16 +++++------ 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/main/java/com/jozufozu/flywheel/lib/material/Materials.java b/src/main/java/com/jozufozu/flywheel/lib/material/Materials.java index 8754a1fa1..fae96ce0e 100644 --- a/src/main/java/com/jozufozu/flywheel/lib/material/Materials.java +++ b/src/main/java/com/jozufozu/flywheel/lib/material/Materials.java @@ -41,42 +41,42 @@ public final class Materials { .vertexShader(Files.SHADED_VERTEX) .fragmentShader(Files.DEFAULT_FRAGMENT) .addShard(Shards.diffuseTex(InventoryMenu.BLOCK_ATLAS, false, true)) - .batchingRenderType(RenderType.solid()) + .fallbackRenderType(RenderType.solid()) .vertexTransformer(SHADING_TRANSFORMER) .register(); public static final Material CHUNK_SOLID_UNSHADED = SimpleMaterial.builder() .vertexShader(Files.DEFAULT_VERTEX) .fragmentShader(Files.DEFAULT_FRAGMENT) .addShard(Shards.diffuseTex(InventoryMenu.BLOCK_ATLAS, false, true)) - .batchingRenderType(RenderType.solid()) + .fallbackRenderType(RenderType.solid()) .register(); public static final Material CHUNK_CUTOUT_MIPPED_SHADED = SimpleMaterial.builder() .vertexShader(Files.SHADED_VERTEX) .fragmentShader(Files.CUTOUT_FRAGMENT) .addShard(Shards.diffuseTex(InventoryMenu.BLOCK_ATLAS, false, true)) - .batchingRenderType(RenderType.cutoutMipped()) + .fallbackRenderType(RenderType.cutoutMipped()) .vertexTransformer(SHADING_TRANSFORMER) .register(); public static final Material CHUNK_CUTOUT_MIPPED_UNSHADED = SimpleMaterial.builder() .vertexShader(Files.DEFAULT_VERTEX) .fragmentShader(Files.CUTOUT_FRAGMENT) .addShard(Shards.diffuseTex(InventoryMenu.BLOCK_ATLAS, false, true)) - .batchingRenderType(RenderType.cutoutMipped()) + .fallbackRenderType(RenderType.cutoutMipped()) .register(); public static final Material CHUNK_CUTOUT_SHADED = SimpleMaterial.builder() .vertexShader(Files.SHADED_VERTEX) .fragmentShader(Files.CUTOUT_FRAGMENT) .addShard(Shards.diffuseTex(InventoryMenu.BLOCK_ATLAS, false, false)) - .batchingRenderType(RenderType.cutout()) + .fallbackRenderType(RenderType.cutout()) .vertexTransformer(SHADING_TRANSFORMER) .register(); public static final Material CHUNK_CUTOUT_UNSHADED = SimpleMaterial.builder() .vertexShader(Files.DEFAULT_VERTEX) .fragmentShader(Files.CUTOUT_FRAGMENT) .addShard(Shards.diffuseTex(InventoryMenu.BLOCK_ATLAS, false, false)) - .batchingRenderType(RenderType.cutout()) + .fallbackRenderType(RenderType.cutout()) .register(); public static final Material CHUNK_TRANSLUCENT_SHADED = SimpleMaterial.builder() @@ -84,7 +84,7 @@ public final class Materials { .fragmentShader(Files.DEFAULT_FRAGMENT) .addShard(Shards.diffuseTex(InventoryMenu.BLOCK_ATLAS, false, true)) .addShard(Shards.TRANSLUCENT_TRANSPARENCY) - .batchingRenderType(RenderType.translucent()) + .fallbackRenderType(RenderType.translucent()) .vertexTransformer(SHADING_TRANSFORMER) .register(); public static final Material CHUNK_TRANSLUCENT_UNSHADED = SimpleMaterial.builder() @@ -92,7 +92,7 @@ public final class Materials { .fragmentShader(Files.DEFAULT_FRAGMENT) .addShard(Shards.diffuseTex(InventoryMenu.BLOCK_ATLAS, false, true)) .addShard(Shards.TRANSLUCENT_TRANSPARENCY) - .batchingRenderType(RenderType.translucent()) + .fallbackRenderType(RenderType.translucent()) .register(); public static final Material CHUNK_TRIPWIRE_SHADED = SimpleMaterial.builder() @@ -100,7 +100,7 @@ public final class Materials { .fragmentShader(Files.CUTOUT_FRAGMENT) .addShard(Shards.diffuseTex(InventoryMenu.BLOCK_ATLAS, false, true)) .addShard(Shards.TRANSLUCENT_TRANSPARENCY) - .batchingRenderType(RenderType.tripwire()) + .fallbackRenderType(RenderType.tripwire()) .vertexTransformer(SHADING_TRANSFORMER) .register(); public static final Material CHUNK_TRIPWIRE_UNSHADED = SimpleMaterial.builder() @@ -108,30 +108,30 @@ public final class Materials { .fragmentShader(Files.CUTOUT_FRAGMENT) .addShard(Shards.diffuseTex(InventoryMenu.BLOCK_ATLAS, false, true)) .addShard(Shards.TRANSLUCENT_TRANSPARENCY) - .batchingRenderType(RenderType.tripwire()) + .fallbackRenderType(RenderType.tripwire()) .register(); public static final Material CHEST = SimpleMaterial.builder() .vertexShader(Files.SHADED_VERTEX) .addShard(Shards.diffuseTex(Sheets.CHEST_SHEET, false, false)) - .batchingRenderType(Sheets.chestSheet()) + .fallbackRenderType(Sheets.chestSheet()) .register(); public static final Material SHULKER = SimpleMaterial.builder() .vertexShader(Files.SHADED_VERTEX) .fragmentShader(Files.CUTOUT_FRAGMENT) .addShard(Shards.diffuseTex(Sheets.SHULKER_SHEET, false, false)) .addShard(Shards.DISABLE_CULL) - .batchingRenderType(Sheets.shulkerBoxSheet()) + .fallbackRenderType(Sheets.shulkerBoxSheet()) .register(); public static final Material BELL = SimpleMaterial.builder() .vertexShader(Files.SHADED_VERTEX) .addShard(Shards.diffuseTex(InventoryMenu.BLOCK_ATLAS, false, false)) - .batchingRenderType(Sheets.solidBlockSheet()) + .fallbackRenderType(Sheets.solidBlockSheet()) .register(); public static final Material MINECART = SimpleMaterial.builder() .vertexShader(Files.SHADED_VERTEX) .addShard(Shards.diffuseTex(MINECART_LOCATION, false, false)) - .batchingRenderType(RenderType.entitySolid(MINECART_LOCATION)) + .fallbackRenderType(RenderType.entitySolid(MINECART_LOCATION)) .register(); private Materials() { diff --git a/src/main/java/com/jozufozu/flywheel/lib/material/SimpleMaterial.java b/src/main/java/com/jozufozu/flywheel/lib/material/SimpleMaterial.java index 1811d354e..219434a11 100644 --- a/src/main/java/com/jozufozu/flywheel/lib/material/SimpleMaterial.java +++ b/src/main/java/com/jozufozu/flywheel/lib/material/SimpleMaterial.java @@ -12,15 +12,15 @@ public class SimpleMaterial implements Material { protected final ResourceLocation fragmentShader; protected final Runnable setup; protected final Runnable clear; - protected final RenderType batchingRenderType; + protected final RenderType fallbackRenderType; protected final MaterialVertexTransformer vertexTransformer; - public SimpleMaterial(ResourceLocation vertexShader, ResourceLocation fragmentShader, Runnable setup, Runnable clear, RenderType batchingRenderType, MaterialVertexTransformer vertexTransformer) { + public SimpleMaterial(ResourceLocation vertexShader, ResourceLocation fragmentShader, Runnable setup, Runnable clear, RenderType fallbackRenderType, MaterialVertexTransformer vertexTransformer) { this.vertexShader = vertexShader; this.fragmentShader = fragmentShader; this.setup = setup; this.clear = clear; - this.batchingRenderType = batchingRenderType; + this.fallbackRenderType = fallbackRenderType; this.vertexTransformer = vertexTransformer; } @@ -50,7 +50,7 @@ public class SimpleMaterial implements Material { @Override public RenderType getFallbackRenderType() { - return batchingRenderType; + return fallbackRenderType; } @Override @@ -63,7 +63,7 @@ public class SimpleMaterial implements Material { protected ResourceLocation fragmentShader = Materials.Files.DEFAULT_FRAGMENT; protected Runnable setup = () -> {}; protected Runnable clear = () -> {}; - protected RenderType batchingRenderType = RenderType.solid(); + protected RenderType fallbackRenderType = RenderType.solid(); protected MaterialVertexTransformer vertexTransformer = (vertexList, level) -> {}; public Builder() { @@ -95,8 +95,8 @@ public class SimpleMaterial implements Material { return this; } - public Builder batchingRenderType(RenderType type) { - this.batchingRenderType = type; + public Builder fallbackRenderType(RenderType type) { + this.fallbackRenderType = type; return this; } @@ -106,7 +106,7 @@ public class SimpleMaterial implements Material { } public SimpleMaterial register() { - return Material.REGISTRY.registerAndGet(new SimpleMaterial(vertexShader, fragmentShader, setup, clear, batchingRenderType, vertexTransformer)); + return Material.REGISTRY.registerAndGet(new SimpleMaterial(vertexShader, fragmentShader, setup, clear, fallbackRenderType, vertexTransformer)); } private static Runnable chain(Runnable runnable1, Runnable runnable2) {