No com

src/main/java/fr/openmc/api/datapacks/DatapackInjector.java

@@ -2,11 +2,41 @@
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import fr.openmc.api.datapacks.builders.ContentBuilder;
 
 import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
 
 public interface DatapackInjector {
     Gson GSON = new GsonBuilder().setPrettyPrinting().create();
+    String[] getPath();
+    ContentBuilder getBuilder();
+    String getNamespace();
+    String getId();
+    String getExtension();
 
-    void inject(File rootFile);
+    default void inject(File rootFile) {
+        if (getBuilder() == null) return;
+
+        Path root = rootFile.toPath().resolve("data").resolve(getNamespace());
+
+        for (String folder : getPath()) {
+            root = root.resolve(folder);
+        }
+
+        try {
+            Files.createDirectories(root);
+            Path biomeFile = root.resolve(getId() + "." + getExtension());
+            Files.createDirectories(biomeFile.getParent());
+            Files.writeString(biomeFile, GSON.toJson(getBuilder().toJson()));
+        } catch (IOException e) {
+            throw new IllegalStateException("Cannot write Content files", e);
+        }
+    }
+
+    default String getKey() {
+        return getNamespace() + ":" + getId();
+    }
 }

src/main/java/fr/openmc/api/datapacks/OMCDatapack.java

