Skip to content

Commit 4309cb0

Browse files
DerFrZockerDerFrZocker
committed
Add support for minecraft version 1.21
Took 16 minutes
1 parent 8a9f2c7 commit 4309cb0

23 files changed

+2098
-10
lines changed

‎custom-ore-generator/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,12 @@
219219
<version>${project.version}</version>
220220
<scope>compile</scope>
221221
</dependency>
222+
<dependency>
223+
<groupId>de.derfrzocker</groupId>
224+
<artifactId>custom-ore-generator-impl-v1_21_R1</artifactId>
225+
<version>${project.version}</version>
226+
<scope>compile</scope>
227+
</dependency>
222228
<dependency>
223229
<groupId>de.derfrzocker</groupId>
224230
<artifactId>custom-ore-generator-plugin-oraxen-v1</artifactId>

‎custom-ore-generator/src/main/java/de/derfrzocker/custom/ore/generator/CustomOreGenerator.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,8 @@
9393
import de.derfrzocker.custom.ore.generator.impl.v1_20_R3.oregenerator.MinableGenerator_v1_20_R3;
9494
import de.derfrzocker.custom.ore.generator.impl.v1_20_R4.WorldHandler_v1_20_R4;
9595
import de.derfrzocker.custom.ore.generator.impl.v1_20_R4.oregenerator.MinableGenerator_v1_20_R4;
96+
import de.derfrzocker.custom.ore.generator.impl.v1_21_R1.WorldHandler_v1_21_R1;
97+
import de.derfrzocker.custom.ore.generator.impl.v1_21_R1.oregenerator.MinableGenerator_v1_21_R1;
9698
import de.derfrzocker.custom.ore.generator.impl.v1_8_R1.CustomOreBlockPopulator_v1_8_R1;
9799
import de.derfrzocker.custom.ore.generator.impl.v1_8_R1.oregenerator.MinableGenerator_v1_8_R1;
98100
import de.derfrzocker.custom.ore.generator.impl.v1_8_R2.CustomOreBlockPopulator_v1_8_R2;
@@ -126,7 +128,7 @@
126128

