From 90d96ba7997a439387bf348a11aa7e9bdc02bb87 Mon Sep 17 00:00:00 2001 From: TypeMonkey Date: Fri, 10 Nov 2023 14:40:51 -0800 Subject: [PATCH 1/2] Added module-info.java files to the six subprojects --- core/src/main/java/module-info.java | 13 +++++++++++++ generators/src/main/java/module-info.java | 18 ++++++++++++++++++ modifiers/src/main/java/module-info.java | 7 +++++++ modules/src/main/java/module-info.java | 9 +++++++++ pipeline/src/main/java/module-info.java | 9 +++++++++ transformers/src/main/java/module-info.java | 6 ++++++ 6 files changed, 62 insertions(+) create mode 100644 core/src/main/java/module-info.java create mode 100644 generators/src/main/java/module-info.java create mode 100644 modifiers/src/main/java/module-info.java create mode 100644 modules/src/main/java/module-info.java create mode 100644 pipeline/src/main/java/module-info.java create mode 100644 transformers/src/main/java/module-info.java diff --git a/core/src/main/java/module-info.java b/core/src/main/java/module-info.java new file mode 100644 index 0000000..3743f37 --- /dev/null +++ b/core/src/main/java/module-info.java @@ -0,0 +1,13 @@ +module de.articdive.jnoise.core { + exports de.articdive.jnoise.core.api.functions; + exports de.articdive.jnoise.core.api.modifiers; + exports de.articdive.jnoise.core.api.modules; + exports de.articdive.jnoise.core.api.noisegen; + exports de.articdive.jnoise.core.api.pipeline; + exports de.articdive.jnoise.core.api.transformers; + + exports de.articdive.jnoise.core.util; + exports de.articdive.jnoise.core.util.vectors; + + requires transitive org.jspecify; +} diff --git a/generators/src/main/java/module-info.java b/generators/src/main/java/module-info.java new file mode 100644 index 0000000..c4dddcd --- /dev/null +++ b/generators/src/main/java/module-info.java @@ -0,0 +1,18 @@ +module de.articdive.jnoise.generators { + exports de.articdive.jnoise.generators.noise_parameters.distance_functions; + exports de.articdive.jnoise.generators.noise_parameters.fade_functions; + exports de.articdive.jnoise.generators.noise_parameters.interpolation; + exports de.articdive.jnoise.generators.noise_parameters.return_type_functions; + exports de.articdive.jnoise.generators.noise_parameters.simplex_variants; + + exports de.articdive.jnoise.generators.noisegen.constant; + exports de.articdive.jnoise.generators.noisegen.opensimplex; + exports de.articdive.jnoise.generators.noisegen.pattern; + exports de.articdive.jnoise.generators.noisegen.perlin; + exports de.articdive.jnoise.generators.noisegen.random.gaussian; + exports de.articdive.jnoise.generators.noisegen.random.white; + exports de.articdive.jnoise.generators.noisegen.value; + exports de.articdive.jnoise.generators.noisegen.worley; + + requires transitive de.articdive.jnoise.core; +} \ No newline at end of file diff --git a/modifiers/src/main/java/module-info.java b/modifiers/src/main/java/module-info.java new file mode 100644 index 0000000..a582fd1 --- /dev/null +++ b/modifiers/src/main/java/module-info.java @@ -0,0 +1,7 @@ +module de.articdive.jnoise.modifiers { + exports de.articdive.jnoise.modifiers.absolute_value; + exports de.articdive.jnoise.modifiers.clamp; + exports de.articdive.jnoise.modifiers.inverter; + + requires transitive de.articdive.jnoise.core; +} diff --git a/modules/src/main/java/module-info.java b/modules/src/main/java/module-info.java new file mode 100644 index 0000000..e08a36b --- /dev/null +++ b/modules/src/main/java/module-info.java @@ -0,0 +1,9 @@ +module de.articdive.jnoise.modules { + exports de.articdive.jnoise.modules.blend; + exports de.articdive.jnoise.modules.combination; + exports de.articdive.jnoise.modules.octavation; + exports de.articdive.jnoise.modules.octavation.fractal_functions; + exports de.articdive.jnoise.modules.selection; + + requires transitive de.articdive.jnoise.core; +} diff --git a/pipeline/src/main/java/module-info.java b/pipeline/src/main/java/module-info.java new file mode 100644 index 0000000..b69ffea --- /dev/null +++ b/pipeline/src/main/java/module-info.java @@ -0,0 +1,9 @@ +module de.articdive.jnoise.pipelines { + exports de.articdive.jnoise.pipeline; + + requires transitive de.articdive.jnoise.core; + requires transitive de.articdive.jnoise.transformers; + requires transitive de.articdive.jnoise.generators; + requires transitive de.articdive.jnoise.modules; + requires transitive de.articdive.jnoise.modifiers; +} diff --git a/transformers/src/main/java/module-info.java b/transformers/src/main/java/module-info.java new file mode 100644 index 0000000..1875a51 --- /dev/null +++ b/transformers/src/main/java/module-info.java @@ -0,0 +1,6 @@ +module de.articdive.jnoise.transformers { + exports de.articdive.jnoise.transformers.domain_warp; + exports de.articdive.jnoise.transformers.scale; + + requires transitive de.articdive.jnoise.core; +} \ No newline at end of file From 307abb04e9769f887befaf37ad086bc8757f4cb3 Mon Sep 17 00:00:00 2001 From: TypeMonkey Date: Fri, 10 Nov 2023 15:14:38 -0800 Subject: [PATCH 2/2] Added comments to the module-info.java files --- core/src/main/java/module-info.java | 5 +++++ generators/src/main/java/module-info.java | 5 +++++ modifiers/src/main/java/module-info.java | 5 +++++ modules/src/main/java/module-info.java | 5 +++++ pipeline/src/main/java/module-info.java | 8 +++++++- transformers/src/main/java/module-info.java | 5 +++++ 6 files changed, 32 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/module-info.java b/core/src/main/java/module-info.java index 3743f37..96ac467 100644 --- a/core/src/main/java/module-info.java +++ b/core/src/main/java/module-info.java @@ -1,3 +1,8 @@ +/** + * The core JNoise module. + * + * Requires JSpecify. + */ module de.articdive.jnoise.core { exports de.articdive.jnoise.core.api.functions; exports de.articdive.jnoise.core.api.modifiers; diff --git a/generators/src/main/java/module-info.java b/generators/src/main/java/module-info.java index c4dddcd..7e8d120 100644 --- a/generators/src/main/java/module-info.java +++ b/generators/src/main/java/module-info.java @@ -1,3 +1,8 @@ +/** + * The "generators" JNoise module. + * + * Requires the core JNoise module. + */ module de.articdive.jnoise.generators { exports de.articdive.jnoise.generators.noise_parameters.distance_functions; exports de.articdive.jnoise.generators.noise_parameters.fade_functions; diff --git a/modifiers/src/main/java/module-info.java b/modifiers/src/main/java/module-info.java index a582fd1..8a93369 100644 --- a/modifiers/src/main/java/module-info.java +++ b/modifiers/src/main/java/module-info.java @@ -1,3 +1,8 @@ +/** + * The "modifiers" JNoise module. + * + * Requires the core JNoise module. + */ module de.articdive.jnoise.modifiers { exports de.articdive.jnoise.modifiers.absolute_value; exports de.articdive.jnoise.modifiers.clamp; diff --git a/modules/src/main/java/module-info.java b/modules/src/main/java/module-info.java index e08a36b..f7e05bf 100644 --- a/modules/src/main/java/module-info.java +++ b/modules/src/main/java/module-info.java @@ -1,3 +1,8 @@ +/** + * The "modules" JNoise module. + * + * Requires the core JNoise module. + */ module de.articdive.jnoise.modules { exports de.articdive.jnoise.modules.blend; exports de.articdive.jnoise.modules.combination; diff --git a/pipeline/src/main/java/module-info.java b/pipeline/src/main/java/module-info.java index b69ffea..c728480 100644 --- a/pipeline/src/main/java/module-info.java +++ b/pipeline/src/main/java/module-info.java @@ -1,4 +1,10 @@ -module de.articdive.jnoise.pipelines { +/** + * The "pipeline" JNoise module. + * + * Requires the "core", "transformers", "generators", + * "modules" and "modifiers" JNoise module. + */ +module de.articdive.jnoise.pipeline { exports de.articdive.jnoise.pipeline; requires transitive de.articdive.jnoise.core; diff --git a/transformers/src/main/java/module-info.java b/transformers/src/main/java/module-info.java index 1875a51..83e46cb 100644 --- a/transformers/src/main/java/module-info.java +++ b/transformers/src/main/java/module-info.java @@ -1,3 +1,8 @@ +/** + * The "transformers" JNoise module. + * + * Requires the core JNoise module. + */ module de.articdive.jnoise.transformers { exports de.articdive.jnoise.transformers.domain_warp; exports de.articdive.jnoise.transformers.scale;