Add support for Minecraft 1.18

Took 1 hour 52 minutes

Author: DerFrZocker

custom-ore-generator/pom.xml

@@ -164,6 +164,12 @@
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>de.derfrzocker</groupId>
+            <artifactId>custom-ore-generator-impl-v1_18_R1</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

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

@@ -77,6 +77,8 @@
 import de.derfrzocker.custom.ore.generator.impl.v1_16_R3.oregenerator.MinableGenerator_v1_16_R3;
 import de.derfrzocker.custom.ore.generator.impl.v1_17_R1.WorldHandler_v1_17_R1;
 import de.derfrzocker.custom.ore.generator.impl.v1_17_R1.oregenerator.MinableGenerator_v1_17_R1;
+import de.derfrzocker.custom.ore.generator.impl.v1_18_R1.WorldHandler_v1_18_R1;
+import de.derfrzocker.custom.ore.generator.impl.v1_18_R1.oregenerator.MinableGenerator_v1_18_R1;
 import de.derfrzocker.custom.ore.generator.impl.v1_8_R1.CustomOreBlockPopulator_v1_8_R1;
 import de.derfrzocker.custom.ore.generator.impl.v1_8_R1.oregenerator.MinableGenerator_v1_8_R1;
 import de.derfrzocker.custom.ore.generator.impl.v1_8_R2.CustomOreBlockPopulator_v1_8_R2;
