Skip to content

Commit e19d819

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

File tree

22 files changed

+2038
-12
lines changed

22 files changed

+2038
-12
lines changed

‎custom-ore-generator/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,12 @@
231231
<version>${project.version}</version>
232232
<scope>compile</scope>
233233
</dependency>
234+
<dependency>
235+
<groupId>de.derfrzocker</groupId>
236+
<artifactId>custom-ore-generator-impl-v1_21_R3</artifactId>
237+
<version>${project.version}</version>
238+
<scope>compile</scope>
239+
</dependency>
234240
<dependency>
235241
<groupId>de.derfrzocker</groupId>
236242
<artifactId>custom-ore-generator-plugin-oraxen-v1</artifactId>

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,8 @@
9797
import de.derfrzocker.custom.ore.generator.impl.v1_21_R1.oregenerator.MinableGenerator_v1_21_R1;
9898
import de.derfrzocker.custom.ore.generator.impl.v1_21_R2.WorldHandler_v1_21_R2;
9999
import de.derfrzocker.custom.ore.generator.impl.v1_21_R2.oregenerator.MinableGenerator_v1_21_R2;
100+
import de.derfrzocker.custom.ore.generator.impl.v1_21_R3.WorldHandler_v1_21_R3;
101+
import de.derfrzocker.custom.ore.generator.impl.v1_21_R3.oregenerator.MinableGenerator_v1_21_R3;
100102
import de.derfrzocker.custom.ore.generator.impl.v1_8_R1.CustomOreBlockPopulator_v1_8_R1;
101103
import de.derfrzocker.custom.ore.generator.impl.v1_8_R1.oregenerator.MinableGenerator_v1_8_R1;
102104
import de.derfrzocker.custom.ore.generator.impl.v1_8_R2.CustomOreBlockPopulator_v1_8_R2;
@@ -249,6 +251,7 @@ private void registerStandardOreGenerators(@NotNull final RegisterUtil registerU
249251
registerUtil.register(InternalVersion.v1_20_R4, InternalVersion.v1_20_R4, () -> new MinableGenerator_v1_20_R4(infoFunction, oreSettingInfoBiFunction), true);
250252
registerUtil.register(InternalVersion.v1_21_R1, InternalVersion.v1_21_R1, () -> new MinableGenerator_v1_21_R1(infoFunction, oreSettingInfoBiFunction), true);
251253
registerUtil.register(InternalVersion.v1_21_R2, InternalVersion.v1_21_R2, () -> new MinableGenerator_v1_21_R2(infoFunction, oreSettingInfoBiFunction), true);
254+
registerUtil.register(InternalVersion.v1_21_R3, InternalVersion.v1_21_R3, () -> new MinableGenerator_v1_21_R3(infoFunction, oreSettingInfoBiFunction), true);
252255
}
253256

