Skip to content

Commit 24827de

Browse files
authored
Merge pull request #56 from ez-plugins/fix/update-26.2
Update deps to MC 26.1
2 parents 92f92d1 + be6b325 commit 24827de

16 files changed

Lines changed: 194 additions & 44 deletions

File tree

.github/workflows/ci.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ jobs:
1818
- name: Checkout
1919
uses: actions/checkout@v6
2020

21-
- name: Set up JDK 17
21+
- name: Set up JDK 25
2222
uses: actions/setup-java@v5
2323
with:
2424
distribution: temurin
25-
java-version: '17'
25+
java-version: '25'
2626
cache: maven
2727

2828
- name: Run Spotless lint
@@ -45,11 +45,11 @@ jobs:
4545
- name: Checkout
4646
uses: actions/checkout@v6
4747

48-
- name: Set up JDK 17
48+
- name: Set up JDK 25
4949
uses: actions/setup-java@v5
5050
with:
5151
distribution: temurin
52-
java-version: '17'
52+
java-version: '25'
5353
cache: maven
5454

5555
- name: Build module
@@ -63,11 +63,11 @@ jobs:
6363
- name: Checkout
6464
uses: actions/checkout@v6
6565

66-
- name: Set up JDK 17
66+
- name: Set up JDK 25
6767
uses: actions/setup-java@v5
6868
with:
6969
distribution: temurin
70-
java-version: '17'
70+
java-version: '25'
7171
cache: maven
7272

7373
- name: Run unit tests
@@ -81,11 +81,11 @@ jobs:
8181
- name: Checkout
8282
uses: actions/checkout@v6
8383

84-
- name: Set up JDK 17
84+
- name: Set up JDK 25
8585
uses: actions/setup-java@v5
8686
with:
8787
distribution: temurin
88-
java-version: '17'
88+
java-version: '25'
8989
cache: maven
9090

9191
- name: Run feature tests
@@ -103,11 +103,11 @@ jobs:
103103
- name: Checkout
104104
uses: actions/checkout@v6
105105

106-
- name: Set up JDK 17
106+
- name: Set up JDK 25
107107
uses: actions/setup-java@v5
108108
with:
109109
distribution: temurin
110-
java-version: '17'
110+
java-version: '25'
111111
cache: maven
112112
server-id: github
113113
server-username: GITHUB_ACTOR

.github/workflows/search-pattern-benchmarks.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ jobs:
2525
- name: Checkout
2626
uses: actions/checkout@v6
2727

28-
- name: Set up JDK 17
28+
- name: Set up JDK 25
2929
uses: actions/setup-java@v5
3030
with:
3131
distribution: temurin
32-
java-version: '17'
32+
java-version: '25'
3333
cache: maven
3434

3535
- name: Compile benchmark classpath

ezrtp-api/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
<parent>
66
<groupId>com.skyblockexp</groupId>
77
<artifactId>ezrtp-parent</artifactId>
8-
<version>2.1.0</version>
8+
<version>3.0.0</version>
99
<relativePath>../pom.xml</relativePath>
1010
</parent>
1111

1212
<groupId>com.skyblockexp</groupId>
1313
<artifactId>ezrtp-api</artifactId>
14-
<version>2.1.0</version>
14+
<version>3.0.0</version>
1515
<packaging>jar</packaging>
1616
<name>EzRTP API</name>
1717
<description>Lightweight public API for EzRTP intended for third-party plugins.</description>

ezrtp-bukkit/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
<parent>
66
<groupId>com.skyblockexp</groupId>
77
<artifactId>ezrtp-parent</artifactId>
8-
<version>2.1.0</version>
8+
<version>3.0.0</version>
99
<relativePath>../pom.xml</relativePath>
1010
</parent>
1111

1212
<groupId>com.skyblockexp</groupId>
1313
<artifactId>ezrtp-bukkit</artifactId>
14-
<version>2.1.0</version>
14+
<version>3.0.0</version>
1515
<packaging>jar</packaging>
1616
<name>EzRTP (Bukkit)</name>
1717
<description>EzRTP Bukkit-compatible plugin module.</description>
@@ -111,7 +111,7 @@
111111
<dependency>
112112
<groupId>com.skyblockexp</groupId>
113113
<artifactId>ezrtp-common</artifactId>
114-
<version>2.1.0</version>
114+
<version>3.0.0</version>
115115
</dependency>
116116
</dependencies>
117117

