moved and renamed classes
parent
f8e0fda558
commit
f4ed2c54fe
|
@ -21,10 +21,10 @@ import amidst.Application;
|
||||||
import amidst.Options;
|
import amidst.Options;
|
||||||
import amidst.documentation.AmidstThread;
|
import amidst.documentation.AmidstThread;
|
||||||
import amidst.documentation.CalledOnlyBy;
|
import amidst.documentation.CalledOnlyBy;
|
||||||
|
import amidst.gui.menu.Actions;
|
||||||
import amidst.gui.menu.AmidstMenu;
|
import amidst.gui.menu.AmidstMenu;
|
||||||
import amidst.gui.menu.AmidstMenuBuilder;
|
import amidst.gui.menu.AmidstMenuBuilder;
|
||||||
import amidst.gui.menu.LevelFileFilter;
|
import amidst.gui.menu.LevelFileFilter;
|
||||||
import amidst.gui.menu.MenuActions;
|
|
||||||
import amidst.gui.menu.PNGFileFilter;
|
import amidst.gui.menu.PNGFileFilter;
|
||||||
import amidst.gui.worldsurroundings.WorldSurroundings;
|
import amidst.gui.worldsurroundings.WorldSurroundings;
|
||||||
import amidst.gui.worldsurroundings.WorldSurroundingsBuilder;
|
import amidst.gui.worldsurroundings.WorldSurroundingsBuilder;
|
||||||
|
@ -46,7 +46,7 @@ public class MainWindow {
|
||||||
|
|
||||||
private final JFrame frame;
|
private final JFrame frame;
|
||||||
private final Container contentPane;
|
private final Container contentPane;
|
||||||
private final MenuActions actions;
|
private final Actions actions;
|
||||||
private final AmidstMenu menuBar;
|
private final AmidstMenu menuBar;
|
||||||
|
|
||||||
private final AtomicReference<WorldSurroundings> worldSurroundings = new AtomicReference<WorldSurroundings>();
|
private final AtomicReference<WorldSurroundings> worldSurroundings = new AtomicReference<WorldSurroundings>();
|
||||||
|
@ -94,8 +94,8 @@ public class MainWindow {
|
||||||
return contentPane;
|
return contentPane;
|
||||||
}
|
}
|
||||||
|
|
||||||
private MenuActions createMenuActions() {
|
private Actions createMenuActions() {
|
||||||
return new MenuActions(application, mojangApi, this, worldSurroundings,
|
return new Actions(application, mojangApi, this, worldSurroundings,
|
||||||
skinLoader, updatePrompt, options.biomeColorProfileSelection);
|
skinLoader, updatePrompt, options.biomeColorProfileSelection);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -14,7 +14,6 @@ import javax.imageio.ImageIO;
|
||||||
|
|
||||||
import amidst.Application;
|
import amidst.Application;
|
||||||
import amidst.gui.MainWindow;
|
import amidst.gui.MainWindow;
|
||||||
import amidst.gui.MovePlayerPopupMenu;
|
|
||||||
import amidst.gui.SkinLoader;
|
import amidst.gui.SkinLoader;
|
||||||
import amidst.gui.UpdatePrompt;
|
import amidst.gui.UpdatePrompt;
|
||||||
import amidst.gui.worldsurroundings.WorldSurroundings;
|
import amidst.gui.worldsurroundings.WorldSurroundings;
|
||||||
|
@ -28,7 +27,7 @@ import amidst.mojangapi.world.icon.WorldIcon;
|
||||||
import amidst.preferences.BiomeColorProfile;
|
import amidst.preferences.BiomeColorProfile;
|
||||||
import amidst.preferences.BiomeColorProfileSelection;
|
import amidst.preferences.BiomeColorProfileSelection;
|
||||||
|
|
||||||
public class MenuActions {
|
public class Actions {
|
||||||
private static final String ABOUT_MESSAGE = "Advanced Minecraft Interfacing and Data/Structure Tracking (AMIDST)\n"
|
private static final String ABOUT_MESSAGE = "Advanced Minecraft Interfacing and Data/Structure Tracking (AMIDST)\n"
|
||||||
+ "By Skidoodle (amidst.project@gmail.com)";
|
+ "By Skidoodle (amidst.project@gmail.com)";
|
||||||
|
|
||||||
|
@ -40,7 +39,7 @@ public class MenuActions {
|
||||||
private final UpdatePrompt updatePrompt;
|
private final UpdatePrompt updatePrompt;
|
||||||
private final BiomeColorProfileSelection biomeColorProfileSelection;
|
private final BiomeColorProfileSelection biomeColorProfileSelection;
|
||||||
|
|
||||||
public MenuActions(Application application, MojangApi mojangApi,
|
public Actions(Application application, MojangApi mojangApi,
|
||||||
MainWindow mainWindow,
|
MainWindow mainWindow,
|
||||||
AtomicReference<WorldSurroundings> worldSurroundings,
|
AtomicReference<WorldSurroundings> worldSurroundings,
|
||||||
SkinLoader skinLoader, UpdatePrompt updatePrompt,
|
SkinLoader skinLoader, UpdatePrompt updatePrompt,
|
|
@ -21,13 +21,13 @@ import amidst.resources.ResourceLoader;
|
||||||
|
|
||||||
public class AmidstMenuBuilder {
|
public class AmidstMenuBuilder {
|
||||||
private final Options options;
|
private final Options options;
|
||||||
private final MenuActions actions;
|
private final Actions actions;
|
||||||
private final JMenuBar menuBar;
|
private final JMenuBar menuBar;
|
||||||
private JMenu worldMenu;
|
private JMenu worldMenu;
|
||||||
private JMenuItem savePlayerLocationsMenu;
|
private JMenuItem savePlayerLocationsMenu;
|
||||||
private JMenuItem reloadPlayerLocationsMenu;
|
private JMenuItem reloadPlayerLocationsMenu;
|
||||||
|
|
||||||
public AmidstMenuBuilder(Options options, MenuActions actions) {
|
public AmidstMenuBuilder(Options options, Actions actions) {
|
||||||
this.options = options;
|
this.options = options;
|
||||||
this.actions = actions;
|
this.actions = actions;
|
||||||
this.menuBar = createMenuBar();
|
this.menuBar = createMenuBar();
|
||||||
|
|
|
@ -25,10 +25,10 @@ public class BiomeColorMenuFactory {
|
||||||
private ActionListener firstListener;
|
private ActionListener firstListener;
|
||||||
private boolean isFirstContainer = true;
|
private boolean isFirstContainer = true;
|
||||||
|
|
||||||
private final MenuActions actions;
|
private final Actions actions;
|
||||||
|
|
||||||
private BiomeColorProfileVisitorImpl(JMenu parentMenu,
|
private BiomeColorProfileVisitorImpl(JMenu parentMenu,
|
||||||
MenuActions actions) {
|
Actions actions) {
|
||||||
this.actions = actions;
|
this.actions = actions;
|
||||||
menuStack.add(parentMenu);
|
menuStack.add(parentMenu);
|
||||||
}
|
}
|
||||||
|
@ -110,10 +110,10 @@ public class BiomeColorMenuFactory {
|
||||||
}
|
}
|
||||||
|
|
||||||
private final JMenu parentMenu = new JMenu("Biome profile");
|
private final JMenu parentMenu = new JMenu("Biome profile");
|
||||||
private final MenuActions actions;
|
private final Actions actions;
|
||||||
private final BiomeColorProfileLoader biomeColorProfileLoader = new BiomeColorProfileLoader();
|
private final BiomeColorProfileLoader biomeColorProfileLoader = new BiomeColorProfileLoader();
|
||||||
|
|
||||||
public BiomeColorMenuFactory(MenuActions actions) {
|
public BiomeColorMenuFactory(Actions actions) {
|
||||||
this.actions = actions;
|
this.actions = actions;
|
||||||
Log.i("Checking for additional biome color profiles.");
|
Log.i("Checking for additional biome color profiles.");
|
||||||
initParentMenu();
|
initParentMenu();
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
package amidst.gui;
|
package amidst.gui.menu;
|
||||||
|
|
||||||
import java.awt.Component;
|
import java.awt.Component;
|
||||||
import java.awt.event.ActionEvent;
|
import java.awt.event.ActionEvent;
|
||||||
|
@ -7,17 +7,16 @@ import java.awt.event.ActionListener;
|
||||||
import javax.swing.JMenuItem;
|
import javax.swing.JMenuItem;
|
||||||
import javax.swing.JPopupMenu;
|
import javax.swing.JPopupMenu;
|
||||||
|
|
||||||
import amidst.gui.menu.MenuActions;
|
|
||||||
import amidst.mojangapi.world.CoordinatesInWorld;
|
import amidst.mojangapi.world.CoordinatesInWorld;
|
||||||
import amidst.mojangapi.world.MovablePlayerList;
|
import amidst.mojangapi.world.MovablePlayerList;
|
||||||
import amidst.mojangapi.world.Player;
|
import amidst.mojangapi.world.Player;
|
||||||
|
|
||||||
public class MovePlayerPopupMenu {
|
public class MovePlayerPopupMenu {
|
||||||
private final MenuActions actions;
|
private final Actions actions;
|
||||||
private final MovablePlayerList movablePlayerList;
|
private final MovablePlayerList movablePlayerList;
|
||||||
private final CoordinatesInWorld targetCoordinates;
|
private final CoordinatesInWorld targetCoordinates;
|
||||||
|
|
||||||
public MovePlayerPopupMenu(MenuActions actions,
|
public MovePlayerPopupMenu(Actions actions,
|
||||||
MovablePlayerList movablePlayerList,
|
MovablePlayerList movablePlayerList,
|
||||||
CoordinatesInWorld targetCoordinates) {
|
CoordinatesInWorld targetCoordinates) {
|
||||||
this.actions = actions;
|
this.actions = actions;
|
|
@ -8,7 +8,7 @@ import java.awt.event.MouseWheelEvent;
|
||||||
import java.awt.event.MouseWheelListener;
|
import java.awt.event.MouseWheelListener;
|
||||||
|
|
||||||
import amidst.fragment.FragmentGraph;
|
import amidst.fragment.FragmentGraph;
|
||||||
import amidst.gui.menu.MenuActions;
|
import amidst.gui.menu.Actions;
|
||||||
import amidst.gui.widget.WidgetManager;
|
import amidst.gui.widget.WidgetManager;
|
||||||
|
|
||||||
public class ViewerMouseListener implements MouseListener, MouseWheelListener {
|
public class ViewerMouseListener implements MouseListener, MouseWheelListener {
|
||||||
|
@ -17,11 +17,11 @@ public class ViewerMouseListener implements MouseListener, MouseWheelListener {
|
||||||
private final FragmentGraphToScreenTranslator translator;
|
private final FragmentGraphToScreenTranslator translator;
|
||||||
private final Zoom zoom;
|
private final Zoom zoom;
|
||||||
private final Movement movement;
|
private final Movement movement;
|
||||||
private final MenuActions actions;
|
private final Actions actions;
|
||||||
|
|
||||||
public ViewerMouseListener(WidgetManager widgetManager,
|
public ViewerMouseListener(WidgetManager widgetManager,
|
||||||
FragmentGraph graph, FragmentGraphToScreenTranslator translator,
|
FragmentGraph graph, FragmentGraphToScreenTranslator translator,
|
||||||
Zoom zoom, Movement movement, MenuActions actions) {
|
Zoom zoom, Movement movement, Actions actions) {
|
||||||
this.widgetManager = widgetManager;
|
this.widgetManager = widgetManager;
|
||||||
this.graph = graph;
|
this.graph = graph;
|
||||||
this.translator = translator;
|
this.translator = translator;
|
||||||
|
|
|
@ -10,7 +10,7 @@ import amidst.fragment.layer.LayerBuilder;
|
||||||
import amidst.fragment.layer.LayerDeclaration;
|
import amidst.fragment.layer.LayerDeclaration;
|
||||||
import amidst.fragment.layer.LayerLoader;
|
import amidst.fragment.layer.LayerLoader;
|
||||||
import amidst.fragment.layer.LayerReloader;
|
import amidst.fragment.layer.LayerReloader;
|
||||||
import amidst.gui.menu.MenuActions;
|
import amidst.gui.menu.Actions;
|
||||||
import amidst.gui.widget.Widget;
|
import amidst.gui.widget.Widget;
|
||||||
import amidst.gui.widget.WidgetBuilder;
|
import amidst.gui.widget.WidgetBuilder;
|
||||||
import amidst.gui.widget.WidgetManager;
|
import amidst.gui.widget.WidgetManager;
|
||||||
|
@ -33,7 +33,7 @@ public class WorldSurroundingsBuilder {
|
||||||
layerBuilder.getNumberOfLayers());
|
layerBuilder.getNumberOfLayers());
|
||||||
}
|
}
|
||||||
|
|
||||||
public WorldSurroundings create(World world, MenuActions actions) {
|
public WorldSurroundings create(World world, Actions actions) {
|
||||||
Movement movement = new Movement(options.smoothScrolling);
|
Movement movement = new Movement(options.smoothScrolling);
|
||||||
WorldIconSelection worldIconSelection = new WorldIconSelection();
|
WorldIconSelection worldIconSelection = new WorldIconSelection();
|
||||||
List<LayerDeclaration> declarations = layerBuilder.getDeclarations();
|
List<LayerDeclaration> declarations = layerBuilder.getDeclarations();
|
||||||
|
|
Loading…
Reference in New Issue