Merge pull request #10 from TheNextLvl-net/config

converted to gson config

Author: NonSwag

build.gradle.kts

@@ -33,6 +33,7 @@ dependencies {
     implementation("org.bstats:bstats-bukkit:3.0.2")
     // Internationalization
     implementation("net.thenextlvl.core:i18n:1.0.18")
+    implementation("net.thenextlvl.core:adapters:1.0.9")
 
     annotationProcessor("org.projectlombok:lombok:1.18.32")
 }

src/main/java/net/thenextlvl/gopaint/GoPaintPlugin.java

@@ -1,57 +1,43 @@
-/*
- * goPaint is designed to simplify painting inside of Minecraft.
- * Copyright (C) Arcaniax-Development
- * Copyright (C) Arcaniax team and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
 package net.thenextlvl.gopaint;
 
+import com.google.gson.GsonBuilder;
+import core.file.FileIO;
+import core.file.format.GsonFile;
 import core.i18n.file.ComponentBundle;
+import core.io.IO;
+import core.paper.adapters.inventory.MaterialAdapter;
 import lombok.Getter;
 import lombok.experimental.Accessors;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import net.thenextlvl.gopaint.brush.PlayerBrushManager;
 import net.thenextlvl.gopaint.command.GoPaintCommand;
+import net.thenextlvl.gopaint.objects.other.PluginConfig;
 import net.thenextlvl.gopaint.listeners.ConnectListener;
 import net.thenextlvl.gopaint.listeners.InteractListener;
 import net.thenextlvl.gopaint.listeners.InventoryListener;
-import net.thenextlvl.gopaint.objects.other.Settings;
+import net.thenextlvl.gopaint.objects.other.SurfaceMode;
 import org.bstats.bukkit.Metrics;
+import org.bukkit.Axis;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Listener;
 import org.bukkit.plugin.java.JavaPlugin;
 
 import java.io.File;
+import java.util.ArrayList;
 import java.util.Locale;
 
-@Getter
 @Accessors(fluent = true)
 public class GoPaintPlugin extends JavaPlugin implements Listener {
-
-    public static final String PAPER_DOCS = "https://jd.papermc.io/paper/1.20.6/org/bukkit/Material.html#enum-constant-summary";
-
     public static final String USE_PERMISSION = "gopaint.use";
     public static final String ADMIN_PERMISSION = "gopaint.admin";
     public static final String WORLD_BYPASS_PERMISSION = "gopaint.world.bypass";
 
     private final File translations = new File(getDataFolder(), "translations");
-    private final ComponentBundle bundle = new ComponentBundle(translations, audience ->
+    private final @Getter ComponentBundle bundle = new ComponentBundle(translations, audience ->
             audience instanceof Player player ? player.locale() : Locale.US)
             .register("messages", Locale.US)
             .register("messages_german", Locale.GERMANY)
@@ -60,7 +46,18 @@ public class GoPaintPlugin extends JavaPlugin implements Listener {
                     Placeholder.component("prefix", bundle.component(Locale.US, "prefix"))
             )).build());
 
-    private final PlayerBrushManager brushManager = new PlayerBrushManager(bundle);
+    private final FileIO<PluginConfig> configFile = new GsonFile<>(IO.of(getDataFolder(), "config.json"), new PluginConfig(
+            new PluginConfig.Generic(Material.FEATHER, 100, 10, 50, Axis.Y, 50, 50, new ArrayList<>(), true, true, Material.SPONGE, SurfaceMode.DIRECT),
+            new PluginConfig.Thickness(1, 5),
+            new PluginConfig.Angle(2, 5, 10, 40, 85),
+            new PluginConfig.Fracture(2, 5)
+    ), new GsonBuilder()
+            .registerTypeAdapter(Material.class, MaterialAdapter.NotNull.INSTANCE)
+            .setPrettyPrinting()
+            .create()
+    ).validate().save();
+
+    private final @Getter PlayerBrushManager brushManager = new PlayerBrushManager(this);
     private final Metrics metrics = new Metrics(this, 22279);
 
     @Override
@@ -73,15 +70,6 @@ public void onEnable() {
             return;
         }
 
-        reloadConfig();
-
-        Material brush = Settings.settings().GENERIC.DEFAULT_BRUSH;
-        if (!brush.isItem()) {
-            getComponentLogger().error("{} is not a valid default brush, it has to be an item", brush.name());
-            getComponentLogger().error("For more information visit {}", PAPER_DOCS);
-            Bukkit.getPluginManager().disablePlugin(this);
-        }
-
         registerListeners();
         registerCommands();
     }
@@ -91,21 +79,26 @@ public void onDisable() {
         metrics.shutdown();
     }
 
+    @Override
     public void reloadConfig() {
-        Settings.settings().reload(this, new File(getDataFolder(), "config.yml"));
+        configFile.reload();
     }
 
     private void registerCommands() {
         new GoPaintCommand(this).register();
     }
 
     private void registerListeners() {
-        Bukkit.getPluginManager().registerEvents(new InventoryListener(brushManager()), this);
+        Bukkit.getPluginManager().registerEvents(new InventoryListener(this), this);
         Bukkit.getPluginManager().registerEvents(new InteractListener(this), this);
         Bukkit.getPluginManager().registerEvents(new ConnectListener(brushManager()), this);
     }
 
     private boolean hasOriginalGoPaint() {
         return Bukkit.getPluginManager().getPlugin("goPaint") != this;
     }
+
+    public PluginConfig config() {
+        return configFile.getRoot();
+    }
 }

src/main/java/net/thenextlvl/gopaint/brush/ExportedPlayerBrush.java

@@ -19,7 +19,6 @@
 package net.thenextlvl.gopaint.brush;
 
 import net.thenextlvl.gopaint.objects.brush.Brush;
-import net.thenextlvl.gopaint.objects.other.Settings;
 import net.thenextlvl.gopaint.objects.other.SurfaceMode;
 import org.bukkit.Axis;
 import org.bukkit.Material;
@@ -94,7 +93,7 @@ public static final class Builder {
         private final Brush brush;
 
         private List<Material> blocks = Collections.emptyList();
-        private Axis axis = Settings.settings().GENERIC.DEFAULT_AXIS;
+        private Axis axis = Axis.Y; // todo: plugin.config().GENERIC.DEFAULT_AXIS;
         private SurfaceMode surfaceMode = SurfaceMode.DISABLED;
 
         private @Nullable Material mask;

src/main/java/net/thenextlvl/gopaint/brush/PlayerBrush.java

@@ -25,8 +25,8 @@
 import net.kyori.adventure.text.format.NamedTextColor;
 import net.kyori.adventure.text.format.Style;
 import net.kyori.adventure.text.format.TextDecoration;
+import net.thenextlvl.gopaint.GoPaintPlugin;
 import net.thenextlvl.gopaint.objects.brush.*;
-import net.thenextlvl.gopaint.objects.other.Settings;
 import net.thenextlvl.gopaint.objects.other.SurfaceMode;
 import net.thenextlvl.gopaint.utils.GUI;
 import org.bukkit.Axis;
@@ -50,7 +50,7 @@
 @Accessors(fluent = true)
 public final class PlayerBrush implements BrushSettings {
 
-    private final PlayerBrushManager brushManager;
+    private final GoPaintPlugin plugin;
     private final Random random = new SecureRandom();
 
     private boolean maskEnabled;
@@ -72,23 +72,23 @@ public final class PlayerBrush implements BrushSettings {
 
     private final Inventory gui;
 
-    public PlayerBrush(PlayerBrushManager brushManager) {
-        this.brushManager = brushManager;
-
-        surfaceMode = Settings.settings().GENERIC.SURFACE_MODE;
-        maskEnabled = Settings.settings().GENERIC.MASK_ENABLED;
-        enabled = Settings.settings().GENERIC.ENABLED_BY_DEFAULT;
-        chance = Settings.settings().GENERIC.DEFAULT_CHANCE;
-        thickness = Settings.settings().THICKNESS.DEFAULT_THICKNESS;
-        fractureDistance = Settings.settings().FRACTURE.DEFAULT_FRACTURE_DISTANCE;
-        angleDistance = Settings.settings().ANGLE.DEFAULT_ANGLE_DISTANCE;
-        angleHeightDifference = Settings.settings().ANGLE.DEFAULT_ANGLE_HEIGHT_DIFFERENCE;
-        falloffStrength = Settings.settings().GENERIC.DEFAULT_FALLOFF_STRENGTH;
-        mixingStrength = Settings.settings().GENERIC.DEFAULT_MIXING_STRENGTH;
-        axis = Settings.settings().GENERIC.DEFAULT_AXIS;
-        size = Settings.settings().GENERIC.DEFAULT_SIZE;
-        mask = Settings.settings().GENERIC.DEFAULT_MASK;
-        brush = brushManager.cycleForward(null);
+    public PlayerBrush(GoPaintPlugin plugin) {
+        this.plugin = plugin;
+
+        surfaceMode = plugin.config().generic().surfaceMode();
+        maskEnabled = plugin.config().generic().maskEnabled();
+        enabled = plugin.config().generic().enabledByDefault();
+        chance = plugin.config().generic().defaultChance();
+        thickness = plugin.config().thickness().defaultThickness();
+        fractureDistance = plugin.config().fracture().defaultFractureDistance();
+        angleDistance = plugin.config().angle().defaultAngleDistance();
+        angleHeightDifference = plugin.config().angle().defaultAngleHeightDifference();
+        falloffStrength = plugin.config().generic().defaultFalloffStrength();
+        mixingStrength = plugin.config().generic().defaultMixingStrength();
+        axis = plugin.config().generic().defaultAxis();
+        size = plugin.config().generic().defaultSize();
+        mask = plugin.config().generic().defaultMask();
+        brush = plugin.brushManager().cycleForward(null);
         blocks.add(Material.STONE);
         gui = GUI.create(this);
     }
@@ -151,20 +151,20 @@ public void removeBlock(int slot) {
     }
 
     public void cycleBrushForward() {
-        brush = brushManager.cycleForward(brush);
+        brush = plugin.brushManager().cycleForward(brush);
         updateInventory();
     }
 
     public void cycleBrushBackwards() {
-        brush = brushManager.cycleBack(brush);
+        brush = plugin.brushManager().cycleBack(brush);
         updateInventory();
     }
 
     public void setSize(int size) {
-        if (size <= Settings.settings().GENERIC.MAX_SIZE && size > 0) {
+        if (size <= plugin.config().generic().maxSize() && size > 0) {
             this.size = size;
-        } else if (size > Settings.settings().GENERIC.MAX_SIZE) {
-            this.size = Settings.settings().GENERIC.MAX_SIZE;
+        } else if (size > plugin.config().generic().maxSize()) {
+            this.size = plugin.config().generic().maxSize();
         } else {
             this.size = 1;
         }
@@ -177,13 +177,13 @@ public Inventory getInventory() {
 
     public void increaseBrushSize(boolean x10) {
         if (x10) {
-            if (size + 10 <= Settings.settings().GENERIC.MAX_SIZE) {
+            if (size + 10 <= plugin.config().generic().maxSize()) {
                 size += 10;
             } else {
-                size = Settings.settings().GENERIC.MAX_SIZE;
+                size = plugin.config().generic().maxSize();
             }
         } else {
-            if (size < Settings.settings().GENERIC.MAX_SIZE) {
+            if (size < plugin.config().generic().maxSize()) {
                 size += 1;
             }
         }
@@ -226,7 +226,7 @@ public void decreaseChance() {
     }
 
     public void increaseThickness() {
-        if (thickness < Settings.settings().THICKNESS.MAX_THICKNESS) {
+        if (thickness < plugin.config().thickness().maxThickness()) {
             thickness += 1;
         }
         updateInventory();
@@ -240,7 +240,7 @@ public void decreaseThickness() {
     }
 
     public void increaseAngleDistance() {
-        if (angleDistance < Settings.settings().ANGLE.MAX_ANGLE_DISTANCE) {
+        if (angleDistance < plugin.config().angle().maxAngleDistance()) {
             angleDistance += 1;
         }
         updateInventory();
@@ -254,7 +254,7 @@ public void decreaseAngleDistance() {
     }
 
     public void increaseFractureDistance() {
-        if (this.fractureDistance < Settings.settings().FRACTURE.MAX_FRACTURE_DISTANCE) {
+        if (this.fractureDistance < plugin.config().fracture().maxFractureDistance()) {
             this.fractureDistance += 1;
         }
         updateInventory();
@@ -273,8 +273,8 @@ public void increaseAngleHeightDifference(boolean d15) {
         } else {
             angleHeightDifference += 5.0;
         }
-        if (angleHeightDifference > Settings.settings().ANGLE.MAX_ANGLE_HEIGHT_DIFFERENCE) {
-            angleHeightDifference = Settings.settings().ANGLE.MAX_ANGLE_HEIGHT_DIFFERENCE;
+        if (angleHeightDifference > plugin.config().angle().maxAngleHeightDifference()) {
+            angleHeightDifference = plugin.config().angle().maxAngleHeightDifference();
         }
         updateInventory();
     }
@@ -285,8 +285,8 @@ public void decreaseAngleHeightDifference(boolean d15) {
         } else {
             angleHeightDifference -= 5.0;
         }
-        if (angleHeightDifference < Settings.settings().ANGLE.MIN_ANGLE_HEIGHT_DIFFERENCE) {
-            angleHeightDifference = Settings.settings().ANGLE.MIN_ANGLE_HEIGHT_DIFFERENCE;
+        if (angleHeightDifference < plugin.config().angle().minAngleHeightDifference()) {
+            angleHeightDifference = plugin.config().angle().minAngleHeightDifference();
         }
         updateInventory();
     }

src/main/java/net/thenextlvl/gopaint/brush/PlayerBrushManager.java

@@ -19,8 +19,8 @@
 package net.thenextlvl.gopaint.brush;
 
 import com.google.common.collect.ImmutableList;
-import core.i18n.file.ComponentBundle;
 import lombok.Getter;
+import net.thenextlvl.gopaint.GoPaintPlugin;
 import net.thenextlvl.gopaint.objects.brush.*;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.Nullable;
@@ -37,8 +37,9 @@
 public class PlayerBrushManager {
     private final HashMap<UUID, PlayerBrush> playerBrushes = new HashMap<>();
     private final @Getter List<Brush> brushes;
+    private final GoPaintPlugin plugin;
 
-    public PlayerBrushManager(ComponentBundle bundle) {
+    public PlayerBrushManager(GoPaintPlugin plugin) {
         brushes = ImmutableList.of(
                 new SphereBrush(),
                 new SprayBrush(),
@@ -50,8 +51,9 @@ public PlayerBrushManager(ComponentBundle bundle) {
                 new UnderlayBrush(),
                 new FractureBrush(),
                 new GradientBrush(),
-                new PaintBrush(bundle)
+                new PaintBrush(plugin.bundle())
         );
+        this.plugin = plugin;
     }
 
     /**
@@ -61,7 +63,7 @@ public PlayerBrushManager(ComponentBundle bundle) {
      * @return The brush for the specified player.
      */
     public PlayerBrush getBrush(Player player) {
-        return playerBrushes.computeIfAbsent(player.getUniqueId(), ignored -> new PlayerBrush(this));
+        return playerBrushes.computeIfAbsent(player.getUniqueId(), ignored -> new PlayerBrush(plugin));
     }
 
     /**