BlueGit

timfa minecart-trains

Upgrade the Paper plugin to 26.2 and drop PuddingAPI.

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

timfa Tim Falken · pushed by timfa

Authored 2026-08-22 · 2 months ago

Hash
de50f5519223f098d276688bfa39eb84b516b4bd
Parent
cce4be79
15 files changed +293 −225
README.md +8 −29
@@ -1,4 +1,4 @@
1 [![API Badge](https://img.shields.io/badge/MC%20version-Spigot%20v1.21.x-blue?style=flat-square)](https://www.spigotmc.org/)
1 [![API Badge](https://img.shields.io/badge/Paper-26.2-blue?style=flat-square)](https://papermc.io/)
2 2 [![Dev State Badge](https://img.shields.io/badge/stage%20of%20development-beta-yellow?style=flat-square)]()
3 3 [![Latest Release](https://img.shields.io/github/v/release/Fridtjof-DE/MinecartTrains?style=flat-square)]()
4 4 [![Maintenance Badge](https://img.shields.io/maintenance/yes/2026?style=flat-square)]()
@@ -43,9 +43,10 @@ Furnace minecarts will, if already going, refuel from a coal cart nearby. Coal c
43 43 - trains that push backwards (w.i.p.)
44 44 - trains going around 2x2 curves
45 45
46 ### Dependencies
46 ### Requirements
47 47
48 - PuddingAPI ([plugin jar](https://modrinth.com/plugin/puddingapi)) ([source](https://github.com/Fridtjof-DE/PuddingAPI))
48 - Paper 26.2 (Java 25)
49 - No extra plugin dependencies
49 50
50 51 ### Relevant Links
51 52
@@ -54,39 +55,17 @@ Furnace minecarts will, if already going, refuel from a coal cart nearby. Coal c
54 55
55 56 ## How to Build
56 57
57 If you are looking to make changes, then you'll need to get both a JDK 17 and Maven installed on your computer. I recommend just using an IDE like Intellij IDEA or Eclipse.
58
59 ### Building Pudding API
60
61 If only want to make changes to `main-branch` of MinecartTrains you can just download the latest ([PuddingAPI jar](https://modrinth.com/plugin/puddingapi)) from Modrith.
62
63 If you want to make changes to a `dev-branch` of MinecartTrains you might need to download the latest ([PuddingAPI dev-build](https://github.com/Fridtjof-DE/PuddingAPI/tree/master/builds)) from GitHub.
64
65 If you also want to make changes to the PuddingAPI you'll need to have the [PuddingAPI](https://github.com/Fridtjof-DE/PuddingAPI) source installed. On more information on how to build PuddingAPI look at it's GitHub.
66
67 Either way PuddingAPI has to be in the correct sister folder specified in the MinecartTrains `pom.xml`.
68
69 ### Building Minecart Trains
70
71 Once you have Pudding API built and the jar generated, update the
72 `puddingapi.jar` property in the `pom.xml` file of the current
73 project, to ensure it points to the jar generated in the 'Building
74 PuddingAPI' section.
75
76 Once the `pom.xml` file has been updated, you can kick off the build:
58 You need JDK 25 and Maven. Then run:
77 59
78 60 ```
79 61 mvn package
80 62 ```
81 63
82 Results will be in the `target` folder, with base name
83 `MinecartTrains`. Assuming the current marked release is 2.0.0
84 (see version value in pom.xml), you'll have the following file:
64 Results will be in the `target` folder. With version `1.5.0` that is:
85 65
86 - `MinecartTrains-2.0.0.jar`
66 - `MinecartTrains-1.5.0.jar`
87 67
88 Copy this file over to the plugins folder of your Minecraft server. Also, don't forget to have copied the PuddingAPI jar as well, to your
89 server's plugins folder.
68 Copy this file to the plugins folder of a Paper 26.2 server.
90 69
91 70 ## bStats
92 71 ![bStats](https://bstats.org/signatures/bukkit/Minecart%20Trains.svg)
@@ -1,4 +1,4 @@
1[![API Badge](https://img.shields.io/badge/MC%20version-Spigot%20v1.21.x-blue?style=flat-square)](https://www.spigotmc.org/)
1[![API Badge](https://img.shields.io/badge/Paper-26.2-blue?style=flat-square)](https://papermc.io/)
2[![Dev State Badge](https://img.shields.io/badge/stage%20of%20development-beta-yellow?style=flat-square)]()
2[![Dev State Badge](https://img.shields.io/badge/stage%20of%20development-beta-yellow?style=flat-square)]()
3[![Latest Release](https://img.shields.io/github/v/release/Fridtjof-DE/MinecartTrains?style=flat-square)]()
3[![Latest Release](https://img.shields.io/github/v/release/Fridtjof-DE/MinecartTrains?style=flat-square)]()
4[![Maintenance Badge](https://img.shields.io/maintenance/yes/2026?style=flat-square)]()
4[![Maintenance Badge](https://img.shields.io/maintenance/yes/2026?style=flat-square)]()
@@ -43,9 +43,10 @@ Furnace minecarts will, if already going, refuel from a coal cart nearby. Coal c
43- trains that push backwards (w.i.p.)
43- trains that push backwards (w.i.p.)
44- trains going around 2x2 curves
44- trains going around 2x2 curves
45
45
46### Dependencies
46### Requirements
47
47
48 - PuddingAPI ([plugin jar](https://modrinth.com/plugin/puddingapi)) ([source](https://github.com/Fridtjof-DE/PuddingAPI))
48 - Paper 26.2 (Java 25)
49 - No extra plugin dependencies
49
50
50### Relevant Links
51### Relevant Links
51
52
@@ -54,39 +55,17 @@ Furnace minecarts will, if already going, refuel from a coal cart nearby. Coal c
54
55
55## How to Build
56## How to Build
56
57
57If you are looking to make changes, then you'll need to get both a JDK 17 and Maven installed on your computer. I recommend just using an IDE like Intellij IDEA or Eclipse.
58You need JDK 25 and Maven. Then run:
58
59### Building Pudding API
60
61If only want to make changes to `main-branch` of MinecartTrains you can just download the latest ([PuddingAPI jar](https://modrinth.com/plugin/puddingapi)) from Modrith.
62
63If you want to make changes to a `dev-branch` of MinecartTrains you might need to download the latest ([PuddingAPI dev-build](https://github.com/Fridtjof-DE/PuddingAPI/tree/master/builds)) from GitHub.
64
65If you also want to make changes to the PuddingAPI you'll need to have the [PuddingAPI](https://github.com/Fridtjof-DE/PuddingAPI) source installed. On more information on how to build PuddingAPI look at it's GitHub.
66
67Either way PuddingAPI has to be in the correct sister folder specified in the MinecartTrains `pom.xml`.
68
69### Building Minecart Trains
70
71Once you have Pudding API built and the jar generated, update the
72`puddingapi.jar` property in the `pom.xml` file of the current
73project, to ensure it points to the jar generated in the 'Building
74PuddingAPI' section.
75
76Once the `pom.xml` file has been updated, you can kick off the build:
77
59
78```
60```
79mvn package
61mvn package
80```
62```
81
63
82Results will be in the `target` folder, with base name
64Results will be in the `target` folder. With version `1.5.0` that is:
83`MinecartTrains`. Assuming the current marked release is 2.0.0
84(see version value in pom.xml), you'll have the following file:
85
65
86 - `MinecartTrains-2.0.0.jar`
66 - `MinecartTrains-1.5.0.jar`
87
67
88Copy this file over to the plugins folder of your Minecraft server. Also, don't forget to have copied the PuddingAPI jar as well, to your
68Copy this file to the plugins folder of a Paper 26.2 server.
89server's plugins folder.
90
69
91## bStats
70## bStats
92![bStats](https://bstats.org/signatures/bukkit/Minecart%20Trains.svg)
71![bStats](https://bstats.org/signatures/bukkit/Minecart%20Trains.svg)
pom.xml +21 −22
@@ -1,20 +1,19 @@
1 1 <?xml version="1.0" encoding="UTF-8"?>
2 2 <project xmlns="http://maven.apache.org/POM/4.0.0"
3 3 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://www.apache.org/xsd/maven-4.0.0.xsd">
5 5 <modelVersion>4.0.0</modelVersion>
6 6
7 7 <groupId>me.fridtjof</groupId>
8 8 <artifactId>minecarttrains</artifactId>
9 <version>1.4.3</version>
9 <version>1.5.0</version>
10 10 <packaging>jar</packaging>
11 11
12 12 <name>MinecartTrains</name>
13 13
14 14 <properties>
15 <java.version>21</java.version>
15 <java.version>25</java.version>
16 16 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
17 <puddingapi.jar>${project.basedir}/../PuddingAPI/builds/PuddingAPI-2602011954.jar</puddingapi.jar>
18 17 </properties>
19 18
20 19 <url>https://www.fridtjof.me</url>
@@ -25,16 +24,15 @@
25 24 <plugin>
26 25 <groupId>org.apache.maven.plugins</groupId>
27 26 <artifactId>maven-compiler-plugin</artifactId>
28 <version>3.8.1</version>
27 <version>3.14.0</version>
29 28 <configuration>
30 <source>${java.version}</source>
31 <target>${java.version}</target>
29 <release>${java.version}</release>
32 30 </configuration>
33 31 </plugin>
34 32 <plugin>
35 33 <groupId>org.apache.maven.plugins</groupId>
36 34 <artifactId>maven-shade-plugin</artifactId>
37 <version>3.2.4</version>
35 <version>3.6.0</version>
38 36 <executions>
39 37 <execution>
40 38 <phase>package</phase>
@@ -43,6 +41,12 @@
43 41 </goals>
44 42 <configuration>
45 43 <createDependencyReducedPom>false</createDependencyReducedPom>
44 <relocations>
45 <relocation>
46 <pattern>org.bstats</pattern>
47 <shadedPattern>me.fridtjof.minecarttrains.lib.bstats</shadedPattern>
48 </relocation>
49 </relocations>
46 50 </configuration>
47 51 </execution>
48 52 </executions>
@@ -58,28 +62,23 @@
58 62
59 63 <repositories>
60 64 <repository>
61 <id>spigotmc-repo</id>
62 <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
63 </repository>
64 <repository>
65 <id>sonatype</id>
66 <url>https://oss.sonatype.org/content/groups/public/</url>
65 <id>papermc</id>
66 <url>https://repo.papermc.io/repository/maven-public/</url>
67 67 </repository>
68 68 </repositories>
69 69
70 70 <dependencies>
71 71 <dependency>
72 <groupId>org.spigotmc</groupId>
73 <artifactId>spigot-api</artifactId>
74 <version>1.21-R0.1-SNAPSHOT</version>
72 <groupId>io.papermc.paper</groupId>
73 <artifactId>paper-api</artifactId>
74 <version>26.2.build.112-stable</version>
75 75 <scope>provided</scope>
76 76 </dependency>
77 77 <dependency>
78 <groupId>me.fridtjof</groupId>
79 <artifactId>puddingapi</artifactId>
80 <version>Snapshot</version>
81 <scope>system</scope>
82 <systemPath>${puddingapi.jar}</systemPath>
78 <groupId>org.bstats</groupId>
79 <artifactId>bstats-bukkit</artifactId>
80 <version>3.1.0</version>
81 <scope>compile</scope>
83 82 </dependency>
84 83 </dependencies>
85 84 </project>
@@ -1,20 +1,19 @@
1<?xml version="1.0" encoding="UTF-8"?>
1<?xml version="1.0" encoding="UTF-8"?>
2<project xmlns="http://maven.apache.org/POM/4.0.0"
2<project xmlns="http://maven.apache.org/POM/4.0.0"
3 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://www.apache.org/xsd/maven-4.0.0.xsd">
5 <modelVersion>4.0.0</modelVersion>
5 <modelVersion>4.0.0</modelVersion>
6
6
7 <groupId>me.fridtjof</groupId>
7 <groupId>me.fridtjof</groupId>
8 <artifactId>minecarttrains</artifactId>
8 <artifactId>minecarttrains</artifactId>
9 <version>1.4.3</version>
9 <version>1.5.0</version>
10 <packaging>jar</packaging>
10 <packaging>jar</packaging>
11
11
12 <name>MinecartTrains</name>
12 <name>MinecartTrains</name>
13
13
14 <properties>
14 <properties>
15 <java.version>21</java.version>
15 <java.version>25</java.version>
16 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
16 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
17 <puddingapi.jar>${project.basedir}/../PuddingAPI/builds/PuddingAPI-2602011954.jar</puddingapi.jar>
18 </properties>
17 </properties>
19
18
20 <url>https://www.fridtjof.me</url>
19 <url>https://www.fridtjof.me</url>
@@ -25,16 +24,15 @@
25 <plugin>
24 <plugin>
26 <groupId>org.apache.maven.plugins</groupId>
25 <groupId>org.apache.maven.plugins</groupId>
27 <artifactId>maven-compiler-plugin</artifactId>
26 <artifactId>maven-compiler-plugin</artifactId>
28 <version>3.8.1</version>
27 <version>3.14.0</version>
29 <configuration>
28 <configuration>
30 <source>${java.version}</source>
29 <release>${java.version}</release>
31 <target>${java.version}</target>
32 </configuration>
30 </configuration>
33 </plugin>
31 </plugin>
34 <plugin>
32 <plugin>
35 <groupId>org.apache.maven.plugins</groupId>
33 <groupId>org.apache.maven.plugins</groupId>
36 <artifactId>maven-shade-plugin</artifactId>
34 <artifactId>maven-shade-plugin</artifactId>
37 <version>3.2.4</version>
35 <version>3.6.0</version>
38 <executions>
36 <executions>
39 <execution>
37 <execution>
40 <phase>package</phase>
38 <phase>package</phase>
@@ -43,6 +41,12 @@
43 </goals>
41 </goals>
44 <configuration>
42 <configuration>
45 <createDependencyReducedPom>false</createDependencyReducedPom>
43 <createDependencyReducedPom>false</createDependencyReducedPom>
44 <relocations>
45 <relocation>
46 <pattern>org.bstats</pattern>
47 <shadedPattern>me.fridtjof.minecarttrains.lib.bstats</shadedPattern>
48 </relocation>
49 </relocations>
46 </configuration>
50 </configuration>
47 </execution>
51 </execution>
48 </executions>
52 </executions>
@@ -58,28 +62,23 @@
58
62
59 <repositories>
63 <repositories>
60 <repository>
64 <repository>
61 <id>spigotmc-repo</id>
65 <id>papermc</id>
62 <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
66 <url>https://repo.papermc.io/repository/maven-public/</url>
63 </repository>
64 <repository>
65 <id>sonatype</id>
66 <url>https://oss.sonatype.org/content/groups/public/</url>
67 </repository>
67 </repository>
68 </repositories>
68 </repositories>
69
69
70 <dependencies>
70 <dependencies>
71 <dependency>
71 <dependency>
72 <groupId>org.spigotmc</groupId>
72 <groupId>io.papermc.paper</groupId>
73 <artifactId>spigot-api</artifactId>
73 <artifactId>paper-api</artifactId>
74 <version>1.21-R0.1-SNAPSHOT</version>
74 <version>26.2.build.112-stable</version>
75 <scope>provided</scope>
75 <scope>provided</scope>
76 </dependency>
76 </dependency>
77 <dependency>
77 <dependency>
78 <groupId>me.fridtjof</groupId>
78 <groupId>org.bstats</groupId>
79 <artifactId>puddingapi</artifactId>
79 <artifactId>bstats-bukkit</artifactId>
80 <version>Snapshot</version>
80 <version>3.1.0</version>
81 <scope>system</scope>
81 <scope>compile</scope>
82 <systemPath>${puddingapi.jar}</systemPath>
83 </dependency>
82 </dependency>
84 </dependencies>
83 </dependencies>
85</project>
84</project>
src/main/java/me/fridtjof/minecarttrains/MinecartTrains.java +5 −12
@@ -4,7 +4,8 @@ import me.fridtjof.minecarttrains.managers.ConfigManager;
4 4 import me.fridtjof.minecarttrains.managers.EventManager;
5 5 import me.fridtjof.minecarttrains.managers.LinkageManager;
6 6 import me.fridtjof.minecarttrains.managers.RecipeManager;
7 import me.fridtjof.puddingapi.bukkit.utils.*;
7 import me.fridtjof.minecarttrains.utils.ModrinthUpdateChecker;
8 import org.bstats.bukkit.Metrics;
8 9 import org.bukkit.plugin.java.JavaPlugin;
9 10
10 11 public final class MinecartTrains extends JavaPlugin
@@ -12,39 +13,31 @@ public final class MinecartTrains extends JavaPlugin
12 13
13 14 private static MinecartTrains instance;
14 15
15 public MinecartTrains()
16 {
17 instance = this;
18 }
19
20 16 public static MinecartTrains getInstance()
21 17 {
22 18 return instance;
23 19 }
24 20
25 Logger logger = new Logger(this);
26
27 21 public ConfigManager configManager;
28 22 public LinkageManager linkageManager;
29 23
30 24 @Override
31 25 public void onEnable()
32 26 {
33 new PuddingAPIVersionChecker(this, 2602011954L);
27 instance = this;
34 28
35 29 configManager = new ConfigManager(this);
36 30 linkageManager = new LinkageManager();
37 31
38 32 new RecipeManager();
39 33 new EventManager(this);
40 new ModrinthUpdateChecker(this,"plRff0I9", "spigot");
34 new ModrinthUpdateChecker(this, "plRff0I9");
41 35 new Metrics(this, 18918);
42
43 36 }
44 37
45 38 @Override
46 39 public void onDisable()
47 40 {
48
41 instance = null;
49 42 }
50 43 }
@@ -4,7 +4,8 @@ import me.fridtjof.minecarttrains.managers.ConfigManager;
4import me.fridtjof.minecarttrains.managers.EventManager;
4import me.fridtjof.minecarttrains.managers.EventManager;
5import me.fridtjof.minecarttrains.managers.LinkageManager;
5import me.fridtjof.minecarttrains.managers.LinkageManager;
6import me.fridtjof.minecarttrains.managers.RecipeManager;
6import me.fridtjof.minecarttrains.managers.RecipeManager;
7import me.fridtjof.puddingapi.bukkit.utils.*;
7import me.fridtjof.minecarttrains.utils.ModrinthUpdateChecker;
8import org.bstats.bukkit.Metrics;
8import org.bukkit.plugin.java.JavaPlugin;
9import org.bukkit.plugin.java.JavaPlugin;
9
10
10public final class MinecartTrains extends JavaPlugin
11public final class MinecartTrains extends JavaPlugin
@@ -12,39 +13,31 @@ public final class MinecartTrains extends JavaPlugin
12
13
13 private static MinecartTrains instance;
14 private static MinecartTrains instance;
14
15
15 public MinecartTrains()
16 {
17 instance = this;
18 }
19
20 public static MinecartTrains getInstance()
16 public static MinecartTrains getInstance()
21 {
17 {
22 return instance;
18 return instance;
23 }
19 }
24
20
25 Logger logger = new Logger(this);
26
27 public ConfigManager configManager;
21 public ConfigManager configManager;
28 public LinkageManager linkageManager;
22 public LinkageManager linkageManager;
29
23
30 @Override
24 @Override
31 public void onEnable()
25 public void onEnable()
32 {
26 {
33 new PuddingAPIVersionChecker(this, 2602011954L);
27 instance = this;
34
28
35 configManager = new ConfigManager(this);
29 configManager = new ConfigManager(this);
36 linkageManager = new LinkageManager();
30 linkageManager = new LinkageManager();
37
31
38 new RecipeManager();
32 new RecipeManager();
39 new EventManager(this);
33 new EventManager(this);
40 new ModrinthUpdateChecker(this,"plRff0I9", "spigot");
34 new ModrinthUpdateChecker(this, "plRff0I9");
41 new Metrics(this, 18918);
35 new Metrics(this, 18918);
42
43 }
36 }
44
37
45 @Override
38 @Override
46 public void onDisable()
39 public void onDisable()
47 {
40 {
48
41 instance = null;
49 }
42 }
50}
43}
src/main/java/me/fridtjof/minecarttrains/events/OnInventoryMoveItemEvent.java +14 −36
@@ -1,105 +1,83 @@
1 1 package me.fridtjof.minecarttrains.events;
2 2
3 3 import me.fridtjof.minecarttrains.MinecartTrains;
4 import me.fridtjof.puddingapi.bukkit.items.HopperUtils;
4 import me.fridtjof.minecarttrains.utils.CartNames;
5 import me.fridtjof.minecarttrains.utils.HopperUtils;
5 6 import org.bukkit.Material;
6 7 import org.bukkit.block.Hopper;
7 8 import org.bukkit.entity.minecart.StorageMinecart;
8 9 import org.bukkit.event.EventHandler;
9 10 import org.bukkit.event.Listener;
10 import org.bukkit.event.inventory.InventoryAction;
11 11 import org.bukkit.event.inventory.InventoryMoveItemEvent;
12 import org.bukkit.inventory.Inventory;
13 import org.bukkit.inventory.InventoryHolder;
14 import org.bukkit.inventory.ItemStack;
15 12
16 13 public class OnInventoryMoveItemEvent implements Listener
17 14 {
18 15
19 16 static MinecartTrains plugin = MinecartTrains.getInstance();
20 17
21 // config vars
22 18 private final String FUEL_CART_NAME = plugin.configManager.mainConfig.getConfig().getString("trains.fuel.cart_name");
23 19 boolean doHopperLogic = plugin.configManager.mainConfig.getConfig().getBoolean("trains.fuel.do_hopper_logic");
24 20
25 //stop hoppers from unloading fuel carts
26 21 @EventHandler
27 22 public void onMoveItemOutOffFuelCartEvent(InventoryMoveItemEvent event)
28 23 {
29 // made this part optional because it can cause problems with other plugins
30 if(!doHopperLogic)
24 if (!doHopperLogic)
31 25 {
32 26 return;
33 27 }
34 28
35 if(!(event.getSource().getHolder() instanceof StorageMinecart))
29 if (!(event.getSource().getHolder() instanceof StorageMinecart cart))
36 30 {
37 31 return;
38 32 }
39 33
40 if(!(event.getDestination().getHolder() instanceof Hopper))
34 if (!(event.getDestination().getHolder() instanceof Hopper))
41 35 {
42 36 return;
43 37 }
44 38
45 if(isFuelCart((StorageMinecart) event.getSource().getHolder()))
39 if (isFuelCart(cart))
46 40 {
47 41 event.setCancelled(true);
48 42 }
49 43 }
50 44
51 //prevent hoppers from filling non coal items in carts
52 45 @EventHandler
53 46 public void onMoveItemIntoFuelCartEvent(InventoryMoveItemEvent event)
54 47 {
55 if(!doHopperLogic)
48 if (!doHopperLogic)
56 49 {
57 50 return;
58 51 }
59 52
60 if(!(event.getDestination().getHolder() instanceof StorageMinecart))
53 if (!(event.getDestination().getHolder() instanceof StorageMinecart cart))
61 54 {
62 55 return;
63 56 }
64 57
65 if(!(event.getSource().getHolder() instanceof Hopper))
58 if (!(event.getSource().getHolder() instanceof Hopper))
66 59 {
67 60 return;
68 61 }
69 62
70 if((event.getItem().getType() == Material.COAL) || (event.getItem().getType() == Material.CHARCOAL))
63 if (event.getItem().getType() == Material.COAL || event.getItem().getType() == Material.CHARCOAL)
71 64 {
72 65 return;
73 66 }
74 67
75 if(isFuelCart((StorageMinecart) event.getDestination().getHolder()))
68 if (isFuelCart(cart))
76 69 {
77 70 event.setCancelled(true);
78 71
79 //rearrange to possibly let other itemstacks get through
80 if(!HopperUtils.rearrangeHopper(event.getSource(), Material.COAL))
72 if (!HopperUtils.rearrangeHopper(event.getSource(), Material.COAL))
81 73 {
82 if(!HopperUtils.rearrangeHopper(event.getSource(), Material.CHARCOAL))
83 {
84 //rearranging was not successful
85 return;
86 }
74 HopperUtils.rearrangeHopper(event.getSource(), Material.CHARCOAL);
87 75 }
88 76 }
89 77 }
90 78
91 79 public boolean isFuelCart(StorageMinecart cart)
92 80 {
93 if(cart.getCustomName() == null)
94 {
95 return false;
96 }
97
98 if(cart.getCustomName().equalsIgnoreCase(FUEL_CART_NAME))
99 {
100 return true;
101 }
102
103 return false;
81 return CartNames.hasName(cart, FUEL_CART_NAME);
104 82 }
105 83 }
@@ -1,105 +1,83 @@
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.puddingapi.bukkit.items.HopperUtils;
4import me.fridtjof.minecarttrains.utils.CartNames;
5import me.fridtjof.minecarttrains.utils.HopperUtils;
5import org.bukkit.Material;
6import org.bukkit.Material;
6import org.bukkit.block.Hopper;
7import org.bukkit.block.Hopper;
7import org.bukkit.entity.minecart.StorageMinecart;
8import org.bukkit.entity.minecart.StorageMinecart;
8import org.bukkit.event.EventHandler;
9import org.bukkit.event.EventHandler;
9import org.bukkit.event.Listener;
10import org.bukkit.event.Listener;
10import org.bukkit.event.inventory.InventoryAction;
11import org.bukkit.event.inventory.InventoryMoveItemEvent;
11import org.bukkit.event.inventory.InventoryMoveItemEvent;
12import org.bukkit.inventory.Inventory;
13import org.bukkit.inventory.InventoryHolder;
14import org.bukkit.inventory.ItemStack;
15
12
16public class OnInventoryMoveItemEvent implements Listener
13public class OnInventoryMoveItemEvent implements Listener
17{
14{
18
15
19 static MinecartTrains plugin = MinecartTrains.getInstance();
16 static MinecartTrains plugin = MinecartTrains.getInstance();
20
17
21 // config vars
22 private final String FUEL_CART_NAME = plugin.configManager.mainConfig.getConfig().getString("trains.fuel.cart_name");
18 private final String FUEL_CART_NAME = plugin.configManager.mainConfig.getConfig().getString("trains.fuel.cart_name");
23 boolean doHopperLogic = plugin.configManager.mainConfig.getConfig().getBoolean("trains.fuel.do_hopper_logic");
19 boolean doHopperLogic = plugin.configManager.mainConfig.getConfig().getBoolean("trains.fuel.do_hopper_logic");
24
20
25 //stop hoppers from unloading fuel carts
26 @EventHandler
21 @EventHandler
27 public void onMoveItemOutOffFuelCartEvent(InventoryMoveItemEvent event)
22 public void onMoveItemOutOffFuelCartEvent(InventoryMoveItemEvent event)
28 {
23 {
29 // made this part optional because it can cause problems with other plugins
24 if (!doHopperLogic)
30 if(!doHopperLogic)
31 {
25 {
32 return;
26 return;
33 }
27 }
34
28
35 if(!(event.getSource().getHolder() instanceof StorageMinecart))
29 if (!(event.getSource().getHolder() instanceof StorageMinecart cart))
36 {
30 {
37 return;
31 return;
38 }
32 }
39
33
40 if(!(event.getDestination().getHolder() instanceof Hopper))
34 if (!(event.getDestination().getHolder() instanceof Hopper))
41 {
35 {
42 return;
36 return;
43 }
37 }
44
38
45 if(isFuelCart((StorageMinecart) event.getSource().getHolder()))
39 if (isFuelCart(cart))
46 {
40 {
47 event.setCancelled(true);
41 event.setCancelled(true);
48 }
42 }
49 }
43 }
50
44
51 //prevent hoppers from filling non coal items in carts
52 @EventHandler
45 @EventHandler
53 public void onMoveItemIntoFuelCartEvent(InventoryMoveItemEvent event)
46 public void onMoveItemIntoFuelCartEvent(InventoryMoveItemEvent event)
54 {
47 {
55 if(!doHopperLogic)
48 if (!doHopperLogic)
56 {
49 {
57 return;
50 return;
58 }
51 }
59
52
60 if(!(event.getDestination().getHolder() instanceof StorageMinecart))
53 if (!(event.getDestination().getHolder() instanceof StorageMinecart cart))
61 {
54 {
62 return;
55 return;
63 }
56 }
64
57
65 if(!(event.getSource().getHolder() instanceof Hopper))
58 if (!(event.getSource().getHolder() instanceof Hopper))
66 {
59 {
67 return;
60 return;
68 }
61 }
69
62
70 if((event.getItem().getType() == Material.COAL) || (event.getItem().getType() == Material.CHARCOAL))
63 if (event.getItem().getType() == Material.COAL || event.getItem().getType() == Material.CHARCOAL)
71 {
64 {
72 return;
65 return;
73 }
66 }
74
67
75 if(isFuelCart((StorageMinecart) event.getDestination().getHolder()))
68 if (isFuelCart(cart))
76 {
69 {
77 event.setCancelled(true);
70 event.setCancelled(true);
78
71
79 //rearrange to possibly let other itemstacks get through
72 if (!HopperUtils.rearrangeHopper(event.getSource(), Material.COAL))
80 if(!HopperUtils.rearrangeHopper(event.getSource(), Material.COAL))
81 {
73 {
82 if(!HopperUtils.rearrangeHopper(event.getSource(), Material.CHARCOAL))
74 HopperUtils.rearrangeHopper(event.getSource(), Material.CHARCOAL);
83 {
84 //rearranging was not successful
85 return;
86 }
87 }
75 }
88 }
76 }
89 }
77 }
90
78
91 public boolean isFuelCart(StorageMinecart cart)
79 public boolean isFuelCart(StorageMinecart cart)
92 {
80 {
93 if(cart.getCustomName() == null)
81 return CartNames.hasName(cart, FUEL_CART_NAME);
94 {
95 return false;
96 }
97
98 if(cart.getCustomName().equalsIgnoreCase(FUEL_CART_NAME))
99 {
100 return true;
101 }
102
103 return false;
104 }
82 }
105}
83}
src/main/java/me/fridtjof/minecarttrains/events/OnVehicleCreateEvent.java +3 −10
@@ -1,6 +1,7 @@
1 1 package me.fridtjof.minecarttrains.events;
2 2
3 3 import me.fridtjof.minecarttrains.MinecartTrains;
4 import me.fridtjof.minecarttrains.utils.CartNames;
4 5 import org.bukkit.Material;
5 6 import org.bukkit.entity.minecart.StorageMinecart;
6 7 import org.bukkit.event.EventHandler;
@@ -14,23 +15,15 @@ public class OnVehicleCreateEvent implements Listener
14 15
15 16 private final String FUEL_CART_NAME = plugin.configManager.mainConfig.getConfig().getString("trains.fuel.cart_name");
16 17
17 //create fuel cart
18 18 @EventHandler
19 19 public void onVehicleCreateEvent(VehicleCreateEvent event)
20 20 {
21 if(!(event.getVehicle() instanceof StorageMinecart))
21 if (!(event.getVehicle() instanceof StorageMinecart cart))
22 22 {
23 23 return;
24 24 }
25 25
26 StorageMinecart cart = (StorageMinecart) event.getVehicle();
27
28 if(cart.getCustomName() == null)
29 {
30 return;
31 }
32
33 if(!cart.getCustomName().equalsIgnoreCase(FUEL_CART_NAME))
26 if (!CartNames.hasName(cart, FUEL_CART_NAME))
34 27 {
35 28 return;
36 29 }
@@ -1,6 +1,7 @@
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.utils.CartNames;
4import org.bukkit.Material;
5import org.bukkit.Material;
5import org.bukkit.entity.minecart.StorageMinecart;
6import org.bukkit.entity.minecart.StorageMinecart;
6import org.bukkit.event.EventHandler;
7import org.bukkit.event.EventHandler;
@@ -14,23 +15,15 @@ public class OnVehicleCreateEvent implements Listener
14
15
15 private final String FUEL_CART_NAME = plugin.configManager.mainConfig.getConfig().getString("trains.fuel.cart_name");
16 private final String FUEL_CART_NAME = plugin.configManager.mainConfig.getConfig().getString("trains.fuel.cart_name");
16
17
17 //create fuel cart
18 @EventHandler
18 @EventHandler
19 public void onVehicleCreateEvent(VehicleCreateEvent event)
19 public void onVehicleCreateEvent(VehicleCreateEvent event)
20 {
20 {
21 if(!(event.getVehicle() instanceof StorageMinecart))
21 if (!(event.getVehicle() instanceof StorageMinecart cart))
22 {
22 {
23 return;
23 return;
24 }
24 }
25
25
26 StorageMinecart cart = (StorageMinecart) event.getVehicle();
26 if (!CartNames.hasName(cart, FUEL_CART_NAME))
27
28 if(cart.getCustomName() == null)
29 {
30 return;
31 }
32
33 if(!cart.getCustomName().equalsIgnoreCase(FUEL_CART_NAME))
34 {
27 {
35 return;
28 return;
36 }
29 }
src/main/java/me/fridtjof/minecarttrains/events/OnVehicleEntityCollisionEvent.java +13 −20
@@ -1,8 +1,10 @@
1 1 package me.fridtjof.minecarttrains.events;
2 2
3 3 import me.fridtjof.minecarttrains.MinecartTrains;
4 import org.bukkit.GameMode;
5 import org.bukkit.entity.*;
4 import org.bukkit.entity.Damageable;
5 import org.bukkit.entity.Entity;
6 import org.bukkit.entity.Minecart;
7 import org.bukkit.entity.Vehicle;
6 8 import org.bukkit.entity.minecart.RideableMinecart;
7 9 import org.bukkit.event.EventHandler;
8 10 import org.bukkit.event.Listener;
@@ -13,58 +15,49 @@ public class OnVehicleEntityCollisionEvent implements Listener
13 15
14 16 static MinecartTrains plugin = MinecartTrains.getInstance();
15 17
16 // get config vars
17 18 boolean runOver = plugin.configManager.mainConfig.getConfig().getBoolean("trains.run_over.entities");
18 19 double damage = plugin.configManager.mainConfig.getConfig().getDouble("trains.run_over.damage");
19 20 double minVelocity = plugin.configManager.mainConfig.getConfig().getDouble("trains.run_over.min_velocity");
20 21
21 // killing entities when run over
22 22 @EventHandler
23 23 public void onVehicleEntityCollision(VehicleEntityCollisionEvent event)
24 24 {
25
26 if(!runOver)
25 if (!runOver)
27 26 {
28 27 return;
29 28 }
30 29
31 30 Vehicle vehicle = event.getVehicle();
32 Entity entity = event.getEntity();
31 Entity entity = event.getEntity();
33 32
34 if(!(vehicle instanceof Minecart))
33 if (!(vehicle instanceof Minecart))
35 34 {
36 35 return;
37 36 }
38 if(entity instanceof Minecart)
37 if (entity instanceof Minecart)
39 38 {
40 39 return;
41 40 }
42 if(!(entity instanceof Damageable))
41 if (!(entity instanceof Damageable damageable))
43 42 {
44 43 return;
45 44 }
46 45
47 if(vehicle instanceof RideableMinecart)
46 if (vehicle instanceof RideableMinecart && vehicle.getPassengers().isEmpty())
48 47 {
49 if(vehicle.getPassenger() == null)
50 {
51 return;
52 }
48 return;
53 49 }
54 50
55 //fixing rare situations where a player riding the cart was killed
56 if(entity.isInsideVehicle())
51 if (entity.isInsideVehicle())
57 52 {
58 53 return;
59 54 }
60 55
61 if(vehicle.getVelocity().length() < minVelocity)
56 if (vehicle.getVelocity().length() < minVelocity)
62 57 {
63 58 return;
64 59 }
65 60
66 Damageable damageable = (Damageable) entity;
67 //damageable.setHealth(0); this also killed player in gamemode 1
68 61 damageable.damage(damage, vehicle);
69 62 }
70 63 }
@@ -1,8 +1,10 @@
1package me.fridtjof.minecarttrains.events;
1package me.fridtjof.minecarttrains.events;
2
2
3import me.fridtjof.minecarttrains.MinecartTrains;
3import me.fridtjof.minecarttrains.MinecartTrains;
4import org.bukkit.GameMode;
4import org.bukkit.entity.Damageable;
5import org.bukkit.entity.*;
5import org.bukkit.entity.Entity;
6import org.bukkit.entity.Minecart;
7import org.bukkit.entity.Vehicle;
6import org.bukkit.entity.minecart.RideableMinecart;
8import org.bukkit.entity.minecart.RideableMinecart;
7import org.bukkit.event.EventHandler;
9import org.bukkit.event.EventHandler;
8import org.bukkit.event.Listener;
10import org.bukkit.event.Listener;
@@ -13,58 +15,49 @@ public class OnVehicleEntityCollisionEvent implements Listener
13
15
14 static MinecartTrains plugin = MinecartTrains.getInstance();
16 static MinecartTrains plugin = MinecartTrains.getInstance();
15
17
16 // get config vars
17 boolean runOver = plugin.configManager.mainConfig.getConfig().getBoolean("trains.run_over.entities");
18 boolean runOver = plugin.configManager.mainConfig.getConfig().getBoolean("trains.run_over.entities");
18 double damage = plugin.configManager.mainConfig.getConfig().getDouble("trains.run_over.damage");
19 double damage = plugin.configManager.mainConfig.getConfig().getDouble("trains.run_over.damage");
19 double minVelocity = plugin.configManager.mainConfig.getConfig().getDouble("trains.run_over.min_velocity");
20 double minVelocity = plugin.configManager.mainConfig.getConfig().getDouble("trains.run_over.min_velocity");
20
21
21 // killing entities when run over
22 @EventHandler
22 @EventHandler
23 public void onVehicleEntityCollision(VehicleEntityCollisionEvent event)
23 public void onVehicleEntityCollision(VehicleEntityCollisionEvent event)
24 {
24 {
25
25 if (!runOver)
26 if(!runOver)
27 {
26 {
28 return;
27 return;
29 }
28 }
30
29
31 Vehicle vehicle = event.getVehicle();
30 Vehicle vehicle = event.getVehicle();
32 Entity entity = event.getEntity();
31 Entity entity = event.getEntity();
33
32
34 if(!(vehicle instanceof Minecart))
33 if (!(vehicle instanceof Minecart))
35 {
34 {
36 return;
35 return;
37 }
36 }
38 if(entity instanceof Minecart)
37 if (entity instanceof Minecart)
39 {
38 {
40 return;
39 return;
41 }
40 }
42 if(!(entity instanceof Damageable))
41 if (!(entity instanceof Damageable damageable))
43 {
42 {
44 return;
43 return;
45 }
44 }
46
45
47 if(vehicle instanceof RideableMinecart)
46 if (vehicle instanceof RideableMinecart && vehicle.getPassengers().isEmpty())
48 {
47 {
49 if(vehicle.getPassenger() == null)
48 return;
50 {
51 return;
52 }
53 }
49 }
54
50
55 //fixing rare situations where a player riding the cart was killed
51 if (entity.isInsideVehicle())
56 if(entity.isInsideVehicle())
57 {
52 {
58 return;
53 return;
59 }
54 }
60
55
61 if(vehicle.getVelocity().length() < minVelocity)
56 if (vehicle.getVelocity().length() < minVelocity)
62 {
57 {
63 return;
58 return;
64 }
59 }
65
60
66 Damageable damageable = (Damageable) entity;
67 //damageable.setHealth(0); this also killed player in gamemode 1
68 damageable.damage(damage, vehicle);
61 damageable.damage(damage, vehicle);
69 }
62 }
70}
63}
src/main/java/me/fridtjof/minecarttrains/events/OnVehicleUpdateEvent.java +0 −1
@@ -227,7 +227,6 @@ public class OnVehicleUpdateEvent implements Listener
227 227 }
228 228
229 229
230 //TODO move to puddingapi
231 230 public boolean isAnyKindOfTrack(Material material)
232 231 {
233 232 if(material == Material.POWERED_RAIL)
@@ -227,7 +227,6 @@ public class OnVehicleUpdateEvent implements Listener
227 }
227 }
228
228
229
229
230 //TODO move to puddingapi
231 public boolean isAnyKindOfTrack(Material material)
230 public boolean isAnyKindOfTrack(Material material)
232 {
231 {
233 if(material == Material.POWERED_RAIL)
232 if(material == Material.POWERED_RAIL)
src/main/java/me/fridtjof/minecarttrains/events/OnVehicleUpdateEventLowestPriority.java +30 −47
@@ -1,7 +1,7 @@
1 1 package me.fridtjof.minecarttrains.events;
2 2
3 import me.fridtjof.minecarttrains.managers.LinkageManager;
4 3 import me.fridtjof.minecarttrains.MinecartTrains;
4 import me.fridtjof.minecarttrains.utils.CartNames;
5 5 import org.bukkit.Material;
6 6 import org.bukkit.entity.Entity;
7 7 import org.bukkit.entity.Vehicle;
@@ -20,77 +20,60 @@ public class OnVehicleUpdateEventLowestPriority implements Listener
20 20 {
21 21
22 22 static MinecartTrains plugin = MinecartTrains.getInstance();
23 LinkageManager linkageManager = new LinkageManager();
24 23
25 24 private final int FUEL_PER_TICK = plugin.configManager.mainConfig.getConfig().getInt("trains.fuel.consumption_per_tick");
26 25 private final boolean REFILL_ONLY_FROM_TENDER = plugin.configManager.mainConfig.getConfig().getBoolean("trains.fuel.refill_only_from_fuel_cart");
27 26 private final String FUEL_CART_NAME = plugin.configManager.mainConfig.getConfig().getString("trains.fuel.cart_name");
28 27
29 28 @EventHandler(priority = EventPriority.LOWEST)
30 public void OnFuelEmptyEvent(VehicleUpdateEvent event) {
29 public void OnFuelEmptyEvent(VehicleUpdateEvent event)
30 {
31 31 Vehicle vehicle = event.getVehicle();
32 String uniqueId;
33 Entity parent;
34 32
35 if (!(vehicle instanceof PoweredMinecart)) {
33 if (!(vehicle instanceof PoweredMinecart cart))
34 {
36 35 return;
37 36 }
38 37
39 PoweredMinecart cart = (PoweredMinecart) vehicle;
40
41 //TODO
42 //maybe adding for particles
43 /*if(cart.getFuel() != 0)
44 {
45 cart.getWorld().spawnParticle(Particle.CAMPFIRE_SIGNAL_SMOKE, cart.getLocation().add(new Vector(0, 2, 0)), 1);
46 }*/
47
48 if((cart.getFuel() < 2) || (cart.getFuel() > (FUEL_PER_TICK + 1)))
38 if ((cart.getFuel() < 2) || (cart.getFuel() > (FUEL_PER_TICK + 1)))
49 39 {
50 40 return;
51 41 }
52 42
53 43 List<Entity> cartsInRange = vehicle.getNearbyEntities(3D, 3D, 3D);
54 44
55 for(Entity entity : cartsInRange)
45 for (Entity entity : cartsInRange)
56 46 {
57 if(entity instanceof StorageMinecart)
47 if (!(entity instanceof StorageMinecart storageCart))
48 {
49 continue;
50 }
51
52 if (REFILL_ONLY_FROM_TENDER && !isCartTender(storageCart))
58 53 {
59 if(REFILL_ONLY_FROM_TENDER)
60 {
61 if(!isCartTender((StorageMinecart) entity))
62 {
63 continue;
64 }
65 }
54 continue;
55 }
66 56
67 Inventory inventory = ((StorageMinecart) entity).getInventory();
57 Inventory inventory = storageCart.getInventory();
68 58
69 if(inventory.contains(Material.COAL))
70 {
71 inventory.removeItem(new ItemStack(Material.COAL, 1));
72 cart.setFuel(cart.getFuel() + 3600);
73 return;
74 }
59 if (inventory.contains(Material.COAL))
60 {
61 inventory.removeItem(new ItemStack(Material.COAL, 1));
62 cart.setFuel(cart.getFuel() + 3600);
63 return;
64 }
75 65
76 if(inventory.contains(Material.CHARCOAL))
77 {
78 inventory.removeItem(new ItemStack(Material.CHARCOAL, 1));
79 cart.setFuel(cart.getFuel() + 3600);
80 return;
81 }
66 if (inventory.contains(Material.CHARCOAL))
67 {
68 inventory.removeItem(new ItemStack(Material.CHARCOAL, 1));
69 cart.setFuel(cart.getFuel() + 3600);
70 return;
82 71 }
83 72 }
84 73 }
85 74
86 private boolean isCartTender(StorageMinecart cart) {
87 if (cart.getCustomName() == null) {
88 return false;
89 }
90
91 if (cart.getCustomName().equalsIgnoreCase(FUEL_CART_NAME)) {
92 return true;
93 }
94 return false;
75 private boolean isCartTender(StorageMinecart cart)
76 {
77 return CartNames.hasName(cart, FUEL_CART_NAME);
95 78 }
96 79 }
@@ -1,7 +1,7 @@
1package me.fridtjof.minecarttrains.events;
1package me.fridtjof.minecarttrains.events;
2
2
3import me.fridtjof.minecarttrains.managers.LinkageManager;
4import me.fridtjof.minecarttrains.MinecartTrains;
3import me.fridtjof.minecarttrains.MinecartTrains;
4import me.fridtjof.minecarttrains.utils.CartNames;
5import org.bukkit.Material;
5import org.bukkit.Material;
6import org.bukkit.entity.Entity;
6import org.bukkit.entity.Entity;
7import org.bukkit.entity.Vehicle;
7import org.bukkit.entity.Vehicle;
@@ -20,77 +20,60 @@ public class OnVehicleUpdateEventLowestPriority implements Listener
20{
20{
21
21
22 static MinecartTrains plugin = MinecartTrains.getInstance();
22 static MinecartTrains plugin = MinecartTrains.getInstance();
23 LinkageManager linkageManager = new LinkageManager();
24
23
25 private final int FUEL_PER_TICK = plugin.configManager.mainConfig.getConfig().getInt("trains.fuel.consumption_per_tick");
24 private final int FUEL_PER_TICK = plugin.configManager.mainConfig.getConfig().getInt("trains.fuel.consumption_per_tick");
26 private final boolean REFILL_ONLY_FROM_TENDER = plugin.configManager.mainConfig.getConfig().getBoolean("trains.fuel.refill_only_from_fuel_cart");
25 private final boolean REFILL_ONLY_FROM_TENDER = plugin.configManager.mainConfig.getConfig().getBoolean("trains.fuel.refill_only_from_fuel_cart");
27 private final String FUEL_CART_NAME = plugin.configManager.mainConfig.getConfig().getString("trains.fuel.cart_name");
26 private final String FUEL_CART_NAME = plugin.configManager.mainConfig.getConfig().getString("trains.fuel.cart_name");
28
27
29 @EventHandler(priority = EventPriority.LOWEST)
28 @EventHandler(priority = EventPriority.LOWEST)
30 public void OnFuelEmptyEvent(VehicleUpdateEvent event) {
29 public void OnFuelEmptyEvent(VehicleUpdateEvent event)
30 {
31 Vehicle vehicle = event.getVehicle();
31 Vehicle vehicle = event.getVehicle();
32 String uniqueId;
33 Entity parent;
34
32
35 if (!(vehicle instanceof PoweredMinecart)) {
33 if (!(vehicle instanceof PoweredMinecart cart))
34 {
36 return;
35 return;
37 }
36 }
38
37
39 PoweredMinecart cart = (PoweredMinecart) vehicle;
38 if ((cart.getFuel() < 2) || (cart.getFuel() > (FUEL_PER_TICK + 1)))
40
41 //TODO
42 //maybe adding for particles
43 /*if(cart.getFuel() != 0)
44 {
45 cart.getWorld().spawnParticle(Particle.CAMPFIRE_SIGNAL_SMOKE, cart.getLocation().add(new Vector(0, 2, 0)), 1);
46 }*/
47
48 if((cart.getFuel() < 2) || (cart.getFuel() > (FUEL_PER_TICK + 1)))
49 {
39 {
50 return;
40 return;
51 }
41 }
52
42
53 List<Entity> cartsInRange = vehicle.getNearbyEntities(3D, 3D, 3D);
43 List<Entity> cartsInRange = vehicle.getNearbyEntities(3D, 3D, 3D);
54
44
55 for(Entity entity : cartsInRange)
45 for (Entity entity : cartsInRange)
56 {
46 {
57 if(entity instanceof StorageMinecart)
47 if (!(entity instanceof StorageMinecart storageCart))
48 {
49 continue;
50 }
51
52 if (REFILL_ONLY_FROM_TENDER && !isCartTender(storageCart))
58 {
53 {
59 if(REFILL_ONLY_FROM_TENDER)
54 continue;
60 {
55 }
61 if(!isCartTender((StorageMinecart) entity))
62 {
63 continue;
64 }
65 }
66
56
67 Inventory inventory = ((StorageMinecart) entity).getInventory();
57 Inventory inventory = storageCart.getInventory();
68
58
69 if(inventory.contains(Material.COAL))
59 if (inventory.contains(Material.COAL))
70 {
60 {
71 inventory.removeItem(new ItemStack(Material.COAL, 1));
61 inventory.removeItem(new ItemStack(Material.COAL, 1));
72 cart.setFuel(cart.getFuel() + 3600);
62 cart.setFuel(cart.getFuel() + 3600);
73 return;
63 return;
74 }
64 }
75
65
76 if(inventory.contains(Material.CHARCOAL))
66 if (inventory.contains(Material.CHARCOAL))
77 {
67 {
78 inventory.removeItem(new ItemStack(Material.CHARCOAL, 1));
68 inventory.removeItem(new ItemStack(Material.CHARCOAL, 1));
79 cart.setFuel(cart.getFuel() + 3600);
69 cart.setFuel(cart.getFuel() + 3600);
80 return;
70 return;
81 }
82 }
71 }
83 }
72 }
84 }
73 }
85
74
86 private boolean isCartTender(StorageMinecart cart) {
75 private boolean isCartTender(StorageMinecart cart)
87 if (cart.getCustomName() == null) {
76 {
88 return false;
77 return CartNames.hasName(cart, FUEL_CART_NAME);
89 }
90
91 if (cart.getCustomName().equalsIgnoreCase(FUEL_CART_NAME)) {
92 return true;
93 }
94 return false;
95 }
78 }
96}
79}
src/main/java/me/fridtjof/minecarttrains/managers/ConfigManager.java +17 −37
@@ -1,20 +1,18 @@
1 1 package me.fridtjof.minecarttrains.managers;
2 2
3 import me.fridtjof.puddingapi.bukkit.utils.YamlConfig;
3 import me.fridtjof.minecarttrains.utils.YamlConfig;
4 4 import org.bukkit.Material;
5 5 import org.bukkit.plugin.java.JavaPlugin;
6 6
7 7 import java.io.File;
8 import java.util.Collections;
9 import java.util.Objects;
8 import java.util.List;
10 9 import java.util.logging.Logger;
11 10
12 11 public class ConfigManager
13 12 {
14 13
15 JavaPlugin plugin;
16
17 private Logger logger;
14 private final JavaPlugin plugin;
15 private final Logger logger;
18 16 public YamlConfig mainConfig, physicsConfig, messagesFile;
19 17
20 18 public static int mainConfigVersion = 4;
@@ -27,7 +25,6 @@ public class ConfigManager
27 25 logger = plugin.getLogger();
28 26 setupConfigs();
29 27 checkConfigVersions();
30 //2nd time to overwrite renamed ones
31 28 setupConfigs();
32 29 reloadConfigs();
33 30 }
@@ -45,32 +42,31 @@ public class ConfigManager
45 42 checkConfigVersion(physicsConfig, versionStringName, physicsConfigVersion);
46 43 }
47 44
48 //TODO move to PuddingAPI
49 45 private void checkConfigVersion(YamlConfig config, String versionStringName, int wantedVersion)
50 46 {
51 if(!config.getConfig().contains(versionStringName))
47 if (!config.getConfig().contains(versionStringName))
52 48 {
53 49 return;
54 50 }
55 if(config.getConfig().getInt(versionStringName) == wantedVersion)
51 if (config.getConfig().getInt(versionStringName) == wantedVersion)
56 52 {
57 53 return;
58 54 }
59 55
60
61 56 String filePath = config.getFile().getAbsolutePath();
62
63 57 File renamedFile = new File(filePath + "_backup");
64
65 58 int backupCount = 0;
66 59
67 while(renamedFile.exists())
60 while (renamedFile.exists())
68 61 {
69 62 backupCount++;
70 63 renamedFile = new File(filePath + "_backup_" + backupCount);
71 64 }
72 65
73 config.getFile().renameTo(renamedFile);
66 if (!config.getFile().renameTo(renamedFile))
67 {
68 logger.warning("Could not back up outdated " + config.getName());
69 }
74 70
75 71 logger.warning("The old " + config.getName() + " was replaced by a new version of the default file due to an update");
76 72 }
@@ -85,7 +81,7 @@ public class ConfigManager
85 81
86 82 private void loadMainConfig()
87 83 {
88 mainConfig.getConfig().options().setHeader(Collections.singletonList("This is the main configuration file"));
84 mainConfig.getConfig().options().setHeader(List.of("This is the main configuration file"));
89 85
90 86 mainConfig.getConfig().addDefault(versionStringName, mainConfigVersion);
91 87
@@ -112,7 +108,7 @@ public class ConfigManager
112 108
113 109 private void loadPhysicsConfig()
114 110 {
115 physicsConfig.getConfig().options().setHeader(Collections.singletonList("This is the physics configuration file - Handle with care! - Default values by @Wallaceman105"));
111 physicsConfig.getConfig().options().setHeader(List.of("This is the physics configuration file - Handle with care! - Default values by @Wallaceman105"));
116 112
117 113 physicsConfig.getConfig().addDefault(versionStringName, physicsConfigVersion);
118 114
@@ -143,7 +139,7 @@ public class ConfigManager
143 139
144 140 private void loadMessagesFile()
145 141 {
146 messagesFile.getConfig().options().header("This is the localization file.");;
142 messagesFile.getConfig().options().setHeader(List.of("This is the localization file."));
147 143
148 144 messagesFile.getConfig().addDefault("trains.coupling_successful", "Coupling successful!");
149 145 messagesFile.getConfig().addDefault("trains.coupling_failed_distance", "Coupling failed! - The minecarts are too far apart!");
@@ -160,27 +156,11 @@ public class ConfigManager
160 156
161 157 public void checkMaterial()
162 158 {
163 //check is Material of tool is valid
164 159 String toolMaterialConfig = mainConfig.getConfig().getString("trains.coupling.tool");
165 if((toolMaterialConfig == null) || (Material.getMaterial(toolMaterialConfig) == null))
160 if (toolMaterialConfig == null || Material.getMaterial(toolMaterialConfig) == null)
166 161 {
167 String msg = "Could not resolve coupling tool Material! - Replacing with default!";
168 Material newToolMaterialDefault = Material.STICK;
169
170 // server lost support for the legacy chain naming
171 if(Material.getMaterial("CHAIN") == null)
172 {
173 newToolMaterialDefault = Material.getMaterial("IRON_CHAIN");
174 }
175
176 // server uses legacy naming for the iron chain
177 if(Material.getMaterial("IRON_CHAIN") == null)
178 {
179 newToolMaterialDefault = Material.getMaterial("CHAIN");
180 }
181
182 logger.warning(msg);
183 mainConfig.getConfig().set("trains.coupling.tool", newToolMaterialDefault.toString());
162 logger.warning("Could not resolve coupling tool Material! - Replacing with default!");
163 mainConfig.getConfig().set("trains.coupling.tool", Material.IRON_CHAIN.toString());
184 164 mainConfig.save();
185 165 }
186 166 }
@@ -1,20 +1,18 @@
1package me.fridtjof.minecarttrains.managers;
1package me.fridtjof.minecarttrains.managers;
2
2
3import me.fridtjof.puddingapi.bukkit.utils.YamlConfig;
3import me.fridtjof.minecarttrains.utils.YamlConfig;
4import org.bukkit.Material;
4import org.bukkit.Material;
5import org.bukkit.plugin.java.JavaPlugin;
5import org.bukkit.plugin.java.JavaPlugin;
6
6
7import java.io.File;
7import java.io.File;
8import java.util.Collections;
8import java.util.List;
9import java.util.Objects;
10import java.util.logging.Logger;
9import java.util.logging.Logger;
11
10
12public class ConfigManager
11public class ConfigManager
13{
12{
14
13
15 JavaPlugin plugin;
14 private final JavaPlugin plugin;
16
15 private final Logger logger;
17 private Logger logger;
18 public YamlConfig mainConfig, physicsConfig, messagesFile;
16 public YamlConfig mainConfig, physicsConfig, messagesFile;
19
17
20 public static int mainConfigVersion = 4;
18 public static int mainConfigVersion = 4;
@@ -27,7 +25,6 @@ public class ConfigManager
27 logger = plugin.getLogger();
25 logger = plugin.getLogger();
28 setupConfigs();
26 setupConfigs();
29 checkConfigVersions();
27 checkConfigVersions();
30 //2nd time to overwrite renamed ones
31 setupConfigs();
28 setupConfigs();
32 reloadConfigs();
29 reloadConfigs();
33 }
30 }
@@ -45,32 +42,31 @@ public class ConfigManager
45 checkConfigVersion(physicsConfig, versionStringName, physicsConfigVersion);
42 checkConfigVersion(physicsConfig, versionStringName, physicsConfigVersion);
46 }
43 }
47
44
48 //TODO move to PuddingAPI
49 private void checkConfigVersion(YamlConfig config, String versionStringName, int wantedVersion)
45 private void checkConfigVersion(YamlConfig config, String versionStringName, int wantedVersion)
50 {
46 {
51 if(!config.getConfig().contains(versionStringName))
47 if (!config.getConfig().contains(versionStringName))
52 {
48 {
53 return;
49 return;
54 }
50 }
55 if(config.getConfig().getInt(versionStringName) == wantedVersion)
51 if (config.getConfig().getInt(versionStringName) == wantedVersion)
56 {
52 {
57 return;
53 return;
58 }
54 }
59
55
60
61 String filePath = config.getFile().getAbsolutePath();
56 String filePath = config.getFile().getAbsolutePath();
62
63 File renamedFile = new File(filePath + "_backup");
57 File renamedFile = new File(filePath + "_backup");
64
65 int backupCount = 0;
58 int backupCount = 0;
66
59
67 while(renamedFile.exists())
60 while (renamedFile.exists())
68 {
61 {
69 backupCount++;
62 backupCount++;
70 renamedFile = new File(filePath + "_backup_" + backupCount);
63 renamedFile = new File(filePath + "_backup_" + backupCount);
71 }
64 }
72
65
73 config.getFile().renameTo(renamedFile);
66 if (!config.getFile().renameTo(renamedFile))
67 {
68 logger.warning("Could not back up outdated " + config.getName());
69 }
74
70
75 logger.warning("The old " + config.getName() + " was replaced by a new version of the default file due to an update");
71 logger.warning("The old " + config.getName() + " was replaced by a new version of the default file due to an update");
76 }
72 }
@@ -85,7 +81,7 @@ public class ConfigManager
85
81
86 private void loadMainConfig()
82 private void loadMainConfig()
87 {
83 {
88 mainConfig.getConfig().options().setHeader(Collections.singletonList("This is the main configuration file"));
84 mainConfig.getConfig().options().setHeader(List.of("This is the main configuration file"));
89
85
90 mainConfig.getConfig().addDefault(versionStringName, mainConfigVersion);
86 mainConfig.getConfig().addDefault(versionStringName, mainConfigVersion);
91
87
@@ -112,7 +108,7 @@ public class ConfigManager
112
108
113 private void loadPhysicsConfig()
109 private void loadPhysicsConfig()
114 {
110 {
115 physicsConfig.getConfig().options().setHeader(Collections.singletonList("This is the physics configuration file - Handle with care! - Default values by @Wallaceman105"));
111 physicsConfig.getConfig().options().setHeader(List.of("This is the physics configuration file - Handle with care! - Default values by @Wallaceman105"));
116
112
117 physicsConfig.getConfig().addDefault(versionStringName, physicsConfigVersion);
113 physicsConfig.getConfig().addDefault(versionStringName, physicsConfigVersion);
118
114
@@ -143,7 +139,7 @@ public class ConfigManager
143
139
144 private void loadMessagesFile()
140 private void loadMessagesFile()
145 {
141 {
146 messagesFile.getConfig().options().header("This is the localization file.");;
142 messagesFile.getConfig().options().setHeader(List.of("This is the localization file."));
147
143
148 messagesFile.getConfig().addDefault("trains.coupling_successful", "Coupling successful!");
144 messagesFile.getConfig().addDefault("trains.coupling_successful", "Coupling successful!");
149 messagesFile.getConfig().addDefault("trains.coupling_failed_distance", "Coupling failed! - The minecarts are too far apart!");
145 messagesFile.getConfig().addDefault("trains.coupling_failed_distance", "Coupling failed! - The minecarts are too far apart!");
@@ -160,27 +156,11 @@ public class ConfigManager
160
156
161 public void checkMaterial()
157 public void checkMaterial()
162 {
158 {
163 //check is Material of tool is valid
164 String toolMaterialConfig = mainConfig.getConfig().getString("trains.coupling.tool");
159 String toolMaterialConfig = mainConfig.getConfig().getString("trains.coupling.tool");
165 if((toolMaterialConfig == null) || (Material.getMaterial(toolMaterialConfig) == null))
160 if (toolMaterialConfig == null || Material.getMaterial(toolMaterialConfig) == null)
166 {
161 {
167 String msg = "Could not resolve coupling tool Material! - Replacing with default!";
162 logger.warning("Could not resolve coupling tool Material! - Replacing with default!");
168 Material newToolMaterialDefault = Material.STICK;
163 mainConfig.getConfig().set("trains.coupling.tool", Material.IRON_CHAIN.toString());
169
170 // server lost support for the legacy chain naming
171 if(Material.getMaterial("CHAIN") == null)
172 {
173 newToolMaterialDefault = Material.getMaterial("IRON_CHAIN");
174 }
175
176 // server uses legacy naming for the iron chain
177 if(Material.getMaterial("IRON_CHAIN") == null)
178 {
179 newToolMaterialDefault = Material.getMaterial("CHAIN");
180 }
181
182 logger.warning(msg);
183 mainConfig.getConfig().set("trains.coupling.tool", newToolMaterialDefault.toString());
184 mainConfig.save();
164 mainConfig.save();
185 }
165 }
186 }
166 }
src/main/java/me/fridtjof/minecarttrains/managers/RecipeManager.java +2 −9
@@ -1,12 +1,11 @@
1 1 package me.fridtjof.minecarttrains.managers;
2 2
3 3 import me.fridtjof.minecarttrains.MinecartTrains;
4 import me.fridtjof.puddingapi.bukkit.utils.RecipeMaker;
4 import net.kyori.adventure.text.Component;
5 5 import org.bukkit.Bukkit;
6 6 import org.bukkit.Material;
7 7 import org.bukkit.NamespacedKey;
8 8 import org.bukkit.inventory.ItemStack;
9 import org.bukkit.inventory.ShapedRecipe;
10 9 import org.bukkit.inventory.ShapelessRecipe;
11 10 import org.bukkit.inventory.meta.ItemMeta;
12 11 import org.bukkit.inventory.recipe.CraftingBookCategory;
@@ -20,20 +19,14 @@ public class RecipeManager
20 19
21 20 public RecipeManager()
22 21 {
23 //Tender recipe
24 22 ItemStack tenderItemStack = new ItemStack(Material.CHEST_MINECART);
25 23 ItemMeta tenderItemMeta = tenderItemStack.getItemMeta();
26 tenderItemMeta.setDisplayName(FUEL_CART_NAME);
24 tenderItemMeta.customName(Component.text(FUEL_CART_NAME));
27 25 tenderItemStack.setItemMeta(tenderItemMeta);
28 26
29 27 NamespacedKey tenderKey = new NamespacedKey(plugin, "fuel_cart");
30
31 28 ShapelessRecipe tenderRecipe = new ShapelessRecipe(tenderKey, tenderItemStack);
32
33 29 tenderRecipe.setCategory(CraftingBookCategory.REDSTONE);
34
35 //tenderRecipe.shape("#B#", "#M#");
36
37 30 tenderRecipe.addIngredient(Material.MINECART);
38 31 tenderRecipe.addIngredient(Material.COAL_BLOCK);
39 32
@@ -1,12 +1,11 @@
1package me.fridtjof.minecarttrains.managers;
1package me.fridtjof.minecarttrains.managers;
2
2
3import me.fridtjof.minecarttrains.MinecartTrains;
3import me.fridtjof.minecarttrains.MinecartTrains;
4import me.fridtjof.puddingapi.bukkit.utils.RecipeMaker;
4import net.kyori.adventure.text.Component;
5import org.bukkit.Bukkit;
5import org.bukkit.Bukkit;
6import org.bukkit.Material;
6import org.bukkit.Material;
7import org.bukkit.NamespacedKey;
7import org.bukkit.NamespacedKey;
8import org.bukkit.inventory.ItemStack;
8import org.bukkit.inventory.ItemStack;
9import org.bukkit.inventory.ShapedRecipe;
10import org.bukkit.inventory.ShapelessRecipe;
9import org.bukkit.inventory.ShapelessRecipe;
11import org.bukkit.inventory.meta.ItemMeta;
10import org.bukkit.inventory.meta.ItemMeta;
12import org.bukkit.inventory.recipe.CraftingBookCategory;
11import org.bukkit.inventory.recipe.CraftingBookCategory;
@@ -20,20 +19,14 @@ public class RecipeManager
20
19
21 public RecipeManager()
20 public RecipeManager()
22 {
21 {
23 //Tender recipe
24 ItemStack tenderItemStack = new ItemStack(Material.CHEST_MINECART);
22 ItemStack tenderItemStack = new ItemStack(Material.CHEST_MINECART);
25 ItemMeta tenderItemMeta = tenderItemStack.getItemMeta();
23 ItemMeta tenderItemMeta = tenderItemStack.getItemMeta();
26 tenderItemMeta.setDisplayName(FUEL_CART_NAME);
24 tenderItemMeta.customName(Component.text(FUEL_CART_NAME));
27 tenderItemStack.setItemMeta(tenderItemMeta);
25 tenderItemStack.setItemMeta(tenderItemMeta);
28
26
29 NamespacedKey tenderKey = new NamespacedKey(plugin, "fuel_cart");
27 NamespacedKey tenderKey = new NamespacedKey(plugin, "fuel_cart");
30
31 ShapelessRecipe tenderRecipe = new ShapelessRecipe(tenderKey, tenderItemStack);
28 ShapelessRecipe tenderRecipe = new ShapelessRecipe(tenderKey, tenderItemStack);
32
33 tenderRecipe.setCategory(CraftingBookCategory.REDSTONE);
29 tenderRecipe.setCategory(CraftingBookCategory.REDSTONE);
34
35 //tenderRecipe.shape("#B#", "#M#");
36
37 tenderRecipe.addIngredient(Material.MINECART);
30 tenderRecipe.addIngredient(Material.MINECART);
38 tenderRecipe.addIngredient(Material.COAL_BLOCK);
31 tenderRecipe.addIngredient(Material.COAL_BLOCK);
39
32
src/main/java/me/fridtjof/minecarttrains/utils/CartNames.java added +23 −0
@@ -0,0 +1,23 @@
1 package me.fridtjof.minecarttrains.utils;
2
3 import net.kyori.adventure.text.Component;
4 import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
5 import org.bukkit.Nameable;
6
7 public final class CartNames
8 {
9
10 private CartNames()
11 {
12 }
13
14 public static boolean hasName(Nameable nameable, String expected)
15 {
16 Component name = nameable.customName();
17 if (name == null)
18 {
19 return false;
20 }
21 return PlainTextComponentSerializer.plainText().serialize(name).equalsIgnoreCase(expected);
22 }
23 }
@@ -0,0 +1,23 @@
1package me.fridtjof.minecarttrains.utils;
2
3import net.kyori.adventure.text.Component;
4import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
5import org.bukkit.Nameable;
6
7public final class CartNames
8{
9
10 private CartNames()
11 {
12 }
13
14 public static boolean hasName(Nameable nameable, String expected)
15 {
16 Component name = nameable.customName();
17 if (name == null)
18 {
19 return false;
20 }
21 return PlainTextComponentSerializer.plainText().serialize(name).equalsIgnoreCase(expected);
22 }
23}
src/main/java/me/fridtjof/minecarttrains/utils/HopperUtils.java added +37 −0
@@ -0,0 +1,37 @@
1 package me.fridtjof.minecarttrains.utils;
2
3 import org.bukkit.Material;
4 import org.bukkit.inventory.Inventory;
5 import org.bukkit.inventory.ItemStack;
6
7 public final class HopperUtils
8 {
9
10 private HopperUtils()
11 {
12 }
13
14 public static boolean rearrangeHopper(Inventory inventory, Material wantedMaterial)
15 {
16 if (!inventory.contains(wantedMaterial))
17 {
18 return false;
19 }
20
21 int slot = 0;
22 for (ItemStack itemStack : inventory.getContents())
23 {
24 if (itemStack != null && itemStack.getType() == wantedMaterial)
25 {
26 break;
27 }
28 slot++;
29 }
30
31 ItemStack firstItemStack = inventory.getItem(0);
32 ItemStack wantedItemStack = inventory.getItem(slot);
33 inventory.setItem(0, wantedItemStack);
34 inventory.setItem(slot, firstItemStack);
35 return true;
36 }
37 }
@@ -0,0 +1,37 @@
1package me.fridtjof.minecarttrains.utils;
2
3import org.bukkit.Material;
4import org.bukkit.inventory.Inventory;
5import org.bukkit.inventory.ItemStack;
6
7public final class HopperUtils
8{
9
10 private HopperUtils()
11 {
12 }
13
14 public static boolean rearrangeHopper(Inventory inventory, Material wantedMaterial)
15 {
16 if (!inventory.contains(wantedMaterial))
17 {
18 return false;
19 }
20
21 int slot = 0;
22 for (ItemStack itemStack : inventory.getContents())
23 {
24 if (itemStack != null && itemStack.getType() == wantedMaterial)
25 {
26 break;
27 }
28 slot++;
29 }
30
31 ItemStack firstItemStack = inventory.getItem(0);
32 ItemStack wantedItemStack = inventory.getItem(slot);
33 inventory.setItem(0, wantedItemStack);
34 inventory.setItem(slot, firstItemStack);
35 return true;
36 }
37}
src/main/java/me/fridtjof/minecarttrains/utils/ModrinthUpdateChecker.java added +59 −0
@@ -0,0 +1,59 @@
1 package me.fridtjof.minecarttrains.utils;
2
3 import com.google.gson.JsonArray;
4 import com.google.gson.JsonParser;
5 import org.bukkit.plugin.java.JavaPlugin;
6
7 import java.net.URI;
8 import java.net.http.HttpClient;
9 import java.net.http.HttpRequest;
10 import java.net.http.HttpResponse;
11 import java.time.Duration;
12
13 public final class ModrinthUpdateChecker
14 {
15
16 public ModrinthUpdateChecker(JavaPlugin plugin, String projectId)
17 {
18 String currentVersion = plugin.getPluginMeta().getVersion();
19
20 plugin.getServer().getScheduler().runTaskAsynchronously(plugin, () ->
21 {
22 try
23 {
24 HttpClient client = HttpClient.newBuilder()
25 .connectTimeout(Duration.ofSeconds(5))
26 .build();
27 HttpRequest request = HttpRequest.newBuilder()
28 .uri(URI.create("https://api.modrinth.com/v2/project/" + projectId + "/version"))
29 .header("User-Agent", "MinecartTrains/" + currentVersion)
30 .timeout(Duration.ofSeconds(8))
31 .GET()
32 .build();
33
34 HttpResponse<String> response = client.send(request, HttpResponse.BodyHandlers.ofString());
35 if (response.statusCode() != 200)
36 {
37 return;
38 }
39
40 JsonArray versions = JsonParser.parseString(response.body()).getAsJsonArray();
41 if (versions.isEmpty())
42 {
43 return;
44 }
45
46 String latest = versions.get(0).getAsJsonObject().get("version_number").getAsString();
47 if (!latest.equalsIgnoreCase(currentVersion))
48 {
49 plugin.getLogger().info("A newer MinecartTrains version is available on Modrinth: " + latest
50 + " (current: " + currentVersion + ")");
51 }
52 }
53 catch (Exception exception)
54 {
55 plugin.getLogger().fine("Could not check Modrinth for updates: " + exception.getMessage());
56 }
57 });
58 }
59 }
@@ -0,0 +1,59 @@
1package me.fridtjof.minecarttrains.utils;
2
3import com.google.gson.JsonArray;
4import com.google.gson.JsonParser;
5import org.bukkit.plugin.java.JavaPlugin;
6
7import java.net.URI;
8import java.net.http.HttpClient;
9import java.net.http.HttpRequest;
10import java.net.http.HttpResponse;
11import java.time.Duration;
12
13public final class ModrinthUpdateChecker
14{
15
16 public ModrinthUpdateChecker(JavaPlugin plugin, String projectId)
17 {
18 String currentVersion = plugin.getPluginMeta().getVersion();
19
20 plugin.getServer().getScheduler().runTaskAsynchronously(plugin, () ->
21 {
22 try
23 {
24 HttpClient client = HttpClient.newBuilder()
25 .connectTimeout(Duration.ofSeconds(5))
26 .build();
27 HttpRequest request = HttpRequest.newBuilder()
28 .uri(URI.create("https://api.modrinth.com/v2/project/" + projectId + "/version"))
29 .header("User-Agent", "MinecartTrains/" + currentVersion)
30 .timeout(Duration.ofSeconds(8))
31 .GET()
32 .build();
33
34 HttpResponse<String> response = client.send(request, HttpResponse.BodyHandlers.ofString());
35 if (response.statusCode() != 200)
36 {
37 return;
38 }
39
40 JsonArray versions = JsonParser.parseString(response.body()).getAsJsonArray();
41 if (versions.isEmpty())
42 {
43 return;
44 }
45
46 String latest = versions.get(0).getAsJsonObject().get("version_number").getAsString();
47 if (!latest.equalsIgnoreCase(currentVersion))
48 {
49 plugin.getLogger().info("A newer MinecartTrains version is available on Modrinth: " + latest
50 + " (current: " + currentVersion + ")");
51 }
52 }
53 catch (Exception exception)
54 {
55 plugin.getLogger().fine("Could not check Modrinth for updates: " + exception.getMessage());
56 }
57 });
58 }
59}
src/main/java/me/fridtjof/minecarttrains/utils/YamlConfig.java added +60 −0
@@ -0,0 +1,60 @@
1 package me.fridtjof.minecarttrains.utils;
2
3 import org.bukkit.configuration.file.FileConfiguration;
4 import org.bukkit.configuration.file.YamlConfiguration;
5
6 import java.io.File;
7 import java.io.IOException;
8 import java.util.logging.Level;
9 import java.util.logging.Logger;
10
11 public class YamlConfig
12 {
13
14 private static final Logger LOGGER = Logger.getLogger("MinecartTrains");
15
16 private final File file;
17 private FileConfiguration config;
18
19 public YamlConfig(File pluginDataFolder, String name)
20 {
21 this.file = new File(pluginDataFolder, name + ".yml");
22 if (!pluginDataFolder.exists())
23 {
24 pluginDataFolder.mkdirs();
25 }
26 this.config = YamlConfiguration.loadConfiguration(file);
27 }
28
29 public FileConfiguration getConfig()
30 {
31 return config;
32 }
33
34 public File getFile()
35 {
36 return file;
37 }
38
39 public String getName()
40 {
41 return file.getName();
42 }
43
44 public void save()
45 {
46 try
47 {
48 config.save(file);
49 }
50 catch (IOException exception)
51 {
52 LOGGER.log(Level.SEVERE, "Could not save " + file.getName(), exception);
53 }
54 }
55
56 public void reload()
57 {
58 config = YamlConfiguration.loadConfiguration(file);
59 }
60 }
@@ -0,0 +1,60 @@
1package me.fridtjof.minecarttrains.utils;
2
3import org.bukkit.configuration.file.FileConfiguration;
4import org.bukkit.configuration.file.YamlConfiguration;
5
6import java.io.File;
7import java.io.IOException;
8import java.util.logging.Level;
9import java.util.logging.Logger;
10
11public class YamlConfig
12{
13
14 private static final Logger LOGGER = Logger.getLogger("MinecartTrains");
15
16 private final File file;
17 private FileConfiguration config;
18
19 public YamlConfig(File pluginDataFolder, String name)
20 {
21 this.file = new File(pluginDataFolder, name + ".yml");
22 if (!pluginDataFolder.exists())
23 {
24 pluginDataFolder.mkdirs();
25 }
26 this.config = YamlConfiguration.loadConfiguration(file);
27 }
28
29 public FileConfiguration getConfig()
30 {
31 return config;
32 }
33
34 public File getFile()
35 {
36 return file;
37 }
38
39 public String getName()
40 {
41 return file.getName();
42 }
43
44 public void save()
45 {
46 try
47 {
48 config.save(file);
49 }
50 catch (IOException exception)
51 {
52 LOGGER.log(Level.SEVERE, "Could not save " + file.getName(), exception);
53 }
54 }
55
56 public void reload()
57 {
58 config = YamlConfiguration.loadConfiguration(file);
59 }
60}
src/main/resources/plugin.yml +1 −2
@@ -1,7 +1,6 @@
1 1 name: MinecartTrains
2 2 version: '${project.version}'
3 3 main: me.fridtjof.minecarttrains.MinecartTrains
4 api-version: '1.21'
4 api-version: '26.2'
5 5 authors: [ Fridtjof_DE ]
6 6 website: https://www.fridtjof.me
7 depend: [PuddingAPI]
@@ -1,7 +1,6 @@
1name: MinecartTrains
1name: MinecartTrains
2version: '${project.version}'
2version: '${project.version}'
3main: me.fridtjof.minecarttrains.MinecartTrains
3main: me.fridtjof.minecarttrains.MinecartTrains
4api-version: '1.21'
4api-version: '26.2'
5authors: [ Fridtjof_DE ]
5authors: [ Fridtjof_DE ]
6website: https://www.fridtjof.me
6website: https://www.fridtjof.me
7depend: [PuddingAPI]