@@ -128,8 +130,8 @@ public void onLoad() {
             getLogger().warning("The Server version which you are running is unsupported, you are running version '" + version + "'");
             getLogger().warning("The plugin supports following versions " + combineVersions(Version.v1_8_R1, Version.v1_8_R2, Version.v1_8_R3,
                     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,
-                    Version.v1_14_R1, Version.v1_15_R1, Version.v1_16_R1, Version.v1_16_R2, Version.v1_16_R3, Version.v1_17_R1));
-            getLogger().warning("(Spigot / Paper version 1.8 - 1.17.1), 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");
+                    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));
+            getLogger().warning("(Spigot / Paper version 1.8 - 1.18), 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");
 
             if (version == Version.UNKNOWN) {
                 getLogger().warning("The Version '" + version + "' can indicate, that you are using a newer Minecraft version than currently supported.");
@@ -225,6 +227,7 @@ private void registerStandardOreGenerators(@NotNull final RegisterUtil registerU
         registerUtil.register(Version.v1_16_R2, Version.v1_16_R2, () -> new MinableGenerator_v1_16_R2(infoFunction, oreSettingInfoBiFunction), true);
         registerUtil.register(Version.v1_16_R3, Version.v1_16_R3, () -> new MinableGenerator_v1_16_R3(infoFunction, oreSettingInfoBiFunction), true);
         registerUtil.register(Version.v1_17_R1, Version.v1_17_R1, () -> new MinableGenerator_v1_17_R1(infoFunction, oreSettingInfoBiFunction), true);
+        registerUtil.register(Version.v1_18_R1, Version.v1_18_R1, () -> new MinableGenerator_v1_18_R1(infoFunction, oreSettingInfoBiFunction), true);
     }
 
     private void registerStandardBlockSelector(@NotNull final RegisterUtil registerUtil) {
@@ -259,6 +262,9 @@ private void registerStandardCustomDatas(@NotNull final RegisterUtil registerUti
 
     private void initWorldHandler() {
         switch (version) {
+            case v1_18_R1:
+                new WorldHandler_v1_18_R1(this, CustomOreGeneratorServiceSupplier.INSTANCE);
+                return;
             case v1_17_R1:
                 new WorldHandler_v1_17_R1(this, CustomOreGeneratorServiceSupplier.INSTANCE);
                 return;

custom-ore-generator/src/main/java/de/derfrzocker/custom/ore/generator/factory/gui/settings/BiomeGuiSettings.java

@@ -35,17 +35,21 @@
 import java.util.function.Supplier;
 
 public class BiomeGuiSettings extends PageSettings {
+    private final Plugin plugin;
 
     public BiomeGuiSettings(@NotNull final Plugin plugin, @NotNull final String file) {
         super(plugin, file);
+        this.plugin = plugin;
     }
 
     public BiomeGuiSettings(@NotNull final Plugin plugin, @NotNull final String file, final boolean copy) {
         super(plugin, file, copy);
+        this.plugin = plugin;
     }
 
     public BiomeGuiSettings(@NotNull final Plugin plugin, @NotNull final Supplier<ConfigurationSection> configurationSectionSupplier) {
         super(plugin, configurationSectionSupplier);
+        this.plugin = plugin;
     }
 
     @NotNull
@@ -81,7 +85,8 @@ public Material getBiomeMaterial(@NotNull final String biome) {
         String value = getSection().getString("biomes." + biome);
 
         if (value == null) {
-            throw new IllegalStateException("There is no material for the biome " + biome);
+            plugin.getLogger().warning("There is no material for the biome " + biome + " using default Material " + Material.STONE);
+            return Material.STONE;
         }
 
         return Material.valueOf(value);

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

@@ -38,6 +38,7 @@
 import de.derfrzocker.custom.ore.generator.impl.v1_16_R2.customdata.AutoApplier_v1_16_R2;
 import de.derfrzocker.custom.ore.generator.impl.v1_16_R3.customdata.AutoApplier_v1_16_R3;
 import de.derfrzocker.custom.ore.generator.impl.v1_17_R1.customdata.AutoApplier_v1_17_R1;
+import de.derfrzocker.custom.ore.generator.impl.v1_18_R1.customdata.AutoApplier_v1_18_R1;
 import de.derfrzocker.custom.ore.generator.impl.v1_9_R1.customdata.AutoApplier_v1_9_R1;
 import de.derfrzocker.custom.ore.generator.impl.v_1_9_R2.customdata.AutoApplier_v1_9_R2;
 import de.derfrzocker.spigot.utils.Version;
@@ -57,6 +58,7 @@ public class AutoCustomData extends AbstractAutoCustomData {
 
     static {
         switch (Version.getServerVersion(Bukkit.getServer())) {
+            case v1_18_R1:
             case v1_17_R1:
             case v1_16_R3:
             case v1_16_R2:
@@ -101,6 +103,8 @@ public boolean hasCustomData(@NotNull final BlockState blockState) {
     @Override
     protected AutoApplier getCustomDataApplier0() {
         switch (Version.getServerVersion(Bukkit.getServer())) {
+            case v1_18_R1:
+                return new AutoApplier_v1_18_R1(this);
             case v1_17_R1:
                 return new AutoApplier_v1_17_R1(this);
             case v1_16_R3:

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

@@ -38,6 +38,7 @@
 import de.derfrzocker.custom.ore.generator.impl.v1_16_R2.customdata.BlockStateApplier_v1_16_R2;
 import de.derfrzocker.custom.ore.generator.impl.v1_16_R3.customdata.BlockStateApplier_v1_16_R3;
 import de.derfrzocker.custom.ore.generator.impl.v1_17_R1.customdata.BlockStateApplier_v1_17_R1;
+import de.derfrzocker.custom.ore.generator.impl.v1_18_R1.customdata.BlockStateApplier_v1_18_R1;
 import de.derfrzocker.spigot.utils.Version;
 import org.apache.commons.lang.Validate;
 import org.bukkit.Bukkit;
@@ -63,6 +64,8 @@ public BlockStateCustomData(@NotNull final Supplier<CustomOreGeneratorService> s
     @Override
     protected AbstractBlockStateCustomData.BlockStateApplier getCustomDataApplier0() {
         switch (Version.getServerVersion(Bukkit.getServer())) {
+            case v1_18_R1:
+                return new BlockStateApplier_v1_18_R1(this.serviceSupplier, this);
             case v1_17_R1:
                 return new BlockStateApplier_v1_17_R1(this.serviceSupplier, this);
             case v1_16_R3:

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

@@ -40,6 +40,7 @@
 import de.derfrzocker.custom.ore.generator.impl.v1_16_R2.customdata.CommandApplier_v1_16_R2;
 import de.derfrzocker.custom.ore.generator.impl.v1_16_R3.customdata.CommandApplier_v1_16_R3;
 import de.derfrzocker.custom.ore.generator.impl.v1_17_R1.customdata.CommandApplier_v1_17_R1;
+import de.derfrzocker.custom.ore.generator.impl.v1_18_R1.customdata.CommandApplier_v1_18_R1;
 import de.derfrzocker.custom.ore.generator.impl.v1_8_R1.customdata.CommandApplier_v1_8_R1;
 import de.derfrzocker.custom.ore.generator.impl.v1_8_R2.customdata.CommandApplier_v1_8_R2;
 import de.derfrzocker.custom.ore.generator.impl.v1_8_R3.customdata.CommandApplier_v1_8_R3;
@@ -63,6 +64,7 @@ public class CommandCustomData extends AbstractCustomData<CustomDataApplier> {
 
     static {
         switch (Version.getServerVersion(Bukkit.getServer())) {
+            case v1_18_R1:
             case v1_17_R1:
             case v1_16_R3:
             case v1_16_R2:
@@ -131,6 +133,8 @@ public String getCustomData(@NotNull final BlockState blockState) {
     @Override
     protected CustomDataApplier getCustomDataApplier0() {
         switch (Version.getServerVersion(Bukkit.getServer())) {
+            case v1_18_R1:
+                return new CommandApplier_v1_18_R1(this);
             case v1_17_R1:
                 return new CommandApplier_v1_17_R1(this);
             case v1_16_R3:

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

@@ -38,6 +38,7 @@
 import de.derfrzocker.custom.ore.generator.impl.v1_16_R2.customdata.DirectionApplier_v1_16_R2;
 import de.derfrzocker.custom.ore.generator.impl.v1_16_R3.customdata.DirectionApplier_v1_16_R3;
 import de.derfrzocker.custom.ore.generator.impl.v1_17_R1.customdata.DirectionApplier_v1_17_R1;
+import de.derfrzocker.custom.ore.generator.impl.v1_18_R1.customdata.DirectionApplier_v1_18_R1;
 import de.derfrzocker.spigot.utils.Version;
 import org.apache.commons.lang.Validate;
 import org.bukkit.Bukkit;
@@ -120,6 +121,8 @@ public Boolean getCustomData(@NotNull final BlockState blockState) {
     @Override
     protected CustomDataApplier getCustomDataApplier0() {
         switch (Version.getServerVersion(Bukkit.getServer())) {
+            case v1_18_R1:
+                return new DirectionApplier_v1_18_R1(this, blockFace);
             case v1_17_R1:
                 return new DirectionApplier_v1_17_R1(this, blockFace);
             case v1_16_R3:

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

@@ -38,6 +38,7 @@
 import de.derfrzocker.custom.ore.generator.impl.v1_16_R2.customdata.FacingApplier_v1_16_R2;
 import de.derfrzocker.custom.ore.generator.impl.v1_16_R3.customdata.FacingApplier_v1_16_R3;
 import de.derfrzocker.custom.ore.generator.impl.v1_17_R1.customdata.FacingApplier_v1_17_R1;
+import de.derfrzocker.custom.ore.generator.impl.v1_18_R1.customdata.FacingApplier_v1_18_R1;
 import de.derfrzocker.spigot.utils.Version;
 import org.apache.commons.lang.Validate;
 import org.bukkit.Bukkit;
@@ -105,6 +106,8 @@ public BlockFace getCustomData(@NotNull final BlockState blockState) {
     @Override
     protected CustomDataApplier getCustomDataApplier0() {
         switch (Version.getServerVersion(Bukkit.getServer())) {
+            case v1_18_R1:
+                return new FacingApplier_v1_18_R1(this);
             case v1_17_R1:
                 return new FacingApplier_v1_17_R1(this);
             case v1_16_R3:

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

@@ -36,6 +36,7 @@
 import de.derfrzocker.custom.ore.generator.impl.v1_16_R2.customdata.ItemModsApplier_v1_16_R2;
 import de.derfrzocker.custom.ore.generator.impl.v1_16_R3.customdata.ItemModsApplier_v1_16_R3;
 import de.derfrzocker.custom.ore.generator.impl.v1_17_R1.customdata.ItemModsApplier_v1_17_R1;
+import de.derfrzocker.custom.ore.generator.impl.v1_18_R1.customdata.ItemModsApplier_v1_18_R1;
 import de.derfrzocker.spigot.utils.Version;
 import dev.linwood.itemmods.ItemMods;
 import dev.linwood.itemmods.api.block.CustomBlock;
@@ -102,6 +103,8 @@ public String getCustomData(@NotNull final BlockState blockState) {
     @Override
     protected CustomDataApplier getCustomDataApplier0() {
         switch (Version.getServerVersion(Bukkit.getServer())) {
+            case v1_18_R1:
+                return new ItemModsApplier_v1_18_R1(this);
             case v1_17_R1:
                 return new ItemModsApplier_v1_17_R1(this);
             case v1_16_R3:

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

@@ -37,6 +37,7 @@
 import de.derfrzocker.custom.ore.generator.impl.v1_16_R2.customdata.NBTTagApplier_v1_16_R2;
 import de.derfrzocker.custom.ore.generator.impl.v1_16_R3.customdata.NBTTagApplier_v1_16_R3;
 import de.derfrzocker.custom.ore.generator.impl.v1_17_R1.customdata.NBTTagApplier_v1_17_R1;
+import de.derfrzocker.custom.ore.generator.impl.v1_18_R1.customdata.NBTTagApplier_v1_18_R1;
 import de.derfrzocker.custom.ore.generator.impl.v1_8_R1.customdata.NBTTagApplier_v1_8_R1;
 import de.derfrzocker.custom.ore.generator.impl.v1_8_R2.customdata.NBTTagApplier_v1_8_R2;
 import de.derfrzocker.custom.ore.generator.impl.v1_8_R3.customdata.NBTTagApplier_v1_8_R3;
@@ -59,6 +60,8 @@ public NBTTagCustomData(@NotNull final Function<String, Info> infoFunction, @Not
     @Override
     protected NBTTagApplier getCustomDataApplier0() {
         switch (Version.getServerVersion(Bukkit.getServer())) {
+            case v1_18_R1:
+                return new NBTTagApplier_v1_18_R1(this);
             case v1_17_R1:
                 return new NBTTagApplier_v1_17_R1(this);
             case v1_16_R3: