BlueGit

timfa minecart-trains

Let furnace minecarts push linked trains in both directions.

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

timfa Tim Falken · pushed by timfa

Authored 2026-08-22 · 2 months ago

Hash
9c812fe8d0777ce3ded63c3c7e135a3bde1069ad
Parent
cc8a6c9d
8 files changed +276 −54
README.md +5 −3
@@ -20,7 +20,8 @@ Introducing Minecart Trains! Experience a whole new level of immersion as you co
20 20 - freezing furnace minecarts with non-powered booster rails (to stop trains)
21 21 - minecarts at high velocity kill mobs on the track (configurable)
22 22 - arrows can't destroy minecarts (configurable)
23 - coal carts which the furnace cart will refuel from
23 - coal carts which the furnace cart will refuel from (in front or behind)
24 - furnace minecarts that can push a train in both directions
24 25 - fuel consumption of the furnace minecart is configurable
25 26 - highspeed tracks inspired by hsrails (only on adapted railways)
26 27
@@ -31,7 +32,9 @@ The standard coupling tool is the chain. Click two minecarts one after the other
31 32
32 33 **Coal Carts:**
33 34
34 Furnace minecarts will, if already going, refuel from a coal cart nearby. Coal carts can be crafting with a minecart and a coal block. Coal carts will only interact with hoppers to refill but only coal and charcoal.
35 Furnace minecarts will, if already going, refuel from a coal cart in front or behind, or otherwise nearby. Coal carts can be crafted with a minecart and a coal block. Coal carts will only interact with hoppers to refill but only coal and charcoal.
36
37 Fueling a furnace minecart sets its push direction to the way you are looking, even if it already has fuel. Sneak-right-click an empty hand on a furnace minecart to reverse it. Linked carts keep following on both sides of the engine.
35 38
36 39 ### What is planned:
37 40 - safe chunk unloading
@@ -39,7 +42,6 @@ Furnace minecarts will, if already going, refuel from a coal cart nearby. Coal c
39 42 - some kind of fuel gauge
40 43
41 44 ### What is not (yet) possible:
42 - trains that push backwards (w.i.p.)
43 45 - trains going around 2x2 curves
44 46
45 47 ### Requirements
@@ -20,7 +20,8 @@ Introducing Minecart Trains! Experience a whole new level of immersion as you co
20- freezing furnace minecarts with non-powered booster rails (to stop trains)
20- freezing furnace minecarts with non-powered booster rails (to stop trains)
21- minecarts at high velocity kill mobs on the track (configurable)
21- minecarts at high velocity kill mobs on the track (configurable)
22- arrows can't destroy minecarts (configurable)
22- arrows can't destroy minecarts (configurable)
23- coal carts which the furnace cart will refuel from
23- coal carts which the furnace cart will refuel from (in front or behind)
24- furnace minecarts that can push a train in both directions
24- fuel consumption of the furnace minecart is configurable
25- fuel consumption of the furnace minecart is configurable
25- highspeed tracks inspired by hsrails (only on adapted railways)
26- highspeed tracks inspired by hsrails (only on adapted railways)
26
27
@@ -31,7 +32,9 @@ The standard coupling tool is the chain. Click two minecarts one after the other
31
32
32**Coal Carts:**
33**Coal Carts:**
33
34
34Furnace minecarts will, if already going, refuel from a coal cart nearby. Coal carts can be crafting with a minecart and a coal block. Coal carts will only interact with hoppers to refill but only coal and charcoal.
35Furnace minecarts will, if already going, refuel from a coal cart in front or behind, or otherwise nearby. Coal carts can be crafted with a minecart and a coal block. Coal carts will only interact with hoppers to refill but only coal and charcoal.
36
37Fueling a furnace minecart sets its push direction to the way you are looking, even if it already has fuel. Sneak-right-click an empty hand on a furnace minecart to reverse it. Linked carts keep following on both sides of the engine.
35
38
36### What is planned:
39### What is planned:
37- safe chunk unloading
40- safe chunk unloading
@@ -39,7 +42,6 @@ Furnace minecarts will, if already going, refuel from a coal cart nearby. Coal c
39- some kind of fuel gauge
42- some kind of fuel gauge
40
43
41### What is not (yet) possible:
44### What is not (yet) possible:
42- trains that push backwards (w.i.p.)
43- trains going around 2x2 curves
45- trains going around 2x2 curves
44
46
45### Requirements
47### Requirements
src/main/java/me/fridtjof/minecarttrains/events/OnFurnaceMinecartInteractEvent.java added +56 −0
@@ -0,0 +1,56 @@
1 package me.fridtjof.minecarttrains.events;
2
3 import me.fridtjof.minecarttrains.MinecartTrains;
4 import me.fridtjof.minecarttrains.utils.FurnaceCarts;
5 import org.bukkit.Material;
6 import org.bukkit.entity.Player;
7 import org.bukkit.entity.minecart.PoweredMinecart;
8 import org.bukkit.event.EventHandler;
9 import org.bukkit.event.Listener;
10 import org.bukkit.event.player.PlayerInteractEntityEvent;
11 import org.bukkit.inventory.EquipmentSlot;
12
13 public class OnFurnaceMinecartInteractEvent implements Listener
14 {
15
16 static MinecartTrains plugin = MinecartTrains.getInstance();
17
18 private final Material couplingTool = Material.getMaterial(plugin.configManager.mainConfig.getConfig().getString("trains.coupling.tool"));
19
20 @EventHandler
21 public void onPlayerInteractEntityEvent(PlayerInteractEntityEvent event)
22 {
23 if (event.getHand() != EquipmentSlot.HAND)
24 {
25 return;
26 }
27 if (!(event.getRightClicked() instanceof PoweredMinecart cart))
28 {
29 return;
30 }
31
32 Player player = event.getPlayer();
33 Material hand = player.getInventory().getItemInMainHand().getType();
34 if (hand == couplingTool)
35 {
36 return;
37 }
38
39 boolean fuelItem = hand == Material.COAL || hand == Material.CHARCOAL;
40 if (player.isSneaking() && !fuelItem)
41 {
42 event.setCancelled(true);
43 FurnaceCarts.reversePush(cart);
44 player.sendMessage(plugin.configManager.messagesFile.getConfig().getString("trains.furnace_reversed"));
45 return;
46 }
47
48 plugin.getServer().getScheduler().runTask(plugin, () ->
49 {
50 if (cart.isValid() && (fuelItem || cart.getFuel() > 0))
51 {
52 FurnaceCarts.setPushFromDirection(cart, player.getLocation().getDirection());
53 }
54 });
55 }
56 }
@@ -0,0 +1,56 @@
1package me.fridtjof.minecarttrains.events;
2
3import me.fridtjof.minecarttrains.MinecartTrains;
4import me.fridtjof.minecarttrains.utils.FurnaceCarts;
5import org.bukkit.Material;
6import org.bukkit.entity.Player;
7import org.bukkit.entity.minecart.PoweredMinecart;
8import org.bukkit.event.EventHandler;
9import org.bukkit.event.Listener;
10import org.bukkit.event.player.PlayerInteractEntityEvent;
11import org.bukkit.inventory.EquipmentSlot;
12
13public class OnFurnaceMinecartInteractEvent implements Listener
14{
15
16 static MinecartTrains plugin = MinecartTrains.getInstance();
17
18 private final Material couplingTool = Material.getMaterial(plugin.configManager.mainConfig.getConfig().getString("trains.coupling.tool"));
19
20 @EventHandler
21 public void onPlayerInteractEntityEvent(PlayerInteractEntityEvent event)
22 {
23 if (event.getHand() != EquipmentSlot.HAND)
24 {
25 return;
26 }
27 if (!(event.getRightClicked() instanceof PoweredMinecart cart))
28 {
29 return;
30 }
31
32 Player player = event.getPlayer();
33 Material hand = player.getInventory().getItemInMainHand().getType();
34 if (hand == couplingTool)
35 {
36 return;
37 }
38
39 boolean fuelItem = hand == Material.COAL || hand == Material.CHARCOAL;
40 if (player.isSneaking() && !fuelItem)
41 {
42 event.setCancelled(true);
43 FurnaceCarts.reversePush(cart);
44 player.sendMessage(plugin.configManager.messagesFile.getConfig().getString("trains.furnace_reversed"));
45 return;
46 }
47
48 plugin.getServer().getScheduler().runTask(plugin, () ->
49 {
50 if (cart.isValid() && (fuelItem || cart.getFuel() > 0))
51 {
52 FurnaceCarts.setPushFromDirection(cart, player.getLocation().getDirection());
53 }
54 });
55 }
56}
src/main/java/me/fridtjof/minecarttrains/events/OnVehicleUpdateEvent.java +55 −38
@@ -2,7 +2,7 @@ package me.fridtjof.minecarttrains.events;
2 2
3 3 import me.fridtjof.minecarttrains.managers.LinkageManager;
4 4 import me.fridtjof.minecarttrains.MinecartTrains;
5 import org.bukkit.Bukkit;
5 import me.fridtjof.minecarttrains.utils.FurnaceCarts;
6 6 import org.bukkit.Location;
7 7 import org.bukkit.Material;
8 8 import org.bukkit.World;
@@ -10,7 +10,6 @@ import org.bukkit.block.Block;
10 10 import org.bukkit.block.data.type.RedstoneRail;
11 11 import org.bukkit.entity.Entity;
12 12 import org.bukkit.entity.Minecart;
13 import org.bukkit.entity.Player;
14 13 import org.bukkit.entity.Vehicle;
15 14 import org.bukkit.entity.minecart.PoweredMinecart;
16 15 import org.bukkit.event.EventHandler;
@@ -70,39 +69,14 @@ public class OnVehicleUpdateEvent implements Listener
70 69
71 70 linkageManager.remember(minecart);
72 71
72 if (minecart instanceof PoweredMinecart poweredCart)
73 {
74 handlePoweredCart(poweredCart);
75 }
76
73 77 // ensures the below function only works on trains, not on single minecarts
74 78 if(!linkageManager.hasLink((minecart)))
75 79 {
76
77 // causes a full stop for Furnace Minecart on un-powered rail, and pauses Fuel Consumption.
78 if(!(minecart instanceof PoweredMinecart))
79 {
80 return;
81 }
82
83 PoweredMinecart poweredCart = (PoweredMinecart) minecart;
84
85 int fuelAfterConsumption = poweredCart.getFuel() - fuelPerTick + 1;
86
87 if(fuelAfterConsumption < 0)
88 {
89 fuelAfterConsumption = 0;
90 }
91 poweredCart.setFuel(fuelAfterConsumption);
92
93 Block block = poweredCart.getLocation().getBlock();
94 if(block.getType() != Material.POWERED_RAIL) {
95 return;
96 }
97 RedstoneRail redstoneRail = (RedstoneRail) block.getBlockData();
98 if(redstoneRail.isPowered()) {
99 return;
100 }
101 poweredCart.setVelocity(new Vector(0 ,0 ,0));
102
103 //to stop fuel consumption just re-add the consumed
104 poweredCart.setFuel(((PoweredMinecart) poweredCart).getFuel() + fuelPerTick);
105
106 80 return;
107 81 }
108 82
@@ -203,16 +177,59 @@ public class OnVehicleUpdateEvent implements Listener
203 177 while train is sitting still, especially on declines, causing 'jiggling' that kills momentum
204 178 More precise parameters helps to eliminate the 'jiggling' behavior that interferes with momentum
205 179 Slower 'away' speeds compared to 'toward' speeds also help to eliminate 'jiggling' */
206 // acceleration if distance to small
207 else if(distance < (aimedDistance - aimedDistanceTolerance))
180 else
208 181 {
209 moveToward(minecart, parent, pushSpeed, (distance - aimedDistance));
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 }
207 }
208 }
209
210 private void handlePoweredCart(PoweredMinecart poweredCart)
211 {
212 int fuelAfterConsumption = poweredCart.getFuel() - fuelPerTick + 1;
213 if (fuelAfterConsumption < 0)
214 {
215 fuelAfterConsumption = 0;
210 216 }
211 // acceleration if distance to large
212 else if(distance > (aimedDistance + aimedDistanceTolerance))
217 poweredCart.setFuel(fuelAfterConsumption);
218
219 FurnaceCarts.restorePushFromMotion(poweredCart);
220
221 Block block = poweredCart.getLocation().getBlock();
222 if (block.getType() != Material.POWERED_RAIL)
213 223 {
214 moveToward(minecart, parent, pullSpeed, (distance - aimedDistance));
224 return;
225 }
226 RedstoneRail redstoneRail = (RedstoneRail) block.getBlockData();
227 if (redstoneRail.isPowered())
228 {
229 return;
215 230 }
231 poweredCart.setVelocity(new Vector(0, 0, 0));
232 poweredCart.setFuel(poweredCart.getFuel() + fuelPerTick);
216 233 }
217 234
218 235 // defines moveToward, which handles the elastic movement of dependant carts. Uses the speed and direction set earlier
@@ -2,7 +2,7 @@ package me.fridtjof.minecarttrains.events;
2
2
3import me.fridtjof.minecarttrains.managers.LinkageManager;
3import me.fridtjof.minecarttrains.managers.LinkageManager;
4import me.fridtjof.minecarttrains.MinecartTrains;
4import me.fridtjof.minecarttrains.MinecartTrains;
5import org.bukkit.Bukkit;
5import me.fridtjof.minecarttrains.utils.FurnaceCarts;
6import org.bukkit.Location;
6import org.bukkit.Location;
7import org.bukkit.Material;
7import org.bukkit.Material;
8import org.bukkit.World;
8import org.bukkit.World;
@@ -10,7 +10,6 @@ import org.bukkit.block.Block;
10import org.bukkit.block.data.type.RedstoneRail;
10import org.bukkit.block.data.type.RedstoneRail;
11import org.bukkit.entity.Entity;
11import org.bukkit.entity.Entity;
12import org.bukkit.entity.Minecart;
12import org.bukkit.entity.Minecart;
13import org.bukkit.entity.Player;
14import org.bukkit.entity.Vehicle;
13import org.bukkit.entity.Vehicle;
15import org.bukkit.entity.minecart.PoweredMinecart;
14import org.bukkit.entity.minecart.PoweredMinecart;
16import org.bukkit.event.EventHandler;
15import org.bukkit.event.EventHandler;
@@ -70,39 +69,14 @@ public class OnVehicleUpdateEvent implements Listener
70
69
71 linkageManager.remember(minecart);
70 linkageManager.remember(minecart);
72
71
72 if (minecart instanceof PoweredMinecart poweredCart)
73 {
74 handlePoweredCart(poweredCart);
75 }
76
73 // ensures the below function only works on trains, not on single minecarts
77 // ensures the below function only works on trains, not on single minecarts
74 if(!linkageManager.hasLink((minecart)))
78 if(!linkageManager.hasLink((minecart)))
75 {
79 {
76
77 // causes a full stop for Furnace Minecart on un-powered rail, and pauses Fuel Consumption.
78 if(!(minecart instanceof PoweredMinecart))
79 {
80 return;
81 }
82
83 PoweredMinecart poweredCart = (PoweredMinecart) minecart;
84
85 int fuelAfterConsumption = poweredCart.getFuel() - fuelPerTick + 1;
86
87 if(fuelAfterConsumption < 0)
88 {
89 fuelAfterConsumption = 0;
90 }
91 poweredCart.setFuel(fuelAfterConsumption);
92
93 Block block = poweredCart.getLocation().getBlock();
94 if(block.getType() != Material.POWERED_RAIL) {
95 return;
96 }
97 RedstoneRail redstoneRail = (RedstoneRail) block.getBlockData();
98 if(redstoneRail.isPowered()) {
99 return;
100 }
101 poweredCart.setVelocity(new Vector(0 ,0 ,0));
102
103 //to stop fuel consumption just re-add the consumed
104 poweredCart.setFuel(((PoweredMinecart) poweredCart).getFuel() + fuelPerTick);
105
106 return;
80 return;
107 }
81 }
108
82
@@ -203,16 +177,59 @@ public class OnVehicleUpdateEvent implements Listener
203 while train is sitting still, especially on declines, causing 'jiggling' that kills momentum
177 while train is sitting still, especially on declines, causing 'jiggling' that kills momentum
204 More precise parameters helps to eliminate the 'jiggling' behavior that interferes with momentum
178 More precise parameters helps to eliminate the 'jiggling' behavior that interferes with momentum
205 Slower 'away' speeds compared to 'toward' speeds also help to eliminate 'jiggling' */
179 Slower 'away' speeds compared to 'toward' speeds also help to eliminate 'jiggling' */
206 // acceleration if distance to small
180 else
207 else if(distance < (aimedDistance - aimedDistanceTolerance))
208 {
181 {
209 moveToward(minecart, parent, pushSpeed, (distance - aimedDistance));
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 }
207 }
208 }
209
210 private void handlePoweredCart(PoweredMinecart poweredCart)
211 {
212 int fuelAfterConsumption = poweredCart.getFuel() - fuelPerTick + 1;
213 if (fuelAfterConsumption < 0)
214 {
215 fuelAfterConsumption = 0;
210 }
216 }
211 // acceleration if distance to large
217 poweredCart.setFuel(fuelAfterConsumption);
212 else if(distance > (aimedDistance + aimedDistanceTolerance))
218
219 FurnaceCarts.restorePushFromMotion(poweredCart);
220
221 Block block = poweredCart.getLocation().getBlock();
222 if (block.getType() != Material.POWERED_RAIL)
213 {
223 {
214 moveToward(minecart, parent, pullSpeed, (distance - aimedDistance));
224 return;
225 }
226 RedstoneRail redstoneRail = (RedstoneRail) block.getBlockData();
227 if (redstoneRail.isPowered())
228 {
229 return;
215 }
230 }
231 poweredCart.setVelocity(new Vector(0, 0, 0));
232 poweredCart.setFuel(poweredCart.getFuel() + fuelPerTick);
216 }
233 }
217
234
218 // defines moveToward, which handles the elastic movement of dependant carts. Uses the speed and direction set earlier
235 // defines moveToward, which handles the elastic movement of dependant carts. Uses the speed and direction set earlier
src/main/java/me/fridtjof/minecarttrains/events/OnVehicleUpdateEventLowestPriority.java +34 −13
@@ -1,9 +1,11 @@
1 1 package me.fridtjof.minecarttrains.events;
2 2
3 3 import me.fridtjof.minecarttrains.MinecartTrains;
4 import me.fridtjof.minecarttrains.managers.LinkageManager;
4 5 import me.fridtjof.minecarttrains.utils.CartNames;
5 6 import org.bukkit.Material;
6 7 import org.bukkit.entity.Entity;
8 import org.bukkit.entity.Minecart;
7 9 import org.bukkit.entity.Vehicle;
8 10 import org.bukkit.entity.minecart.PoweredMinecart;
9 11 import org.bukkit.entity.minecart.StorageMinecart;
@@ -14,12 +16,14 @@ import org.bukkit.event.vehicle.VehicleUpdateEvent;
14 16 import org.bukkit.inventory.Inventory;
15 17 import org.bukkit.inventory.ItemStack;
16 18
19 import java.util.ArrayList;
17 20 import java.util.List;
18 21
19 22 public class OnVehicleUpdateEventLowestPriority implements Listener
20 23 {
21 24
22 25 static MinecartTrains plugin = MinecartTrains.getInstance();
26 private final LinkageManager linkageManager = plugin.linkageManager;
23 27
24 28 private final int FUEL_PER_TICK = plugin.configManager.mainConfig.getConfig().getInt("trains.fuel.consumption_per_tick");
25 29 private final boolean REFILL_ONLY_FROM_TENDER = plugin.configManager.mainConfig.getConfig().getBoolean("trains.fuel.refill_only_from_fuel_cart");
@@ -40,9 +44,20 @@ public class OnVehicleUpdateEventLowestPriority implements Listener
40 44 return;
41 45 }
42 46
43 List<Entity> cartsInRange = vehicle.getNearbyEntities(3D, 3D, 3D);
47 List<Entity> candidates = new ArrayList<>();
48 Minecart parent = linkageManager.getParent(cart);
49 Minecart child = linkageManager.getChild(cart);
50 if (parent != null)
51 {
52 candidates.add(parent);
53 }
54 if (child != null)
55 {
56 candidates.add(child);
57 }
58 candidates.addAll(vehicle.getNearbyEntities(3D, 3D, 3D));
44 59
45 for (Entity entity : cartsInRange)
60 for (Entity entity : candidates)
46 61 {
47 62 if (!(entity instanceof StorageMinecart storageCart))
48 63 {
@@ -54,22 +69,28 @@ public class OnVehicleUpdateEventLowestPriority implements Listener
54 69 continue;
55 70 }
56 71
57 Inventory inventory = storageCart.getInventory();
58
59 if (inventory.contains(Material.COAL))
72 if (tryConsumeFuel(storageCart.getInventory(), cart))
60 73 {
61 inventory.removeItem(new ItemStack(Material.COAL, 1));
62 cart.setFuel(cart.getFuel() + 3600);
63 74 return;
64 75 }
76 }
77 }
65 78
66 if (inventory.contains(Material.CHARCOAL))
67 {
68 inventory.removeItem(new ItemStack(Material.CHARCOAL, 1));
69 cart.setFuel(cart.getFuel() + 3600);
70 return;
71 }
79 private boolean tryConsumeFuel(Inventory inventory, PoweredMinecart cart)
80 {
81 if (inventory.contains(Material.COAL))
82 {
83 inventory.removeItem(new ItemStack(Material.COAL, 1));
84 cart.setFuel(cart.getFuel() + 3600);
85 return true;
86 }
87 if (inventory.contains(Material.CHARCOAL))
88 {
89 inventory.removeItem(new ItemStack(Material.CHARCOAL, 1));
90 cart.setFuel(cart.getFuel() + 3600);
91 return true;
72 92 }
93 return false;
73 94 }
74 95
75 96 private boolean isCartTender(StorageMinecart cart)
@@ -1,9 +1,11 @@
1package me.fridtjof.minecarttrains.events;
1package me.fridtjof.minecarttrains.events;
2
2
3import me.fridtjof.minecarttrains.MinecartTrains;
3import me.fridtjof.minecarttrains.MinecartTrains;
4import me.fridtjof.minecarttrains.managers.LinkageManager;
4import me.fridtjof.minecarttrains.utils.CartNames;
5import me.fridtjof.minecarttrains.utils.CartNames;
5import org.bukkit.Material;
6import org.bukkit.Material;
6import org.bukkit.entity.Entity;
7import org.bukkit.entity.Entity;
8import org.bukkit.entity.Minecart;
7import org.bukkit.entity.Vehicle;
9import org.bukkit.entity.Vehicle;
8import org.bukkit.entity.minecart.PoweredMinecart;
10import org.bukkit.entity.minecart.PoweredMinecart;
9import org.bukkit.entity.minecart.StorageMinecart;
11import org.bukkit.entity.minecart.StorageMinecart;
@@ -14,12 +16,14 @@ import org.bukkit.event.vehicle.VehicleUpdateEvent;
14import org.bukkit.inventory.Inventory;
16import org.bukkit.inventory.Inventory;
15import org.bukkit.inventory.ItemStack;
17import org.bukkit.inventory.ItemStack;
16
18
19import java.util.ArrayList;
17import java.util.List;
20import java.util.List;
18
21
19public class OnVehicleUpdateEventLowestPriority implements Listener
22public class OnVehicleUpdateEventLowestPriority implements Listener
20{
23{
21
24
22 static MinecartTrains plugin = MinecartTrains.getInstance();
25 static MinecartTrains plugin = MinecartTrains.getInstance();
26 private final LinkageManager linkageManager = plugin.linkageManager;
23
27
24 private final int FUEL_PER_TICK = plugin.configManager.mainConfig.getConfig().getInt("trains.fuel.consumption_per_tick");
28 private final int FUEL_PER_TICK = plugin.configManager.mainConfig.getConfig().getInt("trains.fuel.consumption_per_tick");
25 private final boolean REFILL_ONLY_FROM_TENDER = plugin.configManager.mainConfig.getConfig().getBoolean("trains.fuel.refill_only_from_fuel_cart");
29 private final boolean REFILL_ONLY_FROM_TENDER = plugin.configManager.mainConfig.getConfig().getBoolean("trains.fuel.refill_only_from_fuel_cart");
@@ -40,9 +44,20 @@ public class OnVehicleUpdateEventLowestPriority implements Listener
40 return;
44 return;
41 }
45 }
42
46
43 List<Entity> cartsInRange = vehicle.getNearbyEntities(3D, 3D, 3D);
47 List<Entity> candidates = new ArrayList<>();
48 Minecart parent = linkageManager.getParent(cart);
49 Minecart child = linkageManager.getChild(cart);
50 if (parent != null)
51 {
52 candidates.add(parent);
53 }
54 if (child != null)
55 {
56 candidates.add(child);
57 }
58 candidates.addAll(vehicle.getNearbyEntities(3D, 3D, 3D));
44
59
45 for (Entity entity : cartsInRange)
60 for (Entity entity : candidates)
46 {
61 {
47 if (!(entity instanceof StorageMinecart storageCart))
62 if (!(entity instanceof StorageMinecart storageCart))
48 {
63 {
@@ -54,22 +69,28 @@ public class OnVehicleUpdateEventLowestPriority implements Listener
54 continue;
69 continue;
55 }
70 }
56
71
57 Inventory inventory = storageCart.getInventory();
72 if (tryConsumeFuel(storageCart.getInventory(), cart))
58
59 if (inventory.contains(Material.COAL))
60 {
73 {
61 inventory.removeItem(new ItemStack(Material.COAL, 1));
62 cart.setFuel(cart.getFuel() + 3600);
63 return;
74 return;
64 }
75 }
76 }
77 }
65
78
66 if (inventory.contains(Material.CHARCOAL))
79 private boolean tryConsumeFuel(Inventory inventory, PoweredMinecart cart)
67 {
80 {
68 inventory.removeItem(new ItemStack(Material.CHARCOAL, 1));
81 if (inventory.contains(Material.COAL))
69 cart.setFuel(cart.getFuel() + 3600);
82 {
70 return;
83 inventory.removeItem(new ItemStack(Material.COAL, 1));
71 }
84 cart.setFuel(cart.getFuel() + 3600);
85 return true;
86 }
87 if (inventory.contains(Material.CHARCOAL))
88 {
89 inventory.removeItem(new ItemStack(Material.CHARCOAL, 1));
90 cart.setFuel(cart.getFuel() + 3600);
91 return true;
72 }
92 }
93 return false;
73 }
94 }
74
95
75 private boolean isCartTender(StorageMinecart cart)
96 private boolean isCartTender(StorageMinecart cart)
src/main/java/me/fridtjof/minecarttrains/managers/ConfigManager.java +1 −0
@@ -152,6 +152,7 @@ public class ConfigManager
152 152
153 153 messagesFile.getConfig().addDefault("trains.coupling_1-2", "Coupling (1/2) activated for ");
154 154 messagesFile.getConfig().addDefault("trains.coupling_2-2", "Coupling (2/2) activated for ");
155 messagesFile.getConfig().addDefault("trains.furnace_reversed", "Furnace minecart direction reversed!");
155 156
156 157 messagesFile.getConfig().options().copyDefaults(true);
157 158 messagesFile.save();
@@ -152,6 +152,7 @@ public class ConfigManager
152
152
153 messagesFile.getConfig().addDefault("trains.coupling_1-2", "Coupling (1/2) activated for ");
153 messagesFile.getConfig().addDefault("trains.coupling_1-2", "Coupling (1/2) activated for ");
154 messagesFile.getConfig().addDefault("trains.coupling_2-2", "Coupling (2/2) activated for ");
154 messagesFile.getConfig().addDefault("trains.coupling_2-2", "Coupling (2/2) activated for ");
155 messagesFile.getConfig().addDefault("trains.furnace_reversed", "Furnace minecart direction reversed!");
155
156
156 messagesFile.getConfig().options().copyDefaults(true);
157 messagesFile.getConfig().options().copyDefaults(true);
157 messagesFile.save();
158 messagesFile.save();
src/main/java/me/fridtjof/minecarttrains/managers/EventManager.java +1 −0
@@ -17,6 +17,7 @@ public class EventManager implements Listener
17 17 private void registerListeners(JavaPlugin plugin)
18 18 {
19 19 getServer().getPluginManager().registerEvents((Listener) new OnPlayerInteractEntityEvent(), plugin);
20 getServer().getPluginManager().registerEvents((Listener) new OnFurnaceMinecartInteractEvent(), plugin);
20 21 getServer().getPluginManager().registerEvents((Listener) new OnVehicleUpdateEvent(), plugin);
21 22 getServer().getPluginManager().registerEvents((Listener) new OnVehicleUpdateEventLowestPriority(), plugin);
22 23 getServer().getPluginManager().registerEvents((Listener) new OnVehicleEntityCollisionEvent(), plugin);
@@ -17,6 +17,7 @@ public class EventManager implements Listener
17 private void registerListeners(JavaPlugin plugin)
17 private void registerListeners(JavaPlugin plugin)
18 {
18 {
19 getServer().getPluginManager().registerEvents((Listener) new OnPlayerInteractEntityEvent(), plugin);
19 getServer().getPluginManager().registerEvents((Listener) new OnPlayerInteractEntityEvent(), plugin);
20 getServer().getPluginManager().registerEvents((Listener) new OnFurnaceMinecartInteractEvent(), plugin);
20 getServer().getPluginManager().registerEvents((Listener) new OnVehicleUpdateEvent(), plugin);
21 getServer().getPluginManager().registerEvents((Listener) new OnVehicleUpdateEvent(), plugin);
21 getServer().getPluginManager().registerEvents((Listener) new OnVehicleUpdateEventLowestPriority(), plugin);
22 getServer().getPluginManager().registerEvents((Listener) new OnVehicleUpdateEventLowestPriority(), plugin);
22 getServer().getPluginManager().registerEvents((Listener) new OnVehicleEntityCollisionEvent(), plugin);
23 getServer().getPluginManager().registerEvents((Listener) new OnVehicleEntityCollisionEvent(), plugin);
src/main/java/me/fridtjof/minecarttrains/managers/LinkageManager.java +69 −0
@@ -240,6 +240,75 @@ public class LinkageManager
240 240 return first;
241 241 }
242 242
243 public Minecart findLeader(Minecart cart)
244 {
245 List<Minecart> train = getTrain(cart);
246 if (train.isEmpty())
247 {
248 return cart;
249 }
250
251 Minecart bestEngine = null;
252 int bestFuel = -1;
253 for (Minecart candidate : train)
254 {
255 if (candidate instanceof PoweredMinecart powered && powered.getFuel() > 0)
256 {
257 if (powered.getFuel() > bestFuel)
258 {
259 bestFuel = powered.getFuel();
260 bestEngine = candidate;
261 }
262 }
263 }
264 if (bestEngine != null)
265 {
266 return bestEngine;
267 }
268
269 Minecart fastest = train.getFirst();
270 double fastestSpeed = -1;
271 for (Minecart candidate : train)
272 {
273 double speed = candidate.getVelocity().lengthSquared();
274 if (speed > fastestSpeed)
275 {
276 fastestSpeed = speed;
277 fastest = candidate;
278 }
279 }
280 return fastest;
281 }
282
283 public boolean isCloserToLeader(Minecart candidate, Minecart other, Minecart leader)
284 {
285 if (leader == null)
286 {
287 return false;
288 }
289 if (candidate.getUniqueId().equals(leader.getUniqueId()))
290 {
291 return true;
292 }
293 if (other.getUniqueId().equals(leader.getUniqueId()))
294 {
295 return false;
296 }
297
298 for (Minecart trainCart : getTrain(leader))
299 {
300 if (trainCart.getUniqueId().equals(candidate.getUniqueId()))
301 {
302 return true;
303 }
304 if (trainCart.getUniqueId().equals(other.getUniqueId()))
305 {
306 return false;
307 }
308 }
309 return false;
310 }
311
243 312 public void reverseTrain(Minecart cart)
244 313 {
245 314 List<Minecart> chain = getTrain(cart);
@@ -240,6 +240,75 @@ public class LinkageManager
240 return first;
240 return first;
241 }
241 }
242
242
243 public Minecart findLeader(Minecart cart)
244 {
245 List<Minecart> train = getTrain(cart);
246 if (train.isEmpty())
247 {
248 return cart;
249 }
250
251 Minecart bestEngine = null;
252 int bestFuel = -1;
253 for (Minecart candidate : train)
254 {
255 if (candidate instanceof PoweredMinecart powered && powered.getFuel() > 0)
256 {
257 if (powered.getFuel() > bestFuel)
258 {
259 bestFuel = powered.getFuel();
260 bestEngine = candidate;
261 }
262 }
263 }
264 if (bestEngine != null)
265 {
266 return bestEngine;
267 }
268
269 Minecart fastest = train.getFirst();
270 double fastestSpeed = -1;
271 for (Minecart candidate : train)
272 {
273 double speed = candidate.getVelocity().lengthSquared();
274 if (speed > fastestSpeed)
275 {
276 fastestSpeed = speed;
277 fastest = candidate;
278 }
279 }
280 return fastest;
281 }
282
283 public boolean isCloserToLeader(Minecart candidate, Minecart other, Minecart leader)
284 {
285 if (leader == null)
286 {
287 return false;
288 }
289 if (candidate.getUniqueId().equals(leader.getUniqueId()))
290 {
291 return true;
292 }
293 if (other.getUniqueId().equals(leader.getUniqueId()))
294 {
295 return false;
296 }
297
298 for (Minecart trainCart : getTrain(leader))
299 {
300 if (trainCart.getUniqueId().equals(candidate.getUniqueId()))
301 {
302 return true;
303 }
304 if (trainCart.getUniqueId().equals(other.getUniqueId()))
305 {
306 return false;
307 }
308 }
309 return false;
310 }
311
243 public void reverseTrain(Minecart cart)
312 public void reverseTrain(Minecart cart)
244 {
313 {
245 List<Minecart> chain = getTrain(cart);
314 List<Minecart> chain = getTrain(cart);
src/main/java/me/fridtjof/minecarttrains/utils/FurnaceCarts.java added +55 −0
@@ -0,0 +1,55 @@
1 package me.fridtjof.minecarttrains.utils;
2
3 import org.bukkit.entity.minecart.PoweredMinecart;
4 import org.bukkit.util.Vector;
5
6 public final class FurnaceCarts
7 {
8
9 private static final double MIN_PUSH = 1.0E-4;
10
11 private FurnaceCarts()
12 {
13 }
14
15 public static boolean hasDrive(PoweredMinecart cart)
16 {
17 return cart.getFuel() > 0 && Math.hypot(cart.getPushX(), cart.getPushZ()) >= MIN_PUSH;
18 }
19
20 public static void setPushFromDirection(PoweredMinecart cart, Vector direction)
21 {
22 double x = direction.getX();
23 double z = direction.getZ();
24 double length = Math.hypot(x, z);
25 if (length < MIN_PUSH)
26 {
27 return;
28 }
29 cart.setPushX(x / length);
30 cart.setPushZ(z / length);
31 }
32
33 public static void reversePush(PoweredMinecart cart)
34 {
35 if (Math.hypot(cart.getPushX(), cart.getPushZ()) < MIN_PUSH)
36 {
37 setPushFromDirection(cart, cart.getVelocity());
38 }
39 cart.setPushX(-cart.getPushX());
40 cart.setPushZ(-cart.getPushZ());
41 }
42
43 public static void restorePushFromMotion(PoweredMinecart cart)
44 {
45 if (cart.getFuel() <= 0)
46 {
47 return;
48 }
49 if (Math.hypot(cart.getPushX(), cart.getPushZ()) >= MIN_PUSH)
50 {
51 return;
52 }
53 setPushFromDirection(cart, cart.getVelocity());
54 }
55 }
@@ -0,0 +1,55 @@
1package me.fridtjof.minecarttrains.utils;
2
3import org.bukkit.entity.minecart.PoweredMinecart;
4import org.bukkit.util.Vector;
5
6public final class FurnaceCarts
7{
8
9 private static final double MIN_PUSH = 1.0E-4;
10
11 private FurnaceCarts()
12 {
13 }
14
15 public static boolean hasDrive(PoweredMinecart cart)
16 {
17 return cart.getFuel() > 0 && Math.hypot(cart.getPushX(), cart.getPushZ()) >= MIN_PUSH;
18 }
19
20 public static void setPushFromDirection(PoweredMinecart cart, Vector direction)
21 {
22 double x = direction.getX();
23 double z = direction.getZ();
24 double length = Math.hypot(x, z);
25 if (length < MIN_PUSH)
26 {
27 return;
28 }
29 cart.setPushX(x / length);
30 cart.setPushZ(z / length);
31 }
32
33 public static void reversePush(PoweredMinecart cart)
34 {
35 if (Math.hypot(cart.getPushX(), cart.getPushZ()) < MIN_PUSH)
36 {
37 setPushFromDirection(cart, cart.getVelocity());
38 }
39 cart.setPushX(-cart.getPushX());
40 cart.setPushZ(-cart.getPushZ());
41 }
42
43 public static void restorePushFromMotion(PoweredMinecart cart)
44 {
45 if (cart.getFuel() <= 0)
46 {
47 return;
48 }
49 if (Math.hypot(cart.getPushX(), cart.getPushZ()) >= MIN_PUSH)
50 {
51 return;
52 }
53 setPushFromDirection(cart, cart.getVelocity());
54 }
55}