Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,16 @@ repositories {
}

dependencies {
implementation 'com.github.KaptainWutax:SEED:1c966a327ec286906f92f9e849d46a9b2408d3ad'
implementation('com.github.KaptainWutax:MathUtils:5531c4a87b0f1bb85d1dab2bdd18ce375400626a') { transitive = false }
implementation('com.github.KaptainWutax:SeedUtils:b6a383113ce5d8d09a59e91b28ff064fb97c0709') { transitive = false }
implementation('com.github.KaptainWutax:NoiseUtils:bb71e46efe0f8d930bac8af94fecf250b70e0c23') { transitive = false }

implementation('com.github.KaptainWutax:MCUtils:cb9c78e4e37e12dca0ddaefc3a7f3053dfbd237b') { transitive = false }

implementation('com.github.KaptainWutax:BiomeUtils:f27f6e029b85c8a32371ae62292c6ac7fb121674') {transitive = false}
implementation('com.github.KaptainWutax:TerrainUtils:5b477c80a266b1fb2241f11a56538fb33b04a478') {transitive = false}
implementation('com.github.KaptainWutax:FeatureUtils:c37afd12ec9127fe7d20477e2b1be2de1f515ef0') {transitive = false}

implementation 'com.google.code.gson:gson:2.8.6'
implementation "com.formdev:flatlaf:0.38"
implementation 'com.github.wearblackallday:JavaUtils:6341f4093b9adb3de1342bb96bcf5b9d10e7058c'
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/kaptainwutax/minemap/config/SaltsConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import com.google.gson.annotations.Expose;
import kaptainwutax.featureutils.structure.*;
import kaptainwutax.seedutils.mc.MCVersion;
import kaptainwutax.mcutils.version.MCVersion;

import java.io.IOException;
import java.util.HashMap;
Expand Down Expand Up @@ -104,7 +104,7 @@ private void resetConfig(MCVersion version) {
this.addDefaultEntry(version, Structure.getName(NetherFossil.class), NetherFossil.CONFIGS.getAsOf(version) == null ? null : NetherFossil.CONFIGS.getAsOf(version).salt);
this.addDefaultEntry(version, Structure.getName(OceanRuin.class), OceanRuin.CONFIGS.getAsOf(version) == null ? null : OceanRuin.CONFIGS.getAsOf(version).salt);
this.addDefaultEntry(version, Structure.getName(PillagerOutpost.class), PillagerOutpost.CONFIGS.getAsOf(version) == null ? null : PillagerOutpost.CONFIGS.getAsOf(version).salt);
this.addDefaultEntry(version, Structure.getName(RuinedPortal.class), RuinedPortal.CONFIGS.getAsOf(version) == null ? null : RuinedPortal.CONFIGS.getAsOf(version).salt);
this.addDefaultEntry(version, Structure.getName(RuinedPortal.class), RuinedPortal.OVERWORLD_CONFIGS.getAsOf(version) == null ? null : RuinedPortal.OVERWORLD_CONFIGS.getAsOf(version).salt);
this.addDefaultEntry(version, Structure.getName(Shipwreck.class), Shipwreck.CONFIGS.getAsOf(version) == null ? null : Shipwreck.CONFIGS.getAsOf(version).salt);
this.addDefaultEntry(version, Structure.getName(SwampHut.class), SwampHut.CONFIGS.getAsOf(version) == null ? null : SwampHut.CONFIGS.getAsOf(version).salt);
this.addDefaultEntry(version, Structure.getName(Village.class), Village.CONFIGS.getAsOf(version) == null ? null : Village.CONFIGS.getAsOf(version).salt);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
import kaptainwutax.minemap.feature.OWBastionRemnant;
import kaptainwutax.minemap.feature.OWFortress;
import kaptainwutax.minemap.ui.map.MapSettings;
import kaptainwutax.seedutils.mc.Dimension;
import kaptainwutax.seedutils.mc.MCVersion;
import kaptainwutax.mcutils.state.Dimension;
import kaptainwutax.mcutils.version.MCVersion;

import java.io.IOException;
import java.util.LinkedHashMap;
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/kaptainwutax/minemap/config/UserSettings.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
package kaptainwutax.minemap.config;

import com.google.gson.annotations.Expose;
import kaptainwutax.seedutils.util.math.DistanceMetric;
import kaptainwutax.mcutils.util.math.DistanceMetric;


public class UserSettings {

Expand Down
31 changes: 31 additions & 0 deletions src/main/java/kaptainwutax/minemap/feature/NERuinedPortal.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
package kaptainwutax.minemap.feature;

import kaptainwutax.featureutils.structure.RuinedPortal;
import kaptainwutax.mcutils.state.Dimension;
import kaptainwutax.mcutils.version.MCVersion;

public class NERuinedPortal extends RuinedPortal {

public NERuinedPortal(MCVersion version) {
super(Dimension.NETHER, version);
}

public NERuinedPortal(Config config, MCVersion version) {
super(Dimension.NETHER, config, version);
}

public static String name() {
return "NE_ruined_portal";
}

@Override
public String getName() {
return name();
}

@Override
public boolean isValidDimension(Dimension dimension) {
return dimension == Dimension.NETHER;
}

}
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package kaptainwutax.minemap.feature;

import kaptainwutax.featureutils.structure.BastionRemnant;
import kaptainwutax.seedutils.mc.Dimension;
import kaptainwutax.seedutils.mc.MCVersion;
import kaptainwutax.mcutils.state.Dimension;
import kaptainwutax.mcutils.version.MCVersion;

public class OWBastionRemnant extends BastionRemnant {

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/kaptainwutax/minemap/feature/OWFortress.java
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package kaptainwutax.minemap.feature;

import kaptainwutax.featureutils.structure.Fortress;
import kaptainwutax.seedutils.mc.Dimension;
import kaptainwutax.seedutils.mc.MCVersion;
import kaptainwutax.mcutils.state.Dimension;
import kaptainwutax.mcutils.version.MCVersion;

public class OWFortress extends Fortress {

Expand Down
32 changes: 32 additions & 0 deletions src/main/java/kaptainwutax/minemap/feature/OWRuinedPortal.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
package kaptainwutax.minemap.feature;

import kaptainwutax.featureutils.structure.RuinedPortal;
import kaptainwutax.mcutils.state.Dimension;
import kaptainwutax.mcutils.version.MCVersion;

public class OWRuinedPortal extends RuinedPortal {

public OWRuinedPortal(MCVersion version) {
super(Dimension.OVERWORLD, version);
}

public OWRuinedPortal(Config config, MCVersion version) {
super(Dimension.OVERWORLD, config, version);
}

public static String name() {
return "OW_ruined_portal";
}

@Override
public String getName() {
return name();
}

@Override
public boolean isValidDimension(Dimension dimension) {
return dimension == Dimension.OVERWORLD;
}

}

8 changes: 4 additions & 4 deletions src/main/java/kaptainwutax/minemap/feature/SpawnPoint.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
import kaptainwutax.biomeutils.source.BiomeSource;
import kaptainwutax.biomeutils.source.OverworldBiomeSource;
import kaptainwutax.featureutils.Feature;
import kaptainwutax.seedutils.mc.ChunkRand;
import kaptainwutax.seedutils.mc.Dimension;
import kaptainwutax.seedutils.mc.MCVersion;
import kaptainwutax.seedutils.mc.pos.BPos;
import kaptainwutax.mcutils.rand.ChunkRand;
import kaptainwutax.mcutils.state.Dimension;
import kaptainwutax.mcutils.version.MCVersion;
import kaptainwutax.mcutils.util.pos.BPos;

public class SpawnPoint extends Feature<Feature.Config, SpawnPoint.Data> {

Expand Down
9 changes: 4 additions & 5 deletions src/main/java/kaptainwutax/minemap/init/Features.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,9 @@
import kaptainwutax.featureutils.decorator.EndGateway;
import kaptainwutax.featureutils.misc.SlimeChunk;
import kaptainwutax.featureutils.structure.*;
import kaptainwutax.minemap.feature.OWBastionRemnant;
import kaptainwutax.minemap.feature.OWFortress;
import kaptainwutax.minemap.feature.SpawnPoint;
import kaptainwutax.minemap.feature.*;
import kaptainwutax.minemap.ui.map.fragment.FeatureFactory;
import kaptainwutax.seedutils.mc.MCVersion;
import kaptainwutax.mcutils.version.MCVersion;

import java.util.HashMap;
import java.util.Map;
Expand All @@ -31,7 +29,8 @@ public static void registerFeatures() {
register(NetherFossil.class, NetherFossil::new);
register(OceanRuin.class, OceanRuin::new);
register(PillagerOutpost.class, PillagerOutpost::new);
register(RuinedPortal.class, RuinedPortal::new);
register(OWRuinedPortal.class, OWRuinedPortal::new);
register(NERuinedPortal.class, NERuinedPortal::new);
register(Shipwreck.class, Shipwreck::new);
register(SwampHut.class, SwampHut::new);
register(Village.class, Village::new);
Expand Down
7 changes: 3 additions & 4 deletions src/main/java/kaptainwutax/minemap/init/Icons.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@
import kaptainwutax.featureutils.decorator.EndGateway;
import kaptainwutax.featureutils.misc.SlimeChunk;
import kaptainwutax.featureutils.structure.*;
import kaptainwutax.minemap.feature.OWBastionRemnant;
import kaptainwutax.minemap.feature.OWFortress;
import kaptainwutax.minemap.feature.SpawnPoint;
import kaptainwutax.minemap.feature.*;

import javax.imageio.ImageIO;
import java.awt.image.BufferedImage;
Expand All @@ -32,7 +30,8 @@ public static void registerIcons() {
register(NetherFossil.class, Structure.getName(NetherFossil.class));
register(OceanRuin.class, Structure.getName(OceanRuin.class));
register(PillagerOutpost.class, Structure.getName(PillagerOutpost.class));
register(RuinedPortal.class, Structure.getName(RuinedPortal.class));
register(OWRuinedPortal.class, Structure.getName(RuinedPortal.class));
register(NERuinedPortal.class, Structure.getName(RuinedPortal.class));
register(Shipwreck.class, Structure.getName(Shipwreck.class));
register(SwampHut.class, Structure.getName(SwampHut.class));
register(Village.class, Structure.getName(Village.class));
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/kaptainwutax/minemap/ui/MenuBar.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package kaptainwutax.minemap.ui;

import kaptainwutax.mcutils.rand.seed.WorldSeed;
import kaptainwutax.minemap.MineMap;
import kaptainwutax.minemap.init.Configs;
import kaptainwutax.minemap.ui.map.MapPanel;
import kaptainwutax.seedutils.mc.seed.WorldSeed;
import wearblackallday.swing.Events;
import wearblackallday.swing.components.MenuBuilder;

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/kaptainwutax/minemap/ui/component/TabGroup.java
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package kaptainwutax.minemap.ui.component;

import kaptainwutax.minemap.ui.map.MapPanel;
import kaptainwutax.seedutils.mc.Dimension;
import kaptainwutax.seedutils.mc.MCVersion;
import kaptainwutax.mcutils.state.Dimension;
import kaptainwutax.mcutils.version.MCVersion;

import java.util.*;
import java.util.concurrent.atomic.AtomicBoolean;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package kaptainwutax.minemap.ui.component;

import kaptainwutax.minemap.ui.map.MapPanel;
import kaptainwutax.seedutils.mc.Dimension;
import kaptainwutax.seedutils.mc.MCVersion;
import kaptainwutax.mcutils.state.Dimension;
import kaptainwutax.mcutils.version.MCVersion;
import wearblackallday.data.Strings;

import javax.swing.*;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/kaptainwutax/minemap/ui/dialog/Dialog.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
import kaptainwutax.minemap.MineMap;
import kaptainwutax.minemap.init.Configs;
import kaptainwutax.minemap.ui.map.MapPanel;
import kaptainwutax.seedutils.mc.Dimension;
import kaptainwutax.seedutils.mc.MCVersion;
import kaptainwutax.mcutils.state.Dimension;
import kaptainwutax.mcutils.version.MCVersion;
import wearblackallday.swing.SwingUtils;
import wearblackallday.swing.components.CustomPanel;
import wearblackallday.swing.components.SelectionBox;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/kaptainwutax/minemap/ui/map/IconManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import kaptainwutax.minemap.ui.DrawInfo;
import kaptainwutax.minemap.ui.map.fragment.Fragment;
import kaptainwutax.minemap.ui.map.icon.*;
import kaptainwutax.seedutils.mc.pos.BPos;
import kaptainwutax.mcutils.util.pos.BPos;

import java.awt.*;
import java.util.ArrayList;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/kaptainwutax/minemap/ui/map/MapContext.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
import kaptainwutax.biomeutils.layer.BiomeLayer;
import kaptainwutax.biomeutils.source.BiomeSource;
import kaptainwutax.minemap.init.Configs;
import kaptainwutax.seedutils.mc.Dimension;
import kaptainwutax.seedutils.mc.MCVersion;
import kaptainwutax.mcutils.state.Dimension;
import kaptainwutax.mcutils.version.MCVersion;

import java.util.HashMap;
import java.util.Map;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/kaptainwutax/minemap/ui/map/MapManager.java
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package kaptainwutax.minemap.ui.map;

import kaptainwutax.mathutils.util.Mth;
import kaptainwutax.mcutils.util.math.Vec3i;
import kaptainwutax.minemap.MineMap;
import kaptainwutax.minemap.init.Configs;
import kaptainwutax.seedutils.mc.pos.BPos;
import kaptainwutax.seedutils.util.math.Vec3i;
import kaptainwutax.mcutils.util.pos.BPos;
import wearblackallday.swing.Events;
import wearblackallday.swing.SwingUtils;

Expand Down
8 changes: 4 additions & 4 deletions src/main/java/kaptainwutax/minemap/ui/map/MapPanel.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
import kaptainwutax.minemap.ui.component.WorldTabs;
import kaptainwutax.minemap.ui.map.fragment.Fragment;
import kaptainwutax.minemap.ui.map.fragment.FragmentScheduler;
import kaptainwutax.seedutils.mc.Dimension;
import kaptainwutax.seedutils.mc.MCVersion;
import kaptainwutax.seedutils.mc.pos.BPos;
import kaptainwutax.seedutils.mc.pos.RPos;
import kaptainwutax.mcutils.state.Dimension;
import kaptainwutax.mcutils.version.MCVersion;
import kaptainwutax.mcutils.util.pos.BPos;
import kaptainwutax.mcutils.util.pos.RPos;

import javax.swing.*;
import java.awt.*;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/kaptainwutax/minemap/ui/map/MapSettings.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
import kaptainwutax.biomeutils.Biome;
import kaptainwutax.featureutils.Feature;
import kaptainwutax.minemap.init.Features;
import kaptainwutax.seedutils.mc.Dimension;
import kaptainwutax.seedutils.mc.MCVersion;
import kaptainwutax.mcutils.state.Dimension;
import kaptainwutax.mcutils.version.MCVersion;

import java.text.Collator;
import java.util.*;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package kaptainwutax.minemap.ui.map.fragment;

import kaptainwutax.featureutils.Feature;
import kaptainwutax.seedutils.mc.MCVersion;
import kaptainwutax.mcutils.version.MCVersion;

@FunctionalInterface
public interface FeatureFactory<T extends Feature<?, ?>> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
import kaptainwutax.minemap.ui.map.IconManager;
import kaptainwutax.minemap.ui.map.MapContext;
import kaptainwutax.minemap.ui.map.icon.IconRenderer;
import kaptainwutax.seedutils.mc.pos.BPos;
import kaptainwutax.seedutils.mc.pos.RPos;
import kaptainwutax.mcutils.util.pos.BPos;
import kaptainwutax.mcutils.util.pos.RPos;

import java.awt.*;
import java.awt.image.BufferedImage;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
import kaptainwutax.minemap.init.Configs;
import kaptainwutax.minemap.ui.DrawInfo;
import kaptainwutax.minemap.ui.map.MapPanel;
import kaptainwutax.seedutils.mc.pos.BPos;
import kaptainwutax.seedutils.mc.pos.RPos;
import kaptainwutax.mcutils.util.pos.BPos;
import kaptainwutax.mcutils.util.pos.RPos;
import wearblackallday.threading.ThreadPool;

import javax.swing.*;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import kaptainwutax.minemap.ui.DrawInfo;
import kaptainwutax.minemap.ui.map.MapContext;
import kaptainwutax.minemap.ui.map.fragment.Fragment;
import kaptainwutax.seedutils.mc.pos.BPos;
import kaptainwutax.mcutils.util.pos.BPos;

import java.awt.*;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
import kaptainwutax.featureutils.decorator.EndGateway;
import kaptainwutax.minemap.ui.map.MapContext;
import kaptainwutax.minemap.ui.map.fragment.Fragment;
import kaptainwutax.seedutils.mc.ChunkRand;
import kaptainwutax.seedutils.mc.pos.BPos;
import kaptainwutax.mcutils.rand.ChunkRand;
import kaptainwutax.mcutils.util.pos.BPos;

import java.util.List;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import kaptainwutax.minemap.ui.DrawInfo;
import kaptainwutax.minemap.ui.map.MapContext;
import kaptainwutax.minemap.ui.map.fragment.Fragment;
import kaptainwutax.seedutils.mc.pos.BPos;
import kaptainwutax.mcutils.util.pos.BPos;

import java.awt.*;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
import kaptainwutax.featureutils.structure.Mineshaft;
import kaptainwutax.minemap.ui.map.MapContext;
import kaptainwutax.minemap.ui.map.fragment.Fragment;
import kaptainwutax.seedutils.mc.ChunkRand;
import kaptainwutax.seedutils.mc.pos.BPos;
import kaptainwutax.mcutils.rand.ChunkRand;
import kaptainwutax.mcutils.util.pos.BPos;

import java.util.List;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import kaptainwutax.featureutils.Feature;
import kaptainwutax.minemap.ui.DrawInfo;
import kaptainwutax.minemap.ui.map.fragment.Fragment;
import kaptainwutax.seedutils.mc.pos.BPos;
import kaptainwutax.mcutils.util.pos.BPos;

import java.awt.*;
import java.util.List;
Expand Down
Loading