From e47b3f0397ad4c85b8ecffe0556ee8f6ff4c8db9 Mon Sep 17 00:00:00 2001
From: dfsek <dfsek@protonmail.com>
Date: Thu, 7 Jan 2021 09:45:40 -0700
Subject: [PATCH] add message to export command, more cleanup

---
 .../java/com/dfsek/terra/biome/BiomeZone.java |  2 +-
 .../terra/config/base/ConfigPackTemplate.java |  2 +-
 .../config/factories/BiomeGridFactory.java    |  4 ++--
 .../command/structure/ExportCommand.java      | 22 +------------------
 .../terra/bukkit/listeners/EventListener.java |  2 --
 5 files changed, 5 insertions(+), 27 deletions(-)

diff --git a/common/src/main/java/com/dfsek/terra/biome/BiomeZone.java b/common/src/main/java/com/dfsek/terra/biome/BiomeZone.java
index 05c7acb97..c4b7983f2 100644
--- a/common/src/main/java/com/dfsek/terra/biome/BiomeZone.java
+++ b/common/src/main/java/com/dfsek/terra/biome/BiomeZone.java
@@ -27,7 +27,7 @@ public class BiomeZone {
         this.noise.setFractalType(FastNoiseLite.FractalType.FBm);
         this.noise.setFractalOctaves(4);
         ConfigPackTemplate t = wc.getTemplate();
-        this.noise.setFrequency(1D / t.getZoneFreq());
+        this.noise.setFrequency(1D / (t.getZoneFreq() * grids.length));
         this.grids = grids;
         imageLoader = t.getImageLoader();
         useImage = t.isFromImage();
diff --git a/common/src/main/java/com/dfsek/terra/config/base/ConfigPackTemplate.java b/common/src/main/java/com/dfsek/terra/config/base/ConfigPackTemplate.java
index b3afdd471..5ce37ec73 100644
--- a/common/src/main/java/com/dfsek/terra/config/base/ConfigPackTemplate.java
+++ b/common/src/main/java/com/dfsek/terra/config/base/ConfigPackTemplate.java
@@ -31,7 +31,7 @@ public class ConfigPackTemplate implements ValidatedConfigTemplate {
 
     @Value("frequencies.zone")
     @Default
-    private int zoneFreq = 2048;
+    private int zoneFreq = 256;
 
     @Value("blend.enable")
     @Default
diff --git a/common/src/main/java/com/dfsek/terra/config/factories/BiomeGridFactory.java b/common/src/main/java/com/dfsek/terra/config/factories/BiomeGridFactory.java
index c76c023e4..0e5e8808c 100644
--- a/common/src/main/java/com/dfsek/terra/config/factories/BiomeGridFactory.java
+++ b/common/src/main/java/com/dfsek/terra/config/factories/BiomeGridFactory.java
@@ -20,8 +20,8 @@ public class BiomeGridFactory implements TerraFactory<BiomeGridTemplate, BiomeGr
         int xSize = config.getGrid().size();
         int zSize = config.getGrid().get(0).size();
 
-        holder.setXFreq(config.getXFreq() / xSize);
-        holder.setZFreq(config.getZFreq() / zSize);
+        holder.setXFreq(config.getXFreq() * xSize);
+        holder.setZFreq(config.getZFreq() * zSize);
 
         Biome[][] biomes = new UserDefinedBiome[xSize][zSize];
 
diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/structure/ExportCommand.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/structure/ExportCommand.java
index 43ca69af0..77ec5abef 100644
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/structure/ExportCommand.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/structure/ExportCommand.java
@@ -95,27 +95,7 @@ public class ExportCommand extends PlayerCommand {
 
 
 
-        /*
-        Structure structure;
-        try {
-            structure = new Structure(l1, l2, args[0]);
-        } catch(InitializationException e) {
-            sender.sendMessage(e.getMessage());
-            return true;
-        }
-        try {
-            File file = new File(getMain().getDataFolder() + File.separator + "export" + File.separator + "structures", args[0] + ".tstructure");
-            //noinspection ResultOfMethodCallIgnored
-            file.getParentFile().mkdirs();
-            //noinspection ResultOfMethodCallIgnored
-            file.createNewFile();
-            structure.save(file);
-            LangUtil.send("command.structure.export", sender, file.getAbsolutePath());
-        } catch(IOException e) {
-            e.printStackTrace();
-        }
-
-         */
+        sender.sendMessage("Exported structure to " + file.getAbsolutePath());
         return true;
     }
 
diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/EventListener.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/EventListener.java
index 0c05fdc93..cea3e77eb 100644
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/EventListener.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/EventListener.java
@@ -10,7 +10,6 @@ import com.dfsek.terra.api.util.FastRandom;
 import com.dfsek.terra.api.world.tree.Tree;
 import com.dfsek.terra.bukkit.world.BukkitAdapter;
 import com.dfsek.terra.config.base.ConfigPack;
-import com.dfsek.terra.debug.Debug;
 import com.dfsek.terra.registry.TreeRegistry;
 import org.bukkit.Material;
 import org.bukkit.TreeType;
@@ -54,7 +53,6 @@ public class EventListener implements Listener {
         block.setType(Material.AIR);
         TreeRegistry registry = c.getTreeRegistry();
         Tree tree = registry.get(TREE_TYPE_STRING_TRANSFORMER.translate(e.getSpecies()));
-        Debug.info("Overrode tree type: " + e.getSpecies());
         org.bukkit.Location location = e.getLocation();
         if(!tree.plant(new Location(bukkit, location.getX(), location.getY(), location.getZ()), new FastRandom())) block.setBlockData(data);
     }