Skip to content

Commit fc60a16

Browse files
authored
Merge pull request #2 from Elikill58/master
Update Minestom to 1.19.2 and others dependencies
2 parents 0ebff2a + 5916650 commit fc60a16

File tree

5 files changed

+15
-19
lines changed

5 files changed

+15
-19
lines changed

Diff for: README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ repositories {
3434
}
3535
3636
dependencies {
37-
compileOnly("pink.zak.minestom.operadora:operadora:1.1.0") // release builds
37+
compileOnly("pink.zak.minestom.operadora:operadora:1.2.0") // release builds
3838
compileOnly("pink.zak.minestom.operadora:operadora:26") // pre-release builds (see TeamCity CI)
3939
}
4040
```

Diff for: build.gradle.kts

+5-6
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,22 @@ plugins {
55
}
66

77
group = "pink.zak.minestom.operadora"
8-
version = "1.2.0"
8+
version = "1.3.0"
99

1010
repositories {
1111
mavenCentral()
1212
maven("https://jitpack.io")
1313
}
1414

1515
dependencies {
16-
// modified minestom
17-
api("com.github.Minestom:Minestom:f5f323fef9")
18-
api("com.influxdb:influxdb-client-java:4.0.0")
16+
api("com.github.Minestom:Minestom:18c4648")
17+
api("com.influxdb:influxdb-client-java:6.5.0")
1918
implementation("net.kyori:adventure-text-minimessage:4.11.0")
2019
implementation("com.typesafe:config:1.4.2")
2120
implementation("com.google.guava:guava:31.1-jre")
2221

23-
testImplementation("org.junit.jupiter:junit-jupiter-api:5.9.0")
24-
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.9.0")
22+
testImplementation("org.junit.jupiter:junit-jupiter-api:5.9.1")
23+
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.9.1")
2524
}
2625

2726

Diff for: src/main/java/pink/zak/minestom/operadora/command/gamemode/GamemodeSurvivalShortCommand.java

-4
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,12 @@
44
import net.kyori.adventure.text.Component;
55
import net.kyori.adventure.text.format.NamedTextColor;
66
import net.minestom.server.command.builder.Command;
7-
import net.minestom.server.command.builder.arguments.ArgumentType;
8-
import net.minestom.server.command.builder.arguments.minecraft.ArgumentEntity;
97

108
public class GamemodeSurvivalShortCommand extends Command {
119

1210
public GamemodeSurvivalShortCommand() {
1311
super("gms");
1412

15-
ArgumentEntity player = ArgumentType.Entity("targets").onlyPlayers(true);
16-
1713
//Upon invalid usage, print the correct usage of the command to the sender
1814
setDefaultExecutor((sender, context) -> {
1915
String commandName = context.getCommandName();

Diff for: src/main/java/pink/zak/minestom/operadora/module/influx/InfluxMetricsModule.java

+5-6
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
package pink.zak.minestom.operadora.module.influx;
22

3+
import java.util.HashSet;
4+
import java.util.List;
5+
import java.util.Set;
6+
37
import com.influxdb.client.WriteApi;
48
import com.influxdb.client.write.Point;
59
import com.typesafe.config.Config;
10+
611
import pink.zak.minestom.operadora.module.Module;
712
import pink.zak.minestom.operadora.module.influx.metrics.CpuMetrics;
813
import pink.zak.minestom.operadora.module.influx.metrics.InstanceMetrics;
@@ -12,11 +17,6 @@
1217
import pink.zak.minestom.operadora.module.influx.metrics.TickMonitorMetrics;
1318
import pink.zak.minestom.operadora.module.influx.metrics.extensions.InfluxMetric;
1419

15-
import java.time.Duration;
16-
import java.util.HashSet;
17-
import java.util.List;
18-
import java.util.Set;
19-
2020
public class InfluxMetricsModule extends Module {
2121
private final Set<InfluxMetric> activeMetrics = new HashSet<>();
2222
private InfluxConnection influxConnection;
@@ -32,7 +32,6 @@ public void load(Config config) {
3232
String token = config.getString("token");
3333
String organisation = config.getString("organisation");
3434
String bucket = config.getString("bucket");
35-
Duration updateTime = config.getDuration("update-time");
3635

3736
this.influxConnection = new InfluxConnection(url, token, organisation, bucket);
3837
this.writeApi = this.influxConnection.getWriteApi();

Diff for: src/main/java/pink/zak/minestom/operadora/utils/data/repository/json/JsonRepository.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import java.util.Objects;
1717
import java.util.Optional;
1818
import java.util.stream.Collectors;
19+
import java.util.stream.Stream;
1920

2021
public abstract class JsonRepository<ID, T> implements Repository<ID, T>, IdStringConverter<ID> {
2122
protected static final Gson GSON = new Gson();
@@ -62,10 +63,11 @@ public JsonRepository(Path folder) {
6263
return Optional.ofNullable(this.parseFile(file));
6364
}
6465

66+
@SuppressWarnings("unchecked")
6567
@Override
6668
public @NotNull Iterable<T> findAll() {
67-
try {
68-
return Files.list(this.basePath)
69+
try (Stream<Path> pathStream = Files.list(this.basePath)) {
70+
return pathStream
6971
.map(Path::toFile)
7072
.filter(file -> file.getName().endsWith(".json"))
7173
.map(this::parseFile)

0 commit comments

Comments
 (0)