v1.21-1.1.0

ImplicitSaber · Oct 21, 2024 · c6728c6 · c6728c6
1 parent 57b82c6
commit c6728c6
Show file tree

Hide file tree

Showing 32 changed files with 709 additions and 37 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -9,7 +9,7 @@ yarn_mappings=1.21+build.2
 loader_version=0.15.11
 
 # Mod Properties
-mod_version=1.21-1.0.0
+mod_version=1.21-1.1.0
 maven_group=io.github.implicitsaber
 archives_base_name=forkcart
 

diff --git a/src/client/java/io/github/implicitsaber/forkcart/ForkcartClient.java b/src/client/java/io/github/implicitsaber/forkcart/ForkcartClient.java
@@ -36,6 +36,7 @@ public void onInitializeClient() {
 		BlockRenderLayerMap.INSTANCE.putBlock(Forkcart.TRACK_TIES, RenderLayer.getCutout());
 		BlockRenderLayerMap.INSTANCE.putBlock(Forkcart.SWITCH_TIES, RenderLayer.getCutout());
 		BlockRenderLayerMap.INSTANCE.putBlock(Forkcart.INVISIBLE_TIES, RenderLayer.getCutout());
+		BlockRenderLayerMap.INSTANCE.putBlock(Forkcart.SHUTTLE_TIES, RenderLayer.getCutout());
 
 		BlockEntityRendererFactories.register(Forkcart.TRACK_TIES_BE, TrackTiesBlockEntityRenderer::new);
 		EntityRendererRegistry.register(Forkcart.TRACK_FOLLOWER, EmptyEntityRenderer::new);

diff --git a/...ient/java/io/github/implicitsaber/forkcart/block/entity/TrackTiesBlockEntityRenderer.java b/...ient/java/io/github/implicitsaber/forkcart/block/entity/TrackTiesBlockEntityRenderer.java
@@ -24,9 +24,8 @@
 public class TrackTiesBlockEntityRenderer implements BlockEntityRenderer<TrackTiesBlockEntity> {
     public static final int WHITE = 0xFFFFFFFF;
     public static final Identifier CHAIN_TRACK_TEXTURE = Forkcart.id("textures/chain_track.png");
-    public static final Identifier ANTIGRAVITY_TRACK_TEXTURE = Forkcart.id("textures/antigravity_track.png");
-    public static final Identifier FRICTIONLESS_TRACK_TEXTURE = Forkcart.id("textures/frictionless_track.png");
     public static final Identifier STATION_TRACK_TEXTURE = Forkcart.id("textures/station_track.png");
+    private static final Identifier BRAKE_TRACK_TEXTURE = Forkcart.id("textures/brake_track.png");
     public static final Identifier TRACK_TEXTURE = Forkcart.id("textures/track.png");
     public static final Identifier POSE_TEXTURE_DEBUG = Forkcart.id("textures/debug.png");
 
@@ -141,6 +140,7 @@ protected Identifier getTexture(TrackTiesBlockEntity be) {
             case STANDARD -> TRACK_TEXTURE;
             case CHAIN -> CHAIN_TRACK_TEXTURE;
             case STATION -> STATION_TRACK_TEXTURE;
+            case BRAKE -> BRAKE_TRACK_TEXTURE;
         };
     }
 

diff --git a/src/client/resources/assets/forkcart/blockstates/shuttle_ties.json b/src/client/resources/assets/forkcart/blockstates/shuttle_ties.json
@@ -0,0 +1,212 @@
+{
+  "variants": {
+    "running=false,pointing=0,facing=down": {
+      "model": "forkcart:block/shuttle_off_ties_pointing_0",
+      "x": 180
+    },
+    "running=false,pointing=0,facing=east": {
+      "model": "forkcart:block/shuttle_off_ties_pointing_0",
+      "x": 90,
+      "y": 90
+    },
+    "running=false,pointing=0,facing=north": {
+      "model": "forkcart:block/shuttle_off_ties_pointing_0",
+      "x": 90
+    },
+    "running=false,pointing=0,facing=south": {
+      "model": "forkcart:block/shuttle_off_ties_pointing_0",
+      "x": 90,
+      "y": 180
+    },
+    "running=false,pointing=0,facing=up": {
+      "model": "forkcart:block/shuttle_off_ties_pointing_0"
+    },
+    "running=false,pointing=0,facing=west": {
+      "model": "forkcart:block/shuttle_off_ties_pointing_0",
+      "x": 90,
+      "y": 270
+    },
+    "running=false,pointing=1,facing=down": {
+      "model": "forkcart:block/shuttle_off_ties_pointing_1",
+      "x": 180
+    },
+    "running=false,pointing=1,facing=east": {
+      "model": "forkcart:block/shuttle_off_ties_pointing_1",
+      "x": 90,
+      "y": 90
+    },
+    "running=false,pointing=1,facing=north": {
+      "model": "forkcart:block/shuttle_off_ties_pointing_1",
+      "x": 90
+    },
+    "running=false,pointing=1,facing=south": {
+      "model": "forkcart:block/shuttle_off_ties_pointing_1",
+      "x": 90,
+      "y": 180
+    },
+    "running=false,pointing=1,facing=up": {
+      "model": "forkcart:block/shuttle_off_ties_pointing_1"
+    },
+    "running=false,pointing=1,facing=west": {
+      "model": "forkcart:block/shuttle_off_ties_pointing_1",
+      "x": 90,
+      "y": 270
+    },
+    "running=false,pointing=2,facing=down": {
+      "model": "forkcart:block/shuttle_off_ties_pointing_2",
+      "x": 180
+    },
+    "running=false,pointing=2,facing=east": {
+      "model": "forkcart:block/shuttle_off_ties_pointing_2",
+      "x": 90,
+      "y": 90
+    },
+    "running=false,pointing=2,facing=north": {
+      "model": "forkcart:block/shuttle_off_ties_pointing_2",
+      "x": 90
+    },
+    "running=false,pointing=2,facing=south": {
+      "model": "forkcart:block/shuttle_off_ties_pointing_2",
+      "x": 90,
+      "y": 180
+    },
+    "running=false,pointing=2,facing=up": {
+      "model": "forkcart:block/shuttle_off_ties_pointing_2"
+    },
+    "running=false,pointing=2,facing=west": {
+      "model": "forkcart:block/shuttle_off_ties_pointing_2",
+      "x": 90,
+      "y": 270
+    },
+    "running=false,pointing=3,facing=down": {
+      "model": "forkcart:block/shuttle_off_ties_pointing_3",
+      "x": 180
+    },
+    "running=false,pointing=3,facing=east": {
+      "model": "forkcart:block/shuttle_off_ties_pointing_3",
+      "x": 90,
+      "y": 90
+    },
+    "running=false,pointing=3,facing=north": {
+      "model": "forkcart:block/shuttle_off_ties_pointing_3",
+      "x": 90
+    },
+    "running=false,pointing=3,facing=south": {
+      "model": "forkcart:block/shuttle_off_ties_pointing_3",
+      "x": 90,
+      "y": 180
+    },
+    "running=false,pointing=3,facing=up": {
+      "model": "forkcart:block/shuttle_off_ties_pointing_3"
+    },
+    "running=false,pointing=3,facing=west": {
+      "model": "forkcart:block/shuttle_off_ties_pointing_3",
+      "x": 90,
+      "y": 270
+    },
+    "running=true,pointing=0,facing=down": {
+      "model": "forkcart:block/shuttle_ties_pointing_0",
+      "x": 180
+    },
+    "running=true,pointing=0,facing=east": {
+      "model": "forkcart:block/shuttle_ties_pointing_0",
+      "x": 90,
+      "y": 90
+    },
+    "running=true,pointing=0,facing=north": {
+      "model": "forkcart:block/shuttle_ties_pointing_0",
+      "x": 90
+    },
+    "running=true,pointing=0,facing=south": {
+      "model": "forkcart:block/shuttle_ties_pointing_0",
+      "x": 90,
+      "y": 180
+    },
+    "running=true,pointing=0,facing=up": {
+      "model": "forkcart:block/shuttle_ties_pointing_0"
+    },
+    "running=true,pointing=0,facing=west": {
+      "model": "forkcart:block/shuttle_ties_pointing_0",
+      "x": 90,
+      "y": 270
+    },
+    "running=true,pointing=1,facing=down": {
+      "model": "forkcart:block/shuttle_ties_pointing_1",
+      "x": 180
+    },
+    "running=true,pointing=1,facing=east": {
+      "model": "forkcart:block/shuttle_ties_pointing_1",
+      "x": 90,
+      "y": 90
+    },
+    "running=true,pointing=1,facing=north": {
+      "model": "forkcart:block/shuttle_ties_pointing_1",
+      "x": 90
+    },
+    "running=true,pointing=1,facing=south": {
+      "model": "forkcart:block/shuttle_ties_pointing_1",
+      "x": 90,
+      "y": 180
+    },
+    "running=true,pointing=1,facing=up": {
+      "model": "forkcart:block/shuttle_ties_pointing_1"
+    },
+    "running=true,pointing=1,facing=west": {
+      "model": "forkcart:block/shuttle_ties_pointing_1",
+      "x": 90,
+      "y": 270
+    },
+    "running=true,pointing=2,facing=down": {
+      "model": "forkcart:block/shuttle_ties_pointing_2",
+      "x": 180
+    },
+    "running=true,pointing=2,facing=east": {
+      "model": "forkcart:block/shuttle_ties_pointing_2",
+      "x": 90,
+      "y": 90
+    },
+    "running=true,pointing=2,facing=north": {
+      "model": "forkcart:block/shuttle_ties_pointing_2",
+      "x": 90
+    },
+    "running=true,pointing=2,facing=south": {
+      "model": "forkcart:block/shuttle_ties_pointing_2",
+      "x": 90,
+      "y": 180
+    },
+    "running=true,pointing=2,facing=up": {
+      "model": "forkcart:block/shuttle_ties_pointing_2"
+    },
+    "running=true,pointing=2,facing=west": {
+      "model": "forkcart:block/shuttle_ties_pointing_2",
+      "x": 90,
+      "y": 270
+    },
+    "running=true,pointing=3,facing=down": {
+      "model": "forkcart:block/shuttle_ties_pointing_3",
+      "x": 180
+    },
+    "running=true,pointing=3,facing=east": {
+      "model": "forkcart:block/shuttle_ties_pointing_3",
+      "x": 90,
+      "y": 90
+    },
+    "running=true,pointing=3,facing=north": {
+      "model": "forkcart:block/shuttle_ties_pointing_3",
+      "x": 90
+    },
+    "running=true,pointing=3,facing=south": {
+      "model": "forkcart:block/shuttle_ties_pointing_3",
+      "x": 90,
+      "y": 180
+    },
+    "running=true,pointing=3,facing=up": {
+      "model": "forkcart:block/shuttle_ties_pointing_3"
+    },
+    "running=true,pointing=3,facing=west": {
+      "model": "forkcart:block/shuttle_ties_pointing_3",
+      "x": 90,
+      "y": 270
+    }
+  }
+}
diff --git a/src/client/resources/assets/forkcart/models/block/shuttle_off_ties_pointing_0.json b/src/client/resources/assets/forkcart/models/block/shuttle_off_ties_pointing_0.json
@@ -0,0 +1,18 @@
+{
+	"ambientocclusion": false,
+	"textures": {
+		"particle": "forkcart:block/shuttle_ties_off",
+		"rail": "forkcart:block/shuttle_ties_off"
+	},
+	"elements": [
+		{
+			"from": [0, 0.5, 0],
+			"to": [16, 0.5, 16],
+			"rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]},
+			"faces": {
+				"up": {"uv": [0, 0, 16, 16], "texture": "#rail"},
+				"down": {"uv": [0, 16, 16, 0], "texture": "#rail"}
+			}
+		}
+	]
+}
diff --git a/src/client/resources/assets/forkcart/models/block/shuttle_off_ties_pointing_1.json b/src/client/resources/assets/forkcart/models/block/shuttle_off_ties_pointing_1.json
@@ -0,0 +1,18 @@
+{
+	"ambientocclusion": false,
+	"textures": {
+		"particle": "forkcart:block/shuttle_ties_off",
+		"rail": "forkcart:block/shuttle_ties_off"
+	},
+	"elements": [
+		{
+			"from": [0, 0.5, 0],
+			"to": [16, 0.5, 16],
+			"rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]},
+			"faces": {
+				"up": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#rail"},
+				"down": {"uv": [0, 16, 16, 0], "rotation": 90, "texture": "#rail"}
+			}
+		}
+	]
+}
diff --git a/src/client/resources/assets/forkcart/models/block/shuttle_off_ties_pointing_2.json b/src/client/resources/assets/forkcart/models/block/shuttle_off_ties_pointing_2.json
@@ -0,0 +1,18 @@
+{
+	"ambientocclusion": false,
+	"textures": {
+		"particle": "forkcart:block/shuttle_ties_off",
+		"rail": "forkcart:block/shuttle_ties_off"
+	},
+	"elements": [
+		{
+			"from": [0, 0.5, 0],
+			"to": [16, 0.5, 16],
+			"rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]},
+			"faces": {
+				"up": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#rail"},
+				"down": {"uv": [0, 16, 16, 0], "rotation": 180, "texture": "#rail"}
+			}
+		}
+	]
+}
diff --git a/src/client/resources/assets/forkcart/models/block/shuttle_off_ties_pointing_3.json b/src/client/resources/assets/forkcart/models/block/shuttle_off_ties_pointing_3.json
@@ -0,0 +1,18 @@
+{
+	"ambientocclusion": false,
+	"textures": {
+		"particle": "forkcart:block/shuttle_ties_off",
+		"rail": "forkcart:block/shuttle_ties_off"
+	},
+	"elements": [
+		{
+			"from": [0, 0.5, 0],
+			"to": [16, 0.5, 16],
+			"rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]},
+			"faces": {
+				"up": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#rail"},
+				"down": {"uv": [0, 16, 16, 0], "rotation": 270, "texture": "#rail"}
+			}
+		}
+	]
+}
diff --git a/src/client/resources/assets/forkcart/models/block/shuttle_ties_pointing_0.json b/src/client/resources/assets/forkcart/models/block/shuttle_ties_pointing_0.json
@@ -0,0 +1,18 @@
+{
+	"ambientocclusion": false,
+	"textures": {
+		"particle": "forkcart:block/shuttle_ties_on",
+		"rail": "forkcart:block/shuttle_ties_on"
+	},
+	"elements": [
+		{
+			"from": [0, 0.5, 0],
+			"to": [16, 0.5, 16],
+			"rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]},
+			"faces": {
+				"up": {"uv": [0, 0, 16, 16], "texture": "#rail"},
+				"down": {"uv": [0, 16, 16, 0], "texture": "#rail"}
+			}
+		}
+	]
+}
diff --git a/src/client/resources/assets/forkcart/models/block/shuttle_ties_pointing_1.json b/src/client/resources/assets/forkcart/models/block/shuttle_ties_pointing_1.json
@@ -0,0 +1,18 @@
+{
+	"ambientocclusion": false,
+	"textures": {
+		"particle": "forkcart:block/shuttle_ties_on",
+		"rail": "forkcart:block/shuttle_ties_on"
+	},
+	"elements": [
+		{
+			"from": [0, 0.5, 0],
+			"to": [16, 0.5, 16],
+			"rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]},
+			"faces": {
+				"up": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#rail"},
+				"down": {"uv": [0, 16, 16, 0], "rotation": 90, "texture": "#rail"}
+			}
+		}
+	]
+}
diff --git a/src/client/resources/assets/forkcart/models/block/shuttle_ties_pointing_2.json b/src/client/resources/assets/forkcart/models/block/shuttle_ties_pointing_2.json
@@ -0,0 +1,18 @@
+{
+	"ambientocclusion": false,
+	"textures": {
+		"particle": "forkcart:block/shuttle_ties_on",
+		"rail": "forkcart:block/shuttle_ties_on"
+	},
+	"elements": [
+		{
+			"from": [0, 0.5, 0],
+			"to": [16, 0.5, 16],
+			"rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]},
+			"faces": {
+				"up": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#rail"},
+				"down": {"uv": [0, 16, 16, 0], "rotation": 180, "texture": "#rail"}
+			}
+		}
+	]
+}