Cache train lookups and skip idle coupler physics.
Co-authored-by: Cursor <cursoragent@cursor.com>
@@ -5,6 +5,7 @@ import me.fridtjof.minecarttrains.managers.CouplerVisualManager;
5
5
import me.fridtjof.minecarttrains.managers.EventManager;
6
6
import me.fridtjof.minecarttrains.managers.LinkageManager;
7
7
import me.fridtjof.minecarttrains.managers.RecipeManager;
8
import me.fridtjof.minecarttrains.utils.CartTags;
8
9
import me.fridtjof.minecarttrains.utils.ModrinthUpdateChecker;
9
10
import org.bstats.bukkit.Metrics;
10
11
import org.bukkit.plugin.java.JavaPlugin;
@@ -21,6 +22,7 @@ public final class MinecartTrains extends JavaPlugin
21
22
22
23
public ConfigManager configManager;
23
24
public LinkageManager linkageManager;
25
public CartTags cartTags;
24
26
public CouplerVisualManager couplerVisualManager;
25
27
26
28
@Override
@@ -30,6 +32,7 @@ public final class MinecartTrains extends JavaPlugin
30
32
31
33
configManager = new ConfigManager(this);
32
34
linkageManager = new LinkageManager();
35
cartTags = new CartTags(this);
33
36
34
37
new RecipeManager();
35
38
new EventManager(this);
@@ -5,6 +5,7 @@ import me.fridtjof.minecarttrains.managers.CouplerVisualManager;5
import me.fridtjof.minecarttrains.managers.EventManager;5
import me.fridtjof.minecarttrains.managers.EventManager;6
import me.fridtjof.minecarttrains.managers.LinkageManager;6
import me.fridtjof.minecarttrains.managers.LinkageManager;7
import me.fridtjof.minecarttrains.managers.RecipeManager;7
import me.fridtjof.minecarttrains.managers.RecipeManager;8
import me.fridtjof.minecarttrains.utils.CartTags;8
import me.fridtjof.minecarttrains.utils.ModrinthUpdateChecker;9
import me.fridtjof.minecarttrains.utils.ModrinthUpdateChecker;9
import org.bstats.bukkit.Metrics;10
import org.bstats.bukkit.Metrics;10
import org.bukkit.plugin.java.JavaPlugin;11
import org.bukkit.plugin.java.JavaPlugin;@@ -21,6 +22,7 @@ public final class MinecartTrains extends JavaPlugin21
22
22
public ConfigManager configManager;23
public ConfigManager configManager;23
public LinkageManager linkageManager;24
public LinkageManager linkageManager;25
public CartTags cartTags;24
public CouplerVisualManager couplerVisualManager;26
public CouplerVisualManager couplerVisualManager;25
27
26
@Override28
@Override@@ -30,6 +32,7 @@ public final class MinecartTrains extends JavaPlugin30
32
31
configManager = new ConfigManager(this);33
configManager = new ConfigManager(this);32
linkageManager = new LinkageManager();34
linkageManager = new LinkageManager();35
cartTags = new CartTags(this);33
36
34
new RecipeManager();37
new RecipeManager();35
new EventManager(this);38
new EventManager(this);@@ -1,7 +1,6 @@
1
1
package me.fridtjof.minecarttrains.events;
2
2
3
3
import me.fridtjof.minecarttrains.MinecartTrains;
4
import me.fridtjof.minecarttrains.utils.CartNames;
5
4
import me.fridtjof.minecarttrains.utils.HopperUtils;
6
5
import org.bukkit.Material;
7
6
import org.bukkit.block.Hopper;
@@ -78,6 +77,6 @@ public class OnInventoryMoveItemEvent implements Listener
78
77
79
78
public boolean isFuelCart(StorageMinecart cart)
80
79
{
81
return CartNames.hasName(cart, FUEL_CART_NAME);
80
return plugin.cartTags.isFuelCart(cart, FUEL_CART_NAME);
82
81
}
83
82
}
@@ -1,7 +1,6 @@1
package me.fridtjof.minecarttrains.events;1
package me.fridtjof.minecarttrains.events;2
2
3
import me.fridtjof.minecarttrains.MinecartTrains;3
import me.fridtjof.minecarttrains.MinecartTrains;4
import me.fridtjof.minecarttrains.utils.CartNames;5
import me.fridtjof.minecarttrains.utils.HopperUtils;4
import me.fridtjof.minecarttrains.utils.HopperUtils;6
import org.bukkit.Material;5
import org.bukkit.Material;7
import org.bukkit.block.Hopper;6
import org.bukkit.block.Hopper;@@ -78,6 +77,6 @@ public class OnInventoryMoveItemEvent implements Listener78
77
79
public boolean isFuelCart(StorageMinecart cart)78
public boolean isFuelCart(StorageMinecart cart)80
{79
{81
return CartNames.hasName(cart, FUEL_CART_NAME);80
return plugin.cartTags.isFuelCart(cart, FUEL_CART_NAME);82
}81
}83
}82
}@@ -1,7 +1,6 @@
1
1
package me.fridtjof.minecarttrains.events;
2
2
3
3
import me.fridtjof.minecarttrains.MinecartTrains;
4
import me.fridtjof.minecarttrains.utils.CartNames;
5
4
import org.bukkit.Material;
6
5
import org.bukkit.entity.minecart.StorageMinecart;
7
6
import org.bukkit.event.EventHandler;
@@ -23,11 +22,12 @@ public class OnVehicleCreateEvent implements Listener
23
22
return;
24
23
}
25
24
26
if (!CartNames.hasName(cart, FUEL_CART_NAME))
25
if (!plugin.cartTags.isFuelCart(cart, FUEL_CART_NAME))
27
26
{
28
27
return;
29
28
}
30
29
30
plugin.cartTags.markFuelCart(cart);
31
31
cart.setDisplayBlockData(Material.COAL_BLOCK.createBlockData());
32
32
}
33
33
}
@@ -1,7 +1,6 @@1
package me.fridtjof.minecarttrains.events;1
package me.fridtjof.minecarttrains.events;2
2
3
import me.fridtjof.minecarttrains.MinecartTrains;3
import me.fridtjof.minecarttrains.MinecartTrains;4
import me.fridtjof.minecarttrains.utils.CartNames;5
import org.bukkit.Material;4
import org.bukkit.Material;6
import org.bukkit.entity.minecart.StorageMinecart;5
import org.bukkit.entity.minecart.StorageMinecart;7
import org.bukkit.event.EventHandler;6
import org.bukkit.event.EventHandler;@@ -23,11 +22,12 @@ public class OnVehicleCreateEvent implements Listener23
return;22
return;24
}23
}25
24
26
if (!CartNames.hasName(cart, FUEL_CART_NAME))25
if (!plugin.cartTags.isFuelCart(cart, FUEL_CART_NAME))27
{26
{28
return;27
return;29
}28
}30
29
30
plugin.cartTags.markFuelCart(cart);31
cart.setDisplayBlockData(Material.COAL_BLOCK.createBlockData());31
cart.setDisplayBlockData(Material.COAL_BLOCK.createBlockData());32
}32
}33
}33
}@@ -2,19 +2,16 @@ package me.fridtjof.minecarttrains.events;
2
2
3
3
import me.fridtjof.minecarttrains.MinecartTrains;
4
4
import me.fridtjof.minecarttrains.managers.LinkageManager;
5
import org.bukkit.Bukkit;
6
import org.bukkit.Location;
7
5
import org.bukkit.Material;
8
import org.bukkit.World;
9
6
import org.bukkit.block.Block;
7
import org.bukkit.block.BlockFace;
10
8
import org.bukkit.entity.Minecart;
11
9
import org.bukkit.event.EventHandler;
12
10
import org.bukkit.event.Listener;
13
11
import org.bukkit.event.vehicle.VehicleMoveEvent;
14
import org.bukkit.util.Vector;
15
16
public class OnVehicleMoveEvent implements Listener {
17
12
13
public class OnVehicleMoveEvent implements Listener
14
{
18
15
19
16
static MinecartTrains plugin = MinecartTrains.getInstance();
20
17
LinkageManager linkageManager = plugin.linkageManager;
@@ -28,50 +25,45 @@ public class OnVehicleMoveEvent implements Listener {
28
25
@EventHandler
29
26
public void onVehicleMove(VehicleMoveEvent event)
30
27
{
31
if(!doHighSpeed)
28
if (!doHighSpeed)
32
29
{
33
30
return;
34
31
}
35
32
36
// only continue if vehicle is a minecart
37
if(!(event.getVehicle() instanceof Minecart))
33
if (!(event.getVehicle() instanceof Minecart minecart))
38
34
{
39
35
return;
40
36
}
41
37
42
Minecart minecart = (Minecart) event.getVehicle();
43
World world = minecart.getWorld();
44
Location location = minecart.getLocation();
45
46
if(linkageManager.hasLink(minecart))
38
if (linkageManager.hasLink(minecart))
47
39
{
48
Minecart parent = (Minecart) Bukkit.getEntity(linkageManager.getLinkUniqueId(minecart));
49
50
minecart.setMaxSpeed(parent.getMaxSpeed());
40
Minecart parent = linkageManager.getParent(minecart);
41
if (parent != null)
42
{
43
minecart.setMaxSpeed(parent.getMaxSpeed());
44
}
51
45
return;
52
46
}
53
47
54
Block track = world.getBlockAt(location);
55
Block bed = world.getBlockAt(location.add(0, -1, 0));
48
Block track = minecart.getLocation().getBlock();
49
Block bed = track.getRelative(BlockFace.DOWN);
56
50
57
if(track.getType() != Material.POWERED_RAIL)
51
if (track.getType() != Material.POWERED_RAIL)
58
52
{
59
53
return;
60
54
}
61
if(bed.getType() != highSpeedBlock)
55
if (bed.getType() != highSpeedBlock)
62
56
{
63
57
minecart.setMaxSpeed(defaultSpeed);
64
58
return;
65
59
}
66
60
67
61
double currentMaxSpeed = minecart.getMaxSpeed();
68
69
if(currentMaxSpeed < maxHighSpeedSpeed)
62
if (currentMaxSpeed < maxHighSpeedSpeed)
70
63
{
71
//minecart.setMaxSpeed(currentMaxSpeed * acceleration);
72
64
minecart.setMaxSpeed(currentMaxSpeed + acceleration);
73
65
}
74
if(currentMaxSpeed > maxHighSpeedSpeed)
66
else if (currentMaxSpeed > maxHighSpeedSpeed)
75
67
{
76
68
minecart.setMaxSpeed(maxHighSpeedSpeed);
77
69
}
@@ -2,19 +2,16 @@ package me.fridtjof.minecarttrains.events;2
2
3
import me.fridtjof.minecarttrains.MinecartTrains;3
import me.fridtjof.minecarttrains.MinecartTrains;4
import me.fridtjof.minecarttrains.managers.LinkageManager;4
import me.fridtjof.minecarttrains.managers.LinkageManager;5
import org.bukkit.Bukkit;6
import org.bukkit.Location;7
import org.bukkit.Material;5
import org.bukkit.Material;8
import org.bukkit.World;9
import org.bukkit.block.Block;6
import org.bukkit.block.Block;7
import org.bukkit.block.BlockFace;10
import org.bukkit.entity.Minecart;8
import org.bukkit.entity.Minecart;11
import org.bukkit.event.EventHandler;9
import org.bukkit.event.EventHandler;12
import org.bukkit.event.Listener;10
import org.bukkit.event.Listener;13
import org.bukkit.event.vehicle.VehicleMoveEvent;11
import org.bukkit.event.vehicle.VehicleMoveEvent;14
import org.bukkit.util.Vector;15
16
public class OnVehicleMoveEvent implements Listener {17
12
13
public class OnVehicleMoveEvent implements Listener14
{18
15
19
static MinecartTrains plugin = MinecartTrains.getInstance();16
static MinecartTrains plugin = MinecartTrains.getInstance();20
LinkageManager linkageManager = plugin.linkageManager;17
LinkageManager linkageManager = plugin.linkageManager;@@ -28,50 +25,45 @@ public class OnVehicleMoveEvent implements Listener {28
@EventHandler25
@EventHandler29
public void onVehicleMove(VehicleMoveEvent event)26
public void onVehicleMove(VehicleMoveEvent event)30
{27
{31
if(!doHighSpeed)28
if (!doHighSpeed)32
{29
{33
return;30
return;34
}31
}35
32
36
// only continue if vehicle is a minecart33
if (!(event.getVehicle() instanceof Minecart minecart))37
if(!(event.getVehicle() instanceof Minecart))38
{34
{39
return;35
return;40
}36
}41
37
42
Minecart minecart = (Minecart) event.getVehicle();38
if (linkageManager.hasLink(minecart))43
World world = minecart.getWorld();44
Location location = minecart.getLocation();45
46
if(linkageManager.hasLink(minecart))47
{39
{48
Minecart parent = (Minecart) Bukkit.getEntity(linkageManager.getLinkUniqueId(minecart));40
Minecart parent = linkageManager.getParent(minecart);49
41
if (parent != null)50
minecart.setMaxSpeed(parent.getMaxSpeed());42
{43
minecart.setMaxSpeed(parent.getMaxSpeed());44
}51
return;45
return;52
}46
}53
47
54
Block track = world.getBlockAt(location);48
Block track = minecart.getLocation().getBlock();55
Block bed = world.getBlockAt(location.add(0, -1, 0));49
Block bed = track.getRelative(BlockFace.DOWN);56
50
57
if(track.getType() != Material.POWERED_RAIL)51
if (track.getType() != Material.POWERED_RAIL)58
{52
{59
return;53
return;60
}54
}61
if(bed.getType() != highSpeedBlock)55
if (bed.getType() != highSpeedBlock)62
{56
{63
minecart.setMaxSpeed(defaultSpeed);57
minecart.setMaxSpeed(defaultSpeed);64
return;58
return;65
}59
}66
60
67
double currentMaxSpeed = minecart.getMaxSpeed();61
double currentMaxSpeed = minecart.getMaxSpeed();68
62
if (currentMaxSpeed < maxHighSpeedSpeed)69
if(currentMaxSpeed < maxHighSpeedSpeed)70
{63
{71
//minecart.setMaxSpeed(currentMaxSpeed * acceleration);72
minecart.setMaxSpeed(currentMaxSpeed + acceleration);64
minecart.setMaxSpeed(currentMaxSpeed + acceleration);73
}65
}74
if(currentMaxSpeed > maxHighSpeedSpeed)66
else if (currentMaxSpeed > maxHighSpeedSpeed)75
{67
{76
minecart.setMaxSpeed(maxHighSpeedSpeed);68
minecart.setMaxSpeed(maxHighSpeedSpeed);77
}69
}@@ -5,8 +5,10 @@ import me.fridtjof.minecarttrains.MinecartTrains;
5
5
import me.fridtjof.minecarttrains.utils.FurnaceCarts;
6
6
import org.bukkit.Location;
7
7
import org.bukkit.Material;
8
import org.bukkit.Tag;
8
9
import org.bukkit.World;
9
10
import org.bukkit.block.Block;
11
import org.bukkit.block.BlockFace;
10
12
import org.bukkit.block.data.type.RedstoneRail;
11
13
import org.bukkit.entity.Entity;
12
14
import org.bukkit.entity.Minecart;
@@ -46,26 +48,12 @@ public class OnVehicleUpdateEvent implements Listener
46
48
public void onVehicleUpdate(VehicleUpdateEvent event)
47
49
{
48
50
Vehicle vehicle = event.getVehicle();
49
Minecart minecart;
50
String uniqueId;
51
51
Entity parent;
52
52
53
if(!(vehicle instanceof Minecart))
53
if(!(vehicle instanceof Minecart minecart))
54
54
{
55
55
return;
56
56
}
57
minecart = (Minecart) vehicle;
58
59
//DEBUG
60
/*if(!minecart.getPassengers().isEmpty())
61
{
62
Entity passenger = minecart.getPassengers().get(0);
63
if((passenger instanceof Player))
64
{
65
double shownSpeed = minecart.getVelocity().length() * 72;
66
passenger.sendMessage("Speed: " + (int)shownSpeed + " km/h");
67
}
68
}*/
69
57
70
58
linkageManager.remember(minecart);
71
59
@@ -108,20 +96,16 @@ public class OnVehicleUpdateEvent implements Listener
108
96
}
109
97
110
98
111
// may cause problems
112
//check if parent is derailed
113
Location minecartLocation = minecart.getLocation();
114
Material parentTrack = parentWorld.getBlockAt(parent.getLocation()).getType();
115
Material parentTrackOnHill = parentWorld.getBlockAt(parent.getLocation().add(0, -1, 0)).getType();
116
if(!isAnyKindOfTrack(parentTrack) && !isAnyKindOfTrack(parentTrackOnHill))
99
Block parentBlock = parent.getLocation().getBlock();
100
if (!isRail(parentBlock.getType()) && !isRail(parentBlock.getRelative(BlockFace.DOWN).getType()))
117
101
{
118
102
linkageManager.removeLink(minecart);
119
103
return;
120
104
}
121
105
122
123
// defines the distance value as (parent's location)-(child's location)
124
double distance = minecart.getLocation().distance(parent.getLocation());
106
double distanceSquared = minecart.getLocation().distanceSquared(parent.getLocation());
107
double maxDistanceSquared = maxDistance * maxDistance;
108
double minDistanceSquared = minDistance * minDistance;
125
109
126
110
/* Sets the speed at which carts move towards their dependant. At HSRail speeds, this value must be high
127
111
to avoid breaking trains during acceleration.
@@ -133,77 +117,69 @@ public class OnVehicleUpdateEvent implements Listener
133
117
double aimedDistance;
134
118
double aimedDistanceTolerance;
135
119
136
// sets the parts pull vars based on the speed of the parent
137
if(parent.getVelocity().length() <= highSpeedGate)
120
double highSpeedGateSquared = highSpeedGate * highSpeedGate;
121
if(parent.getVelocity().lengthSquared() <= highSpeedGateSquared)
138
122
{
139
//low speed
140
123
pullSpeed = couplingPullSpeedLowSpeed;
141
124
aimedDistance = this.aimedDistanceLowSpeed;
142
125
aimedDistanceTolerance = this.aimedDistanceToleranceLowSpeed;
143
126
}
144
127
else
145
128
{
146
//high speed
147
129
pullSpeed = couplingPullSpeedHighSpeed;
148
130
aimedDistance = this.aimedDistanceHighSpeed;
149
131
aimedDistanceTolerance = this.aimedDistanceToleranceHighSpeed;
150
132
}
151
133
152
153
// sets the carts push speed based on its own speed
154
if(minecart.getVelocity().length() <= highSpeedGate)
134
if(minecart.getVelocity().lengthSquared() <= highSpeedGateSquared)
155
135
{
156
//low speed
157
136
pushSpeed = couplingPushSpeedLowSpeed;
158
137
}
159
138
else
160
139
{
161
//high speed
162
140
pushSpeed = couplingPushSpeedHighSpeed;
163
141
}
164
142
165
166
/* Sets max/min distance for links. Shorter distances are more reliable along corners, however, until the
167
linkageManager can be reworked, longer maximums are needed to handle acceleration.
168
If distance is out of bonds the links get removed and the cart stopped to prevent runaway trains. */
169
if((distance > maxDistance) || distance < minDistance)
143
if((distanceSquared > maxDistanceSquared) || distanceSquared < minDistanceSquared)
170
144
{
171
145
linkageManager.removeLink(minecart);
172
146
minecart.setVelocity(new Vector(0, 0, 0));
173
147
parent.setVelocity(new Vector(0, 0, 0));
148
return;
174
149
}
175
150
176
/* Handles gap between parent and dependant. Values set too low result in collisions between carts
177
while train is sitting still, especially on declines, causing 'jiggling' that kills momentum
178
More precise parameters helps to eliminate the 'jiggling' behavior that interferes with momentum
179
Slower 'away' speeds compared to 'toward' speeds also help to eliminate 'jiggling' */
180
else
151
double distance = Math.sqrt(distanceSquared);
152
double aimedLow = aimedDistance - aimedDistanceTolerance;
153
double aimedHigh = aimedDistance + aimedDistanceTolerance;
154
if (distance >= aimedLow && distance <= aimedHigh
155
&& minecart.getVelocity().lengthSquared() < 0.0001
156
&& parent.getVelocity().lengthSquared() < 0.0001)
157
{
158
return;
159
}
160
161
Entity follower = minecart;
162
Entity anchor = parent;
163
Minecart leader = linkageManager.findLeader(minecart);
164
if (leader != null && linkageManager.isCloserToLeader(minecart, (Minecart) parent, leader))
165
{
166
follower = parent;
167
anchor = minecart;
168
}
169
if (leader != null && follower.getUniqueId().equals(leader.getUniqueId()))
181
170
{
182
Entity follower = minecart;
183
Entity anchor = parent;
184
Minecart leader = linkageManager.findLeader(minecart);
185
if (leader != null && linkageManager.isCloserToLeader(minecart, (Minecart) parent, leader))
186
{
187
follower = parent;
188
anchor = minecart;
189
}
190
if (leader != null && follower.getUniqueId().equals(leader.getUniqueId()))
191
{
192
Entity swap = follower;
193
follower = anchor;
194
anchor = swap;
195
}
196
197
// acceleration if distance to small
198
if(distance < (aimedDistance - aimedDistanceTolerance))
199
{
200
moveToward(follower, anchor, pushSpeed, (distance - aimedDistance));
201
}
202
// acceleration if distance to large
203
else if(distance > (aimedDistance + aimedDistanceTolerance))
204
{
205
moveToward(follower, anchor, pullSpeed, (distance - aimedDistance));
206
}
171
Entity swap = follower;
172
follower = anchor;
173
anchor = swap;
174
}
175
176
if (distance < aimedLow)
177
{
178
moveToward(follower, anchor, pushSpeed, (distance - aimedDistance));
179
}
180
else if (distance > aimedHigh)
181
{
182
moveToward(follower, anchor, pullSpeed, (distance - aimedDistance));
207
183
}
208
184
}
209
185
@@ -246,24 +222,8 @@ public class OnVehicleUpdateEvent implements Listener
246
222
}
247
223
248
224
249
public boolean isAnyKindOfTrack(Material material)
225
private boolean isRail(Material material)
250
226
{
251
if(material == Material.POWERED_RAIL)
252
{
253
return true;
254
}
255
if(material == Material.RAIL)
256
{
257
return true;
258
}
259
if(material == Material.ACTIVATOR_RAIL)
260
{
261
return true;
262
}
263
if(material == Material.DETECTOR_RAIL)
264
{
265
return true;
266
}
267
return false;
227
return Tag.RAILS.isTagged(material);
268
228
}
269
229
}
@@ -5,8 +5,10 @@ import me.fridtjof.minecarttrains.MinecartTrains;5
import me.fridtjof.minecarttrains.utils.FurnaceCarts;5
import me.fridtjof.minecarttrains.utils.FurnaceCarts;6
import org.bukkit.Location;6
import org.bukkit.Location;7
import org.bukkit.Material;7
import org.bukkit.Material;8
import org.bukkit.Tag;8
import org.bukkit.World;9
import org.bukkit.World;9
import org.bukkit.block.Block;10
import org.bukkit.block.Block;11
import org.bukkit.block.BlockFace;10
import org.bukkit.block.data.type.RedstoneRail;12
import org.bukkit.block.data.type.RedstoneRail;11
import org.bukkit.entity.Entity;13
import org.bukkit.entity.Entity;12
import org.bukkit.entity.Minecart;14
import org.bukkit.entity.Minecart;@@ -46,26 +48,12 @@ public class OnVehicleUpdateEvent implements Listener46
public void onVehicleUpdate(VehicleUpdateEvent event)48
public void onVehicleUpdate(VehicleUpdateEvent event)47
{49
{48
Vehicle vehicle = event.getVehicle();50
Vehicle vehicle = event.getVehicle();49
Minecart minecart;50
String uniqueId;51
Entity parent;51
Entity parent;52
52
53
if(!(vehicle instanceof Minecart))53
if(!(vehicle instanceof Minecart minecart))54
{54
{55
return;55
return;56
}56
}57
minecart = (Minecart) vehicle;58
59
//DEBUG60
/*if(!minecart.getPassengers().isEmpty())61
{62
Entity passenger = minecart.getPassengers().get(0);63
if((passenger instanceof Player))64
{65
double shownSpeed = minecart.getVelocity().length() * 72;66
passenger.sendMessage("Speed: " + (int)shownSpeed + " km/h");67
}68
}*/69
57
70
linkageManager.remember(minecart);58
linkageManager.remember(minecart);71
59
@@ -108,20 +96,16 @@ public class OnVehicleUpdateEvent implements Listener108
}96
}109
97
110
98
111
// may cause problems99
Block parentBlock = parent.getLocation().getBlock();112
//check if parent is derailed100
if (!isRail(parentBlock.getType()) && !isRail(parentBlock.getRelative(BlockFace.DOWN).getType()))113
Location minecartLocation = minecart.getLocation();114
Material parentTrack = parentWorld.getBlockAt(parent.getLocation()).getType();115
Material parentTrackOnHill = parentWorld.getBlockAt(parent.getLocation().add(0, -1, 0)).getType();116
if(!isAnyKindOfTrack(parentTrack) && !isAnyKindOfTrack(parentTrackOnHill))117
{101
{118
linkageManager.removeLink(minecart);102
linkageManager.removeLink(minecart);119
return;103
return;120
}104
}121
105
122
106
double distanceSquared = minecart.getLocation().distanceSquared(parent.getLocation());123
// defines the distance value as (parent's location)-(child's location)107
double maxDistanceSquared = maxDistance * maxDistance;124
double distance = minecart.getLocation().distance(parent.getLocation());108
double minDistanceSquared = minDistance * minDistance;125
109
126
/* Sets the speed at which carts move towards their dependant. At HSRail speeds, this value must be high110
/* Sets the speed at which carts move towards their dependant. At HSRail speeds, this value must be high127
to avoid breaking trains during acceleration.111
to avoid breaking trains during acceleration.@@ -133,77 +117,69 @@ public class OnVehicleUpdateEvent implements Listener133
double aimedDistance;117
double aimedDistance;134
double aimedDistanceTolerance;118
double aimedDistanceTolerance;135
119
136
// sets the parts pull vars based on the speed of the parent120
double highSpeedGateSquared = highSpeedGate * highSpeedGate;137
if(parent.getVelocity().length() <= highSpeedGate)121
if(parent.getVelocity().lengthSquared() <= highSpeedGateSquared)138
{122
{139
//low speed140
pullSpeed = couplingPullSpeedLowSpeed;123
pullSpeed = couplingPullSpeedLowSpeed;141
aimedDistance = this.aimedDistanceLowSpeed;124
aimedDistance = this.aimedDistanceLowSpeed;142
aimedDistanceTolerance = this.aimedDistanceToleranceLowSpeed;125
aimedDistanceTolerance = this.aimedDistanceToleranceLowSpeed;143
}126
}144
else127
else145
{128
{146
//high speed147
pullSpeed = couplingPullSpeedHighSpeed;129
pullSpeed = couplingPullSpeedHighSpeed;148
aimedDistance = this.aimedDistanceHighSpeed;130
aimedDistance = this.aimedDistanceHighSpeed;149
aimedDistanceTolerance = this.aimedDistanceToleranceHighSpeed;131
aimedDistanceTolerance = this.aimedDistanceToleranceHighSpeed;150
}132
}151
133
152
134
if(minecart.getVelocity().lengthSquared() <= highSpeedGateSquared)153
// sets the carts push speed based on its own speed154
if(minecart.getVelocity().length() <= highSpeedGate)155
{135
{156
//low speed157
pushSpeed = couplingPushSpeedLowSpeed;136
pushSpeed = couplingPushSpeedLowSpeed;158
}137
}159
else138
else160
{139
{161
//high speed162
pushSpeed = couplingPushSpeedHighSpeed;140
pushSpeed = couplingPushSpeedHighSpeed;163
}141
}164
142
165
143
if((distanceSquared > maxDistanceSquared) || distanceSquared < minDistanceSquared)166
/* Sets max/min distance for links. Shorter distances are more reliable along corners, however, until the167
linkageManager can be reworked, longer maximums are needed to handle acceleration.168
If distance is out of bonds the links get removed and the cart stopped to prevent runaway trains. */169
if((distance > maxDistance) || distance < minDistance)170
{144
{171
linkageManager.removeLink(minecart);145
linkageManager.removeLink(minecart);172
minecart.setVelocity(new Vector(0, 0, 0));146
minecart.setVelocity(new Vector(0, 0, 0));173
parent.setVelocity(new Vector(0, 0, 0));147
parent.setVelocity(new Vector(0, 0, 0));148
return;174
}149
}175
150
176
/* Handles gap between parent and dependant. Values set too low result in collisions between carts151
double distance = Math.sqrt(distanceSquared);177
while train is sitting still, especially on declines, causing 'jiggling' that kills momentum152
double aimedLow = aimedDistance - aimedDistanceTolerance;178
More precise parameters helps to eliminate the 'jiggling' behavior that interferes with momentum153
double aimedHigh = aimedDistance + aimedDistanceTolerance;179
Slower 'away' speeds compared to 'toward' speeds also help to eliminate 'jiggling' */154
if (distance >= aimedLow && distance <= aimedHigh180
else155
&& minecart.getVelocity().lengthSquared() < 0.0001156
&& parent.getVelocity().lengthSquared() < 0.0001)157
{158
return;159
}160
161
Entity follower = minecart;162
Entity anchor = parent;163
Minecart leader = linkageManager.findLeader(minecart);164
if (leader != null && linkageManager.isCloserToLeader(minecart, (Minecart) parent, leader))165
{166
follower = parent;167
anchor = minecart;168
}169
if (leader != null && follower.getUniqueId().equals(leader.getUniqueId()))181
{170
{182
Entity follower = minecart;171
Entity swap = follower;183
Entity anchor = parent;172
follower = anchor;184
Minecart leader = linkageManager.findLeader(minecart);173
anchor = swap;185
if (leader != null && linkageManager.isCloserToLeader(minecart, (Minecart) parent, leader))174
}186
{175
187
follower = parent;176
if (distance < aimedLow)188
anchor = minecart;177
{189
}178
moveToward(follower, anchor, pushSpeed, (distance - aimedDistance));190
if (leader != null && follower.getUniqueId().equals(leader.getUniqueId()))179
}191
{180
else if (distance > aimedHigh)192
Entity swap = follower;181
{193
follower = anchor;182
moveToward(follower, anchor, pullSpeed, (distance - aimedDistance));194
anchor = swap;195
}196
197
// acceleration if distance to small198
if(distance < (aimedDistance - aimedDistanceTolerance))199
{200
moveToward(follower, anchor, pushSpeed, (distance - aimedDistance));201
}202
// acceleration if distance to large203
else if(distance > (aimedDistance + aimedDistanceTolerance))204
{205
moveToward(follower, anchor, pullSpeed, (distance - aimedDistance));206
}207
}183
}208
}184
}209
185
@@ -246,24 +222,8 @@ public class OnVehicleUpdateEvent implements Listener246
}222
}247
223
248
224
249
public boolean isAnyKindOfTrack(Material material)225
private boolean isRail(Material material)250
{226
{251
if(material == Material.POWERED_RAIL)227
return Tag.RAILS.isTagged(material);252
{253
return true;254
}255
if(material == Material.RAIL)256
{257
return true;258
}259
if(material == Material.ACTIVATOR_RAIL)260
{261
return true;262
}263
if(material == Material.DETECTOR_RAIL)264
{265
return true;266
}267
return false;268
}228
}269
}229
}@@ -2,7 +2,6 @@ package me.fridtjof.minecarttrains.events;
2
2
3
3
import me.fridtjof.minecarttrains.MinecartTrains;
4
4
import me.fridtjof.minecarttrains.managers.LinkageManager;
5
import me.fridtjof.minecarttrains.utils.CartNames;
6
5
import org.bukkit.Material;
7
6
import org.bukkit.entity.Entity;
8
7
import org.bukkit.entity.Minecart;
@@ -95,6 +94,6 @@ public class OnVehicleUpdateEventLowestPriority implements Listener
95
94
96
95
private boolean isCartTender(StorageMinecart cart)
97
96
{
98
return CartNames.hasName(cart, FUEL_CART_NAME);
97
return plugin.cartTags.isFuelCart(cart, FUEL_CART_NAME);
99
98
}
100
99
}
@@ -2,7 +2,6 @@ package me.fridtjof.minecarttrains.events;2
2
3
import me.fridtjof.minecarttrains.MinecartTrains;3
import me.fridtjof.minecarttrains.MinecartTrains;4
import me.fridtjof.minecarttrains.managers.LinkageManager;4
import me.fridtjof.minecarttrains.managers.LinkageManager;5
import me.fridtjof.minecarttrains.utils.CartNames;6
import org.bukkit.Material;5
import org.bukkit.Material;7
import org.bukkit.entity.Entity;6
import org.bukkit.entity.Entity;8
import org.bukkit.entity.Minecart;7
import org.bukkit.entity.Minecart;@@ -95,6 +94,6 @@ public class OnVehicleUpdateEventLowestPriority implements Listener95
94
96
private boolean isCartTender(StorageMinecart cart)95
private boolean isCartTender(StorageMinecart cart)97
{96
{98
return CartNames.hasName(cart, FUEL_CART_NAME);97
return plugin.cartTags.isFuelCart(cart, FUEL_CART_NAME);99
}98
}100
}99
}@@ -78,7 +78,7 @@ public class CouplerVisualManager
78
78
{
79
79
continue;
80
80
}
81
if (parent.getWorld() != child.getWorld())
81
if (parent.getWorld() != child.getWorld() || parent.getWorld().getPlayers().isEmpty())
82
82
{
83
83
continue;
84
84
}
@@ -78,7 +78,7 @@ public class CouplerVisualManager78
{78
{79
continue;79
continue;80
}80
}81
if (parent.getWorld() != child.getWorld())81
if (parent.getWorld() != child.getWorld() || parent.getWorld().getPlayers().isEmpty())82
{82
{83
continue;83
continue;84
}84
}@@ -1,30 +1,31 @@
1
1
package me.fridtjof.minecarttrains.managers;
2
2
3
import me.fridtjof.minecarttrains.events.*;
4
import org.bukkit.event.Listener;
3
import me.fridtjof.minecarttrains.events.OnFurnaceMinecartInteractEvent;
4
import me.fridtjof.minecarttrains.events.OnInventoryMoveItemEvent;
5
import me.fridtjof.minecarttrains.events.OnPlayerInteractEntityEvent;
6
import me.fridtjof.minecarttrains.events.OnProjectileHitEvent;
7
import me.fridtjof.minecarttrains.events.OnVehicleCreateEvent;
8
import me.fridtjof.minecarttrains.events.OnVehicleEntityCollisionEvent;
9
import me.fridtjof.minecarttrains.events.OnVehicleMoveEvent;
10
import me.fridtjof.minecarttrains.events.OnVehicleUpdateEvent;
11
import me.fridtjof.minecarttrains.events.OnVehicleUpdateEventLowestPriority;
12
import org.bukkit.plugin.PluginManager;
5
13
import org.bukkit.plugin.java.JavaPlugin;
6
14
7
import static org.bukkit.Bukkit.getServer;
8
9
public class EventManager implements Listener
15
public class EventManager
10
16
{
11
17
12
18
public EventManager(JavaPlugin plugin)
13
19
{
14
registerListeners(plugin);
20
PluginManager pluginManager = plugin.getServer().getPluginManager();
21
pluginManager.registerEvents(new OnPlayerInteractEntityEvent(), plugin);
22
pluginManager.registerEvents(new OnFurnaceMinecartInteractEvent(), plugin);
23
pluginManager.registerEvents(new OnVehicleUpdateEvent(), plugin);
24
pluginManager.registerEvents(new OnVehicleUpdateEventLowestPriority(), plugin);
25
pluginManager.registerEvents(new OnVehicleEntityCollisionEvent(), plugin);
26
pluginManager.registerEvents(new OnProjectileHitEvent(), plugin);
27
pluginManager.registerEvents(new OnVehicleCreateEvent(), plugin);
28
pluginManager.registerEvents(new OnInventoryMoveItemEvent(), plugin);
29
pluginManager.registerEvents(new OnVehicleMoveEvent(), plugin);
15
30
}
16
17
private void registerListeners(JavaPlugin plugin)
18
{
19
getServer().getPluginManager().registerEvents((Listener) new OnPlayerInteractEntityEvent(), plugin);
20
getServer().getPluginManager().registerEvents((Listener) new OnFurnaceMinecartInteractEvent(), plugin);
21
getServer().getPluginManager().registerEvents((Listener) new OnVehicleUpdateEvent(), plugin);
22
getServer().getPluginManager().registerEvents((Listener) new OnVehicleUpdateEventLowestPriority(), plugin);
23
getServer().getPluginManager().registerEvents((Listener) new OnVehicleEntityCollisionEvent(), plugin);
24
getServer().getPluginManager().registerEvents((Listener) new OnProjectileHitEvent(), plugin);
25
getServer().getPluginManager().registerEvents((Listener) new OnVehicleCreateEvent(), plugin);
26
getServer().getPluginManager().registerEvents((Listener) new OnInventoryMoveItemEvent(), plugin);
27
getServer().getPluginManager().registerEvents((Listener) new OnVehicleMoveEvent(), plugin);
28
}
29
30
31
}
@@ -1,30 +1,31 @@1
package me.fridtjof.minecarttrains.managers;1
package me.fridtjof.minecarttrains.managers;2
2
3
import me.fridtjof.minecarttrains.events.*;3
import me.fridtjof.minecarttrains.events.OnFurnaceMinecartInteractEvent;4
import org.bukkit.event.Listener;4
import me.fridtjof.minecarttrains.events.OnInventoryMoveItemEvent;5
import me.fridtjof.minecarttrains.events.OnPlayerInteractEntityEvent;6
import me.fridtjof.minecarttrains.events.OnProjectileHitEvent;7
import me.fridtjof.minecarttrains.events.OnVehicleCreateEvent;8
import me.fridtjof.minecarttrains.events.OnVehicleEntityCollisionEvent;9
import me.fridtjof.minecarttrains.events.OnVehicleMoveEvent;10
import me.fridtjof.minecarttrains.events.OnVehicleUpdateEvent;11
import me.fridtjof.minecarttrains.events.OnVehicleUpdateEventLowestPriority;12
import org.bukkit.plugin.PluginManager;5
import org.bukkit.plugin.java.JavaPlugin;13
import org.bukkit.plugin.java.JavaPlugin;6
14
7
import static org.bukkit.Bukkit.getServer;15
public class EventManager8
9
public class EventManager implements Listener10
{16
{11
17
12
public EventManager(JavaPlugin plugin)18
public EventManager(JavaPlugin plugin)13
{19
{14
registerListeners(plugin);20
PluginManager pluginManager = plugin.getServer().getPluginManager();21
pluginManager.registerEvents(new OnPlayerInteractEntityEvent(), plugin);22
pluginManager.registerEvents(new OnFurnaceMinecartInteractEvent(), plugin);23
pluginManager.registerEvents(new OnVehicleUpdateEvent(), plugin);24
pluginManager.registerEvents(new OnVehicleUpdateEventLowestPriority(), plugin);25
pluginManager.registerEvents(new OnVehicleEntityCollisionEvent(), plugin);26
pluginManager.registerEvents(new OnProjectileHitEvent(), plugin);27
pluginManager.registerEvents(new OnVehicleCreateEvent(), plugin);28
pluginManager.registerEvents(new OnInventoryMoveItemEvent(), plugin);29
pluginManager.registerEvents(new OnVehicleMoveEvent(), plugin);15
}30
}16
17
private void registerListeners(JavaPlugin plugin)18
{19
getServer().getPluginManager().registerEvents((Listener) new OnPlayerInteractEntityEvent(), plugin);20
getServer().getPluginManager().registerEvents((Listener) new OnFurnaceMinecartInteractEvent(), plugin);21
getServer().getPluginManager().registerEvents((Listener) new OnVehicleUpdateEvent(), plugin);22
getServer().getPluginManager().registerEvents((Listener) new OnVehicleUpdateEventLowestPriority(), plugin);23
getServer().getPluginManager().registerEvents((Listener) new OnVehicleEntityCollisionEvent(), plugin);24
getServer().getPluginManager().registerEvents((Listener) new OnProjectileHitEvent(), plugin);25
getServer().getPluginManager().registerEvents((Listener) new OnVehicleCreateEvent(), plugin);26
getServer().getPluginManager().registerEvents((Listener) new OnInventoryMoveItemEvent(), plugin);27
getServer().getPluginManager().registerEvents((Listener) new OnVehicleMoveEvent(), plugin);28
}29
30
}31
}@@ -32,6 +32,10 @@ public class LinkageManager
32
32
33
33
private final NamespacedKey key = new NamespacedKey(plugin, "coupler");
34
34
private final Map<UUID, UUID> childByParent = new HashMap<>();
35
private final Map<UUID, UUID> headByCart = new HashMap<>();
36
private final Map<UUID, List<Minecart>> trainByHead = new HashMap<>();
37
private final Map<UUID, Minecart> leaderByHead = new HashMap<>();
38
private int cacheTick = Integer.MIN_VALUE;
35
39
36
40
public void removeLink(Minecart cart)
37
41
{
@@ -40,6 +44,7 @@ public class LinkageManager
40
44
childByParent.remove(getLinkUniqueId(cart), cart.getUniqueId());
41
45
}
42
46
cart.getPersistentDataContainer().remove(key);
47
invalidateTrainCache();
43
48
}
44
49
45
50
public String getLinkString(Minecart cart)
@@ -60,6 +65,7 @@ public class LinkageManager
60
65
}
61
66
cart.getPersistentDataContainer().set(key, PersistentDataType.STRING, linkedCartUniqueId);
62
67
childByParent.put(UUID.fromString(linkedCartUniqueId), cart.getUniqueId());
68
invalidateTrainCache();
63
69
}
64
70
65
71
public boolean hasLink(Minecart cart)
@@ -116,10 +122,23 @@ public class LinkageManager
116
122
117
123
public Minecart findHead(Minecart cart)
118
124
{
125
refreshTickCache();
126
UUID cachedHeadId = headByCart.get(cart.getUniqueId());
127
if (cachedHeadId != null)
128
{
129
Entity cachedHead = Bukkit.getEntity(cachedHeadId);
130
if (cachedHead instanceof Minecart minecart)
131
{
132
return minecart;
133
}
134
}
135
136
List<Minecart> walked = new ArrayList<>();
119
137
Minecart current = cart;
120
138
Set<UUID> seen = new HashSet<>();
121
139
while (hasLink(current) && seen.add(current.getUniqueId()))
122
140
{
141
walked.add(current);
123
142
Minecart parent = getParent(current);
124
143
if (parent == null)
125
144
{
@@ -127,6 +146,13 @@ public class LinkageManager
127
146
}
128
147
current = parent;
129
148
}
149
150
UUID headId = current.getUniqueId();
151
headByCart.put(headId, headId);
152
for (Minecart walkedCart : walked)
153
{
154
headByCart.put(walkedCart.getUniqueId(), headId);
155
}
130
156
return current;
131
157
}
132
158
@@ -137,14 +163,24 @@ public class LinkageManager
137
163
138
164
public List<Minecart> getTrain(Minecart cart)
139
165
{
166
refreshTickCache();
167
Minecart head = findHead(cart);
168
List<Minecart> cached = trainByHead.get(head.getUniqueId());
169
if (cached != null)
170
{
171
return cached;
172
}
173
140
174
List<Minecart> chain = new ArrayList<>();
141
Minecart current = findHead(cart);
175
Minecart current = head;
142
176
Set<UUID> seen = new HashSet<>();
143
177
while (current != null && seen.add(current.getUniqueId()))
144
178
{
145
179
chain.add(current);
180
headByCart.put(current.getUniqueId(), head.getUniqueId());
146
181
current = getChild(current);
147
182
}
183
trainByHead.put(head.getUniqueId(), chain);
148
184
return chain;
149
185
}
150
186
@@ -247,6 +283,14 @@ public class LinkageManager
247
283
248
284
public Minecart findLeader(Minecart cart)
249
285
{
286
refreshTickCache();
287
Minecart head = findHead(cart);
288
Minecart cachedLeader = leaderByHead.get(head.getUniqueId());
289
if (cachedLeader != null && cachedLeader.isValid())
290
{
291
return cachedLeader;
292
}
293
250
294
List<Minecart> train = getTrain(cart);
251
295
if (train.isEmpty())
252
296
{
@@ -268,6 +312,7 @@ public class LinkageManager
268
312
}
269
313
if (bestEngine != null)
270
314
{
315
leaderByHead.put(head.getUniqueId(), bestEngine);
271
316
return bestEngine;
272
317
}
273
318
@@ -282,9 +327,31 @@ public class LinkageManager
282
327
fastest = candidate;
283
328
}
284
329
}
330
leaderByHead.put(head.getUniqueId(), fastest);
285
331
return fastest;
286
332
}
287
333
334
private void refreshTickCache()
335
{
336
int currentTick = Bukkit.getCurrentTick();
337
if (currentTick == cacheTick)
338
{
339
return;
340
}
341
cacheTick = currentTick;
342
headByCart.clear();
343
trainByHead.clear();
344
leaderByHead.clear();
345
}
346
347
private void invalidateTrainCache()
348
{
349
cacheTick = Integer.MIN_VALUE;
350
headByCart.clear();
351
trainByHead.clear();
352
leaderByHead.clear();
353
}
354
288
355
public boolean isCloserToLeader(Minecart candidate, Minecart other, Minecart leader)
289
356
{
290
357
if (leader == null)
@@ -32,6 +32,10 @@ public class LinkageManager32
32
33
private final NamespacedKey key = new NamespacedKey(plugin, "coupler");33
private final NamespacedKey key = new NamespacedKey(plugin, "coupler");34
private final Map<UUID, UUID> childByParent = new HashMap<>();34
private final Map<UUID, UUID> childByParent = new HashMap<>();35
private final Map<UUID, UUID> headByCart = new HashMap<>();36
private final Map<UUID, List<Minecart>> trainByHead = new HashMap<>();37
private final Map<UUID, Minecart> leaderByHead = new HashMap<>();38
private int cacheTick = Integer.MIN_VALUE;35
39
36
public void removeLink(Minecart cart)40
public void removeLink(Minecart cart)37
{41
{@@ -40,6 +44,7 @@ public class LinkageManager40
childByParent.remove(getLinkUniqueId(cart), cart.getUniqueId());44
childByParent.remove(getLinkUniqueId(cart), cart.getUniqueId());41
}45
}42
cart.getPersistentDataContainer().remove(key);46
cart.getPersistentDataContainer().remove(key);47
invalidateTrainCache();43
}48
}44
49
45
public String getLinkString(Minecart cart)50
public String getLinkString(Minecart cart)@@ -60,6 +65,7 @@ public class LinkageManager60
}65
}61
cart.getPersistentDataContainer().set(key, PersistentDataType.STRING, linkedCartUniqueId);66
cart.getPersistentDataContainer().set(key, PersistentDataType.STRING, linkedCartUniqueId);62
childByParent.put(UUID.fromString(linkedCartUniqueId), cart.getUniqueId());67
childByParent.put(UUID.fromString(linkedCartUniqueId), cart.getUniqueId());68
invalidateTrainCache();63
}69
}64
70
65
public boolean hasLink(Minecart cart)71
public boolean hasLink(Minecart cart)@@ -116,10 +122,23 @@ public class LinkageManager116
122
117
public Minecart findHead(Minecart cart)123
public Minecart findHead(Minecart cart)118
{124
{125
refreshTickCache();126
UUID cachedHeadId = headByCart.get(cart.getUniqueId());127
if (cachedHeadId != null)128
{129
Entity cachedHead = Bukkit.getEntity(cachedHeadId);130
if (cachedHead instanceof Minecart minecart)131
{132
return minecart;133
}134
}135
136
List<Minecart> walked = new ArrayList<>();119
Minecart current = cart;137
Minecart current = cart;120
Set<UUID> seen = new HashSet<>();138
Set<UUID> seen = new HashSet<>();121
while (hasLink(current) && seen.add(current.getUniqueId()))139
while (hasLink(current) && seen.add(current.getUniqueId()))122
{140
{141
walked.add(current);123
Minecart parent = getParent(current);142
Minecart parent = getParent(current);124
if (parent == null)143
if (parent == null)125
{144
{@@ -127,6 +146,13 @@ public class LinkageManager127
}146
}128
current = parent;147
current = parent;129
}148
}149
150
UUID headId = current.getUniqueId();151
headByCart.put(headId, headId);152
for (Minecart walkedCart : walked)153
{154
headByCart.put(walkedCart.getUniqueId(), headId);155
}130
return current;156
return current;131
}157
}132
158
@@ -137,14 +163,24 @@ public class LinkageManager137
163
138
public List<Minecart> getTrain(Minecart cart)164
public List<Minecart> getTrain(Minecart cart)139
{165
{166
refreshTickCache();167
Minecart head = findHead(cart);168
List<Minecart> cached = trainByHead.get(head.getUniqueId());169
if (cached != null)170
{171
return cached;172
}173
140
List<Minecart> chain = new ArrayList<>();174
List<Minecart> chain = new ArrayList<>();141
Minecart current = findHead(cart);175
Minecart current = head;142
Set<UUID> seen = new HashSet<>();176
Set<UUID> seen = new HashSet<>();143
while (current != null && seen.add(current.getUniqueId()))177
while (current != null && seen.add(current.getUniqueId()))144
{178
{145
chain.add(current);179
chain.add(current);180
headByCart.put(current.getUniqueId(), head.getUniqueId());146
current = getChild(current);181
current = getChild(current);147
}182
}183
trainByHead.put(head.getUniqueId(), chain);148
return chain;184
return chain;149
}185
}150
186
@@ -247,6 +283,14 @@ public class LinkageManager247
283
248
public Minecart findLeader(Minecart cart)284
public Minecart findLeader(Minecart cart)249
{285
{286
refreshTickCache();287
Minecart head = findHead(cart);288
Minecart cachedLeader = leaderByHead.get(head.getUniqueId());289
if (cachedLeader != null && cachedLeader.isValid())290
{291
return cachedLeader;292
}293
250
List<Minecart> train = getTrain(cart);294
List<Minecart> train = getTrain(cart);251
if (train.isEmpty())295
if (train.isEmpty())252
{296
{@@ -268,6 +312,7 @@ public class LinkageManager268
}312
}269
if (bestEngine != null)313
if (bestEngine != null)270
{314
{315
leaderByHead.put(head.getUniqueId(), bestEngine);271
return bestEngine;316
return bestEngine;272
}317
}273
318
@@ -282,9 +327,31 @@ public class LinkageManager282
fastest = candidate;327
fastest = candidate;283
}328
}284
}329
}330
leaderByHead.put(head.getUniqueId(), fastest);285
return fastest;331
return fastest;286
}332
}287
333
334
private void refreshTickCache()335
{336
int currentTick = Bukkit.getCurrentTick();337
if (currentTick == cacheTick)338
{339
return;340
}341
cacheTick = currentTick;342
headByCart.clear();343
trainByHead.clear();344
leaderByHead.clear();345
}346
347
private void invalidateTrainCache()348
{349
cacheTick = Integer.MIN_VALUE;350
headByCart.clear();351
trainByHead.clear();352
leaderByHead.clear();353
}354
288
public boolean isCloserToLeader(Minecart candidate, Minecart other, Minecart leader)355
public boolean isCloserToLeader(Minecart candidate, Minecart other, Minecart leader)289
{356
{290
if (leader == null)357
if (leader == null)@@ -22,6 +22,7 @@ public class RecipeManager
22
22
ItemStack tenderItemStack = new ItemStack(Material.CHEST_MINECART);
23
23
ItemMeta tenderItemMeta = tenderItemStack.getItemMeta();
24
24
tenderItemMeta.customName(Component.text(FUEL_CART_NAME));
25
plugin.cartTags.markFuelCart(tenderItemMeta);
25
26
tenderItemStack.setItemMeta(tenderItemMeta);
26
27
27
28
NamespacedKey tenderKey = new NamespacedKey(plugin, "fuel_cart");
@@ -22,6 +22,7 @@ public class RecipeManager22
ItemStack tenderItemStack = new ItemStack(Material.CHEST_MINECART);22
ItemStack tenderItemStack = new ItemStack(Material.CHEST_MINECART);23
ItemMeta tenderItemMeta = tenderItemStack.getItemMeta();23
ItemMeta tenderItemMeta = tenderItemStack.getItemMeta();24
tenderItemMeta.customName(Component.text(FUEL_CART_NAME));24
tenderItemMeta.customName(Component.text(FUEL_CART_NAME));25
plugin.cartTags.markFuelCart(tenderItemMeta);25
tenderItemStack.setItemMeta(tenderItemMeta);26
tenderItemStack.setItemMeta(tenderItemMeta);26
27
27
NamespacedKey tenderKey = new NamespacedKey(plugin, "fuel_cart");28
NamespacedKey tenderKey = new NamespacedKey(plugin, "fuel_cart");@@ -0,0 +1,42 @@
1
package me.fridtjof.minecarttrains.utils;
2
3
import org.bukkit.Nameable;
4
import org.bukkit.NamespacedKey;
5
import org.bukkit.persistence.PersistentDataHolder;
6
import org.bukkit.persistence.PersistentDataType;
7
import org.bukkit.plugin.Plugin;
8
9
public final class CartTags
10
{
11
12
private final NamespacedKey fuelCartKey;
13
14
public CartTags(Plugin plugin)
15
{
16
this.fuelCartKey = new NamespacedKey(plugin, "fuel_cart");
17
}
18
19
public NamespacedKey fuelCartKey()
20
{
21
return fuelCartKey;
22
}
23
24
public void markFuelCart(PersistentDataHolder holder)
25
{
26
holder.getPersistentDataContainer().set(fuelCartKey, PersistentDataType.BOOLEAN, true);
27
}
28
29
public boolean isFuelCart(PersistentDataHolder holder, String fallbackName)
30
{
31
if (holder.getPersistentDataContainer().getOrDefault(fuelCartKey, PersistentDataType.BOOLEAN, false))
32
{
33
return true;
34
}
35
if (holder instanceof Nameable nameable && CartNames.hasName(nameable, fallbackName))
36
{
37
markFuelCart(holder);
38
return true;
39
}
40
return false;
41
}
42
}
@@ -0,0 +1,42 @@1
package me.fridtjof.minecarttrains.utils;2
3
import org.bukkit.Nameable;4
import org.bukkit.NamespacedKey;5
import org.bukkit.persistence.PersistentDataHolder;6
import org.bukkit.persistence.PersistentDataType;7
import org.bukkit.plugin.Plugin;8
9
public final class CartTags10
{11
12
private final NamespacedKey fuelCartKey;13
14
public CartTags(Plugin plugin)15
{16
this.fuelCartKey = new NamespacedKey(plugin, "fuel_cart");17
}18
19
public NamespacedKey fuelCartKey()20
{21
return fuelCartKey;22
}23
24
public void markFuelCart(PersistentDataHolder holder)25
{26
holder.getPersistentDataContainer().set(fuelCartKey, PersistentDataType.BOOLEAN, true);27
}28
29
public boolean isFuelCart(PersistentDataHolder holder, String fallbackName)30
{31
if (holder.getPersistentDataContainer().getOrDefault(fuelCartKey, PersistentDataType.BOOLEAN, false))32
{33
return true;34
}35
if (holder instanceof Nameable nameable && CartNames.hasName(nameable, fallbackName))36
{37
markFuelCart(holder);38
return true;39
}40
return false;41
}42
}