Skip to content

Commit b3b314f

Browse files
DerFrZockerDerFrZocker
committed
Add support for Minecraft version 1.19
Took 24 minutes
1 parent c2e8e4e commit b3b314f

31 files changed

+2307
-4
lines changed

‎custom-ore-generator/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,12 @@
176176
<version>${project.version}</version>
177177
<scope>compile</scope>
178178
</dependency>
179+
<dependency>
180+
<groupId>de.derfrzocker</groupId>
181+
<artifactId>custom-ore-generator-impl-v1_19_R1</artifactId>
182+
<version>${project.version}</version>
183+
<scope>compile</scope>
184+
</dependency>
179185
</dependencies>
180186

181187
<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
@@ -81,6 +81,8 @@
8181
import de.derfrzocker.custom.ore.generator.impl.v1_18_R1.oregenerator.MinableGenerator_v1_18_R1;
8282
import de.derfrzocker.custom.ore.generator.impl.v1_18_R2.WorldHandler_v1_18_R2;
8383
import de.derfrzocker.custom.ore.generator.impl.v1_18_R2.oregenerator.MinableGenerator_v1_18_R2;
84+
import de.derfrzocker.custom.ore.generator.impl.v1_19_R1.WorldHandler_v1_19_R1;
85+
import de.derfrzocker.custom.ore.generator.impl.v1_19_R1.oregenerator.MinableGenerator_v1_19_R1;
8486
import de.derfrzocker.custom.ore.generator.impl.v1_8_R1.CustomOreBlockPopulator_v1_8_R1;
8587
import de.derfrzocker.custom.ore.generator.impl.v1_8_R1.oregenerator.MinableGenerator_v1_8_R1;
8688
import de.derfrzocker.custom.ore.generator.impl.v1_8_R2.CustomOreBlockPopulator_v1_8_R2;
@@ -132,7 +134,7 @@ public void onLoad() {
132134
getLogger().warning("The Server version which you are running is unsupported, you are running version '" + version + "'");
133135
getLogger().warning("The plugin supports following versions " + combineVersions(Version.v1_8_R1, Version.v1_8_R2, Version.v1_8_R3,
134136
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,
135-
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));
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));
136138
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");
137139

