Add support for 1.20.3/4

Took 37 minutes

Author: DerFrZocker

.gitignore

@@ -82,6 +82,9 @@
 /impl/v1_20_R2/target/
 /impl/v1_20_R2/.flattened-pom.xml
 /impl/v1_20_R2/custom-ore-generator-impl-v1_20_R2.iml
+/impl/v1_20_R3/target/
+/impl/v1_20_R3/.flattened-pom.xml
+/impl/v1_20_R3/custom-ore-generator-impl-v1_20_R3.iml
 /impl/yaml/target/
 /impl/yaml/.flattened-pom.xml
 /impl/yaml/custom-ore-generator-impl-yaml.iml

custom-ore-generator/pom.xml

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

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

@@ -89,6 +89,8 @@
 import de.derfrzocker.custom.ore.generator.impl.v1_20_R1.oregenerator.MinableGenerator_v1_20_R1;
 import de.derfrzocker.custom.ore.generator.impl.v1_20_R2.WorldHandler_v1_20_R2;
 import de.derfrzocker.custom.ore.generator.impl.v1_20_R2.oregenerator.MinableGenerator_v1_20_R2;
+import de.derfrzocker.custom.ore.generator.impl.v1_20_R3.WorldHandler_v1_20_R3;
+import de.derfrzocker.custom.ore.generator.impl.v1_20_R3.oregenerator.MinableGenerator_v1_20_R3;
 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;