@@ -18,15 +18,13 @@
 @Getter
 @SuppressWarnings("UnstableApiUsage")
 public class OMCDatapack {
-    private final String packName;
     private final String namespace;
     private final Set<DatapackInjector> injectors = new HashSet<>();
 
     public final String ID_DATAPACK_INJECTED = "openmc-injected";
     private final String ID_TEMP_DATAPACK_FOLDER = "datapacks-openmc";
 
-    public OMCDatapack(String packName, String namespace) {
-        this.packName = packName;
+    public OMCDatapack(String namespace) {
         this.namespace = namespace;
     }
 

src/main/java/fr/openmc/api/datapacks/builders/BiomeBuilder.java

@@ -28,7 +28,7 @@
  *   "temperature": 2
  * }
  */
-public final class BiomeBuilder {
+public final class BiomeBuilder implements ContentBuilder {
     private JsonObject attributes = new JsonObject();
     private final JsonArray carvers = new JsonArray();
     @Getter
@@ -58,17 +58,17 @@ public BiomeBuilder features(JsonElement id) {
     }
 
     public BiomeBuilder temperatureModifier(String id) {
-        this.temperatureModifier =id;
+        this.temperatureModifier = id;
         return this;
     }
 
     public BiomeBuilder creatureSpawnProbability(Double value) {
-        this.creatureSpawnProbability=value;
+        this.creatureSpawnProbability = value;
         return this;
     }
 
     public BiomeBuilder downfall(Float value) {
-        this.downfall=value;
+        this.downfall = value;
         return this;
     }
 
@@ -169,13 +169,16 @@ public JsonObject toJson() {
         if (attributes != null) json.add("attributes", attributes);
         if (temperatureModifier != null) json.addProperty("temperature_modifier", temperatureModifier);
         if (creatureSpawnProbability != null) json.addProperty("creature_spawn_probability", creatureSpawnProbability);
-        if (carvers != null) json.add("carvers", carvers);
+        json.add("carvers", carvers);
         if (downfall != null) json.addProperty("downfall", downfall);
-        if (effects != null) json.add("effects", effects);
-        if (features != null) json.add("features", features);
+        JsonObject effect = effects;
+        if (effect.get("water_color") == null)
+            effect.addProperty("water_color", "#000000");
+        json.add("effects", effects);
+        json.add("features", features);
         if (hasPrecipitation != null) json.addProperty("has_precipitation", hasPrecipitation);
-        if (spawnCosts != null) json.add("spawn_costs", spawnCosts);
-        if (spawners != null) json.add("spawners", spawners);
+        json.add("spawn_costs", spawnCosts);
+        json.add("spawners", spawners);
         if (temperatures != null) json.addProperty("temperature", temperatures);
 
         return json;

src/main/java/fr/openmc/api/datapacks/builders/ContentBuilder.java

@@ -0,0 +1,8 @@
+package fr.openmc.api.datapacks.builders;
+
+import com.google.gson.JsonObject;
+
+// * Interface qui permet au classes de reconnaitre que c'est un builder de contenu
+public interface ContentBuilder {
+    JsonObject toJson();
+}

src/main/java/fr/openmc/api/datapacks/builders/DimensionTypeBuilder.java

@@ -32,7 +32,7 @@
  *   "timelines": "#minecraft:in_overworld"
  * }
  */
-public final class DimensionTypeBuilder {
+public final class DimensionTypeBuilder implements ContentBuilder {
     private JsonObject attributes;
     private Double ambientLight = 0.0;
     private Double coordinateScale = 1.0;
@@ -155,7 +155,7 @@ public DimensionTypeBuilder timelines(String timelines) {
     }
 
     public DimensionTypeBuilder timelines(TimelinesInjector injector) {
-        this.timelines = injector.getNamespace() + ":" + injector.getId();
+        this.timelines = injector.getKey();
         return this;
     }
 
@@ -180,11 +180,4 @@ public JsonObject toJson() {
         if (timelines != null) json.addProperty("timelines", timelines);
         return json;
     }
-
-    private JsonObject toOverridenEnvironnementAttribute(JsonElement value) {
-        JsonObject obj = new JsonObject();
-        obj.addProperty("modifier", "override");
-        obj.add("argument", value);
-        return obj;
-    }
 }

src/main/java/fr/openmc/api/datapacks/builders/EnvironnementAttributeBuilder.java

@@ -5,6 +5,7 @@
 import fr.openmc.api.datapacks.builders.sounds.AmbientSoundBuilder;
 import org.bukkit.Particle;
 
+import java.util.Map;
 import java.util.function.Consumer;
 
 public class EnvironnementAttributeBuilder {
@@ -36,9 +37,25 @@ public EnvironnementAttributeBuilder attributes(JsonObject attributes) {
      * "minecraft:visual/ambient_particles": [ { "particle": { "type": "minecraft:crimson_spore" }, "probability": 0.025 } ]
      */
     public EnvironnementAttributeBuilder ambientParticles(String particleType, double probability) {
+        return ambientParticles(particleType, probability, null);
+    }
+
+    /**
+     * Ajoute un attribut "minecraft:visual/ambient_particles" simple.
+     * Exemple :
+     * "minecraft:visual/ambient_particles": [ { "particle": { "type": "minecraft:crimson_spore" }, "probability": 0.025 } ]
+     */
+    public EnvironnementAttributeBuilder ambientParticles(String particleType, double probability, Map<String, Integer> options) {
         JsonObject entry = new JsonObject();
         JsonObject particle = new JsonObject();
         particle.addProperty("type", particleType);
+
+        if (options != null) {
+            for (var entry1 : options.entrySet()) {
+                particle.addProperty(entry1.getKey(), entry1.getValue());
+            }
+        }
+
         entry.add("particle", particle);
         entry.addProperty("probability", probability);
 
@@ -94,6 +111,10 @@ public EnvironnementAttributeBuilder ambientParticles(Particle particle, double
         return ambientParticles(particle.getKey().toString(), probability);
     }
 
+    public EnvironnementAttributeBuilder ambientParticles(Particle particle, double probability, Map<String, Integer> options) {
+        return ambientParticles(particle.getKey().toString(), probability, options);
+    }
+
     public EnvironnementAttributeBuilder ambientSounds(AmbientSoundBuilder ambientBuilder) {
         this.attributes.add("audio/ambient_sounds", ambientBuilder.toJson());
         return this;

src/main/java/fr/openmc/api/datapacks/builders/TimelineBuilder.java

@@ -60,7 +60,7 @@
  *   }
  * }
  */
-public final class TimelineBuilder {
+public final class TimelineBuilder implements ContentBuilder {
     private String clock = "minecraft:overworld";
     private Integer periodTicks = null;
     private final Map<String, TrackBuilder> tracks = new LinkedHashMap<>();

src/main/java/fr/openmc/api/datapacks/builders/dimensions/VoidDimensionBuilder.java

@@ -0,0 +1,58 @@
+package fr.openmc.api.datapacks.builders.dimensions;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
+import fr.openmc.api.datapacks.builders.ContentBuilder;
+import fr.openmc.api.datapacks.injectors.BiomesInjector;
+import fr.openmc.api.datapacks.injectors.DimensionTypesInjector;
+
+/**
+ * Exemple simple d'une dimension vide, le but n'est pas de faire une API
+ * pour build des datapacks sans toucher a un .json et ttes la structure qu'il y a derriere:
+ * {
+ *   "type": "minecraft:overworld",
+ *   "generator": {
+ *     "type": "minecraft:flat",
+ *     "settings": {
+ *       "biome": "draft:draft",
+ *       "lakes": false,
+ *       "features": false,
+ *       "layers": []
+ *     }
+ *   }
+ * }
+ */
+public final class VoidDimensionBuilder implements ContentBuilder {
+    private String type = "minecraft:overworld";
+    private String biome = "minecraft:plains";
+
+    public VoidDimensionBuilder type(DimensionTypesInjector injector) {
+        this.type = injector.getKey();
+        return this;
+    }
+
+    public VoidDimensionBuilder biome(BiomesInjector injector) {
+        this.biome = injector.getKey();
+        return this;
+    }
+
+    public JsonObject toJson() {
+        JsonObject json = new JsonObject();
+        if (type != null) json.addProperty("type", type);
+        if (biome != null) {
+            JsonObject generator = new JsonObject();
+            generator.addProperty("type", "minecraft:flat");
+
+            JsonObject settings = new JsonObject();
+            settings.addProperty("biome", biome);
+            settings.addProperty("lakes", false);
+            settings.addProperty("features", false);
+            settings.add("layers", new JsonArray());
+
+            generator.add("settings", settings);
+            json.add("generator", generator);
+        }
+
+        return json;
+    }
+}

src/main/java/fr/openmc/api/datapacks/injectors/BiomesInjector.java

@@ -2,13 +2,8 @@
 
 import fr.openmc.api.datapacks.DatapackInjector;
 import fr.openmc.api.datapacks.builders.BiomeBuilder;
+import fr.openmc.api.datapacks.builders.ContentBuilder;
 
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.LinkedHashMap;
-import java.util.Map;
 import java.util.function.Consumer;
 
 /**
@@ -19,39 +14,44 @@
 public class BiomesInjector implements DatapackInjector {
 
     private final String namespace;
-    private final Map<String, BiomeBuilder> entries = new LinkedHashMap<>();
+    private final String id;
+    private final BiomeBuilder builder;
 
-    public BiomesInjector(String namespace) {
+    public BiomesInjector(String namespace, String id, BiomeBuilder builder) {
         this.namespace = namespace;
+        this.id = id;
+        this.builder = builder;
     }
 
-    public BiomesInjector add(String id, Consumer<BiomeBuilder> builder) {
-        BiomeBuilder instance = new BiomeBuilder();
-        builder.accept(instance);
-        entries.put(id, instance);
-        return this;
+    public BiomesInjector(String namespace, String id, Consumer<BiomeBuilder> builder) {
+        this.namespace = namespace;
+        this.id = id;
+        this.builder = new BiomeBuilder();
+        builder.accept(this.builder);
+    }
+
+    @Override
+    public String[] getPath() {
+        return new String[]{"worldgen", "biome"};
     }
 
-    public BiomesInjector add(String id, BiomeBuilder builder) {
-        entries.put(id, builder);
-        return this;
+    @Override
+    public ContentBuilder getBuilder() {
+        return builder;
+    }
+
+    @Override
+    public String getNamespace() {
+        return namespace;
+    }
+
+    @Override
+    public String getId() {
+        return id;
     }
 
     @Override
-    public void inject(File rootFile) {
-        if (entries.isEmpty()) return;
-
-        Path root = rootFile.toPath().resolve("data").resolve(namespace)
-                .resolve("worldgen").resolve("biome");
-        try {
-            Files.createDirectories(root);
-            for (var entry : entries.entrySet()) {
-                Path biomeFile = root.resolve(entry.getKey() + ".json");
-                Files.createDirectories(biomeFile.getParent());
-                Files.writeString(biomeFile, GSON.toJson(entry.getValue().toJson()));
-            }
-        } catch (IOException e) {
-            throw new IllegalStateException("Cannot write biome files", e);
-        }
+    public String getExtension() {
+        return "json";
     }
 }

src/main/java/fr/openmc/api/datapacks/injectors/DimensionInjector.java

@@ -0,0 +1,42 @@
+package fr.openmc.api.datapacks.injectors;
+
+import fr.openmc.api.datapacks.DatapackInjector;
+import fr.openmc.api.datapacks.builders.ContentBuilder;
+
+public class DimensionInjector implements DatapackInjector {
+
+    private final String namespace;
+    private final String id;
+    private final ContentBuilder builder;
+
+    public DimensionInjector(String namespace, String id, ContentBuilder builder) {
+        this.namespace = namespace;
+        this.id = id;
+        this.builder = builder;
+    }
+
+    @Override
+    public String[] getPath() {
+        return new String[]{"dimension"};
+    }
+
+    @Override
+    public ContentBuilder getBuilder() {
+        return builder;
+    }
+
+    @Override
+    public String getNamespace() {
+        return namespace;
+    }
+
+    @Override
+    public String getId() {
+        return id;
+    }
+
+    @Override
+    public String getExtension() {
+        return "json";
+    }
+}