ezrtp-common/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
<parent>
66
<groupId>com.skyblockexp</groupId>
77
<artifactId>ezrtp-parent</artifactId>
8-
<version>2.1.0</version>
8+
<version>3.0.0</version>
99
<relativePath>../pom.xml</relativePath>
1010
</parent>
1111

1212
<groupId>com.skyblockexp</groupId>
1313
<artifactId>ezrtp-common</artifactId>
14-
<version>2.1.0</version>
14+
<version>3.0.0</version>
1515
<packaging>jar</packaging>
1616
<name>EzRTP Common</name>
1717
<description>Shared utilities for EzRTP (platform-independent)</description>

ezrtp-common/src/main/java/com/skyblockexp/ezrtp/config/effects/CountdownParticleSettings.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public static CountdownParticleSettings fromConfiguration(ConfigurationSection s
7979
}
8080
boolean enabled = section.getBoolean("enabled", false);
8181
Particle particle = parseParticle(section.getString("particle",
82-
section.getString("type", "ENCHANTMENT_TABLE")), logger, Particle.ENCHANTMENT_TABLE);
82+
section.getString("type", "ENCHANT")), logger, Particle.ENCHANT);
8383
int points = Math.max(1, section.getInt("points", 12));
8484
double radius = section.getDouble("radius", 1.2D);
8585
double heightOffset = section.getDouble("height-offset", 0.8D);
@@ -96,7 +96,7 @@ public static CountdownParticleSettings fromConfiguration(ConfigurationSection s
9696
}
9797

