Skip to content

Commit 42ad83b

Browse files
DerFrZockerDerFrZocker
committed
feature(version): Add support for Minecraft version 1.21.3
Took 17 minutes
1 parent e9169cd commit 42ad83b

23 files changed

+2094
-11
lines changed

‎custom-ore-generator/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,12 @@
225225
<version>${project.version}</version>
226226
<scope>compile</scope>
227227
</dependency>
228+
<dependency>
229+
<groupId>de.derfrzocker</groupId>
230+
<artifactId>custom-ore-generator-impl-v1_21_R2</artifactId>
231+
<version>${project.version}</version>
232+
<scope>compile</scope>
233+
</dependency>
228234
<dependency>
229235
<groupId>de.derfrzocker</groupId>
230236
<artifactId>custom-ore-generator-plugin-oraxen-v1</artifactId>

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,8 @@
9595
import de.derfrzocker.custom.ore.generator.impl.v1_20_R4.oregenerator.MinableGenerator_v1_20_R4;
9696
import de.derfrzocker.custom.ore.generator.impl.v1_21_R1.WorldHandler_v1_21_R1;
9797
import de.derfrzocker.custom.ore.generator.impl.v1_21_R1.oregenerator.MinableGenerator_v1_21_R1;
98+
import de.derfrzocker.custom.ore.generator.impl.v1_21_R2.WorldHandler_v1_21_R2;
99+
import de.derfrzocker.custom.ore.generator.impl.v1_21_R2.oregenerator.MinableGenerator_v1_21_R2;
98100
import de.derfrzocker.custom.ore.generator.impl.v1_8_R1.CustomOreBlockPopulator_v1_8_R1;
99101
import de.derfrzocker.custom.ore.generator.impl.v1_8_R1.oregenerator.MinableGenerator_v1_8_R1;
100102
import de.derfrzocker.custom.ore.generator.impl.v1_8_R2.CustomOreBlockPopulator_v1_8_R2;
@@ -246,6 +248,7 @@ private void registerStandardOreGenerators(@NotNull final RegisterUtil registerU
246248
registerUtil.register(InternalVersion.v1_20_R3, InternalVersion.v1_20_R3, () -> new MinableGenerator_v1_20_R3(infoFunction, oreSettingInfoBiFunction), true);
247249
registerUtil.register(InternalVersion.v1_20_R4, InternalVersion.v1_20_R4, () -> new MinableGenerator_v1_20_R4(infoFunction, oreSettingInfoBiFunction), true);
248250
registerUtil.register(InternalVersion.v1_21_R1, InternalVersion.v1_21_R1, () -> new MinableGenerator_v1_21_R1(infoFunction, oreSettingInfoBiFunction), true);
251+
registerUtil.register(InternalVersion.v1_21_R2, InternalVersion.v1_21_R2, () -> new MinableGenerator_v1_21_R2(infoFunction, oreSettingInfoBiFunction), true);
249252
}
250253

