Skip to content

Commit 91c6933

Browse files
committed
Updated to Minecraft version 1.19.3
Took 32 minutes
1 parent b3b314f commit 91c6933

31 files changed

+2306
-2
lines changed

custom-ore-generator/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,12 @@
182182
<version>${project.version}</version>
183183
<scope>compile</scope>
184184
</dependency>
185+
<dependency>
186+
<groupId>de.derfrzocker</groupId>
187+
<artifactId>custom-ore-generator-impl-v1_19_R2</artifactId>
188+
<version>${project.version}</version>
189+
<scope>compile</scope>
190+
</dependency>
185191
</dependencies>
186192

187193
<build>

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,8 @@
8383
import de.derfrzocker.custom.ore.generator.impl.v1_18_R2.oregenerator.MinableGenerator_v1_18_R2;
8484
import de.derfrzocker.custom.ore.generator.impl.v1_19_R1.WorldHandler_v1_19_R1;
8585
import de.derfrzocker.custom.ore.generator.impl.v1_19_R1.oregenerator.MinableGenerator_v1_19_R1;
86+
import de.derfrzocker.custom.ore.generator.impl.v1_19_R2.WorldHandler_v1_19_R2;
87+
import de.derfrzocker.custom.ore.generator.impl.v1_19_R2.oregenerator.MinableGenerator_v1_19_R2;
8688
import de.derfrzocker.custom.ore.generator.impl.v1_8_R1.CustomOreBlockPopulator_v1_8_R1;
8789
import de.derfrzocker.custom.ore.generator.impl.v1_8_R1.oregenerator.MinableGenerator_v1_8_R1;
8890
import de.derfrzocker.custom.ore.generator.impl.v1_8_R2.CustomOreBlockPopulator_v1_8_R2;
@@ -134,7 +136,7 @@ public void onLoad() {
134136
getLogger().warning("The Server version which you are running is unsupported, you are running version '" + version + "'");
135137
getLogger().warning("The plugin supports following versions " + combineVersions(Version.v1_8_R1, Version.v1_8_R2, Version.v1_8_R3,
136138
Version.v1_9_R1, Version.v1_9_R2, Version.v1_10_R1, Version.v1_11_R1, Version.v1_12_R1, Version.v1_13_R1, Version.v1_13_R2,
137-
Version.v1_14_R1, Version.v1_15_R1, Version.v1_16_R1, Version.v1_16_R2, Version.v1_16_R3, Version.v1_17_R1, Version.v1_18_R1, Version.v1_18_R2, Version.v1_19_R1));
139+
Version.v1_14_R1, Version.v1_15_R1, Version.v1_16_R1, Version.v1_16_R2, Version.v1_16_R3, Version.v1_17_R1, Version.v1_18_R1, Version.v1_18_R2, Version.v1_19_R1, Version.v1_19_R2));
138140
getLogger().warning("(Spigot / Paper version 1.8 - 1.18.2), if you are running such a Minecraft version, than your bukkit implementation is unsupported, in this case please contact the developer, so he can resolve this Issue");
139141

