fix several issues in minemap

hube12 · Jul 20, 2021 · b22c17d · b22c17d
1 parent ead40e2
commit b22c17d
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 83 deletions.
diff --git a/build.gradle b/build.gradle
@@ -68,14 +68,14 @@ run {
 dependencies {
     implementation('com.github.KaptainWutax:MathUtils:5531c4a87b0f1bb85d1dab2bdd18ce375400626a') { transitive = false }
     implementation('com.github.KaptainWutax:SeedUtils:b6a383113ce5d8d09a59e91b28ff064fb97c0709') { transitive = false }
-    implementation('com.github.KaptainWutax:MCUtils:ada314031f913553ed23f3fc466082418e95b3bb') { transitive = false }
-    implementation('com.github.KaptainWutax:NoiseUtils:4e17e706b685f717782e0bc270c31ea99816b4ec') { transitive = false }
+    implementation('com.github.KaptainWutax:MCUtils:96545bc961eb5d51e18ec2b0cf6c5ce731899b0c') { transitive = false }
+    implementation('com.github.KaptainWutax:NoiseUtils:49d64c336a099086c627d2391760134ebd81292f') { transitive = false }
 
-    implementation('com.github.KaptainWutax:BiomeUtils:1499dca90e2c029249c4af5a842380240dcecee0') { transitive = false }
-    implementation('com.github.KaptainWutax:TerrainUtils:208176943c050d13aac11896995890eec81c6d2c') { transitive = false }
-    implementation('com.github.KaptainWutax:FeatureUtils:778372168e5a187c343f6864363e0e5c9a4c172d') { transitive = false }
+    implementation('com.github.KaptainWutax:BiomeUtils:c0aa2f0e4974c2b4bc23e38f2ce503983ce4564d') { transitive = false }
+    implementation('com.github.KaptainWutax:TerrainUtils:5e0c4033bb97b5d5d6849fffe826fc32f05ec116') { transitive = false }
+    implementation('com.github.KaptainWutax:FeatureUtils:993693c27a1d4b9c417746119952d1b1bc4ba81b') { transitive = false }
 
-    testImplementation('com.github.KaptainWutax:ChunkRandomReversal:3fc82aab792d811fb296dcc28fe7177ac80c31f0') {transitive = false}
+    testImplementation('com.github.KaptainWutax:ChunkRandomReversal:6b76fb5cf2cd438de56e6a46cea2a83985831834') { transitive = false }
     implementation('com.seedfinding:latticg:1.05')
 
     implementation('com.google.code.gson:gson:2.8.6')

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/java/kaptainwutax/minemap/config/IconsConfig.java b/src/main/java/kaptainwutax/minemap/config/IconsConfig.java
@@ -3,6 +3,7 @@
 import com.google.gson.annotations.Expose;
 import kaptainwutax.featureutils.decorator.EndGateway;
 import kaptainwutax.featureutils.misc.SlimeChunk;
+import kaptainwutax.featureutils.misc.SpawnPoint;
 import kaptainwutax.featureutils.structure.*;
 import kaptainwutax.minemap.feature.*;
 import kaptainwutax.minemap.init.Logger;

diff --git a/src/main/java/kaptainwutax/minemap/feature/SpawnPoint.java b/src/main/java/kaptainwutax/minemap/feature/SpawnPoint.java
diff --git a/src/main/java/kaptainwutax/minemap/init/Features.java b/src/main/java/kaptainwutax/minemap/init/Features.java
@@ -3,6 +3,7 @@
 import kaptainwutax.featureutils.Feature;
 import kaptainwutax.featureutils.decorator.EndGateway;
 import kaptainwutax.featureutils.misc.SlimeChunk;
+import kaptainwutax.featureutils.misc.SpawnPoint;
 import kaptainwutax.featureutils.structure.*;
 import kaptainwutax.mcutils.version.MCVersion;
 import kaptainwutax.minemap.feature.*;
@@ -46,7 +47,7 @@ public static void registerFeatures() {
         register(EndGateway.class, EndGateway::new);
         register(SlimeChunk.class, SlimeChunk::new);
 
-        register(SpawnPoint.class, v -> new SpawnPoint());
+        register(SpawnPoint.class, v-> new SpawnPoint());
     }
 
     public static <T extends Feature<?, ?>> void register(Class<T> clazz, FeatureFactory<T> factory) {

diff --git a/src/main/java/kaptainwutax/minemap/init/Icons.java b/src/main/java/kaptainwutax/minemap/init/Icons.java
@@ -4,6 +4,7 @@
 import kaptainwutax.featureutils.loot.item.Item;
 import kaptainwutax.featureutils.loot.item.Items;
 import kaptainwutax.featureutils.misc.SlimeChunk;
+import kaptainwutax.featureutils.misc.SpawnPoint;
 import kaptainwutax.featureutils.structure.*;
 import kaptainwutax.mcutils.util.data.Pair;
 import kaptainwutax.mcutils.version.MCVersion;

diff --git a/src/main/java/kaptainwutax/minemap/ui/map/icon/SpawnIcon.java b/src/main/java/kaptainwutax/minemap/ui/map/icon/SpawnIcon.java
@@ -1,10 +1,8 @@
 package kaptainwutax.minemap.ui.map.icon;
 
-import kaptainwutax.biomeutils.source.BiomeSource;
-import kaptainwutax.biomeutils.source.OverworldBiomeSource;
 import kaptainwutax.featureutils.Feature;
+import kaptainwutax.featureutils.misc.SpawnPoint;
 import kaptainwutax.mcutils.util.pos.BPos;
-import kaptainwutax.minemap.feature.SpawnPoint;
 import kaptainwutax.minemap.ui.map.MapContext;
 import kaptainwutax.minemap.ui.map.fragment.Fragment;
 import kaptainwutax.terrainutils.TerrainGenerator;
@@ -19,7 +17,7 @@ public class SpawnIcon extends StaticIcon {
     public SpawnIcon(MapContext context) {
         super(context);
         TerrainGenerator generator = this.getContext().getTerrainGenerator();
-        this.pos = generator instanceof OverworldTerrainGenerator ? kaptainwutax.featureutils.misc.SpawnPoint.getSpawnPoint((OverworldTerrainGenerator) generator) : null;
+        this.pos = generator instanceof OverworldTerrainGenerator ? SpawnPoint.getSpawn((OverworldTerrainGenerator) generator) : null;
     }
 
     public BPos getPos() {

diff --git a/src/main/java/kaptainwutax/minemap/ui/menubar/WorldMenu.java b/src/main/java/kaptainwutax/minemap/ui/menubar/WorldMenu.java
@@ -1,10 +1,10 @@
 package kaptainwutax.minemap.ui.menubar;
 
+import kaptainwutax.featureutils.misc.SpawnPoint;
 import kaptainwutax.mcutils.rand.seed.WorldSeed;
 import kaptainwutax.mcutils.state.Dimension;
 import kaptainwutax.mcutils.util.pos.BPos;
 import kaptainwutax.minemap.MineMap;
-import kaptainwutax.minemap.feature.SpawnPoint;
 import kaptainwutax.minemap.init.KeyShortcuts;
 import kaptainwutax.minemap.init.Logger;
 import kaptainwutax.minemap.listener.Events;