From 86fada72f8a774140246419052733c6a52aa68bd Mon Sep 17 00:00:00 2001 From: Joo200 Date: Sun, 22 Dec 2024 21:42:31 +0100 Subject: [PATCH 1/2] Initial upgrade to gradle --- .gitignore | 33 +- api/build.gradle.kts | 14 + api/pom.xml | 15 - build-logic/build.gradle.kts | 15 + build-logic/settings.gradle.kts | 9 + .../main/kotlin/buildlogic.adapter.gradle.kts | 36 ++ .../kotlin/buildlogic.common-java.gradle.kts | 16 + .../main/kotlin/buildlogic.common.gradle.kts | 26 + .../main/kotlin/buildlogic.shadow.gradle.kts | 5 + build.gradle.kts | 25 + common/build.gradle.kts | 12 + common/pom.xml | 30 - .../feature/common/util/Refraction.java | 23 + gradle/gradle-daemon-jvm.properties | 2 + gradle/libs.versions.toml | 23 + gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43583 bytes gradle/wrapper/gradle-wrapper.properties | 7 + gradlew | 252 +++++++++ gradlew.bat | 94 ++++ impl/pom.xml | 31 -- impl/v1_18_R1/pom.xml | 80 --- .../GlowstoneBlobFeatureGenerator.java | 62 --- .../generator/MinecraftFeatureGenerator.java | 64 --- .../generator/OreFeatureGenerator.java | 116 ---- .../generator/ScatteredOreGenerator.java | 116 ---- .../OreFeatureConfiguration.java | 124 ----- .../v1_18_R1/placement/CountModifier.java | 85 --- .../placement/HeightRangeModifier.java | 88 --- .../placement/MinecraftPlacementModifier.java | 64 --- .../v1_18_R1/placement/RarityModifier.java | 83 --- .../SurfaceRelativeThresholdModifier.java | 107 ---- .../placement/SurfaceWaterDepthModifier.java | 82 --- ...elativeThresholdModifierConfiguration.java | 121 ---- .../value/heightmap/HeightmapType.java | 7 - .../value/heightmap/HeightmapValue.java | 10 - .../NMSAboveBottomOffsetIntegerValue.java | 33 -- .../offset/NMSBelowTopOffsetIntegerValue.java | 35 -- .../v1_18_R1/value/target/TargetType.java | 7 - .../v1_18_R1/value/target/TargetValue.java | 10 - .../control/impl/v1_18_R1/ConversionUtil.java | 77 --- .../impl/v1_18_R1/NMSReflectionNames.java | 23 - .../impl/v1_18_R1/NMSReplacer_v1_18_R1.java | 484 ---------------- .../GlowstoneBlobFeatureGeneratorHook.java | 25 - .../MinecraftFeatureGeneratorHook.java | 98 ---- .../generator/OreFeatureGeneratorHook.java | 54 -- .../ScatteredOreFeatureGeneratorHook.java | 54 -- .../v1_18_R1/placement/CountModifierHook.java | 55 -- .../placement/HeightRangeModifierHook.java | 122 ----- .../MinecraftPlacementModifierHook.java | 104 ---- .../placement/RarityModifierHook.java | 53 -- .../SurfaceRelativeThresholdModifierHook.java | 77 --- .../SurfaceWaterDepthModifierHook.java | 53 -- impl/v1_18_R2/pom.xml | 80 --- .../GlowstoneBlobFeatureGenerator.java | 61 --- .../generator/MinecraftFeatureGenerator.java | 64 --- .../generator/OreFeatureGenerator.java | 116 ---- .../generator/ScatteredOreGenerator.java | 116 ---- .../OreFeatureConfiguration.java | 124 ----- .../v1_18_R2/placement/CountModifier.java | 85 --- .../placement/HeightRangeModifier.java | 88 --- .../placement/MinecraftPlacementModifier.java | 64 --- .../v1_18_R2/placement/RarityModifier.java | 83 --- .../SurfaceRelativeThresholdModifier.java | 107 ---- .../placement/SurfaceWaterDepthModifier.java | 82 --- ...elativeThresholdModifierConfiguration.java | 121 ---- .../value/heightmap/HeightmapType.java | 7 - .../value/heightmap/HeightmapValue.java | 10 - .../NMSAboveBottomOffsetIntegerValue.java | 33 -- .../offset/NMSBelowTopOffsetIntegerValue.java | 35 -- .../v1_18_R2/value/target/TargetType.java | 7 - .../v1_18_R2/value/target/TargetValue.java | 10 - .../control/impl/v1_18_R2/ConversionUtil.java | 77 --- .../impl/v1_18_R2/NMSReflectionNames.java | 23 - .../impl/v1_18_R2/NMSReplacer_v1_18_R2.java | 504 ----------------- .../GlowstoneBlobFeatureGeneratorHook.java | 25 - .../MinecraftFeatureGeneratorHook.java | 98 ---- .../generator/OreFeatureGeneratorHook.java | 54 -- .../ScatteredOreFeatureGeneratorHook.java | 54 -- .../placement/ActivationModifierHook.java | 94 ---- .../v1_18_R2/placement/CountModifierHook.java | 55 -- .../placement/HeightRangeModifierHook.java | 122 ----- .../MinecraftPlacementModifierHook.java | 104 ---- .../placement/RarityModifierHook.java | 53 -- .../SurfaceRelativeThresholdModifierHook.java | 77 --- .../SurfaceWaterDepthModifierHook.java | 53 -- impl/v1_19_R1/pom.xml | 80 --- .../impl/v1_19_R1/extra/OreVeinHandler.java | 103 ---- .../GlowstoneBlobFeatureGenerator.java | 61 --- .../generator/MinecraftFeatureGenerator.java | 65 --- .../generator/OreFeatureGenerator.java | 115 ---- .../generator/ScatteredOreGenerator.java | 116 ---- .../OreFeatureConfiguration.java | 124 ----- .../v1_19_R1/placement/CountModifier.java | 85 --- .../placement/HeightRangeModifier.java | 88 --- .../placement/MinecraftPlacementModifier.java | 65 --- .../v1_19_R1/placement/RarityModifier.java | 86 --- .../SurfaceRelativeThresholdModifier.java | 107 ---- .../placement/SurfaceWaterDepthModifier.java | 82 --- ...elativeThresholdModifierConfiguration.java | 121 ---- .../value/heightmap/HeightmapType.java | 7 - .../value/heightmap/HeightmapValue.java | 10 - .../NMSAboveBottomOffsetIntegerValue.java | 33 -- .../offset/NMSBelowTopOffsetIntegerValue.java | 35 -- .../v1_19_R1/value/target/TargetType.java | 7 - .../v1_19_R1/value/target/TargetValue.java | 10 - .../control/impl/v1_19_R1/ConversionUtil.java | 77 --- .../impl/v1_19_R1/NMSReflectionNames.java | 25 - .../impl/v1_19_R1/NMSReplacer_v1_19_R1.java | 516 ------------------ .../GlowstoneBlobFeatureGeneratorHook.java | 25 - .../MinecraftFeatureGeneratorHook.java | 100 ---- .../generator/OreFeatureGeneratorHook.java | 53 -- .../ScatteredOreFeatureGeneratorHook.java | 53 -- .../placement/ActivationModifierHook.java | 95 ---- .../v1_19_R1/placement/CountModifierHook.java | 55 -- .../placement/HeightRangeModifierHook.java | 122 ----- .../MinecraftPlacementModifierHook.java | 106 ---- .../placement/RarityModifierHook.java | 53 -- .../SurfaceRelativeThresholdModifierHook.java | 77 --- .../SurfaceWaterDepthModifierHook.java | 53 -- impl/v1_19_R2/pom.xml | 80 --- .../impl/v1_19_R2/extra/OreVeinHandler.java | 98 ---- .../GlowstoneBlobFeatureGenerator.java | 61 --- .../generator/MinecraftFeatureGenerator.java | 65 --- .../generator/OreFeatureGenerator.java | 115 ---- .../generator/ScatteredOreGenerator.java | 117 ---- .../OreFeatureConfiguration.java | 124 ----- .../v1_19_R2/placement/CountModifier.java | 85 --- .../placement/HeightRangeModifier.java | 88 --- .../placement/MinecraftPlacementModifier.java | 65 --- .../v1_19_R2/placement/RarityModifier.java | 83 --- .../SurfaceRelativeThresholdModifier.java | 107 ---- .../placement/SurfaceWaterDepthModifier.java | 82 --- ...elativeThresholdModifierConfiguration.java | 121 ---- .../value/heightmap/HeightmapType.java | 7 - .../value/heightmap/HeightmapValue.java | 10 - .../NMSAboveBottomOffsetIntegerValue.java | 33 -- .../offset/NMSBelowTopOffsetIntegerValue.java | 35 -- .../v1_19_R2/value/target/TargetType.java | 7 - .../v1_19_R2/value/target/TargetValue.java | 10 - .../control/impl/v1_19_R2/ConversionUtil.java | 77 --- .../impl/v1_19_R2/NMSReflectionNames.java | 25 - .../impl/v1_19_R2/NMSReplacer_v1_19_R2.java | 510 ----------------- .../GlowstoneBlobFeatureGeneratorHook.java | 25 - .../MinecraftFeatureGeneratorHook.java | 100 ---- .../generator/OreFeatureGeneratorHook.java | 53 -- .../ScatteredOreFeatureGeneratorHook.java | 53 -- .../placement/ActivationModifierHook.java | 95 ---- .../v1_19_R2/placement/CountModifierHook.java | 55 -- .../placement/HeightRangeModifierHook.java | 122 ----- .../MinecraftPlacementModifierHook.java | 106 ---- .../placement/RarityModifierHook.java | 53 -- .../SurfaceRelativeThresholdModifierHook.java | 77 --- .../SurfaceWaterDepthModifierHook.java | 53 -- impl/v1_19_R3/pom.xml | 80 --- .../impl/v1_19_R3/extra/OreVeinHandler.java | 98 ---- .../EmptyConfigurationGenerator.java | 65 --- .../generator/MinecraftFeatureGenerator.java | 66 --- .../generator/OreConfigurationGenerator.java | 174 ------ .../v1_19_R3/placement/CountModifier.java | 85 --- .../placement/HeightRangeModifier.java | 88 --- .../placement/MinecraftPlacementModifier.java | 65 --- .../v1_19_R3/placement/RarityModifier.java | 83 --- .../SurfaceRelativeThresholdModifier.java | 107 ---- .../placement/SurfaceWaterDepthModifier.java | 82 --- ...elativeThresholdModifierConfiguration.java | 121 ---- .../value/heightmap/HeightmapType.java | 7 - .../value/heightmap/HeightmapValue.java | 10 - .../NMSAboveBottomOffsetIntegerValue.java | 33 -- .../offset/NMSBelowTopOffsetIntegerValue.java | 35 -- .../control/impl/v1_19_R3/ConversionUtil.java | 77 --- .../impl/v1_19_R3/NMSReflectionNames.java | 25 - .../impl/v1_19_R3/NMSReplacer_v1_19_R3.java | 506 ----------------- .../EmptyConfigurationGeneratorHook.java | 30 - .../MinecraftFeatureGeneratorHook.java | 100 ---- .../OreConfigurationGeneratorHook.java | 150 ----- .../placement/ActivationModifierHook.java | 95 ---- .../v1_19_R3/placement/CountModifierHook.java | 55 -- .../placement/HeightRangeModifierHook.java | 122 ----- .../MinecraftPlacementModifierHook.java | 106 ---- .../placement/RarityModifierHook.java | 53 -- .../SurfaceRelativeThresholdModifierHook.java | 77 --- .../SurfaceWaterDepthModifierHook.java | 53 -- impl/v1_20_R1/pom.xml | 80 --- .../impl/v1_20_R1/extra/OreVeinHandler.java | 98 ---- .../EmptyConfigurationGenerator.java | 65 --- .../generator/MinecraftFeatureGenerator.java | 65 --- .../generator/OreConfigurationGenerator.java | 174 ------ .../v1_20_R1/placement/CountModifier.java | 85 --- .../placement/HeightRangeModifier.java | 88 --- .../placement/MinecraftPlacementModifier.java | 65 --- .../v1_20_R1/placement/RarityModifier.java | 83 --- .../SurfaceRelativeThresholdModifier.java | 107 ---- .../placement/SurfaceWaterDepthModifier.java | 82 --- ...elativeThresholdModifierConfiguration.java | 121 ---- .../value/heightmap/HeightmapType.java | 7 - .../value/heightmap/HeightmapValue.java | 10 - .../NMSAboveBottomOffsetIntegerValue.java | 33 -- .../offset/NMSBelowTopOffsetIntegerValue.java | 35 -- .../control/impl/v1_20_R1/ConversionUtil.java | 77 --- .../impl/v1_20_R1/NMSReflectionNames.java | 25 - .../impl/v1_20_R1/NMSReplacer_v1_20_R1.java | 506 ----------------- .../EmptyConfigurationGeneratorHook.java | 30 - .../MinecraftFeatureGeneratorHook.java | 100 ---- .../OreConfigurationGeneratorHook.java | 150 ----- .../placement/ActivationModifierHook.java | 95 ---- .../v1_20_R1/placement/CountModifierHook.java | 55 -- .../placement/HeightRangeModifierHook.java | 122 ----- .../MinecraftPlacementModifierHook.java | 106 ---- .../placement/RarityModifierHook.java | 53 -- .../SurfaceRelativeThresholdModifierHook.java | 77 --- .../SurfaceWaterDepthModifierHook.java | 53 -- impl/v1_20_R2/build.gradle.kts | 10 + impl/v1_20_R2/pom.xml | 80 --- impl/v1_20_R3/build.gradle.kts | 10 + impl/v1_20_R3/pom.xml | 80 --- impl/v1_20_R4/build.gradle.kts | 10 + impl/v1_20_R4/pom.xml | 80 --- .../impl/v1_20_R4/extra/OreVeinHandler.java | 2 +- .../generator/MinecraftFeatureGenerator.java | 4 +- .../generator/OreConfigurationGenerator.java | 6 +- .../placement/MinecraftPlacementModifier.java | 4 +- .../NMSAboveBottomOffsetIntegerValue.java | 2 +- .../offset/NMSBelowTopOffsetIntegerValue.java | 2 +- .../impl/v1_20_R4/NMSReplacer_v1_20_R4.java | 6 +- .../MinecraftFeatureGeneratorHook.java | 4 +- .../OreConfigurationGeneratorHook.java | 6 +- .../placement/ActivationModifierHook.java | 4 +- .../MinecraftPlacementModifierHook.java | 4 +- impl/v1_21_R1/build.gradle.kts | 10 + impl/v1_21_R1/pom.xml | 80 --- .../impl/v1_21_R1/extra/OreVeinHandler.java | 2 +- .../generator/MinecraftFeatureGenerator.java | 4 +- .../generator/OreConfigurationGenerator.java | 6 +- .../placement/MinecraftPlacementModifier.java | 4 +- .../NMSAboveBottomOffsetIntegerValue.java | 2 +- .../offset/NMSBelowTopOffsetIntegerValue.java | 2 +- .../impl/v1_21_R1/NMSReplacer_v1_21_R1.java | 6 +- .../MinecraftFeatureGeneratorHook.java | 4 +- .../OreConfigurationGeneratorHook.java | 6 +- .../placement/ActivationModifierHook.java | 4 +- .../MinecraftPlacementModifierHook.java | 4 +- impl/v1_21_R2/build.gradle.kts | 10 + impl/v1_21_R2/pom.xml | 80 --- .../impl/v1_21_R2/extra/OreVeinHandler.java | 2 +- .../generator/MinecraftFeatureGenerator.java | 4 +- .../generator/OreConfigurationGenerator.java | 6 +- .../placement/MinecraftPlacementModifier.java | 4 +- .../NMSAboveBottomOffsetIntegerValue.java | 2 +- .../offset/NMSBelowTopOffsetIntegerValue.java | 2 +- .../impl/v1_21_R2/NMSReflectionNames.java | 36 +- .../impl/v1_21_R2/NMSReplacer_v1_21_R2.java | 10 +- .../MinecraftFeatureGeneratorHook.java | 4 +- .../OreConfigurationGeneratorHook.java | 6 +- .../placement/ActivationModifierHook.java | 4 +- .../MinecraftPlacementModifierHook.java | 4 +- impl/v1_21_R3/build.gradle.kts | 9 + impl/v1_21_R3/pom.xml | 80 --- .../impl/v1_21_R3/extra/OreVeinHandler.java | 6 +- .../generator/MinecraftFeatureGenerator.java | 4 +- .../generator/OreConfigurationGenerator.java | 6 +- .../placement/MinecraftPlacementModifier.java | 4 +- .../NMSAboveBottomOffsetIntegerValue.java | 2 +- .../offset/NMSBelowTopOffsetIntegerValue.java | 2 +- .../impl/v1_21_R3/NMSReflectionNames.java | 36 +- .../impl/v1_21_R3/NMSReplacer_v1_21_R3.java | 6 +- .../MinecraftFeatureGeneratorHook.java | 4 +- .../OreConfigurationGeneratorHook.java | 6 +- .../placement/ActivationModifierHook.java | 4 +- .../v1_21_R3/placement/CountModifierHook.java | 4 +- .../placement/HeightRangeModifierHook.java | 4 +- .../MinecraftPlacementModifierHook.java | 4 +- .../placement/RarityModifierHook.java | 4 +- .../SurfaceRelativeThresholdModifierHook.java | 4 +- .../SurfaceWaterDepthModifierHook.java | 2 + ore-control/build.gradle.kts | 86 +++ ore-control/pom.xml | 193 ------- .../derfrzocker/ore/control/OreControl.java | 20 +- ore-control/src/main/resources/plugin.yml | 14 - pom.xml | 131 ----- settings.gradle.kts | 36 ++ 280 files changed, 893 insertions(+), 17229 deletions(-) create mode 100644 api/build.gradle.kts delete mode 100644 api/pom.xml create mode 100644 build-logic/build.gradle.kts create mode 100644 build-logic/settings.gradle.kts create mode 100644 build-logic/src/main/kotlin/buildlogic.adapter.gradle.kts create mode 100644 build-logic/src/main/kotlin/buildlogic.common-java.gradle.kts create mode 100644 build-logic/src/main/kotlin/buildlogic.common.gradle.kts create mode 100644 build-logic/src/main/kotlin/buildlogic.shadow.gradle.kts create mode 100644 build.gradle.kts create mode 100644 common/build.gradle.kts delete mode 100644 common/pom.xml create mode 100644 common/src/main/java/de/derfrzocker/feature/common/util/Refraction.java create mode 100644 gradle/gradle-daemon-jvm.properties create mode 100644 gradle/libs.versions.toml create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100755 gradlew create mode 100644 gradlew.bat delete mode 100644 impl/pom.xml delete mode 100644 impl/v1_18_R1/pom.xml delete mode 100644 impl/v1_18_R1/src/main/java/de/derfrzocker/feature/impl/v1_18_R1/feature/generator/GlowstoneBlobFeatureGenerator.java delete mode 100644 impl/v1_18_R1/src/main/java/de/derfrzocker/feature/impl/v1_18_R1/feature/generator/MinecraftFeatureGenerator.java delete mode 100644 impl/v1_18_R1/src/main/java/de/derfrzocker/feature/impl/v1_18_R1/feature/generator/OreFeatureGenerator.java delete mode 100644 impl/v1_18_R1/src/main/java/de/derfrzocker/feature/impl/v1_18_R1/feature/generator/ScatteredOreGenerator.java delete mode 100644 impl/v1_18_R1/src/main/java/de/derfrzocker/feature/impl/v1_18_R1/feature/generator/configuration/OreFeatureConfiguration.java delete mode 100644 impl/v1_18_R1/src/main/java/de/derfrzocker/feature/impl/v1_18_R1/placement/CountModifier.java delete mode 100644 impl/v1_18_R1/src/main/java/de/derfrzocker/feature/impl/v1_18_R1/placement/HeightRangeModifier.java delete mode 100644 impl/v1_18_R1/src/main/java/de/derfrzocker/feature/impl/v1_18_R1/placement/MinecraftPlacementModifier.java delete mode 100644 impl/v1_18_R1/src/main/java/de/derfrzocker/feature/impl/v1_18_R1/placement/RarityModifier.java delete mode 100644 impl/v1_18_R1/src/main/java/de/derfrzocker/feature/impl/v1_18_R1/placement/SurfaceRelativeThresholdModifier.java delete mode 100644 impl/v1_18_R1/src/main/java/de/derfrzocker/feature/impl/v1_18_R1/placement/SurfaceWaterDepthModifier.java delete mode 100644 impl/v1_18_R1/src/main/java/de/derfrzocker/feature/impl/v1_18_R1/placement/configuration/SurfaceRelativeThresholdModifierConfiguration.java delete mode 100644 impl/v1_18_R1/src/main/java/de/derfrzocker/feature/impl/v1_18_R1/value/heightmap/HeightmapType.java delete mode 100644 impl/v1_18_R1/src/main/java/de/derfrzocker/feature/impl/v1_18_R1/value/heightmap/HeightmapValue.java delete mode 100644 impl/v1_18_R1/src/main/java/de/derfrzocker/feature/impl/v1_18_R1/value/offset/NMSAboveBottomOffsetIntegerValue.java delete mode 100644 impl/v1_18_R1/src/main/java/de/derfrzocker/feature/impl/v1_18_R1/value/offset/NMSBelowTopOffsetIntegerValue.java delete mode 100644 impl/v1_18_R1/src/main/java/de/derfrzocker/feature/impl/v1_18_R1/value/target/TargetType.java delete mode 100644 impl/v1_18_R1/src/main/java/de/derfrzocker/feature/impl/v1_18_R1/value/target/TargetValue.java delete mode 100644 impl/v1_18_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R1/ConversionUtil.java delete mode 100644 impl/v1_18_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R1/NMSReflectionNames.java delete mode 100644 impl/v1_18_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R1/NMSReplacer_v1_18_R1.java delete mode 100644 impl/v1_18_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R1/feature/generator/GlowstoneBlobFeatureGeneratorHook.java delete mode 100644 impl/v1_18_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R1/feature/generator/MinecraftFeatureGeneratorHook.java delete mode 100644 impl/v1_18_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R1/feature/generator/OreFeatureGeneratorHook.java delete mode 100644 impl/v1_18_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R1/feature/generator/ScatteredOreFeatureGeneratorHook.java delete mode 100644 impl/v1_18_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R1/placement/CountModifierHook.java delete mode 100644 impl/v1_18_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R1/placement/HeightRangeModifierHook.java delete mode 100644 impl/v1_18_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R1/placement/MinecraftPlacementModifierHook.java delete mode 100644 impl/v1_18_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R1/placement/RarityModifierHook.java delete mode 100644 impl/v1_18_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R1/placement/SurfaceRelativeThresholdModifierHook.java delete mode 100644 impl/v1_18_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R1/placement/SurfaceWaterDepthModifierHook.java delete mode 100644 impl/v1_18_R2/pom.xml delete mode 100644 impl/v1_18_R2/src/main/java/de/derfrzocker/feature/impl/v1_18_R2/feature/generator/GlowstoneBlobFeatureGenerator.java delete mode 100644 impl/v1_18_R2/src/main/java/de/derfrzocker/feature/impl/v1_18_R2/feature/generator/MinecraftFeatureGenerator.java delete mode 100644 impl/v1_18_R2/src/main/java/de/derfrzocker/feature/impl/v1_18_R2/feature/generator/OreFeatureGenerator.java delete mode 100644 impl/v1_18_R2/src/main/java/de/derfrzocker/feature/impl/v1_18_R2/feature/generator/ScatteredOreGenerator.java delete mode 100644 impl/v1_18_R2/src/main/java/de/derfrzocker/feature/impl/v1_18_R2/feature/generator/configuration/OreFeatureConfiguration.java delete mode 100644 impl/v1_18_R2/src/main/java/de/derfrzocker/feature/impl/v1_18_R2/placement/CountModifier.java delete mode 100644 impl/v1_18_R2/src/main/java/de/derfrzocker/feature/impl/v1_18_R2/placement/HeightRangeModifier.java delete mode 100644 impl/v1_18_R2/src/main/java/de/derfrzocker/feature/impl/v1_18_R2/placement/MinecraftPlacementModifier.java delete mode 100644 impl/v1_18_R2/src/main/java/de/derfrzocker/feature/impl/v1_18_R2/placement/RarityModifier.java delete mode 100644 impl/v1_18_R2/src/main/java/de/derfrzocker/feature/impl/v1_18_R2/placement/SurfaceRelativeThresholdModifier.java delete mode 100644 impl/v1_18_R2/src/main/java/de/derfrzocker/feature/impl/v1_18_R2/placement/SurfaceWaterDepthModifier.java delete mode 100644 impl/v1_18_R2/src/main/java/de/derfrzocker/feature/impl/v1_18_R2/placement/configuration/SurfaceRelativeThresholdModifierConfiguration.java delete mode 100644 impl/v1_18_R2/src/main/java/de/derfrzocker/feature/impl/v1_18_R2/value/heightmap/HeightmapType.java delete mode 100644 impl/v1_18_R2/src/main/java/de/derfrzocker/feature/impl/v1_18_R2/value/heightmap/HeightmapValue.java delete mode 100644 impl/v1_18_R2/src/main/java/de/derfrzocker/feature/impl/v1_18_R2/value/offset/NMSAboveBottomOffsetIntegerValue.java delete mode 100644 impl/v1_18_R2/src/main/java/de/derfrzocker/feature/impl/v1_18_R2/value/offset/NMSBelowTopOffsetIntegerValue.java delete mode 100644 impl/v1_18_R2/src/main/java/de/derfrzocker/feature/impl/v1_18_R2/value/target/TargetType.java delete mode 100644 impl/v1_18_R2/src/main/java/de/derfrzocker/feature/impl/v1_18_R2/value/target/TargetValue.java delete mode 100644 impl/v1_18_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R2/ConversionUtil.java delete mode 100644 impl/v1_18_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R2/NMSReflectionNames.java delete mode 100644 impl/v1_18_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R2/NMSReplacer_v1_18_R2.java delete mode 100644 impl/v1_18_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R2/feature/generator/GlowstoneBlobFeatureGeneratorHook.java delete mode 100644 impl/v1_18_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R2/feature/generator/MinecraftFeatureGeneratorHook.java delete mode 100644 impl/v1_18_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R2/feature/generator/OreFeatureGeneratorHook.java delete mode 100644 impl/v1_18_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R2/feature/generator/ScatteredOreFeatureGeneratorHook.java delete mode 100644 impl/v1_18_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R2/placement/ActivationModifierHook.java delete mode 100644 impl/v1_18_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R2/placement/CountModifierHook.java delete mode 100644 impl/v1_18_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R2/placement/HeightRangeModifierHook.java delete mode 100644 impl/v1_18_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R2/placement/MinecraftPlacementModifierHook.java delete mode 100644 impl/v1_18_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R2/placement/RarityModifierHook.java delete mode 100644 impl/v1_18_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R2/placement/SurfaceRelativeThresholdModifierHook.java delete mode 100644 impl/v1_18_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R2/placement/SurfaceWaterDepthModifierHook.java delete mode 100644 impl/v1_19_R1/pom.xml delete mode 100644 impl/v1_19_R1/src/main/java/de/derfrzocker/feature/impl/v1_19_R1/extra/OreVeinHandler.java delete mode 100644 impl/v1_19_R1/src/main/java/de/derfrzocker/feature/impl/v1_19_R1/feature/generator/GlowstoneBlobFeatureGenerator.java delete mode 100644 impl/v1_19_R1/src/main/java/de/derfrzocker/feature/impl/v1_19_R1/feature/generator/MinecraftFeatureGenerator.java delete mode 100644 impl/v1_19_R1/src/main/java/de/derfrzocker/feature/impl/v1_19_R1/feature/generator/OreFeatureGenerator.java delete mode 100644 impl/v1_19_R1/src/main/java/de/derfrzocker/feature/impl/v1_19_R1/feature/generator/ScatteredOreGenerator.java delete mode 100644 impl/v1_19_R1/src/main/java/de/derfrzocker/feature/impl/v1_19_R1/feature/generator/configuration/OreFeatureConfiguration.java delete mode 100644 impl/v1_19_R1/src/main/java/de/derfrzocker/feature/impl/v1_19_R1/placement/CountModifier.java delete mode 100644 impl/v1_19_R1/src/main/java/de/derfrzocker/feature/impl/v1_19_R1/placement/HeightRangeModifier.java delete mode 100644 impl/v1_19_R1/src/main/java/de/derfrzocker/feature/impl/v1_19_R1/placement/MinecraftPlacementModifier.java delete mode 100644 impl/v1_19_R1/src/main/java/de/derfrzocker/feature/impl/v1_19_R1/placement/RarityModifier.java delete mode 100644 impl/v1_19_R1/src/main/java/de/derfrzocker/feature/impl/v1_19_R1/placement/SurfaceRelativeThresholdModifier.java delete mode 100644 impl/v1_19_R1/src/main/java/de/derfrzocker/feature/impl/v1_19_R1/placement/SurfaceWaterDepthModifier.java delete mode 100644 impl/v1_19_R1/src/main/java/de/derfrzocker/feature/impl/v1_19_R1/placement/configuration/SurfaceRelativeThresholdModifierConfiguration.java delete mode 100644 impl/v1_19_R1/src/main/java/de/derfrzocker/feature/impl/v1_19_R1/value/heightmap/HeightmapType.java delete mode 100644 impl/v1_19_R1/src/main/java/de/derfrzocker/feature/impl/v1_19_R1/value/heightmap/HeightmapValue.java delete mode 100644 impl/v1_19_R1/src/main/java/de/derfrzocker/feature/impl/v1_19_R1/value/offset/NMSAboveBottomOffsetIntegerValue.java delete mode 100644 impl/v1_19_R1/src/main/java/de/derfrzocker/feature/impl/v1_19_R1/value/offset/NMSBelowTopOffsetIntegerValue.java delete mode 100644 impl/v1_19_R1/src/main/java/de/derfrzocker/feature/impl/v1_19_R1/value/target/TargetType.java delete mode 100644 impl/v1_19_R1/src/main/java/de/derfrzocker/feature/impl/v1_19_R1/value/target/TargetValue.java delete mode 100644 impl/v1_19_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R1/ConversionUtil.java delete mode 100644 impl/v1_19_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R1/NMSReflectionNames.java delete mode 100644 impl/v1_19_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R1/NMSReplacer_v1_19_R1.java delete mode 100644 impl/v1_19_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R1/feature/generator/GlowstoneBlobFeatureGeneratorHook.java delete mode 100644 impl/v1_19_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R1/feature/generator/MinecraftFeatureGeneratorHook.java delete mode 100644 impl/v1_19_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R1/feature/generator/OreFeatureGeneratorHook.java delete mode 100644 impl/v1_19_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R1/feature/generator/ScatteredOreFeatureGeneratorHook.java delete mode 100644 impl/v1_19_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R1/placement/ActivationModifierHook.java delete mode 100644 impl/v1_19_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R1/placement/CountModifierHook.java delete mode 100644 impl/v1_19_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R1/placement/HeightRangeModifierHook.java delete mode 100644 impl/v1_19_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R1/placement/MinecraftPlacementModifierHook.java delete mode 100644 impl/v1_19_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R1/placement/RarityModifierHook.java delete mode 100644 impl/v1_19_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R1/placement/SurfaceRelativeThresholdModifierHook.java delete mode 100644 impl/v1_19_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R1/placement/SurfaceWaterDepthModifierHook.java delete mode 100644 impl/v1_19_R2/pom.xml delete mode 100644 impl/v1_19_R2/src/main/java/de/derfrzocker/feature/impl/v1_19_R2/extra/OreVeinHandler.java delete mode 100644 impl/v1_19_R2/src/main/java/de/derfrzocker/feature/impl/v1_19_R2/feature/generator/GlowstoneBlobFeatureGenerator.java delete mode 100644 impl/v1_19_R2/src/main/java/de/derfrzocker/feature/impl/v1_19_R2/feature/generator/MinecraftFeatureGenerator.java delete mode 100644 impl/v1_19_R2/src/main/java/de/derfrzocker/feature/impl/v1_19_R2/feature/generator/OreFeatureGenerator.java delete mode 100644 impl/v1_19_R2/src/main/java/de/derfrzocker/feature/impl/v1_19_R2/feature/generator/ScatteredOreGenerator.java delete mode 100644 impl/v1_19_R2/src/main/java/de/derfrzocker/feature/impl/v1_19_R2/feature/generator/configuration/OreFeatureConfiguration.java delete mode 100644 impl/v1_19_R2/src/main/java/de/derfrzocker/feature/impl/v1_19_R2/placement/CountModifier.java delete mode 100644 impl/v1_19_R2/src/main/java/de/derfrzocker/feature/impl/v1_19_R2/placement/HeightRangeModifier.java delete mode 100644 impl/v1_19_R2/src/main/java/de/derfrzocker/feature/impl/v1_19_R2/placement/MinecraftPlacementModifier.java delete mode 100644 impl/v1_19_R2/src/main/java/de/derfrzocker/feature/impl/v1_19_R2/placement/RarityModifier.java delete mode 100644 impl/v1_19_R2/src/main/java/de/derfrzocker/feature/impl/v1_19_R2/placement/SurfaceRelativeThresholdModifier.java delete mode 100644 impl/v1_19_R2/src/main/java/de/derfrzocker/feature/impl/v1_19_R2/placement/SurfaceWaterDepthModifier.java delete mode 100644 impl/v1_19_R2/src/main/java/de/derfrzocker/feature/impl/v1_19_R2/placement/configuration/SurfaceRelativeThresholdModifierConfiguration.java delete mode 100644 impl/v1_19_R2/src/main/java/de/derfrzocker/feature/impl/v1_19_R2/value/heightmap/HeightmapType.java delete mode 100644 impl/v1_19_R2/src/main/java/de/derfrzocker/feature/impl/v1_19_R2/value/heightmap/HeightmapValue.java delete mode 100644 impl/v1_19_R2/src/main/java/de/derfrzocker/feature/impl/v1_19_R2/value/offset/NMSAboveBottomOffsetIntegerValue.java delete mode 100644 impl/v1_19_R2/src/main/java/de/derfrzocker/feature/impl/v1_19_R2/value/offset/NMSBelowTopOffsetIntegerValue.java delete mode 100644 impl/v1_19_R2/src/main/java/de/derfrzocker/feature/impl/v1_19_R2/value/target/TargetType.java delete mode 100644 impl/v1_19_R2/src/main/java/de/derfrzocker/feature/impl/v1_19_R2/value/target/TargetValue.java delete mode 100644 impl/v1_19_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R2/ConversionUtil.java delete mode 100644 impl/v1_19_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R2/NMSReflectionNames.java delete mode 100644 impl/v1_19_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R2/NMSReplacer_v1_19_R2.java delete mode 100644 impl/v1_19_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R2/feature/generator/GlowstoneBlobFeatureGeneratorHook.java delete mode 100644 impl/v1_19_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R2/feature/generator/MinecraftFeatureGeneratorHook.java delete mode 100644 impl/v1_19_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R2/feature/generator/OreFeatureGeneratorHook.java delete mode 100644 impl/v1_19_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R2/feature/generator/ScatteredOreFeatureGeneratorHook.java delete mode 100644 impl/v1_19_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R2/placement/ActivationModifierHook.java delete mode 100644 impl/v1_19_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R2/placement/CountModifierHook.java delete mode 100644 impl/v1_19_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R2/placement/HeightRangeModifierHook.java delete mode 100644 impl/v1_19_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R2/placement/MinecraftPlacementModifierHook.java delete mode 100644 impl/v1_19_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R2/placement/RarityModifierHook.java delete mode 100644 impl/v1_19_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R2/placement/SurfaceRelativeThresholdModifierHook.java delete mode 100644 impl/v1_19_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R2/placement/SurfaceWaterDepthModifierHook.java delete mode 100644 impl/v1_19_R3/pom.xml delete mode 100644 impl/v1_19_R3/src/main/java/de/derfrzocker/feature/impl/v1_19_R3/extra/OreVeinHandler.java delete mode 100644 impl/v1_19_R3/src/main/java/de/derfrzocker/feature/impl/v1_19_R3/feature/generator/EmptyConfigurationGenerator.java delete mode 100644 impl/v1_19_R3/src/main/java/de/derfrzocker/feature/impl/v1_19_R3/feature/generator/MinecraftFeatureGenerator.java delete mode 100644 impl/v1_19_R3/src/main/java/de/derfrzocker/feature/impl/v1_19_R3/feature/generator/OreConfigurationGenerator.java delete mode 100644 impl/v1_19_R3/src/main/java/de/derfrzocker/feature/impl/v1_19_R3/placement/CountModifier.java delete mode 100644 impl/v1_19_R3/src/main/java/de/derfrzocker/feature/impl/v1_19_R3/placement/HeightRangeModifier.java delete mode 100644 impl/v1_19_R3/src/main/java/de/derfrzocker/feature/impl/v1_19_R3/placement/MinecraftPlacementModifier.java delete mode 100644 impl/v1_19_R3/src/main/java/de/derfrzocker/feature/impl/v1_19_R3/placement/RarityModifier.java delete mode 100644 impl/v1_19_R3/src/main/java/de/derfrzocker/feature/impl/v1_19_R3/placement/SurfaceRelativeThresholdModifier.java delete mode 100644 impl/v1_19_R3/src/main/java/de/derfrzocker/feature/impl/v1_19_R3/placement/SurfaceWaterDepthModifier.java delete mode 100644 impl/v1_19_R3/src/main/java/de/derfrzocker/feature/impl/v1_19_R3/placement/configuration/SurfaceRelativeThresholdModifierConfiguration.java delete mode 100644 impl/v1_19_R3/src/main/java/de/derfrzocker/feature/impl/v1_19_R3/value/heightmap/HeightmapType.java delete mode 100644 impl/v1_19_R3/src/main/java/de/derfrzocker/feature/impl/v1_19_R3/value/heightmap/HeightmapValue.java delete mode 100644 impl/v1_19_R3/src/main/java/de/derfrzocker/feature/impl/v1_19_R3/value/offset/NMSAboveBottomOffsetIntegerValue.java delete mode 100644 impl/v1_19_R3/src/main/java/de/derfrzocker/feature/impl/v1_19_R3/value/offset/NMSBelowTopOffsetIntegerValue.java delete mode 100644 impl/v1_19_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R3/ConversionUtil.java delete mode 100644 impl/v1_19_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R3/NMSReflectionNames.java delete mode 100644 impl/v1_19_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R3/NMSReplacer_v1_19_R3.java delete mode 100644 impl/v1_19_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R3/feature/generator/EmptyConfigurationGeneratorHook.java delete mode 100644 impl/v1_19_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R3/feature/generator/MinecraftFeatureGeneratorHook.java delete mode 100644 impl/v1_19_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R3/feature/generator/OreConfigurationGeneratorHook.java delete mode 100644 impl/v1_19_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R3/placement/ActivationModifierHook.java delete mode 100644 impl/v1_19_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R3/placement/CountModifierHook.java delete mode 100644 impl/v1_19_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R3/placement/HeightRangeModifierHook.java delete mode 100644 impl/v1_19_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R3/placement/MinecraftPlacementModifierHook.java delete mode 100644 impl/v1_19_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R3/placement/RarityModifierHook.java delete mode 100644 impl/v1_19_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R3/placement/SurfaceRelativeThresholdModifierHook.java delete mode 100644 impl/v1_19_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R3/placement/SurfaceWaterDepthModifierHook.java delete mode 100644 impl/v1_20_R1/pom.xml delete mode 100644 impl/v1_20_R1/src/main/java/de/derfrzocker/feature/impl/v1_20_R1/extra/OreVeinHandler.java delete mode 100644 impl/v1_20_R1/src/main/java/de/derfrzocker/feature/impl/v1_20_R1/feature/generator/EmptyConfigurationGenerator.java delete mode 100644 impl/v1_20_R1/src/main/java/de/derfrzocker/feature/impl/v1_20_R1/feature/generator/MinecraftFeatureGenerator.java delete mode 100644 impl/v1_20_R1/src/main/java/de/derfrzocker/feature/impl/v1_20_R1/feature/generator/OreConfigurationGenerator.java delete mode 100644 impl/v1_20_R1/src/main/java/de/derfrzocker/feature/impl/v1_20_R1/placement/CountModifier.java delete mode 100644 impl/v1_20_R1/src/main/java/de/derfrzocker/feature/impl/v1_20_R1/placement/HeightRangeModifier.java delete mode 100644 impl/v1_20_R1/src/main/java/de/derfrzocker/feature/impl/v1_20_R1/placement/MinecraftPlacementModifier.java delete mode 100644 impl/v1_20_R1/src/main/java/de/derfrzocker/feature/impl/v1_20_R1/placement/RarityModifier.java delete mode 100644 impl/v1_20_R1/src/main/java/de/derfrzocker/feature/impl/v1_20_R1/placement/SurfaceRelativeThresholdModifier.java delete mode 100644 impl/v1_20_R1/src/main/java/de/derfrzocker/feature/impl/v1_20_R1/placement/SurfaceWaterDepthModifier.java delete mode 100644 impl/v1_20_R1/src/main/java/de/derfrzocker/feature/impl/v1_20_R1/placement/configuration/SurfaceRelativeThresholdModifierConfiguration.java delete mode 100644 impl/v1_20_R1/src/main/java/de/derfrzocker/feature/impl/v1_20_R1/value/heightmap/HeightmapType.java delete mode 100644 impl/v1_20_R1/src/main/java/de/derfrzocker/feature/impl/v1_20_R1/value/heightmap/HeightmapValue.java delete mode 100644 impl/v1_20_R1/src/main/java/de/derfrzocker/feature/impl/v1_20_R1/value/offset/NMSAboveBottomOffsetIntegerValue.java delete mode 100644 impl/v1_20_R1/src/main/java/de/derfrzocker/feature/impl/v1_20_R1/value/offset/NMSBelowTopOffsetIntegerValue.java delete mode 100644 impl/v1_20_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_20_R1/ConversionUtil.java delete mode 100644 impl/v1_20_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_20_R1/NMSReflectionNames.java delete mode 100644 impl/v1_20_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_20_R1/NMSReplacer_v1_20_R1.java delete mode 100644 impl/v1_20_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_20_R1/feature/generator/EmptyConfigurationGeneratorHook.java delete mode 100644 impl/v1_20_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_20_R1/feature/generator/MinecraftFeatureGeneratorHook.java delete mode 100644 impl/v1_20_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_20_R1/feature/generator/OreConfigurationGeneratorHook.java delete mode 100644 impl/v1_20_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_20_R1/placement/ActivationModifierHook.java delete mode 100644 impl/v1_20_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_20_R1/placement/CountModifierHook.java delete mode 100644 impl/v1_20_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_20_R1/placement/HeightRangeModifierHook.java delete mode 100644 impl/v1_20_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_20_R1/placement/MinecraftPlacementModifierHook.java delete mode 100644 impl/v1_20_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_20_R1/placement/RarityModifierHook.java delete mode 100644 impl/v1_20_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_20_R1/placement/SurfaceRelativeThresholdModifierHook.java delete mode 100644 impl/v1_20_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_20_R1/placement/SurfaceWaterDepthModifierHook.java create mode 100644 impl/v1_20_R2/build.gradle.kts delete mode 100644 impl/v1_20_R2/pom.xml create mode 100644 impl/v1_20_R3/build.gradle.kts delete mode 100644 impl/v1_20_R3/pom.xml create mode 100644 impl/v1_20_R4/build.gradle.kts delete mode 100644 impl/v1_20_R4/pom.xml create mode 100644 impl/v1_21_R1/build.gradle.kts delete mode 100644 impl/v1_21_R1/pom.xml create mode 100644 impl/v1_21_R2/build.gradle.kts delete mode 100644 impl/v1_21_R2/pom.xml create mode 100644 impl/v1_21_R3/build.gradle.kts delete mode 100644 impl/v1_21_R3/pom.xml create mode 100644 ore-control/build.gradle.kts delete mode 100644 ore-control/pom.xml delete mode 100644 ore-control/src/main/resources/plugin.yml delete mode 100644 pom.xml create mode 100644 settings.gradle.kts diff --git a/.gitignore b/.gitignore index 8729a2d8..875d4c5d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,6 @@ +/.gradle/ +/build/ /.idea/ /api/target/ /api/.flattened-pom.xml @@ -6,32 +8,6 @@ /common/target/ /common/.flattened-pom.xml /common/ore-control-common.iml -/impl/v1_18_R1/target/ -/impl/v1_18_R1/.flattened-pom.xml -/impl/v1_18_R1/ore-control-impl-v1_18_R1.iml -/impl/v1_18_R2/target/ -/impl/v1_18_R2/.flattened-pom.xml -/impl/v1_18_R2/ore-control-impl-v1_18_R2.iml -/impl/v1_19_R1/target/ -/impl/v1_19_R1/.flattened-pom.xml -/impl/v1_19_R1/ore-control-impl-v1_19_R1.iml -/impl/v1_19_R2/target/ -/impl/v1_19_R2/.flattened-pom.xml -/impl/v1_19_R2/ore-control-impl-v1_19_R2.iml -/impl/v1_19_R3/target/ -/impl/v1_19_R3/.flattened-pom.xml -/impl/v1_19_R3/ore-control-impl-v1_19_R3.iml -/impl/v1_20_R1/target/ -/impl/v1_20_R1/.flattened-pom.xml -/impl/v1_20_R1/ore-control-impl-v1_20_R1.iml -/impl/v1_20_R2/target/ -/impl/v1_20_R2/.flattened-pom.xml -/impl/v1_20_R2/ore-control-impl-v1_20_R2.iml -/impl/v1_20_R3/target/ -/impl/v1_20_R3/.flattened-pom.xml -/impl/v1_20_R3/ore-control-impl-v1_20_R3.iml -/impl/.flattened-pom.xml -/impl/ore-control-impl.iml /ore-control/target/ /ore-control/.flattened-pom.xml /ore-control/ore-control.iml @@ -40,4 +16,7 @@ .flattened-pom.xml target *.iml - +*/build/ +*/.gradle +impl/*/build/ +impl/*/.gradle \ No newline at end of file diff --git a/api/build.gradle.kts b/api/build.gradle.kts new file mode 100644 index 00000000..6ad7f362 --- /dev/null +++ b/api/build.gradle.kts @@ -0,0 +1,14 @@ + +plugins { + `java-library` + id("buildlogic.common") +} + +repositories { + maven("https://repo.papermc.io/repository/maven-public/") +} + +dependencies { + compileOnly(libs.paperApi) + compileOnly(libs.jetbrainsAnnotations) +} diff --git a/api/pom.xml b/api/pom.xml deleted file mode 100644 index 02c2c350..00000000 --- a/api/pom.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - 4.0.0 - - - ore-control-parent - de.derfrzocker - ${revision} - - - ore-control-api - - \ No newline at end of file diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts new file mode 100644 index 00000000..d113a8cb --- /dev/null +++ b/build-logic/build.gradle.kts @@ -0,0 +1,15 @@ +plugins { + `kotlin-dsl` +} + +repositories { + mavenCentral() + gradlePluginPortal() +} + +dependencies { + implementation(gradleApi()) + implementation(libs.grgit) + implementation(libs.paperweight) + implementation(libs.shadow) +} diff --git a/build-logic/settings.gradle.kts b/build-logic/settings.gradle.kts new file mode 100644 index 00000000..aa5e146f --- /dev/null +++ b/build-logic/settings.gradle.kts @@ -0,0 +1,9 @@ +dependencyResolutionManagement { + versionCatalogs { + create("libs") { + from(files("../gradle/libs.versions.toml")) + } + } +} + +rootProject.name = "build-logic" diff --git a/build-logic/src/main/kotlin/buildlogic.adapter.gradle.kts b/build-logic/src/main/kotlin/buildlogic.adapter.gradle.kts new file mode 100644 index 00000000..4cf12058 --- /dev/null +++ b/build-logic/src/main/kotlin/buildlogic.adapter.gradle.kts @@ -0,0 +1,36 @@ +plugins { + `java-library` + id("io.papermc.paperweight.userdev") + id("buildlogic.common-java") +} + +repositories { + maven { + name = "Paper" + url = uri("https://repo.papermc.io/repository/maven-public/") + } + maven { + name = "DerFrZocker-Releases" + url = uri("https://nexus.derfrzocker.de/repository/maven-releases/") + metadataSources { + artifact() + } + } + mavenCentral() +} + +paperweight.reobfArtifactConfiguration = io.papermc.paperweight.userdev.ReobfArtifactConfiguration.REOBF_PRODUCTION + +dependencies { + "compileOnly"(project(":api")) + "compileOnly"(project(":common")) + constraints { + "remapper"("net.fabricmc:tiny-remapper:[0.8.11,)") { + because("Need remapper to support Java 21") + } + } +} + +tasks.named("assemble").configure { + dependsOn("reobfJar") +} diff --git a/build-logic/src/main/kotlin/buildlogic.common-java.gradle.kts b/build-logic/src/main/kotlin/buildlogic.common-java.gradle.kts new file mode 100644 index 00000000..c4ec93c1 --- /dev/null +++ b/build-logic/src/main/kotlin/buildlogic.common-java.gradle.kts @@ -0,0 +1,16 @@ + +plugins { + id("eclipse") + id("idea") +} + +tasks + .withType() + .matching { it.name == "compileJava" || it.name == "compileTestJava" } + .configureEach { + options.release.set(21) + options.encoding = "UTF-8" + options.compilerArgs.add("-parameters") + options.compilerArgs.add("-Werror") + } + diff --git a/build-logic/src/main/kotlin/buildlogic.common.gradle.kts b/build-logic/src/main/kotlin/buildlogic.common.gradle.kts new file mode 100644 index 00000000..90394ecf --- /dev/null +++ b/build-logic/src/main/kotlin/buildlogic.common.gradle.kts @@ -0,0 +1,26 @@ +import org.gradle.kotlin.dsl.`java-library` +import org.gradle.kotlin.dsl.repositories + +plugins { + `java-library` + id("buildlogic.common-java") +} + +repositories { + maven { + name = "Paper" + url = uri("https://repo.papermc.io/repository/maven-public/") + } + maven { + name = "DerFrZocker-Releases" + url = uri("https://nexus.derfrzocker.de/repository/maven-releases/") + metadataSources { + artifact() + } + } + maven { + name = "CodeMC" + url = uri("https://repo.codemc.org/repository/maven-public") + } + mavenCentral() +} diff --git a/build-logic/src/main/kotlin/buildlogic.shadow.gradle.kts b/build-logic/src/main/kotlin/buildlogic.shadow.gradle.kts new file mode 100644 index 00000000..a504488e --- /dev/null +++ b/build-logic/src/main/kotlin/buildlogic.shadow.gradle.kts @@ -0,0 +1,5 @@ + +plugins { + id("com.gradleup.shadow") + id("buildlogic.common-java") +} diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 00000000..0730a743 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,25 @@ +import org.ajoberstar.grgit.Grgit +import java.time.LocalDate +import java.time.format.DateTimeFormatter + +plugins { + jacoco + id("org.ajoberstar.grgit") version "5.2.2" +} + +val date: String = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy.MM.dd")) + +if (!project.hasProperty("gitCommitHash")) { + apply(plugin = "org.ajoberstar.grgit") + val gitCommitHash: String? = try { + extensions.getByName("grgit").head()?.abbreviatedId + } catch (e: Exception) { + logger.warn("Error getting commit hash", e) + "" + } + version = "$date-$gitCommitHash" +} else { + version = date +} + +group = "de.derfrzocker" diff --git a/common/build.gradle.kts b/common/build.gradle.kts new file mode 100644 index 00000000..1fed1fe9 --- /dev/null +++ b/common/build.gradle.kts @@ -0,0 +1,12 @@ +plugins { + `java-library` + id("buildlogic.common") +} + +dependencies { + compileOnly(libs.paperApi) + implementation(project(":api")) + implementation(libs.bstats) + implementation(libs.spigotutils) + compileOnly(libs.exp4j) +} diff --git a/common/pom.xml b/common/pom.xml deleted file mode 100644 index 03148611..00000000 --- a/common/pom.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - 4.0.0 - - - ore-control-parent - de.derfrzocker - ${revision} - - - ore-control-common - - - - de.derfrzocker - ore-control-api - ${project.version} - provided - - - net.objecthunter - exp4j - 0.4.8 - provided - - - - \ No newline at end of file diff --git a/common/src/main/java/de/derfrzocker/feature/common/util/Refraction.java b/common/src/main/java/de/derfrzocker/feature/common/util/Refraction.java new file mode 100644 index 00000000..96f1f19a --- /dev/null +++ b/common/src/main/java/de/derfrzocker/feature/common/util/Refraction.java @@ -0,0 +1,23 @@ +package de.derfrzocker.feature.common.util; + +public class Refraction { + private static final String MOJANG_MAPPED_CLASS_NAME = "net.minecraft.nbt.ListTag"; + private static final boolean IS_MOJANG_MAPPED; + + static { + boolean isMojangMapped; + try { + Class.forName(MOJANG_MAPPED_CLASS_NAME, false, Refraction.class.getClassLoader()); + isMojangMapped = true; + } catch (ClassNotFoundException e) { + isMojangMapped = false; + } + IS_MOJANG_MAPPED = isMojangMapped; + } + + public static String pickName(String mojangName, String spigotName) { + return IS_MOJANG_MAPPED ? mojangName : spigotName; + } + + private Refraction() {} +} diff --git a/gradle/gradle-daemon-jvm.properties b/gradle/gradle-daemon-jvm.properties new file mode 100644 index 00000000..63e5bbdf --- /dev/null +++ b/gradle/gradle-daemon-jvm.properties @@ -0,0 +1,2 @@ +#This file is generated by updateDaemonJvm +toolchainVersion=21 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 00000000..a2e0baf0 --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,23 @@ +[libraries] +grgit = "org.ajoberstar.grgit:grgit-gradle:5.2.2" +shadow = "com.gradleup.shadow:shadow-gradle-plugin:8.3.5" + +paperweight = "io.papermc.paperweight.userdev:io.papermc.paperweight.userdev.gradle.plugin:1.7.7" + +jsr305 = "com.google.code.findbugs:jsr305:3.0.2" +jetbrainsAnnotations = "org.jetbrains:annotations:24.1.0" + +junit = "org.junit.jupiter:junit-jupiter:5.10.0-M1" + +mockito-bom = "org.mockito:mockito-bom:5.11.0" +mockito-core.module = "org.mockito:mockito-core" +mockito-junit-jupiter.module = "org.mockito:mockito-junit-jupiter" + +commonsCli = "commons-cli:commons-cli:1.4" + +paperApi = "io.papermc.paper:paper-api:1.20.2-R0.1-SNAPSHOT" +paperLib = "io.papermc:paperlib:1.0.8" + +bstats = "org.bstats:bstats-bukkit:3.0.0" +spigotutils = "de.derfrzocker:spigot-utils:97" +exp4j = "net.objecthunter:exp4j:0.4.8" diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..a4b76b9530d66f5e68d973ea569d8e19de379189 GIT binary patch literal 43583 zcma&N1CXTcmMvW9vTb(Rwr$&4wr$(C?dmSu>@vG-+vuvg^_??!{yS%8zW-#zn-LkA z5&1^$^{lnmUON?}LBF8_K|(?T0Ra(xUH{($5eN!MR#ZihR#HxkUPe+_R8Cn`RRs(P z_^*#_XlXmGv7!4;*Y%p4nw?{bNp@UZHv1?Um8r6)Fei3p@ClJn0ECfg1hkeuUU@Or zDaPa;U3fE=3L}DooL;8f;P0ipPt0Z~9P0)lbStMS)ag54=uL9ia-Lm3nh|@(Y?B`; zx_#arJIpXH!U{fbCbI^17}6Ri*H<>OLR%c|^mh8+)*h~K8Z!9)DPf zR2h?lbDZQ`p9P;&DQ4F0sur@TMa!Y}S8irn(%d-gi0*WxxCSk*A?3lGh=gcYN?FGl z7D=Js!i~0=u3rox^eO3i@$0=n{K1lPNU zwmfjRVmLOCRfe=seV&P*1Iq=^i`502keY8Uy-WNPwVNNtJFx?IwAyRPZo2Wo1+S(xF37LJZ~%i)kpFQ3Fw=mXfd@>%+)RpYQLnr}B~~zoof(JVm^^&f zxKV^+3D3$A1G;qh4gPVjhrC8e(VYUHv#dy^)(RoUFM?o%W-EHxufuWf(l*@-l+7vt z=l`qmR56K~F|v<^Pd*p~1_y^P0P^aPC##d8+HqX4IR1gu+7w#~TBFphJxF)T$2WEa zxa?H&6=Qe7d(#tha?_1uQys2KtHQ{)Qco)qwGjrdNL7thd^G5i8Os)CHqc>iOidS} z%nFEDdm=GXBw=yXe1W-ShHHFb?Cc70+$W~z_+}nAoHFYI1MV1wZegw*0y^tC*s%3h zhD3tN8b=Gv&rj}!SUM6|ajSPp*58KR7MPpI{oAJCtY~JECm)*m_x>AZEu>DFgUcby z1Qaw8lU4jZpQ_$;*7RME+gq1KySGG#Wql>aL~k9tLrSO()LWn*q&YxHEuzmwd1?aAtI zBJ>P=&$=l1efe1CDU;`Fd+_;&wI07?V0aAIgc(!{a z0Jg6Y=inXc3^n!U0Atk`iCFIQooHqcWhO(qrieUOW8X(x?(RD}iYDLMjSwffH2~tB z)oDgNBLB^AJBM1M^c5HdRx6fBfka`(LD-qrlh5jqH~);#nw|iyp)()xVYak3;Ybik z0j`(+69aK*B>)e_p%=wu8XC&9e{AO4c~O1U`5X9}?0mrd*m$_EUek{R?DNSh(=br# z#Q61gBzEpmy`$pA*6!87 zSDD+=@fTY7<4A?GLqpA?Pb2z$pbCc4B4zL{BeZ?F-8`s$?>*lXXtn*NC61>|*w7J* z$?!iB{6R-0=KFmyp1nnEmLsA-H0a6l+1uaH^g%c(p{iT&YFrbQ$&PRb8Up#X3@Zsk zD^^&LK~111%cqlP%!_gFNa^dTYT?rhkGl}5=fL{a`UViaXWI$k-UcHJwmaH1s=S$4 z%4)PdWJX;hh5UoK?6aWoyLxX&NhNRqKam7tcOkLh{%j3K^4Mgx1@i|Pi&}<^5>hs5 zm8?uOS>%)NzT(%PjVPGa?X%`N2TQCKbeH2l;cTnHiHppPSJ<7y-yEIiC!P*ikl&!B z%+?>VttCOQM@ShFguHVjxX^?mHX^hSaO_;pnyh^v9EumqSZTi+#f&_Vaija0Q-e*| z7ulQj6Fs*bbmsWp{`auM04gGwsYYdNNZcg|ph0OgD>7O}Asn7^Z=eI>`$2*v78;sj-}oMoEj&@)9+ycEOo92xSyY344^ z11Hb8^kdOvbf^GNAK++bYioknrpdN>+u8R?JxG=!2Kd9r=YWCOJYXYuM0cOq^FhEd zBg2puKy__7VT3-r*dG4c62Wgxi52EMCQ`bKgf*#*ou(D4-ZN$+mg&7$u!! z-^+Z%;-3IDwqZ|K=ah85OLwkO zKxNBh+4QHh)u9D?MFtpbl)us}9+V!D%w9jfAMYEb>%$A;u)rrI zuBudh;5PN}_6J_}l55P3l_)&RMlH{m!)ai-i$g)&*M`eN$XQMw{v^r@-125^RRCF0 z^2>|DxhQw(mtNEI2Kj(;KblC7x=JlK$@78`O~>V!`|1Lm-^JR$-5pUANAnb(5}B}JGjBsliK4& zk6y(;$e&h)lh2)L=bvZKbvh@>vLlreBdH8No2>$#%_Wp1U0N7Ank!6$dFSi#xzh|( zRi{Uw%-4W!{IXZ)fWx@XX6;&(m_F%c6~X8hx=BN1&q}*( zoaNjWabE{oUPb!Bt$eyd#$5j9rItB-h*5JiNi(v^e|XKAj*8(k<5-2$&ZBR5fF|JA z9&m4fbzNQnAU}r8ab>fFV%J0z5awe#UZ|bz?Ur)U9bCIKWEzi2%A+5CLqh?}K4JHi z4vtM;+uPsVz{Lfr;78W78gC;z*yTch~4YkLr&m-7%-xc ztw6Mh2d>_iO*$Rd8(-Cr1_V8EO1f*^@wRoSozS) zy1UoC@pruAaC8Z_7~_w4Q6n*&B0AjOmMWa;sIav&gu z|J5&|{=a@vR!~k-OjKEgPFCzcJ>#A1uL&7xTDn;{XBdeM}V=l3B8fE1--DHjSaxoSjNKEM9|U9#m2<3>n{Iuo`r3UZp;>GkT2YBNAh|b z^jTq-hJp(ebZh#Lk8hVBP%qXwv-@vbvoREX$TqRGTgEi$%_F9tZES@z8Bx}$#5eeG zk^UsLBH{bc2VBW)*EdS({yw=?qmevwi?BL6*=12k9zM5gJv1>y#ML4!)iiPzVaH9% zgSImetD@dam~e>{LvVh!phhzpW+iFvWpGT#CVE5TQ40n%F|p(sP5mXxna+Ev7PDwA zamaV4m*^~*xV+&p;W749xhb_X=$|LD;FHuB&JL5?*Y2-oIT(wYY2;73<^#46S~Gx| z^cez%V7x$81}UWqS13Gz80379Rj;6~WdiXWOSsdmzY39L;Hg3MH43o*y8ibNBBH`(av4|u;YPq%{R;IuYow<+GEsf@R?=@tT@!}?#>zIIn0CoyV!hq3mw zHj>OOjfJM3F{RG#6ujzo?y32m^tgSXf@v=J$ELdJ+=5j|=F-~hP$G&}tDZsZE?5rX ztGj`!S>)CFmdkccxM9eGIcGnS2AfK#gXwj%esuIBNJQP1WV~b~+D7PJTmWGTSDrR` zEAu4B8l>NPuhsk5a`rReSya2nfV1EK01+G!x8aBdTs3Io$u5!6n6KX%uv@DxAp3F@{4UYg4SWJtQ-W~0MDb|j-$lwVn znAm*Pl!?Ps&3wO=R115RWKb*JKoexo*)uhhHBncEDMSVa_PyA>k{Zm2(wMQ(5NM3# z)jkza|GoWEQo4^s*wE(gHz?Xsg4`}HUAcs42cM1-qq_=+=!Gk^y710j=66(cSWqUe zklbm8+zB_syQv5A2rj!Vbw8;|$@C!vfNmNV!yJIWDQ>{+2x zKjuFX`~~HKG~^6h5FntRpnnHt=D&rq0>IJ9#F0eM)Y-)GpRjiN7gkA8wvnG#K=q{q z9dBn8_~wm4J<3J_vl|9H{7q6u2A!cW{bp#r*-f{gOV^e=8S{nc1DxMHFwuM$;aVI^ zz6A*}m8N-&x8;aunp1w7_vtB*pa+OYBw=TMc6QK=mbA-|Cf* zvyh8D4LRJImooUaSb7t*fVfih<97Gf@VE0|z>NcBwBQze);Rh!k3K_sfunToZY;f2 z^HmC4KjHRVg+eKYj;PRN^|E0>Gj_zagfRbrki68I^#~6-HaHg3BUW%+clM1xQEdPYt_g<2K+z!$>*$9nQ>; zf9Bei{?zY^-e{q_*|W#2rJG`2fy@{%6u0i_VEWTq$*(ZN37|8lFFFt)nCG({r!q#9 z5VK_kkSJ3?zOH)OezMT{!YkCuSSn!K#-Rhl$uUM(bq*jY? zi1xbMVthJ`E>d>(f3)~fozjg^@eheMF6<)I`oeJYx4*+M&%c9VArn(OM-wp%M<-`x z7sLP1&3^%Nld9Dhm@$3f2}87!quhI@nwd@3~fZl_3LYW-B?Ia>ui`ELg z&Qfe!7m6ze=mZ`Ia9$z|ARSw|IdMpooY4YiPN8K z4B(ts3p%2i(Td=tgEHX z0UQ_>URBtG+-?0E;E7Ld^dyZ;jjw0}XZ(}-QzC6+NN=40oDb2^v!L1g9xRvE#@IBR zO!b-2N7wVfLV;mhEaXQ9XAU+>=XVA6f&T4Z-@AX!leJ8obP^P^wP0aICND?~w&NykJ#54x3_@r7IDMdRNy4Hh;h*!u(Ol(#0bJdwEo$5437-UBjQ+j=Ic>Q2z` zJNDf0yO6@mr6y1#n3)s(W|$iE_i8r@Gd@!DWDqZ7J&~gAm1#~maIGJ1sls^gxL9LLG_NhU!pTGty!TbhzQnu)I*S^54U6Yu%ZeCg`R>Q zhBv$n5j0v%O_j{QYWG!R9W?5_b&67KB$t}&e2LdMvd(PxN6Ir!H4>PNlerpBL>Zvyy!yw z-SOo8caEpDt(}|gKPBd$qND5#a5nju^O>V&;f890?yEOfkSG^HQVmEbM3Ugzu+UtH zC(INPDdraBN?P%kE;*Ae%Wto&sgw(crfZ#Qy(<4nk;S|hD3j{IQRI6Yq|f^basLY; z-HB&Je%Gg}Jt@={_C{L$!RM;$$|iD6vu#3w?v?*;&()uB|I-XqEKqZPS!reW9JkLewLb!70T7n`i!gNtb1%vN- zySZj{8-1>6E%H&=V}LM#xmt`J3XQoaD|@XygXjdZ1+P77-=;=eYpoEQ01B@L*a(uW zrZeZz?HJsw_4g0vhUgkg@VF8<-X$B8pOqCuWAl28uB|@r`19DTUQQsb^pfqB6QtiT z*`_UZ`fT}vtUY#%sq2{rchyfu*pCg;uec2$-$N_xgjZcoumE5vSI{+s@iLWoz^Mf; zuI8kDP{!XY6OP~q5}%1&L}CtfH^N<3o4L@J@zg1-mt{9L`s^z$Vgb|mr{@WiwAqKg zp#t-lhrU>F8o0s1q_9y`gQNf~Vb!F%70f}$>i7o4ho$`uciNf=xgJ>&!gSt0g;M>*x4-`U)ysFW&Vs^Vk6m%?iuWU+o&m(2Jm26Y(3%TL; zA7T)BP{WS!&xmxNw%J=$MPfn(9*^*TV;$JwRy8Zl*yUZi8jWYF>==j~&S|Xinsb%c z2?B+kpet*muEW7@AzjBA^wAJBY8i|#C{WtO_or&Nj2{=6JTTX05}|H>N2B|Wf!*3_ z7hW*j6p3TvpghEc6-wufFiY!%-GvOx*bZrhZu+7?iSrZL5q9}igiF^*R3%DE4aCHZ zqu>xS8LkW+Auv%z-<1Xs92u23R$nk@Pk}MU5!gT|c7vGlEA%G^2th&Q*zfg%-D^=f z&J_}jskj|Q;73NP4<4k*Y%pXPU2Thoqr+5uH1yEYM|VtBPW6lXaetokD0u z9qVek6Q&wk)tFbQ8(^HGf3Wp16gKmr>G;#G(HRBx?F`9AIRboK+;OfHaLJ(P>IP0w zyTbTkx_THEOs%Q&aPrxbZrJlio+hCC_HK<4%f3ZoSAyG7Dn`=X=&h@m*|UYO-4Hq0 z-Bq&+Ie!S##4A6OGoC~>ZW`Y5J)*ouaFl_e9GA*VSL!O_@xGiBw!AF}1{tB)z(w%c zS1Hmrb9OC8>0a_$BzeiN?rkPLc9%&;1CZW*4}CDDNr2gcl_3z+WC15&H1Zc2{o~i) z)LLW=WQ{?ricmC`G1GfJ0Yp4Dy~Ba;j6ZV4r{8xRs`13{dD!xXmr^Aga|C=iSmor% z8hi|pTXH)5Yf&v~exp3o+sY4B^^b*eYkkCYl*T{*=-0HniSA_1F53eCb{x~1k3*`W zr~};p1A`k{1DV9=UPnLDgz{aJH=-LQo<5%+Em!DNN252xwIf*wF_zS^!(XSm(9eoj z=*dXG&n0>)_)N5oc6v!>-bd(2ragD8O=M|wGW z!xJQS<)u70m&6OmrF0WSsr@I%T*c#Qo#Ha4d3COcX+9}hM5!7JIGF>7<~C(Ear^Sn zm^ZFkV6~Ula6+8S?oOROOA6$C&q&dp`>oR-2Ym3(HT@O7Sd5c~+kjrmM)YmgPH*tL zX+znN>`tv;5eOfX?h{AuX^LK~V#gPCu=)Tigtq9&?7Xh$qN|%A$?V*v=&-2F$zTUv z`C#WyIrChS5|Kgm_GeudCFf;)!WH7FI60j^0o#65o6`w*S7R@)88n$1nrgU(oU0M9 zx+EuMkC>(4j1;m6NoGqEkpJYJ?vc|B zOlwT3t&UgL!pX_P*6g36`ZXQ; z9~Cv}ANFnJGp(;ZhS(@FT;3e)0)Kp;h^x;$*xZn*k0U6-&FwI=uOGaODdrsp-!K$Ac32^c{+FhI-HkYd5v=`PGsg%6I`4d9Jy)uW0y%) zm&j^9WBAp*P8#kGJUhB!L?a%h$hJgQrx!6KCB_TRo%9{t0J7KW8!o1B!NC)VGLM5! zpZy5Jc{`r{1e(jd%jsG7k%I+m#CGS*BPA65ZVW~fLYw0dA-H_}O zrkGFL&P1PG9p2(%QiEWm6x;U-U&I#;Em$nx-_I^wtgw3xUPVVu zqSuKnx&dIT-XT+T10p;yjo1Y)z(x1fb8Dzfn8e yu?e%!_ptzGB|8GrCfu%p?(_ zQccdaaVK$5bz;*rnyK{_SQYM>;aES6Qs^lj9lEs6_J+%nIiuQC*fN;z8md>r_~Mfl zU%p5Dt_YT>gQqfr@`cR!$NWr~+`CZb%dn;WtzrAOI>P_JtsB76PYe*<%H(y>qx-`Kq!X_; z<{RpAqYhE=L1r*M)gNF3B8r(<%8mo*SR2hu zccLRZwGARt)Hlo1euqTyM>^!HK*!Q2P;4UYrysje@;(<|$&%vQekbn|0Ruu_Io(w4#%p6ld2Yp7tlA`Y$cciThP zKzNGIMPXX%&Ud0uQh!uQZz|FB`4KGD?3!ND?wQt6!n*f4EmCoJUh&b?;B{|lxs#F- z31~HQ`SF4x$&v00@(P+j1pAaj5!s`)b2RDBp*PB=2IB>oBF!*6vwr7Dp%zpAx*dPr zb@Zjq^XjN?O4QcZ*O+8>)|HlrR>oD*?WQl5ri3R#2?*W6iJ>>kH%KnnME&TT@ZzrHS$Q%LC?n|e>V+D+8D zYc4)QddFz7I8#}y#Wj6>4P%34dZH~OUDb?uP%-E zwjXM(?Sg~1!|wI(RVuxbu)-rH+O=igSho_pDCw(c6b=P zKk4ATlB?bj9+HHlh<_!&z0rx13K3ZrAR8W)!@Y}o`?a*JJsD+twZIv`W)@Y?Amu_u zz``@-e2X}27$i(2=9rvIu5uTUOVhzwu%mNazS|lZb&PT;XE2|B&W1>=B58#*!~D&) zfVmJGg8UdP*fx(>Cj^?yS^zH#o-$Q-*$SnK(ZVFkw+er=>N^7!)FtP3y~Xxnu^nzY zikgB>Nj0%;WOltWIob|}%lo?_C7<``a5hEkx&1ku$|)i>Rh6@3h*`slY=9U}(Ql_< zaNG*J8vb&@zpdhAvv`?{=zDedJ23TD&Zg__snRAH4eh~^oawdYi6A3w8<Ozh@Kw)#bdktM^GVb zrG08?0bG?|NG+w^&JvD*7LAbjED{_Zkc`3H!My>0u5Q}m!+6VokMLXxl`Mkd=g&Xx z-a>m*#G3SLlhbKB!)tnzfWOBV;u;ftU}S!NdD5+YtOjLg?X}dl>7m^gOpihrf1;PY zvll&>dIuUGs{Qnd- zwIR3oIrct8Va^Tm0t#(bJD7c$Z7DO9*7NnRZorrSm`b`cxz>OIC;jSE3DO8`hX955ui`s%||YQtt2 z5DNA&pG-V+4oI2s*x^>-$6J?p=I>C|9wZF8z;VjR??Icg?1w2v5Me+FgAeGGa8(3S z4vg*$>zC-WIVZtJ7}o9{D-7d>zCe|z#<9>CFve-OPAYsneTb^JH!Enaza#j}^mXy1 z+ULn^10+rWLF6j2>Ya@@Kq?26>AqK{A_| zQKb*~F1>sE*=d?A?W7N2j?L09_7n+HGi{VY;MoTGr_)G9)ot$p!-UY5zZ2Xtbm=t z@dpPSGwgH=QtIcEulQNI>S-#ifbnO5EWkI;$A|pxJd885oM+ zGZ0_0gDvG8q2xebj+fbCHYfAXuZStH2j~|d^sBAzo46(K8n59+T6rzBwK)^rfPT+B zyIFw)9YC-V^rhtK`!3jrhmW-sTmM+tPH+;nwjL#-SjQPUZ53L@A>y*rt(#M(qsiB2 zx6B)dI}6Wlsw%bJ8h|(lhkJVogQZA&n{?Vgs6gNSXzuZpEyu*xySy8ro07QZ7Vk1!3tJphN_5V7qOiyK8p z#@jcDD8nmtYi1^l8ml;AF<#IPK?!pqf9D4moYk>d99Im}Jtwj6c#+A;f)CQ*f-hZ< z=p_T86jog%!p)D&5g9taSwYi&eP z#JuEK%+NULWus;0w32-SYFku#i}d~+{Pkho&^{;RxzP&0!RCm3-9K6`>KZpnzS6?L z^H^V*s!8<>x8bomvD%rh>Zp3>Db%kyin;qtl+jAv8Oo~1g~mqGAC&Qi_wy|xEt2iz zWAJEfTV%cl2Cs<1L&DLRVVH05EDq`pH7Oh7sR`NNkL%wi}8n>IXcO40hp+J+sC!W?!krJf!GJNE8uj zg-y~Ns-<~D?yqbzVRB}G>0A^f0!^N7l=$m0OdZuqAOQqLc zX?AEGr1Ht+inZ-Qiwnl@Z0qukd__a!C*CKuGdy5#nD7VUBM^6OCpxCa2A(X;e0&V4 zM&WR8+wErQ7UIc6LY~Q9x%Sn*Tn>>P`^t&idaOEnOd(Ufw#>NoR^1QdhJ8s`h^|R_ zXX`c5*O~Xdvh%q;7L!_!ohf$NfEBmCde|#uVZvEo>OfEq%+Ns7&_f$OR9xsihRpBb z+cjk8LyDm@U{YN>+r46?nn{7Gh(;WhFw6GAxtcKD+YWV?uge>;+q#Xx4!GpRkVZYu zzsF}1)7$?%s9g9CH=Zs+B%M_)+~*j3L0&Q9u7!|+T`^O{xE6qvAP?XWv9_MrZKdo& z%IyU)$Q95AB4!#hT!_dA>4e@zjOBD*Y=XjtMm)V|+IXzjuM;(l+8aA5#Kaz_$rR6! zj>#&^DidYD$nUY(D$mH`9eb|dtV0b{S>H6FBfq>t5`;OxA4Nn{J(+XihF(stSche7$es&~N$epi&PDM_N`As;*9D^L==2Q7Z2zD+CiU(|+-kL*VG+&9!Yb3LgPy?A zm7Z&^qRG_JIxK7-FBzZI3Q<;{`DIxtc48k> zc|0dmX;Z=W$+)qE)~`yn6MdoJ4co;%!`ddy+FV538Y)j(vg}5*k(WK)KWZ3WaOG!8 z!syGn=s{H$odtpqFrT#JGM*utN7B((abXnpDM6w56nhw}OY}0TiTG1#f*VFZr+^-g zbP10`$LPq_;PvrA1XXlyx2uM^mrjTzX}w{yuLo-cOClE8MMk47T25G8M!9Z5ypOSV zAJUBGEg5L2fY)ZGJb^E34R2zJ?}Vf>{~gB!8=5Z) z9y$>5c)=;o0HeHHSuE4U)#vG&KF|I%-cF6f$~pdYJWk_dD}iOA>iA$O$+4%@>JU08 zS`ep)$XLPJ+n0_i@PkF#ri6T8?ZeAot$6JIYHm&P6EB=BiaNY|aA$W0I+nz*zkz_z zkEru!tj!QUffq%)8y0y`T&`fuus-1p>=^hnBiBqD^hXrPs`PY9tU3m0np~rISY09> z`P3s=-kt_cYcxWd{de@}TwSqg*xVhp;E9zCsnXo6z z?f&Sv^U7n4`xr=mXle94HzOdN!2kB~4=%)u&N!+2;z6UYKUDqi-s6AZ!haB;@&B`? z_TRX0%@suz^TRdCb?!vNJYPY8L_}&07uySH9%W^Tc&1pia6y1q#?*Drf}GjGbPjBS zbOPcUY#*$3sL2x4v_i*Y=N7E$mR}J%|GUI(>WEr+28+V z%v5{#e!UF*6~G&%;l*q*$V?&r$Pp^sE^i-0$+RH3ERUUdQ0>rAq2(2QAbG}$y{de( z>{qD~GGuOk559Y@%$?N^1ApVL_a704>8OD%8Y%8B;FCt%AoPu8*D1 zLB5X>b}Syz81pn;xnB}%0FnwazlWfUV)Z-~rZg6~b z6!9J$EcE&sEbzcy?CI~=boWA&eeIa%z(7SE^qgVLz??1Vbc1*aRvc%Mri)AJaAG!p z$X!_9Ds;Zz)f+;%s&dRcJt2==P{^j3bf0M=nJd&xwUGlUFn?H=2W(*2I2Gdu zv!gYCwM10aeus)`RIZSrCK=&oKaO_Ry~D1B5!y0R=%!i2*KfXGYX&gNv_u+n9wiR5 z*e$Zjju&ODRW3phN925%S(jL+bCHv6rZtc?!*`1TyYXT6%Ju=|X;6D@lq$8T zW{Y|e39ioPez(pBH%k)HzFITXHvnD6hw^lIoUMA;qAJ^CU?top1fo@s7xT13Fvn1H z6JWa-6+FJF#x>~+A;D~;VDs26>^oH0EI`IYT2iagy23?nyJ==i{g4%HrAf1-*v zK1)~@&(KkwR7TL}L(A@C_S0G;-GMDy=MJn2$FP5s<%wC)4jC5PXoxrQBFZ_k0P{{s@sz+gX`-!=T8rcB(=7vW}^K6oLWMmp(rwDh}b zwaGGd>yEy6fHv%jM$yJXo5oMAQ>c9j`**}F?MCry;T@47@r?&sKHgVe$MCqk#Z_3S z1GZI~nOEN*P~+UaFGnj{{Jo@16`(qVNtbU>O0Hf57-P>x8Jikp=`s8xWs^dAJ9lCQ z)GFm+=OV%AMVqVATtN@|vp61VVAHRn87}%PC^RAzJ%JngmZTasWBAWsoAqBU+8L8u z4A&Pe?fmTm0?mK-BL9t+{y7o(7jm+RpOhL9KnY#E&qu^}B6=K_dB}*VlSEiC9fn)+V=J;OnN)Ta5v66ic1rG+dGAJ1 z1%Zb_+!$=tQ~lxQrzv3x#CPb?CekEkA}0MYSgx$Jdd}q8+R=ma$|&1a#)TQ=l$1tQ z=tL9&_^vJ)Pk}EDO-va`UCT1m#Uty1{v^A3P~83_#v^ozH}6*9mIjIr;t3Uv%@VeW zGL6(CwCUp)Jq%G0bIG%?{_*Y#5IHf*5M@wPo6A{$Um++Co$wLC=J1aoG93&T7Ho}P z=mGEPP7GbvoG!uD$k(H3A$Z))+i{Hy?QHdk>3xSBXR0j!11O^mEe9RHmw!pvzv?Ua~2_l2Yh~_!s1qS`|0~0)YsbHSz8!mG)WiJE| z2f($6TQtt6L_f~ApQYQKSb=`053LgrQq7G@98#igV>y#i==-nEjQ!XNu9 z~;mE+gtj4IDDNQJ~JVk5Ux6&LCSFL!y=>79kE9=V}J7tD==Ga+IW zX)r7>VZ9dY=V&}DR))xUoV!u(Z|%3ciQi_2jl}3=$Agc(`RPb z8kEBpvY>1FGQ9W$n>Cq=DIpski};nE)`p3IUw1Oz0|wxll^)4dq3;CCY@RyJgFgc# zKouFh!`?Xuo{IMz^xi-h=StCis_M7yq$u) z?XHvw*HP0VgR+KR6wI)jEMX|ssqYvSf*_3W8zVTQzD?3>H!#>InzpSO)@SC8q*ii- z%%h}_#0{4JG;Jm`4zg};BPTGkYamx$Xo#O~lBirRY)q=5M45n{GCfV7h9qwyu1NxOMoP4)jjZMxmT|IQQh0U7C$EbnMN<3)Kk?fFHYq$d|ICu>KbY_hO zTZM+uKHe(cIZfEqyzyYSUBZa8;Fcut-GN!HSA9ius`ltNebF46ZX_BbZNU}}ZOm{M2&nANL9@0qvih15(|`S~z}m&h!u4x~(%MAO$jHRWNfuxWF#B)E&g3ghSQ9|> z(MFaLQj)NE0lowyjvg8z0#m6FIuKE9lDO~Glg}nSb7`~^&#(Lw{}GVOS>U)m8bF}x zVjbXljBm34Cs-yM6TVusr+3kYFjr28STT3g056y3cH5Tmge~ASxBj z%|yb>$eF;WgrcOZf569sDZOVwoo%8>XO>XQOX1OyN9I-SQgrm;U;+#3OI(zrWyow3 zk==|{lt2xrQ%FIXOTejR>;wv(Pb8u8}BUpx?yd(Abh6? zsoO3VYWkeLnF43&@*#MQ9-i-d0t*xN-UEyNKeyNMHw|A(k(_6QKO=nKMCxD(W(Yop zsRQ)QeL4X3Lxp^L%wzi2-WVSsf61dqliPUM7srDB?Wm6Lzn0&{*}|IsKQW;02(Y&| zaTKv|`U(pSzuvR6Rduu$wzK_W-Y-7>7s?G$)U}&uK;<>vU}^^ns@Z!p+9?St1s)dG zK%y6xkPyyS1$~&6v{kl?Md6gwM|>mt6Upm>oa8RLD^8T{0?HC!Z>;(Bob7el(DV6x zi`I)$&E&ngwFS@bi4^xFLAn`=fzTC;aimE^!cMI2n@Vo%Ae-ne`RF((&5y6xsjjAZ zVguVoQ?Z9uk$2ON;ersE%PU*xGO@T*;j1BO5#TuZKEf(mB7|g7pcEA=nYJ{s3vlbg zd4-DUlD{*6o%Gc^N!Nptgay>j6E5;3psI+C3Q!1ZIbeCubW%w4pq9)MSDyB{HLm|k zxv-{$$A*pS@csolri$Ge<4VZ}e~78JOL-EVyrbxKra^d{?|NnPp86!q>t<&IP07?Z z^>~IK^k#OEKgRH+LjllZXk7iA>2cfH6+(e&9ku5poo~6y{GC5>(bRK7hwjiurqAiZ zg*DmtgY}v83IjE&AbiWgMyFbaRUPZ{lYiz$U^&Zt2YjG<%m((&_JUbZcfJ22(>bi5 z!J?<7AySj0JZ&<-qXX;mcV!f~>G=sB0KnjWca4}vrtunD^1TrpfeS^4dvFr!65knK zZh`d;*VOkPs4*-9kL>$GP0`(M!j~B;#x?Ba~&s6CopvO86oM?-? zOw#dIRc;6A6T?B`Qp%^<U5 z19x(ywSH$_N+Io!6;e?`tWaM$`=Db!gzx|lQ${DG!zb1Zl&|{kX0y6xvO1o z220r<-oaS^^R2pEyY;=Qllqpmue|5yI~D|iI!IGt@iod{Opz@*ml^w2bNs)p`M(Io z|E;;m*Xpjd9l)4G#KaWfV(t8YUn@A;nK^#xgv=LtnArX|vWQVuw3}B${h+frU2>9^ z!l6)!Uo4`5k`<<;E(ido7M6lKTgWezNLq>U*=uz&s=cc$1%>VrAeOoUtA|T6gO4>UNqsdK=NF*8|~*sl&wI=x9-EGiq*aqV!(VVXA57 zw9*o6Ir8Lj1npUXvlevtn(_+^X5rzdR>#(}4YcB9O50q97%rW2me5_L=%ffYPUSRc z!vv?Kv>dH994Qi>U(a<0KF6NH5b16enCp+mw^Hb3Xs1^tThFpz!3QuN#}KBbww`(h z7GO)1olDqy6?T$()R7y%NYx*B0k_2IBiZ14&8|JPFxeMF{vW>HF-Vi3+ZOI=+qP}n zw(+!WcTd~4ZJX1!ZM&y!+uyt=&i!+~d(V%GjH;-NsEEv6nS1TERt|RHh!0>W4+4pp z1-*EzAM~i`+1f(VEHI8So`S`akPfPTfq*`l{Fz`hS%k#JS0cjT2mS0#QLGf=J?1`he3W*;m4)ce8*WFq1sdP=~$5RlH1EdWm|~dCvKOi4*I_96{^95p#B<(n!d?B z=o`0{t+&OMwKcxiBECznJcfH!fL(z3OvmxP#oWd48|mMjpE||zdiTBdWelj8&Qosv zZFp@&UgXuvJw5y=q6*28AtxZzo-UUpkRW%ne+Ylf!V-0+uQXBW=5S1o#6LXNtY5!I z%Rkz#(S8Pjz*P7bqB6L|M#Er{|QLae-Y{KA>`^} z@lPjeX>90X|34S-7}ZVXe{wEei1<{*e8T-Nbj8JmD4iwcE+Hg_zhkPVm#=@b$;)h6 z<<6y`nPa`f3I6`!28d@kdM{uJOgM%`EvlQ5B2bL)Sl=|y@YB3KeOzz=9cUW3clPAU z^sYc}xf9{4Oj?L5MOlYxR{+>w=vJjvbyO5}ptT(o6dR|ygO$)nVCvNGnq(6;bHlBd zl?w-|plD8spjDF03g5ip;W3Z z><0{BCq!Dw;h5~#1BuQilq*TwEu)qy50@+BE4bX28+7erX{BD4H)N+7U`AVEuREE8 z;X?~fyhF-x_sRfHIj~6f(+^@H)D=ngP;mwJjxhQUbUdzk8f94Ab%59-eRIq?ZKrwD z(BFI=)xrUlgu(b|hAysqK<}8bslmNNeD=#JW*}^~Nrswn^xw*nL@Tx!49bfJecV&KC2G4q5a!NSv)06A_5N3Y?veAz;Gv+@U3R% z)~UA8-0LvVE{}8LVDOHzp~2twReqf}ODIyXMM6=W>kL|OHcx9P%+aJGYi_Om)b!xe zF40Vntn0+VP>o<$AtP&JANjXBn7$}C@{+@3I@cqlwR2MdwGhVPxlTIcRVu@Ho-wO` z_~Or~IMG)A_`6-p)KPS@cT9mu9RGA>dVh5wY$NM9-^c@N=hcNaw4ITjm;iWSP^ZX| z)_XpaI61<+La+U&&%2a z0za$)-wZP@mwSELo#3!PGTt$uy0C(nTT@9NX*r3Ctw6J~7A(m#8fE)0RBd`TdKfAT zCf@$MAxjP`O(u9s@c0Fd@|}UQ6qp)O5Q5DPCeE6mSIh|Rj{$cAVIWsA=xPKVKxdhg zLzPZ`3CS+KIO;T}0Ip!fAUaNU>++ZJZRk@I(h<)RsJUhZ&Ru9*!4Ptn;gX^~4E8W^TSR&~3BAZc#HquXn)OW|TJ`CTahk+{qe`5+ixON^zA9IFd8)kc%*!AiLu z>`SFoZ5bW-%7}xZ>gpJcx_hpF$2l+533{gW{a7ce^B9sIdmLrI0)4yivZ^(Vh@-1q zFT!NQK$Iz^xu%|EOK=n>ug;(7J4OnS$;yWmq>A;hsD_0oAbLYhW^1Vdt9>;(JIYjf zdb+&f&D4@4AS?!*XpH>8egQvSVX`36jMd>$+RgI|pEg))^djhGSo&#lhS~9%NuWfX zDDH;3T*GzRT@5=7ibO>N-6_XPBYxno@mD_3I#rDD?iADxX`! zh*v8^i*JEMzyN#bGEBz7;UYXki*Xr(9xXax(_1qVW=Ml)kSuvK$coq2A(5ZGhs_pF z$*w}FbN6+QDseuB9=fdp_MTs)nQf!2SlROQ!gBJBCXD&@-VurqHj0wm@LWX-TDmS= z71M__vAok|@!qgi#H&H%Vg-((ZfxPAL8AI{x|VV!9)ZE}_l>iWk8UPTGHs*?u7RfP z5MC&=c6X;XlUzrz5q?(!eO@~* zoh2I*%J7dF!!_!vXoSIn5o|wj1#_>K*&CIn{qSaRc&iFVxt*^20ngCL;QonIS>I5^ zMw8HXm>W0PGd*}Ko)f|~dDd%;Wu_RWI_d;&2g6R3S63Uzjd7dn%Svu-OKpx*o|N>F zZg=-~qLb~VRLpv`k zWSdfHh@?dp=s_X`{yxOlxE$4iuyS;Z-x!*E6eqmEm*j2bE@=ZI0YZ5%Yj29!5+J$4h{s($nakA`xgbO8w zi=*r}PWz#lTL_DSAu1?f%-2OjD}NHXp4pXOsCW;DS@BC3h-q4_l`<))8WgzkdXg3! zs1WMt32kS2E#L0p_|x+x**TFV=gn`m9BWlzF{b%6j-odf4{7a4y4Uaef@YaeuPhU8 zHBvRqN^;$Jizy+ z=zW{E5<>2gp$pH{M@S*!sJVQU)b*J5*bX4h>5VJve#Q6ga}cQ&iL#=(u+KroWrxa%8&~p{WEUF0il=db;-$=A;&9M{Rq`ouZ5m%BHT6%st%saGsD6)fQgLN}x@d3q>FC;=f%O3Cyg=Ke@Gh`XW za@RajqOE9UB6eE=zhG%|dYS)IW)&y&Id2n7r)6p_)vlRP7NJL(x4UbhlcFXWT8?K=%s7;z?Vjts?y2+r|uk8Wt(DM*73^W%pAkZa1Jd zNoE)8FvQA>Z`eR5Z@Ig6kS5?0h;`Y&OL2D&xnnAUzQz{YSdh0k zB3exx%A2TyI)M*EM6htrxSlep!Kk(P(VP`$p0G~f$smld6W1r_Z+o?=IB@^weq>5VYsYZZR@` z&XJFxd5{|KPZmVOSxc@^%71C@;z}}WhbF9p!%yLj3j%YOlPL5s>7I3vj25 z@xmf=*z%Wb4;Va6SDk9cv|r*lhZ`(y_*M@>q;wrn)oQx%B(2A$9(74>;$zmQ!4fN; z>XurIk-7@wZys<+7XL@0Fhe-f%*=(weaQEdR9Eh6>Kl-EcI({qoZqyzziGwpg-GM#251sK_ z=3|kitS!j%;fpc@oWn65SEL73^N&t>Ix37xgs= zYG%eQDJc|rqHFia0!_sm7`@lvcv)gfy(+KXA@E{3t1DaZ$DijWAcA)E0@X?2ziJ{v z&KOYZ|DdkM{}t+@{@*6ge}m%xfjIxi%qh`=^2Rwz@w0cCvZ&Tc#UmCDbVwABrON^x zEBK43FO@weA8s7zggCOWhMvGGE`baZ62cC)VHyy!5Zbt%ieH+XN|OLbAFPZWyC6)p z4P3%8sq9HdS3=ih^0OOlqTPbKuzQ?lBEI{w^ReUO{V?@`ARsL|S*%yOS=Z%sF)>-y z(LAQdhgAcuF6LQjRYfdbD1g4o%tV4EiK&ElLB&^VZHbrV1K>tHTO{#XTo>)2UMm`2 z^t4s;vnMQgf-njU-RVBRw0P0-m#d-u`(kq7NL&2T)TjI_@iKuPAK-@oH(J8?%(e!0Ir$yG32@CGUPn5w4)+9@8c&pGx z+K3GKESI4*`tYlmMHt@br;jBWTei&(a=iYslc^c#RU3Q&sYp zSG){)V<(g7+8W!Wxeb5zJb4XE{I|&Y4UrFWr%LHkdQ;~XU zgy^dH-Z3lmY+0G~?DrC_S4@=>0oM8Isw%g(id10gWkoz2Q%7W$bFk@mIzTCcIB(K8 zc<5h&ZzCdT=9n-D>&a8vl+=ZF*`uTvQviG_bLde*k>{^)&0o*b05x$MO3gVLUx`xZ z43j+>!u?XV)Yp@MmG%Y`+COH2?nQcMrQ%k~6#O%PeD_WvFO~Kct za4XoCM_X!c5vhRkIdV=xUB3xI2NNStK*8_Zl!cFjOvp-AY=D;5{uXj}GV{LK1~IE2 z|KffUiBaStRr;10R~K2VVtf{TzM7FaPm;Y(zQjILn+tIPSrJh&EMf6evaBKIvi42-WYU9Vhj~3< zZSM-B;E`g_o8_XTM9IzEL=9Lb^SPhe(f(-`Yh=X6O7+6ALXnTcUFpI>ekl6v)ZQeNCg2 z^H|{SKXHU*%nBQ@I3It0m^h+6tvI@FS=MYS$ZpBaG7j#V@P2ZuYySbp@hA# ze(kc;P4i_-_UDP?%<6>%tTRih6VBgScKU^BV6Aoeg6Uh(W^#J^V$Xo^4#Ekp ztqQVK^g9gKMTHvV7nb64UU7p~!B?>Y0oFH5T7#BSW#YfSB@5PtE~#SCCg3p^o=NkMk$<8- z6PT*yIKGrvne7+y3}_!AC8NNeI?iTY(&nakN>>U-zT0wzZf-RuyZk^X9H-DT_*wk= z;&0}6LsGtfVa1q)CEUPlx#(ED@-?H<1_FrHU#z5^P3lEB|qsxEyn%FOpjx z3S?~gvoXy~L(Q{Jh6*i~=f%9kM1>RGjBzQh_SaIDfSU_9!<>*Pm>l)cJD@wlyxpBV z4Fmhc2q=R_wHCEK69<*wG%}mgD1=FHi4h!98B-*vMu4ZGW~%IrYSLGU{^TuseqVgV zLP<%wirIL`VLyJv9XG_p8w@Q4HzNt-o;U@Au{7%Ji;53!7V8Rv0^Lu^Vf*sL>R(;c zQG_ZuFl)Mh-xEIkGu}?_(HwkB2jS;HdPLSxVU&Jxy9*XRG~^HY(f0g8Q}iqnVmgjI zfd=``2&8GsycjR?M%(zMjn;tn9agcq;&rR!Hp z$B*gzHsQ~aXw8c|a(L^LW(|`yGc!qOnV(ZjU_Q-4z1&0;jG&vAKuNG=F|H?@m5^N@ zq{E!1n;)kNTJ>|Hb2ODt-7U~-MOIFo%9I)_@7fnX+eMMNh>)V$IXesJpBn|uo8f~#aOFytCT zf9&%MCLf8mp4kwHTcojWmM3LU=#|{3L>E}SKwOd?%{HogCZ_Z1BSA}P#O(%H$;z7XyJ^sjGX;j5 zrzp>|Ud;*&VAU3x#f{CKwY7Vc{%TKKqmB@oTHA9;>?!nvMA;8+Jh=cambHz#J18x~ zs!dF>$*AnsQ{{82r5Aw&^7eRCdvcgyxH?*DV5(I$qXh^zS>us*I66_MbL8y4d3ULj z{S(ipo+T3Ag!+5`NU2sc+@*m{_X|&p#O-SAqF&g_n7ObB82~$p%fXA5GLHMC+#qqL zdt`sJC&6C2)=juQ_!NeD>U8lDVpAOkW*khf7MCcs$A(wiIl#B9HM%~GtQ^}yBPjT@ z+E=|A!Z?A(rwzZ;T}o6pOVqHzTr*i;Wrc%&36kc@jXq~+w8kVrs;%=IFdACoLAcCAmhFNpbP8;s`zG|HC2Gv?I~w4ITy=g$`0qMQdkijLSOtX6xW%Z9Nw<;M- zMN`c7=$QxN00DiSjbVt9Mi6-pjv*j(_8PyV-il8Q-&TwBwH1gz1uoxs6~uU}PrgWB zIAE_I-a1EqlIaGQNbcp@iI8W1sm9fBBNOk(k&iLBe%MCo#?xI$%ZmGA?=)M9D=0t7 zc)Q0LnI)kCy{`jCGy9lYX%mUsDWwsY`;jE(;Us@gmWPqjmXL+Hu#^;k%eT>{nMtzj zsV`Iy6leTA8-PndszF;N^X@CJrTw5IIm!GPeu)H2#FQitR{1p;MasQVAG3*+=9FYK zw*k!HT(YQorfQj+1*mCV458(T5=fH`um$gS38hw(OqVMyunQ;rW5aPbF##A3fGH6h z@W)i9Uff?qz`YbK4c}JzQpuxuE3pcQO)%xBRZp{zJ^-*|oryTxJ-rR+MXJ)!f=+pp z10H|DdGd2exhi+hftcYbM0_}C0ZI-2vh+$fU1acsB-YXid7O|=9L!3e@$H*6?G*Zp z%qFB(sgl=FcC=E4CYGp4CN>=M8#5r!RU!u+FJVlH6=gI5xHVD&k;Ta*M28BsxfMV~ zLz+@6TxnfLhF@5=yQo^1&S}cmTN@m!7*c6z;}~*!hNBjuE>NLVl2EwN!F+)0$R1S! zR|lF%n!9fkZ@gPW|x|B={V6x3`=jS*$Pu0+5OWf?wnIy>Y1MbbGSncpKO0qE(qO=ts z!~@&!N`10S593pVQu4FzpOh!tvg}p%zCU(aV5=~K#bKi zHdJ1>tQSrhW%KOky;iW+O_n;`l9~omqM%sdxdLtI`TrJzN6BQz+7xOl*rM>xVI2~# z)7FJ^Dc{DC<%~VS?@WXzuOG$YPLC;>#vUJ^MmtbSL`_yXtNKa$Hk+l-c!aC7gn(Cg ze?YPYZ(2Jw{SF6MiO5(%_pTo7j@&DHNW`|lD`~{iH+_eSTS&OC*2WTT*a`?|9w1dh zh1nh@$a}T#WE5$7Od~NvSEU)T(W$p$s5fe^GpG+7fdJ9=enRT9$wEk+ZaB>G3$KQO zgq?-rZZnIv!p#>Ty~}c*Lb_jxJg$eGM*XwHUwuQ|o^}b3^T6Bxx{!?va8aC@-xK*H ztJBFvFfsSWu89%@b^l3-B~O!CXs)I6Y}y#0C0U0R0WG zybjroj$io0j}3%P7zADXOwHwafT#uu*zfM!oD$6aJx7+WL%t-@6^rD_a_M?S^>c;z zMK580bZXo1f*L$CuMeM4Mp!;P@}b~$cd(s5*q~FP+NHSq;nw3fbWyH)i2)-;gQl{S zZO!T}A}fC}vUdskGSq&{`oxt~0i?0xhr6I47_tBc`fqaSrMOzR4>0H^;A zF)hX1nfHs)%Zb-(YGX;=#2R6C{BG;k=?FfP?9{_uFLri~-~AJ;jw({4MU7e*d)?P@ zXX*GkNY9ItFjhwgAIWq7Y!ksbMzfqpG)IrqKx9q{zu%Mdl+{Dis#p9q`02pr1LG8R z@As?eG!>IoROgS!@J*to<27coFc1zpkh?w=)h9CbYe%^Q!Ui46Y*HO0mr% zEff-*$ndMNw}H2a5@BsGj5oFfd!T(F&0$<{GO!Qdd?McKkorh=5{EIjDTHU`So>8V zBA-fqVLb2;u7UhDV1xMI?y>fe3~4urv3%PX)lDw+HYa;HFkaLqi4c~VtCm&Ca+9C~ zge+67hp#R9`+Euq59WhHX&7~RlXn=--m8$iZ~~1C8cv^2(qO#X0?vl91gzUKBeR1J z^p4!!&7)3#@@X&2aF2-)1Ffcc^F8r|RtdL2X%HgN&XU-KH2SLCbpw?J5xJ*!F-ypZ zMG%AJ!Pr&}`LW?E!K~=(NJxuSVTRCGJ$2a*Ao=uUDSys!OFYu!Vs2IT;xQ6EubLIl z+?+nMGeQQhh~??0!s4iQ#gm3!BpMpnY?04kK375e((Uc7B3RMj;wE?BCoQGu=UlZt!EZ1Q*auI)dj3Jj{Ujgt zW5hd~-HWBLI_3HuO) zNrb^XzPsTIb=*a69wAAA3J6AAZZ1VsYbIG}a`=d6?PjM)3EPaDpW2YP$|GrBX{q*! z$KBHNif)OKMBCFP5>!1d=DK>8u+Upm-{hj5o|Wn$vh1&K!lVfDB&47lw$tJ?d5|=B z^(_9=(1T3Fte)z^>|3**n}mIX;mMN5v2F#l(q*CvU{Ga`@VMp#%rQkDBy7kYbmb-q z<5!4iuB#Q_lLZ8}h|hPODI^U6`gzLJre9u3k3c#%86IKI*^H-@I48Bi*@avYm4v!n0+v zWu{M{&F8#p9cx+gF0yTB_<2QUrjMPo9*7^-uP#~gGW~y3nfPAoV%amgr>PSyVAd@l)}8#X zR5zV6t*uKJZL}?NYvPVK6J0v4iVpwiN|>+t3aYiZSp;m0!(1`bHO}TEtWR1tY%BPB z(W!0DmXbZAsT$iC13p4f>u*ZAy@JoLAkJhzFf1#4;#1deO8#8d&89}en&z!W&A3++^1(;>0SB1*54d@y&9Pn;^IAf3GiXbfT`_>{R+Xv; zQvgL>+0#8-laO!j#-WB~(I>l0NCMt_;@Gp_f0#^c)t?&#Xh1-7RR0@zPyBz!U#0Av zT?}n({(p?p7!4S2ZBw)#KdCG)uPnZe+U|0{BW!m)9 zi_9$F?m<`2!`JNFv+w8MK_K)qJ^aO@7-Ig>cM4-r0bi=>?B_2mFNJ}aE3<+QCzRr*NA!QjHw# z`1OsvcoD0?%jq{*7b!l|L1+Tw0TTAM4XMq7*ntc-Ived>Sj_ZtS|uVdpfg1_I9knY z2{GM_j5sDC7(W&}#s{jqbybqJWyn?{PW*&cQIU|*v8YGOKKlGl@?c#TCnmnAkAzV- zmK={|1G90zz=YUvC}+fMqts0d4vgA%t6Jhjv?d;(Z}(Ep8fTZfHA9``fdUHkA+z3+ zhh{ohP%Bj?T~{i0sYCQ}uC#5BwN`skI7`|c%kqkyWIQ;!ysvA8H`b-t()n6>GJj6xlYDu~8qX{AFo$Cm3d|XFL=4uvc?Keb zzb0ZmMoXca6Mob>JqkNuoP>B2Z>D`Q(TvrG6m`j}-1rGP!g|qoL=$FVQYxJQjFn33lODt3Wb1j8VR zlR++vIT6^DtYxAv_hxupbLLN3e0%A%a+hWTKDV3!Fjr^cWJ{scsAdfhpI)`Bms^M6 zQG$waKgFr=c|p9Piug=fcJvZ1ThMnNhQvBAg-8~b1?6wL*WyqXhtj^g(Ke}mEfZVM zJuLNTUVh#WsE*a6uqiz`b#9ZYg3+2%=C(6AvZGc=u&<6??!slB1a9K)=VL zY9EL^mfyKnD zSJyYBc_>G;5RRnrNgzJz#Rkn3S1`mZgO`(r5;Hw6MveN(URf_XS-r58Cn80K)ArH4 z#Rrd~LG1W&@ttw85cjp8xV&>$b%nSXH_*W}7Ch2pg$$c0BdEo-HWRTZcxngIBJad> z;C>b{jIXjb_9Jis?NZJsdm^EG}e*pR&DAy0EaSGi3XWTa(>C%tz1n$u?5Fb z1qtl?;_yjYo)(gB^iQq?=jusF%kywm?CJP~zEHi0NbZ);$(H$w(Hy@{i>$wcVRD_X|w-~(0Z9BJyh zhNh;+eQ9BEIs;tPz%jSVnfCP!3L&9YtEP;svoj_bNzeGSQIAjd zBss@A;)R^WAu-37RQrM%{DfBNRx>v!G31Z}8-El9IOJlb_MSoMu2}GDYycNaf>uny z+8xykD-7ONCM!APry_Lw6-yT>5!tR}W;W`C)1>pxSs5o1z#j7%m=&=7O4hz+Lsqm` z*>{+xsabZPr&X=}G@obTb{nPTkccJX8w3CG7X+1+t{JcMabv~UNv+G?txRqXib~c^Mo}`q{$`;EBNJ;#F*{gvS12kV?AZ%O0SFB$^ zn+}!HbmEj}w{Vq(G)OGAzH}R~kS^;(-s&=ectz8vN!_)Yl$$U@HNTI-pV`LSj7Opu zTZ5zZ)-S_{GcEQPIQXLQ#oMS`HPu{`SQiAZ)m1at*Hy%3xma|>o`h%E%8BEbi9p0r zVjcsh<{NBKQ4eKlXU|}@XJ#@uQw*$4BxKn6#W~I4T<^f99~(=}a`&3(ur8R9t+|AQ zWkQx7l}wa48-jO@ft2h+7qn%SJtL%~890FG0s5g*kNbL3I&@brh&f6)TlM`K^(bhr zJWM6N6x3flOw$@|C@kPi7yP&SP?bzP-E|HSXQXG>7gk|R9BTj`e=4de9C6+H7H7n# z#GJeVs1mtHhLDmVO?LkYRQc`DVOJ_vdl8VUihO-j#t=0T3%Fc1f9F73ufJz*adn*p zc%&vi(4NqHu^R>sAT_0EDjVR8bc%wTz#$;%NU-kbDyL_dg0%TFafZwZ?5KZpcuaO54Z9hX zD$u>q!-9`U6-D`E#`W~fIfiIF5_m6{fvM)b1NG3xf4Auw;Go~Fu7cth#DlUn{@~yu z=B;RT*dp?bO}o%4x7k9v{r=Y@^YQ^UUm(Qmliw8brO^=NP+UOohLYiaEB3^DB56&V zK?4jV61B|1Uj_5fBKW;8LdwOFZKWp)g{B%7g1~DgO&N& z#lisxf?R~Z@?3E$Mms$$JK8oe@X`5m98V*aV6Ua}8Xs2#A!{x?IP|N(%nxsH?^c{& z@vY&R1QmQs83BW28qAmJfS7MYi=h(YK??@EhjL-t*5W!p z^gYX!Q6-vBqcv~ruw@oMaU&qp0Fb(dbVzm5xJN%0o_^@fWq$oa3X?9s%+b)x4w-q5Koe(@j6Ez7V@~NRFvd zfBH~)U5!ix3isg`6be__wBJp=1@yfsCMw1C@y+9WYD9_C%{Q~7^0AF2KFryfLlUP# zwrtJEcH)jm48!6tUcxiurAMaiD04C&tPe6DI0#aoqz#Bt0_7_*X*TsF7u*zv(iEfA z;$@?XVu~oX#1YXtceQL{dSneL&*nDug^OW$DSLF0M1Im|sSX8R26&)<0Fbh^*l6!5wfSu8MpMoh=2l z^^0Sr$UpZp*9oqa23fcCfm7`ya2<4wzJ`Axt7e4jJrRFVf?nY~2&tRL* zd;6_njcz01c>$IvN=?K}9ie%Z(BO@JG2J}fT#BJQ+f5LFSgup7i!xWRKw6)iITjZU z%l6hPZia>R!`aZjwCp}I zg)%20;}f+&@t;(%5;RHL>K_&7MH^S+7<|(SZH!u zznW|jz$uA`P9@ZWtJgv$EFp>)K&Gt+4C6#*khZQXS*S~6N%JDT$r`aJDs9|uXWdbg zBwho$phWx}x!qy8&}6y5Vr$G{yGSE*r$^r{}pw zVTZKvikRZ`J_IJrjc=X1uw?estdwm&bEahku&D04HD+0Bm~q#YGS6gp!KLf$A{%Qd z&&yX@Hp>~(wU{|(#U&Bf92+1i&Q*-S+=y=3pSZy$#8Uc$#7oiJUuO{cE6=tsPhwPe| zxQpK>`Dbka`V)$}e6_OXKLB%i76~4N*zA?X+PrhH<&)}prET;kel24kW%+9))G^JI zsq7L{P}^#QsZViX%KgxBvEugr>ZmFqe^oAg?{EI=&_O#e)F3V#rc z8$4}0Zr19qd3tE4#$3_f=Bbx9oV6VO!d3(R===i-7p=Vj`520w0D3W6lQfY48}!D* z&)lZMG;~er2qBoI2gsX+Ts-hnpS~NYRDtPd^FPzn!^&yxRy#CSz(b&E*tL|jIkq|l zf%>)7Dtu>jCf`-7R#*GhGn4FkYf;B$+9IxmqH|lf6$4irg{0ept__%)V*R_OK=T06 zyT_m-o@Kp6U{l5h>W1hGq*X#8*y@<;vsOFqEjTQXFEotR+{3}ODDnj;o0@!bB5x=N z394FojuGOtVKBlVRLtHp%EJv_G5q=AgF)SKyRN5=cGBjDWv4LDn$IL`*=~J7u&Dy5 zrMc83y+w^F&{?X(KOOAl-sWZDb{9X9#jrQtmrEXD?;h-}SYT7yM(X_6qksM=K_a;Z z3u0qT0TtaNvDER_8x*rxXw&C^|h{P1qxK|@pS7vdlZ#P z7PdB7MmC2}%sdzAxt>;WM1s0??`1983O4nFK|hVAbHcZ3x{PzytQLkCVk7hA!Lo` zEJH?4qw|}WH{dc4z%aB=0XqsFW?^p=X}4xnCJXK%c#ItOSjdSO`UXJyuc8bh^Cf}8 z@Ht|vXd^6{Fgai8*tmyRGmD_s_nv~r^Fy7j`Bu`6=G)5H$i7Q7lvQnmea&TGvJp9a|qOrUymZ$6G|Ly z#zOCg++$3iB$!6!>215A4!iryregKuUT344X)jQb3|9qY>c0LO{6Vby05n~VFzd?q zgGZv&FGlkiH*`fTurp>B8v&nSxNz)=5IF$=@rgND4d`!AaaX;_lK~)-U8la_Wa8i?NJC@BURO*sUW)E9oyv3RG^YGfN%BmxzjlT)bp*$<| zX3tt?EAy<&K+bhIuMs-g#=d1}N_?isY)6Ay$mDOKRh z4v1asEGWoAp=srraLW^h&_Uw|6O+r;wns=uwYm=JN4Q!quD8SQRSeEcGh|Eb5Jg8m zOT}u;N|x@aq)=&;wufCc^#)5U^VcZw;d_wwaoh9$p@Xrc{DD6GZUqZ ziC6OT^zSq@-lhbgR8B+e;7_Giv;DK5gn^$bs<6~SUadiosfewWDJu`XsBfOd1|p=q zE>m=zF}!lObA%ePey~gqU8S6h-^J2Y?>7)L2+%8kV}Gp=h`Xm_}rlm)SyUS=`=S7msKu zC|T!gPiI1rWGb1z$Md?0YJQ;%>uPLOXf1Z>N~`~JHJ!^@D5kSXQ4ugnFZ>^`zH8CAiZmp z6Ms|#2gcGsQ{{u7+Nb9sA?U>(0e$5V1|WVwY`Kn)rsnnZ4=1u=7u!4WexZD^IQ1Jk zfF#NLe>W$3m&C^ULjdw+5|)-BSHwpegdyt9NYC{3@QtMfd8GrIWDu`gd0nv-3LpGCh@wgBaG z176tikL!_NXM+Bv#7q^cyn9$XSeZR6#!B4JE@GVH zoobHZN_*RF#@_SVYKkQ_igme-Y5U}cV(hkR#k1c{bQNMji zU7aE`?dHyx=1`kOYZo_8U7?3-7vHOp`Qe%Z*i+FX!s?6huNp0iCEW-Z7E&jRWmUW_ z67j>)Ew!yq)hhG4o?^z}HWH-e=es#xJUhDRc4B51M4~E-l5VZ!&zQq`gWe`?}#b~7w1LH4Xa-UCT5LXkXQWheBa2YJYbyQ zl1pXR%b(KCXMO0OsXgl0P0Og<{(@&z1aokU-Pq`eQq*JYgt8xdFQ6S z6Z3IFSua8W&M#`~*L#r>Jfd6*BzJ?JFdBR#bDv$_0N!_5vnmo@!>vULcDm`MFU823 zpG9pqjqz^FE5zMDoGqhs5OMmC{Y3iVcl>F}5Rs24Y5B^mYQ;1T&ks@pIApHOdrzXF z-SdX}Hf{X;TaSxG_T$0~#RhqKISGKNK47}0*x&nRIPtmdwxc&QT3$8&!3fWu1eZ_P zJveQj^hJL#Sn!*4k`3}(d(aasl&7G0j0-*_2xtAnoX1@9+h zO#c>YQg60Z;o{Bi=3i7S`Ic+ZE>K{(u|#)9y}q*j8uKQ1^>+(BI}m%1v3$=4ojGBc zm+o1*!T&b}-lVvZqIUBc8V}QyFEgm#oyIuC{8WqUNV{Toz`oxhYpP!_p2oHHh5P@iB*NVo~2=GQm+8Yrkm2Xjc_VyHg1c0>+o~@>*Qzo zHVBJS>$$}$_4EniTI;b1WShX<5-p#TPB&!;lP!lBVBbLOOxh6FuYloD%m;n{r|;MU3!q4AVkua~fieeWu2 zQAQ$ue(IklX6+V;F1vCu-&V?I3d42FgWgsb_e^29ol}HYft?{SLf>DrmOp9o!t>I^ zY7fBCk+E8n_|apgM|-;^=#B?6RnFKlN`oR)`e$+;D=yO-(U^jV;rft^G_zl`n7qnM zL z*-Y4Phq+ZI1$j$F-f;`CD#|`-T~OM5Q>x}a>B~Gb3-+9i>Lfr|Ca6S^8g*{*?_5!x zH_N!SoRP=gX1?)q%>QTY!r77e2j9W(I!uAz{T`NdNmPBBUzi2{`XMB^zJGGwFWeA9 z{fk33#*9SO0)DjROug+(M)I-pKA!CX;IY(#gE!UxXVsa)X!UftIN98{pt#4MJHOhY zM$_l}-TJlxY?LS6Nuz1T<44m<4i^8k@D$zuCPrkmz@sdv+{ciyFJG2Zwy&%c7;atIeTdh!a(R^QXnu1Oq1b42*OQFWnyQ zWeQrdvP|w_idy53Wa<{QH^lFmEd+VlJkyiC>6B#s)F;w-{c;aKIm;Kp50HnA-o3lY z9B~F$gJ@yYE#g#X&3ADx&tO+P_@mnQTz9gv30_sTsaGXkfNYXY{$(>*PEN3QL>I!k zp)KibPhrfX3%Z$H6SY`rXGYS~143wZrG2;=FLj50+VM6soI~up_>fU(2Wl@{BRsMi zO%sL3x?2l1cXTF)k&moNsHfQrQ+wu(gBt{sk#CU=UhrvJIncy@tJX5klLjgMn>~h= zg|FR&;@eh|C7`>s_9c~0-{IAPV){l|Ts`i=)AW;d9&KPc3fMeoTS%8@V~D8*h;&(^>yjT84MM}=%#LS7shLAuuj(0VAYoozhWjq z4LEr?wUe2^WGwdTIgWBkDUJa>YP@5d9^Rs$kCXmMRxuF*YMVrn?0NFyPl}>`&dqZb z<5eqR=ZG3>n2{6v6BvJ`YBZeeTtB88TAY(x0a58EWyuf>+^|x8Qa6wA|1Nb_p|nA zWWa}|z8a)--Wj`LqyFk_a3gN2>5{Rl_wbW?#by7&i*^hRknK%jwIH6=dQ8*-_{*x0j^DUfMX0`|K@6C<|1cgZ~D(e5vBFFm;HTZF(!vT8=T$K+|F)x3kqzBV4-=p1V(lzi(s7jdu0>LD#N=$Lk#3HkG!a zIF<7>%B7sRNzJ66KrFV76J<2bdYhxll0y2^_rdG=I%AgW4~)1Nvz=$1UkE^J%BxLo z+lUci`UcU062os*=`-j4IfSQA{w@y|3}Vk?i;&SSdh8n+$iHA#%ERL{;EpXl6u&8@ zzg}?hkEOUOJt?ZL=pWZFJ19mI1@P=$U5*Im1e_8Z${JsM>Ov?nh8Z zP5QvI!{Jy@&BP48%P2{Jr_VgzW;P@7)M9n|lDT|Ep#}7C$&ud&6>C^5ZiwKIg2McPU(4jhM!BD@@L(Gd*Nu$ji(ljZ<{FIeW_1Mmf;76{LU z-ywN~=uNN)Xi6$<12A9y)K%X|(W0p|&>>4OXB?IiYr||WKDOJPxiSe01NSV-h24^L z_>m$;|C+q!Mj**-qQ$L-*++en(g|hw;M!^%_h-iDjFHLo-n3JpB;p?+o2;`*jpvJU zLY^lt)Un4joij^^)O(CKs@7E%*!w>!HA4Q?0}oBJ7Nr8NQ7QmY^4~jvf0-`%waOLn zdNjAPaC0_7c|RVhw)+71NWjRi!y>C+Bl;Z`NiL^zn2*0kmj5gyhCLCxts*cWCdRI| zjsd=sT5BVJc^$GxP~YF$-U{-?kW6r@^vHXB%{CqYzU@1>dzf#3SYedJG-Rm6^RB7s zGM5PR(yKPKR)>?~vpUIeTP7A1sc8-knnJk*9)3t^e%izbdm>Y=W{$wm(cy1RB-19i za#828DMBY+ps#7Y8^6t)=Ea@%Nkt)O6JCx|ybC;Ap}Z@Zw~*}3P>MZLPb4Enxz9Wf zssobT^(R@KuShj8>@!1M7tm|2%-pYYDxz-5`rCbaTCG5{;Uxm z*g=+H1X8{NUvFGzz~wXa%Eo};I;~`37*WrRU&K0dPSB$yk(Z*@K&+mFal^?c zurbqB-+|Kb5|sznT;?Pj!+kgFY1#Dr;_%A(GIQC{3ct|{*Bji%FNa6c-thbpBkA;U zURV!Dr&X{0J}iht#-Qp2=xzuh(fM>zRoiGrYl5ttw2#r34gC41CCOC31m~^UPTK@s z6;A@)7O7_%C)>bnAXerYuAHdE93>j2N}H${zEc6&SbZ|-fiG*-qtGuy-qDelH(|u$ zorf8_T6Zqe#Ub!+e3oSyrskt_HyW_^5lrWt#30l)tHk|j$@YyEkXUOV;6B51L;M@=NIWZXU;GrAa(LGxO%|im%7F<-6N;en0Cr zLH>l*y?pMwt`1*cH~LdBPFY_l;~`N!Clyfr;7w<^X;&(ZiVdF1S5e(+Q%60zgh)s4 zn2yj$+mE=miVERP(g8}G4<85^-5f@qxh2ec?n+$A_`?qN=iyT1?U@t?V6DM~BIlBB z>u~eXm-aE>R0sQy!-I4xtCNi!!qh?R1!kKf6BoH2GG{L4%PAz0{Sh6xpuyI%*~u)s z%rLuFl)uQUCBQAtMyN;%)zFMx4loh7uTfKeB2Xif`lN?2gq6NhWhfz0u5WP9J>=V2 zo{mLtSy&BA!mSzs&CrKWq^y40JF5a&GSXIi2= z{EYb59J4}VwikL4P=>+mc6{($FNE@e=VUwG+KV21;<@lrN`mnz5jYGASyvz7BOG_6(p^eTxD-4O#lROgon;R35=|nj#eHIfJBYPWG>H>`dHKCDZ3`R{-?HO0mE~(5_WYcFmp8sU?wr*UkAQiNDGc6T zA%}GOLXlOWqL?WwfHO8MB#8M8*~Y*gz;1rWWoVSXP&IbKxbQ8+s%4Jnt?kDsq7btI zCDr0PZ)b;B%!lu&CT#RJzm{l{2fq|BcY85`w~3LSK<><@(2EdzFLt9Y_`;WXL6x`0 zDoQ?=?I@Hbr;*VVll1Gmd8*%tiXggMK81a+T(5Gx6;eNb8=uYn z5BG-0g>pP21NPn>$ntBh>`*})Fl|38oC^9Qz>~MAazH%3Q~Qb!ALMf$srexgPZ2@&c~+hxRi1;}+)-06)!#Mq<6GhP z-Q?qmgo${aFBApb5p}$1OJKTClfi8%PpnczyVKkoHw7Ml9e7ikrF0d~UB}i3vizos zXW4DN$SiEV9{faLt5bHy2a>33K%7Td-n5C*N;f&ZqAg#2hIqEb(y<&f4u5BWJ>2^4 z414GosL=Aom#m&=x_v<0-fp1r%oVJ{T-(xnomNJ(Dryv zh?vj+%=II_nV+@NR+(!fZZVM&(W6{6%9cm+o+Z6}KqzLw{(>E86uA1`_K$HqINlb1 zKelh3-jr2I9V?ych`{hta9wQ2c9=MM`2cC{m6^MhlL2{DLv7C^j z$xXBCnDl_;l|bPGMX@*tV)B!c|4oZyftUlP*?$YU9C_eAsuVHJ58?)zpbr30P*C`T z7y#ao`uE-SOG(Pi+`$=e^mle~)pRrdwL5)N;o{gpW21of(QE#U6w%*C~`v-z0QqBML!!5EeYA5IQB0 z^l01c;L6E(iytN!LhL}wfwP7W9PNAkb+)Cst?qg#$n;z41O4&v+8-zPs+XNb-q zIeeBCh#ivnFLUCwfS;p{LC0O7tm+Sf9Jn)~b%uwP{%69;QC)Ok0t%*a5M+=;y8j=v z#!*pp$9@!x;UMIs4~hP#pnfVc!%-D<+wsG@R2+J&%73lK|2G!EQC)O05TCV=&3g)C!lT=czLpZ@Sa%TYuoE?v8T8`V;e$#Zf2_Nj6nvBgh1)2 GZ~q4|mN%#X literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..cea7a793 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 00000000..f5feea6d --- /dev/null +++ b/gradlew @@ -0,0 +1,252 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 00000000..9d21a218 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,94 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/impl/pom.xml b/impl/pom.xml deleted file mode 100644 index 77eec655..00000000 --- a/impl/pom.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - 4.0.0 - - - ore-control-parent - de.derfrzocker - ${revision} - - - - v1_18_R1 - v1_18_R2 - v1_19_R1 - v1_19_R2 - v1_19_R3 - v1_20_R1 - v1_20_R2 - v1_20_R3 - v1_20_R4 - v1_21_R1 - v1_21_R2 - v1_21_R3 - - - ore-control-impl - pom - - \ No newline at end of file diff --git a/impl/v1_18_R1/pom.xml b/impl/v1_18_R1/pom.xml deleted file mode 100644 index 9081a326..00000000 --- a/impl/v1_18_R1/pom.xml +++ /dev/null @@ -1,80 +0,0 @@ - - - 4.0.0 - - - ore-control-impl - de.derfrzocker - ${revision} - - - ore-control-impl-v1_18_R1 - - - - de.derfrzocker - ore-control-api - ${project.version} - provided - - - de.derfrzocker - ore-control-common - ${project.version} - provided - - - org.spigotmc - spigot - 1.18.1-R0.1-SNAPSHOT - remapped-mojang - provided - true - - - - - - - net.md-5 - specialsource-maven-plugin - 1.2.3 - - - package - - remap - - remap-obf - - org.spigotmc:minecraft-server:1.18.1-R0.1-SNAPSHOT:txt:maps-mojang - true - org.spigotmc:spigot:1.18.1-R0.1-SNAPSHOT:jar:remapped-mojang - - true - remapped-obf - - - - package - - remap - - remap-spigot - - - ${project.build.directory}/${project.artifactId}-${project.version}-remapped-obf.jar - - org.spigotmc:minecraft-server:1.18.1-R0.1-SNAPSHOT:csrg:maps-spigot - org.spigotmc:spigot:1.18.1-R0.1-SNAPSHOT:jar:remapped-obf - - - - - - - - - \ No newline at end of file diff --git a/impl/v1_18_R1/src/main/java/de/derfrzocker/feature/impl/v1_18_R1/feature/generator/GlowstoneBlobFeatureGenerator.java b/impl/v1_18_R1/src/main/java/de/derfrzocker/feature/impl/v1_18_R1/feature/generator/GlowstoneBlobFeatureGenerator.java deleted file mode 100644 index 4b9e26eb..00000000 --- a/impl/v1_18_R1/src/main/java/de/derfrzocker/feature/impl/v1_18_R1/feature/generator/GlowstoneBlobFeatureGenerator.java +++ /dev/null @@ -1,62 +0,0 @@ -package de.derfrzocker.feature.impl.v1_18_R1.feature.generator; - -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import de.derfrzocker.feature.api.Configuration; -import de.derfrzocker.feature.api.Registries; -import de.derfrzocker.feature.api.Setting; -import de.derfrzocker.feature.api.util.Parser; -import de.derfrzocker.feature.common.feature.generator.configuration.EmptyFeatureConfiguration; -import net.minecraft.world.level.levelgen.feature.Feature; -import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Collections; -import java.util.Random; -import java.util.Set; - -public class GlowstoneBlobFeatureGenerator extends MinecraftFeatureGenerator { - - public GlowstoneBlobFeatureGenerator(Registries registries) { - super(registries, Feature.GLOWSTONE_BLOB, "glowstone_blob"); - } - - @Override - public @NotNull Set getSettings() { - return Collections.emptySet(); - } - - @Override - public @NotNull Configuration createEmptyConfiguration() { - return new EmptyFeatureConfiguration(this); - } - - @Override - public EmptyFeatureConfiguration mergeConfig(EmptyFeatureConfiguration first, EmptyFeatureConfiguration second) { - return first; - } - - @Override - public Parser createParser(Registries registries) { - return new Parser<>() { - - @Override - public JsonElement toJson(EmptyFeatureConfiguration value) { - return new JsonObject(); - } - - @Override - public EmptyFeatureConfiguration fromJson(JsonElement jsonElement) { - return new EmptyFeatureConfiguration(GlowstoneBlobFeatureGenerator.this); - } - }; - } - - @Override - public NoneFeatureConfiguration createConfiguration(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull EmptyFeatureConfiguration configuration) { - return NoneFeatureConfiguration.INSTANCE; - } -} diff --git a/impl/v1_18_R1/src/main/java/de/derfrzocker/feature/impl/v1_18_R1/feature/generator/MinecraftFeatureGenerator.java b/impl/v1_18_R1/src/main/java/de/derfrzocker/feature/impl/v1_18_R1/feature/generator/MinecraftFeatureGenerator.java deleted file mode 100644 index a2cb5a47..00000000 --- a/impl/v1_18_R1/src/main/java/de/derfrzocker/feature/impl/v1_18_R1/feature/generator/MinecraftFeatureGenerator.java +++ /dev/null @@ -1,64 +0,0 @@ -package de.derfrzocker.feature.impl.v1_18_R1.feature.generator; - -import de.derfrzocker.feature.api.FeatureGenerator; -import de.derfrzocker.feature.api.FeatureGeneratorConfiguration; -import de.derfrzocker.feature.api.Registries; -import de.derfrzocker.feature.api.util.Parser; -import net.minecraft.core.BlockPos; -import net.minecraft.world.level.WorldGenLevel; -import net.minecraft.world.level.levelgen.feature.Feature; -import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext; -import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration; -import org.bukkit.NamespacedKey; -import org.bukkit.craftbukkit.v1_18_R1.generator.CraftLimitedRegion; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Optional; -import java.util.Random; - -public abstract class MinecraftFeatureGenerator implements FeatureGenerator { - - private final Parser parser; - private final Feature feature; - private final NamespacedKey namespacedKey; - - public MinecraftFeatureGenerator(Registries registries, Feature feature, String name) { - this.parser = (Parser) createParser(registries); - this.feature = feature; - this.namespacedKey = NamespacedKey.minecraft(name); - } - - public abstract C mergeConfig(C first, C second); - - public abstract Parser createParser(Registries registries); - - public abstract M createConfiguration(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull C configuration); - - @NotNull - @Override - public C merge(@NotNull FeatureGeneratorConfiguration first, @NotNull FeatureGeneratorConfiguration second) { - return mergeConfig((C) first, (C) second); - } - - @Override - public void place(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull C configuration) { - WorldGenLevel level = ((CraftLimitedRegion) limitedRegion).getHandle(); - M config = createConfiguration(worldInfo, random, position, limitedRegion, configuration); - feature.place(new FeaturePlaceContext<>(Optional.empty(), level, level.getMinecraftWorld().getChunkSource().getGenerator(), random, new BlockPos(position.getBlockX(), position.getBlockY(), position.getBlockZ()), config)); - } - - @NotNull - @Override - public Parser getParser() { - return parser; - } - - @NotNull - @Override - public NamespacedKey getKey() { - return namespacedKey; - } -} diff --git a/impl/v1_18_R1/src/main/java/de/derfrzocker/feature/impl/v1_18_R1/feature/generator/OreFeatureGenerator.java b/impl/v1_18_R1/src/main/java/de/derfrzocker/feature/impl/v1_18_R1/feature/generator/OreFeatureGenerator.java deleted file mode 100644 index 91092372..00000000 --- a/impl/v1_18_R1/src/main/java/de/derfrzocker/feature/impl/v1_18_R1/feature/generator/OreFeatureGenerator.java +++ /dev/null @@ -1,116 +0,0 @@ -package de.derfrzocker.feature.impl.v1_18_R1.feature.generator; - -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import de.derfrzocker.feature.api.Registries; -import de.derfrzocker.feature.api.Setting; -import de.derfrzocker.feature.api.util.Parser; -import de.derfrzocker.feature.common.value.number.FloatType; -import de.derfrzocker.feature.common.value.number.FloatValue; -import de.derfrzocker.feature.common.value.number.IntegerType; -import de.derfrzocker.feature.common.value.number.IntegerValue; -import de.derfrzocker.feature.impl.v1_18_R1.feature.generator.configuration.OreFeatureConfiguration; -import de.derfrzocker.feature.impl.v1_18_R1.value.target.TargetValue; -import net.minecraft.world.level.levelgen.feature.OreFeature; -import net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.ArrayList; -import java.util.List; -import java.util.Random; -import java.util.Set; - -public class OreFeatureGenerator extends MinecraftFeatureGenerator { - - public OreFeatureGenerator(Registries registries) { - super(registries, OreFeature.ORE, "ore"); - } - - @Override - public Parser createParser(Registries registries) { - return new Parser<>() { - @Override - public JsonElement toJson(OreFeatureConfiguration value) { - JsonObject jsonObject = new JsonObject(); - - if (value.getSize() != null) { - JsonObject size = value.getSize().getValueType().getParser().toJson(value.getSize()).getAsJsonObject(); - size.addProperty("size_type", value.getSize().getValueType().getKey().toString()); - jsonObject.add("size", size); - } - - if (value.getDiscardChanceOnAirExposure() != null) { - JsonObject discardChanceOnAirExposure = value.getDiscardChanceOnAirExposure().getValueType().getParser().toJson(value.getDiscardChanceOnAirExposure()).getAsJsonObject(); - discardChanceOnAirExposure.addProperty("discard_chance_on_air_exposure_type", value.getDiscardChanceOnAirExposure().getValueType().getKey().toString()); - } - - return jsonObject; - } - - @Override - public OreFeatureConfiguration fromJson(JsonElement jsonElement) { - JsonObject jsonObject = jsonElement.getAsJsonObject(); - - IntegerValue size = null; - if (jsonObject.has("size")) { - JsonObject sizes = jsonObject.getAsJsonObject("size"); - size = registries.getValueTypeRegistry(IntegerType.class).get(NamespacedKey.fromString(sizes.getAsJsonPrimitive("size_type").getAsString())).get().getParser().fromJson(sizes); - } - - FloatValue discardChanceOnAirExposure = null; - if (jsonObject.has("discard_chance_on_air_exposure")) { - JsonObject chance = jsonObject.getAsJsonObject("discard_chance_on_air_exposure"); - discardChanceOnAirExposure = registries.getValueTypeRegistry(FloatType.class).get(NamespacedKey.fromString(chance.getAsJsonPrimitive("discard_chance_on_air_exposure_type").getAsString())).get().getParser().fromJson(chance); - } - - return new OreFeatureConfiguration(OreFeatureGenerator.this, null, size, discardChanceOnAirExposure); - } - }; - } - - @Override - public OreFeatureConfiguration mergeConfig(OreFeatureConfiguration first, OreFeatureConfiguration second) { - return new OreFeatureConfiguration(this, - first.getTargets() != null ? first.getTargets() : second.getTargets(), - first.getSize() != null ? first.getSize() : second.getSize(), - first.getDiscardChanceOnAirExposure() != null ? first.getDiscardChanceOnAirExposure() : second.getDiscardChanceOnAirExposure()); - } - - @Override - public OreConfiguration createConfiguration(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull OreFeatureConfiguration configuration) { - List blockStates = new ArrayList<>(); - if (configuration.getTargets() != null) { - for (TargetValue targetValue : configuration.getTargets()) { - blockStates.add(targetValue.getValue(worldInfo, random, position, limitedRegion)); - } - } - - int size = 0; - if (configuration.getSize() != null) { - size = configuration.getSize().getValue(worldInfo, random, position, limitedRegion); - } - - float discardChanceOnAirExposure = 0f; - if (configuration.getDiscardChanceOnAirExposure() != null) { - discardChanceOnAirExposure = configuration.getDiscardChanceOnAirExposure().getValue(worldInfo, random, position, limitedRegion); - } - - return new OreConfiguration(blockStates, size, discardChanceOnAirExposure); - } - - @NotNull - @Override - public Set getSettings() { - return OreFeatureConfiguration.SETTINGS; - } - - @NotNull - @Override - public OreFeatureConfiguration createEmptyConfiguration() { - return new OreFeatureConfiguration(this, null, null, null); - } -} diff --git a/impl/v1_18_R1/src/main/java/de/derfrzocker/feature/impl/v1_18_R1/feature/generator/ScatteredOreGenerator.java b/impl/v1_18_R1/src/main/java/de/derfrzocker/feature/impl/v1_18_R1/feature/generator/ScatteredOreGenerator.java deleted file mode 100644 index a460963c..00000000 --- a/impl/v1_18_R1/src/main/java/de/derfrzocker/feature/impl/v1_18_R1/feature/generator/ScatteredOreGenerator.java +++ /dev/null @@ -1,116 +0,0 @@ -package de.derfrzocker.feature.impl.v1_18_R1.feature.generator; - -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import de.derfrzocker.feature.api.Registries; -import de.derfrzocker.feature.api.Setting; -import de.derfrzocker.feature.api.util.Parser; -import de.derfrzocker.feature.common.value.number.FloatType; -import de.derfrzocker.feature.common.value.number.FloatValue; -import de.derfrzocker.feature.common.value.number.IntegerType; -import de.derfrzocker.feature.common.value.number.IntegerValue; -import de.derfrzocker.feature.impl.v1_18_R1.feature.generator.configuration.OreFeatureConfiguration; -import de.derfrzocker.feature.impl.v1_18_R1.value.target.TargetValue; -import net.minecraft.world.level.levelgen.feature.OreFeature; -import net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.ArrayList; -import java.util.List; -import java.util.Random; -import java.util.Set; - -public class ScatteredOreGenerator extends MinecraftFeatureGenerator { - - public ScatteredOreGenerator(Registries registries) { - super(registries, OreFeature.SCATTERED_ORE, "scattered_ore"); - } - - @Override - public Parser createParser(Registries registries) { - return new Parser<>() { - @Override - public JsonElement toJson(OreFeatureConfiguration value) { - JsonObject jsonObject = new JsonObject(); - - if (value.getSize() != null) { - JsonObject size = value.getSize().getValueType().getParser().toJson(value.getSize()).getAsJsonObject(); - size.addProperty("size_type", value.getSize().getValueType().getKey().toString()); - jsonObject.add("size", size); - } - - if (value.getDiscardChanceOnAirExposure() != null) { - JsonObject discardChanceOnAirExposure = value.getDiscardChanceOnAirExposure().getValueType().getParser().toJson(value.getDiscardChanceOnAirExposure()).getAsJsonObject(); - discardChanceOnAirExposure.addProperty("discard_chance_on_air_exposure_type", value.getDiscardChanceOnAirExposure().getValueType().getKey().toString()); - } - - return jsonObject; - } - - @Override - public OreFeatureConfiguration fromJson(JsonElement jsonElement) { - JsonObject jsonObject = jsonElement.getAsJsonObject(); - - IntegerValue size = null; - if (jsonObject.has("size")) { - JsonObject sizes = jsonObject.getAsJsonObject("size"); - size = registries.getValueTypeRegistry(IntegerType.class).get(NamespacedKey.fromString(sizes.getAsJsonPrimitive("size_type").getAsString())).get().getParser().fromJson(sizes); - } - - FloatValue discardChanceOnAirExposure = null; - if (jsonObject.has("discard_chance_on_air_exposure")) { - JsonObject chance = jsonObject.getAsJsonObject("discard_chance_on_air_exposure"); - discardChanceOnAirExposure = registries.getValueTypeRegistry(FloatType.class).get(NamespacedKey.fromString(chance.getAsJsonPrimitive("discard_chance_on_air_exposure_type").getAsString())).get().getParser().fromJson(chance); - } - - return new OreFeatureConfiguration(ScatteredOreGenerator.this, null, size, discardChanceOnAirExposure); - } - }; - } - - @Override - public OreFeatureConfiguration mergeConfig(OreFeatureConfiguration first, OreFeatureConfiguration second) { - return new OreFeatureConfiguration(this, - first.getTargets() != null ? first.getTargets() : second.getTargets(), - first.getSize() != null ? first.getSize() : second.getSize(), - first.getDiscardChanceOnAirExposure() != null ? first.getDiscardChanceOnAirExposure() : second.getDiscardChanceOnAirExposure()); - } - - @Override - public OreConfiguration createConfiguration(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull OreFeatureConfiguration configuration) { - List blockStates = new ArrayList<>(); - if (configuration.getTargets() != null) { - for (TargetValue targetValue : configuration.getTargets()) { - blockStates.add(targetValue.getValue(worldInfo, random, position, limitedRegion)); - } - } - - int size = 0; - if (configuration.getSize() != null) { - size = configuration.getSize().getValue(worldInfo, random, position, limitedRegion); - } - - float discardChanceOnAirExposure = 0f; - if (configuration.getDiscardChanceOnAirExposure() != null) { - discardChanceOnAirExposure = configuration.getDiscardChanceOnAirExposure().getValue(worldInfo, random, position, limitedRegion); - } - - return new OreConfiguration(blockStates, size, discardChanceOnAirExposure); - } - - @NotNull - @Override - public Set getSettings() { - return OreFeatureConfiguration.SETTINGS; - } - - @NotNull - @Override - public OreFeatureConfiguration createEmptyConfiguration() { - return new OreFeatureConfiguration(this, null, null, null); - } -} diff --git a/impl/v1_18_R1/src/main/java/de/derfrzocker/feature/impl/v1_18_R1/feature/generator/configuration/OreFeatureConfiguration.java b/impl/v1_18_R1/src/main/java/de/derfrzocker/feature/impl/v1_18_R1/feature/generator/configuration/OreFeatureConfiguration.java deleted file mode 100644 index 24f32d20..00000000 --- a/impl/v1_18_R1/src/main/java/de/derfrzocker/feature/impl/v1_18_R1/feature/generator/configuration/OreFeatureConfiguration.java +++ /dev/null @@ -1,124 +0,0 @@ -package de.derfrzocker.feature.impl.v1_18_R1.feature.generator.configuration; - -import de.derfrzocker.feature.api.FeatureGenerator; -import de.derfrzocker.feature.api.FeatureGeneratorConfiguration; -import de.derfrzocker.feature.api.Setting; -import de.derfrzocker.feature.api.Value; -import de.derfrzocker.feature.common.value.number.FloatType; -import de.derfrzocker.feature.common.value.number.FloatValue; -import de.derfrzocker.feature.common.value.number.IntegerType; -import de.derfrzocker.feature.common.value.number.IntegerValue; -import de.derfrzocker.feature.impl.v1_18_R1.value.target.TargetValue; -import org.jetbrains.annotations.NotNull; - -import java.util.Collections; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; - -public class OreFeatureConfiguration implements FeatureGeneratorConfiguration { - - public final static Set SETTINGS; - private final static Setting SIZE = new Setting("size", IntegerType.class); - private final static Setting DISCARD_CHANCE_ON_AIR_EXPOSURE = new Setting("discard-chance-on-air-exposure", FloatType.class); - - static { - Set settings = new LinkedHashSet<>(); - settings.add(SIZE); - settings.add(DISCARD_CHANCE_ON_AIR_EXPOSURE); - SETTINGS = Collections.unmodifiableSet(settings); - } - - private final FeatureGenerator featureGenerator; - private final List targets; - private IntegerValue size; - private FloatValue discardChanceOnAirExposure; - private boolean dirty = false; - - public OreFeatureConfiguration(FeatureGenerator featureGenerator, List targets, IntegerValue size, FloatValue discardChanceOnAirExposure) { - this.featureGenerator = featureGenerator; - this.targets = targets; - this.size = size; - this.discardChanceOnAirExposure = discardChanceOnAirExposure; - } - - public List getTargets() { - return targets; - } - - public IntegerValue getSize() { - return size; - } - - public FloatValue getDiscardChanceOnAirExposure() { - return discardChanceOnAirExposure; - } - - @NotNull - @Override - public FeatureGenerator getOwner() { - return featureGenerator; - } - - @NotNull - @Override - public Set getSettings() { - return SETTINGS; - } - - @Override - public Value getValue(@NotNull Setting setting) { - if (setting == SIZE) { - return getSize(); - } - - if (setting == DISCARD_CHANCE_ON_AIR_EXPOSURE) { - return getDiscardChanceOnAirExposure(); - } - - throw new IllegalArgumentException(String.format("Setting '%s' is not in the configuration '%s'", setting, "OreFeatureConfiguration")); - } - - @Override - public void setValue(@NotNull Setting setting, Value value) { - if (setting == SIZE) { - size = (IntegerValue) value; - dirty = true; - return; - } - - if (setting == DISCARD_CHANCE_ON_AIR_EXPOSURE) { - discardChanceOnAirExposure = (FloatValue) value; - dirty = true; - return; - } - - throw new IllegalArgumentException(String.format("Setting '%s' is not in the configuration '%s'", setting, "OreFeatureConfiguration")); - } - - @Override - public boolean isDirty() { - if (dirty) { - return true; - } - - if (size != null && size.isDirty()) { - return true; - } - - return discardChanceOnAirExposure != null && discardChanceOnAirExposure.isDirty(); - } - - @Override - public void saved() { - dirty = false; - - if (size != null) { - size.saved(); - } - - if (discardChanceOnAirExposure != null) { - discardChanceOnAirExposure.saved(); - } - } -} diff --git a/impl/v1_18_R1/src/main/java/de/derfrzocker/feature/impl/v1_18_R1/placement/CountModifier.java b/impl/v1_18_R1/src/main/java/de/derfrzocker/feature/impl/v1_18_R1/placement/CountModifier.java deleted file mode 100644 index 019bb95f..00000000 --- a/impl/v1_18_R1/src/main/java/de/derfrzocker/feature/impl/v1_18_R1/placement/CountModifier.java +++ /dev/null @@ -1,85 +0,0 @@ -package de.derfrzocker.feature.impl.v1_18_R1.placement; - -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import de.derfrzocker.feature.api.Registries; -import de.derfrzocker.feature.api.Setting; -import de.derfrzocker.feature.api.util.Parser; -import de.derfrzocker.feature.common.feature.placement.configuration.CountModifierConfiguration; -import de.derfrzocker.feature.common.value.number.IntegerType; -import de.derfrzocker.feature.common.value.number.IntegerValue; -import net.minecraft.world.level.levelgen.placement.CountPlacement; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Random; -import java.util.Set; - -public class CountModifier extends MinecraftPlacementModifier { - - public CountModifier(@NotNull Registries registries) { - super(registries, "count"); - } - - @Override - public CountModifierConfiguration mergeConfig(CountModifierConfiguration first, CountModifierConfiguration second) { - return new CountModifierConfiguration(this, - first.getCount() != null ? first.getCount() : second.getCount()); - } - - @Override - public Parser createParser(Registries registries) { - return new Parser<>() { - @Override - public JsonElement toJson(CountModifierConfiguration value) { - JsonObject jsonObject = new JsonObject(); - if (value.getCount() != null) { - JsonObject entry = value.getCount().getValueType().getParser().toJson(value.getCount()).getAsJsonObject(); - entry.addProperty("count_type", value.getCount().getValueType().getKey().toString()); - jsonObject.add("count", entry); - } - return jsonObject; - } - - @Override - public CountModifierConfiguration fromJson(JsonElement jsonElement) { - JsonObject jsonObject = jsonElement.getAsJsonObject(); - - IntegerValue count = null; - if (jsonObject.has("count")) { - JsonObject entry = jsonObject.getAsJsonObject("count"); - count = registries.getValueTypeRegistry(IntegerType.class).get(NamespacedKey.fromString(entry.getAsJsonPrimitive("count_type").getAsString())).get().getParser().fromJson(entry); - } - - return new CountModifierConfiguration(CountModifier.this, count); - } - }; - } - - @Override - public CountPlacement createPlacementModifier(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull CountModifierConfiguration configuration) { - int count; - if (configuration.getCount() != null) { - count = configuration.getCount().getValue(worldInfo, random, position, limitedRegion); - } else { - count = 0; - } - - return CountPlacement.of(count); - } - - @NotNull - @Override - public Set getSettings() { - return CountModifierConfiguration.SETTINGS; - } - - @NotNull - @Override - public CountModifierConfiguration createEmptyConfiguration() { - return new CountModifierConfiguration(this, null); - } -} diff --git a/impl/v1_18_R1/src/main/java/de/derfrzocker/feature/impl/v1_18_R1/placement/HeightRangeModifier.java b/impl/v1_18_R1/src/main/java/de/derfrzocker/feature/impl/v1_18_R1/placement/HeightRangeModifier.java deleted file mode 100644 index 54f9d9b1..00000000 --- a/impl/v1_18_R1/src/main/java/de/derfrzocker/feature/impl/v1_18_R1/placement/HeightRangeModifier.java +++ /dev/null @@ -1,88 +0,0 @@ -package de.derfrzocker.feature.impl.v1_18_R1.placement; - -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import de.derfrzocker.feature.api.Registries; -import de.derfrzocker.feature.api.Setting; -import de.derfrzocker.feature.api.util.Parser; -import de.derfrzocker.feature.common.feature.placement.configuration.HeightRangeModifierConfiguration; -import de.derfrzocker.feature.common.value.number.IntegerType; -import de.derfrzocker.feature.common.value.number.IntegerValue; -import net.minecraft.world.level.levelgen.VerticalAnchor; -import net.minecraft.world.level.levelgen.heightproviders.ConstantHeight; -import net.minecraft.world.level.levelgen.heightproviders.HeightProvider; -import net.minecraft.world.level.levelgen.placement.HeightRangePlacement; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Random; -import java.util.Set; - -public class HeightRangeModifier extends MinecraftPlacementModifier { - - public HeightRangeModifier(@NotNull Registries registries) { - super(registries, "height_range"); - } - - @Override - public HeightRangeModifierConfiguration mergeConfig(HeightRangeModifierConfiguration first, HeightRangeModifierConfiguration second) { - return new HeightRangeModifierConfiguration(this, - first.getHeight() != null ? first.getHeight() : second.getHeight()); - } - - @Override - public Parser createParser(Registries registries) { - return new Parser<>() { - @Override - public JsonElement toJson(HeightRangeModifierConfiguration value) { - JsonObject jsonObject = new JsonObject(); - if (value.getHeight() != null) { - JsonObject entry = value.getHeight().getValueType().getParser().toJson(value.getHeight()).getAsJsonObject(); - entry.addProperty("height_range_type", value.getHeight().getValueType().getKey().toString()); - jsonObject.add("height", entry); - } - return jsonObject; - } - - @Override - public HeightRangeModifierConfiguration fromJson(JsonElement jsonElement) { - JsonObject jsonObject = jsonElement.getAsJsonObject(); - - IntegerValue count = null; - if (jsonObject.has("height")) { - JsonObject entry = jsonObject.getAsJsonObject("height"); - count = registries.getValueTypeRegistry(IntegerType.class).get(NamespacedKey.fromString(entry.getAsJsonPrimitive("height_range_type").getAsString())).get().getParser().fromJson(entry); - } - - return new HeightRangeModifierConfiguration(HeightRangeModifier.this, count); - } - }; - } - - @Override - public HeightRangePlacement createPlacementModifier(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull HeightRangeModifierConfiguration configuration) { - HeightProvider height; - if (configuration.getHeight() != null) { - height = ConstantHeight.of(VerticalAnchor.absolute(configuration.getHeight().getValue(worldInfo, random, position, limitedRegion))); - } else { - height = ConstantHeight.of(VerticalAnchor.bottom()); - } - - return HeightRangePlacement.of(height); - } - - @NotNull - @Override - public Set getSettings() { - return HeightRangeModifierConfiguration.SETTINGS; - } - - @NotNull - @Override - public HeightRangeModifierConfiguration createEmptyConfiguration() { - return new HeightRangeModifierConfiguration(this, null); - } -} diff --git a/impl/v1_18_R1/src/main/java/de/derfrzocker/feature/impl/v1_18_R1/placement/MinecraftPlacementModifier.java b/impl/v1_18_R1/src/main/java/de/derfrzocker/feature/impl/v1_18_R1/placement/MinecraftPlacementModifier.java deleted file mode 100644 index 90ec7f76..00000000 --- a/impl/v1_18_R1/src/main/java/de/derfrzocker/feature/impl/v1_18_R1/placement/MinecraftPlacementModifier.java +++ /dev/null @@ -1,64 +0,0 @@ -package de.derfrzocker.feature.impl.v1_18_R1.placement; - -import de.derfrzocker.feature.api.FeaturePlacementModifier; -import de.derfrzocker.feature.api.PlacementModifierConfiguration; -import de.derfrzocker.feature.api.Registries; -import de.derfrzocker.feature.api.util.Parser; -import net.minecraft.core.BlockPos; -import net.minecraft.world.level.WorldGenLevel; -import net.minecraft.world.level.levelgen.placement.PlacementContext; -import net.minecraft.world.level.levelgen.placement.PlacementModifier; -import org.bukkit.NamespacedKey; -import org.bukkit.craftbukkit.v1_18_R1.generator.CraftLimitedRegion; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Optional; -import java.util.Random; -import java.util.stream.Stream; - -public abstract class MinecraftPlacementModifier implements FeaturePlacementModifier { - - private final Parser parser; - private final NamespacedKey namespacedKey; - - public MinecraftPlacementModifier(@NotNull Registries registries, @NotNull String name) { - this.parser = (Parser) createParser(registries); - this.namespacedKey = NamespacedKey.minecraft(name); - } - - public abstract C mergeConfig(C first, C second); - - public abstract Parser createParser(Registries registries); - - public abstract M createPlacementModifier(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull C configuration); - - @NotNull - @Override - public C merge(@NotNull PlacementModifierConfiguration first, @NotNull PlacementModifierConfiguration second) { - return mergeConfig((C) first, (C) second); - } - - @NotNull - @Override - public Stream getPositions(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull C configuration) { - WorldGenLevel level = ((CraftLimitedRegion) limitedRegion).getHandle(); - M placementModifier = createPlacementModifier(worldInfo, random, position, limitedRegion, configuration); - return placementModifier.getPositions(new PlacementContext(level, level.getMinecraftWorld().getChunkSource().getGenerator(), Optional.empty()), random, new BlockPos(position.getBlockX(), position.getBlockY(), position.getBlockZ())). - map(pos -> new BlockVector(pos.getX(), pos.getY(), pos.getZ())); - } - - @NotNull - @Override - public Parser getParser() { - return parser; - } - - @NotNull - @Override - public NamespacedKey getKey() { - return namespacedKey; - } -} diff --git a/impl/v1_18_R1/src/main/java/de/derfrzocker/feature/impl/v1_18_R1/placement/RarityModifier.java b/impl/v1_18_R1/src/main/java/de/derfrzocker/feature/impl/v1_18_R1/placement/RarityModifier.java deleted file mode 100644 index 34ab05d8..00000000 --- a/impl/v1_18_R1/src/main/java/de/derfrzocker/feature/impl/v1_18_R1/placement/RarityModifier.java +++ /dev/null @@ -1,83 +0,0 @@ -package de.derfrzocker.feature.impl.v1_18_R1.placement; - -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import de.derfrzocker.feature.api.Registries; -import de.derfrzocker.feature.api.Setting; -import de.derfrzocker.feature.api.util.Parser; -import de.derfrzocker.feature.common.feature.placement.configuration.RarityModifierConfiguration; -import de.derfrzocker.feature.common.value.number.IntegerType; -import de.derfrzocker.feature.common.value.number.IntegerValue; -import net.minecraft.world.level.levelgen.placement.RarityFilter; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Random; -import java.util.Set; - -public class RarityModifier extends MinecraftPlacementModifier { - - public RarityModifier(@NotNull Registries registries) { - super(registries, "rarity_filter"); - } - - - @Override - public RarityModifierConfiguration mergeConfig(RarityModifierConfiguration first, RarityModifierConfiguration second) { - return new RarityModifierConfiguration(this, - first.getChance() != null ? first.getChance() : second.getChance()); - } - - @Override - public Parser createParser(Registries registries) { - return new Parser<>() { - @Override - public JsonElement toJson(RarityModifierConfiguration value) { - JsonObject jsonObject = new JsonObject(); - if (value.getChance() != null) { - JsonObject entry = value.getChance().getValueType().getParser().toJson(value.getChance()).getAsJsonObject(); - entry.addProperty("chance_type", value.getChance().getValueType().getKey().toString()); - jsonObject.add("chance", entry); - } - return jsonObject; - } - - @Override - public RarityModifierConfiguration fromJson(JsonElement jsonElement) { - JsonObject jsonObject = jsonElement.getAsJsonObject(); - - IntegerValue count = null; - if (jsonObject.has("chance")) { - JsonObject entry = jsonObject.getAsJsonObject("chance"); - count = registries.getValueTypeRegistry(IntegerType.class).get(NamespacedKey.fromString(entry.getAsJsonPrimitive("chance_type").getAsString())).get().getParser().fromJson(entry); - } - - return new RarityModifierConfiguration(RarityModifier.this, count); - } - }; - } - - @Override - public RarityFilter createPlacementModifier(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull RarityModifierConfiguration configuration) { - int chance = 0; - if (configuration.getChance() != null) { - chance = configuration.getChance().getValue(worldInfo, random, position, limitedRegion); - } - return RarityFilter.onAverageOnceEvery(chance); - } - - @NotNull - @Override - public Set getSettings() { - return RarityModifierConfiguration.SETTINGS; - } - - @NotNull - @Override - public RarityModifierConfiguration createEmptyConfiguration() { - return new RarityModifierConfiguration(this, null); - } -} diff --git a/impl/v1_18_R1/src/main/java/de/derfrzocker/feature/impl/v1_18_R1/placement/SurfaceRelativeThresholdModifier.java b/impl/v1_18_R1/src/main/java/de/derfrzocker/feature/impl/v1_18_R1/placement/SurfaceRelativeThresholdModifier.java deleted file mode 100644 index 26a18046..00000000 --- a/impl/v1_18_R1/src/main/java/de/derfrzocker/feature/impl/v1_18_R1/placement/SurfaceRelativeThresholdModifier.java +++ /dev/null @@ -1,107 +0,0 @@ -package de.derfrzocker.feature.impl.v1_18_R1.placement; - -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import de.derfrzocker.feature.api.Registries; -import de.derfrzocker.feature.api.Setting; -import de.derfrzocker.feature.api.util.Parser; -import de.derfrzocker.feature.common.value.number.IntegerType; -import de.derfrzocker.feature.common.value.number.IntegerValue; -import de.derfrzocker.feature.impl.v1_18_R1.placement.configuration.SurfaceRelativeThresholdModifierConfiguration; -import net.minecraft.world.level.levelgen.Heightmap; -import net.minecraft.world.level.levelgen.placement.SurfaceRelativeThresholdFilter; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Random; -import java.util.Set; - -public class SurfaceRelativeThresholdModifier extends MinecraftPlacementModifier { - public SurfaceRelativeThresholdModifier(@NotNull Registries registries) { - super(registries, "surface_relative_threshold_filter"); - } - - @Override - public SurfaceRelativeThresholdModifierConfiguration mergeConfig(SurfaceRelativeThresholdModifierConfiguration first, SurfaceRelativeThresholdModifierConfiguration second) { - return new SurfaceRelativeThresholdModifierConfiguration(this, - first.getHeightmap() != null ? first.getHeightmap() : second.getHeightmap(), - first.getMinInclusive() != null ? first.getMinInclusive() : second.getMinInclusive(), - first.getMaxInclusive() != null ? first.getMaxInclusive() : second.getMaxInclusive()); - } - - @Override - public Parser createParser(Registries registries) { - return new Parser<>() { - @Override - public JsonElement toJson(SurfaceRelativeThresholdModifierConfiguration value) { - JsonObject jsonObject = new JsonObject(); - if (value.getMinInclusive() != null) { - JsonObject entry = value.getMinInclusive().getValueType().getParser().toJson(value.getMinInclusive()).getAsJsonObject(); - entry.addProperty("min_inclusive_type", value.getMinInclusive().getValueType().getKey().toString()); - jsonObject.add("min_inclusive", entry); - } - - if (value.getMaxInclusive() != null) { - JsonObject entry = value.getMaxInclusive().getValueType().getParser().toJson(value.getMaxInclusive()).getAsJsonObject(); - entry.addProperty("max_inclusive_type", value.getMaxInclusive().getValueType().getKey().toString()); - jsonObject.add("max_inclusive", entry); - } - - return jsonObject; - } - - @Override - public SurfaceRelativeThresholdModifierConfiguration fromJson(JsonElement jsonElement) { - JsonObject jsonObject = jsonElement.getAsJsonObject(); - - IntegerValue minInclusive = null; - if (jsonObject.has("min_inclusive")) { - JsonObject entry = jsonObject.getAsJsonObject("min_inclusive"); - minInclusive = registries.getValueTypeRegistry(IntegerType.class).get(NamespacedKey.fromString(entry.getAsJsonPrimitive("min_inclusive_type").getAsString())).get().getParser().fromJson(entry); - } - - IntegerValue maxInclusive = null; - if (jsonObject.has("max_inclusive")) { - JsonObject entry = jsonObject.getAsJsonObject("max_inclusive"); - maxInclusive = registries.getValueTypeRegistry(IntegerType.class).get(NamespacedKey.fromString(entry.getAsJsonPrimitive("max_inclusive_type").getAsString())).get().getParser().fromJson(entry); - } - - return new SurfaceRelativeThresholdModifierConfiguration(SurfaceRelativeThresholdModifier.this, null, minInclusive, maxInclusive); - } - }; - } - - @Override - public SurfaceRelativeThresholdFilter createPlacementModifier(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull SurfaceRelativeThresholdModifierConfiguration configuration) { - Heightmap.Types heightmap = Heightmap.Types.MOTION_BLOCKING; - if (configuration.getHeightmap() != null) { - heightmap = configuration.getHeightmap().getValue(worldInfo, random, position, limitedRegion); - } - - int minInclusive = 0; - if (configuration.getMinInclusive() != null) { - minInclusive = configuration.getMinInclusive().getValue(worldInfo, random, position, limitedRegion); - } - - int maxInclusive = 0; - if (configuration.getMaxInclusive() != null) { - maxInclusive = configuration.getMaxInclusive().getValue(worldInfo, random, position, limitedRegion); - } - return SurfaceRelativeThresholdFilter.of(heightmap, minInclusive, maxInclusive); - } - - @NotNull - @Override - public Set getSettings() { - return SurfaceRelativeThresholdModifierConfiguration.SETTINGS; - } - - @NotNull - @Override - public SurfaceRelativeThresholdModifierConfiguration createEmptyConfiguration() { - return new SurfaceRelativeThresholdModifierConfiguration(this, null, null, null); - } -} diff --git a/impl/v1_18_R1/src/main/java/de/derfrzocker/feature/impl/v1_18_R1/placement/SurfaceWaterDepthModifier.java b/impl/v1_18_R1/src/main/java/de/derfrzocker/feature/impl/v1_18_R1/placement/SurfaceWaterDepthModifier.java deleted file mode 100644 index 9bff5da0..00000000 --- a/impl/v1_18_R1/src/main/java/de/derfrzocker/feature/impl/v1_18_R1/placement/SurfaceWaterDepthModifier.java +++ /dev/null @@ -1,82 +0,0 @@ -package de.derfrzocker.feature.impl.v1_18_R1.placement; - -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import de.derfrzocker.feature.api.Registries; -import de.derfrzocker.feature.api.Setting; -import de.derfrzocker.feature.api.util.Parser; -import de.derfrzocker.feature.common.feature.placement.configuration.SurfaceWaterDepthModifierConfiguration; -import de.derfrzocker.feature.common.value.number.IntegerType; -import de.derfrzocker.feature.common.value.number.IntegerValue; -import net.minecraft.world.level.levelgen.placement.SurfaceWaterDepthFilter; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Random; -import java.util.Set; - -public class SurfaceWaterDepthModifier extends MinecraftPlacementModifier { - - public SurfaceWaterDepthModifier(@NotNull Registries registries) { - super(registries, "surface_water_depth_filter"); - } - - @Override - public SurfaceWaterDepthModifierConfiguration mergeConfig(SurfaceWaterDepthModifierConfiguration first, SurfaceWaterDepthModifierConfiguration second) { - return new SurfaceWaterDepthModifierConfiguration(this, - first.getMaxWaterDepth() != null ? first.getMaxWaterDepth() : second.getMaxWaterDepth()); - } - - @Override - public Parser createParser(Registries registries) { - return new Parser<>() { - @Override - public JsonElement toJson(SurfaceWaterDepthModifierConfiguration value) { - JsonObject jsonObject = new JsonObject(); - if (value.getMaxWaterDepth() != null) { - JsonObject entry = value.getMaxWaterDepth().getValueType().getParser().toJson(value.getMaxWaterDepth()).getAsJsonObject(); - entry.addProperty("max_water_depth_type", value.getMaxWaterDepth().getValueType().getKey().toString()); - jsonObject.add("max_water_depth", entry); - } - return jsonObject; - } - - @Override - public SurfaceWaterDepthModifierConfiguration fromJson(JsonElement jsonElement) { - JsonObject jsonObject = jsonElement.getAsJsonObject(); - - IntegerValue count = null; - if (jsonObject.has("max_water_depth")) { - JsonObject entry = jsonObject.getAsJsonObject("max_water_depth"); - count = registries.getValueTypeRegistry(IntegerType.class).get(NamespacedKey.fromString(entry.getAsJsonPrimitive("max_water_depth_type").getAsString())).get().getParser().fromJson(entry); - } - - return new SurfaceWaterDepthModifierConfiguration(SurfaceWaterDepthModifier.this, count); - } - }; - } - - @Override - public SurfaceWaterDepthFilter createPlacementModifier(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull SurfaceWaterDepthModifierConfiguration configuration) { - int maxWaterDepth = 0; - if (configuration.getMaxWaterDepth() != null) { - maxWaterDepth = configuration.getMaxWaterDepth().getValue(worldInfo, random, position, limitedRegion); - } - return SurfaceWaterDepthFilter.forMaxDepth(maxWaterDepth); - } - - @NotNull - @Override - public Set getSettings() { - return SurfaceWaterDepthModifierConfiguration.SETTINGS; - } - - @NotNull - @Override - public SurfaceWaterDepthModifierConfiguration createEmptyConfiguration() { - return new SurfaceWaterDepthModifierConfiguration(this, null); - } -} \ No newline at end of file diff --git a/impl/v1_18_R1/src/main/java/de/derfrzocker/feature/impl/v1_18_R1/placement/configuration/SurfaceRelativeThresholdModifierConfiguration.java b/impl/v1_18_R1/src/main/java/de/derfrzocker/feature/impl/v1_18_R1/placement/configuration/SurfaceRelativeThresholdModifierConfiguration.java deleted file mode 100644 index 8296e1e9..00000000 --- a/impl/v1_18_R1/src/main/java/de/derfrzocker/feature/impl/v1_18_R1/placement/configuration/SurfaceRelativeThresholdModifierConfiguration.java +++ /dev/null @@ -1,121 +0,0 @@ -package de.derfrzocker.feature.impl.v1_18_R1.placement.configuration; - -import de.derfrzocker.feature.api.FeaturePlacementModifier; -import de.derfrzocker.feature.api.PlacementModifierConfiguration; -import de.derfrzocker.feature.api.Setting; -import de.derfrzocker.feature.api.Value; -import de.derfrzocker.feature.common.value.number.IntegerType; -import de.derfrzocker.feature.common.value.number.IntegerValue; -import de.derfrzocker.feature.impl.v1_18_R1.value.heightmap.HeightmapValue; -import org.jetbrains.annotations.NotNull; - -import java.util.Collections; -import java.util.LinkedHashSet; -import java.util.Set; - -public class SurfaceRelativeThresholdModifierConfiguration implements PlacementModifierConfiguration { - - public final static Set SETTINGS; - private final static Setting MIN_INCLUSIVE = new Setting("min-inclusive", IntegerType.class); - private final static Setting MAX_INCLUSIVE = new Setting("max-inclusive", IntegerType.class); - - static { - Set settings = new LinkedHashSet<>(); - settings.add(MIN_INCLUSIVE); - settings.add(MAX_INCLUSIVE); - SETTINGS = Collections.unmodifiableSet(settings); - } - - private final FeaturePlacementModifier placementModifier; - private final HeightmapValue heightmap; - private IntegerValue minInclusive; - private IntegerValue maxInclusive; - private boolean dirty = false; - - public SurfaceRelativeThresholdModifierConfiguration(FeaturePlacementModifier placementModifier, HeightmapValue heightmap, IntegerValue minInclusive, IntegerValue maxInclusive) { - this.placementModifier = placementModifier; - this.heightmap = heightmap; - this.minInclusive = minInclusive; - this.maxInclusive = maxInclusive; - } - - @NotNull - @Override - public FeaturePlacementModifier getOwner() { - return placementModifier; - } - - public HeightmapValue getHeightmap() { - return heightmap; - } - - public IntegerValue getMinInclusive() { - return minInclusive; - } - - public IntegerValue getMaxInclusive() { - return maxInclusive; - } - - @NotNull - @Override - public Set getSettings() { - return SETTINGS; - } - - @Override - public Value getValue(@NotNull Setting setting) { - if (setting == MIN_INCLUSIVE) { - return getMinInclusive(); - } - - if (setting == MAX_INCLUSIVE) { - return getMaxInclusive(); - } - - throw new IllegalArgumentException(String.format("Setting '%s' is not in the configuration '%s'", setting, "SurfaceRelativeThresholdModifierConfiguration")); - } - - @Override - public void setValue(@NotNull Setting setting, Value value) { - if (setting == MIN_INCLUSIVE) { - minInclusive = (IntegerValue) value; - dirty = true; - return; - } - - if (setting == MAX_INCLUSIVE) { - maxInclusive = (IntegerValue) value; - dirty = true; - return; - } - - throw new IllegalArgumentException(String.format("Setting '%s' is not in the configuration '%s'", setting, "SurfaceRelativeThresholdModifierConfiguration")); - } - - @Override - public boolean isDirty() { - if (dirty) { - return true; - } - - if (minInclusive != null && minInclusive.isDirty()) { - return true; - } - - return maxInclusive != null && maxInclusive.isDirty(); - } - - @Override - public void saved() { - dirty = false; - - if (minInclusive != null) { - minInclusive.saved(); - } - - if (maxInclusive != null) { - maxInclusive.saved(); - } - } -} diff --git a/impl/v1_18_R1/src/main/java/de/derfrzocker/feature/impl/v1_18_R1/value/heightmap/HeightmapType.java b/impl/v1_18_R1/src/main/java/de/derfrzocker/feature/impl/v1_18_R1/value/heightmap/HeightmapType.java deleted file mode 100644 index e031730c..00000000 --- a/impl/v1_18_R1/src/main/java/de/derfrzocker/feature/impl/v1_18_R1/value/heightmap/HeightmapType.java +++ /dev/null @@ -1,7 +0,0 @@ -package de.derfrzocker.feature.impl.v1_18_R1.value.heightmap; - -import de.derfrzocker.feature.api.ValueType; -import net.minecraft.world.level.levelgen.Heightmap; - -public abstract class HeightmapType implements ValueType { -} diff --git a/impl/v1_18_R1/src/main/java/de/derfrzocker/feature/impl/v1_18_R1/value/heightmap/HeightmapValue.java b/impl/v1_18_R1/src/main/java/de/derfrzocker/feature/impl/v1_18_R1/value/heightmap/HeightmapValue.java deleted file mode 100644 index 4455b6df..00000000 --- a/impl/v1_18_R1/src/main/java/de/derfrzocker/feature/impl/v1_18_R1/value/heightmap/HeightmapValue.java +++ /dev/null @@ -1,10 +0,0 @@ -package de.derfrzocker.feature.impl.v1_18_R1.value.heightmap; - -import de.derfrzocker.feature.common.AbstractValue; -import net.minecraft.world.level.levelgen.Heightmap; - -public abstract class HeightmapValue extends AbstractValue { - - @Override - public abstract HeightmapValue clone(); -} diff --git a/impl/v1_18_R1/src/main/java/de/derfrzocker/feature/impl/v1_18_R1/value/offset/NMSAboveBottomOffsetIntegerValue.java b/impl/v1_18_R1/src/main/java/de/derfrzocker/feature/impl/v1_18_R1/value/offset/NMSAboveBottomOffsetIntegerValue.java deleted file mode 100644 index be973050..00000000 --- a/impl/v1_18_R1/src/main/java/de/derfrzocker/feature/impl/v1_18_R1/value/offset/NMSAboveBottomOffsetIntegerValue.java +++ /dev/null @@ -1,33 +0,0 @@ -package de.derfrzocker.feature.impl.v1_18_R1.value.offset; - -import de.derfrzocker.feature.common.value.number.IntegerValue; -import de.derfrzocker.feature.common.value.offset.AboveBottomOffsetIntegerValue; -import net.minecraft.world.level.WorldGenLevel; -import org.bukkit.craftbukkit.v1_18_R1.generator.CraftLimitedRegion; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Random; - -public class NMSAboveBottomOffsetIntegerValue extends AboveBottomOffsetIntegerValue { - - public NMSAboveBottomOffsetIntegerValue(IntegerValue base) { - super(base); - } - - @Override - public Integer getValue(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion) { - int baseValue = getBase() == null ? 0 : getBase().getValue(worldInfo, random, position, limitedRegion); - - WorldGenLevel level = ((CraftLimitedRegion) limitedRegion).getHandle(); - - return Math.max(level.getMinBuildHeight(), level.getLevel().getChunkSource().chunkMap.generator.getMinY()) + baseValue; - } - - @Override - public AboveBottomOffsetIntegerValue clone() { - return new NMSAboveBottomOffsetIntegerValue(getBase() == null ? null : getBase().clone()); - } -} diff --git a/impl/v1_18_R1/src/main/java/de/derfrzocker/feature/impl/v1_18_R1/value/offset/NMSBelowTopOffsetIntegerValue.java b/impl/v1_18_R1/src/main/java/de/derfrzocker/feature/impl/v1_18_R1/value/offset/NMSBelowTopOffsetIntegerValue.java deleted file mode 100644 index 89d89699..00000000 --- a/impl/v1_18_R1/src/main/java/de/derfrzocker/feature/impl/v1_18_R1/value/offset/NMSBelowTopOffsetIntegerValue.java +++ /dev/null @@ -1,35 +0,0 @@ -package de.derfrzocker.feature.impl.v1_18_R1.value.offset; - -import de.derfrzocker.feature.common.value.number.IntegerValue; -import de.derfrzocker.feature.common.value.offset.BelowTopOffsetIntegerValue; -import net.minecraft.world.level.WorldGenLevel; -import net.minecraft.world.level.chunk.ChunkGenerator; -import org.bukkit.craftbukkit.v1_18_R1.generator.CraftLimitedRegion; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Random; - -public class NMSBelowTopOffsetIntegerValue extends BelowTopOffsetIntegerValue { - - public NMSBelowTopOffsetIntegerValue(IntegerValue base) { - super(base); - } - - @Override - public Integer getValue(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion) { - int baseValue = getBase() == null ? 0 : getBase().getValue(worldInfo, random, position, limitedRegion); - - WorldGenLevel level = ((CraftLimitedRegion) limitedRegion).getHandle(); - ChunkGenerator chunkGenerator = level.getLevel().getChunkSource().chunkMap.generator; - - return Math.min(level.getHeight(), chunkGenerator.getGenDepth()) - 1 + Math.max(level.getMinBuildHeight(), chunkGenerator.getMinY()) - baseValue; - } - - @Override - public NMSBelowTopOffsetIntegerValue clone() { - return new NMSBelowTopOffsetIntegerValue(getBase() == null ? null : getBase().clone()); - } -} diff --git a/impl/v1_18_R1/src/main/java/de/derfrzocker/feature/impl/v1_18_R1/value/target/TargetType.java b/impl/v1_18_R1/src/main/java/de/derfrzocker/feature/impl/v1_18_R1/value/target/TargetType.java deleted file mode 100644 index 13060b4f..00000000 --- a/impl/v1_18_R1/src/main/java/de/derfrzocker/feature/impl/v1_18_R1/value/target/TargetType.java +++ /dev/null @@ -1,7 +0,0 @@ -package de.derfrzocker.feature.impl.v1_18_R1.value.target; - -import de.derfrzocker.feature.api.ValueType; -import net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration; - -public abstract class TargetType implements ValueType { -} diff --git a/impl/v1_18_R1/src/main/java/de/derfrzocker/feature/impl/v1_18_R1/value/target/TargetValue.java b/impl/v1_18_R1/src/main/java/de/derfrzocker/feature/impl/v1_18_R1/value/target/TargetValue.java deleted file mode 100644 index 7e88d603..00000000 --- a/impl/v1_18_R1/src/main/java/de/derfrzocker/feature/impl/v1_18_R1/value/target/TargetValue.java +++ /dev/null @@ -1,10 +0,0 @@ -package de.derfrzocker.feature.impl.v1_18_R1.value.target; - -import de.derfrzocker.feature.common.AbstractValue; -import net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration; - -public abstract class TargetValue extends AbstractValue { - - @Override - public abstract TargetValue clone(); -} diff --git a/impl/v1_18_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R1/ConversionUtil.java b/impl/v1_18_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R1/ConversionUtil.java deleted file mode 100644 index 78cd6332..00000000 --- a/impl/v1_18_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R1/ConversionUtil.java +++ /dev/null @@ -1,77 +0,0 @@ -package de.derfrzocker.ore.control.impl.v1_18_R1; - -import de.derfrzocker.feature.common.value.number.FixedFloatValue; -import de.derfrzocker.feature.common.value.number.IntegerValue; -import de.derfrzocker.feature.common.value.number.integer.FixedDoubleToIntegerValue; -import de.derfrzocker.feature.common.value.number.integer.biased.BiasedToBottomIntegerValue; -import de.derfrzocker.feature.common.value.number.integer.clamped.ClampedIntegerValue; -import de.derfrzocker.feature.common.value.number.integer.clamped.ClampedNormalIntegerValue; -import de.derfrzocker.feature.common.value.number.integer.uniform.UniformIntegerValue; -import de.derfrzocker.feature.common.value.number.integer.weighted.WeightedListIntegerValue; -import net.minecraft.util.random.SimpleWeightedRandomList; -import net.minecraft.util.random.WeightedEntry; -import net.minecraft.util.valueproviders.ClampedInt; -import net.minecraft.util.valueproviders.ClampedNormalInt; -import net.minecraft.util.valueproviders.IntProvider; -import net.minecraft.util.valueproviders.IntProviderType; -import net.minecraft.util.valueproviders.WeightedListInt; - -import java.lang.reflect.Field; -import java.util.LinkedHashMap; -import java.util.Map; - -public final class ConversionUtil { - - private ConversionUtil() { - } - - public static IntegerValue convert(IntProvider intProvider) { - try { - if (intProvider.getType() == IntProviderType.CONSTANT) { - return new FixedDoubleToIntegerValue(intProvider.getMinValue()); - } else if (intProvider.getType() == IntProviderType.UNIFORM) { - return new UniformIntegerValue(new FixedDoubleToIntegerValue(intProvider.getMinValue()), new FixedDoubleToIntegerValue(intProvider.getMaxValue())); - } else if (intProvider.getType() == IntProviderType.BIASED_TO_BOTTOM) { - return new BiasedToBottomIntegerValue(new FixedDoubleToIntegerValue(intProvider.getMinValue()), new FixedDoubleToIntegerValue(intProvider.getMaxValue())); - } else if (intProvider.getType() == IntProviderType.CLAMPED) { - Field sourceField = ClampedInt.class.getDeclaredField(NMSReflectionNames.CLAMPED_INT_SOURCE); - Field minField = ClampedInt.class.getDeclaredField(NMSReflectionNames.CLAMPED_INT_MIN_INCLUSIVE); - Field maxField = ClampedInt.class.getDeclaredField(NMSReflectionNames.CLAMPED_INT_MAX_INCLUSIVE); - sourceField.setAccessible(true); - minField.setAccessible(true); - maxField.setAccessible(true); - - IntProvider source = (IntProvider) sourceField.get(intProvider); - int min = (int) minField.get(intProvider); - int max = (int) maxField.get(intProvider); - return new ClampedIntegerValue(convert(source), new FixedDoubleToIntegerValue(min), new FixedDoubleToIntegerValue(max)); - } else if (intProvider.getType() == IntProviderType.WEIGHTED_LIST) { - Field distributionField = WeightedListInt.class.getDeclaredField(NMSReflectionNames.WEIGHTED_LIST_INT_DISTRIBUTION); - distributionField.setAccessible(true); - SimpleWeightedRandomList distribution = (SimpleWeightedRandomList) distributionField.get(intProvider); - - Map values = new LinkedHashMap<>(); - for (WeightedEntry.Wrapper wrapper : distribution.unwrap()) { - values.put(convert(wrapper.getData()), new FixedDoubleToIntegerValue(wrapper.getWeight().asInt())); - } - - return new WeightedListIntegerValue(values); - } else if (intProvider.getType() == IntProviderType.CLAMPED_NORMAL) { - Field meanField = ClampedNormalInt.class.getDeclaredField(NMSReflectionNames.CLAMPED_NORMAL_INT_MEAN); - Field deviationField = ClampedNormalInt.class.getDeclaredField(NMSReflectionNames.CLAMPED_NORMAL_INT_DEVIATION); - meanField.setAccessible(true); - deviationField.setAccessible(true); - - float mean = (float) meanField.get(intProvider); - float deviation = (float) meanField.get(intProvider); - int min = intProvider.getMinValue(); - int max = intProvider.getMaxValue(); - return new ClampedNormalIntegerValue(new FixedFloatValue(mean), new FixedFloatValue(deviation), new FixedDoubleToIntegerValue(min), new FixedDoubleToIntegerValue(max)); - } else { - throw new UnsupportedOperationException(String.format("No integer value equivalent for IntProvider '%s'", intProvider)); - } - } catch (NoSuchFieldException | IllegalAccessException e) { - throw new RuntimeException(e); - } - } -} diff --git a/impl/v1_18_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R1/NMSReflectionNames.java b/impl/v1_18_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R1/NMSReflectionNames.java deleted file mode 100644 index 4f0b5094..00000000 --- a/impl/v1_18_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R1/NMSReflectionNames.java +++ /dev/null @@ -1,23 +0,0 @@ -package de.derfrzocker.ore.control.impl.v1_18_R1; - -public final class NMSReflectionNames { - - public final static String BIOME_GENERATION_SETTINGS_FEATURES = "e"; - public final static String BIOME_GENERATION_SETTINGS_FEATURE_SET = "g"; - public final static String WEIGHTED_LIST_INT_DISTRIBUTION = "b"; - public final static String COUNT_PLACEMENT_COUNT = "c"; - public final static String HEIGHT_RANGE_PLACEMENT_HEIGHT = "c"; - public final static String RARITY_FILTER_CHANCE = "c"; - public final static String SURFACE_RELATIVE_THRESHOLD_FILTER_HEIGHTMAP = "c"; - public final static String SURFACE_RELATIVE_THRESHOLD_FILTER_MIN_INCLUSIVE = "d"; - public final static String SURFACE_RELATIVE_THRESHOLD_FILTER_MAX_INCLUSIVE = "e"; - public final static String SURFACE_WATER_DEPTH_FILTER_MAX_WATER_DEPTH = "c"; - public static final String CLAMPED_INT_SOURCE = "b"; - public static final String CLAMPED_INT_MIN_INCLUSIVE = "f"; - public static final String CLAMPED_INT_MAX_INCLUSIVE = "g"; - public static final String CLAMPED_NORMAL_INT_MEAN = "b"; - public static final String CLAMPED_NORMAL_INT_DEVIATION = "f"; - - private NMSReflectionNames() { - } -} diff --git a/impl/v1_18_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R1/NMSReplacer_v1_18_R1.java b/impl/v1_18_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R1/NMSReplacer_v1_18_R1.java deleted file mode 100644 index b92cbce1..00000000 --- a/impl/v1_18_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R1/NMSReplacer_v1_18_R1.java +++ /dev/null @@ -1,484 +0,0 @@ -package de.derfrzocker.ore.control.impl.v1_18_R1; - -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import com.google.gson.JsonElement; -import de.derfrzocker.feature.api.FeatureGenerator; -import de.derfrzocker.feature.api.FeatureGeneratorConfiguration; -import de.derfrzocker.feature.api.FeaturePlacementModifier; -import de.derfrzocker.feature.api.PlacementModifierConfiguration; -import de.derfrzocker.feature.api.util.Parser; -import de.derfrzocker.feature.common.feature.generator.configuration.EmptyFeatureConfiguration; -import de.derfrzocker.feature.common.value.number.FixedFloatValue; -import de.derfrzocker.feature.common.value.number.IntegerType; -import de.derfrzocker.feature.common.value.number.integer.FixedDoubleToIntegerValue; -import de.derfrzocker.feature.common.value.offset.AboveBottomOffsetIntegerType; -import de.derfrzocker.feature.common.value.offset.BelowTopOffsetIntegerType; -import de.derfrzocker.feature.impl.v1_18_R1.feature.generator.GlowstoneBlobFeatureGenerator; -import de.derfrzocker.feature.impl.v1_18_R1.feature.generator.OreFeatureGenerator; -import de.derfrzocker.feature.impl.v1_18_R1.feature.generator.ScatteredOreGenerator; -import de.derfrzocker.feature.impl.v1_18_R1.feature.generator.configuration.OreFeatureConfiguration; -import de.derfrzocker.feature.impl.v1_18_R1.placement.CountModifier; -import de.derfrzocker.feature.impl.v1_18_R1.placement.HeightRangeModifier; -import de.derfrzocker.feature.impl.v1_18_R1.placement.RarityModifier; -import de.derfrzocker.feature.impl.v1_18_R1.placement.SurfaceRelativeThresholdModifier; -import de.derfrzocker.feature.impl.v1_18_R1.placement.SurfaceWaterDepthModifier; -import de.derfrzocker.feature.impl.v1_18_R1.value.heightmap.HeightmapType; -import de.derfrzocker.feature.impl.v1_18_R1.value.offset.NMSAboveBottomOffsetIntegerValue; -import de.derfrzocker.feature.impl.v1_18_R1.value.offset.NMSBelowTopOffsetIntegerValue; -import de.derfrzocker.feature.impl.v1_18_R1.value.target.TargetType; -import de.derfrzocker.ore.control.api.NMSReplacer; -import de.derfrzocker.ore.control.api.OreControlManager; -import de.derfrzocker.ore.control.api.OreControlRegistries; -import de.derfrzocker.ore.control.api.config.Config; -import de.derfrzocker.ore.control.api.config.ConfigManager; -import de.derfrzocker.ore.control.impl.v1_18_R1.feature.generator.GlowstoneBlobFeatureGeneratorHook; -import de.derfrzocker.ore.control.impl.v1_18_R1.feature.generator.OreFeatureGeneratorHook; -import de.derfrzocker.ore.control.impl.v1_18_R1.feature.generator.ScatteredOreFeatureGeneratorHook; -import de.derfrzocker.ore.control.impl.v1_18_R1.placement.CountModifierHook; -import de.derfrzocker.ore.control.impl.v1_18_R1.placement.HeightRangeModifierHook; -import de.derfrzocker.ore.control.impl.v1_18_R1.placement.RarityModifierHook; -import de.derfrzocker.ore.control.impl.v1_18_R1.placement.SurfaceRelativeThresholdModifierHook; -import de.derfrzocker.ore.control.impl.v1_18_R1.placement.SurfaceWaterDepthModifierHook; -import net.minecraft.core.Registry; -import net.minecraft.core.RegistryAccess; -import net.minecraft.data.BuiltinRegistries; -import net.minecraft.resources.ResourceKey; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.server.dedicated.DedicatedServer; -import net.minecraft.server.level.ServerLevel; -import net.minecraft.world.level.biome.Biome; -import net.minecraft.world.level.biome.BiomeGenerationSettings; -import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; -import net.minecraft.world.level.levelgen.feature.Feature; -import net.minecraft.world.level.levelgen.feature.GlowstoneFeature; -import net.minecraft.world.level.levelgen.feature.OreFeature; -import net.minecraft.world.level.levelgen.feature.ScatteredOreFeature; -import net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration; -import net.minecraft.world.level.levelgen.placement.CountPlacement; -import net.minecraft.world.level.levelgen.placement.HeightRangePlacement; -import net.minecraft.world.level.levelgen.placement.PlacedFeature; -import net.minecraft.world.level.levelgen.placement.PlacementModifier; -import net.minecraft.world.level.levelgen.placement.PlacementModifierType; -import net.minecraft.world.level.levelgen.placement.RarityFilter; -import net.minecraft.world.level.levelgen.placement.SurfaceRelativeThresholdFilter; -import net.minecraft.world.level.levelgen.placement.SurfaceWaterDepthFilter; -import org.bukkit.Bukkit; -import org.bukkit.NamespacedKey; -import org.bukkit.World; -import org.bukkit.craftbukkit.v1_18_R1.CraftServer; -import org.bukkit.craftbukkit.v1_18_R1.CraftWorld; -import org.bukkit.craftbukkit.v1_18_R1.util.CraftNamespacedKey; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import java.io.File; -import java.io.FileWriter; -import java.io.IOException; -import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.Collection; -import java.util.LinkedHashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Set; -import java.util.function.BiConsumer; -import java.util.function.Supplier; -import java.util.stream.Collectors; - -public class NMSReplacer_v1_18_R1 implements NMSReplacer { - - private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create(); - private final Parser configParser; - private final OreControlManager oreControlManager; - @NotNull - private final OreControlRegistries registries; - private final ConfigManager configManager; - - public NMSReplacer_v1_18_R1(@NotNull OreControlManager oreControlManager, Parser configParser) { - this.oreControlManager = oreControlManager; - this.registries = oreControlManager.getRegistries(); - this.configManager = oreControlManager.getConfigManager(); - this.configParser = configParser; - } - - @Override - public void register() { - registerValueTypes(); - registerFeatureGenerators(); - registerPlacementModifier(); - registerFeatures(); - registerBiomes(); - } - - private void registerValueTypes() { - registries.getValueTypeRegistry(IntegerType.class).register(new AboveBottomOffsetIntegerType(registries, NMSAboveBottomOffsetIntegerValue::new)); - registries.getValueTypeRegistry(IntegerType.class).register(new BelowTopOffsetIntegerType(registries, NMSBelowTopOffsetIntegerValue::new)); - } - - private void registerFeatureGenerators() { - registries.getFeatureGeneratorRegistry().register(new OreFeatureGenerator(registries)); - registries.getFeatureGeneratorRegistry().register(new ScatteredOreGenerator(registries)); - registries.getFeatureGeneratorRegistry().register(new GlowstoneBlobFeatureGenerator(registries)); - } - - private void registerPlacementModifier() { - registries.getPlacementModifierRegistry().register(new RarityModifier(registries)); - registries.getPlacementModifierRegistry().register(new SurfaceRelativeThresholdModifier(registries)); - registries.getPlacementModifierRegistry().register(new SurfaceWaterDepthModifier(registries)); - registries.getPlacementModifierRegistry().register(new CountModifier(registries)); - registries.getPlacementModifierRegistry().register(new HeightRangeModifier(registries)); - } - - private void registerFeatures() { - Registry placedFeatureRegistry = getRegistry().registryOrThrow(Registry.PLACED_FEATURE_REGISTRY); - Registry> featureRegistry = getRegistry().registryOrThrow(Registry.FEATURE_REGISTRY); - Registry> placementModifierTypes = getRegistry().registryOrThrow(Registry.PLACEMENT_MODIFIER_REGISTRY); - - for (PlacedFeature placedFeature : placedFeatureRegistry) { - Feature feature = placedFeature.getFeatures().findFirst().get().feature(); - ResourceLocation resourceLocation = featureRegistry.getKey(feature); - Optional> featureGenerator = registries.getFeatureGeneratorRegistry().get(NamespacedKey.fromString(resourceLocation.toString())); - - if (featureGenerator.isEmpty()) { - continue; - } - - boolean hasCount = false; - List> modifiers = new LinkedList<>(); - for (PlacementModifier modifier : placedFeature.getPlacement()) { - if (modifier.type() == PlacementModifierType.COUNT) { - hasCount = true; - } - ResourceLocation placementModifierType = placementModifierTypes.getKey(modifier.type()); - Optional> modifierOptional = registries.getPlacementModifierRegistry().get(NamespacedKey.fromString(placementModifierType.toString())); - modifierOptional.ifPresent(modifiers::add); - } - - if (!hasCount) { - Optional> modifierOptional = registries.getPlacementModifierRegistry().get(NamespacedKey.fromString("minecraft:count")); - modifierOptional.ifPresent(modifiers::add); - } - - registries.getFeatureRegistry().register(new de.derfrzocker.feature.api.Feature(NamespacedKey.fromString(placedFeatureRegistry.getKey(placedFeature).toString()), featureGenerator.get(), modifiers)); - } - } - - private void registerBiomes() { - Registry placedFeatureRegistry = getRegistry().registryOrThrow(Registry.PLACED_FEATURE_REGISTRY); - forEachBiome((biome, resourceLocation) -> { - de.derfrzocker.ore.control.api.Biome bio = new de.derfrzocker.ore.control.api.Biome(CraftNamespacedKey.fromMinecraft(resourceLocation)); - - biome.getGenerationSettings().features().forEach(featureSet -> featureSet.forEach(holder -> { - PlacedFeature feature = holder.get(); - ResourceLocation featureKey = placedFeatureRegistry.getKey(feature); - - if (featureKey == null) { - // Skip if the feature is not registered, this can happen if another plugin adds a feature without registering it - return; - } - - registries.getFeatureRegistry().get(CraftNamespacedKey.fromMinecraft(featureKey)).ifPresent(value -> bio.getFeatures().add(value)); - })); - - registries.getBiomeRegistry().register(bio); - }); - } - - @Override - public void saveDefaultValues(File directory) { - File world = new File(directory, "world"); - File biomes = new File(directory, "biome"); - - saveWorldValues(world); - saveBiomeValues(biomes); - } - - @Override - public void hookIntoBiomes() { - forEachBiome((biome, resourceLocation) -> { - try { - hookIntoBiome(biome, resourceLocation); - } catch (final Exception e) { - throw new RuntimeException("Unexpected error while hooking in NMS for Biome: " + biome, e); - } - }); - } - - @Override - public Set getBiomes(World world) { - Set biomes = new LinkedHashSet<>(); - ServerLevel level = ((CraftWorld) world).getHandle(); - Registry registry = getRegistry().registryOrThrow(Registry.BIOME_REGISTRY); - - for (Biome biome : level.getChunkSource().chunkMap.generator.getBiomeSource().possibleBiomes()) { - ResourceLocation key = registry.getKey(biome); - - biomes.add(registries.getBiomeRegistry().get(CraftNamespacedKey.fromMinecraft(key)).get()); - } - - return biomes; - } - - private void saveWorldValues(File directory) { - Registry registry = getRegistry().registryOrThrow(Registry.PLACED_FEATURE_REGISTRY); - for (Map.Entry, PlacedFeature> entry : registry.entrySet()) { - ResourceLocation key = entry.getKey().location(); - File file = new File(directory, key.getNamespace() + "/" + key.getPath() + ".json"); - try { - saveFeature(file, null, CraftNamespacedKey.fromMinecraft(key), entry.getValue()); - } catch (Exception e) { - throw new RuntimeException(String.format("Error while saving feature '%s'", key), e); - } - } - } - - private void saveBiomeValues(File directory) { - forEachBiome((biome, biomeKey) -> { - File biomeFile = new File(directory, biomeKey.getNamespace() + "/" + biomeKey.getPath()); - List>> decorations = biome.getGenerationSettings().features(); - for (List> list : decorations) { - for (Supplier featureSupplier : list) { - PlacedFeature feature = featureSupplier.get(); - Registry registry = getRegistry().registryOrThrow(Registry.PLACED_FEATURE_REGISTRY); - ResourceLocation featureKey = registry.getKey(feature); - - if (featureKey == null) { - // Skip if the feature is not registered, this can happen if another plugin adds a feature without registering it - return; - } - - File featureFile = new File(biomeFile, featureKey.getNamespace() + "/" + featureKey.getPath() + ".json"); - try { - saveFeature(featureFile, registries.getBiomeRegistry().get(CraftNamespacedKey.fromMinecraft(biomeKey)).get(), CraftNamespacedKey.fromMinecraft(featureKey), feature); - } catch (Exception e) { - throw new RuntimeException(String.format("Error while saving feature '%s' in biome '%s'", featureKey, biomeKey), e); - } - } - } - }); - } - - private void saveFeature(File file, de.derfrzocker.ore.control.api.Biome biome, NamespacedKey featureKey, PlacedFeature feature) { - ConfiguredFeature configuredFeature = feature.getFeatures().findFirst().orElse(null); - - if (configuredFeature == null) { - return; - } - - if (!(configuredFeature.feature() instanceof OreFeature) && !(configuredFeature.feature() instanceof ScatteredOreFeature) && !(configuredFeature.feature() instanceof GlowstoneFeature)) { - return; - } - - file.getParentFile().mkdirs(); - - FeatureGenerator featureGenerator; - FeatureGeneratorConfiguration featureConfiguration; - - if (configuredFeature.feature() instanceof OreFeature) { - OreConfiguration configuration = (OreConfiguration) configuredFeature.config(); - featureGenerator = registries.getFeatureGeneratorRegistry().get(NamespacedKey.minecraft("ore")).get(); - featureConfiguration = new OreFeatureConfiguration(featureGenerator, null, new FixedDoubleToIntegerValue(configuration.size), new FixedFloatValue(configuration.discardChanceOnAirExposure)); - } else if (configuredFeature.feature() instanceof ScatteredOreFeature) { - OreConfiguration configuration = (OreConfiguration) configuredFeature.config(); - featureGenerator = registries.getFeatureGeneratorRegistry().get(NamespacedKey.minecraft("scattered_ore")).get(); - featureConfiguration = new OreFeatureConfiguration(featureGenerator, null, new FixedDoubleToIntegerValue(configuration.size), new FixedFloatValue(configuration.discardChanceOnAirExposure)); - } else if (configuredFeature.feature() instanceof GlowstoneFeature) { - featureGenerator = registries.getFeatureGeneratorRegistry().get(NamespacedKey.minecraft("glowstone_blob")).get(); - featureConfiguration = new EmptyFeatureConfiguration(featureGenerator); - } else { - throw new RuntimeException("HOW?"); - } - - boolean hasCount = false; - List placementConfiguration = new ArrayList<>(); - Registry> placementModifierTypes = getRegistry().registryOrThrow(Registry.PLACEMENT_MODIFIER_REGISTRY); - for (PlacementModifier placement : feature.getPlacement()) { - ResourceLocation placementModifierType = placementModifierTypes.getKey(placement.type()); - Optional> modifierOptional = registries.getPlacementModifierRegistry().get(NamespacedKey.fromString(placementModifierType.toString())); - - if (modifierOptional.isEmpty()) { - continue; - } - - if (placement.type() == PlacementModifierType.RARITY_FILTER && placement instanceof RarityFilter) { - placementConfiguration.add(RarityModifierHook.createDefaultConfiguration((RarityFilter) placement, modifierOptional.get())); - } - if (placement.type() == PlacementModifierType.SURFACE_RELATIVE_THRESHOLD_FILTER && placement instanceof SurfaceRelativeThresholdFilter) { - placementConfiguration.add(SurfaceRelativeThresholdModifierHook.createDefaultConfiguration((SurfaceRelativeThresholdFilter) placement, modifierOptional.get())); - } - if (placement.type() == PlacementModifierType.SURFACE_WATER_DEPTH_FILTER && placement instanceof SurfaceWaterDepthFilter) { - placementConfiguration.add(SurfaceWaterDepthModifierHook.createDefaultConfiguration((SurfaceWaterDepthFilter) placement, modifierOptional.get())); - } - if (placement.type() == PlacementModifierType.COUNT && placement instanceof CountPlacement) { - placementConfiguration.add(CountModifierHook.createDefaultConfiguration((CountPlacement) placement, modifierOptional.get())); - hasCount = true; - } - if (placement.type() == PlacementModifierType.HEIGHT_RANGE && placement instanceof HeightRangePlacement) { - placementConfiguration.add(HeightRangeModifierHook.createDefaultConfiguration((HeightRangePlacement) placement, modifierOptional.get())); - } - } - - if (!hasCount) { - Optional> modifierOptional = registries.getPlacementModifierRegistry().get(NamespacedKey.fromString("minecraft:count")); - - modifierOptional.ifPresent(modifier -> placementConfiguration.add(0, CountModifierHook.createDefaultConfiguration(CountPlacement.of(1), modifier))); - } - - Config config = new Config(placementConfiguration, featureConfiguration); - - if (biome == null) { - configManager.setDefaultConfig(featureKey, config); - } else { - configManager.setDefaultConfig(biome, featureKey, config); - } - - if (file.exists()) { - return; - } - - try { - file.createNewFile(); - } catch (IOException e) { - throw new RuntimeException(e); - } - - JsonElement element = configParser.toJson(config); - try (FileWriter writer = new FileWriter(file)) { - writer.write(GSON.toJson(element)); - } catch (IOException e) { - throw new RuntimeException(e); - } - } - - private void forEachBiome(BiConsumer consumer) { - Registry registry = getRegistry().registryOrThrow(Registry.BIOME_REGISTRY); - for (Biome biome : registry) { - consumer.accept(biome, registry.getKey(biome)); - } - } - - private void hookIntoBiome(@NotNull final Biome biome, ResourceLocation minecraftKey) throws NoSuchFieldException, IllegalAccessException { - de.derfrzocker.ore.control.api.Biome oreControlBiome = registries.getBiomeRegistry().get(CraftNamespacedKey.fromMinecraft(minecraftKey)).get(); - List>> decorations = biome.getGenerationSettings().features(); - List>> newDecorations = new ArrayList<>(); - for (List> list : decorations) { - List> newList = new ArrayList<>(); - - for (Supplier featureSupplier : list) { - PlacedFeature feature = featureSupplier.get(); - - PlacedFeature newFeature = check(oreControlBiome, minecraftKey, feature); - - if (newFeature != null) { - addToList(newList, list.indexOf(featureSupplier), newFeature); - } else { - newList.add(featureSupplier); - } - } - - newDecorations.add(decorations.indexOf(list), newList); - } - - { - final Field field = getField(BiomeGenerationSettings.class, NMSReflectionNames.BIOME_GENERATION_SETTINGS_FEATURES); - field.setAccessible(true); - field.set(biome.getGenerationSettings(), newDecorations); - } - { - final Field field = getField(BiomeGenerationSettings.class, NMSReflectionNames.BIOME_GENERATION_SETTINGS_FEATURE_SET); - field.setAccessible(true); - field.set(biome.getGenerationSettings(), newDecorations.stream().flatMap(Collection::stream).map(Supplier::get).collect(Collectors.toSet())); - } - } - - private void addToList(List> list, int index, PlacedFeature feature) { - list.add(index, () -> feature); - } - - @Nullable - private PlacedFeature check(de.derfrzocker.ore.control.api.Biome biome, ResourceLocation biomeKey, PlacedFeature feature) { - // Not the best method to do this, but hey it works - final Registry registry = getRegistry().registryOrThrow(Registry.PLACED_FEATURE_REGISTRY); - ResourceLocation featureKey = registry.getKey(feature); - - // Return if the featureKey is null, this can happen when plugins are adding placed features to the biome without registering them - if (featureKey == null) { - // TODO add debug message - return null; - } - - NamespacedKey key = CraftNamespacedKey.fromMinecraft(featureKey); - feature = BuiltinRegistries.PLACED_FEATURE.get(featureKey); - - if (feature == null) { - return null; - } - - ConfiguredFeature configuredFeature = feature.getFeatures().findFirst().orElse(null); - - if (configuredFeature == null) { - return null; - } - - if (!(configuredFeature.feature() instanceof OreFeature) && !(configuredFeature.feature() instanceof ScatteredOreFeature) && !(configuredFeature.feature() instanceof GlowstoneFeature)) { - return null; - } - - boolean hasCount = false; - List placementModifiers = new ArrayList<>(); - for (PlacementModifier placement : feature.getPlacement()) { - if (placement.type() == PlacementModifierType.RARITY_FILTER) { - placementModifiers.add(new RarityModifierHook(oreControlManager, biome, key, (RarityFilter) placement)); - } else if (placement.type() == PlacementModifierType.SURFACE_RELATIVE_THRESHOLD_FILTER) { - placementModifiers.add(new SurfaceRelativeThresholdModifierHook(oreControlManager, biome, key, (SurfaceRelativeThresholdFilter) placement)); - } else if (placement.type() == PlacementModifierType.SURFACE_WATER_DEPTH_FILTER) { - placementModifiers.add(new SurfaceWaterDepthModifierHook(oreControlManager, biome, key, (SurfaceWaterDepthFilter) placement)); - } else if (placement.type() == PlacementModifierType.COUNT) { - hasCount = true; - placementModifiers.add(new CountModifierHook(oreControlManager, biome, key, (CountPlacement) placement)); - } else if (placement.type() == PlacementModifierType.HEIGHT_RANGE) { - placementModifiers.add(new HeightRangeModifierHook(oreControlManager, biome, key, (HeightRangePlacement) placement)); - } else { - placementModifiers.add(placement); - } - } - - if (!hasCount) { - placementModifiers.add(0, new CountModifierHook(oreControlManager, biome, key, CountPlacement.of(1))); - } - - if (configuredFeature.feature() instanceof OreFeature) { - return new PlacedFeature(() -> new ConfiguredFeature(new OreFeatureGeneratorHook(oreControlManager, key, biome), configuredFeature.config()), placementModifiers); - } else if (configuredFeature.feature() instanceof ScatteredOreFeature) { - return new PlacedFeature(() -> new ConfiguredFeature(new ScatteredOreFeatureGeneratorHook(oreControlManager, key, biome), configuredFeature.config()), placementModifiers); - } else if (configuredFeature.feature() instanceof GlowstoneFeature) { - return new PlacedFeature(() -> new ConfiguredFeature(new GlowstoneBlobFeatureGeneratorHook(oreControlManager, biome, key), configuredFeature.config()), placementModifiers); - } - - throw new RuntimeException("HOW?"); - } - - @SuppressWarnings("rawtypes") - private Field getField(@NotNull final Class clazz, @NotNull final String fieldName) throws NoSuchFieldException { - try { - return clazz.getDeclaredField(fieldName); - } catch (final NoSuchFieldException e) { - final Class superClass = clazz.getSuperclass(); - if (superClass == null) { - throw e; - } else { - return getField(superClass, fieldName); - } - } - } - - @NotNull - private RegistryAccess getRegistry() { - final DedicatedServer server = ((CraftServer) Bukkit.getServer()).getServer(); - - return server.registryAccess(); - } -} diff --git a/impl/v1_18_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R1/feature/generator/GlowstoneBlobFeatureGeneratorHook.java b/impl/v1_18_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R1/feature/generator/GlowstoneBlobFeatureGeneratorHook.java deleted file mode 100644 index f24e6fd1..00000000 --- a/impl/v1_18_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R1/feature/generator/GlowstoneBlobFeatureGeneratorHook.java +++ /dev/null @@ -1,25 +0,0 @@ -package de.derfrzocker.ore.control.impl.v1_18_R1.feature.generator; - -import de.derfrzocker.feature.common.feature.generator.configuration.EmptyFeatureConfiguration; -import de.derfrzocker.ore.control.api.Biome; -import de.derfrzocker.ore.control.api.OreControlManager; -import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Random; - -public class GlowstoneBlobFeatureGeneratorHook extends MinecraftFeatureGeneratorHook { - - public GlowstoneBlobFeatureGeneratorHook(@NotNull OreControlManager oreControlManager, Biome biome, NamespacedKey namespacedKey) { - super(NoneFeatureConfiguration.CODEC, GLOWSTONE_BLOB, oreControlManager, "glowstone_blob", biome, namespacedKey); - } - - @Override - public NoneFeatureConfiguration createConfig(@NotNull NoneFeatureConfiguration defaultConfiguration, @NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull EmptyFeatureConfiguration configuration) { - return defaultConfiguration; - } -} diff --git a/impl/v1_18_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R1/feature/generator/MinecraftFeatureGeneratorHook.java b/impl/v1_18_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R1/feature/generator/MinecraftFeatureGeneratorHook.java deleted file mode 100644 index ae559f3c..00000000 --- a/impl/v1_18_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R1/feature/generator/MinecraftFeatureGeneratorHook.java +++ /dev/null @@ -1,98 +0,0 @@ -package de.derfrzocker.ore.control.impl.v1_18_R1.feature.generator; - -import com.mojang.serialization.Codec; -import de.derfrzocker.feature.api.FeatureGenerator; -import de.derfrzocker.feature.api.FeatureGeneratorConfiguration; -import de.derfrzocker.ore.control.api.Biome; -import de.derfrzocker.ore.control.api.FeatureGeneratorHook; -import de.derfrzocker.ore.control.api.OreControlManager; -import de.derfrzocker.ore.control.api.config.Config; -import de.derfrzocker.ore.control.api.config.ConfigManager; -import net.minecraft.core.BlockPos; -import net.minecraft.world.level.ChunkPos; -import net.minecraft.world.level.WorldGenLevel; -import net.minecraft.world.level.chunk.ChunkGenerator; -import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; -import net.minecraft.world.level.levelgen.feature.Feature; -import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext; -import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration; -import org.bukkit.NamespacedKey; -import org.bukkit.craftbukkit.v1_18_R1.generator.CraftLimitedRegion; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Map; -import java.util.Optional; -import java.util.Random; -import java.util.concurrent.ConcurrentHashMap; - -public abstract class MinecraftFeatureGeneratorHook extends Feature implements FeatureGeneratorHook { - - private final Map cache = new ConcurrentHashMap<>(); - private final Feature feature; - private final ConfigManager configManager; - private final FeatureGenerator featureGenerator; - private final Biome biome; - private final NamespacedKey namespacedKey; - - public MinecraftFeatureGeneratorHook(Codec codec, Feature feature, @NotNull OreControlManager oreControlManager, @NotNull String name, Biome biome, NamespacedKey namespacedKey) { - super(codec); - this.feature = feature; - this.configManager = oreControlManager.getConfigManager(); - this.featureGenerator = (FeatureGenerator) oreControlManager.getRegistries().getFeatureGeneratorRegistry().get(NamespacedKey.minecraft(name)).get(); - this.biome = biome; - this.namespacedKey = namespacedKey; - - oreControlManager.addValueChangeListener(cache::clear); - } - - public abstract M createConfig(@NotNull M defaultConfiguration, @NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull C configuration); - - @Override - public FeatureGenerator getFeatureGenerator() { - return featureGenerator; - } - - @Override - public Biome getBiome() { - return biome; - } - - @NotNull - @Override - public NamespacedKey getKey() { - return namespacedKey; - } - - @Override - public boolean place(FeaturePlaceContext context) { - BlockPos origin = context.origin(); - - FeatureGeneratorConfiguration configuration = cache.computeIfAbsent(context.level().getMinecraftWorld().getWorld().getName(), this::loadConfig); - if (configuration == null) { - return feature.place(context); - } - - CraftLimitedRegion limitedRegion = new CraftLimitedRegion(context.level(), new ChunkPos(origin)); - M config = createConfig(context.config(), context.level().getMinecraftWorld().getWorld(), context.random(), new BlockVector(origin.getX(), origin.getY(), origin.getZ()), limitedRegion, (C) configuration); - limitedRegion.breakLink(); - - return place(context.topFeature(), context.level(), context.chunkGenerator(), context.random(), origin, config); - } - - private FeatureGeneratorConfiguration loadConfig(String name) { - Config config = configManager.getGenerationConfig(configManager.getOrCreateConfigInfo(name), biome, namespacedKey).orElse(null); - - if (config == null) { - return null; - } - - return config.getFeature(); - } - - private boolean place(Optional> top, WorldGenLevel world, ChunkGenerator generator, Random random, BlockPos pos, M config) { - return feature.place(new FeaturePlaceContext<>(top, world, generator, random, pos, config)); - } -} diff --git a/impl/v1_18_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R1/feature/generator/OreFeatureGeneratorHook.java b/impl/v1_18_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R1/feature/generator/OreFeatureGeneratorHook.java deleted file mode 100644 index 7e3cf67b..00000000 --- a/impl/v1_18_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R1/feature/generator/OreFeatureGeneratorHook.java +++ /dev/null @@ -1,54 +0,0 @@ -package de.derfrzocker.ore.control.impl.v1_18_R1.feature.generator; - -import de.derfrzocker.feature.impl.v1_18_R1.feature.generator.configuration.OreFeatureConfiguration; -import de.derfrzocker.feature.impl.v1_18_R1.value.target.TargetValue; -import de.derfrzocker.ore.control.api.Biome; -import de.derfrzocker.ore.control.api.OreControlManager; -import net.minecraft.world.level.levelgen.feature.Feature; -import net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.ArrayList; -import java.util.List; -import java.util.Random; - -public class OreFeatureGeneratorHook extends MinecraftFeatureGeneratorHook { - - public OreFeatureGeneratorHook(@NotNull OreControlManager oreControlManager, @NotNull NamespacedKey namespacedKey, @NotNull Biome biome) { - super(OreConfiguration.CODEC, Feature.ORE, oreControlManager, "ore", biome, namespacedKey); - } - - @Override - public OreConfiguration createConfig(@NotNull OreConfiguration defaultConfiguration, @NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull OreFeatureConfiguration configuration) { - List blockStates; - if (configuration.getTargets() == null) { - blockStates = defaultConfiguration.targetStates; - } else { - blockStates = new ArrayList<>(); - - for (TargetValue targetValue : configuration.getTargets()) { - blockStates.add(targetValue.getValue(worldInfo, random, position, limitedRegion)); - } - } - - int size; - if (configuration.getSize() == null) { - size = defaultConfiguration.size; - } else { - size = configuration.getSize().getValue(worldInfo, random, position, limitedRegion); - } - - float discardChanceOnAirExposure; - if (configuration.getDiscardChanceOnAirExposure() == null) { - discardChanceOnAirExposure = defaultConfiguration.discardChanceOnAirExposure; - } else { - discardChanceOnAirExposure = configuration.getDiscardChanceOnAirExposure().getValue(worldInfo, random, position, limitedRegion); - } - - return new OreConfiguration(blockStates, size, discardChanceOnAirExposure); - } -} diff --git a/impl/v1_18_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R1/feature/generator/ScatteredOreFeatureGeneratorHook.java b/impl/v1_18_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R1/feature/generator/ScatteredOreFeatureGeneratorHook.java deleted file mode 100644 index 83088072..00000000 --- a/impl/v1_18_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R1/feature/generator/ScatteredOreFeatureGeneratorHook.java +++ /dev/null @@ -1,54 +0,0 @@ -package de.derfrzocker.ore.control.impl.v1_18_R1.feature.generator; - -import de.derfrzocker.feature.impl.v1_18_R1.feature.generator.configuration.OreFeatureConfiguration; -import de.derfrzocker.feature.impl.v1_18_R1.value.target.TargetValue; -import de.derfrzocker.ore.control.api.Biome; -import de.derfrzocker.ore.control.api.OreControlManager; -import net.minecraft.world.level.levelgen.feature.Feature; -import net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.ArrayList; -import java.util.List; -import java.util.Random; - -public class ScatteredOreFeatureGeneratorHook extends MinecraftFeatureGeneratorHook { - - public ScatteredOreFeatureGeneratorHook(@NotNull OreControlManager oreControlManager, @NotNull NamespacedKey namespacedKey, @NotNull Biome biome) { - super(OreConfiguration.CODEC, Feature.SCATTERED_ORE, oreControlManager, "scattered_ore", biome, namespacedKey); - } - - @Override - public OreConfiguration createConfig(@NotNull OreConfiguration defaultConfiguration, @NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull OreFeatureConfiguration configuration) { - List blockStates; - if (configuration.getTargets() == null) { - blockStates = defaultConfiguration.targetStates; - } else { - blockStates = new ArrayList<>(); - - for (TargetValue targetValue : configuration.getTargets()) { - blockStates.add(targetValue.getValue(worldInfo, random, position, limitedRegion)); - } - } - - int size; - if (configuration.getSize() == null) { - size = defaultConfiguration.size; - } else { - size = configuration.getSize().getValue(worldInfo, random, position, limitedRegion); - } - - float discardChanceOnAirExposure; - if (configuration.getDiscardChanceOnAirExposure() == null) { - discardChanceOnAirExposure = defaultConfiguration.discardChanceOnAirExposure; - } else { - discardChanceOnAirExposure = configuration.getDiscardChanceOnAirExposure().getValue(worldInfo, random, position, limitedRegion); - } - - return new OreConfiguration(blockStates, size, discardChanceOnAirExposure); - } -} diff --git a/impl/v1_18_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R1/placement/CountModifierHook.java b/impl/v1_18_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R1/placement/CountModifierHook.java deleted file mode 100644 index e2d54856..00000000 --- a/impl/v1_18_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R1/placement/CountModifierHook.java +++ /dev/null @@ -1,55 +0,0 @@ -package de.derfrzocker.ore.control.impl.v1_18_R1.placement; - -import de.derfrzocker.feature.api.FeaturePlacementModifier; -import de.derfrzocker.feature.common.feature.placement.configuration.CountModifierConfiguration; -import de.derfrzocker.feature.common.value.number.IntegerValue; -import de.derfrzocker.ore.control.api.Biome; -import de.derfrzocker.ore.control.api.OreControlManager; -import de.derfrzocker.ore.control.impl.v1_18_R1.ConversionUtil; -import de.derfrzocker.ore.control.impl.v1_18_R1.NMSReflectionNames; -import net.minecraft.util.valueproviders.IntProvider; -import net.minecraft.world.level.levelgen.placement.CountPlacement; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.lang.reflect.Field; -import java.util.Random; - -public class CountModifierHook extends MinecraftPlacementModifierHook { - - public CountModifierHook(@NotNull OreControlManager oreControlManager, @NotNull Biome biome, @NotNull NamespacedKey namespacedKey, @NotNull CountPlacement defaultModifier) { - super(oreControlManager, "count", defaultModifier, biome, namespacedKey); - } - - public static CountModifierConfiguration createDefaultConfiguration(@NotNull CountPlacement defaultModifier, @NotNull FeaturePlacementModifier modifier) { - try { - Field count = CountPlacement.class.getDeclaredField(NMSReflectionNames.COUNT_PLACEMENT_COUNT); - count.setAccessible(true); - IntProvider value = (IntProvider) count.get(defaultModifier); - IntegerValue integerValue = ConversionUtil.convert(value); - return new CountModifierConfiguration(modifier, integerValue); - } catch (NoSuchFieldException | IllegalAccessException e) { - throw new RuntimeException(e); - } - } - - @Override - public CountModifierConfiguration createDefaultConfiguration(@NotNull CountPlacement defaultModifier) { - return createDefaultConfiguration(defaultModifier, getPlacementModifier()); - } - - @Override - public CountPlacement createModifier(@NotNull CountModifierConfiguration defaultConfiguration, @NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull CountModifierConfiguration configuration) { - int count; - if (configuration.getCount() == null) { - count = defaultConfiguration.getCount().getValue(worldInfo, random, position, limitedRegion); - } else { - count = configuration.getCount().getValue(worldInfo, random, position, limitedRegion); - } - - return CountPlacement.of(count); - } -} diff --git a/impl/v1_18_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R1/placement/HeightRangeModifierHook.java b/impl/v1_18_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R1/placement/HeightRangeModifierHook.java deleted file mode 100644 index 7ab5d404..00000000 --- a/impl/v1_18_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R1/placement/HeightRangeModifierHook.java +++ /dev/null @@ -1,122 +0,0 @@ -package de.derfrzocker.ore.control.impl.v1_18_R1.placement; - -import de.derfrzocker.feature.api.FeaturePlacementModifier; -import de.derfrzocker.feature.common.feature.placement.configuration.HeightRangeModifierConfiguration; -import de.derfrzocker.feature.common.value.number.IntegerValue; -import de.derfrzocker.feature.common.value.number.integer.FixedDoubleToIntegerValue; -import de.derfrzocker.feature.common.value.number.integer.trapezoid.TrapezoidIntegerValue; -import de.derfrzocker.feature.common.value.number.integer.uniform.UniformIntegerValue; -import de.derfrzocker.feature.impl.v1_18_R1.value.offset.NMSAboveBottomOffsetIntegerValue; -import de.derfrzocker.feature.impl.v1_18_R1.value.offset.NMSBelowTopOffsetIntegerValue; -import de.derfrzocker.ore.control.api.Biome; -import de.derfrzocker.ore.control.api.OreControlManager; -import de.derfrzocker.ore.control.impl.v1_18_R1.NMSReflectionNames; -import net.minecraft.world.level.levelgen.VerticalAnchor; -import net.minecraft.world.level.levelgen.heightproviders.ConstantHeight; -import net.minecraft.world.level.levelgen.heightproviders.HeightProvider; -import net.minecraft.world.level.levelgen.heightproviders.HeightProviderType; -import net.minecraft.world.level.levelgen.placement.HeightRangePlacement; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.lang.reflect.Field; -import java.util.Random; - -public class HeightRangeModifierHook extends MinecraftPlacementModifierHook { - - public HeightRangeModifierHook(@NotNull OreControlManager oreControlManager, @NotNull Biome biome, @NotNull NamespacedKey namespacedKey, @NotNull HeightRangePlacement defaultModifier) { - super(oreControlManager, "height_range", defaultModifier, biome, namespacedKey); - } - - public static HeightRangeModifierConfiguration createDefaultConfiguration(@NotNull HeightRangePlacement defaultModifier, @NotNull FeaturePlacementModifier modifier) { - try { - Field height = HeightRangePlacement.class.getDeclaredField(NMSReflectionNames.HEIGHT_RANGE_PLACEMENT_HEIGHT); - height.setAccessible(true); - HeightProvider value = (HeightProvider) height.get(defaultModifier); - - IntegerValue integerValue; - if (value.getType() == HeightProviderType.CONSTANT) { - integerValue = getIntegerValue(value.toString()); - } else if (value.getType() == HeightProviderType.UNIFORM) { - String uniform = value.toString(); - uniform = uniform.substring(1); - uniform = uniform.substring(0, uniform.length() - 1); - int charType = uniform.indexOf("-", 1); - String[] anchors = new String[]{uniform.substring(0, charType), uniform.substring(charType + 1)}; - - integerValue = new UniformIntegerValue(getIntegerValue(anchors[0]), getIntegerValue(anchors[1])); - } else if (value.getType() == HeightProviderType.TRAPEZOID) { - String trapezoid = value.toString(); - if (trapezoid.startsWith("triangle")) { - trapezoid = trapezoid.replace("triangle (", ""); - trapezoid = trapezoid.substring(0, trapezoid.length() - 1); - int charType = trapezoid.indexOf("-", 1); - String[] anchors = new String[]{trapezoid.substring(0, charType), trapezoid.substring(charType + 1)}; - - integerValue = new TrapezoidIntegerValue(getIntegerValue(anchors[0]), getIntegerValue(anchors[1]), new FixedDoubleToIntegerValue(0)); - } else if (trapezoid.startsWith("trapezoid")) { - trapezoid = trapezoid.replace("trapezoid (", ""); - trapezoid = trapezoid.substring(0, trapezoid.length() - 1); - String[] split = trapezoid.split("\\) in \\["); - - if (split.length != 2) { - throw new IllegalStateException(String.format("Expected a split of size '2', but got '%s' for input '%s'", split.length, trapezoid)); - } - - int plateau = Integer.parseInt(split[0]); - int charType = trapezoid.indexOf("-", 1); - String[] anchors = new String[]{trapezoid.substring(0, charType), trapezoid.substring(charType + 1)}; - integerValue = new TrapezoidIntegerValue(getIntegerValue(anchors[0]), getIntegerValue(anchors[1]), new FixedDoubleToIntegerValue(plateau)); - } else { - throw new UnsupportedOperationException(String.format("Unknown trapezoid value '%s'", trapezoid)); - } - - } else { // TODO add rest of HeightProvider types - throw new UnsupportedOperationException(String.format("No integer value equivalent for HeightProvider '%s'", value)); - } - - return new HeightRangeModifierConfiguration(modifier, integerValue); - } catch (NoSuchFieldException | IllegalAccessException e) { - throw new RuntimeException(e); - } - } - - private static IntegerValue getIntegerValue(String anchor) { - String[] values = anchor.split(" "); - int value = Integer.parseInt(values[0]); - - if (values.length == 2 && values[1].equals("absolute")) { - return new FixedDoubleToIntegerValue(value); - } - - if (values.length == 3 && values[1].equals("above") && values[2].equals("bottom")) { - return new NMSAboveBottomOffsetIntegerValue(new FixedDoubleToIntegerValue(value)); - } - - if (values.length == 3 && values[1].equals("below") && values[2].equals("top")) { - return new NMSBelowTopOffsetIntegerValue(new FixedDoubleToIntegerValue(value)); - } - - throw new UnsupportedOperationException(String.format("Unknown vertical anchor '%s'", anchor)); - } - - @Override - public HeightRangeModifierConfiguration createDefaultConfiguration(@NotNull HeightRangePlacement defaultModifier) { - return createDefaultConfiguration(defaultModifier, getPlacementModifier()); - } - - @Override - public HeightRangePlacement createModifier(@NotNull HeightRangeModifierConfiguration defaultConfiguration, @NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull HeightRangeModifierConfiguration configuration) { - int height; - if (configuration.getHeight() == null) { - height = defaultConfiguration.getHeight().getValue(worldInfo, random, position, limitedRegion); - } else { - height = configuration.getHeight().getValue(worldInfo, random, position, limitedRegion); - } - - return HeightRangePlacement.of(ConstantHeight.of(VerticalAnchor.absolute(height))); - } -} diff --git a/impl/v1_18_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R1/placement/MinecraftPlacementModifierHook.java b/impl/v1_18_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R1/placement/MinecraftPlacementModifierHook.java deleted file mode 100644 index 77f57cb8..00000000 --- a/impl/v1_18_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R1/placement/MinecraftPlacementModifierHook.java +++ /dev/null @@ -1,104 +0,0 @@ -package de.derfrzocker.ore.control.impl.v1_18_R1.placement; - -import de.derfrzocker.feature.api.FeaturePlacementModifier; -import de.derfrzocker.feature.api.PlacementModifierConfiguration; -import de.derfrzocker.ore.control.api.Biome; -import de.derfrzocker.ore.control.api.OreControlManager; -import de.derfrzocker.ore.control.api.PlacementModifierHook; -import de.derfrzocker.ore.control.api.config.Config; -import de.derfrzocker.ore.control.api.config.ConfigManager; -import net.minecraft.core.BlockPos; -import net.minecraft.world.level.ChunkPos; -import net.minecraft.world.level.WorldGenLevel; -import net.minecraft.world.level.chunk.ChunkGenerator; -import net.minecraft.world.level.levelgen.placement.PlacedFeature; -import net.minecraft.world.level.levelgen.placement.PlacementContext; -import net.minecraft.world.level.levelgen.placement.PlacementModifier; -import net.minecraft.world.level.levelgen.placement.PlacementModifierType; -import org.bukkit.NamespacedKey; -import org.bukkit.craftbukkit.v1_18_R1.generator.CraftLimitedRegion; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Map; -import java.util.Optional; -import java.util.Random; -import java.util.concurrent.ConcurrentHashMap; -import java.util.stream.Stream; - -public abstract class MinecraftPlacementModifierHook extends PlacementModifier implements PlacementModifierHook { - - private final Map cache = new ConcurrentHashMap<>(); - private final FeaturePlacementModifier placementModifier; - private final ConfigManager configManager; - private final M defaultModifier; - private final C defaultConfiguration; - private final Biome biome; - private final NamespacedKey namespacedKey; - - public MinecraftPlacementModifierHook(@NotNull OreControlManager oreControlManager, @NotNull String name, @NotNull M defaultModifier, @NotNull Biome biome, @NotNull NamespacedKey namespacedKey) { - this.configManager = oreControlManager.getConfigManager(); - this.placementModifier = (FeaturePlacementModifier) oreControlManager.getRegistries().getPlacementModifierRegistry().get(NamespacedKey.minecraft(name)).get(); - this.defaultModifier = defaultModifier; - this.defaultConfiguration = createDefaultConfiguration(defaultModifier); - this.biome = biome; - this.namespacedKey = namespacedKey; - - oreControlManager.addValueChangeListener(cache::clear); - } - - public abstract M createModifier(@NotNull C defaultConfiguration, @NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull C configuration); - - public abstract C createDefaultConfiguration(M defaultModifier); - - @Override - public FeaturePlacementModifier getPlacementModifier() { - return placementModifier; - } - - @Override - public Biome getBiome() { - return biome; - } - - @NotNull - @Override - public NamespacedKey getKey() { - return namespacedKey; - } - - @Override - public Stream getPositions(PlacementContext context, Random random, BlockPos blockPos) { - PlacementModifierConfiguration configuration = cache.computeIfAbsent(context.getLevel().getMinecraftWorld().getWorld().getName(), this::loadConfig); - - M modifier = defaultModifier; - if (configuration != null) { - CraftLimitedRegion limitedRegion = new CraftLimitedRegion(context.getLevel(), new ChunkPos(blockPos)); - modifier = createModifier(defaultConfiguration, context.getLevel().getMinecraftWorld().getWorld(), random, new BlockVector(blockPos.getX(), blockPos.getY(), blockPos.getZ()), limitedRegion, (C) configuration); - limitedRegion.breakLink(); - } - - return getPositions(context.topFeature(), context.getLevel(), context.generator(), random, blockPos, modifier); - } - - private PlacementModifierConfiguration loadConfig(String name) { - Config config = configManager.getGenerationConfig(configManager.getOrCreateConfigInfo(name), biome, namespacedKey).orElse(null); - - if (config == null) { - return null; - } - - return config.getPlacements().get(placementModifier); - } - - @Override - public PlacementModifierType type() { - return null; - } - - private Stream getPositions(Optional top, WorldGenLevel world, ChunkGenerator generator, Random random, BlockPos pos, M modifier) { - return modifier.getPositions(new PlacementContext(world, generator, top), random, pos); - } -} diff --git a/impl/v1_18_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R1/placement/RarityModifierHook.java b/impl/v1_18_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R1/placement/RarityModifierHook.java deleted file mode 100644 index ffadb725..00000000 --- a/impl/v1_18_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R1/placement/RarityModifierHook.java +++ /dev/null @@ -1,53 +0,0 @@ -package de.derfrzocker.ore.control.impl.v1_18_R1.placement; - -import de.derfrzocker.feature.api.FeaturePlacementModifier; -import de.derfrzocker.feature.common.feature.placement.configuration.RarityModifierConfiguration; -import de.derfrzocker.feature.common.value.number.integer.FixedDoubleToIntegerValue; -import de.derfrzocker.ore.control.api.Biome; -import de.derfrzocker.ore.control.api.OreControlManager; -import de.derfrzocker.ore.control.impl.v1_18_R1.NMSReflectionNames; -import net.minecraft.world.level.levelgen.placement.RarityFilter; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.bukkit.util.NumberConversions; -import org.jetbrains.annotations.NotNull; - -import java.lang.reflect.Field; -import java.util.Random; - -public class RarityModifierHook extends MinecraftPlacementModifierHook { - - public RarityModifierHook(@NotNull OreControlManager oreControlManager, @NotNull Biome biome, @NotNull NamespacedKey namespacedKey, @NotNull RarityFilter defaultModifier) { - super(oreControlManager, "rarity_filter", defaultModifier, biome, namespacedKey); - } - - public static RarityModifierConfiguration createDefaultConfiguration(@NotNull RarityFilter defaultModifier, @NotNull FeaturePlacementModifier modifier) { - try { - Field chance = RarityFilter.class.getDeclaredField(NMSReflectionNames.RARITY_FILTER_CHANCE); - chance.setAccessible(true); - Object value = chance.get(defaultModifier); - return new RarityModifierConfiguration(modifier, new FixedDoubleToIntegerValue(NumberConversions.toInt(value))); - } catch (NoSuchFieldException | IllegalAccessException e) { - throw new RuntimeException(e); - } - } - - @Override - public RarityModifierConfiguration createDefaultConfiguration(@NotNull RarityFilter defaultModifier) { - return createDefaultConfiguration(defaultModifier, getPlacementModifier()); - } - - @Override - public RarityFilter createModifier(@NotNull RarityModifierConfiguration defaultConfiguration, @NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull RarityModifierConfiguration configuration) { - int chance; - if (configuration.getChance() == null) { - chance = defaultConfiguration.getChance().getValue(worldInfo, random, position, limitedRegion); - } else { - chance = configuration.getChance().getValue(worldInfo, random, position, limitedRegion); - } - - return RarityFilter.onAverageOnceEvery(chance); - } -} diff --git a/impl/v1_18_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R1/placement/SurfaceRelativeThresholdModifierHook.java b/impl/v1_18_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R1/placement/SurfaceRelativeThresholdModifierHook.java deleted file mode 100644 index 26b45386..00000000 --- a/impl/v1_18_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R1/placement/SurfaceRelativeThresholdModifierHook.java +++ /dev/null @@ -1,77 +0,0 @@ -package de.derfrzocker.ore.control.impl.v1_18_R1.placement; - -import de.derfrzocker.feature.api.FeaturePlacementModifier; -import de.derfrzocker.feature.common.value.number.integer.FixedDoubleToIntegerValue; -import de.derfrzocker.feature.impl.v1_18_R1.placement.configuration.SurfaceRelativeThresholdModifierConfiguration; -import de.derfrzocker.ore.control.api.Biome; -import de.derfrzocker.ore.control.api.OreControlManager; -import de.derfrzocker.ore.control.impl.v1_18_R1.NMSReflectionNames; -import net.minecraft.world.level.levelgen.Heightmap; -import net.minecraft.world.level.levelgen.placement.SurfaceRelativeThresholdFilter; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.bukkit.util.NumberConversions; -import org.jetbrains.annotations.NotNull; - -import java.lang.reflect.Field; -import java.util.Random; - -public class SurfaceRelativeThresholdModifierHook extends MinecraftPlacementModifierHook { - - public SurfaceRelativeThresholdModifierHook(@NotNull OreControlManager oreControlManager, @NotNull Biome biome, @NotNull NamespacedKey namespacedKey, @NotNull SurfaceRelativeThresholdFilter defaultModifier) { - super(oreControlManager, "surface_relative_threshold_filter", defaultModifier, biome, namespacedKey); - } - - public static SurfaceRelativeThresholdModifierConfiguration createDefaultConfiguration(@NotNull SurfaceRelativeThresholdFilter defaultModifier, @NotNull FeaturePlacementModifier modifier) { - try { - Field heightmap = SurfaceRelativeThresholdFilter.class.getDeclaredField(NMSReflectionNames.SURFACE_RELATIVE_THRESHOLD_FILTER_HEIGHTMAP); - heightmap.setAccessible(true); - - Field minInclusive = SurfaceRelativeThresholdFilter.class.getDeclaredField(NMSReflectionNames.SURFACE_RELATIVE_THRESHOLD_FILTER_MIN_INCLUSIVE); - minInclusive.setAccessible(true); - - Field maxInclusive = SurfaceRelativeThresholdFilter.class.getDeclaredField(NMSReflectionNames.SURFACE_RELATIVE_THRESHOLD_FILTER_MAX_INCLUSIVE); - maxInclusive.setAccessible(true); - - Object heightmapValue = heightmap.get(defaultModifier); - Object minInclusiveValue = minInclusive.get(defaultModifier); - Object maxInclusiveValue = maxInclusive.get(defaultModifier); - return new SurfaceRelativeThresholdModifierConfiguration(modifier, null, new FixedDoubleToIntegerValue(NumberConversions.toInt(minInclusiveValue)), new FixedDoubleToIntegerValue(NumberConversions.toInt(maxInclusiveValue))); - } catch (NoSuchFieldException | IllegalAccessException e) { - throw new RuntimeException(e); - } - } - - @Override - public SurfaceRelativeThresholdFilter createModifier(@NotNull SurfaceRelativeThresholdModifierConfiguration defaultConfiguration, @NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull SurfaceRelativeThresholdModifierConfiguration configuration) { - Heightmap.Types heightmap; - if (configuration.getHeightmap() == null) { - heightmap = defaultConfiguration.getHeightmap().getValue(worldInfo, random, position, limitedRegion); - } else { - heightmap = configuration.getHeightmap().getValue(worldInfo, random, position, limitedRegion); - } - - int minInclusive; - if (configuration.getMinInclusive() == null) { - minInclusive = defaultConfiguration.getMinInclusive().getValue(worldInfo, random, position, limitedRegion); - } else { - minInclusive = configuration.getMinInclusive().getValue(worldInfo, random, position, limitedRegion); - } - - int maxInclusive; - if (configuration.getMaxInclusive() == null) { - maxInclusive = defaultConfiguration.getMaxInclusive().getValue(worldInfo, random, position, limitedRegion); - } else { - maxInclusive = configuration.getMaxInclusive().getValue(worldInfo, random, position, limitedRegion); - } - - return SurfaceRelativeThresholdFilter.of(heightmap, minInclusive, maxInclusive); - } - - @Override - public SurfaceRelativeThresholdModifierConfiguration createDefaultConfiguration(SurfaceRelativeThresholdFilter defaultModifier) { - return createDefaultConfiguration(defaultModifier, getPlacementModifier()); - } -} diff --git a/impl/v1_18_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R1/placement/SurfaceWaterDepthModifierHook.java b/impl/v1_18_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R1/placement/SurfaceWaterDepthModifierHook.java deleted file mode 100644 index 47d8a08d..00000000 --- a/impl/v1_18_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R1/placement/SurfaceWaterDepthModifierHook.java +++ /dev/null @@ -1,53 +0,0 @@ -package de.derfrzocker.ore.control.impl.v1_18_R1.placement; - -import de.derfrzocker.feature.api.FeaturePlacementModifier; -import de.derfrzocker.feature.common.feature.placement.configuration.SurfaceWaterDepthModifierConfiguration; -import de.derfrzocker.feature.common.value.number.integer.FixedDoubleToIntegerValue; -import de.derfrzocker.ore.control.api.Biome; -import de.derfrzocker.ore.control.api.OreControlManager; -import de.derfrzocker.ore.control.impl.v1_18_R1.NMSReflectionNames; -import net.minecraft.world.level.levelgen.placement.SurfaceWaterDepthFilter; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.bukkit.util.NumberConversions; -import org.jetbrains.annotations.NotNull; - -import java.lang.reflect.Field; -import java.util.Random; - -public class SurfaceWaterDepthModifierHook extends MinecraftPlacementModifierHook { - - public SurfaceWaterDepthModifierHook(@NotNull OreControlManager oreControlManager, @NotNull Biome biome, @NotNull NamespacedKey namespacedKey, @NotNull SurfaceWaterDepthFilter defaultModifier) { - super(oreControlManager, "surface_water_depth_filter", defaultModifier, biome, namespacedKey); - } - - public static SurfaceWaterDepthModifierConfiguration createDefaultConfiguration(@NotNull SurfaceWaterDepthFilter defaultModifier, @NotNull FeaturePlacementModifier modifier) { - try { - Field maxWaterDepth = SurfaceWaterDepthFilter.class.getDeclaredField(NMSReflectionNames.SURFACE_WATER_DEPTH_FILTER_MAX_WATER_DEPTH); - maxWaterDepth.setAccessible(true); - Object value = maxWaterDepth.get(defaultModifier); - return new SurfaceWaterDepthModifierConfiguration(modifier, new FixedDoubleToIntegerValue(NumberConversions.toInt(value))); - } catch (NoSuchFieldException | IllegalAccessException e) { - throw new RuntimeException(e); - } - } - - @Override - public SurfaceWaterDepthModifierConfiguration createDefaultConfiguration(@NotNull SurfaceWaterDepthFilter defaultModifier) { - return createDefaultConfiguration(defaultModifier, getPlacementModifier()); - } - - @Override - public SurfaceWaterDepthFilter createModifier(@NotNull SurfaceWaterDepthModifierConfiguration defaultConfiguration, @NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull SurfaceWaterDepthModifierConfiguration configuration) { - int maxWaterDepth; - if (configuration.getMaxWaterDepth() == null) { - maxWaterDepth = defaultConfiguration.getMaxWaterDepth().getValue(worldInfo, random, position, limitedRegion); - } else { - maxWaterDepth = configuration.getMaxWaterDepth().getValue(worldInfo, random, position, limitedRegion); - } - - return SurfaceWaterDepthFilter.forMaxDepth(maxWaterDepth); - } -} \ No newline at end of file diff --git a/impl/v1_18_R2/pom.xml b/impl/v1_18_R2/pom.xml deleted file mode 100644 index 1bcbeb78..00000000 --- a/impl/v1_18_R2/pom.xml +++ /dev/null @@ -1,80 +0,0 @@ - - - 4.0.0 - - - ore-control-impl - de.derfrzocker - ${revision} - - - ore-control-impl-v1_18_R2 - - - - de.derfrzocker - ore-control-api - ${project.version} - provided - - - de.derfrzocker - ore-control-common - ${project.version} - provided - - - org.spigotmc - spigot - 1.18.2-R0.1-SNAPSHOT - remapped-mojang - provided - true - - - - - - - net.md-5 - specialsource-maven-plugin - 1.2.3 - - - package - - remap - - remap-obf - - org.spigotmc:minecraft-server:1.18.2-R0.1-SNAPSHOT:txt:maps-mojang - true - org.spigotmc:spigot:1.18.2-R0.1-SNAPSHOT:jar:remapped-mojang - - true - remapped-obf - - - - package - - remap - - remap-spigot - - - ${project.build.directory}/${project.artifactId}-${project.version}-remapped-obf.jar - - org.spigotmc:minecraft-server:1.18.2-R0.1-SNAPSHOT:csrg:maps-spigot - org.spigotmc:spigot:1.18.2-R0.1-SNAPSHOT:jar:remapped-obf - - - - - - - - - \ No newline at end of file diff --git a/impl/v1_18_R2/src/main/java/de/derfrzocker/feature/impl/v1_18_R2/feature/generator/GlowstoneBlobFeatureGenerator.java b/impl/v1_18_R2/src/main/java/de/derfrzocker/feature/impl/v1_18_R2/feature/generator/GlowstoneBlobFeatureGenerator.java deleted file mode 100644 index 8879d352..00000000 --- a/impl/v1_18_R2/src/main/java/de/derfrzocker/feature/impl/v1_18_R2/feature/generator/GlowstoneBlobFeatureGenerator.java +++ /dev/null @@ -1,61 +0,0 @@ -package de.derfrzocker.feature.impl.v1_18_R2.feature.generator; - -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import de.derfrzocker.feature.api.Configuration; -import de.derfrzocker.feature.api.Registries; -import de.derfrzocker.feature.api.Setting; -import de.derfrzocker.feature.api.util.Parser; -import de.derfrzocker.feature.common.feature.generator.configuration.EmptyFeatureConfiguration; -import net.minecraft.world.level.levelgen.feature.Feature; -import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Collections; -import java.util.Random; -import java.util.Set; - -public class GlowstoneBlobFeatureGenerator extends MinecraftFeatureGenerator { - - public GlowstoneBlobFeatureGenerator(Registries registries) { - super(registries, Feature.GLOWSTONE_BLOB, "glowstone_blob"); - } - - @Override - public @NotNull Set getSettings() { - return Collections.emptySet(); - } - - @Override - public @NotNull Configuration createEmptyConfiguration() { - return new EmptyFeatureConfiguration(this); - } - - @Override - public EmptyFeatureConfiguration mergeConfig(EmptyFeatureConfiguration first, EmptyFeatureConfiguration second) { - return first; - } - - @Override - public Parser createParser(Registries registries) { - return new Parser<>() { - @Override - public JsonElement toJson(EmptyFeatureConfiguration value) { - return new JsonObject(); - } - - @Override - public EmptyFeatureConfiguration fromJson(JsonElement jsonElement) { - return new EmptyFeatureConfiguration(GlowstoneBlobFeatureGenerator.this); - } - }; - } - - @Override - public NoneFeatureConfiguration createConfiguration(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull EmptyFeatureConfiguration configuration) { - return NoneFeatureConfiguration.INSTANCE; - } -} diff --git a/impl/v1_18_R2/src/main/java/de/derfrzocker/feature/impl/v1_18_R2/feature/generator/MinecraftFeatureGenerator.java b/impl/v1_18_R2/src/main/java/de/derfrzocker/feature/impl/v1_18_R2/feature/generator/MinecraftFeatureGenerator.java deleted file mode 100644 index c2721ce0..00000000 --- a/impl/v1_18_R2/src/main/java/de/derfrzocker/feature/impl/v1_18_R2/feature/generator/MinecraftFeatureGenerator.java +++ /dev/null @@ -1,64 +0,0 @@ -package de.derfrzocker.feature.impl.v1_18_R2.feature.generator; - -import de.derfrzocker.feature.api.FeatureGenerator; -import de.derfrzocker.feature.api.FeatureGeneratorConfiguration; -import de.derfrzocker.feature.api.Registries; -import de.derfrzocker.feature.api.util.Parser; -import net.minecraft.core.BlockPos; -import net.minecraft.world.level.WorldGenLevel; -import net.minecraft.world.level.levelgen.feature.Feature; -import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext; -import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration; -import org.bukkit.NamespacedKey; -import org.bukkit.craftbukkit.v1_18_R2.generator.CraftLimitedRegion; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Optional; -import java.util.Random; - -public abstract class MinecraftFeatureGenerator implements FeatureGenerator { - - private final Parser parser; - private final Feature feature; - private final NamespacedKey namespacedKey; - - public MinecraftFeatureGenerator(Registries registries, Feature feature, String name) { - this.parser = (Parser) createParser(registries); - this.feature = feature; - this.namespacedKey = NamespacedKey.minecraft(name); - } - - public abstract C mergeConfig(C first, C second); - - public abstract Parser createParser(Registries registries); - - public abstract M createConfiguration(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull C configuration); - - @NotNull - @Override - public C merge(@NotNull FeatureGeneratorConfiguration first, @NotNull FeatureGeneratorConfiguration second) { - return mergeConfig((C) first, (C) second); - } - - @Override - public void place(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull C configuration) { - WorldGenLevel level = ((CraftLimitedRegion) limitedRegion).getHandle(); - M config = createConfiguration(worldInfo, random, position, limitedRegion, configuration); - feature.place(new FeaturePlaceContext<>(Optional.empty(), level, level.getMinecraftWorld().getChunkSource().getGenerator(), random, new BlockPos(position.getBlockX(), position.getBlockY(), position.getBlockZ()), config)); - } - - @NotNull - @Override - public Parser getParser() { - return parser; - } - - @NotNull - @Override - public NamespacedKey getKey() { - return namespacedKey; - } -} diff --git a/impl/v1_18_R2/src/main/java/de/derfrzocker/feature/impl/v1_18_R2/feature/generator/OreFeatureGenerator.java b/impl/v1_18_R2/src/main/java/de/derfrzocker/feature/impl/v1_18_R2/feature/generator/OreFeatureGenerator.java deleted file mode 100644 index 55942e34..00000000 --- a/impl/v1_18_R2/src/main/java/de/derfrzocker/feature/impl/v1_18_R2/feature/generator/OreFeatureGenerator.java +++ /dev/null @@ -1,116 +0,0 @@ -package de.derfrzocker.feature.impl.v1_18_R2.feature.generator; - -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import de.derfrzocker.feature.api.Registries; -import de.derfrzocker.feature.api.Setting; -import de.derfrzocker.feature.api.util.Parser; -import de.derfrzocker.feature.common.value.number.FloatType; -import de.derfrzocker.feature.common.value.number.FloatValue; -import de.derfrzocker.feature.common.value.number.IntegerType; -import de.derfrzocker.feature.common.value.number.IntegerValue; -import de.derfrzocker.feature.impl.v1_18_R2.feature.generator.configuration.OreFeatureConfiguration; -import de.derfrzocker.feature.impl.v1_18_R2.value.target.TargetValue; -import net.minecraft.world.level.levelgen.feature.OreFeature; -import net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.ArrayList; -import java.util.List; -import java.util.Random; -import java.util.Set; - -public class OreFeatureGenerator extends MinecraftFeatureGenerator { - - public OreFeatureGenerator(Registries registries) { - super(registries, OreFeature.ORE, "ore"); - } - - @Override - public Parser createParser(Registries registries) { - return new Parser<>() { - @Override - public JsonElement toJson(OreFeatureConfiguration value) { - JsonObject jsonObject = new JsonObject(); - - if (value.getSize() != null) { - JsonObject size = value.getSize().getValueType().getParser().toJson(value.getSize()).getAsJsonObject(); - size.addProperty("size_type", value.getSize().getValueType().getKey().toString()); - jsonObject.add("size", size); - } - - if (value.getDiscardChanceOnAirExposure() != null) { - JsonObject discardChanceOnAirExposure = value.getDiscardChanceOnAirExposure().getValueType().getParser().toJson(value.getDiscardChanceOnAirExposure()).getAsJsonObject(); - discardChanceOnAirExposure.addProperty("discard_chance_on_air_exposure_type", value.getDiscardChanceOnAirExposure().getValueType().getKey().toString()); - } - - return jsonObject; - } - - @Override - public OreFeatureConfiguration fromJson(JsonElement jsonElement) { - JsonObject jsonObject = jsonElement.getAsJsonObject(); - - IntegerValue size = null; - if (jsonObject.has("size")) { - JsonObject sizes = jsonObject.getAsJsonObject("size"); - size = registries.getValueTypeRegistry(IntegerType.class).get(NamespacedKey.fromString(sizes.getAsJsonPrimitive("size_type").getAsString())).get().getParser().fromJson(sizes); - } - - FloatValue discardChanceOnAirExposure = null; - if (jsonObject.has("discard_chance_on_air_exposure")) { - JsonObject chance = jsonObject.getAsJsonObject("discard_chance_on_air_exposure"); - discardChanceOnAirExposure = registries.getValueTypeRegistry(FloatType.class).get(NamespacedKey.fromString(chance.getAsJsonPrimitive("discard_chance_on_air_exposure_type").getAsString())).get().getParser().fromJson(chance); - } - - return new OreFeatureConfiguration(OreFeatureGenerator.this, null, size, discardChanceOnAirExposure); - } - }; - } - - @Override - public OreFeatureConfiguration mergeConfig(OreFeatureConfiguration first, OreFeatureConfiguration second) { - return new OreFeatureConfiguration(this, - first.getTargets() != null ? first.getTargets() : second.getTargets(), - first.getSize() != null ? first.getSize() : second.getSize(), - first.getDiscardChanceOnAirExposure() != null ? first.getDiscardChanceOnAirExposure() : second.getDiscardChanceOnAirExposure()); - } - - @Override - public OreConfiguration createConfiguration(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull OreFeatureConfiguration configuration) { - List blockStates = new ArrayList<>(); - if (configuration.getTargets() != null) { - for (TargetValue targetValue : configuration.getTargets()) { - blockStates.add(targetValue.getValue(worldInfo, random, position, limitedRegion)); - } - } - - int size = 0; - if (configuration.getSize() != null) { - size = configuration.getSize().getValue(worldInfo, random, position, limitedRegion); - } - - float discardChanceOnAirExposure = 0f; - if (configuration.getDiscardChanceOnAirExposure() != null) { - discardChanceOnAirExposure = configuration.getDiscardChanceOnAirExposure().getValue(worldInfo, random, position, limitedRegion); - } - - return new OreConfiguration(blockStates, size, discardChanceOnAirExposure); - } - - @NotNull - @Override - public Set getSettings() { - return OreFeatureConfiguration.SETTINGS; - } - - @NotNull - @Override - public OreFeatureConfiguration createEmptyConfiguration() { - return new OreFeatureConfiguration(this, null, null, null); - } -} diff --git a/impl/v1_18_R2/src/main/java/de/derfrzocker/feature/impl/v1_18_R2/feature/generator/ScatteredOreGenerator.java b/impl/v1_18_R2/src/main/java/de/derfrzocker/feature/impl/v1_18_R2/feature/generator/ScatteredOreGenerator.java deleted file mode 100644 index 20f87e90..00000000 --- a/impl/v1_18_R2/src/main/java/de/derfrzocker/feature/impl/v1_18_R2/feature/generator/ScatteredOreGenerator.java +++ /dev/null @@ -1,116 +0,0 @@ -package de.derfrzocker.feature.impl.v1_18_R2.feature.generator; - -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import de.derfrzocker.feature.api.Registries; -import de.derfrzocker.feature.api.Setting; -import de.derfrzocker.feature.api.util.Parser; -import de.derfrzocker.feature.common.value.number.FloatType; -import de.derfrzocker.feature.common.value.number.FloatValue; -import de.derfrzocker.feature.common.value.number.IntegerType; -import de.derfrzocker.feature.common.value.number.IntegerValue; -import de.derfrzocker.feature.impl.v1_18_R2.feature.generator.configuration.OreFeatureConfiguration; -import de.derfrzocker.feature.impl.v1_18_R2.value.target.TargetValue; -import net.minecraft.world.level.levelgen.feature.OreFeature; -import net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.ArrayList; -import java.util.List; -import java.util.Random; -import java.util.Set; - -public class ScatteredOreGenerator extends MinecraftFeatureGenerator { - - public ScatteredOreGenerator(Registries registries) { - super(registries, OreFeature.SCATTERED_ORE, "scattered_ore"); - } - - @Override - public Parser createParser(Registries registries) { - return new Parser<>() { - @Override - public JsonElement toJson(OreFeatureConfiguration value) { - JsonObject jsonObject = new JsonObject(); - - if (value.getSize() != null) { - JsonObject size = value.getSize().getValueType().getParser().toJson(value.getSize()).getAsJsonObject(); - size.addProperty("size_type", value.getSize().getValueType().getKey().toString()); - jsonObject.add("size", size); - } - - if (value.getDiscardChanceOnAirExposure() != null) { - JsonObject discardChanceOnAirExposure = value.getDiscardChanceOnAirExposure().getValueType().getParser().toJson(value.getDiscardChanceOnAirExposure()).getAsJsonObject(); - discardChanceOnAirExposure.addProperty("discard_chance_on_air_exposure_type", value.getDiscardChanceOnAirExposure().getValueType().getKey().toString()); - } - - return jsonObject; - } - - @Override - public OreFeatureConfiguration fromJson(JsonElement jsonElement) { - JsonObject jsonObject = jsonElement.getAsJsonObject(); - - IntegerValue size = null; - if (jsonObject.has("size")) { - JsonObject sizes = jsonObject.getAsJsonObject("size"); - size = registries.getValueTypeRegistry(IntegerType.class).get(NamespacedKey.fromString(sizes.getAsJsonPrimitive("size_type").getAsString())).get().getParser().fromJson(sizes); - } - - FloatValue discardChanceOnAirExposure = null; - if (jsonObject.has("discard_chance_on_air_exposure")) { - JsonObject chance = jsonObject.getAsJsonObject("discard_chance_on_air_exposure"); - discardChanceOnAirExposure = registries.getValueTypeRegistry(FloatType.class).get(NamespacedKey.fromString(chance.getAsJsonPrimitive("discard_chance_on_air_exposure_type").getAsString())).get().getParser().fromJson(chance); - } - - return new OreFeatureConfiguration(ScatteredOreGenerator.this, null, size, discardChanceOnAirExposure); - } - }; - } - - @Override - public OreFeatureConfiguration mergeConfig(OreFeatureConfiguration first, OreFeatureConfiguration second) { - return new OreFeatureConfiguration(this, - first.getTargets() != null ? first.getTargets() : second.getTargets(), - first.getSize() != null ? first.getSize() : second.getSize(), - first.getDiscardChanceOnAirExposure() != null ? first.getDiscardChanceOnAirExposure() : second.getDiscardChanceOnAirExposure()); - } - - @Override - public OreConfiguration createConfiguration(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull OreFeatureConfiguration configuration) { - List blockStates = new ArrayList<>(); - if (configuration.getTargets() != null) { - for (TargetValue targetValue : configuration.getTargets()) { - blockStates.add(targetValue.getValue(worldInfo, random, position, limitedRegion)); - } - } - - int size = 0; - if (configuration.getSize() != null) { - size = configuration.getSize().getValue(worldInfo, random, position, limitedRegion); - } - - float discardChanceOnAirExposure = 0f; - if (configuration.getDiscardChanceOnAirExposure() != null) { - discardChanceOnAirExposure = configuration.getDiscardChanceOnAirExposure().getValue(worldInfo, random, position, limitedRegion); - } - - return new OreConfiguration(blockStates, size, discardChanceOnAirExposure); - } - - @NotNull - @Override - public Set getSettings() { - return OreFeatureConfiguration.SETTINGS; - } - - @NotNull - @Override - public OreFeatureConfiguration createEmptyConfiguration() { - return new OreFeatureConfiguration(this, null, null, null); - } -} diff --git a/impl/v1_18_R2/src/main/java/de/derfrzocker/feature/impl/v1_18_R2/feature/generator/configuration/OreFeatureConfiguration.java b/impl/v1_18_R2/src/main/java/de/derfrzocker/feature/impl/v1_18_R2/feature/generator/configuration/OreFeatureConfiguration.java deleted file mode 100644 index f9eff346..00000000 --- a/impl/v1_18_R2/src/main/java/de/derfrzocker/feature/impl/v1_18_R2/feature/generator/configuration/OreFeatureConfiguration.java +++ /dev/null @@ -1,124 +0,0 @@ -package de.derfrzocker.feature.impl.v1_18_R2.feature.generator.configuration; - -import de.derfrzocker.feature.api.FeatureGenerator; -import de.derfrzocker.feature.api.FeatureGeneratorConfiguration; -import de.derfrzocker.feature.api.Setting; -import de.derfrzocker.feature.api.Value; -import de.derfrzocker.feature.common.value.number.FloatType; -import de.derfrzocker.feature.common.value.number.FloatValue; -import de.derfrzocker.feature.common.value.number.IntegerType; -import de.derfrzocker.feature.common.value.number.IntegerValue; -import de.derfrzocker.feature.impl.v1_18_R2.value.target.TargetValue; -import org.jetbrains.annotations.NotNull; - -import java.util.Collections; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; - -public class OreFeatureConfiguration implements FeatureGeneratorConfiguration { - - public final static Set SETTINGS; - private final static Setting SIZE = new Setting("size", IntegerType.class); - private final static Setting DISCARD_CHANCE_ON_AIR_EXPOSURE = new Setting("discard-chance-on-air-exposure", FloatType.class); - - static { - Set settings = new LinkedHashSet<>(); - settings.add(SIZE); - settings.add(DISCARD_CHANCE_ON_AIR_EXPOSURE); - SETTINGS = Collections.unmodifiableSet(settings); - } - - private final FeatureGenerator featureGenerator; - private final List targets; - private IntegerValue size; - private FloatValue discardChanceOnAirExposure; - private boolean dirty = false; - - public OreFeatureConfiguration(FeatureGenerator featureGenerator, List targets, IntegerValue size, FloatValue discardChanceOnAirExposure) { - this.featureGenerator = featureGenerator; - this.targets = targets; - this.size = size; - this.discardChanceOnAirExposure = discardChanceOnAirExposure; - } - - public List getTargets() { - return targets; - } - - public IntegerValue getSize() { - return size; - } - - public FloatValue getDiscardChanceOnAirExposure() { - return discardChanceOnAirExposure; - } - - @NotNull - @Override - public FeatureGenerator getOwner() { - return featureGenerator; - } - - @NotNull - @Override - public Set getSettings() { - return SETTINGS; - } - - @Override - public Value getValue(@NotNull Setting setting) { - if (setting == SIZE) { - return getSize(); - } - - if (setting == DISCARD_CHANCE_ON_AIR_EXPOSURE) { - return getDiscardChanceOnAirExposure(); - } - - throw new IllegalArgumentException(String.format("Setting '%s' is not in the configuration '%s'", setting, "OreFeatureConfiguration")); - } - - @Override - public void setValue(@NotNull Setting setting, Value value) { - if (setting == SIZE) { - size = (IntegerValue) value; - dirty = true; - return; - } - - if (setting == DISCARD_CHANCE_ON_AIR_EXPOSURE) { - discardChanceOnAirExposure = (FloatValue) value; - dirty = true; - return; - } - - throw new IllegalArgumentException(String.format("Setting '%s' is not in the configuration '%s'", setting, "OreFeatureConfiguration")); - } - - @Override - public boolean isDirty() { - if (dirty) { - return true; - } - - if (size != null && size.isDirty()) { - return true; - } - - return discardChanceOnAirExposure != null && discardChanceOnAirExposure.isDirty(); - } - - @Override - public void saved() { - dirty = false; - - if (size != null) { - size.saved(); - } - - if (discardChanceOnAirExposure != null) { - discardChanceOnAirExposure.saved(); - } - } -} diff --git a/impl/v1_18_R2/src/main/java/de/derfrzocker/feature/impl/v1_18_R2/placement/CountModifier.java b/impl/v1_18_R2/src/main/java/de/derfrzocker/feature/impl/v1_18_R2/placement/CountModifier.java deleted file mode 100644 index bd94e826..00000000 --- a/impl/v1_18_R2/src/main/java/de/derfrzocker/feature/impl/v1_18_R2/placement/CountModifier.java +++ /dev/null @@ -1,85 +0,0 @@ -package de.derfrzocker.feature.impl.v1_18_R2.placement; - -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import de.derfrzocker.feature.api.Registries; -import de.derfrzocker.feature.api.Setting; -import de.derfrzocker.feature.api.util.Parser; -import de.derfrzocker.feature.common.feature.placement.configuration.CountModifierConfiguration; -import de.derfrzocker.feature.common.value.number.IntegerType; -import de.derfrzocker.feature.common.value.number.IntegerValue; -import net.minecraft.world.level.levelgen.placement.CountPlacement; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Random; -import java.util.Set; - -public class CountModifier extends MinecraftPlacementModifier { - - public CountModifier(@NotNull Registries registries) { - super(registries, "count"); - } - - @Override - public CountModifierConfiguration mergeConfig(CountModifierConfiguration first, CountModifierConfiguration second) { - return new CountModifierConfiguration(this, - first.getCount() != null ? first.getCount() : second.getCount()); - } - - @Override - public Parser createParser(Registries registries) { - return new Parser<>() { - @Override - public JsonElement toJson(CountModifierConfiguration value) { - JsonObject jsonObject = new JsonObject(); - if (value.getCount() != null) { - JsonObject entry = value.getCount().getValueType().getParser().toJson(value.getCount()).getAsJsonObject(); - entry.addProperty("count_type", value.getCount().getValueType().getKey().toString()); - jsonObject.add("count", entry); - } - return jsonObject; - } - - @Override - public CountModifierConfiguration fromJson(JsonElement jsonElement) { - JsonObject jsonObject = jsonElement.getAsJsonObject(); - - IntegerValue count = null; - if (jsonObject.has("count")) { - JsonObject entry = jsonObject.getAsJsonObject("count"); - count = registries.getValueTypeRegistry(IntegerType.class).get(NamespacedKey.fromString(entry.getAsJsonPrimitive("count_type").getAsString())).get().getParser().fromJson(entry); - } - - return new CountModifierConfiguration(CountModifier.this, count); - } - }; - } - - @Override - public CountPlacement createPlacementModifier(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull CountModifierConfiguration configuration) { - int count; - if (configuration.getCount() != null) { - count = configuration.getCount().getValue(worldInfo, random, position, limitedRegion); - } else { - count = 0; - } - - return CountPlacement.of(count); - } - - @NotNull - @Override - public Set getSettings() { - return CountModifierConfiguration.SETTINGS; - } - - @NotNull - @Override - public CountModifierConfiguration createEmptyConfiguration() { - return new CountModifierConfiguration(this, null); - } -} diff --git a/impl/v1_18_R2/src/main/java/de/derfrzocker/feature/impl/v1_18_R2/placement/HeightRangeModifier.java b/impl/v1_18_R2/src/main/java/de/derfrzocker/feature/impl/v1_18_R2/placement/HeightRangeModifier.java deleted file mode 100644 index 4d4c43ad..00000000 --- a/impl/v1_18_R2/src/main/java/de/derfrzocker/feature/impl/v1_18_R2/placement/HeightRangeModifier.java +++ /dev/null @@ -1,88 +0,0 @@ -package de.derfrzocker.feature.impl.v1_18_R2.placement; - -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import de.derfrzocker.feature.api.Registries; -import de.derfrzocker.feature.api.Setting; -import de.derfrzocker.feature.api.util.Parser; -import de.derfrzocker.feature.common.feature.placement.configuration.HeightRangeModifierConfiguration; -import de.derfrzocker.feature.common.value.number.IntegerType; -import de.derfrzocker.feature.common.value.number.IntegerValue; -import net.minecraft.world.level.levelgen.VerticalAnchor; -import net.minecraft.world.level.levelgen.heightproviders.ConstantHeight; -import net.minecraft.world.level.levelgen.heightproviders.HeightProvider; -import net.minecraft.world.level.levelgen.placement.HeightRangePlacement; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Random; -import java.util.Set; - -public class HeightRangeModifier extends MinecraftPlacementModifier { - - public HeightRangeModifier(@NotNull Registries registries) { - super(registries, "height_range"); - } - - @Override - public HeightRangeModifierConfiguration mergeConfig(HeightRangeModifierConfiguration first, HeightRangeModifierConfiguration second) { - return new HeightRangeModifierConfiguration(this, - first.getHeight() != null ? first.getHeight() : second.getHeight()); - } - - @Override - public Parser createParser(Registries registries) { - return new Parser<>() { - @Override - public JsonElement toJson(HeightRangeModifierConfiguration value) { - JsonObject jsonObject = new JsonObject(); - if (value.getHeight() != null) { - JsonObject entry = value.getHeight().getValueType().getParser().toJson(value.getHeight()).getAsJsonObject(); - entry.addProperty("height_range_type", value.getHeight().getValueType().getKey().toString()); - jsonObject.add("height", entry); - } - return jsonObject; - } - - @Override - public HeightRangeModifierConfiguration fromJson(JsonElement jsonElement) { - JsonObject jsonObject = jsonElement.getAsJsonObject(); - - IntegerValue count = null; - if (jsonObject.has("height")) { - JsonObject entry = jsonObject.getAsJsonObject("height"); - count = registries.getValueTypeRegistry(IntegerType.class).get(NamespacedKey.fromString(entry.getAsJsonPrimitive("height_range_type").getAsString())).get().getParser().fromJson(entry); - } - - return new HeightRangeModifierConfiguration(HeightRangeModifier.this, count); - } - }; - } - - @Override - public HeightRangePlacement createPlacementModifier(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull HeightRangeModifierConfiguration configuration) { - HeightProvider height; - if (configuration.getHeight() != null) { - height = ConstantHeight.of(VerticalAnchor.absolute(configuration.getHeight().getValue(worldInfo, random, position, limitedRegion))); - } else { - height = ConstantHeight.of(VerticalAnchor.bottom()); - } - - return HeightRangePlacement.of(height); - } - - @NotNull - @Override - public Set getSettings() { - return HeightRangeModifierConfiguration.SETTINGS; - } - - @NotNull - @Override - public HeightRangeModifierConfiguration createEmptyConfiguration() { - return new HeightRangeModifierConfiguration(this, null); - } -} diff --git a/impl/v1_18_R2/src/main/java/de/derfrzocker/feature/impl/v1_18_R2/placement/MinecraftPlacementModifier.java b/impl/v1_18_R2/src/main/java/de/derfrzocker/feature/impl/v1_18_R2/placement/MinecraftPlacementModifier.java deleted file mode 100644 index 40fd25cb..00000000 --- a/impl/v1_18_R2/src/main/java/de/derfrzocker/feature/impl/v1_18_R2/placement/MinecraftPlacementModifier.java +++ /dev/null @@ -1,64 +0,0 @@ -package de.derfrzocker.feature.impl.v1_18_R2.placement; - -import de.derfrzocker.feature.api.FeaturePlacementModifier; -import de.derfrzocker.feature.api.PlacementModifierConfiguration; -import de.derfrzocker.feature.api.Registries; -import de.derfrzocker.feature.api.util.Parser; -import net.minecraft.core.BlockPos; -import net.minecraft.world.level.WorldGenLevel; -import net.minecraft.world.level.levelgen.placement.PlacementContext; -import net.minecraft.world.level.levelgen.placement.PlacementModifier; -import org.bukkit.NamespacedKey; -import org.bukkit.craftbukkit.v1_18_R2.generator.CraftLimitedRegion; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Optional; -import java.util.Random; -import java.util.stream.Stream; - -public abstract class MinecraftPlacementModifier implements FeaturePlacementModifier { - - private final Parser parser; - private final NamespacedKey namespacedKey; - - public MinecraftPlacementModifier(@NotNull Registries registries, @NotNull String name) { - this.parser = (Parser) createParser(registries); - this.namespacedKey = NamespacedKey.minecraft(name); - } - - public abstract C mergeConfig(C first, C second); - - public abstract Parser createParser(Registries registries); - - public abstract M createPlacementModifier(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull C configuration); - - @NotNull - @Override - public C merge(@NotNull PlacementModifierConfiguration first, @NotNull PlacementModifierConfiguration second) { - return mergeConfig((C) first, (C) second); - } - - @NotNull - @Override - public Stream getPositions(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull C configuration) { - WorldGenLevel level = ((CraftLimitedRegion) limitedRegion).getHandle(); - M placementModifier = createPlacementModifier(worldInfo, random, position, limitedRegion, configuration); - return placementModifier.getPositions(new PlacementContext(level, level.getMinecraftWorld().getChunkSource().getGenerator(), Optional.empty()), random, new BlockPos(position.getBlockX(), position.getBlockY(), position.getBlockZ())). - map(pos -> new BlockVector(pos.getX(), pos.getY(), pos.getZ())); - } - - @NotNull - @Override - public Parser getParser() { - return parser; - } - - @NotNull - @Override - public NamespacedKey getKey() { - return namespacedKey; - } -} diff --git a/impl/v1_18_R2/src/main/java/de/derfrzocker/feature/impl/v1_18_R2/placement/RarityModifier.java b/impl/v1_18_R2/src/main/java/de/derfrzocker/feature/impl/v1_18_R2/placement/RarityModifier.java deleted file mode 100644 index 21da0cac..00000000 --- a/impl/v1_18_R2/src/main/java/de/derfrzocker/feature/impl/v1_18_R2/placement/RarityModifier.java +++ /dev/null @@ -1,83 +0,0 @@ -package de.derfrzocker.feature.impl.v1_18_R2.placement; - -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import de.derfrzocker.feature.api.Registries; -import de.derfrzocker.feature.api.Setting; -import de.derfrzocker.feature.api.util.Parser; -import de.derfrzocker.feature.common.feature.placement.configuration.RarityModifierConfiguration; -import de.derfrzocker.feature.common.value.number.IntegerType; -import de.derfrzocker.feature.common.value.number.IntegerValue; -import net.minecraft.world.level.levelgen.placement.RarityFilter; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Random; -import java.util.Set; - -public class RarityModifier extends MinecraftPlacementModifier { - - public RarityModifier(@NotNull Registries registries) { - super(registries, "rarity_filter"); - } - - - @Override - public RarityModifierConfiguration mergeConfig(RarityModifierConfiguration first, RarityModifierConfiguration second) { - return new RarityModifierConfiguration(this, - first.getChance() != null ? first.getChance() : second.getChance()); - } - - @Override - public Parser createParser(Registries registries) { - return new Parser<>() { - @Override - public JsonElement toJson(RarityModifierConfiguration value) { - JsonObject jsonObject = new JsonObject(); - if (value.getChance() != null) { - JsonObject entry = value.getChance().getValueType().getParser().toJson(value.getChance()).getAsJsonObject(); - entry.addProperty("chance_type", value.getChance().getValueType().getKey().toString()); - jsonObject.add("chance", entry); - } - return jsonObject; - } - - @Override - public RarityModifierConfiguration fromJson(JsonElement jsonElement) { - JsonObject jsonObject = jsonElement.getAsJsonObject(); - - IntegerValue count = null; - if (jsonObject.has("chance")) { - JsonObject entry = jsonObject.getAsJsonObject("chance"); - count = registries.getValueTypeRegistry(IntegerType.class).get(NamespacedKey.fromString(entry.getAsJsonPrimitive("chance_type").getAsString())).get().getParser().fromJson(entry); - } - - return new RarityModifierConfiguration(RarityModifier.this, count); - } - }; - } - - @Override - public RarityFilter createPlacementModifier(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull RarityModifierConfiguration configuration) { - int chance = 0; - if (configuration.getChance() != null) { - chance = configuration.getChance().getValue(worldInfo, random, position, limitedRegion); - } - return RarityFilter.onAverageOnceEvery(chance); - } - - @NotNull - @Override - public Set getSettings() { - return RarityModifierConfiguration.SETTINGS; - } - - @NotNull - @Override - public RarityModifierConfiguration createEmptyConfiguration() { - return new RarityModifierConfiguration(this, null); - } -} diff --git a/impl/v1_18_R2/src/main/java/de/derfrzocker/feature/impl/v1_18_R2/placement/SurfaceRelativeThresholdModifier.java b/impl/v1_18_R2/src/main/java/de/derfrzocker/feature/impl/v1_18_R2/placement/SurfaceRelativeThresholdModifier.java deleted file mode 100644 index c3906989..00000000 --- a/impl/v1_18_R2/src/main/java/de/derfrzocker/feature/impl/v1_18_R2/placement/SurfaceRelativeThresholdModifier.java +++ /dev/null @@ -1,107 +0,0 @@ -package de.derfrzocker.feature.impl.v1_18_R2.placement; - -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import de.derfrzocker.feature.api.Registries; -import de.derfrzocker.feature.api.Setting; -import de.derfrzocker.feature.api.util.Parser; -import de.derfrzocker.feature.common.value.number.IntegerType; -import de.derfrzocker.feature.common.value.number.IntegerValue; -import de.derfrzocker.feature.impl.v1_18_R2.placement.configuration.SurfaceRelativeThresholdModifierConfiguration; -import net.minecraft.world.level.levelgen.Heightmap; -import net.minecraft.world.level.levelgen.placement.SurfaceRelativeThresholdFilter; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Random; -import java.util.Set; - -public class SurfaceRelativeThresholdModifier extends MinecraftPlacementModifier { - public SurfaceRelativeThresholdModifier(@NotNull Registries registries) { - super(registries, "surface_relative_threshold_filter"); - } - - @Override - public SurfaceRelativeThresholdModifierConfiguration mergeConfig(SurfaceRelativeThresholdModifierConfiguration first, SurfaceRelativeThresholdModifierConfiguration second) { - return new SurfaceRelativeThresholdModifierConfiguration(this, - first.getHeightmap() != null ? first.getHeightmap() : second.getHeightmap(), - first.getMinInclusive() != null ? first.getMinInclusive() : second.getMinInclusive(), - first.getMaxInclusive() != null ? first.getMaxInclusive() : second.getMaxInclusive()); - } - - @Override - public Parser createParser(Registries registries) { - return new Parser<>() { - @Override - public JsonElement toJson(SurfaceRelativeThresholdModifierConfiguration value) { - JsonObject jsonObject = new JsonObject(); - if (value.getMinInclusive() != null) { - JsonObject entry = value.getMinInclusive().getValueType().getParser().toJson(value.getMinInclusive()).getAsJsonObject(); - entry.addProperty("min_inclusive_type", value.getMinInclusive().getValueType().getKey().toString()); - jsonObject.add("min_inclusive", entry); - } - - if (value.getMaxInclusive() != null) { - JsonObject entry = value.getMaxInclusive().getValueType().getParser().toJson(value.getMaxInclusive()).getAsJsonObject(); - entry.addProperty("max_inclusive_type", value.getMaxInclusive().getValueType().getKey().toString()); - jsonObject.add("max_inclusive", entry); - } - - return jsonObject; - } - - @Override - public SurfaceRelativeThresholdModifierConfiguration fromJson(JsonElement jsonElement) { - JsonObject jsonObject = jsonElement.getAsJsonObject(); - - IntegerValue minInclusive = null; - if (jsonObject.has("min_inclusive")) { - JsonObject entry = jsonObject.getAsJsonObject("min_inclusive"); - minInclusive = registries.getValueTypeRegistry(IntegerType.class).get(NamespacedKey.fromString(entry.getAsJsonPrimitive("min_inclusive_type").getAsString())).get().getParser().fromJson(entry); - } - - IntegerValue maxInclusive = null; - if (jsonObject.has("max_inclusive")) { - JsonObject entry = jsonObject.getAsJsonObject("max_inclusive"); - maxInclusive = registries.getValueTypeRegistry(IntegerType.class).get(NamespacedKey.fromString(entry.getAsJsonPrimitive("max_inclusive_type").getAsString())).get().getParser().fromJson(entry); - } - - return new SurfaceRelativeThresholdModifierConfiguration(SurfaceRelativeThresholdModifier.this, null, minInclusive, maxInclusive); - } - }; - } - - @Override - public SurfaceRelativeThresholdFilter createPlacementModifier(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull SurfaceRelativeThresholdModifierConfiguration configuration) { - Heightmap.Types heightmap = Heightmap.Types.MOTION_BLOCKING; - if (configuration.getHeightmap() != null) { - heightmap = configuration.getHeightmap().getValue(worldInfo, random, position, limitedRegion); - } - - int minInclusive = 0; - if (configuration.getMinInclusive() != null) { - minInclusive = configuration.getMinInclusive().getValue(worldInfo, random, position, limitedRegion); - } - - int maxInclusive = 0; - if (configuration.getMaxInclusive() != null) { - maxInclusive = configuration.getMaxInclusive().getValue(worldInfo, random, position, limitedRegion); - } - return SurfaceRelativeThresholdFilter.of(heightmap, minInclusive, maxInclusive); - } - - @NotNull - @Override - public Set getSettings() { - return SurfaceRelativeThresholdModifierConfiguration.SETTINGS; - } - - @NotNull - @Override - public SurfaceRelativeThresholdModifierConfiguration createEmptyConfiguration() { - return new SurfaceRelativeThresholdModifierConfiguration(this, null, null, null); - } -} diff --git a/impl/v1_18_R2/src/main/java/de/derfrzocker/feature/impl/v1_18_R2/placement/SurfaceWaterDepthModifier.java b/impl/v1_18_R2/src/main/java/de/derfrzocker/feature/impl/v1_18_R2/placement/SurfaceWaterDepthModifier.java deleted file mode 100644 index a4f0f340..00000000 --- a/impl/v1_18_R2/src/main/java/de/derfrzocker/feature/impl/v1_18_R2/placement/SurfaceWaterDepthModifier.java +++ /dev/null @@ -1,82 +0,0 @@ -package de.derfrzocker.feature.impl.v1_18_R2.placement; - -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import de.derfrzocker.feature.api.Registries; -import de.derfrzocker.feature.api.Setting; -import de.derfrzocker.feature.api.util.Parser; -import de.derfrzocker.feature.common.feature.placement.configuration.SurfaceWaterDepthModifierConfiguration; -import de.derfrzocker.feature.common.value.number.IntegerType; -import de.derfrzocker.feature.common.value.number.IntegerValue; -import net.minecraft.world.level.levelgen.placement.SurfaceWaterDepthFilter; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Random; -import java.util.Set; - -public class SurfaceWaterDepthModifier extends MinecraftPlacementModifier { - - public SurfaceWaterDepthModifier(@NotNull Registries registries) { - super(registries, "surface_water_depth_filter"); - } - - @Override - public SurfaceWaterDepthModifierConfiguration mergeConfig(SurfaceWaterDepthModifierConfiguration first, SurfaceWaterDepthModifierConfiguration second) { - return new SurfaceWaterDepthModifierConfiguration(this, - first.getMaxWaterDepth() != null ? first.getMaxWaterDepth() : second.getMaxWaterDepth()); - } - - @Override - public Parser createParser(Registries registries) { - return new Parser<>() { - @Override - public JsonElement toJson(SurfaceWaterDepthModifierConfiguration value) { - JsonObject jsonObject = new JsonObject(); - if (value.getMaxWaterDepth() != null) { - JsonObject entry = value.getMaxWaterDepth().getValueType().getParser().toJson(value.getMaxWaterDepth()).getAsJsonObject(); - entry.addProperty("max_water_depth_type", value.getMaxWaterDepth().getValueType().getKey().toString()); - jsonObject.add("max_water_depth", entry); - } - return jsonObject; - } - - @Override - public SurfaceWaterDepthModifierConfiguration fromJson(JsonElement jsonElement) { - JsonObject jsonObject = jsonElement.getAsJsonObject(); - - IntegerValue count = null; - if (jsonObject.has("max_water_depth")) { - JsonObject entry = jsonObject.getAsJsonObject("max_water_depth"); - count = registries.getValueTypeRegistry(IntegerType.class).get(NamespacedKey.fromString(entry.getAsJsonPrimitive("max_water_depth_type").getAsString())).get().getParser().fromJson(entry); - } - - return new SurfaceWaterDepthModifierConfiguration(SurfaceWaterDepthModifier.this, count); - } - }; - } - - @Override - public SurfaceWaterDepthFilter createPlacementModifier(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull SurfaceWaterDepthModifierConfiguration configuration) { - int maxWaterDepth = 0; - if (configuration.getMaxWaterDepth() != null) { - maxWaterDepth = configuration.getMaxWaterDepth().getValue(worldInfo, random, position, limitedRegion); - } - return SurfaceWaterDepthFilter.forMaxDepth(maxWaterDepth); - } - - @NotNull - @Override - public Set getSettings() { - return SurfaceWaterDepthModifierConfiguration.SETTINGS; - } - - @NotNull - @Override - public SurfaceWaterDepthModifierConfiguration createEmptyConfiguration() { - return new SurfaceWaterDepthModifierConfiguration(this, null); - } -} \ No newline at end of file diff --git a/impl/v1_18_R2/src/main/java/de/derfrzocker/feature/impl/v1_18_R2/placement/configuration/SurfaceRelativeThresholdModifierConfiguration.java b/impl/v1_18_R2/src/main/java/de/derfrzocker/feature/impl/v1_18_R2/placement/configuration/SurfaceRelativeThresholdModifierConfiguration.java deleted file mode 100644 index 437d5e40..00000000 --- a/impl/v1_18_R2/src/main/java/de/derfrzocker/feature/impl/v1_18_R2/placement/configuration/SurfaceRelativeThresholdModifierConfiguration.java +++ /dev/null @@ -1,121 +0,0 @@ -package de.derfrzocker.feature.impl.v1_18_R2.placement.configuration; - -import de.derfrzocker.feature.api.FeaturePlacementModifier; -import de.derfrzocker.feature.api.PlacementModifierConfiguration; -import de.derfrzocker.feature.api.Setting; -import de.derfrzocker.feature.api.Value; -import de.derfrzocker.feature.common.value.number.IntegerType; -import de.derfrzocker.feature.common.value.number.IntegerValue; -import de.derfrzocker.feature.impl.v1_18_R2.value.heightmap.HeightmapValue; -import org.jetbrains.annotations.NotNull; - -import java.util.Collections; -import java.util.LinkedHashSet; -import java.util.Set; - -public class SurfaceRelativeThresholdModifierConfiguration implements PlacementModifierConfiguration { - - public final static Set SETTINGS; - private final static Setting MIN_INCLUSIVE = new Setting("min-inclusive", IntegerType.class); - private final static Setting MAX_INCLUSIVE = new Setting("max-inclusive", IntegerType.class); - - static { - Set settings = new LinkedHashSet<>(); - settings.add(MIN_INCLUSIVE); - settings.add(MAX_INCLUSIVE); - SETTINGS = Collections.unmodifiableSet(settings); - } - - private final FeaturePlacementModifier placementModifier; - private final HeightmapValue heightmap; - private IntegerValue minInclusive; - private IntegerValue maxInclusive; - private boolean dirty = false; - - public SurfaceRelativeThresholdModifierConfiguration(FeaturePlacementModifier placementModifier, HeightmapValue heightmap, IntegerValue minInclusive, IntegerValue maxInclusive) { - this.placementModifier = placementModifier; - this.heightmap = heightmap; - this.minInclusive = minInclusive; - this.maxInclusive = maxInclusive; - } - - @NotNull - @Override - public FeaturePlacementModifier getOwner() { - return placementModifier; - } - - public HeightmapValue getHeightmap() { - return heightmap; - } - - public IntegerValue getMinInclusive() { - return minInclusive; - } - - public IntegerValue getMaxInclusive() { - return maxInclusive; - } - - @NotNull - @Override - public Set getSettings() { - return SETTINGS; - } - - @Override - public Value getValue(@NotNull Setting setting) { - if (setting == MIN_INCLUSIVE) { - return getMinInclusive(); - } - - if (setting == MAX_INCLUSIVE) { - return getMaxInclusive(); - } - - throw new IllegalArgumentException(String.format("Setting '%s' is not in the configuration '%s'", setting, "SurfaceRelativeThresholdModifierConfiguration")); - } - - @Override - public void setValue(@NotNull Setting setting, Value value) { - if (setting == MIN_INCLUSIVE) { - minInclusive = (IntegerValue) value; - dirty = true; - return; - } - - if (setting == MAX_INCLUSIVE) { - maxInclusive = (IntegerValue) value; - dirty = true; - return; - } - - throw new IllegalArgumentException(String.format("Setting '%s' is not in the configuration '%s'", setting, "SurfaceRelativeThresholdModifierConfiguration")); - } - - @Override - public boolean isDirty() { - if (dirty) { - return true; - } - - if (minInclusive != null && minInclusive.isDirty()) { - return true; - } - - return maxInclusive != null && maxInclusive.isDirty(); - } - - @Override - public void saved() { - dirty = false; - - if (minInclusive != null) { - minInclusive.saved(); - } - - if (maxInclusive != null) { - maxInclusive.saved(); - } - } -} diff --git a/impl/v1_18_R2/src/main/java/de/derfrzocker/feature/impl/v1_18_R2/value/heightmap/HeightmapType.java b/impl/v1_18_R2/src/main/java/de/derfrzocker/feature/impl/v1_18_R2/value/heightmap/HeightmapType.java deleted file mode 100644 index fba5489d..00000000 --- a/impl/v1_18_R2/src/main/java/de/derfrzocker/feature/impl/v1_18_R2/value/heightmap/HeightmapType.java +++ /dev/null @@ -1,7 +0,0 @@ -package de.derfrzocker.feature.impl.v1_18_R2.value.heightmap; - -import de.derfrzocker.feature.api.ValueType; -import net.minecraft.world.level.levelgen.Heightmap; - -public abstract class HeightmapType implements ValueType { -} diff --git a/impl/v1_18_R2/src/main/java/de/derfrzocker/feature/impl/v1_18_R2/value/heightmap/HeightmapValue.java b/impl/v1_18_R2/src/main/java/de/derfrzocker/feature/impl/v1_18_R2/value/heightmap/HeightmapValue.java deleted file mode 100644 index 687b44d0..00000000 --- a/impl/v1_18_R2/src/main/java/de/derfrzocker/feature/impl/v1_18_R2/value/heightmap/HeightmapValue.java +++ /dev/null @@ -1,10 +0,0 @@ -package de.derfrzocker.feature.impl.v1_18_R2.value.heightmap; - -import de.derfrzocker.feature.common.AbstractValue; -import net.minecraft.world.level.levelgen.Heightmap; - -public abstract class HeightmapValue extends AbstractValue { - - @Override - public abstract HeightmapValue clone(); -} diff --git a/impl/v1_18_R2/src/main/java/de/derfrzocker/feature/impl/v1_18_R2/value/offset/NMSAboveBottomOffsetIntegerValue.java b/impl/v1_18_R2/src/main/java/de/derfrzocker/feature/impl/v1_18_R2/value/offset/NMSAboveBottomOffsetIntegerValue.java deleted file mode 100644 index 80ec8a5c..00000000 --- a/impl/v1_18_R2/src/main/java/de/derfrzocker/feature/impl/v1_18_R2/value/offset/NMSAboveBottomOffsetIntegerValue.java +++ /dev/null @@ -1,33 +0,0 @@ -package de.derfrzocker.feature.impl.v1_18_R2.value.offset; - -import de.derfrzocker.feature.common.value.number.IntegerValue; -import de.derfrzocker.feature.common.value.offset.AboveBottomOffsetIntegerValue; -import net.minecraft.world.level.WorldGenLevel; -import org.bukkit.craftbukkit.v1_18_R2.generator.CraftLimitedRegion; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Random; - -public class NMSAboveBottomOffsetIntegerValue extends AboveBottomOffsetIntegerValue { - - public NMSAboveBottomOffsetIntegerValue(IntegerValue base) { - super(base); - } - - @Override - public Integer getValue(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion) { - int baseValue = getBase() == null ? 0 : getBase().getValue(worldInfo, random, position, limitedRegion); - - WorldGenLevel level = ((CraftLimitedRegion) limitedRegion).getHandle(); - - return Math.max(level.getMinBuildHeight(), level.getLevel().getChunkSource().chunkMap.generator.getMinY()) + baseValue; - } - - @Override - public AboveBottomOffsetIntegerValue clone() { - return new NMSAboveBottomOffsetIntegerValue(getBase() == null ? null : getBase().clone()); - } -} diff --git a/impl/v1_18_R2/src/main/java/de/derfrzocker/feature/impl/v1_18_R2/value/offset/NMSBelowTopOffsetIntegerValue.java b/impl/v1_18_R2/src/main/java/de/derfrzocker/feature/impl/v1_18_R2/value/offset/NMSBelowTopOffsetIntegerValue.java deleted file mode 100644 index 2ed72b90..00000000 --- a/impl/v1_18_R2/src/main/java/de/derfrzocker/feature/impl/v1_18_R2/value/offset/NMSBelowTopOffsetIntegerValue.java +++ /dev/null @@ -1,35 +0,0 @@ -package de.derfrzocker.feature.impl.v1_18_R2.value.offset; - -import de.derfrzocker.feature.common.value.number.IntegerValue; -import de.derfrzocker.feature.common.value.offset.BelowTopOffsetIntegerValue; -import net.minecraft.world.level.WorldGenLevel; -import net.minecraft.world.level.chunk.ChunkGenerator; -import org.bukkit.craftbukkit.v1_18_R2.generator.CraftLimitedRegion; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Random; - -public class NMSBelowTopOffsetIntegerValue extends BelowTopOffsetIntegerValue { - - public NMSBelowTopOffsetIntegerValue(IntegerValue base) { - super(base); - } - - @Override - public Integer getValue(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion) { - int baseValue = getBase() == null ? 0 : getBase().getValue(worldInfo, random, position, limitedRegion); - - WorldGenLevel level = ((CraftLimitedRegion) limitedRegion).getHandle(); - ChunkGenerator chunkGenerator = level.getLevel().getChunkSource().chunkMap.generator; - - return Math.min(level.getHeight(), chunkGenerator.getGenDepth()) - 1 + Math.max(level.getMinBuildHeight(), chunkGenerator.getMinY()) - baseValue; - } - - @Override - public NMSBelowTopOffsetIntegerValue clone() { - return new NMSBelowTopOffsetIntegerValue(getBase() == null ? null : getBase().clone()); - } -} diff --git a/impl/v1_18_R2/src/main/java/de/derfrzocker/feature/impl/v1_18_R2/value/target/TargetType.java b/impl/v1_18_R2/src/main/java/de/derfrzocker/feature/impl/v1_18_R2/value/target/TargetType.java deleted file mode 100644 index 80b2e7ad..00000000 --- a/impl/v1_18_R2/src/main/java/de/derfrzocker/feature/impl/v1_18_R2/value/target/TargetType.java +++ /dev/null @@ -1,7 +0,0 @@ -package de.derfrzocker.feature.impl.v1_18_R2.value.target; - -import de.derfrzocker.feature.api.ValueType; -import net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration; - -public abstract class TargetType implements ValueType { -} diff --git a/impl/v1_18_R2/src/main/java/de/derfrzocker/feature/impl/v1_18_R2/value/target/TargetValue.java b/impl/v1_18_R2/src/main/java/de/derfrzocker/feature/impl/v1_18_R2/value/target/TargetValue.java deleted file mode 100644 index c924fb2c..00000000 --- a/impl/v1_18_R2/src/main/java/de/derfrzocker/feature/impl/v1_18_R2/value/target/TargetValue.java +++ /dev/null @@ -1,10 +0,0 @@ -package de.derfrzocker.feature.impl.v1_18_R2.value.target; - -import de.derfrzocker.feature.common.AbstractValue; -import net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration; - -public abstract class TargetValue extends AbstractValue { - - @Override - public abstract TargetValue clone(); -} diff --git a/impl/v1_18_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R2/ConversionUtil.java b/impl/v1_18_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R2/ConversionUtil.java deleted file mode 100644 index 83cf56ac..00000000 --- a/impl/v1_18_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R2/ConversionUtil.java +++ /dev/null @@ -1,77 +0,0 @@ -package de.derfrzocker.ore.control.impl.v1_18_R2; - -import de.derfrzocker.feature.common.value.number.FixedFloatValue; -import de.derfrzocker.feature.common.value.number.IntegerValue; -import de.derfrzocker.feature.common.value.number.integer.FixedDoubleToIntegerValue; -import de.derfrzocker.feature.common.value.number.integer.biased.BiasedToBottomIntegerValue; -import de.derfrzocker.feature.common.value.number.integer.clamped.ClampedIntegerValue; -import de.derfrzocker.feature.common.value.number.integer.clamped.ClampedNormalIntegerValue; -import de.derfrzocker.feature.common.value.number.integer.uniform.UniformIntegerValue; -import de.derfrzocker.feature.common.value.number.integer.weighted.WeightedListIntegerValue; -import net.minecraft.util.random.SimpleWeightedRandomList; -import net.minecraft.util.random.WeightedEntry; -import net.minecraft.util.valueproviders.ClampedInt; -import net.minecraft.util.valueproviders.ClampedNormalInt; -import net.minecraft.util.valueproviders.IntProvider; -import net.minecraft.util.valueproviders.IntProviderType; -import net.minecraft.util.valueproviders.WeightedListInt; - -import java.lang.reflect.Field; -import java.util.LinkedHashMap; -import java.util.Map; - -public final class ConversionUtil { - - private ConversionUtil() { - } - - public static IntegerValue convert(IntProvider intProvider) { - try { - if (intProvider.getType() == IntProviderType.CONSTANT) { - return new FixedDoubleToIntegerValue(intProvider.getMinValue()); - } else if (intProvider.getType() == IntProviderType.UNIFORM) { - return new UniformIntegerValue(new FixedDoubleToIntegerValue(intProvider.getMinValue()), new FixedDoubleToIntegerValue(intProvider.getMaxValue())); - } else if (intProvider.getType() == IntProviderType.BIASED_TO_BOTTOM) { - return new BiasedToBottomIntegerValue(new FixedDoubleToIntegerValue(intProvider.getMinValue()), new FixedDoubleToIntegerValue(intProvider.getMaxValue())); - } else if (intProvider.getType() == IntProviderType.CLAMPED) { - Field sourceField = ClampedInt.class.getDeclaredField(NMSReflectionNames.CLAMPED_INT_SOURCE); - Field minField = ClampedInt.class.getDeclaredField(NMSReflectionNames.CLAMPED_INT_MIN_INCLUSIVE); - Field maxField = ClampedInt.class.getDeclaredField(NMSReflectionNames.CLAMPED_INT_MAX_INCLUSIVE); - sourceField.setAccessible(true); - minField.setAccessible(true); - maxField.setAccessible(true); - - IntProvider source = (IntProvider) sourceField.get(intProvider); - int min = (int) minField.get(intProvider); - int max = (int) maxField.get(intProvider); - return new ClampedIntegerValue(convert(source), new FixedDoubleToIntegerValue(min), new FixedDoubleToIntegerValue(max)); - } else if (intProvider.getType() == IntProviderType.WEIGHTED_LIST) { - Field distributionField = WeightedListInt.class.getDeclaredField(NMSReflectionNames.WEIGHTED_LIST_INT_DISTRIBUTION); - distributionField.setAccessible(true); - SimpleWeightedRandomList distribution = (SimpleWeightedRandomList) distributionField.get(intProvider); - - Map values = new LinkedHashMap<>(); - for (WeightedEntry.Wrapper wrapper : distribution.unwrap()) { - values.put(convert(wrapper.getData()), new FixedDoubleToIntegerValue(wrapper.getWeight().asInt())); - } - - return new WeightedListIntegerValue(values); - } else if (intProvider.getType() == IntProviderType.CLAMPED_NORMAL) { - Field meanField = ClampedNormalInt.class.getDeclaredField(NMSReflectionNames.CLAMPED_NORMAL_INT_MEAN); - Field deviationField = ClampedNormalInt.class.getDeclaredField(NMSReflectionNames.CLAMPED_NORMAL_INT_DEVIATION); - meanField.setAccessible(true); - deviationField.setAccessible(true); - - float mean = (float) meanField.get(intProvider); - float deviation = (float) meanField.get(intProvider); - int min = intProvider.getMinValue(); - int max = intProvider.getMaxValue(); - return new ClampedNormalIntegerValue(new FixedFloatValue(mean), new FixedFloatValue(deviation), new FixedDoubleToIntegerValue(min), new FixedDoubleToIntegerValue(max)); - } else { - throw new UnsupportedOperationException(String.format("No integer value equivalent for IntProvider '%s'", intProvider)); - } - } catch (NoSuchFieldException | IllegalAccessException e) { - throw new RuntimeException(e); - } - } -} diff --git a/impl/v1_18_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R2/NMSReflectionNames.java b/impl/v1_18_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R2/NMSReflectionNames.java deleted file mode 100644 index e7017ad4..00000000 --- a/impl/v1_18_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R2/NMSReflectionNames.java +++ /dev/null @@ -1,23 +0,0 @@ -package de.derfrzocker.ore.control.impl.v1_18_R2; - -public final class NMSReflectionNames { - - public final static String BIOME_GENERATION_SETTINGS_FEATURES = "e"; - public final static String BIOME_GENERATION_SETTINGS_FEATURE_SET = "g"; - public final static String WEIGHTED_LIST_INT_DISTRIBUTION = "b"; - public final static String COUNT_PLACEMENT_COUNT = "c"; - public final static String HEIGHT_RANGE_PLACEMENT_HEIGHT = "c"; - public final static String RARITY_FILTER_CHANCE = "c"; - public final static String SURFACE_RELATIVE_THRESHOLD_FILTER_HEIGHTMAP = "c"; - public final static String SURFACE_RELATIVE_THRESHOLD_FILTER_MIN_INCLUSIVE = "d"; - public final static String SURFACE_RELATIVE_THRESHOLD_FILTER_MAX_INCLUSIVE = "e"; - public final static String SURFACE_WATER_DEPTH_FILTER_MAX_WATER_DEPTH = "c"; - public static final String CLAMPED_INT_SOURCE = "b"; - public static final String CLAMPED_INT_MIN_INCLUSIVE = "f"; - public static final String CLAMPED_INT_MAX_INCLUSIVE = "g"; - public static final String CLAMPED_NORMAL_INT_MEAN = "b"; - public static final String CLAMPED_NORMAL_INT_DEVIATION = "f"; - - private NMSReflectionNames() { - } -} diff --git a/impl/v1_18_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R2/NMSReplacer_v1_18_R2.java b/impl/v1_18_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R2/NMSReplacer_v1_18_R2.java deleted file mode 100644 index 96731cc8..00000000 --- a/impl/v1_18_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R2/NMSReplacer_v1_18_R2.java +++ /dev/null @@ -1,504 +0,0 @@ -package de.derfrzocker.ore.control.impl.v1_18_R2; - -import com.google.common.base.Suppliers; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import com.google.gson.JsonElement; -import de.derfrzocker.feature.api.FeatureGenerator; -import de.derfrzocker.feature.api.FeatureGeneratorConfiguration; -import de.derfrzocker.feature.api.FeaturePlacementModifier; -import de.derfrzocker.feature.api.PlacementModifierConfiguration; -import de.derfrzocker.feature.api.util.Parser; -import de.derfrzocker.feature.common.feature.generator.configuration.EmptyFeatureConfiguration; -import de.derfrzocker.feature.common.feature.placement.ActivationModifier; -import de.derfrzocker.feature.common.feature.placement.configuration.ActivationConfiguration; -import de.derfrzocker.feature.common.value.bool.FixedBooleanValue; -import de.derfrzocker.feature.common.value.number.FixedFloatValue; -import de.derfrzocker.feature.common.value.number.IntegerType; -import de.derfrzocker.feature.common.value.number.integer.FixedDoubleToIntegerValue; -import de.derfrzocker.feature.common.value.offset.AboveBottomOffsetIntegerType; -import de.derfrzocker.feature.common.value.offset.BelowTopOffsetIntegerType; -import de.derfrzocker.feature.impl.v1_18_R2.feature.generator.GlowstoneBlobFeatureGenerator; -import de.derfrzocker.feature.impl.v1_18_R2.feature.generator.OreFeatureGenerator; -import de.derfrzocker.feature.impl.v1_18_R2.feature.generator.ScatteredOreGenerator; -import de.derfrzocker.feature.impl.v1_18_R2.feature.generator.configuration.OreFeatureConfiguration; -import de.derfrzocker.feature.impl.v1_18_R2.placement.CountModifier; -import de.derfrzocker.feature.impl.v1_18_R2.placement.HeightRangeModifier; -import de.derfrzocker.feature.impl.v1_18_R2.placement.RarityModifier; -import de.derfrzocker.feature.impl.v1_18_R2.placement.SurfaceRelativeThresholdModifier; -import de.derfrzocker.feature.impl.v1_18_R2.placement.SurfaceWaterDepthModifier; -import de.derfrzocker.feature.impl.v1_18_R2.value.heightmap.HeightmapType; -import de.derfrzocker.feature.impl.v1_18_R2.value.offset.NMSAboveBottomOffsetIntegerValue; -import de.derfrzocker.feature.impl.v1_18_R2.value.offset.NMSBelowTopOffsetIntegerValue; -import de.derfrzocker.feature.impl.v1_18_R2.value.target.TargetType; -import de.derfrzocker.ore.control.api.NMSReplacer; -import de.derfrzocker.ore.control.api.OreControlManager; -import de.derfrzocker.ore.control.api.OreControlRegistries; -import de.derfrzocker.ore.control.api.config.Config; -import de.derfrzocker.ore.control.api.config.ConfigManager; -import de.derfrzocker.ore.control.impl.v1_18_R2.feature.generator.GlowstoneBlobFeatureGeneratorHook; -import de.derfrzocker.ore.control.impl.v1_18_R2.feature.generator.OreFeatureGeneratorHook; -import de.derfrzocker.ore.control.impl.v1_18_R2.feature.generator.ScatteredOreFeatureGeneratorHook; -import de.derfrzocker.ore.control.impl.v1_18_R2.placement.ActivationModifierHook; -import de.derfrzocker.ore.control.impl.v1_18_R2.placement.CountModifierHook; -import de.derfrzocker.ore.control.impl.v1_18_R2.placement.HeightRangeModifierHook; -import de.derfrzocker.ore.control.impl.v1_18_R2.placement.RarityModifierHook; -import de.derfrzocker.ore.control.impl.v1_18_R2.placement.SurfaceRelativeThresholdModifierHook; -import de.derfrzocker.ore.control.impl.v1_18_R2.placement.SurfaceWaterDepthModifierHook; -import net.minecraft.core.Holder; -import net.minecraft.core.HolderSet; -import net.minecraft.core.Registry; -import net.minecraft.core.RegistryAccess; -import net.minecraft.data.BuiltinRegistries; -import net.minecraft.resources.ResourceKey; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.server.dedicated.DedicatedServer; -import net.minecraft.server.level.ServerLevel; -import net.minecraft.world.level.biome.Biome; -import net.minecraft.world.level.biome.BiomeGenerationSettings; -import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; -import net.minecraft.world.level.levelgen.feature.Feature; -import net.minecraft.world.level.levelgen.feature.GlowstoneFeature; -import net.minecraft.world.level.levelgen.feature.OreFeature; -import net.minecraft.world.level.levelgen.feature.ScatteredOreFeature; -import net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration; -import net.minecraft.world.level.levelgen.placement.CountPlacement; -import net.minecraft.world.level.levelgen.placement.HeightRangePlacement; -import net.minecraft.world.level.levelgen.placement.PlacedFeature; -import net.minecraft.world.level.levelgen.placement.PlacementModifier; -import net.minecraft.world.level.levelgen.placement.PlacementModifierType; -import net.minecraft.world.level.levelgen.placement.RarityFilter; -import net.minecraft.world.level.levelgen.placement.SurfaceRelativeThresholdFilter; -import net.minecraft.world.level.levelgen.placement.SurfaceWaterDepthFilter; -import org.bukkit.Bukkit; -import org.bukkit.NamespacedKey; -import org.bukkit.World; -import org.bukkit.craftbukkit.v1_18_R2.CraftServer; -import org.bukkit.craftbukkit.v1_18_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_18_R2.util.CraftNamespacedKey; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import java.io.File; -import java.io.FileWriter; -import java.io.IOException; -import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.LinkedHashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Set; -import java.util.function.BiConsumer; -import java.util.function.Supplier; -import java.util.stream.Collectors; - -public class NMSReplacer_v1_18_R2 implements NMSReplacer { - - private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create(); - private final Parser configParser; - private final OreControlManager oreControlManager; - @NotNull - private final OreControlRegistries registries; - private final ConfigManager configManager; - - public NMSReplacer_v1_18_R2(@NotNull OreControlManager oreControlManager, Parser configParser) { - this.oreControlManager = oreControlManager; - this.registries = oreControlManager.getRegistries(); - this.configManager = oreControlManager.getConfigManager(); - this.configParser = configParser; - } - - @Override - public void register() { - registerValueTypes(); - registerFeatureGenerators(); - registerPlacementModifier(); - registerFeatures(); - registerBiomes(); - } - - private void registerValueTypes() { - registries.getValueTypeRegistry(IntegerType.class).register(new AboveBottomOffsetIntegerType(registries, NMSAboveBottomOffsetIntegerValue::new)); - registries.getValueTypeRegistry(IntegerType.class).register(new BelowTopOffsetIntegerType(registries, NMSBelowTopOffsetIntegerValue::new)); - } - - private void registerFeatureGenerators() { - registries.getFeatureGeneratorRegistry().register(new OreFeatureGenerator(registries)); - registries.getFeatureGeneratorRegistry().register(new ScatteredOreGenerator(registries)); - registries.getFeatureGeneratorRegistry().register(new GlowstoneBlobFeatureGenerator(registries)); - } - - private void registerPlacementModifier() { - registries.getPlacementModifierRegistry().register(new RarityModifier(registries)); - registries.getPlacementModifierRegistry().register(new SurfaceRelativeThresholdModifier(registries)); - registries.getPlacementModifierRegistry().register(new SurfaceWaterDepthModifier(registries)); - registries.getPlacementModifierRegistry().register(new CountModifier(registries)); - registries.getPlacementModifierRegistry().register(new HeightRangeModifier(registries)); - } - - private void registerFeatures() { - Registry placedFeatureRegistry = getRegistry().registryOrThrow(Registry.PLACED_FEATURE_REGISTRY); - Registry> featureRegistry = getRegistry().registryOrThrow(Registry.FEATURE_REGISTRY); - Registry> placementModifierTypes = getRegistry().registryOrThrow(Registry.PLACEMENT_MODIFIER_REGISTRY); - - for (PlacedFeature placedFeature : placedFeatureRegistry) { - Feature feature = placedFeature.getFeatures().findFirst().get().feature(); - ResourceLocation resourceLocation = featureRegistry.getKey(feature); - Optional> featureGenerator = registries.getFeatureGeneratorRegistry().get(NamespacedKey.fromString(resourceLocation.toString())); - - if (featureGenerator.isEmpty()) { - continue; - } - - boolean hasCount = false; - List> modifiers = new LinkedList<>(); - for (PlacementModifier modifier : placedFeature.placement()) { - if (modifier.type() == PlacementModifierType.COUNT) { - hasCount = true; - } - ResourceLocation placementModifierType = placementModifierTypes.getKey(modifier.type()); - Optional> modifierOptional = registries.getPlacementModifierRegistry().get(NamespacedKey.fromString(placementModifierType.toString())); - modifierOptional.ifPresent(modifiers::add); - } - - if (!hasCount) { - Optional> modifierOptional = registries.getPlacementModifierRegistry().get(NamespacedKey.fromString("minecraft:count")); - modifierOptional.ifPresent(modifiers::add); - } - - // inject activation / deactivation logic - Optional> modifierOptional = registries.getPlacementModifierRegistry().get(ActivationModifier.KEY); - modifierOptional.ifPresent(modifiers::add); - - registries.getFeatureRegistry().register(new de.derfrzocker.feature.api.Feature(NamespacedKey.fromString(placedFeatureRegistry.getKey(placedFeature).toString()), featureGenerator.get(), modifiers)); - } - } - - private void registerBiomes() { - Registry placedFeatureRegistry = getRegistry().registryOrThrow(Registry.PLACED_FEATURE_REGISTRY); - forEachBiome((biome, resourceLocation) -> { - de.derfrzocker.ore.control.api.Biome bio = new de.derfrzocker.ore.control.api.Biome(CraftNamespacedKey.fromMinecraft(resourceLocation)); - - biome.getGenerationSettings().features().forEach(featureSet -> featureSet.forEach(holder -> { - PlacedFeature feature = holder.value(); - ResourceLocation featureKey = placedFeatureRegistry.getKey(feature); - - if (featureKey == null) { - // Skip if the feature is not registered, this can happen if another plugin adds a feature without registering it - return; - } - - registries.getFeatureRegistry().get(CraftNamespacedKey.fromMinecraft(featureKey)).ifPresent(value -> bio.getFeatures().add(value)); - })); - - registries.getBiomeRegistry().register(bio); - }); - } - - @Override - public void saveDefaultValues(File directory) { - File world = new File(directory, "world"); - File biomes = new File(directory, "biome"); - - saveWorldValues(world); - saveBiomeValues(biomes); - } - - @Override - public void hookIntoBiomes() { - forEachBiome((biome, resourceLocation) -> { - try { - hookIntoBiome(biome, resourceLocation); - } catch (final Exception e) { - throw new RuntimeException("Unexpected error while hooking in NMS for Biome: " + biome, e); - } - }); - } - - @Override - public Set getBiomes(World world) { - Set biomes = new LinkedHashSet<>(); - ServerLevel level = ((CraftWorld) world).getHandle(); - Registry registry = getRegistry().registryOrThrow(Registry.BIOME_REGISTRY); - - for (Holder biomeHolder : level.getChunkSource().chunkMap.generator.getBiomeSource().possibleBiomes()) { - Biome biome = biomeHolder.value(); - - ResourceLocation key = registry.getKey(biome); - - biomes.add(registries.getBiomeRegistry().get(CraftNamespacedKey.fromMinecraft(key)).get()); - } - - return biomes; - } - - private void saveWorldValues(File directory) { - Registry registry = getRegistry().registryOrThrow(Registry.PLACED_FEATURE_REGISTRY); - for (Map.Entry, PlacedFeature> entry : registry.entrySet()) { - ResourceLocation key = entry.getKey().location(); - File file = new File(directory, key.getNamespace() + "/" + key.getPath() + ".json"); - try { - saveFeature(file, null, CraftNamespacedKey.fromMinecraft(key), entry.getValue()); - } catch (Exception e) { - throw new RuntimeException(String.format("Error while saving feature '%s'", key), e); - } - } - } - - private void saveBiomeValues(File directory) { - forEachBiome((biome, biomeKey) -> { - File biomeFile = new File(directory, biomeKey.getNamespace() + "/" + biomeKey.getPath()); - List> decorations = biome.getGenerationSettings().features(); - for (HolderSet list : decorations) { - for (Holder featureSupplier : list) { - PlacedFeature feature = featureSupplier.value(); - Registry registry = getRegistry().registryOrThrow(Registry.PLACED_FEATURE_REGISTRY); - ResourceLocation featureKey = registry.getKey(feature); - - if (featureKey == null) { - // Skip if the feature is not registered, this can happen if another plugin adds a feature without registering it - return; - } - - File featureFile = new File(biomeFile, featureKey.getNamespace() + "/" + featureKey.getPath() + ".json"); - try { - saveFeature(featureFile, registries.getBiomeRegistry().get(CraftNamespacedKey.fromMinecraft(biomeKey)).get(), CraftNamespacedKey.fromMinecraft(featureKey), feature); - } catch (Exception e) { - throw new RuntimeException(String.format("Error while saving feature '%s' in biome '%s'", featureKey, biomeKey), e); - } - } - } - }); - } - - private void saveFeature(File file, de.derfrzocker.ore.control.api.Biome biome, NamespacedKey featureKey, PlacedFeature feature) { - ConfiguredFeature configuredFeature = feature.getFeatures().findFirst().orElse(null); - - if (configuredFeature == null) { - return; - } - - if (!(configuredFeature.feature() instanceof OreFeature) && !(configuredFeature.feature() instanceof ScatteredOreFeature) && !(configuredFeature.feature() instanceof GlowstoneFeature)) { - return; - } - - file.getParentFile().mkdirs(); - - FeatureGenerator featureGenerator; - FeatureGeneratorConfiguration featureConfiguration; - - if (configuredFeature.feature() instanceof OreFeature) { - OreConfiguration configuration = (OreConfiguration) configuredFeature.config(); - featureGenerator = registries.getFeatureGeneratorRegistry().get(NamespacedKey.minecraft("ore")).get(); - featureConfiguration = new OreFeatureConfiguration(featureGenerator, null, new FixedDoubleToIntegerValue(configuration.size), new FixedFloatValue(configuration.discardChanceOnAirExposure)); - } else if (configuredFeature.feature() instanceof ScatteredOreFeature) { - OreConfiguration configuration = (OreConfiguration) configuredFeature.config(); - featureGenerator = registries.getFeatureGeneratorRegistry().get(NamespacedKey.minecraft("scattered_ore")).get(); - featureConfiguration = new OreFeatureConfiguration(featureGenerator, null, new FixedDoubleToIntegerValue(configuration.size), new FixedFloatValue(configuration.discardChanceOnAirExposure)); - } else if (configuredFeature.feature() instanceof GlowstoneFeature) { - featureGenerator = registries.getFeatureGeneratorRegistry().get(NamespacedKey.minecraft("glowstone_blob")).get(); - featureConfiguration = new EmptyFeatureConfiguration(featureGenerator); - } else { - throw new RuntimeException("HOW?"); - } - - boolean hasCount = false; - List placementConfiguration = new ArrayList<>(); - Registry> placementModifierTypes = getRegistry().registryOrThrow(Registry.PLACEMENT_MODIFIER_REGISTRY); - for (PlacementModifier placement : feature.placement()) { - ResourceLocation placementModifierType = placementModifierTypes.getKey(placement.type()); - Optional> modifierOptional = registries.getPlacementModifierRegistry().get(NamespacedKey.fromString(placementModifierType.toString())); - - if (modifierOptional.isEmpty()) { - continue; - } - - if (placement.type() == PlacementModifierType.RARITY_FILTER && placement instanceof RarityFilter) { - placementConfiguration.add(RarityModifierHook.createDefaultConfiguration((RarityFilter) placement, modifierOptional.get())); - } - if (placement.type() == PlacementModifierType.SURFACE_RELATIVE_THRESHOLD_FILTER && placement instanceof SurfaceRelativeThresholdFilter) { - placementConfiguration.add(SurfaceRelativeThresholdModifierHook.createDefaultConfiguration((SurfaceRelativeThresholdFilter) placement, modifierOptional.get())); - } - if (placement.type() == PlacementModifierType.SURFACE_WATER_DEPTH_FILTER && placement instanceof SurfaceWaterDepthFilter) { - placementConfiguration.add(SurfaceWaterDepthModifierHook.createDefaultConfiguration((SurfaceWaterDepthFilter) placement, modifierOptional.get())); - } - if (placement.type() == PlacementModifierType.COUNT && placement instanceof CountPlacement) { - placementConfiguration.add(CountModifierHook.createDefaultConfiguration((CountPlacement) placement, modifierOptional.get())); - hasCount = true; - } - if (placement.type() == PlacementModifierType.HEIGHT_RANGE && placement instanceof HeightRangePlacement) { - placementConfiguration.add(HeightRangeModifierHook.createDefaultConfiguration((HeightRangePlacement) placement, modifierOptional.get())); - } - } - - if (!hasCount) { - Optional> modifierOptional = registries.getPlacementModifierRegistry().get(NamespacedKey.fromString("minecraft:count")); - - modifierOptional.ifPresent(modifier -> placementConfiguration.add(0, CountModifierHook.createDefaultConfiguration(CountPlacement.of(1), modifier))); - } - - // inject activation / deactivation logic - Optional> modifierOptional = registries.getPlacementModifierRegistry().get(ActivationModifier.KEY); - modifierOptional.ifPresent(modifier -> placementConfiguration.add(0, new ActivationConfiguration(modifier, new FixedBooleanValue(true)))); - - Config config = new Config(placementConfiguration, featureConfiguration); - - if (biome == null) { - configManager.setDefaultConfig(featureKey, config); - } else { - configManager.setDefaultConfig(biome, featureKey, config); - } - - if (file.exists()) { - return; - } - - try { - file.createNewFile(); - } catch (IOException e) { - throw new RuntimeException(e); - } - - JsonElement element = configParser.toJson(config); - try (FileWriter writer = new FileWriter(file)) { - writer.write(GSON.toJson(element)); - } catch (IOException e) { - throw new RuntimeException(e); - } - } - - private void forEachBiome(BiConsumer consumer) { - Registry registry = getRegistry().registryOrThrow(Registry.BIOME_REGISTRY); - for (Biome biome : registry) { - consumer.accept(biome, registry.getKey(biome)); - } - } - - private void hookIntoBiome(@NotNull final Biome biome, ResourceLocation minecraftKey) throws NoSuchFieldException, IllegalAccessException { - de.derfrzocker.ore.control.api.Biome oreControlBiome = registries.getBiomeRegistry().get(CraftNamespacedKey.fromMinecraft(minecraftKey)).get(); - List> decorations = biome.getGenerationSettings().features(); - List> newDecorations = new ArrayList<>(); - for (HolderSet list : decorations) { - List> newList = new ArrayList<>(); - - for (Holder featureSupplier : list) { - PlacedFeature feature = featureSupplier.value(); - - PlacedFeature newFeature = check(oreControlBiome, minecraftKey, feature); - - if (newFeature != null) { - newList.add(Holder.direct(newFeature)); - } else { - newList.add(featureSupplier); - } - } - - newDecorations.add(decorations.indexOf(list), HolderSet.direct(newList)); - } - - { - final Field field = getField(BiomeGenerationSettings.class, NMSReflectionNames.BIOME_GENERATION_SETTINGS_FEATURES); - field.setAccessible(true); - field.set(biome.getGenerationSettings(), newDecorations); - } - { - final Field field = getField(BiomeGenerationSettings.class, NMSReflectionNames.BIOME_GENERATION_SETTINGS_FEATURE_SET); - field.setAccessible(true); - field.set(biome.getGenerationSettings(), Suppliers.memoize(() -> newDecorations.stream().flatMap(HolderSet::stream).map(Holder::value).collect(Collectors.toSet()))); - } - } - - private void addToList(List> list, int index, PlacedFeature feature) { - list.add(index, () -> feature); - } - - @Nullable - private PlacedFeature check(de.derfrzocker.ore.control.api.Biome biome, ResourceLocation biomeKey, PlacedFeature feature) { - // Not the best method to do this, but hey it works - final Registry registry = getRegistry().registryOrThrow(Registry.PLACED_FEATURE_REGISTRY); - ResourceLocation featureKey = registry.getKey(feature); - - // Return if the featureKey is null, this can happen when plugins are adding placed features to the biome without registering them - if (featureKey == null) { - // TODO add debug message - return null; - } - - NamespacedKey key = CraftNamespacedKey.fromMinecraft(featureKey); - feature = BuiltinRegistries.PLACED_FEATURE.get(featureKey); - - if (feature == null) { - return null; - } - - ConfiguredFeature configuredFeature = feature.getFeatures().findFirst().orElse(null); - - if (configuredFeature == null) { - return null; - } - - if (!(configuredFeature.feature() instanceof OreFeature) && !(configuredFeature.feature() instanceof ScatteredOreFeature) && !(configuredFeature.feature() instanceof GlowstoneFeature)) { - return null; - } - - boolean hasCount = false; - List placementModifiers = new ArrayList<>(); - for (PlacementModifier placement : feature.placement()) { - if (placement.type() == PlacementModifierType.RARITY_FILTER) { - placementModifiers.add(new RarityModifierHook(oreControlManager, biome, key, (RarityFilter) placement)); - } else if (placement.type() == PlacementModifierType.SURFACE_RELATIVE_THRESHOLD_FILTER) { - placementModifiers.add(new SurfaceRelativeThresholdModifierHook(oreControlManager, biome, key, (SurfaceRelativeThresholdFilter) placement)); - } else if (placement.type() == PlacementModifierType.SURFACE_WATER_DEPTH_FILTER) { - placementModifiers.add(new SurfaceWaterDepthModifierHook(oreControlManager, biome, key, (SurfaceWaterDepthFilter) placement)); - } else if (placement.type() == PlacementModifierType.COUNT) { - hasCount = true; - placementModifiers.add(new CountModifierHook(oreControlManager, biome, key, (CountPlacement) placement)); - } else if (placement.type() == PlacementModifierType.HEIGHT_RANGE) { - placementModifiers.add(new HeightRangeModifierHook(oreControlManager, biome, key, (HeightRangePlacement) placement)); - } else { - placementModifiers.add(placement); - } - } - - if (!hasCount) { - placementModifiers.add(0, new CountModifierHook(oreControlManager, biome, key, CountPlacement.of(1))); - } - - // inject activation / deactivation logic - Optional> modifierOptional = registries.getPlacementModifierRegistry().get(ActivationModifier.KEY); - modifierOptional.ifPresent(modifier -> placementModifiers.add(0, new ActivationModifierHook(oreControlManager, biome, key))); - - if (configuredFeature.feature() instanceof OreFeature) { - return new PlacedFeature(Holder.direct(new ConfiguredFeature(new OreFeatureGeneratorHook(oreControlManager, key, biome), configuredFeature.config())), placementModifiers); - } else if (configuredFeature.feature() instanceof ScatteredOreFeature) { - return new PlacedFeature(Holder.direct(new ConfiguredFeature(new ScatteredOreFeatureGeneratorHook(oreControlManager, key, biome), configuredFeature.config())), placementModifiers); - } else if (configuredFeature.feature() instanceof GlowstoneFeature) { - return new PlacedFeature(Holder.direct(new ConfiguredFeature(new GlowstoneBlobFeatureGeneratorHook(oreControlManager, biome, key), configuredFeature.config())), placementModifiers); - } - - throw new RuntimeException("HOW?"); - } - - @SuppressWarnings("rawtypes") - private Field getField(@NotNull final Class clazz, @NotNull final String fieldName) throws NoSuchFieldException { - try { - return clazz.getDeclaredField(fieldName); - } catch (final NoSuchFieldException e) { - final Class superClass = clazz.getSuperclass(); - if (superClass == null) { - throw e; - } else { - return getField(superClass, fieldName); - } - } - } - - @NotNull - private RegistryAccess getRegistry() { - final DedicatedServer server = ((CraftServer) Bukkit.getServer()).getServer(); - - return server.registryAccess(); - } -} diff --git a/impl/v1_18_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R2/feature/generator/GlowstoneBlobFeatureGeneratorHook.java b/impl/v1_18_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R2/feature/generator/GlowstoneBlobFeatureGeneratorHook.java deleted file mode 100644 index e7b2f7d9..00000000 --- a/impl/v1_18_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R2/feature/generator/GlowstoneBlobFeatureGeneratorHook.java +++ /dev/null @@ -1,25 +0,0 @@ -package de.derfrzocker.ore.control.impl.v1_18_R2.feature.generator; - -import de.derfrzocker.feature.common.feature.generator.configuration.EmptyFeatureConfiguration; -import de.derfrzocker.ore.control.api.Biome; -import de.derfrzocker.ore.control.api.OreControlManager; -import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Random; - -public class GlowstoneBlobFeatureGeneratorHook extends MinecraftFeatureGeneratorHook { - - public GlowstoneBlobFeatureGeneratorHook(@NotNull OreControlManager oreControlManager, Biome biome, NamespacedKey namespacedKey) { - super(NoneFeatureConfiguration.CODEC, GLOWSTONE_BLOB, oreControlManager, "glowstone_blob", biome, namespacedKey); - } - - @Override - public NoneFeatureConfiguration createConfig(@NotNull NoneFeatureConfiguration defaultConfiguration, @NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull EmptyFeatureConfiguration configuration) { - return defaultConfiguration; - } -} diff --git a/impl/v1_18_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R2/feature/generator/MinecraftFeatureGeneratorHook.java b/impl/v1_18_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R2/feature/generator/MinecraftFeatureGeneratorHook.java deleted file mode 100644 index 53cef014..00000000 --- a/impl/v1_18_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R2/feature/generator/MinecraftFeatureGeneratorHook.java +++ /dev/null @@ -1,98 +0,0 @@ -package de.derfrzocker.ore.control.impl.v1_18_R2.feature.generator; - -import com.mojang.serialization.Codec; -import de.derfrzocker.feature.api.FeatureGenerator; -import de.derfrzocker.feature.api.FeatureGeneratorConfiguration; -import de.derfrzocker.ore.control.api.Biome; -import de.derfrzocker.ore.control.api.FeatureGeneratorHook; -import de.derfrzocker.ore.control.api.OreControlManager; -import de.derfrzocker.ore.control.api.config.Config; -import de.derfrzocker.ore.control.api.config.ConfigManager; -import net.minecraft.core.BlockPos; -import net.minecraft.world.level.ChunkPos; -import net.minecraft.world.level.WorldGenLevel; -import net.minecraft.world.level.chunk.ChunkGenerator; -import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; -import net.minecraft.world.level.levelgen.feature.Feature; -import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext; -import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration; -import org.bukkit.NamespacedKey; -import org.bukkit.craftbukkit.v1_18_R2.generator.CraftLimitedRegion; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Map; -import java.util.Optional; -import java.util.Random; -import java.util.concurrent.ConcurrentHashMap; - -public abstract class MinecraftFeatureGeneratorHook extends Feature implements FeatureGeneratorHook { - - private final Map cache = new ConcurrentHashMap<>(); - private final Feature feature; - private final ConfigManager configManager; - private final FeatureGenerator featureGenerator; - private final Biome biome; - private final NamespacedKey namespacedKey; - - public MinecraftFeatureGeneratorHook(Codec codec, Feature feature, @NotNull OreControlManager oreControlManager, @NotNull String name, Biome biome, NamespacedKey namespacedKey) { - super(codec); - this.feature = feature; - this.configManager = oreControlManager.getConfigManager(); - this.featureGenerator = (FeatureGenerator) oreControlManager.getRegistries().getFeatureGeneratorRegistry().get(NamespacedKey.minecraft(name)).get(); - this.biome = biome; - this.namespacedKey = namespacedKey; - - oreControlManager.addValueChangeListener(cache::clear); - } - - public abstract M createConfig(@NotNull M defaultConfiguration, @NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull C configuration); - - @Override - public FeatureGenerator getFeatureGenerator() { - return featureGenerator; - } - - @Override - public Biome getBiome() { - return biome; - } - - @NotNull - @Override - public NamespacedKey getKey() { - return namespacedKey; - } - - @Override - public boolean place(FeaturePlaceContext context) { - BlockPos origin = context.origin(); - - FeatureGeneratorConfiguration configuration = cache.computeIfAbsent(context.level().getMinecraftWorld().getWorld().getName(), this::loadConfig); - if (configuration == null) { - return feature.place(context); - } - - CraftLimitedRegion limitedRegion = new CraftLimitedRegion(context.level(), new ChunkPos(origin)); - M config = createConfig(context.config(), context.level().getMinecraftWorld().getWorld(), context.random(), new BlockVector(origin.getX(), origin.getY(), origin.getZ()), limitedRegion, (C) configuration); - limitedRegion.breakLink(); - - return place(context.topFeature(), context.level(), context.chunkGenerator(), context.random(), origin, config); - } - - private FeatureGeneratorConfiguration loadConfig(String name) { - Config config = configManager.getGenerationConfig(configManager.getOrCreateConfigInfo(name), biome, namespacedKey).orElse(null); - - if (config == null) { - return null; - } - - return config.getFeature(); - } - - private boolean place(Optional> top, WorldGenLevel world, ChunkGenerator generator, Random random, BlockPos pos, M config) { - return feature.place(new FeaturePlaceContext<>(top, world, generator, random, pos, config)); - } -} diff --git a/impl/v1_18_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R2/feature/generator/OreFeatureGeneratorHook.java b/impl/v1_18_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R2/feature/generator/OreFeatureGeneratorHook.java deleted file mode 100644 index d4726863..00000000 --- a/impl/v1_18_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R2/feature/generator/OreFeatureGeneratorHook.java +++ /dev/null @@ -1,54 +0,0 @@ -package de.derfrzocker.ore.control.impl.v1_18_R2.feature.generator; - -import de.derfrzocker.feature.impl.v1_18_R2.feature.generator.configuration.OreFeatureConfiguration; -import de.derfrzocker.feature.impl.v1_18_R2.value.target.TargetValue; -import de.derfrzocker.ore.control.api.Biome; -import de.derfrzocker.ore.control.api.OreControlManager; -import net.minecraft.world.level.levelgen.feature.Feature; -import net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.ArrayList; -import java.util.List; -import java.util.Random; - -public class OreFeatureGeneratorHook extends MinecraftFeatureGeneratorHook { - - public OreFeatureGeneratorHook(@NotNull OreControlManager oreControlManager, @NotNull NamespacedKey namespacedKey, @NotNull Biome biome) { - super(OreConfiguration.CODEC, Feature.ORE, oreControlManager, "ore", biome, namespacedKey); - } - - @Override - public OreConfiguration createConfig(@NotNull OreConfiguration defaultConfiguration, @NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull OreFeatureConfiguration configuration) { - List blockStates; - if (configuration.getTargets() == null) { - blockStates = defaultConfiguration.targetStates; - } else { - blockStates = new ArrayList<>(); - - for (TargetValue targetValue : configuration.getTargets()) { - blockStates.add(targetValue.getValue(worldInfo, random, position, limitedRegion)); - } - } - - int size; - if (configuration.getSize() == null) { - size = defaultConfiguration.size; - } else { - size = configuration.getSize().getValue(worldInfo, random, position, limitedRegion); - } - - float discardChanceOnAirExposure; - if (configuration.getDiscardChanceOnAirExposure() == null) { - discardChanceOnAirExposure = defaultConfiguration.discardChanceOnAirExposure; - } else { - discardChanceOnAirExposure = configuration.getDiscardChanceOnAirExposure().getValue(worldInfo, random, position, limitedRegion); - } - - return new OreConfiguration(blockStates, size, discardChanceOnAirExposure); - } -} diff --git a/impl/v1_18_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R2/feature/generator/ScatteredOreFeatureGeneratorHook.java b/impl/v1_18_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R2/feature/generator/ScatteredOreFeatureGeneratorHook.java deleted file mode 100644 index f4585416..00000000 --- a/impl/v1_18_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R2/feature/generator/ScatteredOreFeatureGeneratorHook.java +++ /dev/null @@ -1,54 +0,0 @@ -package de.derfrzocker.ore.control.impl.v1_18_R2.feature.generator; - -import de.derfrzocker.feature.impl.v1_18_R2.feature.generator.configuration.OreFeatureConfiguration; -import de.derfrzocker.feature.impl.v1_18_R2.value.target.TargetValue; -import de.derfrzocker.ore.control.api.Biome; -import de.derfrzocker.ore.control.api.OreControlManager; -import net.minecraft.world.level.levelgen.feature.Feature; -import net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.ArrayList; -import java.util.List; -import java.util.Random; - -public class ScatteredOreFeatureGeneratorHook extends MinecraftFeatureGeneratorHook { - - public ScatteredOreFeatureGeneratorHook(@NotNull OreControlManager oreControlManager, @NotNull NamespacedKey namespacedKey, @NotNull Biome biome) { - super(OreConfiguration.CODEC, Feature.SCATTERED_ORE, oreControlManager, "scattered_ore", biome, namespacedKey); - } - - @Override - public OreConfiguration createConfig(@NotNull OreConfiguration defaultConfiguration, @NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull OreFeatureConfiguration configuration) { - List blockStates; - if (configuration.getTargets() == null) { - blockStates = defaultConfiguration.targetStates; - } else { - blockStates = new ArrayList<>(); - - for (TargetValue targetValue : configuration.getTargets()) { - blockStates.add(targetValue.getValue(worldInfo, random, position, limitedRegion)); - } - } - - int size; - if (configuration.getSize() == null) { - size = defaultConfiguration.size; - } else { - size = configuration.getSize().getValue(worldInfo, random, position, limitedRegion); - } - - float discardChanceOnAirExposure; - if (configuration.getDiscardChanceOnAirExposure() == null) { - discardChanceOnAirExposure = defaultConfiguration.discardChanceOnAirExposure; - } else { - discardChanceOnAirExposure = configuration.getDiscardChanceOnAirExposure().getValue(worldInfo, random, position, limitedRegion); - } - - return new OreConfiguration(blockStates, size, discardChanceOnAirExposure); - } -} diff --git a/impl/v1_18_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R2/placement/ActivationModifierHook.java b/impl/v1_18_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R2/placement/ActivationModifierHook.java deleted file mode 100644 index 7b16cf6d..00000000 --- a/impl/v1_18_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R2/placement/ActivationModifierHook.java +++ /dev/null @@ -1,94 +0,0 @@ -package de.derfrzocker.ore.control.impl.v1_18_R2.placement; - -import de.derfrzocker.feature.api.FeaturePlacementModifier; -import de.derfrzocker.feature.api.PlacementModifierConfiguration; -import de.derfrzocker.feature.common.feature.placement.ActivationModifier; -import de.derfrzocker.feature.common.feature.placement.configuration.ActivationConfiguration; -import de.derfrzocker.ore.control.api.Biome; -import de.derfrzocker.ore.control.api.OreControlManager; -import de.derfrzocker.ore.control.api.PlacementModifierHook; -import de.derfrzocker.ore.control.api.config.Config; -import de.derfrzocker.ore.control.api.config.ConfigManager; -import net.minecraft.core.BlockPos; -import net.minecraft.world.level.ChunkPos; -import net.minecraft.world.level.levelgen.placement.PlacementContext; -import net.minecraft.world.level.levelgen.placement.PlacementModifier; -import net.minecraft.world.level.levelgen.placement.PlacementModifierType; -import org.bukkit.NamespacedKey; -import org.bukkit.craftbukkit.v1_18_R2.generator.CraftLimitedRegion; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Map; -import java.util.Random; -import java.util.concurrent.ConcurrentHashMap; -import java.util.stream.Stream; - -// TODO make more generic -public class ActivationModifierHook extends PlacementModifier implements PlacementModifierHook { - - private final Map cache = new ConcurrentHashMap<>(); - private final ActivationModifier activationModifier; - private final ConfigManager configManager; - private final Biome biome; - private final NamespacedKey namespacedKey; - - public ActivationModifierHook(@NotNull OreControlManager oreControlManager, @NotNull Biome biome, @NotNull NamespacedKey namespacedKey) { - this.configManager = oreControlManager.getConfigManager(); - this.activationModifier = (ActivationModifier) oreControlManager.getRegistries().getPlacementModifierRegistry().get(ActivationModifier.KEY).get(); - this.biome = biome; - this.namespacedKey = namespacedKey; - - oreControlManager.addValueChangeListener(cache::clear); - } - - @Override - public FeaturePlacementModifier getPlacementModifier() { - return activationModifier; - } - - @Override - public Biome getBiome() { - return biome; - } - - @NotNull - @Override - public NamespacedKey getKey() { - return activationModifier.getKey(); - } - - @Override - public Stream getPositions(PlacementContext context, Random random, BlockPos blockPos) { - PlacementModifierConfiguration configuration = cache.computeIfAbsent(context.getLevel().getMinecraftWorld().getWorld().getName(), this::loadConfig); - if (configuration == null) { - return Stream.of(blockPos); - } - - CraftLimitedRegion limitedRegion = new CraftLimitedRegion(context.getLevel(), new ChunkPos(blockPos)); - Stream pos = activationModifier.getPositions(context.getLevel().getMinecraftWorld().getWorld(), random, new BlockVector(blockPos.getX(), blockPos.getY(), blockPos.getZ()), limitedRegion, (ActivationConfiguration) configuration); - - limitedRegion.breakLink(); - - return pos.map(blockVector -> new BlockPos(blockVector.getBlockX(), blockVector.getBlockY(), blockVector.getBlockZ())); - } - - private PlacementModifierConfiguration loadConfig(String name) { - Config config = configManager.getGenerationConfig(configManager.getOrCreateConfigInfo(name), biome, namespacedKey).orElse(null); - - if (config == null) { - return null; - } - - if (config.getPlacements() == null) { - return null; - } - - return config.getPlacements().get(activationModifier); - } - - @Override - public PlacementModifierType type() { - return null; - } -} diff --git a/impl/v1_18_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R2/placement/CountModifierHook.java b/impl/v1_18_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R2/placement/CountModifierHook.java deleted file mode 100644 index 6dc616d5..00000000 --- a/impl/v1_18_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R2/placement/CountModifierHook.java +++ /dev/null @@ -1,55 +0,0 @@ -package de.derfrzocker.ore.control.impl.v1_18_R2.placement; - -import de.derfrzocker.feature.api.FeaturePlacementModifier; -import de.derfrzocker.feature.common.feature.placement.configuration.CountModifierConfiguration; -import de.derfrzocker.feature.common.value.number.IntegerValue; -import de.derfrzocker.ore.control.api.Biome; -import de.derfrzocker.ore.control.api.OreControlManager; -import de.derfrzocker.ore.control.impl.v1_18_R2.ConversionUtil; -import de.derfrzocker.ore.control.impl.v1_18_R2.NMSReflectionNames; -import net.minecraft.util.valueproviders.IntProvider; -import net.minecraft.world.level.levelgen.placement.CountPlacement; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.lang.reflect.Field; -import java.util.Random; - -public class CountModifierHook extends MinecraftPlacementModifierHook { - - public CountModifierHook(@NotNull OreControlManager oreControlManager, @NotNull Biome biome, @NotNull NamespacedKey namespacedKey, @NotNull CountPlacement defaultModifier) { - super(oreControlManager, "count", defaultModifier, biome, namespacedKey); - } - - public static CountModifierConfiguration createDefaultConfiguration(@NotNull CountPlacement defaultModifier, @NotNull FeaturePlacementModifier modifier) { - try { - Field count = CountPlacement.class.getDeclaredField(NMSReflectionNames.COUNT_PLACEMENT_COUNT); - count.setAccessible(true); - IntProvider value = (IntProvider) count.get(defaultModifier); - IntegerValue integerValue = ConversionUtil.convert(value); - return new CountModifierConfiguration(modifier, integerValue); - } catch (NoSuchFieldException | IllegalAccessException e) { - throw new RuntimeException(e); - } - } - - @Override - public CountModifierConfiguration createDefaultConfiguration(@NotNull CountPlacement defaultModifier) { - return createDefaultConfiguration(defaultModifier, getPlacementModifier()); - } - - @Override - public CountPlacement createModifier(@NotNull CountModifierConfiguration defaultConfiguration, @NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull CountModifierConfiguration configuration) { - int count; - if (configuration.getCount() == null) { - count = defaultConfiguration.getCount().getValue(worldInfo, random, position, limitedRegion); - } else { - count = configuration.getCount().getValue(worldInfo, random, position, limitedRegion); - } - - return CountPlacement.of(count); - } -} diff --git a/impl/v1_18_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R2/placement/HeightRangeModifierHook.java b/impl/v1_18_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R2/placement/HeightRangeModifierHook.java deleted file mode 100644 index 79ea8e83..00000000 --- a/impl/v1_18_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R2/placement/HeightRangeModifierHook.java +++ /dev/null @@ -1,122 +0,0 @@ -package de.derfrzocker.ore.control.impl.v1_18_R2.placement; - -import de.derfrzocker.feature.api.FeaturePlacementModifier; -import de.derfrzocker.feature.common.feature.placement.configuration.HeightRangeModifierConfiguration; -import de.derfrzocker.feature.common.value.number.IntegerValue; -import de.derfrzocker.feature.common.value.number.integer.FixedDoubleToIntegerValue; -import de.derfrzocker.feature.common.value.number.integer.trapezoid.TrapezoidIntegerValue; -import de.derfrzocker.feature.common.value.number.integer.uniform.UniformIntegerValue; -import de.derfrzocker.feature.impl.v1_18_R2.value.offset.NMSAboveBottomOffsetIntegerValue; -import de.derfrzocker.feature.impl.v1_18_R2.value.offset.NMSBelowTopOffsetIntegerValue; -import de.derfrzocker.ore.control.api.Biome; -import de.derfrzocker.ore.control.api.OreControlManager; -import de.derfrzocker.ore.control.impl.v1_18_R2.NMSReflectionNames; -import net.minecraft.world.level.levelgen.VerticalAnchor; -import net.minecraft.world.level.levelgen.heightproviders.ConstantHeight; -import net.minecraft.world.level.levelgen.heightproviders.HeightProvider; -import net.minecraft.world.level.levelgen.heightproviders.HeightProviderType; -import net.minecraft.world.level.levelgen.placement.HeightRangePlacement; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.lang.reflect.Field; -import java.util.Random; - -public class HeightRangeModifierHook extends MinecraftPlacementModifierHook { - - public HeightRangeModifierHook(@NotNull OreControlManager oreControlManager, @NotNull Biome biome, @NotNull NamespacedKey namespacedKey, @NotNull HeightRangePlacement defaultModifier) { - super(oreControlManager, "height_range", defaultModifier, biome, namespacedKey); - } - - public static HeightRangeModifierConfiguration createDefaultConfiguration(@NotNull HeightRangePlacement defaultModifier, @NotNull FeaturePlacementModifier modifier) { - try { - Field height = HeightRangePlacement.class.getDeclaredField(NMSReflectionNames.HEIGHT_RANGE_PLACEMENT_HEIGHT); - height.setAccessible(true); - HeightProvider value = (HeightProvider) height.get(defaultModifier); - - IntegerValue integerValue; - if (value.getType() == HeightProviderType.CONSTANT) { - integerValue = getIntegerValue(value.toString()); - } else if (value.getType() == HeightProviderType.UNIFORM) { - String uniform = value.toString(); - uniform = uniform.substring(1); - uniform = uniform.substring(0, uniform.length() - 1); - int charType = uniform.indexOf("-", 1); - String[] anchors = new String[]{uniform.substring(0, charType), uniform.substring(charType + 1)}; - - integerValue = new UniformIntegerValue(getIntegerValue(anchors[0]), getIntegerValue(anchors[1])); - } else if (value.getType() == HeightProviderType.TRAPEZOID) { - String trapezoid = value.toString(); - if (trapezoid.startsWith("triangle")) { - trapezoid = trapezoid.replace("triangle (", ""); - trapezoid = trapezoid.substring(0, trapezoid.length() - 1); - int charType = trapezoid.indexOf("-", 1); - String[] anchors = new String[]{trapezoid.substring(0, charType), trapezoid.substring(charType + 1)}; - - integerValue = new TrapezoidIntegerValue(getIntegerValue(anchors[0]), getIntegerValue(anchors[1]), new FixedDoubleToIntegerValue(0)); - } else if (trapezoid.startsWith("trapezoid")) { - trapezoid = trapezoid.replace("trapezoid (", ""); - trapezoid = trapezoid.substring(0, trapezoid.length() - 1); - String[] split = trapezoid.split("\\) in \\["); - - if (split.length != 2) { - throw new IllegalStateException(String.format("Expected a split of size '2', but got '%s' for input '%s'", split.length, trapezoid)); - } - - int plateau = Integer.parseInt(split[0]); - int charType = trapezoid.indexOf("-", 1); - String[] anchors = new String[]{trapezoid.substring(0, charType), trapezoid.substring(charType + 1)}; - integerValue = new TrapezoidIntegerValue(getIntegerValue(anchors[0]), getIntegerValue(anchors[1]), new FixedDoubleToIntegerValue(plateau)); - } else { - throw new UnsupportedOperationException(String.format("Unknown trapezoid value '%s'", trapezoid)); - } - - } else { // TODO add rest of HeightProvider types - throw new UnsupportedOperationException(String.format("No integer value equivalent for HeightProvider '%s'", value)); - } - - return new HeightRangeModifierConfiguration(modifier, integerValue); - } catch (NoSuchFieldException | IllegalAccessException e) { - throw new RuntimeException(e); - } - } - - private static IntegerValue getIntegerValue(String anchor) { - String[] values = anchor.split(" "); - int value = Integer.parseInt(values[0]); - - if (values.length == 2 && values[1].equals("absolute")) { - return new FixedDoubleToIntegerValue(value); - } - - if (values.length == 3 && values[1].equals("above") && values[2].equals("bottom")) { - return new NMSAboveBottomOffsetIntegerValue(new FixedDoubleToIntegerValue(value)); - } - - if (values.length == 3 && values[1].equals("below") && values[2].equals("top")) { - return new NMSBelowTopOffsetIntegerValue(new FixedDoubleToIntegerValue(value)); - } - - throw new UnsupportedOperationException(String.format("Unknown vertical anchor '%s'", anchor)); - } - - @Override - public HeightRangeModifierConfiguration createDefaultConfiguration(@NotNull HeightRangePlacement defaultModifier) { - return createDefaultConfiguration(defaultModifier, getPlacementModifier()); - } - - @Override - public HeightRangePlacement createModifier(@NotNull HeightRangeModifierConfiguration defaultConfiguration, @NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull HeightRangeModifierConfiguration configuration) { - int height; - if (configuration.getHeight() == null) { - height = defaultConfiguration.getHeight().getValue(worldInfo, random, position, limitedRegion); - } else { - height = configuration.getHeight().getValue(worldInfo, random, position, limitedRegion); - } - - return HeightRangePlacement.of(ConstantHeight.of(VerticalAnchor.absolute(height))); - } -} diff --git a/impl/v1_18_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R2/placement/MinecraftPlacementModifierHook.java b/impl/v1_18_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R2/placement/MinecraftPlacementModifierHook.java deleted file mode 100644 index 729d3b3b..00000000 --- a/impl/v1_18_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R2/placement/MinecraftPlacementModifierHook.java +++ /dev/null @@ -1,104 +0,0 @@ -package de.derfrzocker.ore.control.impl.v1_18_R2.placement; - -import de.derfrzocker.feature.api.FeaturePlacementModifier; -import de.derfrzocker.feature.api.PlacementModifierConfiguration; -import de.derfrzocker.ore.control.api.Biome; -import de.derfrzocker.ore.control.api.OreControlManager; -import de.derfrzocker.ore.control.api.PlacementModifierHook; -import de.derfrzocker.ore.control.api.config.Config; -import de.derfrzocker.ore.control.api.config.ConfigManager; -import net.minecraft.core.BlockPos; -import net.minecraft.world.level.ChunkPos; -import net.minecraft.world.level.WorldGenLevel; -import net.minecraft.world.level.chunk.ChunkGenerator; -import net.minecraft.world.level.levelgen.placement.PlacedFeature; -import net.minecraft.world.level.levelgen.placement.PlacementContext; -import net.minecraft.world.level.levelgen.placement.PlacementModifier; -import net.minecraft.world.level.levelgen.placement.PlacementModifierType; -import org.bukkit.NamespacedKey; -import org.bukkit.craftbukkit.v1_18_R2.generator.CraftLimitedRegion; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Map; -import java.util.Optional; -import java.util.Random; -import java.util.concurrent.ConcurrentHashMap; -import java.util.stream.Stream; - -public abstract class MinecraftPlacementModifierHook extends PlacementModifier implements PlacementModifierHook { - - private final Map cache = new ConcurrentHashMap<>(); - private final FeaturePlacementModifier placementModifier; - private final ConfigManager configManager; - private final M defaultModifier; - private final C defaultConfiguration; - private final Biome biome; - private final NamespacedKey namespacedKey; - - public MinecraftPlacementModifierHook(@NotNull OreControlManager oreControlManager, @NotNull String name, @NotNull M defaultModifier, @NotNull Biome biome, @NotNull NamespacedKey namespacedKey) { - this.configManager = oreControlManager.getConfigManager(); - this.placementModifier = (FeaturePlacementModifier) oreControlManager.getRegistries().getPlacementModifierRegistry().get(NamespacedKey.minecraft(name)).get(); - this.defaultModifier = defaultModifier; - this.defaultConfiguration = createDefaultConfiguration(defaultModifier); - this.biome = biome; - this.namespacedKey = namespacedKey; - - oreControlManager.addValueChangeListener(cache::clear); - } - - public abstract M createModifier(@NotNull C defaultConfiguration, @NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull C configuration); - - public abstract C createDefaultConfiguration(M defaultModifier); - - @Override - public FeaturePlacementModifier getPlacementModifier() { - return placementModifier; - } - - @Override - public Biome getBiome() { - return biome; - } - - @NotNull - @Override - public NamespacedKey getKey() { - return namespacedKey; - } - - @Override - public Stream getPositions(PlacementContext context, Random random, BlockPos blockPos) { - PlacementModifierConfiguration configuration = cache.computeIfAbsent(context.getLevel().getMinecraftWorld().getWorld().getName(), this::loadConfig); - - M modifier = defaultModifier; - if (configuration != null) { - CraftLimitedRegion limitedRegion = new CraftLimitedRegion(context.getLevel(), new ChunkPos(blockPos)); - modifier = createModifier(defaultConfiguration, context.getLevel().getMinecraftWorld().getWorld(), random, new BlockVector(blockPos.getX(), blockPos.getY(), blockPos.getZ()), limitedRegion, (C) configuration); - limitedRegion.breakLink(); - } - - return getPositions(context.topFeature(), context.getLevel(), context.generator(), random, blockPos, modifier); - } - - private PlacementModifierConfiguration loadConfig(String name) { - Config config = configManager.getGenerationConfig(configManager.getOrCreateConfigInfo(name), biome, namespacedKey).orElse(null); - - if (config == null) { - return null; - } - - return config.getPlacements().get(placementModifier); - } - - @Override - public PlacementModifierType type() { - return null; - } - - private Stream getPositions(Optional top, WorldGenLevel world, ChunkGenerator generator, Random random, BlockPos pos, M modifier) { - return modifier.getPositions(new PlacementContext(world, generator, top), random, pos); - } -} diff --git a/impl/v1_18_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R2/placement/RarityModifierHook.java b/impl/v1_18_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R2/placement/RarityModifierHook.java deleted file mode 100644 index 90685d24..00000000 --- a/impl/v1_18_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R2/placement/RarityModifierHook.java +++ /dev/null @@ -1,53 +0,0 @@ -package de.derfrzocker.ore.control.impl.v1_18_R2.placement; - -import de.derfrzocker.feature.api.FeaturePlacementModifier; -import de.derfrzocker.feature.common.feature.placement.configuration.RarityModifierConfiguration; -import de.derfrzocker.feature.common.value.number.integer.FixedDoubleToIntegerValue; -import de.derfrzocker.ore.control.api.Biome; -import de.derfrzocker.ore.control.api.OreControlManager; -import de.derfrzocker.ore.control.impl.v1_18_R2.NMSReflectionNames; -import net.minecraft.world.level.levelgen.placement.RarityFilter; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.bukkit.util.NumberConversions; -import org.jetbrains.annotations.NotNull; - -import java.lang.reflect.Field; -import java.util.Random; - -public class RarityModifierHook extends MinecraftPlacementModifierHook { - - public RarityModifierHook(@NotNull OreControlManager oreControlManager, @NotNull Biome biome, @NotNull NamespacedKey namespacedKey, @NotNull RarityFilter defaultModifier) { - super(oreControlManager, "rarity_filter", defaultModifier, biome, namespacedKey); - } - - public static RarityModifierConfiguration createDefaultConfiguration(@NotNull RarityFilter defaultModifier, @NotNull FeaturePlacementModifier modifier) { - try { - Field chance = RarityFilter.class.getDeclaredField(NMSReflectionNames.RARITY_FILTER_CHANCE); - chance.setAccessible(true); - Object value = chance.get(defaultModifier); - return new RarityModifierConfiguration(modifier, new FixedDoubleToIntegerValue(NumberConversions.toInt(value))); - } catch (NoSuchFieldException | IllegalAccessException e) { - throw new RuntimeException(e); - } - } - - @Override - public RarityModifierConfiguration createDefaultConfiguration(@NotNull RarityFilter defaultModifier) { - return createDefaultConfiguration(defaultModifier, getPlacementModifier()); - } - - @Override - public RarityFilter createModifier(@NotNull RarityModifierConfiguration defaultConfiguration, @NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull RarityModifierConfiguration configuration) { - int chance; - if (configuration.getChance() == null) { - chance = defaultConfiguration.getChance().getValue(worldInfo, random, position, limitedRegion); - } else { - chance = configuration.getChance().getValue(worldInfo, random, position, limitedRegion); - } - - return RarityFilter.onAverageOnceEvery(chance); - } -} diff --git a/impl/v1_18_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R2/placement/SurfaceRelativeThresholdModifierHook.java b/impl/v1_18_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R2/placement/SurfaceRelativeThresholdModifierHook.java deleted file mode 100644 index 543dcb5f..00000000 --- a/impl/v1_18_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R2/placement/SurfaceRelativeThresholdModifierHook.java +++ /dev/null @@ -1,77 +0,0 @@ -package de.derfrzocker.ore.control.impl.v1_18_R2.placement; - -import de.derfrzocker.feature.api.FeaturePlacementModifier; -import de.derfrzocker.feature.common.value.number.integer.FixedDoubleToIntegerValue; -import de.derfrzocker.feature.impl.v1_18_R2.placement.configuration.SurfaceRelativeThresholdModifierConfiguration; -import de.derfrzocker.ore.control.api.Biome; -import de.derfrzocker.ore.control.api.OreControlManager; -import de.derfrzocker.ore.control.impl.v1_18_R2.NMSReflectionNames; -import net.minecraft.world.level.levelgen.Heightmap; -import net.minecraft.world.level.levelgen.placement.SurfaceRelativeThresholdFilter; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.bukkit.util.NumberConversions; -import org.jetbrains.annotations.NotNull; - -import java.lang.reflect.Field; -import java.util.Random; - -public class SurfaceRelativeThresholdModifierHook extends MinecraftPlacementModifierHook { - - public SurfaceRelativeThresholdModifierHook(@NotNull OreControlManager oreControlManager, @NotNull Biome biome, @NotNull NamespacedKey namespacedKey, @NotNull SurfaceRelativeThresholdFilter defaultModifier) { - super(oreControlManager, "surface_relative_threshold_filter", defaultModifier, biome, namespacedKey); - } - - public static SurfaceRelativeThresholdModifierConfiguration createDefaultConfiguration(@NotNull SurfaceRelativeThresholdFilter defaultModifier, @NotNull FeaturePlacementModifier modifier) { - try { - Field heightmap = SurfaceRelativeThresholdFilter.class.getDeclaredField(NMSReflectionNames.SURFACE_RELATIVE_THRESHOLD_FILTER_HEIGHTMAP); - heightmap.setAccessible(true); - - Field minInclusive = SurfaceRelativeThresholdFilter.class.getDeclaredField(NMSReflectionNames.SURFACE_RELATIVE_THRESHOLD_FILTER_MIN_INCLUSIVE); - minInclusive.setAccessible(true); - - Field maxInclusive = SurfaceRelativeThresholdFilter.class.getDeclaredField(NMSReflectionNames.SURFACE_RELATIVE_THRESHOLD_FILTER_MAX_INCLUSIVE); - maxInclusive.setAccessible(true); - - Object heightmapValue = heightmap.get(defaultModifier); - Object minInclusiveValue = minInclusive.get(defaultModifier); - Object maxInclusiveValue = maxInclusive.get(defaultModifier); - return new SurfaceRelativeThresholdModifierConfiguration(modifier, null, new FixedDoubleToIntegerValue(NumberConversions.toInt(minInclusiveValue)), new FixedDoubleToIntegerValue(NumberConversions.toInt(maxInclusiveValue))); - } catch (NoSuchFieldException | IllegalAccessException e) { - throw new RuntimeException(e); - } - } - - @Override - public SurfaceRelativeThresholdFilter createModifier(@NotNull SurfaceRelativeThresholdModifierConfiguration defaultConfiguration, @NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull SurfaceRelativeThresholdModifierConfiguration configuration) { - Heightmap.Types heightmap; - if (configuration.getHeightmap() == null) { - heightmap = defaultConfiguration.getHeightmap().getValue(worldInfo, random, position, limitedRegion); - } else { - heightmap = configuration.getHeightmap().getValue(worldInfo, random, position, limitedRegion); - } - - int minInclusive; - if (configuration.getMinInclusive() == null) { - minInclusive = defaultConfiguration.getMinInclusive().getValue(worldInfo, random, position, limitedRegion); - } else { - minInclusive = configuration.getMinInclusive().getValue(worldInfo, random, position, limitedRegion); - } - - int maxInclusive; - if (configuration.getMaxInclusive() == null) { - maxInclusive = defaultConfiguration.getMaxInclusive().getValue(worldInfo, random, position, limitedRegion); - } else { - maxInclusive = configuration.getMaxInclusive().getValue(worldInfo, random, position, limitedRegion); - } - - return SurfaceRelativeThresholdFilter.of(heightmap, minInclusive, maxInclusive); - } - - @Override - public SurfaceRelativeThresholdModifierConfiguration createDefaultConfiguration(SurfaceRelativeThresholdFilter defaultModifier) { - return createDefaultConfiguration(defaultModifier, getPlacementModifier()); - } -} diff --git a/impl/v1_18_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R2/placement/SurfaceWaterDepthModifierHook.java b/impl/v1_18_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R2/placement/SurfaceWaterDepthModifierHook.java deleted file mode 100644 index 1baba28d..00000000 --- a/impl/v1_18_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_18_R2/placement/SurfaceWaterDepthModifierHook.java +++ /dev/null @@ -1,53 +0,0 @@ -package de.derfrzocker.ore.control.impl.v1_18_R2.placement; - -import de.derfrzocker.feature.api.FeaturePlacementModifier; -import de.derfrzocker.feature.common.feature.placement.configuration.SurfaceWaterDepthModifierConfiguration; -import de.derfrzocker.feature.common.value.number.integer.FixedDoubleToIntegerValue; -import de.derfrzocker.ore.control.api.Biome; -import de.derfrzocker.ore.control.api.OreControlManager; -import de.derfrzocker.ore.control.impl.v1_18_R2.NMSReflectionNames; -import net.minecraft.world.level.levelgen.placement.SurfaceWaterDepthFilter; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.bukkit.util.NumberConversions; -import org.jetbrains.annotations.NotNull; - -import java.lang.reflect.Field; -import java.util.Random; - -public class SurfaceWaterDepthModifierHook extends MinecraftPlacementModifierHook { - - public SurfaceWaterDepthModifierHook(@NotNull OreControlManager oreControlManager, @NotNull Biome biome, @NotNull NamespacedKey namespacedKey, @NotNull SurfaceWaterDepthFilter defaultModifier) { - super(oreControlManager, "surface_water_depth_filter", defaultModifier, biome, namespacedKey); - } - - public static SurfaceWaterDepthModifierConfiguration createDefaultConfiguration(@NotNull SurfaceWaterDepthFilter defaultModifier, @NotNull FeaturePlacementModifier modifier) { - try { - Field maxWaterDepth = SurfaceWaterDepthFilter.class.getDeclaredField(NMSReflectionNames.SURFACE_WATER_DEPTH_FILTER_MAX_WATER_DEPTH); - maxWaterDepth.setAccessible(true); - Object value = maxWaterDepth.get(defaultModifier); - return new SurfaceWaterDepthModifierConfiguration(modifier, new FixedDoubleToIntegerValue(NumberConversions.toInt(value))); - } catch (NoSuchFieldException | IllegalAccessException e) { - throw new RuntimeException(e); - } - } - - @Override - public SurfaceWaterDepthModifierConfiguration createDefaultConfiguration(@NotNull SurfaceWaterDepthFilter defaultModifier) { - return createDefaultConfiguration(defaultModifier, getPlacementModifier()); - } - - @Override - public SurfaceWaterDepthFilter createModifier(@NotNull SurfaceWaterDepthModifierConfiguration defaultConfiguration, @NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull SurfaceWaterDepthModifierConfiguration configuration) { - int maxWaterDepth; - if (configuration.getMaxWaterDepth() == null) { - maxWaterDepth = defaultConfiguration.getMaxWaterDepth().getValue(worldInfo, random, position, limitedRegion); - } else { - maxWaterDepth = configuration.getMaxWaterDepth().getValue(worldInfo, random, position, limitedRegion); - } - - return SurfaceWaterDepthFilter.forMaxDepth(maxWaterDepth); - } -} \ No newline at end of file diff --git a/impl/v1_19_R1/pom.xml b/impl/v1_19_R1/pom.xml deleted file mode 100644 index a939ab88..00000000 --- a/impl/v1_19_R1/pom.xml +++ /dev/null @@ -1,80 +0,0 @@ - - - 4.0.0 - - - ore-control-impl - de.derfrzocker - ${revision} - - - ore-control-impl-v1_19_R1 - - - - de.derfrzocker - ore-control-api - ${project.version} - provided - - - de.derfrzocker - ore-control-common - ${project.version} - provided - - - org.spigotmc - spigot - 1.19-R0.1-SNAPSHOT - remapped-mojang - provided - true - - - - - - - net.md-5 - specialsource-maven-plugin - 1.2.3 - - - package - - remap - - remap-obf - - org.spigotmc:minecraft-server:1.19-R0.1-SNAPSHOT:txt:maps-mojang - true - org.spigotmc:spigot:1.19-R0.1-SNAPSHOT:jar:remapped-mojang - - true - remapped-obf - - - - package - - remap - - remap-spigot - - - ${project.build.directory}/${project.artifactId}-${project.version}-remapped-obf.jar - - org.spigotmc:minecraft-server:1.19-R0.1-SNAPSHOT:csrg:maps-spigot - org.spigotmc:spigot:1.19-R0.1-SNAPSHOT:jar:remapped-obf - - - - - - - - - \ No newline at end of file diff --git a/impl/v1_19_R1/src/main/java/de/derfrzocker/feature/impl/v1_19_R1/extra/OreVeinHandler.java b/impl/v1_19_R1/src/main/java/de/derfrzocker/feature/impl/v1_19_R1/extra/OreVeinHandler.java deleted file mode 100644 index de597eaf..00000000 --- a/impl/v1_19_R1/src/main/java/de/derfrzocker/feature/impl/v1_19_R1/extra/OreVeinHandler.java +++ /dev/null @@ -1,103 +0,0 @@ -package de.derfrzocker.feature.impl.v1_19_R1.extra; - -import de.derfrzocker.feature.api.ExtraValues; -import de.derfrzocker.ore.control.api.OreControlManager; -import de.derfrzocker.ore.control.api.config.ConfigInfo; -import de.derfrzocker.ore.control.api.config.ConfigManager; -import de.derfrzocker.ore.control.impl.v1_19_R1.NMSReflectionNames; -import net.minecraft.core.Holder; -import net.minecraft.server.level.ChunkMap; -import net.minecraft.world.level.levelgen.NoiseBasedChunkGenerator; -import net.minecraft.world.level.levelgen.NoiseGeneratorSettings; -import org.bukkit.World; -import org.bukkit.craftbukkit.v1_19_R1.CraftWorld; -import org.bukkit.event.EventHandler; -import org.bukkit.event.EventPriority; -import org.bukkit.event.Listener; -import org.bukkit.event.world.WorldInitEvent; -import org.bukkit.event.world.WorldUnloadEvent; - -import java.lang.reflect.Field; -import java.util.HashSet; -import java.util.Optional; -import java.util.Set; - -public class OreVeinHandler implements Listener { - - private final static Field CHUNK_GENERATOR_FIELD; - private final static Field NOISE_GENERATOR_SETTINGS_FIELD; - - static { - try { - CHUNK_GENERATOR_FIELD = ChunkMap.class.getDeclaredField(NMSReflectionNames.CHUNK_MAP_GENERATOR); - CHUNK_GENERATOR_FIELD.setAccessible(true); - NOISE_GENERATOR_SETTINGS_FIELD = NoiseBasedChunkGenerator.class.getDeclaredField(NMSReflectionNames.NOISE_GENERATOR_SETTINGS); - NOISE_GENERATOR_SETTINGS_FIELD.setAccessible(true); - } catch (NoSuchFieldException e) { - throw new RuntimeException(e); - } - } - - private final Set hookedWorlds = new HashSet<>(); - private final ConfigManager configManager; - - public OreVeinHandler(OreControlManager oreControlManager) { - this.configManager = oreControlManager.getConfigManager(); - oreControlManager.addValueChangeListener(this::update); - } - - @EventHandler(priority = EventPriority.LOW) - public void onWorldInit(WorldInitEvent event) { - if (!(((CraftWorld) event.getWorld()).getHandle().getChunkSource().chunkMap.generator instanceof NoiseBasedChunkGenerator noiseChunkGenerator)) { - return; - } - - NoiseGeneratorSettings newSettings = getNewValue(event.getWorld(), noiseChunkGenerator.settings.value()); - NoiseBasedChunkGenerator newGenerator = new NoiseBasedChunkGenerator(noiseChunkGenerator.structureSets, noiseChunkGenerator.noises, noiseChunkGenerator.getBiomeSource(), Holder.direct(newSettings)); - - try { - newGenerator.conf = noiseChunkGenerator.conf; - } catch (Throwable ignore) { - } - - try { - CHUNK_GENERATOR_FIELD.set(((CraftWorld) event.getWorld()).getHandle().getChunkSource().chunkMap, newGenerator); - } catch (IllegalAccessException e) { - throw new RuntimeException(e); - } - - hookedWorlds.add(event.getWorld()); - } - - @EventHandler - public void onWorldUnload(WorldUnloadEvent event) { - // Cleanup - hookedWorlds.remove(event.getWorld()); - } - - private NoiseGeneratorSettings getNewValue(World world, NoiseGeneratorSettings old) { - ConfigInfo configInfo = configManager.getOrCreateConfigInfo(world.getName()); - Optional optionalExtraValues = configManager.getGenerationExtraValues(configInfo); - - boolean newValue = optionalExtraValues.flatMap(ExtraValues::shouldGeneratedBigOreVeins).orElse(old.oreVeinsEnabled()); - - return new NoiseGeneratorSettings(old.noiseSettings(), old.defaultBlock(), old.defaultFluid(), - old.noiseRouter(), old.surfaceRule(), old.spawnTarget(), old.seaLevel(), old.disableMobGeneration(), old.aquifersEnabled(), newValue, old.useLegacyRandomSource()); - } - - private void update() { - for (World world : hookedWorlds) { - if (!(((CraftWorld) world).getHandle().getChunkSource().chunkMap.generator instanceof NoiseBasedChunkGenerator noiseChunkGenerator)) { - return; - } - - NoiseGeneratorSettings newSettings = getNewValue(world, noiseChunkGenerator.settings.value()); - - try { - NOISE_GENERATOR_SETTINGS_FIELD.set(noiseChunkGenerator, Holder.direct(newSettings)); - } catch (IllegalAccessException e) { - throw new RuntimeException(e); - } - } - } -} diff --git a/impl/v1_19_R1/src/main/java/de/derfrzocker/feature/impl/v1_19_R1/feature/generator/GlowstoneBlobFeatureGenerator.java b/impl/v1_19_R1/src/main/java/de/derfrzocker/feature/impl/v1_19_R1/feature/generator/GlowstoneBlobFeatureGenerator.java deleted file mode 100644 index 3310a49d..00000000 --- a/impl/v1_19_R1/src/main/java/de/derfrzocker/feature/impl/v1_19_R1/feature/generator/GlowstoneBlobFeatureGenerator.java +++ /dev/null @@ -1,61 +0,0 @@ -package de.derfrzocker.feature.impl.v1_19_R1.feature.generator; - -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import de.derfrzocker.feature.api.Configuration; -import de.derfrzocker.feature.api.Registries; -import de.derfrzocker.feature.api.Setting; -import de.derfrzocker.feature.api.util.Parser; -import de.derfrzocker.feature.common.feature.generator.configuration.EmptyFeatureConfiguration; -import net.minecraft.world.level.levelgen.feature.Feature; -import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Collections; -import java.util.Random; -import java.util.Set; - -public class GlowstoneBlobFeatureGenerator extends MinecraftFeatureGenerator { - - public GlowstoneBlobFeatureGenerator(Registries registries) { - super(registries, Feature.GLOWSTONE_BLOB, "glowstone_blob"); - } - - @Override - public @NotNull Set getSettings() { - return Collections.emptySet(); - } - - @Override - public @NotNull Configuration createEmptyConfiguration() { - return new EmptyFeatureConfiguration(this); - } - - @Override - public EmptyFeatureConfiguration mergeConfig(EmptyFeatureConfiguration first, EmptyFeatureConfiguration second) { - return first; - } - - @Override - public Parser createParser(Registries registries) { - return new Parser<>() { - @Override - public JsonElement toJson(EmptyFeatureConfiguration value) { - return new JsonObject(); - } - - @Override - public EmptyFeatureConfiguration fromJson(JsonElement jsonElement) { - return new EmptyFeatureConfiguration(GlowstoneBlobFeatureGenerator.this); - } - }; - } - - @Override - public NoneFeatureConfiguration createConfiguration(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull EmptyFeatureConfiguration configuration) { - return NoneFeatureConfiguration.INSTANCE; - } -} diff --git a/impl/v1_19_R1/src/main/java/de/derfrzocker/feature/impl/v1_19_R1/feature/generator/MinecraftFeatureGenerator.java b/impl/v1_19_R1/src/main/java/de/derfrzocker/feature/impl/v1_19_R1/feature/generator/MinecraftFeatureGenerator.java deleted file mode 100644 index 5360c125..00000000 --- a/impl/v1_19_R1/src/main/java/de/derfrzocker/feature/impl/v1_19_R1/feature/generator/MinecraftFeatureGenerator.java +++ /dev/null @@ -1,65 +0,0 @@ -package de.derfrzocker.feature.impl.v1_19_R1.feature.generator; - -import de.derfrzocker.feature.api.FeatureGenerator; -import de.derfrzocker.feature.api.FeatureGeneratorConfiguration; -import de.derfrzocker.feature.api.Registries; -import de.derfrzocker.feature.api.util.Parser; -import net.minecraft.core.BlockPos; -import net.minecraft.world.level.WorldGenLevel; -import net.minecraft.world.level.levelgen.feature.Feature; -import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext; -import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration; -import org.bukkit.NamespacedKey; -import org.bukkit.craftbukkit.v1_19_R1.generator.CraftLimitedRegion; -import org.bukkit.craftbukkit.v1_19_R1.util.RandomSourceWrapper; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Optional; -import java.util.Random; - -public abstract class MinecraftFeatureGenerator implements FeatureGenerator { - - private final Parser parser; - private final Feature feature; - private final NamespacedKey namespacedKey; - - public MinecraftFeatureGenerator(Registries registries, Feature feature, String name) { - this.parser = (Parser) createParser(registries); - this.feature = feature; - this.namespacedKey = NamespacedKey.minecraft(name); - } - - public abstract C mergeConfig(C first, C second); - - public abstract Parser createParser(Registries registries); - - public abstract M createConfiguration(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull C configuration); - - @NotNull - @Override - public C merge(@NotNull FeatureGeneratorConfiguration first, @NotNull FeatureGeneratorConfiguration second) { - return mergeConfig((C) first, (C) second); - } - - @Override - public void place(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull C configuration) { - WorldGenLevel level = ((CraftLimitedRegion) limitedRegion).getHandle(); - M config = createConfiguration(worldInfo, random, position, limitedRegion, configuration); - feature.place(new FeaturePlaceContext<>(Optional.empty(), level, level.getMinecraftWorld().getChunkSource().getGenerator(), new RandomSourceWrapper(random), new BlockPos(position.getBlockX(), position.getBlockY(), position.getBlockZ()), config)); - } - - @NotNull - @Override - public Parser getParser() { - return parser; - } - - @NotNull - @Override - public NamespacedKey getKey() { - return namespacedKey; - } -} diff --git a/impl/v1_19_R1/src/main/java/de/derfrzocker/feature/impl/v1_19_R1/feature/generator/OreFeatureGenerator.java b/impl/v1_19_R1/src/main/java/de/derfrzocker/feature/impl/v1_19_R1/feature/generator/OreFeatureGenerator.java deleted file mode 100644 index 9e70294d..00000000 --- a/impl/v1_19_R1/src/main/java/de/derfrzocker/feature/impl/v1_19_R1/feature/generator/OreFeatureGenerator.java +++ /dev/null @@ -1,115 +0,0 @@ -package de.derfrzocker.feature.impl.v1_19_R1.feature.generator; - -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import de.derfrzocker.feature.api.Registries; -import de.derfrzocker.feature.api.Setting; -import de.derfrzocker.feature.api.util.Parser; -import de.derfrzocker.feature.common.value.number.FloatType; -import de.derfrzocker.feature.common.value.number.FloatValue; -import de.derfrzocker.feature.common.value.number.IntegerType; -import de.derfrzocker.feature.common.value.number.IntegerValue; -import de.derfrzocker.feature.impl.v1_19_R1.feature.generator.configuration.OreFeatureConfiguration; -import de.derfrzocker.feature.impl.v1_19_R1.value.target.TargetValue; -import java.util.ArrayList; -import java.util.List; -import java.util.Random; -import java.util.Set; -import net.minecraft.world.level.levelgen.feature.OreFeature; -import net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -public class OreFeatureGenerator extends MinecraftFeatureGenerator { - - public OreFeatureGenerator(Registries registries) { - super(registries, OreFeature.ORE, "ore"); - } - - @Override - public Parser createParser(Registries registries) { - return new Parser<>() { - @Override - public JsonElement toJson(OreFeatureConfiguration value) { - JsonObject jsonObject = new JsonObject(); - - if (value.getSize() != null) { - JsonObject size = value.getSize().getValueType().getParser().toJson(value.getSize()).getAsJsonObject(); - size.addProperty("size_type", value.getSize().getValueType().getKey().toString()); - jsonObject.add("size", size); - } - - if (value.getDiscardChanceOnAirExposure() != null) { - JsonObject discardChanceOnAirExposure = value.getDiscardChanceOnAirExposure().getValueType().getParser().toJson(value.getDiscardChanceOnAirExposure()).getAsJsonObject(); - discardChanceOnAirExposure.addProperty("discard_chance_on_air_exposure_type", value.getDiscardChanceOnAirExposure().getValueType().getKey().toString()); - } - - return jsonObject; - } - - @Override - public OreFeatureConfiguration fromJson(JsonElement jsonElement) { - JsonObject jsonObject = jsonElement.getAsJsonObject(); - - IntegerValue size = null; - if (jsonObject.has("size")) { - JsonObject sizes = jsonObject.getAsJsonObject("size"); - size = registries.getValueTypeRegistry(IntegerType.class).get(NamespacedKey.fromString(sizes.getAsJsonPrimitive("size_type").getAsString())).get().getParser().fromJson(sizes); - } - - FloatValue discardChanceOnAirExposure = null; - if (jsonObject.has("discard_chance_on_air_exposure")) { - JsonObject chance = jsonObject.getAsJsonObject("discard_chance_on_air_exposure"); - discardChanceOnAirExposure = registries.getValueTypeRegistry(FloatType.class).get(NamespacedKey.fromString(chance.getAsJsonPrimitive("discard_chance_on_air_exposure_type").getAsString())).get().getParser().fromJson(chance); - } - - return new OreFeatureConfiguration(OreFeatureGenerator.this, null, size, discardChanceOnAirExposure); - } - }; - } - - @Override - public OreFeatureConfiguration mergeConfig(OreFeatureConfiguration first, OreFeatureConfiguration second) { - return new OreFeatureConfiguration(this, - first.getTargets() != null ? first.getTargets() : second.getTargets(), - first.getSize() != null ? first.getSize() : second.getSize(), - first.getDiscardChanceOnAirExposure() != null ? first.getDiscardChanceOnAirExposure() : second.getDiscardChanceOnAirExposure()); - } - - @Override - public OreConfiguration createConfiguration(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull OreFeatureConfiguration configuration) { - List blockStates = new ArrayList<>(); - if (configuration.getTargets() != null) { - for (TargetValue targetValue : configuration.getTargets()) { - blockStates.add(targetValue.getValue(worldInfo, random, position, limitedRegion)); - } - } - - int size = 0; - if (configuration.getSize() != null) { - size = configuration.getSize().getValue(worldInfo, random, position, limitedRegion); - } - - float discardChanceOnAirExposure = 0f; - if (configuration.getDiscardChanceOnAirExposure() != null) { - discardChanceOnAirExposure = configuration.getDiscardChanceOnAirExposure().getValue(worldInfo, random, position, limitedRegion); - } - - return new OreConfiguration(blockStates, size, discardChanceOnAirExposure); - } - - @NotNull - @Override - public Set getSettings() { - return OreFeatureConfiguration.SETTINGS; - } - - @NotNull - @Override - public OreFeatureConfiguration createEmptyConfiguration() { - return new OreFeatureConfiguration(this, null, null, null); - } -} diff --git a/impl/v1_19_R1/src/main/java/de/derfrzocker/feature/impl/v1_19_R1/feature/generator/ScatteredOreGenerator.java b/impl/v1_19_R1/src/main/java/de/derfrzocker/feature/impl/v1_19_R1/feature/generator/ScatteredOreGenerator.java deleted file mode 100644 index 22cd107e..00000000 --- a/impl/v1_19_R1/src/main/java/de/derfrzocker/feature/impl/v1_19_R1/feature/generator/ScatteredOreGenerator.java +++ /dev/null @@ -1,116 +0,0 @@ -package de.derfrzocker.feature.impl.v1_19_R1.feature.generator; - -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import de.derfrzocker.feature.api.Registries; -import de.derfrzocker.feature.api.Setting; -import de.derfrzocker.feature.api.util.Parser; -import de.derfrzocker.feature.common.value.number.FloatType; -import de.derfrzocker.feature.common.value.number.FloatValue; -import de.derfrzocker.feature.common.value.number.IntegerType; -import de.derfrzocker.feature.common.value.number.IntegerValue; -import de.derfrzocker.feature.impl.v1_19_R1.feature.generator.configuration.OreFeatureConfiguration; -import de.derfrzocker.feature.impl.v1_19_R1.value.target.TargetValue; -import net.minecraft.world.level.levelgen.feature.OreFeature; -import net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.ArrayList; -import java.util.List; -import java.util.Random; -import java.util.Set; - -public class ScatteredOreGenerator extends MinecraftFeatureGenerator { - - public ScatteredOreGenerator(Registries registries) { - super(registries, OreFeature.SCATTERED_ORE, "scattered_ore"); - } - - @Override - public Parser createParser(Registries registries) { - return new Parser<>() { - @Override - public JsonElement toJson(OreFeatureConfiguration value) { - JsonObject jsonObject = new JsonObject(); - - if (value.getSize() != null) { - JsonObject size = value.getSize().getValueType().getParser().toJson(value.getSize()).getAsJsonObject(); - size.addProperty("size_type", value.getSize().getValueType().getKey().toString()); - jsonObject.add("size", size); - } - - if (value.getDiscardChanceOnAirExposure() != null) { - JsonObject discardChanceOnAirExposure = value.getDiscardChanceOnAirExposure().getValueType().getParser().toJson(value.getDiscardChanceOnAirExposure()).getAsJsonObject(); - discardChanceOnAirExposure.addProperty("discard_chance_on_air_exposure_type", value.getDiscardChanceOnAirExposure().getValueType().getKey().toString()); - } - - return jsonObject; - } - - @Override - public OreFeatureConfiguration fromJson(JsonElement jsonElement) { - JsonObject jsonObject = jsonElement.getAsJsonObject(); - - IntegerValue size = null; - if (jsonObject.has("size")) { - JsonObject sizes = jsonObject.getAsJsonObject("size"); - size = registries.getValueTypeRegistry(IntegerType.class).get(NamespacedKey.fromString(sizes.getAsJsonPrimitive("size_type").getAsString())).get().getParser().fromJson(sizes); - } - - FloatValue discardChanceOnAirExposure = null; - if (jsonObject.has("discard_chance_on_air_exposure")) { - JsonObject chance = jsonObject.getAsJsonObject("discard_chance_on_air_exposure"); - discardChanceOnAirExposure = registries.getValueTypeRegistry(FloatType.class).get(NamespacedKey.fromString(chance.getAsJsonPrimitive("discard_chance_on_air_exposure_type").getAsString())).get().getParser().fromJson(chance); - } - - return new OreFeatureConfiguration(ScatteredOreGenerator.this, null, size, discardChanceOnAirExposure); - } - }; - } - - @Override - public OreFeatureConfiguration mergeConfig(OreFeatureConfiguration first, OreFeatureConfiguration second) { - return new OreFeatureConfiguration(this, - first.getTargets() != null ? first.getTargets() : second.getTargets(), - first.getSize() != null ? first.getSize() : second.getSize(), - first.getDiscardChanceOnAirExposure() != null ? first.getDiscardChanceOnAirExposure() : second.getDiscardChanceOnAirExposure()); - } - - @Override - public OreConfiguration createConfiguration(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull OreFeatureConfiguration configuration) { - List blockStates = new ArrayList<>(); - if (configuration.getTargets() != null) { - for (TargetValue targetValue : configuration.getTargets()) { - blockStates.add(targetValue.getValue(worldInfo, random, position, limitedRegion)); - } - } - - int size = 0; - if (configuration.getSize() != null) { - size = configuration.getSize().getValue(worldInfo, random, position, limitedRegion); - } - - float discardChanceOnAirExposure = 0f; - if (configuration.getDiscardChanceOnAirExposure() != null) { - discardChanceOnAirExposure = configuration.getDiscardChanceOnAirExposure().getValue(worldInfo, random, position, limitedRegion); - } - - return new OreConfiguration(blockStates, size, discardChanceOnAirExposure); - } - - @NotNull - @Override - public Set getSettings() { - return OreFeatureConfiguration.SETTINGS; - } - - @NotNull - @Override - public OreFeatureConfiguration createEmptyConfiguration() { - return new OreFeatureConfiguration(this, null, null, null); - } -} diff --git a/impl/v1_19_R1/src/main/java/de/derfrzocker/feature/impl/v1_19_R1/feature/generator/configuration/OreFeatureConfiguration.java b/impl/v1_19_R1/src/main/java/de/derfrzocker/feature/impl/v1_19_R1/feature/generator/configuration/OreFeatureConfiguration.java deleted file mode 100644 index 6d7aac43..00000000 --- a/impl/v1_19_R1/src/main/java/de/derfrzocker/feature/impl/v1_19_R1/feature/generator/configuration/OreFeatureConfiguration.java +++ /dev/null @@ -1,124 +0,0 @@ -package de.derfrzocker.feature.impl.v1_19_R1.feature.generator.configuration; - -import de.derfrzocker.feature.api.FeatureGenerator; -import de.derfrzocker.feature.api.FeatureGeneratorConfiguration; -import de.derfrzocker.feature.api.Setting; -import de.derfrzocker.feature.api.Value; -import de.derfrzocker.feature.common.value.number.FloatType; -import de.derfrzocker.feature.common.value.number.FloatValue; -import de.derfrzocker.feature.common.value.number.IntegerType; -import de.derfrzocker.feature.common.value.number.IntegerValue; -import de.derfrzocker.feature.impl.v1_19_R1.value.target.TargetValue; -import org.jetbrains.annotations.NotNull; - -import java.util.Collections; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; - -public class OreFeatureConfiguration implements FeatureGeneratorConfiguration { - - public final static Set SETTINGS; - private final static Setting SIZE = new Setting("size", IntegerType.class); - private final static Setting DISCARD_CHANCE_ON_AIR_EXPOSURE = new Setting("discard-chance-on-air-exposure", FloatType.class); - - static { - Set settings = new LinkedHashSet<>(); - settings.add(SIZE); - settings.add(DISCARD_CHANCE_ON_AIR_EXPOSURE); - SETTINGS = Collections.unmodifiableSet(settings); - } - - private final FeatureGenerator featureGenerator; - private final List targets; - private IntegerValue size; - private FloatValue discardChanceOnAirExposure; - private boolean dirty = false; - - public OreFeatureConfiguration(FeatureGenerator featureGenerator, List targets, IntegerValue size, FloatValue discardChanceOnAirExposure) { - this.featureGenerator = featureGenerator; - this.targets = targets; - this.size = size; - this.discardChanceOnAirExposure = discardChanceOnAirExposure; - } - - public List getTargets() { - return targets; - } - - public IntegerValue getSize() { - return size; - } - - public FloatValue getDiscardChanceOnAirExposure() { - return discardChanceOnAirExposure; - } - - @NotNull - @Override - public FeatureGenerator getOwner() { - return featureGenerator; - } - - @NotNull - @Override - public Set getSettings() { - return SETTINGS; - } - - @Override - public Value getValue(@NotNull Setting setting) { - if (setting == SIZE) { - return getSize(); - } - - if (setting == DISCARD_CHANCE_ON_AIR_EXPOSURE) { - return getDiscardChanceOnAirExposure(); - } - - throw new IllegalArgumentException(String.format("Setting '%s' is not in the configuration '%s'", setting, "OreFeatureConfiguration")); - } - - @Override - public void setValue(@NotNull Setting setting, Value value) { - if (setting == SIZE) { - size = (IntegerValue) value; - dirty = true; - return; - } - - if (setting == DISCARD_CHANCE_ON_AIR_EXPOSURE) { - discardChanceOnAirExposure = (FloatValue) value; - dirty = true; - return; - } - - throw new IllegalArgumentException(String.format("Setting '%s' is not in the configuration '%s'", setting, "OreFeatureConfiguration")); - } - - @Override - public boolean isDirty() { - if (dirty) { - return true; - } - - if (size != null && size.isDirty()) { - return true; - } - - return discardChanceOnAirExposure != null && discardChanceOnAirExposure.isDirty(); - } - - @Override - public void saved() { - dirty = false; - - if (size != null) { - size.saved(); - } - - if (discardChanceOnAirExposure != null) { - discardChanceOnAirExposure.saved(); - } - } -} diff --git a/impl/v1_19_R1/src/main/java/de/derfrzocker/feature/impl/v1_19_R1/placement/CountModifier.java b/impl/v1_19_R1/src/main/java/de/derfrzocker/feature/impl/v1_19_R1/placement/CountModifier.java deleted file mode 100644 index e72b7ab2..00000000 --- a/impl/v1_19_R1/src/main/java/de/derfrzocker/feature/impl/v1_19_R1/placement/CountModifier.java +++ /dev/null @@ -1,85 +0,0 @@ -package de.derfrzocker.feature.impl.v1_19_R1.placement; - -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import de.derfrzocker.feature.api.Registries; -import de.derfrzocker.feature.api.Setting; -import de.derfrzocker.feature.api.util.Parser; -import de.derfrzocker.feature.common.feature.placement.configuration.CountModifierConfiguration; -import de.derfrzocker.feature.common.value.number.IntegerType; -import de.derfrzocker.feature.common.value.number.IntegerValue; -import net.minecraft.world.level.levelgen.placement.CountPlacement; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Random; -import java.util.Set; - -public class CountModifier extends MinecraftPlacementModifier { - - public CountModifier(@NotNull Registries registries) { - super(registries, "count"); - } - - @Override - public CountModifierConfiguration mergeConfig(CountModifierConfiguration first, CountModifierConfiguration second) { - return new CountModifierConfiguration(this, - first.getCount() != null ? first.getCount() : second.getCount()); - } - - @Override - public Parser createParser(Registries registries) { - return new Parser<>() { - @Override - public JsonElement toJson(CountModifierConfiguration value) { - JsonObject jsonObject = new JsonObject(); - if (value.getCount() != null) { - JsonObject entry = value.getCount().getValueType().getParser().toJson(value.getCount()).getAsJsonObject(); - entry.addProperty("count_type", value.getCount().getValueType().getKey().toString()); - jsonObject.add("count", entry); - } - return jsonObject; - } - - @Override - public CountModifierConfiguration fromJson(JsonElement jsonElement) { - JsonObject jsonObject = jsonElement.getAsJsonObject(); - - IntegerValue count = null; - if (jsonObject.has("count")) { - JsonObject entry = jsonObject.getAsJsonObject("count"); - count = registries.getValueTypeRegistry(IntegerType.class).get(NamespacedKey.fromString(entry.getAsJsonPrimitive("count_type").getAsString())).get().getParser().fromJson(entry); - } - - return new CountModifierConfiguration(CountModifier.this, count); - } - }; - } - - @Override - public CountPlacement createPlacementModifier(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull CountModifierConfiguration configuration) { - int count; - if (configuration.getCount() != null) { - count = configuration.getCount().getValue(worldInfo, random, position, limitedRegion); - } else { - count = 0; - } - - return CountPlacement.of(count); - } - - @NotNull - @Override - public Set getSettings() { - return CountModifierConfiguration.SETTINGS; - } - - @NotNull - @Override - public CountModifierConfiguration createEmptyConfiguration() { - return new CountModifierConfiguration(this, null); - } -} diff --git a/impl/v1_19_R1/src/main/java/de/derfrzocker/feature/impl/v1_19_R1/placement/HeightRangeModifier.java b/impl/v1_19_R1/src/main/java/de/derfrzocker/feature/impl/v1_19_R1/placement/HeightRangeModifier.java deleted file mode 100644 index 02d0e416..00000000 --- a/impl/v1_19_R1/src/main/java/de/derfrzocker/feature/impl/v1_19_R1/placement/HeightRangeModifier.java +++ /dev/null @@ -1,88 +0,0 @@ -package de.derfrzocker.feature.impl.v1_19_R1.placement; - -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import de.derfrzocker.feature.api.Registries; -import de.derfrzocker.feature.api.Setting; -import de.derfrzocker.feature.api.util.Parser; -import de.derfrzocker.feature.common.feature.placement.configuration.HeightRangeModifierConfiguration; -import de.derfrzocker.feature.common.value.number.IntegerType; -import de.derfrzocker.feature.common.value.number.IntegerValue; -import net.minecraft.world.level.levelgen.VerticalAnchor; -import net.minecraft.world.level.levelgen.heightproviders.ConstantHeight; -import net.minecraft.world.level.levelgen.heightproviders.HeightProvider; -import net.minecraft.world.level.levelgen.placement.HeightRangePlacement; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Random; -import java.util.Set; - -public class HeightRangeModifier extends MinecraftPlacementModifier { - - public HeightRangeModifier(@NotNull Registries registries) { - super(registries, "height_range"); - } - - @Override - public HeightRangeModifierConfiguration mergeConfig(HeightRangeModifierConfiguration first, HeightRangeModifierConfiguration second) { - return new HeightRangeModifierConfiguration(this, - first.getHeight() != null ? first.getHeight() : second.getHeight()); - } - - @Override - public Parser createParser(Registries registries) { - return new Parser<>() { - @Override - public JsonElement toJson(HeightRangeModifierConfiguration value) { - JsonObject jsonObject = new JsonObject(); - if (value.getHeight() != null) { - JsonObject entry = value.getHeight().getValueType().getParser().toJson(value.getHeight()).getAsJsonObject(); - entry.addProperty("height_range_type", value.getHeight().getValueType().getKey().toString()); - jsonObject.add("height", entry); - } - return jsonObject; - } - - @Override - public HeightRangeModifierConfiguration fromJson(JsonElement jsonElement) { - JsonObject jsonObject = jsonElement.getAsJsonObject(); - - IntegerValue count = null; - if (jsonObject.has("height")) { - JsonObject entry = jsonObject.getAsJsonObject("height"); - count = registries.getValueTypeRegistry(IntegerType.class).get(NamespacedKey.fromString(entry.getAsJsonPrimitive("height_range_type").getAsString())).get().getParser().fromJson(entry); - } - - return new HeightRangeModifierConfiguration(HeightRangeModifier.this, count); - } - }; - } - - @Override - public HeightRangePlacement createPlacementModifier(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull HeightRangeModifierConfiguration configuration) { - HeightProvider height; - if (configuration.getHeight() != null) { - height = ConstantHeight.of(VerticalAnchor.absolute(configuration.getHeight().getValue(worldInfo, random, position, limitedRegion))); - } else { - height = ConstantHeight.of(VerticalAnchor.bottom()); - } - - return HeightRangePlacement.of(height); - } - - @NotNull - @Override - public Set getSettings() { - return HeightRangeModifierConfiguration.SETTINGS; - } - - @NotNull - @Override - public HeightRangeModifierConfiguration createEmptyConfiguration() { - return new HeightRangeModifierConfiguration(this, null); - } -} diff --git a/impl/v1_19_R1/src/main/java/de/derfrzocker/feature/impl/v1_19_R1/placement/MinecraftPlacementModifier.java b/impl/v1_19_R1/src/main/java/de/derfrzocker/feature/impl/v1_19_R1/placement/MinecraftPlacementModifier.java deleted file mode 100644 index 1f2f2802..00000000 --- a/impl/v1_19_R1/src/main/java/de/derfrzocker/feature/impl/v1_19_R1/placement/MinecraftPlacementModifier.java +++ /dev/null @@ -1,65 +0,0 @@ -package de.derfrzocker.feature.impl.v1_19_R1.placement; - -import de.derfrzocker.feature.api.FeaturePlacementModifier; -import de.derfrzocker.feature.api.PlacementModifierConfiguration; -import de.derfrzocker.feature.api.Registries; -import de.derfrzocker.feature.api.util.Parser; -import net.minecraft.core.BlockPos; -import net.minecraft.world.level.WorldGenLevel; -import net.minecraft.world.level.levelgen.placement.PlacementContext; -import net.minecraft.world.level.levelgen.placement.PlacementModifier; -import org.bukkit.NamespacedKey; -import org.bukkit.craftbukkit.v1_19_R1.generator.CraftLimitedRegion; -import org.bukkit.craftbukkit.v1_19_R1.util.RandomSourceWrapper; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Optional; -import java.util.Random; -import java.util.stream.Stream; - -public abstract class MinecraftPlacementModifier implements FeaturePlacementModifier { - - private final Parser parser; - private final NamespacedKey namespacedKey; - - public MinecraftPlacementModifier(@NotNull Registries registries, @NotNull String name) { - this.parser = (Parser) createParser(registries); - this.namespacedKey = NamespacedKey.minecraft(name); - } - - public abstract C mergeConfig(C first, C second); - - public abstract Parser createParser(Registries registries); - - public abstract M createPlacementModifier(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull C configuration); - - @NotNull - @Override - public C merge(@NotNull PlacementModifierConfiguration first, @NotNull PlacementModifierConfiguration second) { - return mergeConfig((C) first, (C) second); - } - - @NotNull - @Override - public Stream getPositions(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull C configuration) { - WorldGenLevel level = ((CraftLimitedRegion) limitedRegion).getHandle(); - M placementModifier = createPlacementModifier(worldInfo, random, position, limitedRegion, configuration); - return placementModifier.getPositions(new PlacementContext(level, level.getMinecraftWorld().getChunkSource().getGenerator(), Optional.empty()), new RandomSourceWrapper(random), new BlockPos(position.getBlockX(), position.getBlockY(), position.getBlockZ())). - map(pos -> new BlockVector(pos.getX(), pos.getY(), pos.getZ())); - } - - @NotNull - @Override - public Parser getParser() { - return parser; - } - - @NotNull - @Override - public NamespacedKey getKey() { - return namespacedKey; - } -} diff --git a/impl/v1_19_R1/src/main/java/de/derfrzocker/feature/impl/v1_19_R1/placement/RarityModifier.java b/impl/v1_19_R1/src/main/java/de/derfrzocker/feature/impl/v1_19_R1/placement/RarityModifier.java deleted file mode 100644 index 03a4e5ba..00000000 --- a/impl/v1_19_R1/src/main/java/de/derfrzocker/feature/impl/v1_19_R1/placement/RarityModifier.java +++ /dev/null @@ -1,86 +0,0 @@ -package de.derfrzocker.feature.impl.v1_19_R1.placement; - -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.mojang.serialization.Codec; -import com.mojang.serialization.codecs.RecordCodecBuilder; -import de.derfrzocker.feature.api.Registries; -import de.derfrzocker.feature.api.Setting; -import de.derfrzocker.feature.api.util.Parser; -import de.derfrzocker.feature.common.feature.placement.configuration.RarityModifierConfiguration; -import de.derfrzocker.feature.common.value.number.IntegerType; -import de.derfrzocker.feature.common.value.number.IntegerValue; -import net.minecraft.world.level.levelgen.placement.RarityFilter; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Optional; -import java.util.Random; -import java.util.Set; - -public class RarityModifier extends MinecraftPlacementModifier { - - public RarityModifier(@NotNull Registries registries) { - super(registries, "rarity_filter"); - } - - - @Override - public RarityModifierConfiguration mergeConfig(RarityModifierConfiguration first, RarityModifierConfiguration second) { - return new RarityModifierConfiguration(this, - first.getChance() != null ? first.getChance() : second.getChance()); - } - - @Override - public Parser createParser(Registries registries) { - return new Parser<>() { - @Override - public JsonElement toJson(RarityModifierConfiguration value) { - JsonObject jsonObject = new JsonObject(); - if (value.getChance() != null) { - JsonObject entry = value.getChance().getValueType().getParser().toJson(value.getChance()).getAsJsonObject(); - entry.addProperty("chance_type", value.getChance().getValueType().getKey().toString()); - jsonObject.add("chance", entry); - } - return jsonObject; - } - - @Override - public RarityModifierConfiguration fromJson(JsonElement jsonElement) { - JsonObject jsonObject = jsonElement.getAsJsonObject(); - - IntegerValue count = null; - if (jsonObject.has("chance")) { - JsonObject entry = jsonObject.getAsJsonObject("chance"); - count = registries.getValueTypeRegistry(IntegerType.class).get(NamespacedKey.fromString(entry.getAsJsonPrimitive("chance_type").getAsString())).get().getParser().fromJson(entry); - } - - return new RarityModifierConfiguration(RarityModifier.this, count); - } - }; - } - - @Override - public RarityFilter createPlacementModifier(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull RarityModifierConfiguration configuration) { - int chance = 0; - if (configuration.getChance() != null) { - chance = configuration.getChance().getValue(worldInfo, random, position, limitedRegion); - } - return RarityFilter.onAverageOnceEvery(chance); - } - - @NotNull - @Override - public Set getSettings() { - return RarityModifierConfiguration.SETTINGS; - } - - @NotNull - @Override - public RarityModifierConfiguration createEmptyConfiguration() { - return new RarityModifierConfiguration(this, null); - } -} diff --git a/impl/v1_19_R1/src/main/java/de/derfrzocker/feature/impl/v1_19_R1/placement/SurfaceRelativeThresholdModifier.java b/impl/v1_19_R1/src/main/java/de/derfrzocker/feature/impl/v1_19_R1/placement/SurfaceRelativeThresholdModifier.java deleted file mode 100644 index 3436db57..00000000 --- a/impl/v1_19_R1/src/main/java/de/derfrzocker/feature/impl/v1_19_R1/placement/SurfaceRelativeThresholdModifier.java +++ /dev/null @@ -1,107 +0,0 @@ -package de.derfrzocker.feature.impl.v1_19_R1.placement; - -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import de.derfrzocker.feature.api.Registries; -import de.derfrzocker.feature.api.Setting; -import de.derfrzocker.feature.api.util.Parser; -import de.derfrzocker.feature.common.value.number.IntegerType; -import de.derfrzocker.feature.common.value.number.IntegerValue; -import de.derfrzocker.feature.impl.v1_19_R1.placement.configuration.SurfaceRelativeThresholdModifierConfiguration; -import net.minecraft.world.level.levelgen.Heightmap; -import net.minecraft.world.level.levelgen.placement.SurfaceRelativeThresholdFilter; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Random; -import java.util.Set; - -public class SurfaceRelativeThresholdModifier extends MinecraftPlacementModifier { - public SurfaceRelativeThresholdModifier(@NotNull Registries registries) { - super(registries, "surface_relative_threshold_filter"); - } - - @Override - public SurfaceRelativeThresholdModifierConfiguration mergeConfig(SurfaceRelativeThresholdModifierConfiguration first, SurfaceRelativeThresholdModifierConfiguration second) { - return new SurfaceRelativeThresholdModifierConfiguration(this, - first.getHeightmap() != null ? first.getHeightmap() : second.getHeightmap(), - first.getMinInclusive() != null ? first.getMinInclusive() : second.getMinInclusive(), - first.getMaxInclusive() != null ? first.getMaxInclusive() : second.getMaxInclusive()); - } - - @Override - public Parser createParser(Registries registries) { - return new Parser<>() { - @Override - public JsonElement toJson(SurfaceRelativeThresholdModifierConfiguration value) { - JsonObject jsonObject = new JsonObject(); - if (value.getMinInclusive() != null) { - JsonObject entry = value.getMinInclusive().getValueType().getParser().toJson(value.getMinInclusive()).getAsJsonObject(); - entry.addProperty("min_inclusive_type", value.getMinInclusive().getValueType().getKey().toString()); - jsonObject.add("min_inclusive", entry); - } - - if (value.getMaxInclusive() != null) { - JsonObject entry = value.getMaxInclusive().getValueType().getParser().toJson(value.getMaxInclusive()).getAsJsonObject(); - entry.addProperty("max_inclusive_type", value.getMaxInclusive().getValueType().getKey().toString()); - jsonObject.add("max_inclusive", entry); - } - - return jsonObject; - } - - @Override - public SurfaceRelativeThresholdModifierConfiguration fromJson(JsonElement jsonElement) { - JsonObject jsonObject = jsonElement.getAsJsonObject(); - - IntegerValue minInclusive = null; - if (jsonObject.has("min_inclusive")) { - JsonObject entry = jsonObject.getAsJsonObject("min_inclusive"); - minInclusive = registries.getValueTypeRegistry(IntegerType.class).get(NamespacedKey.fromString(entry.getAsJsonPrimitive("min_inclusive_type").getAsString())).get().getParser().fromJson(entry); - } - - IntegerValue maxInclusive = null; - if (jsonObject.has("max_inclusive")) { - JsonObject entry = jsonObject.getAsJsonObject("max_inclusive"); - maxInclusive = registries.getValueTypeRegistry(IntegerType.class).get(NamespacedKey.fromString(entry.getAsJsonPrimitive("max_inclusive_type").getAsString())).get().getParser().fromJson(entry); - } - - return new SurfaceRelativeThresholdModifierConfiguration(SurfaceRelativeThresholdModifier.this, null, minInclusive, maxInclusive); - } - }; - } - - @Override - public SurfaceRelativeThresholdFilter createPlacementModifier(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull SurfaceRelativeThresholdModifierConfiguration configuration) { - Heightmap.Types heightmap = Heightmap.Types.MOTION_BLOCKING; - if (configuration.getHeightmap() != null) { - heightmap = configuration.getHeightmap().getValue(worldInfo, random, position, limitedRegion); - } - - int minInclusive = 0; - if (configuration.getMinInclusive() != null) { - minInclusive = configuration.getMinInclusive().getValue(worldInfo, random, position, limitedRegion); - } - - int maxInclusive = 0; - if (configuration.getMaxInclusive() != null) { - maxInclusive = configuration.getMaxInclusive().getValue(worldInfo, random, position, limitedRegion); - } - return SurfaceRelativeThresholdFilter.of(heightmap, minInclusive, maxInclusive); - } - - @NotNull - @Override - public Set getSettings() { - return SurfaceRelativeThresholdModifierConfiguration.SETTINGS; - } - - @NotNull - @Override - public SurfaceRelativeThresholdModifierConfiguration createEmptyConfiguration() { - return new SurfaceRelativeThresholdModifierConfiguration(this, null, null, null); - } -} diff --git a/impl/v1_19_R1/src/main/java/de/derfrzocker/feature/impl/v1_19_R1/placement/SurfaceWaterDepthModifier.java b/impl/v1_19_R1/src/main/java/de/derfrzocker/feature/impl/v1_19_R1/placement/SurfaceWaterDepthModifier.java deleted file mode 100644 index aa51dfd3..00000000 --- a/impl/v1_19_R1/src/main/java/de/derfrzocker/feature/impl/v1_19_R1/placement/SurfaceWaterDepthModifier.java +++ /dev/null @@ -1,82 +0,0 @@ -package de.derfrzocker.feature.impl.v1_19_R1.placement; - -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import de.derfrzocker.feature.api.Registries; -import de.derfrzocker.feature.api.Setting; -import de.derfrzocker.feature.api.util.Parser; -import de.derfrzocker.feature.common.feature.placement.configuration.SurfaceWaterDepthModifierConfiguration; -import de.derfrzocker.feature.common.value.number.IntegerType; -import de.derfrzocker.feature.common.value.number.IntegerValue; -import net.minecraft.world.level.levelgen.placement.SurfaceWaterDepthFilter; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Random; -import java.util.Set; - -public class SurfaceWaterDepthModifier extends MinecraftPlacementModifier { - - public SurfaceWaterDepthModifier(@NotNull Registries registries) { - super(registries, "surface_water_depth_filter"); - } - - @Override - public SurfaceWaterDepthModifierConfiguration mergeConfig(SurfaceWaterDepthModifierConfiguration first, SurfaceWaterDepthModifierConfiguration second) { - return new SurfaceWaterDepthModifierConfiguration(this, - first.getMaxWaterDepth() != null ? first.getMaxWaterDepth() : second.getMaxWaterDepth()); - } - - @Override - public Parser createParser(Registries registries) { - return new Parser<>() { - @Override - public JsonElement toJson(SurfaceWaterDepthModifierConfiguration value) { - JsonObject jsonObject = new JsonObject(); - if (value.getMaxWaterDepth() != null) { - JsonObject entry = value.getMaxWaterDepth().getValueType().getParser().toJson(value.getMaxWaterDepth()).getAsJsonObject(); - entry.addProperty("max_water_depth_type", value.getMaxWaterDepth().getValueType().getKey().toString()); - jsonObject.add("max_water_depth", entry); - } - return jsonObject; - } - - @Override - public SurfaceWaterDepthModifierConfiguration fromJson(JsonElement jsonElement) { - JsonObject jsonObject = jsonElement.getAsJsonObject(); - - IntegerValue count = null; - if (jsonObject.has("max_water_depth")) { - JsonObject entry = jsonObject.getAsJsonObject("max_water_depth"); - count = registries.getValueTypeRegistry(IntegerType.class).get(NamespacedKey.fromString(entry.getAsJsonPrimitive("max_water_depth_type").getAsString())).get().getParser().fromJson(entry); - } - - return new SurfaceWaterDepthModifierConfiguration(SurfaceWaterDepthModifier.this, count); - } - }; - } - - @Override - public SurfaceWaterDepthFilter createPlacementModifier(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull SurfaceWaterDepthModifierConfiguration configuration) { - int maxWaterDepth = 0; - if (configuration.getMaxWaterDepth() != null) { - maxWaterDepth = configuration.getMaxWaterDepth().getValue(worldInfo, random, position, limitedRegion); - } - return SurfaceWaterDepthFilter.forMaxDepth(maxWaterDepth); - } - - @NotNull - @Override - public Set getSettings() { - return SurfaceWaterDepthModifierConfiguration.SETTINGS; - } - - @NotNull - @Override - public SurfaceWaterDepthModifierConfiguration createEmptyConfiguration() { - return new SurfaceWaterDepthModifierConfiguration(this, null); - } -} \ No newline at end of file diff --git a/impl/v1_19_R1/src/main/java/de/derfrzocker/feature/impl/v1_19_R1/placement/configuration/SurfaceRelativeThresholdModifierConfiguration.java b/impl/v1_19_R1/src/main/java/de/derfrzocker/feature/impl/v1_19_R1/placement/configuration/SurfaceRelativeThresholdModifierConfiguration.java deleted file mode 100644 index cbc2bbc2..00000000 --- a/impl/v1_19_R1/src/main/java/de/derfrzocker/feature/impl/v1_19_R1/placement/configuration/SurfaceRelativeThresholdModifierConfiguration.java +++ /dev/null @@ -1,121 +0,0 @@ -package de.derfrzocker.feature.impl.v1_19_R1.placement.configuration; - -import de.derfrzocker.feature.api.FeaturePlacementModifier; -import de.derfrzocker.feature.api.PlacementModifierConfiguration; -import de.derfrzocker.feature.api.Setting; -import de.derfrzocker.feature.api.Value; -import de.derfrzocker.feature.common.value.number.IntegerType; -import de.derfrzocker.feature.common.value.number.IntegerValue; -import de.derfrzocker.feature.impl.v1_19_R1.value.heightmap.HeightmapValue; -import org.jetbrains.annotations.NotNull; - -import java.util.Collections; -import java.util.LinkedHashSet; -import java.util.Set; - -public class SurfaceRelativeThresholdModifierConfiguration implements PlacementModifierConfiguration { - - public final static Set SETTINGS; - private final static Setting MIN_INCLUSIVE = new Setting("min-inclusive", IntegerType.class); - private final static Setting MAX_INCLUSIVE = new Setting("max-inclusive", IntegerType.class); - - static { - Set settings = new LinkedHashSet<>(); - settings.add(MIN_INCLUSIVE); - settings.add(MAX_INCLUSIVE); - SETTINGS = Collections.unmodifiableSet(settings); - } - - private final FeaturePlacementModifier placementModifier; - private final HeightmapValue heightmap; - private IntegerValue minInclusive; - private IntegerValue maxInclusive; - private boolean dirty = false; - - public SurfaceRelativeThresholdModifierConfiguration(FeaturePlacementModifier placementModifier, HeightmapValue heightmap, IntegerValue minInclusive, IntegerValue maxInclusive) { - this.placementModifier = placementModifier; - this.heightmap = heightmap; - this.minInclusive = minInclusive; - this.maxInclusive = maxInclusive; - } - - @NotNull - @Override - public FeaturePlacementModifier getOwner() { - return placementModifier; - } - - public HeightmapValue getHeightmap() { - return heightmap; - } - - public IntegerValue getMinInclusive() { - return minInclusive; - } - - public IntegerValue getMaxInclusive() { - return maxInclusive; - } - - @NotNull - @Override - public Set getSettings() { - return SETTINGS; - } - - @Override - public Value getValue(@NotNull Setting setting) { - if (setting == MIN_INCLUSIVE) { - return getMinInclusive(); - } - - if (setting == MAX_INCLUSIVE) { - return getMaxInclusive(); - } - - throw new IllegalArgumentException(String.format("Setting '%s' is not in the configuration '%s'", setting, "SurfaceRelativeThresholdModifierConfiguration")); - } - - @Override - public void setValue(@NotNull Setting setting, Value value) { - if (setting == MIN_INCLUSIVE) { - minInclusive = (IntegerValue) value; - dirty = true; - return; - } - - if (setting == MAX_INCLUSIVE) { - maxInclusive = (IntegerValue) value; - dirty = true; - return; - } - - throw new IllegalArgumentException(String.format("Setting '%s' is not in the configuration '%s'", setting, "SurfaceRelativeThresholdModifierConfiguration")); - } - - @Override - public boolean isDirty() { - if (dirty) { - return true; - } - - if (minInclusive != null && minInclusive.isDirty()) { - return true; - } - - return maxInclusive != null && maxInclusive.isDirty(); - } - - @Override - public void saved() { - dirty = false; - - if (minInclusive != null) { - minInclusive.saved(); - } - - if (maxInclusive != null) { - maxInclusive.saved(); - } - } -} diff --git a/impl/v1_19_R1/src/main/java/de/derfrzocker/feature/impl/v1_19_R1/value/heightmap/HeightmapType.java b/impl/v1_19_R1/src/main/java/de/derfrzocker/feature/impl/v1_19_R1/value/heightmap/HeightmapType.java deleted file mode 100644 index fba43965..00000000 --- a/impl/v1_19_R1/src/main/java/de/derfrzocker/feature/impl/v1_19_R1/value/heightmap/HeightmapType.java +++ /dev/null @@ -1,7 +0,0 @@ -package de.derfrzocker.feature.impl.v1_19_R1.value.heightmap; - -import de.derfrzocker.feature.api.ValueType; -import net.minecraft.world.level.levelgen.Heightmap; - -public abstract class HeightmapType implements ValueType { -} diff --git a/impl/v1_19_R1/src/main/java/de/derfrzocker/feature/impl/v1_19_R1/value/heightmap/HeightmapValue.java b/impl/v1_19_R1/src/main/java/de/derfrzocker/feature/impl/v1_19_R1/value/heightmap/HeightmapValue.java deleted file mode 100644 index f04287bd..00000000 --- a/impl/v1_19_R1/src/main/java/de/derfrzocker/feature/impl/v1_19_R1/value/heightmap/HeightmapValue.java +++ /dev/null @@ -1,10 +0,0 @@ -package de.derfrzocker.feature.impl.v1_19_R1.value.heightmap; - -import de.derfrzocker.feature.common.AbstractValue; -import net.minecraft.world.level.levelgen.Heightmap; - -public abstract class HeightmapValue extends AbstractValue { - - @Override - public abstract HeightmapValue clone(); -} diff --git a/impl/v1_19_R1/src/main/java/de/derfrzocker/feature/impl/v1_19_R1/value/offset/NMSAboveBottomOffsetIntegerValue.java b/impl/v1_19_R1/src/main/java/de/derfrzocker/feature/impl/v1_19_R1/value/offset/NMSAboveBottomOffsetIntegerValue.java deleted file mode 100644 index bff2d5d7..00000000 --- a/impl/v1_19_R1/src/main/java/de/derfrzocker/feature/impl/v1_19_R1/value/offset/NMSAboveBottomOffsetIntegerValue.java +++ /dev/null @@ -1,33 +0,0 @@ -package de.derfrzocker.feature.impl.v1_19_R1.value.offset; - -import de.derfrzocker.feature.common.value.number.IntegerValue; -import de.derfrzocker.feature.common.value.offset.AboveBottomOffsetIntegerValue; -import net.minecraft.world.level.WorldGenLevel; -import org.bukkit.craftbukkit.v1_19_R1.generator.CraftLimitedRegion; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Random; - -public class NMSAboveBottomOffsetIntegerValue extends AboveBottomOffsetIntegerValue { - - public NMSAboveBottomOffsetIntegerValue(IntegerValue base) { - super(base); - } - - @Override - public Integer getValue(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion) { - int baseValue = getBase() == null ? 0 : getBase().getValue(worldInfo, random, position, limitedRegion); - - WorldGenLevel level = ((CraftLimitedRegion) limitedRegion).getHandle(); - - return Math.max(level.getMinBuildHeight(), level.getLevel().getChunkSource().chunkMap.generator.getMinY()) + baseValue; - } - - @Override - public AboveBottomOffsetIntegerValue clone() { - return new NMSAboveBottomOffsetIntegerValue(getBase() == null ? null : getBase().clone()); - } -} diff --git a/impl/v1_19_R1/src/main/java/de/derfrzocker/feature/impl/v1_19_R1/value/offset/NMSBelowTopOffsetIntegerValue.java b/impl/v1_19_R1/src/main/java/de/derfrzocker/feature/impl/v1_19_R1/value/offset/NMSBelowTopOffsetIntegerValue.java deleted file mode 100644 index 2422444d..00000000 --- a/impl/v1_19_R1/src/main/java/de/derfrzocker/feature/impl/v1_19_R1/value/offset/NMSBelowTopOffsetIntegerValue.java +++ /dev/null @@ -1,35 +0,0 @@ -package de.derfrzocker.feature.impl.v1_19_R1.value.offset; - -import de.derfrzocker.feature.common.value.number.IntegerValue; -import de.derfrzocker.feature.common.value.offset.BelowTopOffsetIntegerValue; -import net.minecraft.world.level.WorldGenLevel; -import net.minecraft.world.level.chunk.ChunkGenerator; -import org.bukkit.craftbukkit.v1_19_R1.generator.CraftLimitedRegion; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Random; - -public class NMSBelowTopOffsetIntegerValue extends BelowTopOffsetIntegerValue { - - public NMSBelowTopOffsetIntegerValue(IntegerValue base) { - super(base); - } - - @Override - public Integer getValue(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion) { - int baseValue = getBase() == null ? 0 : getBase().getValue(worldInfo, random, position, limitedRegion); - - WorldGenLevel level = ((CraftLimitedRegion) limitedRegion).getHandle(); - ChunkGenerator chunkGenerator = level.getLevel().getChunkSource().chunkMap.generator; - - return Math.min(level.getHeight(), chunkGenerator.getGenDepth()) - 1 + Math.max(level.getMinBuildHeight(), chunkGenerator.getMinY()) - baseValue; - } - - @Override - public NMSBelowTopOffsetIntegerValue clone() { - return new NMSBelowTopOffsetIntegerValue(getBase() == null ? null : getBase().clone()); - } -} diff --git a/impl/v1_19_R1/src/main/java/de/derfrzocker/feature/impl/v1_19_R1/value/target/TargetType.java b/impl/v1_19_R1/src/main/java/de/derfrzocker/feature/impl/v1_19_R1/value/target/TargetType.java deleted file mode 100644 index efc54729..00000000 --- a/impl/v1_19_R1/src/main/java/de/derfrzocker/feature/impl/v1_19_R1/value/target/TargetType.java +++ /dev/null @@ -1,7 +0,0 @@ -package de.derfrzocker.feature.impl.v1_19_R1.value.target; - -import de.derfrzocker.feature.api.ValueType; -import net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration; - -public abstract class TargetType implements ValueType { -} diff --git a/impl/v1_19_R1/src/main/java/de/derfrzocker/feature/impl/v1_19_R1/value/target/TargetValue.java b/impl/v1_19_R1/src/main/java/de/derfrzocker/feature/impl/v1_19_R1/value/target/TargetValue.java deleted file mode 100644 index 0d079ed9..00000000 --- a/impl/v1_19_R1/src/main/java/de/derfrzocker/feature/impl/v1_19_R1/value/target/TargetValue.java +++ /dev/null @@ -1,10 +0,0 @@ -package de.derfrzocker.feature.impl.v1_19_R1.value.target; - -import de.derfrzocker.feature.common.AbstractValue; -import net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration; - -public abstract class TargetValue extends AbstractValue { - - @Override - public abstract TargetValue clone(); -} diff --git a/impl/v1_19_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R1/ConversionUtil.java b/impl/v1_19_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R1/ConversionUtil.java deleted file mode 100644 index 7cbfbb61..00000000 --- a/impl/v1_19_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R1/ConversionUtil.java +++ /dev/null @@ -1,77 +0,0 @@ -package de.derfrzocker.ore.control.impl.v1_19_R1; - -import de.derfrzocker.feature.common.value.number.FixedFloatValue; -import de.derfrzocker.feature.common.value.number.IntegerValue; -import de.derfrzocker.feature.common.value.number.integer.FixedDoubleToIntegerValue; -import de.derfrzocker.feature.common.value.number.integer.biased.BiasedToBottomIntegerValue; -import de.derfrzocker.feature.common.value.number.integer.clamped.ClampedIntegerValue; -import de.derfrzocker.feature.common.value.number.integer.clamped.ClampedNormalIntegerValue; -import de.derfrzocker.feature.common.value.number.integer.uniform.UniformIntegerValue; -import de.derfrzocker.feature.common.value.number.integer.weighted.WeightedListIntegerValue; -import net.minecraft.util.random.SimpleWeightedRandomList; -import net.minecraft.util.random.WeightedEntry; -import net.minecraft.util.valueproviders.ClampedInt; -import net.minecraft.util.valueproviders.ClampedNormalInt; -import net.minecraft.util.valueproviders.IntProvider; -import net.minecraft.util.valueproviders.IntProviderType; -import net.minecraft.util.valueproviders.WeightedListInt; - -import java.lang.reflect.Field; -import java.util.LinkedHashMap; -import java.util.Map; - -public final class ConversionUtil { - - private ConversionUtil() { - } - - public static IntegerValue convert(IntProvider intProvider) { - try { - if (intProvider.getType() == IntProviderType.CONSTANT) { - return new FixedDoubleToIntegerValue(intProvider.getMinValue()); - } else if (intProvider.getType() == IntProviderType.UNIFORM) { - return new UniformIntegerValue(new FixedDoubleToIntegerValue(intProvider.getMinValue()), new FixedDoubleToIntegerValue(intProvider.getMaxValue())); - } else if (intProvider.getType() == IntProviderType.BIASED_TO_BOTTOM) { - return new BiasedToBottomIntegerValue(new FixedDoubleToIntegerValue(intProvider.getMinValue()), new FixedDoubleToIntegerValue(intProvider.getMaxValue())); - } else if (intProvider.getType() == IntProviderType.CLAMPED) { - Field sourceField = ClampedInt.class.getDeclaredField(NMSReflectionNames.CLAMPED_INT_SOURCE); - Field minField = ClampedInt.class.getDeclaredField(NMSReflectionNames.CLAMPED_INT_MIN_INCLUSIVE); - Field maxField = ClampedInt.class.getDeclaredField(NMSReflectionNames.CLAMPED_INT_MAX_INCLUSIVE); - sourceField.setAccessible(true); - minField.setAccessible(true); - maxField.setAccessible(true); - - IntProvider source = (IntProvider) sourceField.get(intProvider); - int min = (int) minField.get(intProvider); - int max = (int) maxField.get(intProvider); - return new ClampedIntegerValue(convert(source), new FixedDoubleToIntegerValue(min), new FixedDoubleToIntegerValue(max)); - } else if (intProvider.getType() == IntProviderType.WEIGHTED_LIST) { - Field distributionField = WeightedListInt.class.getDeclaredField(NMSReflectionNames.WEIGHTED_LIST_INT_DISTRIBUTION); - distributionField.setAccessible(true); - SimpleWeightedRandomList distribution = (SimpleWeightedRandomList) distributionField.get(intProvider); - - Map values = new LinkedHashMap<>(); - for (WeightedEntry.Wrapper wrapper : distribution.unwrap()) { - values.put(convert(wrapper.getData()), new FixedDoubleToIntegerValue(wrapper.getWeight().asInt())); - } - - return new WeightedListIntegerValue(values); - } else if (intProvider.getType() == IntProviderType.CLAMPED_NORMAL) { - Field meanField = ClampedNormalInt.class.getDeclaredField(NMSReflectionNames.CLAMPED_NORMAL_INT_MEAN); - Field deviationField = ClampedNormalInt.class.getDeclaredField(NMSReflectionNames.CLAMPED_NORMAL_INT_DEVIATION); - meanField.setAccessible(true); - deviationField.setAccessible(true); - - float mean = (float) meanField.get(intProvider); - float deviation = (float) meanField.get(intProvider); - int min = intProvider.getMinValue(); - int max = intProvider.getMaxValue(); - return new ClampedNormalIntegerValue(new FixedFloatValue(mean), new FixedFloatValue(deviation), new FixedDoubleToIntegerValue(min), new FixedDoubleToIntegerValue(max)); - } else { - throw new UnsupportedOperationException(String.format("No integer value equivalent for IntProvider '%s'", intProvider)); - } - } catch (NoSuchFieldException | IllegalAccessException e) { - throw new RuntimeException(e); - } - } -} diff --git a/impl/v1_19_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R1/NMSReflectionNames.java b/impl/v1_19_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R1/NMSReflectionNames.java deleted file mode 100644 index 1a3748e6..00000000 --- a/impl/v1_19_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R1/NMSReflectionNames.java +++ /dev/null @@ -1,25 +0,0 @@ -package de.derfrzocker.ore.control.impl.v1_19_R1; - -public final class NMSReflectionNames { - - public final static String BIOME_GENERATION_SETTINGS_FEATURES = "e"; - public final static String BIOME_GENERATION_SETTINGS_FEATURE_SET = "g"; - public final static String WEIGHTED_LIST_INT_DISTRIBUTION = "b"; - public final static String COUNT_PLACEMENT_COUNT = "c"; - public final static String HEIGHT_RANGE_PLACEMENT_HEIGHT = "c"; - public final static String RARITY_FILTER_CHANCE = "c"; - public final static String SURFACE_RELATIVE_THRESHOLD_FILTER_HEIGHTMAP = "c"; - public final static String SURFACE_RELATIVE_THRESHOLD_FILTER_MIN_INCLUSIVE = "d"; - public final static String SURFACE_RELATIVE_THRESHOLD_FILTER_MAX_INCLUSIVE = "e"; - public final static String SURFACE_WATER_DEPTH_FILTER_MAX_WATER_DEPTH = "c"; - public static final String CLAMPED_INT_SOURCE = "b"; - public static final String CLAMPED_INT_MIN_INCLUSIVE = "f"; - public static final String CLAMPED_INT_MAX_INCLUSIVE = "g"; - public static final String CLAMPED_NORMAL_INT_MEAN = "b"; - public static final String CLAMPED_NORMAL_INT_DEVIATION = "f"; - public static final String CHUNK_MAP_GENERATOR = "u"; - public static final String NOISE_GENERATOR_SETTINGS = "g"; - - private NMSReflectionNames() { - } -} diff --git a/impl/v1_19_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R1/NMSReplacer_v1_19_R1.java b/impl/v1_19_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R1/NMSReplacer_v1_19_R1.java deleted file mode 100644 index 72d1439a..00000000 --- a/impl/v1_19_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R1/NMSReplacer_v1_19_R1.java +++ /dev/null @@ -1,516 +0,0 @@ -package de.derfrzocker.ore.control.impl.v1_19_R1; - -import com.google.common.base.Suppliers; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import com.google.gson.JsonElement; -import de.derfrzocker.feature.api.FeatureGenerator; -import de.derfrzocker.feature.api.FeatureGeneratorConfiguration; -import de.derfrzocker.feature.api.FeaturePlacementModifier; -import de.derfrzocker.feature.api.PlacementModifierConfiguration; -import de.derfrzocker.feature.api.ValueLocation; -import de.derfrzocker.feature.api.util.Parser; -import de.derfrzocker.feature.common.feature.generator.configuration.EmptyFeatureConfiguration; -import de.derfrzocker.feature.common.feature.placement.ActivationModifier; -import de.derfrzocker.feature.common.feature.placement.configuration.ActivationConfiguration; -import de.derfrzocker.feature.common.util.ValueLocationUtil; -import de.derfrzocker.feature.common.value.bool.FixedBooleanValue; -import de.derfrzocker.feature.common.value.number.FixedFloatValue; -import de.derfrzocker.feature.common.value.number.IntegerType; -import de.derfrzocker.feature.common.value.number.integer.FixedDoubleToIntegerValue; -import de.derfrzocker.feature.common.value.offset.AboveBottomOffsetIntegerType; -import de.derfrzocker.feature.common.value.offset.BelowTopOffsetIntegerType; -import de.derfrzocker.feature.impl.v1_19_R1.extra.OreVeinHandler; -import de.derfrzocker.feature.impl.v1_19_R1.feature.generator.GlowstoneBlobFeatureGenerator; -import de.derfrzocker.feature.impl.v1_19_R1.feature.generator.OreFeatureGenerator; -import de.derfrzocker.feature.impl.v1_19_R1.feature.generator.ScatteredOreGenerator; -import de.derfrzocker.feature.impl.v1_19_R1.feature.generator.configuration.OreFeatureConfiguration; -import de.derfrzocker.feature.impl.v1_19_R1.placement.CountModifier; -import de.derfrzocker.feature.impl.v1_19_R1.placement.HeightRangeModifier; -import de.derfrzocker.feature.impl.v1_19_R1.placement.RarityModifier; -import de.derfrzocker.feature.impl.v1_19_R1.placement.SurfaceRelativeThresholdModifier; -import de.derfrzocker.feature.impl.v1_19_R1.placement.SurfaceWaterDepthModifier; -import de.derfrzocker.feature.impl.v1_19_R1.value.offset.NMSAboveBottomOffsetIntegerValue; -import de.derfrzocker.feature.impl.v1_19_R1.value.offset.NMSBelowTopOffsetIntegerValue; -import de.derfrzocker.ore.control.api.NMSReplacer; -import de.derfrzocker.ore.control.api.OreControlManager; -import de.derfrzocker.ore.control.api.OreControlRegistries; -import de.derfrzocker.ore.control.api.config.Config; -import de.derfrzocker.ore.control.api.config.ConfigManager; -import de.derfrzocker.ore.control.impl.v1_19_R1.feature.generator.GlowstoneBlobFeatureGeneratorHook; -import de.derfrzocker.ore.control.impl.v1_19_R1.feature.generator.OreFeatureGeneratorHook; -import de.derfrzocker.ore.control.impl.v1_19_R1.feature.generator.ScatteredOreFeatureGeneratorHook; -import de.derfrzocker.ore.control.impl.v1_19_R1.placement.ActivationModifierHook; -import de.derfrzocker.ore.control.impl.v1_19_R1.placement.CountModifierHook; -import de.derfrzocker.ore.control.impl.v1_19_R1.placement.HeightRangeModifierHook; -import de.derfrzocker.ore.control.impl.v1_19_R1.placement.RarityModifierHook; -import de.derfrzocker.ore.control.impl.v1_19_R1.placement.SurfaceRelativeThresholdModifierHook; -import de.derfrzocker.ore.control.impl.v1_19_R1.placement.SurfaceWaterDepthModifierHook; -import net.minecraft.core.Holder; -import net.minecraft.core.HolderSet; -import net.minecraft.core.Registry; -import net.minecraft.core.RegistryAccess; -import net.minecraft.data.BuiltinRegistries; -import net.minecraft.resources.ResourceKey; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.server.dedicated.DedicatedServer; -import net.minecraft.server.level.ServerLevel; -import net.minecraft.world.level.biome.Biome; -import net.minecraft.world.level.biome.BiomeGenerationSettings; -import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; -import net.minecraft.world.level.levelgen.feature.Feature; -import net.minecraft.world.level.levelgen.feature.GlowstoneFeature; -import net.minecraft.world.level.levelgen.feature.OreFeature; -import net.minecraft.world.level.levelgen.feature.ScatteredOreFeature; -import net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration; -import net.minecraft.world.level.levelgen.placement.CountPlacement; -import net.minecraft.world.level.levelgen.placement.HeightRangePlacement; -import net.minecraft.world.level.levelgen.placement.PlacedFeature; -import net.minecraft.world.level.levelgen.placement.PlacementModifier; -import net.minecraft.world.level.levelgen.placement.PlacementModifierType; -import net.minecraft.world.level.levelgen.placement.RarityFilter; -import net.minecraft.world.level.levelgen.placement.SurfaceRelativeThresholdFilter; -import net.minecraft.world.level.levelgen.placement.SurfaceWaterDepthFilter; -import org.bukkit.Bukkit; -import org.bukkit.NamespacedKey; -import org.bukkit.World; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.CraftWorld; -import org.bukkit.craftbukkit.v1_19_R1.util.CraftNamespacedKey; -import org.bukkit.plugin.Plugin; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import java.io.File; -import java.io.FileWriter; -import java.io.IOException; -import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.LinkedHashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Set; -import java.util.function.BiConsumer; -import java.util.function.Supplier; -import java.util.stream.Collectors; - -public class NMSReplacer_v1_19_R1 implements NMSReplacer { - - private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create(); - private final Plugin plugin; - private final Parser configParser; - private final OreControlManager oreControlManager; - @NotNull - private final OreControlRegistries registries; - private final ConfigManager configManager; - - public NMSReplacer_v1_19_R1(@NotNull Plugin plugin, @NotNull OreControlManager oreControlManager, Parser configParser) { - this.plugin = plugin; - this.oreControlManager = oreControlManager; - this.registries = oreControlManager.getRegistries(); - this.configManager = oreControlManager.getConfigManager(); - this.configParser = configParser; - } - - @Override - public void register() { - registerValueTypes(); - registerFeatureGenerators(); - registerPlacementModifier(); - registerFeatures(); - registerBiomes(); - registerExtraValues(); - } - - private void registerValueTypes() { - registries.getValueTypeRegistry(IntegerType.class).register(new AboveBottomOffsetIntegerType(registries, NMSAboveBottomOffsetIntegerValue::new)); - registries.getValueTypeRegistry(IntegerType.class).register(new BelowTopOffsetIntegerType(registries, NMSBelowTopOffsetIntegerValue::new)); - } - - private void registerFeatureGenerators() { - registries.getFeatureGeneratorRegistry().register(new OreFeatureGenerator(registries)); - registries.getFeatureGeneratorRegistry().register(new ScatteredOreGenerator(registries)); - registries.getFeatureGeneratorRegistry().register(new GlowstoneBlobFeatureGenerator(registries)); - } - - private void registerPlacementModifier() { - registries.getPlacementModifierRegistry().register(new RarityModifier(registries)); - registries.getPlacementModifierRegistry().register(new SurfaceRelativeThresholdModifier(registries)); - registries.getPlacementModifierRegistry().register(new SurfaceWaterDepthModifier(registries)); - registries.getPlacementModifierRegistry().register(new CountModifier(registries)); - registries.getPlacementModifierRegistry().register(new HeightRangeModifier(registries)); - } - - private void registerFeatures() { - Registry placedFeatureRegistry = getRegistry().registryOrThrow(Registry.PLACED_FEATURE_REGISTRY); - Registry> featureRegistry = getRegistry().registryOrThrow(Registry.FEATURE_REGISTRY); - Registry> placementModifierTypes = getRegistry().registryOrThrow(Registry.PLACEMENT_MODIFIER_REGISTRY); - - for (PlacedFeature placedFeature : placedFeatureRegistry) { - Feature feature = placedFeature.getFeatures().findFirst().get().feature(); - ResourceLocation resourceLocation = featureRegistry.getKey(feature); - Optional> featureGenerator = registries.getFeatureGeneratorRegistry().get(NamespacedKey.fromString(resourceLocation.toString())); - - if (featureGenerator.isEmpty()) { - continue; - } - - boolean hasCount = false; - List> modifiers = new LinkedList<>(); - for (PlacementModifier modifier : placedFeature.placement()) { - if (modifier.type() == PlacementModifierType.COUNT) { - hasCount = true; - } - ResourceLocation placementModifierType = placementModifierTypes.getKey(modifier.type()); - Optional> modifierOptional = registries.getPlacementModifierRegistry().get(NamespacedKey.fromString(placementModifierType.toString())); - modifierOptional.ifPresent(modifiers::add); - } - - if (!hasCount) { - Optional> modifierOptional = registries.getPlacementModifierRegistry().get(NamespacedKey.fromString("minecraft:count")); - modifierOptional.ifPresent(modifiers::add); - } - - // inject activation / deactivation logic - Optional> modifierOptional = registries.getPlacementModifierRegistry().get(ActivationModifier.KEY); - modifierOptional.ifPresent(modifiers::add); - - registries.getFeatureRegistry().register(new de.derfrzocker.feature.api.Feature(NamespacedKey.fromString(placedFeatureRegistry.getKey(placedFeature).toString()), featureGenerator.get(), modifiers)); - } - } - - private void registerBiomes() { - Registry placedFeatureRegistry = getRegistry().registryOrThrow(Registry.PLACED_FEATURE_REGISTRY); - forEachBiome((biome, resourceLocation) -> { - de.derfrzocker.ore.control.api.Biome bio = new de.derfrzocker.ore.control.api.Biome(CraftNamespacedKey.fromMinecraft(resourceLocation)); - - biome.getGenerationSettings().features().forEach(featureSet -> featureSet.forEach(holder -> { - PlacedFeature feature = holder.value(); - ResourceLocation featureKey = placedFeatureRegistry.getKey(feature); - - if (featureKey == null) { - // Skip if the feature is not registered, this can happen if another plugin adds a feature without registering it - return; - } - - registries.getFeatureRegistry().get(CraftNamespacedKey.fromMinecraft(featureKey)).ifPresent(value -> bio.getFeatures().add(value)); - })); - - registries.getBiomeRegistry().register(bio); - }); - } - - private void registerExtraValues() { - plugin.getServer().getPluginManager().registerEvents(new OreVeinHandler(oreControlManager), plugin); - } - - @Override - public void saveDefaultValues(File directory) { - File world = new File(directory, "world"); - File biomes = new File(directory, "biome"); - - saveWorldValues(world); - saveBiomeValues(biomes); - } - - @Override - public void hookIntoBiomes() { - forEachBiome((biome, resourceLocation) -> { - try { - hookIntoBiome(biome, resourceLocation); - } catch (final Exception e) { - throw new RuntimeException("Unexpected error while hooking in NMS for Biome: " + biome, e); - } - }); - } - - @Override - public Set getBiomes(World world) { - Set biomes = new LinkedHashSet<>(); - ServerLevel level = ((CraftWorld) world).getHandle(); - Registry registry = getRegistry().registryOrThrow(Registry.BIOME_REGISTRY); - - for (Holder biomeHolder : level.getChunkSource().chunkMap.generator.getBiomeSource().possibleBiomes()) { - Biome biome = biomeHolder.value(); - - ResourceLocation key = registry.getKey(biome); - - biomes.add(registries.getBiomeRegistry().get(CraftNamespacedKey.fromMinecraft(key)).get()); - } - - return biomes; - } - - private void saveWorldValues(File directory) { - Registry registry = getRegistry().registryOrThrow(Registry.PLACED_FEATURE_REGISTRY); - for (Map.Entry, PlacedFeature> entry : registry.entrySet()) { - ResourceLocation key = entry.getKey().location(); - File file = new File(directory, key.getNamespace() + "/" + key.getPath() + ".json"); - try { - saveFeature(file, null, CraftNamespacedKey.fromMinecraft(key), entry.getValue()); - } catch (Exception e) { - throw new RuntimeException(String.format("Error while saving feature '%s'", key), e); - } - } - } - - private void saveBiomeValues(File directory) { - forEachBiome((biome, biomeKey) -> { - File biomeFile = new File(directory, biomeKey.getNamespace() + "/" + biomeKey.getPath()); - List> decorations = biome.getGenerationSettings().features(); - for (HolderSet list : decorations) { - for (Holder featureSupplier : list) { - PlacedFeature feature = featureSupplier.value(); - Registry registry = getRegistry().registryOrThrow(Registry.PLACED_FEATURE_REGISTRY); - ResourceLocation featureKey = registry.getKey(feature); - - if (featureKey == null) { - // Skip if the feature is not registered, this can happen if another plugin adds a feature without registering it - return; - } - - File featureFile = new File(biomeFile, featureKey.getNamespace() + "/" + featureKey.getPath() + ".json"); - try { - saveFeature(featureFile, registries.getBiomeRegistry().get(CraftNamespacedKey.fromMinecraft(biomeKey)).get(), CraftNamespacedKey.fromMinecraft(featureKey), feature); - } catch (Exception e) { - throw new RuntimeException(String.format("Error while saving feature '%s' in biome '%s'", featureKey, biomeKey), e); - } - } - } - }); - } - - // TODO clean up - private void saveFeature(File file, de.derfrzocker.ore.control.api.Biome biome, NamespacedKey featureKey, PlacedFeature feature) { - ConfiguredFeature configuredFeature = feature.getFeatures().findFirst().orElse(null); - - if (configuredFeature == null) { - return; - } - - if (!(configuredFeature.feature() instanceof OreFeature) && !(configuredFeature.feature() instanceof ScatteredOreFeature) && !(configuredFeature.feature() instanceof GlowstoneFeature)) { - return; - } - - file.getParentFile().mkdirs(); - - FeatureGenerator featureGenerator; - FeatureGeneratorConfiguration featureConfiguration; - - if (configuredFeature.feature() instanceof OreFeature) { - OreConfiguration configuration = (OreConfiguration) configuredFeature.config(); - featureGenerator = registries.getFeatureGeneratorRegistry().get(NamespacedKey.minecraft("ore")).get(); - featureConfiguration = new OreFeatureConfiguration(featureGenerator, null, new FixedDoubleToIntegerValue(configuration.size), new FixedFloatValue(configuration.discardChanceOnAirExposure)); - } else if (configuredFeature.feature() instanceof ScatteredOreFeature) { - OreConfiguration configuration = (OreConfiguration) configuredFeature.config(); - featureGenerator = registries.getFeatureGeneratorRegistry().get(NamespacedKey.minecraft("scattered_ore")).get(); - featureConfiguration = new OreFeatureConfiguration(featureGenerator, null, new FixedDoubleToIntegerValue(configuration.size), new FixedFloatValue(configuration.discardChanceOnAirExposure)); - } else if (configuredFeature.feature() instanceof GlowstoneFeature) { - featureGenerator = registries.getFeatureGeneratorRegistry().get(NamespacedKey.minecraft("glowstone_blob")).get(); - featureConfiguration = new EmptyFeatureConfiguration(featureGenerator); - } else { - throw new RuntimeException("HOW?"); - } - - boolean hasCount = false; - List placementConfiguration = new ArrayList<>(); - Registry> placementModifierTypes = getRegistry().registryOrThrow(Registry.PLACEMENT_MODIFIER_REGISTRY); - for (PlacementModifier placement : feature.placement()) { - ResourceLocation placementModifierType = placementModifierTypes.getKey(placement.type()); - Optional> modifierOptional = registries.getPlacementModifierRegistry().get(NamespacedKey.fromString(placementModifierType.toString())); - - if (modifierOptional.isEmpty()) { - continue; - } - - if (placement.type() == PlacementModifierType.RARITY_FILTER && placement instanceof RarityFilter) { - placementConfiguration.add(RarityModifierHook.createDefaultConfiguration((RarityFilter) placement, modifierOptional.get())); - } - if (placement.type() == PlacementModifierType.SURFACE_RELATIVE_THRESHOLD_FILTER && placement instanceof SurfaceRelativeThresholdFilter) { - placementConfiguration.add(SurfaceRelativeThresholdModifierHook.createDefaultConfiguration((SurfaceRelativeThresholdFilter) placement, modifierOptional.get())); - } - if (placement.type() == PlacementModifierType.SURFACE_WATER_DEPTH_FILTER && placement instanceof SurfaceWaterDepthFilter) { - placementConfiguration.add(SurfaceWaterDepthModifierHook.createDefaultConfiguration((SurfaceWaterDepthFilter) placement, modifierOptional.get())); - } - if (placement.type() == PlacementModifierType.COUNT && placement instanceof CountPlacement) { - placementConfiguration.add(CountModifierHook.createDefaultConfiguration((CountPlacement) placement, modifierOptional.get())); - hasCount = true; - } - if (placement.type() == PlacementModifierType.HEIGHT_RANGE && placement instanceof HeightRangePlacement) { - placementConfiguration.add(HeightRangeModifierHook.createDefaultConfiguration((HeightRangePlacement) placement, modifierOptional.get())); - } - } - - if (!hasCount) { - Optional> modifierOptional = registries.getPlacementModifierRegistry().get(NamespacedKey.fromString("minecraft:count")); - - modifierOptional.ifPresent(modifier -> placementConfiguration.add(0, CountModifierHook.createDefaultConfiguration(CountPlacement.of(1), modifier))); - } - - // inject activation / deactivation logic - Optional> modifierOptional = registries.getPlacementModifierRegistry().get(ActivationModifier.KEY); - modifierOptional.ifPresent(modifier -> placementConfiguration.add(0, new ActivationConfiguration(modifier, new FixedBooleanValue(true)))); - - Config config = new Config(placementConfiguration, featureConfiguration); - - if (biome == null) { - ValueLocationUtil.setValueLocation(Optional.of(config), ValueLocation.DEFAULT_WORLD); - configManager.setDefaultConfig(featureKey, config); - } else { - ValueLocationUtil.setValueLocation(Optional.of(config), ValueLocation.DEFAULT_BIOME); - configManager.setDefaultConfig(biome, featureKey, config); - } - - if (file.exists()) { - return; - } - - try { - file.createNewFile(); - } catch (IOException e) { - throw new RuntimeException(e); - } - - JsonElement element = configParser.toJson(config); - try (FileWriter writer = new FileWriter(file)) { - writer.write(GSON.toJson(element)); - } catch (IOException e) { - throw new RuntimeException(e); - } - } - - private void forEachBiome(BiConsumer consumer) { - Registry registry = getRegistry().registryOrThrow(Registry.BIOME_REGISTRY); - for (Biome biome : registry) { - consumer.accept(biome, registry.getKey(biome)); - } - } - - private void hookIntoBiome(@NotNull final Biome biome, ResourceLocation minecraftKey) throws NoSuchFieldException, IllegalAccessException { - de.derfrzocker.ore.control.api.Biome oreControlBiome = registries.getBiomeRegistry().get(CraftNamespacedKey.fromMinecraft(minecraftKey)).get(); - List> decorations = biome.getGenerationSettings().features(); - List> newDecorations = new ArrayList<>(); - for (HolderSet list : decorations) { - List> newList = new ArrayList<>(); - - for (Holder featureSupplier : list) { - PlacedFeature feature = featureSupplier.value(); - - PlacedFeature newFeature = check(oreControlBiome, minecraftKey, feature); - - if (newFeature != null) { - newList.add(Holder.direct(newFeature)); - } else { - newList.add(featureSupplier); - } - } - - newDecorations.add(decorations.indexOf(list), HolderSet.direct(newList)); - } - - { - final Field field = getField(BiomeGenerationSettings.class, NMSReflectionNames.BIOME_GENERATION_SETTINGS_FEATURES); - field.setAccessible(true); - field.set(biome.getGenerationSettings(), newDecorations); - } - { - final Field field = getField(BiomeGenerationSettings.class, NMSReflectionNames.BIOME_GENERATION_SETTINGS_FEATURE_SET); - field.setAccessible(true); - field.set(biome.getGenerationSettings(), Suppliers.memoize(() -> newDecorations.stream().flatMap(HolderSet::stream).map(Holder::value).collect(Collectors.toSet()))); - } - } - - private void addToList(List> list, int index, PlacedFeature feature) { - list.add(index, () -> feature); - } - - @Nullable - private PlacedFeature check(de.derfrzocker.ore.control.api.Biome biome, ResourceLocation biomeKey, PlacedFeature feature) { - // Not the best method to do this, but hey it works - final Registry registry = getRegistry().registryOrThrow(Registry.PLACED_FEATURE_REGISTRY); - ResourceLocation featureKey = registry.getKey(feature); - - // Return if the featureKey is null, this can happen when plugins are adding placed features to the biome without registering them - if (featureKey == null) { - // TODO add debug message - return null; - } - - NamespacedKey key = CraftNamespacedKey.fromMinecraft(featureKey); - feature = BuiltinRegistries.PLACED_FEATURE.get(featureKey); - - if (feature == null) { - return null; - } - - ConfiguredFeature configuredFeature = feature.getFeatures().findFirst().orElse(null); - - if (configuredFeature == null) { - return null; - } - - if (!(configuredFeature.feature() instanceof OreFeature) && !(configuredFeature.feature() instanceof ScatteredOreFeature) && !(configuredFeature.feature() instanceof GlowstoneFeature)) { - return null; - } - - boolean hasCount = false; - List placementModifiers = new ArrayList<>(); - for (PlacementModifier placement : feature.placement()) { - if (placement.type() == PlacementModifierType.RARITY_FILTER) { - placementModifiers.add(new RarityModifierHook(oreControlManager, biome, key, (RarityFilter) placement)); - } else if (placement.type() == PlacementModifierType.SURFACE_RELATIVE_THRESHOLD_FILTER) { - placementModifiers.add(new SurfaceRelativeThresholdModifierHook(oreControlManager, biome, key, (SurfaceRelativeThresholdFilter) placement)); - } else if (placement.type() == PlacementModifierType.SURFACE_WATER_DEPTH_FILTER) { - placementModifiers.add(new SurfaceWaterDepthModifierHook(oreControlManager, biome, key, (SurfaceWaterDepthFilter) placement)); - } else if (placement.type() == PlacementModifierType.COUNT) { - hasCount = true; - placementModifiers.add(new CountModifierHook(oreControlManager, biome, key, (CountPlacement) placement)); - } else if (placement.type() == PlacementModifierType.HEIGHT_RANGE) { - placementModifiers.add(new HeightRangeModifierHook(oreControlManager, biome, key, (HeightRangePlacement) placement)); - } else { - placementModifiers.add(placement); - } - } - - if (!hasCount) { - placementModifiers.add(0, new CountModifierHook(oreControlManager, biome, key, CountPlacement.of(1))); - } - - // inject activation / deactivation logic - Optional> modifierOptional = registries.getPlacementModifierRegistry().get(ActivationModifier.KEY); - modifierOptional.ifPresent(modifier -> placementModifiers.add(0, new ActivationModifierHook(oreControlManager, biome, key))); - - if (configuredFeature.feature() instanceof OreFeature) { - return new PlacedFeature(Holder.direct(new ConfiguredFeature(new OreFeatureGeneratorHook(oreControlManager, key, biome), configuredFeature.config())), placementModifiers); - } else if (configuredFeature.feature() instanceof ScatteredOreFeature) { - return new PlacedFeature(Holder.direct(new ConfiguredFeature(new ScatteredOreFeatureGeneratorHook(oreControlManager, key, biome), configuredFeature.config())), placementModifiers); - } else if (configuredFeature.feature() instanceof GlowstoneFeature) { - return new PlacedFeature(Holder.direct(new ConfiguredFeature(new GlowstoneBlobFeatureGeneratorHook(oreControlManager, biome, key), configuredFeature.config())), placementModifiers); - } - - throw new RuntimeException("HOW?"); - } - - @SuppressWarnings("rawtypes") - private Field getField(@NotNull final Class clazz, @NotNull final String fieldName) throws NoSuchFieldException { - try { - return clazz.getDeclaredField(fieldName); - } catch (final NoSuchFieldException e) { - final Class superClass = clazz.getSuperclass(); - if (superClass == null) { - throw e; - } else { - return getField(superClass, fieldName); - } - } - } - - @NotNull - private RegistryAccess getRegistry() { - final DedicatedServer server = ((CraftServer) Bukkit.getServer()).getServer(); - - return server.registryAccess(); - } -} diff --git a/impl/v1_19_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R1/feature/generator/GlowstoneBlobFeatureGeneratorHook.java b/impl/v1_19_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R1/feature/generator/GlowstoneBlobFeatureGeneratorHook.java deleted file mode 100644 index 6dc8661a..00000000 --- a/impl/v1_19_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R1/feature/generator/GlowstoneBlobFeatureGeneratorHook.java +++ /dev/null @@ -1,25 +0,0 @@ -package de.derfrzocker.ore.control.impl.v1_19_R1.feature.generator; - -import de.derfrzocker.feature.common.feature.generator.configuration.EmptyFeatureConfiguration; -import de.derfrzocker.ore.control.api.Biome; -import de.derfrzocker.ore.control.api.OreControlManager; -import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Random; - -public class GlowstoneBlobFeatureGeneratorHook extends MinecraftFeatureGeneratorHook { - - public GlowstoneBlobFeatureGeneratorHook(@NotNull OreControlManager oreControlManager, Biome biome, NamespacedKey namespacedKey) { - super(NoneFeatureConfiguration.CODEC, GLOWSTONE_BLOB, oreControlManager, "glowstone_blob", biome, namespacedKey); - } - - @Override - public NoneFeatureConfiguration createConfig(@NotNull NoneFeatureConfiguration defaultConfiguration, @NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull EmptyFeatureConfiguration configuration) { - return defaultConfiguration; - } -} diff --git a/impl/v1_19_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R1/feature/generator/MinecraftFeatureGeneratorHook.java b/impl/v1_19_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R1/feature/generator/MinecraftFeatureGeneratorHook.java deleted file mode 100644 index 5f79c3c2..00000000 --- a/impl/v1_19_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R1/feature/generator/MinecraftFeatureGeneratorHook.java +++ /dev/null @@ -1,100 +0,0 @@ -package de.derfrzocker.ore.control.impl.v1_19_R1.feature.generator; - -import com.mojang.serialization.Codec; -import de.derfrzocker.feature.api.FeatureGenerator; -import de.derfrzocker.feature.api.FeatureGeneratorConfiguration; -import de.derfrzocker.ore.control.api.Biome; -import de.derfrzocker.ore.control.api.FeatureGeneratorHook; -import de.derfrzocker.ore.control.api.OreControlManager; -import de.derfrzocker.ore.control.api.config.Config; -import de.derfrzocker.ore.control.api.config.ConfigManager; -import net.minecraft.core.BlockPos; -import net.minecraft.util.RandomSource; -import net.minecraft.world.level.ChunkPos; -import net.minecraft.world.level.WorldGenLevel; -import net.minecraft.world.level.chunk.ChunkGenerator; -import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; -import net.minecraft.world.level.levelgen.feature.Feature; -import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext; -import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration; -import org.bukkit.NamespacedKey; -import org.bukkit.craftbukkit.v1_19_R1.generator.CraftLimitedRegion; -import org.bukkit.craftbukkit.v1_19_R1.util.RandomSourceWrapper; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Map; -import java.util.Optional; -import java.util.Random; -import java.util.concurrent.ConcurrentHashMap; - -public abstract class MinecraftFeatureGeneratorHook extends Feature implements FeatureGeneratorHook { - - private final Map cache = new ConcurrentHashMap<>(); - private final Feature feature; - private final ConfigManager configManager; - private final FeatureGenerator featureGenerator; - private final Biome biome; - private final NamespacedKey namespacedKey; - - public MinecraftFeatureGeneratorHook(Codec codec, Feature feature, @NotNull OreControlManager oreControlManager, @NotNull String name, Biome biome, NamespacedKey namespacedKey) { - super(codec); - this.feature = feature; - this.configManager = oreControlManager.getConfigManager(); - this.featureGenerator = (FeatureGenerator) oreControlManager.getRegistries().getFeatureGeneratorRegistry().get(NamespacedKey.minecraft(name)).get(); - this.biome = biome; - this.namespacedKey = namespacedKey; - - oreControlManager.addValueChangeListener(cache::clear); - } - - public abstract M createConfig(@NotNull M defaultConfiguration, @NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull C configuration); - - @Override - public FeatureGenerator getFeatureGenerator() { - return featureGenerator; - } - - @Override - public Biome getBiome() { - return biome; - } - - @NotNull - @Override - public NamespacedKey getKey() { - return namespacedKey; - } - - @Override - public boolean place(FeaturePlaceContext context) { - BlockPos origin = context.origin(); - - FeatureGeneratorConfiguration configuration = cache.computeIfAbsent(context.level().getMinecraftWorld().getWorld().getName(), this::loadConfig); - if (configuration == null) { - return feature.place(context); - } - - CraftLimitedRegion limitedRegion = new CraftLimitedRegion(context.level(), new ChunkPos(origin)); - M config = createConfig(context.config(), context.level().getMinecraftWorld().getWorld(), new RandomSourceWrapper.RandomWrapper(context.random()), new BlockVector(origin.getX(), origin.getY(), origin.getZ()), limitedRegion, (C) configuration); - limitedRegion.breakLink(); - - return place(context.topFeature(), context.level(), context.chunkGenerator(), context.random(), origin, config); - } - - private FeatureGeneratorConfiguration loadConfig(String name) { - Config config = configManager.getGenerationConfig(configManager.getOrCreateConfigInfo(name), biome, namespacedKey).orElse(null); - - if (config == null) { - return null; - } - - return config.getFeature(); - } - - private boolean place(Optional> top, WorldGenLevel world, ChunkGenerator generator, RandomSource random, BlockPos pos, M config) { - return feature.place(new FeaturePlaceContext<>(top, world, generator, random, pos, config)); - } -} diff --git a/impl/v1_19_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R1/feature/generator/OreFeatureGeneratorHook.java b/impl/v1_19_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R1/feature/generator/OreFeatureGeneratorHook.java deleted file mode 100644 index f910770c..00000000 --- a/impl/v1_19_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R1/feature/generator/OreFeatureGeneratorHook.java +++ /dev/null @@ -1,53 +0,0 @@ -package de.derfrzocker.ore.control.impl.v1_19_R1.feature.generator; - -import de.derfrzocker.feature.impl.v1_19_R1.feature.generator.configuration.OreFeatureConfiguration; -import de.derfrzocker.feature.impl.v1_19_R1.value.target.TargetValue; -import de.derfrzocker.ore.control.api.Biome; -import de.derfrzocker.ore.control.api.OreControlManager; -import net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.ArrayList; -import java.util.List; -import java.util.Random; - -public class OreFeatureGeneratorHook extends MinecraftFeatureGeneratorHook { - - public OreFeatureGeneratorHook(@NotNull OreControlManager oreControlManager, @NotNull NamespacedKey namespacedKey, @NotNull Biome biome) { - super(OreConfiguration.CODEC, ORE, oreControlManager, "ore", biome, namespacedKey); - } - - @Override - public OreConfiguration createConfig(@NotNull OreConfiguration defaultConfiguration, @NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull OreFeatureConfiguration configuration) { - List blockStates; - if (configuration.getTargets() == null) { - blockStates = defaultConfiguration.targetStates; - } else { - blockStates = new ArrayList<>(); - - for (TargetValue targetValue : configuration.getTargets()) { - blockStates.add(targetValue.getValue(worldInfo, random, position, limitedRegion)); - } - } - - int size; - if (configuration.getSize() == null) { - size = defaultConfiguration.size; - } else { - size = configuration.getSize().getValue(worldInfo, random, position, limitedRegion); - } - - float discardChanceOnAirExposure; - if (configuration.getDiscardChanceOnAirExposure() == null) { - discardChanceOnAirExposure = defaultConfiguration.discardChanceOnAirExposure; - } else { - discardChanceOnAirExposure = configuration.getDiscardChanceOnAirExposure().getValue(worldInfo, random, position, limitedRegion); - } - - return new OreConfiguration(blockStates, size, discardChanceOnAirExposure); - } -} diff --git a/impl/v1_19_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R1/feature/generator/ScatteredOreFeatureGeneratorHook.java b/impl/v1_19_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R1/feature/generator/ScatteredOreFeatureGeneratorHook.java deleted file mode 100644 index 3193253f..00000000 --- a/impl/v1_19_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R1/feature/generator/ScatteredOreFeatureGeneratorHook.java +++ /dev/null @@ -1,53 +0,0 @@ -package de.derfrzocker.ore.control.impl.v1_19_R1.feature.generator; - -import de.derfrzocker.feature.impl.v1_19_R1.feature.generator.configuration.OreFeatureConfiguration; -import de.derfrzocker.feature.impl.v1_19_R1.value.target.TargetValue; -import de.derfrzocker.ore.control.api.Biome; -import de.derfrzocker.ore.control.api.OreControlManager; -import net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.ArrayList; -import java.util.List; -import java.util.Random; - -public class ScatteredOreFeatureGeneratorHook extends MinecraftFeatureGeneratorHook { - - public ScatteredOreFeatureGeneratorHook(@NotNull OreControlManager oreControlManager, @NotNull NamespacedKey namespacedKey, @NotNull Biome biome) { - super(OreConfiguration.CODEC, SCATTERED_ORE, oreControlManager, "scattered_ore", biome, namespacedKey); - } - - @Override - public OreConfiguration createConfig(@NotNull OreConfiguration defaultConfiguration, @NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull OreFeatureConfiguration configuration) { - List blockStates; - if (configuration.getTargets() == null) { - blockStates = defaultConfiguration.targetStates; - } else { - blockStates = new ArrayList<>(); - - for (TargetValue targetValue : configuration.getTargets()) { - blockStates.add(targetValue.getValue(worldInfo, random, position, limitedRegion)); - } - } - - int size; - if (configuration.getSize() == null) { - size = defaultConfiguration.size; - } else { - size = configuration.getSize().getValue(worldInfo, random, position, limitedRegion); - } - - float discardChanceOnAirExposure; - if (configuration.getDiscardChanceOnAirExposure() == null) { - discardChanceOnAirExposure = defaultConfiguration.discardChanceOnAirExposure; - } else { - discardChanceOnAirExposure = configuration.getDiscardChanceOnAirExposure().getValue(worldInfo, random, position, limitedRegion); - } - - return new OreConfiguration(blockStates, size, discardChanceOnAirExposure); - } -} diff --git a/impl/v1_19_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R1/placement/ActivationModifierHook.java b/impl/v1_19_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R1/placement/ActivationModifierHook.java deleted file mode 100644 index 049dde63..00000000 --- a/impl/v1_19_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R1/placement/ActivationModifierHook.java +++ /dev/null @@ -1,95 +0,0 @@ -package de.derfrzocker.ore.control.impl.v1_19_R1.placement; - -import de.derfrzocker.feature.api.FeaturePlacementModifier; -import de.derfrzocker.feature.api.PlacementModifierConfiguration; -import de.derfrzocker.feature.common.feature.placement.ActivationModifier; -import de.derfrzocker.feature.common.feature.placement.configuration.ActivationConfiguration; -import de.derfrzocker.ore.control.api.Biome; -import de.derfrzocker.ore.control.api.OreControlManager; -import de.derfrzocker.ore.control.api.PlacementModifierHook; -import de.derfrzocker.ore.control.api.config.Config; -import de.derfrzocker.ore.control.api.config.ConfigManager; -import net.minecraft.core.BlockPos; -import net.minecraft.util.RandomSource; -import net.minecraft.world.level.ChunkPos; -import net.minecraft.world.level.levelgen.placement.PlacementContext; -import net.minecraft.world.level.levelgen.placement.PlacementModifier; -import net.minecraft.world.level.levelgen.placement.PlacementModifierType; -import org.bukkit.NamespacedKey; -import org.bukkit.craftbukkit.v1_19_R1.generator.CraftLimitedRegion; -import org.bukkit.craftbukkit.v1_19_R1.util.RandomSourceWrapper; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; -import java.util.stream.Stream; - -// TODO make more generic -public class ActivationModifierHook extends PlacementModifier implements PlacementModifierHook { - - private final Map cache = new ConcurrentHashMap<>(); - private final ActivationModifier activationModifier; - private final ConfigManager configManager; - private final Biome biome; - private final NamespacedKey namespacedKey; - - public ActivationModifierHook(@NotNull OreControlManager oreControlManager, @NotNull Biome biome, @NotNull NamespacedKey namespacedKey) { - this.configManager = oreControlManager.getConfigManager(); - this.activationModifier = (ActivationModifier) oreControlManager.getRegistries().getPlacementModifierRegistry().get(ActivationModifier.KEY).get(); - this.biome = biome; - this.namespacedKey = namespacedKey; - - oreControlManager.addValueChangeListener(cache::clear); - } - - @Override - public FeaturePlacementModifier getPlacementModifier() { - return activationModifier; - } - - @Override - public Biome getBiome() { - return biome; - } - - @NotNull - @Override - public NamespacedKey getKey() { - return activationModifier.getKey(); - } - - @Override - public Stream getPositions(PlacementContext context, RandomSource random, BlockPos blockPos) { - PlacementModifierConfiguration configuration = cache.computeIfAbsent(context.getLevel().getMinecraftWorld().getWorld().getName(), this::loadConfig); - if (configuration == null) { - return Stream.of(blockPos); - } - - CraftLimitedRegion limitedRegion = new CraftLimitedRegion(context.getLevel(), new ChunkPos(blockPos)); - Stream pos = activationModifier.getPositions(context.getLevel().getMinecraftWorld().getWorld(), new RandomSourceWrapper.RandomWrapper(random), new BlockVector(blockPos.getX(), blockPos.getY(), blockPos.getZ()), limitedRegion, (ActivationConfiguration) configuration); - - limitedRegion.breakLink(); - - return pos.map(blockVector -> new BlockPos(blockVector.getBlockX(), blockVector.getBlockY(), blockVector.getBlockZ())); - } - - private PlacementModifierConfiguration loadConfig(String name) { - Config config = configManager.getGenerationConfig(configManager.getOrCreateConfigInfo(name), biome, namespacedKey).orElse(null); - - if (config == null) { - return null; - } - - if (config.getPlacements() == null) { - return null; - } - - return config.getPlacements().get(activationModifier); - } - - @Override - public PlacementModifierType type() { - return null; - } -} diff --git a/impl/v1_19_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R1/placement/CountModifierHook.java b/impl/v1_19_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R1/placement/CountModifierHook.java deleted file mode 100644 index 66ddd1b6..00000000 --- a/impl/v1_19_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R1/placement/CountModifierHook.java +++ /dev/null @@ -1,55 +0,0 @@ -package de.derfrzocker.ore.control.impl.v1_19_R1.placement; - -import de.derfrzocker.feature.api.FeaturePlacementModifier; -import de.derfrzocker.feature.common.feature.placement.configuration.CountModifierConfiguration; -import de.derfrzocker.feature.common.value.number.IntegerValue; -import de.derfrzocker.ore.control.api.Biome; -import de.derfrzocker.ore.control.api.OreControlManager; -import de.derfrzocker.ore.control.impl.v1_19_R1.ConversionUtil; -import de.derfrzocker.ore.control.impl.v1_19_R1.NMSReflectionNames; -import net.minecraft.util.valueproviders.IntProvider; -import net.minecraft.world.level.levelgen.placement.CountPlacement; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.lang.reflect.Field; -import java.util.Random; - -public class CountModifierHook extends MinecraftPlacementModifierHook { - - public CountModifierHook(@NotNull OreControlManager oreControlManager, @NotNull Biome biome, @NotNull NamespacedKey namespacedKey, @NotNull CountPlacement defaultModifier) { - super(oreControlManager, "count", defaultModifier, biome, namespacedKey); - } - - public static CountModifierConfiguration createDefaultConfiguration(@NotNull CountPlacement defaultModifier, @NotNull FeaturePlacementModifier modifier) { - try { - Field count = CountPlacement.class.getDeclaredField(NMSReflectionNames.COUNT_PLACEMENT_COUNT); - count.setAccessible(true); - IntProvider value = (IntProvider) count.get(defaultModifier); - IntegerValue integerValue = ConversionUtil.convert(value); - return new CountModifierConfiguration(modifier, integerValue); - } catch (NoSuchFieldException | IllegalAccessException e) { - throw new RuntimeException(e); - } - } - - @Override - public CountModifierConfiguration createDefaultConfiguration(@NotNull CountPlacement defaultModifier) { - return createDefaultConfiguration(defaultModifier, getPlacementModifier()); - } - - @Override - public CountPlacement createModifier(@NotNull CountModifierConfiguration defaultConfiguration, @NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull CountModifierConfiguration configuration) { - int count; - if (configuration.getCount() == null) { - count = defaultConfiguration.getCount().getValue(worldInfo, random, position, limitedRegion); - } else { - count = configuration.getCount().getValue(worldInfo, random, position, limitedRegion); - } - - return CountPlacement.of(count); - } -} diff --git a/impl/v1_19_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R1/placement/HeightRangeModifierHook.java b/impl/v1_19_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R1/placement/HeightRangeModifierHook.java deleted file mode 100644 index ed5fd26c..00000000 --- a/impl/v1_19_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R1/placement/HeightRangeModifierHook.java +++ /dev/null @@ -1,122 +0,0 @@ -package de.derfrzocker.ore.control.impl.v1_19_R1.placement; - -import de.derfrzocker.feature.api.FeaturePlacementModifier; -import de.derfrzocker.feature.common.feature.placement.configuration.HeightRangeModifierConfiguration; -import de.derfrzocker.feature.common.value.number.IntegerValue; -import de.derfrzocker.feature.common.value.number.integer.FixedDoubleToIntegerValue; -import de.derfrzocker.feature.common.value.number.integer.trapezoid.TrapezoidIntegerValue; -import de.derfrzocker.feature.common.value.number.integer.uniform.UniformIntegerValue; -import de.derfrzocker.feature.impl.v1_19_R1.value.offset.NMSAboveBottomOffsetIntegerValue; -import de.derfrzocker.feature.impl.v1_19_R1.value.offset.NMSBelowTopOffsetIntegerValue; -import de.derfrzocker.ore.control.api.Biome; -import de.derfrzocker.ore.control.api.OreControlManager; -import de.derfrzocker.ore.control.impl.v1_19_R1.NMSReflectionNames; -import net.minecraft.world.level.levelgen.VerticalAnchor; -import net.minecraft.world.level.levelgen.heightproviders.ConstantHeight; -import net.minecraft.world.level.levelgen.heightproviders.HeightProvider; -import net.minecraft.world.level.levelgen.heightproviders.HeightProviderType; -import net.minecraft.world.level.levelgen.placement.HeightRangePlacement; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.lang.reflect.Field; -import java.util.Random; - -public class HeightRangeModifierHook extends MinecraftPlacementModifierHook { - - public HeightRangeModifierHook(@NotNull OreControlManager oreControlManager, @NotNull Biome biome, @NotNull NamespacedKey namespacedKey, @NotNull HeightRangePlacement defaultModifier) { - super(oreControlManager, "height_range", defaultModifier, biome, namespacedKey); - } - - public static HeightRangeModifierConfiguration createDefaultConfiguration(@NotNull HeightRangePlacement defaultModifier, @NotNull FeaturePlacementModifier modifier) { - try { - Field height = HeightRangePlacement.class.getDeclaredField(NMSReflectionNames.HEIGHT_RANGE_PLACEMENT_HEIGHT); - height.setAccessible(true); - HeightProvider value = (HeightProvider) height.get(defaultModifier); - - IntegerValue integerValue; - if (value.getType() == HeightProviderType.CONSTANT) { - integerValue = getIntegerValue(value.toString()); - } else if (value.getType() == HeightProviderType.UNIFORM) { - String uniform = value.toString(); - uniform = uniform.substring(1); - uniform = uniform.substring(0, uniform.length() - 1); - int charType = uniform.indexOf("-", 1); - String[] anchors = new String[]{uniform.substring(0, charType), uniform.substring(charType + 1)}; - - integerValue = new UniformIntegerValue(getIntegerValue(anchors[0]), getIntegerValue(anchors[1])); - } else if (value.getType() == HeightProviderType.TRAPEZOID) { - String trapezoid = value.toString(); - if (trapezoid.startsWith("triangle")) { - trapezoid = trapezoid.replace("triangle (", ""); - trapezoid = trapezoid.substring(0, trapezoid.length() - 1); - int charType = trapezoid.indexOf("-", 1); - String[] anchors = new String[]{trapezoid.substring(0, charType), trapezoid.substring(charType + 1)}; - - integerValue = new TrapezoidIntegerValue(getIntegerValue(anchors[0]), getIntegerValue(anchors[1]), new FixedDoubleToIntegerValue(0)); - } else if (trapezoid.startsWith("trapezoid")) { - trapezoid = trapezoid.replace("trapezoid (", ""); - trapezoid = trapezoid.substring(0, trapezoid.length() - 1); - String[] split = trapezoid.split("\\) in \\["); - - if (split.length != 2) { - throw new IllegalStateException(String.format("Expected a split of size '2', but got '%s' for input '%s'", split.length, trapezoid)); - } - - int plateau = Integer.parseInt(split[0]); - int charType = trapezoid.indexOf("-", 1); - String[] anchors = new String[]{trapezoid.substring(0, charType), trapezoid.substring(charType + 1)}; - integerValue = new TrapezoidIntegerValue(getIntegerValue(anchors[0]), getIntegerValue(anchors[1]), new FixedDoubleToIntegerValue(plateau)); - } else { - throw new UnsupportedOperationException(String.format("Unknown trapezoid value '%s'", trapezoid)); - } - - } else { // TODO add rest of HeightProvider types - throw new UnsupportedOperationException(String.format("No integer value equivalent for HeightProvider '%s'", value)); - } - - return new HeightRangeModifierConfiguration(modifier, integerValue); - } catch (NoSuchFieldException | IllegalAccessException e) { - throw new RuntimeException(e); - } - } - - private static IntegerValue getIntegerValue(String anchor) { - String[] values = anchor.split(" "); - int value = Integer.parseInt(values[0]); - - if (values.length == 2 && values[1].equals("absolute")) { - return new FixedDoubleToIntegerValue(value); - } - - if (values.length == 3 && values[1].equals("above") && values[2].equals("bottom")) { - return new NMSAboveBottomOffsetIntegerValue(new FixedDoubleToIntegerValue(value)); - } - - if (values.length == 3 && values[1].equals("below") && values[2].equals("top")) { - return new NMSBelowTopOffsetIntegerValue(new FixedDoubleToIntegerValue(value)); - } - - throw new UnsupportedOperationException(String.format("Unknown vertical anchor '%s'", anchor)); - } - - @Override - public HeightRangeModifierConfiguration createDefaultConfiguration(@NotNull HeightRangePlacement defaultModifier) { - return createDefaultConfiguration(defaultModifier, getPlacementModifier()); - } - - @Override - public HeightRangePlacement createModifier(@NotNull HeightRangeModifierConfiguration defaultConfiguration, @NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull HeightRangeModifierConfiguration configuration) { - int height; - if (configuration.getHeight() == null) { - height = defaultConfiguration.getHeight().getValue(worldInfo, random, position, limitedRegion); - } else { - height = configuration.getHeight().getValue(worldInfo, random, position, limitedRegion); - } - - return HeightRangePlacement.of(ConstantHeight.of(VerticalAnchor.absolute(height))); - } -} diff --git a/impl/v1_19_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R1/placement/MinecraftPlacementModifierHook.java b/impl/v1_19_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R1/placement/MinecraftPlacementModifierHook.java deleted file mode 100644 index 8a323115..00000000 --- a/impl/v1_19_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R1/placement/MinecraftPlacementModifierHook.java +++ /dev/null @@ -1,106 +0,0 @@ -package de.derfrzocker.ore.control.impl.v1_19_R1.placement; - -import de.derfrzocker.feature.api.FeaturePlacementModifier; -import de.derfrzocker.feature.api.PlacementModifierConfiguration; -import de.derfrzocker.ore.control.api.Biome; -import de.derfrzocker.ore.control.api.OreControlManager; -import de.derfrzocker.ore.control.api.PlacementModifierHook; -import de.derfrzocker.ore.control.api.config.Config; -import de.derfrzocker.ore.control.api.config.ConfigManager; -import net.minecraft.core.BlockPos; -import net.minecraft.util.RandomSource; -import net.minecraft.world.level.ChunkPos; -import net.minecraft.world.level.WorldGenLevel; -import net.minecraft.world.level.chunk.ChunkGenerator; -import net.minecraft.world.level.levelgen.placement.PlacedFeature; -import net.minecraft.world.level.levelgen.placement.PlacementContext; -import net.minecraft.world.level.levelgen.placement.PlacementModifier; -import net.minecraft.world.level.levelgen.placement.PlacementModifierType; -import org.bukkit.NamespacedKey; -import org.bukkit.craftbukkit.v1_19_R1.generator.CraftLimitedRegion; -import org.bukkit.craftbukkit.v1_19_R1.util.RandomSourceWrapper; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Map; -import java.util.Optional; -import java.util.Random; -import java.util.concurrent.ConcurrentHashMap; -import java.util.stream.Stream; - -public abstract class MinecraftPlacementModifierHook extends PlacementModifier implements PlacementModifierHook { - - private final Map cache = new ConcurrentHashMap<>(); - private final FeaturePlacementModifier placementModifier; - private final ConfigManager configManager; - private final M defaultModifier; - private final C defaultConfiguration; - private final Biome biome; - private final NamespacedKey namespacedKey; - - public MinecraftPlacementModifierHook(@NotNull OreControlManager oreControlManager, @NotNull String name, @NotNull M defaultModifier, @NotNull Biome biome, @NotNull NamespacedKey namespacedKey) { - this.configManager = oreControlManager.getConfigManager(); - this.placementModifier = (FeaturePlacementModifier) oreControlManager.getRegistries().getPlacementModifierRegistry().get(NamespacedKey.minecraft(name)).get(); - this.defaultModifier = defaultModifier; - this.defaultConfiguration = createDefaultConfiguration(defaultModifier); - this.biome = biome; - this.namespacedKey = namespacedKey; - - oreControlManager.addValueChangeListener(cache::clear); - } - - public abstract M createModifier(@NotNull C defaultConfiguration, @NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull C configuration); - - public abstract C createDefaultConfiguration(M defaultModifier); - - @Override - public FeaturePlacementModifier getPlacementModifier() { - return placementModifier; - } - - @Override - public Biome getBiome() { - return biome; - } - - @NotNull - @Override - public NamespacedKey getKey() { - return namespacedKey; - } - - @Override - public Stream getPositions(PlacementContext context, RandomSource random, BlockPos blockPos) { - PlacementModifierConfiguration configuration = cache.computeIfAbsent(context.getLevel().getMinecraftWorld().getWorld().getName(), this::loadConfig); - - M modifier = defaultModifier; - if (configuration != null) { - CraftLimitedRegion limitedRegion = new CraftLimitedRegion(context.getLevel(), new ChunkPos(blockPos)); - modifier = createModifier(defaultConfiguration, context.getLevel().getMinecraftWorld().getWorld(), new RandomSourceWrapper.RandomWrapper(random), new BlockVector(blockPos.getX(), blockPos.getY(), blockPos.getZ()), limitedRegion, (C) configuration); - limitedRegion.breakLink(); - } - - return getPositions(context.topFeature(), context.getLevel(), context.generator(), random, blockPos, modifier); - } - - private PlacementModifierConfiguration loadConfig(String name) { - Config config = configManager.getGenerationConfig(configManager.getOrCreateConfigInfo(name), biome, namespacedKey).orElse(null); - - if (config == null) { - return null; - } - - return config.getPlacements().get(placementModifier); - } - - @Override - public PlacementModifierType type() { - return null; - } - - private Stream getPositions(Optional top, WorldGenLevel world, ChunkGenerator generator, RandomSource random, BlockPos pos, M modifier) { - return modifier.getPositions(new PlacementContext(world, generator, top), random, pos); - } -} diff --git a/impl/v1_19_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R1/placement/RarityModifierHook.java b/impl/v1_19_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R1/placement/RarityModifierHook.java deleted file mode 100644 index 98873965..00000000 --- a/impl/v1_19_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R1/placement/RarityModifierHook.java +++ /dev/null @@ -1,53 +0,0 @@ -package de.derfrzocker.ore.control.impl.v1_19_R1.placement; - -import de.derfrzocker.feature.api.FeaturePlacementModifier; -import de.derfrzocker.feature.common.feature.placement.configuration.RarityModifierConfiguration; -import de.derfrzocker.feature.common.value.number.integer.FixedDoubleToIntegerValue; -import de.derfrzocker.ore.control.api.Biome; -import de.derfrzocker.ore.control.api.OreControlManager; -import de.derfrzocker.ore.control.impl.v1_19_R1.NMSReflectionNames; -import net.minecraft.world.level.levelgen.placement.RarityFilter; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.bukkit.util.NumberConversions; -import org.jetbrains.annotations.NotNull; - -import java.lang.reflect.Field; -import java.util.Random; - -public class RarityModifierHook extends MinecraftPlacementModifierHook { - - public RarityModifierHook(@NotNull OreControlManager oreControlManager, @NotNull Biome biome, @NotNull NamespacedKey namespacedKey, @NotNull RarityFilter defaultModifier) { - super(oreControlManager, "rarity_filter", defaultModifier, biome, namespacedKey); - } - - public static RarityModifierConfiguration createDefaultConfiguration(@NotNull RarityFilter defaultModifier, @NotNull FeaturePlacementModifier modifier) { - try { - Field chance = RarityFilter.class.getDeclaredField(NMSReflectionNames.RARITY_FILTER_CHANCE); - chance.setAccessible(true); - Object value = chance.get(defaultModifier); - return new RarityModifierConfiguration(modifier, new FixedDoubleToIntegerValue(NumberConversions.toInt(value))); - } catch (NoSuchFieldException | IllegalAccessException e) { - throw new RuntimeException(e); - } - } - - @Override - public RarityModifierConfiguration createDefaultConfiguration(@NotNull RarityFilter defaultModifier) { - return createDefaultConfiguration(defaultModifier, getPlacementModifier()); - } - - @Override - public RarityFilter createModifier(@NotNull RarityModifierConfiguration defaultConfiguration, @NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull RarityModifierConfiguration configuration) { - int chance; - if (configuration.getChance() == null) { - chance = defaultConfiguration.getChance().getValue(worldInfo, random, position, limitedRegion); - } else { - chance = configuration.getChance().getValue(worldInfo, random, position, limitedRegion); - } - - return RarityFilter.onAverageOnceEvery(chance); - } -} diff --git a/impl/v1_19_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R1/placement/SurfaceRelativeThresholdModifierHook.java b/impl/v1_19_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R1/placement/SurfaceRelativeThresholdModifierHook.java deleted file mode 100644 index 754c01d0..00000000 --- a/impl/v1_19_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R1/placement/SurfaceRelativeThresholdModifierHook.java +++ /dev/null @@ -1,77 +0,0 @@ -package de.derfrzocker.ore.control.impl.v1_19_R1.placement; - -import de.derfrzocker.feature.api.FeaturePlacementModifier; -import de.derfrzocker.feature.common.value.number.integer.FixedDoubleToIntegerValue; -import de.derfrzocker.feature.impl.v1_19_R1.placement.configuration.SurfaceRelativeThresholdModifierConfiguration; -import de.derfrzocker.ore.control.api.Biome; -import de.derfrzocker.ore.control.api.OreControlManager; -import de.derfrzocker.ore.control.impl.v1_19_R1.NMSReflectionNames; -import net.minecraft.world.level.levelgen.Heightmap; -import net.minecraft.world.level.levelgen.placement.SurfaceRelativeThresholdFilter; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.bukkit.util.NumberConversions; -import org.jetbrains.annotations.NotNull; - -import java.lang.reflect.Field; -import java.util.Random; - -public class SurfaceRelativeThresholdModifierHook extends MinecraftPlacementModifierHook { - - public SurfaceRelativeThresholdModifierHook(@NotNull OreControlManager oreControlManager, @NotNull Biome biome, @NotNull NamespacedKey namespacedKey, @NotNull SurfaceRelativeThresholdFilter defaultModifier) { - super(oreControlManager, "surface_relative_threshold_filter", defaultModifier, biome, namespacedKey); - } - - public static SurfaceRelativeThresholdModifierConfiguration createDefaultConfiguration(@NotNull SurfaceRelativeThresholdFilter defaultModifier, @NotNull FeaturePlacementModifier modifier) { - try { - Field heightmap = SurfaceRelativeThresholdFilter.class.getDeclaredField(NMSReflectionNames.SURFACE_RELATIVE_THRESHOLD_FILTER_HEIGHTMAP); - heightmap.setAccessible(true); - - Field minInclusive = SurfaceRelativeThresholdFilter.class.getDeclaredField(NMSReflectionNames.SURFACE_RELATIVE_THRESHOLD_FILTER_MIN_INCLUSIVE); - minInclusive.setAccessible(true); - - Field maxInclusive = SurfaceRelativeThresholdFilter.class.getDeclaredField(NMSReflectionNames.SURFACE_RELATIVE_THRESHOLD_FILTER_MAX_INCLUSIVE); - maxInclusive.setAccessible(true); - - Object heightmapValue = heightmap.get(defaultModifier); - Object minInclusiveValue = minInclusive.get(defaultModifier); - Object maxInclusiveValue = maxInclusive.get(defaultModifier); - return new SurfaceRelativeThresholdModifierConfiguration(modifier, null, new FixedDoubleToIntegerValue(NumberConversions.toInt(minInclusiveValue)), new FixedDoubleToIntegerValue(NumberConversions.toInt(maxInclusiveValue))); - } catch (NoSuchFieldException | IllegalAccessException e) { - throw new RuntimeException(e); - } - } - - @Override - public SurfaceRelativeThresholdFilter createModifier(@NotNull SurfaceRelativeThresholdModifierConfiguration defaultConfiguration, @NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull SurfaceRelativeThresholdModifierConfiguration configuration) { - Heightmap.Types heightmap; - if (configuration.getHeightmap() == null) { - heightmap = defaultConfiguration.getHeightmap().getValue(worldInfo, random, position, limitedRegion); - } else { - heightmap = configuration.getHeightmap().getValue(worldInfo, random, position, limitedRegion); - } - - int minInclusive; - if (configuration.getMinInclusive() == null) { - minInclusive = defaultConfiguration.getMinInclusive().getValue(worldInfo, random, position, limitedRegion); - } else { - minInclusive = configuration.getMinInclusive().getValue(worldInfo, random, position, limitedRegion); - } - - int maxInclusive; - if (configuration.getMaxInclusive() == null) { - maxInclusive = defaultConfiguration.getMaxInclusive().getValue(worldInfo, random, position, limitedRegion); - } else { - maxInclusive = configuration.getMaxInclusive().getValue(worldInfo, random, position, limitedRegion); - } - - return SurfaceRelativeThresholdFilter.of(heightmap, minInclusive, maxInclusive); - } - - @Override - public SurfaceRelativeThresholdModifierConfiguration createDefaultConfiguration(SurfaceRelativeThresholdFilter defaultModifier) { - return createDefaultConfiguration(defaultModifier, getPlacementModifier()); - } -} diff --git a/impl/v1_19_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R1/placement/SurfaceWaterDepthModifierHook.java b/impl/v1_19_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R1/placement/SurfaceWaterDepthModifierHook.java deleted file mode 100644 index 81167522..00000000 --- a/impl/v1_19_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R1/placement/SurfaceWaterDepthModifierHook.java +++ /dev/null @@ -1,53 +0,0 @@ -package de.derfrzocker.ore.control.impl.v1_19_R1.placement; - -import de.derfrzocker.feature.api.FeaturePlacementModifier; -import de.derfrzocker.feature.common.feature.placement.configuration.SurfaceWaterDepthModifierConfiguration; -import de.derfrzocker.feature.common.value.number.integer.FixedDoubleToIntegerValue; -import de.derfrzocker.ore.control.api.Biome; -import de.derfrzocker.ore.control.api.OreControlManager; -import de.derfrzocker.ore.control.impl.v1_19_R1.NMSReflectionNames; -import net.minecraft.world.level.levelgen.placement.SurfaceWaterDepthFilter; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.bukkit.util.NumberConversions; -import org.jetbrains.annotations.NotNull; - -import java.lang.reflect.Field; -import java.util.Random; - -public class SurfaceWaterDepthModifierHook extends MinecraftPlacementModifierHook { - - public SurfaceWaterDepthModifierHook(@NotNull OreControlManager oreControlManager, @NotNull Biome biome, @NotNull NamespacedKey namespacedKey, @NotNull SurfaceWaterDepthFilter defaultModifier) { - super(oreControlManager, "surface_water_depth_filter", defaultModifier, biome, namespacedKey); - } - - public static SurfaceWaterDepthModifierConfiguration createDefaultConfiguration(@NotNull SurfaceWaterDepthFilter defaultModifier, @NotNull FeaturePlacementModifier modifier) { - try { - Field maxWaterDepth = SurfaceWaterDepthFilter.class.getDeclaredField(NMSReflectionNames.SURFACE_WATER_DEPTH_FILTER_MAX_WATER_DEPTH); - maxWaterDepth.setAccessible(true); - Object value = maxWaterDepth.get(defaultModifier); - return new SurfaceWaterDepthModifierConfiguration(modifier, new FixedDoubleToIntegerValue(NumberConversions.toInt(value))); - } catch (NoSuchFieldException | IllegalAccessException e) { - throw new RuntimeException(e); - } - } - - @Override - public SurfaceWaterDepthModifierConfiguration createDefaultConfiguration(@NotNull SurfaceWaterDepthFilter defaultModifier) { - return createDefaultConfiguration(defaultModifier, getPlacementModifier()); - } - - @Override - public SurfaceWaterDepthFilter createModifier(@NotNull SurfaceWaterDepthModifierConfiguration defaultConfiguration, @NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull SurfaceWaterDepthModifierConfiguration configuration) { - int maxWaterDepth; - if (configuration.getMaxWaterDepth() == null) { - maxWaterDepth = defaultConfiguration.getMaxWaterDepth().getValue(worldInfo, random, position, limitedRegion); - } else { - maxWaterDepth = configuration.getMaxWaterDepth().getValue(worldInfo, random, position, limitedRegion); - } - - return SurfaceWaterDepthFilter.forMaxDepth(maxWaterDepth); - } -} \ No newline at end of file diff --git a/impl/v1_19_R2/pom.xml b/impl/v1_19_R2/pom.xml deleted file mode 100644 index 293f3f9c..00000000 --- a/impl/v1_19_R2/pom.xml +++ /dev/null @@ -1,80 +0,0 @@ - - - 4.0.0 - - - ore-control-impl - de.derfrzocker - ${revision} - - - ore-control-impl-v1_19_R2 - - - - de.derfrzocker - ore-control-api - ${project.version} - provided - - - de.derfrzocker - ore-control-common - ${project.version} - provided - - - org.spigotmc - spigot - 1.19.3-R0.1-SNAPSHOT - remapped-mojang - provided - true - - - - - - - net.md-5 - specialsource-maven-plugin - 1.2.3 - - - package - - remap - - remap-obf - - org.spigotmc:minecraft-server:1.19.3-R0.1-SNAPSHOT:txt:maps-mojang - true - org.spigotmc:spigot:1.19.3-R0.1-SNAPSHOT:jar:remapped-mojang - - true - remapped-obf - - - - package - - remap - - remap-spigot - - - ${project.build.directory}/${project.artifactId}-${project.version}-remapped-obf.jar - - org.spigotmc:minecraft-server:1.19.3-R0.1-SNAPSHOT:csrg:maps-spigot - org.spigotmc:spigot:1.19.3-R0.1-SNAPSHOT:jar:remapped-obf - - - - - - - - - \ No newline at end of file diff --git a/impl/v1_19_R2/src/main/java/de/derfrzocker/feature/impl/v1_19_R2/extra/OreVeinHandler.java b/impl/v1_19_R2/src/main/java/de/derfrzocker/feature/impl/v1_19_R2/extra/OreVeinHandler.java deleted file mode 100644 index d6f866af..00000000 --- a/impl/v1_19_R2/src/main/java/de/derfrzocker/feature/impl/v1_19_R2/extra/OreVeinHandler.java +++ /dev/null @@ -1,98 +0,0 @@ -package de.derfrzocker.feature.impl.v1_19_R2.extra; - -import de.derfrzocker.feature.api.ExtraValues; -import de.derfrzocker.ore.control.api.OreControlManager; -import de.derfrzocker.ore.control.api.config.ConfigInfo; -import de.derfrzocker.ore.control.api.config.ConfigManager; -import de.derfrzocker.ore.control.impl.v1_19_R2.NMSReflectionNames; -import net.minecraft.core.Holder; -import net.minecraft.server.level.ChunkMap; -import net.minecraft.world.level.levelgen.NoiseBasedChunkGenerator; -import net.minecraft.world.level.levelgen.NoiseGeneratorSettings; -import org.bukkit.World; -import org.bukkit.craftbukkit.v1_19_R2.CraftWorld; -import org.bukkit.event.EventHandler; -import org.bukkit.event.EventPriority; -import org.bukkit.event.Listener; -import org.bukkit.event.world.WorldInitEvent; -import org.bukkit.event.world.WorldUnloadEvent; - -import java.lang.reflect.Field; -import java.util.HashSet; -import java.util.Optional; -import java.util.Set; - -public class OreVeinHandler implements Listener { - - private final static Field CHUNK_GENERATOR_FIELD; - private final static Field NOISE_GENERATOR_SETTINGS_FIELD; - - static { - try { - CHUNK_GENERATOR_FIELD = ChunkMap.class.getDeclaredField(NMSReflectionNames.CHUNK_MAP_GENERATOR); - CHUNK_GENERATOR_FIELD.setAccessible(true); - NOISE_GENERATOR_SETTINGS_FIELD = NoiseBasedChunkGenerator.class.getDeclaredField(NMSReflectionNames.NOISE_GENERATOR_SETTINGS); - NOISE_GENERATOR_SETTINGS_FIELD.setAccessible(true); - } catch (NoSuchFieldException e) { - throw new RuntimeException(e); - } - } - - private final Set hookedWorlds = new HashSet<>(); - private final ConfigManager configManager; - - public OreVeinHandler(OreControlManager oreControlManager) { - this.configManager = oreControlManager.getConfigManager(); - oreControlManager.addValueChangeListener(this::update); - } - - @EventHandler(priority = EventPriority.LOW) - public void onWorldInit(WorldInitEvent event) { - if (!(((CraftWorld) event.getWorld()).getHandle().getChunkSource().chunkMap.generator instanceof NoiseBasedChunkGenerator noiseChunkGenerator)) { - return; - } - - NoiseGeneratorSettings newSettings = getNewValue(event.getWorld(), noiseChunkGenerator.settings.value()); - NoiseBasedChunkGenerator newGenerator = new NoiseBasedChunkGenerator(noiseChunkGenerator.getBiomeSource(), Holder.direct(newSettings)); - - try { - CHUNK_GENERATOR_FIELD.set(((CraftWorld) event.getWorld()).getHandle().getChunkSource().chunkMap, newGenerator); - } catch (IllegalAccessException e) { - throw new RuntimeException(e); - } - - hookedWorlds.add(event.getWorld()); - } - - @EventHandler - public void onWorldUnload(WorldUnloadEvent event) { - // Cleanup - hookedWorlds.remove(event.getWorld()); - } - - private NoiseGeneratorSettings getNewValue(World world, NoiseGeneratorSettings old) { - ConfigInfo configInfo = configManager.getOrCreateConfigInfo(world.getName()); - Optional optionalExtraValues = configManager.getGenerationExtraValues(configInfo); - - boolean newValue = optionalExtraValues.flatMap(ExtraValues::shouldGeneratedBigOreVeins).orElse(old.oreVeinsEnabled()); - - return new NoiseGeneratorSettings(old.noiseSettings(), old.defaultBlock(), old.defaultFluid(), - old.noiseRouter(), old.surfaceRule(), old.spawnTarget(), old.seaLevel(), old.disableMobGeneration(), old.aquifersEnabled(), newValue, old.useLegacyRandomSource()); - } - - private void update() { - for (World world : hookedWorlds) { - if (!(((CraftWorld) world).getHandle().getChunkSource().chunkMap.generator instanceof NoiseBasedChunkGenerator noiseChunkGenerator)) { - return; - } - - NoiseGeneratorSettings newSettings = getNewValue(world, noiseChunkGenerator.settings.value()); - - try { - NOISE_GENERATOR_SETTINGS_FIELD.set(noiseChunkGenerator, Holder.direct(newSettings)); - } catch (IllegalAccessException e) { - throw new RuntimeException(e); - } - } - } -} diff --git a/impl/v1_19_R2/src/main/java/de/derfrzocker/feature/impl/v1_19_R2/feature/generator/GlowstoneBlobFeatureGenerator.java b/impl/v1_19_R2/src/main/java/de/derfrzocker/feature/impl/v1_19_R2/feature/generator/GlowstoneBlobFeatureGenerator.java deleted file mode 100644 index b76f2647..00000000 --- a/impl/v1_19_R2/src/main/java/de/derfrzocker/feature/impl/v1_19_R2/feature/generator/GlowstoneBlobFeatureGenerator.java +++ /dev/null @@ -1,61 +0,0 @@ -package de.derfrzocker.feature.impl.v1_19_R2.feature.generator; - -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import de.derfrzocker.feature.api.Configuration; -import de.derfrzocker.feature.api.Registries; -import de.derfrzocker.feature.api.Setting; -import de.derfrzocker.feature.api.util.Parser; -import de.derfrzocker.feature.common.feature.generator.configuration.EmptyFeatureConfiguration; -import net.minecraft.world.level.levelgen.feature.Feature; -import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Collections; -import java.util.Random; -import java.util.Set; - -public class GlowstoneBlobFeatureGenerator extends MinecraftFeatureGenerator { - - public GlowstoneBlobFeatureGenerator(Registries registries) { - super(registries, Feature.GLOWSTONE_BLOB, "glowstone_blob"); - } - - @Override - public @NotNull Set getSettings() { - return Collections.emptySet(); - } - - @Override - public @NotNull Configuration createEmptyConfiguration() { - return new EmptyFeatureConfiguration(this); - } - - @Override - public EmptyFeatureConfiguration mergeConfig(EmptyFeatureConfiguration first, EmptyFeatureConfiguration second) { - return first; - } - - @Override - public Parser createParser(Registries registries) { - return new Parser<>() { - @Override - public JsonElement toJson(EmptyFeatureConfiguration value) { - return new JsonObject(); - } - - @Override - public EmptyFeatureConfiguration fromJson(JsonElement jsonElement) { - return new EmptyFeatureConfiguration(GlowstoneBlobFeatureGenerator.this); - } - }; - } - - @Override - public NoneFeatureConfiguration createConfiguration(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull EmptyFeatureConfiguration configuration) { - return NoneFeatureConfiguration.INSTANCE; - } -} diff --git a/impl/v1_19_R2/src/main/java/de/derfrzocker/feature/impl/v1_19_R2/feature/generator/MinecraftFeatureGenerator.java b/impl/v1_19_R2/src/main/java/de/derfrzocker/feature/impl/v1_19_R2/feature/generator/MinecraftFeatureGenerator.java deleted file mode 100644 index 827d6547..00000000 --- a/impl/v1_19_R2/src/main/java/de/derfrzocker/feature/impl/v1_19_R2/feature/generator/MinecraftFeatureGenerator.java +++ /dev/null @@ -1,65 +0,0 @@ -package de.derfrzocker.feature.impl.v1_19_R2.feature.generator; - -import de.derfrzocker.feature.api.FeatureGenerator; -import de.derfrzocker.feature.api.FeatureGeneratorConfiguration; -import de.derfrzocker.feature.api.Registries; -import de.derfrzocker.feature.api.util.Parser; -import net.minecraft.core.BlockPos; -import net.minecraft.world.level.WorldGenLevel; -import net.minecraft.world.level.levelgen.feature.Feature; -import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext; -import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration; -import org.bukkit.NamespacedKey; -import org.bukkit.craftbukkit.v1_19_R2.generator.CraftLimitedRegion; -import org.bukkit.craftbukkit.v1_19_R2.util.RandomSourceWrapper; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Optional; -import java.util.Random; - -public abstract class MinecraftFeatureGenerator implements FeatureGenerator { - - private final Parser parser; - private final Feature feature; - private final NamespacedKey namespacedKey; - - public MinecraftFeatureGenerator(Registries registries, Feature feature, String name) { - this.parser = (Parser) createParser(registries); - this.feature = feature; - this.namespacedKey = NamespacedKey.minecraft(name); - } - - public abstract C mergeConfig(C first, C second); - - public abstract Parser createParser(Registries registries); - - public abstract M createConfiguration(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull C configuration); - - @NotNull - @Override - public C merge(@NotNull FeatureGeneratorConfiguration first, @NotNull FeatureGeneratorConfiguration second) { - return mergeConfig((C) first, (C) second); - } - - @Override - public void place(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull C configuration) { - WorldGenLevel level = ((CraftLimitedRegion) limitedRegion).getHandle(); - M config = createConfiguration(worldInfo, random, position, limitedRegion, configuration); - feature.place(new FeaturePlaceContext<>(Optional.empty(), level, level.getMinecraftWorld().getChunkSource().getGenerator(), new RandomSourceWrapper(random), new BlockPos(position.getBlockX(), position.getBlockY(), position.getBlockZ()), config)); - } - - @NotNull - @Override - public Parser getParser() { - return parser; - } - - @NotNull - @Override - public NamespacedKey getKey() { - return namespacedKey; - } -} diff --git a/impl/v1_19_R2/src/main/java/de/derfrzocker/feature/impl/v1_19_R2/feature/generator/OreFeatureGenerator.java b/impl/v1_19_R2/src/main/java/de/derfrzocker/feature/impl/v1_19_R2/feature/generator/OreFeatureGenerator.java deleted file mode 100644 index f2625673..00000000 --- a/impl/v1_19_R2/src/main/java/de/derfrzocker/feature/impl/v1_19_R2/feature/generator/OreFeatureGenerator.java +++ /dev/null @@ -1,115 +0,0 @@ -package de.derfrzocker.feature.impl.v1_19_R2.feature.generator; - -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import de.derfrzocker.feature.api.Registries; -import de.derfrzocker.feature.api.Setting; -import de.derfrzocker.feature.api.util.Parser; -import de.derfrzocker.feature.common.value.number.FloatType; -import de.derfrzocker.feature.common.value.number.FloatValue; -import de.derfrzocker.feature.common.value.number.IntegerType; -import de.derfrzocker.feature.common.value.number.IntegerValue; -import de.derfrzocker.feature.impl.v1_19_R2.feature.generator.configuration.OreFeatureConfiguration; -import de.derfrzocker.feature.impl.v1_19_R2.value.target.TargetValue; -import java.util.ArrayList; -import java.util.List; -import java.util.Random; -import java.util.Set; -import net.minecraft.world.level.levelgen.feature.OreFeature; -import net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -public class OreFeatureGenerator extends MinecraftFeatureGenerator { - - public OreFeatureGenerator(Registries registries) { - super(registries, OreFeature.ORE, "ore"); - } - - @Override - public Parser createParser(Registries registries) { - return new Parser<>() { - @Override - public JsonElement toJson(OreFeatureConfiguration value) { - JsonObject jsonObject = new JsonObject(); - - if (value.getSize() != null) { - JsonObject size = value.getSize().getValueType().getParser().toJson(value.getSize()).getAsJsonObject(); - size.addProperty("size_type", value.getSize().getValueType().getKey().toString()); - jsonObject.add("size", size); - } - - if (value.getDiscardChanceOnAirExposure() != null) { - JsonObject discardChanceOnAirExposure = value.getDiscardChanceOnAirExposure().getValueType().getParser().toJson(value.getDiscardChanceOnAirExposure()).getAsJsonObject(); - discardChanceOnAirExposure.addProperty("discard_chance_on_air_exposure_type", value.getDiscardChanceOnAirExposure().getValueType().getKey().toString()); - } - - return jsonObject; - } - - @Override - public OreFeatureConfiguration fromJson(JsonElement jsonElement) { - JsonObject jsonObject = jsonElement.getAsJsonObject(); - - IntegerValue size = null; - if (jsonObject.has("size")) { - JsonObject sizes = jsonObject.getAsJsonObject("size"); - size = registries.getValueTypeRegistry(IntegerType.class).get(NamespacedKey.fromString(sizes.getAsJsonPrimitive("size_type").getAsString())).get().getParser().fromJson(sizes); - } - - FloatValue discardChanceOnAirExposure = null; - if (jsonObject.has("discard_chance_on_air_exposure")) { - JsonObject chance = jsonObject.getAsJsonObject("discard_chance_on_air_exposure"); - discardChanceOnAirExposure = registries.getValueTypeRegistry(FloatType.class).get(NamespacedKey.fromString(chance.getAsJsonPrimitive("discard_chance_on_air_exposure_type").getAsString())).get().getParser().fromJson(chance); - } - - return new OreFeatureConfiguration(OreFeatureGenerator.this, null, size, discardChanceOnAirExposure); - } - }; - } - - @Override - public OreFeatureConfiguration mergeConfig(OreFeatureConfiguration first, OreFeatureConfiguration second) { - return new OreFeatureConfiguration(this, - first.getTargets() != null ? first.getTargets() : second.getTargets(), - first.getSize() != null ? first.getSize() : second.getSize(), - first.getDiscardChanceOnAirExposure() != null ? first.getDiscardChanceOnAirExposure() : second.getDiscardChanceOnAirExposure()); - } - - @Override - public OreConfiguration createConfiguration(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull OreFeatureConfiguration configuration) { - List blockStates = new ArrayList<>(); - if (configuration.getTargets() != null) { - for (TargetValue targetValue : configuration.getTargets()) { - blockStates.add(targetValue.getValue(worldInfo, random, position, limitedRegion)); - } - } - - int size = 0; - if (configuration.getSize() != null) { - size = configuration.getSize().getValue(worldInfo, random, position, limitedRegion); - } - - float discardChanceOnAirExposure = 0f; - if (configuration.getDiscardChanceOnAirExposure() != null) { - discardChanceOnAirExposure = configuration.getDiscardChanceOnAirExposure().getValue(worldInfo, random, position, limitedRegion); - } - - return new OreConfiguration(blockStates, size, discardChanceOnAirExposure); - } - - @NotNull - @Override - public Set getSettings() { - return OreFeatureConfiguration.SETTINGS; - } - - @NotNull - @Override - public OreFeatureConfiguration createEmptyConfiguration() { - return new OreFeatureConfiguration(this, null, null, null); - } -} diff --git a/impl/v1_19_R2/src/main/java/de/derfrzocker/feature/impl/v1_19_R2/feature/generator/ScatteredOreGenerator.java b/impl/v1_19_R2/src/main/java/de/derfrzocker/feature/impl/v1_19_R2/feature/generator/ScatteredOreGenerator.java deleted file mode 100644 index 9546b02b..00000000 --- a/impl/v1_19_R2/src/main/java/de/derfrzocker/feature/impl/v1_19_R2/feature/generator/ScatteredOreGenerator.java +++ /dev/null @@ -1,117 +0,0 @@ -package de.derfrzocker.feature.impl.v1_19_R2.feature.generator; - -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import de.derfrzocker.feature.api.Registries; -import de.derfrzocker.feature.api.Setting; -import de.derfrzocker.feature.api.util.Parser; -import de.derfrzocker.feature.common.value.number.FloatType; -import de.derfrzocker.feature.common.value.number.FloatValue; -import de.derfrzocker.feature.common.value.number.IntegerType; -import de.derfrzocker.feature.common.value.number.IntegerValue; -import de.derfrzocker.feature.impl.v1_19_R2.feature.generator.configuration.OreFeatureConfiguration; -import de.derfrzocker.feature.impl.v1_19_R2.value.target.TargetValue; -import net.minecraft.world.level.levelgen.feature.OreFeature; -import net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.ArrayList; -import java.util.List; -import java.util.Optional; -import java.util.Random; -import java.util.Set; - -public class ScatteredOreGenerator extends MinecraftFeatureGenerator { - - public ScatteredOreGenerator(Registries registries) { - super(registries, OreFeature.SCATTERED_ORE, "scattered_ore"); - } - - @Override - public Parser createParser(Registries registries) { - return new Parser<>() { - @Override - public JsonElement toJson(OreFeatureConfiguration value) { - JsonObject jsonObject = new JsonObject(); - - if (value.getSize() != null) { - JsonObject size = value.getSize().getValueType().getParser().toJson(value.getSize()).getAsJsonObject(); - size.addProperty("size_type", value.getSize().getValueType().getKey().toString()); - jsonObject.add("size", size); - } - - if (value.getDiscardChanceOnAirExposure() != null) { - JsonObject discardChanceOnAirExposure = value.getDiscardChanceOnAirExposure().getValueType().getParser().toJson(value.getDiscardChanceOnAirExposure()).getAsJsonObject(); - discardChanceOnAirExposure.addProperty("discard_chance_on_air_exposure_type", value.getDiscardChanceOnAirExposure().getValueType().getKey().toString()); - } - - return jsonObject; - } - - @Override - public OreFeatureConfiguration fromJson(JsonElement jsonElement) { - JsonObject jsonObject = jsonElement.getAsJsonObject(); - - IntegerValue size = null; - if (jsonObject.has("size")) { - JsonObject sizes = jsonObject.getAsJsonObject("size"); - size = registries.getValueTypeRegistry(IntegerType.class).get(NamespacedKey.fromString(sizes.getAsJsonPrimitive("size_type").getAsString())).get().getParser().fromJson(sizes); - } - - FloatValue discardChanceOnAirExposure = null; - if (jsonObject.has("discard_chance_on_air_exposure")) { - JsonObject chance = jsonObject.getAsJsonObject("discard_chance_on_air_exposure"); - discardChanceOnAirExposure = registries.getValueTypeRegistry(FloatType.class).get(NamespacedKey.fromString(chance.getAsJsonPrimitive("discard_chance_on_air_exposure_type").getAsString())).get().getParser().fromJson(chance); - } - - return new OreFeatureConfiguration(ScatteredOreGenerator.this, null, size, discardChanceOnAirExposure); - } - }; - } - - @Override - public OreFeatureConfiguration mergeConfig(OreFeatureConfiguration first, OreFeatureConfiguration second) { - return new OreFeatureConfiguration(this, - first.getTargets() != null ? first.getTargets() : second.getTargets(), - first.getSize() != null ? first.getSize() : second.getSize(), - first.getDiscardChanceOnAirExposure() != null ? first.getDiscardChanceOnAirExposure() : second.getDiscardChanceOnAirExposure()); - } - - @Override - public OreConfiguration createConfiguration(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull OreFeatureConfiguration configuration) { - List blockStates = new ArrayList<>(); - if (configuration.getTargets() != null) { - for (TargetValue targetValue : configuration.getTargets()) { - blockStates.add(targetValue.getValue(worldInfo, random, position, limitedRegion)); - } - } - - int size = 0; - if (configuration.getSize() != null) { - size = configuration.getSize().getValue(worldInfo, random, position, limitedRegion); - } - - float discardChanceOnAirExposure = 0f; - if (configuration.getDiscardChanceOnAirExposure() != null) { - discardChanceOnAirExposure = configuration.getDiscardChanceOnAirExposure().getValue(worldInfo, random, position, limitedRegion); - } - - return new OreConfiguration(blockStates, size, discardChanceOnAirExposure); - } - - @NotNull - @Override - public Set getSettings() { - return OreFeatureConfiguration.SETTINGS; - } - - @NotNull - @Override - public OreFeatureConfiguration createEmptyConfiguration() { - return new OreFeatureConfiguration(this, null, null, null); - } -} diff --git a/impl/v1_19_R2/src/main/java/de/derfrzocker/feature/impl/v1_19_R2/feature/generator/configuration/OreFeatureConfiguration.java b/impl/v1_19_R2/src/main/java/de/derfrzocker/feature/impl/v1_19_R2/feature/generator/configuration/OreFeatureConfiguration.java deleted file mode 100644 index 7146165c..00000000 --- a/impl/v1_19_R2/src/main/java/de/derfrzocker/feature/impl/v1_19_R2/feature/generator/configuration/OreFeatureConfiguration.java +++ /dev/null @@ -1,124 +0,0 @@ -package de.derfrzocker.feature.impl.v1_19_R2.feature.generator.configuration; - -import de.derfrzocker.feature.api.FeatureGenerator; -import de.derfrzocker.feature.api.FeatureGeneratorConfiguration; -import de.derfrzocker.feature.api.Setting; -import de.derfrzocker.feature.api.Value; -import de.derfrzocker.feature.common.value.number.FloatType; -import de.derfrzocker.feature.common.value.number.FloatValue; -import de.derfrzocker.feature.common.value.number.IntegerType; -import de.derfrzocker.feature.common.value.number.IntegerValue; -import de.derfrzocker.feature.impl.v1_19_R2.value.target.TargetValue; -import org.jetbrains.annotations.NotNull; - -import java.util.Collections; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; - -public class OreFeatureConfiguration implements FeatureGeneratorConfiguration { - - public final static Set SETTINGS; - private final static Setting SIZE = new Setting("size", IntegerType.class); - private final static Setting DISCARD_CHANCE_ON_AIR_EXPOSURE = new Setting("discard-chance-on-air-exposure", FloatType.class); - - static { - Set settings = new LinkedHashSet<>(); - settings.add(SIZE); - settings.add(DISCARD_CHANCE_ON_AIR_EXPOSURE); - SETTINGS = Collections.unmodifiableSet(settings); - } - - private final FeatureGenerator featureGenerator; - private final List targets; - private IntegerValue size; - private FloatValue discardChanceOnAirExposure; - private boolean dirty = false; - - public OreFeatureConfiguration(FeatureGenerator featureGenerator, List targets, IntegerValue size, FloatValue discardChanceOnAirExposure) { - this.featureGenerator = featureGenerator; - this.targets = targets; - this.size = size; - this.discardChanceOnAirExposure = discardChanceOnAirExposure; - } - - public List getTargets() { - return targets; - } - - public IntegerValue getSize() { - return size; - } - - public FloatValue getDiscardChanceOnAirExposure() { - return discardChanceOnAirExposure; - } - - @NotNull - @Override - public FeatureGenerator getOwner() { - return featureGenerator; - } - - @NotNull - @Override - public Set getSettings() { - return SETTINGS; - } - - @Override - public Value getValue(@NotNull Setting setting) { - if (setting == SIZE) { - return getSize(); - } - - if (setting == DISCARD_CHANCE_ON_AIR_EXPOSURE) { - return getDiscardChanceOnAirExposure(); - } - - throw new IllegalArgumentException(String.format("Setting '%s' is not in the configuration '%s'", setting, "OreFeatureConfiguration")); - } - - @Override - public void setValue(@NotNull Setting setting, Value value) { - if (setting == SIZE) { - size = (IntegerValue) value; - dirty = true; - return; - } - - if (setting == DISCARD_CHANCE_ON_AIR_EXPOSURE) { - discardChanceOnAirExposure = (FloatValue) value; - dirty = true; - return; - } - - throw new IllegalArgumentException(String.format("Setting '%s' is not in the configuration '%s'", setting, "OreFeatureConfiguration")); - } - - @Override - public boolean isDirty() { - if (dirty) { - return true; - } - - if (size != null && size.isDirty()) { - return true; - } - - return discardChanceOnAirExposure != null && discardChanceOnAirExposure.isDirty(); - } - - @Override - public void saved() { - dirty = false; - - if (size != null) { - size.saved(); - } - - if (discardChanceOnAirExposure != null) { - discardChanceOnAirExposure.saved(); - } - } -} diff --git a/impl/v1_19_R2/src/main/java/de/derfrzocker/feature/impl/v1_19_R2/placement/CountModifier.java b/impl/v1_19_R2/src/main/java/de/derfrzocker/feature/impl/v1_19_R2/placement/CountModifier.java deleted file mode 100644 index 17300e6c..00000000 --- a/impl/v1_19_R2/src/main/java/de/derfrzocker/feature/impl/v1_19_R2/placement/CountModifier.java +++ /dev/null @@ -1,85 +0,0 @@ -package de.derfrzocker.feature.impl.v1_19_R2.placement; - -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import de.derfrzocker.feature.api.Registries; -import de.derfrzocker.feature.api.Setting; -import de.derfrzocker.feature.api.util.Parser; -import de.derfrzocker.feature.common.feature.placement.configuration.CountModifierConfiguration; -import de.derfrzocker.feature.common.value.number.IntegerType; -import de.derfrzocker.feature.common.value.number.IntegerValue; -import net.minecraft.world.level.levelgen.placement.CountPlacement; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Random; -import java.util.Set; - -public class CountModifier extends MinecraftPlacementModifier { - - public CountModifier(@NotNull Registries registries) { - super(registries, "count"); - } - - @Override - public CountModifierConfiguration mergeConfig(CountModifierConfiguration first, CountModifierConfiguration second) { - return new CountModifierConfiguration(this, - first.getCount() != null ? first.getCount() : second.getCount()); - } - - @Override - public Parser createParser(Registries registries) { - return new Parser<>() { - @Override - public JsonElement toJson(CountModifierConfiguration value) { - JsonObject jsonObject = new JsonObject(); - if (value.getCount() != null) { - JsonObject entry = value.getCount().getValueType().getParser().toJson(value.getCount()).getAsJsonObject(); - entry.addProperty("count_type", value.getCount().getValueType().getKey().toString()); - jsonObject.add("count", entry); - } - return jsonObject; - } - - @Override - public CountModifierConfiguration fromJson(JsonElement jsonElement) { - JsonObject jsonObject = jsonElement.getAsJsonObject(); - - IntegerValue count = null; - if (jsonObject.has("count")) { - JsonObject entry = jsonObject.getAsJsonObject("count"); - count = registries.getValueTypeRegistry(IntegerType.class).get(NamespacedKey.fromString(entry.getAsJsonPrimitive("count_type").getAsString())).get().getParser().fromJson(entry); - } - - return new CountModifierConfiguration(CountModifier.this, count); - } - }; - } - - @Override - public CountPlacement createPlacementModifier(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull CountModifierConfiguration configuration) { - int count; - if (configuration.getCount() != null) { - count = configuration.getCount().getValue(worldInfo, random, position, limitedRegion); - } else { - count = 0; - } - - return CountPlacement.of(count); - } - - @NotNull - @Override - public Set getSettings() { - return CountModifierConfiguration.SETTINGS; - } - - @NotNull - @Override - public CountModifierConfiguration createEmptyConfiguration() { - return new CountModifierConfiguration(this, null); - } -} diff --git a/impl/v1_19_R2/src/main/java/de/derfrzocker/feature/impl/v1_19_R2/placement/HeightRangeModifier.java b/impl/v1_19_R2/src/main/java/de/derfrzocker/feature/impl/v1_19_R2/placement/HeightRangeModifier.java deleted file mode 100644 index edd10827..00000000 --- a/impl/v1_19_R2/src/main/java/de/derfrzocker/feature/impl/v1_19_R2/placement/HeightRangeModifier.java +++ /dev/null @@ -1,88 +0,0 @@ -package de.derfrzocker.feature.impl.v1_19_R2.placement; - -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import de.derfrzocker.feature.api.Registries; -import de.derfrzocker.feature.api.Setting; -import de.derfrzocker.feature.api.util.Parser; -import de.derfrzocker.feature.common.feature.placement.configuration.HeightRangeModifierConfiguration; -import de.derfrzocker.feature.common.value.number.IntegerType; -import de.derfrzocker.feature.common.value.number.IntegerValue; -import net.minecraft.world.level.levelgen.VerticalAnchor; -import net.minecraft.world.level.levelgen.heightproviders.ConstantHeight; -import net.minecraft.world.level.levelgen.heightproviders.HeightProvider; -import net.minecraft.world.level.levelgen.placement.HeightRangePlacement; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Random; -import java.util.Set; - -public class HeightRangeModifier extends MinecraftPlacementModifier { - - public HeightRangeModifier(@NotNull Registries registries) { - super(registries, "height_range"); - } - - @Override - public HeightRangeModifierConfiguration mergeConfig(HeightRangeModifierConfiguration first, HeightRangeModifierConfiguration second) { - return new HeightRangeModifierConfiguration(this, - first.getHeight() != null ? first.getHeight() : second.getHeight()); - } - - @Override - public Parser createParser(Registries registries) { - return new Parser<>() { - @Override - public JsonElement toJson(HeightRangeModifierConfiguration value) { - JsonObject jsonObject = new JsonObject(); - if (value.getHeight() != null) { - JsonObject entry = value.getHeight().getValueType().getParser().toJson(value.getHeight()).getAsJsonObject(); - entry.addProperty("height_range_type", value.getHeight().getValueType().getKey().toString()); - jsonObject.add("height", entry); - } - return jsonObject; - } - - @Override - public HeightRangeModifierConfiguration fromJson(JsonElement jsonElement) { - JsonObject jsonObject = jsonElement.getAsJsonObject(); - - IntegerValue count = null; - if (jsonObject.has("height")) { - JsonObject entry = jsonObject.getAsJsonObject("height"); - count = registries.getValueTypeRegistry(IntegerType.class).get(NamespacedKey.fromString(entry.getAsJsonPrimitive("height_range_type").getAsString())).get().getParser().fromJson(entry); - } - - return new HeightRangeModifierConfiguration(HeightRangeModifier.this, count); - } - }; - } - - @Override - public HeightRangePlacement createPlacementModifier(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull HeightRangeModifierConfiguration configuration) { - HeightProvider height; - if (configuration.getHeight() != null) { - height = ConstantHeight.of(VerticalAnchor.absolute(configuration.getHeight().getValue(worldInfo, random, position, limitedRegion))); - } else { - height = ConstantHeight.of(VerticalAnchor.bottom()); - } - - return HeightRangePlacement.of(height); - } - - @NotNull - @Override - public Set getSettings() { - return HeightRangeModifierConfiguration.SETTINGS; - } - - @NotNull - @Override - public HeightRangeModifierConfiguration createEmptyConfiguration() { - return new HeightRangeModifierConfiguration(this, null); - } -} diff --git a/impl/v1_19_R2/src/main/java/de/derfrzocker/feature/impl/v1_19_R2/placement/MinecraftPlacementModifier.java b/impl/v1_19_R2/src/main/java/de/derfrzocker/feature/impl/v1_19_R2/placement/MinecraftPlacementModifier.java deleted file mode 100644 index ce61b86b..00000000 --- a/impl/v1_19_R2/src/main/java/de/derfrzocker/feature/impl/v1_19_R2/placement/MinecraftPlacementModifier.java +++ /dev/null @@ -1,65 +0,0 @@ -package de.derfrzocker.feature.impl.v1_19_R2.placement; - -import de.derfrzocker.feature.api.FeaturePlacementModifier; -import de.derfrzocker.feature.api.PlacementModifierConfiguration; -import de.derfrzocker.feature.api.Registries; -import de.derfrzocker.feature.api.util.Parser; -import net.minecraft.core.BlockPos; -import net.minecraft.world.level.WorldGenLevel; -import net.minecraft.world.level.levelgen.placement.PlacementContext; -import net.minecraft.world.level.levelgen.placement.PlacementModifier; -import org.bukkit.NamespacedKey; -import org.bukkit.craftbukkit.v1_19_R2.generator.CraftLimitedRegion; -import org.bukkit.craftbukkit.v1_19_R2.util.RandomSourceWrapper; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Optional; -import java.util.Random; -import java.util.stream.Stream; - -public abstract class MinecraftPlacementModifier implements FeaturePlacementModifier { - - private final Parser parser; - private final NamespacedKey namespacedKey; - - public MinecraftPlacementModifier(@NotNull Registries registries, @NotNull String name) { - this.parser = (Parser) createParser(registries); - this.namespacedKey = NamespacedKey.minecraft(name); - } - - public abstract C mergeConfig(C first, C second); - - public abstract Parser createParser(Registries registries); - - public abstract M createPlacementModifier(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull C configuration); - - @NotNull - @Override - public C merge(@NotNull PlacementModifierConfiguration first, @NotNull PlacementModifierConfiguration second) { - return mergeConfig((C) first, (C) second); - } - - @NotNull - @Override - public Stream getPositions(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull C configuration) { - WorldGenLevel level = ((CraftLimitedRegion) limitedRegion).getHandle(); - M placementModifier = createPlacementModifier(worldInfo, random, position, limitedRegion, configuration); - return placementModifier.getPositions(new PlacementContext(level, level.getMinecraftWorld().getChunkSource().getGenerator(), Optional.empty()), new RandomSourceWrapper(random), new BlockPos(position.getBlockX(), position.getBlockY(), position.getBlockZ())). - map(pos -> new BlockVector(pos.getX(), pos.getY(), pos.getZ())); - } - - @NotNull - @Override - public Parser getParser() { - return parser; - } - - @NotNull - @Override - public NamespacedKey getKey() { - return namespacedKey; - } -} diff --git a/impl/v1_19_R2/src/main/java/de/derfrzocker/feature/impl/v1_19_R2/placement/RarityModifier.java b/impl/v1_19_R2/src/main/java/de/derfrzocker/feature/impl/v1_19_R2/placement/RarityModifier.java deleted file mode 100644 index 8b973dd5..00000000 --- a/impl/v1_19_R2/src/main/java/de/derfrzocker/feature/impl/v1_19_R2/placement/RarityModifier.java +++ /dev/null @@ -1,83 +0,0 @@ -package de.derfrzocker.feature.impl.v1_19_R2.placement; - -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import de.derfrzocker.feature.api.Registries; -import de.derfrzocker.feature.api.Setting; -import de.derfrzocker.feature.api.util.Parser; -import de.derfrzocker.feature.common.feature.placement.configuration.RarityModifierConfiguration; -import de.derfrzocker.feature.common.value.number.IntegerType; -import de.derfrzocker.feature.common.value.number.IntegerValue; -import net.minecraft.world.level.levelgen.placement.RarityFilter; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Random; -import java.util.Set; - -public class RarityModifier extends MinecraftPlacementModifier { - - public RarityModifier(@NotNull Registries registries) { - super(registries, "rarity_filter"); - } - - - @Override - public RarityModifierConfiguration mergeConfig(RarityModifierConfiguration first, RarityModifierConfiguration second) { - return new RarityModifierConfiguration(this, - first.getChance() != null ? first.getChance() : second.getChance()); - } - - @Override - public Parser createParser(Registries registries) { - return new Parser<>() { - @Override - public JsonElement toJson(RarityModifierConfiguration value) { - JsonObject jsonObject = new JsonObject(); - if (value.getChance() != null) { - JsonObject entry = value.getChance().getValueType().getParser().toJson(value.getChance()).getAsJsonObject(); - entry.addProperty("chance_type", value.getChance().getValueType().getKey().toString()); - jsonObject.add("chance", entry); - } - return jsonObject; - } - - @Override - public RarityModifierConfiguration fromJson(JsonElement jsonElement) { - JsonObject jsonObject = jsonElement.getAsJsonObject(); - - IntegerValue count = null; - if (jsonObject.has("chance")) { - JsonObject entry = jsonObject.getAsJsonObject("chance"); - count = registries.getValueTypeRegistry(IntegerType.class).get(NamespacedKey.fromString(entry.getAsJsonPrimitive("chance_type").getAsString())).get().getParser().fromJson(entry); - } - - return new RarityModifierConfiguration(RarityModifier.this, count); - } - }; - } - - @Override - public RarityFilter createPlacementModifier(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull RarityModifierConfiguration configuration) { - int chance = 0; - if (configuration.getChance() != null) { - chance = configuration.getChance().getValue(worldInfo, random, position, limitedRegion); - } - return RarityFilter.onAverageOnceEvery(chance); - } - - @NotNull - @Override - public Set getSettings() { - return RarityModifierConfiguration.SETTINGS; - } - - @NotNull - @Override - public RarityModifierConfiguration createEmptyConfiguration() { - return new RarityModifierConfiguration(this, null); - } -} diff --git a/impl/v1_19_R2/src/main/java/de/derfrzocker/feature/impl/v1_19_R2/placement/SurfaceRelativeThresholdModifier.java b/impl/v1_19_R2/src/main/java/de/derfrzocker/feature/impl/v1_19_R2/placement/SurfaceRelativeThresholdModifier.java deleted file mode 100644 index a3f0033a..00000000 --- a/impl/v1_19_R2/src/main/java/de/derfrzocker/feature/impl/v1_19_R2/placement/SurfaceRelativeThresholdModifier.java +++ /dev/null @@ -1,107 +0,0 @@ -package de.derfrzocker.feature.impl.v1_19_R2.placement; - -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import de.derfrzocker.feature.api.Registries; -import de.derfrzocker.feature.api.Setting; -import de.derfrzocker.feature.api.util.Parser; -import de.derfrzocker.feature.common.value.number.IntegerType; -import de.derfrzocker.feature.common.value.number.IntegerValue; -import de.derfrzocker.feature.impl.v1_19_R2.placement.configuration.SurfaceRelativeThresholdModifierConfiguration; -import net.minecraft.world.level.levelgen.Heightmap; -import net.minecraft.world.level.levelgen.placement.SurfaceRelativeThresholdFilter; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Random; -import java.util.Set; - -public class SurfaceRelativeThresholdModifier extends MinecraftPlacementModifier { - public SurfaceRelativeThresholdModifier(@NotNull Registries registries) { - super(registries, "surface_relative_threshold_filter"); - } - - @Override - public SurfaceRelativeThresholdModifierConfiguration mergeConfig(SurfaceRelativeThresholdModifierConfiguration first, SurfaceRelativeThresholdModifierConfiguration second) { - return new SurfaceRelativeThresholdModifierConfiguration(this, - first.getHeightmap() != null ? first.getHeightmap() : second.getHeightmap(), - first.getMinInclusive() != null ? first.getMinInclusive() : second.getMinInclusive(), - first.getMaxInclusive() != null ? first.getMaxInclusive() : second.getMaxInclusive()); - } - - @Override - public Parser createParser(Registries registries) { - return new Parser<>() { - @Override - public JsonElement toJson(SurfaceRelativeThresholdModifierConfiguration value) { - JsonObject jsonObject = new JsonObject(); - if (value.getMinInclusive() != null) { - JsonObject entry = value.getMinInclusive().getValueType().getParser().toJson(value.getMinInclusive()).getAsJsonObject(); - entry.addProperty("min_inclusive_type", value.getMinInclusive().getValueType().getKey().toString()); - jsonObject.add("min_inclusive", entry); - } - - if (value.getMaxInclusive() != null) { - JsonObject entry = value.getMaxInclusive().getValueType().getParser().toJson(value.getMaxInclusive()).getAsJsonObject(); - entry.addProperty("max_inclusive_type", value.getMaxInclusive().getValueType().getKey().toString()); - jsonObject.add("max_inclusive", entry); - } - - return jsonObject; - } - - @Override - public SurfaceRelativeThresholdModifierConfiguration fromJson(JsonElement jsonElement) { - JsonObject jsonObject = jsonElement.getAsJsonObject(); - - IntegerValue minInclusive = null; - if (jsonObject.has("min_inclusive")) { - JsonObject entry = jsonObject.getAsJsonObject("min_inclusive"); - minInclusive = registries.getValueTypeRegistry(IntegerType.class).get(NamespacedKey.fromString(entry.getAsJsonPrimitive("min_inclusive_type").getAsString())).get().getParser().fromJson(entry); - } - - IntegerValue maxInclusive = null; - if (jsonObject.has("max_inclusive")) { - JsonObject entry = jsonObject.getAsJsonObject("max_inclusive"); - maxInclusive = registries.getValueTypeRegistry(IntegerType.class).get(NamespacedKey.fromString(entry.getAsJsonPrimitive("max_inclusive_type").getAsString())).get().getParser().fromJson(entry); - } - - return new SurfaceRelativeThresholdModifierConfiguration(SurfaceRelativeThresholdModifier.this, null, minInclusive, maxInclusive); - } - }; - } - - @Override - public SurfaceRelativeThresholdFilter createPlacementModifier(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull SurfaceRelativeThresholdModifierConfiguration configuration) { - Heightmap.Types heightmap = Heightmap.Types.MOTION_BLOCKING; - if (configuration.getHeightmap() != null) { - heightmap = configuration.getHeightmap().getValue(worldInfo, random, position, limitedRegion); - } - - int minInclusive = 0; - if (configuration.getMinInclusive() != null) { - minInclusive = configuration.getMinInclusive().getValue(worldInfo, random, position, limitedRegion); - } - - int maxInclusive = 0; - if (configuration.getMaxInclusive() != null) { - maxInclusive = configuration.getMaxInclusive().getValue(worldInfo, random, position, limitedRegion); - } - return SurfaceRelativeThresholdFilter.of(heightmap, minInclusive, maxInclusive); - } - - @NotNull - @Override - public Set getSettings() { - return SurfaceRelativeThresholdModifierConfiguration.SETTINGS; - } - - @NotNull - @Override - public SurfaceRelativeThresholdModifierConfiguration createEmptyConfiguration() { - return new SurfaceRelativeThresholdModifierConfiguration(this, null, null, null); - } -} diff --git a/impl/v1_19_R2/src/main/java/de/derfrzocker/feature/impl/v1_19_R2/placement/SurfaceWaterDepthModifier.java b/impl/v1_19_R2/src/main/java/de/derfrzocker/feature/impl/v1_19_R2/placement/SurfaceWaterDepthModifier.java deleted file mode 100644 index 66950889..00000000 --- a/impl/v1_19_R2/src/main/java/de/derfrzocker/feature/impl/v1_19_R2/placement/SurfaceWaterDepthModifier.java +++ /dev/null @@ -1,82 +0,0 @@ -package de.derfrzocker.feature.impl.v1_19_R2.placement; - -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import de.derfrzocker.feature.api.Registries; -import de.derfrzocker.feature.api.Setting; -import de.derfrzocker.feature.api.util.Parser; -import de.derfrzocker.feature.common.feature.placement.configuration.SurfaceWaterDepthModifierConfiguration; -import de.derfrzocker.feature.common.value.number.IntegerType; -import de.derfrzocker.feature.common.value.number.IntegerValue; -import net.minecraft.world.level.levelgen.placement.SurfaceWaterDepthFilter; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Random; -import java.util.Set; - -public class SurfaceWaterDepthModifier extends MinecraftPlacementModifier { - - public SurfaceWaterDepthModifier(@NotNull Registries registries) { - super(registries, "surface_water_depth_filter"); - } - - @Override - public SurfaceWaterDepthModifierConfiguration mergeConfig(SurfaceWaterDepthModifierConfiguration first, SurfaceWaterDepthModifierConfiguration second) { - return new SurfaceWaterDepthModifierConfiguration(this, - first.getMaxWaterDepth() != null ? first.getMaxWaterDepth() : second.getMaxWaterDepth()); - } - - @Override - public Parser createParser(Registries registries) { - return new Parser<>() { - @Override - public JsonElement toJson(SurfaceWaterDepthModifierConfiguration value) { - JsonObject jsonObject = new JsonObject(); - if (value.getMaxWaterDepth() != null) { - JsonObject entry = value.getMaxWaterDepth().getValueType().getParser().toJson(value.getMaxWaterDepth()).getAsJsonObject(); - entry.addProperty("max_water_depth_type", value.getMaxWaterDepth().getValueType().getKey().toString()); - jsonObject.add("max_water_depth", entry); - } - return jsonObject; - } - - @Override - public SurfaceWaterDepthModifierConfiguration fromJson(JsonElement jsonElement) { - JsonObject jsonObject = jsonElement.getAsJsonObject(); - - IntegerValue count = null; - if (jsonObject.has("max_water_depth")) { - JsonObject entry = jsonObject.getAsJsonObject("max_water_depth"); - count = registries.getValueTypeRegistry(IntegerType.class).get(NamespacedKey.fromString(entry.getAsJsonPrimitive("max_water_depth_type").getAsString())).get().getParser().fromJson(entry); - } - - return new SurfaceWaterDepthModifierConfiguration(SurfaceWaterDepthModifier.this, count); - } - }; - } - - @Override - public SurfaceWaterDepthFilter createPlacementModifier(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull SurfaceWaterDepthModifierConfiguration configuration) { - int maxWaterDepth = 0; - if (configuration.getMaxWaterDepth() != null) { - maxWaterDepth = configuration.getMaxWaterDepth().getValue(worldInfo, random, position, limitedRegion); - } - return SurfaceWaterDepthFilter.forMaxDepth(maxWaterDepth); - } - - @NotNull - @Override - public Set getSettings() { - return SurfaceWaterDepthModifierConfiguration.SETTINGS; - } - - @NotNull - @Override - public SurfaceWaterDepthModifierConfiguration createEmptyConfiguration() { - return new SurfaceWaterDepthModifierConfiguration(this, null); - } -} \ No newline at end of file diff --git a/impl/v1_19_R2/src/main/java/de/derfrzocker/feature/impl/v1_19_R2/placement/configuration/SurfaceRelativeThresholdModifierConfiguration.java b/impl/v1_19_R2/src/main/java/de/derfrzocker/feature/impl/v1_19_R2/placement/configuration/SurfaceRelativeThresholdModifierConfiguration.java deleted file mode 100644 index 8876fd20..00000000 --- a/impl/v1_19_R2/src/main/java/de/derfrzocker/feature/impl/v1_19_R2/placement/configuration/SurfaceRelativeThresholdModifierConfiguration.java +++ /dev/null @@ -1,121 +0,0 @@ -package de.derfrzocker.feature.impl.v1_19_R2.placement.configuration; - -import de.derfrzocker.feature.api.FeaturePlacementModifier; -import de.derfrzocker.feature.api.PlacementModifierConfiguration; -import de.derfrzocker.feature.api.Setting; -import de.derfrzocker.feature.api.Value; -import de.derfrzocker.feature.common.value.number.IntegerType; -import de.derfrzocker.feature.common.value.number.IntegerValue; -import de.derfrzocker.feature.impl.v1_19_R2.value.heightmap.HeightmapValue; -import org.jetbrains.annotations.NotNull; - -import java.util.Collections; -import java.util.LinkedHashSet; -import java.util.Set; - -public class SurfaceRelativeThresholdModifierConfiguration implements PlacementModifierConfiguration { - - public final static Set SETTINGS; - private final static Setting MIN_INCLUSIVE = new Setting("min-inclusive", IntegerType.class); - private final static Setting MAX_INCLUSIVE = new Setting("max-inclusive", IntegerType.class); - - static { - Set settings = new LinkedHashSet<>(); - settings.add(MIN_INCLUSIVE); - settings.add(MAX_INCLUSIVE); - SETTINGS = Collections.unmodifiableSet(settings); - } - - private final FeaturePlacementModifier placementModifier; - private final HeightmapValue heightmap; - private IntegerValue minInclusive; - private IntegerValue maxInclusive; - private boolean dirty = false; - - public SurfaceRelativeThresholdModifierConfiguration(FeaturePlacementModifier placementModifier, HeightmapValue heightmap, IntegerValue minInclusive, IntegerValue maxInclusive) { - this.placementModifier = placementModifier; - this.heightmap = heightmap; - this.minInclusive = minInclusive; - this.maxInclusive = maxInclusive; - } - - @NotNull - @Override - public FeaturePlacementModifier getOwner() { - return placementModifier; - } - - public HeightmapValue getHeightmap() { - return heightmap; - } - - public IntegerValue getMinInclusive() { - return minInclusive; - } - - public IntegerValue getMaxInclusive() { - return maxInclusive; - } - - @NotNull - @Override - public Set getSettings() { - return SETTINGS; - } - - @Override - public Value getValue(@NotNull Setting setting) { - if (setting == MIN_INCLUSIVE) { - return getMinInclusive(); - } - - if (setting == MAX_INCLUSIVE) { - return getMaxInclusive(); - } - - throw new IllegalArgumentException(String.format("Setting '%s' is not in the configuration '%s'", setting, "SurfaceRelativeThresholdModifierConfiguration")); - } - - @Override - public void setValue(@NotNull Setting setting, Value value) { - if (setting == MIN_INCLUSIVE) { - minInclusive = (IntegerValue) value; - dirty = true; - return; - } - - if (setting == MAX_INCLUSIVE) { - maxInclusive = (IntegerValue) value; - dirty = true; - return; - } - - throw new IllegalArgumentException(String.format("Setting '%s' is not in the configuration '%s'", setting, "SurfaceRelativeThresholdModifierConfiguration")); - } - - @Override - public boolean isDirty() { - if (dirty) { - return true; - } - - if (minInclusive != null && minInclusive.isDirty()) { - return true; - } - - return maxInclusive != null && maxInclusive.isDirty(); - } - - @Override - public void saved() { - dirty = false; - - if (minInclusive != null) { - minInclusive.saved(); - } - - if (maxInclusive != null) { - maxInclusive.saved(); - } - } -} diff --git a/impl/v1_19_R2/src/main/java/de/derfrzocker/feature/impl/v1_19_R2/value/heightmap/HeightmapType.java b/impl/v1_19_R2/src/main/java/de/derfrzocker/feature/impl/v1_19_R2/value/heightmap/HeightmapType.java deleted file mode 100644 index 39bd5bed..00000000 --- a/impl/v1_19_R2/src/main/java/de/derfrzocker/feature/impl/v1_19_R2/value/heightmap/HeightmapType.java +++ /dev/null @@ -1,7 +0,0 @@ -package de.derfrzocker.feature.impl.v1_19_R2.value.heightmap; - -import de.derfrzocker.feature.api.ValueType; -import net.minecraft.world.level.levelgen.Heightmap; - -public abstract class HeightmapType implements ValueType { -} diff --git a/impl/v1_19_R2/src/main/java/de/derfrzocker/feature/impl/v1_19_R2/value/heightmap/HeightmapValue.java b/impl/v1_19_R2/src/main/java/de/derfrzocker/feature/impl/v1_19_R2/value/heightmap/HeightmapValue.java deleted file mode 100644 index 46cbb704..00000000 --- a/impl/v1_19_R2/src/main/java/de/derfrzocker/feature/impl/v1_19_R2/value/heightmap/HeightmapValue.java +++ /dev/null @@ -1,10 +0,0 @@ -package de.derfrzocker.feature.impl.v1_19_R2.value.heightmap; - -import de.derfrzocker.feature.common.AbstractValue; -import net.minecraft.world.level.levelgen.Heightmap; - -public abstract class HeightmapValue extends AbstractValue { - - @Override - public abstract HeightmapValue clone(); -} diff --git a/impl/v1_19_R2/src/main/java/de/derfrzocker/feature/impl/v1_19_R2/value/offset/NMSAboveBottomOffsetIntegerValue.java b/impl/v1_19_R2/src/main/java/de/derfrzocker/feature/impl/v1_19_R2/value/offset/NMSAboveBottomOffsetIntegerValue.java deleted file mode 100644 index e19eadeb..00000000 --- a/impl/v1_19_R2/src/main/java/de/derfrzocker/feature/impl/v1_19_R2/value/offset/NMSAboveBottomOffsetIntegerValue.java +++ /dev/null @@ -1,33 +0,0 @@ -package de.derfrzocker.feature.impl.v1_19_R2.value.offset; - -import de.derfrzocker.feature.common.value.number.IntegerValue; -import de.derfrzocker.feature.common.value.offset.AboveBottomOffsetIntegerValue; -import net.minecraft.world.level.WorldGenLevel; -import org.bukkit.craftbukkit.v1_19_R2.generator.CraftLimitedRegion; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Random; - -public class NMSAboveBottomOffsetIntegerValue extends AboveBottomOffsetIntegerValue { - - public NMSAboveBottomOffsetIntegerValue(IntegerValue base) { - super(base); - } - - @Override - public Integer getValue(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion) { - int baseValue = getBase() == null ? 0 : getBase().getValue(worldInfo, random, position, limitedRegion); - - WorldGenLevel level = ((CraftLimitedRegion) limitedRegion).getHandle(); - - return Math.max(level.getMinBuildHeight(), level.getLevel().getChunkSource().chunkMap.generator.getMinY()) + baseValue; - } - - @Override - public AboveBottomOffsetIntegerValue clone() { - return new NMSAboveBottomOffsetIntegerValue(getBase() == null ? null : getBase().clone()); - } -} diff --git a/impl/v1_19_R2/src/main/java/de/derfrzocker/feature/impl/v1_19_R2/value/offset/NMSBelowTopOffsetIntegerValue.java b/impl/v1_19_R2/src/main/java/de/derfrzocker/feature/impl/v1_19_R2/value/offset/NMSBelowTopOffsetIntegerValue.java deleted file mode 100644 index 0bc2f627..00000000 --- a/impl/v1_19_R2/src/main/java/de/derfrzocker/feature/impl/v1_19_R2/value/offset/NMSBelowTopOffsetIntegerValue.java +++ /dev/null @@ -1,35 +0,0 @@ -package de.derfrzocker.feature.impl.v1_19_R2.value.offset; - -import de.derfrzocker.feature.common.value.number.IntegerValue; -import de.derfrzocker.feature.common.value.offset.BelowTopOffsetIntegerValue; -import net.minecraft.world.level.WorldGenLevel; -import net.minecraft.world.level.chunk.ChunkGenerator; -import org.bukkit.craftbukkit.v1_19_R2.generator.CraftLimitedRegion; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Random; - -public class NMSBelowTopOffsetIntegerValue extends BelowTopOffsetIntegerValue { - - public NMSBelowTopOffsetIntegerValue(IntegerValue base) { - super(base); - } - - @Override - public Integer getValue(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion) { - int baseValue = getBase() == null ? 0 : getBase().getValue(worldInfo, random, position, limitedRegion); - - WorldGenLevel level = ((CraftLimitedRegion) limitedRegion).getHandle(); - ChunkGenerator chunkGenerator = level.getLevel().getChunkSource().chunkMap.generator; - - return Math.min(level.getHeight(), chunkGenerator.getGenDepth()) - 1 + Math.max(level.getMinBuildHeight(), chunkGenerator.getMinY()) - baseValue; - } - - @Override - public NMSBelowTopOffsetIntegerValue clone() { - return new NMSBelowTopOffsetIntegerValue(getBase() == null ? null : getBase().clone()); - } -} diff --git a/impl/v1_19_R2/src/main/java/de/derfrzocker/feature/impl/v1_19_R2/value/target/TargetType.java b/impl/v1_19_R2/src/main/java/de/derfrzocker/feature/impl/v1_19_R2/value/target/TargetType.java deleted file mode 100644 index fe52f9e4..00000000 --- a/impl/v1_19_R2/src/main/java/de/derfrzocker/feature/impl/v1_19_R2/value/target/TargetType.java +++ /dev/null @@ -1,7 +0,0 @@ -package de.derfrzocker.feature.impl.v1_19_R2.value.target; - -import de.derfrzocker.feature.api.ValueType; -import net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration; - -public abstract class TargetType implements ValueType { -} diff --git a/impl/v1_19_R2/src/main/java/de/derfrzocker/feature/impl/v1_19_R2/value/target/TargetValue.java b/impl/v1_19_R2/src/main/java/de/derfrzocker/feature/impl/v1_19_R2/value/target/TargetValue.java deleted file mode 100644 index bd243380..00000000 --- a/impl/v1_19_R2/src/main/java/de/derfrzocker/feature/impl/v1_19_R2/value/target/TargetValue.java +++ /dev/null @@ -1,10 +0,0 @@ -package de.derfrzocker.feature.impl.v1_19_R2.value.target; - -import de.derfrzocker.feature.common.AbstractValue; -import net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration; - -public abstract class TargetValue extends AbstractValue { - - @Override - public abstract TargetValue clone(); -} diff --git a/impl/v1_19_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R2/ConversionUtil.java b/impl/v1_19_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R2/ConversionUtil.java deleted file mode 100644 index e2ccacde..00000000 --- a/impl/v1_19_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R2/ConversionUtil.java +++ /dev/null @@ -1,77 +0,0 @@ -package de.derfrzocker.ore.control.impl.v1_19_R2; - -import de.derfrzocker.feature.common.value.number.FixedFloatValue; -import de.derfrzocker.feature.common.value.number.IntegerValue; -import de.derfrzocker.feature.common.value.number.integer.FixedDoubleToIntegerValue; -import de.derfrzocker.feature.common.value.number.integer.biased.BiasedToBottomIntegerValue; -import de.derfrzocker.feature.common.value.number.integer.clamped.ClampedIntegerValue; -import de.derfrzocker.feature.common.value.number.integer.clamped.ClampedNormalIntegerValue; -import de.derfrzocker.feature.common.value.number.integer.uniform.UniformIntegerValue; -import de.derfrzocker.feature.common.value.number.integer.weighted.WeightedListIntegerValue; -import net.minecraft.util.random.SimpleWeightedRandomList; -import net.minecraft.util.random.WeightedEntry; -import net.minecraft.util.valueproviders.ClampedInt; -import net.minecraft.util.valueproviders.ClampedNormalInt; -import net.minecraft.util.valueproviders.IntProvider; -import net.minecraft.util.valueproviders.IntProviderType; -import net.minecraft.util.valueproviders.WeightedListInt; - -import java.lang.reflect.Field; -import java.util.LinkedHashMap; -import java.util.Map; - -public final class ConversionUtil { - - private ConversionUtil() { - } - - public static IntegerValue convert(IntProvider intProvider) { - try { - if (intProvider.getType() == IntProviderType.CONSTANT) { - return new FixedDoubleToIntegerValue(intProvider.getMinValue()); - } else if (intProvider.getType() == IntProviderType.UNIFORM) { - return new UniformIntegerValue(new FixedDoubleToIntegerValue(intProvider.getMinValue()), new FixedDoubleToIntegerValue(intProvider.getMaxValue())); - } else if (intProvider.getType() == IntProviderType.BIASED_TO_BOTTOM) { - return new BiasedToBottomIntegerValue(new FixedDoubleToIntegerValue(intProvider.getMinValue()), new FixedDoubleToIntegerValue(intProvider.getMaxValue())); - } else if (intProvider.getType() == IntProviderType.CLAMPED) { - Field sourceField = ClampedInt.class.getDeclaredField(NMSReflectionNames.CLAMPED_INT_SOURCE); - Field minField = ClampedInt.class.getDeclaredField(NMSReflectionNames.CLAMPED_INT_MIN_INCLUSIVE); - Field maxField = ClampedInt.class.getDeclaredField(NMSReflectionNames.CLAMPED_INT_MAX_INCLUSIVE); - sourceField.setAccessible(true); - minField.setAccessible(true); - maxField.setAccessible(true); - - IntProvider source = (IntProvider) sourceField.get(intProvider); - int min = (int) minField.get(intProvider); - int max = (int) maxField.get(intProvider); - return new ClampedIntegerValue(convert(source), new FixedDoubleToIntegerValue(min), new FixedDoubleToIntegerValue(max)); - } else if (intProvider.getType() == IntProviderType.WEIGHTED_LIST) { - Field distributionField = WeightedListInt.class.getDeclaredField(NMSReflectionNames.WEIGHTED_LIST_INT_DISTRIBUTION); - distributionField.setAccessible(true); - SimpleWeightedRandomList distribution = (SimpleWeightedRandomList) distributionField.get(intProvider); - - Map values = new LinkedHashMap<>(); - for (WeightedEntry.Wrapper wrapper : distribution.unwrap()) { - values.put(convert(wrapper.getData()), new FixedDoubleToIntegerValue(wrapper.getWeight().asInt())); - } - - return new WeightedListIntegerValue(values); - } else if (intProvider.getType() == IntProviderType.CLAMPED_NORMAL) { - Field meanField = ClampedNormalInt.class.getDeclaredField(NMSReflectionNames.CLAMPED_NORMAL_INT_MEAN); - Field deviationField = ClampedNormalInt.class.getDeclaredField(NMSReflectionNames.CLAMPED_NORMAL_INT_DEVIATION); - meanField.setAccessible(true); - deviationField.setAccessible(true); - - float mean = (float) meanField.get(intProvider); - float deviation = (float) meanField.get(intProvider); - int min = intProvider.getMinValue(); - int max = intProvider.getMaxValue(); - return new ClampedNormalIntegerValue(new FixedFloatValue(mean), new FixedFloatValue(deviation), new FixedDoubleToIntegerValue(min), new FixedDoubleToIntegerValue(max)); - } else { - throw new UnsupportedOperationException(String.format("No integer value equivalent for IntProvider '%s'", intProvider)); - } - } catch (NoSuchFieldException | IllegalAccessException e) { - throw new RuntimeException(e); - } - } -} diff --git a/impl/v1_19_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R2/NMSReflectionNames.java b/impl/v1_19_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R2/NMSReflectionNames.java deleted file mode 100644 index d8aa5da2..00000000 --- a/impl/v1_19_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R2/NMSReflectionNames.java +++ /dev/null @@ -1,25 +0,0 @@ -package de.derfrzocker.ore.control.impl.v1_19_R2; - -public final class NMSReflectionNames { - - public final static String BIOME_GENERATION_SETTINGS_FEATURES = "e"; - public final static String BIOME_GENERATION_SETTINGS_FEATURE_SET = "g"; - public final static String WEIGHTED_LIST_INT_DISTRIBUTION = "b"; - public final static String COUNT_PLACEMENT_COUNT = "c"; - public final static String HEIGHT_RANGE_PLACEMENT_HEIGHT = "c"; - public final static String RARITY_FILTER_CHANCE = "c"; - public final static String SURFACE_RELATIVE_THRESHOLD_FILTER_HEIGHTMAP = "c"; - public final static String SURFACE_RELATIVE_THRESHOLD_FILTER_MIN_INCLUSIVE = "d"; - public final static String SURFACE_RELATIVE_THRESHOLD_FILTER_MAX_INCLUSIVE = "e"; - public final static String SURFACE_WATER_DEPTH_FILTER_MAX_WATER_DEPTH = "c"; - public static final String CLAMPED_INT_SOURCE = "b"; - public static final String CLAMPED_INT_MIN_INCLUSIVE = "f"; - public static final String CLAMPED_INT_MAX_INCLUSIVE = "g"; - public static final String CLAMPED_NORMAL_INT_MEAN = "b"; - public static final String CLAMPED_NORMAL_INT_DEVIATION = "f"; - public static final String CHUNK_MAP_GENERATOR = "u"; - public static final String NOISE_GENERATOR_SETTINGS = "e"; - - private NMSReflectionNames() { - } -} diff --git a/impl/v1_19_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R2/NMSReplacer_v1_19_R2.java b/impl/v1_19_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R2/NMSReplacer_v1_19_R2.java deleted file mode 100644 index 83c6a170..00000000 --- a/impl/v1_19_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R2/NMSReplacer_v1_19_R2.java +++ /dev/null @@ -1,510 +0,0 @@ -package de.derfrzocker.ore.control.impl.v1_19_R2; - -import com.google.common.base.Suppliers; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import com.google.gson.JsonElement; -import de.derfrzocker.feature.api.FeatureGenerator; -import de.derfrzocker.feature.api.FeatureGeneratorConfiguration; -import de.derfrzocker.feature.api.FeaturePlacementModifier; -import de.derfrzocker.feature.api.PlacementModifierConfiguration; -import de.derfrzocker.feature.api.ValueLocation; -import de.derfrzocker.feature.api.util.Parser; -import de.derfrzocker.feature.common.feature.generator.configuration.EmptyFeatureConfiguration; -import de.derfrzocker.feature.common.feature.placement.ActivationModifier; -import de.derfrzocker.feature.common.feature.placement.configuration.ActivationConfiguration; -import de.derfrzocker.feature.common.util.ValueLocationUtil; -import de.derfrzocker.feature.common.value.bool.FixedBooleanValue; -import de.derfrzocker.feature.common.value.number.FixedFloatValue; -import de.derfrzocker.feature.common.value.number.IntegerType; -import de.derfrzocker.feature.common.value.number.integer.FixedDoubleToIntegerValue; -import de.derfrzocker.feature.common.value.offset.AboveBottomOffsetIntegerType; -import de.derfrzocker.feature.common.value.offset.BelowTopOffsetIntegerType; -import de.derfrzocker.feature.impl.v1_19_R2.extra.OreVeinHandler; -import de.derfrzocker.feature.impl.v1_19_R2.feature.generator.GlowstoneBlobFeatureGenerator; -import de.derfrzocker.feature.impl.v1_19_R2.feature.generator.OreFeatureGenerator; -import de.derfrzocker.feature.impl.v1_19_R2.feature.generator.ScatteredOreGenerator; -import de.derfrzocker.feature.impl.v1_19_R2.feature.generator.configuration.OreFeatureConfiguration; -import de.derfrzocker.feature.impl.v1_19_R2.placement.CountModifier; -import de.derfrzocker.feature.impl.v1_19_R2.placement.HeightRangeModifier; -import de.derfrzocker.feature.impl.v1_19_R2.placement.RarityModifier; -import de.derfrzocker.feature.impl.v1_19_R2.placement.SurfaceRelativeThresholdModifier; -import de.derfrzocker.feature.impl.v1_19_R2.placement.SurfaceWaterDepthModifier; -import de.derfrzocker.feature.impl.v1_19_R2.value.offset.NMSAboveBottomOffsetIntegerValue; -import de.derfrzocker.feature.impl.v1_19_R2.value.offset.NMSBelowTopOffsetIntegerValue; -import de.derfrzocker.ore.control.api.NMSReplacer; -import de.derfrzocker.ore.control.api.OreControlManager; -import de.derfrzocker.ore.control.api.OreControlRegistries; -import de.derfrzocker.ore.control.api.config.Config; -import de.derfrzocker.ore.control.api.config.ConfigManager; -import de.derfrzocker.ore.control.impl.v1_19_R2.feature.generator.GlowstoneBlobFeatureGeneratorHook; -import de.derfrzocker.ore.control.impl.v1_19_R2.feature.generator.OreFeatureGeneratorHook; -import de.derfrzocker.ore.control.impl.v1_19_R2.feature.generator.ScatteredOreFeatureGeneratorHook; -import de.derfrzocker.ore.control.impl.v1_19_R2.placement.ActivationModifierHook; -import de.derfrzocker.ore.control.impl.v1_19_R2.placement.CountModifierHook; -import de.derfrzocker.ore.control.impl.v1_19_R2.placement.HeightRangeModifierHook; -import de.derfrzocker.ore.control.impl.v1_19_R2.placement.RarityModifierHook; -import de.derfrzocker.ore.control.impl.v1_19_R2.placement.SurfaceRelativeThresholdModifierHook; -import de.derfrzocker.ore.control.impl.v1_19_R2.placement.SurfaceWaterDepthModifierHook; -import net.minecraft.core.Holder; -import net.minecraft.core.HolderSet; -import net.minecraft.core.Registry; -import net.minecraft.core.RegistryAccess; -import net.minecraft.core.registries.Registries; -import net.minecraft.resources.ResourceKey; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.server.dedicated.DedicatedServer; -import net.minecraft.server.level.ServerLevel; -import net.minecraft.world.level.biome.Biome; -import net.minecraft.world.level.biome.BiomeGenerationSettings; -import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; -import net.minecraft.world.level.levelgen.feature.Feature; -import net.minecraft.world.level.levelgen.feature.GlowstoneFeature; -import net.minecraft.world.level.levelgen.feature.OreFeature; -import net.minecraft.world.level.levelgen.feature.ScatteredOreFeature; -import net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration; -import net.minecraft.world.level.levelgen.placement.CountPlacement; -import net.minecraft.world.level.levelgen.placement.HeightRangePlacement; -import net.minecraft.world.level.levelgen.placement.PlacedFeature; -import net.minecraft.world.level.levelgen.placement.PlacementModifier; -import net.minecraft.world.level.levelgen.placement.PlacementModifierType; -import net.minecraft.world.level.levelgen.placement.RarityFilter; -import net.minecraft.world.level.levelgen.placement.SurfaceRelativeThresholdFilter; -import net.minecraft.world.level.levelgen.placement.SurfaceWaterDepthFilter; -import org.bukkit.Bukkit; -import org.bukkit.NamespacedKey; -import org.bukkit.World; -import org.bukkit.craftbukkit.v1_19_R2.CraftServer; -import org.bukkit.craftbukkit.v1_19_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_19_R2.util.CraftNamespacedKey; -import org.bukkit.plugin.Plugin; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import java.io.File; -import java.io.FileWriter; -import java.io.IOException; -import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.LinkedHashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Set; -import java.util.function.BiConsumer; -import java.util.function.Supplier; -import java.util.stream.Collectors; - -public class NMSReplacer_v1_19_R2 implements NMSReplacer { - - private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create(); - private final Plugin plugin; - private final Parser configParser; - private final OreControlManager oreControlManager; - @NotNull - private final OreControlRegistries registries; - private final ConfigManager configManager; - - public NMSReplacer_v1_19_R2(@NotNull Plugin plugin, @NotNull OreControlManager oreControlManager, Parser configParser) { - this.plugin = plugin; - this.oreControlManager = oreControlManager; - this.registries = oreControlManager.getRegistries(); - this.configManager = oreControlManager.getConfigManager(); - this.configParser = configParser; - } - - @Override - public void register() { - registerValueTypes(); - registerFeatureGenerators(); - registerPlacementModifier(); - registerFeatures(); - registerBiomes(); - registerExtraValues(); - } - - private void registerValueTypes() { - registries.getValueTypeRegistry(IntegerType.class).register(new AboveBottomOffsetIntegerType(registries, NMSAboveBottomOffsetIntegerValue::new)); - registries.getValueTypeRegistry(IntegerType.class).register(new BelowTopOffsetIntegerType(registries, NMSBelowTopOffsetIntegerValue::new)); - } - - private void registerFeatureGenerators() { - registries.getFeatureGeneratorRegistry().register(new OreFeatureGenerator(registries)); - registries.getFeatureGeneratorRegistry().register(new ScatteredOreGenerator(registries)); - registries.getFeatureGeneratorRegistry().register(new GlowstoneBlobFeatureGenerator(registries)); - } - - private void registerPlacementModifier() { - registries.getPlacementModifierRegistry().register(new RarityModifier(registries)); - registries.getPlacementModifierRegistry().register(new SurfaceRelativeThresholdModifier(registries)); - registries.getPlacementModifierRegistry().register(new SurfaceWaterDepthModifier(registries)); - registries.getPlacementModifierRegistry().register(new CountModifier(registries)); - registries.getPlacementModifierRegistry().register(new HeightRangeModifier(registries)); - } - - private void registerFeatures() { - Registry placedFeatureRegistry = getRegistry().registryOrThrow(Registries.PLACED_FEATURE); - Registry> featureRegistry = getRegistry().registryOrThrow(Registries.FEATURE); - Registry> placementModifierTypes = getRegistry().registryOrThrow(Registries.PLACEMENT_MODIFIER_TYPE); - - for (PlacedFeature placedFeature : placedFeatureRegistry) { - Feature feature = placedFeature.getFeatures().findFirst().get().feature(); - ResourceLocation resourceLocation = featureRegistry.getKey(feature); - Optional> featureGenerator = registries.getFeatureGeneratorRegistry().get(NamespacedKey.fromString(resourceLocation.toString())); - - if (featureGenerator.isEmpty()) { - continue; - } - - boolean hasCount = false; - List> modifiers = new LinkedList<>(); - for (PlacementModifier modifier : placedFeature.placement()) { - if (modifier.type() == PlacementModifierType.COUNT) { - hasCount = true; - } - ResourceLocation placementModifierType = placementModifierTypes.getKey(modifier.type()); - Optional> modifierOptional = registries.getPlacementModifierRegistry().get(NamespacedKey.fromString(placementModifierType.toString())); - modifierOptional.ifPresent(modifiers::add); - } - - if (!hasCount) { - Optional> modifierOptional = registries.getPlacementModifierRegistry().get(NamespacedKey.fromString("minecraft:count")); - modifierOptional.ifPresent(modifiers::add); - } - - // inject activation / deactivation logic - Optional> modifierOptional = registries.getPlacementModifierRegistry().get(ActivationModifier.KEY); - modifierOptional.ifPresent(modifiers::add); - - registries.getFeatureRegistry().register(new de.derfrzocker.feature.api.Feature(NamespacedKey.fromString(placedFeatureRegistry.getKey(placedFeature).toString()), featureGenerator.get(), modifiers)); - } - } - - private void registerBiomes() { - Registry placedFeatureRegistry = getRegistry().registryOrThrow(Registries.PLACED_FEATURE); - forEachBiome((biome, resourceLocation) -> { - de.derfrzocker.ore.control.api.Biome bio = new de.derfrzocker.ore.control.api.Biome(CraftNamespacedKey.fromMinecraft(resourceLocation)); - - biome.getGenerationSettings().features().forEach(featureSet -> featureSet.forEach(holder -> { - PlacedFeature feature = holder.value(); - ResourceLocation featureKey = placedFeatureRegistry.getKey(feature); - - if (featureKey == null) { - // Skip if the feature is not registered, this can happen if another plugin adds a feature without registering it - return; - } - - registries.getFeatureRegistry().get(CraftNamespacedKey.fromMinecraft(featureKey)).ifPresent(value -> bio.getFeatures().add(value)); - })); - - registries.getBiomeRegistry().register(bio); - }); - } - - private void registerExtraValues() { - plugin.getServer().getPluginManager().registerEvents(new OreVeinHandler(oreControlManager), plugin); - } - - @Override - public void saveDefaultValues(File directory) { - File world = new File(directory, "world"); - File biomes = new File(directory, "biome"); - - saveWorldValues(world); - saveBiomeValues(biomes); - } - - @Override - public void hookIntoBiomes() { - forEachBiome((biome, resourceLocation) -> { - try { - hookIntoBiome(biome, resourceLocation); - } catch (final Exception e) { - throw new RuntimeException("Unexpected error while hooking in NMS for Biome: " + biome, e); - } - }); - } - - @Override - public Set getBiomes(World world) { - Set biomes = new LinkedHashSet<>(); - ServerLevel level = ((CraftWorld) world).getHandle(); - Registry registry = getRegistry().registryOrThrow(Registries.BIOME); - - for (Holder biomeHolder : level.getChunkSource().chunkMap.generator.getBiomeSource().possibleBiomes()) { - Biome biome = biomeHolder.value(); - - ResourceLocation key = registry.getKey(biome); - - biomes.add(registries.getBiomeRegistry().get(CraftNamespacedKey.fromMinecraft(key)).get()); - } - - return biomes; - } - - private void saveWorldValues(File directory) { - Registry registry = getRegistry().registryOrThrow(Registries.PLACED_FEATURE); - for (Map.Entry, PlacedFeature> entry : registry.entrySet()) { - ResourceLocation key = entry.getKey().location(); - File file = new File(directory, key.getNamespace() + "/" + key.getPath() + ".json"); - try { - saveFeature(file, null, CraftNamespacedKey.fromMinecraft(key), entry.getValue()); - } catch (Exception e) { - throw new RuntimeException(String.format("Error while saving feature '%s'", key), e); - } - } - } - - private void saveBiomeValues(File directory) { - forEachBiome((biome, biomeKey) -> { - File biomeFile = new File(directory, biomeKey.getNamespace() + "/" + biomeKey.getPath()); - List> decorations = biome.getGenerationSettings().features(); - for (HolderSet list : decorations) { - for (Holder featureSupplier : list) { - PlacedFeature feature = featureSupplier.value(); - Registry registry = getRegistry().registryOrThrow(Registries.PLACED_FEATURE); - ResourceLocation featureKey = registry.getKey(feature); - - if (featureKey == null) { - // Skip if the feature is not registered, this can happen if another plugin adds a feature without registering it - return; - } - - File featureFile = new File(biomeFile, featureKey.getNamespace() + "/" + featureKey.getPath() + ".json"); - try { - saveFeature(featureFile, registries.getBiomeRegistry().get(CraftNamespacedKey.fromMinecraft(biomeKey)).get(), CraftNamespacedKey.fromMinecraft(featureKey), feature); - } catch (Exception e) { - throw new RuntimeException(String.format("Error while saving feature '%s' in biome '%s'", featureKey, biomeKey), e); - } - } - } - }); - } - - // TODO clean up - private void saveFeature(File file, de.derfrzocker.ore.control.api.Biome biome, NamespacedKey featureKey, PlacedFeature feature) { - ConfiguredFeature configuredFeature = feature.getFeatures().findFirst().orElse(null); - - if (configuredFeature == null) { - return; - } - - if (!(configuredFeature.feature() instanceof OreFeature) && !(configuredFeature.feature() instanceof ScatteredOreFeature) && !(configuredFeature.feature() instanceof GlowstoneFeature)) { - return; - } - - file.getParentFile().mkdirs(); - - FeatureGenerator featureGenerator; - FeatureGeneratorConfiguration featureConfiguration; - - if (configuredFeature.feature() instanceof OreFeature) { - OreConfiguration configuration = (OreConfiguration) configuredFeature.config(); - featureGenerator = registries.getFeatureGeneratorRegistry().get(NamespacedKey.minecraft("ore")).get(); - featureConfiguration = new OreFeatureConfiguration(featureGenerator, null, new FixedDoubleToIntegerValue(configuration.size), new FixedFloatValue(configuration.discardChanceOnAirExposure)); - } else if (configuredFeature.feature() instanceof ScatteredOreFeature) { - OreConfiguration configuration = (OreConfiguration) configuredFeature.config(); - featureGenerator = registries.getFeatureGeneratorRegistry().get(NamespacedKey.minecraft("scattered_ore")).get(); - featureConfiguration = new OreFeatureConfiguration(featureGenerator, null, new FixedDoubleToIntegerValue(configuration.size), new FixedFloatValue(configuration.discardChanceOnAirExposure)); - } else if (configuredFeature.feature() instanceof GlowstoneFeature) { - featureGenerator = registries.getFeatureGeneratorRegistry().get(NamespacedKey.minecraft("glowstone_blob")).get(); - featureConfiguration = new EmptyFeatureConfiguration(featureGenerator); - } else { - throw new RuntimeException("HOW?"); - } - - boolean hasCount = false; - List placementConfiguration = new ArrayList<>(); - Registry> placementModifierTypes = getRegistry().registryOrThrow(Registries.PLACEMENT_MODIFIER_TYPE); - for (PlacementModifier placement : feature.placement()) { - ResourceLocation placementModifierType = placementModifierTypes.getKey(placement.type()); - Optional> modifierOptional = registries.getPlacementModifierRegistry().get(NamespacedKey.fromString(placementModifierType.toString())); - - if (modifierOptional.isEmpty()) { - continue; - } - - if (placement.type() == PlacementModifierType.RARITY_FILTER && placement instanceof RarityFilter) { - placementConfiguration.add(RarityModifierHook.createDefaultConfiguration((RarityFilter) placement, modifierOptional.get())); - } - if (placement.type() == PlacementModifierType.SURFACE_RELATIVE_THRESHOLD_FILTER && placement instanceof SurfaceRelativeThresholdFilter) { - placementConfiguration.add(SurfaceRelativeThresholdModifierHook.createDefaultConfiguration((SurfaceRelativeThresholdFilter) placement, modifierOptional.get())); - } - if (placement.type() == PlacementModifierType.SURFACE_WATER_DEPTH_FILTER && placement instanceof SurfaceWaterDepthFilter) { - placementConfiguration.add(SurfaceWaterDepthModifierHook.createDefaultConfiguration((SurfaceWaterDepthFilter) placement, modifierOptional.get())); - } - if (placement.type() == PlacementModifierType.COUNT && placement instanceof CountPlacement) { - placementConfiguration.add(CountModifierHook.createDefaultConfiguration((CountPlacement) placement, modifierOptional.get())); - hasCount = true; - } - if (placement.type() == PlacementModifierType.HEIGHT_RANGE && placement instanceof HeightRangePlacement) { - placementConfiguration.add(HeightRangeModifierHook.createDefaultConfiguration((HeightRangePlacement) placement, modifierOptional.get())); - } - } - - if (!hasCount) { - Optional> modifierOptional = registries.getPlacementModifierRegistry().get(NamespacedKey.fromString("minecraft:count")); - - modifierOptional.ifPresent(modifier -> placementConfiguration.add(0, CountModifierHook.createDefaultConfiguration(CountPlacement.of(1), modifier))); - } - - // inject activation / deactivation logic - Optional> modifierOptional = registries.getPlacementModifierRegistry().get(ActivationModifier.KEY); - modifierOptional.ifPresent(modifier -> placementConfiguration.add(0, new ActivationConfiguration(modifier, new FixedBooleanValue(true)))); - - Config config = new Config(placementConfiguration, featureConfiguration); - - if (biome == null) { - ValueLocationUtil.setValueLocation(Optional.of(config), ValueLocation.DEFAULT_WORLD); - configManager.setDefaultConfig(featureKey, config); - } else { - ValueLocationUtil.setValueLocation(Optional.of(config), ValueLocation.DEFAULT_BIOME); - configManager.setDefaultConfig(biome, featureKey, config); - } - - if (file.exists()) { - return; - } - - try { - file.createNewFile(); - } catch (IOException e) { - throw new RuntimeException(e); - } - - JsonElement element = configParser.toJson(config); - try (FileWriter writer = new FileWriter(file)) { - writer.write(GSON.toJson(element)); - } catch (IOException e) { - throw new RuntimeException(e); - } - } - - private void forEachBiome(BiConsumer consumer) { - Registry registry = getRegistry().registryOrThrow(Registries.BIOME); - for (Biome biome : registry) { - consumer.accept(biome, registry.getKey(biome)); - } - } - - private void hookIntoBiome(@NotNull final Biome biome, ResourceLocation minecraftKey) throws NoSuchFieldException, IllegalAccessException { - de.derfrzocker.ore.control.api.Biome oreControlBiome = registries.getBiomeRegistry().get(CraftNamespacedKey.fromMinecraft(minecraftKey)).get(); - List> decorations = biome.getGenerationSettings().features(); - List> newDecorations = new ArrayList<>(); - for (HolderSet list : decorations) { - List> newList = new ArrayList<>(); - - for (Holder featureSupplier : list) { - PlacedFeature feature = featureSupplier.value(); - - PlacedFeature newFeature = check(oreControlBiome, minecraftKey, feature); - - if (newFeature != null) { - newList.add(Holder.direct(newFeature)); - } else { - newList.add(featureSupplier); - } - } - - newDecorations.add(decorations.indexOf(list), HolderSet.direct(newList)); - } - - { - final Field field = getField(BiomeGenerationSettings.class, NMSReflectionNames.BIOME_GENERATION_SETTINGS_FEATURES); - field.setAccessible(true); - field.set(biome.getGenerationSettings(), newDecorations); - } - { - final Field field = getField(BiomeGenerationSettings.class, NMSReflectionNames.BIOME_GENERATION_SETTINGS_FEATURE_SET); - field.setAccessible(true); - field.set(biome.getGenerationSettings(), Suppliers.memoize(() -> newDecorations.stream().flatMap(HolderSet::stream).map(Holder::value).collect(Collectors.toSet()))); - } - } - - private void addToList(List> list, int index, PlacedFeature feature) { - list.add(index, () -> feature); - } - - @Nullable - private PlacedFeature check(de.derfrzocker.ore.control.api.Biome biome, ResourceLocation biomeKey, PlacedFeature feature) { - // Not the best method to do this, but hey it works - final Registry registry = getRegistry().registryOrThrow(Registries.PLACED_FEATURE); - ResourceLocation featureKey = registry.getKey(feature); - - // Return if the featureKey is null, this can happen when plugins are adding placed features to the biome without registering them - if (featureKey == null) { - // TODO add debug message - return null; - } - - NamespacedKey key = CraftNamespacedKey.fromMinecraft(featureKey); - ConfiguredFeature configuredFeature = feature.getFeatures().findFirst().orElse(null); - - if (configuredFeature == null) { - return null; - } - - if (!(configuredFeature.feature() instanceof OreFeature) && !(configuredFeature.feature() instanceof ScatteredOreFeature) && !(configuredFeature.feature() instanceof GlowstoneFeature)) { - return null; - } - - boolean hasCount = false; - List placementModifiers = new ArrayList<>(); - for (PlacementModifier placement : feature.placement()) { - if (placement.type() == PlacementModifierType.RARITY_FILTER) { - placementModifiers.add(new RarityModifierHook(oreControlManager, biome, key, (RarityFilter) placement)); - } else if (placement.type() == PlacementModifierType.SURFACE_RELATIVE_THRESHOLD_FILTER) { - placementModifiers.add(new SurfaceRelativeThresholdModifierHook(oreControlManager, biome, key, (SurfaceRelativeThresholdFilter) placement)); - } else if (placement.type() == PlacementModifierType.SURFACE_WATER_DEPTH_FILTER) { - placementModifiers.add(new SurfaceWaterDepthModifierHook(oreControlManager, biome, key, (SurfaceWaterDepthFilter) placement)); - } else if (placement.type() == PlacementModifierType.COUNT) { - hasCount = true; - placementModifiers.add(new CountModifierHook(oreControlManager, biome, key, (CountPlacement) placement)); - } else if (placement.type() == PlacementModifierType.HEIGHT_RANGE) { - placementModifiers.add(new HeightRangeModifierHook(oreControlManager, biome, key, (HeightRangePlacement) placement)); - } else { - placementModifiers.add(placement); - } - } - - if (!hasCount) { - placementModifiers.add(0, new CountModifierHook(oreControlManager, biome, key, CountPlacement.of(1))); - } - - // inject activation / deactivation logic - Optional> modifierOptional = registries.getPlacementModifierRegistry().get(ActivationModifier.KEY); - modifierOptional.ifPresent(modifier -> placementModifiers.add(0, new ActivationModifierHook(oreControlManager, biome, key))); - - if (configuredFeature.feature() instanceof OreFeature) { - return new PlacedFeature(Holder.direct(new ConfiguredFeature(new OreFeatureGeneratorHook(oreControlManager, key, biome), configuredFeature.config())), placementModifiers); - } else if (configuredFeature.feature() instanceof ScatteredOreFeature) { - return new PlacedFeature(Holder.direct(new ConfiguredFeature(new ScatteredOreFeatureGeneratorHook(oreControlManager, key, biome), configuredFeature.config())), placementModifiers); - } else if (configuredFeature.feature() instanceof GlowstoneFeature) { - return new PlacedFeature(Holder.direct(new ConfiguredFeature(new GlowstoneBlobFeatureGeneratorHook(oreControlManager, biome, key), configuredFeature.config())), placementModifiers); - } - - throw new RuntimeException("HOW?"); - } - - @SuppressWarnings("rawtypes") - private Field getField(@NotNull final Class clazz, @NotNull final String fieldName) throws NoSuchFieldException { - try { - return clazz.getDeclaredField(fieldName); - } catch (final NoSuchFieldException e) { - final Class superClass = clazz.getSuperclass(); - if (superClass == null) { - throw e; - } else { - return getField(superClass, fieldName); - } - } - } - - @NotNull - private RegistryAccess getRegistry() { - final DedicatedServer server = ((CraftServer) Bukkit.getServer()).getServer(); - - return server.registryAccess(); - } -} diff --git a/impl/v1_19_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R2/feature/generator/GlowstoneBlobFeatureGeneratorHook.java b/impl/v1_19_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R2/feature/generator/GlowstoneBlobFeatureGeneratorHook.java deleted file mode 100644 index d3f9ae68..00000000 --- a/impl/v1_19_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R2/feature/generator/GlowstoneBlobFeatureGeneratorHook.java +++ /dev/null @@ -1,25 +0,0 @@ -package de.derfrzocker.ore.control.impl.v1_19_R2.feature.generator; - -import de.derfrzocker.feature.common.feature.generator.configuration.EmptyFeatureConfiguration; -import de.derfrzocker.ore.control.api.Biome; -import de.derfrzocker.ore.control.api.OreControlManager; -import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Random; - -public class GlowstoneBlobFeatureGeneratorHook extends MinecraftFeatureGeneratorHook { - - public GlowstoneBlobFeatureGeneratorHook(@NotNull OreControlManager oreControlManager, Biome biome, NamespacedKey namespacedKey) { - super(NoneFeatureConfiguration.CODEC, GLOWSTONE_BLOB, oreControlManager, "glowstone_blob", biome, namespacedKey); - } - - @Override - public NoneFeatureConfiguration createConfig(@NotNull NoneFeatureConfiguration defaultConfiguration, @NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull EmptyFeatureConfiguration configuration) { - return defaultConfiguration; - } -} diff --git a/impl/v1_19_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R2/feature/generator/MinecraftFeatureGeneratorHook.java b/impl/v1_19_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R2/feature/generator/MinecraftFeatureGeneratorHook.java deleted file mode 100644 index 2cecf298..00000000 --- a/impl/v1_19_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R2/feature/generator/MinecraftFeatureGeneratorHook.java +++ /dev/null @@ -1,100 +0,0 @@ -package de.derfrzocker.ore.control.impl.v1_19_R2.feature.generator; - -import com.mojang.serialization.Codec; -import de.derfrzocker.feature.api.FeatureGenerator; -import de.derfrzocker.feature.api.FeatureGeneratorConfiguration; -import de.derfrzocker.ore.control.api.Biome; -import de.derfrzocker.ore.control.api.FeatureGeneratorHook; -import de.derfrzocker.ore.control.api.OreControlManager; -import de.derfrzocker.ore.control.api.config.Config; -import de.derfrzocker.ore.control.api.config.ConfigManager; -import net.minecraft.core.BlockPos; -import net.minecraft.util.RandomSource; -import net.minecraft.world.level.ChunkPos; -import net.minecraft.world.level.WorldGenLevel; -import net.minecraft.world.level.chunk.ChunkGenerator; -import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; -import net.minecraft.world.level.levelgen.feature.Feature; -import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext; -import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration; -import org.bukkit.NamespacedKey; -import org.bukkit.craftbukkit.v1_19_R2.generator.CraftLimitedRegion; -import org.bukkit.craftbukkit.v1_19_R2.util.RandomSourceWrapper; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Map; -import java.util.Optional; -import java.util.Random; -import java.util.concurrent.ConcurrentHashMap; - -public abstract class MinecraftFeatureGeneratorHook extends Feature implements FeatureGeneratorHook { - - private final Map cache = new ConcurrentHashMap<>(); - private final Feature feature; - private final ConfigManager configManager; - private final FeatureGenerator featureGenerator; - private final Biome biome; - private final NamespacedKey namespacedKey; - - public MinecraftFeatureGeneratorHook(Codec codec, Feature feature, @NotNull OreControlManager oreControlManager, @NotNull String name, Biome biome, NamespacedKey namespacedKey) { - super(codec); - this.feature = feature; - this.configManager = oreControlManager.getConfigManager(); - this.featureGenerator = (FeatureGenerator) oreControlManager.getRegistries().getFeatureGeneratorRegistry().get(NamespacedKey.minecraft(name)).get(); - this.biome = biome; - this.namespacedKey = namespacedKey; - - oreControlManager.addValueChangeListener(cache::clear); - } - - public abstract M createConfig(@NotNull M defaultConfiguration, @NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull C configuration); - - @Override - public FeatureGenerator getFeatureGenerator() { - return featureGenerator; - } - - @Override - public Biome getBiome() { - return biome; - } - - @NotNull - @Override - public NamespacedKey getKey() { - return namespacedKey; - } - - @Override - public boolean place(FeaturePlaceContext context) { - BlockPos origin = context.origin(); - - FeatureGeneratorConfiguration configuration = cache.computeIfAbsent(context.level().getMinecraftWorld().getWorld().getName(), this::loadConfig); - if (configuration == null) { - return feature.place(context); - } - - CraftLimitedRegion limitedRegion = new CraftLimitedRegion(context.level(), new ChunkPos(origin)); - M config = createConfig(context.config(), context.level().getMinecraftWorld().getWorld(), new RandomSourceWrapper.RandomWrapper(context.random()), new BlockVector(origin.getX(), origin.getY(), origin.getZ()), limitedRegion, (C) configuration); - limitedRegion.breakLink(); - - return place(context.topFeature(), context.level(), context.chunkGenerator(), context.random(), origin, config); - } - - private FeatureGeneratorConfiguration loadConfig(String name) { - Config config = configManager.getGenerationConfig(configManager.getOrCreateConfigInfo(name), biome, namespacedKey).orElse(null); - - if (config == null) { - return null; - } - - return config.getFeature(); - } - - private boolean place(Optional> top, WorldGenLevel world, ChunkGenerator generator, RandomSource random, BlockPos pos, M config) { - return feature.place(new FeaturePlaceContext<>(top, world, generator, random, pos, config)); - } -} diff --git a/impl/v1_19_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R2/feature/generator/OreFeatureGeneratorHook.java b/impl/v1_19_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R2/feature/generator/OreFeatureGeneratorHook.java deleted file mode 100644 index 55b5608a..00000000 --- a/impl/v1_19_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R2/feature/generator/OreFeatureGeneratorHook.java +++ /dev/null @@ -1,53 +0,0 @@ -package de.derfrzocker.ore.control.impl.v1_19_R2.feature.generator; - -import de.derfrzocker.feature.impl.v1_19_R2.feature.generator.configuration.OreFeatureConfiguration; -import de.derfrzocker.feature.impl.v1_19_R2.value.target.TargetValue; -import de.derfrzocker.ore.control.api.Biome; -import de.derfrzocker.ore.control.api.OreControlManager; -import net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.ArrayList; -import java.util.List; -import java.util.Random; - -public class OreFeatureGeneratorHook extends MinecraftFeatureGeneratorHook { - - public OreFeatureGeneratorHook(@NotNull OreControlManager oreControlManager, @NotNull NamespacedKey namespacedKey, @NotNull Biome biome) { - super(OreConfiguration.CODEC, ORE, oreControlManager, "ore", biome, namespacedKey); - } - - @Override - public OreConfiguration createConfig(@NotNull OreConfiguration defaultConfiguration, @NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull OreFeatureConfiguration configuration) { - List blockStates; - if (configuration.getTargets() == null) { - blockStates = defaultConfiguration.targetStates; - } else { - blockStates = new ArrayList<>(); - - for (TargetValue targetValue : configuration.getTargets()) { - blockStates.add(targetValue.getValue(worldInfo, random, position, limitedRegion)); - } - } - - int size; - if (configuration.getSize() == null) { - size = defaultConfiguration.size; - } else { - size = configuration.getSize().getValue(worldInfo, random, position, limitedRegion); - } - - float discardChanceOnAirExposure; - if (configuration.getDiscardChanceOnAirExposure() == null) { - discardChanceOnAirExposure = defaultConfiguration.discardChanceOnAirExposure; - } else { - discardChanceOnAirExposure = configuration.getDiscardChanceOnAirExposure().getValue(worldInfo, random, position, limitedRegion); - } - - return new OreConfiguration(blockStates, size, discardChanceOnAirExposure); - } -} diff --git a/impl/v1_19_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R2/feature/generator/ScatteredOreFeatureGeneratorHook.java b/impl/v1_19_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R2/feature/generator/ScatteredOreFeatureGeneratorHook.java deleted file mode 100644 index 8695ff9b..00000000 --- a/impl/v1_19_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R2/feature/generator/ScatteredOreFeatureGeneratorHook.java +++ /dev/null @@ -1,53 +0,0 @@ -package de.derfrzocker.ore.control.impl.v1_19_R2.feature.generator; - -import de.derfrzocker.feature.impl.v1_19_R2.feature.generator.configuration.OreFeatureConfiguration; -import de.derfrzocker.feature.impl.v1_19_R2.value.target.TargetValue; -import de.derfrzocker.ore.control.api.Biome; -import de.derfrzocker.ore.control.api.OreControlManager; -import net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.ArrayList; -import java.util.List; -import java.util.Random; - -public class ScatteredOreFeatureGeneratorHook extends MinecraftFeatureGeneratorHook { - - public ScatteredOreFeatureGeneratorHook(@NotNull OreControlManager oreControlManager, @NotNull NamespacedKey namespacedKey, @NotNull Biome biome) { - super(OreConfiguration.CODEC, SCATTERED_ORE, oreControlManager, "scattered_ore", biome, namespacedKey); - } - - @Override - public OreConfiguration createConfig(@NotNull OreConfiguration defaultConfiguration, @NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull OreFeatureConfiguration configuration) { - List blockStates; - if (configuration.getTargets() == null) { - blockStates = defaultConfiguration.targetStates; - } else { - blockStates = new ArrayList<>(); - - for (TargetValue targetValue : configuration.getTargets()) { - blockStates.add(targetValue.getValue(worldInfo, random, position, limitedRegion)); - } - } - - int size; - if (configuration.getSize() == null) { - size = defaultConfiguration.size; - } else { - size = configuration.getSize().getValue(worldInfo, random, position, limitedRegion); - } - - float discardChanceOnAirExposure; - if (configuration.getDiscardChanceOnAirExposure() == null) { - discardChanceOnAirExposure = defaultConfiguration.discardChanceOnAirExposure; - } else { - discardChanceOnAirExposure = configuration.getDiscardChanceOnAirExposure().getValue(worldInfo, random, position, limitedRegion); - } - - return new OreConfiguration(blockStates, size, discardChanceOnAirExposure); - } -} diff --git a/impl/v1_19_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R2/placement/ActivationModifierHook.java b/impl/v1_19_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R2/placement/ActivationModifierHook.java deleted file mode 100644 index 6474c1f7..00000000 --- a/impl/v1_19_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R2/placement/ActivationModifierHook.java +++ /dev/null @@ -1,95 +0,0 @@ -package de.derfrzocker.ore.control.impl.v1_19_R2.placement; - -import de.derfrzocker.feature.api.FeaturePlacementModifier; -import de.derfrzocker.feature.api.PlacementModifierConfiguration; -import de.derfrzocker.feature.common.feature.placement.ActivationModifier; -import de.derfrzocker.feature.common.feature.placement.configuration.ActivationConfiguration; -import de.derfrzocker.ore.control.api.Biome; -import de.derfrzocker.ore.control.api.OreControlManager; -import de.derfrzocker.ore.control.api.PlacementModifierHook; -import de.derfrzocker.ore.control.api.config.Config; -import de.derfrzocker.ore.control.api.config.ConfigManager; -import net.minecraft.core.BlockPos; -import net.minecraft.util.RandomSource; -import net.minecraft.world.level.ChunkPos; -import net.minecraft.world.level.levelgen.placement.PlacementContext; -import net.minecraft.world.level.levelgen.placement.PlacementModifier; -import net.minecraft.world.level.levelgen.placement.PlacementModifierType; -import org.bukkit.NamespacedKey; -import org.bukkit.craftbukkit.v1_19_R2.generator.CraftLimitedRegion; -import org.bukkit.craftbukkit.v1_19_R2.util.RandomSourceWrapper; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; -import java.util.stream.Stream; - -// TODO make more generic -public class ActivationModifierHook extends PlacementModifier implements PlacementModifierHook { - - private final Map cache = new ConcurrentHashMap<>(); - private final ActivationModifier activationModifier; - private final ConfigManager configManager; - private final Biome biome; - private final NamespacedKey namespacedKey; - - public ActivationModifierHook(@NotNull OreControlManager oreControlManager, @NotNull Biome biome, @NotNull NamespacedKey namespacedKey) { - this.configManager = oreControlManager.getConfigManager(); - this.activationModifier = (ActivationModifier) oreControlManager.getRegistries().getPlacementModifierRegistry().get(ActivationModifier.KEY).get(); - this.biome = biome; - this.namespacedKey = namespacedKey; - - oreControlManager.addValueChangeListener(cache::clear); - } - - @Override - public FeaturePlacementModifier getPlacementModifier() { - return activationModifier; - } - - @Override - public Biome getBiome() { - return biome; - } - - @NotNull - @Override - public NamespacedKey getKey() { - return activationModifier.getKey(); - } - - @Override - public Stream getPositions(PlacementContext context, RandomSource random, BlockPos blockPos) { - PlacementModifierConfiguration configuration = cache.computeIfAbsent(context.getLevel().getMinecraftWorld().getWorld().getName(), this::loadConfig); - if (configuration == null) { - return Stream.of(blockPos); - } - - CraftLimitedRegion limitedRegion = new CraftLimitedRegion(context.getLevel(), new ChunkPos(blockPos)); - Stream pos = activationModifier.getPositions(context.getLevel().getMinecraftWorld().getWorld(), new RandomSourceWrapper.RandomWrapper(random), new BlockVector(blockPos.getX(), blockPos.getY(), blockPos.getZ()), limitedRegion, (ActivationConfiguration) configuration); - - limitedRegion.breakLink(); - - return pos.map(blockVector -> new BlockPos(blockVector.getBlockX(), blockVector.getBlockY(), blockVector.getBlockZ())); - } - - private PlacementModifierConfiguration loadConfig(String name) { - Config config = configManager.getGenerationConfig(configManager.getOrCreateConfigInfo(name), biome, namespacedKey).orElse(null); - - if (config == null) { - return null; - } - - if (config.getPlacements() == null) { - return null; - } - - return config.getPlacements().get(activationModifier); - } - - @Override - public PlacementModifierType type() { - return null; - } -} diff --git a/impl/v1_19_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R2/placement/CountModifierHook.java b/impl/v1_19_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R2/placement/CountModifierHook.java deleted file mode 100644 index 853ee1a6..00000000 --- a/impl/v1_19_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R2/placement/CountModifierHook.java +++ /dev/null @@ -1,55 +0,0 @@ -package de.derfrzocker.ore.control.impl.v1_19_R2.placement; - -import de.derfrzocker.feature.api.FeaturePlacementModifier; -import de.derfrzocker.feature.common.feature.placement.configuration.CountModifierConfiguration; -import de.derfrzocker.feature.common.value.number.IntegerValue; -import de.derfrzocker.ore.control.api.Biome; -import de.derfrzocker.ore.control.api.OreControlManager; -import de.derfrzocker.ore.control.impl.v1_19_R2.ConversionUtil; -import de.derfrzocker.ore.control.impl.v1_19_R2.NMSReflectionNames; -import net.minecraft.util.valueproviders.IntProvider; -import net.minecraft.world.level.levelgen.placement.CountPlacement; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.lang.reflect.Field; -import java.util.Random; - -public class CountModifierHook extends MinecraftPlacementModifierHook { - - public CountModifierHook(@NotNull OreControlManager oreControlManager, @NotNull Biome biome, @NotNull NamespacedKey namespacedKey, @NotNull CountPlacement defaultModifier) { - super(oreControlManager, "count", defaultModifier, biome, namespacedKey); - } - - public static CountModifierConfiguration createDefaultConfiguration(@NotNull CountPlacement defaultModifier, @NotNull FeaturePlacementModifier modifier) { - try { - Field count = CountPlacement.class.getDeclaredField(NMSReflectionNames.COUNT_PLACEMENT_COUNT); - count.setAccessible(true); - IntProvider value = (IntProvider) count.get(defaultModifier); - IntegerValue integerValue = ConversionUtil.convert(value); - return new CountModifierConfiguration(modifier, integerValue); - } catch (NoSuchFieldException | IllegalAccessException e) { - throw new RuntimeException(e); - } - } - - @Override - public CountModifierConfiguration createDefaultConfiguration(@NotNull CountPlacement defaultModifier) { - return createDefaultConfiguration(defaultModifier, getPlacementModifier()); - } - - @Override - public CountPlacement createModifier(@NotNull CountModifierConfiguration defaultConfiguration, @NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull CountModifierConfiguration configuration) { - int count; - if (configuration.getCount() == null) { - count = defaultConfiguration.getCount().getValue(worldInfo, random, position, limitedRegion); - } else { - count = configuration.getCount().getValue(worldInfo, random, position, limitedRegion); - } - - return CountPlacement.of(count); - } -} diff --git a/impl/v1_19_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R2/placement/HeightRangeModifierHook.java b/impl/v1_19_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R2/placement/HeightRangeModifierHook.java deleted file mode 100644 index 16b4d070..00000000 --- a/impl/v1_19_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R2/placement/HeightRangeModifierHook.java +++ /dev/null @@ -1,122 +0,0 @@ -package de.derfrzocker.ore.control.impl.v1_19_R2.placement; - -import de.derfrzocker.feature.api.FeaturePlacementModifier; -import de.derfrzocker.feature.common.feature.placement.configuration.HeightRangeModifierConfiguration; -import de.derfrzocker.feature.common.value.number.IntegerValue; -import de.derfrzocker.feature.common.value.number.integer.FixedDoubleToIntegerValue; -import de.derfrzocker.feature.common.value.number.integer.trapezoid.TrapezoidIntegerValue; -import de.derfrzocker.feature.common.value.number.integer.uniform.UniformIntegerValue; -import de.derfrzocker.feature.impl.v1_19_R2.value.offset.NMSAboveBottomOffsetIntegerValue; -import de.derfrzocker.feature.impl.v1_19_R2.value.offset.NMSBelowTopOffsetIntegerValue; -import de.derfrzocker.ore.control.api.Biome; -import de.derfrzocker.ore.control.api.OreControlManager; -import de.derfrzocker.ore.control.impl.v1_19_R2.NMSReflectionNames; -import net.minecraft.world.level.levelgen.VerticalAnchor; -import net.minecraft.world.level.levelgen.heightproviders.ConstantHeight; -import net.minecraft.world.level.levelgen.heightproviders.HeightProvider; -import net.minecraft.world.level.levelgen.heightproviders.HeightProviderType; -import net.minecraft.world.level.levelgen.placement.HeightRangePlacement; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.lang.reflect.Field; -import java.util.Random; - -public class HeightRangeModifierHook extends MinecraftPlacementModifierHook { - - public HeightRangeModifierHook(@NotNull OreControlManager oreControlManager, @NotNull Biome biome, @NotNull NamespacedKey namespacedKey, @NotNull HeightRangePlacement defaultModifier) { - super(oreControlManager, "height_range", defaultModifier, biome, namespacedKey); - } - - public static HeightRangeModifierConfiguration createDefaultConfiguration(@NotNull HeightRangePlacement defaultModifier, @NotNull FeaturePlacementModifier modifier) { - try { - Field height = HeightRangePlacement.class.getDeclaredField(NMSReflectionNames.HEIGHT_RANGE_PLACEMENT_HEIGHT); - height.setAccessible(true); - HeightProvider value = (HeightProvider) height.get(defaultModifier); - - IntegerValue integerValue; - if (value.getType() == HeightProviderType.CONSTANT) { - integerValue = getIntegerValue(value.toString()); - } else if (value.getType() == HeightProviderType.UNIFORM) { - String uniform = value.toString(); - uniform = uniform.substring(1); - uniform = uniform.substring(0, uniform.length() - 1); - int charType = uniform.indexOf("-", 1); - String[] anchors = new String[]{uniform.substring(0, charType), uniform.substring(charType + 1)}; - - integerValue = new UniformIntegerValue(getIntegerValue(anchors[0]), getIntegerValue(anchors[1])); - } else if (value.getType() == HeightProviderType.TRAPEZOID) { - String trapezoid = value.toString(); - if (trapezoid.startsWith("triangle")) { - trapezoid = trapezoid.replace("triangle (", ""); - trapezoid = trapezoid.substring(0, trapezoid.length() - 1); - int charType = trapezoid.indexOf("-", 1); - String[] anchors = new String[]{trapezoid.substring(0, charType), trapezoid.substring(charType + 1)}; - - integerValue = new TrapezoidIntegerValue(getIntegerValue(anchors[0]), getIntegerValue(anchors[1]), new FixedDoubleToIntegerValue(0)); - } else if (trapezoid.startsWith("trapezoid")) { - trapezoid = trapezoid.replace("trapezoid (", ""); - trapezoid = trapezoid.substring(0, trapezoid.length() - 1); - String[] split = trapezoid.split("\\) in \\["); - - if (split.length != 2) { - throw new IllegalStateException(String.format("Expected a split of size '2', but got '%s' for input '%s'", split.length, trapezoid)); - } - - int plateau = Integer.parseInt(split[0]); - int charType = trapezoid.indexOf("-", 1); - String[] anchors = new String[]{trapezoid.substring(0, charType), trapezoid.substring(charType + 1)}; - integerValue = new TrapezoidIntegerValue(getIntegerValue(anchors[0]), getIntegerValue(anchors[1]), new FixedDoubleToIntegerValue(plateau)); - } else { - throw new UnsupportedOperationException(String.format("Unknown trapezoid value '%s'", trapezoid)); - } - - } else { // TODO add rest of HeightProvider types - throw new UnsupportedOperationException(String.format("No integer value equivalent for HeightProvider '%s'", value)); - } - - return new HeightRangeModifierConfiguration(modifier, integerValue); - } catch (NoSuchFieldException | IllegalAccessException e) { - throw new RuntimeException(e); - } - } - - private static IntegerValue getIntegerValue(String anchor) { - String[] values = anchor.split(" "); - int value = Integer.parseInt(values[0]); - - if (values.length == 2 && values[1].equals("absolute")) { - return new FixedDoubleToIntegerValue(value); - } - - if (values.length == 3 && values[1].equals("above") && values[2].equals("bottom")) { - return new NMSAboveBottomOffsetIntegerValue(new FixedDoubleToIntegerValue(value)); - } - - if (values.length == 3 && values[1].equals("below") && values[2].equals("top")) { - return new NMSBelowTopOffsetIntegerValue(new FixedDoubleToIntegerValue(value)); - } - - throw new UnsupportedOperationException(String.format("Unknown vertical anchor '%s'", anchor)); - } - - @Override - public HeightRangeModifierConfiguration createDefaultConfiguration(@NotNull HeightRangePlacement defaultModifier) { - return createDefaultConfiguration(defaultModifier, getPlacementModifier()); - } - - @Override - public HeightRangePlacement createModifier(@NotNull HeightRangeModifierConfiguration defaultConfiguration, @NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull HeightRangeModifierConfiguration configuration) { - int height; - if (configuration.getHeight() == null) { - height = defaultConfiguration.getHeight().getValue(worldInfo, random, position, limitedRegion); - } else { - height = configuration.getHeight().getValue(worldInfo, random, position, limitedRegion); - } - - return HeightRangePlacement.of(ConstantHeight.of(VerticalAnchor.absolute(height))); - } -} diff --git a/impl/v1_19_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R2/placement/MinecraftPlacementModifierHook.java b/impl/v1_19_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R2/placement/MinecraftPlacementModifierHook.java deleted file mode 100644 index 2ebabafb..00000000 --- a/impl/v1_19_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R2/placement/MinecraftPlacementModifierHook.java +++ /dev/null @@ -1,106 +0,0 @@ -package de.derfrzocker.ore.control.impl.v1_19_R2.placement; - -import de.derfrzocker.feature.api.FeaturePlacementModifier; -import de.derfrzocker.feature.api.PlacementModifierConfiguration; -import de.derfrzocker.ore.control.api.Biome; -import de.derfrzocker.ore.control.api.OreControlManager; -import de.derfrzocker.ore.control.api.PlacementModifierHook; -import de.derfrzocker.ore.control.api.config.Config; -import de.derfrzocker.ore.control.api.config.ConfigManager; -import net.minecraft.core.BlockPos; -import net.minecraft.util.RandomSource; -import net.minecraft.world.level.ChunkPos; -import net.minecraft.world.level.WorldGenLevel; -import net.minecraft.world.level.chunk.ChunkGenerator; -import net.minecraft.world.level.levelgen.placement.PlacedFeature; -import net.minecraft.world.level.levelgen.placement.PlacementContext; -import net.minecraft.world.level.levelgen.placement.PlacementModifier; -import net.minecraft.world.level.levelgen.placement.PlacementModifierType; -import org.bukkit.NamespacedKey; -import org.bukkit.craftbukkit.v1_19_R2.generator.CraftLimitedRegion; -import org.bukkit.craftbukkit.v1_19_R2.util.RandomSourceWrapper; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Map; -import java.util.Optional; -import java.util.Random; -import java.util.concurrent.ConcurrentHashMap; -import java.util.stream.Stream; - -public abstract class MinecraftPlacementModifierHook extends PlacementModifier implements PlacementModifierHook { - - private final Map cache = new ConcurrentHashMap<>(); - private final FeaturePlacementModifier placementModifier; - private final ConfigManager configManager; - private final M defaultModifier; - private final C defaultConfiguration; - private final Biome biome; - private final NamespacedKey namespacedKey; - - public MinecraftPlacementModifierHook(@NotNull OreControlManager oreControlManager, @NotNull String name, @NotNull M defaultModifier, @NotNull Biome biome, @NotNull NamespacedKey namespacedKey) { - this.configManager = oreControlManager.getConfigManager(); - this.placementModifier = (FeaturePlacementModifier) oreControlManager.getRegistries().getPlacementModifierRegistry().get(NamespacedKey.minecraft(name)).get(); - this.defaultModifier = defaultModifier; - this.defaultConfiguration = createDefaultConfiguration(defaultModifier); - this.biome = biome; - this.namespacedKey = namespacedKey; - - oreControlManager.addValueChangeListener(cache::clear); - } - - public abstract M createModifier(@NotNull C defaultConfiguration, @NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull C configuration); - - public abstract C createDefaultConfiguration(M defaultModifier); - - @Override - public FeaturePlacementModifier getPlacementModifier() { - return placementModifier; - } - - @Override - public Biome getBiome() { - return biome; - } - - @NotNull - @Override - public NamespacedKey getKey() { - return namespacedKey; - } - - @Override - public Stream getPositions(PlacementContext context, RandomSource random, BlockPos blockPos) { - PlacementModifierConfiguration configuration = cache.computeIfAbsent(context.getLevel().getMinecraftWorld().getWorld().getName(), this::loadConfig); - - M modifier = defaultModifier; - if (configuration != null) { - CraftLimitedRegion limitedRegion = new CraftLimitedRegion(context.getLevel(), new ChunkPos(blockPos)); - modifier = createModifier(defaultConfiguration, context.getLevel().getMinecraftWorld().getWorld(), new RandomSourceWrapper.RandomWrapper(random), new BlockVector(blockPos.getX(), blockPos.getY(), blockPos.getZ()), limitedRegion, (C) configuration); - limitedRegion.breakLink(); - } - - return getPositions(context.topFeature(), context.getLevel(), context.generator(), random, blockPos, modifier); - } - - private PlacementModifierConfiguration loadConfig(String name) { - Config config = configManager.getGenerationConfig(configManager.getOrCreateConfigInfo(name), biome, namespacedKey).orElse(null); - - if (config == null) { - return null; - } - - return config.getPlacements().get(placementModifier); - } - - @Override - public PlacementModifierType type() { - return null; - } - - private Stream getPositions(Optional top, WorldGenLevel world, ChunkGenerator generator, RandomSource random, BlockPos pos, M modifier) { - return modifier.getPositions(new PlacementContext(world, generator, top), random, pos); - } -} diff --git a/impl/v1_19_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R2/placement/RarityModifierHook.java b/impl/v1_19_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R2/placement/RarityModifierHook.java deleted file mode 100644 index f9867ffb..00000000 --- a/impl/v1_19_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R2/placement/RarityModifierHook.java +++ /dev/null @@ -1,53 +0,0 @@ -package de.derfrzocker.ore.control.impl.v1_19_R2.placement; - -import de.derfrzocker.feature.api.FeaturePlacementModifier; -import de.derfrzocker.feature.common.feature.placement.configuration.RarityModifierConfiguration; -import de.derfrzocker.feature.common.value.number.integer.FixedDoubleToIntegerValue; -import de.derfrzocker.ore.control.api.Biome; -import de.derfrzocker.ore.control.api.OreControlManager; -import de.derfrzocker.ore.control.impl.v1_19_R2.NMSReflectionNames; -import net.minecraft.world.level.levelgen.placement.RarityFilter; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.bukkit.util.NumberConversions; -import org.jetbrains.annotations.NotNull; - -import java.lang.reflect.Field; -import java.util.Random; - -public class RarityModifierHook extends MinecraftPlacementModifierHook { - - public RarityModifierHook(@NotNull OreControlManager oreControlManager, @NotNull Biome biome, @NotNull NamespacedKey namespacedKey, @NotNull RarityFilter defaultModifier) { - super(oreControlManager, "rarity_filter", defaultModifier, biome, namespacedKey); - } - - public static RarityModifierConfiguration createDefaultConfiguration(@NotNull RarityFilter defaultModifier, @NotNull FeaturePlacementModifier modifier) { - try { - Field chance = RarityFilter.class.getDeclaredField(NMSReflectionNames.RARITY_FILTER_CHANCE); - chance.setAccessible(true); - Object value = chance.get(defaultModifier); - return new RarityModifierConfiguration(modifier, new FixedDoubleToIntegerValue(NumberConversions.toInt(value))); - } catch (NoSuchFieldException | IllegalAccessException e) { - throw new RuntimeException(e); - } - } - - @Override - public RarityModifierConfiguration createDefaultConfiguration(@NotNull RarityFilter defaultModifier) { - return createDefaultConfiguration(defaultModifier, getPlacementModifier()); - } - - @Override - public RarityFilter createModifier(@NotNull RarityModifierConfiguration defaultConfiguration, @NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull RarityModifierConfiguration configuration) { - int chance; - if (configuration.getChance() == null) { - chance = defaultConfiguration.getChance().getValue(worldInfo, random, position, limitedRegion); - } else { - chance = configuration.getChance().getValue(worldInfo, random, position, limitedRegion); - } - - return RarityFilter.onAverageOnceEvery(chance); - } -} diff --git a/impl/v1_19_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R2/placement/SurfaceRelativeThresholdModifierHook.java b/impl/v1_19_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R2/placement/SurfaceRelativeThresholdModifierHook.java deleted file mode 100644 index cde975f1..00000000 --- a/impl/v1_19_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R2/placement/SurfaceRelativeThresholdModifierHook.java +++ /dev/null @@ -1,77 +0,0 @@ -package de.derfrzocker.ore.control.impl.v1_19_R2.placement; - -import de.derfrzocker.feature.api.FeaturePlacementModifier; -import de.derfrzocker.feature.common.value.number.integer.FixedDoubleToIntegerValue; -import de.derfrzocker.feature.impl.v1_19_R2.placement.configuration.SurfaceRelativeThresholdModifierConfiguration; -import de.derfrzocker.ore.control.api.Biome; -import de.derfrzocker.ore.control.api.OreControlManager; -import de.derfrzocker.ore.control.impl.v1_19_R2.NMSReflectionNames; -import net.minecraft.world.level.levelgen.Heightmap; -import net.minecraft.world.level.levelgen.placement.SurfaceRelativeThresholdFilter; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.bukkit.util.NumberConversions; -import org.jetbrains.annotations.NotNull; - -import java.lang.reflect.Field; -import java.util.Random; - -public class SurfaceRelativeThresholdModifierHook extends MinecraftPlacementModifierHook { - - public SurfaceRelativeThresholdModifierHook(@NotNull OreControlManager oreControlManager, @NotNull Biome biome, @NotNull NamespacedKey namespacedKey, @NotNull SurfaceRelativeThresholdFilter defaultModifier) { - super(oreControlManager, "surface_relative_threshold_filter", defaultModifier, biome, namespacedKey); - } - - public static SurfaceRelativeThresholdModifierConfiguration createDefaultConfiguration(@NotNull SurfaceRelativeThresholdFilter defaultModifier, @NotNull FeaturePlacementModifier modifier) { - try { - Field heightmap = SurfaceRelativeThresholdFilter.class.getDeclaredField(NMSReflectionNames.SURFACE_RELATIVE_THRESHOLD_FILTER_HEIGHTMAP); - heightmap.setAccessible(true); - - Field minInclusive = SurfaceRelativeThresholdFilter.class.getDeclaredField(NMSReflectionNames.SURFACE_RELATIVE_THRESHOLD_FILTER_MIN_INCLUSIVE); - minInclusive.setAccessible(true); - - Field maxInclusive = SurfaceRelativeThresholdFilter.class.getDeclaredField(NMSReflectionNames.SURFACE_RELATIVE_THRESHOLD_FILTER_MAX_INCLUSIVE); - maxInclusive.setAccessible(true); - - Object heightmapValue = heightmap.get(defaultModifier); - Object minInclusiveValue = minInclusive.get(defaultModifier); - Object maxInclusiveValue = maxInclusive.get(defaultModifier); - return new SurfaceRelativeThresholdModifierConfiguration(modifier, null, new FixedDoubleToIntegerValue(NumberConversions.toInt(minInclusiveValue)), new FixedDoubleToIntegerValue(NumberConversions.toInt(maxInclusiveValue))); - } catch (NoSuchFieldException | IllegalAccessException e) { - throw new RuntimeException(e); - } - } - - @Override - public SurfaceRelativeThresholdFilter createModifier(@NotNull SurfaceRelativeThresholdModifierConfiguration defaultConfiguration, @NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull SurfaceRelativeThresholdModifierConfiguration configuration) { - Heightmap.Types heightmap; - if (configuration.getHeightmap() == null) { - heightmap = defaultConfiguration.getHeightmap().getValue(worldInfo, random, position, limitedRegion); - } else { - heightmap = configuration.getHeightmap().getValue(worldInfo, random, position, limitedRegion); - } - - int minInclusive; - if (configuration.getMinInclusive() == null) { - minInclusive = defaultConfiguration.getMinInclusive().getValue(worldInfo, random, position, limitedRegion); - } else { - minInclusive = configuration.getMinInclusive().getValue(worldInfo, random, position, limitedRegion); - } - - int maxInclusive; - if (configuration.getMaxInclusive() == null) { - maxInclusive = defaultConfiguration.getMaxInclusive().getValue(worldInfo, random, position, limitedRegion); - } else { - maxInclusive = configuration.getMaxInclusive().getValue(worldInfo, random, position, limitedRegion); - } - - return SurfaceRelativeThresholdFilter.of(heightmap, minInclusive, maxInclusive); - } - - @Override - public SurfaceRelativeThresholdModifierConfiguration createDefaultConfiguration(SurfaceRelativeThresholdFilter defaultModifier) { - return createDefaultConfiguration(defaultModifier, getPlacementModifier()); - } -} diff --git a/impl/v1_19_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R2/placement/SurfaceWaterDepthModifierHook.java b/impl/v1_19_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R2/placement/SurfaceWaterDepthModifierHook.java deleted file mode 100644 index e424d2ee..00000000 --- a/impl/v1_19_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R2/placement/SurfaceWaterDepthModifierHook.java +++ /dev/null @@ -1,53 +0,0 @@ -package de.derfrzocker.ore.control.impl.v1_19_R2.placement; - -import de.derfrzocker.feature.api.FeaturePlacementModifier; -import de.derfrzocker.feature.common.feature.placement.configuration.SurfaceWaterDepthModifierConfiguration; -import de.derfrzocker.feature.common.value.number.integer.FixedDoubleToIntegerValue; -import de.derfrzocker.ore.control.api.Biome; -import de.derfrzocker.ore.control.api.OreControlManager; -import de.derfrzocker.ore.control.impl.v1_19_R2.NMSReflectionNames; -import net.minecraft.world.level.levelgen.placement.SurfaceWaterDepthFilter; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.bukkit.util.NumberConversions; -import org.jetbrains.annotations.NotNull; - -import java.lang.reflect.Field; -import java.util.Random; - -public class SurfaceWaterDepthModifierHook extends MinecraftPlacementModifierHook { - - public SurfaceWaterDepthModifierHook(@NotNull OreControlManager oreControlManager, @NotNull Biome biome, @NotNull NamespacedKey namespacedKey, @NotNull SurfaceWaterDepthFilter defaultModifier) { - super(oreControlManager, "surface_water_depth_filter", defaultModifier, biome, namespacedKey); - } - - public static SurfaceWaterDepthModifierConfiguration createDefaultConfiguration(@NotNull SurfaceWaterDepthFilter defaultModifier, @NotNull FeaturePlacementModifier modifier) { - try { - Field maxWaterDepth = SurfaceWaterDepthFilter.class.getDeclaredField(NMSReflectionNames.SURFACE_WATER_DEPTH_FILTER_MAX_WATER_DEPTH); - maxWaterDepth.setAccessible(true); - Object value = maxWaterDepth.get(defaultModifier); - return new SurfaceWaterDepthModifierConfiguration(modifier, new FixedDoubleToIntegerValue(NumberConversions.toInt(value))); - } catch (NoSuchFieldException | IllegalAccessException e) { - throw new RuntimeException(e); - } - } - - @Override - public SurfaceWaterDepthModifierConfiguration createDefaultConfiguration(@NotNull SurfaceWaterDepthFilter defaultModifier) { - return createDefaultConfiguration(defaultModifier, getPlacementModifier()); - } - - @Override - public SurfaceWaterDepthFilter createModifier(@NotNull SurfaceWaterDepthModifierConfiguration defaultConfiguration, @NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull SurfaceWaterDepthModifierConfiguration configuration) { - int maxWaterDepth; - if (configuration.getMaxWaterDepth() == null) { - maxWaterDepth = defaultConfiguration.getMaxWaterDepth().getValue(worldInfo, random, position, limitedRegion); - } else { - maxWaterDepth = configuration.getMaxWaterDepth().getValue(worldInfo, random, position, limitedRegion); - } - - return SurfaceWaterDepthFilter.forMaxDepth(maxWaterDepth); - } -} \ No newline at end of file diff --git a/impl/v1_19_R3/pom.xml b/impl/v1_19_R3/pom.xml deleted file mode 100644 index b56f0d8f..00000000 --- a/impl/v1_19_R3/pom.xml +++ /dev/null @@ -1,80 +0,0 @@ - - - 4.0.0 - - - ore-control-impl - de.derfrzocker - ${revision} - - - ore-control-impl-v1_19_R3 - - - - de.derfrzocker - ore-control-api - ${project.version} - provided - - - de.derfrzocker - ore-control-common - ${project.version} - provided - - - org.spigotmc - spigot - 1.19.4-R0.1-SNAPSHOT - remapped-mojang - provided - true - - - - - - - net.md-5 - specialsource-maven-plugin - 1.2.3 - - - package - - remap - - remap-obf - - org.spigotmc:minecraft-server:1.19.4-R0.1-SNAPSHOT:txt:maps-mojang - true - org.spigotmc:spigot:1.19.4-R0.1-SNAPSHOT:jar:remapped-mojang - - true - remapped-obf - - - - package - - remap - - remap-spigot - - - ${project.build.directory}/${project.artifactId}-${project.version}-remapped-obf.jar - - org.spigotmc:minecraft-server:1.19.4-R0.1-SNAPSHOT:csrg:maps-spigot - org.spigotmc:spigot:1.19.4-R0.1-SNAPSHOT:jar:remapped-obf - - - - - - - - - \ No newline at end of file diff --git a/impl/v1_19_R3/src/main/java/de/derfrzocker/feature/impl/v1_19_R3/extra/OreVeinHandler.java b/impl/v1_19_R3/src/main/java/de/derfrzocker/feature/impl/v1_19_R3/extra/OreVeinHandler.java deleted file mode 100644 index 24cdae3c..00000000 --- a/impl/v1_19_R3/src/main/java/de/derfrzocker/feature/impl/v1_19_R3/extra/OreVeinHandler.java +++ /dev/null @@ -1,98 +0,0 @@ -package de.derfrzocker.feature.impl.v1_19_R3.extra; - -import de.derfrzocker.feature.api.ExtraValues; -import de.derfrzocker.ore.control.api.OreControlManager; -import de.derfrzocker.ore.control.api.config.ConfigInfo; -import de.derfrzocker.ore.control.api.config.ConfigManager; -import de.derfrzocker.ore.control.impl.v1_19_R3.NMSReflectionNames; -import net.minecraft.core.Holder; -import net.minecraft.server.level.ChunkMap; -import net.minecraft.world.level.levelgen.NoiseBasedChunkGenerator; -import net.minecraft.world.level.levelgen.NoiseGeneratorSettings; -import org.bukkit.World; -import org.bukkit.craftbukkit.v1_19_R3.CraftWorld; -import org.bukkit.event.EventHandler; -import org.bukkit.event.EventPriority; -import org.bukkit.event.Listener; -import org.bukkit.event.world.WorldInitEvent; -import org.bukkit.event.world.WorldUnloadEvent; - -import java.lang.reflect.Field; -import java.util.HashSet; -import java.util.Optional; -import java.util.Set; - -public class OreVeinHandler implements Listener { - - private final static Field CHUNK_GENERATOR_FIELD; - private final static Field NOISE_GENERATOR_SETTINGS_FIELD; - - static { - try { - CHUNK_GENERATOR_FIELD = ChunkMap.class.getDeclaredField(NMSReflectionNames.CHUNK_MAP_GENERATOR); - CHUNK_GENERATOR_FIELD.setAccessible(true); - NOISE_GENERATOR_SETTINGS_FIELD = NoiseBasedChunkGenerator.class.getDeclaredField(NMSReflectionNames.NOISE_GENERATOR_SETTINGS); - NOISE_GENERATOR_SETTINGS_FIELD.setAccessible(true); - } catch (NoSuchFieldException e) { - throw new RuntimeException(e); - } - } - - private final Set hookedWorlds = new HashSet<>(); - private final ConfigManager configManager; - - public OreVeinHandler(OreControlManager oreControlManager) { - this.configManager = oreControlManager.getConfigManager(); - oreControlManager.addValueChangeListener(this::update); - } - - @EventHandler(priority = EventPriority.LOW) - public void onWorldInit(WorldInitEvent event) { - if (!(((CraftWorld) event.getWorld()).getHandle().getChunkSource().chunkMap.generator instanceof NoiseBasedChunkGenerator noiseChunkGenerator)) { - return; - } - - NoiseGeneratorSettings newSettings = getNewValue(event.getWorld(), noiseChunkGenerator.settings.value()); - NoiseBasedChunkGenerator newGenerator = new NoiseBasedChunkGenerator(noiseChunkGenerator.getBiomeSource(), Holder.direct(newSettings)); - - try { - CHUNK_GENERATOR_FIELD.set(((CraftWorld) event.getWorld()).getHandle().getChunkSource().chunkMap, newGenerator); - } catch (IllegalAccessException e) { - throw new RuntimeException(e); - } - - hookedWorlds.add(event.getWorld()); - } - - @EventHandler - public void onWorldUnload(WorldUnloadEvent event) { - // Cleanup - hookedWorlds.remove(event.getWorld()); - } - - private NoiseGeneratorSettings getNewValue(World world, NoiseGeneratorSettings old) { - ConfigInfo configInfo = configManager.getOrCreateConfigInfo(world.getName()); - Optional optionalExtraValues = configManager.getGenerationExtraValues(configInfo); - - boolean newValue = optionalExtraValues.flatMap(ExtraValues::shouldGeneratedBigOreVeins).orElse(old.oreVeinsEnabled()); - - return new NoiseGeneratorSettings(old.noiseSettings(), old.defaultBlock(), old.defaultFluid(), - old.noiseRouter(), old.surfaceRule(), old.spawnTarget(), old.seaLevel(), old.disableMobGeneration(), old.aquifersEnabled(), newValue, old.useLegacyRandomSource()); - } - - private void update() { - for (World world : hookedWorlds) { - if (!(((CraftWorld) world).getHandle().getChunkSource().chunkMap.generator instanceof NoiseBasedChunkGenerator noiseChunkGenerator)) { - return; - } - - NoiseGeneratorSettings newSettings = getNewValue(world, noiseChunkGenerator.settings.value()); - - try { - NOISE_GENERATOR_SETTINGS_FIELD.set(noiseChunkGenerator, Holder.direct(newSettings)); - } catch (IllegalAccessException e) { - throw new RuntimeException(e); - } - } - } -} diff --git a/impl/v1_19_R3/src/main/java/de/derfrzocker/feature/impl/v1_19_R3/feature/generator/EmptyConfigurationGenerator.java b/impl/v1_19_R3/src/main/java/de/derfrzocker/feature/impl/v1_19_R3/feature/generator/EmptyConfigurationGenerator.java deleted file mode 100644 index 60139efe..00000000 --- a/impl/v1_19_R3/src/main/java/de/derfrzocker/feature/impl/v1_19_R3/feature/generator/EmptyConfigurationGenerator.java +++ /dev/null @@ -1,65 +0,0 @@ -package de.derfrzocker.feature.impl.v1_19_R3.feature.generator; - -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import de.derfrzocker.feature.api.Configuration; -import de.derfrzocker.feature.api.Registries; -import de.derfrzocker.feature.api.Setting; -import de.derfrzocker.feature.api.util.Parser; -import de.derfrzocker.feature.common.feature.generator.configuration.EmptyFeatureConfiguration; -import net.minecraft.world.level.levelgen.feature.Feature; -import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Collections; -import java.util.Random; -import java.util.Set; - -public class EmptyConfigurationGenerator extends MinecraftFeatureGenerator { - - private EmptyConfigurationGenerator(Registries registries, Feature feature, String name) { - super(registries, feature, name); - } - - public static EmptyConfigurationGenerator createGlowstoneBlob(Registries registries) { - return new EmptyConfigurationGenerator(registries, Feature.GLOWSTONE_BLOB, "glowstone_blob"); - } - - @Override - public @NotNull Set getSettings() { - return Collections.emptySet(); - } - - @Override - public @NotNull Configuration createEmptyConfiguration() { - return new EmptyFeatureConfiguration(this); - } - - @Override - public EmptyFeatureConfiguration mergeConfig(EmptyFeatureConfiguration first, EmptyFeatureConfiguration second) { - return first; - } - - @Override - public Parser createParser(Registries registries) { - return new Parser<>() { - @Override - public JsonElement toJson(EmptyFeatureConfiguration value) { - return new JsonObject(); - } - - @Override - public EmptyFeatureConfiguration fromJson(JsonElement jsonElement) { - return new EmptyFeatureConfiguration(EmptyConfigurationGenerator.this); - } - }; - } - - @Override - public NoneFeatureConfiguration createConfiguration(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull EmptyFeatureConfiguration configuration) { - return NoneFeatureConfiguration.INSTANCE; - } -} diff --git a/impl/v1_19_R3/src/main/java/de/derfrzocker/feature/impl/v1_19_R3/feature/generator/MinecraftFeatureGenerator.java b/impl/v1_19_R3/src/main/java/de/derfrzocker/feature/impl/v1_19_R3/feature/generator/MinecraftFeatureGenerator.java deleted file mode 100644 index f197e683..00000000 --- a/impl/v1_19_R3/src/main/java/de/derfrzocker/feature/impl/v1_19_R3/feature/generator/MinecraftFeatureGenerator.java +++ /dev/null @@ -1,66 +0,0 @@ -package de.derfrzocker.feature.impl.v1_19_R3.feature.generator; - -import com.mojang.serialization.Codec; -import de.derfrzocker.feature.api.FeatureGenerator; -import de.derfrzocker.feature.api.FeatureGeneratorConfiguration; -import de.derfrzocker.feature.api.Registries; -import de.derfrzocker.feature.api.util.Parser; -import net.minecraft.core.BlockPos; -import net.minecraft.world.level.WorldGenLevel; -import net.minecraft.world.level.levelgen.feature.Feature; -import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext; -import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration; -import org.bukkit.NamespacedKey; -import org.bukkit.craftbukkit.v1_19_R3.generator.CraftLimitedRegion; -import org.bukkit.craftbukkit.v1_19_R3.util.RandomSourceWrapper; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Optional; -import java.util.Random; - -public abstract class MinecraftFeatureGenerator implements FeatureGenerator { - - private final Parser parser; - private final Feature feature; - private final NamespacedKey namespacedKey; - - public MinecraftFeatureGenerator(Registries registries, Feature feature, String name) { - this.parser = (Parser) createParser(registries); - this.feature = feature; - this.namespacedKey = NamespacedKey.minecraft(name); - } - - public abstract C mergeConfig(C first, C second); - - public abstract Parser createParser(Registries registries); - - public abstract M createConfiguration(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull C configuration); - - @NotNull - @Override - public C merge(@NotNull FeatureGeneratorConfiguration first, @NotNull FeatureGeneratorConfiguration second) { - return mergeConfig((C) first, (C) second); - } - - @Override - public void place(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull C configuration) { - WorldGenLevel level = ((CraftLimitedRegion) limitedRegion).getHandle(); - M config = createConfiguration(worldInfo, random, position, limitedRegion, configuration); - feature.place(new FeaturePlaceContext<>(Optional.empty(), level, level.getMinecraftWorld().getChunkSource().getGenerator(), new RandomSourceWrapper(random), new BlockPos(position.getBlockX(), position.getBlockY(), position.getBlockZ()), config)); - } - - @NotNull - @Override - public Parser getParser() { - return parser; - } - - @NotNull - @Override - public NamespacedKey getKey() { - return namespacedKey; - } -} diff --git a/impl/v1_19_R3/src/main/java/de/derfrzocker/feature/impl/v1_19_R3/feature/generator/OreConfigurationGenerator.java b/impl/v1_19_R3/src/main/java/de/derfrzocker/feature/impl/v1_19_R3/feature/generator/OreConfigurationGenerator.java deleted file mode 100644 index 76dea343..00000000 --- a/impl/v1_19_R3/src/main/java/de/derfrzocker/feature/impl/v1_19_R3/feature/generator/OreConfigurationGenerator.java +++ /dev/null @@ -1,174 +0,0 @@ -package de.derfrzocker.feature.impl.v1_19_R3.feature.generator; - -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import de.derfrzocker.feature.api.Registries; -import de.derfrzocker.feature.api.Setting; -import de.derfrzocker.feature.api.util.Parser; -import de.derfrzocker.feature.common.feature.generator.configuration.OreFeatureConfiguration; -import de.derfrzocker.feature.common.ruletest.AlwaysTrueRuleTest; -import de.derfrzocker.feature.common.ruletest.BlockMatchRuleTest; -import de.derfrzocker.feature.common.ruletest.BlockStateMatchRuleTest; -import de.derfrzocker.feature.common.ruletest.RandomBlockMatchRuleTest; -import de.derfrzocker.feature.common.ruletest.RandomBlockStateMatchRuleTest; -import de.derfrzocker.feature.common.ruletest.TagMatchRuleTest; -import de.derfrzocker.feature.common.value.number.FloatType; -import de.derfrzocker.feature.common.value.number.FloatValue; -import de.derfrzocker.feature.common.value.number.IntegerType; -import de.derfrzocker.feature.common.value.number.IntegerValue; -import de.derfrzocker.feature.common.value.target.TargetBlockState; -import de.derfrzocker.feature.common.value.target.TargetListType; -import de.derfrzocker.feature.common.value.target.TargetListValue; -import net.minecraft.tags.TagKey; -import net.minecraft.world.level.levelgen.feature.Feature; -import net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration; -import net.minecraft.world.level.levelgen.structure.templatesystem.AlwaysTrueTest; -import net.minecraft.world.level.levelgen.structure.templatesystem.BlockMatchTest; -import net.minecraft.world.level.levelgen.structure.templatesystem.BlockStateMatchTest; -import net.minecraft.world.level.levelgen.structure.templatesystem.RandomBlockMatchTest; -import net.minecraft.world.level.levelgen.structure.templatesystem.RandomBlockStateMatchTest; -import net.minecraft.world.level.levelgen.structure.templatesystem.RuleTest; -import net.minecraft.world.level.levelgen.structure.templatesystem.TagMatchTest; -import org.bukkit.NamespacedKey; -import org.bukkit.craftbukkit.v1_19_R3.block.data.CraftBlockData; -import org.bukkit.craftbukkit.v1_19_R3.util.CraftMagicNumbers; -import org.bukkit.craftbukkit.v1_19_R3.util.CraftNamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.ArrayList; -import java.util.List; -import java.util.Optional; -import java.util.Random; -import java.util.Set; - -public class OreConfigurationGenerator extends MinecraftFeatureGenerator { - - private OreConfigurationGenerator(Registries registries, Feature feature, String name) { - super(registries, feature, name); - } - - public static OreConfigurationGenerator createOre(Registries registries) { - return new OreConfigurationGenerator(registries, Feature.ORE, "ore"); - } - - public static OreConfigurationGenerator createScatteredOre(Registries registries) { - return new OreConfigurationGenerator(registries, Feature.SCATTERED_ORE, "scattered_ore"); - } - - @Override - public Parser createParser(Registries registries) { - return new Parser<>() { - @Override - public JsonElement toJson(OreFeatureConfiguration value) { - JsonObject jsonObject = new JsonObject(); - if (value.getTargets() != null) { - JsonObject entry = value.getTargets().getValueType().getParser().toJson(value.getTargets()).getAsJsonObject(); - entry.addProperty("target_type", value.getTargets().getValueType().getKey().toString()); - - jsonObject.add("targets", entry); - } - - if (value.getSize() != null) { - JsonObject size = value.getSize().getValueType().getParser().toJson(value.getSize()).getAsJsonObject(); - size.addProperty("size_type", value.getSize().getValueType().getKey().toString()); - jsonObject.add("size", size); - } - - if (value.getDiscardChanceOnAirExposure() != null) { - JsonObject discardChanceOnAirExposure = value.getDiscardChanceOnAirExposure().getValueType().getParser().toJson(value.getDiscardChanceOnAirExposure()).getAsJsonObject(); - discardChanceOnAirExposure.addProperty("discard_chance_on_air_exposure_type", value.getDiscardChanceOnAirExposure().getValueType().getKey().toString()); - } - - return jsonObject; - } - - @Override - public OreFeatureConfiguration fromJson(JsonElement jsonElement) { - JsonObject jsonObject = jsonElement.getAsJsonObject(); - - TargetListValue targetValues = null; - if (jsonObject.has("targets")) { - JsonObject targets = jsonObject.getAsJsonObject("targets"); - targetValues = registries.getValueTypeRegistry(TargetListType.class).get(NamespacedKey.fromString(targets.getAsJsonPrimitive("target_type").getAsString())).get().getParser().fromJson(targets); - } - - IntegerValue size = null; - if (jsonObject.has("size")) { - JsonObject sizes = jsonObject.getAsJsonObject("size"); - size = registries.getValueTypeRegistry(IntegerType.class).get(NamespacedKey.fromString(sizes.getAsJsonPrimitive("size_type").getAsString())).get().getParser().fromJson(sizes); - } - - FloatValue discardChanceOnAirExposure = null; - if (jsonObject.has("discard_chance_on_air_exposure")) { - JsonObject chance = jsonObject.getAsJsonObject("discard_chance_on_air_exposure"); - discardChanceOnAirExposure = registries.getValueTypeRegistry(FloatType.class).get(NamespacedKey.fromString(chance.getAsJsonPrimitive("discard_chance_on_air_exposure_type").getAsString())).get().getParser().fromJson(chance); - } - - return new OreFeatureConfiguration(OreConfigurationGenerator.this, targetValues, size, discardChanceOnAirExposure); - } - }; - } - - @Override - public OreFeatureConfiguration mergeConfig(OreFeatureConfiguration first, OreFeatureConfiguration second) { - return new OreFeatureConfiguration(this, - first.getTargets() != null ? first.getTargets() : second.getTargets(), - first.getSize() != null ? first.getSize() : second.getSize(), - first.getDiscardChanceOnAirExposure() != null ? first.getDiscardChanceOnAirExposure() : second.getDiscardChanceOnAirExposure()); - } - - @Override - public OreConfiguration createConfiguration(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull OreFeatureConfiguration configuration) { - List blockStates = new ArrayList<>(); - if (configuration.getTargets() != null) { - for (TargetBlockState targetValue : configuration.getTargets().getValue(worldInfo, random, position, limitedRegion)) { - RuleTest ruleTest; - - if (targetValue.getTarget() instanceof AlwaysTrueRuleTest) { - ruleTest = AlwaysTrueTest.INSTANCE; - } else if (targetValue.getTarget() instanceof BlockMatchRuleTest rule) { - ruleTest = new BlockMatchTest(CraftMagicNumbers.getBlock(rule.getBlock())); - } else if (targetValue.getTarget() instanceof BlockStateMatchRuleTest rule) { - ruleTest = new BlockStateMatchTest(((CraftBlockData) rule.getBlockData()).getState()); - } else if (targetValue.getTarget() instanceof RandomBlockMatchRuleTest rule) { - ruleTest = new RandomBlockMatchTest(CraftMagicNumbers.getBlock(rule.getMaterial()), rule.getProbability()); - } else if (targetValue.getTarget() instanceof RandomBlockStateMatchRuleTest rule) { - ruleTest = new RandomBlockStateMatchTest(((CraftBlockData) rule.getBlockData()).getState(), rule.getProbability()); - } else if (targetValue.getTarget() instanceof TagMatchRuleTest rule) { - ruleTest = new TagMatchTest(TagKey.create(net.minecraft.core.registries.Registries.BLOCK, CraftNamespacedKey.toMinecraft(rule.getTag()))); - } else { - throw new IllegalArgumentException("Got unexpected rule test from class " + targetValue.getTarget().getClass()); - } - - blockStates.add(OreConfiguration.target(ruleTest, ((CraftBlockData) targetValue.getState()).getState())); - } - } - - int size = 0; - if (configuration.getSize() != null) { - size = configuration.getSize().getValue(worldInfo, random, position, limitedRegion); - } - - float discardChanceOnAirExposure = 0f; - if (configuration.getDiscardChanceOnAirExposure() != null) { - discardChanceOnAirExposure = configuration.getDiscardChanceOnAirExposure().getValue(worldInfo, random, position, limitedRegion); - } - - return new OreConfiguration(blockStates, size, discardChanceOnAirExposure); - } - - @NotNull - @Override - public Set getSettings() { - return OreFeatureConfiguration.SETTINGS; - } - - @NotNull - @Override - public OreFeatureConfiguration createEmptyConfiguration() { - return new OreFeatureConfiguration(this, null, null, null); - } -} diff --git a/impl/v1_19_R3/src/main/java/de/derfrzocker/feature/impl/v1_19_R3/placement/CountModifier.java b/impl/v1_19_R3/src/main/java/de/derfrzocker/feature/impl/v1_19_R3/placement/CountModifier.java deleted file mode 100644 index 295735bf..00000000 --- a/impl/v1_19_R3/src/main/java/de/derfrzocker/feature/impl/v1_19_R3/placement/CountModifier.java +++ /dev/null @@ -1,85 +0,0 @@ -package de.derfrzocker.feature.impl.v1_19_R3.placement; - -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import de.derfrzocker.feature.api.Registries; -import de.derfrzocker.feature.api.Setting; -import de.derfrzocker.feature.api.util.Parser; -import de.derfrzocker.feature.common.feature.placement.configuration.CountModifierConfiguration; -import de.derfrzocker.feature.common.value.number.IntegerType; -import de.derfrzocker.feature.common.value.number.IntegerValue; -import net.minecraft.world.level.levelgen.placement.CountPlacement; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Random; -import java.util.Set; - -public class CountModifier extends MinecraftPlacementModifier { - - public CountModifier(@NotNull Registries registries) { - super(registries, "count"); - } - - @Override - public CountModifierConfiguration mergeConfig(CountModifierConfiguration first, CountModifierConfiguration second) { - return new CountModifierConfiguration(this, - first.getCount() != null ? first.getCount() : second.getCount()); - } - - @Override - public Parser createParser(Registries registries) { - return new Parser<>() { - @Override - public JsonElement toJson(CountModifierConfiguration value) { - JsonObject jsonObject = new JsonObject(); - if (value.getCount() != null) { - JsonObject entry = value.getCount().getValueType().getParser().toJson(value.getCount()).getAsJsonObject(); - entry.addProperty("count_type", value.getCount().getValueType().getKey().toString()); - jsonObject.add("count", entry); - } - return jsonObject; - } - - @Override - public CountModifierConfiguration fromJson(JsonElement jsonElement) { - JsonObject jsonObject = jsonElement.getAsJsonObject(); - - IntegerValue count = null; - if (jsonObject.has("count")) { - JsonObject entry = jsonObject.getAsJsonObject("count"); - count = registries.getValueTypeRegistry(IntegerType.class).get(NamespacedKey.fromString(entry.getAsJsonPrimitive("count_type").getAsString())).get().getParser().fromJson(entry); - } - - return new CountModifierConfiguration(CountModifier.this, count); - } - }; - } - - @Override - public CountPlacement createPlacementModifier(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull CountModifierConfiguration configuration) { - int count; - if (configuration.getCount() != null) { - count = configuration.getCount().getValue(worldInfo, random, position, limitedRegion); - } else { - count = 0; - } - - return CountPlacement.of(count); - } - - @NotNull - @Override - public Set getSettings() { - return CountModifierConfiguration.SETTINGS; - } - - @NotNull - @Override - public CountModifierConfiguration createEmptyConfiguration() { - return new CountModifierConfiguration(this, null); - } -} diff --git a/impl/v1_19_R3/src/main/java/de/derfrzocker/feature/impl/v1_19_R3/placement/HeightRangeModifier.java b/impl/v1_19_R3/src/main/java/de/derfrzocker/feature/impl/v1_19_R3/placement/HeightRangeModifier.java deleted file mode 100644 index 3102637e..00000000 --- a/impl/v1_19_R3/src/main/java/de/derfrzocker/feature/impl/v1_19_R3/placement/HeightRangeModifier.java +++ /dev/null @@ -1,88 +0,0 @@ -package de.derfrzocker.feature.impl.v1_19_R3.placement; - -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import de.derfrzocker.feature.api.Registries; -import de.derfrzocker.feature.api.Setting; -import de.derfrzocker.feature.api.util.Parser; -import de.derfrzocker.feature.common.feature.placement.configuration.HeightRangeModifierConfiguration; -import de.derfrzocker.feature.common.value.number.IntegerType; -import de.derfrzocker.feature.common.value.number.IntegerValue; -import net.minecraft.world.level.levelgen.VerticalAnchor; -import net.minecraft.world.level.levelgen.heightproviders.ConstantHeight; -import net.minecraft.world.level.levelgen.heightproviders.HeightProvider; -import net.minecraft.world.level.levelgen.placement.HeightRangePlacement; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Random; -import java.util.Set; - -public class HeightRangeModifier extends MinecraftPlacementModifier { - - public HeightRangeModifier(@NotNull Registries registries) { - super(registries, "height_range"); - } - - @Override - public HeightRangeModifierConfiguration mergeConfig(HeightRangeModifierConfiguration first, HeightRangeModifierConfiguration second) { - return new HeightRangeModifierConfiguration(this, - first.getHeight() != null ? first.getHeight() : second.getHeight()); - } - - @Override - public Parser createParser(Registries registries) { - return new Parser<>() { - @Override - public JsonElement toJson(HeightRangeModifierConfiguration value) { - JsonObject jsonObject = new JsonObject(); - if (value.getHeight() != null) { - JsonObject entry = value.getHeight().getValueType().getParser().toJson(value.getHeight()).getAsJsonObject(); - entry.addProperty("height_range_type", value.getHeight().getValueType().getKey().toString()); - jsonObject.add("height", entry); - } - return jsonObject; - } - - @Override - public HeightRangeModifierConfiguration fromJson(JsonElement jsonElement) { - JsonObject jsonObject = jsonElement.getAsJsonObject(); - - IntegerValue count = null; - if (jsonObject.has("height")) { - JsonObject entry = jsonObject.getAsJsonObject("height"); - count = registries.getValueTypeRegistry(IntegerType.class).get(NamespacedKey.fromString(entry.getAsJsonPrimitive("height_range_type").getAsString())).get().getParser().fromJson(entry); - } - - return new HeightRangeModifierConfiguration(HeightRangeModifier.this, count); - } - }; - } - - @Override - public HeightRangePlacement createPlacementModifier(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull HeightRangeModifierConfiguration configuration) { - HeightProvider height; - if (configuration.getHeight() != null) { - height = ConstantHeight.of(VerticalAnchor.absolute(configuration.getHeight().getValue(worldInfo, random, position, limitedRegion))); - } else { - height = ConstantHeight.of(VerticalAnchor.bottom()); - } - - return HeightRangePlacement.of(height); - } - - @NotNull - @Override - public Set getSettings() { - return HeightRangeModifierConfiguration.SETTINGS; - } - - @NotNull - @Override - public HeightRangeModifierConfiguration createEmptyConfiguration() { - return new HeightRangeModifierConfiguration(this, null); - } -} diff --git a/impl/v1_19_R3/src/main/java/de/derfrzocker/feature/impl/v1_19_R3/placement/MinecraftPlacementModifier.java b/impl/v1_19_R3/src/main/java/de/derfrzocker/feature/impl/v1_19_R3/placement/MinecraftPlacementModifier.java deleted file mode 100644 index bf422173..00000000 --- a/impl/v1_19_R3/src/main/java/de/derfrzocker/feature/impl/v1_19_R3/placement/MinecraftPlacementModifier.java +++ /dev/null @@ -1,65 +0,0 @@ -package de.derfrzocker.feature.impl.v1_19_R3.placement; - -import de.derfrzocker.feature.api.FeaturePlacementModifier; -import de.derfrzocker.feature.api.PlacementModifierConfiguration; -import de.derfrzocker.feature.api.Registries; -import de.derfrzocker.feature.api.util.Parser; -import net.minecraft.core.BlockPos; -import net.minecraft.world.level.WorldGenLevel; -import net.minecraft.world.level.levelgen.placement.PlacementContext; -import net.minecraft.world.level.levelgen.placement.PlacementModifier; -import org.bukkit.NamespacedKey; -import org.bukkit.craftbukkit.v1_19_R3.generator.CraftLimitedRegion; -import org.bukkit.craftbukkit.v1_19_R3.util.RandomSourceWrapper; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Optional; -import java.util.Random; -import java.util.stream.Stream; - -public abstract class MinecraftPlacementModifier implements FeaturePlacementModifier { - - private final Parser parser; - private final NamespacedKey namespacedKey; - - public MinecraftPlacementModifier(@NotNull Registries registries, @NotNull String name) { - this.parser = (Parser) createParser(registries); - this.namespacedKey = NamespacedKey.minecraft(name); - } - - public abstract C mergeConfig(C first, C second); - - public abstract Parser createParser(Registries registries); - - public abstract M createPlacementModifier(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull C configuration); - - @NotNull - @Override - public C merge(@NotNull PlacementModifierConfiguration first, @NotNull PlacementModifierConfiguration second) { - return mergeConfig((C) first, (C) second); - } - - @NotNull - @Override - public Stream getPositions(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull C configuration) { - WorldGenLevel level = ((CraftLimitedRegion) limitedRegion).getHandle(); - M placementModifier = createPlacementModifier(worldInfo, random, position, limitedRegion, configuration); - return placementModifier.getPositions(new PlacementContext(level, level.getMinecraftWorld().getChunkSource().getGenerator(), Optional.empty()), new RandomSourceWrapper(random), new BlockPos(position.getBlockX(), position.getBlockY(), position.getBlockZ())). - map(pos -> new BlockVector(pos.getX(), pos.getY(), pos.getZ())); - } - - @NotNull - @Override - public Parser getParser() { - return parser; - } - - @NotNull - @Override - public NamespacedKey getKey() { - return namespacedKey; - } -} diff --git a/impl/v1_19_R3/src/main/java/de/derfrzocker/feature/impl/v1_19_R3/placement/RarityModifier.java b/impl/v1_19_R3/src/main/java/de/derfrzocker/feature/impl/v1_19_R3/placement/RarityModifier.java deleted file mode 100644 index 64c43985..00000000 --- a/impl/v1_19_R3/src/main/java/de/derfrzocker/feature/impl/v1_19_R3/placement/RarityModifier.java +++ /dev/null @@ -1,83 +0,0 @@ -package de.derfrzocker.feature.impl.v1_19_R3.placement; - -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import de.derfrzocker.feature.api.Registries; -import de.derfrzocker.feature.api.Setting; -import de.derfrzocker.feature.api.util.Parser; -import de.derfrzocker.feature.common.feature.placement.configuration.RarityModifierConfiguration; -import de.derfrzocker.feature.common.value.number.IntegerType; -import de.derfrzocker.feature.common.value.number.IntegerValue; -import net.minecraft.world.level.levelgen.placement.RarityFilter; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Random; -import java.util.Set; - -public class RarityModifier extends MinecraftPlacementModifier { - - public RarityModifier(@NotNull Registries registries) { - super(registries, "rarity_filter"); - } - - - @Override - public RarityModifierConfiguration mergeConfig(RarityModifierConfiguration first, RarityModifierConfiguration second) { - return new RarityModifierConfiguration(this, - first.getChance() != null ? first.getChance() : second.getChance()); - } - - @Override - public Parser createParser(Registries registries) { - return new Parser<>() { - @Override - public JsonElement toJson(RarityModifierConfiguration value) { - JsonObject jsonObject = new JsonObject(); - if (value.getChance() != null) { - JsonObject entry = value.getChance().getValueType().getParser().toJson(value.getChance()).getAsJsonObject(); - entry.addProperty("chance_type", value.getChance().getValueType().getKey().toString()); - jsonObject.add("chance", entry); - } - return jsonObject; - } - - @Override - public RarityModifierConfiguration fromJson(JsonElement jsonElement) { - JsonObject jsonObject = jsonElement.getAsJsonObject(); - - IntegerValue count = null; - if (jsonObject.has("chance")) { - JsonObject entry = jsonObject.getAsJsonObject("chance"); - count = registries.getValueTypeRegistry(IntegerType.class).get(NamespacedKey.fromString(entry.getAsJsonPrimitive("chance_type").getAsString())).get().getParser().fromJson(entry); - } - - return new RarityModifierConfiguration(RarityModifier.this, count); - } - }; - } - - @Override - public RarityFilter createPlacementModifier(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull RarityModifierConfiguration configuration) { - int chance = 0; - if (configuration.getChance() != null) { - chance = configuration.getChance().getValue(worldInfo, random, position, limitedRegion); - } - return RarityFilter.onAverageOnceEvery(chance); - } - - @NotNull - @Override - public Set getSettings() { - return RarityModifierConfiguration.SETTINGS; - } - - @NotNull - @Override - public RarityModifierConfiguration createEmptyConfiguration() { - return new RarityModifierConfiguration(this, null); - } -} diff --git a/impl/v1_19_R3/src/main/java/de/derfrzocker/feature/impl/v1_19_R3/placement/SurfaceRelativeThresholdModifier.java b/impl/v1_19_R3/src/main/java/de/derfrzocker/feature/impl/v1_19_R3/placement/SurfaceRelativeThresholdModifier.java deleted file mode 100644 index fb37f315..00000000 --- a/impl/v1_19_R3/src/main/java/de/derfrzocker/feature/impl/v1_19_R3/placement/SurfaceRelativeThresholdModifier.java +++ /dev/null @@ -1,107 +0,0 @@ -package de.derfrzocker.feature.impl.v1_19_R3.placement; - -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import de.derfrzocker.feature.api.Registries; -import de.derfrzocker.feature.api.Setting; -import de.derfrzocker.feature.api.util.Parser; -import de.derfrzocker.feature.common.value.number.IntegerType; -import de.derfrzocker.feature.common.value.number.IntegerValue; -import de.derfrzocker.feature.impl.v1_19_R3.placement.configuration.SurfaceRelativeThresholdModifierConfiguration; -import net.minecraft.world.level.levelgen.Heightmap; -import net.minecraft.world.level.levelgen.placement.SurfaceRelativeThresholdFilter; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Random; -import java.util.Set; - -public class SurfaceRelativeThresholdModifier extends MinecraftPlacementModifier { - public SurfaceRelativeThresholdModifier(@NotNull Registries registries) { - super(registries, "surface_relative_threshold_filter"); - } - - @Override - public SurfaceRelativeThresholdModifierConfiguration mergeConfig(SurfaceRelativeThresholdModifierConfiguration first, SurfaceRelativeThresholdModifierConfiguration second) { - return new SurfaceRelativeThresholdModifierConfiguration(this, - first.getHeightmap() != null ? first.getHeightmap() : second.getHeightmap(), - first.getMinInclusive() != null ? first.getMinInclusive() : second.getMinInclusive(), - first.getMaxInclusive() != null ? first.getMaxInclusive() : second.getMaxInclusive()); - } - - @Override - public Parser createParser(Registries registries) { - return new Parser<>() { - @Override - public JsonElement toJson(SurfaceRelativeThresholdModifierConfiguration value) { - JsonObject jsonObject = new JsonObject(); - if (value.getMinInclusive() != null) { - JsonObject entry = value.getMinInclusive().getValueType().getParser().toJson(value.getMinInclusive()).getAsJsonObject(); - entry.addProperty("min_inclusive_type", value.getMinInclusive().getValueType().getKey().toString()); - jsonObject.add("min_inclusive", entry); - } - - if (value.getMaxInclusive() != null) { - JsonObject entry = value.getMaxInclusive().getValueType().getParser().toJson(value.getMaxInclusive()).getAsJsonObject(); - entry.addProperty("max_inclusive_type", value.getMaxInclusive().getValueType().getKey().toString()); - jsonObject.add("max_inclusive", entry); - } - - return jsonObject; - } - - @Override - public SurfaceRelativeThresholdModifierConfiguration fromJson(JsonElement jsonElement) { - JsonObject jsonObject = jsonElement.getAsJsonObject(); - - IntegerValue minInclusive = null; - if (jsonObject.has("min_inclusive")) { - JsonObject entry = jsonObject.getAsJsonObject("min_inclusive"); - minInclusive = registries.getValueTypeRegistry(IntegerType.class).get(NamespacedKey.fromString(entry.getAsJsonPrimitive("min_inclusive_type").getAsString())).get().getParser().fromJson(entry); - } - - IntegerValue maxInclusive = null; - if (jsonObject.has("max_inclusive")) { - JsonObject entry = jsonObject.getAsJsonObject("max_inclusive"); - maxInclusive = registries.getValueTypeRegistry(IntegerType.class).get(NamespacedKey.fromString(entry.getAsJsonPrimitive("max_inclusive_type").getAsString())).get().getParser().fromJson(entry); - } - - return new SurfaceRelativeThresholdModifierConfiguration(SurfaceRelativeThresholdModifier.this, null, minInclusive, maxInclusive); - } - }; - } - - @Override - public SurfaceRelativeThresholdFilter createPlacementModifier(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull SurfaceRelativeThresholdModifierConfiguration configuration) { - Heightmap.Types heightmap = Heightmap.Types.MOTION_BLOCKING; - if (configuration.getHeightmap() != null) { - heightmap = configuration.getHeightmap().getValue(worldInfo, random, position, limitedRegion); - } - - int minInclusive = 0; - if (configuration.getMinInclusive() != null) { - minInclusive = configuration.getMinInclusive().getValue(worldInfo, random, position, limitedRegion); - } - - int maxInclusive = 0; - if (configuration.getMaxInclusive() != null) { - maxInclusive = configuration.getMaxInclusive().getValue(worldInfo, random, position, limitedRegion); - } - return SurfaceRelativeThresholdFilter.of(heightmap, minInclusive, maxInclusive); - } - - @NotNull - @Override - public Set getSettings() { - return SurfaceRelativeThresholdModifierConfiguration.SETTINGS; - } - - @NotNull - @Override - public SurfaceRelativeThresholdModifierConfiguration createEmptyConfiguration() { - return new SurfaceRelativeThresholdModifierConfiguration(this, null, null, null); - } -} diff --git a/impl/v1_19_R3/src/main/java/de/derfrzocker/feature/impl/v1_19_R3/placement/SurfaceWaterDepthModifier.java b/impl/v1_19_R3/src/main/java/de/derfrzocker/feature/impl/v1_19_R3/placement/SurfaceWaterDepthModifier.java deleted file mode 100644 index 90eb0fdf..00000000 --- a/impl/v1_19_R3/src/main/java/de/derfrzocker/feature/impl/v1_19_R3/placement/SurfaceWaterDepthModifier.java +++ /dev/null @@ -1,82 +0,0 @@ -package de.derfrzocker.feature.impl.v1_19_R3.placement; - -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import de.derfrzocker.feature.api.Registries; -import de.derfrzocker.feature.api.Setting; -import de.derfrzocker.feature.api.util.Parser; -import de.derfrzocker.feature.common.feature.placement.configuration.SurfaceWaterDepthModifierConfiguration; -import de.derfrzocker.feature.common.value.number.IntegerType; -import de.derfrzocker.feature.common.value.number.IntegerValue; -import net.minecraft.world.level.levelgen.placement.SurfaceWaterDepthFilter; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Random; -import java.util.Set; - -public class SurfaceWaterDepthModifier extends MinecraftPlacementModifier { - - public SurfaceWaterDepthModifier(@NotNull Registries registries) { - super(registries, "surface_water_depth_filter"); - } - - @Override - public SurfaceWaterDepthModifierConfiguration mergeConfig(SurfaceWaterDepthModifierConfiguration first, SurfaceWaterDepthModifierConfiguration second) { - return new SurfaceWaterDepthModifierConfiguration(this, - first.getMaxWaterDepth() != null ? first.getMaxWaterDepth() : second.getMaxWaterDepth()); - } - - @Override - public Parser createParser(Registries registries) { - return new Parser<>() { - @Override - public JsonElement toJson(SurfaceWaterDepthModifierConfiguration value) { - JsonObject jsonObject = new JsonObject(); - if (value.getMaxWaterDepth() != null) { - JsonObject entry = value.getMaxWaterDepth().getValueType().getParser().toJson(value.getMaxWaterDepth()).getAsJsonObject(); - entry.addProperty("max_water_depth_type", value.getMaxWaterDepth().getValueType().getKey().toString()); - jsonObject.add("max_water_depth", entry); - } - return jsonObject; - } - - @Override - public SurfaceWaterDepthModifierConfiguration fromJson(JsonElement jsonElement) { - JsonObject jsonObject = jsonElement.getAsJsonObject(); - - IntegerValue count = null; - if (jsonObject.has("max_water_depth")) { - JsonObject entry = jsonObject.getAsJsonObject("max_water_depth"); - count = registries.getValueTypeRegistry(IntegerType.class).get(NamespacedKey.fromString(entry.getAsJsonPrimitive("max_water_depth_type").getAsString())).get().getParser().fromJson(entry); - } - - return new SurfaceWaterDepthModifierConfiguration(SurfaceWaterDepthModifier.this, count); - } - }; - } - - @Override - public SurfaceWaterDepthFilter createPlacementModifier(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull SurfaceWaterDepthModifierConfiguration configuration) { - int maxWaterDepth = 0; - if (configuration.getMaxWaterDepth() != null) { - maxWaterDepth = configuration.getMaxWaterDepth().getValue(worldInfo, random, position, limitedRegion); - } - return SurfaceWaterDepthFilter.forMaxDepth(maxWaterDepth); - } - - @NotNull - @Override - public Set getSettings() { - return SurfaceWaterDepthModifierConfiguration.SETTINGS; - } - - @NotNull - @Override - public SurfaceWaterDepthModifierConfiguration createEmptyConfiguration() { - return new SurfaceWaterDepthModifierConfiguration(this, null); - } -} \ No newline at end of file diff --git a/impl/v1_19_R3/src/main/java/de/derfrzocker/feature/impl/v1_19_R3/placement/configuration/SurfaceRelativeThresholdModifierConfiguration.java b/impl/v1_19_R3/src/main/java/de/derfrzocker/feature/impl/v1_19_R3/placement/configuration/SurfaceRelativeThresholdModifierConfiguration.java deleted file mode 100644 index d38eddf6..00000000 --- a/impl/v1_19_R3/src/main/java/de/derfrzocker/feature/impl/v1_19_R3/placement/configuration/SurfaceRelativeThresholdModifierConfiguration.java +++ /dev/null @@ -1,121 +0,0 @@ -package de.derfrzocker.feature.impl.v1_19_R3.placement.configuration; - -import de.derfrzocker.feature.api.FeaturePlacementModifier; -import de.derfrzocker.feature.api.PlacementModifierConfiguration; -import de.derfrzocker.feature.api.Setting; -import de.derfrzocker.feature.api.Value; -import de.derfrzocker.feature.common.value.number.IntegerType; -import de.derfrzocker.feature.common.value.number.IntegerValue; -import de.derfrzocker.feature.impl.v1_19_R3.value.heightmap.HeightmapValue; -import org.jetbrains.annotations.NotNull; - -import java.util.Collections; -import java.util.LinkedHashSet; -import java.util.Set; - -public class SurfaceRelativeThresholdModifierConfiguration implements PlacementModifierConfiguration { - - public final static Set SETTINGS; - private final static Setting MIN_INCLUSIVE = new Setting("min-inclusive", IntegerType.class); - private final static Setting MAX_INCLUSIVE = new Setting("max-inclusive", IntegerType.class); - - static { - Set settings = new LinkedHashSet<>(); - settings.add(MIN_INCLUSIVE); - settings.add(MAX_INCLUSIVE); - SETTINGS = Collections.unmodifiableSet(settings); - } - - private final FeaturePlacementModifier placementModifier; - private final HeightmapValue heightmap; - private IntegerValue minInclusive; - private IntegerValue maxInclusive; - private boolean dirty = false; - - public SurfaceRelativeThresholdModifierConfiguration(FeaturePlacementModifier placementModifier, HeightmapValue heightmap, IntegerValue minInclusive, IntegerValue maxInclusive) { - this.placementModifier = placementModifier; - this.heightmap = heightmap; - this.minInclusive = minInclusive; - this.maxInclusive = maxInclusive; - } - - @NotNull - @Override - public FeaturePlacementModifier getOwner() { - return placementModifier; - } - - public HeightmapValue getHeightmap() { - return heightmap; - } - - public IntegerValue getMinInclusive() { - return minInclusive; - } - - public IntegerValue getMaxInclusive() { - return maxInclusive; - } - - @NotNull - @Override - public Set getSettings() { - return SETTINGS; - } - - @Override - public Value getValue(@NotNull Setting setting) { - if (setting == MIN_INCLUSIVE) { - return getMinInclusive(); - } - - if (setting == MAX_INCLUSIVE) { - return getMaxInclusive(); - } - - throw new IllegalArgumentException(String.format("Setting '%s' is not in the configuration '%s'", setting, "SurfaceRelativeThresholdModifierConfiguration")); - } - - @Override - public void setValue(@NotNull Setting setting, Value value) { - if (setting == MIN_INCLUSIVE) { - minInclusive = (IntegerValue) value; - dirty = true; - return; - } - - if (setting == MAX_INCLUSIVE) { - maxInclusive = (IntegerValue) value; - dirty = true; - return; - } - - throw new IllegalArgumentException(String.format("Setting '%s' is not in the configuration '%s'", setting, "SurfaceRelativeThresholdModifierConfiguration")); - } - - @Override - public boolean isDirty() { - if (dirty) { - return true; - } - - if (minInclusive != null && minInclusive.isDirty()) { - return true; - } - - return maxInclusive != null && maxInclusive.isDirty(); - } - - @Override - public void saved() { - dirty = false; - - if (minInclusive != null) { - minInclusive.saved(); - } - - if (maxInclusive != null) { - maxInclusive.saved(); - } - } -} diff --git a/impl/v1_19_R3/src/main/java/de/derfrzocker/feature/impl/v1_19_R3/value/heightmap/HeightmapType.java b/impl/v1_19_R3/src/main/java/de/derfrzocker/feature/impl/v1_19_R3/value/heightmap/HeightmapType.java deleted file mode 100644 index d7e50449..00000000 --- a/impl/v1_19_R3/src/main/java/de/derfrzocker/feature/impl/v1_19_R3/value/heightmap/HeightmapType.java +++ /dev/null @@ -1,7 +0,0 @@ -package de.derfrzocker.feature.impl.v1_19_R3.value.heightmap; - -import de.derfrzocker.feature.api.ValueType; -import net.minecraft.world.level.levelgen.Heightmap; - -public abstract class HeightmapType implements ValueType { -} diff --git a/impl/v1_19_R3/src/main/java/de/derfrzocker/feature/impl/v1_19_R3/value/heightmap/HeightmapValue.java b/impl/v1_19_R3/src/main/java/de/derfrzocker/feature/impl/v1_19_R3/value/heightmap/HeightmapValue.java deleted file mode 100644 index 6792a07a..00000000 --- a/impl/v1_19_R3/src/main/java/de/derfrzocker/feature/impl/v1_19_R3/value/heightmap/HeightmapValue.java +++ /dev/null @@ -1,10 +0,0 @@ -package de.derfrzocker.feature.impl.v1_19_R3.value.heightmap; - -import de.derfrzocker.feature.common.AbstractValue; -import net.minecraft.world.level.levelgen.Heightmap; - -public abstract class HeightmapValue extends AbstractValue { - - @Override - public abstract HeightmapValue clone(); -} diff --git a/impl/v1_19_R3/src/main/java/de/derfrzocker/feature/impl/v1_19_R3/value/offset/NMSAboveBottomOffsetIntegerValue.java b/impl/v1_19_R3/src/main/java/de/derfrzocker/feature/impl/v1_19_R3/value/offset/NMSAboveBottomOffsetIntegerValue.java deleted file mode 100644 index 4ebf8bce..00000000 --- a/impl/v1_19_R3/src/main/java/de/derfrzocker/feature/impl/v1_19_R3/value/offset/NMSAboveBottomOffsetIntegerValue.java +++ /dev/null @@ -1,33 +0,0 @@ -package de.derfrzocker.feature.impl.v1_19_R3.value.offset; - -import de.derfrzocker.feature.common.value.number.IntegerValue; -import de.derfrzocker.feature.common.value.offset.AboveBottomOffsetIntegerValue; -import net.minecraft.world.level.WorldGenLevel; -import org.bukkit.craftbukkit.v1_19_R3.generator.CraftLimitedRegion; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Random; - -public class NMSAboveBottomOffsetIntegerValue extends AboveBottomOffsetIntegerValue { - - public NMSAboveBottomOffsetIntegerValue(IntegerValue base) { - super(base); - } - - @Override - public Integer getValue(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion) { - int baseValue = getBase() == null ? 0 : getBase().getValue(worldInfo, random, position, limitedRegion); - - WorldGenLevel level = ((CraftLimitedRegion) limitedRegion).getHandle(); - - return Math.max(level.getMinBuildHeight(), level.getLevel().getChunkSource().chunkMap.generator.getMinY()) + baseValue; - } - - @Override - public AboveBottomOffsetIntegerValue clone() { - return new NMSAboveBottomOffsetIntegerValue(getBase() == null ? null : getBase().clone()); - } -} diff --git a/impl/v1_19_R3/src/main/java/de/derfrzocker/feature/impl/v1_19_R3/value/offset/NMSBelowTopOffsetIntegerValue.java b/impl/v1_19_R3/src/main/java/de/derfrzocker/feature/impl/v1_19_R3/value/offset/NMSBelowTopOffsetIntegerValue.java deleted file mode 100644 index 4ead0fb7..00000000 --- a/impl/v1_19_R3/src/main/java/de/derfrzocker/feature/impl/v1_19_R3/value/offset/NMSBelowTopOffsetIntegerValue.java +++ /dev/null @@ -1,35 +0,0 @@ -package de.derfrzocker.feature.impl.v1_19_R3.value.offset; - -import de.derfrzocker.feature.common.value.number.IntegerValue; -import de.derfrzocker.feature.common.value.offset.BelowTopOffsetIntegerValue; -import net.minecraft.world.level.WorldGenLevel; -import net.minecraft.world.level.chunk.ChunkGenerator; -import org.bukkit.craftbukkit.v1_19_R3.generator.CraftLimitedRegion; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Random; - -public class NMSBelowTopOffsetIntegerValue extends BelowTopOffsetIntegerValue { - - public NMSBelowTopOffsetIntegerValue(IntegerValue base) { - super(base); - } - - @Override - public Integer getValue(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion) { - int baseValue = getBase() == null ? 0 : getBase().getValue(worldInfo, random, position, limitedRegion); - - WorldGenLevel level = ((CraftLimitedRegion) limitedRegion).getHandle(); - ChunkGenerator chunkGenerator = level.getLevel().getChunkSource().chunkMap.generator; - - return Math.min(level.getHeight(), chunkGenerator.getGenDepth()) - 1 + Math.max(level.getMinBuildHeight(), chunkGenerator.getMinY()) - baseValue; - } - - @Override - public NMSBelowTopOffsetIntegerValue clone() { - return new NMSBelowTopOffsetIntegerValue(getBase() == null ? null : getBase().clone()); - } -} diff --git a/impl/v1_19_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R3/ConversionUtil.java b/impl/v1_19_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R3/ConversionUtil.java deleted file mode 100644 index 71b3a469..00000000 --- a/impl/v1_19_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R3/ConversionUtil.java +++ /dev/null @@ -1,77 +0,0 @@ -package de.derfrzocker.ore.control.impl.v1_19_R3; - -import de.derfrzocker.feature.common.value.number.FixedFloatValue; -import de.derfrzocker.feature.common.value.number.IntegerValue; -import de.derfrzocker.feature.common.value.number.integer.FixedDoubleToIntegerValue; -import de.derfrzocker.feature.common.value.number.integer.biased.BiasedToBottomIntegerValue; -import de.derfrzocker.feature.common.value.number.integer.clamped.ClampedIntegerValue; -import de.derfrzocker.feature.common.value.number.integer.clamped.ClampedNormalIntegerValue; -import de.derfrzocker.feature.common.value.number.integer.uniform.UniformIntegerValue; -import de.derfrzocker.feature.common.value.number.integer.weighted.WeightedListIntegerValue; -import net.minecraft.util.random.SimpleWeightedRandomList; -import net.minecraft.util.random.WeightedEntry; -import net.minecraft.util.valueproviders.ClampedInt; -import net.minecraft.util.valueproviders.ClampedNormalInt; -import net.minecraft.util.valueproviders.IntProvider; -import net.minecraft.util.valueproviders.IntProviderType; -import net.minecraft.util.valueproviders.WeightedListInt; - -import java.lang.reflect.Field; -import java.util.LinkedHashMap; -import java.util.Map; - -public final class ConversionUtil { - - private ConversionUtil() { - } - - public static IntegerValue convert(IntProvider intProvider) { - try { - if (intProvider.getType() == IntProviderType.CONSTANT) { - return new FixedDoubleToIntegerValue(intProvider.getMinValue()); - } else if (intProvider.getType() == IntProviderType.UNIFORM) { - return new UniformIntegerValue(new FixedDoubleToIntegerValue(intProvider.getMinValue()), new FixedDoubleToIntegerValue(intProvider.getMaxValue())); - } else if (intProvider.getType() == IntProviderType.BIASED_TO_BOTTOM) { - return new BiasedToBottomIntegerValue(new FixedDoubleToIntegerValue(intProvider.getMinValue()), new FixedDoubleToIntegerValue(intProvider.getMaxValue())); - } else if (intProvider.getType() == IntProviderType.CLAMPED) { - Field sourceField = ClampedInt.class.getDeclaredField(NMSReflectionNames.CLAMPED_INT_SOURCE); - Field minField = ClampedInt.class.getDeclaredField(NMSReflectionNames.CLAMPED_INT_MIN_INCLUSIVE); - Field maxField = ClampedInt.class.getDeclaredField(NMSReflectionNames.CLAMPED_INT_MAX_INCLUSIVE); - sourceField.setAccessible(true); - minField.setAccessible(true); - maxField.setAccessible(true); - - IntProvider source = (IntProvider) sourceField.get(intProvider); - int min = (int) minField.get(intProvider); - int max = (int) maxField.get(intProvider); - return new ClampedIntegerValue(convert(source), new FixedDoubleToIntegerValue(min), new FixedDoubleToIntegerValue(max)); - } else if (intProvider.getType() == IntProviderType.WEIGHTED_LIST) { - Field distributionField = WeightedListInt.class.getDeclaredField(NMSReflectionNames.WEIGHTED_LIST_INT_DISTRIBUTION); - distributionField.setAccessible(true); - SimpleWeightedRandomList distribution = (SimpleWeightedRandomList) distributionField.get(intProvider); - - Map values = new LinkedHashMap<>(); - for (WeightedEntry.Wrapper wrapper : distribution.unwrap()) { - values.put(convert(wrapper.getData()), new FixedDoubleToIntegerValue(wrapper.getWeight().asInt())); - } - - return new WeightedListIntegerValue(values); - } else if (intProvider.getType() == IntProviderType.CLAMPED_NORMAL) { - Field meanField = ClampedNormalInt.class.getDeclaredField(NMSReflectionNames.CLAMPED_NORMAL_INT_MEAN); - Field deviationField = ClampedNormalInt.class.getDeclaredField(NMSReflectionNames.CLAMPED_NORMAL_INT_DEVIATION); - meanField.setAccessible(true); - deviationField.setAccessible(true); - - float mean = (float) meanField.get(intProvider); - float deviation = (float) meanField.get(intProvider); - int min = intProvider.getMinValue(); - int max = intProvider.getMaxValue(); - return new ClampedNormalIntegerValue(new FixedFloatValue(mean), new FixedFloatValue(deviation), new FixedDoubleToIntegerValue(min), new FixedDoubleToIntegerValue(max)); - } else { - throw new UnsupportedOperationException(String.format("No integer value equivalent for IntProvider '%s'", intProvider)); - } - } catch (NoSuchFieldException | IllegalAccessException e) { - throw new RuntimeException(e); - } - } -} diff --git a/impl/v1_19_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R3/NMSReflectionNames.java b/impl/v1_19_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R3/NMSReflectionNames.java deleted file mode 100644 index adb3d661..00000000 --- a/impl/v1_19_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R3/NMSReflectionNames.java +++ /dev/null @@ -1,25 +0,0 @@ -package de.derfrzocker.ore.control.impl.v1_19_R3; - -public final class NMSReflectionNames { - - public final static String BIOME_GENERATION_SETTINGS_FEATURES = "e"; - public final static String BIOME_GENERATION_SETTINGS_FEATURE_SET = "g"; - public final static String WEIGHTED_LIST_INT_DISTRIBUTION = "b"; - public final static String COUNT_PLACEMENT_COUNT = "c"; - public final static String HEIGHT_RANGE_PLACEMENT_HEIGHT = "c"; - public final static String RARITY_FILTER_CHANCE = "c"; - public final static String SURFACE_RELATIVE_THRESHOLD_FILTER_HEIGHTMAP = "c"; - public final static String SURFACE_RELATIVE_THRESHOLD_FILTER_MIN_INCLUSIVE = "d"; - public final static String SURFACE_RELATIVE_THRESHOLD_FILTER_MAX_INCLUSIVE = "e"; - public final static String SURFACE_WATER_DEPTH_FILTER_MAX_WATER_DEPTH = "c"; - public static final String CLAMPED_INT_SOURCE = "b"; - public static final String CLAMPED_INT_MIN_INCLUSIVE = "f"; - public static final String CLAMPED_INT_MAX_INCLUSIVE = "g"; - public static final String CLAMPED_NORMAL_INT_MEAN = "b"; - public static final String CLAMPED_NORMAL_INT_DEVIATION = "f"; - public static final String CHUNK_MAP_GENERATOR = "u"; - public static final String NOISE_GENERATOR_SETTINGS = "e"; - - private NMSReflectionNames() { - } -} diff --git a/impl/v1_19_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R3/NMSReplacer_v1_19_R3.java b/impl/v1_19_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R3/NMSReplacer_v1_19_R3.java deleted file mode 100644 index beed84fd..00000000 --- a/impl/v1_19_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R3/NMSReplacer_v1_19_R3.java +++ /dev/null @@ -1,506 +0,0 @@ -package de.derfrzocker.ore.control.impl.v1_19_R3; - -import com.google.common.base.Suppliers; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import com.google.gson.JsonElement; -import de.derfrzocker.feature.api.FeatureGenerator; -import de.derfrzocker.feature.api.FeatureGeneratorConfiguration; -import de.derfrzocker.feature.api.FeaturePlacementModifier; -import de.derfrzocker.feature.api.PlacementModifierConfiguration; -import de.derfrzocker.feature.api.ValueLocation; -import de.derfrzocker.feature.api.util.Parser; -import de.derfrzocker.feature.common.feature.generator.configuration.EmptyFeatureConfiguration; -import de.derfrzocker.feature.common.feature.generator.configuration.OreFeatureConfiguration; -import de.derfrzocker.feature.common.feature.placement.ActivationModifier; -import de.derfrzocker.feature.common.feature.placement.configuration.ActivationConfiguration; -import de.derfrzocker.feature.common.util.ValueLocationUtil; -import de.derfrzocker.feature.common.value.bool.FixedBooleanValue; -import de.derfrzocker.feature.common.value.number.IntegerType; -import de.derfrzocker.feature.common.value.offset.AboveBottomOffsetIntegerType; -import de.derfrzocker.feature.common.value.offset.BelowTopOffsetIntegerType; -import de.derfrzocker.feature.impl.v1_19_R3.extra.OreVeinHandler; -import de.derfrzocker.feature.impl.v1_19_R3.feature.generator.EmptyConfigurationGenerator; -import de.derfrzocker.feature.impl.v1_19_R3.feature.generator.OreConfigurationGenerator; -import de.derfrzocker.feature.impl.v1_19_R3.placement.CountModifier; -import de.derfrzocker.feature.impl.v1_19_R3.placement.HeightRangeModifier; -import de.derfrzocker.feature.impl.v1_19_R3.placement.RarityModifier; -import de.derfrzocker.feature.impl.v1_19_R3.placement.SurfaceRelativeThresholdModifier; -import de.derfrzocker.feature.impl.v1_19_R3.placement.SurfaceWaterDepthModifier; -import de.derfrzocker.feature.impl.v1_19_R3.value.offset.NMSAboveBottomOffsetIntegerValue; -import de.derfrzocker.feature.impl.v1_19_R3.value.offset.NMSBelowTopOffsetIntegerValue; -import de.derfrzocker.ore.control.api.NMSReplacer; -import de.derfrzocker.ore.control.api.OreControlManager; -import de.derfrzocker.ore.control.api.OreControlRegistries; -import de.derfrzocker.ore.control.api.config.Config; -import de.derfrzocker.ore.control.api.config.ConfigManager; -import de.derfrzocker.ore.control.impl.v1_19_R3.feature.generator.EmptyConfigurationGeneratorHook; -import de.derfrzocker.ore.control.impl.v1_19_R3.feature.generator.OreConfigurationGeneratorHook; -import de.derfrzocker.ore.control.impl.v1_19_R3.placement.ActivationModifierHook; -import de.derfrzocker.ore.control.impl.v1_19_R3.placement.CountModifierHook; -import de.derfrzocker.ore.control.impl.v1_19_R3.placement.HeightRangeModifierHook; -import de.derfrzocker.ore.control.impl.v1_19_R3.placement.RarityModifierHook; -import de.derfrzocker.ore.control.impl.v1_19_R3.placement.SurfaceRelativeThresholdModifierHook; -import de.derfrzocker.ore.control.impl.v1_19_R3.placement.SurfaceWaterDepthModifierHook; -import net.minecraft.core.Holder; -import net.minecraft.core.HolderSet; -import net.minecraft.core.Registry; -import net.minecraft.core.RegistryAccess; -import net.minecraft.core.registries.Registries; -import net.minecraft.resources.ResourceKey; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.server.dedicated.DedicatedServer; -import net.minecraft.server.level.ServerLevel; -import net.minecraft.world.level.biome.Biome; -import net.minecraft.world.level.biome.BiomeGenerationSettings; -import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; -import net.minecraft.world.level.levelgen.feature.Feature; -import net.minecraft.world.level.levelgen.feature.GlowstoneFeature; -import net.minecraft.world.level.levelgen.feature.OreFeature; -import net.minecraft.world.level.levelgen.feature.ScatteredOreFeature; -import net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration; -import net.minecraft.world.level.levelgen.placement.CountPlacement; -import net.minecraft.world.level.levelgen.placement.HeightRangePlacement; -import net.minecraft.world.level.levelgen.placement.PlacedFeature; -import net.minecraft.world.level.levelgen.placement.PlacementModifier; -import net.minecraft.world.level.levelgen.placement.PlacementModifierType; -import net.minecraft.world.level.levelgen.placement.RarityFilter; -import net.minecraft.world.level.levelgen.placement.SurfaceRelativeThresholdFilter; -import net.minecraft.world.level.levelgen.placement.SurfaceWaterDepthFilter; -import org.bukkit.Bukkit; -import org.bukkit.NamespacedKey; -import org.bukkit.World; -import org.bukkit.craftbukkit.v1_19_R3.CraftServer; -import org.bukkit.craftbukkit.v1_19_R3.CraftWorld; -import org.bukkit.craftbukkit.v1_19_R3.util.CraftNamespacedKey; -import org.bukkit.plugin.Plugin; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import java.io.File; -import java.io.FileWriter; -import java.io.IOException; -import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.LinkedHashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Set; -import java.util.function.BiConsumer; -import java.util.function.Supplier; -import java.util.stream.Collectors; - -public class NMSReplacer_v1_19_R3 implements NMSReplacer { - - private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create(); - private final Plugin plugin; - private final Parser configParser; - private final OreControlManager oreControlManager; - @NotNull - private final OreControlRegistries registries; - private final ConfigManager configManager; - - public NMSReplacer_v1_19_R3(@NotNull Plugin plugin, @NotNull OreControlManager oreControlManager, Parser configParser) { - this.plugin = plugin; - this.oreControlManager = oreControlManager; - this.registries = oreControlManager.getRegistries(); - this.configManager = oreControlManager.getConfigManager(); - this.configParser = configParser; - } - - @Override - public void register() { - registerValueTypes(); - registerFeatureGenerators(); - registerPlacementModifier(); - registerFeatures(); - registerBiomes(); - registerExtraValues(); - } - - private void registerValueTypes() { - registries.getValueTypeRegistry(IntegerType.class).register(new AboveBottomOffsetIntegerType(registries, NMSAboveBottomOffsetIntegerValue::new)); - registries.getValueTypeRegistry(IntegerType.class).register(new BelowTopOffsetIntegerType(registries, NMSBelowTopOffsetIntegerValue::new)); - } - - private void registerFeatureGenerators() { - registries.getFeatureGeneratorRegistry().register(OreConfigurationGenerator.createOre(registries)); - registries.getFeatureGeneratorRegistry().register(OreConfigurationGenerator.createScatteredOre(registries)); - registries.getFeatureGeneratorRegistry().register(EmptyConfigurationGenerator.createGlowstoneBlob(registries)); - } - - private void registerPlacementModifier() { - registries.getPlacementModifierRegistry().register(new RarityModifier(registries)); - registries.getPlacementModifierRegistry().register(new SurfaceRelativeThresholdModifier(registries)); - registries.getPlacementModifierRegistry().register(new SurfaceWaterDepthModifier(registries)); - registries.getPlacementModifierRegistry().register(new CountModifier(registries)); - registries.getPlacementModifierRegistry().register(new HeightRangeModifier(registries)); - } - - private void registerFeatures() { - Registry placedFeatureRegistry = getRegistry().registryOrThrow(Registries.PLACED_FEATURE); - Registry> featureRegistry = getRegistry().registryOrThrow(Registries.FEATURE); - Registry> placementModifierTypes = getRegistry().registryOrThrow(Registries.PLACEMENT_MODIFIER_TYPE); - - for (PlacedFeature placedFeature : placedFeatureRegistry) { - Feature feature = placedFeature.getFeatures().findFirst().get().feature(); - ResourceLocation resourceLocation = featureRegistry.getKey(feature); - Optional> featureGenerator = registries.getFeatureGeneratorRegistry().get(NamespacedKey.fromString(resourceLocation.toString())); - - if (featureGenerator.isEmpty()) { - continue; - } - - boolean hasCount = false; - List> modifiers = new LinkedList<>(); - for (PlacementModifier modifier : placedFeature.placement()) { - if (modifier.type() == PlacementModifierType.COUNT) { - hasCount = true; - } - ResourceLocation placementModifierType = placementModifierTypes.getKey(modifier.type()); - Optional> modifierOptional = registries.getPlacementModifierRegistry().get(NamespacedKey.fromString(placementModifierType.toString())); - modifierOptional.ifPresent(modifiers::add); - } - - if (!hasCount) { - Optional> modifierOptional = registries.getPlacementModifierRegistry().get(NamespacedKey.fromString("minecraft:count")); - modifierOptional.ifPresent(modifiers::add); - } - - // inject activation / deactivation logic - Optional> modifierOptional = registries.getPlacementModifierRegistry().get(ActivationModifier.KEY); - modifierOptional.ifPresent(modifiers::add); - - registries.getFeatureRegistry().register(new de.derfrzocker.feature.api.Feature(NamespacedKey.fromString(placedFeatureRegistry.getKey(placedFeature).toString()), featureGenerator.get(), modifiers)); - } - } - - private void registerBiomes() { - Registry placedFeatureRegistry = getRegistry().registryOrThrow(Registries.PLACED_FEATURE); - forEachBiome((biome, resourceLocation) -> { - de.derfrzocker.ore.control.api.Biome bio = new de.derfrzocker.ore.control.api.Biome(CraftNamespacedKey.fromMinecraft(resourceLocation)); - - biome.getGenerationSettings().features().forEach(featureSet -> featureSet.forEach(holder -> { - PlacedFeature feature = holder.value(); - ResourceLocation featureKey = placedFeatureRegistry.getKey(feature); - - if (featureKey == null) { - // Skip if the feature is not registered, this can happen if another plugin adds a feature without registering it - return; - } - - registries.getFeatureRegistry().get(CraftNamespacedKey.fromMinecraft(featureKey)).ifPresent(value -> bio.getFeatures().add(value)); - })); - - registries.getBiomeRegistry().register(bio); - }); - } - - private void registerExtraValues() { - plugin.getServer().getPluginManager().registerEvents(new OreVeinHandler(oreControlManager), plugin); - } - - @Override - public void saveDefaultValues(File directory) { - File world = new File(directory, "world"); - File biomes = new File(directory, "biome"); - - saveWorldValues(world); - saveBiomeValues(biomes); - } - - @Override - public void hookIntoBiomes() { - forEachBiome((biome, resourceLocation) -> { - try { - hookIntoBiome(biome, resourceLocation); - } catch (final Exception e) { - throw new RuntimeException("Unexpected error while hooking in NMS for Biome: " + biome, e); - } - }); - } - - @Override - public Set getBiomes(World world) { - Set biomes = new LinkedHashSet<>(); - ServerLevel level = ((CraftWorld) world).getHandle(); - Registry registry = getRegistry().registryOrThrow(Registries.BIOME); - - for (Holder biomeHolder : level.getChunkSource().chunkMap.generator.getBiomeSource().possibleBiomes()) { - Biome biome = biomeHolder.value(); - - ResourceLocation key = registry.getKey(biome); - - biomes.add(registries.getBiomeRegistry().get(CraftNamespacedKey.fromMinecraft(key)).get()); - } - - return biomes; - } - - private void saveWorldValues(File directory) { - Registry registry = getRegistry().registryOrThrow(Registries.PLACED_FEATURE); - for (Map.Entry, PlacedFeature> entry : registry.entrySet()) { - ResourceLocation key = entry.getKey().location(); - File file = new File(directory, key.getNamespace() + "/" + key.getPath() + ".json"); - try { - saveFeature(file, null, CraftNamespacedKey.fromMinecraft(key), entry.getValue()); - } catch (Exception e) { - throw new RuntimeException(String.format("Error while saving feature '%s'", key), e); - } - } - } - - private void saveBiomeValues(File directory) { - forEachBiome((biome, biomeKey) -> { - File biomeFile = new File(directory, biomeKey.getNamespace() + "/" + biomeKey.getPath()); - List> decorations = biome.getGenerationSettings().features(); - for (HolderSet list : decorations) { - for (Holder featureSupplier : list) { - PlacedFeature feature = featureSupplier.value(); - Registry registry = getRegistry().registryOrThrow(Registries.PLACED_FEATURE); - ResourceLocation featureKey = registry.getKey(feature); - - if (featureKey == null) { - // Skip if the feature is not registered, this can happen if another plugin adds a feature without registering it - return; - } - - File featureFile = new File(biomeFile, featureKey.getNamespace() + "/" + featureKey.getPath() + ".json"); - try { - saveFeature(featureFile, registries.getBiomeRegistry().get(CraftNamespacedKey.fromMinecraft(biomeKey)).get(), CraftNamespacedKey.fromMinecraft(featureKey), feature); - } catch (Exception e) { - throw new RuntimeException(String.format("Error while saving feature '%s' in biome '%s'", featureKey, biomeKey), e); - } - } - } - }); - } - - // TODO clean up - private void saveFeature(File file, de.derfrzocker.ore.control.api.Biome biome, NamespacedKey featureKey, PlacedFeature feature) { - ConfiguredFeature configuredFeature = feature.getFeatures().findFirst().orElse(null); - - if (configuredFeature == null) { - return; - } - - if (!(configuredFeature.feature() instanceof OreFeature) && !(configuredFeature.feature() instanceof ScatteredOreFeature) && !(configuredFeature.feature() instanceof GlowstoneFeature)) { - return; - } - - file.getParentFile().mkdirs(); - - FeatureGenerator featureGenerator; - FeatureGeneratorConfiguration featureConfiguration; - - if (configuredFeature.feature() instanceof OreFeature) { - OreConfiguration configuration = (OreConfiguration) configuredFeature.config(); - featureGenerator = registries.getFeatureGeneratorRegistry().get(NamespacedKey.minecraft("ore")).get(); - featureConfiguration = OreConfigurationGeneratorHook.createDefaultConfiguration(configuration, (FeatureGenerator) featureGenerator); - } else if (configuredFeature.feature() instanceof ScatteredOreFeature) { - OreConfiguration configuration = (OreConfiguration) configuredFeature.config(); - featureGenerator = registries.getFeatureGeneratorRegistry().get(NamespacedKey.minecraft("scattered_ore")).get(); - featureConfiguration = OreConfigurationGeneratorHook.createDefaultConfiguration(configuration, (FeatureGenerator) featureGenerator); - } else if (configuredFeature.feature() instanceof GlowstoneFeature) { - featureGenerator = registries.getFeatureGeneratorRegistry().get(NamespacedKey.minecraft("glowstone_blob")).get(); - featureConfiguration = new EmptyFeatureConfiguration(featureGenerator); - } else { - throw new RuntimeException("HOW?"); - } - - boolean hasCount = false; - List placementConfiguration = new ArrayList<>(); - Registry> placementModifierTypes = getRegistry().registryOrThrow(Registries.PLACEMENT_MODIFIER_TYPE); - for (PlacementModifier placement : feature.placement()) { - ResourceLocation placementModifierType = placementModifierTypes.getKey(placement.type()); - Optional> modifierOptional = registries.getPlacementModifierRegistry().get(NamespacedKey.fromString(placementModifierType.toString())); - - if (modifierOptional.isEmpty()) { - continue; - } - - if (placement.type() == PlacementModifierType.RARITY_FILTER && placement instanceof RarityFilter) { - placementConfiguration.add(RarityModifierHook.createDefaultConfiguration((RarityFilter) placement, modifierOptional.get())); - } - if (placement.type() == PlacementModifierType.SURFACE_RELATIVE_THRESHOLD_FILTER && placement instanceof SurfaceRelativeThresholdFilter) { - placementConfiguration.add(SurfaceRelativeThresholdModifierHook.createDefaultConfiguration((SurfaceRelativeThresholdFilter) placement, modifierOptional.get())); - } - if (placement.type() == PlacementModifierType.SURFACE_WATER_DEPTH_FILTER && placement instanceof SurfaceWaterDepthFilter) { - placementConfiguration.add(SurfaceWaterDepthModifierHook.createDefaultConfiguration((SurfaceWaterDepthFilter) placement, modifierOptional.get())); - } - if (placement.type() == PlacementModifierType.COUNT && placement instanceof CountPlacement) { - placementConfiguration.add(CountModifierHook.createDefaultConfiguration((CountPlacement) placement, modifierOptional.get())); - hasCount = true; - } - if (placement.type() == PlacementModifierType.HEIGHT_RANGE && placement instanceof HeightRangePlacement) { - placementConfiguration.add(HeightRangeModifierHook.createDefaultConfiguration((HeightRangePlacement) placement, modifierOptional.get())); - } - } - - if (!hasCount) { - Optional> modifierOptional = registries.getPlacementModifierRegistry().get(NamespacedKey.fromString("minecraft:count")); - - modifierOptional.ifPresent(modifier -> placementConfiguration.add(0, CountModifierHook.createDefaultConfiguration(CountPlacement.of(1), modifier))); - } - - // inject activation / deactivation logic - Optional> modifierOptional = registries.getPlacementModifierRegistry().get(ActivationModifier.KEY); - modifierOptional.ifPresent(modifier -> placementConfiguration.add(0, new ActivationConfiguration(modifier, new FixedBooleanValue(true)))); - - Config config = new Config(placementConfiguration, featureConfiguration); - - if (biome == null) { - ValueLocationUtil.setValueLocation(Optional.of(config), ValueLocation.DEFAULT_WORLD); - configManager.setDefaultConfig(featureKey, config); - } else { - ValueLocationUtil.setValueLocation(Optional.of(config), ValueLocation.DEFAULT_BIOME); - configManager.setDefaultConfig(biome, featureKey, config); - } - - if (file.exists()) { - return; - } - - try { - file.createNewFile(); - } catch (IOException e) { - throw new RuntimeException(e); - } - - JsonElement element = configParser.toJson(config); - try (FileWriter writer = new FileWriter(file)) { - writer.write(GSON.toJson(element)); - } catch (IOException e) { - throw new RuntimeException(e); - } - } - - private void forEachBiome(BiConsumer consumer) { - Registry registry = getRegistry().registryOrThrow(Registries.BIOME); - for (Biome biome : registry) { - consumer.accept(biome, registry.getKey(biome)); - } - } - - private void hookIntoBiome(@NotNull final Biome biome, ResourceLocation minecraftKey) throws NoSuchFieldException, IllegalAccessException { - de.derfrzocker.ore.control.api.Biome oreControlBiome = registries.getBiomeRegistry().get(CraftNamespacedKey.fromMinecraft(minecraftKey)).get(); - List> decorations = biome.getGenerationSettings().features(); - List> newDecorations = new ArrayList<>(); - for (HolderSet list : decorations) { - List> newList = new ArrayList<>(); - - for (Holder featureSupplier : list) { - PlacedFeature feature = featureSupplier.value(); - - PlacedFeature newFeature = check(oreControlBiome, minecraftKey, feature); - - if (newFeature != null) { - newList.add(Holder.direct(newFeature)); - } else { - newList.add(featureSupplier); - } - } - - newDecorations.add(decorations.indexOf(list), HolderSet.direct(newList)); - } - - { - final Field field = getField(BiomeGenerationSettings.class, NMSReflectionNames.BIOME_GENERATION_SETTINGS_FEATURES); - field.setAccessible(true); - field.set(biome.getGenerationSettings(), newDecorations); - } - { - final Field field = getField(BiomeGenerationSettings.class, NMSReflectionNames.BIOME_GENERATION_SETTINGS_FEATURE_SET); - field.setAccessible(true); - field.set(biome.getGenerationSettings(), Suppliers.memoize(() -> newDecorations.stream().flatMap(HolderSet::stream).map(Holder::value).collect(Collectors.toSet()))); - } - } - - private void addToList(List> list, int index, PlacedFeature feature) { - list.add(index, () -> feature); - } - - @Nullable - private PlacedFeature check(de.derfrzocker.ore.control.api.Biome biome, ResourceLocation biomeKey, PlacedFeature feature) { - // Not the best method to do this, but hey it works - final Registry registry = getRegistry().registryOrThrow(Registries.PLACED_FEATURE); - ResourceLocation featureKey = registry.getKey(feature); - - // Return if the featureKey is null, this can happen when plugins are adding placed features to the biome without registering them - if (featureKey == null) { - // TODO add debug message - return null; - } - - NamespacedKey key = CraftNamespacedKey.fromMinecraft(featureKey); - ConfiguredFeature configuredFeature = feature.getFeatures().findFirst().orElse(null); - - if (configuredFeature == null) { - return null; - } - - if (!(configuredFeature.feature() instanceof OreFeature) && !(configuredFeature.feature() instanceof ScatteredOreFeature) && !(configuredFeature.feature() instanceof GlowstoneFeature)) { - return null; - } - - boolean hasCount = false; - List placementModifiers = new ArrayList<>(); - for (PlacementModifier placement : feature.placement()) { - if (placement.type() == PlacementModifierType.RARITY_FILTER) { - placementModifiers.add(new RarityModifierHook(oreControlManager, biome, key, (RarityFilter) placement)); - } else if (placement.type() == PlacementModifierType.SURFACE_RELATIVE_THRESHOLD_FILTER) { - placementModifiers.add(new SurfaceRelativeThresholdModifierHook(oreControlManager, biome, key, (SurfaceRelativeThresholdFilter) placement)); - } else if (placement.type() == PlacementModifierType.SURFACE_WATER_DEPTH_FILTER) { - placementModifiers.add(new SurfaceWaterDepthModifierHook(oreControlManager, biome, key, (SurfaceWaterDepthFilter) placement)); - } else if (placement.type() == PlacementModifierType.COUNT) { - hasCount = true; - placementModifiers.add(new CountModifierHook(oreControlManager, biome, key, (CountPlacement) placement)); - } else if (placement.type() == PlacementModifierType.HEIGHT_RANGE) { - placementModifiers.add(new HeightRangeModifierHook(oreControlManager, biome, key, (HeightRangePlacement) placement)); - } else { - placementModifiers.add(placement); - } - } - - if (!hasCount) { - placementModifiers.add(0, new CountModifierHook(oreControlManager, biome, key, CountPlacement.of(1))); - } - - // inject activation / deactivation logic - Optional> modifierOptional = registries.getPlacementModifierRegistry().get(ActivationModifier.KEY); - modifierOptional.ifPresent(modifier -> placementModifiers.add(0, new ActivationModifierHook(oreControlManager, biome, key))); - - if (configuredFeature.feature() instanceof OreFeature) { - return new PlacedFeature(Holder.direct(new ConfiguredFeature(OreConfigurationGeneratorHook.createOreHook(oreControlManager, key, biome), configuredFeature.config())), placementModifiers); - } else if (configuredFeature.feature() instanceof ScatteredOreFeature) { - return new PlacedFeature(Holder.direct(new ConfiguredFeature(OreConfigurationGeneratorHook.createScatteredOreHook(oreControlManager, key, biome), configuredFeature.config())), placementModifiers); - } else if (configuredFeature.feature() instanceof GlowstoneFeature) { - return new PlacedFeature(Holder.direct(new ConfiguredFeature(EmptyConfigurationGeneratorHook.createGlowstoneBlobHook(oreControlManager, key, biome), configuredFeature.config())), placementModifiers); - } - - throw new RuntimeException("HOW?"); - } - - @SuppressWarnings("rawtypes") - private Field getField(@NotNull final Class clazz, @NotNull final String fieldName) throws NoSuchFieldException { - try { - return clazz.getDeclaredField(fieldName); - } catch (final NoSuchFieldException e) { - final Class superClass = clazz.getSuperclass(); - if (superClass == null) { - throw e; - } else { - return getField(superClass, fieldName); - } - } - } - - @NotNull - private RegistryAccess getRegistry() { - final DedicatedServer server = ((CraftServer) Bukkit.getServer()).getServer(); - - return server.registryAccess(); - } -} diff --git a/impl/v1_19_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R3/feature/generator/EmptyConfigurationGeneratorHook.java b/impl/v1_19_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R3/feature/generator/EmptyConfigurationGeneratorHook.java deleted file mode 100644 index 4ee489e4..00000000 --- a/impl/v1_19_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R3/feature/generator/EmptyConfigurationGeneratorHook.java +++ /dev/null @@ -1,30 +0,0 @@ -package de.derfrzocker.ore.control.impl.v1_19_R3.feature.generator; - -import de.derfrzocker.feature.common.feature.generator.configuration.EmptyFeatureConfiguration; -import de.derfrzocker.ore.control.api.Biome; -import de.derfrzocker.ore.control.api.OreControlManager; -import net.minecraft.world.level.levelgen.feature.Feature; -import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Random; - -public class EmptyConfigurationGeneratorHook extends MinecraftFeatureGeneratorHook { - - private EmptyConfigurationGeneratorHook(Feature feature, @NotNull OreControlManager oreControlManager, @NotNull String name, Biome biome, NamespacedKey namespacedKey) { - super(NoneFeatureConfiguration.CODEC, feature, oreControlManager, name, biome, namespacedKey); - } - - public static EmptyConfigurationGeneratorHook createGlowstoneBlobHook(@NotNull OreControlManager oreControlManager, @NotNull NamespacedKey namespacedKey, @NotNull Biome biome) { - return new EmptyConfigurationGeneratorHook(GLOWSTONE_BLOB, oreControlManager, "glowstone_blob", biome, namespacedKey); - } - - @Override - public NoneFeatureConfiguration createConfig(@NotNull NoneFeatureConfiguration defaultConfiguration, @NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull EmptyFeatureConfiguration configuration) { - return defaultConfiguration; - } -} diff --git a/impl/v1_19_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R3/feature/generator/MinecraftFeatureGeneratorHook.java b/impl/v1_19_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R3/feature/generator/MinecraftFeatureGeneratorHook.java deleted file mode 100644 index 604d8496..00000000 --- a/impl/v1_19_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R3/feature/generator/MinecraftFeatureGeneratorHook.java +++ /dev/null @@ -1,100 +0,0 @@ -package de.derfrzocker.ore.control.impl.v1_19_R3.feature.generator; - -import com.mojang.serialization.Codec; -import de.derfrzocker.feature.api.FeatureGenerator; -import de.derfrzocker.feature.api.FeatureGeneratorConfiguration; -import de.derfrzocker.ore.control.api.Biome; -import de.derfrzocker.ore.control.api.FeatureGeneratorHook; -import de.derfrzocker.ore.control.api.OreControlManager; -import de.derfrzocker.ore.control.api.config.Config; -import de.derfrzocker.ore.control.api.config.ConfigManager; -import net.minecraft.core.BlockPos; -import net.minecraft.util.RandomSource; -import net.minecraft.world.level.ChunkPos; -import net.minecraft.world.level.WorldGenLevel; -import net.minecraft.world.level.chunk.ChunkGenerator; -import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; -import net.minecraft.world.level.levelgen.feature.Feature; -import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext; -import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration; -import org.bukkit.NamespacedKey; -import org.bukkit.craftbukkit.v1_19_R3.generator.CraftLimitedRegion; -import org.bukkit.craftbukkit.v1_19_R3.util.RandomSourceWrapper; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Map; -import java.util.Optional; -import java.util.Random; -import java.util.concurrent.ConcurrentHashMap; - -public abstract class MinecraftFeatureGeneratorHook extends Feature implements FeatureGeneratorHook { - - private final Map cache = new ConcurrentHashMap<>(); - private final Feature feature; - private final ConfigManager configManager; - private final FeatureGenerator featureGenerator; - private final Biome biome; - private final NamespacedKey namespacedKey; - - public MinecraftFeatureGeneratorHook(Codec codec, Feature feature, @NotNull OreControlManager oreControlManager, @NotNull String name, Biome biome, NamespacedKey namespacedKey) { - super(codec); - this.feature = feature; - this.configManager = oreControlManager.getConfigManager(); - this.featureGenerator = (FeatureGenerator) oreControlManager.getRegistries().getFeatureGeneratorRegistry().get(NamespacedKey.minecraft(name)).get(); - this.biome = biome; - this.namespacedKey = namespacedKey; - - oreControlManager.addValueChangeListener(cache::clear); - } - - public abstract M createConfig(@NotNull M defaultConfiguration, @NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull C configuration); - - @Override - public FeatureGenerator getFeatureGenerator() { - return featureGenerator; - } - - @Override - public Biome getBiome() { - return biome; - } - - @NotNull - @Override - public NamespacedKey getKey() { - return namespacedKey; - } - - @Override - public boolean place(FeaturePlaceContext context) { - BlockPos origin = context.origin(); - - FeatureGeneratorConfiguration configuration = cache.computeIfAbsent(context.level().getMinecraftWorld().getWorld().getName(), this::loadConfig); - if (configuration == null) { - return feature.place(context); - } - - CraftLimitedRegion limitedRegion = new CraftLimitedRegion(context.level(), new ChunkPos(origin)); - M config = createConfig(context.config(), context.level().getMinecraftWorld().getWorld(), new RandomSourceWrapper.RandomWrapper(context.random()), new BlockVector(origin.getX(), origin.getY(), origin.getZ()), limitedRegion, (C) configuration); - limitedRegion.breakLink(); - - return place(context.topFeature(), context.level(), context.chunkGenerator(), context.random(), origin, config); - } - - private FeatureGeneratorConfiguration loadConfig(String name) { - Config config = configManager.getGenerationConfig(configManager.getOrCreateConfigInfo(name), biome, namespacedKey).orElse(null); - - if (config == null) { - return null; - } - - return config.getFeature(); - } - - private boolean place(Optional> top, WorldGenLevel world, ChunkGenerator generator, RandomSource random, BlockPos pos, M config) { - return feature.place(new FeaturePlaceContext<>(top, world, generator, random, pos, config)); - } -} diff --git a/impl/v1_19_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R3/feature/generator/OreConfigurationGeneratorHook.java b/impl/v1_19_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R3/feature/generator/OreConfigurationGeneratorHook.java deleted file mode 100644 index 6c0c9ff5..00000000 --- a/impl/v1_19_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R3/feature/generator/OreConfigurationGeneratorHook.java +++ /dev/null @@ -1,150 +0,0 @@ -package de.derfrzocker.ore.control.impl.v1_19_R3.feature.generator; - -import de.derfrzocker.feature.api.FeatureGenerator; -import de.derfrzocker.feature.common.feature.generator.configuration.OreFeatureConfiguration; -import de.derfrzocker.feature.common.ruletest.AlwaysTrueRuleTest; -import de.derfrzocker.feature.common.ruletest.BlockMatchRuleTest; -import de.derfrzocker.feature.common.ruletest.BlockStateMatchRuleTest; -import de.derfrzocker.feature.common.ruletest.RandomBlockMatchRuleTest; -import de.derfrzocker.feature.common.ruletest.RandomBlockStateMatchRuleTest; -import de.derfrzocker.feature.common.ruletest.TagMatchRuleTest; -import de.derfrzocker.feature.common.value.number.FixedFloatValue; -import de.derfrzocker.feature.common.value.number.integer.FixedDoubleToIntegerValue; -import de.derfrzocker.feature.common.value.target.FixedTargetListValue; -import de.derfrzocker.feature.common.value.target.TargetBlockState; -import de.derfrzocker.feature.common.value.target.TargetListValue; -import de.derfrzocker.ore.control.api.Biome; -import de.derfrzocker.ore.control.api.OreControlManager; -import net.minecraft.tags.TagKey; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.levelgen.feature.Feature; -import net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration; -import net.minecraft.world.level.levelgen.structure.templatesystem.AlwaysTrueTest; -import net.minecraft.world.level.levelgen.structure.templatesystem.BlockMatchTest; -import net.minecraft.world.level.levelgen.structure.templatesystem.BlockStateMatchTest; -import net.minecraft.world.level.levelgen.structure.templatesystem.RandomBlockMatchTest; -import net.minecraft.world.level.levelgen.structure.templatesystem.RandomBlockStateMatchTest; -import net.minecraft.world.level.levelgen.structure.templatesystem.RuleTest; -import net.minecraft.world.level.levelgen.structure.templatesystem.TagMatchTest; -import org.bukkit.NamespacedKey; -import org.bukkit.craftbukkit.v1_19_R3.block.data.CraftBlockData; -import org.bukkit.craftbukkit.v1_19_R3.util.CraftMagicNumbers; -import org.bukkit.craftbukkit.v1_19_R3.util.CraftNamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Random; - -public class OreConfigurationGeneratorHook extends MinecraftFeatureGeneratorHook { - - private OreConfigurationGeneratorHook(Feature feature, @NotNull OreControlManager oreControlManager, @NotNull String name, Biome biome, NamespacedKey namespacedKey) { - super(OreConfiguration.CODEC, feature, oreControlManager, name, biome, namespacedKey); - } - - public static OreConfigurationGeneratorHook createOreHook(@NotNull OreControlManager oreControlManager, @NotNull NamespacedKey namespacedKey, @NotNull Biome biome) { - return new OreConfigurationGeneratorHook(ORE, oreControlManager, "ore", biome, namespacedKey); - } - - public static OreConfigurationGeneratorHook createScatteredOreHook(@NotNull OreControlManager oreControlManager, @NotNull NamespacedKey namespacedKey, @NotNull Biome biome) { - return new OreConfigurationGeneratorHook(SCATTERED_ORE, oreControlManager, "scattered_ore", biome, namespacedKey); - } - - public static OreFeatureConfiguration createDefaultConfiguration(@NotNull OreConfiguration configuration, @NotNull FeatureGenerator feature) { - List targetBlockStates = new ArrayList<>(); - for (OreConfiguration.TargetBlockState targetBlockState : configuration.targetStates) { - de.derfrzocker.feature.api.RuleTest ruleTest; - if (targetBlockState.target instanceof AlwaysTrueTest) { - ruleTest = new AlwaysTrueRuleTest(); - } else if (targetBlockState.target instanceof BlockMatchTest rule) { - ruleTest = new BlockMatchRuleTest(CraftMagicNumbers.getMaterial(getFieldValueFromType(rule, Block.class))); - } else if (targetBlockState.target instanceof BlockStateMatchTest rule) { - ruleTest = new BlockStateMatchRuleTest(CraftBlockData.fromData(getFieldValueFromType(rule, BlockState.class))); - } else if (targetBlockState.target instanceof RandomBlockMatchTest rule) { - ruleTest = new RandomBlockMatchRuleTest(CraftMagicNumbers.getMaterial(getFieldValueFromType(rule, Block.class)), getFieldValueFromType(rule, Float.TYPE)); - } else if (targetBlockState.target instanceof RandomBlockStateMatchTest rule) { - ruleTest = new RandomBlockStateMatchRuleTest(CraftBlockData.fromData(getFieldValueFromType(rule, BlockState.class)), getFieldValueFromType(rule, Float.TYPE)); - } else if (targetBlockState.target instanceof TagMatchTest rule) { - ruleTest = new TagMatchRuleTest(CraftNamespacedKey.fromMinecraft(getFieldValueFromType(rule, TagKey.class).location())); - } else { - throw new IllegalArgumentException("Got unexpected rule test from class " + targetBlockState.target.getClass()); - } - - targetBlockStates.add(new TargetBlockState(ruleTest, CraftBlockData.fromData(targetBlockState.state))); - } - - TargetListValue targetListValue = new FixedTargetListValue(targetBlockStates); - - return new OreFeatureConfiguration(feature, targetListValue, new FixedDoubleToIntegerValue(configuration.size), new FixedFloatValue(configuration.discardChanceOnAirExposure)); - } - - private static V getFieldValueFromType(Object from, Class type) { - for (Field field : from.getClass().getDeclaredFields()) { - if (field.getType() == type) { - field.setAccessible(true); - try { - return (V) field.get(from); - } catch (IllegalAccessException e) { - throw new RuntimeException(e); - } - } - } - - throw new IllegalStateException("Didn't found field with type " + type + " from class " + from.getClass() - + ", following fields are present " + Arrays.toString(from.getClass().getDeclaredFields())); - } - - @Override - public OreConfiguration createConfig(@NotNull OreConfiguration defaultConfiguration, @NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull OreFeatureConfiguration configuration) { - List blockStates; - if (configuration.getTargets() == null) { - blockStates = defaultConfiguration.targetStates; - } else { - blockStates = new ArrayList<>(); - - for (TargetBlockState targetValue : configuration.getTargets().getValue(worldInfo, random, position, limitedRegion)) { - RuleTest ruleTest; - - if (targetValue.getTarget() instanceof AlwaysTrueRuleTest) { - ruleTest = AlwaysTrueTest.INSTANCE; - } else if (targetValue.getTarget() instanceof BlockMatchRuleTest rule) { - ruleTest = new BlockMatchTest(CraftMagicNumbers.getBlock(rule.getBlock())); - } else if (targetValue.getTarget() instanceof BlockStateMatchRuleTest rule) { - ruleTest = new BlockStateMatchTest(((CraftBlockData) rule.getBlockData()).getState()); - } else if (targetValue.getTarget() instanceof RandomBlockMatchRuleTest rule) { - ruleTest = new RandomBlockMatchTest(CraftMagicNumbers.getBlock(rule.getMaterial()), rule.getProbability()); - } else if (targetValue.getTarget() instanceof RandomBlockStateMatchRuleTest rule) { - ruleTest = new RandomBlockStateMatchTest(((CraftBlockData) rule.getBlockData()).getState(), rule.getProbability()); - } else if (targetValue.getTarget() instanceof TagMatchRuleTest rule) { - ruleTest = new TagMatchTest(TagKey.create(net.minecraft.core.registries.Registries.BLOCK, CraftNamespacedKey.toMinecraft(rule.getTag()))); - } else { - throw new IllegalArgumentException("Got unexpected rule test from class " + targetValue.getTarget().getClass()); - } - - blockStates.add(OreConfiguration.target(ruleTest, ((CraftBlockData) targetValue.getState()).getState())); - } - } - - int size; - if (configuration.getSize() == null) { - size = defaultConfiguration.size; - } else { - size = configuration.getSize().getValue(worldInfo, random, position, limitedRegion); - } - - float discardChanceOnAirExposure; - if (configuration.getDiscardChanceOnAirExposure() == null) { - discardChanceOnAirExposure = defaultConfiguration.discardChanceOnAirExposure; - } else { - discardChanceOnAirExposure = configuration.getDiscardChanceOnAirExposure().getValue(worldInfo, random, position, limitedRegion); - } - - return new OreConfiguration(blockStates, size, discardChanceOnAirExposure); - } -} diff --git a/impl/v1_19_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R3/placement/ActivationModifierHook.java b/impl/v1_19_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R3/placement/ActivationModifierHook.java deleted file mode 100644 index 08927285..00000000 --- a/impl/v1_19_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R3/placement/ActivationModifierHook.java +++ /dev/null @@ -1,95 +0,0 @@ -package de.derfrzocker.ore.control.impl.v1_19_R3.placement; - -import de.derfrzocker.feature.api.FeaturePlacementModifier; -import de.derfrzocker.feature.api.PlacementModifierConfiguration; -import de.derfrzocker.feature.common.feature.placement.ActivationModifier; -import de.derfrzocker.feature.common.feature.placement.configuration.ActivationConfiguration; -import de.derfrzocker.ore.control.api.Biome; -import de.derfrzocker.ore.control.api.OreControlManager; -import de.derfrzocker.ore.control.api.PlacementModifierHook; -import de.derfrzocker.ore.control.api.config.Config; -import de.derfrzocker.ore.control.api.config.ConfigManager; -import net.minecraft.core.BlockPos; -import net.minecraft.util.RandomSource; -import net.minecraft.world.level.ChunkPos; -import net.minecraft.world.level.levelgen.placement.PlacementContext; -import net.minecraft.world.level.levelgen.placement.PlacementModifier; -import net.minecraft.world.level.levelgen.placement.PlacementModifierType; -import org.bukkit.NamespacedKey; -import org.bukkit.craftbukkit.v1_19_R3.generator.CraftLimitedRegion; -import org.bukkit.craftbukkit.v1_19_R3.util.RandomSourceWrapper; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; -import java.util.stream.Stream; - -// TODO make more generic -public class ActivationModifierHook extends PlacementModifier implements PlacementModifierHook { - - private final Map cache = new ConcurrentHashMap<>(); - private final ActivationModifier activationModifier; - private final ConfigManager configManager; - private final Biome biome; - private final NamespacedKey namespacedKey; - - public ActivationModifierHook(@NotNull OreControlManager oreControlManager, @NotNull Biome biome, @NotNull NamespacedKey namespacedKey) { - this.configManager = oreControlManager.getConfigManager(); - this.activationModifier = (ActivationModifier) oreControlManager.getRegistries().getPlacementModifierRegistry().get(ActivationModifier.KEY).get(); - this.biome = biome; - this.namespacedKey = namespacedKey; - - oreControlManager.addValueChangeListener(cache::clear); - } - - @Override - public FeaturePlacementModifier getPlacementModifier() { - return activationModifier; - } - - @Override - public Biome getBiome() { - return biome; - } - - @NotNull - @Override - public NamespacedKey getKey() { - return activationModifier.getKey(); - } - - @Override - public Stream getPositions(PlacementContext context, RandomSource random, BlockPos blockPos) { - PlacementModifierConfiguration configuration = cache.computeIfAbsent(context.getLevel().getMinecraftWorld().getWorld().getName(), this::loadConfig); - if (configuration == null) { - return Stream.of(blockPos); - } - - CraftLimitedRegion limitedRegion = new CraftLimitedRegion(context.getLevel(), new ChunkPos(blockPos)); - Stream pos = activationModifier.getPositions(context.getLevel().getMinecraftWorld().getWorld(), new RandomSourceWrapper.RandomWrapper(random), new BlockVector(blockPos.getX(), blockPos.getY(), blockPos.getZ()), limitedRegion, (ActivationConfiguration) configuration); - - limitedRegion.breakLink(); - - return pos.map(blockVector -> new BlockPos(blockVector.getBlockX(), blockVector.getBlockY(), blockVector.getBlockZ())); - } - - private PlacementModifierConfiguration loadConfig(String name) { - Config config = configManager.getGenerationConfig(configManager.getOrCreateConfigInfo(name), biome, namespacedKey).orElse(null); - - if (config == null) { - return null; - } - - if (config.getPlacements() == null) { - return null; - } - - return config.getPlacements().get(activationModifier); - } - - @Override - public PlacementModifierType type() { - return null; - } -} diff --git a/impl/v1_19_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R3/placement/CountModifierHook.java b/impl/v1_19_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R3/placement/CountModifierHook.java deleted file mode 100644 index 3c73fd21..00000000 --- a/impl/v1_19_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R3/placement/CountModifierHook.java +++ /dev/null @@ -1,55 +0,0 @@ -package de.derfrzocker.ore.control.impl.v1_19_R3.placement; - -import de.derfrzocker.feature.api.FeaturePlacementModifier; -import de.derfrzocker.feature.common.feature.placement.configuration.CountModifierConfiguration; -import de.derfrzocker.feature.common.value.number.IntegerValue; -import de.derfrzocker.ore.control.api.Biome; -import de.derfrzocker.ore.control.api.OreControlManager; -import de.derfrzocker.ore.control.impl.v1_19_R3.ConversionUtil; -import de.derfrzocker.ore.control.impl.v1_19_R3.NMSReflectionNames; -import net.minecraft.util.valueproviders.IntProvider; -import net.minecraft.world.level.levelgen.placement.CountPlacement; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.lang.reflect.Field; -import java.util.Random; - -public class CountModifierHook extends MinecraftPlacementModifierHook { - - public CountModifierHook(@NotNull OreControlManager oreControlManager, @NotNull Biome biome, @NotNull NamespacedKey namespacedKey, @NotNull CountPlacement defaultModifier) { - super(oreControlManager, "count", defaultModifier, biome, namespacedKey); - } - - public static CountModifierConfiguration createDefaultConfiguration(@NotNull CountPlacement defaultModifier, @NotNull FeaturePlacementModifier modifier) { - try { - Field count = CountPlacement.class.getDeclaredField(NMSReflectionNames.COUNT_PLACEMENT_COUNT); - count.setAccessible(true); - IntProvider value = (IntProvider) count.get(defaultModifier); - IntegerValue integerValue = ConversionUtil.convert(value); - return new CountModifierConfiguration(modifier, integerValue); - } catch (NoSuchFieldException | IllegalAccessException e) { - throw new RuntimeException(e); - } - } - - @Override - public CountModifierConfiguration createDefaultConfiguration(@NotNull CountPlacement defaultModifier) { - return createDefaultConfiguration(defaultModifier, getPlacementModifier()); - } - - @Override - public CountPlacement createModifier(@NotNull CountModifierConfiguration defaultConfiguration, @NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull CountModifierConfiguration configuration) { - int count; - if (configuration.getCount() == null) { - count = defaultConfiguration.getCount().getValue(worldInfo, random, position, limitedRegion); - } else { - count = configuration.getCount().getValue(worldInfo, random, position, limitedRegion); - } - - return CountPlacement.of(count); - } -} diff --git a/impl/v1_19_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R3/placement/HeightRangeModifierHook.java b/impl/v1_19_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R3/placement/HeightRangeModifierHook.java deleted file mode 100644 index 07ea9ca2..00000000 --- a/impl/v1_19_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R3/placement/HeightRangeModifierHook.java +++ /dev/null @@ -1,122 +0,0 @@ -package de.derfrzocker.ore.control.impl.v1_19_R3.placement; - -import de.derfrzocker.feature.api.FeaturePlacementModifier; -import de.derfrzocker.feature.common.feature.placement.configuration.HeightRangeModifierConfiguration; -import de.derfrzocker.feature.common.value.number.IntegerValue; -import de.derfrzocker.feature.common.value.number.integer.FixedDoubleToIntegerValue; -import de.derfrzocker.feature.common.value.number.integer.trapezoid.TrapezoidIntegerValue; -import de.derfrzocker.feature.common.value.number.integer.uniform.UniformIntegerValue; -import de.derfrzocker.feature.impl.v1_19_R3.value.offset.NMSAboveBottomOffsetIntegerValue; -import de.derfrzocker.feature.impl.v1_19_R3.value.offset.NMSBelowTopOffsetIntegerValue; -import de.derfrzocker.ore.control.api.Biome; -import de.derfrzocker.ore.control.api.OreControlManager; -import de.derfrzocker.ore.control.impl.v1_19_R3.NMSReflectionNames; -import net.minecraft.world.level.levelgen.VerticalAnchor; -import net.minecraft.world.level.levelgen.heightproviders.ConstantHeight; -import net.minecraft.world.level.levelgen.heightproviders.HeightProvider; -import net.minecraft.world.level.levelgen.heightproviders.HeightProviderType; -import net.minecraft.world.level.levelgen.placement.HeightRangePlacement; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.lang.reflect.Field; -import java.util.Random; - -public class HeightRangeModifierHook extends MinecraftPlacementModifierHook { - - public HeightRangeModifierHook(@NotNull OreControlManager oreControlManager, @NotNull Biome biome, @NotNull NamespacedKey namespacedKey, @NotNull HeightRangePlacement defaultModifier) { - super(oreControlManager, "height_range", defaultModifier, biome, namespacedKey); - } - - public static HeightRangeModifierConfiguration createDefaultConfiguration(@NotNull HeightRangePlacement defaultModifier, @NotNull FeaturePlacementModifier modifier) { - try { - Field height = HeightRangePlacement.class.getDeclaredField(NMSReflectionNames.HEIGHT_RANGE_PLACEMENT_HEIGHT); - height.setAccessible(true); - HeightProvider value = (HeightProvider) height.get(defaultModifier); - - IntegerValue integerValue; - if (value.getType() == HeightProviderType.CONSTANT) { - integerValue = getIntegerValue(value.toString()); - } else if (value.getType() == HeightProviderType.UNIFORM) { - String uniform = value.toString(); - uniform = uniform.substring(1); - uniform = uniform.substring(0, uniform.length() - 1); - int charType = uniform.indexOf("-", 1); - String[] anchors = new String[]{uniform.substring(0, charType), uniform.substring(charType + 1)}; - - integerValue = new UniformIntegerValue(getIntegerValue(anchors[0]), getIntegerValue(anchors[1])); - } else if (value.getType() == HeightProviderType.TRAPEZOID) { - String trapezoid = value.toString(); - if (trapezoid.startsWith("triangle")) { - trapezoid = trapezoid.replace("triangle (", ""); - trapezoid = trapezoid.substring(0, trapezoid.length() - 1); - int charType = trapezoid.indexOf("-", 1); - String[] anchors = new String[]{trapezoid.substring(0, charType), trapezoid.substring(charType + 1)}; - - integerValue = new TrapezoidIntegerValue(getIntegerValue(anchors[0]), getIntegerValue(anchors[1]), new FixedDoubleToIntegerValue(0)); - } else if (trapezoid.startsWith("trapezoid")) { - trapezoid = trapezoid.replace("trapezoid (", ""); - trapezoid = trapezoid.substring(0, trapezoid.length() - 1); - String[] split = trapezoid.split("\\) in \\["); - - if (split.length != 2) { - throw new IllegalStateException(String.format("Expected a split of size '2', but got '%s' for input '%s'", split.length, trapezoid)); - } - - int plateau = Integer.parseInt(split[0]); - int charType = trapezoid.indexOf("-", 1); - String[] anchors = new String[]{trapezoid.substring(0, charType), trapezoid.substring(charType + 1)}; - integerValue = new TrapezoidIntegerValue(getIntegerValue(anchors[0]), getIntegerValue(anchors[1]), new FixedDoubleToIntegerValue(plateau)); - } else { - throw new UnsupportedOperationException(String.format("Unknown trapezoid value '%s'", trapezoid)); - } - - } else { // TODO add rest of HeightProvider types - throw new UnsupportedOperationException(String.format("No integer value equivalent for HeightProvider '%s'", value)); - } - - return new HeightRangeModifierConfiguration(modifier, integerValue); - } catch (NoSuchFieldException | IllegalAccessException e) { - throw new RuntimeException(e); - } - } - - private static IntegerValue getIntegerValue(String anchor) { - String[] values = anchor.split(" "); - int value = Integer.parseInt(values[0]); - - if (values.length == 2 && values[1].equals("absolute")) { - return new FixedDoubleToIntegerValue(value); - } - - if (values.length == 3 && values[1].equals("above") && values[2].equals("bottom")) { - return new NMSAboveBottomOffsetIntegerValue(new FixedDoubleToIntegerValue(value)); - } - - if (values.length == 3 && values[1].equals("below") && values[2].equals("top")) { - return new NMSBelowTopOffsetIntegerValue(new FixedDoubleToIntegerValue(value)); - } - - throw new UnsupportedOperationException(String.format("Unknown vertical anchor '%s'", anchor)); - } - - @Override - public HeightRangeModifierConfiguration createDefaultConfiguration(@NotNull HeightRangePlacement defaultModifier) { - return createDefaultConfiguration(defaultModifier, getPlacementModifier()); - } - - @Override - public HeightRangePlacement createModifier(@NotNull HeightRangeModifierConfiguration defaultConfiguration, @NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull HeightRangeModifierConfiguration configuration) { - int height; - if (configuration.getHeight() == null) { - height = defaultConfiguration.getHeight().getValue(worldInfo, random, position, limitedRegion); - } else { - height = configuration.getHeight().getValue(worldInfo, random, position, limitedRegion); - } - - return HeightRangePlacement.of(ConstantHeight.of(VerticalAnchor.absolute(height))); - } -} diff --git a/impl/v1_19_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R3/placement/MinecraftPlacementModifierHook.java b/impl/v1_19_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R3/placement/MinecraftPlacementModifierHook.java deleted file mode 100644 index 2a31d06e..00000000 --- a/impl/v1_19_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R3/placement/MinecraftPlacementModifierHook.java +++ /dev/null @@ -1,106 +0,0 @@ -package de.derfrzocker.ore.control.impl.v1_19_R3.placement; - -import de.derfrzocker.feature.api.FeaturePlacementModifier; -import de.derfrzocker.feature.api.PlacementModifierConfiguration; -import de.derfrzocker.ore.control.api.Biome; -import de.derfrzocker.ore.control.api.OreControlManager; -import de.derfrzocker.ore.control.api.PlacementModifierHook; -import de.derfrzocker.ore.control.api.config.Config; -import de.derfrzocker.ore.control.api.config.ConfigManager; -import net.minecraft.core.BlockPos; -import net.minecraft.util.RandomSource; -import net.minecraft.world.level.ChunkPos; -import net.minecraft.world.level.WorldGenLevel; -import net.minecraft.world.level.chunk.ChunkGenerator; -import net.minecraft.world.level.levelgen.placement.PlacedFeature; -import net.minecraft.world.level.levelgen.placement.PlacementContext; -import net.minecraft.world.level.levelgen.placement.PlacementModifier; -import net.minecraft.world.level.levelgen.placement.PlacementModifierType; -import org.bukkit.NamespacedKey; -import org.bukkit.craftbukkit.v1_19_R3.generator.CraftLimitedRegion; -import org.bukkit.craftbukkit.v1_19_R3.util.RandomSourceWrapper; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Map; -import java.util.Optional; -import java.util.Random; -import java.util.concurrent.ConcurrentHashMap; -import java.util.stream.Stream; - -public abstract class MinecraftPlacementModifierHook extends PlacementModifier implements PlacementModifierHook { - - private final Map cache = new ConcurrentHashMap<>(); - private final FeaturePlacementModifier placementModifier; - private final ConfigManager configManager; - private final M defaultModifier; - private final C defaultConfiguration; - private final Biome biome; - private final NamespacedKey namespacedKey; - - public MinecraftPlacementModifierHook(@NotNull OreControlManager oreControlManager, @NotNull String name, @NotNull M defaultModifier, @NotNull Biome biome, @NotNull NamespacedKey namespacedKey) { - this.configManager = oreControlManager.getConfigManager(); - this.placementModifier = (FeaturePlacementModifier) oreControlManager.getRegistries().getPlacementModifierRegistry().get(NamespacedKey.minecraft(name)).get(); - this.defaultModifier = defaultModifier; - this.defaultConfiguration = createDefaultConfiguration(defaultModifier); - this.biome = biome; - this.namespacedKey = namespacedKey; - - oreControlManager.addValueChangeListener(cache::clear); - } - - public abstract M createModifier(@NotNull C defaultConfiguration, @NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull C configuration); - - public abstract C createDefaultConfiguration(M defaultModifier); - - @Override - public FeaturePlacementModifier getPlacementModifier() { - return placementModifier; - } - - @Override - public Biome getBiome() { - return biome; - } - - @NotNull - @Override - public NamespacedKey getKey() { - return namespacedKey; - } - - @Override - public Stream getPositions(PlacementContext context, RandomSource random, BlockPos blockPos) { - PlacementModifierConfiguration configuration = cache.computeIfAbsent(context.getLevel().getMinecraftWorld().getWorld().getName(), this::loadConfig); - - M modifier = defaultModifier; - if (configuration != null) { - CraftLimitedRegion limitedRegion = new CraftLimitedRegion(context.getLevel(), new ChunkPos(blockPos)); - modifier = createModifier(defaultConfiguration, context.getLevel().getMinecraftWorld().getWorld(), new RandomSourceWrapper.RandomWrapper(random), new BlockVector(blockPos.getX(), blockPos.getY(), blockPos.getZ()), limitedRegion, (C) configuration); - limitedRegion.breakLink(); - } - - return getPositions(context.topFeature(), context.getLevel(), context.generator(), random, blockPos, modifier); - } - - private PlacementModifierConfiguration loadConfig(String name) { - Config config = configManager.getGenerationConfig(configManager.getOrCreateConfigInfo(name), biome, namespacedKey).orElse(null); - - if (config == null) { - return null; - } - - return config.getPlacements().get(placementModifier); - } - - @Override - public PlacementModifierType type() { - return null; - } - - private Stream getPositions(Optional top, WorldGenLevel world, ChunkGenerator generator, RandomSource random, BlockPos pos, M modifier) { - return modifier.getPositions(new PlacementContext(world, generator, top), random, pos); - } -} diff --git a/impl/v1_19_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R3/placement/RarityModifierHook.java b/impl/v1_19_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R3/placement/RarityModifierHook.java deleted file mode 100644 index 93eb753a..00000000 --- a/impl/v1_19_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R3/placement/RarityModifierHook.java +++ /dev/null @@ -1,53 +0,0 @@ -package de.derfrzocker.ore.control.impl.v1_19_R3.placement; - -import de.derfrzocker.feature.api.FeaturePlacementModifier; -import de.derfrzocker.feature.common.feature.placement.configuration.RarityModifierConfiguration; -import de.derfrzocker.feature.common.value.number.integer.FixedDoubleToIntegerValue; -import de.derfrzocker.ore.control.api.Biome; -import de.derfrzocker.ore.control.api.OreControlManager; -import de.derfrzocker.ore.control.impl.v1_19_R3.NMSReflectionNames; -import net.minecraft.world.level.levelgen.placement.RarityFilter; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.bukkit.util.NumberConversions; -import org.jetbrains.annotations.NotNull; - -import java.lang.reflect.Field; -import java.util.Random; - -public class RarityModifierHook extends MinecraftPlacementModifierHook { - - public RarityModifierHook(@NotNull OreControlManager oreControlManager, @NotNull Biome biome, @NotNull NamespacedKey namespacedKey, @NotNull RarityFilter defaultModifier) { - super(oreControlManager, "rarity_filter", defaultModifier, biome, namespacedKey); - } - - public static RarityModifierConfiguration createDefaultConfiguration(@NotNull RarityFilter defaultModifier, @NotNull FeaturePlacementModifier modifier) { - try { - Field chance = RarityFilter.class.getDeclaredField(NMSReflectionNames.RARITY_FILTER_CHANCE); - chance.setAccessible(true); - Object value = chance.get(defaultModifier); - return new RarityModifierConfiguration(modifier, new FixedDoubleToIntegerValue(NumberConversions.toInt(value))); - } catch (NoSuchFieldException | IllegalAccessException e) { - throw new RuntimeException(e); - } - } - - @Override - public RarityModifierConfiguration createDefaultConfiguration(@NotNull RarityFilter defaultModifier) { - return createDefaultConfiguration(defaultModifier, getPlacementModifier()); - } - - @Override - public RarityFilter createModifier(@NotNull RarityModifierConfiguration defaultConfiguration, @NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull RarityModifierConfiguration configuration) { - int chance; - if (configuration.getChance() == null) { - chance = defaultConfiguration.getChance().getValue(worldInfo, random, position, limitedRegion); - } else { - chance = configuration.getChance().getValue(worldInfo, random, position, limitedRegion); - } - - return RarityFilter.onAverageOnceEvery(chance); - } -} diff --git a/impl/v1_19_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R3/placement/SurfaceRelativeThresholdModifierHook.java b/impl/v1_19_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R3/placement/SurfaceRelativeThresholdModifierHook.java deleted file mode 100644 index c3c635ca..00000000 --- a/impl/v1_19_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R3/placement/SurfaceRelativeThresholdModifierHook.java +++ /dev/null @@ -1,77 +0,0 @@ -package de.derfrzocker.ore.control.impl.v1_19_R3.placement; - -import de.derfrzocker.feature.api.FeaturePlacementModifier; -import de.derfrzocker.feature.common.value.number.integer.FixedDoubleToIntegerValue; -import de.derfrzocker.feature.impl.v1_19_R3.placement.configuration.SurfaceRelativeThresholdModifierConfiguration; -import de.derfrzocker.ore.control.api.Biome; -import de.derfrzocker.ore.control.api.OreControlManager; -import de.derfrzocker.ore.control.impl.v1_19_R3.NMSReflectionNames; -import net.minecraft.world.level.levelgen.Heightmap; -import net.minecraft.world.level.levelgen.placement.SurfaceRelativeThresholdFilter; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.bukkit.util.NumberConversions; -import org.jetbrains.annotations.NotNull; - -import java.lang.reflect.Field; -import java.util.Random; - -public class SurfaceRelativeThresholdModifierHook extends MinecraftPlacementModifierHook { - - public SurfaceRelativeThresholdModifierHook(@NotNull OreControlManager oreControlManager, @NotNull Biome biome, @NotNull NamespacedKey namespacedKey, @NotNull SurfaceRelativeThresholdFilter defaultModifier) { - super(oreControlManager, "surface_relative_threshold_filter", defaultModifier, biome, namespacedKey); - } - - public static SurfaceRelativeThresholdModifierConfiguration createDefaultConfiguration(@NotNull SurfaceRelativeThresholdFilter defaultModifier, @NotNull FeaturePlacementModifier modifier) { - try { - Field heightmap = SurfaceRelativeThresholdFilter.class.getDeclaredField(NMSReflectionNames.SURFACE_RELATIVE_THRESHOLD_FILTER_HEIGHTMAP); - heightmap.setAccessible(true); - - Field minInclusive = SurfaceRelativeThresholdFilter.class.getDeclaredField(NMSReflectionNames.SURFACE_RELATIVE_THRESHOLD_FILTER_MIN_INCLUSIVE); - minInclusive.setAccessible(true); - - Field maxInclusive = SurfaceRelativeThresholdFilter.class.getDeclaredField(NMSReflectionNames.SURFACE_RELATIVE_THRESHOLD_FILTER_MAX_INCLUSIVE); - maxInclusive.setAccessible(true); - - Object heightmapValue = heightmap.get(defaultModifier); - Object minInclusiveValue = minInclusive.get(defaultModifier); - Object maxInclusiveValue = maxInclusive.get(defaultModifier); - return new SurfaceRelativeThresholdModifierConfiguration(modifier, null, new FixedDoubleToIntegerValue(NumberConversions.toInt(minInclusiveValue)), new FixedDoubleToIntegerValue(NumberConversions.toInt(maxInclusiveValue))); - } catch (NoSuchFieldException | IllegalAccessException e) { - throw new RuntimeException(e); - } - } - - @Override - public SurfaceRelativeThresholdFilter createModifier(@NotNull SurfaceRelativeThresholdModifierConfiguration defaultConfiguration, @NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull SurfaceRelativeThresholdModifierConfiguration configuration) { - Heightmap.Types heightmap; - if (configuration.getHeightmap() == null) { - heightmap = defaultConfiguration.getHeightmap().getValue(worldInfo, random, position, limitedRegion); - } else { - heightmap = configuration.getHeightmap().getValue(worldInfo, random, position, limitedRegion); - } - - int minInclusive; - if (configuration.getMinInclusive() == null) { - minInclusive = defaultConfiguration.getMinInclusive().getValue(worldInfo, random, position, limitedRegion); - } else { - minInclusive = configuration.getMinInclusive().getValue(worldInfo, random, position, limitedRegion); - } - - int maxInclusive; - if (configuration.getMaxInclusive() == null) { - maxInclusive = defaultConfiguration.getMaxInclusive().getValue(worldInfo, random, position, limitedRegion); - } else { - maxInclusive = configuration.getMaxInclusive().getValue(worldInfo, random, position, limitedRegion); - } - - return SurfaceRelativeThresholdFilter.of(heightmap, minInclusive, maxInclusive); - } - - @Override - public SurfaceRelativeThresholdModifierConfiguration createDefaultConfiguration(SurfaceRelativeThresholdFilter defaultModifier) { - return createDefaultConfiguration(defaultModifier, getPlacementModifier()); - } -} diff --git a/impl/v1_19_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R3/placement/SurfaceWaterDepthModifierHook.java b/impl/v1_19_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R3/placement/SurfaceWaterDepthModifierHook.java deleted file mode 100644 index 5e9c605d..00000000 --- a/impl/v1_19_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_19_R3/placement/SurfaceWaterDepthModifierHook.java +++ /dev/null @@ -1,53 +0,0 @@ -package de.derfrzocker.ore.control.impl.v1_19_R3.placement; - -import de.derfrzocker.feature.api.FeaturePlacementModifier; -import de.derfrzocker.feature.common.feature.placement.configuration.SurfaceWaterDepthModifierConfiguration; -import de.derfrzocker.feature.common.value.number.integer.FixedDoubleToIntegerValue; -import de.derfrzocker.ore.control.api.Biome; -import de.derfrzocker.ore.control.api.OreControlManager; -import de.derfrzocker.ore.control.impl.v1_19_R3.NMSReflectionNames; -import net.minecraft.world.level.levelgen.placement.SurfaceWaterDepthFilter; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.bukkit.util.NumberConversions; -import org.jetbrains.annotations.NotNull; - -import java.lang.reflect.Field; -import java.util.Random; - -public class SurfaceWaterDepthModifierHook extends MinecraftPlacementModifierHook { - - public SurfaceWaterDepthModifierHook(@NotNull OreControlManager oreControlManager, @NotNull Biome biome, @NotNull NamespacedKey namespacedKey, @NotNull SurfaceWaterDepthFilter defaultModifier) { - super(oreControlManager, "surface_water_depth_filter", defaultModifier, biome, namespacedKey); - } - - public static SurfaceWaterDepthModifierConfiguration createDefaultConfiguration(@NotNull SurfaceWaterDepthFilter defaultModifier, @NotNull FeaturePlacementModifier modifier) { - try { - Field maxWaterDepth = SurfaceWaterDepthFilter.class.getDeclaredField(NMSReflectionNames.SURFACE_WATER_DEPTH_FILTER_MAX_WATER_DEPTH); - maxWaterDepth.setAccessible(true); - Object value = maxWaterDepth.get(defaultModifier); - return new SurfaceWaterDepthModifierConfiguration(modifier, new FixedDoubleToIntegerValue(NumberConversions.toInt(value))); - } catch (NoSuchFieldException | IllegalAccessException e) { - throw new RuntimeException(e); - } - } - - @Override - public SurfaceWaterDepthModifierConfiguration createDefaultConfiguration(@NotNull SurfaceWaterDepthFilter defaultModifier) { - return createDefaultConfiguration(defaultModifier, getPlacementModifier()); - } - - @Override - public SurfaceWaterDepthFilter createModifier(@NotNull SurfaceWaterDepthModifierConfiguration defaultConfiguration, @NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull SurfaceWaterDepthModifierConfiguration configuration) { - int maxWaterDepth; - if (configuration.getMaxWaterDepth() == null) { - maxWaterDepth = defaultConfiguration.getMaxWaterDepth().getValue(worldInfo, random, position, limitedRegion); - } else { - maxWaterDepth = configuration.getMaxWaterDepth().getValue(worldInfo, random, position, limitedRegion); - } - - return SurfaceWaterDepthFilter.forMaxDepth(maxWaterDepth); - } -} \ No newline at end of file diff --git a/impl/v1_20_R1/pom.xml b/impl/v1_20_R1/pom.xml deleted file mode 100644 index 4ac69465..00000000 --- a/impl/v1_20_R1/pom.xml +++ /dev/null @@ -1,80 +0,0 @@ - - - 4.0.0 - - - ore-control-impl - de.derfrzocker - ${revision} - - - ore-control-impl-v1_20_R1 - - - - de.derfrzocker - ore-control-api - ${project.version} - provided - - - de.derfrzocker - ore-control-common - ${project.version} - provided - - - org.spigotmc - spigot - 1.20-R0.1-SNAPSHOT - remapped-mojang - provided - true - - - - - - - net.md-5 - specialsource-maven-plugin - 1.2.3 - - - package - - remap - - remap-obf - - org.spigotmc:minecraft-server:1.20-R0.1-SNAPSHOT:txt:maps-mojang - true - org.spigotmc:spigot:1.20-R0.1-SNAPSHOT:jar:remapped-mojang - - true - remapped-obf - - - - package - - remap - - remap-spigot - - - ${project.build.directory}/${project.artifactId}-${project.version}-remapped-obf.jar - - org.spigotmc:minecraft-server:1.20-R0.1-SNAPSHOT:csrg:maps-spigot - org.spigotmc:spigot:1.20-R0.1-SNAPSHOT:jar:remapped-obf - - - - - - - - - \ No newline at end of file diff --git a/impl/v1_20_R1/src/main/java/de/derfrzocker/feature/impl/v1_20_R1/extra/OreVeinHandler.java b/impl/v1_20_R1/src/main/java/de/derfrzocker/feature/impl/v1_20_R1/extra/OreVeinHandler.java deleted file mode 100644 index 4c760c38..00000000 --- a/impl/v1_20_R1/src/main/java/de/derfrzocker/feature/impl/v1_20_R1/extra/OreVeinHandler.java +++ /dev/null @@ -1,98 +0,0 @@ -package de.derfrzocker.feature.impl.v1_20_R1.extra; - -import de.derfrzocker.feature.api.ExtraValues; -import de.derfrzocker.ore.control.api.OreControlManager; -import de.derfrzocker.ore.control.api.config.ConfigInfo; -import de.derfrzocker.ore.control.api.config.ConfigManager; -import de.derfrzocker.ore.control.impl.v1_20_R1.NMSReflectionNames; -import net.minecraft.core.Holder; -import net.minecraft.server.level.ChunkMap; -import net.minecraft.world.level.levelgen.NoiseBasedChunkGenerator; -import net.minecraft.world.level.levelgen.NoiseGeneratorSettings; -import org.bukkit.World; -import org.bukkit.craftbukkit.v1_20_R1.CraftWorld; -import org.bukkit.event.EventHandler; -import org.bukkit.event.EventPriority; -import org.bukkit.event.Listener; -import org.bukkit.event.world.WorldInitEvent; -import org.bukkit.event.world.WorldUnloadEvent; - -import java.lang.reflect.Field; -import java.util.HashSet; -import java.util.Optional; -import java.util.Set; - -public class OreVeinHandler implements Listener { - - private final static Field CHUNK_GENERATOR_FIELD; - private final static Field NOISE_GENERATOR_SETTINGS_FIELD; - - static { - try { - CHUNK_GENERATOR_FIELD = ChunkMap.class.getDeclaredField(NMSReflectionNames.CHUNK_MAP_GENERATOR); - CHUNK_GENERATOR_FIELD.setAccessible(true); - NOISE_GENERATOR_SETTINGS_FIELD = NoiseBasedChunkGenerator.class.getDeclaredField(NMSReflectionNames.NOISE_GENERATOR_SETTINGS); - NOISE_GENERATOR_SETTINGS_FIELD.setAccessible(true); - } catch (NoSuchFieldException e) { - throw new RuntimeException(e); - } - } - - private final Set hookedWorlds = new HashSet<>(); - private final ConfigManager configManager; - - public OreVeinHandler(OreControlManager oreControlManager) { - this.configManager = oreControlManager.getConfigManager(); - oreControlManager.addValueChangeListener(this::update); - } - - @EventHandler(priority = EventPriority.LOW) - public void onWorldInit(WorldInitEvent event) { - if (!(((CraftWorld) event.getWorld()).getHandle().getChunkSource().chunkMap.generator instanceof NoiseBasedChunkGenerator noiseChunkGenerator)) { - return; - } - - NoiseGeneratorSettings newSettings = getNewValue(event.getWorld(), noiseChunkGenerator.settings.value()); - NoiseBasedChunkGenerator newGenerator = new NoiseBasedChunkGenerator(noiseChunkGenerator.getBiomeSource(), Holder.direct(newSettings)); - - try { - CHUNK_GENERATOR_FIELD.set(((CraftWorld) event.getWorld()).getHandle().getChunkSource().chunkMap, newGenerator); - } catch (IllegalAccessException e) { - throw new RuntimeException(e); - } - - hookedWorlds.add(event.getWorld()); - } - - @EventHandler - public void onWorldUnload(WorldUnloadEvent event) { - // Cleanup - hookedWorlds.remove(event.getWorld()); - } - - private NoiseGeneratorSettings getNewValue(World world, NoiseGeneratorSettings old) { - ConfigInfo configInfo = configManager.getOrCreateConfigInfo(world.getName()); - Optional optionalExtraValues = configManager.getGenerationExtraValues(configInfo); - - boolean newValue = optionalExtraValues.flatMap(ExtraValues::shouldGeneratedBigOreVeins).orElse(old.oreVeinsEnabled()); - - return new NoiseGeneratorSettings(old.noiseSettings(), old.defaultBlock(), old.defaultFluid(), - old.noiseRouter(), old.surfaceRule(), old.spawnTarget(), old.seaLevel(), old.disableMobGeneration(), old.aquifersEnabled(), newValue, old.useLegacyRandomSource()); - } - - private void update() { - for (World world : hookedWorlds) { - if (!(((CraftWorld) world).getHandle().getChunkSource().chunkMap.generator instanceof NoiseBasedChunkGenerator noiseChunkGenerator)) { - return; - } - - NoiseGeneratorSettings newSettings = getNewValue(world, noiseChunkGenerator.settings.value()); - - try { - NOISE_GENERATOR_SETTINGS_FIELD.set(noiseChunkGenerator, Holder.direct(newSettings)); - } catch (IllegalAccessException e) { - throw new RuntimeException(e); - } - } - } -} diff --git a/impl/v1_20_R1/src/main/java/de/derfrzocker/feature/impl/v1_20_R1/feature/generator/EmptyConfigurationGenerator.java b/impl/v1_20_R1/src/main/java/de/derfrzocker/feature/impl/v1_20_R1/feature/generator/EmptyConfigurationGenerator.java deleted file mode 100644 index 0a6e7aa2..00000000 --- a/impl/v1_20_R1/src/main/java/de/derfrzocker/feature/impl/v1_20_R1/feature/generator/EmptyConfigurationGenerator.java +++ /dev/null @@ -1,65 +0,0 @@ -package de.derfrzocker.feature.impl.v1_20_R1.feature.generator; - -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import de.derfrzocker.feature.api.Configuration; -import de.derfrzocker.feature.api.Registries; -import de.derfrzocker.feature.api.Setting; -import de.derfrzocker.feature.api.util.Parser; -import de.derfrzocker.feature.common.feature.generator.configuration.EmptyFeatureConfiguration; -import net.minecraft.world.level.levelgen.feature.Feature; -import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Collections; -import java.util.Random; -import java.util.Set; - -public class EmptyConfigurationGenerator extends MinecraftFeatureGenerator { - - private EmptyConfigurationGenerator(Registries registries, Feature feature, String name) { - super(registries, feature, name); - } - - public static EmptyConfigurationGenerator createGlowstoneBlob(Registries registries) { - return new EmptyConfigurationGenerator(registries, Feature.GLOWSTONE_BLOB, "glowstone_blob"); - } - - @Override - public @NotNull Set getSettings() { - return Collections.emptySet(); - } - - @Override - public @NotNull Configuration createEmptyConfiguration() { - return new EmptyFeatureConfiguration(this); - } - - @Override - public EmptyFeatureConfiguration mergeConfig(EmptyFeatureConfiguration first, EmptyFeatureConfiguration second) { - return first; - } - - @Override - public Parser createParser(Registries registries) { - return new Parser<>() { - @Override - public JsonElement toJson(EmptyFeatureConfiguration value) { - return new JsonObject(); - } - - @Override - public EmptyFeatureConfiguration fromJson(JsonElement jsonElement) { - return new EmptyFeatureConfiguration(EmptyConfigurationGenerator.this); - } - }; - } - - @Override - public NoneFeatureConfiguration createConfiguration(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull EmptyFeatureConfiguration configuration) { - return NoneFeatureConfiguration.INSTANCE; - } -} diff --git a/impl/v1_20_R1/src/main/java/de/derfrzocker/feature/impl/v1_20_R1/feature/generator/MinecraftFeatureGenerator.java b/impl/v1_20_R1/src/main/java/de/derfrzocker/feature/impl/v1_20_R1/feature/generator/MinecraftFeatureGenerator.java deleted file mode 100644 index a4d29ae1..00000000 --- a/impl/v1_20_R1/src/main/java/de/derfrzocker/feature/impl/v1_20_R1/feature/generator/MinecraftFeatureGenerator.java +++ /dev/null @@ -1,65 +0,0 @@ -package de.derfrzocker.feature.impl.v1_20_R1.feature.generator; - -import de.derfrzocker.feature.api.FeatureGenerator; -import de.derfrzocker.feature.api.FeatureGeneratorConfiguration; -import de.derfrzocker.feature.api.Registries; -import de.derfrzocker.feature.api.util.Parser; -import net.minecraft.core.BlockPos; -import net.minecraft.world.level.WorldGenLevel; -import net.minecraft.world.level.levelgen.feature.Feature; -import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext; -import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration; -import org.bukkit.NamespacedKey; -import org.bukkit.craftbukkit.v1_20_R1.generator.CraftLimitedRegion; -import org.bukkit.craftbukkit.v1_20_R1.util.RandomSourceWrapper; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Optional; -import java.util.Random; - -public abstract class MinecraftFeatureGenerator implements FeatureGenerator { - - private final Parser parser; - private final Feature feature; - private final NamespacedKey namespacedKey; - - public MinecraftFeatureGenerator(Registries registries, Feature feature, String name) { - this.parser = (Parser) createParser(registries); - this.feature = feature; - this.namespacedKey = NamespacedKey.minecraft(name); - } - - public abstract C mergeConfig(C first, C second); - - public abstract Parser createParser(Registries registries); - - public abstract M createConfiguration(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull C configuration); - - @NotNull - @Override - public C merge(@NotNull FeatureGeneratorConfiguration first, @NotNull FeatureGeneratorConfiguration second) { - return mergeConfig((C) first, (C) second); - } - - @Override - public void place(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull C configuration) { - WorldGenLevel level = ((CraftLimitedRegion) limitedRegion).getHandle(); - M config = createConfiguration(worldInfo, random, position, limitedRegion, configuration); - feature.place(new FeaturePlaceContext<>(Optional.empty(), level, level.getMinecraftWorld().getChunkSource().getGenerator(), new RandomSourceWrapper(random), new BlockPos(position.getBlockX(), position.getBlockY(), position.getBlockZ()), config)); - } - - @NotNull - @Override - public Parser getParser() { - return parser; - } - - @NotNull - @Override - public NamespacedKey getKey() { - return namespacedKey; - } -} diff --git a/impl/v1_20_R1/src/main/java/de/derfrzocker/feature/impl/v1_20_R1/feature/generator/OreConfigurationGenerator.java b/impl/v1_20_R1/src/main/java/de/derfrzocker/feature/impl/v1_20_R1/feature/generator/OreConfigurationGenerator.java deleted file mode 100644 index 4cbfb427..00000000 --- a/impl/v1_20_R1/src/main/java/de/derfrzocker/feature/impl/v1_20_R1/feature/generator/OreConfigurationGenerator.java +++ /dev/null @@ -1,174 +0,0 @@ -package de.derfrzocker.feature.impl.v1_20_R1.feature.generator; - -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import de.derfrzocker.feature.api.Registries; -import de.derfrzocker.feature.api.Setting; -import de.derfrzocker.feature.api.util.Parser; -import de.derfrzocker.feature.common.feature.generator.configuration.OreFeatureConfiguration; -import de.derfrzocker.feature.common.ruletest.AlwaysTrueRuleTest; -import de.derfrzocker.feature.common.ruletest.BlockMatchRuleTest; -import de.derfrzocker.feature.common.ruletest.BlockStateMatchRuleTest; -import de.derfrzocker.feature.common.ruletest.RandomBlockMatchRuleTest; -import de.derfrzocker.feature.common.ruletest.RandomBlockStateMatchRuleTest; -import de.derfrzocker.feature.common.ruletest.TagMatchRuleTest; -import de.derfrzocker.feature.common.value.number.FloatType; -import de.derfrzocker.feature.common.value.number.FloatValue; -import de.derfrzocker.feature.common.value.number.IntegerType; -import de.derfrzocker.feature.common.value.number.IntegerValue; -import de.derfrzocker.feature.common.value.target.TargetBlockState; -import de.derfrzocker.feature.common.value.target.TargetListType; -import de.derfrzocker.feature.common.value.target.TargetListValue; -import net.minecraft.tags.TagKey; -import net.minecraft.world.level.levelgen.feature.Feature; -import net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration; -import net.minecraft.world.level.levelgen.structure.templatesystem.AlwaysTrueTest; -import net.minecraft.world.level.levelgen.structure.templatesystem.BlockMatchTest; -import net.minecraft.world.level.levelgen.structure.templatesystem.BlockStateMatchTest; -import net.minecraft.world.level.levelgen.structure.templatesystem.RandomBlockMatchTest; -import net.minecraft.world.level.levelgen.structure.templatesystem.RandomBlockStateMatchTest; -import net.minecraft.world.level.levelgen.structure.templatesystem.RuleTest; -import net.minecraft.world.level.levelgen.structure.templatesystem.TagMatchTest; -import org.bukkit.NamespacedKey; -import org.bukkit.craftbukkit.v1_20_R1.block.data.CraftBlockData; -import org.bukkit.craftbukkit.v1_20_R1.util.CraftMagicNumbers; -import org.bukkit.craftbukkit.v1_20_R1.util.CraftNamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.ArrayList; -import java.util.List; -import java.util.Optional; -import java.util.Random; -import java.util.Set; - -public class OreConfigurationGenerator extends MinecraftFeatureGenerator { - - private OreConfigurationGenerator(Registries registries, Feature feature, String name) { - super(registries, feature, name); - } - - public static OreConfigurationGenerator createOre(Registries registries) { - return new OreConfigurationGenerator(registries, Feature.ORE, "ore"); - } - - public static OreConfigurationGenerator createScatteredOre(Registries registries) { - return new OreConfigurationGenerator(registries, Feature.SCATTERED_ORE, "scattered_ore"); - } - - @Override - public Parser createParser(Registries registries) { - return new Parser<>() { - @Override - public JsonElement toJson(OreFeatureConfiguration value) { - JsonObject jsonObject = new JsonObject(); - if (value.getTargets() != null) { - JsonObject entry = value.getTargets().getValueType().getParser().toJson(value.getTargets()).getAsJsonObject(); - entry.addProperty("target_type", value.getTargets().getValueType().getKey().toString()); - - jsonObject.add("targets", entry); - } - - if (value.getSize() != null) { - JsonObject size = value.getSize().getValueType().getParser().toJson(value.getSize()).getAsJsonObject(); - size.addProperty("size_type", value.getSize().getValueType().getKey().toString()); - jsonObject.add("size", size); - } - - if (value.getDiscardChanceOnAirExposure() != null) { - JsonObject discardChanceOnAirExposure = value.getDiscardChanceOnAirExposure().getValueType().getParser().toJson(value.getDiscardChanceOnAirExposure()).getAsJsonObject(); - discardChanceOnAirExposure.addProperty("discard_chance_on_air_exposure_type", value.getDiscardChanceOnAirExposure().getValueType().getKey().toString()); - } - - return jsonObject; - } - - @Override - public OreFeatureConfiguration fromJson(JsonElement jsonElement) { - JsonObject jsonObject = jsonElement.getAsJsonObject(); - - TargetListValue targetValues = null; - if (jsonObject.has("targets")) { - JsonObject targets = jsonObject.getAsJsonObject("targets"); - targetValues = registries.getValueTypeRegistry(TargetListType.class).get(NamespacedKey.fromString(targets.getAsJsonPrimitive("target_type").getAsString())).get().getParser().fromJson(targets); - } - - IntegerValue size = null; - if (jsonObject.has("size")) { - JsonObject sizes = jsonObject.getAsJsonObject("size"); - size = registries.getValueTypeRegistry(IntegerType.class).get(NamespacedKey.fromString(sizes.getAsJsonPrimitive("size_type").getAsString())).get().getParser().fromJson(sizes); - } - - FloatValue discardChanceOnAirExposure = null; - if (jsonObject.has("discard_chance_on_air_exposure")) { - JsonObject chance = jsonObject.getAsJsonObject("discard_chance_on_air_exposure"); - discardChanceOnAirExposure = registries.getValueTypeRegistry(FloatType.class).get(NamespacedKey.fromString(chance.getAsJsonPrimitive("discard_chance_on_air_exposure_type").getAsString())).get().getParser().fromJson(chance); - } - - return new OreFeatureConfiguration(OreConfigurationGenerator.this, targetValues, size, discardChanceOnAirExposure); - } - }; - } - - @Override - public OreFeatureConfiguration mergeConfig(OreFeatureConfiguration first, OreFeatureConfiguration second) { - return new OreFeatureConfiguration(this, - first.getTargets() != null ? first.getTargets() : second.getTargets(), - first.getSize() != null ? first.getSize() : second.getSize(), - first.getDiscardChanceOnAirExposure() != null ? first.getDiscardChanceOnAirExposure() : second.getDiscardChanceOnAirExposure()); - } - - @Override - public OreConfiguration createConfiguration(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull OreFeatureConfiguration configuration) { - List blockStates = new ArrayList<>(); - if (configuration.getTargets() != null) { - for (TargetBlockState targetValue : configuration.getTargets().getValue(worldInfo, random, position, limitedRegion)) { - RuleTest ruleTest; - - if (targetValue.getTarget() instanceof AlwaysTrueRuleTest) { - ruleTest = AlwaysTrueTest.INSTANCE; - } else if (targetValue.getTarget() instanceof BlockMatchRuleTest rule) { - ruleTest = new BlockMatchTest(CraftMagicNumbers.getBlock(rule.getBlock())); - } else if (targetValue.getTarget() instanceof BlockStateMatchRuleTest rule) { - ruleTest = new BlockStateMatchTest(((CraftBlockData) rule.getBlockData()).getState()); - } else if (targetValue.getTarget() instanceof RandomBlockMatchRuleTest rule) { - ruleTest = new RandomBlockMatchTest(CraftMagicNumbers.getBlock(rule.getMaterial()), rule.getProbability()); - } else if (targetValue.getTarget() instanceof RandomBlockStateMatchRuleTest rule) { - ruleTest = new RandomBlockStateMatchTest(((CraftBlockData) rule.getBlockData()).getState(), rule.getProbability()); - } else if (targetValue.getTarget() instanceof TagMatchRuleTest rule) { - ruleTest = new TagMatchTest(TagKey.create(net.minecraft.core.registries.Registries.BLOCK, CraftNamespacedKey.toMinecraft(rule.getTag()))); - } else { - throw new IllegalArgumentException("Got unexpected rule test from class " + targetValue.getTarget().getClass()); - } - - blockStates.add(OreConfiguration.target(ruleTest, ((CraftBlockData) targetValue.getState()).getState())); - } - } - - int size = 0; - if (configuration.getSize() != null) { - size = configuration.getSize().getValue(worldInfo, random, position, limitedRegion); - } - - float discardChanceOnAirExposure = 0f; - if (configuration.getDiscardChanceOnAirExposure() != null) { - discardChanceOnAirExposure = configuration.getDiscardChanceOnAirExposure().getValue(worldInfo, random, position, limitedRegion); - } - - return new OreConfiguration(blockStates, size, discardChanceOnAirExposure); - } - - @NotNull - @Override - public Set getSettings() { - return OreFeatureConfiguration.SETTINGS; - } - - @NotNull - @Override - public OreFeatureConfiguration createEmptyConfiguration() { - return new OreFeatureConfiguration(this, null, null, null); - } -} diff --git a/impl/v1_20_R1/src/main/java/de/derfrzocker/feature/impl/v1_20_R1/placement/CountModifier.java b/impl/v1_20_R1/src/main/java/de/derfrzocker/feature/impl/v1_20_R1/placement/CountModifier.java deleted file mode 100644 index a7eca04d..00000000 --- a/impl/v1_20_R1/src/main/java/de/derfrzocker/feature/impl/v1_20_R1/placement/CountModifier.java +++ /dev/null @@ -1,85 +0,0 @@ -package de.derfrzocker.feature.impl.v1_20_R1.placement; - -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import de.derfrzocker.feature.api.Registries; -import de.derfrzocker.feature.api.Setting; -import de.derfrzocker.feature.api.util.Parser; -import de.derfrzocker.feature.common.feature.placement.configuration.CountModifierConfiguration; -import de.derfrzocker.feature.common.value.number.IntegerType; -import de.derfrzocker.feature.common.value.number.IntegerValue; -import net.minecraft.world.level.levelgen.placement.CountPlacement; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Random; -import java.util.Set; - -public class CountModifier extends MinecraftPlacementModifier { - - public CountModifier(@NotNull Registries registries) { - super(registries, "count"); - } - - @Override - public CountModifierConfiguration mergeConfig(CountModifierConfiguration first, CountModifierConfiguration second) { - return new CountModifierConfiguration(this, - first.getCount() != null ? first.getCount() : second.getCount()); - } - - @Override - public Parser createParser(Registries registries) { - return new Parser<>() { - @Override - public JsonElement toJson(CountModifierConfiguration value) { - JsonObject jsonObject = new JsonObject(); - if (value.getCount() != null) { - JsonObject entry = value.getCount().getValueType().getParser().toJson(value.getCount()).getAsJsonObject(); - entry.addProperty("count_type", value.getCount().getValueType().getKey().toString()); - jsonObject.add("count", entry); - } - return jsonObject; - } - - @Override - public CountModifierConfiguration fromJson(JsonElement jsonElement) { - JsonObject jsonObject = jsonElement.getAsJsonObject(); - - IntegerValue count = null; - if (jsonObject.has("count")) { - JsonObject entry = jsonObject.getAsJsonObject("count"); - count = registries.getValueTypeRegistry(IntegerType.class).get(NamespacedKey.fromString(entry.getAsJsonPrimitive("count_type").getAsString())).get().getParser().fromJson(entry); - } - - return new CountModifierConfiguration(CountModifier.this, count); - } - }; - } - - @Override - public CountPlacement createPlacementModifier(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull CountModifierConfiguration configuration) { - int count; - if (configuration.getCount() != null) { - count = configuration.getCount().getValue(worldInfo, random, position, limitedRegion); - } else { - count = 0; - } - - return CountPlacement.of(count); - } - - @NotNull - @Override - public Set getSettings() { - return CountModifierConfiguration.SETTINGS; - } - - @NotNull - @Override - public CountModifierConfiguration createEmptyConfiguration() { - return new CountModifierConfiguration(this, null); - } -} diff --git a/impl/v1_20_R1/src/main/java/de/derfrzocker/feature/impl/v1_20_R1/placement/HeightRangeModifier.java b/impl/v1_20_R1/src/main/java/de/derfrzocker/feature/impl/v1_20_R1/placement/HeightRangeModifier.java deleted file mode 100644 index 58d80ba6..00000000 --- a/impl/v1_20_R1/src/main/java/de/derfrzocker/feature/impl/v1_20_R1/placement/HeightRangeModifier.java +++ /dev/null @@ -1,88 +0,0 @@ -package de.derfrzocker.feature.impl.v1_20_R1.placement; - -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import de.derfrzocker.feature.api.Registries; -import de.derfrzocker.feature.api.Setting; -import de.derfrzocker.feature.api.util.Parser; -import de.derfrzocker.feature.common.feature.placement.configuration.HeightRangeModifierConfiguration; -import de.derfrzocker.feature.common.value.number.IntegerType; -import de.derfrzocker.feature.common.value.number.IntegerValue; -import net.minecraft.world.level.levelgen.VerticalAnchor; -import net.minecraft.world.level.levelgen.heightproviders.ConstantHeight; -import net.minecraft.world.level.levelgen.heightproviders.HeightProvider; -import net.minecraft.world.level.levelgen.placement.HeightRangePlacement; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Random; -import java.util.Set; - -public class HeightRangeModifier extends MinecraftPlacementModifier { - - public HeightRangeModifier(@NotNull Registries registries) { - super(registries, "height_range"); - } - - @Override - public HeightRangeModifierConfiguration mergeConfig(HeightRangeModifierConfiguration first, HeightRangeModifierConfiguration second) { - return new HeightRangeModifierConfiguration(this, - first.getHeight() != null ? first.getHeight() : second.getHeight()); - } - - @Override - public Parser createParser(Registries registries) { - return new Parser<>() { - @Override - public JsonElement toJson(HeightRangeModifierConfiguration value) { - JsonObject jsonObject = new JsonObject(); - if (value.getHeight() != null) { - JsonObject entry = value.getHeight().getValueType().getParser().toJson(value.getHeight()).getAsJsonObject(); - entry.addProperty("height_range_type", value.getHeight().getValueType().getKey().toString()); - jsonObject.add("height", entry); - } - return jsonObject; - } - - @Override - public HeightRangeModifierConfiguration fromJson(JsonElement jsonElement) { - JsonObject jsonObject = jsonElement.getAsJsonObject(); - - IntegerValue count = null; - if (jsonObject.has("height")) { - JsonObject entry = jsonObject.getAsJsonObject("height"); - count = registries.getValueTypeRegistry(IntegerType.class).get(NamespacedKey.fromString(entry.getAsJsonPrimitive("height_range_type").getAsString())).get().getParser().fromJson(entry); - } - - return new HeightRangeModifierConfiguration(HeightRangeModifier.this, count); - } - }; - } - - @Override - public HeightRangePlacement createPlacementModifier(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull HeightRangeModifierConfiguration configuration) { - HeightProvider height; - if (configuration.getHeight() != null) { - height = ConstantHeight.of(VerticalAnchor.absolute(configuration.getHeight().getValue(worldInfo, random, position, limitedRegion))); - } else { - height = ConstantHeight.of(VerticalAnchor.bottom()); - } - - return HeightRangePlacement.of(height); - } - - @NotNull - @Override - public Set getSettings() { - return HeightRangeModifierConfiguration.SETTINGS; - } - - @NotNull - @Override - public HeightRangeModifierConfiguration createEmptyConfiguration() { - return new HeightRangeModifierConfiguration(this, null); - } -} diff --git a/impl/v1_20_R1/src/main/java/de/derfrzocker/feature/impl/v1_20_R1/placement/MinecraftPlacementModifier.java b/impl/v1_20_R1/src/main/java/de/derfrzocker/feature/impl/v1_20_R1/placement/MinecraftPlacementModifier.java deleted file mode 100644 index 854e084c..00000000 --- a/impl/v1_20_R1/src/main/java/de/derfrzocker/feature/impl/v1_20_R1/placement/MinecraftPlacementModifier.java +++ /dev/null @@ -1,65 +0,0 @@ -package de.derfrzocker.feature.impl.v1_20_R1.placement; - -import de.derfrzocker.feature.api.FeaturePlacementModifier; -import de.derfrzocker.feature.api.PlacementModifierConfiguration; -import de.derfrzocker.feature.api.Registries; -import de.derfrzocker.feature.api.util.Parser; -import net.minecraft.core.BlockPos; -import net.minecraft.world.level.WorldGenLevel; -import net.minecraft.world.level.levelgen.placement.PlacementContext; -import net.minecraft.world.level.levelgen.placement.PlacementModifier; -import org.bukkit.NamespacedKey; -import org.bukkit.craftbukkit.v1_20_R1.generator.CraftLimitedRegion; -import org.bukkit.craftbukkit.v1_20_R1.util.RandomSourceWrapper; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Optional; -import java.util.Random; -import java.util.stream.Stream; - -public abstract class MinecraftPlacementModifier implements FeaturePlacementModifier { - - private final Parser parser; - private final NamespacedKey namespacedKey; - - public MinecraftPlacementModifier(@NotNull Registries registries, @NotNull String name) { - this.parser = (Parser) createParser(registries); - this.namespacedKey = NamespacedKey.minecraft(name); - } - - public abstract C mergeConfig(C first, C second); - - public abstract Parser createParser(Registries registries); - - public abstract M createPlacementModifier(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull C configuration); - - @NotNull - @Override - public C merge(@NotNull PlacementModifierConfiguration first, @NotNull PlacementModifierConfiguration second) { - return mergeConfig((C) first, (C) second); - } - - @NotNull - @Override - public Stream getPositions(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull C configuration) { - WorldGenLevel level = ((CraftLimitedRegion) limitedRegion).getHandle(); - M placementModifier = createPlacementModifier(worldInfo, random, position, limitedRegion, configuration); - return placementModifier.getPositions(new PlacementContext(level, level.getMinecraftWorld().getChunkSource().getGenerator(), Optional.empty()), new RandomSourceWrapper(random), new BlockPos(position.getBlockX(), position.getBlockY(), position.getBlockZ())). - map(pos -> new BlockVector(pos.getX(), pos.getY(), pos.getZ())); - } - - @NotNull - @Override - public Parser getParser() { - return parser; - } - - @NotNull - @Override - public NamespacedKey getKey() { - return namespacedKey; - } -} diff --git a/impl/v1_20_R1/src/main/java/de/derfrzocker/feature/impl/v1_20_R1/placement/RarityModifier.java b/impl/v1_20_R1/src/main/java/de/derfrzocker/feature/impl/v1_20_R1/placement/RarityModifier.java deleted file mode 100644 index 9c807da5..00000000 --- a/impl/v1_20_R1/src/main/java/de/derfrzocker/feature/impl/v1_20_R1/placement/RarityModifier.java +++ /dev/null @@ -1,83 +0,0 @@ -package de.derfrzocker.feature.impl.v1_20_R1.placement; - -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import de.derfrzocker.feature.api.Registries; -import de.derfrzocker.feature.api.Setting; -import de.derfrzocker.feature.api.util.Parser; -import de.derfrzocker.feature.common.feature.placement.configuration.RarityModifierConfiguration; -import de.derfrzocker.feature.common.value.number.IntegerType; -import de.derfrzocker.feature.common.value.number.IntegerValue; -import net.minecraft.world.level.levelgen.placement.RarityFilter; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Random; -import java.util.Set; - -public class RarityModifier extends MinecraftPlacementModifier { - - public RarityModifier(@NotNull Registries registries) { - super(registries, "rarity_filter"); - } - - - @Override - public RarityModifierConfiguration mergeConfig(RarityModifierConfiguration first, RarityModifierConfiguration second) { - return new RarityModifierConfiguration(this, - first.getChance() != null ? first.getChance() : second.getChance()); - } - - @Override - public Parser createParser(Registries registries) { - return new Parser<>() { - @Override - public JsonElement toJson(RarityModifierConfiguration value) { - JsonObject jsonObject = new JsonObject(); - if (value.getChance() != null) { - JsonObject entry = value.getChance().getValueType().getParser().toJson(value.getChance()).getAsJsonObject(); - entry.addProperty("chance_type", value.getChance().getValueType().getKey().toString()); - jsonObject.add("chance", entry); - } - return jsonObject; - } - - @Override - public RarityModifierConfiguration fromJson(JsonElement jsonElement) { - JsonObject jsonObject = jsonElement.getAsJsonObject(); - - IntegerValue count = null; - if (jsonObject.has("chance")) { - JsonObject entry = jsonObject.getAsJsonObject("chance"); - count = registries.getValueTypeRegistry(IntegerType.class).get(NamespacedKey.fromString(entry.getAsJsonPrimitive("chance_type").getAsString())).get().getParser().fromJson(entry); - } - - return new RarityModifierConfiguration(RarityModifier.this, count); - } - }; - } - - @Override - public RarityFilter createPlacementModifier(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull RarityModifierConfiguration configuration) { - int chance = 0; - if (configuration.getChance() != null) { - chance = configuration.getChance().getValue(worldInfo, random, position, limitedRegion); - } - return RarityFilter.onAverageOnceEvery(chance); - } - - @NotNull - @Override - public Set getSettings() { - return RarityModifierConfiguration.SETTINGS; - } - - @NotNull - @Override - public RarityModifierConfiguration createEmptyConfiguration() { - return new RarityModifierConfiguration(this, null); - } -} diff --git a/impl/v1_20_R1/src/main/java/de/derfrzocker/feature/impl/v1_20_R1/placement/SurfaceRelativeThresholdModifier.java b/impl/v1_20_R1/src/main/java/de/derfrzocker/feature/impl/v1_20_R1/placement/SurfaceRelativeThresholdModifier.java deleted file mode 100644 index 9919ef06..00000000 --- a/impl/v1_20_R1/src/main/java/de/derfrzocker/feature/impl/v1_20_R1/placement/SurfaceRelativeThresholdModifier.java +++ /dev/null @@ -1,107 +0,0 @@ -package de.derfrzocker.feature.impl.v1_20_R1.placement; - -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import de.derfrzocker.feature.api.Registries; -import de.derfrzocker.feature.api.Setting; -import de.derfrzocker.feature.api.util.Parser; -import de.derfrzocker.feature.common.value.number.IntegerType; -import de.derfrzocker.feature.common.value.number.IntegerValue; -import de.derfrzocker.feature.impl.v1_20_R1.placement.configuration.SurfaceRelativeThresholdModifierConfiguration; -import net.minecraft.world.level.levelgen.Heightmap; -import net.minecraft.world.level.levelgen.placement.SurfaceRelativeThresholdFilter; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Random; -import java.util.Set; - -public class SurfaceRelativeThresholdModifier extends MinecraftPlacementModifier { - public SurfaceRelativeThresholdModifier(@NotNull Registries registries) { - super(registries, "surface_relative_threshold_filter"); - } - - @Override - public SurfaceRelativeThresholdModifierConfiguration mergeConfig(SurfaceRelativeThresholdModifierConfiguration first, SurfaceRelativeThresholdModifierConfiguration second) { - return new SurfaceRelativeThresholdModifierConfiguration(this, - first.getHeightmap() != null ? first.getHeightmap() : second.getHeightmap(), - first.getMinInclusive() != null ? first.getMinInclusive() : second.getMinInclusive(), - first.getMaxInclusive() != null ? first.getMaxInclusive() : second.getMaxInclusive()); - } - - @Override - public Parser createParser(Registries registries) { - return new Parser<>() { - @Override - public JsonElement toJson(SurfaceRelativeThresholdModifierConfiguration value) { - JsonObject jsonObject = new JsonObject(); - if (value.getMinInclusive() != null) { - JsonObject entry = value.getMinInclusive().getValueType().getParser().toJson(value.getMinInclusive()).getAsJsonObject(); - entry.addProperty("min_inclusive_type", value.getMinInclusive().getValueType().getKey().toString()); - jsonObject.add("min_inclusive", entry); - } - - if (value.getMaxInclusive() != null) { - JsonObject entry = value.getMaxInclusive().getValueType().getParser().toJson(value.getMaxInclusive()).getAsJsonObject(); - entry.addProperty("max_inclusive_type", value.getMaxInclusive().getValueType().getKey().toString()); - jsonObject.add("max_inclusive", entry); - } - - return jsonObject; - } - - @Override - public SurfaceRelativeThresholdModifierConfiguration fromJson(JsonElement jsonElement) { - JsonObject jsonObject = jsonElement.getAsJsonObject(); - - IntegerValue minInclusive = null; - if (jsonObject.has("min_inclusive")) { - JsonObject entry = jsonObject.getAsJsonObject("min_inclusive"); - minInclusive = registries.getValueTypeRegistry(IntegerType.class).get(NamespacedKey.fromString(entry.getAsJsonPrimitive("min_inclusive_type").getAsString())).get().getParser().fromJson(entry); - } - - IntegerValue maxInclusive = null; - if (jsonObject.has("max_inclusive")) { - JsonObject entry = jsonObject.getAsJsonObject("max_inclusive"); - maxInclusive = registries.getValueTypeRegistry(IntegerType.class).get(NamespacedKey.fromString(entry.getAsJsonPrimitive("max_inclusive_type").getAsString())).get().getParser().fromJson(entry); - } - - return new SurfaceRelativeThresholdModifierConfiguration(SurfaceRelativeThresholdModifier.this, null, minInclusive, maxInclusive); - } - }; - } - - @Override - public SurfaceRelativeThresholdFilter createPlacementModifier(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull SurfaceRelativeThresholdModifierConfiguration configuration) { - Heightmap.Types heightmap = Heightmap.Types.MOTION_BLOCKING; - if (configuration.getHeightmap() != null) { - heightmap = configuration.getHeightmap().getValue(worldInfo, random, position, limitedRegion); - } - - int minInclusive = 0; - if (configuration.getMinInclusive() != null) { - minInclusive = configuration.getMinInclusive().getValue(worldInfo, random, position, limitedRegion); - } - - int maxInclusive = 0; - if (configuration.getMaxInclusive() != null) { - maxInclusive = configuration.getMaxInclusive().getValue(worldInfo, random, position, limitedRegion); - } - return SurfaceRelativeThresholdFilter.of(heightmap, minInclusive, maxInclusive); - } - - @NotNull - @Override - public Set getSettings() { - return SurfaceRelativeThresholdModifierConfiguration.SETTINGS; - } - - @NotNull - @Override - public SurfaceRelativeThresholdModifierConfiguration createEmptyConfiguration() { - return new SurfaceRelativeThresholdModifierConfiguration(this, null, null, null); - } -} diff --git a/impl/v1_20_R1/src/main/java/de/derfrzocker/feature/impl/v1_20_R1/placement/SurfaceWaterDepthModifier.java b/impl/v1_20_R1/src/main/java/de/derfrzocker/feature/impl/v1_20_R1/placement/SurfaceWaterDepthModifier.java deleted file mode 100644 index a0f8b321..00000000 --- a/impl/v1_20_R1/src/main/java/de/derfrzocker/feature/impl/v1_20_R1/placement/SurfaceWaterDepthModifier.java +++ /dev/null @@ -1,82 +0,0 @@ -package de.derfrzocker.feature.impl.v1_20_R1.placement; - -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import de.derfrzocker.feature.api.Registries; -import de.derfrzocker.feature.api.Setting; -import de.derfrzocker.feature.api.util.Parser; -import de.derfrzocker.feature.common.feature.placement.configuration.SurfaceWaterDepthModifierConfiguration; -import de.derfrzocker.feature.common.value.number.IntegerType; -import de.derfrzocker.feature.common.value.number.IntegerValue; -import net.minecraft.world.level.levelgen.placement.SurfaceWaterDepthFilter; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Random; -import java.util.Set; - -public class SurfaceWaterDepthModifier extends MinecraftPlacementModifier { - - public SurfaceWaterDepthModifier(@NotNull Registries registries) { - super(registries, "surface_water_depth_filter"); - } - - @Override - public SurfaceWaterDepthModifierConfiguration mergeConfig(SurfaceWaterDepthModifierConfiguration first, SurfaceWaterDepthModifierConfiguration second) { - return new SurfaceWaterDepthModifierConfiguration(this, - first.getMaxWaterDepth() != null ? first.getMaxWaterDepth() : second.getMaxWaterDepth()); - } - - @Override - public Parser createParser(Registries registries) { - return new Parser<>() { - @Override - public JsonElement toJson(SurfaceWaterDepthModifierConfiguration value) { - JsonObject jsonObject = new JsonObject(); - if (value.getMaxWaterDepth() != null) { - JsonObject entry = value.getMaxWaterDepth().getValueType().getParser().toJson(value.getMaxWaterDepth()).getAsJsonObject(); - entry.addProperty("max_water_depth_type", value.getMaxWaterDepth().getValueType().getKey().toString()); - jsonObject.add("max_water_depth", entry); - } - return jsonObject; - } - - @Override - public SurfaceWaterDepthModifierConfiguration fromJson(JsonElement jsonElement) { - JsonObject jsonObject = jsonElement.getAsJsonObject(); - - IntegerValue count = null; - if (jsonObject.has("max_water_depth")) { - JsonObject entry = jsonObject.getAsJsonObject("max_water_depth"); - count = registries.getValueTypeRegistry(IntegerType.class).get(NamespacedKey.fromString(entry.getAsJsonPrimitive("max_water_depth_type").getAsString())).get().getParser().fromJson(entry); - } - - return new SurfaceWaterDepthModifierConfiguration(SurfaceWaterDepthModifier.this, count); - } - }; - } - - @Override - public SurfaceWaterDepthFilter createPlacementModifier(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull SurfaceWaterDepthModifierConfiguration configuration) { - int maxWaterDepth = 0; - if (configuration.getMaxWaterDepth() != null) { - maxWaterDepth = configuration.getMaxWaterDepth().getValue(worldInfo, random, position, limitedRegion); - } - return SurfaceWaterDepthFilter.forMaxDepth(maxWaterDepth); - } - - @NotNull - @Override - public Set getSettings() { - return SurfaceWaterDepthModifierConfiguration.SETTINGS; - } - - @NotNull - @Override - public SurfaceWaterDepthModifierConfiguration createEmptyConfiguration() { - return new SurfaceWaterDepthModifierConfiguration(this, null); - } -} \ No newline at end of file diff --git a/impl/v1_20_R1/src/main/java/de/derfrzocker/feature/impl/v1_20_R1/placement/configuration/SurfaceRelativeThresholdModifierConfiguration.java b/impl/v1_20_R1/src/main/java/de/derfrzocker/feature/impl/v1_20_R1/placement/configuration/SurfaceRelativeThresholdModifierConfiguration.java deleted file mode 100644 index f0cf6364..00000000 --- a/impl/v1_20_R1/src/main/java/de/derfrzocker/feature/impl/v1_20_R1/placement/configuration/SurfaceRelativeThresholdModifierConfiguration.java +++ /dev/null @@ -1,121 +0,0 @@ -package de.derfrzocker.feature.impl.v1_20_R1.placement.configuration; - -import de.derfrzocker.feature.api.FeaturePlacementModifier; -import de.derfrzocker.feature.api.PlacementModifierConfiguration; -import de.derfrzocker.feature.api.Setting; -import de.derfrzocker.feature.api.Value; -import de.derfrzocker.feature.common.value.number.IntegerType; -import de.derfrzocker.feature.common.value.number.IntegerValue; -import de.derfrzocker.feature.impl.v1_20_R1.value.heightmap.HeightmapValue; -import org.jetbrains.annotations.NotNull; - -import java.util.Collections; -import java.util.LinkedHashSet; -import java.util.Set; - -public class SurfaceRelativeThresholdModifierConfiguration implements PlacementModifierConfiguration { - - public final static Set SETTINGS; - private final static Setting MIN_INCLUSIVE = new Setting("min-inclusive", IntegerType.class); - private final static Setting MAX_INCLUSIVE = new Setting("max-inclusive", IntegerType.class); - - static { - Set settings = new LinkedHashSet<>(); - settings.add(MIN_INCLUSIVE); - settings.add(MAX_INCLUSIVE); - SETTINGS = Collections.unmodifiableSet(settings); - } - - private final FeaturePlacementModifier placementModifier; - private final HeightmapValue heightmap; - private IntegerValue minInclusive; - private IntegerValue maxInclusive; - private boolean dirty = false; - - public SurfaceRelativeThresholdModifierConfiguration(FeaturePlacementModifier placementModifier, HeightmapValue heightmap, IntegerValue minInclusive, IntegerValue maxInclusive) { - this.placementModifier = placementModifier; - this.heightmap = heightmap; - this.minInclusive = minInclusive; - this.maxInclusive = maxInclusive; - } - - @NotNull - @Override - public FeaturePlacementModifier getOwner() { - return placementModifier; - } - - public HeightmapValue getHeightmap() { - return heightmap; - } - - public IntegerValue getMinInclusive() { - return minInclusive; - } - - public IntegerValue getMaxInclusive() { - return maxInclusive; - } - - @NotNull - @Override - public Set getSettings() { - return SETTINGS; - } - - @Override - public Value getValue(@NotNull Setting setting) { - if (setting == MIN_INCLUSIVE) { - return getMinInclusive(); - } - - if (setting == MAX_INCLUSIVE) { - return getMaxInclusive(); - } - - throw new IllegalArgumentException(String.format("Setting '%s' is not in the configuration '%s'", setting, "SurfaceRelativeThresholdModifierConfiguration")); - } - - @Override - public void setValue(@NotNull Setting setting, Value value) { - if (setting == MIN_INCLUSIVE) { - minInclusive = (IntegerValue) value; - dirty = true; - return; - } - - if (setting == MAX_INCLUSIVE) { - maxInclusive = (IntegerValue) value; - dirty = true; - return; - } - - throw new IllegalArgumentException(String.format("Setting '%s' is not in the configuration '%s'", setting, "SurfaceRelativeThresholdModifierConfiguration")); - } - - @Override - public boolean isDirty() { - if (dirty) { - return true; - } - - if (minInclusive != null && minInclusive.isDirty()) { - return true; - } - - return maxInclusive != null && maxInclusive.isDirty(); - } - - @Override - public void saved() { - dirty = false; - - if (minInclusive != null) { - minInclusive.saved(); - } - - if (maxInclusive != null) { - maxInclusive.saved(); - } - } -} diff --git a/impl/v1_20_R1/src/main/java/de/derfrzocker/feature/impl/v1_20_R1/value/heightmap/HeightmapType.java b/impl/v1_20_R1/src/main/java/de/derfrzocker/feature/impl/v1_20_R1/value/heightmap/HeightmapType.java deleted file mode 100644 index 6f4a8a2d..00000000 --- a/impl/v1_20_R1/src/main/java/de/derfrzocker/feature/impl/v1_20_R1/value/heightmap/HeightmapType.java +++ /dev/null @@ -1,7 +0,0 @@ -package de.derfrzocker.feature.impl.v1_20_R1.value.heightmap; - -import de.derfrzocker.feature.api.ValueType; -import net.minecraft.world.level.levelgen.Heightmap; - -public abstract class HeightmapType implements ValueType { -} diff --git a/impl/v1_20_R1/src/main/java/de/derfrzocker/feature/impl/v1_20_R1/value/heightmap/HeightmapValue.java b/impl/v1_20_R1/src/main/java/de/derfrzocker/feature/impl/v1_20_R1/value/heightmap/HeightmapValue.java deleted file mode 100644 index 8771b9de..00000000 --- a/impl/v1_20_R1/src/main/java/de/derfrzocker/feature/impl/v1_20_R1/value/heightmap/HeightmapValue.java +++ /dev/null @@ -1,10 +0,0 @@ -package de.derfrzocker.feature.impl.v1_20_R1.value.heightmap; - -import de.derfrzocker.feature.common.AbstractValue; -import net.minecraft.world.level.levelgen.Heightmap; - -public abstract class HeightmapValue extends AbstractValue { - - @Override - public abstract HeightmapValue clone(); -} diff --git a/impl/v1_20_R1/src/main/java/de/derfrzocker/feature/impl/v1_20_R1/value/offset/NMSAboveBottomOffsetIntegerValue.java b/impl/v1_20_R1/src/main/java/de/derfrzocker/feature/impl/v1_20_R1/value/offset/NMSAboveBottomOffsetIntegerValue.java deleted file mode 100644 index 08416029..00000000 --- a/impl/v1_20_R1/src/main/java/de/derfrzocker/feature/impl/v1_20_R1/value/offset/NMSAboveBottomOffsetIntegerValue.java +++ /dev/null @@ -1,33 +0,0 @@ -package de.derfrzocker.feature.impl.v1_20_R1.value.offset; - -import de.derfrzocker.feature.common.value.number.IntegerValue; -import de.derfrzocker.feature.common.value.offset.AboveBottomOffsetIntegerValue; -import net.minecraft.world.level.WorldGenLevel; -import org.bukkit.craftbukkit.v1_20_R1.generator.CraftLimitedRegion; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Random; - -public class NMSAboveBottomOffsetIntegerValue extends AboveBottomOffsetIntegerValue { - - public NMSAboveBottomOffsetIntegerValue(IntegerValue base) { - super(base); - } - - @Override - public Integer getValue(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion) { - int baseValue = getBase() == null ? 0 : getBase().getValue(worldInfo, random, position, limitedRegion); - - WorldGenLevel level = ((CraftLimitedRegion) limitedRegion).getHandle(); - - return Math.max(level.getMinBuildHeight(), level.getLevel().getChunkSource().chunkMap.generator.getMinY()) + baseValue; - } - - @Override - public AboveBottomOffsetIntegerValue clone() { - return new NMSAboveBottomOffsetIntegerValue(getBase() == null ? null : getBase().clone()); - } -} diff --git a/impl/v1_20_R1/src/main/java/de/derfrzocker/feature/impl/v1_20_R1/value/offset/NMSBelowTopOffsetIntegerValue.java b/impl/v1_20_R1/src/main/java/de/derfrzocker/feature/impl/v1_20_R1/value/offset/NMSBelowTopOffsetIntegerValue.java deleted file mode 100644 index 1d4aa970..00000000 --- a/impl/v1_20_R1/src/main/java/de/derfrzocker/feature/impl/v1_20_R1/value/offset/NMSBelowTopOffsetIntegerValue.java +++ /dev/null @@ -1,35 +0,0 @@ -package de.derfrzocker.feature.impl.v1_20_R1.value.offset; - -import de.derfrzocker.feature.common.value.number.IntegerValue; -import de.derfrzocker.feature.common.value.offset.BelowTopOffsetIntegerValue; -import net.minecraft.world.level.WorldGenLevel; -import net.minecraft.world.level.chunk.ChunkGenerator; -import org.bukkit.craftbukkit.v1_20_R1.generator.CraftLimitedRegion; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Random; - -public class NMSBelowTopOffsetIntegerValue extends BelowTopOffsetIntegerValue { - - public NMSBelowTopOffsetIntegerValue(IntegerValue base) { - super(base); - } - - @Override - public Integer getValue(@NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion) { - int baseValue = getBase() == null ? 0 : getBase().getValue(worldInfo, random, position, limitedRegion); - - WorldGenLevel level = ((CraftLimitedRegion) limitedRegion).getHandle(); - ChunkGenerator chunkGenerator = level.getLevel().getChunkSource().chunkMap.generator; - - return Math.min(level.getHeight(), chunkGenerator.getGenDepth()) - 1 + Math.max(level.getMinBuildHeight(), chunkGenerator.getMinY()) - baseValue; - } - - @Override - public NMSBelowTopOffsetIntegerValue clone() { - return new NMSBelowTopOffsetIntegerValue(getBase() == null ? null : getBase().clone()); - } -} diff --git a/impl/v1_20_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_20_R1/ConversionUtil.java b/impl/v1_20_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_20_R1/ConversionUtil.java deleted file mode 100644 index 91802846..00000000 --- a/impl/v1_20_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_20_R1/ConversionUtil.java +++ /dev/null @@ -1,77 +0,0 @@ -package de.derfrzocker.ore.control.impl.v1_20_R1; - -import de.derfrzocker.feature.common.value.number.FixedFloatValue; -import de.derfrzocker.feature.common.value.number.IntegerValue; -import de.derfrzocker.feature.common.value.number.integer.FixedDoubleToIntegerValue; -import de.derfrzocker.feature.common.value.number.integer.biased.BiasedToBottomIntegerValue; -import de.derfrzocker.feature.common.value.number.integer.clamped.ClampedIntegerValue; -import de.derfrzocker.feature.common.value.number.integer.clamped.ClampedNormalIntegerValue; -import de.derfrzocker.feature.common.value.number.integer.uniform.UniformIntegerValue; -import de.derfrzocker.feature.common.value.number.integer.weighted.WeightedListIntegerValue; -import net.minecraft.util.random.SimpleWeightedRandomList; -import net.minecraft.util.random.WeightedEntry; -import net.minecraft.util.valueproviders.ClampedInt; -import net.minecraft.util.valueproviders.ClampedNormalInt; -import net.minecraft.util.valueproviders.IntProvider; -import net.minecraft.util.valueproviders.IntProviderType; -import net.minecraft.util.valueproviders.WeightedListInt; - -import java.lang.reflect.Field; -import java.util.LinkedHashMap; -import java.util.Map; - -public final class ConversionUtil { - - private ConversionUtil() { - } - - public static IntegerValue convert(IntProvider intProvider) { - try { - if (intProvider.getType() == IntProviderType.CONSTANT) { - return new FixedDoubleToIntegerValue(intProvider.getMinValue()); - } else if (intProvider.getType() == IntProviderType.UNIFORM) { - return new UniformIntegerValue(new FixedDoubleToIntegerValue(intProvider.getMinValue()), new FixedDoubleToIntegerValue(intProvider.getMaxValue())); - } else if (intProvider.getType() == IntProviderType.BIASED_TO_BOTTOM) { - return new BiasedToBottomIntegerValue(new FixedDoubleToIntegerValue(intProvider.getMinValue()), new FixedDoubleToIntegerValue(intProvider.getMaxValue())); - } else if (intProvider.getType() == IntProviderType.CLAMPED) { - Field sourceField = ClampedInt.class.getDeclaredField(NMSReflectionNames.CLAMPED_INT_SOURCE); - Field minField = ClampedInt.class.getDeclaredField(NMSReflectionNames.CLAMPED_INT_MIN_INCLUSIVE); - Field maxField = ClampedInt.class.getDeclaredField(NMSReflectionNames.CLAMPED_INT_MAX_INCLUSIVE); - sourceField.setAccessible(true); - minField.setAccessible(true); - maxField.setAccessible(true); - - IntProvider source = (IntProvider) sourceField.get(intProvider); - int min = (int) minField.get(intProvider); - int max = (int) maxField.get(intProvider); - return new ClampedIntegerValue(convert(source), new FixedDoubleToIntegerValue(min), new FixedDoubleToIntegerValue(max)); - } else if (intProvider.getType() == IntProviderType.WEIGHTED_LIST) { - Field distributionField = WeightedListInt.class.getDeclaredField(NMSReflectionNames.WEIGHTED_LIST_INT_DISTRIBUTION); - distributionField.setAccessible(true); - SimpleWeightedRandomList distribution = (SimpleWeightedRandomList) distributionField.get(intProvider); - - Map values = new LinkedHashMap<>(); - for (WeightedEntry.Wrapper wrapper : distribution.unwrap()) { - values.put(convert(wrapper.getData()), new FixedDoubleToIntegerValue(wrapper.getWeight().asInt())); - } - - return new WeightedListIntegerValue(values); - } else if (intProvider.getType() == IntProviderType.CLAMPED_NORMAL) { - Field meanField = ClampedNormalInt.class.getDeclaredField(NMSReflectionNames.CLAMPED_NORMAL_INT_MEAN); - Field deviationField = ClampedNormalInt.class.getDeclaredField(NMSReflectionNames.CLAMPED_NORMAL_INT_DEVIATION); - meanField.setAccessible(true); - deviationField.setAccessible(true); - - float mean = (float) meanField.get(intProvider); - float deviation = (float) meanField.get(intProvider); - int min = intProvider.getMinValue(); - int max = intProvider.getMaxValue(); - return new ClampedNormalIntegerValue(new FixedFloatValue(mean), new FixedFloatValue(deviation), new FixedDoubleToIntegerValue(min), new FixedDoubleToIntegerValue(max)); - } else { - throw new UnsupportedOperationException(String.format("No integer value equivalent for IntProvider '%s'", intProvider)); - } - } catch (NoSuchFieldException | IllegalAccessException e) { - throw new RuntimeException(e); - } - } -} diff --git a/impl/v1_20_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_20_R1/NMSReflectionNames.java b/impl/v1_20_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_20_R1/NMSReflectionNames.java deleted file mode 100644 index 68b41740..00000000 --- a/impl/v1_20_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_20_R1/NMSReflectionNames.java +++ /dev/null @@ -1,25 +0,0 @@ -package de.derfrzocker.ore.control.impl.v1_20_R1; - -public final class NMSReflectionNames { - - public final static String BIOME_GENERATION_SETTINGS_FEATURES = "e"; - public final static String BIOME_GENERATION_SETTINGS_FEATURE_SET = "g"; - public final static String WEIGHTED_LIST_INT_DISTRIBUTION = "b"; - public final static String COUNT_PLACEMENT_COUNT = "c"; - public final static String HEIGHT_RANGE_PLACEMENT_HEIGHT = "c"; - public final static String RARITY_FILTER_CHANCE = "c"; - public final static String SURFACE_RELATIVE_THRESHOLD_FILTER_HEIGHTMAP = "c"; - public final static String SURFACE_RELATIVE_THRESHOLD_FILTER_MIN_INCLUSIVE = "d"; - public final static String SURFACE_RELATIVE_THRESHOLD_FILTER_MAX_INCLUSIVE = "e"; - public final static String SURFACE_WATER_DEPTH_FILTER_MAX_WATER_DEPTH = "c"; - public static final String CLAMPED_INT_SOURCE = "b"; - public static final String CLAMPED_INT_MIN_INCLUSIVE = "f"; - public static final String CLAMPED_INT_MAX_INCLUSIVE = "g"; - public static final String CLAMPED_NORMAL_INT_MEAN = "b"; - public static final String CLAMPED_NORMAL_INT_DEVIATION = "f"; - public static final String CHUNK_MAP_GENERATOR = "t"; - public static final String NOISE_GENERATOR_SETTINGS = "e"; - - private NMSReflectionNames() { - } -} diff --git a/impl/v1_20_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_20_R1/NMSReplacer_v1_20_R1.java b/impl/v1_20_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_20_R1/NMSReplacer_v1_20_R1.java deleted file mode 100644 index fdc62536..00000000 --- a/impl/v1_20_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_20_R1/NMSReplacer_v1_20_R1.java +++ /dev/null @@ -1,506 +0,0 @@ -package de.derfrzocker.ore.control.impl.v1_20_R1; - -import com.google.common.base.Suppliers; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import com.google.gson.JsonElement; -import de.derfrzocker.feature.api.FeatureGenerator; -import de.derfrzocker.feature.api.FeatureGeneratorConfiguration; -import de.derfrzocker.feature.api.FeaturePlacementModifier; -import de.derfrzocker.feature.api.PlacementModifierConfiguration; -import de.derfrzocker.feature.api.ValueLocation; -import de.derfrzocker.feature.api.util.Parser; -import de.derfrzocker.feature.common.feature.generator.configuration.EmptyFeatureConfiguration; -import de.derfrzocker.feature.common.feature.generator.configuration.OreFeatureConfiguration; -import de.derfrzocker.feature.common.feature.placement.ActivationModifier; -import de.derfrzocker.feature.common.feature.placement.configuration.ActivationConfiguration; -import de.derfrzocker.feature.common.util.ValueLocationUtil; -import de.derfrzocker.feature.common.value.bool.FixedBooleanValue; -import de.derfrzocker.feature.common.value.number.IntegerType; -import de.derfrzocker.feature.common.value.offset.AboveBottomOffsetIntegerType; -import de.derfrzocker.feature.common.value.offset.BelowTopOffsetIntegerType; -import de.derfrzocker.feature.impl.v1_20_R1.extra.OreVeinHandler; -import de.derfrzocker.feature.impl.v1_20_R1.feature.generator.EmptyConfigurationGenerator; -import de.derfrzocker.feature.impl.v1_20_R1.feature.generator.OreConfigurationGenerator; -import de.derfrzocker.feature.impl.v1_20_R1.placement.CountModifier; -import de.derfrzocker.feature.impl.v1_20_R1.placement.HeightRangeModifier; -import de.derfrzocker.feature.impl.v1_20_R1.placement.RarityModifier; -import de.derfrzocker.feature.impl.v1_20_R1.placement.SurfaceRelativeThresholdModifier; -import de.derfrzocker.feature.impl.v1_20_R1.placement.SurfaceWaterDepthModifier; -import de.derfrzocker.feature.impl.v1_20_R1.value.offset.NMSAboveBottomOffsetIntegerValue; -import de.derfrzocker.feature.impl.v1_20_R1.value.offset.NMSBelowTopOffsetIntegerValue; -import de.derfrzocker.ore.control.api.NMSReplacer; -import de.derfrzocker.ore.control.api.OreControlManager; -import de.derfrzocker.ore.control.api.OreControlRegistries; -import de.derfrzocker.ore.control.api.config.Config; -import de.derfrzocker.ore.control.api.config.ConfigManager; -import de.derfrzocker.ore.control.impl.v1_20_R1.feature.generator.EmptyConfigurationGeneratorHook; -import de.derfrzocker.ore.control.impl.v1_20_R1.feature.generator.OreConfigurationGeneratorHook; -import de.derfrzocker.ore.control.impl.v1_20_R1.placement.ActivationModifierHook; -import de.derfrzocker.ore.control.impl.v1_20_R1.placement.CountModifierHook; -import de.derfrzocker.ore.control.impl.v1_20_R1.placement.HeightRangeModifierHook; -import de.derfrzocker.ore.control.impl.v1_20_R1.placement.RarityModifierHook; -import de.derfrzocker.ore.control.impl.v1_20_R1.placement.SurfaceRelativeThresholdModifierHook; -import de.derfrzocker.ore.control.impl.v1_20_R1.placement.SurfaceWaterDepthModifierHook; -import net.minecraft.core.Holder; -import net.minecraft.core.HolderSet; -import net.minecraft.core.Registry; -import net.minecraft.core.RegistryAccess; -import net.minecraft.core.registries.Registries; -import net.minecraft.resources.ResourceKey; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.server.dedicated.DedicatedServer; -import net.minecraft.server.level.ServerLevel; -import net.minecraft.world.level.biome.Biome; -import net.minecraft.world.level.biome.BiomeGenerationSettings; -import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; -import net.minecraft.world.level.levelgen.feature.Feature; -import net.minecraft.world.level.levelgen.feature.GlowstoneFeature; -import net.minecraft.world.level.levelgen.feature.OreFeature; -import net.minecraft.world.level.levelgen.feature.ScatteredOreFeature; -import net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration; -import net.minecraft.world.level.levelgen.placement.CountPlacement; -import net.minecraft.world.level.levelgen.placement.HeightRangePlacement; -import net.minecraft.world.level.levelgen.placement.PlacedFeature; -import net.minecraft.world.level.levelgen.placement.PlacementModifier; -import net.minecraft.world.level.levelgen.placement.PlacementModifierType; -import net.minecraft.world.level.levelgen.placement.RarityFilter; -import net.minecraft.world.level.levelgen.placement.SurfaceRelativeThresholdFilter; -import net.minecraft.world.level.levelgen.placement.SurfaceWaterDepthFilter; -import org.bukkit.Bukkit; -import org.bukkit.NamespacedKey; -import org.bukkit.World; -import org.bukkit.craftbukkit.v1_20_R1.CraftServer; -import org.bukkit.craftbukkit.v1_20_R1.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R1.util.CraftNamespacedKey; -import org.bukkit.plugin.Plugin; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import java.io.File; -import java.io.FileWriter; -import java.io.IOException; -import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.LinkedHashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Set; -import java.util.function.BiConsumer; -import java.util.function.Supplier; -import java.util.stream.Collectors; - -public class NMSReplacer_v1_20_R1 implements NMSReplacer { - - private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create(); - private final Plugin plugin; - private final Parser configParser; - private final OreControlManager oreControlManager; - @NotNull - private final OreControlRegistries registries; - private final ConfigManager configManager; - - public NMSReplacer_v1_20_R1(@NotNull Plugin plugin, @NotNull OreControlManager oreControlManager, Parser configParser) { - this.plugin = plugin; - this.oreControlManager = oreControlManager; - this.registries = oreControlManager.getRegistries(); - this.configManager = oreControlManager.getConfigManager(); - this.configParser = configParser; - } - - @Override - public void register() { - registerValueTypes(); - registerFeatureGenerators(); - registerPlacementModifier(); - registerFeatures(); - registerBiomes(); - registerExtraValues(); - } - - private void registerValueTypes() { - registries.getValueTypeRegistry(IntegerType.class).register(new AboveBottomOffsetIntegerType(registries, NMSAboveBottomOffsetIntegerValue::new)); - registries.getValueTypeRegistry(IntegerType.class).register(new BelowTopOffsetIntegerType(registries, NMSBelowTopOffsetIntegerValue::new)); - } - - private void registerFeatureGenerators() { - registries.getFeatureGeneratorRegistry().register(OreConfigurationGenerator.createOre(registries)); - registries.getFeatureGeneratorRegistry().register(OreConfigurationGenerator.createScatteredOre(registries)); - registries.getFeatureGeneratorRegistry().register(EmptyConfigurationGenerator.createGlowstoneBlob(registries)); - } - - private void registerPlacementModifier() { - registries.getPlacementModifierRegistry().register(new RarityModifier(registries)); - registries.getPlacementModifierRegistry().register(new SurfaceRelativeThresholdModifier(registries)); - registries.getPlacementModifierRegistry().register(new SurfaceWaterDepthModifier(registries)); - registries.getPlacementModifierRegistry().register(new CountModifier(registries)); - registries.getPlacementModifierRegistry().register(new HeightRangeModifier(registries)); - } - - private void registerFeatures() { - Registry placedFeatureRegistry = getRegistry().registryOrThrow(Registries.PLACED_FEATURE); - Registry> featureRegistry = getRegistry().registryOrThrow(Registries.FEATURE); - Registry> placementModifierTypes = getRegistry().registryOrThrow(Registries.PLACEMENT_MODIFIER_TYPE); - - for (PlacedFeature placedFeature : placedFeatureRegistry) { - Feature feature = placedFeature.getFeatures().findFirst().get().feature(); - ResourceLocation resourceLocation = featureRegistry.getKey(feature); - Optional> featureGenerator = registries.getFeatureGeneratorRegistry().get(NamespacedKey.fromString(resourceLocation.toString())); - - if (featureGenerator.isEmpty()) { - continue; - } - - boolean hasCount = false; - List> modifiers = new LinkedList<>(); - for (PlacementModifier modifier : placedFeature.placement()) { - if (modifier.type() == PlacementModifierType.COUNT) { - hasCount = true; - } - ResourceLocation placementModifierType = placementModifierTypes.getKey(modifier.type()); - Optional> modifierOptional = registries.getPlacementModifierRegistry().get(NamespacedKey.fromString(placementModifierType.toString())); - modifierOptional.ifPresent(modifiers::add); - } - - if (!hasCount) { - Optional> modifierOptional = registries.getPlacementModifierRegistry().get(NamespacedKey.fromString("minecraft:count")); - modifierOptional.ifPresent(modifiers::add); - } - - // inject activation / deactivation logic - Optional> modifierOptional = registries.getPlacementModifierRegistry().get(ActivationModifier.KEY); - modifierOptional.ifPresent(modifiers::add); - - registries.getFeatureRegistry().register(new de.derfrzocker.feature.api.Feature(NamespacedKey.fromString(placedFeatureRegistry.getKey(placedFeature).toString()), featureGenerator.get(), modifiers)); - } - } - - private void registerBiomes() { - Registry placedFeatureRegistry = getRegistry().registryOrThrow(Registries.PLACED_FEATURE); - forEachBiome((biome, resourceLocation) -> { - de.derfrzocker.ore.control.api.Biome bio = new de.derfrzocker.ore.control.api.Biome(CraftNamespacedKey.fromMinecraft(resourceLocation)); - - biome.getGenerationSettings().features().forEach(featureSet -> featureSet.forEach(holder -> { - PlacedFeature feature = holder.value(); - ResourceLocation featureKey = placedFeatureRegistry.getKey(feature); - - if (featureKey == null) { - // Skip if the feature is not registered, this can happen if another plugin adds a feature without registering it - return; - } - - registries.getFeatureRegistry().get(CraftNamespacedKey.fromMinecraft(featureKey)).ifPresent(value -> bio.getFeatures().add(value)); - })); - - registries.getBiomeRegistry().register(bio); - }); - } - - private void registerExtraValues() { - plugin.getServer().getPluginManager().registerEvents(new OreVeinHandler(oreControlManager), plugin); - } - - @Override - public void saveDefaultValues(File directory) { - File world = new File(directory, "world"); - File biomes = new File(directory, "biome"); - - saveWorldValues(world); - saveBiomeValues(biomes); - } - - @Override - public void hookIntoBiomes() { - forEachBiome((biome, resourceLocation) -> { - try { - hookIntoBiome(biome, resourceLocation); - } catch (final Exception e) { - throw new RuntimeException("Unexpected error while hooking in NMS for Biome: " + biome, e); - } - }); - } - - @Override - public Set getBiomes(World world) { - Set biomes = new LinkedHashSet<>(); - ServerLevel level = ((CraftWorld) world).getHandle(); - Registry registry = getRegistry().registryOrThrow(Registries.BIOME); - - for (Holder biomeHolder : level.getChunkSource().chunkMap.generator.getBiomeSource().possibleBiomes()) { - Biome biome = biomeHolder.value(); - - ResourceLocation key = registry.getKey(biome); - - biomes.add(registries.getBiomeRegistry().get(CraftNamespacedKey.fromMinecraft(key)).get()); - } - - return biomes; - } - - private void saveWorldValues(File directory) { - Registry registry = getRegistry().registryOrThrow(Registries.PLACED_FEATURE); - for (Map.Entry, PlacedFeature> entry : registry.entrySet()) { - ResourceLocation key = entry.getKey().location(); - File file = new File(directory, key.getNamespace() + "/" + key.getPath() + ".json"); - try { - saveFeature(file, null, CraftNamespacedKey.fromMinecraft(key), entry.getValue()); - } catch (Exception e) { - throw new RuntimeException(String.format("Error while saving feature '%s'", key), e); - } - } - } - - private void saveBiomeValues(File directory) { - forEachBiome((biome, biomeKey) -> { - File biomeFile = new File(directory, biomeKey.getNamespace() + "/" + biomeKey.getPath()); - List> decorations = biome.getGenerationSettings().features(); - for (HolderSet list : decorations) { - for (Holder featureSupplier : list) { - PlacedFeature feature = featureSupplier.value(); - Registry registry = getRegistry().registryOrThrow(Registries.PLACED_FEATURE); - ResourceLocation featureKey = registry.getKey(feature); - - if (featureKey == null) { - // Skip if the feature is not registered, this can happen if another plugin adds a feature without registering it - return; - } - - File featureFile = new File(biomeFile, featureKey.getNamespace() + "/" + featureKey.getPath() + ".json"); - try { - saveFeature(featureFile, registries.getBiomeRegistry().get(CraftNamespacedKey.fromMinecraft(biomeKey)).get(), CraftNamespacedKey.fromMinecraft(featureKey), feature); - } catch (Exception e) { - throw new RuntimeException(String.format("Error while saving feature '%s' in biome '%s'", featureKey, biomeKey), e); - } - } - } - }); - } - - // TODO clean up - private void saveFeature(File file, de.derfrzocker.ore.control.api.Biome biome, NamespacedKey featureKey, PlacedFeature feature) { - ConfiguredFeature configuredFeature = feature.getFeatures().findFirst().orElse(null); - - if (configuredFeature == null) { - return; - } - - if (!(configuredFeature.feature() instanceof OreFeature) && !(configuredFeature.feature() instanceof ScatteredOreFeature) && !(configuredFeature.feature() instanceof GlowstoneFeature)) { - return; - } - - file.getParentFile().mkdirs(); - - FeatureGenerator featureGenerator; - FeatureGeneratorConfiguration featureConfiguration; - - if (configuredFeature.feature() instanceof OreFeature) { - OreConfiguration configuration = (OreConfiguration) configuredFeature.config(); - featureGenerator = registries.getFeatureGeneratorRegistry().get(NamespacedKey.minecraft("ore")).get(); - featureConfiguration = OreConfigurationGeneratorHook.createDefaultConfiguration(configuration, (FeatureGenerator) featureGenerator); - } else if (configuredFeature.feature() instanceof ScatteredOreFeature) { - OreConfiguration configuration = (OreConfiguration) configuredFeature.config(); - featureGenerator = registries.getFeatureGeneratorRegistry().get(NamespacedKey.minecraft("scattered_ore")).get(); - featureConfiguration = OreConfigurationGeneratorHook.createDefaultConfiguration(configuration, (FeatureGenerator) featureGenerator); - } else if (configuredFeature.feature() instanceof GlowstoneFeature) { - featureGenerator = registries.getFeatureGeneratorRegistry().get(NamespacedKey.minecraft("glowstone_blob")).get(); - featureConfiguration = new EmptyFeatureConfiguration(featureGenerator); - } else { - throw new RuntimeException("HOW?"); - } - - boolean hasCount = false; - List placementConfiguration = new ArrayList<>(); - Registry> placementModifierTypes = getRegistry().registryOrThrow(Registries.PLACEMENT_MODIFIER_TYPE); - for (PlacementModifier placement : feature.placement()) { - ResourceLocation placementModifierType = placementModifierTypes.getKey(placement.type()); - Optional> modifierOptional = registries.getPlacementModifierRegistry().get(NamespacedKey.fromString(placementModifierType.toString())); - - if (modifierOptional.isEmpty()) { - continue; - } - - if (placement.type() == PlacementModifierType.RARITY_FILTER && placement instanceof RarityFilter) { - placementConfiguration.add(RarityModifierHook.createDefaultConfiguration((RarityFilter) placement, modifierOptional.get())); - } - if (placement.type() == PlacementModifierType.SURFACE_RELATIVE_THRESHOLD_FILTER && placement instanceof SurfaceRelativeThresholdFilter) { - placementConfiguration.add(SurfaceRelativeThresholdModifierHook.createDefaultConfiguration((SurfaceRelativeThresholdFilter) placement, modifierOptional.get())); - } - if (placement.type() == PlacementModifierType.SURFACE_WATER_DEPTH_FILTER && placement instanceof SurfaceWaterDepthFilter) { - placementConfiguration.add(SurfaceWaterDepthModifierHook.createDefaultConfiguration((SurfaceWaterDepthFilter) placement, modifierOptional.get())); - } - if (placement.type() == PlacementModifierType.COUNT && placement instanceof CountPlacement) { - placementConfiguration.add(CountModifierHook.createDefaultConfiguration((CountPlacement) placement, modifierOptional.get())); - hasCount = true; - } - if (placement.type() == PlacementModifierType.HEIGHT_RANGE && placement instanceof HeightRangePlacement) { - placementConfiguration.add(HeightRangeModifierHook.createDefaultConfiguration((HeightRangePlacement) placement, modifierOptional.get())); - } - } - - if (!hasCount) { - Optional> modifierOptional = registries.getPlacementModifierRegistry().get(NamespacedKey.fromString("minecraft:count")); - - modifierOptional.ifPresent(modifier -> placementConfiguration.add(0, CountModifierHook.createDefaultConfiguration(CountPlacement.of(1), modifier))); - } - - // inject activation / deactivation logic - Optional> modifierOptional = registries.getPlacementModifierRegistry().get(ActivationModifier.KEY); - modifierOptional.ifPresent(modifier -> placementConfiguration.add(0, new ActivationConfiguration(modifier, new FixedBooleanValue(true)))); - - Config config = new Config(placementConfiguration, featureConfiguration); - - if (biome == null) { - ValueLocationUtil.setValueLocation(Optional.of(config), ValueLocation.DEFAULT_WORLD); - configManager.setDefaultConfig(featureKey, config); - } else { - ValueLocationUtil.setValueLocation(Optional.of(config), ValueLocation.DEFAULT_BIOME); - configManager.setDefaultConfig(biome, featureKey, config); - } - - if (file.exists()) { - return; - } - - try { - file.createNewFile(); - } catch (IOException e) { - throw new RuntimeException(e); - } - - JsonElement element = configParser.toJson(config); - try (FileWriter writer = new FileWriter(file)) { - writer.write(GSON.toJson(element)); - } catch (IOException e) { - throw new RuntimeException(e); - } - } - - private void forEachBiome(BiConsumer consumer) { - Registry registry = getRegistry().registryOrThrow(Registries.BIOME); - for (Biome biome : registry) { - consumer.accept(biome, registry.getKey(biome)); - } - } - - private void hookIntoBiome(@NotNull final Biome biome, ResourceLocation minecraftKey) throws NoSuchFieldException, IllegalAccessException { - de.derfrzocker.ore.control.api.Biome oreControlBiome = registries.getBiomeRegistry().get(CraftNamespacedKey.fromMinecraft(minecraftKey)).get(); - List> decorations = biome.getGenerationSettings().features(); - List> newDecorations = new ArrayList<>(); - for (HolderSet list : decorations) { - List> newList = new ArrayList<>(); - - for (Holder featureSupplier : list) { - PlacedFeature feature = featureSupplier.value(); - - PlacedFeature newFeature = check(oreControlBiome, minecraftKey, feature); - - if (newFeature != null) { - newList.add(Holder.direct(newFeature)); - } else { - newList.add(featureSupplier); - } - } - - newDecorations.add(decorations.indexOf(list), HolderSet.direct(newList)); - } - - { - final Field field = getField(BiomeGenerationSettings.class, NMSReflectionNames.BIOME_GENERATION_SETTINGS_FEATURES); - field.setAccessible(true); - field.set(biome.getGenerationSettings(), newDecorations); - } - { - final Field field = getField(BiomeGenerationSettings.class, NMSReflectionNames.BIOME_GENERATION_SETTINGS_FEATURE_SET); - field.setAccessible(true); - field.set(biome.getGenerationSettings(), Suppliers.memoize(() -> newDecorations.stream().flatMap(HolderSet::stream).map(Holder::value).collect(Collectors.toSet()))); - } - } - - private void addToList(List> list, int index, PlacedFeature feature) { - list.add(index, () -> feature); - } - - @Nullable - private PlacedFeature check(de.derfrzocker.ore.control.api.Biome biome, ResourceLocation biomeKey, PlacedFeature feature) { - // Not the best method to do this, but hey it works - final Registry registry = getRegistry().registryOrThrow(Registries.PLACED_FEATURE); - ResourceLocation featureKey = registry.getKey(feature); - - // Return if the featureKey is null, this can happen when plugins are adding placed features to the biome without registering them - if (featureKey == null) { - // TODO add debug message - return null; - } - - NamespacedKey key = CraftNamespacedKey.fromMinecraft(featureKey); - ConfiguredFeature configuredFeature = feature.getFeatures().findFirst().orElse(null); - - if (configuredFeature == null) { - return null; - } - - if (!(configuredFeature.feature() instanceof OreFeature) && !(configuredFeature.feature() instanceof ScatteredOreFeature) && !(configuredFeature.feature() instanceof GlowstoneFeature)) { - return null; - } - - boolean hasCount = false; - List placementModifiers = new ArrayList<>(); - for (PlacementModifier placement : feature.placement()) { - if (placement.type() == PlacementModifierType.RARITY_FILTER) { - placementModifiers.add(new RarityModifierHook(oreControlManager, biome, key, (RarityFilter) placement)); - } else if (placement.type() == PlacementModifierType.SURFACE_RELATIVE_THRESHOLD_FILTER) { - placementModifiers.add(new SurfaceRelativeThresholdModifierHook(oreControlManager, biome, key, (SurfaceRelativeThresholdFilter) placement)); - } else if (placement.type() == PlacementModifierType.SURFACE_WATER_DEPTH_FILTER) { - placementModifiers.add(new SurfaceWaterDepthModifierHook(oreControlManager, biome, key, (SurfaceWaterDepthFilter) placement)); - } else if (placement.type() == PlacementModifierType.COUNT) { - hasCount = true; - placementModifiers.add(new CountModifierHook(oreControlManager, biome, key, (CountPlacement) placement)); - } else if (placement.type() == PlacementModifierType.HEIGHT_RANGE) { - placementModifiers.add(new HeightRangeModifierHook(oreControlManager, biome, key, (HeightRangePlacement) placement)); - } else { - placementModifiers.add(placement); - } - } - - if (!hasCount) { - placementModifiers.add(0, new CountModifierHook(oreControlManager, biome, key, CountPlacement.of(1))); - } - - // inject activation / deactivation logic - Optional> modifierOptional = registries.getPlacementModifierRegistry().get(ActivationModifier.KEY); - modifierOptional.ifPresent(modifier -> placementModifiers.add(0, new ActivationModifierHook(oreControlManager, biome, key))); - - if (configuredFeature.feature() instanceof OreFeature) { - return new PlacedFeature(Holder.direct(new ConfiguredFeature(OreConfigurationGeneratorHook.createOreHook(oreControlManager, key, biome), configuredFeature.config())), placementModifiers); - } else if (configuredFeature.feature() instanceof ScatteredOreFeature) { - return new PlacedFeature(Holder.direct(new ConfiguredFeature(OreConfigurationGeneratorHook.createScatteredOreHook(oreControlManager, key, biome), configuredFeature.config())), placementModifiers); - } else if (configuredFeature.feature() instanceof GlowstoneFeature) { - return new PlacedFeature(Holder.direct(new ConfiguredFeature(EmptyConfigurationGeneratorHook.createGlowstoneBlobHook(oreControlManager, key, biome), configuredFeature.config())), placementModifiers); - } - - throw new RuntimeException("HOW?"); - } - - @SuppressWarnings("rawtypes") - private Field getField(@NotNull final Class clazz, @NotNull final String fieldName) throws NoSuchFieldException { - try { - return clazz.getDeclaredField(fieldName); - } catch (final NoSuchFieldException e) { - final Class superClass = clazz.getSuperclass(); - if (superClass == null) { - throw e; - } else { - return getField(superClass, fieldName); - } - } - } - - @NotNull - private RegistryAccess getRegistry() { - final DedicatedServer server = ((CraftServer) Bukkit.getServer()).getServer(); - - return server.registryAccess(); - } -} diff --git a/impl/v1_20_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_20_R1/feature/generator/EmptyConfigurationGeneratorHook.java b/impl/v1_20_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_20_R1/feature/generator/EmptyConfigurationGeneratorHook.java deleted file mode 100644 index 5bb5f733..00000000 --- a/impl/v1_20_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_20_R1/feature/generator/EmptyConfigurationGeneratorHook.java +++ /dev/null @@ -1,30 +0,0 @@ -package de.derfrzocker.ore.control.impl.v1_20_R1.feature.generator; - -import de.derfrzocker.feature.common.feature.generator.configuration.EmptyFeatureConfiguration; -import de.derfrzocker.ore.control.api.Biome; -import de.derfrzocker.ore.control.api.OreControlManager; -import net.minecraft.world.level.levelgen.feature.Feature; -import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Random; - -public class EmptyConfigurationGeneratorHook extends MinecraftFeatureGeneratorHook { - - private EmptyConfigurationGeneratorHook(Feature feature, @NotNull OreControlManager oreControlManager, @NotNull String name, Biome biome, NamespacedKey namespacedKey) { - super(NoneFeatureConfiguration.CODEC, feature, oreControlManager, name, biome, namespacedKey); - } - - public static EmptyConfigurationGeneratorHook createGlowstoneBlobHook(@NotNull OreControlManager oreControlManager, @NotNull NamespacedKey namespacedKey, @NotNull Biome biome) { - return new EmptyConfigurationGeneratorHook(GLOWSTONE_BLOB, oreControlManager, "glowstone_blob", biome, namespacedKey); - } - - @Override - public NoneFeatureConfiguration createConfig(@NotNull NoneFeatureConfiguration defaultConfiguration, @NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull EmptyFeatureConfiguration configuration) { - return defaultConfiguration; - } -} diff --git a/impl/v1_20_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_20_R1/feature/generator/MinecraftFeatureGeneratorHook.java b/impl/v1_20_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_20_R1/feature/generator/MinecraftFeatureGeneratorHook.java deleted file mode 100644 index 26d1b36e..00000000 --- a/impl/v1_20_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_20_R1/feature/generator/MinecraftFeatureGeneratorHook.java +++ /dev/null @@ -1,100 +0,0 @@ -package de.derfrzocker.ore.control.impl.v1_20_R1.feature.generator; - -import com.mojang.serialization.Codec; -import de.derfrzocker.feature.api.FeatureGenerator; -import de.derfrzocker.feature.api.FeatureGeneratorConfiguration; -import de.derfrzocker.ore.control.api.Biome; -import de.derfrzocker.ore.control.api.FeatureGeneratorHook; -import de.derfrzocker.ore.control.api.OreControlManager; -import de.derfrzocker.ore.control.api.config.Config; -import de.derfrzocker.ore.control.api.config.ConfigManager; -import net.minecraft.core.BlockPos; -import net.minecraft.util.RandomSource; -import net.minecraft.world.level.ChunkPos; -import net.minecraft.world.level.WorldGenLevel; -import net.minecraft.world.level.chunk.ChunkGenerator; -import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; -import net.minecraft.world.level.levelgen.feature.Feature; -import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext; -import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration; -import org.bukkit.NamespacedKey; -import org.bukkit.craftbukkit.v1_20_R1.generator.CraftLimitedRegion; -import org.bukkit.craftbukkit.v1_20_R1.util.RandomSourceWrapper; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Map; -import java.util.Optional; -import java.util.Random; -import java.util.concurrent.ConcurrentHashMap; - -public abstract class MinecraftFeatureGeneratorHook extends Feature implements FeatureGeneratorHook { - - private final Map cache = new ConcurrentHashMap<>(); - private final Feature feature; - private final ConfigManager configManager; - private final FeatureGenerator featureGenerator; - private final Biome biome; - private final NamespacedKey namespacedKey; - - public MinecraftFeatureGeneratorHook(Codec codec, Feature feature, @NotNull OreControlManager oreControlManager, @NotNull String name, Biome biome, NamespacedKey namespacedKey) { - super(codec); - this.feature = feature; - this.configManager = oreControlManager.getConfigManager(); - this.featureGenerator = (FeatureGenerator) oreControlManager.getRegistries().getFeatureGeneratorRegistry().get(NamespacedKey.minecraft(name)).get(); - this.biome = biome; - this.namespacedKey = namespacedKey; - - oreControlManager.addValueChangeListener(cache::clear); - } - - public abstract M createConfig(@NotNull M defaultConfiguration, @NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull C configuration); - - @Override - public FeatureGenerator getFeatureGenerator() { - return featureGenerator; - } - - @Override - public Biome getBiome() { - return biome; - } - - @NotNull - @Override - public NamespacedKey getKey() { - return namespacedKey; - } - - @Override - public boolean place(FeaturePlaceContext context) { - BlockPos origin = context.origin(); - - FeatureGeneratorConfiguration configuration = cache.computeIfAbsent(context.level().getMinecraftWorld().getWorld().getName(), this::loadConfig); - if (configuration == null) { - return feature.place(context); - } - - CraftLimitedRegion limitedRegion = new CraftLimitedRegion(context.level(), new ChunkPos(origin)); - M config = createConfig(context.config(), context.level().getMinecraftWorld().getWorld(), new RandomSourceWrapper.RandomWrapper(context.random()), new BlockVector(origin.getX(), origin.getY(), origin.getZ()), limitedRegion, (C) configuration); - limitedRegion.breakLink(); - - return place(context.topFeature(), context.level(), context.chunkGenerator(), context.random(), origin, config); - } - - private FeatureGeneratorConfiguration loadConfig(String name) { - Config config = configManager.getGenerationConfig(configManager.getOrCreateConfigInfo(name), biome, namespacedKey).orElse(null); - - if (config == null) { - return null; - } - - return config.getFeature(); - } - - private boolean place(Optional> top, WorldGenLevel world, ChunkGenerator generator, RandomSource random, BlockPos pos, M config) { - return feature.place(new FeaturePlaceContext<>(top, world, generator, random, pos, config)); - } -} diff --git a/impl/v1_20_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_20_R1/feature/generator/OreConfigurationGeneratorHook.java b/impl/v1_20_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_20_R1/feature/generator/OreConfigurationGeneratorHook.java deleted file mode 100644 index a0befcbb..00000000 --- a/impl/v1_20_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_20_R1/feature/generator/OreConfigurationGeneratorHook.java +++ /dev/null @@ -1,150 +0,0 @@ -package de.derfrzocker.ore.control.impl.v1_20_R1.feature.generator; - -import de.derfrzocker.feature.api.FeatureGenerator; -import de.derfrzocker.feature.common.feature.generator.configuration.OreFeatureConfiguration; -import de.derfrzocker.feature.common.ruletest.AlwaysTrueRuleTest; -import de.derfrzocker.feature.common.ruletest.BlockMatchRuleTest; -import de.derfrzocker.feature.common.ruletest.BlockStateMatchRuleTest; -import de.derfrzocker.feature.common.ruletest.RandomBlockMatchRuleTest; -import de.derfrzocker.feature.common.ruletest.RandomBlockStateMatchRuleTest; -import de.derfrzocker.feature.common.ruletest.TagMatchRuleTest; -import de.derfrzocker.feature.common.value.number.FixedFloatValue; -import de.derfrzocker.feature.common.value.number.integer.FixedDoubleToIntegerValue; -import de.derfrzocker.feature.common.value.target.FixedTargetListValue; -import de.derfrzocker.feature.common.value.target.TargetBlockState; -import de.derfrzocker.feature.common.value.target.TargetListValue; -import de.derfrzocker.ore.control.api.Biome; -import de.derfrzocker.ore.control.api.OreControlManager; -import net.minecraft.tags.TagKey; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.levelgen.feature.Feature; -import net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration; -import net.minecraft.world.level.levelgen.structure.templatesystem.AlwaysTrueTest; -import net.minecraft.world.level.levelgen.structure.templatesystem.BlockMatchTest; -import net.minecraft.world.level.levelgen.structure.templatesystem.BlockStateMatchTest; -import net.minecraft.world.level.levelgen.structure.templatesystem.RandomBlockMatchTest; -import net.minecraft.world.level.levelgen.structure.templatesystem.RandomBlockStateMatchTest; -import net.minecraft.world.level.levelgen.structure.templatesystem.RuleTest; -import net.minecraft.world.level.levelgen.structure.templatesystem.TagMatchTest; -import org.bukkit.NamespacedKey; -import org.bukkit.craftbukkit.v1_20_R1.block.data.CraftBlockData; -import org.bukkit.craftbukkit.v1_20_R1.util.CraftMagicNumbers; -import org.bukkit.craftbukkit.v1_20_R1.util.CraftNamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Random; - -public class OreConfigurationGeneratorHook extends MinecraftFeatureGeneratorHook { - - private OreConfigurationGeneratorHook(Feature feature, @NotNull OreControlManager oreControlManager, @NotNull String name, Biome biome, NamespacedKey namespacedKey) { - super(OreConfiguration.CODEC, feature, oreControlManager, name, biome, namespacedKey); - } - - public static OreConfigurationGeneratorHook createOreHook(@NotNull OreControlManager oreControlManager, @NotNull NamespacedKey namespacedKey, @NotNull Biome biome) { - return new OreConfigurationGeneratorHook(ORE, oreControlManager, "ore", biome, namespacedKey); - } - - public static OreConfigurationGeneratorHook createScatteredOreHook(@NotNull OreControlManager oreControlManager, @NotNull NamespacedKey namespacedKey, @NotNull Biome biome) { - return new OreConfigurationGeneratorHook(SCATTERED_ORE, oreControlManager, "scattered_ore", biome, namespacedKey); - } - - public static OreFeatureConfiguration createDefaultConfiguration(@NotNull OreConfiguration configuration, @NotNull FeatureGenerator feature) { - List targetBlockStates = new ArrayList<>(); - for (OreConfiguration.TargetBlockState targetBlockState : configuration.targetStates) { - de.derfrzocker.feature.api.RuleTest ruleTest; - if (targetBlockState.target instanceof AlwaysTrueTest) { - ruleTest = new AlwaysTrueRuleTest(); - } else if (targetBlockState.target instanceof BlockMatchTest rule) { - ruleTest = new BlockMatchRuleTest(CraftMagicNumbers.getMaterial(getFieldValueFromType(rule, Block.class))); - } else if (targetBlockState.target instanceof BlockStateMatchTest rule) { - ruleTest = new BlockStateMatchRuleTest(CraftBlockData.fromData(getFieldValueFromType(rule, BlockState.class))); - } else if (targetBlockState.target instanceof RandomBlockMatchTest rule) { - ruleTest = new RandomBlockMatchRuleTest(CraftMagicNumbers.getMaterial(getFieldValueFromType(rule, Block.class)), getFieldValueFromType(rule, Float.TYPE)); - } else if (targetBlockState.target instanceof RandomBlockStateMatchTest rule) { - ruleTest = new RandomBlockStateMatchRuleTest(CraftBlockData.fromData(getFieldValueFromType(rule, BlockState.class)), getFieldValueFromType(rule, Float.TYPE)); - } else if (targetBlockState.target instanceof TagMatchTest rule) { - ruleTest = new TagMatchRuleTest(CraftNamespacedKey.fromMinecraft(getFieldValueFromType(rule, TagKey.class).location())); - } else { - throw new IllegalArgumentException("Got unexpected rule test from class " + targetBlockState.target.getClass()); - } - - targetBlockStates.add(new TargetBlockState(ruleTest, CraftBlockData.fromData(targetBlockState.state))); - } - - TargetListValue targetListValue = new FixedTargetListValue(targetBlockStates); - - return new OreFeatureConfiguration(feature, targetListValue, new FixedDoubleToIntegerValue(configuration.size), new FixedFloatValue(configuration.discardChanceOnAirExposure)); - } - - private static V getFieldValueFromType(Object from, Class type) { - for (Field field : from.getClass().getDeclaredFields()) { - if (field.getType() == type) { - field.setAccessible(true); - try { - return (V) field.get(from); - } catch (IllegalAccessException e) { - throw new RuntimeException(e); - } - } - } - - throw new IllegalStateException("Didn't found field with type " + type + " from class " + from.getClass() - + ", following fields are present " + Arrays.toString(from.getClass().getDeclaredFields())); - } - - @Override - public OreConfiguration createConfig(@NotNull OreConfiguration defaultConfiguration, @NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull OreFeatureConfiguration configuration) { - List blockStates; - if (configuration.getTargets() == null) { - blockStates = defaultConfiguration.targetStates; - } else { - blockStates = new ArrayList<>(); - - for (TargetBlockState targetValue : configuration.getTargets().getValue(worldInfo, random, position, limitedRegion)) { - RuleTest ruleTest; - - if (targetValue.getTarget() instanceof AlwaysTrueRuleTest) { - ruleTest = AlwaysTrueTest.INSTANCE; - } else if (targetValue.getTarget() instanceof BlockMatchRuleTest rule) { - ruleTest = new BlockMatchTest(CraftMagicNumbers.getBlock(rule.getBlock())); - } else if (targetValue.getTarget() instanceof BlockStateMatchRuleTest rule) { - ruleTest = new BlockStateMatchTest(((CraftBlockData) rule.getBlockData()).getState()); - } else if (targetValue.getTarget() instanceof RandomBlockMatchRuleTest rule) { - ruleTest = new RandomBlockMatchTest(CraftMagicNumbers.getBlock(rule.getMaterial()), rule.getProbability()); - } else if (targetValue.getTarget() instanceof RandomBlockStateMatchRuleTest rule) { - ruleTest = new RandomBlockStateMatchTest(((CraftBlockData) rule.getBlockData()).getState(), rule.getProbability()); - } else if (targetValue.getTarget() instanceof TagMatchRuleTest rule) { - ruleTest = new TagMatchTest(TagKey.create(net.minecraft.core.registries.Registries.BLOCK, CraftNamespacedKey.toMinecraft(rule.getTag()))); - } else { - throw new IllegalArgumentException("Got unexpected rule test from class " + targetValue.getTarget().getClass()); - } - - blockStates.add(OreConfiguration.target(ruleTest, ((CraftBlockData) targetValue.getState()).getState())); - } - } - - int size; - if (configuration.getSize() == null) { - size = defaultConfiguration.size; - } else { - size = configuration.getSize().getValue(worldInfo, random, position, limitedRegion); - } - - float discardChanceOnAirExposure; - if (configuration.getDiscardChanceOnAirExposure() == null) { - discardChanceOnAirExposure = defaultConfiguration.discardChanceOnAirExposure; - } else { - discardChanceOnAirExposure = configuration.getDiscardChanceOnAirExposure().getValue(worldInfo, random, position, limitedRegion); - } - - return new OreConfiguration(blockStates, size, discardChanceOnAirExposure); - } -} diff --git a/impl/v1_20_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_20_R1/placement/ActivationModifierHook.java b/impl/v1_20_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_20_R1/placement/ActivationModifierHook.java deleted file mode 100644 index b38d8c27..00000000 --- a/impl/v1_20_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_20_R1/placement/ActivationModifierHook.java +++ /dev/null @@ -1,95 +0,0 @@ -package de.derfrzocker.ore.control.impl.v1_20_R1.placement; - -import de.derfrzocker.feature.api.FeaturePlacementModifier; -import de.derfrzocker.feature.api.PlacementModifierConfiguration; -import de.derfrzocker.feature.common.feature.placement.ActivationModifier; -import de.derfrzocker.feature.common.feature.placement.configuration.ActivationConfiguration; -import de.derfrzocker.ore.control.api.Biome; -import de.derfrzocker.ore.control.api.OreControlManager; -import de.derfrzocker.ore.control.api.PlacementModifierHook; -import de.derfrzocker.ore.control.api.config.Config; -import de.derfrzocker.ore.control.api.config.ConfigManager; -import net.minecraft.core.BlockPos; -import net.minecraft.util.RandomSource; -import net.minecraft.world.level.ChunkPos; -import net.minecraft.world.level.levelgen.placement.PlacementContext; -import net.minecraft.world.level.levelgen.placement.PlacementModifier; -import net.minecraft.world.level.levelgen.placement.PlacementModifierType; -import org.bukkit.NamespacedKey; -import org.bukkit.craftbukkit.v1_20_R1.generator.CraftLimitedRegion; -import org.bukkit.craftbukkit.v1_20_R1.util.RandomSourceWrapper; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; -import java.util.stream.Stream; - -// TODO make more generic -public class ActivationModifierHook extends PlacementModifier implements PlacementModifierHook { - - private final Map cache = new ConcurrentHashMap<>(); - private final ActivationModifier activationModifier; - private final ConfigManager configManager; - private final Biome biome; - private final NamespacedKey namespacedKey; - - public ActivationModifierHook(@NotNull OreControlManager oreControlManager, @NotNull Biome biome, @NotNull NamespacedKey namespacedKey) { - this.configManager = oreControlManager.getConfigManager(); - this.activationModifier = (ActivationModifier) oreControlManager.getRegistries().getPlacementModifierRegistry().get(ActivationModifier.KEY).get(); - this.biome = biome; - this.namespacedKey = namespacedKey; - - oreControlManager.addValueChangeListener(cache::clear); - } - - @Override - public FeaturePlacementModifier getPlacementModifier() { - return activationModifier; - } - - @Override - public Biome getBiome() { - return biome; - } - - @NotNull - @Override - public NamespacedKey getKey() { - return activationModifier.getKey(); - } - - @Override - public Stream getPositions(PlacementContext context, RandomSource random, BlockPos blockPos) { - PlacementModifierConfiguration configuration = cache.computeIfAbsent(context.getLevel().getMinecraftWorld().getWorld().getName(), this::loadConfig); - if (configuration == null) { - return Stream.of(blockPos); - } - - CraftLimitedRegion limitedRegion = new CraftLimitedRegion(context.getLevel(), new ChunkPos(blockPos)); - Stream pos = activationModifier.getPositions(context.getLevel().getMinecraftWorld().getWorld(), new RandomSourceWrapper.RandomWrapper(random), new BlockVector(blockPos.getX(), blockPos.getY(), blockPos.getZ()), limitedRegion, (ActivationConfiguration) configuration); - - limitedRegion.breakLink(); - - return pos.map(blockVector -> new BlockPos(blockVector.getBlockX(), blockVector.getBlockY(), blockVector.getBlockZ())); - } - - private PlacementModifierConfiguration loadConfig(String name) { - Config config = configManager.getGenerationConfig(configManager.getOrCreateConfigInfo(name), biome, namespacedKey).orElse(null); - - if (config == null) { - return null; - } - - if (config.getPlacements() == null) { - return null; - } - - return config.getPlacements().get(activationModifier); - } - - @Override - public PlacementModifierType type() { - return null; - } -} diff --git a/impl/v1_20_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_20_R1/placement/CountModifierHook.java b/impl/v1_20_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_20_R1/placement/CountModifierHook.java deleted file mode 100644 index fe9d3da4..00000000 --- a/impl/v1_20_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_20_R1/placement/CountModifierHook.java +++ /dev/null @@ -1,55 +0,0 @@ -package de.derfrzocker.ore.control.impl.v1_20_R1.placement; - -import de.derfrzocker.feature.api.FeaturePlacementModifier; -import de.derfrzocker.feature.common.feature.placement.configuration.CountModifierConfiguration; -import de.derfrzocker.feature.common.value.number.IntegerValue; -import de.derfrzocker.ore.control.api.Biome; -import de.derfrzocker.ore.control.api.OreControlManager; -import de.derfrzocker.ore.control.impl.v1_20_R1.ConversionUtil; -import de.derfrzocker.ore.control.impl.v1_20_R1.NMSReflectionNames; -import net.minecraft.util.valueproviders.IntProvider; -import net.minecraft.world.level.levelgen.placement.CountPlacement; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.lang.reflect.Field; -import java.util.Random; - -public class CountModifierHook extends MinecraftPlacementModifierHook { - - public CountModifierHook(@NotNull OreControlManager oreControlManager, @NotNull Biome biome, @NotNull NamespacedKey namespacedKey, @NotNull CountPlacement defaultModifier) { - super(oreControlManager, "count", defaultModifier, biome, namespacedKey); - } - - public static CountModifierConfiguration createDefaultConfiguration(@NotNull CountPlacement defaultModifier, @NotNull FeaturePlacementModifier modifier) { - try { - Field count = CountPlacement.class.getDeclaredField(NMSReflectionNames.COUNT_PLACEMENT_COUNT); - count.setAccessible(true); - IntProvider value = (IntProvider) count.get(defaultModifier); - IntegerValue integerValue = ConversionUtil.convert(value); - return new CountModifierConfiguration(modifier, integerValue); - } catch (NoSuchFieldException | IllegalAccessException e) { - throw new RuntimeException(e); - } - } - - @Override - public CountModifierConfiguration createDefaultConfiguration(@NotNull CountPlacement defaultModifier) { - return createDefaultConfiguration(defaultModifier, getPlacementModifier()); - } - - @Override - public CountPlacement createModifier(@NotNull CountModifierConfiguration defaultConfiguration, @NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull CountModifierConfiguration configuration) { - int count; - if (configuration.getCount() == null) { - count = defaultConfiguration.getCount().getValue(worldInfo, random, position, limitedRegion); - } else { - count = configuration.getCount().getValue(worldInfo, random, position, limitedRegion); - } - - return CountPlacement.of(count); - } -} diff --git a/impl/v1_20_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_20_R1/placement/HeightRangeModifierHook.java b/impl/v1_20_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_20_R1/placement/HeightRangeModifierHook.java deleted file mode 100644 index 3c3037c6..00000000 --- a/impl/v1_20_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_20_R1/placement/HeightRangeModifierHook.java +++ /dev/null @@ -1,122 +0,0 @@ -package de.derfrzocker.ore.control.impl.v1_20_R1.placement; - -import de.derfrzocker.feature.api.FeaturePlacementModifier; -import de.derfrzocker.feature.common.feature.placement.configuration.HeightRangeModifierConfiguration; -import de.derfrzocker.feature.common.value.number.IntegerValue; -import de.derfrzocker.feature.common.value.number.integer.FixedDoubleToIntegerValue; -import de.derfrzocker.feature.common.value.number.integer.trapezoid.TrapezoidIntegerValue; -import de.derfrzocker.feature.common.value.number.integer.uniform.UniformIntegerValue; -import de.derfrzocker.feature.impl.v1_20_R1.value.offset.NMSAboveBottomOffsetIntegerValue; -import de.derfrzocker.feature.impl.v1_20_R1.value.offset.NMSBelowTopOffsetIntegerValue; -import de.derfrzocker.ore.control.api.Biome; -import de.derfrzocker.ore.control.api.OreControlManager; -import de.derfrzocker.ore.control.impl.v1_20_R1.NMSReflectionNames; -import net.minecraft.world.level.levelgen.VerticalAnchor; -import net.minecraft.world.level.levelgen.heightproviders.ConstantHeight; -import net.minecraft.world.level.levelgen.heightproviders.HeightProvider; -import net.minecraft.world.level.levelgen.heightproviders.HeightProviderType; -import net.minecraft.world.level.levelgen.placement.HeightRangePlacement; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.lang.reflect.Field; -import java.util.Random; - -public class HeightRangeModifierHook extends MinecraftPlacementModifierHook { - - public HeightRangeModifierHook(@NotNull OreControlManager oreControlManager, @NotNull Biome biome, @NotNull NamespacedKey namespacedKey, @NotNull HeightRangePlacement defaultModifier) { - super(oreControlManager, "height_range", defaultModifier, biome, namespacedKey); - } - - public static HeightRangeModifierConfiguration createDefaultConfiguration(@NotNull HeightRangePlacement defaultModifier, @NotNull FeaturePlacementModifier modifier) { - try { - Field height = HeightRangePlacement.class.getDeclaredField(NMSReflectionNames.HEIGHT_RANGE_PLACEMENT_HEIGHT); - height.setAccessible(true); - HeightProvider value = (HeightProvider) height.get(defaultModifier); - - IntegerValue integerValue; - if (value.getType() == HeightProviderType.CONSTANT) { - integerValue = getIntegerValue(value.toString()); - } else if (value.getType() == HeightProviderType.UNIFORM) { - String uniform = value.toString(); - uniform = uniform.substring(1); - uniform = uniform.substring(0, uniform.length() - 1); - int charType = uniform.indexOf("-", 1); - String[] anchors = new String[]{uniform.substring(0, charType), uniform.substring(charType + 1)}; - - integerValue = new UniformIntegerValue(getIntegerValue(anchors[0]), getIntegerValue(anchors[1])); - } else if (value.getType() == HeightProviderType.TRAPEZOID) { - String trapezoid = value.toString(); - if (trapezoid.startsWith("triangle")) { - trapezoid = trapezoid.replace("triangle (", ""); - trapezoid = trapezoid.substring(0, trapezoid.length() - 1); - int charType = trapezoid.indexOf("-", 1); - String[] anchors = new String[]{trapezoid.substring(0, charType), trapezoid.substring(charType + 1)}; - - integerValue = new TrapezoidIntegerValue(getIntegerValue(anchors[0]), getIntegerValue(anchors[1]), new FixedDoubleToIntegerValue(0)); - } else if (trapezoid.startsWith("trapezoid")) { - trapezoid = trapezoid.replace("trapezoid (", ""); - trapezoid = trapezoid.substring(0, trapezoid.length() - 1); - String[] split = trapezoid.split("\\) in \\["); - - if (split.length != 2) { - throw new IllegalStateException(String.format("Expected a split of size '2', but got '%s' for input '%s'", split.length, trapezoid)); - } - - int plateau = Integer.parseInt(split[0]); - int charType = trapezoid.indexOf("-", 1); - String[] anchors = new String[]{trapezoid.substring(0, charType), trapezoid.substring(charType + 1)}; - integerValue = new TrapezoidIntegerValue(getIntegerValue(anchors[0]), getIntegerValue(anchors[1]), new FixedDoubleToIntegerValue(plateau)); - } else { - throw new UnsupportedOperationException(String.format("Unknown trapezoid value '%s'", trapezoid)); - } - - } else { // TODO add rest of HeightProvider types - throw new UnsupportedOperationException(String.format("No integer value equivalent for HeightProvider '%s'", value)); - } - - return new HeightRangeModifierConfiguration(modifier, integerValue); - } catch (NoSuchFieldException | IllegalAccessException e) { - throw new RuntimeException(e); - } - } - - private static IntegerValue getIntegerValue(String anchor) { - String[] values = anchor.split(" "); - int value = Integer.parseInt(values[0]); - - if (values.length == 2 && values[1].equals("absolute")) { - return new FixedDoubleToIntegerValue(value); - } - - if (values.length == 3 && values[1].equals("above") && values[2].equals("bottom")) { - return new NMSAboveBottomOffsetIntegerValue(new FixedDoubleToIntegerValue(value)); - } - - if (values.length == 3 && values[1].equals("below") && values[2].equals("top")) { - return new NMSBelowTopOffsetIntegerValue(new FixedDoubleToIntegerValue(value)); - } - - throw new UnsupportedOperationException(String.format("Unknown vertical anchor '%s'", anchor)); - } - - @Override - public HeightRangeModifierConfiguration createDefaultConfiguration(@NotNull HeightRangePlacement defaultModifier) { - return createDefaultConfiguration(defaultModifier, getPlacementModifier()); - } - - @Override - public HeightRangePlacement createModifier(@NotNull HeightRangeModifierConfiguration defaultConfiguration, @NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull HeightRangeModifierConfiguration configuration) { - int height; - if (configuration.getHeight() == null) { - height = defaultConfiguration.getHeight().getValue(worldInfo, random, position, limitedRegion); - } else { - height = configuration.getHeight().getValue(worldInfo, random, position, limitedRegion); - } - - return HeightRangePlacement.of(ConstantHeight.of(VerticalAnchor.absolute(height))); - } -} diff --git a/impl/v1_20_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_20_R1/placement/MinecraftPlacementModifierHook.java b/impl/v1_20_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_20_R1/placement/MinecraftPlacementModifierHook.java deleted file mode 100644 index 40416b36..00000000 --- a/impl/v1_20_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_20_R1/placement/MinecraftPlacementModifierHook.java +++ /dev/null @@ -1,106 +0,0 @@ -package de.derfrzocker.ore.control.impl.v1_20_R1.placement; - -import de.derfrzocker.feature.api.FeaturePlacementModifier; -import de.derfrzocker.feature.api.PlacementModifierConfiguration; -import de.derfrzocker.ore.control.api.Biome; -import de.derfrzocker.ore.control.api.OreControlManager; -import de.derfrzocker.ore.control.api.PlacementModifierHook; -import de.derfrzocker.ore.control.api.config.Config; -import de.derfrzocker.ore.control.api.config.ConfigManager; -import net.minecraft.core.BlockPos; -import net.minecraft.util.RandomSource; -import net.minecraft.world.level.ChunkPos; -import net.minecraft.world.level.WorldGenLevel; -import net.minecraft.world.level.chunk.ChunkGenerator; -import net.minecraft.world.level.levelgen.placement.PlacedFeature; -import net.minecraft.world.level.levelgen.placement.PlacementContext; -import net.minecraft.world.level.levelgen.placement.PlacementModifier; -import net.minecraft.world.level.levelgen.placement.PlacementModifierType; -import org.bukkit.NamespacedKey; -import org.bukkit.craftbukkit.v1_20_R1.generator.CraftLimitedRegion; -import org.bukkit.craftbukkit.v1_20_R1.util.RandomSourceWrapper; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.jetbrains.annotations.NotNull; - -import java.util.Map; -import java.util.Optional; -import java.util.Random; -import java.util.concurrent.ConcurrentHashMap; -import java.util.stream.Stream; - -public abstract class MinecraftPlacementModifierHook extends PlacementModifier implements PlacementModifierHook { - - private final Map cache = new ConcurrentHashMap<>(); - private final FeaturePlacementModifier placementModifier; - private final ConfigManager configManager; - private final M defaultModifier; - private final C defaultConfiguration; - private final Biome biome; - private final NamespacedKey namespacedKey; - - public MinecraftPlacementModifierHook(@NotNull OreControlManager oreControlManager, @NotNull String name, @NotNull M defaultModifier, @NotNull Biome biome, @NotNull NamespacedKey namespacedKey) { - this.configManager = oreControlManager.getConfigManager(); - this.placementModifier = (FeaturePlacementModifier) oreControlManager.getRegistries().getPlacementModifierRegistry().get(NamespacedKey.minecraft(name)).get(); - this.defaultModifier = defaultModifier; - this.defaultConfiguration = createDefaultConfiguration(defaultModifier); - this.biome = biome; - this.namespacedKey = namespacedKey; - - oreControlManager.addValueChangeListener(cache::clear); - } - - public abstract M createModifier(@NotNull C defaultConfiguration, @NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull C configuration); - - public abstract C createDefaultConfiguration(M defaultModifier); - - @Override - public FeaturePlacementModifier getPlacementModifier() { - return placementModifier; - } - - @Override - public Biome getBiome() { - return biome; - } - - @NotNull - @Override - public NamespacedKey getKey() { - return namespacedKey; - } - - @Override - public Stream getPositions(PlacementContext context, RandomSource random, BlockPos blockPos) { - PlacementModifierConfiguration configuration = cache.computeIfAbsent(context.getLevel().getMinecraftWorld().getWorld().getName(), this::loadConfig); - - M modifier = defaultModifier; - if (configuration != null) { - CraftLimitedRegion limitedRegion = new CraftLimitedRegion(context.getLevel(), new ChunkPos(blockPos)); - modifier = createModifier(defaultConfiguration, context.getLevel().getMinecraftWorld().getWorld(), new RandomSourceWrapper.RandomWrapper(random), new BlockVector(blockPos.getX(), blockPos.getY(), blockPos.getZ()), limitedRegion, (C) configuration); - limitedRegion.breakLink(); - } - - return getPositions(context.topFeature(), context.getLevel(), context.generator(), random, blockPos, modifier); - } - - private PlacementModifierConfiguration loadConfig(String name) { - Config config = configManager.getGenerationConfig(configManager.getOrCreateConfigInfo(name), biome, namespacedKey).orElse(null); - - if (config == null) { - return null; - } - - return config.getPlacements().get(placementModifier); - } - - @Override - public PlacementModifierType type() { - return null; - } - - private Stream getPositions(Optional top, WorldGenLevel world, ChunkGenerator generator, RandomSource random, BlockPos pos, M modifier) { - return modifier.getPositions(new PlacementContext(world, generator, top), random, pos); - } -} diff --git a/impl/v1_20_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_20_R1/placement/RarityModifierHook.java b/impl/v1_20_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_20_R1/placement/RarityModifierHook.java deleted file mode 100644 index 67292f13..00000000 --- a/impl/v1_20_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_20_R1/placement/RarityModifierHook.java +++ /dev/null @@ -1,53 +0,0 @@ -package de.derfrzocker.ore.control.impl.v1_20_R1.placement; - -import de.derfrzocker.feature.api.FeaturePlacementModifier; -import de.derfrzocker.feature.common.feature.placement.configuration.RarityModifierConfiguration; -import de.derfrzocker.feature.common.value.number.integer.FixedDoubleToIntegerValue; -import de.derfrzocker.ore.control.api.Biome; -import de.derfrzocker.ore.control.api.OreControlManager; -import de.derfrzocker.ore.control.impl.v1_20_R1.NMSReflectionNames; -import net.minecraft.world.level.levelgen.placement.RarityFilter; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.bukkit.util.NumberConversions; -import org.jetbrains.annotations.NotNull; - -import java.lang.reflect.Field; -import java.util.Random; - -public class RarityModifierHook extends MinecraftPlacementModifierHook { - - public RarityModifierHook(@NotNull OreControlManager oreControlManager, @NotNull Biome biome, @NotNull NamespacedKey namespacedKey, @NotNull RarityFilter defaultModifier) { - super(oreControlManager, "rarity_filter", defaultModifier, biome, namespacedKey); - } - - public static RarityModifierConfiguration createDefaultConfiguration(@NotNull RarityFilter defaultModifier, @NotNull FeaturePlacementModifier modifier) { - try { - Field chance = RarityFilter.class.getDeclaredField(NMSReflectionNames.RARITY_FILTER_CHANCE); - chance.setAccessible(true); - Object value = chance.get(defaultModifier); - return new RarityModifierConfiguration(modifier, new FixedDoubleToIntegerValue(NumberConversions.toInt(value))); - } catch (NoSuchFieldException | IllegalAccessException e) { - throw new RuntimeException(e); - } - } - - @Override - public RarityModifierConfiguration createDefaultConfiguration(@NotNull RarityFilter defaultModifier) { - return createDefaultConfiguration(defaultModifier, getPlacementModifier()); - } - - @Override - public RarityFilter createModifier(@NotNull RarityModifierConfiguration defaultConfiguration, @NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull RarityModifierConfiguration configuration) { - int chance; - if (configuration.getChance() == null) { - chance = defaultConfiguration.getChance().getValue(worldInfo, random, position, limitedRegion); - } else { - chance = configuration.getChance().getValue(worldInfo, random, position, limitedRegion); - } - - return RarityFilter.onAverageOnceEvery(chance); - } -} diff --git a/impl/v1_20_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_20_R1/placement/SurfaceRelativeThresholdModifierHook.java b/impl/v1_20_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_20_R1/placement/SurfaceRelativeThresholdModifierHook.java deleted file mode 100644 index 8ebf2731..00000000 --- a/impl/v1_20_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_20_R1/placement/SurfaceRelativeThresholdModifierHook.java +++ /dev/null @@ -1,77 +0,0 @@ -package de.derfrzocker.ore.control.impl.v1_20_R1.placement; - -import de.derfrzocker.feature.api.FeaturePlacementModifier; -import de.derfrzocker.feature.common.value.number.integer.FixedDoubleToIntegerValue; -import de.derfrzocker.feature.impl.v1_20_R1.placement.configuration.SurfaceRelativeThresholdModifierConfiguration; -import de.derfrzocker.ore.control.api.Biome; -import de.derfrzocker.ore.control.api.OreControlManager; -import de.derfrzocker.ore.control.impl.v1_20_R1.NMSReflectionNames; -import net.minecraft.world.level.levelgen.Heightmap; -import net.minecraft.world.level.levelgen.placement.SurfaceRelativeThresholdFilter; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.bukkit.util.NumberConversions; -import org.jetbrains.annotations.NotNull; - -import java.lang.reflect.Field; -import java.util.Random; - -public class SurfaceRelativeThresholdModifierHook extends MinecraftPlacementModifierHook { - - public SurfaceRelativeThresholdModifierHook(@NotNull OreControlManager oreControlManager, @NotNull Biome biome, @NotNull NamespacedKey namespacedKey, @NotNull SurfaceRelativeThresholdFilter defaultModifier) { - super(oreControlManager, "surface_relative_threshold_filter", defaultModifier, biome, namespacedKey); - } - - public static SurfaceRelativeThresholdModifierConfiguration createDefaultConfiguration(@NotNull SurfaceRelativeThresholdFilter defaultModifier, @NotNull FeaturePlacementModifier modifier) { - try { - Field heightmap = SurfaceRelativeThresholdFilter.class.getDeclaredField(NMSReflectionNames.SURFACE_RELATIVE_THRESHOLD_FILTER_HEIGHTMAP); - heightmap.setAccessible(true); - - Field minInclusive = SurfaceRelativeThresholdFilter.class.getDeclaredField(NMSReflectionNames.SURFACE_RELATIVE_THRESHOLD_FILTER_MIN_INCLUSIVE); - minInclusive.setAccessible(true); - - Field maxInclusive = SurfaceRelativeThresholdFilter.class.getDeclaredField(NMSReflectionNames.SURFACE_RELATIVE_THRESHOLD_FILTER_MAX_INCLUSIVE); - maxInclusive.setAccessible(true); - - Object heightmapValue = heightmap.get(defaultModifier); - Object minInclusiveValue = minInclusive.get(defaultModifier); - Object maxInclusiveValue = maxInclusive.get(defaultModifier); - return new SurfaceRelativeThresholdModifierConfiguration(modifier, null, new FixedDoubleToIntegerValue(NumberConversions.toInt(minInclusiveValue)), new FixedDoubleToIntegerValue(NumberConversions.toInt(maxInclusiveValue))); - } catch (NoSuchFieldException | IllegalAccessException e) { - throw new RuntimeException(e); - } - } - - @Override - public SurfaceRelativeThresholdFilter createModifier(@NotNull SurfaceRelativeThresholdModifierConfiguration defaultConfiguration, @NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull SurfaceRelativeThresholdModifierConfiguration configuration) { - Heightmap.Types heightmap; - if (configuration.getHeightmap() == null) { - heightmap = defaultConfiguration.getHeightmap().getValue(worldInfo, random, position, limitedRegion); - } else { - heightmap = configuration.getHeightmap().getValue(worldInfo, random, position, limitedRegion); - } - - int minInclusive; - if (configuration.getMinInclusive() == null) { - minInclusive = defaultConfiguration.getMinInclusive().getValue(worldInfo, random, position, limitedRegion); - } else { - minInclusive = configuration.getMinInclusive().getValue(worldInfo, random, position, limitedRegion); - } - - int maxInclusive; - if (configuration.getMaxInclusive() == null) { - maxInclusive = defaultConfiguration.getMaxInclusive().getValue(worldInfo, random, position, limitedRegion); - } else { - maxInclusive = configuration.getMaxInclusive().getValue(worldInfo, random, position, limitedRegion); - } - - return SurfaceRelativeThresholdFilter.of(heightmap, minInclusive, maxInclusive); - } - - @Override - public SurfaceRelativeThresholdModifierConfiguration createDefaultConfiguration(SurfaceRelativeThresholdFilter defaultModifier) { - return createDefaultConfiguration(defaultModifier, getPlacementModifier()); - } -} diff --git a/impl/v1_20_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_20_R1/placement/SurfaceWaterDepthModifierHook.java b/impl/v1_20_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_20_R1/placement/SurfaceWaterDepthModifierHook.java deleted file mode 100644 index f90931f1..00000000 --- a/impl/v1_20_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_20_R1/placement/SurfaceWaterDepthModifierHook.java +++ /dev/null @@ -1,53 +0,0 @@ -package de.derfrzocker.ore.control.impl.v1_20_R1.placement; - -import de.derfrzocker.feature.api.FeaturePlacementModifier; -import de.derfrzocker.feature.common.feature.placement.configuration.SurfaceWaterDepthModifierConfiguration; -import de.derfrzocker.feature.common.value.number.integer.FixedDoubleToIntegerValue; -import de.derfrzocker.ore.control.api.Biome; -import de.derfrzocker.ore.control.api.OreControlManager; -import de.derfrzocker.ore.control.impl.v1_20_R1.NMSReflectionNames; -import net.minecraft.world.level.levelgen.placement.SurfaceWaterDepthFilter; -import org.bukkit.NamespacedKey; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.util.BlockVector; -import org.bukkit.util.NumberConversions; -import org.jetbrains.annotations.NotNull; - -import java.lang.reflect.Field; -import java.util.Random; - -public class SurfaceWaterDepthModifierHook extends MinecraftPlacementModifierHook { - - public SurfaceWaterDepthModifierHook(@NotNull OreControlManager oreControlManager, @NotNull Biome biome, @NotNull NamespacedKey namespacedKey, @NotNull SurfaceWaterDepthFilter defaultModifier) { - super(oreControlManager, "surface_water_depth_filter", defaultModifier, biome, namespacedKey); - } - - public static SurfaceWaterDepthModifierConfiguration createDefaultConfiguration(@NotNull SurfaceWaterDepthFilter defaultModifier, @NotNull FeaturePlacementModifier modifier) { - try { - Field maxWaterDepth = SurfaceWaterDepthFilter.class.getDeclaredField(NMSReflectionNames.SURFACE_WATER_DEPTH_FILTER_MAX_WATER_DEPTH); - maxWaterDepth.setAccessible(true); - Object value = maxWaterDepth.get(defaultModifier); - return new SurfaceWaterDepthModifierConfiguration(modifier, new FixedDoubleToIntegerValue(NumberConversions.toInt(value))); - } catch (NoSuchFieldException | IllegalAccessException e) { - throw new RuntimeException(e); - } - } - - @Override - public SurfaceWaterDepthModifierConfiguration createDefaultConfiguration(@NotNull SurfaceWaterDepthFilter defaultModifier) { - return createDefaultConfiguration(defaultModifier, getPlacementModifier()); - } - - @Override - public SurfaceWaterDepthFilter createModifier(@NotNull SurfaceWaterDepthModifierConfiguration defaultConfiguration, @NotNull WorldInfo worldInfo, @NotNull Random random, @NotNull BlockVector position, @NotNull LimitedRegion limitedRegion, @NotNull SurfaceWaterDepthModifierConfiguration configuration) { - int maxWaterDepth; - if (configuration.getMaxWaterDepth() == null) { - maxWaterDepth = defaultConfiguration.getMaxWaterDepth().getValue(worldInfo, random, position, limitedRegion); - } else { - maxWaterDepth = configuration.getMaxWaterDepth().getValue(worldInfo, random, position, limitedRegion); - } - - return SurfaceWaterDepthFilter.forMaxDepth(maxWaterDepth); - } -} \ No newline at end of file diff --git a/impl/v1_20_R2/build.gradle.kts b/impl/v1_20_R2/build.gradle.kts new file mode 100644 index 00000000..6cfc1d37 --- /dev/null +++ b/impl/v1_20_R2/build.gradle.kts @@ -0,0 +1,10 @@ +import io.papermc.paperweight.userdev.PaperweightUserDependenciesExtension + +plugins { + `java-library` + id("buildlogic.adapter") +} + +dependencies { + the().paperDevBundle("1.20.2-R0.1-SNAPSHOT") +} diff --git a/impl/v1_20_R2/pom.xml b/impl/v1_20_R2/pom.xml deleted file mode 100644 index 6ce4916d..00000000 --- a/impl/v1_20_R2/pom.xml +++ /dev/null @@ -1,80 +0,0 @@ - - - 4.0.0 - - - ore-control-impl - de.derfrzocker - ${revision} - - - ore-control-impl-v1_20_R2 - - - - de.derfrzocker - ore-control-api - ${project.version} - provided - - - de.derfrzocker - ore-control-common - ${project.version} - provided - - - org.spigotmc - spigot - 1.20.2-R0.1-SNAPSHOT - remapped-mojang - provided - true - - - - - - - net.md-5 - specialsource-maven-plugin - 1.2.3 - - - package - - remap - - remap-obf - - org.spigotmc:minecraft-server:1.20.2-R0.1-SNAPSHOT:txt:maps-mojang - true - org.spigotmc:spigot:1.20.2-R0.1-SNAPSHOT:jar:remapped-mojang - - true - remapped-obf - - - - package - - remap - - remap-spigot - - - ${project.build.directory}/${project.artifactId}-${project.version}-remapped-obf.jar - - org.spigotmc:minecraft-server:1.20.2-R0.1-SNAPSHOT:csrg:maps-spigot - org.spigotmc:spigot:1.20.2-R0.1-SNAPSHOT:jar:remapped-obf - - - - - - - - - \ No newline at end of file diff --git a/impl/v1_20_R3/build.gradle.kts b/impl/v1_20_R3/build.gradle.kts new file mode 100644 index 00000000..f9e0f776 --- /dev/null +++ b/impl/v1_20_R3/build.gradle.kts @@ -0,0 +1,10 @@ +import io.papermc.paperweight.userdev.PaperweightUserDependenciesExtension + +plugins { + `java-library` + id("buildlogic.adapter") +} + +dependencies { + the().paperDevBundle("1.20.4-R0.1-SNAPSHOT") +} diff --git a/impl/v1_20_R3/pom.xml b/impl/v1_20_R3/pom.xml deleted file mode 100644 index b81ec80b..00000000 --- a/impl/v1_20_R3/pom.xml +++ /dev/null @@ -1,80 +0,0 @@ - - - 4.0.0 - - - ore-control-impl - de.derfrzocker - ${revision} - - - ore-control-impl-v1_20_R3 - - - - de.derfrzocker - ore-control-api - ${project.version} - provided - - - de.derfrzocker - ore-control-common - ${project.version} - provided - - - org.spigotmc - spigot - 1.20.4-R0.1-SNAPSHOT - remapped-mojang - provided - true - - - - - - - net.md-5 - specialsource-maven-plugin - 1.2.3 - - - package - - remap - - remap-obf - - org.spigotmc:minecraft-server:1.20.4-R0.1-SNAPSHOT:txt:maps-mojang - true - org.spigotmc:spigot:1.20.4-R0.1-SNAPSHOT:jar:remapped-mojang - - true - remapped-obf - - - - package - - remap - - remap-spigot - - - ${project.build.directory}/${project.artifactId}-${project.version}-remapped-obf.jar - - org.spigotmc:minecraft-server:1.20.4-R0.1-SNAPSHOT:csrg:maps-spigot - org.spigotmc:spigot:1.20.4-R0.1-SNAPSHOT:jar:remapped-obf - - - - - - - - - \ No newline at end of file diff --git a/impl/v1_20_R4/build.gradle.kts b/impl/v1_20_R4/build.gradle.kts new file mode 100644 index 00000000..41a38367 --- /dev/null +++ b/impl/v1_20_R4/build.gradle.kts @@ -0,0 +1,10 @@ +import io.papermc.paperweight.userdev.PaperweightUserDependenciesExtension + +plugins { + `java-library` + id("buildlogic.adapter") +} + +dependencies { + the().paperDevBundle("1.20.6-R0.1-SNAPSHOT") +} diff --git a/impl/v1_20_R4/pom.xml b/impl/v1_20_R4/pom.xml deleted file mode 100644 index b54e257a..00000000 --- a/impl/v1_20_R4/pom.xml +++ /dev/null @@ -1,80 +0,0 @@ - - - 4.0.0 - - - ore-control-impl - de.derfrzocker - ${revision} - - - ore-control-impl-v1_20_R4 - - - - de.derfrzocker - ore-control-api - ${project.version} - provided - - - de.derfrzocker - ore-control-common - ${project.version} - provided - - - org.spigotmc - spigot - 1.20.6-R0.1-SNAPSHOT - remapped-mojang - provided - true - - - - - - - net.md-5 - specialsource-maven-plugin - 2.0.3 - - - package - - remap - - remap-obf - - org.spigotmc:minecraft-server:1.20.6-R0.1-SNAPSHOT:txt:maps-mojang - true - org.spigotmc:spigot:1.20.6-R0.1-SNAPSHOT:jar:remapped-mojang - - true - remapped-obf - - - - package - - remap - - remap-spigot - - - ${project.build.directory}/${project.artifactId}-${project.version}-remapped-obf.jar - - org.spigotmc:minecraft-server:1.20.6-R0.1-SNAPSHOT:csrg:maps-spigot - org.spigotmc:spigot:1.20.6-R0.1-SNAPSHOT:jar:remapped-obf - - - - - - - - - \ No newline at end of file diff --git a/impl/v1_20_R4/src/main/java/de/derfrzocker/feature/impl/v1_20_R4/extra/OreVeinHandler.java b/impl/v1_20_R4/src/main/java/de/derfrzocker/feature/impl/v1_20_R4/extra/OreVeinHandler.java index e03927c7..9c92e719 100644 --- a/impl/v1_20_R4/src/main/java/de/derfrzocker/feature/impl/v1_20_R4/extra/OreVeinHandler.java +++ b/impl/v1_20_R4/src/main/java/de/derfrzocker/feature/impl/v1_20_R4/extra/OreVeinHandler.java @@ -14,7 +14,7 @@ import net.minecraft.world.level.levelgen.NoiseBasedChunkGenerator; import net.minecraft.world.level.levelgen.NoiseGeneratorSettings; import org.bukkit.World; -import org.bukkit.craftbukkit.v1_20_R4.CraftWorld; +import org.bukkit.craftbukkit.CraftWorld; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; diff --git a/impl/v1_20_R4/src/main/java/de/derfrzocker/feature/impl/v1_20_R4/feature/generator/MinecraftFeatureGenerator.java b/impl/v1_20_R4/src/main/java/de/derfrzocker/feature/impl/v1_20_R4/feature/generator/MinecraftFeatureGenerator.java index 8f8f0495..b131ca45 100644 --- a/impl/v1_20_R4/src/main/java/de/derfrzocker/feature/impl/v1_20_R4/feature/generator/MinecraftFeatureGenerator.java +++ b/impl/v1_20_R4/src/main/java/de/derfrzocker/feature/impl/v1_20_R4/feature/generator/MinecraftFeatureGenerator.java @@ -13,8 +13,8 @@ import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext; import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration; import org.bukkit.NamespacedKey; -import org.bukkit.craftbukkit.v1_20_R4.generator.CraftLimitedRegion; -import org.bukkit.craftbukkit.v1_20_R4.util.RandomSourceWrapper; +import org.bukkit.craftbukkit.generator.CraftLimitedRegion; +import org.bukkit.craftbukkit.util.RandomSourceWrapper; import org.bukkit.generator.LimitedRegion; import org.bukkit.generator.WorldInfo; import org.bukkit.util.BlockVector; diff --git a/impl/v1_20_R4/src/main/java/de/derfrzocker/feature/impl/v1_20_R4/feature/generator/OreConfigurationGenerator.java b/impl/v1_20_R4/src/main/java/de/derfrzocker/feature/impl/v1_20_R4/feature/generator/OreConfigurationGenerator.java index 98dfddf1..c35bee2f 100644 --- a/impl/v1_20_R4/src/main/java/de/derfrzocker/feature/impl/v1_20_R4/feature/generator/OreConfigurationGenerator.java +++ b/impl/v1_20_R4/src/main/java/de/derfrzocker/feature/impl/v1_20_R4/feature/generator/OreConfigurationGenerator.java @@ -34,9 +34,9 @@ import net.minecraft.world.level.levelgen.structure.templatesystem.RuleTest; import net.minecraft.world.level.levelgen.structure.templatesystem.TagMatchTest; import org.bukkit.NamespacedKey; -import org.bukkit.craftbukkit.v1_20_R4.block.data.CraftBlockData; -import org.bukkit.craftbukkit.v1_20_R4.util.CraftMagicNumbers; -import org.bukkit.craftbukkit.v1_20_R4.util.CraftNamespacedKey; +import org.bukkit.craftbukkit.block.data.CraftBlockData; +import org.bukkit.craftbukkit.util.CraftMagicNumbers; +import org.bukkit.craftbukkit.util.CraftNamespacedKey; import org.bukkit.generator.LimitedRegion; import org.bukkit.generator.WorldInfo; import org.bukkit.util.BlockVector; diff --git a/impl/v1_20_R4/src/main/java/de/derfrzocker/feature/impl/v1_20_R4/placement/MinecraftPlacementModifier.java b/impl/v1_20_R4/src/main/java/de/derfrzocker/feature/impl/v1_20_R4/placement/MinecraftPlacementModifier.java index 5ca56854..3c05740d 100644 --- a/impl/v1_20_R4/src/main/java/de/derfrzocker/feature/impl/v1_20_R4/placement/MinecraftPlacementModifier.java +++ b/impl/v1_20_R4/src/main/java/de/derfrzocker/feature/impl/v1_20_R4/placement/MinecraftPlacementModifier.java @@ -12,8 +12,8 @@ import net.minecraft.world.level.levelgen.placement.PlacementContext; import net.minecraft.world.level.levelgen.placement.PlacementModifier; import org.bukkit.NamespacedKey; -import org.bukkit.craftbukkit.v1_20_R4.generator.CraftLimitedRegion; -import org.bukkit.craftbukkit.v1_20_R4.util.RandomSourceWrapper; +import org.bukkit.craftbukkit.generator.CraftLimitedRegion; +import org.bukkit.craftbukkit.util.RandomSourceWrapper; import org.bukkit.generator.LimitedRegion; import org.bukkit.generator.WorldInfo; import org.bukkit.util.BlockVector; diff --git a/impl/v1_20_R4/src/main/java/de/derfrzocker/feature/impl/v1_20_R4/value/offset/NMSAboveBottomOffsetIntegerValue.java b/impl/v1_20_R4/src/main/java/de/derfrzocker/feature/impl/v1_20_R4/value/offset/NMSAboveBottomOffsetIntegerValue.java index 0febd408..325e5af5 100644 --- a/impl/v1_20_R4/src/main/java/de/derfrzocker/feature/impl/v1_20_R4/value/offset/NMSAboveBottomOffsetIntegerValue.java +++ b/impl/v1_20_R4/src/main/java/de/derfrzocker/feature/impl/v1_20_R4/value/offset/NMSAboveBottomOffsetIntegerValue.java @@ -4,7 +4,7 @@ import de.derfrzocker.feature.common.value.offset.AboveBottomOffsetIntegerValue; import java.util.Random; import net.minecraft.world.level.WorldGenLevel; -import org.bukkit.craftbukkit.v1_20_R4.generator.CraftLimitedRegion; +import org.bukkit.craftbukkit.generator.CraftLimitedRegion; import org.bukkit.generator.LimitedRegion; import org.bukkit.generator.WorldInfo; import org.bukkit.util.BlockVector; diff --git a/impl/v1_20_R4/src/main/java/de/derfrzocker/feature/impl/v1_20_R4/value/offset/NMSBelowTopOffsetIntegerValue.java b/impl/v1_20_R4/src/main/java/de/derfrzocker/feature/impl/v1_20_R4/value/offset/NMSBelowTopOffsetIntegerValue.java index 00544b10..2ca1250c 100644 --- a/impl/v1_20_R4/src/main/java/de/derfrzocker/feature/impl/v1_20_R4/value/offset/NMSBelowTopOffsetIntegerValue.java +++ b/impl/v1_20_R4/src/main/java/de/derfrzocker/feature/impl/v1_20_R4/value/offset/NMSBelowTopOffsetIntegerValue.java @@ -5,7 +5,7 @@ import java.util.Random; import net.minecraft.world.level.WorldGenLevel; import net.minecraft.world.level.chunk.ChunkGenerator; -import org.bukkit.craftbukkit.v1_20_R4.generator.CraftLimitedRegion; +import org.bukkit.craftbukkit.generator.CraftLimitedRegion; import org.bukkit.generator.LimitedRegion; import org.bukkit.generator.WorldInfo; import org.bukkit.util.BlockVector; diff --git a/impl/v1_20_R4/src/main/java/de/derfrzocker/ore/control/impl/v1_20_R4/NMSReplacer_v1_20_R4.java b/impl/v1_20_R4/src/main/java/de/derfrzocker/ore/control/impl/v1_20_R4/NMSReplacer_v1_20_R4.java index a5fb5922..ddc4e943 100644 --- a/impl/v1_20_R4/src/main/java/de/derfrzocker/ore/control/impl/v1_20_R4/NMSReplacer_v1_20_R4.java +++ b/impl/v1_20_R4/src/main/java/de/derfrzocker/ore/control/impl/v1_20_R4/NMSReplacer_v1_20_R4.java @@ -84,9 +84,9 @@ import org.bukkit.Bukkit; import org.bukkit.NamespacedKey; import org.bukkit.World; -import org.bukkit.craftbukkit.v1_20_R4.CraftServer; -import org.bukkit.craftbukkit.v1_20_R4.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R4.util.CraftNamespacedKey; +import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.CraftWorld; +import org.bukkit.craftbukkit.util.CraftNamespacedKey; import org.bukkit.plugin.Plugin; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/impl/v1_20_R4/src/main/java/de/derfrzocker/ore/control/impl/v1_20_R4/feature/generator/MinecraftFeatureGeneratorHook.java b/impl/v1_20_R4/src/main/java/de/derfrzocker/ore/control/impl/v1_20_R4/feature/generator/MinecraftFeatureGeneratorHook.java index 731ab65d..2bbb8866 100644 --- a/impl/v1_20_R4/src/main/java/de/derfrzocker/ore/control/impl/v1_20_R4/feature/generator/MinecraftFeatureGeneratorHook.java +++ b/impl/v1_20_R4/src/main/java/de/derfrzocker/ore/control/impl/v1_20_R4/feature/generator/MinecraftFeatureGeneratorHook.java @@ -22,8 +22,8 @@ import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext; import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration; import org.bukkit.NamespacedKey; -import org.bukkit.craftbukkit.v1_20_R4.generator.CraftLimitedRegion; -import org.bukkit.craftbukkit.v1_20_R4.util.RandomSourceWrapper; +import org.bukkit.craftbukkit.generator.CraftLimitedRegion; +import org.bukkit.craftbukkit.util.RandomSourceWrapper; import org.bukkit.generator.LimitedRegion; import org.bukkit.generator.WorldInfo; import org.bukkit.util.BlockVector; diff --git a/impl/v1_20_R4/src/main/java/de/derfrzocker/ore/control/impl/v1_20_R4/feature/generator/OreConfigurationGeneratorHook.java b/impl/v1_20_R4/src/main/java/de/derfrzocker/ore/control/impl/v1_20_R4/feature/generator/OreConfigurationGeneratorHook.java index 2944df55..8563a7a7 100644 --- a/impl/v1_20_R4/src/main/java/de/derfrzocker/ore/control/impl/v1_20_R4/feature/generator/OreConfigurationGeneratorHook.java +++ b/impl/v1_20_R4/src/main/java/de/derfrzocker/ore/control/impl/v1_20_R4/feature/generator/OreConfigurationGeneratorHook.java @@ -33,9 +33,9 @@ import net.minecraft.world.level.levelgen.structure.templatesystem.RuleTest; import net.minecraft.world.level.levelgen.structure.templatesystem.TagMatchTest; import org.bukkit.NamespacedKey; -import org.bukkit.craftbukkit.v1_20_R4.block.data.CraftBlockData; -import org.bukkit.craftbukkit.v1_20_R4.util.CraftMagicNumbers; -import org.bukkit.craftbukkit.v1_20_R4.util.CraftNamespacedKey; +import org.bukkit.craftbukkit.block.data.CraftBlockData; +import org.bukkit.craftbukkit.util.CraftMagicNumbers; +import org.bukkit.craftbukkit.util.CraftNamespacedKey; import org.bukkit.generator.LimitedRegion; import org.bukkit.generator.WorldInfo; import org.bukkit.util.BlockVector; diff --git a/impl/v1_20_R4/src/main/java/de/derfrzocker/ore/control/impl/v1_20_R4/placement/ActivationModifierHook.java b/impl/v1_20_R4/src/main/java/de/derfrzocker/ore/control/impl/v1_20_R4/placement/ActivationModifierHook.java index f5eb568b..350f22da 100644 --- a/impl/v1_20_R4/src/main/java/de/derfrzocker/ore/control/impl/v1_20_R4/placement/ActivationModifierHook.java +++ b/impl/v1_20_R4/src/main/java/de/derfrzocker/ore/control/impl/v1_20_R4/placement/ActivationModifierHook.java @@ -19,8 +19,8 @@ import net.minecraft.world.level.levelgen.placement.PlacementModifier; import net.minecraft.world.level.levelgen.placement.PlacementModifierType; import org.bukkit.NamespacedKey; -import org.bukkit.craftbukkit.v1_20_R4.generator.CraftLimitedRegion; -import org.bukkit.craftbukkit.v1_20_R4.util.RandomSourceWrapper; +import org.bukkit.craftbukkit.generator.CraftLimitedRegion; +import org.bukkit.craftbukkit.util.RandomSourceWrapper; import org.bukkit.util.BlockVector; import org.jetbrains.annotations.NotNull; diff --git a/impl/v1_20_R4/src/main/java/de/derfrzocker/ore/control/impl/v1_20_R4/placement/MinecraftPlacementModifierHook.java b/impl/v1_20_R4/src/main/java/de/derfrzocker/ore/control/impl/v1_20_R4/placement/MinecraftPlacementModifierHook.java index bc74ca19..ff03d4c2 100644 --- a/impl/v1_20_R4/src/main/java/de/derfrzocker/ore/control/impl/v1_20_R4/placement/MinecraftPlacementModifierHook.java +++ b/impl/v1_20_R4/src/main/java/de/derfrzocker/ore/control/impl/v1_20_R4/placement/MinecraftPlacementModifierHook.java @@ -22,8 +22,8 @@ import net.minecraft.world.level.levelgen.placement.PlacementModifier; import net.minecraft.world.level.levelgen.placement.PlacementModifierType; import org.bukkit.NamespacedKey; -import org.bukkit.craftbukkit.v1_20_R4.generator.CraftLimitedRegion; -import org.bukkit.craftbukkit.v1_20_R4.util.RandomSourceWrapper; +import org.bukkit.craftbukkit.generator.CraftLimitedRegion; +import org.bukkit.craftbukkit.util.RandomSourceWrapper; import org.bukkit.generator.LimitedRegion; import org.bukkit.generator.WorldInfo; import org.bukkit.util.BlockVector; diff --git a/impl/v1_21_R1/build.gradle.kts b/impl/v1_21_R1/build.gradle.kts new file mode 100644 index 00000000..fc0b8b51 --- /dev/null +++ b/impl/v1_21_R1/build.gradle.kts @@ -0,0 +1,10 @@ +import io.papermc.paperweight.userdev.PaperweightUserDependenciesExtension + +plugins { + `java-library` + id("buildlogic.adapter") +} + +dependencies { + the().paperDevBundle("1.21.1-R0.1-SNAPSHOT") +} diff --git a/impl/v1_21_R1/pom.xml b/impl/v1_21_R1/pom.xml deleted file mode 100644 index 1aef6c5e..00000000 --- a/impl/v1_21_R1/pom.xml +++ /dev/null @@ -1,80 +0,0 @@ - - - 4.0.0 - - - ore-control-impl - de.derfrzocker - ${revision} - - - ore-control-impl-v1_21_R1 - - - - de.derfrzocker - ore-control-api - ${project.version} - provided - - - de.derfrzocker - ore-control-common - ${project.version} - provided - - - org.spigotmc - spigot - 1.21-R0.1-SNAPSHOT - remapped-mojang - provided - true - - - - - - - net.md-5 - specialsource-maven-plugin - 2.0.3 - - - package - - remap - - remap-obf - - org.spigotmc:minecraft-server:1.21-R0.1-SNAPSHOT:txt:maps-mojang - true - org.spigotmc:spigot:1.21-R0.1-SNAPSHOT:jar:remapped-mojang - - true - remapped-obf - - - - package - - remap - - remap-spigot - - - ${project.build.directory}/${project.artifactId}-${project.version}-remapped-obf.jar - - org.spigotmc:minecraft-server:1.21-R0.1-SNAPSHOT:csrg:maps-spigot - org.spigotmc:spigot:1.21-R0.1-SNAPSHOT:jar:remapped-obf - - - - - - - - - \ No newline at end of file diff --git a/impl/v1_21_R1/src/main/java/de/derfrzocker/feature/impl/v1_21_R1/extra/OreVeinHandler.java b/impl/v1_21_R1/src/main/java/de/derfrzocker/feature/impl/v1_21_R1/extra/OreVeinHandler.java index 8235de54..6e5b8939 100644 --- a/impl/v1_21_R1/src/main/java/de/derfrzocker/feature/impl/v1_21_R1/extra/OreVeinHandler.java +++ b/impl/v1_21_R1/src/main/java/de/derfrzocker/feature/impl/v1_21_R1/extra/OreVeinHandler.java @@ -15,7 +15,7 @@ import net.minecraft.world.level.levelgen.NoiseBasedChunkGenerator; import net.minecraft.world.level.levelgen.NoiseGeneratorSettings; import org.bukkit.World; -import org.bukkit.craftbukkit.v1_21_R1.CraftWorld; +import org.bukkit.craftbukkit.CraftWorld; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; diff --git a/impl/v1_21_R1/src/main/java/de/derfrzocker/feature/impl/v1_21_R1/feature/generator/MinecraftFeatureGenerator.java b/impl/v1_21_R1/src/main/java/de/derfrzocker/feature/impl/v1_21_R1/feature/generator/MinecraftFeatureGenerator.java index ab93315b..42dd96f6 100644 --- a/impl/v1_21_R1/src/main/java/de/derfrzocker/feature/impl/v1_21_R1/feature/generator/MinecraftFeatureGenerator.java +++ b/impl/v1_21_R1/src/main/java/de/derfrzocker/feature/impl/v1_21_R1/feature/generator/MinecraftFeatureGenerator.java @@ -12,8 +12,8 @@ import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext; import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration; import org.bukkit.NamespacedKey; -import org.bukkit.craftbukkit.v1_21_R1.generator.CraftLimitedRegion; -import org.bukkit.craftbukkit.v1_21_R1.util.RandomSourceWrapper; +import org.bukkit.craftbukkit.generator.CraftLimitedRegion; +import org.bukkit.craftbukkit.util.RandomSourceWrapper; import org.bukkit.generator.LimitedRegion; import org.bukkit.generator.WorldInfo; import org.bukkit.util.BlockVector; diff --git a/impl/v1_21_R1/src/main/java/de/derfrzocker/feature/impl/v1_21_R1/feature/generator/OreConfigurationGenerator.java b/impl/v1_21_R1/src/main/java/de/derfrzocker/feature/impl/v1_21_R1/feature/generator/OreConfigurationGenerator.java index cb46fe58..85506150 100644 --- a/impl/v1_21_R1/src/main/java/de/derfrzocker/feature/impl/v1_21_R1/feature/generator/OreConfigurationGenerator.java +++ b/impl/v1_21_R1/src/main/java/de/derfrzocker/feature/impl/v1_21_R1/feature/generator/OreConfigurationGenerator.java @@ -34,9 +34,9 @@ import net.minecraft.world.level.levelgen.structure.templatesystem.RuleTest; import net.minecraft.world.level.levelgen.structure.templatesystem.TagMatchTest; import org.bukkit.NamespacedKey; -import org.bukkit.craftbukkit.v1_21_R1.block.data.CraftBlockData; -import org.bukkit.craftbukkit.v1_21_R1.util.CraftMagicNumbers; -import org.bukkit.craftbukkit.v1_21_R1.util.CraftNamespacedKey; +import org.bukkit.craftbukkit.block.data.CraftBlockData; +import org.bukkit.craftbukkit.util.CraftMagicNumbers; +import org.bukkit.craftbukkit.util.CraftNamespacedKey; import org.bukkit.generator.LimitedRegion; import org.bukkit.generator.WorldInfo; import org.bukkit.util.BlockVector; diff --git a/impl/v1_21_R1/src/main/java/de/derfrzocker/feature/impl/v1_21_R1/placement/MinecraftPlacementModifier.java b/impl/v1_21_R1/src/main/java/de/derfrzocker/feature/impl/v1_21_R1/placement/MinecraftPlacementModifier.java index a99bca9f..a9e257fd 100644 --- a/impl/v1_21_R1/src/main/java/de/derfrzocker/feature/impl/v1_21_R1/placement/MinecraftPlacementModifier.java +++ b/impl/v1_21_R1/src/main/java/de/derfrzocker/feature/impl/v1_21_R1/placement/MinecraftPlacementModifier.java @@ -12,8 +12,8 @@ import net.minecraft.world.level.levelgen.placement.PlacementContext; import net.minecraft.world.level.levelgen.placement.PlacementModifier; import org.bukkit.NamespacedKey; -import org.bukkit.craftbukkit.v1_21_R1.generator.CraftLimitedRegion; -import org.bukkit.craftbukkit.v1_21_R1.util.RandomSourceWrapper; +import org.bukkit.craftbukkit.generator.CraftLimitedRegion; +import org.bukkit.craftbukkit.util.RandomSourceWrapper; import org.bukkit.generator.LimitedRegion; import org.bukkit.generator.WorldInfo; import org.bukkit.util.BlockVector; diff --git a/impl/v1_21_R1/src/main/java/de/derfrzocker/feature/impl/v1_21_R1/value/offset/NMSAboveBottomOffsetIntegerValue.java b/impl/v1_21_R1/src/main/java/de/derfrzocker/feature/impl/v1_21_R1/value/offset/NMSAboveBottomOffsetIntegerValue.java index 12e82341..b6cf9125 100644 --- a/impl/v1_21_R1/src/main/java/de/derfrzocker/feature/impl/v1_21_R1/value/offset/NMSAboveBottomOffsetIntegerValue.java +++ b/impl/v1_21_R1/src/main/java/de/derfrzocker/feature/impl/v1_21_R1/value/offset/NMSAboveBottomOffsetIntegerValue.java @@ -4,7 +4,7 @@ import de.derfrzocker.feature.common.value.offset.AboveBottomOffsetIntegerValue; import java.util.Random; import net.minecraft.world.level.WorldGenLevel; -import org.bukkit.craftbukkit.v1_21_R1.generator.CraftLimitedRegion; +import org.bukkit.craftbukkit.generator.CraftLimitedRegion; import org.bukkit.generator.LimitedRegion; import org.bukkit.generator.WorldInfo; import org.bukkit.util.BlockVector; diff --git a/impl/v1_21_R1/src/main/java/de/derfrzocker/feature/impl/v1_21_R1/value/offset/NMSBelowTopOffsetIntegerValue.java b/impl/v1_21_R1/src/main/java/de/derfrzocker/feature/impl/v1_21_R1/value/offset/NMSBelowTopOffsetIntegerValue.java index fc00a809..f2d6a07e 100644 --- a/impl/v1_21_R1/src/main/java/de/derfrzocker/feature/impl/v1_21_R1/value/offset/NMSBelowTopOffsetIntegerValue.java +++ b/impl/v1_21_R1/src/main/java/de/derfrzocker/feature/impl/v1_21_R1/value/offset/NMSBelowTopOffsetIntegerValue.java @@ -5,7 +5,7 @@ import java.util.Random; import net.minecraft.world.level.WorldGenLevel; import net.minecraft.world.level.chunk.ChunkGenerator; -import org.bukkit.craftbukkit.v1_21_R1.generator.CraftLimitedRegion; +import org.bukkit.craftbukkit.generator.CraftLimitedRegion; import org.bukkit.generator.LimitedRegion; import org.bukkit.generator.WorldInfo; import org.bukkit.util.BlockVector; diff --git a/impl/v1_21_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R1/NMSReplacer_v1_21_R1.java b/impl/v1_21_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R1/NMSReplacer_v1_21_R1.java index 1be03a8c..1bb51898 100644 --- a/impl/v1_21_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R1/NMSReplacer_v1_21_R1.java +++ b/impl/v1_21_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R1/NMSReplacer_v1_21_R1.java @@ -84,9 +84,9 @@ import org.bukkit.Bukkit; import org.bukkit.NamespacedKey; import org.bukkit.World; -import org.bukkit.craftbukkit.v1_21_R1.CraftServer; -import org.bukkit.craftbukkit.v1_21_R1.CraftWorld; -import org.bukkit.craftbukkit.v1_21_R1.util.CraftNamespacedKey; +import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.CraftWorld; +import org.bukkit.craftbukkit.util.CraftNamespacedKey; import org.bukkit.plugin.Plugin; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/impl/v1_21_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R1/feature/generator/MinecraftFeatureGeneratorHook.java b/impl/v1_21_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R1/feature/generator/MinecraftFeatureGeneratorHook.java index dd63f3a3..e8941559 100644 --- a/impl/v1_21_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R1/feature/generator/MinecraftFeatureGeneratorHook.java +++ b/impl/v1_21_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R1/feature/generator/MinecraftFeatureGeneratorHook.java @@ -22,8 +22,8 @@ import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext; import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration; import org.bukkit.NamespacedKey; -import org.bukkit.craftbukkit.v1_21_R1.generator.CraftLimitedRegion; -import org.bukkit.craftbukkit.v1_21_R1.util.RandomSourceWrapper; +import org.bukkit.craftbukkit.generator.CraftLimitedRegion; +import org.bukkit.craftbukkit.util.RandomSourceWrapper; import org.bukkit.generator.LimitedRegion; import org.bukkit.generator.WorldInfo; import org.bukkit.util.BlockVector; diff --git a/impl/v1_21_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R1/feature/generator/OreConfigurationGeneratorHook.java b/impl/v1_21_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R1/feature/generator/OreConfigurationGeneratorHook.java index 3c99a25b..d71fdc74 100644 --- a/impl/v1_21_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R1/feature/generator/OreConfigurationGeneratorHook.java +++ b/impl/v1_21_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R1/feature/generator/OreConfigurationGeneratorHook.java @@ -33,9 +33,9 @@ import net.minecraft.world.level.levelgen.structure.templatesystem.RuleTest; import net.minecraft.world.level.levelgen.structure.templatesystem.TagMatchTest; import org.bukkit.NamespacedKey; -import org.bukkit.craftbukkit.v1_21_R1.block.data.CraftBlockData; -import org.bukkit.craftbukkit.v1_21_R1.util.CraftMagicNumbers; -import org.bukkit.craftbukkit.v1_21_R1.util.CraftNamespacedKey; +import org.bukkit.craftbukkit.block.data.CraftBlockData; +import org.bukkit.craftbukkit.util.CraftMagicNumbers; +import org.bukkit.craftbukkit.util.CraftNamespacedKey; import org.bukkit.generator.LimitedRegion; import org.bukkit.generator.WorldInfo; import org.bukkit.util.BlockVector; diff --git a/impl/v1_21_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R1/placement/ActivationModifierHook.java b/impl/v1_21_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R1/placement/ActivationModifierHook.java index 07f32756..03d18c7e 100644 --- a/impl/v1_21_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R1/placement/ActivationModifierHook.java +++ b/impl/v1_21_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R1/placement/ActivationModifierHook.java @@ -19,8 +19,8 @@ import net.minecraft.world.level.levelgen.placement.PlacementModifier; import net.minecraft.world.level.levelgen.placement.PlacementModifierType; import org.bukkit.NamespacedKey; -import org.bukkit.craftbukkit.v1_21_R1.generator.CraftLimitedRegion; -import org.bukkit.craftbukkit.v1_21_R1.util.RandomSourceWrapper; +import org.bukkit.craftbukkit.generator.CraftLimitedRegion; +import org.bukkit.craftbukkit.util.RandomSourceWrapper; import org.bukkit.util.BlockVector; import org.jetbrains.annotations.NotNull; diff --git a/impl/v1_21_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R1/placement/MinecraftPlacementModifierHook.java b/impl/v1_21_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R1/placement/MinecraftPlacementModifierHook.java index 8c5af38f..f5ce79d3 100644 --- a/impl/v1_21_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R1/placement/MinecraftPlacementModifierHook.java +++ b/impl/v1_21_R1/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R1/placement/MinecraftPlacementModifierHook.java @@ -22,8 +22,8 @@ import net.minecraft.world.level.levelgen.placement.PlacementModifier; import net.minecraft.world.level.levelgen.placement.PlacementModifierType; import org.bukkit.NamespacedKey; -import org.bukkit.craftbukkit.v1_21_R1.generator.CraftLimitedRegion; -import org.bukkit.craftbukkit.v1_21_R1.util.RandomSourceWrapper; +import org.bukkit.craftbukkit.generator.CraftLimitedRegion; +import org.bukkit.craftbukkit.util.RandomSourceWrapper; import org.bukkit.generator.LimitedRegion; import org.bukkit.generator.WorldInfo; import org.bukkit.util.BlockVector; diff --git a/impl/v1_21_R2/build.gradle.kts b/impl/v1_21_R2/build.gradle.kts new file mode 100644 index 00000000..df283d9a --- /dev/null +++ b/impl/v1_21_R2/build.gradle.kts @@ -0,0 +1,10 @@ +import io.papermc.paperweight.userdev.PaperweightUserDependenciesExtension + +plugins { + `java-library` + id("buildlogic.adapter") +} + +dependencies { + the().paperDevBundle("1.21.3-R0.1-20241203.150031-85") +} diff --git a/impl/v1_21_R2/pom.xml b/impl/v1_21_R2/pom.xml deleted file mode 100644 index 21370e14..00000000 --- a/impl/v1_21_R2/pom.xml +++ /dev/null @@ -1,80 +0,0 @@ - - - 4.0.0 - - - ore-control-impl - de.derfrzocker - ${revision} - - - ore-control-impl-v1_21_R2 - - - - de.derfrzocker - ore-control-api - ${project.version} - provided - - - de.derfrzocker - ore-control-common - ${project.version} - provided - - - org.spigotmc - spigot - 1.21.3-R0.1-SNAPSHOT - remapped-mojang - provided - true - - - - - - - net.md-5 - specialsource-maven-plugin - 2.0.3 - - - package - - remap - - remap-obf - - org.spigotmc:minecraft-server:1.21.3-R0.1-SNAPSHOT:txt:maps-mojang - true - org.spigotmc:spigot:1.21.3-R0.1-SNAPSHOT:jar:remapped-mojang - - true - remapped-obf - - - - package - - remap - - remap-spigot - - - ${project.build.directory}/${project.artifactId}-${project.version}-remapped-obf.jar - - org.spigotmc:minecraft-server:1.21.3-R0.1-SNAPSHOT:csrg:maps-spigot - org.spigotmc:spigot:1.21.3-R0.1-SNAPSHOT:jar:remapped-obf - - - - - - - - - \ No newline at end of file diff --git a/impl/v1_21_R2/src/main/java/de/derfrzocker/feature/impl/v1_21_R2/extra/OreVeinHandler.java b/impl/v1_21_R2/src/main/java/de/derfrzocker/feature/impl/v1_21_R2/extra/OreVeinHandler.java index ea631429..ccc9450f 100644 --- a/impl/v1_21_R2/src/main/java/de/derfrzocker/feature/impl/v1_21_R2/extra/OreVeinHandler.java +++ b/impl/v1_21_R2/src/main/java/de/derfrzocker/feature/impl/v1_21_R2/extra/OreVeinHandler.java @@ -15,7 +15,7 @@ import net.minecraft.world.level.levelgen.NoiseBasedChunkGenerator; import net.minecraft.world.level.levelgen.NoiseGeneratorSettings; import org.bukkit.World; -import org.bukkit.craftbukkit.v1_21_R2.CraftWorld; +import org.bukkit.craftbukkit.CraftWorld; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; diff --git a/impl/v1_21_R2/src/main/java/de/derfrzocker/feature/impl/v1_21_R2/feature/generator/MinecraftFeatureGenerator.java b/impl/v1_21_R2/src/main/java/de/derfrzocker/feature/impl/v1_21_R2/feature/generator/MinecraftFeatureGenerator.java index a239fe67..325c17a3 100644 --- a/impl/v1_21_R2/src/main/java/de/derfrzocker/feature/impl/v1_21_R2/feature/generator/MinecraftFeatureGenerator.java +++ b/impl/v1_21_R2/src/main/java/de/derfrzocker/feature/impl/v1_21_R2/feature/generator/MinecraftFeatureGenerator.java @@ -12,8 +12,8 @@ import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext; import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration; import org.bukkit.NamespacedKey; -import org.bukkit.craftbukkit.v1_21_R2.generator.CraftLimitedRegion; -import org.bukkit.craftbukkit.v1_21_R2.util.RandomSourceWrapper; +import org.bukkit.craftbukkit.generator.CraftLimitedRegion; +import org.bukkit.craftbukkit.util.RandomSourceWrapper; import org.bukkit.generator.LimitedRegion; import org.bukkit.generator.WorldInfo; import org.bukkit.util.BlockVector; diff --git a/impl/v1_21_R2/src/main/java/de/derfrzocker/feature/impl/v1_21_R2/feature/generator/OreConfigurationGenerator.java b/impl/v1_21_R2/src/main/java/de/derfrzocker/feature/impl/v1_21_R2/feature/generator/OreConfigurationGenerator.java index 59bb9410..5d64ab3a 100644 --- a/impl/v1_21_R2/src/main/java/de/derfrzocker/feature/impl/v1_21_R2/feature/generator/OreConfigurationGenerator.java +++ b/impl/v1_21_R2/src/main/java/de/derfrzocker/feature/impl/v1_21_R2/feature/generator/OreConfigurationGenerator.java @@ -34,9 +34,9 @@ import net.minecraft.world.level.levelgen.structure.templatesystem.RuleTest; import net.minecraft.world.level.levelgen.structure.templatesystem.TagMatchTest; import org.bukkit.NamespacedKey; -import org.bukkit.craftbukkit.v1_21_R2.block.data.CraftBlockData; -import org.bukkit.craftbukkit.v1_21_R2.util.CraftMagicNumbers; -import org.bukkit.craftbukkit.v1_21_R2.util.CraftNamespacedKey; +import org.bukkit.craftbukkit.block.data.CraftBlockData; +import org.bukkit.craftbukkit.util.CraftMagicNumbers; +import org.bukkit.craftbukkit.util.CraftNamespacedKey; import org.bukkit.generator.LimitedRegion; import org.bukkit.generator.WorldInfo; import org.bukkit.util.BlockVector; diff --git a/impl/v1_21_R2/src/main/java/de/derfrzocker/feature/impl/v1_21_R2/placement/MinecraftPlacementModifier.java b/impl/v1_21_R2/src/main/java/de/derfrzocker/feature/impl/v1_21_R2/placement/MinecraftPlacementModifier.java index 0bef1564..2f33eeee 100644 --- a/impl/v1_21_R2/src/main/java/de/derfrzocker/feature/impl/v1_21_R2/placement/MinecraftPlacementModifier.java +++ b/impl/v1_21_R2/src/main/java/de/derfrzocker/feature/impl/v1_21_R2/placement/MinecraftPlacementModifier.java @@ -12,8 +12,8 @@ import net.minecraft.world.level.levelgen.placement.PlacementContext; import net.minecraft.world.level.levelgen.placement.PlacementModifier; import org.bukkit.NamespacedKey; -import org.bukkit.craftbukkit.v1_21_R2.generator.CraftLimitedRegion; -import org.bukkit.craftbukkit.v1_21_R2.util.RandomSourceWrapper; +import org.bukkit.craftbukkit.generator.CraftLimitedRegion; +import org.bukkit.craftbukkit.util.RandomSourceWrapper; import org.bukkit.generator.LimitedRegion; import org.bukkit.generator.WorldInfo; import org.bukkit.util.BlockVector; diff --git a/impl/v1_21_R2/src/main/java/de/derfrzocker/feature/impl/v1_21_R2/value/offset/NMSAboveBottomOffsetIntegerValue.java b/impl/v1_21_R2/src/main/java/de/derfrzocker/feature/impl/v1_21_R2/value/offset/NMSAboveBottomOffsetIntegerValue.java index 8e091c5e..14cddba4 100644 --- a/impl/v1_21_R2/src/main/java/de/derfrzocker/feature/impl/v1_21_R2/value/offset/NMSAboveBottomOffsetIntegerValue.java +++ b/impl/v1_21_R2/src/main/java/de/derfrzocker/feature/impl/v1_21_R2/value/offset/NMSAboveBottomOffsetIntegerValue.java @@ -4,7 +4,7 @@ import de.derfrzocker.feature.common.value.offset.AboveBottomOffsetIntegerValue; import java.util.Random; import net.minecraft.world.level.WorldGenLevel; -import org.bukkit.craftbukkit.v1_21_R2.generator.CraftLimitedRegion; +import org.bukkit.craftbukkit.generator.CraftLimitedRegion; import org.bukkit.generator.LimitedRegion; import org.bukkit.generator.WorldInfo; import org.bukkit.util.BlockVector; diff --git a/impl/v1_21_R2/src/main/java/de/derfrzocker/feature/impl/v1_21_R2/value/offset/NMSBelowTopOffsetIntegerValue.java b/impl/v1_21_R2/src/main/java/de/derfrzocker/feature/impl/v1_21_R2/value/offset/NMSBelowTopOffsetIntegerValue.java index 7c14e11a..bde9fe28 100644 --- a/impl/v1_21_R2/src/main/java/de/derfrzocker/feature/impl/v1_21_R2/value/offset/NMSBelowTopOffsetIntegerValue.java +++ b/impl/v1_21_R2/src/main/java/de/derfrzocker/feature/impl/v1_21_R2/value/offset/NMSBelowTopOffsetIntegerValue.java @@ -5,7 +5,7 @@ import java.util.Random; import net.minecraft.world.level.WorldGenLevel; import net.minecraft.world.level.chunk.ChunkGenerator; -import org.bukkit.craftbukkit.v1_21_R2.generator.CraftLimitedRegion; +import org.bukkit.craftbukkit.generator.CraftLimitedRegion; import org.bukkit.generator.LimitedRegion; import org.bukkit.generator.WorldInfo; import org.bukkit.util.BlockVector; diff --git a/impl/v1_21_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R2/NMSReflectionNames.java b/impl/v1_21_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R2/NMSReflectionNames.java index 45504f47..7032c5e6 100644 --- a/impl/v1_21_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R2/NMSReflectionNames.java +++ b/impl/v1_21_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R2/NMSReflectionNames.java @@ -1,24 +1,26 @@ package de.derfrzocker.ore.control.impl.v1_21_R2; +import static de.derfrzocker.feature.common.util.Refraction.pickName; + public final class NMSReflectionNames { - public final static String BIOME_GENERATION_SETTINGS_FEATURES = "e"; - public final static String BIOME_GENERATION_SETTINGS_FEATURE_SET = "g"; - public final static String WEIGHTED_LIST_INT_DISTRIBUTION = "b"; - public final static String COUNT_PLACEMENT_COUNT = "c"; - public final static String HEIGHT_RANGE_PLACEMENT_HEIGHT = "c"; - public final static String RARITY_FILTER_CHANCE = "c"; - public final static String SURFACE_RELATIVE_THRESHOLD_FILTER_HEIGHTMAP = "c"; - public final static String SURFACE_RELATIVE_THRESHOLD_FILTER_MIN_INCLUSIVE = "d"; - public final static String SURFACE_RELATIVE_THRESHOLD_FILTER_MAX_INCLUSIVE = "e"; - public final static String SURFACE_WATER_DEPTH_FILTER_MAX_WATER_DEPTH = "c"; - public static final String CLAMPED_INT_SOURCE = "b"; - public static final String CLAMPED_INT_MIN_INCLUSIVE = "f"; - public static final String CLAMPED_INT_MAX_INCLUSIVE = "g"; - public static final String CLAMPED_NORMAL_INT_MEAN = "b"; - public static final String CLAMPED_NORMAL_INT_DEVIATION = "f"; - public static final String CHUNK_MAP_WORLD_GEN_CONTEXT = "R"; - public static final String NOISE_GENERATOR_SETTINGS = "e"; + public final static String BIOME_GENERATION_SETTINGS_FEATURES = pickName("features", "e"); + public final static String BIOME_GENERATION_SETTINGS_FEATURE_SET = pickName("featureSet", "g"); + public final static String WEIGHTED_LIST_INT_DISTRIBUTION = pickName("distribution", "b"); + public final static String COUNT_PLACEMENT_COUNT = pickName("count", "c"); + public final static String HEIGHT_RANGE_PLACEMENT_HEIGHT = pickName("height", "c"); + public final static String RARITY_FILTER_CHANCE = pickName("chance", "c"); + public final static String SURFACE_RELATIVE_THRESHOLD_FILTER_HEIGHTMAP = pickName("heightmap", "c"); + public final static String SURFACE_RELATIVE_THRESHOLD_FILTER_MIN_INCLUSIVE = pickName("minInclusive", "d"); + public final static String SURFACE_RELATIVE_THRESHOLD_FILTER_MAX_INCLUSIVE = pickName("maxInclusive", "e"); + public final static String SURFACE_WATER_DEPTH_FILTER_MAX_WATER_DEPTH = pickName("maxWaterDepth", "c"); + public static final String CLAMPED_INT_SOURCE = pickName("source","b"); + public static final String CLAMPED_INT_MIN_INCLUSIVE = pickName("minInclusive", "f"); + public static final String CLAMPED_INT_MAX_INCLUSIVE = pickName("maxInclusive", "g"); + public static final String CLAMPED_NORMAL_INT_MEAN = pickName("mean", "b"); + public static final String CLAMPED_NORMAL_INT_DEVIATION = pickName("deviation", "f"); + public static final String CHUNK_MAP_WORLD_GEN_CONTEXT = pickName("worldGenContext", "R"); + public static final String NOISE_GENERATOR_SETTINGS = pickName("settings", "e"); private NMSReflectionNames() { } diff --git a/impl/v1_21_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R2/NMSReplacer_v1_21_R2.java b/impl/v1_21_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R2/NMSReplacer_v1_21_R2.java index 60b2bbee..d40a05a5 100644 --- a/impl/v1_21_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R2/NMSReplacer_v1_21_R2.java +++ b/impl/v1_21_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R2/NMSReplacer_v1_21_R2.java @@ -84,9 +84,9 @@ import org.bukkit.Bukkit; import org.bukkit.NamespacedKey; import org.bukkit.World; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_21_R2.util.CraftNamespacedKey; +import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.CraftWorld; +import org.bukkit.craftbukkit.util.CraftNamespacedKey; import org.bukkit.plugin.Plugin; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -172,7 +172,9 @@ private void registerFeatures() { Optional> modifierOptional = registries.getPlacementModifierRegistry().get(ActivationModifier.KEY); modifierOptional.ifPresent(modifiers::add); - registries.getFeatureRegistry().register(new de.derfrzocker.feature.api.Feature(NamespacedKey.fromString(placedFeatureRegistry.getKey(placedFeature).toString()), featureGenerator.get(), modifiers)); + String keyString = placedFeatureRegistry.getKey(placedFeature).toString(); + NamespacedKey key = NamespacedKey.fromString(keyString); + registries.getFeatureRegistry().register(new de.derfrzocker.feature.api.Feature(key, featureGenerator.get(), modifiers)); } } diff --git a/impl/v1_21_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R2/feature/generator/MinecraftFeatureGeneratorHook.java b/impl/v1_21_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R2/feature/generator/MinecraftFeatureGeneratorHook.java index eecaec98..98cb0a2d 100644 --- a/impl/v1_21_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R2/feature/generator/MinecraftFeatureGeneratorHook.java +++ b/impl/v1_21_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R2/feature/generator/MinecraftFeatureGeneratorHook.java @@ -22,8 +22,8 @@ import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext; import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration; import org.bukkit.NamespacedKey; -import org.bukkit.craftbukkit.v1_21_R2.generator.CraftLimitedRegion; -import org.bukkit.craftbukkit.v1_21_R2.util.RandomSourceWrapper; +import org.bukkit.craftbukkit.generator.CraftLimitedRegion; +import org.bukkit.craftbukkit.util.RandomSourceWrapper; import org.bukkit.generator.LimitedRegion; import org.bukkit.generator.WorldInfo; import org.bukkit.util.BlockVector; diff --git a/impl/v1_21_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R2/feature/generator/OreConfigurationGeneratorHook.java b/impl/v1_21_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R2/feature/generator/OreConfigurationGeneratorHook.java index 8b3a43d9..f1517634 100644 --- a/impl/v1_21_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R2/feature/generator/OreConfigurationGeneratorHook.java +++ b/impl/v1_21_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R2/feature/generator/OreConfigurationGeneratorHook.java @@ -33,9 +33,9 @@ import net.minecraft.world.level.levelgen.structure.templatesystem.RuleTest; import net.minecraft.world.level.levelgen.structure.templatesystem.TagMatchTest; import org.bukkit.NamespacedKey; -import org.bukkit.craftbukkit.v1_21_R2.block.data.CraftBlockData; -import org.bukkit.craftbukkit.v1_21_R2.util.CraftMagicNumbers; -import org.bukkit.craftbukkit.v1_21_R2.util.CraftNamespacedKey; +import org.bukkit.craftbukkit.block.data.CraftBlockData; +import org.bukkit.craftbukkit.util.CraftMagicNumbers; +import org.bukkit.craftbukkit.util.CraftNamespacedKey; import org.bukkit.generator.LimitedRegion; import org.bukkit.generator.WorldInfo; import org.bukkit.util.BlockVector; diff --git a/impl/v1_21_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R2/placement/ActivationModifierHook.java b/impl/v1_21_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R2/placement/ActivationModifierHook.java index 2c2027a2..403916aa 100644 --- a/impl/v1_21_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R2/placement/ActivationModifierHook.java +++ b/impl/v1_21_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R2/placement/ActivationModifierHook.java @@ -19,8 +19,8 @@ import net.minecraft.world.level.levelgen.placement.PlacementModifier; import net.minecraft.world.level.levelgen.placement.PlacementModifierType; import org.bukkit.NamespacedKey; -import org.bukkit.craftbukkit.v1_21_R2.generator.CraftLimitedRegion; -import org.bukkit.craftbukkit.v1_21_R2.util.RandomSourceWrapper; +import org.bukkit.craftbukkit.generator.CraftLimitedRegion; +import org.bukkit.craftbukkit.util.RandomSourceWrapper; import org.bukkit.util.BlockVector; import org.jetbrains.annotations.NotNull; diff --git a/impl/v1_21_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R2/placement/MinecraftPlacementModifierHook.java b/impl/v1_21_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R2/placement/MinecraftPlacementModifierHook.java index 31129854..270a0367 100644 --- a/impl/v1_21_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R2/placement/MinecraftPlacementModifierHook.java +++ b/impl/v1_21_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R2/placement/MinecraftPlacementModifierHook.java @@ -22,8 +22,8 @@ import net.minecraft.world.level.levelgen.placement.PlacementModifier; import net.minecraft.world.level.levelgen.placement.PlacementModifierType; import org.bukkit.NamespacedKey; -import org.bukkit.craftbukkit.v1_21_R2.generator.CraftLimitedRegion; -import org.bukkit.craftbukkit.v1_21_R2.util.RandomSourceWrapper; +import org.bukkit.craftbukkit.generator.CraftLimitedRegion; +import org.bukkit.craftbukkit.util.RandomSourceWrapper; import org.bukkit.generator.LimitedRegion; import org.bukkit.generator.WorldInfo; import org.bukkit.util.BlockVector; diff --git a/impl/v1_21_R3/build.gradle.kts b/impl/v1_21_R3/build.gradle.kts new file mode 100644 index 00000000..7a8fd507 --- /dev/null +++ b/impl/v1_21_R3/build.gradle.kts @@ -0,0 +1,9 @@ +import io.papermc.paperweight.userdev.PaperweightUserDependenciesExtension + +plugins { + id("buildlogic.adapter") +} + +dependencies { + the().paperDevBundle("1.21.4-R0.1-SNAPSHOT") +} diff --git a/impl/v1_21_R3/pom.xml b/impl/v1_21_R3/pom.xml deleted file mode 100644 index cf132642..00000000 --- a/impl/v1_21_R3/pom.xml +++ /dev/null @@ -1,80 +0,0 @@ - - - 4.0.0 - - - ore-control-impl - de.derfrzocker - ${revision} - - - ore-control-impl-v1_21_R3 - - - - de.derfrzocker - ore-control-api - ${project.version} - provided - - - de.derfrzocker - ore-control-common - ${project.version} - provided - - - org.spigotmc - spigot - 1.21.4-R0.1-SNAPSHOT - remapped-mojang - provided - true - - - - - - - net.md-5 - specialsource-maven-plugin - 2.0.3 - - - package - - remap - - remap-obf - - org.spigotmc:minecraft-server:1.21.4-R0.1-SNAPSHOT:txt:maps-mojang - true - org.spigotmc:spigot:1.21.4-R0.1-SNAPSHOT:jar:remapped-mojang - - true - remapped-obf - - - - package - - remap - - remap-spigot - - - ${project.build.directory}/${project.artifactId}-${project.version}-remapped-obf.jar - - org.spigotmc:minecraft-server:1.21.4-R0.1-SNAPSHOT:csrg:maps-spigot - org.spigotmc:spigot:1.21.4-R0.1-SNAPSHOT:jar:remapped-obf - - - - - - - - - \ No newline at end of file diff --git a/impl/v1_21_R3/src/main/java/de/derfrzocker/feature/impl/v1_21_R3/extra/OreVeinHandler.java b/impl/v1_21_R3/src/main/java/de/derfrzocker/feature/impl/v1_21_R3/extra/OreVeinHandler.java index d3085ab2..a5f4312a 100644 --- a/impl/v1_21_R3/src/main/java/de/derfrzocker/feature/impl/v1_21_R3/extra/OreVeinHandler.java +++ b/impl/v1_21_R3/src/main/java/de/derfrzocker/feature/impl/v1_21_R3/extra/OreVeinHandler.java @@ -4,18 +4,20 @@ import de.derfrzocker.ore.control.api.OreControlManager; import de.derfrzocker.ore.control.api.config.ConfigInfo; import de.derfrzocker.ore.control.api.config.ConfigManager; -import de.derfrzocker.ore.control.impl.v1_21_R3.NMSReflectionNames; + import java.lang.reflect.Field; import java.util.HashSet; import java.util.Optional; import java.util.Set; + +import de.derfrzocker.ore.control.impl.v1_21_R3.NMSReflectionNames; import net.minecraft.core.Holder; import net.minecraft.server.level.ChunkMap; import net.minecraft.world.level.chunk.status.WorldGenContext; import net.minecraft.world.level.levelgen.NoiseBasedChunkGenerator; import net.minecraft.world.level.levelgen.NoiseGeneratorSettings; import org.bukkit.World; -import org.bukkit.craftbukkit.v1_21_R3.CraftWorld; +import org.bukkit.craftbukkit.CraftWorld; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; diff --git a/impl/v1_21_R3/src/main/java/de/derfrzocker/feature/impl/v1_21_R3/feature/generator/MinecraftFeatureGenerator.java b/impl/v1_21_R3/src/main/java/de/derfrzocker/feature/impl/v1_21_R3/feature/generator/MinecraftFeatureGenerator.java index e205d3a8..61137dfb 100644 --- a/impl/v1_21_R3/src/main/java/de/derfrzocker/feature/impl/v1_21_R3/feature/generator/MinecraftFeatureGenerator.java +++ b/impl/v1_21_R3/src/main/java/de/derfrzocker/feature/impl/v1_21_R3/feature/generator/MinecraftFeatureGenerator.java @@ -12,8 +12,8 @@ import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext; import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration; import org.bukkit.NamespacedKey; -import org.bukkit.craftbukkit.v1_21_R3.generator.CraftLimitedRegion; -import org.bukkit.craftbukkit.v1_21_R3.util.RandomSourceWrapper; +import org.bukkit.craftbukkit.generator.CraftLimitedRegion; +import org.bukkit.craftbukkit.util.RandomSourceWrapper; import org.bukkit.generator.LimitedRegion; import org.bukkit.generator.WorldInfo; import org.bukkit.util.BlockVector; diff --git a/impl/v1_21_R3/src/main/java/de/derfrzocker/feature/impl/v1_21_R3/feature/generator/OreConfigurationGenerator.java b/impl/v1_21_R3/src/main/java/de/derfrzocker/feature/impl/v1_21_R3/feature/generator/OreConfigurationGenerator.java index 7e76588c..7da1c1da 100644 --- a/impl/v1_21_R3/src/main/java/de/derfrzocker/feature/impl/v1_21_R3/feature/generator/OreConfigurationGenerator.java +++ b/impl/v1_21_R3/src/main/java/de/derfrzocker/feature/impl/v1_21_R3/feature/generator/OreConfigurationGenerator.java @@ -34,9 +34,9 @@ import net.minecraft.world.level.levelgen.structure.templatesystem.RuleTest; import net.minecraft.world.level.levelgen.structure.templatesystem.TagMatchTest; import org.bukkit.NamespacedKey; -import org.bukkit.craftbukkit.v1_21_R3.block.data.CraftBlockData; -import org.bukkit.craftbukkit.v1_21_R3.util.CraftMagicNumbers; -import org.bukkit.craftbukkit.v1_21_R3.util.CraftNamespacedKey; +import org.bukkit.craftbukkit.block.data.CraftBlockData; +import org.bukkit.craftbukkit.util.CraftMagicNumbers; +import org.bukkit.craftbukkit.util.CraftNamespacedKey; import org.bukkit.generator.LimitedRegion; import org.bukkit.generator.WorldInfo; import org.bukkit.util.BlockVector; diff --git a/impl/v1_21_R3/src/main/java/de/derfrzocker/feature/impl/v1_21_R3/placement/MinecraftPlacementModifier.java b/impl/v1_21_R3/src/main/java/de/derfrzocker/feature/impl/v1_21_R3/placement/MinecraftPlacementModifier.java index b288c112..7af78ed2 100644 --- a/impl/v1_21_R3/src/main/java/de/derfrzocker/feature/impl/v1_21_R3/placement/MinecraftPlacementModifier.java +++ b/impl/v1_21_R3/src/main/java/de/derfrzocker/feature/impl/v1_21_R3/placement/MinecraftPlacementModifier.java @@ -12,8 +12,8 @@ import net.minecraft.world.level.levelgen.placement.PlacementContext; import net.minecraft.world.level.levelgen.placement.PlacementModifier; import org.bukkit.NamespacedKey; -import org.bukkit.craftbukkit.v1_21_R3.generator.CraftLimitedRegion; -import org.bukkit.craftbukkit.v1_21_R3.util.RandomSourceWrapper; +import org.bukkit.craftbukkit.generator.CraftLimitedRegion; +import org.bukkit.craftbukkit.util.RandomSourceWrapper; import org.bukkit.generator.LimitedRegion; import org.bukkit.generator.WorldInfo; import org.bukkit.util.BlockVector; diff --git a/impl/v1_21_R3/src/main/java/de/derfrzocker/feature/impl/v1_21_R3/value/offset/NMSAboveBottomOffsetIntegerValue.java b/impl/v1_21_R3/src/main/java/de/derfrzocker/feature/impl/v1_21_R3/value/offset/NMSAboveBottomOffsetIntegerValue.java index a4a39e33..1f02bb92 100644 --- a/impl/v1_21_R3/src/main/java/de/derfrzocker/feature/impl/v1_21_R3/value/offset/NMSAboveBottomOffsetIntegerValue.java +++ b/impl/v1_21_R3/src/main/java/de/derfrzocker/feature/impl/v1_21_R3/value/offset/NMSAboveBottomOffsetIntegerValue.java @@ -4,7 +4,7 @@ import de.derfrzocker.feature.common.value.offset.AboveBottomOffsetIntegerValue; import java.util.Random; import net.minecraft.world.level.WorldGenLevel; -import org.bukkit.craftbukkit.v1_21_R3.generator.CraftLimitedRegion; +import org.bukkit.craftbukkit.generator.CraftLimitedRegion; import org.bukkit.generator.LimitedRegion; import org.bukkit.generator.WorldInfo; import org.bukkit.util.BlockVector; diff --git a/impl/v1_21_R3/src/main/java/de/derfrzocker/feature/impl/v1_21_R3/value/offset/NMSBelowTopOffsetIntegerValue.java b/impl/v1_21_R3/src/main/java/de/derfrzocker/feature/impl/v1_21_R3/value/offset/NMSBelowTopOffsetIntegerValue.java index b6513fc3..088841b7 100644 --- a/impl/v1_21_R3/src/main/java/de/derfrzocker/feature/impl/v1_21_R3/value/offset/NMSBelowTopOffsetIntegerValue.java +++ b/impl/v1_21_R3/src/main/java/de/derfrzocker/feature/impl/v1_21_R3/value/offset/NMSBelowTopOffsetIntegerValue.java @@ -5,7 +5,7 @@ import java.util.Random; import net.minecraft.world.level.WorldGenLevel; import net.minecraft.world.level.chunk.ChunkGenerator; -import org.bukkit.craftbukkit.v1_21_R3.generator.CraftLimitedRegion; +import org.bukkit.craftbukkit.generator.CraftLimitedRegion; import org.bukkit.generator.LimitedRegion; import org.bukkit.generator.WorldInfo; import org.bukkit.util.BlockVector; diff --git a/impl/v1_21_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R3/NMSReflectionNames.java b/impl/v1_21_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R3/NMSReflectionNames.java index d5134143..7b3e2ba6 100644 --- a/impl/v1_21_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R3/NMSReflectionNames.java +++ b/impl/v1_21_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R3/NMSReflectionNames.java @@ -1,24 +1,26 @@ package de.derfrzocker.ore.control.impl.v1_21_R3; +import static de.derfrzocker.feature.common.util.Refraction.pickName; + public final class NMSReflectionNames { - public final static String BIOME_GENERATION_SETTINGS_FEATURES = "e"; - public final static String BIOME_GENERATION_SETTINGS_FEATURE_SET = "g"; - public final static String WEIGHTED_LIST_INT_DISTRIBUTION = "b"; - public final static String COUNT_PLACEMENT_COUNT = "c"; - public final static String HEIGHT_RANGE_PLACEMENT_HEIGHT = "c"; - public final static String RARITY_FILTER_CHANCE = "c"; - public final static String SURFACE_RELATIVE_THRESHOLD_FILTER_HEIGHTMAP = "c"; - public final static String SURFACE_RELATIVE_THRESHOLD_FILTER_MIN_INCLUSIVE = "d"; - public final static String SURFACE_RELATIVE_THRESHOLD_FILTER_MAX_INCLUSIVE = "e"; - public final static String SURFACE_WATER_DEPTH_FILTER_MAX_WATER_DEPTH = "c"; - public static final String CLAMPED_INT_SOURCE = "b"; - public static final String CLAMPED_INT_MIN_INCLUSIVE = "f"; - public static final String CLAMPED_INT_MAX_INCLUSIVE = "g"; - public static final String CLAMPED_NORMAL_INT_MEAN = "b"; - public static final String CLAMPED_NORMAL_INT_DEVIATION = "f"; - public static final String CHUNK_MAP_WORLD_GEN_CONTEXT = "R"; - public static final String NOISE_GENERATOR_SETTINGS = "e"; + public final static String BIOME_GENERATION_SETTINGS_FEATURES = pickName("features", "e"); + public final static String BIOME_GENERATION_SETTINGS_FEATURE_SET = pickName("featureSet", "g"); + public final static String WEIGHTED_LIST_INT_DISTRIBUTION = pickName("distribution", "b"); + public final static String COUNT_PLACEMENT_COUNT = pickName("count", "c"); + public final static String HEIGHT_RANGE_PLACEMENT_HEIGHT = pickName("height", "c"); + public final static String RARITY_FILTER_CHANCE = pickName("chance", "c"); + public final static String SURFACE_RELATIVE_THRESHOLD_FILTER_HEIGHTMAP = pickName("heightmap", "c"); + public final static String SURFACE_RELATIVE_THRESHOLD_FILTER_MIN_INCLUSIVE = pickName("minInclusive", "d"); + public final static String SURFACE_RELATIVE_THRESHOLD_FILTER_MAX_INCLUSIVE = pickName("maxInclusive", "e"); + public final static String SURFACE_WATER_DEPTH_FILTER_MAX_WATER_DEPTH = pickName("maxWaterDepth", "c"); + public static final String CLAMPED_INT_SOURCE = pickName("source","b"); + public static final String CLAMPED_INT_MIN_INCLUSIVE = pickName("minInclusive", "f"); + public static final String CLAMPED_INT_MAX_INCLUSIVE = pickName("maxInclusive", "g"); + public static final String CLAMPED_NORMAL_INT_MEAN = pickName("mean", "b"); + public static final String CLAMPED_NORMAL_INT_DEVIATION = pickName("deviation", "f"); + public static final String CHUNK_MAP_WORLD_GEN_CONTEXT = pickName("worldGenContext", "R"); + public static final String NOISE_GENERATOR_SETTINGS = pickName("settings", "e"); private NMSReflectionNames() { } diff --git a/impl/v1_21_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R3/NMSReplacer_v1_21_R3.java b/impl/v1_21_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R3/NMSReplacer_v1_21_R3.java index d48ad362..91be1ef1 100644 --- a/impl/v1_21_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R3/NMSReplacer_v1_21_R3.java +++ b/impl/v1_21_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R3/NMSReplacer_v1_21_R3.java @@ -84,9 +84,9 @@ import org.bukkit.Bukkit; import org.bukkit.NamespacedKey; import org.bukkit.World; -import org.bukkit.craftbukkit.v1_21_R3.CraftServer; -import org.bukkit.craftbukkit.v1_21_R3.CraftWorld; -import org.bukkit.craftbukkit.v1_21_R3.util.CraftNamespacedKey; +import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.CraftWorld; +import org.bukkit.craftbukkit.util.CraftNamespacedKey; import org.bukkit.plugin.Plugin; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/impl/v1_21_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R3/feature/generator/MinecraftFeatureGeneratorHook.java b/impl/v1_21_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R3/feature/generator/MinecraftFeatureGeneratorHook.java index 97597e5c..2a96f661 100644 --- a/impl/v1_21_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R3/feature/generator/MinecraftFeatureGeneratorHook.java +++ b/impl/v1_21_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R3/feature/generator/MinecraftFeatureGeneratorHook.java @@ -22,8 +22,8 @@ import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext; import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration; import org.bukkit.NamespacedKey; -import org.bukkit.craftbukkit.v1_21_R3.generator.CraftLimitedRegion; -import org.bukkit.craftbukkit.v1_21_R3.util.RandomSourceWrapper; +import org.bukkit.craftbukkit.generator.CraftLimitedRegion; +import org.bukkit.craftbukkit.util.RandomSourceWrapper; import org.bukkit.generator.LimitedRegion; import org.bukkit.generator.WorldInfo; import org.bukkit.util.BlockVector; diff --git a/impl/v1_21_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R3/feature/generator/OreConfigurationGeneratorHook.java b/impl/v1_21_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R3/feature/generator/OreConfigurationGeneratorHook.java index 1af16c56..4f170f3c 100644 --- a/impl/v1_21_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R3/feature/generator/OreConfigurationGeneratorHook.java +++ b/impl/v1_21_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R3/feature/generator/OreConfigurationGeneratorHook.java @@ -33,9 +33,9 @@ import net.minecraft.world.level.levelgen.structure.templatesystem.RuleTest; import net.minecraft.world.level.levelgen.structure.templatesystem.TagMatchTest; import org.bukkit.NamespacedKey; -import org.bukkit.craftbukkit.v1_21_R3.block.data.CraftBlockData; -import org.bukkit.craftbukkit.v1_21_R3.util.CraftMagicNumbers; -import org.bukkit.craftbukkit.v1_21_R3.util.CraftNamespacedKey; +import org.bukkit.craftbukkit.block.data.CraftBlockData; +import org.bukkit.craftbukkit.util.CraftMagicNumbers; +import org.bukkit.craftbukkit.util.CraftNamespacedKey; import org.bukkit.generator.LimitedRegion; import org.bukkit.generator.WorldInfo; import org.bukkit.util.BlockVector; diff --git a/impl/v1_21_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R3/placement/ActivationModifierHook.java b/impl/v1_21_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R3/placement/ActivationModifierHook.java index c55b533e..7dd18130 100644 --- a/impl/v1_21_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R3/placement/ActivationModifierHook.java +++ b/impl/v1_21_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R3/placement/ActivationModifierHook.java @@ -19,8 +19,8 @@ import net.minecraft.world.level.levelgen.placement.PlacementModifier; import net.minecraft.world.level.levelgen.placement.PlacementModifierType; import org.bukkit.NamespacedKey; -import org.bukkit.craftbukkit.v1_21_R3.generator.CraftLimitedRegion; -import org.bukkit.craftbukkit.v1_21_R3.util.RandomSourceWrapper; +import org.bukkit.craftbukkit.generator.CraftLimitedRegion; +import org.bukkit.craftbukkit.util.RandomSourceWrapper; import org.bukkit.util.BlockVector; import org.jetbrains.annotations.NotNull; diff --git a/impl/v1_21_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R3/placement/CountModifierHook.java b/impl/v1_21_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R3/placement/CountModifierHook.java index 8c6eb592..f8be2264 100644 --- a/impl/v1_21_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R3/placement/CountModifierHook.java +++ b/impl/v1_21_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R3/placement/CountModifierHook.java @@ -6,9 +6,11 @@ import de.derfrzocker.ore.control.api.Biome; import de.derfrzocker.ore.control.api.OreControlManager; import de.derfrzocker.ore.control.impl.v1_21_R3.ConversionUtil; -import de.derfrzocker.ore.control.impl.v1_21_R3.NMSReflectionNames; + import java.lang.reflect.Field; import java.util.Random; + +import de.derfrzocker.ore.control.impl.v1_21_R3.NMSReflectionNames; import net.minecraft.util.valueproviders.IntProvider; import net.minecraft.world.level.levelgen.placement.CountPlacement; import org.bukkit.NamespacedKey; diff --git a/impl/v1_21_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R3/placement/HeightRangeModifierHook.java b/impl/v1_21_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R3/placement/HeightRangeModifierHook.java index ac85a9d3..15bf05ba 100644 --- a/impl/v1_21_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R3/placement/HeightRangeModifierHook.java +++ b/impl/v1_21_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R3/placement/HeightRangeModifierHook.java @@ -10,9 +10,11 @@ import de.derfrzocker.feature.impl.v1_21_R3.value.offset.NMSBelowTopOffsetIntegerValue; import de.derfrzocker.ore.control.api.Biome; import de.derfrzocker.ore.control.api.OreControlManager; -import de.derfrzocker.ore.control.impl.v1_21_R3.NMSReflectionNames; + import java.lang.reflect.Field; import java.util.Random; + +import de.derfrzocker.ore.control.impl.v1_21_R3.NMSReflectionNames; import net.minecraft.world.level.levelgen.VerticalAnchor; import net.minecraft.world.level.levelgen.heightproviders.ConstantHeight; import net.minecraft.world.level.levelgen.heightproviders.HeightProvider; diff --git a/impl/v1_21_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R3/placement/MinecraftPlacementModifierHook.java b/impl/v1_21_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R3/placement/MinecraftPlacementModifierHook.java index 4bf8341b..26240ad2 100644 --- a/impl/v1_21_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R3/placement/MinecraftPlacementModifierHook.java +++ b/impl/v1_21_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R3/placement/MinecraftPlacementModifierHook.java @@ -22,8 +22,8 @@ import net.minecraft.world.level.levelgen.placement.PlacementModifier; import net.minecraft.world.level.levelgen.placement.PlacementModifierType; import org.bukkit.NamespacedKey; -import org.bukkit.craftbukkit.v1_21_R3.generator.CraftLimitedRegion; -import org.bukkit.craftbukkit.v1_21_R3.util.RandomSourceWrapper; +import org.bukkit.craftbukkit.generator.CraftLimitedRegion; +import org.bukkit.craftbukkit.util.RandomSourceWrapper; import org.bukkit.generator.LimitedRegion; import org.bukkit.generator.WorldInfo; import org.bukkit.util.BlockVector; diff --git a/impl/v1_21_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R3/placement/RarityModifierHook.java b/impl/v1_21_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R3/placement/RarityModifierHook.java index 533a866b..24d474e0 100644 --- a/impl/v1_21_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R3/placement/RarityModifierHook.java +++ b/impl/v1_21_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R3/placement/RarityModifierHook.java @@ -5,9 +5,11 @@ import de.derfrzocker.feature.common.value.number.integer.FixedDoubleToIntegerValue; import de.derfrzocker.ore.control.api.Biome; import de.derfrzocker.ore.control.api.OreControlManager; -import de.derfrzocker.ore.control.impl.v1_21_R3.NMSReflectionNames; + import java.lang.reflect.Field; import java.util.Random; + +import de.derfrzocker.ore.control.impl.v1_21_R3.NMSReflectionNames; import net.minecraft.world.level.levelgen.placement.RarityFilter; import org.bukkit.NamespacedKey; import org.bukkit.generator.LimitedRegion; diff --git a/impl/v1_21_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R3/placement/SurfaceRelativeThresholdModifierHook.java b/impl/v1_21_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R3/placement/SurfaceRelativeThresholdModifierHook.java index 6f4b3618..b7fbaade 100644 --- a/impl/v1_21_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R3/placement/SurfaceRelativeThresholdModifierHook.java +++ b/impl/v1_21_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R3/placement/SurfaceRelativeThresholdModifierHook.java @@ -5,9 +5,11 @@ import de.derfrzocker.feature.impl.v1_21_R3.placement.configuration.SurfaceRelativeThresholdModifierConfiguration; import de.derfrzocker.ore.control.api.Biome; import de.derfrzocker.ore.control.api.OreControlManager; -import de.derfrzocker.ore.control.impl.v1_21_R3.NMSReflectionNames; + import java.lang.reflect.Field; import java.util.Random; + +import de.derfrzocker.ore.control.impl.v1_21_R3.NMSReflectionNames; import net.minecraft.world.level.levelgen.Heightmap; import net.minecraft.world.level.levelgen.placement.SurfaceRelativeThresholdFilter; import org.bukkit.NamespacedKey; diff --git a/impl/v1_21_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R3/placement/SurfaceWaterDepthModifierHook.java b/impl/v1_21_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R3/placement/SurfaceWaterDepthModifierHook.java index 765a48bf..5aedcfe1 100644 --- a/impl/v1_21_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R3/placement/SurfaceWaterDepthModifierHook.java +++ b/impl/v1_21_R3/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R3/placement/SurfaceWaterDepthModifierHook.java @@ -6,8 +6,10 @@ import de.derfrzocker.ore.control.api.Biome; import de.derfrzocker.ore.control.api.OreControlManager; import de.derfrzocker.ore.control.impl.v1_21_R3.NMSReflectionNames; + import java.lang.reflect.Field; import java.util.Random; + import net.minecraft.world.level.levelgen.placement.SurfaceWaterDepthFilter; import org.bukkit.NamespacedKey; import org.bukkit.generator.LimitedRegion; diff --git a/ore-control/build.gradle.kts b/ore-control/build.gradle.kts new file mode 100644 index 00000000..db63e98c --- /dev/null +++ b/ore-control/build.gradle.kts @@ -0,0 +1,86 @@ +import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar +import net.minecrell.pluginyml.bukkit.BukkitPluginDescription +import io.papermc.paperweight.userdev.attribute.Obfuscation + +plugins { + `java-library` + id("buildlogic.common") + id("buildlogic.shadow") + id("net.minecrell.plugin-yml.bukkit") version "0.6.0" +} + +val adapters = configurations.create("adapters") { + description = "Adapters to include in the JAR" + isCanBeConsumed = false + isCanBeResolved = true + shouldResolveConsistentlyWith(configurations["runtimeClasspath"]) + attributes { + attribute(Obfuscation.OBFUSCATION_ATTRIBUTE, objects.named(Obfuscation.OBFUSCATED)) + } +} + +bukkit { + name = rootProject.name + version = rootProject.version.toString() + description = "An ore control plugin" + author = "DerFrZocker" + main = "de.derfrzocker.ore.control.OreControl" + apiVersion = "1.13" + load = BukkitPluginDescription.PluginLoadOrder.STARTUP + contributors = listOf("Joo200") + libraries = listOf("net.objecthunter:exp4j:0.4.8") + commands { + register("ore-control") { + permission = "ore.control" + description = "Open the ore control gui" + usage = "Usage: /" + } + } +} + +dependencies { + compileOnly(libs.paperApi) + "implementation"(project(":api")) + "implementation"(project(":common")) + "implementation"(libs.spigotutils) + "implementation"(libs.bstats) + project.project(":impl").subprojects.forEach { + "compileOnly"(project(it.path)) + "adapters"(project(it.path)) + } + + "testImplementation"(libs.paperApi) + "testImplementation"(libs.junit) +} + +tasks.named("shadowJar") { + archiveClassifier.set("dist") + + configurations.add(adapters) + + relocate("org.bstats", "de.derfrzocker.ore.control.utils") + relocate("de.derfrzocker.spigot.utils", "de.derfrzocker.ore.control.utils") + relocate("net.wesjd", "de.derfrzocker.ore.control.utils") + + exclude("GradleStart**") + exclude(".cache") + exclude("LICENSE*") + exclude("META-INF/maven/**") + + dependencies { + include(project(":api")) + include(project(":common")) + include(dependency("org.bstats:")) + include(dependency("de.derfrzocker:spigot-utils")) + } + + project.project(":impl").subprojects.forEach { + dependencies { + include(dependency("${it.group}:${it.name}")) + } + } +} + +tasks.named("assemble").configure { + dependsOn("shadowJar") +} diff --git a/ore-control/pom.xml b/ore-control/pom.xml deleted file mode 100644 index 29e819d8..00000000 --- a/ore-control/pom.xml +++ /dev/null @@ -1,193 +0,0 @@ - - - 4.0.0 - - - ore-control-parent - de.derfrzocker - ${revision} - - - ore-control - - - - codemc-snapshots - https://repo.codemc.io/repository/maven-snapshots/ - - - - - - org.bstats - bstats-bukkit - ${bstats.version} - compile - true - - - de.derfrzocker - spigot-utils - ${spigot-utils.version} - compile - - - de.derfrzocker - ore-control-api - ${project.version} - compile - - - de.derfrzocker - ore-control-common - ${project.version} - compile - - - de.derfrzocker - ore-control-impl-v1_18_R1 - ${project.version} - compile - true - - - de.derfrzocker - ore-control-impl-v1_18_R2 - ${project.version} - compile - true - - - de.derfrzocker - ore-control-impl-v1_19_R1 - ${project.version} - compile - true - - - de.derfrzocker - ore-control-impl-v1_19_R2 - ${project.version} - compile - true - - - de.derfrzocker - ore-control-impl-v1_19_R3 - ${project.version} - compile - true - - - de.derfrzocker - ore-control-impl-v1_20_R1 - ${project.version} - compile - true - - - de.derfrzocker - ore-control-impl-v1_20_R2 - ${project.version} - compile - true - - - de.derfrzocker - ore-control-impl-v1_20_R3 - ${project.version} - compile - true - - - de.derfrzocker - ore-control-impl-v1_20_R4 - ${project.version} - compile - true - - - de.derfrzocker - ore-control-impl-v1_21_R1 - ${project.version} - compile - true - - - de.derfrzocker - ore-control-impl-v1_21_R2 - ${project.version} - compile - true - - - de.derfrzocker - ore-control-impl-v1_21_R3 - ${project.version} - compile - true - - - org.junit.jupiter - junit-jupiter - 5.10.0-M1 - test - - - - - - - org.apache.maven.plugins - maven-shade-plugin - 3.3.0 - - - package - - shade - - - - - false - false - true - - - org.bstats - de.derfrzocker.ore.control.utils - - - de.derfrzocker.spigot.utils - de.derfrzocker.ore.control.utils - - - net.wesjd - de.derfrzocker.ore.control.utils - - - com.mojang.datafixers - de.derfrzocker.ore.control.utils.datafixers - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 3.0.0-M5 - - - - - - src/main/resources - true - - - - - \ No newline at end of file diff --git a/ore-control/src/main/java/de/derfrzocker/ore/control/OreControl.java b/ore-control/src/main/java/de/derfrzocker/ore/control/OreControl.java index 80b1dfe9..470925fc 100644 --- a/ore-control/src/main/java/de/derfrzocker/ore/control/OreControl.java +++ b/ore-control/src/main/java/de/derfrzocker/ore/control/OreControl.java @@ -40,12 +40,6 @@ import de.derfrzocker.ore.control.cache.info.ConfigInfoCache; import de.derfrzocker.ore.control.gui.OreControlGuiManager; import de.derfrzocker.ore.control.impl.BasicConfigManager; -import de.derfrzocker.ore.control.impl.v1_18_R1.NMSReplacer_v1_18_R1; -import de.derfrzocker.ore.control.impl.v1_18_R2.NMSReplacer_v1_18_R2; -import de.derfrzocker.ore.control.impl.v1_19_R1.NMSReplacer_v1_19_R1; -import de.derfrzocker.ore.control.impl.v1_19_R2.NMSReplacer_v1_19_R2; -import de.derfrzocker.ore.control.impl.v1_19_R3.NMSReplacer_v1_19_R3; -import de.derfrzocker.ore.control.impl.v1_20_R1.NMSReplacer_v1_20_R1; import de.derfrzocker.ore.control.impl.v1_20_R2.NMSReplacer_v1_20_R2; import de.derfrzocker.ore.control.impl.v1_20_R3.NMSReplacer_v1_20_R3; import de.derfrzocker.ore.control.impl.v1_20_R4.NMSReplacer_v1_20_R4; @@ -148,19 +142,7 @@ public void onDisable() { } private NMSReplacer getNmsReplacer() { - if (InternalVersion.v1_18_R1.getServerVersionRange().isInRange(version)) { - return new NMSReplacer_v1_18_R1(oreControlManager, configParser); - } else if (InternalVersion.v1_18_R2.getServerVersionRange().isInRange(version)) { - return new NMSReplacer_v1_18_R2(oreControlManager, configParser); - } else if (InternalVersion.v1_19_R1.getServerVersionRange().isInRange(version)) { - return new NMSReplacer_v1_19_R1(this, oreControlManager, configParser); - } else if (InternalVersion.v1_19_R2.getServerVersionRange().isInRange(version)) { - return new NMSReplacer_v1_19_R2(this, oreControlManager, configParser); - } else if (InternalVersion.v1_19_R3.getServerVersionRange().isInRange(version)) { - return new NMSReplacer_v1_19_R3(this, oreControlManager, configParser); - } else if (InternalVersion.v1_20_R1.getServerVersionRange().isInRange(version)) { - return new NMSReplacer_v1_20_R1(this, oreControlManager, configParser); - } else if (InternalVersion.v1_20_R2.getServerVersionRange().isInRange(version)) { + if (InternalVersion.v1_20_R2.getServerVersionRange().isInRange(version)) { return new NMSReplacer_v1_20_R2(this, oreControlManager, configParser); } else if (InternalVersion.v1_20_R3.getServerVersionRange().isInRange(version)) { return new NMSReplacer_v1_20_R3(this, oreControlManager, configParser); diff --git a/ore-control/src/main/resources/plugin.yml b/ore-control/src/main/resources/plugin.yml deleted file mode 100644 index 583f829f..00000000 --- a/ore-control/src/main/resources/plugin.yml +++ /dev/null @@ -1,14 +0,0 @@ -name: ${parent.name} -version: ${project.version} -description: ${project.description} -author: ${project.author} -main: de.derfrzocker.ore.control.OreControl -api-version: "1.13" -load: STARTUP -libraries: - - net.objecthunter:exp4j:0.4.8 -commands: - ore-control: - permission: "ore.control" - description: "Open the ore control gui" - usage: "Usage: /" diff --git a/pom.xml b/pom.xml deleted file mode 100644 index 4960a1c9..00000000 --- a/pom.xml +++ /dev/null @@ -1,131 +0,0 @@ - - - 4.0.0 - - de.derfrzocker - ore-control-parent - ${revision} - - - api - impl - ore-control - common - - - pom - An ore control plugin - ore-control - - - dev-SNAPSHOT - UTF-8 - 17 - 17 - yyyy.MM.d - DerFrZocker - 97 - 3.0.0 - - - - - spigot-repo - https://hub.spigotmc.org/nexus/content/repositories/snapshots/ - - - derfrzocker-snapshots - https://nexus.derfrzocker.de/repository/maven-snapshots/ - - - derfrzocker-release - https://nexus.derfrzocker.de/repository/maven-releases/ - - - CodeMC - https://repo.codemc.org/repository/maven-public - - - minecraft-libraries - Minecraft Libraries - https://libraries.minecraft.net - - - - - - org.spigotmc - spigot-api - 1.18.1-R0.1-SNAPSHOT - provided - - - de.derfrzocker - spigot-utils - ${spigot-utils.version} - provided - - - org.jetbrains - annotations - 23.0.0 - provided - - - - - - - org.apache.maven.plugins - maven-source-plugin - 3.2.1 - - - attach-sources - - jar - - - - - - org.codehaus.mojo - flatten-maven-plugin - 1.2.2 - - true - - - - flatten - process-resources - - flatten - - - - flatten.clean - clean - - clean - - - - - - - - - - derfrzocker-repo - https://nexus.derfrzocker.de/repository/maven-releases/ - - - derfrzocker-repo - https://nexus.derfrzocker.de/repository/maven-snapshots/ - - - - \ No newline at end of file diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 00000000..6ec31a0d --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,36 @@ +pluginManagement { + repositories { + gradlePluginPortal() + maven { + name = "Paper" + url = uri("https://repo.papermc.io/repository/maven-public/") + } + } +} +dependencyResolutionManagement { + repositories { + maven { + name = "Paper" + url = uri("https://repo.papermc.io/repository/maven-public/") + } + } +} + +rootProject.name = "ore-control" + +includeBuild("build-logic") + +include("api") +include("common") +include("ore-control") + +listOf( + "v1_20_R2", + "v1_20_R3", + "v1_20_R4", + "v1_21_R1", + "v1_21_R2", + "v1_21_R3" +).forEach { + include("impl:$it") +} From 412cde46c3ed074ea5ea82a076c607fa91a8c3b5 Mon Sep 17 00:00:00 2001 From: Joo200 Date: Mon, 23 Dec 2024 00:33:04 +0100 Subject: [PATCH 2/2] Fix runtime errors on spigot --- api/src/main/java/de/derfrzocker/feature/api/Feature.java | 6 +++--- .../ore/control/impl/v1_21_R2/NMSReplacer_v1_21_R2.java | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/api/src/main/java/de/derfrzocker/feature/api/Feature.java b/api/src/main/java/de/derfrzocker/feature/api/Feature.java index 3c026689..ba4eca15 100644 --- a/api/src/main/java/de/derfrzocker/feature/api/Feature.java +++ b/api/src/main/java/de/derfrzocker/feature/api/Feature.java @@ -11,16 +11,16 @@ * Each Feature contains one generator and can have multiple placement modifiers. * The order of the placement modifiers is important. A list which preserves its order should be used. * - * @param key The unique key of this feature. + * @param namedKey The unique key of this feature. * @param generator The generator which generates the blocks. * @param placementModifiers The placement modifiers which determine the positions to generate the feature. */ -public record Feature(@NotNull NamespacedKey key, @NotNull FeatureGenerator generator, +public record Feature(@NotNull NamespacedKey namedKey, @NotNull FeatureGenerator generator, @NotNull List> placementModifiers) implements Keyed { @NotNull @Override public NamespacedKey getKey() { - return key(); + return namedKey(); } } diff --git a/impl/v1_21_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R2/NMSReplacer_v1_21_R2.java b/impl/v1_21_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R2/NMSReplacer_v1_21_R2.java index d40a05a5..fa5e246a 100644 --- a/impl/v1_21_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R2/NMSReplacer_v1_21_R2.java +++ b/impl/v1_21_R2/src/main/java/de/derfrzocker/ore/control/impl/v1_21_R2/NMSReplacer_v1_21_R2.java @@ -172,9 +172,7 @@ private void registerFeatures() { Optional> modifierOptional = registries.getPlacementModifierRegistry().get(ActivationModifier.KEY); modifierOptional.ifPresent(modifiers::add); - String keyString = placedFeatureRegistry.getKey(placedFeature).toString(); - NamespacedKey key = NamespacedKey.fromString(keyString); - registries.getFeatureRegistry().register(new de.derfrzocker.feature.api.Feature(key, featureGenerator.get(), modifiers)); + registries.getFeatureRegistry().register(new de.derfrzocker.feature.api.Feature(NamespacedKey.fromString(placedFeatureRegistry.getKey(placedFeature).toString()), featureGenerator.get(), modifiers)); } }