From 917c6041bac73d1357563d345a287596a69af622 Mon Sep 17 00:00:00 2001
From: PepperCode1 <44146161+PepperCode1@users.noreply.github.com>
Date: Thu, 7 Jul 2022 17:57:09 -0700
Subject: [PATCH] Fix OBJ materials

- Fix OBJ model materials to use correct Ka and Kd
- Remove unnecessary material properties
- Rename disableDiffuseMult to disableDiffuse
- Fix curved track outlines rendering in spectator mode
---
 .../block/display/DisplayLinkRenderer.java    |  2 +-
 .../block/redstone/NixieTubeRenderer.java     |  6 ++--
 .../trains/track/TrackBlockOutline.java       |  5 +++
 .../foundation/render/SuperByteBuffer.java    |  4 +--
 .../models/block/blaze_burner/blaze_cage.mtl  |  9 ------
 .../models/block/blaze_burner/blaze_flame.mtl |  7 ----
 .../models/block/blaze_burner/blaze_rods.mtl  |  8 -----
 .../models/block/blaze_burner/campfire.mtl    | 16 ----------
 .../create/models/block/blaze_burner/item.mtl | 17 ----------
 .../create/models/block/flywheel/flywheel.mtl | 24 --------------
 .../create/models/block/track/ascending.mtl   |  5 ++-
 .../models/block/track/bogey/bogey_drive.mtl  | 32 -------------------
 .../block/track/bogey/bogey_drive_piston.mtl  |  8 -----
 .../block/track/bogey/bogey_drive_wheel.mtl   |  8 -----
 .../track/bogey/bogey_drive_wheel_pin.mtl     |  8 -----
 .../models/block/track/bogey/bogey_frame.mtl  | 24 --------------
 .../models/block/track/bogey/bogey_wheel.mtl  | 24 --------------
 .../models/block/track/bogey/textures.json    |  2 --
 .../create/models/block/track/track.mtl       |  6 +++-
 19 files changed, 20 insertions(+), 195 deletions(-)

diff --git a/src/main/java/com/simibubi/create/content/logistics/block/display/DisplayLinkRenderer.java b/src/main/java/com/simibubi/create/content/logistics/block/display/DisplayLinkRenderer.java
index 2ebd8edad..3650b2554 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/display/DisplayLinkRenderer.java
+++ b/src/main/java/com/simibubi/create/content/logistics/block/display/DisplayLinkRenderer.java
@@ -56,7 +56,7 @@ public class DisplayLinkRenderer extends SafeTileEntityRenderer<DisplayLinkTileE
 		CachedBufferer.partial(AllBlockPartials.DISPLAY_LINK_GLOW, blockState)
 			.light(LightTexture.FULL_BRIGHT)
 			.color(color, color, color, 255)
-			.disableDiffuseMult()
+			.disableDiffuse()
 			.renderInto(ms, buffer.getBuffer(RenderTypes.getAdditive()));
 
 		ms.popPose();
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/redstone/NixieTubeRenderer.java b/src/main/java/com/simibubi/create/content/logistics/block/redstone/NixieTubeRenderer.java
index ddf75c370..4428908fa 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/redstone/NixieTubeRenderer.java
+++ b/src/main/java/com/simibubi/create/content/logistics/block/redstone/NixieTubeRenderer.java
@@ -168,7 +168,7 @@ public class NixieTubeRenderer extends SafeTileEntityRenderer<NixieTubeTileEntit
 
 				CachedBufferer.partial(AllBlockPartials.SIGNAL_WHITE_CUBE, blockState)
 					.light(0xf000f0)
-					.disableDiffuseMult()
+					.disableDiffuse()
 					.scale(vert ? longSide : 1, vert ? 1 : longSide, 1)
 					.renderInto(ms, buffer.getBuffer(RenderType.translucent()));
 
@@ -178,7 +178,7 @@ public class NixieTubeRenderer extends SafeTileEntityRenderer<NixieTubeTileEntit
 							: yellow ? AllBlockPartials.SIGNAL_YELLOW_GLOW : AllBlockPartials.SIGNAL_WHITE_GLOW,
 						blockState)
 					.light(0xf000f0)
-					.disableDiffuseMult()
+					.disableDiffuse()
 					.scale(vert ? longSideGlow : 2, vert ? 2 : longSideGlow, 2)
 					.renderInto(ms, buffer.getBuffer(RenderTypes.getAdditive()));
 			}
@@ -187,7 +187,7 @@ public class NixieTubeRenderer extends SafeTileEntityRenderer<NixieTubeTileEntit
 				.partial(first ? AllBlockPartials.SIGNAL_RED
 					: yellow ? AllBlockPartials.SIGNAL_YELLOW : AllBlockPartials.SIGNAL_WHITE, blockState)
 				.light(0xF000F0)
