fix #47

Author: PouekDEV

src/main/java/one/pouekdev/coordinatelist/CListClient.java

@@ -166,7 +166,7 @@ public void onInitializeClient() {
             while(add_a_waypoint.wasPressed()){
                 if(!Objects.equals(client.currentScreen, new CListWaypointScreen(Text.literal("Waypoints")))){
                     PlayerEntity player = CListVariables.minecraft_client.player;
-                    addNewWaypoint((int) Math.round(player.getX()), (int) Math.round(player.getY()), (int) Math.round(player.getZ()),false);
+                    addNewWaypoint((int) Math.round(player.getX()), (int) Math.round(player.getY()), (int) Math.round(player.getZ()),false,true);
                 }
             }
             while(toggle_visibility.wasPressed()){
@@ -200,7 +200,7 @@ public void onInitializeClient() {
                         }
                         if(!client.player.isAlive() && !variables.had_death_waypoint_placed && CListConfig.can_place_deathpoints){
                             PlayerEntity player = client.player;
-                            addNewWaypoint((int) Math.round(player.getX()), (int) Math.round(player.getY()), (int) Math.round(player.getZ()),true);
+                            addNewWaypoint((int) Math.round(player.getX()), (int) Math.round(player.getY()), (int) Math.round(player.getZ()),true,false);
                             variables.had_death_waypoint_placed = true;
                         } else if (client.player.isAlive() && variables.had_death_waypoint_placed) {
                             variables.had_death_waypoint_placed = false;
@@ -216,7 +216,7 @@ public void onInitializeClient() {
         variables.saved_since_last_update = true;
         variables.loaded_last_world = false;
     }
-    public static void addNewWaypoint(int x, int y, int z, boolean death){
+    public static void addNewWaypoint(int x, int y, int z, boolean death, boolean viaKeybind){
         CList.LOGGER.info("New waypoint for dimension " + variables.last_world.getDimension().effects());
         String waypoint_name;
         if(death){
@@ -229,7 +229,7 @@ public static void addNewWaypoint(int x, int y, int z, boolean death){
         variables.colors.add(new CListWaypointColor(rand.nextFloat(),rand.nextFloat(),rand.nextFloat()));
         variables.saved_since_last_update = false;
         if(!death){
-            CListVariables.minecraft_client.setScreen(new CListWaypointConfig(Text.literal("Config"),variables.waypoints.size()-1));
+            CListVariables.minecraft_client.setScreen(new CListWaypointConfig(Text.literal("Config"),variables.waypoints.size()-1, viaKeybind));
         }
     }
     public static void deleteWaypoint(int position){

src/main/java/one/pouekdev/coordinatelist/CListCommand.java

@@ -18,7 +18,7 @@ public void register(CommandDispatcher<FabricClientCommandSource> dispatcher, Co
                     int x = IntegerArgumentType.getInteger(ctx,"x");
                     int y = IntegerArgumentType.getInteger(ctx,"y");
                     int z = IntegerArgumentType.getInteger(ctx,"z");
-                    CListClient.addNewWaypoint(x,y,z,false);
+                    CListClient.addNewWaypoint(x,y,z,false,true);
                     return 0;
         })))));
     }

src/main/java/one/pouekdev/coordinatelist/CListWaypointConfig.java

@@ -17,17 +17,19 @@
 public class CListWaypointConfig extends Screen {
     private static int id;
     private boolean render_color_picker = false;
+    private final boolean viaKeybind;
     private final CListWaypoint waypoint;
     private TextFieldWidget waypoint_name;
     private static TextFieldWidget waypoint_color;
     private TextFieldWidget x, y, z;
     private SpriteButton change_color;
     private HSVSlider h, s, v;
     private static float[] hsv;
-    public CListWaypointConfig(Text title, int waypoint_id){
+    public CListWaypointConfig(Text title, int waypoint_id, boolean viaKeybind){
         super(title);
         id = waypoint_id;
         this.waypoint = CListClient.variables.waypoints.get(id);
+        this.viaKeybind = viaKeybind;
     }
     @Override
     protected void init(){
@@ -39,7 +41,15 @@ protected void init(){
             CListClient.deleteWaypoint(id);
             CListVariables.minecraft_client.setScreen(new CListWaypointScreen(Text.literal("Waypoints")));
         }).width(150).build(),1, gridWidget.copyPositioner().marginBottom(10));
-        adder.add(ButtonWidget.builder(Text.translatable("gui.done"), button -> {CListVariables.minecraft_client.setScreen(new CListWaypointScreen(Text.literal("Waypoints")));CListClient.variables.saved_since_last_update = false;}).width(150).build(),1, gridWidget.copyPositioner().marginBottom(10));
+        adder.add(ButtonWidget.builder(Text.translatable("gui.done"), button -> {
+            CListClient.variables.saved_since_last_update = false;
+            if(!viaKeybind){
+                CListVariables.minecraft_client.setScreen(new CListWaypointScreen(Text.literal("Waypoints")));
+            }
+            else{
+                close();
+            }
+        }).width(150).build(),1, gridWidget.copyPositioner().marginBottom(10));
         this.waypoint_name = new TextFieldWidget(textRenderer, (this.width-150)/2, (this.height-20)/2-80, 150, 20, Text.literal(""));
         this.waypoint_name.setFocusUnlocked(true);
         this.waypoint_name.setMaxLength(25);

src/main/java/one/pouekdev/coordinatelist/CListWaypointScreen.java

@@ -17,14 +17,14 @@
 import java.util.List;
 
 public class CListWaypointScreen extends Screen {
-    public CListWaypointScreen(Text title) {
-        super(title);
-    }
     private ScrollList list;
     private int selected_waypoint_id = -1;
     private ButtonWidget copy_coordinates_button;
     private ButtonWidget edit_waypoint_button;
     private ButtonWidget delete_waypoint_button;
+    public CListWaypointScreen(Text title) {
+        super(title);
+    }
     @Override
     protected void init() {
         GridWidget gridWidget = new GridWidget();
@@ -35,7 +35,7 @@ protected void init() {
         GridWidget.Adder adderBottom = gridWidgetBottom.createAdder(3);
         adder.add(ButtonWidget.builder(Text.translatable("buttons.add.new.waypoint"), button -> {
             PlayerEntity player = CListVariables.minecraft_client.player;
-            CListClient.addNewWaypoint((int) Math.round(player.getX()), (int) Math.round(player.getY()), (int) Math.round(player.getZ()),false);
+            CListClient.addNewWaypoint((int) Math.round(player.getX()), (int) Math.round(player.getY()), (int) Math.round(player.getZ()),false,true);
             list.RefreshElements();
         }).width(300).build(),2, gridWidget.copyPositioner().marginTop(10));
         copy_coordinates_button = ButtonWidget.builder(Text.literal("---"), button -> {
@@ -44,7 +44,7 @@ protected void init() {
             GLFW.glfwSetClipboardString(window, waypoint.x + " " + waypoint.y + " " + waypoint.z);
         }).width(150).build();
         copy_coordinates_button.setTooltip(Tooltip.of(Text.translatable("tooltip.copy.waypoint.coordinates")));
-        edit_waypoint_button = ButtonWidget.builder(Text.translatable("selectWorld.edit"), button -> CListVariables.minecraft_client.setScreen(new CListWaypointConfig(Text.literal("Config"),selected_waypoint_id))).width(100).build();
+        edit_waypoint_button = ButtonWidget.builder(Text.translatable("selectWorld.edit"), button -> CListVariables.minecraft_client.setScreen(new CListWaypointConfig(Text.literal("Config"),selected_waypoint_id,false))).width(100).build();
         delete_waypoint_button = ButtonWidget.builder(Text.translatable("selectWorld.delete"), button -> {
             CListClient.deleteWaypoint(selected_waypoint_id);
             if(selected_waypoint_id >= CListClient.variables.waypoints.size()){