From 5b8beebaa3b343f6f9e44c9b3d21b09b745c6ab4 Mon Sep 17 00:00:00 2001
From: dfsek <dfsek@protonmail.com>
Date: Wed, 20 Jan 2021 18:49:45 -0700
Subject: [PATCH] fix fabric stuff

---
 .../dfsek/terra/api/math/noise/samplers/FastNoiseLite.java  | 2 +-
 .../main/java/com/dfsek/terra/biome/ImageBiomeProvider.java | 1 -
 common/src/test/java/biome/DistributionTest.java            | 2 +-
 .../com/dfsek/terra/bukkit/listeners/PaperListener.java     | 2 +-
 .../main/java/com/dfsek/terra/fabric/TerraFabricPlugin.java | 6 +++---
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/common/src/main/java/com/dfsek/terra/api/math/noise/samplers/FastNoiseLite.java b/common/src/main/java/com/dfsek/terra/api/math/noise/samplers/FastNoiseLite.java
index 56fa88331..91970516f 100644
--- a/common/src/main/java/com/dfsek/terra/api/math/noise/samplers/FastNoiseLite.java
+++ b/common/src/main/java/com/dfsek/terra/api/math/noise/samplers/FastNoiseLite.java
@@ -1642,7 +1642,7 @@ public class FastNoiseLite implements NoiseSampler {
         return lerp(xf0, xf1, ys) * 1.4247691104677813;
     }
 
-    long murmur64(long h) {
+    private long murmur64(long h) {
         h ^= h >>> 33;
         h *= 0xff51afd7ed558ccdL;
         h ^= h >>> 33;
diff --git a/common/src/main/java/com/dfsek/terra/biome/ImageBiomeProvider.java b/common/src/main/java/com/dfsek/terra/biome/ImageBiomeProvider.java
index f0924f1e8..9afdbd400 100644
--- a/common/src/main/java/com/dfsek/terra/biome/ImageBiomeProvider.java
+++ b/common/src/main/java/com/dfsek/terra/biome/ImageBiomeProvider.java
@@ -27,7 +27,6 @@ public class ImageBiomeProvider implements BiomeProvider {
     @Override
     public TerraBiome getBiome(int x, int z) {
         Color color = new Color(image.getRGB(FastMath.floorMod(x / resolution, image.getWidth()), FastMath.floorMod(z / resolution, image.getHeight())));
-
         return colorBiomeMap.get(colorBiomeMap.keySet().stream().reduce(colorBiomeMap.keySet().stream().findAny().orElseThrow(IllegalStateException::new), (running, element) -> {
             int d1 = distance(color, running);
             int d2 = distance(color, element);
diff --git a/common/src/test/java/biome/DistributionTest.java b/common/src/test/java/biome/DistributionTest.java
index 4305b5cd0..6dcc6c59c 100644
--- a/common/src/test/java/biome/DistributionTest.java
+++ b/common/src/test/java/biome/DistributionTest.java
@@ -168,7 +168,7 @@ public class DistributionTest {
     }
 
     private static final class BiomeProviderTemplate implements ConfigTemplate {
-        @Value("biome-pipeline")
+        @Value("biomes")
         BiomeProvider.BiomeProviderBuilder biomeProviderBuilder;
 
         public BiomeProvider.BiomeProviderBuilder getBiomeProviderBuilder() {
diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/PaperListener.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/PaperListener.java
index b06de01b3..04d2ba8ad 100644
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/PaperListener.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/PaperListener.java
@@ -22,9 +22,9 @@ public class PaperListener implements Listener {
 
     @EventHandler
     public void onStructureLocate(StructureLocateEvent e) {
+        if(!TerraWorld.isTerraWorld(BukkitAdapter.adapt(e.getWorld()))) return;
         e.setResult(null); // Assume no result.
         String name = "minecraft:" + e.getType().getName();
-        if(!TerraWorld.isTerraWorld(BukkitAdapter.adapt(e.getWorld()))) return;
         Debug.info("Overriding structure location for \"" + name + "\"");
         TerraWorld tw = main.getWorld(BukkitAdapter.adapt(e.getWorld()));
         TerraStructure config = tw.getConfig().getStructure(tw.getConfig().getTemplate().getLocatable().get(name));
diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraFabricPlugin.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraFabricPlugin.java
index 7c934ffc2..3961cbd78 100644
--- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraFabricPlugin.java
+++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraFabricPlugin.java
@@ -13,7 +13,7 @@ import com.dfsek.terra.api.platform.world.World;
 import com.dfsek.terra.api.transform.MapTransform;
 import com.dfsek.terra.api.transform.NotNullValidator;
 import com.dfsek.terra.api.transform.Transformer;
-import com.dfsek.terra.biome.UserDefinedBiome;
+import com.dfsek.terra.api.world.biome.TerraBiome;
 import com.dfsek.terra.config.base.ConfigPack;
 import com.dfsek.terra.config.base.PluginConfig;
 import com.dfsek.terra.config.lang.LangUtil;
@@ -194,11 +194,11 @@ public class TerraFabricPlugin implements TerraPlugin, ModInitializer {
                 .registerLoader(com.dfsek.terra.api.platform.world.Biome.class, (t, o, l) -> new FabricBiome(biomeFixer.translate((String) o)));
     }
 
-    public static String createBiomeID(ConfigPack pack, UserDefinedBiome biome) {
+    public static String createBiomeID(ConfigPack pack, TerraBiome biome) {
         return pack.getTemplate().getID().toLowerCase() + "/" + biome.getID().toLowerCase();
     }
 
-    private Biome createBiome(UserDefinedBiome biome) {
+    private Biome createBiome(TerraBiome biome) {
         SpawnSettings.Builder spawnSettings = new SpawnSettings.Builder();
         DefaultBiomeFeatures.addFarmAnimals(spawnSettings);
         DefaultBiomeFeatures.addMonsters(spawnSettings, 95, 5, 100);