254257
private void registerStandardBlockSelector(@NotNull final RegisterUtil registerUtil) {
@@ -277,13 +280,16 @@ private void registerStandardCustomDatas(@NotNull final RegisterUtil registerUti
277280
registerUtil.register(InternalVersion.v1_13_R1, () -> new DirectionCustomData(BlockFace.SOUTH, infoFunction));
278281
registerUtil.register(InternalVersion.v1_13_R1, () -> new DirectionCustomData(BlockFace.EAST, infoFunction));
279282
registerUtil.register(InternalVersion.v1_13_R1, () -> new DirectionCustomData(BlockFace.WEST, infoFunction));
280-
registerUtil.register(InternalVersion.v1_14_R1, "ItemMods", () -> new ItemModsCustomData(infoFunction));
283+
registerUtil.register(InternalVersion.v1_14_R1, InternalVersion.v1_21_R2, "ItemMods",
284+
() -> new ItemModsCustomData(infoFunction));
281285
registerUtil.register(InternalVersion.v1_17_R1, "Oraxen", plugin -> plugin.getDescription().getVersion().startsWith("1."), () -> new OraxenCustomData_v1(infoFunction));
282286
registerUtil.register(InternalVersion.v1_18_R1, "Oraxen", plugin -> plugin.getDescription().getVersion().startsWith("2."), () -> new OraxenCustomData_v2(infoFunction));
283287
}
284288

285289
private WorldHandler initWorldHandler() {
286-
if (InternalVersion.v1_21_R2.getServerVersionRange().isInRange(version)) {
290+
if (InternalVersion.v1_21_R3.getServerVersionRange().isInRange(version)) {
291+
return new WorldHandler_v1_21_R3(this, CustomOreGeneratorServiceSupplier.INSTANCE);
292+
} else if (InternalVersion.v1_21_R2.getServerVersionRange().isInRange(version)) {
287293
return new WorldHandler_v1_21_R2(this, CustomOreGeneratorServiceSupplier.INSTANCE);
288294
} else if (InternalVersion.v1_21_R1.getServerVersionRange().isInRange(version)) {
289295
return new WorldHandler_v1_21_R1(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
@@ -49,6 +49,7 @@
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;
5151
import de.derfrzocker.custom.ore.generator.impl.v1_21_R2.customdata.AutoApplier_v1_21_R2;
52+
import de.derfrzocker.custom.ore.generator.impl.v1_21_R3.customdata.AutoApplier_v1_21_R3;
5253
import de.derfrzocker.custom.ore.generator.impl.v1_9_R1.customdata.AutoApplier_v1_9_R1;
5354
import de.derfrzocker.custom.ore.generator.impl.v_1_9_R2.customdata.AutoApplier_v1_9_R2;
5455
import de.derfrzocker.spigot.utils.version.InternalVersion;
@@ -99,7 +100,9 @@ public boolean hasCustomData(@NotNull final BlockState blockState) {
99100
@Override
100101
protected AutoApplier getCustomDataApplier0() {
101102
ServerVersion version = ServerVersion.getCurrentVersion(Bukkit.getServer());
102-
if (InternalVersion.v1_21_R2.getServerVersionRange().isInRange(version)) {
103+
if (InternalVersion.v1_21_R3.getServerVersionRange().isInRange(version)) {
104+
return new AutoApplier_v1_21_R3(this);
105+
} else if (InternalVersion.v1_21_R2.getServerVersionRange().isInRange(version)) {
103106
return new AutoApplier_v1_21_R2(this);
104107
} else if (InternalVersion.v1_21_R1.getServerVersionRange().isInRange(version)) {
105108
return new AutoApplier_v1_21_R1(this);

‎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
@@ -49,6 +49,7 @@
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;
5151
import de.derfrzocker.custom.ore.generator.impl.v1_21_R2.customdata.BlockStateApplier_v1_21_R2;
52+
import de.derfrzocker.custom.ore.generator.impl.v1_21_R3.customdata.BlockStateApplier_v1_21_R3;
5253
import de.derfrzocker.spigot.utils.version.InternalVersion;
5354
import de.derfrzocker.spigot.utils.version.ServerVersion;
5455
import java.io.File;
@@ -76,7 +77,9 @@ public BlockStateCustomData(@NotNull final Supplier<CustomOreGeneratorService> s
7677
@Override
7778
protected AbstractBlockStateCustomData.BlockStateApplier getCustomDataApplier0() {
7879
ServerVersion version = ServerVersion.getCurrentVersion(Bukkit.getServer());
79-
if (InternalVersion.v1_21_R2.getServerVersionRange().isInRange(version)) {
80+
if (InternalVersion.v1_21_R3.getServerVersionRange().isInRange(version)) {
81+
return new BlockStateApplier_v1_21_R3(this.serviceSupplier, this);
82+
} else if (InternalVersion.v1_21_R2.getServerVersionRange().isInRange(version)) {
8083
return new BlockStateApplier_v1_21_R2(this.serviceSupplier, this);
8184
} else if (InternalVersion.v1_21_R1.getServerVersionRange().isInRange(version)) {
8285
return new BlockStateApplier_v1_21_R1(this.serviceSupplier, 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
@@ -48,6 +48,7 @@
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;
5050
import de.derfrzocker.custom.ore.generator.impl.v1_21_R2.customdata.NBTTagApplier_v1_21_R2;
51+
import de.derfrzocker.custom.ore.generator.impl.v1_21_R3.customdata.NBTTagApplier_v1_21_R3;
5152
import de.derfrzocker.custom.ore.generator.impl.v1_8_R1.customdata.NBTTagApplier_v1_8_R1;
5253
import de.derfrzocker.custom.ore.generator.impl.v1_8_R2.customdata.NBTTagApplier_v1_8_R2;
5354
import de.derfrzocker.custom.ore.generator.impl.v1_8_R3.customdata.NBTTagApplier_v1_8_R3;
@@ -70,7 +71,9 @@ public NBTTagCustomData(@NotNull final Function<String, Info> infoFunction, @Not
7071
@Override
7172
protected NBTTagApplier getCustomDataApplier0() {
7273
ServerVersion version = ServerVersion.getCurrentVersion(Bukkit.getServer());
73-
if (InternalVersion.v1_21_R2.getServerVersionRange().isInRange(version)) {
74+
if (InternalVersion.v1_21_R3.getServerVersionRange().isInRange(version)) {
75+
return new NBTTagApplier_v1_21_R3(this);
76+
} else if (InternalVersion.v1_21_R2.getServerVersionRange().isInRange(version)) {
7477
return new NBTTagApplier_v1_21_R2(this);
7578
} else if (InternalVersion.v1_21_R1.getServerVersionRange().isInRange(version)) {
7679
return new NBTTagApplier_v1_21_R1(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
@@ -49,6 +49,7 @@
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;
5151
import de.derfrzocker.custom.ore.generator.impl.v1_21_R2.customdata.SkullTextureApplier_v1_21_R2;
52+
import de.derfrzocker.custom.ore.generator.impl.v1_21_R3.customdata.SkullTextureApplier_v1_21_R3;
5253
import de.derfrzocker.custom.ore.generator.impl.v1_8_R1.customdata.SkullTextureApplier_v1_8_R1;
5354
import de.derfrzocker.custom.ore.generator.impl.v1_8_R2.customdata.SkullTextureApplier_v1_8_R2;
5455
import de.derfrzocker.custom.ore.generator.impl.v1_8_R3.customdata.SkullTextureApplier_v1_8_R3;
@@ -90,7 +91,9 @@ public boolean canApply(@NotNull final OreConfig oreConfig) {
9091
@Override
9192
protected SkullTextureApplier getCustomDataApplier0() {
9293
ServerVersion version = ServerVersion.getCurrentVersion(Bukkit.getServer());
93-
if (InternalVersion.v1_21_R2.getServerVersionRange().isInRange(version)) {
94+
if (InternalVersion.v1_21_R3.getServerVersionRange().isInRange(version)) {
95+
return new SkullTextureApplier_v1_21_R3(this);
96+
} else if (InternalVersion.v1_21_R2.getServerVersionRange().isInRange(version)) {
9497
return new SkullTextureApplier_v1_21_R2(this);
9598
} else if (InternalVersion.v1_21_R1.getServerVersionRange().isInRange(version)) {
9699
return new SkullTextureApplier_v1_21_R1(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
@@ -49,6 +49,7 @@
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;
5151
import de.derfrzocker.custom.ore.generator.impl.v1_21_R2.customdata.TickBlockApplier_v1_21_R2;
52+
import de.derfrzocker.custom.ore.generator.impl.v1_21_R3.customdata.TickBlockApplier_v1_21_R3;
5253
import de.derfrzocker.spigot.utils.version.InternalVersion;
5354
import de.derfrzocker.spigot.utils.version.ServerVersion;
5455
import java.util.Set;
@@ -95,7 +96,9 @@ public Boolean getCustomData(@NotNull final BlockState blockState) {
9596
@Override
9697
protected CustomDataApplier getCustomDataApplier0() {
9798
ServerVersion version = ServerVersion.getCurrentVersion(Bukkit.getServer());
98-
if (InternalVersion.v1_21_R2.getServerVersionRange().isInRange(version)) {
99+
if (InternalVersion.v1_21_R3.getServerVersionRange().isInRange(version)) {
100+
return new TickBlockApplier_v1_21_R3(this);
101+
} else if (InternalVersion.v1_21_R2.getServerVersionRange().isInRange(version)) {
99102
return new TickBlockApplier_v1_21_R2(this);
100103
} else if (InternalVersion.v1_21_R1.getServerVersionRange().isInRange(version)) {
101104
return new TickBlockApplier_v1_21_R1(this);

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

Lines changed: 30 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,9 @@ public class RegisterUtil {
4545
@NotNull
4646
private final ServerVersion currentVersion;
4747

48-
public RegisterUtil(@NotNull Plugin plugin, @NotNull final CustomOreGeneratorService service, @NotNull final ServerVersion currentVersion) {
48+
public RegisterUtil(@NotNull Plugin plugin,
49+
@NotNull final CustomOreGeneratorService service,
50+
@NotNull final ServerVersion currentVersion) {
4951
Validate.notNull(plugin, "Plugin can not be null");
5052
Validate.notNull(service, "CustomOreGeneratorService can not be null");
5153
Validate.notNull(currentVersion, "Version can not be null");
@@ -70,7 +72,10 @@ public void register(@NotNull final OreGenerator oreGenerator, boolean defaultOr
7072

7173
}
7274

73-
public void register(@NotNull final InternalVersion minimalVersion, @NotNull final InternalVersion maximumVersion, @NotNull final OreGeneratorSupplier oreGenerator, final boolean defaultOreGenerator) {
75+
public void register(@NotNull final InternalVersion minimalVersion,
76+
@NotNull final InternalVersion maximumVersion,
77+
@NotNull final OreGeneratorSupplier oreGenerator,
78+
final boolean defaultOreGenerator) {
7479
if (currentVersion.isNewerThanOrSameAs(minimalVersion.getServerVersionRange().minInclusive())) {
7580
if (currentVersion.isOlderThanOrSameAs(maximumVersion.getServerVersionRange().maxInclusive())) {
7681
register(oreGenerator.get(), defaultOreGenerator);
@@ -105,15 +110,33 @@ public void register(@NotNull final InternalVersion minimalVersion, @NotNull fin
105110
}
106111
}
107112

108-
public void register(@NotNull final InternalVersion minimalVersion, @NotNull final String pluginName, @NotNull final CustomDataSupplier customData) {
113+
public void register(@NotNull final InternalVersion minimalVersion,
114+
@NotNull final String pluginName,
115+
@NotNull final CustomDataSupplier customData) {
109116
if (currentVersion.isNewerThanOrSameAs(minimalVersion.getServerVersionRange().minInclusive())) {
110117
if (this.plugin.getServer().getPluginManager().getPlugin(pluginName) != null) {
111118
register(customData.get());
112119
}
113120
}
114121
}
115122

116-
public void register(@NotNull final InternalVersion minimalVersion, @NotNull final String pluginName, Predicate<Plugin> shouldRegister, @NotNull final CustomDataSupplier customData) {
123+
public void register(@NotNull final InternalVersion minimalVersion,
124+
@NotNull final InternalVersion maximumVersion,
125+
@NotNull final String pluginName,
126+
@NotNull final CustomDataSupplier customData) {
127+
if (currentVersion.isNewerThanOrSameAs(minimalVersion.getServerVersionRange().minInclusive())) {
128+
if (currentVersion.isOlderThanOrSameAs(maximumVersion.getServerVersionRange().maxInclusive())) {
129+
if (this.plugin.getServer().getPluginManager().getPlugin(pluginName) != null) {
130+
register(customData.get());
131+
}
132+
}
133+
}
134+
}
135+
136+
public void register(@NotNull final InternalVersion minimalVersion,
137+
@NotNull final String pluginName,
138+
Predicate<Plugin> shouldRegister,
139+
@NotNull final CustomDataSupplier customData) {
117140
if (currentVersion.isNewerThanOrSameAs(minimalVersion.getServerVersionRange().minInclusive())) {
118141
Plugin otherPlugin = this.plugin.getServer().getPluginManager().getPlugin(pluginName);
119142
if (otherPlugin == null || !shouldRegister.test(otherPlugin)) {
@@ -124,7 +147,9 @@ public void register(@NotNull final InternalVersion minimalVersion, @NotNull fin
124147
}
125148
}
126149

127-
public void register(@NotNull final InternalVersion minimalVersion, @NotNull final InternalVersion maximumVersion, @NotNull final CustomDataSupplier customData) {
150+
public void register(@NotNull final InternalVersion minimalVersion,
151+
@NotNull final InternalVersion maximumVersion,
152+
@NotNull final CustomDataSupplier customData) {
128153
if (currentVersion.isNewerThanOrSameAs(minimalVersion.getServerVersionRange().minInclusive())) {
129154
if (currentVersion.isOlderThanOrSameAs(maximumVersion.getServerVersionRange().maxInclusive())) {
130155
register(customData.get());

‎impl/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
<module>v1_20_R4</module>
4141
<module>v1_21_R1</module>
4242
<module>v1_21_R2</module>
43+
<module>v1_21_R3</module>
4344
</modules>
4445

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

‎impl/v1_21_R2/src/main/java/de/derfrzocker/custom/ore/generator/impl/v1_21_R2/CustomChunkAccess.java

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,36 @@ public int getHighestSectionPosition() {
221221
return delegate.getHighestSectionPosition();
222222
}
223223

224+
@Override
225+
public void addPackedPostProcess(ShortList shortlist, int i) {
226+
delegate.addPackedPostProcess(shortlist, i);
227+
}
228+
229+
@Override
230+
public boolean isSectionEmpty(int i) {
231+
return delegate.isSectionEmpty(i);
232+
}
233+
234+
@Override
235+
public boolean canBeSerialized() {
236+
return delegate.canBeSerialized();
237+
}
238+
239+
@Override
240+
public void markUnsaved() {
241+
delegate.markUnsaved();
242+
}
243+
244+
@Override
245+
public boolean tryMarkSaved() {
246+
return delegate.tryMarkSaved();
247+
}
248+
249+
@Override
250+
public int getMinY() {
251+
return delegate.getMinY();
252+
}
253+
224254
@Override
225255
public ChunkSkyLightSources getSkyLightSources() {
226256
return delegate.getSkyLightSources();

0 commit comments

Comments
 (0)