Ticket #2441: 2441-change-location-by-hud.patch

src/main/java/org/sophie2/main/app/halos/huds/properties/PropertiesHud.java

@@ -1418 +1418 @@
                         public boolean handle(EventR3 event) {
                                 VisualElement source = event.getSource(FrameXPosition.class);
                                 ResourceAccess access = getAccess(source);
+                                LocationChannel oldChannel = MemberElement.KEY_LOCATION.get(access);
+                                TimePos time = getTime(source);                         
+                                ImmPoint oldLocation = oldChannel.getValue(time);
+                                
                                 String input = event.getEventParam(BoundControl.EventIds.INPUT_PARAM_INDEX,
                                                 String.class);
-                                ImmPoint location = MemberElement.KEY_LOCATION.get(access)
-                                                .getValue(getTime(source));
                                 float value = BoundValidation.parseNumber(input, Float.class);
-                                final ImmPoint newPoint = new ImmPoint(value, location.getY());
-                                final LocationChannel channel = MemberElement.KEY_LOCATION.get(access);
+                                ImmPoint newLocation = new ImmPoint(value, oldLocation.getY());
+                                final LocationChannel newChannel = oldChannel.setValue(time, newLocation);
 
                                 new AutoAction(Message.create(SET_X_POSITION), true) {
                                         @Override
                                         public void performAuto() {
-                                                getChanger().setRaw(MemberElement.KEY_LOCATION, channel.setAll(newPoint));
+                                                getChanger().setRaw(MemberElement.KEY_LOCATION, newChannel);
                                         }
                                 }.register(access);
+                                
                                 return true;
                         }
                 },
@@ -1449 +1452 @@
                         public boolean handle(EventR3 event) {
                                 VisualElement source = event.getSource(FrameYPosition.class);
                                 ResourceAccess access = getAccess(source);
+                                LocationChannel oldChannel = MemberElement.KEY_LOCATION.get(access);
+                                TimePos time = getTime(source);                         
+                                ImmPoint oldLocation = oldChannel.getValue(time);
+                                
                                 String input = event.getEventParam(BoundControl.EventIds.INPUT_PARAM_INDEX,
                                                 String.class);
-
-                                final LocationChannel location = MemberElement.KEY_LOCATION.get(access);
                                 float value = BoundValidation.parseNumber(input, Float.class);
-                                final ImmPoint newPoint = new ImmPoint(location.getValue(getTime(source)).getX(),
-                                                value);
-
+                                ImmPoint newLocation = new ImmPoint(oldLocation.getX(), value);
+                                final LocationChannel newChannel = oldChannel.setValue(time, newLocation);
+                                
                                 new AutoAction(Message.create(SET_Y_POSITION), true) {
                                         @Override
                                         public void performAuto() {
-                                                getChanger().setRaw(MemberElement.KEY_LOCATION, location.setAll(newPoint));
+                                                getChanger().setRaw(MemberElement.KEY_LOCATION, newChannel);
                                         }
                                 }.register(access);
+                                
                                 return true;
                         }
                 },