@@ -141,8 +143,8 @@ public void onLoad() {
             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, Version.v1_18_R1,
-                    Version.v1_18_R2, Version.v1_19_R1, Version.v1_19_R2, Version.v1_19_R3, Version.v1_20_R1, Version.v1_20_R2));
-            getLogger().warning("(Spigot / Paper version 1.8 - 1.20.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");
+                    Version.v1_18_R2, Version.v1_19_R1, Version.v1_19_R2, Version.v1_19_R3, Version.v1_20_R1, Version.v1_20_R2, Version.v1_20_R3));
+            getLogger().warning("(Spigot / Paper version 1.8 - 1.20.4), 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.");
@@ -244,6 +246,7 @@ private void registerStandardOreGenerators(@NotNull final RegisterUtil registerU
         registerUtil.register(Version.v1_19_R3, Version.v1_19_R3, () -> new MinableGenerator_v1_19_R3(infoFunction, oreSettingInfoBiFunction), true);
         registerUtil.register(Version.v1_20_R1, Version.v1_20_R1, () -> new MinableGenerator_v1_20_R1(infoFunction, oreSettingInfoBiFunction), true);
         registerUtil.register(Version.v1_20_R2, Version.v1_20_R2, () -> new MinableGenerator_v1_20_R2(infoFunction, oreSettingInfoBiFunction), true);
+        registerUtil.register(Version.v1_20_R3, Version.v1_20_R3, () -> new MinableGenerator_v1_20_R3(infoFunction, oreSettingInfoBiFunction), true);
     }
 
     private void registerStandardBlockSelector(@NotNull final RegisterUtil registerUtil) {
@@ -278,6 +281,9 @@ private void registerStandardCustomDatas(@NotNull final RegisterUtil registerUti
 
     private void initWorldHandler() {
         switch (version) {
+            case v1_20_R3:
+                new WorldHandler_v1_20_R3(this, CustomOreGeneratorServiceSupplier.INSTANCE);
+                break;
             case v1_20_R2:
                 new WorldHandler_v1_20_R2(this, CustomOreGeneratorServiceSupplier.INSTANCE);
                 break;

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

@@ -45,6 +45,7 @@
 import de.derfrzocker.custom.ore.generator.impl.v1_19_R3.customdata.AutoApplier_v1_19_R3;
 import de.derfrzocker.custom.ore.generator.impl.v1_20_R1.customdata.AutoApplier_v1_20_R1;
 import de.derfrzocker.custom.ore.generator.impl.v1_20_R2.customdata.AutoApplier_v1_20_R2;
+import de.derfrzocker.custom.ore.generator.impl.v1_20_R3.customdata.AutoApplier_v1_20_R3;
 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;
@@ -64,6 +65,7 @@ public class AutoCustomData extends AbstractAutoCustomData {
 
     static {
         switch (Version.getServerVersion(Bukkit.getServer())) {
+            case v1_20_R3:
             case v1_20_R2:
             case v1_20_R1:
             case v1_19_R3:
@@ -115,6 +117,8 @@ public boolean hasCustomData(@NotNull final BlockState blockState) {
     @Override
     protected AutoApplier getCustomDataApplier0() {
         switch (Version.getServerVersion(Bukkit.getServer())) {
+            case v1_20_R3:
+                return new AutoApplier_v1_20_R3(this);
             case v1_20_R2:
                 return new AutoApplier_v1_20_R2(this);
             case v1_20_R1:

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

@@ -45,6 +45,7 @@
 import de.derfrzocker.custom.ore.generator.impl.v1_19_R3.customdata.BlockStateApplier_v1_19_R3;
 import de.derfrzocker.custom.ore.generator.impl.v1_20_R1.customdata.BlockStateApplier_v1_20_R1;
 import de.derfrzocker.custom.ore.generator.impl.v1_20_R2.customdata.BlockStateApplier_v1_20_R2;
+import de.derfrzocker.custom.ore.generator.impl.v1_20_R3.customdata.BlockStateApplier_v1_20_R3;
 import de.derfrzocker.spigot.utils.Version;
 import org.apache.commons.lang.Validate;
 import org.bukkit.Bukkit;
@@ -70,6 +71,8 @@ public BlockStateCustomData(@NotNull final Supplier<CustomOreGeneratorService> s
     @Override
     protected AbstractBlockStateCustomData.BlockStateApplier getCustomDataApplier0() {
         switch (Version.getServerVersion(Bukkit.getServer())) {
+            case v1_20_R3:
+                return new BlockStateApplier_v1_20_R3(this.serviceSupplier, this);
             case v1_20_R2:
                 return new BlockStateApplier_v1_20_R2(this.serviceSupplier, this);
             case v1_20_R1:

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

@@ -47,6 +47,7 @@
 import de.derfrzocker.custom.ore.generator.impl.v1_19_R3.customdata.CommandApplier_v1_19_R3;
 import de.derfrzocker.custom.ore.generator.impl.v1_20_R1.customdata.CommandApplier_v1_20_R1;
 import de.derfrzocker.custom.ore.generator.impl.v1_20_R2.customdata.CommandApplier_v1_20_R2;
+import de.derfrzocker.custom.ore.generator.impl.v1_20_R3.customdata.CommandApplier_v1_20_R3;
 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;
@@ -70,6 +71,7 @@ public class CommandCustomData extends AbstractCustomData<CustomDataApplier> {
 
     static {
         switch (Version.getServerVersion(Bukkit.getServer())) {
+            case v1_20_R3:
             case v1_20_R2:
             case v1_20_R1:
             case v1_19_R3:
@@ -145,6 +147,8 @@ public String getCustomData(@NotNull final BlockState blockState) {
     @Override
     protected CustomDataApplier getCustomDataApplier0() {
         switch (Version.getServerVersion(Bukkit.getServer())) {
+            case v1_20_R3:
+                return new CommandApplier_v1_20_R3(this);
             case v1_20_R2:
                 return new CommandApplier_v1_20_R2(this);
             case v1_20_R1:

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

@@ -45,6 +45,7 @@
 import de.derfrzocker.custom.ore.generator.impl.v1_19_R3.customdata.DirectionApplier_v1_19_R3;
 import de.derfrzocker.custom.ore.generator.impl.v1_20_R1.customdata.DirectionApplier_v1_20_R1;
 import de.derfrzocker.custom.ore.generator.impl.v1_20_R2.customdata.DirectionApplier_v1_20_R2;
+import de.derfrzocker.custom.ore.generator.impl.v1_20_R3.customdata.DirectionApplier_v1_20_R3;
 import de.derfrzocker.spigot.utils.Version;
 import org.apache.commons.lang.Validate;
 import org.bukkit.Bukkit;
@@ -127,6 +128,8 @@ public Boolean getCustomData(@NotNull final BlockState blockState) {
     @Override
     protected CustomDataApplier getCustomDataApplier0() {
         switch (Version.getServerVersion(Bukkit.getServer())) {
+            case v1_20_R3:
+                return new DirectionApplier_v1_20_R3(this, blockFace);
             case v1_20_R2:
                 return new DirectionApplier_v1_20_R2(this, blockFace);
             case v1_20_R1:

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

@@ -45,6 +45,7 @@
 import de.derfrzocker.custom.ore.generator.impl.v1_19_R3.customdata.FacingApplier_v1_19_R3;
 import de.derfrzocker.custom.ore.generator.impl.v1_20_R1.customdata.FacingApplier_v1_20_R1;
 import de.derfrzocker.custom.ore.generator.impl.v1_20_R2.customdata.FacingApplier_v1_20_R2;
+import de.derfrzocker.custom.ore.generator.impl.v1_20_R3.customdata.FacingApplier_v1_20_R3;
 import de.derfrzocker.spigot.utils.Version;
 import org.apache.commons.lang.Validate;
 import org.bukkit.Bukkit;
@@ -112,6 +113,8 @@ public BlockFace getCustomData(@NotNull final BlockState blockState) {
     @Override
     protected CustomDataApplier getCustomDataApplier0() {
         switch (Version.getServerVersion(Bukkit.getServer())) {
+            case v1_20_R3:
+                return new FacingApplier_v1_20_R3(this);
             case v1_20_R2:
                 return new FacingApplier_v1_20_R2(this);
             case v1_20_R1:

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

@@ -43,6 +43,7 @@
 import de.derfrzocker.custom.ore.generator.impl.v1_19_R3.customdata.ItemModsApplier_v1_19_R3;
 import de.derfrzocker.custom.ore.generator.impl.v1_20_R1.customdata.ItemModsApplier_v1_20_R1;
 import de.derfrzocker.custom.ore.generator.impl.v1_20_R2.customdata.ItemModsApplier_v1_20_R2;
+import de.derfrzocker.custom.ore.generator.impl.v1_20_R3.customdata.ItemModsApplier_v1_20_R3;
 import de.derfrzocker.spigot.utils.Version;
 import dev.linwood.itemmods.ItemMods;
 import dev.linwood.itemmods.api.block.CustomBlock;
@@ -109,6 +110,8 @@ public String getCustomData(@NotNull final BlockState blockState) {
     @Override
     protected CustomDataApplier getCustomDataApplier0() {
         switch (Version.getServerVersion(Bukkit.getServer())) {
+            case v1_20_R3:
+                return new ItemModsApplier_v1_20_R3(this);
             case v1_20_R2:
                 return new ItemModsApplier_v1_20_R2(this);
             case v1_20_R1:

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

@@ -44,6 +44,7 @@
 import de.derfrzocker.custom.ore.generator.impl.v1_19_R3.customdata.NBTTagApplier_v1_19_R3;
 import de.derfrzocker.custom.ore.generator.impl.v1_20_R1.customdata.NBTTagApplier_v1_20_R1;
 import de.derfrzocker.custom.ore.generator.impl.v1_20_R2.customdata.NBTTagApplier_v1_20_R2;
+import de.derfrzocker.custom.ore.generator.impl.v1_20_R3.customdata.NBTTagApplier_v1_20_R3;
 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;
@@ -66,6 +67,8 @@ public NBTTagCustomData(@NotNull final Function<String, Info> infoFunction, @Not
     @Override
     protected NBTTagApplier getCustomDataApplier0() {
         switch (Version.getServerVersion(Bukkit.getServer())) {
+            case v1_20_R3:
+                return new NBTTagApplier_v1_20_R3(this);
             case v1_20_R2:
                 return new NBTTagApplier_v1_20_R2(this);
             case v1_20_R1: