From 523035a4634801c052f08b9f70565bc8c3a71956 Mon Sep 17 00:00:00 2001 From: Surya Date: Sun, 31 Oct 2021 16:45:46 +0530 Subject: [PATCH 1/7] Fix backward compatibility while printing dimension sprite in list coordinates view --- .../mods/savecoords/util/IdentifiersCache.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/java/me/bionicbeanie/mods/savecoords/util/IdentifiersCache.java b/src/main/java/me/bionicbeanie/mods/savecoords/util/IdentifiersCache.java index f6882dc..66b1bc5 100644 --- a/src/main/java/me/bionicbeanie/mods/savecoords/util/IdentifiersCache.java +++ b/src/main/java/me/bionicbeanie/mods/savecoords/util/IdentifiersCache.java @@ -13,6 +13,9 @@ public class IdentifiersCache { public IdentifiersCache() { add(DEFAULT, cache); add("overworld", cache); + add("minecraft:overworld", "overworld", cache); + add("minecraft:the_end", "end", cache); + add("minecraft:the_nether", "nether", cache); add("nether", cache); add("end", cache); add("ping", cache); @@ -25,6 +28,10 @@ public class IdentifiersCache { return cache.getOrDefault(key, cache.get(DEFAULT)); } + private static void add(String identifierName, String resourceName, Map cache) { + cache.put(identifierName, createIdentifier(resourceName)); + } + private static void add(String resourceName, Map cache) { cache.put(resourceName, createIdentifier(resourceName)); } From 4d022fcb03450f779a99ef0872ef5d0915189e70 Mon Sep 17 00:00:00 2001 From: Surya Date: Fri, 26 Nov 2021 00:12:05 +0530 Subject: [PATCH 2/7] Add nether coordinate calculator --- .../mods/savecoords/IDimensionAware.java | 8 ++++ .../mods/savecoords/INetherCalculator.java | 7 +++ .../savecoords/SaveCoordinatesClient.java | 3 ++ .../mods/savecoords/gui/impl/DIContainer.java | 14 ++++-- .../savecoords/gui/impl/ListViewHandler.java | 39 ++++++++++----- .../gui/impl/SaveCoordinatesGui.java | 7 ++- .../mods/savecoords/impl/DimensionAware.java | 42 ++++++++++++++--- .../mods/savecoords/impl/Factory.java | 5 ++ .../savecoords/impl/NetherCalculator.java | 47 +++++++++++++++++++ 9 files changed, 146 insertions(+), 26 deletions(-) create mode 100644 src/main/java/me/bionicbeanie/mods/savecoords/INetherCalculator.java create mode 100644 src/main/java/me/bionicbeanie/mods/savecoords/impl/NetherCalculator.java diff --git a/src/main/java/me/bionicbeanie/mods/savecoords/IDimensionAware.java b/src/main/java/me/bionicbeanie/mods/savecoords/IDimensionAware.java index 57cee27..514e4e1 100644 --- a/src/main/java/me/bionicbeanie/mods/savecoords/IDimensionAware.java +++ b/src/main/java/me/bionicbeanie/mods/savecoords/IDimensionAware.java @@ -11,9 +11,17 @@ public interface IDimensionAware { IDimension getCurrentDimension(); IDimension getDimension(String dimensionKey); + + boolean isOverworld(IDimension dimension); + + boolean isNether(IDimension dimension); + + boolean isEnd(IDimension dimension); public interface IDimension { + public int getId(); + public String getName(); public Identifier getSpriteIdentifier(); diff --git a/src/main/java/me/bionicbeanie/mods/savecoords/INetherCalculator.java b/src/main/java/me/bionicbeanie/mods/savecoords/INetherCalculator.java new file mode 100644 index 0000000..7ac2e6c --- /dev/null +++ b/src/main/java/me/bionicbeanie/mods/savecoords/INetherCalculator.java @@ -0,0 +1,7 @@ +package me.bionicbeanie.mods.savecoords; + +import me.bionicbeanie.mods.savecoords.model.PlayerRawPosition; + +public interface INetherCalculator { + PlayerRawPosition convert(PlayerRawPosition position); +} diff --git a/src/main/java/me/bionicbeanie/mods/savecoords/SaveCoordinatesClient.java b/src/main/java/me/bionicbeanie/mods/savecoords/SaveCoordinatesClient.java index ab9e4a2..0ed616e 100644 --- a/src/main/java/me/bionicbeanie/mods/savecoords/SaveCoordinatesClient.java +++ b/src/main/java/me/bionicbeanie/mods/savecoords/SaveCoordinatesClient.java @@ -5,6 +5,8 @@ import me.bionicbeanie.mods.savecoords.gui.impl.DIContainer; import net.fabricmc.api.ClientModInitializer; import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents; import net.minecraft.client.MinecraftClient; +import net.minecraft.client.font.Font; +import net.minecraft.client.font.TextRenderer; import net.minecraft.text.TranslatableText; public class SaveCoordinatesClient implements ClientModInitializer { @@ -24,6 +26,7 @@ public class SaveCoordinatesClient implements ClientModInitializer { while(pingLockBinding.wasPressed()) { boolean enabled = DIContainer.togglePingBehavior(); + // TODO : Abstract to a tooltip queue String translationKey = TranslationKeys.TOOLTIP_PING_DISABLED; if(enabled) { translationKey = TranslationKeys.TOOLTIP_PING_ENABLED; diff --git a/src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/DIContainer.java b/src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/DIContainer.java index 3005249..c9fe35c 100644 --- a/src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/DIContainer.java +++ b/src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/DIContainer.java @@ -6,6 +6,7 @@ import me.bionicbeanie.mods.savecoords.IDimensionAware; import me.bionicbeanie.mods.savecoords.IFileStore; import me.bionicbeanie.mods.savecoords.IKeyBinds; import me.bionicbeanie.mods.savecoords.IModGui; +import me.bionicbeanie.mods.savecoords.INetherCalculator; import me.bionicbeanie.mods.savecoords.IPlayerLocator; import me.bionicbeanie.mods.savecoords.impl.Factory; import net.minecraft.client.MinecraftClient; @@ -23,6 +24,7 @@ public class DIContainer { private static ConfigScreenFactory modMenuScreenFactory; private static CurrentPositionPingOperation pingPositionOperation; private static IDimensionAware dimensionAware; + private static INetherCalculator netherCalculator; public static IModGui getModGui() { initialize(); @@ -53,18 +55,18 @@ public class DIContainer { } return modMenuScreenFactory; } - + public static Runnable getPingPositionOperation() { initialize(); return () -> { try { pingPositionOperation.call(); - }catch (Exception e) { + } catch (Exception e) { e.printStackTrace(); } }; } - + public static boolean togglePingBehavior() { return pingPositionOperation.toggleEnabled(); } @@ -79,8 +81,10 @@ public class DIContainer { playerLocator = Factory.CreatePlayerLocator(minecraftClient); keyBinds = Factory.CreateKeyBinds(fileStore); dimensionAware = Factory.CreateDimensionAware(minecraftClient); - modGui = new SaveCoordinatesGui(fileStore, playerLocator, dimensionAware, keyBinds, guiController); - + netherCalculator = Factory.CreateNetherCalculator(dimensionAware); + modGui = new SaveCoordinatesGui(fileStore, playerLocator, dimensionAware, keyBinds, guiController, + netherCalculator); + pingPositionOperation = new CurrentPositionPingOperation(fileStore, () -> playerLocator.locate()); } } diff --git a/src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/ListViewHandler.java b/src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/ListViewHandler.java index c214975..1d55572 100644 --- a/src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/ListViewHandler.java +++ b/src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/ListViewHandler.java @@ -13,6 +13,7 @@ import io.github.cottonmc.cotton.gui.widget.WListPanel; import io.github.cottonmc.cotton.gui.widget.WPlainPanel; import io.github.cottonmc.cotton.gui.widget.WSprite; import me.bionicbeanie.mods.savecoords.IFileStore; +import me.bionicbeanie.mods.savecoords.INetherCalculator; import me.bionicbeanie.mods.savecoords.TranslationKeys; import me.bionicbeanie.mods.savecoords.gui.IRootPanel; import me.bionicbeanie.mods.savecoords.model.PlayerPosition; @@ -29,14 +30,16 @@ class ListViewHandler extends ViewHandlerBase { private Consumer onDelete; private Consumer onEdit; private Consumer onPing; + private INetherCalculator netherCalculator; public ListViewHandler(IFileStore fileStore, Consumer onDelete, Consumer onEdit, - Consumer onPing) { + Consumer onPing, INetherCalculator netherCalculator) { this.fileStore = fileStore; this.backButton = createBackButton(); this.onDelete = onDelete; this.onEdit = onEdit; this.onPing = onPing; + this.netherCalculator = netherCalculator; } @Override @@ -60,7 +63,7 @@ class ListViewHandler extends ViewHandlerBase { } private WListPanel createListPanel(List positions) { - BiConsumer configurator = (pos, p) -> p.setPosition(pos, fileStore); + BiConsumer configurator = (pos, p) -> p.setPosition(pos); WListPanel panel = createListPanel(positions, configurator); panel.setListItemHeight(2 * 18); @@ -74,7 +77,7 @@ class ListViewHandler extends ViewHandlerBase { } private CoordinatesListItemPanel createListPanel() { - return new CoordinatesListItemPanel(onDelete, onEdit, onPing); + return new CoordinatesListItemPanel(onDelete, onEdit, onPing, netherCalculator); } private List getPositions(IFileStore fileStore) { @@ -101,27 +104,31 @@ class ListViewHandler extends ViewHandlerBase { private WLabel location; private WSprite icon; private WButton deleteButton; - private WButton pingButton; private WButton detailButton; + private WButton pingButton; + private WButton convertButton; private WLabel world; private Consumer onPing; private Consumer onEdit; private Consumer onDelete; + private INetherCalculator netherCalculator; CoordinatesListItemPanel(Consumer onDelete, Consumer onEdit, - Consumer onPing) { + Consumer onPing, INetherCalculator netherCalculator) { this.onDelete = onDelete; this.onEdit = onEdit; this.onPing = onPing; + this.netherCalculator = netherCalculator; this.coordinates = new WLabel("Foo"); this.location = new WLabel("Foo"); this.world = new WLabel("Foo"); this.icon = new WSprite(new Identifier("minecraft:textures/item/ender_eye.png")); this.deleteButton = createDeleteButton(); - this.pingButton = new WButton(new LiteralText("")); this.detailButton = new WButton(new LiteralText("")); + this.pingButton = new WButton(new LiteralText("")); + this.convertButton = new WButton(new LiteralText("")); this.pingButton.setIcon(ResourceUtils.createPingIcon()); this.detailButton.setIcon(ResourceUtils.createDetailsIcon()); @@ -131,8 +138,9 @@ class ListViewHandler extends ViewHandlerBase { this.add(location, 4 * 18, 0, 4 * 18, 1 * 18); this.add(coordinates, 3 * 18, 1 * 18, 9 * 18, 1 * 18); this.add(deleteButton, 13 * 18, 0, 1 * 18, 1 * 18); - this.add(pingButton, 11 * 18 - 2, 0, 1 * 18, 1 * 18); this.add(detailButton, 12 * 18 - 1, 0, 1 * 18, 1 * 18); + this.add(pingButton, 11 * 18 - 2, 0, 1 * 18, 1 * 18); + this.add(convertButton, 10 * 18 - 3, 0, 1 * 18, 1 * 18); this.icon.setSize(1 * 15, 1 * 15); this.world.setSize(3 * 18, 1 * 18); @@ -152,20 +160,27 @@ class ListViewHandler extends ViewHandlerBase { return button; } - void setPosition(PlayerPosition position, IFileStore fileStore) { - this.icon.setImage(ResourceUtils.getIdentifier(position.getWorldDimension())); + void setPosition(PlayerPosition position) { this.location.setText(new LiteralText(position.getLocationName())); this.location.setColor(0x3939ac); if (position.getPositionMetadata() != null) { this.world.setText(new LiteralText("[" + position.getPositionMetadata().getWorldName() + "]")); this.world.setColor(0xb80000); } - - this.coordinates - .setText(new LiteralText(position.getX() + ", " + position.getY() + ", " + position.getZ())); + + setRawPosition(position); + this.deleteButton.setOnClick(() -> onDelete.accept(position)); this.pingButton.setOnClick(() -> onPing.accept(position)); this.detailButton.setOnClick(() -> onEdit.accept(position)); + this.convertButton.setOnClick(() -> setRawPosition(netherCalculator.convert(position))); + } + + private void setRawPosition(PlayerRawPosition position) { + this.icon.setImage(ResourceUtils.getIdentifier(position.getWorldDimension())); + this.coordinates + .setText(new LiteralText(position.getX() + ", " + position.getY() + ", " + position.getZ())); + this.convertButton.setOnClick(() -> setRawPosition(netherCalculator.convert(position))); } } } diff --git a/src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/SaveCoordinatesGui.java b/src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/SaveCoordinatesGui.java index 1b01d6f..f99e61f 100644 --- a/src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/SaveCoordinatesGui.java +++ b/src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/SaveCoordinatesGui.java @@ -7,6 +7,7 @@ import me.bionicbeanie.mods.savecoords.IFileStore; import me.bionicbeanie.mods.savecoords.IKeyBinds; import me.bionicbeanie.mods.savecoords.IKeyBinds.IKeyBinding; import me.bionicbeanie.mods.savecoords.IModGui; +import me.bionicbeanie.mods.savecoords.INetherCalculator; import me.bionicbeanie.mods.savecoords.IPlayerLocator; import me.bionicbeanie.mods.savecoords.gui.IGuiController; import me.bionicbeanie.mods.savecoords.gui.IViewHandler; @@ -24,14 +25,16 @@ public class SaveCoordinatesGui implements IModGui { private IPlayerLocator locator; private IDimensionAware dimensionAware; private IKeyBinds keyBinds; + private INetherCalculator netherCalculator; SaveCoordinatesGui(IFileStore fileStore, IPlayerLocator locator, IDimensionAware dimensionAware, IKeyBinds binds, - IGuiController screenController) { + IGuiController screenController, INetherCalculator netherCalculator) { this.screenController = screenController; this.fileStore = fileStore; this.keyBinds = binds; this.locator = locator; this.dimensionAware = dimensionAware; + this.netherCalculator = netherCalculator; this.defaultHandler = CreateDefaultViewHandler(); this.listHandler = CreateListViewHandler(); @@ -57,7 +60,7 @@ public class SaveCoordinatesGui implements IModGui { private IViewHandler CreateListViewHandler() { ListViewHandler handler = new ListViewHandler(fileStore, this::onDeletePosition, this::onEditPosition, - this::pingPosition); + this::pingPosition, netherCalculator); handler.onBackButtonClick(() -> showDefaultView(null)); diff --git a/src/main/java/me/bionicbeanie/mods/savecoords/impl/DimensionAware.java b/src/main/java/me/bionicbeanie/mods/savecoords/impl/DimensionAware.java index 3238aa9..652245a 100644 --- a/src/main/java/me/bionicbeanie/mods/savecoords/impl/DimensionAware.java +++ b/src/main/java/me/bionicbeanie/mods/savecoords/impl/DimensionAware.java @@ -9,12 +9,15 @@ import me.bionicbeanie.mods.savecoords.util.ResourceUtils; import net.minecraft.client.MinecraftClient; import net.minecraft.util.Identifier; -public class DimensionAware implements IDimensionAware { +class DimensionAware implements IDimensionAware { private List allDimensions; private List allDimensionsReadOnly; - private IDimension UNKNOWN = new Dimension("Unknown", ResourceUtils.getIdentifier("unknown")); + private IDimension UNKNOWN = new Dimension("Unknown", ResourceUtils.getIdentifier("unknown"), 0); private MinecraftClient minecraftClient; + private int DIM_OVERWORLD = 1; + private int DIM_NETHER = 2; + private int DIM_END = 4; public DimensionAware(MinecraftClient minecraftClient) { this.minecraftClient = minecraftClient; @@ -27,9 +30,9 @@ public class DimensionAware implements IDimensionAware { // TODO: Provide a hook for other mods to add in their dimension info private void initialize(List dimensions) { - dimensions.add(new Dimension("Overworld", ResourceUtils.getIdentifier("overworld"))); - dimensions.add(new Dimension("Nether", ResourceUtils.getIdentifier("nether"))); - dimensions.add(new Dimension("End", ResourceUtils.getIdentifier("end"))); + dimensions.add(new Dimension("Overworld", ResourceUtils.getIdentifier("overworld"), DIM_OVERWORLD)); + dimensions.add(new Dimension("Nether", ResourceUtils.getIdentifier("nether"), DIM_NETHER)); + dimensions.add(new Dimension("End", ResourceUtils.getIdentifier("end"), DIM_END)); } @Override @@ -53,15 +56,32 @@ public class DimensionAware implements IDimensionAware { return UNKNOWN; } + + @Override + public boolean isOverworld(IDimension dimension) { + return dimension.getId() == DIM_OVERWORLD; + } + @Override + public boolean isNether(IDimension dimension) { + return dimension.getId() == DIM_NETHER; + } + + @Override + public boolean isEnd(IDimension dimension) { + return dimension.getId() == DIM_END; + } + static class Dimension implements IDimension { private String name; private Identifier spriteIdentifier; + private int dimensionId; - Dimension(String name, Identifier spriteIdentifier) { + Dimension(String name, Identifier spriteIdentifier, int dimensionId) { this.name = name; this.spriteIdentifier = spriteIdentifier; + this.dimensionId = dimensionId; } @Override @@ -77,7 +97,15 @@ public class DimensionAware implements IDimensionAware { boolean isDimension(String registryKey) { return (registryKey != null && registryKey.toLowerCase().contains(this.name.toLowerCase())); } + + int getDimensionId() { + return this.dimensionId; + } + + @Override + public int getId() { + return this.dimensionId; + } } - } diff --git a/src/main/java/me/bionicbeanie/mods/savecoords/impl/Factory.java b/src/main/java/me/bionicbeanie/mods/savecoords/impl/Factory.java index bcb480d..beb1efa 100644 --- a/src/main/java/me/bionicbeanie/mods/savecoords/impl/Factory.java +++ b/src/main/java/me/bionicbeanie/mods/savecoords/impl/Factory.java @@ -3,6 +3,7 @@ package me.bionicbeanie.mods.savecoords.impl; import me.bionicbeanie.mods.savecoords.IDimensionAware; import me.bionicbeanie.mods.savecoords.IFileStore; import me.bionicbeanie.mods.savecoords.IKeyBinds; +import me.bionicbeanie.mods.savecoords.INetherCalculator; import me.bionicbeanie.mods.savecoords.IPlayerLocator; import net.minecraft.client.MinecraftClient; @@ -23,4 +24,8 @@ public class Factory { public static IDimensionAware CreateDimensionAware(MinecraftClient client) { return new DimensionAware(client); } + + public static INetherCalculator CreateNetherCalculator(IDimensionAware dimensionAware) { + return new NetherCalculator(dimensionAware); + } } diff --git a/src/main/java/me/bionicbeanie/mods/savecoords/impl/NetherCalculator.java b/src/main/java/me/bionicbeanie/mods/savecoords/impl/NetherCalculator.java new file mode 100644 index 0000000..ecc6c5e --- /dev/null +++ b/src/main/java/me/bionicbeanie/mods/savecoords/impl/NetherCalculator.java @@ -0,0 +1,47 @@ +package me.bionicbeanie.mods.savecoords.impl; + +import me.bionicbeanie.mods.savecoords.IDimensionAware; +import me.bionicbeanie.mods.savecoords.IDimensionAware.IDimension; +import me.bionicbeanie.mods.savecoords.INetherCalculator; +import me.bionicbeanie.mods.savecoords.model.PlayerRawPosition; + +class NetherCalculator implements INetherCalculator { + + private int MULTIPLIER = 8; + private IDimensionAware dimensionAware; + private IDimension overworld; + private IDimension nether; + + public NetherCalculator(IDimensionAware dimensionAware) { + this.dimensionAware = dimensionAware; + + for (IDimension dimension : dimensionAware.getDimensions()) { + if (dimensionAware.isOverworld(dimension)) { + overworld = dimension; + continue; + } + + if (dimensionAware.isNether(dimension)) { + nether = dimension; + } + } + } + + @Override + public PlayerRawPosition convert(PlayerRawPosition position) { + IDimension dimension = dimensionAware.getDimension(position.getWorldDimension()); + + if (dimensionAware.isOverworld(dimension)) { + return new PlayerRawPosition(position.getX() / MULTIPLIER, position.getY(), position.getZ() / MULTIPLIER, + nether.getName()); + } + + if (dimensionAware.isNether(dimension)) { + return new PlayerRawPosition(position.getX() * MULTIPLIER, position.getY(), position.getZ() * MULTIPLIER, + overworld.getName()); + } + + return position; + } + +} From f908d0403495fe3b1d3cf4284d7d6db36695701c Mon Sep 17 00:00:00 2001 From: Surya Date: Fri, 26 Nov 2021 21:35:45 +0530 Subject: [PATCH 3/7] Add keybind to directly list coordinates, Add coordinate convert assets --- .../mods/savecoords/IKeyBinds.java | 1 + .../bionicbeanie/mods/savecoords/IModGui.java | 2 ++ .../savecoords/SaveCoordinatesClient.java | 7 ++++-- .../mods/savecoords/TranslationKeys.java | 1 + .../gui/impl/ConfigViewHandler.java | 6 +++--- .../savecoords/gui/impl/ListViewHandler.java | 20 ++++++++++++------ .../gui/impl/SaveCoordinatesGui.java | 5 +++++ .../mods/savecoords/impl/KeyBinds.java | 4 ++++ .../savecoords/util/IdentifiersCache.java | 2 ++ .../mods/savecoords/util/ResourceUtils.java | 10 ++++++++- .../assets/savecoords/lang/en_us.json | 13 ++++++------ .../savecoords/textures/gui/convert.png | Bin 0 -> 304 bytes .../textures/gui/convert_active.png | Bin 0 -> 336 bytes 13 files changed, 52 insertions(+), 19 deletions(-) create mode 100644 src/main/resources/assets/savecoords/textures/gui/convert.png create mode 100644 src/main/resources/assets/savecoords/textures/gui/convert_active.png diff --git a/src/main/java/me/bionicbeanie/mods/savecoords/IKeyBinds.java b/src/main/java/me/bionicbeanie/mods/savecoords/IKeyBinds.java index 6787de1..64f8c9e 100644 --- a/src/main/java/me/bionicbeanie/mods/savecoords/IKeyBinds.java +++ b/src/main/java/me/bionicbeanie/mods/savecoords/IKeyBinds.java @@ -9,6 +9,7 @@ public interface IKeyBinds { public static String DEFAULT = "default"; public static String PING = "ping"; public static String PING_LOCK = "ping_lock"; + public static String LIST = "list"; public List getAllBinds(); public IKeyBinding getKeyBind(String name); diff --git a/src/main/java/me/bionicbeanie/mods/savecoords/IModGui.java b/src/main/java/me/bionicbeanie/mods/savecoords/IModGui.java index 3b6461f..0d57b42 100644 --- a/src/main/java/me/bionicbeanie/mods/savecoords/IModGui.java +++ b/src/main/java/me/bionicbeanie/mods/savecoords/IModGui.java @@ -2,4 +2,6 @@ package me.bionicbeanie.mods.savecoords; public interface IModGui{ void open(); + + void openList(); } diff --git a/src/main/java/me/bionicbeanie/mods/savecoords/SaveCoordinatesClient.java b/src/main/java/me/bionicbeanie/mods/savecoords/SaveCoordinatesClient.java index 0ed616e..622aa17 100644 --- a/src/main/java/me/bionicbeanie/mods/savecoords/SaveCoordinatesClient.java +++ b/src/main/java/me/bionicbeanie/mods/savecoords/SaveCoordinatesClient.java @@ -5,8 +5,6 @@ import me.bionicbeanie.mods.savecoords.gui.impl.DIContainer; import net.fabricmc.api.ClientModInitializer; import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents; import net.minecraft.client.MinecraftClient; -import net.minecraft.client.font.Font; -import net.minecraft.client.font.TextRenderer; import net.minecraft.text.TranslatableText; public class SaveCoordinatesClient implements ClientModInitializer { @@ -14,6 +12,7 @@ public class SaveCoordinatesClient implements ClientModInitializer { private static IKeyBinding defaultKeyBinding = getKeyBinding(IKeyBinds.DEFAULT); private static IKeyBinding pingKeyBinding = getKeyBinding(IKeyBinds.PING); private static IKeyBinding pingLockBinding = getKeyBinding(IKeyBinds.PING_LOCK); + private static IKeyBinding listKeyBinding = getKeyBinding(IKeyBinds.LIST); @SuppressWarnings("resource") @Override @@ -24,6 +23,10 @@ public class SaveCoordinatesClient implements ClientModInitializer { DIContainer.getModGui().open(); } + while(listKeyBinding.wasPressed()) { + DIContainer.getModGui().openList(); + } + while(pingLockBinding.wasPressed()) { boolean enabled = DIContainer.togglePingBehavior(); // TODO : Abstract to a tooltip queue diff --git a/src/main/java/me/bionicbeanie/mods/savecoords/TranslationKeys.java b/src/main/java/me/bionicbeanie/mods/savecoords/TranslationKeys.java index 2d1e3d3..cd76071 100644 --- a/src/main/java/me/bionicbeanie/mods/savecoords/TranslationKeys.java +++ b/src/main/java/me/bionicbeanie/mods/savecoords/TranslationKeys.java @@ -4,6 +4,7 @@ public interface TranslationKeys { public static String KEYBIND_DEFAULT = "key.savecoords.default"; public static String KEYBIND_PING = "key.savecoords.ping"; public static String KEYBIND_PING_LOCK = "key.savecoords.ping_lock"; + public static String KEYBIND_LIST = "key.savecoords.list"; public static String CATEGORY_GENERIC = "category.savecoords.default"; public static String MENU_SAVE = "menu.savecoords.save"; public static String MENU_BACK = "menu.savecoords.back"; diff --git a/src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/ConfigViewHandler.java b/src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/ConfigViewHandler.java index 086e634..65ce309 100644 --- a/src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/ConfigViewHandler.java +++ b/src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/ConfigViewHandler.java @@ -217,9 +217,9 @@ class ConfigViewHandler extends ViewHandlerBase> { private int code; ConfigItemPanel() { - this.configLabel = new WLabel("Foo"); + this.configLabel = new WLabel(""); this.configButton = new WButton(); - this.resetButton = new WButton(new LiteralText("RESET")); + this.resetButton = new WButton(new TranslatableText(TranslationKeys.MENU_RESET)); } void setInitialConfig(IKeyBinding config) { @@ -234,7 +234,7 @@ class ConfigViewHandler extends ViewHandlerBase> { this.resetButton.setOnClick(this::reset); this.add(configLabel, 0, 0, 4 * 18, 1 * 9); - this.add(configButton, 5 * 18, 0, 4 * 18, 1 * 18); + this.add(configButton, 7 * 18, 0, 3 * 18, 1 * 18); this.add(resetButton, 11 * 18, 0, 3 * 18, 1 * 18); } diff --git a/src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/ListViewHandler.java b/src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/ListViewHandler.java index 1d55572..56652a5 100644 --- a/src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/ListViewHandler.java +++ b/src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/ListViewHandler.java @@ -21,7 +21,6 @@ import me.bionicbeanie.mods.savecoords.model.PlayerRawPosition; import me.bionicbeanie.mods.savecoords.util.ResourceUtils; import net.minecraft.text.LiteralText; import net.minecraft.text.TranslatableText; -import net.minecraft.util.Identifier; class ListViewHandler extends ViewHandlerBase { @@ -112,6 +111,7 @@ class ListViewHandler extends ViewHandlerBase { private Consumer onEdit; private Consumer onDelete; private INetherCalculator netherCalculator; + private boolean coordinateConvertState; CoordinatesListItemPanel(Consumer onDelete, Consumer onEdit, Consumer onPing, INetherCalculator netherCalculator) { @@ -120,11 +120,12 @@ class ListViewHandler extends ViewHandlerBase { this.onEdit = onEdit; this.onPing = onPing; this.netherCalculator = netherCalculator; + this.coordinateConvertState = true; - this.coordinates = new WLabel("Foo"); - this.location = new WLabel("Foo"); - this.world = new WLabel("Foo"); - this.icon = new WSprite(new Identifier("minecraft:textures/item/ender_eye.png")); + this.coordinates = new WLabel(""); + this.location = new WLabel(""); + this.world = new WLabel(""); + this.icon = new WSprite(ResourceUtils.getIdentifier("close")); this.deleteButton = createDeleteButton(); this.detailButton = new WButton(new LiteralText("")); this.pingButton = new WButton(new LiteralText("")); @@ -132,6 +133,7 @@ class ListViewHandler extends ViewHandlerBase { this.pingButton.setIcon(ResourceUtils.createPingIcon()); this.detailButton.setIcon(ResourceUtils.createDetailsIcon()); + this.convertButton.setIcon(ResourceUtils.createConvertIcon(this.coordinateConvertState)); this.add(icon, 0, 0, 1 * 9, 1 * 9); this.add(world, 1 * 18, 0, 3 * 18, 1 * 18); @@ -139,8 +141,8 @@ class ListViewHandler extends ViewHandlerBase { this.add(coordinates, 3 * 18, 1 * 18, 9 * 18, 1 * 18); this.add(deleteButton, 13 * 18, 0, 1 * 18, 1 * 18); this.add(detailButton, 12 * 18 - 1, 0, 1 * 18, 1 * 18); - this.add(pingButton, 11 * 18 - 2, 0, 1 * 18, 1 * 18); - this.add(convertButton, 10 * 18 - 3, 0, 1 * 18, 1 * 18); + this.add(convertButton, 11 * 18 - 2, 0, 1 * 18, 1 * 18); + this.add(pingButton, 10 * 18 - 3, 0, 1 * 18, 1 * 18); this.icon.setSize(1 * 15, 1 * 15); this.world.setSize(3 * 18, 1 * 18); @@ -149,6 +151,7 @@ class ListViewHandler extends ViewHandlerBase { this.deleteButton.setSize(1 * 18, 1 * 18); this.pingButton.setSize(1 * 18, 1 * 18); this.detailButton.setSize(1 * 18, 1 * 18); + this.convertButton.setSize(1 * 18, 1 * 18); this.setSize(15 * 18, 2 * 18); } @@ -177,10 +180,13 @@ class ListViewHandler extends ViewHandlerBase { } private void setRawPosition(PlayerRawPosition position) { + this.icon.setImage(ResourceUtils.getIdentifier(position.getWorldDimension())); this.coordinates .setText(new LiteralText(position.getX() + ", " + position.getY() + ", " + position.getZ())); this.convertButton.setOnClick(() -> setRawPosition(netherCalculator.convert(position))); + this.coordinateConvertState = !coordinateConvertState; + this.convertButton.setIcon(ResourceUtils.createConvertIcon(coordinateConvertState)); } } } diff --git a/src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/SaveCoordinatesGui.java b/src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/SaveCoordinatesGui.java index f99e61f..ab13844 100644 --- a/src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/SaveCoordinatesGui.java +++ b/src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/SaveCoordinatesGui.java @@ -45,6 +45,11 @@ public class SaveCoordinatesGui implements IModGui { public void open() { showDefaultView(null); } + + @Override + public void openList() { + showListView(); + } private IViewHandler CreateDefaultViewHandler() { DefaultViewHandler handler = new DefaultViewHandler(fileStore, locator, dimensionAware); diff --git a/src/main/java/me/bionicbeanie/mods/savecoords/impl/KeyBinds.java b/src/main/java/me/bionicbeanie/mods/savecoords/impl/KeyBinds.java index 775bb4c..2e7092c 100644 --- a/src/main/java/me/bionicbeanie/mods/savecoords/impl/KeyBinds.java +++ b/src/main/java/me/bionicbeanie/mods/savecoords/impl/KeyBinds.java @@ -30,6 +30,9 @@ class KeyBinds implements IKeyBinds { KeyBindingEx PING_LOCK = new KeyBindingEx(IKeyBinds.PING_LOCK, TranslationKeys.KEYBIND_PING_LOCK, InputUtil.Type.KEYSYM, GLFW.GLFW_KEY_N, TranslationKeys.CATEGORY_GENERIC); + + KeyBindingEx LIST = new KeyBindingEx(IKeyBinds.LIST, TranslationKeys.KEYBIND_LIST, + InputUtil.Type.KEYSYM, GLFW.GLFW_KEY_J, TranslationKeys.CATEGORY_GENERIC); private IFileStore fileStore; private Map keyBinds; @@ -40,6 +43,7 @@ class KeyBinds implements IKeyBinds { this.keyBinds = new HashMap<>(); add(DEFAULT); + add(LIST); add(PING); add(PING_LOCK); diff --git a/src/main/java/me/bionicbeanie/mods/savecoords/util/IdentifiersCache.java b/src/main/java/me/bionicbeanie/mods/savecoords/util/IdentifiersCache.java index 66b1bc5..14bb14b 100644 --- a/src/main/java/me/bionicbeanie/mods/savecoords/util/IdentifiersCache.java +++ b/src/main/java/me/bionicbeanie/mods/savecoords/util/IdentifiersCache.java @@ -21,6 +21,8 @@ public class IdentifiersCache { add("ping", cache); add("close", cache); add("more", cache); + add("convert", cache); + add("convert_active", cache); } public Identifier get(String resourceName) { diff --git a/src/main/java/me/bionicbeanie/mods/savecoords/util/ResourceUtils.java b/src/main/java/me/bionicbeanie/mods/savecoords/util/ResourceUtils.java index 89cd5e8..3d2a570 100644 --- a/src/main/java/me/bionicbeanie/mods/savecoords/util/ResourceUtils.java +++ b/src/main/java/me/bionicbeanie/mods/savecoords/util/ResourceUtils.java @@ -11,7 +11,7 @@ public class ResourceUtils { public static Identifier getIdentifier(String resourceName) { return cache.get(resourceName); } - + public static Icon createPingIcon() { return new TextureIcon(cache.get("ping")); } @@ -23,4 +23,12 @@ public class ResourceUtils { public static Icon createDetailsIcon() { return new TextureIcon(cache.get("more")); } + + public static Icon createConvertIcon(boolean active) { + String resource = "convert"; + if(active) { + resource = "convert_active"; + } + return new TextureIcon(cache.get(resource)); + } } diff --git a/src/main/resources/assets/savecoords/lang/en_us.json b/src/main/resources/assets/savecoords/lang/en_us.json index 5872ca9..ca89839 100644 --- a/src/main/resources/assets/savecoords/lang/en_us.json +++ b/src/main/resources/assets/savecoords/lang/en_us.json @@ -1,7 +1,8 @@ { - "key.savecoords.default": "Open GUI", - "key.savecoords.ping": "Beam Location", - "key.savecoords.ping_lock": "Lock Beaming", + "key.savecoords.default": "Save a coordinate", + "key.savecoords.list": "List coordinates", + "key.savecoords.ping": "Broadcast position", + "key.savecoords.ping_lock": "Lock broadcast", "category.savecoords.default": "Generic", "menu.savecoords.save": "SAVE", "menu.savecoords.reset": "RESET", @@ -12,7 +13,7 @@ "menu.savecoords.location": "location name", "menu.savecoords.notes": "additional notes", "menu.savecoords.world_name": "world name", - "tooltip.savecoords.ping_lock": "You must first enable beaming current location", - "tooltip.savecoords.ping_enabled": "Beaming current location is now enabled", - "tooltip.savecoords.ping_disabled": "Beaming current location is now disabled" + "tooltip.savecoords.ping_lock": "You must first enable broadcasting current location", + "tooltip.savecoords.ping_enabled": "Broadcasting current location is now enabled", + "tooltip.savecoords.ping_disabled": "Broadcasting current location is now disabled" } \ No newline at end of file diff --git a/src/main/resources/assets/savecoords/textures/gui/convert.png b/src/main/resources/assets/savecoords/textures/gui/convert.png new file mode 100644 index 0000000000000000000000000000000000000000..7749ceecc9efff7a5104db5d7b060bb45ca0111b GIT binary patch literal 304 zcmeAS@N?(olHy`uVBq!ia0y~yU=U(pU=ZP8V_;zXJ|XrF0|NtNage(c!@6@aFBupZ zSkfJR9T^xl_H+M9WMyDr;4JWnEM{QfI|#yzJ0@noWnf@9>gnPbq7i&|@>$+P20X3t zk_(UbU68b5cE8c0c!QvzRn zTdoVq&kQ?O?G&FLv@47wh!lK1m&@|>s3 zoobpt*1Ekp6j4>TIsNDH)}YPRJQ9YHJ9_>)=_LO<&tSt?v(T8~<}8nW3=9kmp00i_ I>zopr0Be_cxc~qF literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/savecoords/textures/gui/convert_active.png b/src/main/resources/assets/savecoords/textures/gui/convert_active.png new file mode 100644 index 0000000000000000000000000000000000000000..03ee74c5b05b06ec268ad4489391bfa79be100e1 GIT binary patch literal 336 zcmeAS@N?(olHy`uVBq!ia0y~yU=U(pU=ZP8V_;zXJ|XrF0|NtNage(c!@6@aFBupZ zSkfJR9T^xl_H+M9WMyDr;4JWnEM{QfI|#yzJ0@noWnf@<>gnPbq7i&|@?PFU1|lu` z9Qq8h%1fH1%p9g{;7npUq87j;JweLK&4ZnLiNQ|s<3IV`TtsRnDgXXcQfJ?_eDUhG zg~!i(_HI7RG*4#J2F+=|IM%N0Rtk4EZI{14(R+*Id}*%iH?AysmXk%eOrAUnWZ6|5 zI6;L=f`9j_Wu`Y4%)Iq1$Sa}uV{Om}>p4w!r&scRe{N&?FsElqfqR2{$+W#bEmKb4 zPfRWAJO9_>L|8ccbGKcucW|>VUUp@cN3fcxvfl=q1x7Lv4bBHotemX(XJg>fo6J2A qj_c+(@4q0N`1#7dg^MpWh{qppbPLG!UeCb5z~JfX=d#Wzp$PyMUxLB_ literal 0 HcmV?d00001 From 4b0a964369139b5c41fdeafeb2b040dbb2073250 Mon Sep 17 00:00:00 2001 From: Surya Date: Fri, 17 Dec 2021 15:58:14 +0530 Subject: [PATCH 4/7] Make ping position text clearer --- .../mods/savecoords/INetherCalculator.java | 4 ++-- .../mods/savecoords/gui/impl/DIContainer.java | 4 ++-- .../mods/savecoords/gui/impl/ListViewHandler.java | 3 ++- .../bionicbeanie/mods/savecoords/impl/Factory.java | 4 ++-- .../mods/savecoords/impl/NetherCalculator.java | 14 ++++++++++---- .../mods/savecoords/impl/PlayerLocator.java | 7 +++++-- .../mods/savecoords/model/PlayerPosition.java | 4 ++-- .../mods/savecoords/model/PlayerRawPosition.java | 2 +- 8 files changed, 26 insertions(+), 16 deletions(-) diff --git a/src/main/java/me/bionicbeanie/mods/savecoords/INetherCalculator.java b/src/main/java/me/bionicbeanie/mods/savecoords/INetherCalculator.java index 7ac2e6c..1f3ab64 100644 --- a/src/main/java/me/bionicbeanie/mods/savecoords/INetherCalculator.java +++ b/src/main/java/me/bionicbeanie/mods/savecoords/INetherCalculator.java @@ -1,7 +1,7 @@ package me.bionicbeanie.mods.savecoords; -import me.bionicbeanie.mods.savecoords.model.PlayerRawPosition; +import me.bionicbeanie.mods.savecoords.model.PlayerPosition; public interface INetherCalculator { - PlayerRawPosition convert(PlayerRawPosition position); + PlayerPosition convert(PlayerPosition position); } diff --git a/src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/DIContainer.java b/src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/DIContainer.java index c9fe35c..fb813ba 100644 --- a/src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/DIContainer.java +++ b/src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/DIContainer.java @@ -78,9 +78,9 @@ public class DIContainer { MinecraftClient minecraftClient = MinecraftClient.getInstance(); fileStore = Factory.createFileStore(minecraftClient.runDirectory.getAbsolutePath()); guiController = new GuiController(minecraftClient); - playerLocator = Factory.CreatePlayerLocator(minecraftClient); - keyBinds = Factory.CreateKeyBinds(fileStore); dimensionAware = Factory.CreateDimensionAware(minecraftClient); + playerLocator = Factory.CreatePlayerLocator(minecraftClient, dimensionAware); + keyBinds = Factory.CreateKeyBinds(fileStore); netherCalculator = Factory.CreateNetherCalculator(dimensionAware); modGui = new SaveCoordinatesGui(fileStore, playerLocator, dimensionAware, keyBinds, guiController, netherCalculator); diff --git a/src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/ListViewHandler.java b/src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/ListViewHandler.java index 56652a5..324bd92 100644 --- a/src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/ListViewHandler.java +++ b/src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/ListViewHandler.java @@ -179,12 +179,13 @@ class ListViewHandler extends ViewHandlerBase { this.convertButton.setOnClick(() -> setRawPosition(netherCalculator.convert(position))); } - private void setRawPosition(PlayerRawPosition position) { + private void setRawPosition(PlayerPosition position) { this.icon.setImage(ResourceUtils.getIdentifier(position.getWorldDimension())); this.coordinates .setText(new LiteralText(position.getX() + ", " + position.getY() + ", " + position.getZ())); this.convertButton.setOnClick(() -> setRawPosition(netherCalculator.convert(position))); + this.pingButton.setOnClick(() -> onPing.accept(position)); this.coordinateConvertState = !coordinateConvertState; this.convertButton.setIcon(ResourceUtils.createConvertIcon(coordinateConvertState)); } diff --git a/src/main/java/me/bionicbeanie/mods/savecoords/impl/Factory.java b/src/main/java/me/bionicbeanie/mods/savecoords/impl/Factory.java index beb1efa..fac33b5 100644 --- a/src/main/java/me/bionicbeanie/mods/savecoords/impl/Factory.java +++ b/src/main/java/me/bionicbeanie/mods/savecoords/impl/Factory.java @@ -13,8 +13,8 @@ public class Factory { return new FileStore(baseDirectory); } - public static IPlayerLocator CreatePlayerLocator(MinecraftClient client) { - return new PlayerLocator(client); + public static IPlayerLocator CreatePlayerLocator(MinecraftClient client, IDimensionAware dimensionAware) { + return new PlayerLocator(client, dimensionAware); } public static IKeyBinds CreateKeyBinds(IFileStore fileStore) { diff --git a/src/main/java/me/bionicbeanie/mods/savecoords/impl/NetherCalculator.java b/src/main/java/me/bionicbeanie/mods/savecoords/impl/NetherCalculator.java index ecc6c5e..8bc1528 100644 --- a/src/main/java/me/bionicbeanie/mods/savecoords/impl/NetherCalculator.java +++ b/src/main/java/me/bionicbeanie/mods/savecoords/impl/NetherCalculator.java @@ -3,6 +3,7 @@ package me.bionicbeanie.mods.savecoords.impl; import me.bionicbeanie.mods.savecoords.IDimensionAware; import me.bionicbeanie.mods.savecoords.IDimensionAware.IDimension; import me.bionicbeanie.mods.savecoords.INetherCalculator; +import me.bionicbeanie.mods.savecoords.model.PlayerPosition; import me.bionicbeanie.mods.savecoords.model.PlayerRawPosition; class NetherCalculator implements INetherCalculator { @@ -28,19 +29,24 @@ class NetherCalculator implements INetherCalculator { } @Override - public PlayerRawPosition convert(PlayerRawPosition position) { + public PlayerPosition convert(PlayerPosition position) { IDimension dimension = dimensionAware.getDimension(position.getWorldDimension()); - + PlayerRawPosition rawPosition = null; + if (dimensionAware.isOverworld(dimension)) { - return new PlayerRawPosition(position.getX() / MULTIPLIER, position.getY(), position.getZ() / MULTIPLIER, + rawPosition = new PlayerRawPosition(position.getX() / MULTIPLIER, position.getY(), position.getZ() / MULTIPLIER, nether.getName()); } if (dimensionAware.isNether(dimension)) { - return new PlayerRawPosition(position.getX() * MULTIPLIER, position.getY(), position.getZ() * MULTIPLIER, + rawPosition = new PlayerRawPosition(position.getX() * MULTIPLIER, position.getY(), position.getZ() * MULTIPLIER, overworld.getName()); } + if(rawPosition != null) { + return new PlayerPosition(position.getId(), rawPosition, position.getLocationName(), position.getPositionMetadata()); + } + return position; } diff --git a/src/main/java/me/bionicbeanie/mods/savecoords/impl/PlayerLocator.java b/src/main/java/me/bionicbeanie/mods/savecoords/impl/PlayerLocator.java index 40bdfd5..8229f02 100644 --- a/src/main/java/me/bionicbeanie/mods/savecoords/impl/PlayerLocator.java +++ b/src/main/java/me/bionicbeanie/mods/savecoords/impl/PlayerLocator.java @@ -1,5 +1,6 @@ package me.bionicbeanie.mods.savecoords.impl; +import me.bionicbeanie.mods.savecoords.IDimensionAware; import me.bionicbeanie.mods.savecoords.IPlayerLocator; import me.bionicbeanie.mods.savecoords.model.PlayerRawPosition; import net.minecraft.client.MinecraftClient; @@ -8,9 +9,11 @@ import net.minecraft.util.math.Vec3d; class PlayerLocator implements IPlayerLocator { private MinecraftClient client; + private IDimensionAware dimensionAware; - public PlayerLocator(MinecraftClient client) { + public PlayerLocator(MinecraftClient client, IDimensionAware dimensionAware) { this.client = client; + this.dimensionAware = dimensionAware; } public PlayerRawPosition locate() { @@ -19,7 +22,7 @@ class PlayerLocator implements IPlayerLocator { long y = Math.round(pos.y); long z = Math.round(pos.z); - String worldDimension = client.player.getEntityWorld().getRegistryKey().getValue().toString(); + String worldDimension = this.dimensionAware.getCurrentDimension().getName(); return new PlayerRawPosition(x, y, z, worldDimension); } diff --git a/src/main/java/me/bionicbeanie/mods/savecoords/model/PlayerPosition.java b/src/main/java/me/bionicbeanie/mods/savecoords/model/PlayerPosition.java index 9667522..02774fb 100644 --- a/src/main/java/me/bionicbeanie/mods/savecoords/model/PlayerPosition.java +++ b/src/main/java/me/bionicbeanie/mods/savecoords/model/PlayerPosition.java @@ -27,7 +27,7 @@ public class PlayerPosition extends PlayerRawPosition { @Override public String toString() { - return this.locationName + " in [ " + this.getWorldDimension() + " ] at [ " + this.getX() + ", " + this.getY() - + ", " + this.getZ() + " ]"; + return this.locationName + " in " + this.getWorldDimension() + " >>> " + this.getX() + ", " + this.getY() + + ", " + this.getZ(); } } diff --git a/src/main/java/me/bionicbeanie/mods/savecoords/model/PlayerRawPosition.java b/src/main/java/me/bionicbeanie/mods/savecoords/model/PlayerRawPosition.java index bb777f7..c150553 100644 --- a/src/main/java/me/bionicbeanie/mods/savecoords/model/PlayerRawPosition.java +++ b/src/main/java/me/bionicbeanie/mods/savecoords/model/PlayerRawPosition.java @@ -29,7 +29,7 @@ public class PlayerRawPosition { @Override public String toString() { - return "I'm in [ " + worldDimension + " ] at [ " + x + ", " + y + ", " + z + " ]"; + return worldDimension + " >>> " + x + ", " + y + ", " + z; } } From 567408aef94426ec265eef15b0d31e5eff672239 Mon Sep 17 00:00:00 2001 From: Surya Date: Fri, 17 Dec 2021 16:00:21 +0530 Subject: [PATCH 5/7] Update package name --- gradle.properties | 2 +- .../mods/savecoords/INetherCalculator.java | 7 ------ .../mods/savecoords/IPlayerLocator.java | 7 ------ .../mods/savecoords/IDimensionAware.java | 2 +- .../mods/savecoords/IFileStore.java | 6 ++--- .../mods/savecoords/IKeyBinds.java | 2 +- .../mods/savecoords/IModGui.java | 2 +- .../mods/savecoords/INetherCalculator.java | 7 ++++++ .../mods/savecoords/IPlayerLocator.java | 7 ++++++ .../savecoords/SaveCoordinatesClient.java | 6 ++--- .../mods/savecoords/TranslationKeys.java | 2 +- .../mods/savecoords/gui/IGuiController.java | 2 +- .../mods/savecoords/gui/IRootPanel.java | 2 +- .../mods/savecoords/gui/IViewHandler.java | 2 +- .../savecoords/gui/SaveCoordinatesScreen.java | 2 +- .../savecoords/gui/impl/ConfigScreen.java | 4 ++-- .../gui/impl/ConfigViewHandler.java | 8 +++---- .../impl/CurrentPositionPingOperation.java | 8 +++---- .../mods/savecoords/gui/impl/DIContainer.java | 16 ++++++------- .../gui/impl/DefaultViewHandler.java | 20 ++++++++-------- .../gui/impl/DeletePositionOperation.java | 4 ++-- .../savecoords/gui/impl/DimensionButton.java | 10 ++++---- .../savecoords/gui/impl/DimensionSprite.java | 4 ++-- .../savecoords/gui/impl/GuiController.java | 4 ++-- .../savecoords/gui/impl/ListViewHandler.java | 16 ++++++------- .../gui/impl/PingPositionOperation.java | 6 ++--- .../savecoords/gui/impl/RootGridPanel.java | 4 ++-- .../gui/impl/SaveConfigsOperation.java | 12 +++++----- .../gui/impl/SaveCoordinatesGui.java | 24 +++++++++---------- .../gui/impl/SavePositionOperation.java | 6 ++--- .../savecoords/gui/impl/TexturedButton.java | 2 +- .../savecoords/gui/impl/ViewHandlerBase.java | 8 +++---- .../gui/impl/ViewOperationBase.java | 4 ++-- .../mods/savecoords/impl/DimensionAware.java | 6 ++--- .../mods/savecoords/impl/Factory.java | 12 +++++----- .../mods/savecoords/impl/FileStore.java | 12 +++++----- .../mods/savecoords/impl/KeyBinds.java | 12 +++++----- .../savecoords/impl/NetherCalculator.java | 12 +++++----- .../mods/savecoords/impl/PlayerLocator.java | 8 +++---- .../mods/savecoords/model/ConfigData.java | 2 +- .../mods/savecoords/model/ModData.java | 2 +- .../mods/savecoords/model/PlayerPosition.java | 2 +- .../savecoords/model/PlayerRawPosition.java | 2 +- .../savecoords/model/PositionMetadata.java | 2 +- .../modmenu/SaveCoordinatesModMenu.java | 4 ++-- .../savecoords/util/IdentifiersCache.java | 2 +- .../savecoords/util/PartialCircularList.java | 2 +- .../mods/savecoords/util/ResourceUtils.java | 2 +- src/main/resources/fabric.mod.json | 4 ++-- 49 files changed, 152 insertions(+), 152 deletions(-) delete mode 100644 src/main/java/me/bionicbeanie/mods/savecoords/INetherCalculator.java delete mode 100644 src/main/java/me/bionicbeanie/mods/savecoords/IPlayerLocator.java rename src/main/java/me/{bionicbeanie => neophyte}/mods/savecoords/IDimensionAware.java (93%) rename src/main/java/me/{bionicbeanie => neophyte}/mods/savecoords/IFileStore.java (76%) rename src/main/java/me/{bionicbeanie => neophyte}/mods/savecoords/IKeyBinds.java (95%) rename src/main/java/me/{bionicbeanie => neophyte}/mods/savecoords/IModGui.java (63%) create mode 100644 src/main/java/me/neophyte/mods/savecoords/INetherCalculator.java create mode 100644 src/main/java/me/neophyte/mods/savecoords/IPlayerLocator.java rename src/main/java/me/{bionicbeanie => neophyte}/mods/savecoords/SaveCoordinatesClient.java (91%) rename src/main/java/me/{bionicbeanie => neophyte}/mods/savecoords/TranslationKeys.java (96%) rename src/main/java/me/{bionicbeanie => neophyte}/mods/savecoords/gui/IGuiController.java (76%) rename src/main/java/me/{bionicbeanie => neophyte}/mods/savecoords/gui/IRootPanel.java (80%) rename src/main/java/me/{bionicbeanie => neophyte}/mods/savecoords/gui/IViewHandler.java (75%) rename src/main/java/me/{bionicbeanie => neophyte}/mods/savecoords/gui/SaveCoordinatesScreen.java (86%) rename src/main/java/me/{bionicbeanie => neophyte}/mods/savecoords/gui/impl/ConfigScreen.java (88%) rename src/main/java/me/{bionicbeanie => neophyte}/mods/savecoords/gui/impl/ConfigViewHandler.java (97%) rename src/main/java/me/{bionicbeanie => neophyte}/mods/savecoords/gui/impl/CurrentPositionPingOperation.java (80%) rename src/main/java/me/{bionicbeanie => neophyte}/mods/savecoords/gui/impl/DIContainer.java (87%) rename src/main/java/me/{bionicbeanie => neophyte}/mods/savecoords/gui/impl/DefaultViewHandler.java (93%) rename src/main/java/me/{bionicbeanie => neophyte}/mods/savecoords/gui/impl/DeletePositionOperation.java (80%) rename src/main/java/me/{bionicbeanie => neophyte}/mods/savecoords/gui/impl/DimensionButton.java (82%) rename src/main/java/me/{bionicbeanie => neophyte}/mods/savecoords/gui/impl/DimensionSprite.java (78%) rename src/main/java/me/{bionicbeanie => neophyte}/mods/savecoords/gui/impl/GuiController.java (80%) rename src/main/java/me/{bionicbeanie => neophyte}/mods/savecoords/gui/impl/ListViewHandler.java (94%) rename src/main/java/me/{bionicbeanie => neophyte}/mods/savecoords/gui/impl/PingPositionOperation.java (76%) rename src/main/java/me/{bionicbeanie => neophyte}/mods/savecoords/gui/impl/RootGridPanel.java (91%) rename src/main/java/me/{bionicbeanie => neophyte}/mods/savecoords/gui/impl/SaveConfigsOperation.java (80%) rename src/main/java/me/{bionicbeanie => neophyte}/mods/savecoords/gui/impl/SaveCoordinatesGui.java (84%) rename src/main/java/me/{bionicbeanie => neophyte}/mods/savecoords/gui/impl/SavePositionOperation.java (75%) rename src/main/java/me/{bionicbeanie => neophyte}/mods/savecoords/gui/impl/TexturedButton.java (96%) rename src/main/java/me/{bionicbeanie => neophyte}/mods/savecoords/gui/impl/ViewHandlerBase.java (82%) rename src/main/java/me/{bionicbeanie => neophyte}/mods/savecoords/gui/impl/ViewOperationBase.java (93%) rename src/main/java/me/{bionicbeanie => neophyte}/mods/savecoords/impl/DimensionAware.java (95%) rename src/main/java/me/{bionicbeanie => neophyte}/mods/savecoords/impl/Factory.java (71%) rename src/main/java/me/{bionicbeanie => neophyte}/mods/savecoords/impl/FileStore.java (92%) rename src/main/java/me/{bionicbeanie => neophyte}/mods/savecoords/impl/KeyBinds.java (93%) rename src/main/java/me/{bionicbeanie => neophyte}/mods/savecoords/impl/NetherCalculator.java (81%) rename src/main/java/me/{bionicbeanie => neophyte}/mods/savecoords/impl/PlayerLocator.java (76%) rename src/main/java/me/{bionicbeanie => neophyte}/mods/savecoords/model/ConfigData.java (98%) rename src/main/java/me/{bionicbeanie => neophyte}/mods/savecoords/model/ModData.java (93%) rename src/main/java/me/{bionicbeanie => neophyte}/mods/savecoords/model/PlayerPosition.java (95%) rename src/main/java/me/{bionicbeanie => neophyte}/mods/savecoords/model/PlayerRawPosition.java (93%) rename src/main/java/me/{bionicbeanie => neophyte}/mods/savecoords/model/PositionMetadata.java (95%) rename src/main/java/me/{bionicbeanie => neophyte}/mods/savecoords/modmenu/SaveCoordinatesModMenu.java (73%) rename src/main/java/me/{bionicbeanie => neophyte}/mods/savecoords/util/IdentifiersCache.java (96%) rename src/main/java/me/{bionicbeanie => neophyte}/mods/savecoords/util/PartialCircularList.java (95%) rename src/main/java/me/{bionicbeanie => neophyte}/mods/savecoords/util/ResourceUtils.java (95%) diff --git a/gradle.properties b/gradle.properties index 6823eec..808236a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ org.gradle.jvmargs=-Xmx1G # Mod Properties mod_version = 1.17.1-1.2.1 - maven_group = me.bionicbeanie.mods.savecoords + maven_group = me.neophyte.mods.savecoords archives_base_name = save-coordinates # Dependencies diff --git a/src/main/java/me/bionicbeanie/mods/savecoords/INetherCalculator.java b/src/main/java/me/bionicbeanie/mods/savecoords/INetherCalculator.java deleted file mode 100644 index 1f3ab64..0000000 --- a/src/main/java/me/bionicbeanie/mods/savecoords/INetherCalculator.java +++ /dev/null @@ -1,7 +0,0 @@ -package me.bionicbeanie.mods.savecoords; - -import me.bionicbeanie.mods.savecoords.model.PlayerPosition; - -public interface INetherCalculator { - PlayerPosition convert(PlayerPosition position); -} diff --git a/src/main/java/me/bionicbeanie/mods/savecoords/IPlayerLocator.java b/src/main/java/me/bionicbeanie/mods/savecoords/IPlayerLocator.java deleted file mode 100644 index 31f8198..0000000 --- a/src/main/java/me/bionicbeanie/mods/savecoords/IPlayerLocator.java +++ /dev/null @@ -1,7 +0,0 @@ -package me.bionicbeanie.mods.savecoords; - -import me.bionicbeanie.mods.savecoords.model.PlayerRawPosition; - -public interface IPlayerLocator { - PlayerRawPosition locate(); -} diff --git a/src/main/java/me/bionicbeanie/mods/savecoords/IDimensionAware.java b/src/main/java/me/neophyte/mods/savecoords/IDimensionAware.java similarity index 93% rename from src/main/java/me/bionicbeanie/mods/savecoords/IDimensionAware.java rename to src/main/java/me/neophyte/mods/savecoords/IDimensionAware.java index 514e4e1..e509e58 100644 --- a/src/main/java/me/bionicbeanie/mods/savecoords/IDimensionAware.java +++ b/src/main/java/me/neophyte/mods/savecoords/IDimensionAware.java @@ -1,4 +1,4 @@ -package me.bionicbeanie.mods.savecoords; +package me.neophyte.mods.savecoords; import java.util.List; diff --git a/src/main/java/me/bionicbeanie/mods/savecoords/IFileStore.java b/src/main/java/me/neophyte/mods/savecoords/IFileStore.java similarity index 76% rename from src/main/java/me/bionicbeanie/mods/savecoords/IFileStore.java rename to src/main/java/me/neophyte/mods/savecoords/IFileStore.java index cf4a37e..3db5f4b 100644 --- a/src/main/java/me/bionicbeanie/mods/savecoords/IFileStore.java +++ b/src/main/java/me/neophyte/mods/savecoords/IFileStore.java @@ -1,10 +1,10 @@ -package me.bionicbeanie.mods.savecoords; +package me.neophyte.mods.savecoords; import java.io.IOException; import java.util.List; -import me.bionicbeanie.mods.savecoords.model.ConfigData; -import me.bionicbeanie.mods.savecoords.model.PlayerPosition; +import me.neophyte.mods.savecoords.model.ConfigData; +import me.neophyte.mods.savecoords.model.PlayerPosition; public interface IFileStore { String readDefaultWorldName() throws IOException; diff --git a/src/main/java/me/bionicbeanie/mods/savecoords/IKeyBinds.java b/src/main/java/me/neophyte/mods/savecoords/IKeyBinds.java similarity index 95% rename from src/main/java/me/bionicbeanie/mods/savecoords/IKeyBinds.java rename to src/main/java/me/neophyte/mods/savecoords/IKeyBinds.java index 64f8c9e..bf85448 100644 --- a/src/main/java/me/bionicbeanie/mods/savecoords/IKeyBinds.java +++ b/src/main/java/me/neophyte/mods/savecoords/IKeyBinds.java @@ -1,4 +1,4 @@ -package me.bionicbeanie.mods.savecoords; +package me.neophyte.mods.savecoords; import java.util.List; diff --git a/src/main/java/me/bionicbeanie/mods/savecoords/IModGui.java b/src/main/java/me/neophyte/mods/savecoords/IModGui.java similarity index 63% rename from src/main/java/me/bionicbeanie/mods/savecoords/IModGui.java rename to src/main/java/me/neophyte/mods/savecoords/IModGui.java index 0d57b42..8608eba 100644 --- a/src/main/java/me/bionicbeanie/mods/savecoords/IModGui.java +++ b/src/main/java/me/neophyte/mods/savecoords/IModGui.java @@ -1,4 +1,4 @@ -package me.bionicbeanie.mods.savecoords; +package me.neophyte.mods.savecoords; public interface IModGui{ void open(); diff --git a/src/main/java/me/neophyte/mods/savecoords/INetherCalculator.java b/src/main/java/me/neophyte/mods/savecoords/INetherCalculator.java new file mode 100644 index 0000000..97765b0 --- /dev/null +++ b/src/main/java/me/neophyte/mods/savecoords/INetherCalculator.java @@ -0,0 +1,7 @@ +package me.neophyte.mods.savecoords; + +import me.neophyte.mods.savecoords.model.PlayerPosition; + +public interface INetherCalculator { + PlayerPosition convert(PlayerPosition position); +} diff --git a/src/main/java/me/neophyte/mods/savecoords/IPlayerLocator.java b/src/main/java/me/neophyte/mods/savecoords/IPlayerLocator.java new file mode 100644 index 0000000..5cc4b20 --- /dev/null +++ b/src/main/java/me/neophyte/mods/savecoords/IPlayerLocator.java @@ -0,0 +1,7 @@ +package me.neophyte.mods.savecoords; + +import me.neophyte.mods.savecoords.model.PlayerRawPosition; + +public interface IPlayerLocator { + PlayerRawPosition locate(); +} diff --git a/src/main/java/me/bionicbeanie/mods/savecoords/SaveCoordinatesClient.java b/src/main/java/me/neophyte/mods/savecoords/SaveCoordinatesClient.java similarity index 91% rename from src/main/java/me/bionicbeanie/mods/savecoords/SaveCoordinatesClient.java rename to src/main/java/me/neophyte/mods/savecoords/SaveCoordinatesClient.java index 622aa17..6d2cdef 100644 --- a/src/main/java/me/bionicbeanie/mods/savecoords/SaveCoordinatesClient.java +++ b/src/main/java/me/neophyte/mods/savecoords/SaveCoordinatesClient.java @@ -1,7 +1,7 @@ -package me.bionicbeanie.mods.savecoords; +package me.neophyte.mods.savecoords; -import me.bionicbeanie.mods.savecoords.IKeyBinds.IKeyBinding; -import me.bionicbeanie.mods.savecoords.gui.impl.DIContainer; +import me.neophyte.mods.savecoords.IKeyBinds.IKeyBinding; +import me.neophyte.mods.savecoords.gui.impl.DIContainer; import net.fabricmc.api.ClientModInitializer; import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents; import net.minecraft.client.MinecraftClient; diff --git a/src/main/java/me/bionicbeanie/mods/savecoords/TranslationKeys.java b/src/main/java/me/neophyte/mods/savecoords/TranslationKeys.java similarity index 96% rename from src/main/java/me/bionicbeanie/mods/savecoords/TranslationKeys.java rename to src/main/java/me/neophyte/mods/savecoords/TranslationKeys.java index cd76071..20b032d 100644 --- a/src/main/java/me/bionicbeanie/mods/savecoords/TranslationKeys.java +++ b/src/main/java/me/neophyte/mods/savecoords/TranslationKeys.java @@ -1,4 +1,4 @@ -package me.bionicbeanie.mods.savecoords; +package me.neophyte.mods.savecoords; public interface TranslationKeys { public static String KEYBIND_DEFAULT = "key.savecoords.default"; diff --git a/src/main/java/me/bionicbeanie/mods/savecoords/gui/IGuiController.java b/src/main/java/me/neophyte/mods/savecoords/gui/IGuiController.java similarity index 76% rename from src/main/java/me/bionicbeanie/mods/savecoords/gui/IGuiController.java rename to src/main/java/me/neophyte/mods/savecoords/gui/IGuiController.java index 01a3cf0..da14fcf 100644 --- a/src/main/java/me/bionicbeanie/mods/savecoords/gui/IGuiController.java +++ b/src/main/java/me/neophyte/mods/savecoords/gui/IGuiController.java @@ -1,4 +1,4 @@ -package me.bionicbeanie.mods.savecoords.gui; +package me.neophyte.mods.savecoords.gui; import net.minecraft.client.gui.screen.Screen; diff --git a/src/main/java/me/bionicbeanie/mods/savecoords/gui/IRootPanel.java b/src/main/java/me/neophyte/mods/savecoords/gui/IRootPanel.java similarity index 80% rename from src/main/java/me/bionicbeanie/mods/savecoords/gui/IRootPanel.java rename to src/main/java/me/neophyte/mods/savecoords/gui/IRootPanel.java index 943a114..d77330c 100644 --- a/src/main/java/me/bionicbeanie/mods/savecoords/gui/IRootPanel.java +++ b/src/main/java/me/neophyte/mods/savecoords/gui/IRootPanel.java @@ -1,4 +1,4 @@ -package me.bionicbeanie.mods.savecoords.gui; +package me.neophyte.mods.savecoords.gui; import io.github.cottonmc.cotton.gui.widget.WWidget; diff --git a/src/main/java/me/bionicbeanie/mods/savecoords/gui/IViewHandler.java b/src/main/java/me/neophyte/mods/savecoords/gui/IViewHandler.java similarity index 75% rename from src/main/java/me/bionicbeanie/mods/savecoords/gui/IViewHandler.java rename to src/main/java/me/neophyte/mods/savecoords/gui/IViewHandler.java index 971e928..7846ef6 100644 --- a/src/main/java/me/bionicbeanie/mods/savecoords/gui/IViewHandler.java +++ b/src/main/java/me/neophyte/mods/savecoords/gui/IViewHandler.java @@ -1,4 +1,4 @@ -package me.bionicbeanie.mods.savecoords.gui; +package me.neophyte.mods.savecoords.gui; import net.minecraft.client.gui.screen.Screen; diff --git a/src/main/java/me/bionicbeanie/mods/savecoords/gui/SaveCoordinatesScreen.java b/src/main/java/me/neophyte/mods/savecoords/gui/SaveCoordinatesScreen.java similarity index 86% rename from src/main/java/me/bionicbeanie/mods/savecoords/gui/SaveCoordinatesScreen.java rename to src/main/java/me/neophyte/mods/savecoords/gui/SaveCoordinatesScreen.java index fd3f457..0bdcf97 100644 --- a/src/main/java/me/bionicbeanie/mods/savecoords/gui/SaveCoordinatesScreen.java +++ b/src/main/java/me/neophyte/mods/savecoords/gui/SaveCoordinatesScreen.java @@ -1,4 +1,4 @@ -package me.bionicbeanie.mods.savecoords.gui; +package me.neophyte.mods.savecoords.gui; import io.github.cottonmc.cotton.gui.GuiDescription; import io.github.cottonmc.cotton.gui.client.CottonClientScreen; diff --git a/src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/ConfigScreen.java b/src/main/java/me/neophyte/mods/savecoords/gui/impl/ConfigScreen.java similarity index 88% rename from src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/ConfigScreen.java rename to src/main/java/me/neophyte/mods/savecoords/gui/impl/ConfigScreen.java index d59bdaf..b29b9a3 100644 --- a/src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/ConfigScreen.java +++ b/src/main/java/me/neophyte/mods/savecoords/gui/impl/ConfigScreen.java @@ -1,9 +1,9 @@ -package me.bionicbeanie.mods.savecoords.gui.impl; +package me.neophyte.mods.savecoords.gui.impl; import java.util.function.BiConsumer; import io.github.cottonmc.cotton.gui.GuiDescription; -import me.bionicbeanie.mods.savecoords.gui.SaveCoordinatesScreen; +import me.neophyte.mods.savecoords.gui.SaveCoordinatesScreen; import net.minecraft.client.util.InputUtil; import net.minecraft.client.util.InputUtil.Type; diff --git a/src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/ConfigViewHandler.java b/src/main/java/me/neophyte/mods/savecoords/gui/impl/ConfigViewHandler.java similarity index 97% rename from src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/ConfigViewHandler.java rename to src/main/java/me/neophyte/mods/savecoords/gui/impl/ConfigViewHandler.java index 65ce309..ac51925 100644 --- a/src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/ConfigViewHandler.java +++ b/src/main/java/me/neophyte/mods/savecoords/gui/impl/ConfigViewHandler.java @@ -1,4 +1,4 @@ -package me.bionicbeanie.mods.savecoords.gui.impl; +package me.neophyte.mods.savecoords.gui.impl; import java.util.ArrayList; import java.util.List; @@ -10,9 +10,9 @@ import io.github.cottonmc.cotton.gui.widget.WButton; import io.github.cottonmc.cotton.gui.widget.WLabel; import io.github.cottonmc.cotton.gui.widget.WListPanel; import io.github.cottonmc.cotton.gui.widget.WPlainPanel; -import me.bionicbeanie.mods.savecoords.IKeyBinds.IKeyBinding; -import me.bionicbeanie.mods.savecoords.TranslationKeys; -import me.bionicbeanie.mods.savecoords.gui.IRootPanel; +import me.neophyte.mods.savecoords.TranslationKeys; +import me.neophyte.mods.savecoords.IKeyBinds.IKeyBinding; +import me.neophyte.mods.savecoords.gui.IRootPanel; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.util.InputUtil.Type; import net.minecraft.text.LiteralText; diff --git a/src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/CurrentPositionPingOperation.java b/src/main/java/me/neophyte/mods/savecoords/gui/impl/CurrentPositionPingOperation.java similarity index 80% rename from src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/CurrentPositionPingOperation.java rename to src/main/java/me/neophyte/mods/savecoords/gui/impl/CurrentPositionPingOperation.java index 9c6706d..d52f385 100644 --- a/src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/CurrentPositionPingOperation.java +++ b/src/main/java/me/neophyte/mods/savecoords/gui/impl/CurrentPositionPingOperation.java @@ -1,10 +1,10 @@ -package me.bionicbeanie.mods.savecoords.gui.impl; +package me.neophyte.mods.savecoords.gui.impl; import java.util.function.Supplier; -import me.bionicbeanie.mods.savecoords.IFileStore; -import me.bionicbeanie.mods.savecoords.TranslationKeys; -import me.bionicbeanie.mods.savecoords.model.PlayerRawPosition; +import me.neophyte.mods.savecoords.IFileStore; +import me.neophyte.mods.savecoords.TranslationKeys; +import me.neophyte.mods.savecoords.model.PlayerRawPosition; import net.minecraft.client.MinecraftClient; import net.minecraft.text.TranslatableText; diff --git a/src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/DIContainer.java b/src/main/java/me/neophyte/mods/savecoords/gui/impl/DIContainer.java similarity index 87% rename from src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/DIContainer.java rename to src/main/java/me/neophyte/mods/savecoords/gui/impl/DIContainer.java index fb813ba..b69624a 100644 --- a/src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/DIContainer.java +++ b/src/main/java/me/neophyte/mods/savecoords/gui/impl/DIContainer.java @@ -1,14 +1,14 @@ -package me.bionicbeanie.mods.savecoords.gui.impl; +package me.neophyte.mods.savecoords.gui.impl; import com.terraformersmc.modmenu.api.ConfigScreenFactory; -import me.bionicbeanie.mods.savecoords.IDimensionAware; -import me.bionicbeanie.mods.savecoords.IFileStore; -import me.bionicbeanie.mods.savecoords.IKeyBinds; -import me.bionicbeanie.mods.savecoords.IModGui; -import me.bionicbeanie.mods.savecoords.INetherCalculator; -import me.bionicbeanie.mods.savecoords.IPlayerLocator; -import me.bionicbeanie.mods.savecoords.impl.Factory; +import me.neophyte.mods.savecoords.IDimensionAware; +import me.neophyte.mods.savecoords.IFileStore; +import me.neophyte.mods.savecoords.IKeyBinds; +import me.neophyte.mods.savecoords.IModGui; +import me.neophyte.mods.savecoords.INetherCalculator; +import me.neophyte.mods.savecoords.IPlayerLocator; +import me.neophyte.mods.savecoords.impl.Factory; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.screen.Screen; diff --git a/src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/DefaultViewHandler.java b/src/main/java/me/neophyte/mods/savecoords/gui/impl/DefaultViewHandler.java similarity index 93% rename from src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/DefaultViewHandler.java rename to src/main/java/me/neophyte/mods/savecoords/gui/impl/DefaultViewHandler.java index f932595..67c1a6b 100644 --- a/src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/DefaultViewHandler.java +++ b/src/main/java/me/neophyte/mods/savecoords/gui/impl/DefaultViewHandler.java @@ -1,4 +1,4 @@ -package me.bionicbeanie.mods.savecoords.gui.impl; +package me.neophyte.mods.savecoords.gui.impl; import java.util.UUID; import java.util.function.Supplier; @@ -7,15 +7,15 @@ import io.github.cottonmc.cotton.gui.widget.WButton; import io.github.cottonmc.cotton.gui.widget.WSprite; import io.github.cottonmc.cotton.gui.widget.WTextField; import io.github.cottonmc.cotton.gui.widget.WWidget; -import me.bionicbeanie.mods.savecoords.IDimensionAware; -import me.bionicbeanie.mods.savecoords.IFileStore; -import me.bionicbeanie.mods.savecoords.IPlayerLocator; -import me.bionicbeanie.mods.savecoords.TranslationKeys; -import me.bionicbeanie.mods.savecoords.gui.IRootPanel; -import me.bionicbeanie.mods.savecoords.model.PlayerPosition; -import me.bionicbeanie.mods.savecoords.model.PlayerRawPosition; -import me.bionicbeanie.mods.savecoords.model.PositionMetadata; -import me.bionicbeanie.mods.savecoords.util.ResourceUtils; +import me.neophyte.mods.savecoords.IDimensionAware; +import me.neophyte.mods.savecoords.IFileStore; +import me.neophyte.mods.savecoords.IPlayerLocator; +import me.neophyte.mods.savecoords.TranslationKeys; +import me.neophyte.mods.savecoords.gui.IRootPanel; +import me.neophyte.mods.savecoords.model.PlayerPosition; +import me.neophyte.mods.savecoords.model.PlayerRawPosition; +import me.neophyte.mods.savecoords.model.PositionMetadata; +import me.neophyte.mods.savecoords.util.ResourceUtils; import net.minecraft.text.LiteralText; import net.minecraft.text.TranslatableText; diff --git a/src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/DeletePositionOperation.java b/src/main/java/me/neophyte/mods/savecoords/gui/impl/DeletePositionOperation.java similarity index 80% rename from src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/DeletePositionOperation.java rename to src/main/java/me/neophyte/mods/savecoords/gui/impl/DeletePositionOperation.java index df28090..d62788e 100644 --- a/src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/DeletePositionOperation.java +++ b/src/main/java/me/neophyte/mods/savecoords/gui/impl/DeletePositionOperation.java @@ -1,8 +1,8 @@ -package me.bionicbeanie.mods.savecoords.gui.impl; +package me.neophyte.mods.savecoords.gui.impl; import java.util.function.Supplier; -import me.bionicbeanie.mods.savecoords.IFileStore; +import me.neophyte.mods.savecoords.IFileStore; class DeletePositionOperation extends ViewOperationBase { diff --git a/src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/DimensionButton.java b/src/main/java/me/neophyte/mods/savecoords/gui/impl/DimensionButton.java similarity index 82% rename from src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/DimensionButton.java rename to src/main/java/me/neophyte/mods/savecoords/gui/impl/DimensionButton.java index 9548847..fdab7ce 100644 --- a/src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/DimensionButton.java +++ b/src/main/java/me/neophyte/mods/savecoords/gui/impl/DimensionButton.java @@ -1,11 +1,11 @@ -package me.bionicbeanie.mods.savecoords.gui.impl; +package me.neophyte.mods.savecoords.gui.impl; import io.github.cottonmc.cotton.gui.widget.WButton; import io.github.cottonmc.cotton.gui.widget.WSprite; -import me.bionicbeanie.mods.savecoords.IDimensionAware; -import me.bionicbeanie.mods.savecoords.IDimensionAware.IDimension; -import me.bionicbeanie.mods.savecoords.model.PlayerRawPosition; -import me.bionicbeanie.mods.savecoords.util.PartialCircularList; +import me.neophyte.mods.savecoords.IDimensionAware; +import me.neophyte.mods.savecoords.IDimensionAware.IDimension; +import me.neophyte.mods.savecoords.model.PlayerRawPosition; +import me.neophyte.mods.savecoords.util.PartialCircularList; import net.minecraft.text.LiteralText; public class DimensionButton extends WButton { diff --git a/src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/DimensionSprite.java b/src/main/java/me/neophyte/mods/savecoords/gui/impl/DimensionSprite.java similarity index 78% rename from src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/DimensionSprite.java rename to src/main/java/me/neophyte/mods/savecoords/gui/impl/DimensionSprite.java index 33bfc0b..aad9db8 100644 --- a/src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/DimensionSprite.java +++ b/src/main/java/me/neophyte/mods/savecoords/gui/impl/DimensionSprite.java @@ -1,7 +1,7 @@ -package me.bionicbeanie.mods.savecoords.gui.impl; +package me.neophyte.mods.savecoords.gui.impl; import io.github.cottonmc.cotton.gui.widget.WSprite; -import me.bionicbeanie.mods.savecoords.util.ResourceUtils; +import me.neophyte.mods.savecoords.util.ResourceUtils; import net.minecraft.util.Identifier; public class DimensionSprite extends WSprite { diff --git a/src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/GuiController.java b/src/main/java/me/neophyte/mods/savecoords/gui/impl/GuiController.java similarity index 80% rename from src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/GuiController.java rename to src/main/java/me/neophyte/mods/savecoords/gui/impl/GuiController.java index 7a2f7b7..ad6e45d 100644 --- a/src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/GuiController.java +++ b/src/main/java/me/neophyte/mods/savecoords/gui/impl/GuiController.java @@ -1,6 +1,6 @@ -package me.bionicbeanie.mods.savecoords.gui.impl; +package me.neophyte.mods.savecoords.gui.impl; -import me.bionicbeanie.mods.savecoords.gui.IGuiController; +import me.neophyte.mods.savecoords.gui.IGuiController; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.screen.Screen; diff --git a/src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/ListViewHandler.java b/src/main/java/me/neophyte/mods/savecoords/gui/impl/ListViewHandler.java similarity index 94% rename from src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/ListViewHandler.java rename to src/main/java/me/neophyte/mods/savecoords/gui/impl/ListViewHandler.java index 324bd92..0a4c235 100644 --- a/src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/ListViewHandler.java +++ b/src/main/java/me/neophyte/mods/savecoords/gui/impl/ListViewHandler.java @@ -1,4 +1,4 @@ -package me.bionicbeanie.mods.savecoords.gui.impl; +package me.neophyte.mods.savecoords.gui.impl; import java.io.IOException; import java.util.Collections; @@ -12,13 +12,13 @@ import io.github.cottonmc.cotton.gui.widget.WLabel; import io.github.cottonmc.cotton.gui.widget.WListPanel; import io.github.cottonmc.cotton.gui.widget.WPlainPanel; import io.github.cottonmc.cotton.gui.widget.WSprite; -import me.bionicbeanie.mods.savecoords.IFileStore; -import me.bionicbeanie.mods.savecoords.INetherCalculator; -import me.bionicbeanie.mods.savecoords.TranslationKeys; -import me.bionicbeanie.mods.savecoords.gui.IRootPanel; -import me.bionicbeanie.mods.savecoords.model.PlayerPosition; -import me.bionicbeanie.mods.savecoords.model.PlayerRawPosition; -import me.bionicbeanie.mods.savecoords.util.ResourceUtils; +import me.neophyte.mods.savecoords.IFileStore; +import me.neophyte.mods.savecoords.INetherCalculator; +import me.neophyte.mods.savecoords.TranslationKeys; +import me.neophyte.mods.savecoords.gui.IRootPanel; +import me.neophyte.mods.savecoords.model.PlayerPosition; +import me.neophyte.mods.savecoords.model.PlayerRawPosition; +import me.neophyte.mods.savecoords.util.ResourceUtils; import net.minecraft.text.LiteralText; import net.minecraft.text.TranslatableText; diff --git a/src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/PingPositionOperation.java b/src/main/java/me/neophyte/mods/savecoords/gui/impl/PingPositionOperation.java similarity index 76% rename from src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/PingPositionOperation.java rename to src/main/java/me/neophyte/mods/savecoords/gui/impl/PingPositionOperation.java index 64b595b..7ef0d2d 100644 --- a/src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/PingPositionOperation.java +++ b/src/main/java/me/neophyte/mods/savecoords/gui/impl/PingPositionOperation.java @@ -1,9 +1,9 @@ -package me.bionicbeanie.mods.savecoords.gui.impl; +package me.neophyte.mods.savecoords.gui.impl; import java.util.function.Supplier; -import me.bionicbeanie.mods.savecoords.IFileStore; -import me.bionicbeanie.mods.savecoords.model.PlayerRawPosition; +import me.neophyte.mods.savecoords.IFileStore; +import me.neophyte.mods.savecoords.model.PlayerRawPosition; import net.minecraft.client.MinecraftClient; class PingPositionOperation extends ViewOperationBase { diff --git a/src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/RootGridPanel.java b/src/main/java/me/neophyte/mods/savecoords/gui/impl/RootGridPanel.java similarity index 91% rename from src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/RootGridPanel.java rename to src/main/java/me/neophyte/mods/savecoords/gui/impl/RootGridPanel.java index 077aa76..7fc731b 100644 --- a/src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/RootGridPanel.java +++ b/src/main/java/me/neophyte/mods/savecoords/gui/impl/RootGridPanel.java @@ -1,4 +1,4 @@ -package me.bionicbeanie.mods.savecoords.gui.impl; +package me.neophyte.mods.savecoords.gui.impl; import java.util.ArrayList; import java.util.List; @@ -7,7 +7,7 @@ import io.github.cottonmc.cotton.gui.GuiDescription; import io.github.cottonmc.cotton.gui.widget.WGridPanel; import io.github.cottonmc.cotton.gui.widget.WWidget; import io.github.cottonmc.cotton.gui.widget.data.Insets; -import me.bionicbeanie.mods.savecoords.gui.IRootPanel; +import me.neophyte.mods.savecoords.gui.IRootPanel; class RootGridPanel extends WGridPanel implements IRootPanel{ diff --git a/src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/SaveConfigsOperation.java b/src/main/java/me/neophyte/mods/savecoords/gui/impl/SaveConfigsOperation.java similarity index 80% rename from src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/SaveConfigsOperation.java rename to src/main/java/me/neophyte/mods/savecoords/gui/impl/SaveConfigsOperation.java index e47f75b..7afb6b8 100644 --- a/src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/SaveConfigsOperation.java +++ b/src/main/java/me/neophyte/mods/savecoords/gui/impl/SaveConfigsOperation.java @@ -1,14 +1,14 @@ -package me.bionicbeanie.mods.savecoords.gui.impl; +package me.neophyte.mods.savecoords.gui.impl; import java.util.ArrayList; import java.util.List; import java.util.function.Supplier; -import me.bionicbeanie.mods.savecoords.IFileStore; -import me.bionicbeanie.mods.savecoords.IKeyBinds; -import me.bionicbeanie.mods.savecoords.IKeyBinds.IKeyBinding; -import me.bionicbeanie.mods.savecoords.model.ConfigData; -import me.bionicbeanie.mods.savecoords.model.ConfigData.Config; +import me.neophyte.mods.savecoords.IFileStore; +import me.neophyte.mods.savecoords.IKeyBinds; +import me.neophyte.mods.savecoords.IKeyBinds.IKeyBinding; +import me.neophyte.mods.savecoords.model.ConfigData; +import me.neophyte.mods.savecoords.model.ConfigData.Config; import net.minecraft.client.util.InputUtil.Type; public class SaveConfigsOperation extends ViewOperationBase>{ diff --git a/src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/SaveCoordinatesGui.java b/src/main/java/me/neophyte/mods/savecoords/gui/impl/SaveCoordinatesGui.java similarity index 84% rename from src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/SaveCoordinatesGui.java rename to src/main/java/me/neophyte/mods/savecoords/gui/impl/SaveCoordinatesGui.java index ab13844..46f2eb8 100644 --- a/src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/SaveCoordinatesGui.java +++ b/src/main/java/me/neophyte/mods/savecoords/gui/impl/SaveCoordinatesGui.java @@ -1,18 +1,18 @@ -package me.bionicbeanie.mods.savecoords.gui.impl; +package me.neophyte.mods.savecoords.gui.impl; import java.util.List; -import me.bionicbeanie.mods.savecoords.IDimensionAware; -import me.bionicbeanie.mods.savecoords.IFileStore; -import me.bionicbeanie.mods.savecoords.IKeyBinds; -import me.bionicbeanie.mods.savecoords.IKeyBinds.IKeyBinding; -import me.bionicbeanie.mods.savecoords.IModGui; -import me.bionicbeanie.mods.savecoords.INetherCalculator; -import me.bionicbeanie.mods.savecoords.IPlayerLocator; -import me.bionicbeanie.mods.savecoords.gui.IGuiController; -import me.bionicbeanie.mods.savecoords.gui.IViewHandler; -import me.bionicbeanie.mods.savecoords.model.PlayerPosition; -import me.bionicbeanie.mods.savecoords.model.PlayerRawPosition; +import me.neophyte.mods.savecoords.IDimensionAware; +import me.neophyte.mods.savecoords.IFileStore; +import me.neophyte.mods.savecoords.IKeyBinds; +import me.neophyte.mods.savecoords.IModGui; +import me.neophyte.mods.savecoords.INetherCalculator; +import me.neophyte.mods.savecoords.IPlayerLocator; +import me.neophyte.mods.savecoords.IKeyBinds.IKeyBinding; +import me.neophyte.mods.savecoords.gui.IGuiController; +import me.neophyte.mods.savecoords.gui.IViewHandler; +import me.neophyte.mods.savecoords.model.PlayerPosition; +import me.neophyte.mods.savecoords.model.PlayerRawPosition; import net.minecraft.client.gui.screen.Screen; public class SaveCoordinatesGui implements IModGui { diff --git a/src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/SavePositionOperation.java b/src/main/java/me/neophyte/mods/savecoords/gui/impl/SavePositionOperation.java similarity index 75% rename from src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/SavePositionOperation.java rename to src/main/java/me/neophyte/mods/savecoords/gui/impl/SavePositionOperation.java index cbe9a8d..395613b 100644 --- a/src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/SavePositionOperation.java +++ b/src/main/java/me/neophyte/mods/savecoords/gui/impl/SavePositionOperation.java @@ -1,9 +1,9 @@ -package me.bionicbeanie.mods.savecoords.gui.impl; +package me.neophyte.mods.savecoords.gui.impl; import java.util.function.Supplier; -import me.bionicbeanie.mods.savecoords.IFileStore; -import me.bionicbeanie.mods.savecoords.model.PlayerPosition; +import me.neophyte.mods.savecoords.IFileStore; +import me.neophyte.mods.savecoords.model.PlayerPosition; class SavePositionOperation extends ViewOperationBase { diff --git a/src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/TexturedButton.java b/src/main/java/me/neophyte/mods/savecoords/gui/impl/TexturedButton.java similarity index 96% rename from src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/TexturedButton.java rename to src/main/java/me/neophyte/mods/savecoords/gui/impl/TexturedButton.java index da21265..ff02b55 100644 --- a/src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/TexturedButton.java +++ b/src/main/java/me/neophyte/mods/savecoords/gui/impl/TexturedButton.java @@ -1,4 +1,4 @@ -package me.bionicbeanie.mods.savecoords.gui.impl; +package me.neophyte.mods.savecoords.gui.impl; import io.github.cottonmc.cotton.gui.client.ScreenDrawing; import io.github.cottonmc.cotton.gui.widget.WButton; diff --git a/src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/ViewHandlerBase.java b/src/main/java/me/neophyte/mods/savecoords/gui/impl/ViewHandlerBase.java similarity index 82% rename from src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/ViewHandlerBase.java rename to src/main/java/me/neophyte/mods/savecoords/gui/impl/ViewHandlerBase.java index bf5c212..9797cec 100644 --- a/src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/ViewHandlerBase.java +++ b/src/main/java/me/neophyte/mods/savecoords/gui/impl/ViewHandlerBase.java @@ -1,11 +1,11 @@ -package me.bionicbeanie.mods.savecoords.gui.impl; +package me.neophyte.mods.savecoords.gui.impl; import java.util.function.Supplier; import io.github.cottonmc.cotton.gui.client.LightweightGuiDescription; -import me.bionicbeanie.mods.savecoords.gui.IRootPanel; -import me.bionicbeanie.mods.savecoords.gui.IViewHandler; -import me.bionicbeanie.mods.savecoords.gui.SaveCoordinatesScreen; +import me.neophyte.mods.savecoords.gui.IRootPanel; +import me.neophyte.mods.savecoords.gui.IViewHandler; +import me.neophyte.mods.savecoords.gui.SaveCoordinatesScreen; import net.minecraft.client.gui.screen.Screen; abstract class ViewHandlerBase extends LightweightGuiDescription implements IViewHandler { diff --git a/src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/ViewOperationBase.java b/src/main/java/me/neophyte/mods/savecoords/gui/impl/ViewOperationBase.java similarity index 93% rename from src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/ViewOperationBase.java rename to src/main/java/me/neophyte/mods/savecoords/gui/impl/ViewOperationBase.java index 38add48..3ee3eb3 100644 --- a/src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/ViewOperationBase.java +++ b/src/main/java/me/neophyte/mods/savecoords/gui/impl/ViewOperationBase.java @@ -1,9 +1,9 @@ -package me.bionicbeanie.mods.savecoords.gui.impl; +package me.neophyte.mods.savecoords.gui.impl; import java.util.concurrent.Callable; import java.util.function.Supplier; -import me.bionicbeanie.mods.savecoords.IFileStore; +import me.neophyte.mods.savecoords.IFileStore; abstract class ViewOperationBase implements Callable { diff --git a/src/main/java/me/bionicbeanie/mods/savecoords/impl/DimensionAware.java b/src/main/java/me/neophyte/mods/savecoords/impl/DimensionAware.java similarity index 95% rename from src/main/java/me/bionicbeanie/mods/savecoords/impl/DimensionAware.java rename to src/main/java/me/neophyte/mods/savecoords/impl/DimensionAware.java index 652245a..c375196 100644 --- a/src/main/java/me/bionicbeanie/mods/savecoords/impl/DimensionAware.java +++ b/src/main/java/me/neophyte/mods/savecoords/impl/DimensionAware.java @@ -1,11 +1,11 @@ -package me.bionicbeanie.mods.savecoords.impl; +package me.neophyte.mods.savecoords.impl; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import me.bionicbeanie.mods.savecoords.IDimensionAware; -import me.bionicbeanie.mods.savecoords.util.ResourceUtils; +import me.neophyte.mods.savecoords.IDimensionAware; +import me.neophyte.mods.savecoords.util.ResourceUtils; import net.minecraft.client.MinecraftClient; import net.minecraft.util.Identifier; diff --git a/src/main/java/me/bionicbeanie/mods/savecoords/impl/Factory.java b/src/main/java/me/neophyte/mods/savecoords/impl/Factory.java similarity index 71% rename from src/main/java/me/bionicbeanie/mods/savecoords/impl/Factory.java rename to src/main/java/me/neophyte/mods/savecoords/impl/Factory.java index fac33b5..8871602 100644 --- a/src/main/java/me/bionicbeanie/mods/savecoords/impl/Factory.java +++ b/src/main/java/me/neophyte/mods/savecoords/impl/Factory.java @@ -1,10 +1,10 @@ -package me.bionicbeanie.mods.savecoords.impl; +package me.neophyte.mods.savecoords.impl; -import me.bionicbeanie.mods.savecoords.IDimensionAware; -import me.bionicbeanie.mods.savecoords.IFileStore; -import me.bionicbeanie.mods.savecoords.IKeyBinds; -import me.bionicbeanie.mods.savecoords.INetherCalculator; -import me.bionicbeanie.mods.savecoords.IPlayerLocator; +import me.neophyte.mods.savecoords.IDimensionAware; +import me.neophyte.mods.savecoords.IFileStore; +import me.neophyte.mods.savecoords.IKeyBinds; +import me.neophyte.mods.savecoords.INetherCalculator; +import me.neophyte.mods.savecoords.IPlayerLocator; import net.minecraft.client.MinecraftClient; public class Factory { diff --git a/src/main/java/me/bionicbeanie/mods/savecoords/impl/FileStore.java b/src/main/java/me/neophyte/mods/savecoords/impl/FileStore.java similarity index 92% rename from src/main/java/me/bionicbeanie/mods/savecoords/impl/FileStore.java rename to src/main/java/me/neophyte/mods/savecoords/impl/FileStore.java index 674c1db..6172860 100644 --- a/src/main/java/me/bionicbeanie/mods/savecoords/impl/FileStore.java +++ b/src/main/java/me/neophyte/mods/savecoords/impl/FileStore.java @@ -1,4 +1,4 @@ -package me.bionicbeanie.mods.savecoords.impl; +package me.neophyte.mods.savecoords.impl; import java.io.IOException; import java.nio.file.FileAlreadyExistsException; @@ -14,11 +14,11 @@ import org.apache.commons.lang3.StringUtils; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import me.bionicbeanie.mods.savecoords.IFileStore; -import me.bionicbeanie.mods.savecoords.model.ConfigData; -import me.bionicbeanie.mods.savecoords.model.ConfigData.Config; -import me.bionicbeanie.mods.savecoords.model.ModData; -import me.bionicbeanie.mods.savecoords.model.PlayerPosition; +import me.neophyte.mods.savecoords.IFileStore; +import me.neophyte.mods.savecoords.model.ConfigData; +import me.neophyte.mods.savecoords.model.ModData; +import me.neophyte.mods.savecoords.model.PlayerPosition; +import me.neophyte.mods.savecoords.model.ConfigData.Config; class FileStore implements IFileStore { diff --git a/src/main/java/me/bionicbeanie/mods/savecoords/impl/KeyBinds.java b/src/main/java/me/neophyte/mods/savecoords/impl/KeyBinds.java similarity index 93% rename from src/main/java/me/bionicbeanie/mods/savecoords/impl/KeyBinds.java rename to src/main/java/me/neophyte/mods/savecoords/impl/KeyBinds.java index 2e7092c..89ab06a 100644 --- a/src/main/java/me/bionicbeanie/mods/savecoords/impl/KeyBinds.java +++ b/src/main/java/me/neophyte/mods/savecoords/impl/KeyBinds.java @@ -1,4 +1,4 @@ -package me.bionicbeanie.mods.savecoords.impl; +package me.neophyte.mods.savecoords.impl; import java.io.IOException; import java.util.ArrayList; @@ -9,11 +9,11 @@ import java.util.Map; import org.lwjgl.glfw.GLFW; -import me.bionicbeanie.mods.savecoords.IFileStore; -import me.bionicbeanie.mods.savecoords.IKeyBinds; -import me.bionicbeanie.mods.savecoords.TranslationKeys; -import me.bionicbeanie.mods.savecoords.model.ConfigData; -import me.bionicbeanie.mods.savecoords.model.ConfigData.Config; +import me.neophyte.mods.savecoords.IFileStore; +import me.neophyte.mods.savecoords.IKeyBinds; +import me.neophyte.mods.savecoords.TranslationKeys; +import me.neophyte.mods.savecoords.model.ConfigData; +import me.neophyte.mods.savecoords.model.ConfigData.Config; import net.minecraft.client.option.KeyBinding; import net.minecraft.client.util.InputUtil; import net.minecraft.client.util.InputUtil.Type; diff --git a/src/main/java/me/bionicbeanie/mods/savecoords/impl/NetherCalculator.java b/src/main/java/me/neophyte/mods/savecoords/impl/NetherCalculator.java similarity index 81% rename from src/main/java/me/bionicbeanie/mods/savecoords/impl/NetherCalculator.java rename to src/main/java/me/neophyte/mods/savecoords/impl/NetherCalculator.java index 8bc1528..c6e4fd4 100644 --- a/src/main/java/me/bionicbeanie/mods/savecoords/impl/NetherCalculator.java +++ b/src/main/java/me/neophyte/mods/savecoords/impl/NetherCalculator.java @@ -1,10 +1,10 @@ -package me.bionicbeanie.mods.savecoords.impl; +package me.neophyte.mods.savecoords.impl; -import me.bionicbeanie.mods.savecoords.IDimensionAware; -import me.bionicbeanie.mods.savecoords.IDimensionAware.IDimension; -import me.bionicbeanie.mods.savecoords.INetherCalculator; -import me.bionicbeanie.mods.savecoords.model.PlayerPosition; -import me.bionicbeanie.mods.savecoords.model.PlayerRawPosition; +import me.neophyte.mods.savecoords.IDimensionAware; +import me.neophyte.mods.savecoords.INetherCalculator; +import me.neophyte.mods.savecoords.IDimensionAware.IDimension; +import me.neophyte.mods.savecoords.model.PlayerPosition; +import me.neophyte.mods.savecoords.model.PlayerRawPosition; class NetherCalculator implements INetherCalculator { diff --git a/src/main/java/me/bionicbeanie/mods/savecoords/impl/PlayerLocator.java b/src/main/java/me/neophyte/mods/savecoords/impl/PlayerLocator.java similarity index 76% rename from src/main/java/me/bionicbeanie/mods/savecoords/impl/PlayerLocator.java rename to src/main/java/me/neophyte/mods/savecoords/impl/PlayerLocator.java index 8229f02..2786626 100644 --- a/src/main/java/me/bionicbeanie/mods/savecoords/impl/PlayerLocator.java +++ b/src/main/java/me/neophyte/mods/savecoords/impl/PlayerLocator.java @@ -1,8 +1,8 @@ -package me.bionicbeanie.mods.savecoords.impl; +package me.neophyte.mods.savecoords.impl; -import me.bionicbeanie.mods.savecoords.IDimensionAware; -import me.bionicbeanie.mods.savecoords.IPlayerLocator; -import me.bionicbeanie.mods.savecoords.model.PlayerRawPosition; +import me.neophyte.mods.savecoords.IDimensionAware; +import me.neophyte.mods.savecoords.IPlayerLocator; +import me.neophyte.mods.savecoords.model.PlayerRawPosition; import net.minecraft.client.MinecraftClient; import net.minecraft.util.math.Vec3d; diff --git a/src/main/java/me/bionicbeanie/mods/savecoords/model/ConfigData.java b/src/main/java/me/neophyte/mods/savecoords/model/ConfigData.java similarity index 98% rename from src/main/java/me/bionicbeanie/mods/savecoords/model/ConfigData.java rename to src/main/java/me/neophyte/mods/savecoords/model/ConfigData.java index d8a7e06..ef07f53 100644 --- a/src/main/java/me/bionicbeanie/mods/savecoords/model/ConfigData.java +++ b/src/main/java/me/neophyte/mods/savecoords/model/ConfigData.java @@ -1,4 +1,4 @@ -package me.bionicbeanie.mods.savecoords.model; +package me.neophyte.mods.savecoords.model; import java.lang.reflect.Type; diff --git a/src/main/java/me/bionicbeanie/mods/savecoords/model/ModData.java b/src/main/java/me/neophyte/mods/savecoords/model/ModData.java similarity index 93% rename from src/main/java/me/bionicbeanie/mods/savecoords/model/ModData.java rename to src/main/java/me/neophyte/mods/savecoords/model/ModData.java index ddb485a..629e45b 100644 --- a/src/main/java/me/bionicbeanie/mods/savecoords/model/ModData.java +++ b/src/main/java/me/neophyte/mods/savecoords/model/ModData.java @@ -1,4 +1,4 @@ -package me.bionicbeanie.mods.savecoords.model; +package me.neophyte.mods.savecoords.model; public class ModData { diff --git a/src/main/java/me/bionicbeanie/mods/savecoords/model/PlayerPosition.java b/src/main/java/me/neophyte/mods/savecoords/model/PlayerPosition.java similarity index 95% rename from src/main/java/me/bionicbeanie/mods/savecoords/model/PlayerPosition.java rename to src/main/java/me/neophyte/mods/savecoords/model/PlayerPosition.java index 02774fb..e920e81 100644 --- a/src/main/java/me/bionicbeanie/mods/savecoords/model/PlayerPosition.java +++ b/src/main/java/me/neophyte/mods/savecoords/model/PlayerPosition.java @@ -1,4 +1,4 @@ -package me.bionicbeanie.mods.savecoords.model; +package me.neophyte.mods.savecoords.model; public class PlayerPosition extends PlayerRawPosition { diff --git a/src/main/java/me/bionicbeanie/mods/savecoords/model/PlayerRawPosition.java b/src/main/java/me/neophyte/mods/savecoords/model/PlayerRawPosition.java similarity index 93% rename from src/main/java/me/bionicbeanie/mods/savecoords/model/PlayerRawPosition.java rename to src/main/java/me/neophyte/mods/savecoords/model/PlayerRawPosition.java index c150553..35b6fd0 100644 --- a/src/main/java/me/bionicbeanie/mods/savecoords/model/PlayerRawPosition.java +++ b/src/main/java/me/neophyte/mods/savecoords/model/PlayerRawPosition.java @@ -1,4 +1,4 @@ -package me.bionicbeanie.mods.savecoords.model; +package me.neophyte.mods.savecoords.model; public class PlayerRawPosition { private long x, y, z; diff --git a/src/main/java/me/bionicbeanie/mods/savecoords/model/PositionMetadata.java b/src/main/java/me/neophyte/mods/savecoords/model/PositionMetadata.java similarity index 95% rename from src/main/java/me/bionicbeanie/mods/savecoords/model/PositionMetadata.java rename to src/main/java/me/neophyte/mods/savecoords/model/PositionMetadata.java index 5d46d5a..3a58481 100644 --- a/src/main/java/me/bionicbeanie/mods/savecoords/model/PositionMetadata.java +++ b/src/main/java/me/neophyte/mods/savecoords/model/PositionMetadata.java @@ -1,4 +1,4 @@ -package me.bionicbeanie.mods.savecoords.model; +package me.neophyte.mods.savecoords.model; public class PositionMetadata { diff --git a/src/main/java/me/bionicbeanie/mods/savecoords/modmenu/SaveCoordinatesModMenu.java b/src/main/java/me/neophyte/mods/savecoords/modmenu/SaveCoordinatesModMenu.java similarity index 73% rename from src/main/java/me/bionicbeanie/mods/savecoords/modmenu/SaveCoordinatesModMenu.java rename to src/main/java/me/neophyte/mods/savecoords/modmenu/SaveCoordinatesModMenu.java index 4eee60a..4fb316a 100644 --- a/src/main/java/me/bionicbeanie/mods/savecoords/modmenu/SaveCoordinatesModMenu.java +++ b/src/main/java/me/neophyte/mods/savecoords/modmenu/SaveCoordinatesModMenu.java @@ -1,9 +1,9 @@ -package me.bionicbeanie.mods.savecoords.modmenu; +package me.neophyte.mods.savecoords.modmenu; import com.terraformersmc.modmenu.api.ConfigScreenFactory; import com.terraformersmc.modmenu.api.ModMenuApi; -import me.bionicbeanie.mods.savecoords.gui.impl.DIContainer; +import me.neophyte.mods.savecoords.gui.impl.DIContainer; public class SaveCoordinatesModMenu implements ModMenuApi { diff --git a/src/main/java/me/bionicbeanie/mods/savecoords/util/IdentifiersCache.java b/src/main/java/me/neophyte/mods/savecoords/util/IdentifiersCache.java similarity index 96% rename from src/main/java/me/bionicbeanie/mods/savecoords/util/IdentifiersCache.java rename to src/main/java/me/neophyte/mods/savecoords/util/IdentifiersCache.java index 14bb14b..84d7968 100644 --- a/src/main/java/me/bionicbeanie/mods/savecoords/util/IdentifiersCache.java +++ b/src/main/java/me/neophyte/mods/savecoords/util/IdentifiersCache.java @@ -1,4 +1,4 @@ -package me.bionicbeanie.mods.savecoords.util; +package me.neophyte.mods.savecoords.util; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/me/bionicbeanie/mods/savecoords/util/PartialCircularList.java b/src/main/java/me/neophyte/mods/savecoords/util/PartialCircularList.java similarity index 95% rename from src/main/java/me/bionicbeanie/mods/savecoords/util/PartialCircularList.java rename to src/main/java/me/neophyte/mods/savecoords/util/PartialCircularList.java index 0ebdea3..c832976 100644 --- a/src/main/java/me/bionicbeanie/mods/savecoords/util/PartialCircularList.java +++ b/src/main/java/me/neophyte/mods/savecoords/util/PartialCircularList.java @@ -1,4 +1,4 @@ -package me.bionicbeanie.mods.savecoords.util; +package me.neophyte.mods.savecoords.util; public class PartialCircularList { diff --git a/src/main/java/me/bionicbeanie/mods/savecoords/util/ResourceUtils.java b/src/main/java/me/neophyte/mods/savecoords/util/ResourceUtils.java similarity index 95% rename from src/main/java/me/bionicbeanie/mods/savecoords/util/ResourceUtils.java rename to src/main/java/me/neophyte/mods/savecoords/util/ResourceUtils.java index 3d2a570..3e7443f 100644 --- a/src/main/java/me/bionicbeanie/mods/savecoords/util/ResourceUtils.java +++ b/src/main/java/me/neophyte/mods/savecoords/util/ResourceUtils.java @@ -1,4 +1,4 @@ -package me.bionicbeanie.mods.savecoords.util; +package me.neophyte.mods.savecoords.util; import io.github.cottonmc.cotton.gui.widget.icon.Icon; import io.github.cottonmc.cotton.gui.widget.icon.TextureIcon; diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 66d564f..caa253d 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -17,10 +17,10 @@ "environment": "client", "entrypoints": { "client": [ - "me.bionicbeanie.mods.savecoords.SaveCoordinatesClient" + "me.neophyte.mods.savecoords.SaveCoordinatesClient" ], "modmenu": [ - "me.bionicbeanie.mods.savecoords.modmenu.SaveCoordinatesModMenu" + "me.neophyte.mods.savecoords.modmenu.SaveCoordinatesModMenu" ] }, "mixins": [], From 0cef29b46abac63233abd647592dd2146d5c3b93 Mon Sep 17 00:00:00 2001 From: Surya Date: Fri, 17 Dec 2021 16:41:34 +0530 Subject: [PATCH 6/7] Port to 1.18 --- .github/workflows/build.yml | 2 +- build.gradle | 9 ++++++--- gradle.properties | 14 +++++++------- gradle/wrapper/gradle-wrapper.properties | 2 +- src/main/resources/fabric.mod.json | 4 ++-- 5 files changed, 17 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3c8f55e..a7c0aa7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,7 +12,7 @@ jobs: matrix: # Use these Java versions java: [ - 16, # Minimum supported by Minecraft + 17, # Minimum supported by Minecraft ] # and run on both Linux and Windows os: [ubuntu-20.04, windows-latest] diff --git a/build.gradle b/build.gradle index ab622a1..43b5b4b 100644 --- a/build.gradle +++ b/build.gradle @@ -1,10 +1,10 @@ plugins { - id 'fabric-loom' version '0.8-SNAPSHOT' + id 'fabric-loom' version '0.10-SNAPSHOT' id 'maven-publish' } -sourceCompatibility = JavaVersion.VERSION_16 -targetCompatibility = JavaVersion.VERSION_16 +sourceCompatibility = JavaVersion.VERSION_17 +targetCompatibility = JavaVersion.VERSION_17 archivesBaseName = project.archives_base_name version = project.mod_version @@ -55,6 +55,9 @@ tasks.withType(JavaCompile).configureEach { // see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html // If Javadoc is generated, this must be specified in that task too. it.options.encoding = "UTF-8" + + // Minecraft 1.18 (1.18-pre2) upwards uses Java 17. + it.options.release = 17 } java { diff --git a/gradle.properties b/gradle.properties index 808236a..1f62723 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,21 +3,21 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://fabricmc.net/use - minecraft_version=1.17.1 - yarn_mappings=1.17.1+build.63 - loader_version=0.11.7 + minecraft_version=1.18.1 + yarn_mappings=1.18.1+build.1 + loader_version=0.12.12 # Mod Properties - mod_version = 1.17.1-1.2.1 + mod_version = 1.18.1-1.3.0 maven_group = me.neophyte.mods.savecoords archives_base_name = save-coordinates # Dependencies # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api - fabric_version=0.41.0+1.17 + fabric_version=0.44.0+1.18 # https://github.com/CottonMC/LibGui/wiki/Setup - libgui_version=4.2.1+1.17.1 + libgui_version=5.1.0+1.18 #https://maven.terraformersmc.com/releases/com/terraformersmc/modmenu/ - modmenu_version=2.0.14 + modmenu_version=3.0.0 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0f80bbf..84d1f85 100644 --- 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.3.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index caa253d..5bfbf57 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -27,8 +27,8 @@ "depends": { "fabricloader": ">=0.11.3", "fabric": "*", - "minecraft": "1.17.1", - "java": ">=16" + "minecraft": "1.18.x", + "java": ">=17" }, "suggests": { "another-mod": "modmenu" From cc92ab41fe410bcb0f04c6ae381f6848a5f8b053 Mon Sep 17 00:00:00 2001 From: Surya Date: Fri, 17 Dec 2021 16:54:58 +0530 Subject: [PATCH 7/7] Update readme for 1.18 --- README.md | 47 ++++++++++++++++++++++++++++++++++++----------- 1 file changed, 36 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 400d523..142148d 100644 --- a/README.md +++ b/README.md @@ -8,20 +8,45 @@ This mod|Minecraft|[Fabric API](https://www.curseforge.com/minecraft/mc-mods/fabric-api/files)|[Mod Menu](https://www.curseforge.com/minecraft/mc-mods/modmenu/files) (optional) --|--|--|-- -1.16.5-1.1.0 |1.16.5|0.34.2+1.16+|1.16.9+ -1.17-1.1.1 |1.17|0.34.9+1.17+|2.0.0-beta.7+ -1.17-1.1.1 |1.17.1|0.34.9+1.17+|2.0.2 +**1.18.1-1.3.0**|1.18.x|0.44.0+1.18|3.0.0 1.17.1-1.2.1|1.17.1|0.41.0+1.17|2.0.14 +1.17-1.1.1 |1.17.1|0.34.9+1.17+|2.0.2 +1.17-1.1.1 |1.17|0.34.9+1.17+|2.0.0-beta.7+ +1.16.5-1.1.0 |1.16.5|0.34.2+1.16+|1.16.9+ -## Usage +
-- Press `H` to open menu -- Press `B` to beam location -- Press `N` to lock beaming -- Select `SAVE` to save the coordinate -- Select `PING` to ping the coordinate to other players -- Select `LIST` to view saved coordinates -- Select `CONF` to update configs. Reachable through mod menu as well when available +## Saving a new coordinate + +- Press `H` to open menu to save a coordinate. +- You can manually enter the coordinates and change the dimension by clicking on the text below the current dimension icon. +- Provide a world name and some description. +- Select to ping the coordinate to other players. +- Select `SAVE` to save the coordinate. + +
+ +## Managing coordinates + +- Press `J` or select `LIST` to open the list of coordinates. +- Select in list view to ping that coordinate to other players. +- Select to convert the coordinate to nether (or vice versa) + +
+ +## Broadcasting current location + +- Press `B` to broadcast current location +- Press `N` to lock broadcasting current location + +
+ +## Configs + +- Select `CONF` in any window to update configs. +- This is reachable through mod menu as well when available. + +
## Discord