BlueGit

timfa minecart-trains

Keep empty furnaces as the train anchor and tighten coupler spacing.

Co-authored-by: Cursor <cursoragent@cursor.com>

timfa Tim Falken · pushed by timfa

Authored 2026-08-22 · 2 months ago

Hash
33371a57a19479a6366a14b12ec540cabe1811c1
Parent
3f29f00e
6 files changed +30 −11
README.md +2 −2
@@ -72,9 +72,9 @@ You need JDK 25 and Maven. Then run:
72 72 mvn package
73 73 ```
74 74
75 Results will be in the `target` folder. With version `1.5.4` that is:
75 Results will be in the `target` folder. With version `1.5.5` that is:
76 76
77 - `MinecartTrains-1.5.4.jar`
77 - `MinecartTrains-1.5.5.jar`
78 78
79 79 Copy this file to the plugins folder of a Paper 26.2 server.
80 80
@@ -72,9 +72,9 @@ You need JDK 25 and Maven. Then run:
72mvn package
72mvn package
73```
73```
74
74
75Results will be in the `target` folder. With version `1.5.4` that is:
75Results will be in the `target` folder. With version `1.5.5` that is:
76
76
77- `MinecartTrains-1.5.4.jar`
77- `MinecartTrains-1.5.5.jar`
78
78
79Copy this file to the plugins folder of a Paper 26.2 server.
79Copy this file to the plugins folder of a Paper 26.2 server.
80
80
pom.xml +1 −1
@@ -6,7 +6,7 @@
6 6
7 7 <groupId>me.fridtjof</groupId>
8 8 <artifactId>minecarttrains</artifactId>
9 <version>1.5.4</version>
9 <version>1.5.5</version>
10 10 <packaging>jar</packaging>
11 11
12 12 <name>MinecartTrains</name>
@@ -6,7 +6,7 @@
6
6
7 <groupId>me.fridtjof</groupId>
7 <groupId>me.fridtjof</groupId>
8 <artifactId>minecarttrains</artifactId>
8 <artifactId>minecarttrains</artifactId>
9 <version>1.5.4</version>
9 <version>1.5.5</version>
10 <packaging>jar</packaging>
10 <packaging>jar</packaging>
11
11
12 <name>MinecartTrains</name>
12 <name>MinecartTrains</name>
src/main/java/me/fridtjof/minecarttrains/events/OnVehicleUpdateEvent.java +2 −3
@@ -66,6 +66,8 @@ public class OnVehicleUpdateEvent implements Listener
66 66 return;
67 67 }
68 68
69 linkPhysics.updateTrain(minecart);
70
69 71 if (!Rails.isRail(Rails.railBlock(parent.getLocation()))
70 72 || !Rails.isRail(Rails.railBlock(minecart.getLocation())))
71 73 {
@@ -79,10 +81,7 @@ public class OnVehicleUpdateEvent implements Listener
79 81 linkageManager.removeLink(minecart);
80 82 minecart.setVelocity(new Vector(0, 0, 0));
81 83 parent.setVelocity(new Vector(0, 0, 0));
82 return;
83 84 }
84
85 linkPhysics.updateTrain(minecart);
86 85 }
87 86
88 87 private void handlePoweredCart(PoweredMinecart poweredCart)
@@ -66,6 +66,8 @@ public class OnVehicleUpdateEvent implements Listener
66 return;
66 return;
67 }
67 }
68
68
69 linkPhysics.updateTrain(minecart);
70
69 if (!Rails.isRail(Rails.railBlock(parent.getLocation()))
71 if (!Rails.isRail(Rails.railBlock(parent.getLocation()))
70 || !Rails.isRail(Rails.railBlock(minecart.getLocation())))
72 || !Rails.isRail(Rails.railBlock(minecart.getLocation())))
71 {
73 {
@@ -79,10 +81,7 @@ public class OnVehicleUpdateEvent implements Listener
79 linkageManager.removeLink(minecart);
81 linkageManager.removeLink(minecart);
80 minecart.setVelocity(new Vector(0, 0, 0));
82 minecart.setVelocity(new Vector(0, 0, 0));
81 parent.setVelocity(new Vector(0, 0, 0));
83 parent.setVelocity(new Vector(0, 0, 0));
82 return;
83 }
84 }
84
85 linkPhysics.updateTrain(minecart);
86 }
85 }
87
86
88 private void handlePoweredCart(PoweredMinecart poweredCart)
87 private void handlePoweredCart(PoweredMinecart poweredCart)
src/main/java/me/fridtjof/minecarttrains/managers/ConfigManager.java +4 −4
@@ -16,7 +16,7 @@ public class ConfigManager
16 16 public YamlConfig mainConfig, physicsConfig, messagesFile;
17 17
18 18 public static int mainConfigVersion = 4;
19 public static int physicsConfigVersion = 5;
19 public static int physicsConfigVersion = 6;
20 20 public static String versionStringName = "config_version";
21 21
22 22 public ConfigManager(JavaPlugin plugin)
@@ -124,19 +124,19 @@ public class ConfigManager
124 124
125 125 physicsConfig.getConfig().addDefault("link.low_speed.speed.pull", 1);
126 126 physicsConfig.getConfig().addDefault("link.low_speed.speed.push", 32);
127 physicsConfig.getConfig().addDefault("link.low_speed.distance.aimed", 1.3);
127 physicsConfig.getConfig().addDefault("link.low_speed.distance.aimed", 1.15);
128 128 physicsConfig.getConfig().addDefault("link.low_speed.distance.aimed_tolerance", 0.001);
129 129
130 130 physicsConfig.getConfig().addDefault("link.high_speed.speed.pull", 4);
131 131 physicsConfig.getConfig().addDefault("link.high_speed.speed.push", 4);
132 physicsConfig.getConfig().addDefault("link.high_speed.distance.aimed", 1.5);
132 physicsConfig.getConfig().addDefault("link.high_speed.distance.aimed", 1.25);
133 133 physicsConfig.getConfig().addDefault("link.high_speed.distance.aimed_tolerance", 0.001);
134 134
135 135 physicsConfig.getConfig().addDefault("link.high_speed.gate_speed", 1.5);
136 136
137 137 physicsConfig.getConfig().addDefault("link.kinematic.sample_distance", 0.12);
138 138 physicsConfig.getConfig().addDefault("link.kinematic.max_path_length", 96);
139 physicsConfig.getConfig().addDefault("link.kinematic.snap_epsilon", 0.01);
139 physicsConfig.getConfig().addDefault("link.kinematic.snap_epsilon", 0.012);
140 140
141 141 physicsConfig.getConfig().addDefault("track.high_speed.max_speed", 4);
142 142 physicsConfig.getConfig().addDefault("track.high_speed.acceleration", 0.008);
@@ -16,7 +16,7 @@ public class ConfigManager
16 public YamlConfig mainConfig, physicsConfig, messagesFile;
16 public YamlConfig mainConfig, physicsConfig, messagesFile;
17
17
18 public static int mainConfigVersion = 4;
18 public static int mainConfigVersion = 4;
19 public static int physicsConfigVersion = 5;
19 public static int physicsConfigVersion = 6;
20 public static String versionStringName = "config_version";
20 public static String versionStringName = "config_version";
21
21
22 public ConfigManager(JavaPlugin plugin)
22 public ConfigManager(JavaPlugin plugin)
@@ -124,19 +124,19 @@ public class ConfigManager
124
124
125 physicsConfig.getConfig().addDefault("link.low_speed.speed.pull", 1);
125 physicsConfig.getConfig().addDefault("link.low_speed.speed.pull", 1);
126 physicsConfig.getConfig().addDefault("link.low_speed.speed.push", 32);
126 physicsConfig.getConfig().addDefault("link.low_speed.speed.push", 32);
127 physicsConfig.getConfig().addDefault("link.low_speed.distance.aimed", 1.3);
127 physicsConfig.getConfig().addDefault("link.low_speed.distance.aimed", 1.15);
128 physicsConfig.getConfig().addDefault("link.low_speed.distance.aimed_tolerance", 0.001);
128 physicsConfig.getConfig().addDefault("link.low_speed.distance.aimed_tolerance", 0.001);
129
129
130 physicsConfig.getConfig().addDefault("link.high_speed.speed.pull", 4);
130 physicsConfig.getConfig().addDefault("link.high_speed.speed.pull", 4);
131 physicsConfig.getConfig().addDefault("link.high_speed.speed.push", 4);
131 physicsConfig.getConfig().addDefault("link.high_speed.speed.push", 4);
132 physicsConfig.getConfig().addDefault("link.high_speed.distance.aimed", 1.5);
132 physicsConfig.getConfig().addDefault("link.high_speed.distance.aimed", 1.25);
133 physicsConfig.getConfig().addDefault("link.high_speed.distance.aimed_tolerance", 0.001);
133 physicsConfig.getConfig().addDefault("link.high_speed.distance.aimed_tolerance", 0.001);
134
134
135 physicsConfig.getConfig().addDefault("link.high_speed.gate_speed", 1.5);
135 physicsConfig.getConfig().addDefault("link.high_speed.gate_speed", 1.5);
136
136
137 physicsConfig.getConfig().addDefault("link.kinematic.sample_distance", 0.12);
137 physicsConfig.getConfig().addDefault("link.kinematic.sample_distance", 0.12);
138 physicsConfig.getConfig().addDefault("link.kinematic.max_path_length", 96);
138 physicsConfig.getConfig().addDefault("link.kinematic.max_path_length", 96);
139 physicsConfig.getConfig().addDefault("link.kinematic.snap_epsilon", 0.01);
139 physicsConfig.getConfig().addDefault("link.kinematic.snap_epsilon", 0.012);
140
140
141 physicsConfig.getConfig().addDefault("track.high_speed.max_speed", 4);
141 physicsConfig.getConfig().addDefault("track.high_speed.max_speed", 4);
142 physicsConfig.getConfig().addDefault("track.high_speed.acceleration", 0.008);
142 physicsConfig.getConfig().addDefault("track.high_speed.acceleration", 0.008);
src/main/java/me/fridtjof/minecarttrains/managers/LinkPhysics.java +14 −1
@@ -65,6 +65,11 @@ public class LinkPhysics
65 65 Vector heading = headingOf(reference);
66 66 boolean lowerIsAhead = lowerIsAhead(train, referenceIndex, heading);
67 67 UUID trainId = linkageManager.findHead(cart).getUniqueId();
68 Trail trail = trails.get(trainId);
69 if (trail != null && !reference.getUniqueId().equals(trail.ownerId))
70 {
71 trails.remove(trainId);
72 }
68 73 recordTrail(trainId, reference, heading);
69 74
70 75 double spacing = aimedDistance(reference);
@@ -89,6 +94,11 @@ public class LinkPhysics
89 94 {
90 95 return;
91 96 }
97 Rails.Pose onRail = Rails.snap(pose.location(), pose.tangent());
98 if (onRail != null)
99 {
100 pose = onRail;
101 }
92 102
93 103 Vector tangent = pose.tangent().clone();
94 104 if (tangent.lengthSquared() < STILL)
@@ -133,7 +143,9 @@ public class LinkPhysics
133 143 {
134 144 Rails.Pose snapped = Rails.snap(reference.getLocation(), heading);
135 145 Location sample = snapped == null ? reference.getLocation() : snapped.location();
136 trails.computeIfAbsent(trainId, id -> new Trail()).record(sample, heading, sampleDistance, maxPathLength);
146 Trail trail = trails.computeIfAbsent(trainId, id -> new Trail());
147 trail.ownerId = reference.getUniqueId();
148 trail.record(sample, heading, sampleDistance, maxPathLength);
137 149 }
138 150
139 151 private void pruneTrails()
@@ -210,6 +222,7 @@ public class LinkPhysics
210 222
211 223 private static final class Trail
212 224 {
225 private UUID ownerId;
213 226 private final List<double[]> points = new ArrayList<>();
214 227 private Vector lastHeading;
215 228
@@ -65,6 +65,11 @@ public class LinkPhysics
65 Vector heading = headingOf(reference);
65 Vector heading = headingOf(reference);
66 boolean lowerIsAhead = lowerIsAhead(train, referenceIndex, heading);
66 boolean lowerIsAhead = lowerIsAhead(train, referenceIndex, heading);
67 UUID trainId = linkageManager.findHead(cart).getUniqueId();
67 UUID trainId = linkageManager.findHead(cart).getUniqueId();
68 Trail trail = trails.get(trainId);
69 if (trail != null && !reference.getUniqueId().equals(trail.ownerId))
70 {
71 trails.remove(trainId);
72 }
68 recordTrail(trainId, reference, heading);
73 recordTrail(trainId, reference, heading);
69
74
70 double spacing = aimedDistance(reference);
75 double spacing = aimedDistance(reference);
@@ -89,6 +94,11 @@ public class LinkPhysics
89 {
94 {
90 return;
95 return;
91 }
96 }
97 Rails.Pose onRail = Rails.snap(pose.location(), pose.tangent());
98 if (onRail != null)
99 {
100 pose = onRail;
101 }
92
102
93 Vector tangent = pose.tangent().clone();
103 Vector tangent = pose.tangent().clone();
94 if (tangent.lengthSquared() < STILL)
104 if (tangent.lengthSquared() < STILL)
@@ -133,7 +143,9 @@ public class LinkPhysics
133 {
143 {
134 Rails.Pose snapped = Rails.snap(reference.getLocation(), heading);
144 Rails.Pose snapped = Rails.snap(reference.getLocation(), heading);
135 Location sample = snapped == null ? reference.getLocation() : snapped.location();
145 Location sample = snapped == null ? reference.getLocation() : snapped.location();
136 trails.computeIfAbsent(trainId, id -> new Trail()).record(sample, heading, sampleDistance, maxPathLength);
146 Trail trail = trails.computeIfAbsent(trainId, id -> new Trail());
147 trail.ownerId = reference.getUniqueId();
148 trail.record(sample, heading, sampleDistance, maxPathLength);
137 }
149 }
138
150
139 private void pruneTrails()
151 private void pruneTrails()
@@ -210,6 +222,7 @@ public class LinkPhysics
210
222
211 private static final class Trail
223 private static final class Trail
212 {
224 {
225 private UUID ownerId;
213 private final List<double[]> points = new ArrayList<>();
226 private final List<double[]> points = new ArrayList<>();
214 private Vector lastHeading;
227 private Vector lastHeading;
215
228
src/main/java/me/fridtjof/minecarttrains/managers/LinkageManager.java +7 −0
@@ -322,6 +322,13 @@ public class LinkageManager
322 322 }
323 323
324 324 List<Minecart> train = getTrain(cart);
325 for (Minecart member : train)
326 {
327 if (member instanceof PoweredMinecart)
328 {
329 return member;
330 }
331 }
325 332 if (train.size() < 2)
326 333 {
327 334 return train.get(0);
@@ -322,6 +322,13 @@ public class LinkageManager
322 }
322 }
323
323
324 List<Minecart> train = getTrain(cart);
324 List<Minecart> train = getTrain(cart);
325 for (Minecart member : train)
326 {
327 if (member instanceof PoweredMinecart)
328 {
329 return member;
330 }
331 }
325 if (train.size() < 2)
332 if (train.size() < 2)
326 {
333 {
327 return train.get(0);
334 return train.get(0);