251254
private void registerStandardBlockSelector(@NotNull final RegisterUtil registerUtil) {
@@ -280,7 +283,9 @@ private void registerStandardCustomDatas(@NotNull final RegisterUtil registerUti
280283
}
281284

282285
private WorldHandler initWorldHandler() {
283-
if (InternalVersion.v1_21_R1.getServerVersionRange().isInRange(version)) {
286+
if (InternalVersion.v1_21_R2.getServerVersionRange().isInRange(version)) {
287+
return new WorldHandler_v1_21_R2(this, CustomOreGeneratorServiceSupplier.INSTANCE);
288+
} else if (InternalVersion.v1_21_R1.getServerVersionRange().isInRange(version)) {
284289
return new WorldHandler_v1_21_R1(this, CustomOreGeneratorServiceSupplier.INSTANCE);
285290
} else if (InternalVersion.v1_20_R4.getServerVersionRange().isInRange(version)) {
286291
return new WorldHandler_v1_20_R4(this, CustomOreGeneratorServiceSupplier.INSTANCE);

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
import de.derfrzocker.custom.ore.generator.impl.v1_20_R3.customdata.AutoApplier_v1_20_R3;
4949
import de.derfrzocker.custom.ore.generator.impl.v1_20_R4.customdata.AutoApplier_v1_20_R4;
5050
import de.derfrzocker.custom.ore.generator.impl.v1_21_R1.customdata.AutoApplier_v1_21_R1;
51+
import de.derfrzocker.custom.ore.generator.impl.v1_21_R2.customdata.AutoApplier_v1_21_R2;
5152
import de.derfrzocker.custom.ore.generator.impl.v1_9_R1.customdata.AutoApplier_v1_9_R1;
5253
import de.derfrzocker.custom.ore.generator.impl.v_1_9_R2.customdata.AutoApplier_v1_9_R2;
5354
import de.derfrzocker.spigot.utils.version.InternalVersion;
@@ -98,7 +99,9 @@ public boolean hasCustomData(@NotNull final BlockState blockState) {
9899
@Override
99100
protected AutoApplier getCustomDataApplier0() {
100101
ServerVersion version = ServerVersion.getCurrentVersion(Bukkit.getServer());
101-
if (InternalVersion.v1_21_R1.getServerVersionRange().isInRange(version)) {
102+
if (InternalVersion.v1_21_R2.getServerVersionRange().isInRange(version)) {
103+
return new AutoApplier_v1_21_R2(this);
104+
} else if (InternalVersion.v1_21_R1.getServerVersionRange().isInRange(version)) {
102105
return new AutoApplier_v1_21_R1(this);
103106
} else if (InternalVersion.v1_20_R4.getServerVersionRange().isInRange(version)) {
104107
return new AutoApplier_v1_20_R4(this);

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
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;
5050
import de.derfrzocker.custom.ore.generator.impl.v1_21_R1.customdata.BlockStateApplier_v1_21_R1;
51+
import de.derfrzocker.custom.ore.generator.impl.v1_21_R2.customdata.BlockStateApplier_v1_21_R2;
5152
import de.derfrzocker.spigot.utils.version.InternalVersion;
5253
import de.derfrzocker.spigot.utils.version.ServerVersion;
5354
import java.io.File;
@@ -62,7 +63,9 @@ public class BlockStateCustomData extends AbstractBlockStateCustomData {
6263
@NotNull
6364
private final Supplier<CustomOreGeneratorService> serviceSupplier;
6465

65-
public BlockStateCustomData(@NotNull final Supplier<CustomOreGeneratorService> serviceSupplier, @NotNull Function<String, Info> infoFunction, @NotNull final File fileFolder) {
66+
public BlockStateCustomData(@NotNull final Supplier<CustomOreGeneratorService> serviceSupplier,
67+
@NotNull Function<String, Info> infoFunction,
68+
@NotNull final File fileFolder) {
6669
super(infoFunction, fileFolder);
6770
Validate.notNull(serviceSupplier, "Service supplier can not be null");
6871

@@ -73,7 +76,9 @@ public BlockStateCustomData(@NotNull final Supplier<CustomOreGeneratorService> s
7376
@Override
7477
protected AbstractBlockStateCustomData.BlockStateApplier getCustomDataApplier0() {
7578
ServerVersion version = ServerVersion.getCurrentVersion(Bukkit.getServer());
76-
if (InternalVersion.v1_21_R1.getServerVersionRange().isInRange(version)) {
79+
if (InternalVersion.v1_21_R2.getServerVersionRange().isInRange(version)) {
80+
return new BlockStateApplier_v1_21_R2(this.serviceSupplier, this);
81+
} else if (InternalVersion.v1_21_R1.getServerVersionRange().isInRange(version)) {
7782
return new BlockStateApplier_v1_21_R1(this.serviceSupplier, this);
7883
} else if (InternalVersion.v1_20_R4.getServerVersionRange().isInRange(version)) {
7984
return new BlockStateApplier_v1_20_R4(this.serviceSupplier, this);

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
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;
4848
import de.derfrzocker.custom.ore.generator.impl.v1_21_R1.customdata.ItemModsApplier_v1_21_R1;
49+
import de.derfrzocker.custom.ore.generator.impl.v1_21_R2.customdata.ItemModsApplier_v1_21_R2;
4950
import de.derfrzocker.spigot.utils.version.InternalVersion;
5051
import de.derfrzocker.spigot.utils.version.ServerVersion;
5152
import dev.linwood.itemmods.ItemMods;
@@ -77,8 +78,9 @@ public boolean canApply(@NotNull final OreConfig oreConfig) {
7778

7879
@Override
7980
public boolean isValidCustomData(@NotNull final Object customData, @NotNull final OreConfig oreConfig) {
80-
if (!(customData instanceof String))
81+
if (!(customData instanceof String)) {
8182
return false;
83+
}
8284

8385
if (oreConfig.getMaterial() != Material.SPAWNER) {
8486
return false;
@@ -103,7 +105,8 @@ public boolean hasCustomData(@NotNull final BlockState blockState) {
103105
@NotNull
104106
@Override
105107
public String getCustomData(@NotNull final BlockState blockState) {
106-
Validate.isTrue(hasCustomData(blockState), "The given BlockState '" + blockState.getType() + ", " + blockState.getLocation() + "' can not have the CustomData '" + getName() + "'");
108+
Validate.isTrue(hasCustomData(blockState),
109+
"The given BlockState '" + blockState.getType() + ", " + blockState.getLocation() + "' can not have the CustomData '" + getName() + "'");
107110

108111
return new CustomBlock(blockState.getLocation()).getPackObject().toString();
109112
}
@@ -112,7 +115,9 @@ public String getCustomData(@NotNull final BlockState blockState) {
112115
@Override
113116
protected CustomDataApplier getCustomDataApplier0() {
114117
ServerVersion version = ServerVersion.getCurrentVersion(Bukkit.getServer());
115-
if (InternalVersion.v1_21_R1.getServerVersionRange().isInRange(version)) {
118+
if (InternalVersion.v1_21_R2.getServerVersionRange().isInRange(version)) {
119+
return new ItemModsApplier_v1_21_R2(this);
120+
} else if (InternalVersion.v1_21_R1.getServerVersionRange().isInRange(version)) {
116121
return new ItemModsApplier_v1_21_R1(this);
117122
} else if (InternalVersion.v1_20_R4.getServerVersionRange().isInRange(version)) {
118123
return new ItemModsApplier_v1_20_R4(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
@@ -47,6 +47,7 @@
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;
4949
import de.derfrzocker.custom.ore.generator.impl.v1_21_R1.customdata.NBTTagApplier_v1_21_R1;
50+
import de.derfrzocker.custom.ore.generator.impl.v1_21_R2.customdata.NBTTagApplier_v1_21_R2;
5051
import de.derfrzocker.custom.ore.generator.impl.v1_8_R1.customdata.NBTTagApplier_v1_8_R1;
5152
import de.derfrzocker.custom.ore.generator.impl.v1_8_R2.customdata.NBTTagApplier_v1_8_R2;
5253
import de.derfrzocker.custom.ore.generator.impl.v1_8_R3.customdata.NBTTagApplier_v1_8_R3;
@@ -69,7 +70,9 @@ public NBTTagCustomData(@NotNull final Function<String, Info> infoFunction, @Not
6970
@Override
7071
protected NBTTagApplier getCustomDataApplier0() {
7172
ServerVersion version = ServerVersion.getCurrentVersion(Bukkit.getServer());
72-
if (InternalVersion.v1_21_R1.getServerVersionRange().isInRange(version)) {
73+
if (InternalVersion.v1_21_R2.getServerVersionRange().isInRange(version)) {
74+
return new NBTTagApplier_v1_21_R2(this);
75+
} else if (InternalVersion.v1_21_R1.getServerVersionRange().isInRange(version)) {
7376
return new NBTTagApplier_v1_21_R1(this);
7477
} else if (InternalVersion.v1_20_R4.getServerVersionRange().isInRange(version)) {
7578
return new NBTTagApplier_v1_20_R4(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
@@ -48,6 +48,7 @@
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;
5050
import de.derfrzocker.custom.ore.generator.impl.v1_21_R1.customdata.SkullTextureApplier_v1_21_R1;
51+
import de.derfrzocker.custom.ore.generator.impl.v1_21_R2.customdata.SkullTextureApplier_v1_21_R2;
5152
import de.derfrzocker.custom.ore.generator.impl.v1_8_R1.customdata.SkullTextureApplier_v1_8_R1;
5253
import de.derfrzocker.custom.ore.generator.impl.v1_8_R2.customdata.SkullTextureApplier_v1_8_R2;
5354
import de.derfrzocker.custom.ore.generator.impl.v1_8_R3.customdata.SkullTextureApplier_v1_8_R3;
@@ -89,7 +90,9 @@ public boolean canApply(@NotNull final OreConfig oreConfig) {
8990
@Override
9091
protected SkullTextureApplier getCustomDataApplier0() {
9192
ServerVersion version = ServerVersion.getCurrentVersion(Bukkit.getServer());
92-
if (InternalVersion.v1_21_R1.getServerVersionRange().isInRange(version)) {
93+
if (InternalVersion.v1_21_R2.getServerVersionRange().isInRange(version)) {
94+
return new SkullTextureApplier_v1_21_R2(this);
95+
} else if (InternalVersion.v1_21_R1.getServerVersionRange().isInRange(version)) {
9396
return new SkullTextureApplier_v1_21_R1(this);
9497
} else if (InternalVersion.v1_20_R4.getServerVersionRange().isInRange(version)) {
9598
return new SkullTextureApplier_v1_20_R4(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
@@ -48,6 +48,7 @@
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;
5050
import de.derfrzocker.custom.ore.generator.impl.v1_21_R1.customdata.TickBlockApplier_v1_21_R1;
51+
import de.derfrzocker.custom.ore.generator.impl.v1_21_R2.customdata.TickBlockApplier_v1_21_R2;
5152
import de.derfrzocker.spigot.utils.version.InternalVersion;
5253
import de.derfrzocker.spigot.utils.version.ServerVersion;
5354
import java.util.Set;
@@ -94,7 +95,9 @@ public Boolean getCustomData(@NotNull final BlockState blockState) {
9495
@Override
9596
protected CustomDataApplier getCustomDataApplier0() {
9697
ServerVersion version = ServerVersion.getCurrentVersion(Bukkit.getServer());
97-
if (InternalVersion.v1_21_R1.getServerVersionRange().isInRange(version)) {
98+
if (InternalVersion.v1_21_R2.getServerVersionRange().isInRange(version)) {
99+
return new TickBlockApplier_v1_21_R2(this);
100+
} else if (InternalVersion.v1_21_R1.getServerVersionRange().isInRange(version)) {
98101
return new TickBlockApplier_v1_21_R1(this);
99102
} else if (InternalVersion.v1_20_R4.getServerVersionRange().isInRange(version)) {
100103
return new TickBlockApplier_v1_20_R4(this);

‎impl/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
<module>v1_20_R3</module>
4040
<module>v1_20_R4</module>
4141
<module>v1_21_R1</module>
42+
<module>v1_21_R2</module>
4243
</modules>
4344

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

‎impl/v1_21_R2/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_R2</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.3-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.3-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.3-R0.1-SNAPSHOT:txt:maps-mojang</srgIn>
72+
<reverse>true</reverse>
73+
<remappedDependencies>org.spigotmc:spigot:1.21.3-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.3-R0.1-SNAPSHOT:csrg:maps-spigot</srgIn>
90+
<remappedDependencies>org.spigotmc:spigot:1.21.3-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)