138140
if (version == Version.UNKNOWN) {
@@ -231,6 +233,7 @@ private void registerStandardOreGenerators(@NotNull final RegisterUtil registerU
231233
registerUtil.register(Version.v1_17_R1, Version.v1_17_R1, () -> new MinableGenerator_v1_17_R1(infoFunction, oreSettingInfoBiFunction), true);
232234
registerUtil.register(Version.v1_18_R1, Version.v1_18_R1, () -> new MinableGenerator_v1_18_R1(infoFunction, oreSettingInfoBiFunction), true);
233235
registerUtil.register(Version.v1_18_R2, Version.v1_18_R2, () -> new MinableGenerator_v1_18_R2(infoFunction, oreSettingInfoBiFunction), true);
236+
registerUtil.register(Version.v1_19_R1, Version.v1_19_R1, () -> new MinableGenerator_v1_19_R1(infoFunction, oreSettingInfoBiFunction), true);
234237
}
235238

236239
private void registerStandardBlockSelector(@NotNull final RegisterUtil registerUtil) {
@@ -265,6 +268,9 @@ private void registerStandardCustomDatas(@NotNull final RegisterUtil registerUti
265268

266269
private void initWorldHandler() {
267270
switch (version) {
271+
case v1_19_R1:
272+
new WorldHandler_v1_19_R1(this, CustomOreGeneratorServiceSupplier.INSTANCE);
273+
break;
268274
case v1_18_R2:
269275
new WorldHandler_v1_18_R2(this, CustomOreGeneratorServiceSupplier.INSTANCE);
270276
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
@@ -40,6 +40,7 @@
4040
import de.derfrzocker.custom.ore.generator.impl.v1_17_R1.customdata.AutoApplier_v1_17_R1;
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;
43+
import de.derfrzocker.custom.ore.generator.impl.v1_19_R1.customdata.AutoApplier_v1_19_R1;
4344
import de.derfrzocker.custom.ore.generator.impl.v1_9_R1.customdata.AutoApplier_v1_9_R1;
4445
import de.derfrzocker.custom.ore.generator.impl.v_1_9_R2.customdata.AutoApplier_v1_9_R2;
4546
import de.derfrzocker.spigot.utils.Version;
@@ -59,6 +60,7 @@ public class AutoCustomData extends AbstractAutoCustomData {
5960

6061
static {
6162
switch (Version.getServerVersion(Bukkit.getServer())) {
63+
case v1_19_R1:
6264
case v1_18_R2:
6365
case v1_18_R1:
6466
case v1_17_R1:
@@ -105,6 +107,8 @@ public boolean hasCustomData(@NotNull final BlockState blockState) {
105107
@Override
106108
protected AutoApplier getCustomDataApplier0() {
107109
switch (Version.getServerVersion(Bukkit.getServer())) {
110+
case v1_19_R1:
111+
return new AutoApplier_v1_19_R1(this);
108112
case v1_18_R2:
109113
return new AutoApplier_v1_18_R2(this);
110114
case v1_18_R1:

‎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
@@ -40,6 +40,7 @@
4040
import de.derfrzocker.custom.ore.generator.impl.v1_17_R1.customdata.BlockStateApplier_v1_17_R1;
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;
43+
import de.derfrzocker.custom.ore.generator.impl.v1_19_R1.customdata.BlockStateApplier_v1_19_R1;
4344
import de.derfrzocker.spigot.utils.Version;
4445
import org.apache.commons.lang.Validate;
4546
import org.bukkit.Bukkit;
@@ -65,8 +66,10 @@ public BlockStateCustomData(@NotNull final Supplier<CustomOreGeneratorService> s
6566
@Override
6667
protected AbstractBlockStateCustomData.BlockStateApplier getCustomDataApplier0() {
6768
switch (Version.getServerVersion(Bukkit.getServer())) {
69+
case v1_19_R1:
70+
return new BlockStateApplier_v1_19_R1(this.serviceSupplier, this);
6871
case v1_18_R2:
69-
return new BlockStateApplier_v1_18_R2(this.serviceSupplier, this);
72+
return new BlockStateApplier_v1_18_R2(this.serviceSupplier, this);
7073
case v1_18_R1:
7174
return new BlockStateApplier_v1_18_R1(this.serviceSupplier, this);
7275
case v1_17_R1:

‎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
@@ -42,6 +42,7 @@
4242
import de.derfrzocker.custom.ore.generator.impl.v1_17_R1.customdata.CommandApplier_v1_17_R1;
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;
45+
import de.derfrzocker.custom.ore.generator.impl.v1_19_R1.customdata.CommandApplier_v1_19_R1;
4546
import de.derfrzocker.custom.ore.generator.impl.v1_8_R1.customdata.CommandApplier_v1_8_R1;
4647
import de.derfrzocker.custom.ore.generator.impl.v1_8_R2.customdata.CommandApplier_v1_8_R2;
4748
import de.derfrzocker.custom.ore.generator.impl.v1_8_R3.customdata.CommandApplier_v1_8_R3;
@@ -65,6 +66,7 @@ public class CommandCustomData extends AbstractCustomData<CustomDataApplier> {
6566

6667
static {
6768
switch (Version.getServerVersion(Bukkit.getServer())) {
69+
case v1_19_R1:
6870
case v1_18_R2:
6971
case v1_18_R1:
7072
case v1_17_R1:
@@ -135,6 +137,8 @@ public String getCustomData(@NotNull final BlockState blockState) {
135137
@Override
136138
protected CustomDataApplier getCustomDataApplier0() {
137139
switch (Version.getServerVersion(Bukkit.getServer())) {
140+
case v1_19_R1:
141+
return new CommandApplier_v1_19_R1(this);
138142
case v1_18_R2:
139143
return new CommandApplier_v1_18_R2(this);
140144
case v1_18_R1:

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
import de.derfrzocker.custom.ore.generator.impl.v1_17_R1.customdata.DirectionApplier_v1_17_R1;
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;
43+
import de.derfrzocker.custom.ore.generator.impl.v1_19_R1.customdata.DirectionApplier_v1_19_R1;
4344
import de.derfrzocker.spigot.utils.Version;
4445
import org.apache.commons.lang.Validate;
4546
import org.bukkit.Bukkit;
@@ -122,8 +123,10 @@ public Boolean getCustomData(@NotNull final BlockState blockState) {
122123
@Override
123124
protected CustomDataApplier getCustomDataApplier0() {
124125
switch (Version.getServerVersion(Bukkit.getServer())) {
126+
case v1_19_R1:
127+
return new DirectionApplier_v1_19_R1(this, blockFace);
125128
case v1_18_R2:
126-
return new DirectionApplier_v1_18_R2(this, blockFace);
129+
return new DirectionApplier_v1_18_R2(this, blockFace);
127130
case v1_18_R1:
128131
return new DirectionApplier_v1_18_R1(this, blockFace);
129132
case v1_17_R1:

‎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
@@ -40,6 +40,7 @@
4040
import de.derfrzocker.custom.ore.generator.impl.v1_17_R1.customdata.FacingApplier_v1_17_R1;
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;
43+
import de.derfrzocker.custom.ore.generator.impl.v1_19_R1.customdata.FacingApplier_v1_19_R1;
4344
import de.derfrzocker.spigot.utils.Version;
4445
import org.apache.commons.lang.Validate;
4546
import org.bukkit.Bukkit;
@@ -107,6 +108,8 @@ public BlockFace getCustomData(@NotNull final BlockState blockState) {
107108
@Override
108109
protected CustomDataApplier getCustomDataApplier0() {
109110
switch (Version.getServerVersion(Bukkit.getServer())) {
111+
case v1_19_R1:
112+
return new FacingApplier_v1_19_R1(this);
110113
case v1_18_R2:
111114
return new FacingApplier_v1_18_R2(this);
112115
case v1_18_R1:

‎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
@@ -38,6 +38,7 @@
3838
import de.derfrzocker.custom.ore.generator.impl.v1_17_R1.customdata.ItemModsApplier_v1_17_R1;
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;
41+
import de.derfrzocker.custom.ore.generator.impl.v1_19_R1.customdata.ItemModsApplier_v1_19_R1;
4142
import de.derfrzocker.spigot.utils.Version;
4243
import dev.linwood.itemmods.ItemMods;
4344
import dev.linwood.itemmods.api.block.CustomBlock;
@@ -104,6 +105,8 @@ public String getCustomData(@NotNull final BlockState blockState) {
104105
@Override
105106
protected CustomDataApplier getCustomDataApplier0() {
106107
switch (Version.getServerVersion(Bukkit.getServer())) {
108+
case v1_19_R1:
109+
return new ItemModsApplier_v1_19_R1(this);
107110
case v1_18_R2:
108111
return new ItemModsApplier_v1_18_R2(this);
109112
case v1_18_R1:

‎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
@@ -39,6 +39,7 @@
3939
import de.derfrzocker.custom.ore.generator.impl.v1_17_R1.customdata.NBTTagApplier_v1_17_R1;
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;
42+
import de.derfrzocker.custom.ore.generator.impl.v1_19_R1.customdata.NBTTagApplier_v1_19_R1;
4243
import de.derfrzocker.custom.ore.generator.impl.v1_8_R1.customdata.NBTTagApplier_v1_8_R1;
4344
import de.derfrzocker.custom.ore.generator.impl.v1_8_R2.customdata.NBTTagApplier_v1_8_R2;
4445
import de.derfrzocker.custom.ore.generator.impl.v1_8_R3.customdata.NBTTagApplier_v1_8_R3;
@@ -61,6 +62,8 @@ public NBTTagCustomData(@NotNull final Function<String, Info> infoFunction, @Not
6162
@Override
6263
protected NBTTagApplier getCustomDataApplier0() {
6364
switch (Version.getServerVersion(Bukkit.getServer())) {
65+
case v1_19_R1:
66+
return new NBTTagApplier_v1_19_R1(this);
6467
case v1_18_R2:
6568
return new NBTTagApplier_v1_18_R2(this);
6669
case v1_18_R1:

‎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
@@ -37,6 +37,7 @@
3737
import de.derfrzocker.custom.ore.generator.impl.v1_17_R1.customdata.OraxenApplier_v1_17_R1;
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;
40+
import de.derfrzocker.custom.ore.generator.impl.v1_19_R1.customdata.OraxenApplier_v1_19_R1;
4041
import de.derfrzocker.spigot.utils.Version;
4142
import io.th0rgal.oraxen.compatibilities.provided.itembridge.OraxenItemBridge;
4243
import io.th0rgal.oraxen.items.OraxenItems;
@@ -134,6 +135,8 @@ public Object getCustomData(@NotNull BlockState blockState) {
134135
@Override
135136
protected CustomDataApplier getCustomDataApplier0() {
136137
switch (Version.getServerVersion(Bukkit.getServer())) {
138+
case v1_19_R1:
139+
return new OraxenApplier_v1_19_R1(this);
137140
case v1_18_R2:
138141
return new OraxenApplier_v1_18_R2(this);
139142
case v1_18_R1:

0 commit comments

Comments
 (0)