-				.disableDiffuseMult()
+				.disableDiffuse()
 				.scale(1 + 1 / 16f)
 				.renderInto(ms, buffer.getBuffer(RenderTypes.getAdditive()));
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/track/TrackBlockOutline.java b/src/main/java/com/simibubi/create/content/logistics/trains/track/TrackBlockOutline.java
index bd20136e9..0417825dd 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/track/TrackBlockOutline.java
+++ b/src/main/java/com/simibubi/create/content/logistics/trains/track/TrackBlockOutline.java
@@ -27,6 +27,7 @@ import net.minecraft.core.Direction;
 import net.minecraft.core.Direction.Axis;
 import net.minecraft.util.Mth;
 import net.minecraft.world.entity.ai.attributes.AttributeInstance;
+import net.minecraft.world.level.GameType;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.AABB;
 import net.minecraft.world.phys.BlockHitResult;
@@ -142,6 +143,10 @@ public class TrackBlockOutline {
 	}
 
 	public static void drawCurveSelection(PoseStack ms, MultiBufferSource buffer) {
+		Minecraft mc = Minecraft.getInstance();
+		if (mc.options.hideGui || mc.gameMode.getPlayerMode() == GameType.SPECTATOR)
+			return;
+
 		BezierPointSelection result = TrackBlockOutline.result;
 		if (result == null)
 			return;
diff --git a/src/main/java/com/simibubi/create/foundation/render/SuperByteBuffer.java b/src/main/java/com/simibubi/create/foundation/render/SuperByteBuffer.java
index d2400064c..3942299fe 100644
--- a/src/main/java/com/simibubi/create/foundation/render/SuperByteBuffer.java
+++ b/src/main/java/com/simibubi/create/foundation/render/SuperByteBuffer.java
@@ -337,7 +337,7 @@ public class SuperByteBuffer implements Transform<SuperByteBuffer>, TStack<Super
 	 * from the final transformed normal vector. Useful for entity rendering, when
 	 * diffuse is applied automatically later.
 	 */
-	public SuperByteBuffer disableDiffuseMult() {
+	public SuperByteBuffer disableDiffuse() {
 		disableDiffuseMult = true;
 		return this;
 	}
@@ -438,7 +438,7 @@ public class SuperByteBuffer implements Transform<SuperByteBuffer>, TStack<Super
 	}
 
 	public SuperByteBuffer forEntityRender() {
-		disableDiffuseMult();
+		disableDiffuse();
 		overlay();
 		fullNormalTransform();
 		return this;
diff --git a/src/main/resources/assets/create/models/block/blaze_burner/blaze_cage.mtl b/src/main/resources/assets/create/models/block/blaze_burner/blaze_cage.mtl
index 939c5bed4..ef466b17b 100644
--- a/src/main/resources/assets/create/models/block/blaze_burner/blaze_cage.mtl
+++ b/src/main/resources/assets/create/models/block/blaze_burner/blaze_cage.mtl
@@ -2,13 +2,4 @@
 # Material Count: 1
 
 newmtl m_0
-Ns 250.000000
-Ka 1.000000 1.000000 1.000000
-Kd 0.800000 0.800000 0.800000
-Ks 0.500000 0.500000 0.500000
-Ke 0.000000 0.000000 0.000000
-Ni 1.450000
-d 1.000000
-illum 2
 map_Kd #0
-map_d #0
diff --git a/src/main/resources/assets/create/models/block/blaze_burner/blaze_flame.mtl b/src/main/resources/assets/create/models/block/blaze_burner/blaze_flame.mtl
index 1c196be7b..9921b6697 100644
--- a/src/main/resources/assets/create/models/block/blaze_burner/blaze_flame.mtl
+++ b/src/main/resources/assets/create/models/block/blaze_burner/blaze_flame.mtl
@@ -2,12 +2,5 @@
 # Material Count: 1
 
 newmtl m_0
-Ns 250.000000
 Ka 1.000000 1.000000 1.000000
-Kd 0.800000 0.800000 0.800000
-Ks 0.500000 0.500000 0.500000
-Ke 0.000000 0.000000 0.000000
-Ni 1.450000
-d 1.000000
-illum 2
 map_Kd #0
diff --git a/src/main/resources/assets/create/models/block/blaze_burner/blaze_rods.mtl b/src/main/resources/assets/create/models/block/blaze_burner/blaze_rods.mtl
index 19a691e56..9921b6697 100644
--- a/src/main/resources/assets/create/models/block/blaze_burner/blaze_rods.mtl
+++ b/src/main/resources/assets/create/models/block/blaze_burner/blaze_rods.mtl
@@ -2,13 +2,5 @@
 # Material Count: 1
 
 newmtl m_0
-Ns 0.000000
 Ka 1.000000 1.000000 1.000000
-Kd 0.800000 0.800000 0.800000
-Ks 0.000000 0.000000 0.000000
-Ke 0.000000 0.000000 0.000000
-Ni 1.450000
-d 1.000000
-illum 1
 map_Kd #0
-map_d #0
diff --git a/src/main/resources/assets/create/models/block/blaze_burner/campfire.mtl b/src/main/resources/assets/create/models/block/blaze_burner/campfire.mtl
index 5ccfe534a..8276a5f37 100644
--- a/src/main/resources/assets/create/models/block/blaze_burner/campfire.mtl
+++ b/src/main/resources/assets/create/models/block/blaze_burner/campfire.mtl
@@ -2,24 +2,8 @@
 # Material Count: 2
 
 newmtl Blazier
-Ns 250.000000
-Ka 1.000000 1.000000 1.000000
-Kd 0.800000 0.800000 0.800000
-Ks 0.500000 0.500000 0.500000
-Ke 0.000000 0.000000 0.000000
-Ni 1.450000
-d 1.000000
-illum 2
 map_Kd #0
-map_d #0
 
 newmtl Campfire
-Ns 250.000000
 Ka 1.000000 1.000000 1.000000
-Kd 0.800000 0.800000 0.800000
-Ks 0.500000 0.500000 0.500000
-Ke 0.000000 0.000000 0.000000
-Ni 1.450000
-d 1.000000
-illum 2
 map_Kd #1
diff --git a/src/main/resources/assets/create/models/block/blaze_burner/item.mtl b/src/main/resources/assets/create/models/block/blaze_burner/item.mtl
index 1028610d4..0d24f37d1 100644
--- a/src/main/resources/assets/create/models/block/blaze_burner/item.mtl
+++ b/src/main/resources/assets/create/models/block/blaze_burner/item.mtl
@@ -2,25 +2,8 @@
 # Material Count: 2
 
 newmtl m_0
-Ns 250.000000
-Ka 1.000000 1.000000 1.000000
-Kd 0.800000 0.800000 0.800000
-Ks 0.500000 0.500000 0.500000
-Ke 0.000000 0.000000 0.000000
-Ni 1.450000
-d 1.000000
-illum 2
 map_Kd #0
-map_d #0
 
 newmtl m_1
-Ns 0.000000
 Ka 1.000000 1.000000 1.000000
-Kd 0.800000 0.800000 0.800000
-Ks 0.000000 0.000000 0.000000
-Ke 0.000000 0.000000 0.000000
-Ni 1.450000
-d 1.000000
-illum 1
 map_Kd #1
-map_d #1
diff --git a/src/main/resources/assets/create/models/block/flywheel/flywheel.mtl b/src/main/resources/assets/create/models/block/flywheel/flywheel.mtl
index 24713dde3..8ac0149d3 100644
--- a/src/main/resources/assets/create/models/block/flywheel/flywheel.mtl
+++ b/src/main/resources/assets/create/models/block/flywheel/flywheel.mtl
@@ -2,34 +2,10 @@
 # Material Count: 3
 
 newmtl m_0
-Ns 250.000000
-Ka 1.000000 1.000000 1.000000
-Kd 0.800000 0.800000 0.800000
-Ks 0.500000 0.500000 0.500000
-Ke 0.000000 0.000000 0.000000
-Ni 1.450000
-d 1.000000
-illum 2
 map_Kd #0
 
 newmtl m_1
-Ns 250.000000
-Ka 1.000000 1.000000 1.000000
-Kd 0.800000 0.800000 0.800000
-Ks 0.500000 0.500000 0.500000
-Ke 0.000000 0.000000 0.000000
-Ni 1.450000
-d 1.000000
-illum 2
 map_Kd #1
 
 newmtl m_2
-Ns 250.000000
-Ka 1.000000 1.000000 1.000000
-Kd 0.800000 0.800000 0.800000
-Ks 0.500000 0.500000 0.500000
-Ke 0.000000 0.000000 0.000000
-Ni 1.450000
-d 1.000000
-illum 2
 map_Kd #2
diff --git a/src/main/resources/assets/create/models/block/track/ascending.mtl b/src/main/resources/assets/create/models/block/track/ascending.mtl
index 327d876ee..85a75fa29 100644
--- a/src/main/resources/assets/create/models/block/track/ascending.mtl
+++ b/src/main/resources/assets/create/models/block/track/ascending.mtl
@@ -1,6 +1,9 @@
 # Made in Blockbench 4.1.4
+
 newmtl m_2
 map_Kd #1
+
 newmtl m_1_0
 map_Kd #0
-newmtl none
\ No newline at end of file
+
+newmtl none
diff --git a/src/main/resources/assets/create/models/block/track/bogey/bogey_drive.mtl b/src/main/resources/assets/create/models/block/track/bogey/bogey_drive.mtl
index 40aadbc70..5e922e0b7 100644
--- a/src/main/resources/assets/create/models/block/track/bogey/bogey_drive.mtl
+++ b/src/main/resources/assets/create/models/block/track/bogey/bogey_drive.mtl
@@ -2,45 +2,13 @@
 # Material Count: 4
 
 newmtl Belts
-Ns 0.000000
-Ka 1.000000 1.000000 1.000000
-Kd 0.800000 0.800000 0.800000
-Ks 0.000000 0.000000 0.000000
-Ke 0.000000 0.000000 0.000000
-Ni 1.450000
-d 1.000000
-illum 1
 map_Kd #belt
 
 newmtl Bogey_Body
-Ns 225.000000
-Ka 1.000000 1.000000 1.000000
-Kd 0.800000 0.800000 0.800000
-Ks 0.500000 0.500000 0.500000
-Ke 0.000000 0.000000 0.000000
-Ni 1.450000
-d 1.000000
-illum 2
 map_Kd #bogey
 
 newmtl Bogey_Piston
-Ns 225.000000
-Ka 1.000000 1.000000 1.000000
-Kd 0.800000 0.800000 0.800000
-Ks 0.500000 0.500000 0.500000
-Ke 0.000000 0.000000 0.000000
-Ni 1.450000
-d 1.000000
-illum 2
 map_Kd #piston
 
 newmtl wheel_Large
-Ns 0.000000
-Ka 1.000000 1.000000 1.000000
-Kd 0.800000 0.800000 0.800000
-Ks 0.000000 0.000000 0.000000
-Ke 0.000000 0.000000 0.000000
-Ni 1.450000
-d 1.000000
-illum 1
 map_Kd #wheel
diff --git a/src/main/resources/assets/create/models/block/track/bogey/bogey_drive_piston.mtl b/src/main/resources/assets/create/models/block/track/bogey/bogey_drive_piston.mtl
index 51555a734..d196735c2 100644
--- a/src/main/resources/assets/create/models/block/track/bogey/bogey_drive_piston.mtl
+++ b/src/main/resources/assets/create/models/block/track/bogey/bogey_drive_piston.mtl
@@ -2,12 +2,4 @@
 # Material Count: 1
 
 newmtl Bogey_Piston
-Ns 225.000000
-Ka 1.000000 1.000000 1.000000
-Kd 0.800000 0.800000 0.800000
-Ks 0.500000 0.500000 0.500000
-Ke 0.000000 0.000000 0.000000
-Ni 1.450000
-d 1.000000
-illum 2
 map_Kd #piston
diff --git a/src/main/resources/assets/create/models/block/track/bogey/bogey_drive_wheel.mtl b/src/main/resources/assets/create/models/block/track/bogey/bogey_drive_wheel.mtl
index 5d47d85cd..5a7292b65 100644
--- a/src/main/resources/assets/create/models/block/track/bogey/bogey_drive_wheel.mtl
+++ b/src/main/resources/assets/create/models/block/track/bogey/bogey_drive_wheel.mtl
@@ -2,12 +2,4 @@
 # Material Count: 1
 
 newmtl wheel_Large
-Ns 0.000000
-Ka 1.000000 1.000000 1.000000
-Kd 0.800000 0.800000 0.800000
-Ks 0.000000 0.000000 0.000000
-Ke 0.000000 0.000000 0.000000
-Ni 1.450000
-d 1.000000
-illum 1
 map_Kd #wheel
diff --git a/src/main/resources/assets/create/models/block/track/bogey/bogey_drive_wheel_pin.mtl b/src/main/resources/assets/create/models/block/track/bogey/bogey_drive_wheel_pin.mtl
index 51555a734..d196735c2 100644
--- a/src/main/resources/assets/create/models/block/track/bogey/bogey_drive_wheel_pin.mtl
+++ b/src/main/resources/assets/create/models/block/track/bogey/bogey_drive_wheel_pin.mtl
@@ -2,12 +2,4 @@
 # Material Count: 1
 
 newmtl Bogey_Piston
-Ns 225.000000
-Ka 1.000000 1.000000 1.000000
-Kd 0.800000 0.800000 0.800000
-Ks 0.500000 0.500000 0.500000
-Ke 0.000000 0.000000 0.000000
-Ni 1.450000
-d 1.000000
-illum 2
 map_Kd #piston
diff --git a/src/main/resources/assets/create/models/block/track/bogey/bogey_frame.mtl b/src/main/resources/assets/create/models/block/track/bogey/bogey_frame.mtl
index 04674d292..eb4b7ca36 100644
--- a/src/main/resources/assets/create/models/block/track/bogey/bogey_frame.mtl
+++ b/src/main/resources/assets/create/models/block/track/bogey/bogey_frame.mtl
@@ -2,34 +2,10 @@
 # Material Count: 3
 
 newmtl Bogey_Body
-Ns 225.000000
-Ka 1.000000 1.000000 1.000000
-Kd 0.800000 0.800000 0.800000
-Ks 0.500000 0.500000 0.500000
-Ke 0.000000 0.000000 0.000000
-Ni 1.450000
-d 1.000000
-illum 2
 map_Kd #bogey
 
 newmtl Bogey_Body_2
-Ns 225.000000
-Ka 1.000000 1.000000 1.000000
-Kd 0.800000 0.800000 0.800000
-Ks 0.500000 0.500000 0.500000
-Ke 0.000000 0.000000 0.000000
-Ni 1.450000
-d 1.000000
-illum 2
 map_Kd #bogey2
 
 newmtl wheel_Large
-Ns 0.000000
-Ka 1.000000 1.000000 1.000000
-Kd 0.800000 0.800000 0.800000
-Ks 0.000000 0.000000 0.000000
-Ke 0.000000 0.000000 0.000000
-Ni 1.450000
-d 1.000000
-illum 1
 map_Kd #wheel
diff --git a/src/main/resources/assets/create/models/block/track/bogey/bogey_wheel.mtl b/src/main/resources/assets/create/models/block/track/bogey/bogey_wheel.mtl
index 2231cc2c3..329685460 100644
--- a/src/main/resources/assets/create/models/block/track/bogey/bogey_wheel.mtl
+++ b/src/main/resources/assets/create/models/block/track/bogey/bogey_wheel.mtl
@@ -2,34 +2,10 @@
 # Material Count: 3
 
 newmtl 00_Shaft
-Ns 225.000000
-Ka 1.000000 1.000000 1.000000
-Kd 0.800000 0.800000 0.800000
-Ks 0.500000 0.500000 0.500000
-Ke 0.000000 0.000000 0.000000
-Ni 1.450000
-d 1.000000
-illum 2
 map_Kd #axis
 
 newmtl 00_Shaft_end
-Ns 225.000000
-Ka 1.000000 1.000000 1.000000
-Kd 0.800000 0.800000 0.800000
-Ks 0.500000 0.500000 0.500000
-Ke 0.000000 0.000000 0.000000
-Ni 1.450000
-d 1.000000
-illum 2
 map_Kd #axis_top
 
 newmtl wheel_Large
-Ns 0.000000
-Ka 1.000000 1.000000 1.000000
-Kd 0.800000 0.800000 0.800000
-Ks 0.000000 0.000000 0.000000
-Ke 0.000000 0.000000 0.000000
-Ni 1.450000
-d 1.000000
-illum 1
 map_Kd #wheel
diff --git a/src/main/resources/assets/create/models/block/track/bogey/textures.json b/src/main/resources/assets/create/models/block/track/bogey/textures.json
index e22d22f33..287f1be5e 100644
--- a/src/main/resources/assets/create/models/block/track/bogey/textures.json
+++ b/src/main/resources/assets/create/models/block/track/bogey/textures.json
@@ -1,7 +1,5 @@
 {
 	"parent": "block/block",
-	"ambientToFullbright": false,
-	"diffuseLighting": false,
 	"textures": {
 		"belt": "create:block/bogey/belt",
 		"bogey": "create:block/bogey/frame",
diff --git a/src/main/resources/assets/create/models/block/track/track.mtl b/src/main/resources/assets/create/models/block/track/track.mtl
index ea017c289..d2d255ad3 100644
--- a/src/main/resources/assets/create/models/block/track/track.mtl
+++ b/src/main/resources/assets/create/models/block/track/track.mtl
@@ -1,8 +1,12 @@
 # Made in Blockbench 4.1.1
+
 newmtl m_0
 map_Kd #0
+
 newmtl m_1
 map_Kd #1
+
 newmtl m_2
 map_Kd #2
-newmtl none
\ No newline at end of file
+
+newmtl none