127129
public class CustomOreGenerator extends JavaPlugin {
128130

129-
private static final ServerVersionRange[] SUPPORTED_VERSION = new ServerVersionRange[]{ServerVersionRange.V1_20, ServerVersionRange.V1_19,
131+
private static final ServerVersionRange[] SUPPORTED_VERSION = new ServerVersionRange[]{ServerVersionRange.V1_21, ServerVersionRange.V1_20, ServerVersionRange.V1_19,
130132
ServerVersionRange.V1_18, ServerVersionRange.V1_17, ServerVersionRange.V1_16, ServerVersionRange.V1_15, ServerVersionRange.V1_14,
131133
ServerVersionRange.V1_13, ServerVersionRange.V1_12, ServerVersionRange.V1_11, ServerVersionRange.V1_10, ServerVersionRange.V1_9,
132134
ServerVersionRange.V1_8};
@@ -243,6 +245,7 @@ private void registerStandardOreGenerators(@NotNull final RegisterUtil registerU
243245
registerUtil.register(InternalVersion.v1_20_R2, InternalVersion.v1_20_R2, () -> new MinableGenerator_v1_20_R2(infoFunction, oreSettingInfoBiFunction), true);
244246
registerUtil.register(InternalVersion.v1_20_R3, InternalVersion.v1_20_R3, () -> new MinableGenerator_v1_20_R3(infoFunction, oreSettingInfoBiFunction), true);
245247
registerUtil.register(InternalVersion.v1_20_R4, InternalVersion.v1_20_R4, () -> new MinableGenerator_v1_20_R4(infoFunction, oreSettingInfoBiFunction), true);
248+
registerUtil.register(InternalVersion.v1_21_R1, InternalVersion.v1_21_R1, () -> new MinableGenerator_v1_21_R1(infoFunction, oreSettingInfoBiFunction), true);
246249
}
247250

248251
private void registerStandardBlockSelector(@NotNull final RegisterUtil registerUtil) {
@@ -277,7 +280,9 @@ private void registerStandardCustomDatas(@NotNull final RegisterUtil registerUti
277280
}
278281

279282
private WorldHandler initWorldHandler() {
280-
if (InternalVersion.v1_20_R4.getServerVersionRange().isInRange(version)) {
283+
if (InternalVersion.v1_21_R1.getServerVersionRange().isInRange(version)) {
284+
return new WorldHandler_v1_21_R1(this, CustomOreGeneratorServiceSupplier.INSTANCE);
285+
} else if (InternalVersion.v1_20_R4.getServerVersionRange().isInRange(version)) {
281286
return new WorldHandler_v1_20_R4(this, CustomOreGeneratorServiceSupplier.INSTANCE);
282287
} else if (InternalVersion.v1_20_R3.getServerVersionRange().isInRange(version)) {
283288
return new WorldHandler_v1_20_R3(this, CustomOreGeneratorServiceSupplier.INSTANCE);

‎custom-ore-generator/src/main/java/de/derfrzocker/custom/ore/generator/impl/customdata/AutoCustomData.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@
4646
import de.derfrzocker.custom.ore.generator.impl.v1_20_R1.customdata.AutoApplier_v1_20_R1;
4747
import de.derfrzocker.custom.ore.generator.impl.v1_20_R2.customdata.AutoApplier_v1_20_R2;
4848
import de.derfrzocker.custom.ore.generator.impl.v1_20_R3.customdata.AutoApplier_v1_20_R3;
49+
import de.derfrzocker.custom.ore.generator.impl.v1_20_R4.customdata.AutoApplier_v1_20_R4;
50+
import de.derfrzocker.custom.ore.generator.impl.v1_21_R1.customdata.AutoApplier_v1_21_R1;
4951
import de.derfrzocker.custom.ore.generator.impl.v1_9_R1.customdata.AutoApplier_v1_9_R1;
5052
import de.derfrzocker.custom.ore.generator.impl.v_1_9_R2.customdata.AutoApplier_v1_9_R2;
5153
import de.derfrzocker.spigot.utils.version.InternalVersion;
@@ -96,8 +98,10 @@ public boolean hasCustomData(@NotNull final BlockState blockState) {
9698
@Override
9799
protected AutoApplier getCustomDataApplier0() {
98100
ServerVersion version = ServerVersion.getCurrentVersion(Bukkit.getServer());
99-
if (InternalVersion.v1_20_R4.getServerVersionRange().isInRange(version)) {
100-
return new AutoApplier_v1_20_R1(this);
101+
if (InternalVersion.v1_21_R1.getServerVersionRange().isInRange(version)) {
102+
return new AutoApplier_v1_21_R1(this);
103+
} else if (InternalVersion.v1_20_R4.getServerVersionRange().isInRange(version)) {
104+
return new AutoApplier_v1_20_R4(this);
101105
} else if (InternalVersion.v1_20_R3.getServerVersionRange().isInRange(version)) {
102106
return new AutoApplier_v1_20_R3(this);
103107
} else if (InternalVersion.v1_20_R2.getServerVersionRange().isInRange(version)) {

‎custom-ore-generator/src/main/java/de/derfrzocker/custom/ore/generator/impl/customdata/BlockStateCustomData.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
import de.derfrzocker.custom.ore.generator.impl.v1_20_R2.customdata.BlockStateApplier_v1_20_R2;
4848
import de.derfrzocker.custom.ore.generator.impl.v1_20_R3.customdata.BlockStateApplier_v1_20_R3;
4949
import de.derfrzocker.custom.ore.generator.impl.v1_20_R4.customdata.BlockStateApplier_v1_20_R4;
50+
import de.derfrzocker.custom.ore.generator.impl.v1_21_R1.customdata.BlockStateApplier_v1_21_R1;
5051
import de.derfrzocker.spigot.utils.version.InternalVersion;
5152
import de.derfrzocker.spigot.utils.version.ServerVersion;
5253
import java.io.File;
@@ -72,7 +73,9 @@ public BlockStateCustomData(@NotNull final Supplier<CustomOreGeneratorService> s
7273
@Override
7374
protected AbstractBlockStateCustomData.BlockStateApplier getCustomDataApplier0() {
7475
ServerVersion version = ServerVersion.getCurrentVersion(Bukkit.getServer());
75-
if (InternalVersion.v1_20_R4.getServerVersionRange().isInRange(version)) {
76+
if (InternalVersion.v1_21_R1.getServerVersionRange().isInRange(version)) {
77+
return new BlockStateApplier_v1_21_R1(this.serviceSupplier, this);
78+
} else if (InternalVersion.v1_20_R4.getServerVersionRange().isInRange(version)) {
7679
return new BlockStateApplier_v1_20_R4(this.serviceSupplier, this);
7780
} else if (InternalVersion.v1_20_R3.getServerVersionRange().isInRange(version)) {
7881
return new BlockStateApplier_v1_20_R3(this.serviceSupplier, this);

‎custom-ore-generator/src/main/java/de/derfrzocker/custom/ore/generator/impl/customdata/ItemModsCustomData.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
import de.derfrzocker.custom.ore.generator.impl.v1_20_R2.customdata.ItemModsApplier_v1_20_R2;
4646
import de.derfrzocker.custom.ore.generator.impl.v1_20_R3.customdata.ItemModsApplier_v1_20_R3;
4747
import de.derfrzocker.custom.ore.generator.impl.v1_20_R4.customdata.ItemModsApplier_v1_20_R4;
48+
import de.derfrzocker.custom.ore.generator.impl.v1_21_R1.customdata.ItemModsApplier_v1_21_R1;
4849
import de.derfrzocker.spigot.utils.version.InternalVersion;
4950
import de.derfrzocker.spigot.utils.version.ServerVersion;
5051
import dev.linwood.itemmods.ItemMods;
@@ -111,7 +112,9 @@ public String getCustomData(@NotNull final BlockState blockState) {
111112
@Override
112113
protected CustomDataApplier getCustomDataApplier0() {
113114
ServerVersion version = ServerVersion.getCurrentVersion(Bukkit.getServer());
114-
if (InternalVersion.v1_20_R4.getServerVersionRange().isInRange(version)) {
115+
if (InternalVersion.v1_21_R1.getServerVersionRange().isInRange(version)) {
116+
return new ItemModsApplier_v1_21_R1(this);
117+
} else if (InternalVersion.v1_20_R4.getServerVersionRange().isInRange(version)) {
115118
return new ItemModsApplier_v1_20_R4(this);
116119
} else if (InternalVersion.v1_20_R3.getServerVersionRange().isInRange(version)) {
117120
return new ItemModsApplier_v1_20_R3(this);

‎custom-ore-generator/src/main/java/de/derfrzocker/custom/ore/generator/impl/customdata/NBTTagCustomData.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
import de.derfrzocker.custom.ore.generator.impl.v1_20_R2.customdata.NBTTagApplier_v1_20_R2;
4747
import de.derfrzocker.custom.ore.generator.impl.v1_20_R3.customdata.NBTTagApplier_v1_20_R3;
4848
import de.derfrzocker.custom.ore.generator.impl.v1_20_R4.customdata.NBTTagApplier_v1_20_R4;
49+
import de.derfrzocker.custom.ore.generator.impl.v1_21_R1.customdata.NBTTagApplier_v1_21_R1;
4950
import de.derfrzocker.custom.ore.generator.impl.v1_8_R1.customdata.NBTTagApplier_v1_8_R1;
5051
import de.derfrzocker.custom.ore.generator.impl.v1_8_R2.customdata.NBTTagApplier_v1_8_R2;
5152
import de.derfrzocker.custom.ore.generator.impl.v1_8_R3.customdata.NBTTagApplier_v1_8_R3;
@@ -68,7 +69,9 @@ public NBTTagCustomData(@NotNull final Function<String, Info> infoFunction, @Not
6869
@Override
6970
protected NBTTagApplier getCustomDataApplier0() {
7071
ServerVersion version = ServerVersion.getCurrentVersion(Bukkit.getServer());
71-
if (InternalVersion.v1_20_R4.getServerVersionRange().isInRange(version)) {
72+
if (InternalVersion.v1_21_R1.getServerVersionRange().isInRange(version)) {
73+
return new NBTTagApplier_v1_21_R1(this);
74+
} else if (InternalVersion.v1_20_R4.getServerVersionRange().isInRange(version)) {
7275
return new NBTTagApplier_v1_20_R4(this);
7376
} else if (InternalVersion.v1_20_R3.getServerVersionRange().isInRange(version)) {
7477
return new NBTTagApplier_v1_20_R3(this);

‎custom-ore-generator/src/main/java/de/derfrzocker/custom/ore/generator/impl/customdata/SkullTextureCustomData.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
import de.derfrzocker.custom.ore.generator.impl.v1_20_R2.customdata.SkullTextureApplier_v1_20_R2;
4848
import de.derfrzocker.custom.ore.generator.impl.v1_20_R3.customdata.SkullTextureApplier_v1_20_R3;
4949
import de.derfrzocker.custom.ore.generator.impl.v1_20_R4.customdata.SkullTextureApplier_v1_20_R4;
50+
import de.derfrzocker.custom.ore.generator.impl.v1_21_R1.customdata.SkullTextureApplier_v1_21_R1;
5051
import de.derfrzocker.custom.ore.generator.impl.v1_8_R1.customdata.SkullTextureApplier_v1_8_R1;
5152
import de.derfrzocker.custom.ore.generator.impl.v1_8_R2.customdata.SkullTextureApplier_v1_8_R2;
5253
import de.derfrzocker.custom.ore.generator.impl.v1_8_R3.customdata.SkullTextureApplier_v1_8_R3;
@@ -88,7 +89,9 @@ public boolean canApply(@NotNull final OreConfig oreConfig) {
8889
@Override
8990
protected SkullTextureApplier getCustomDataApplier0() {
9091
ServerVersion version = ServerVersion.getCurrentVersion(Bukkit.getServer());
91-
if (InternalVersion.v1_20_R4.getServerVersionRange().isInRange(version)) {
92+
if (InternalVersion.v1_21_R1.getServerVersionRange().isInRange(version)) {
93+
return new SkullTextureApplier_v1_21_R1(this);
94+
} else if (InternalVersion.v1_20_R4.getServerVersionRange().isInRange(version)) {
9295
return new SkullTextureApplier_v1_20_R4(this);
9396
} else if (InternalVersion.v1_20_R3.getServerVersionRange().isInRange(version)) {
9497
return new SkullTextureApplier_v1_20_R3(this);

‎custom-ore-generator/src/main/java/de/derfrzocker/custom/ore/generator/impl/customdata/TickBlockCustomData.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
import de.derfrzocker.custom.ore.generator.impl.v1_20_R2.customdata.TickBlockApplier_v1_20_R2;
4848
import de.derfrzocker.custom.ore.generator.impl.v1_20_R3.customdata.TickBlockApplier_v1_20_R3;
4949
import de.derfrzocker.custom.ore.generator.impl.v1_20_R4.customdata.TickBlockApplier_v1_20_R4;
50+
import de.derfrzocker.custom.ore.generator.impl.v1_21_R1.customdata.TickBlockApplier_v1_21_R1;
5051
import de.derfrzocker.spigot.utils.version.InternalVersion;
5152
import de.derfrzocker.spigot.utils.version.ServerVersion;
5253
import java.util.Set;
@@ -93,7 +94,9 @@ public Boolean getCustomData(@NotNull final BlockState blockState) {
9394
@Override
9495
protected CustomDataApplier getCustomDataApplier0() {
9596
ServerVersion version = ServerVersion.getCurrentVersion(Bukkit.getServer());
96-
if (InternalVersion.v1_20_R4.getServerVersionRange().isInRange(version)) {
97+
if (InternalVersion.v1_21_R1.getServerVersionRange().isInRange(version)) {
98+
return new TickBlockApplier_v1_21_R1(this);
99+
} else if (InternalVersion.v1_20_R4.getServerVersionRange().isInRange(version)) {
97100
return new TickBlockApplier_v1_20_R4(this);
98101
} else if (InternalVersion.v1_20_R3.getServerVersionRange().isInRange(version)) {
99102
return new TickBlockApplier_v1_20_R3(this);

‎impl/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
<module>v1_20_R2</module>
3939
<module>v1_20_R3</module>
4040
<module>v1_20_R4</module>
41+
<module>v1_21_R1</module>
4142
</modules>
4243

4344
<artifactId>custom-ore-generator-impl</artifactId>

‎impl/v1_21_R1/pom.xml

Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
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">
5+
<modelVersion>4.0.0</modelVersion>
6+
7+
<parent>
8+
<artifactId>custom-ore-generator-impl</artifactId>
9+
<groupId>de.derfrzocker</groupId>
10+
<version>${revision}</version>
11+
</parent>
12+
13+
<artifactId>custom-ore-generator-impl-v1_21_R1</artifactId>
14+
<repositories>
15+
<repository>
16+
<id>minecraft-libraries</id>
17+
<name>Minecraft Libraries</name>
18+
<url>https://libraries.minecraft.net</url>
19+
</repository>
20+
</repositories>
21+
<dependencies>
22+
<dependency>
23+
<groupId>dev.linwood</groupId>
24+
<artifactId>ItemMods</artifactId>
25+
<version>${ItemMods.version}</version>
26+
<scope>provided</scope>
27+
</dependency>
28+
<dependency>
29+
<groupId>de.derfrzocker</groupId>
30+
<artifactId>custom-ore-generator-api</artifactId>
31+
<version>${project.version}</version>
32+
<scope>provided</scope>
33+
</dependency>
34+
<dependency>
35+
<groupId>org.spigotmc</groupId>
36+
<artifactId>spigot-api</artifactId>
37+
<version>1.21-R0.1-SNAPSHOT</version>
38+
<scope>provided</scope>
39+
<optional>true</optional>
40+
</dependency>
41+
<dependency>
42+
<groupId>org.spigotmc</groupId>
43+
<artifactId>spigot</artifactId>
44+
<version>1.21-R0.1-SNAPSHOT</version>
45+
<classifier>remapped-mojang</classifier>
46+
<scope>provided</scope>
47+
<optional>true</optional>
48+
</dependency>
49+
<dependency>
50+
<groupId>de.derfrzocker</groupId>
51+
<artifactId>custom-ore-generator-impl-abstract</artifactId>
52+
<version>${project.version}</version>
53+
<scope>provided</scope>
54+
</dependency>
55+
</dependencies>
56+
57+
<build>
58+
<plugins>
59+
<plugin>
60+
<groupId>net.md-5</groupId>
61+
<artifactId>specialsource-maven-plugin</artifactId>
62+
<version>2.0.3</version>
63+
<executions>
64+
<execution>
65+
<phase>package</phase>
66+
<goals>
67+
<goal>remap</goal>
68+
</goals>
69+
<id>remap-obf</id>
70+
<configuration>
71+
<srgIn>org.spigotmc:minecraft-server:1.21-R0.1-SNAPSHOT:txt:maps-mojang</srgIn>
72+
<reverse>true</reverse>
73+
<remappedDependencies>org.spigotmc:spigot:1.21-R0.1-SNAPSHOT:jar:remapped-mojang
74+
</remappedDependencies>
75+
<remappedArtifactAttached>true</remappedArtifactAttached>
76+
<remappedClassifierName>remapped-obf</remappedClassifierName>
77+
</configuration>
78+
</execution>
79+
<execution>
80+
<phase>package</phase>
81+
<goals>
82+
<goal>remap</goal>
83+
</goals>
84+
<id>remap-spigot</id>
85+
<configuration>
86+
<inputFile>
87+
${project.build.directory}/${project.artifactId}-${project.version}-remapped-obf.jar
88+
</inputFile>
89+
<srgIn>org.spigotmc:minecraft-server:1.21-R0.1-SNAPSHOT:csrg:maps-spigot</srgIn>
90+
<remappedDependencies>org.spigotmc:spigot:1.21-R0.1-SNAPSHOT:jar:remapped-obf
91+
</remappedDependencies>
92+
</configuration>
93+
</execution>
94+
</executions>
95+
</plugin>
96+
</plugins>
97+
</build>
98+
99+
</project>

0 commit comments

Comments
 (0)