140142
if (version == Version.UNKNOWN) {
@@ -234,6 +236,7 @@ private void registerStandardOreGenerators(@NotNull final RegisterUtil registerU
234236
registerUtil.register(Version.v1_18_R1, Version.v1_18_R1, () -> new MinableGenerator_v1_18_R1(infoFunction, oreSettingInfoBiFunction), true);
235237
registerUtil.register(Version.v1_18_R2, Version.v1_18_R2, () -> new MinableGenerator_v1_18_R2(infoFunction, oreSettingInfoBiFunction), true);
236238
registerUtil.register(Version.v1_19_R1, Version.v1_19_R1, () -> new MinableGenerator_v1_19_R1(infoFunction, oreSettingInfoBiFunction), true);
239+
registerUtil.register(Version.v1_19_R2, Version.v1_19_R2, () -> new MinableGenerator_v1_19_R2(infoFunction, oreSettingInfoBiFunction), true);
237240
}
238241

239242
private void registerStandardBlockSelector(@NotNull final RegisterUtil registerUtil) {
@@ -268,6 +271,9 @@ private void registerStandardCustomDatas(@NotNull final RegisterUtil registerUti
268271

269272
private void initWorldHandler() {
270273
switch (version) {
274+
case v1_19_R2:
275+
new WorldHandler_v1_19_R2(this, CustomOreGeneratorServiceSupplier.INSTANCE);
276+
break;
271277
case v1_19_R1:
272278
new WorldHandler_v1_19_R1(this, CustomOreGeneratorServiceSupplier.INSTANCE);
273279
break;

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
import de.derfrzocker.custom.ore.generator.impl.v1_18_R1.customdata.AutoApplier_v1_18_R1;
4242
import de.derfrzocker.custom.ore.generator.impl.v1_18_R2.customdata.AutoApplier_v1_18_R2;
4343
import de.derfrzocker.custom.ore.generator.impl.v1_19_R1.customdata.AutoApplier_v1_19_R1;
44+
import de.derfrzocker.custom.ore.generator.impl.v1_19_R2.customdata.AutoApplier_v1_19_R2;
4445
import de.derfrzocker.custom.ore.generator.impl.v1_9_R1.customdata.AutoApplier_v1_9_R1;
4546
import de.derfrzocker.custom.ore.generator.impl.v_1_9_R2.customdata.AutoApplier_v1_9_R2;
4647
import de.derfrzocker.spigot.utils.Version;
@@ -60,6 +61,7 @@ public class AutoCustomData extends AbstractAutoCustomData {
6061

6162
static {
6263
switch (Version.getServerVersion(Bukkit.getServer())) {
64+
case v1_19_R2:
6365
case v1_19_R1:
6466
case v1_18_R2:
6567
case v1_18_R1:
@@ -107,6 +109,8 @@ public boolean hasCustomData(@NotNull final BlockState blockState) {
107109
@Override
108110
protected AutoApplier getCustomDataApplier0() {
109111
switch (Version.getServerVersion(Bukkit.getServer())) {
112+
case v1_19_R2:
113+
return new AutoApplier_v1_19_R2(this);
110114
case v1_19_R1:
111115
return new AutoApplier_v1_19_R1(this);
112116
case v1_18_R2:

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
import de.derfrzocker.custom.ore.generator.impl.v1_18_R1.customdata.BlockStateApplier_v1_18_R1;
4242
import de.derfrzocker.custom.ore.generator.impl.v1_18_R2.customdata.BlockStateApplier_v1_18_R2;
4343
import de.derfrzocker.custom.ore.generator.impl.v1_19_R1.customdata.BlockStateApplier_v1_19_R1;
44+
import de.derfrzocker.custom.ore.generator.impl.v1_19_R2.customdata.BlockStateApplier_v1_19_R2;
4445
import de.derfrzocker.spigot.utils.Version;
4546
import org.apache.commons.lang.Validate;
4647
import org.bukkit.Bukkit;
@@ -66,6 +67,8 @@ public BlockStateCustomData(@NotNull final Supplier<CustomOreGeneratorService> s
6667
@Override
6768
protected AbstractBlockStateCustomData.BlockStateApplier getCustomDataApplier0() {
6869
switch (Version.getServerVersion(Bukkit.getServer())) {
70+
case v1_19_R2:
71+
return new BlockStateApplier_v1_19_R2(this.serviceSupplier, this);
6972
case v1_19_R1:
7073
return new BlockStateApplier_v1_19_R1(this.serviceSupplier, this);
7174
case v1_18_R2:

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
import de.derfrzocker.custom.ore.generator.impl.v1_18_R1.customdata.CommandApplier_v1_18_R1;
4444
import de.derfrzocker.custom.ore.generator.impl.v1_18_R2.customdata.CommandApplier_v1_18_R2;
4545
import de.derfrzocker.custom.ore.generator.impl.v1_19_R1.customdata.CommandApplier_v1_19_R1;
46+
import de.derfrzocker.custom.ore.generator.impl.v1_19_R2.customdata.CommandApplier_v1_19_R2;
4647
import de.derfrzocker.custom.ore.generator.impl.v1_8_R1.customdata.CommandApplier_v1_8_R1;
4748
import de.derfrzocker.custom.ore.generator.impl.v1_8_R2.customdata.CommandApplier_v1_8_R2;
4849
import de.derfrzocker.custom.ore.generator.impl.v1_8_R3.customdata.CommandApplier_v1_8_R3;
@@ -66,6 +67,7 @@ public class CommandCustomData extends AbstractCustomData<CustomDataApplier> {
6667

6768
static {
6869
switch (Version.getServerVersion(Bukkit.getServer())) {
70+
case v1_19_R2:
6971
case v1_19_R1:
7072
case v1_18_R2:
7173
case v1_18_R1:
@@ -137,6 +139,8 @@ public String getCustomData(@NotNull final BlockState blockState) {
137139
@Override
138140
protected CustomDataApplier getCustomDataApplier0() {
139141
switch (Version.getServerVersion(Bukkit.getServer())) {
142+
case v1_19_R2:
143+
return new CommandApplier_v1_19_R2(this);
140144
case v1_19_R1:
141145
return new CommandApplier_v1_19_R1(this);
142146
case v1_18_R2:

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
import de.derfrzocker.custom.ore.generator.impl.v1_18_R1.customdata.DirectionApplier_v1_18_R1;
4242
import de.derfrzocker.custom.ore.generator.impl.v1_18_R2.customdata.DirectionApplier_v1_18_R2;
4343
import de.derfrzocker.custom.ore.generator.impl.v1_19_R1.customdata.DirectionApplier_v1_19_R1;
44+
import de.derfrzocker.custom.ore.generator.impl.v1_19_R2.customdata.DirectionApplier_v1_19_R2;
4445
import de.derfrzocker.spigot.utils.Version;
4546
import org.apache.commons.lang.Validate;
4647
import org.bukkit.Bukkit;
@@ -123,6 +124,8 @@ public Boolean getCustomData(@NotNull final BlockState blockState) {
123124
@Override
124125
protected CustomDataApplier getCustomDataApplier0() {
125126
switch (Version.getServerVersion(Bukkit.getServer())) {
127+
case v1_19_R2:
128+
return new DirectionApplier_v1_19_R2(this, blockFace);
126129
case v1_19_R1:
127130
return new DirectionApplier_v1_19_R1(this, blockFace);
128131
case v1_18_R2:

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
import de.derfrzocker.custom.ore.generator.impl.v1_18_R1.customdata.FacingApplier_v1_18_R1;
4242
import de.derfrzocker.custom.ore.generator.impl.v1_18_R2.customdata.FacingApplier_v1_18_R2;
4343
import de.derfrzocker.custom.ore.generator.impl.v1_19_R1.customdata.FacingApplier_v1_19_R1;
44+
import de.derfrzocker.custom.ore.generator.impl.v1_19_R2.customdata.FacingApplier_v1_19_R2;
4445
import de.derfrzocker.spigot.utils.Version;
4546
import org.apache.commons.lang.Validate;
4647
import org.bukkit.Bukkit;
@@ -108,6 +109,8 @@ public BlockFace getCustomData(@NotNull final BlockState blockState) {
108109
@Override
109110
protected CustomDataApplier getCustomDataApplier0() {
110111
switch (Version.getServerVersion(Bukkit.getServer())) {
112+
case v1_19_R2:
113+
return new FacingApplier_v1_19_R2(this);
111114
case v1_19_R1:
112115
return new FacingApplier_v1_19_R1(this);
113116
case v1_18_R2:

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
import de.derfrzocker.custom.ore.generator.impl.v1_18_R1.customdata.ItemModsApplier_v1_18_R1;
4040
import de.derfrzocker.custom.ore.generator.impl.v1_18_R2.customdata.ItemModsApplier_v1_18_R2;
4141
import de.derfrzocker.custom.ore.generator.impl.v1_19_R1.customdata.ItemModsApplier_v1_19_R1;
42+
import de.derfrzocker.custom.ore.generator.impl.v1_19_R2.customdata.ItemModsApplier_v1_19_R2;
4243
import de.derfrzocker.spigot.utils.Version;
4344
import dev.linwood.itemmods.ItemMods;
4445
import dev.linwood.itemmods.api.block.CustomBlock;
@@ -105,6 +106,8 @@ public String getCustomData(@NotNull final BlockState blockState) {
105106
@Override
106107
protected CustomDataApplier getCustomDataApplier0() {
107108
switch (Version.getServerVersion(Bukkit.getServer())) {
109+
case v1_19_R2:
110+
return new ItemModsApplier_v1_19_R2(this);
108111
case v1_19_R1:
109112
return new ItemModsApplier_v1_19_R1(this);
110113
case v1_18_R2:

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
import de.derfrzocker.custom.ore.generator.impl.v1_18_R1.customdata.NBTTagApplier_v1_18_R1;
4141
import de.derfrzocker.custom.ore.generator.impl.v1_18_R2.customdata.NBTTagApplier_v1_18_R2;
4242
import de.derfrzocker.custom.ore.generator.impl.v1_19_R1.customdata.NBTTagApplier_v1_19_R1;
43+
import de.derfrzocker.custom.ore.generator.impl.v1_19_R2.customdata.NBTTagApplier_v1_19_R2;
4344
import de.derfrzocker.custom.ore.generator.impl.v1_8_R1.customdata.NBTTagApplier_v1_8_R1;
4445
import de.derfrzocker.custom.ore.generator.impl.v1_8_R2.customdata.NBTTagApplier_v1_8_R2;
4546
import de.derfrzocker.custom.ore.generator.impl.v1_8_R3.customdata.NBTTagApplier_v1_8_R3;
@@ -62,6 +63,8 @@ public NBTTagCustomData(@NotNull final Function<String, Info> infoFunction, @Not
6263
@Override
6364
protected NBTTagApplier getCustomDataApplier0() {
6465
switch (Version.getServerVersion(Bukkit.getServer())) {
66+
case v1_19_R2:
67+
return new NBTTagApplier_v1_19_R2(this);
6568
case v1_19_R1:
6669
return new NBTTagApplier_v1_19_R1(this);
6770
case v1_18_R2:

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
import de.derfrzocker.custom.ore.generator.impl.v1_18_R1.customdata.OraxenApplier_v1_18_R1;
3939
import de.derfrzocker.custom.ore.generator.impl.v1_18_R2.customdata.OraxenApplier_v1_18_R2;
4040
import de.derfrzocker.custom.ore.generator.impl.v1_19_R1.customdata.OraxenApplier_v1_19_R1;
41+
import de.derfrzocker.custom.ore.generator.impl.v1_19_R2.customdata.OraxenApplier_v1_19_R2;
4142
import de.derfrzocker.spigot.utils.Version;
4243
import io.th0rgal.oraxen.compatibilities.provided.itembridge.OraxenItemBridge;
4344
import io.th0rgal.oraxen.items.OraxenItems;
@@ -135,6 +136,8 @@ public Object getCustomData(@NotNull BlockState blockState) {
135136
@Override
136137
protected CustomDataApplier getCustomDataApplier0() {
137138
switch (Version.getServerVersion(Bukkit.getServer())) {
139+
case v1_19_R2:
140+
return new OraxenApplier_v1_19_R2(this);
138141
case v1_19_R1:
139142
return new OraxenApplier_v1_19_R1(this);
140143
case v1_18_R2:

0 commit comments

Comments
 (0)