9898
public static CountdownParticleSettings disabled() {
99-
return new CountdownParticleSettings(false, Particle.ENCHANTMENT_TABLE, 12,
99+
return new CountdownParticleSettings(false, Particle.ENCHANT, 12,
100100
1.2D, 0.8D, 0.0D, false, null, 0, 0.35D);
101101
}
102102

ezrtp-common/src/test/java/com/skyblockexp/ezrtp/teleport/biome/WeightedRareBiomeStrategyTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
import com.skyblockexp.ezrtp.teleport.search.BiomeSearchStrategy;
1111

12-
import java.util.EnumSet;
1312
import java.util.Set;
1413

1514
import static org.junit.jupiter.api.Assertions.assertSame;
@@ -33,7 +32,7 @@ class WeightedRareBiomeStrategyTest {
3332
@Test
3433
void delegatesToProvidedFallbackWhenTargetsAreNotRare() {
3534
WeightedRareBiomeStrategy strategy = new WeightedRareBiomeStrategy(fallbackStrategy);
36-
Set<Biome> targets = EnumSet.of(Biome.PLAINS);
35+
Set<Biome> targets = Set.of(Biome.PLAINS);
3736

3837
when(registry.isRareBiome(any(Biome.class))).thenReturn(false);
3938
int[] expected = new int[]{25, -64};
Lines changed: 146 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,146 @@
1+
package org.bukkit.block;
2+
3+
import org.bukkit.Keyed;
4+
import org.bukkit.NamespacedKey;
5+
6+
import java.util.HashMap;
7+
import java.util.Locale;
8+
import java.util.Map;
9+
10+
/**
11+
* Test shim for org.bukkit.block.Biome.
12+
* Replaces the registry-backed Paper 26.1 interface to avoid requiring a running
13+
* server (RegistryAccess) in unit tests. Must be an interface (not an enum) so that
14+
* bytecode compiled against the real Paper Biome interface resolves correctly.
15+
*/
16+
public interface Biome extends Keyed {
17+
18+
Biome BADLANDS = BiomeShim.of("BADLANDS");
19+
Biome BAMBOO_JUNGLE = BiomeShim.of("BAMBOO_JUNGLE");
20+
Biome BASALT_DELTAS = BiomeShim.of("BASALT_DELTAS");
21+
Biome BEACH = BiomeShim.of("BEACH");
22+
Biome BIRCH_FOREST = BiomeShim.of("BIRCH_FOREST");
23+
Biome CHERRY_GROVE = BiomeShim.of("CHERRY_GROVE");
24+
Biome COLD_OCEAN = BiomeShim.of("COLD_OCEAN");
25+
Biome CRIMSON_FOREST = BiomeShim.of("CRIMSON_FOREST");
26+
Biome DARK_FOREST = BiomeShim.of("DARK_FOREST");
27+
Biome DEEP_COLD_OCEAN = BiomeShim.of("DEEP_COLD_OCEAN");
28+
Biome DEEP_DARK = BiomeShim.of("DEEP_DARK");
29+
Biome DEEP_FROZEN_OCEAN = BiomeShim.of("DEEP_FROZEN_OCEAN");
30+
Biome DEEP_LUKEWARM_OCEAN = BiomeShim.of("DEEP_LUKEWARM_OCEAN");
31+
Biome DEEP_OCEAN = BiomeShim.of("DEEP_OCEAN");
32+
Biome DESERT = BiomeShim.of("DESERT");
33+
Biome DRIPSTONE_CAVES = BiomeShim.of("DRIPSTONE_CAVES");
34+
Biome END_BARRENS = BiomeShim.of("END_BARRENS");
35+
Biome END_HIGHLANDS = BiomeShim.of("END_HIGHLANDS");
36+
Biome END_MIDLANDS = BiomeShim.of("END_MIDLANDS");
37+
Biome ERODED_BADLANDS = BiomeShim.of("ERODED_BADLANDS");
38+
Biome FLOWER_FOREST = BiomeShim.of("FLOWER_FOREST");
39+
Biome FOREST = BiomeShim.of("FOREST");
40+
Biome FROZEN_OCEAN = BiomeShim.of("FROZEN_OCEAN");
41+
Biome FROZEN_PEAKS = BiomeShim.of("FROZEN_PEAKS");
42+
Biome FROZEN_RIVER = BiomeShim.of("FROZEN_RIVER");
43+
Biome GROVE = BiomeShim.of("GROVE");
44+
Biome ICE_SPIKES = BiomeShim.of("ICE_SPIKES");
45+
Biome JAGGED_PEAKS = BiomeShim.of("JAGGED_PEAKS");
46+
Biome JUNGLE = BiomeShim.of("JUNGLE");
47+
Biome LUKEWARM_OCEAN = BiomeShim.of("LUKEWARM_OCEAN");
48+
Biome LUSH_CAVES = BiomeShim.of("LUSH_CAVES");
49+
Biome MANGROVE_SWAMP = BiomeShim.of("MANGROVE_SWAMP");
50+
Biome MEADOW = BiomeShim.of("MEADOW");
51+
Biome MUSHROOM_FIELDS = BiomeShim.of("MUSHROOM_FIELDS");
52+
Biome NETHER_WASTES = BiomeShim.of("NETHER_WASTES");
53+
Biome OCEAN = BiomeShim.of("OCEAN");
54+
Biome OLD_GROWTH_BIRCH_FOREST = BiomeShim.of("OLD_GROWTH_BIRCH_FOREST");
55+
Biome OLD_GROWTH_PINE_TAIGA = BiomeShim.of("OLD_GROWTH_PINE_TAIGA");
56+
Biome OLD_GROWTH_SPRUCE_TAIGA = BiomeShim.of("OLD_GROWTH_SPRUCE_TAIGA");
57+
Biome PALE_GARDEN = BiomeShim.of("PALE_GARDEN");
58+
Biome PLAINS = BiomeShim.of("PLAINS");
59+
Biome RIVER = BiomeShim.of("RIVER");
60+
Biome SAVANNA = BiomeShim.of("SAVANNA");
61+
Biome SAVANNA_PLATEAU = BiomeShim.of("SAVANNA_PLATEAU");
62+
Biome SMALL_END_ISLANDS = BiomeShim.of("SMALL_END_ISLANDS");
63+
Biome SNOWY_BEACH = BiomeShim.of("SNOWY_BEACH");
64+
Biome SNOWY_PLAINS = BiomeShim.of("SNOWY_PLAINS");
65+
Biome SNOWY_SLOPES = BiomeShim.of("SNOWY_SLOPES");
66+
Biome SNOWY_TAIGA = BiomeShim.of("SNOWY_TAIGA");
67+
Biome SOUL_SAND_VALLEY = BiomeShim.of("SOUL_SAND_VALLEY");
68+
Biome SPARSE_JUNGLE = BiomeShim.of("SPARSE_JUNGLE");
69+
Biome STONY_PEAKS = BiomeShim.of("STONY_PEAKS");
70+
Biome STONY_SHORE = BiomeShim.of("STONY_SHORE");
71+
Biome SUNFLOWER_PLAINS = BiomeShim.of("SUNFLOWER_PLAINS");
72+
Biome SWAMP = BiomeShim.of("SWAMP");
73+
Biome TAIGA = BiomeShim.of("TAIGA");
74+
Biome THE_END = BiomeShim.of("THE_END");
75+
Biome THE_VOID = BiomeShim.of("THE_VOID");
76+
Biome WARM_OCEAN = BiomeShim.of("WARM_OCEAN");
77+
Biome WARPED_FOREST = BiomeShim.of("WARPED_FOREST");
78+
Biome WINDSWEPT_FOREST = BiomeShim.of("WINDSWEPT_FOREST");
79+
Biome WINDSWEPT_GRAVELLY_HILLS = BiomeShim.of("WINDSWEPT_GRAVELLY_HILLS");
80+
Biome WINDSWEPT_HILLS = BiomeShim.of("WINDSWEPT_HILLS");
81+
Biome WINDSWEPT_SAVANNA = BiomeShim.of("WINDSWEPT_SAVANNA");
82+
Biome WOODED_BADLANDS = BiomeShim.of("WOODED_BADLANDS");
83+
Biome CUSTOM = BiomeShim.of("CUSTOM");
84+
85+
/** Returns the constant name (mirrors Enum.name() / OldEnum behaviour). */
86+
String name();
87+
88+
static Biome valueOf(String name) {
89+
if (name == null) {
90+
return null;
91+
}
92+
Biome biome = BiomeShim.REGISTRY.get(name.toUpperCase(Locale.ROOT));
93+
if (biome == null) {
94+
throw new IllegalArgumentException("No Biome constant: " + name);
95+
}
96+
return biome;
97+
}
98+
99+
static Biome[] values() {
100+
return BiomeShim.REGISTRY.values().toArray(new Biome[0]);
101+
}
102+
103+
/** Concrete backing class for test Biome constants. */
104+
final class BiomeShim implements Biome {
105+
static final Map<String, Biome> REGISTRY = new HashMap<>();
106+
107+
private final String name;
108+
109+
private BiomeShim(String name) {
110+
this.name = name;
111+
}
112+
113+
static BiomeShim of(String n) {
114+
BiomeShim b = new BiomeShim(n.toUpperCase(Locale.ROOT));
115+
REGISTRY.put(b.name, b);
116+
return b;
117+
}
118+
119+
@Override
120+
public String name() {
121+
return name;
122+
}
123+
124+
@Override
125+
public NamespacedKey getKey() {
126+
return NamespacedKey.minecraft(name.toLowerCase(Locale.ROOT));
127+
}
128+
129+
@Override
130+
public String toString() {
131+
return name;
132+
}
133+
134+
@Override
135+
public boolean equals(Object o) {
136+
if (this == o) return true;
137+
if (o instanceof BiomeShim) return name.equals(((BiomeShim) o).name);
138+
return false;
139+
}
140+
141+
@Override
142+
public int hashCode() {
143+
return name.hashCode();
144+
}
145+
}
146+
}

ezrtp-paper/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
<parent>
66
<groupId>com.skyblockexp</groupId>
77
<artifactId>ezrtp-parent</artifactId>
8-
<version>2.1.0</version>
8+
<version>3.0.0</version>
99
<relativePath>../pom.xml</relativePath>
1010
</parent>
1111

1212
<groupId>com.skyblockexp</groupId>
1313
<artifactId>ezrtp-paper</artifactId>
14-
<version>2.1.0</version>
14+
<version>3.0.0</version>
1515
<packaging>jar</packaging>
1616
<name>EzRTP (Paper)</name>
1717
<description>Paper-optimized module for EzRTP</description>
@@ -32,7 +32,7 @@
3232
<dependency>
3333
<groupId>com.skyblockexp</groupId>
3434
<artifactId>ezrtp-common</artifactId>
35-
<version>2.1.0</version>
35+
<version>3.0.0</version>
3636
</dependency>
3737
<dependency>
3838
<groupId>org.junit.jupiter</groupId>

ezrtp-paper/src/main/resources/plugin.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: EzRTPPaperModule
22
version: ${project.version}
33
main: com.skyblockexp.ezrtp.paper.EzRtpPaperModulePlugin
4-
api-version: '1.19'
4+
api-version: '26.1.2'
55
author: SkyblockEXP
66
description: Paper platform module for EzRTP runtime adapters.
77
folia-supported: true

0 commit comments

Comments
 (0)