Skip to content

Commit 5cab076

Browse files
committed
[Serialiser] Revert virtual input "fix"
1 parent d9171fc commit 5cab076

3 files changed

Lines changed: 11 additions & 6 deletions

File tree

src/main/java/com/minecrafttas/tasmod/playback/tasfile/flavor/builtin/ParkourCalculatorFlavor.java

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,11 @@
3131
import com.minecrafttas.tasmod.virtual.VirtualKeyboard;
3232
import com.minecrafttas.tasmod.virtual.VirtualMouse;
3333

34+
/**
35+
* Flavor for importing/exporting files from <a href="https://github.com/Leg0shii/ParkourCalculatorMod">ParkourCalculatorMod</a>
36+
*
37+
* @author Scribble
38+
*/
3439
public class ParkourCalculatorFlavor extends SerialiserFlavorBase {
3540

3641
private final Gson gson;
@@ -84,7 +89,7 @@ public BigArrayList<InputContainer> deserialise(BigArrayList<String> lines, long
8489
JsonObject main = gson.fromJson(fullJson, JsonObject.class);
8590
deserialiseMetadata(main);
8691
JsonObject start = main.get("start").getAsJsonObject();
87-
previousInputContainer = new InputContainer(new VirtualKeyboard(), new VirtualMouse(), new VirtualCameraAngle(0f, start.get("yaw").getAsFloat()));
92+
previousInputContainer = new InputContainer(new VirtualKeyboard(), new VirtualMouse(), new VirtualCameraAngle(0f, start.get("yaw").getAsFloat(), false));
8893

8994
JsonArray rows = main.get("rows").getAsJsonArray();
9095
JsonArray debug = null;
@@ -149,7 +154,7 @@ protected VirtualKeyboard deserialiseKeyboard(JsonElement jsonElement) {
149154
String keyString = key.getAsString();
150155
keySet.add(deserialiseVirtualKey(keyString, null));
151156
});
152-
return new VirtualKeyboard(keySet, new ArrayList<>());
157+
return new VirtualKeyboard(keySet, new ArrayList<>(), new ArrayList<>(), false);
153158
}
154159

155160
@Override
@@ -178,7 +183,7 @@ private VirtualCameraAngle deserialiseCameraAngle(JsonElement jsonElement) {
178183
if (jsonElement == null)
179184
return previousInputContainer.getCameraAngle();
180185
float yaw = jsonElement.getAsFloat() + previousInputContainer.getCameraAngle().getYaw();
181-
return new VirtualCameraAngle(0f, yaw);
186+
return new VirtualCameraAngle(0f, yaw, false);
182187
}
183188

184189
protected void deserialiseMetadata(JsonObject main) {

src/main/java/com/minecrafttas/tasmod/virtual/VirtualCameraAngle.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public VirtualCameraAngle() {
3838
* @param yaw {@link #yaw}
3939
*/
4040
public VirtualCameraAngle(Float pitch, Float yaw) {
41-
this(pitch, yaw, new ArrayList<>());
41+
this(pitch, yaw, null);
4242
}
4343

4444
/**

src/main/java/com/minecrafttas/tasmod/virtual/VirtualKeyboard.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ public VirtualKeyboard() {
9696
* @param charList A list of characters for this subtickKeyboard
9797
*/
9898
public VirtualKeyboard(Set<Integer> pressedKeys, List<Character> charList) {
99-
this(pressedKeys, charList, new ArrayList<>(), false);
99+
this(pressedKeys, charList, null, false);
100100
}
101101

102102
/**
@@ -105,7 +105,7 @@ public VirtualKeyboard(Set<Integer> pressedKeys, List<Character> charList) {
105105
* @param charList The existing list of characters
106106
*/
107107
public VirtualKeyboard(Set<Integer> pressedKeys, List<Character> charList, boolean ignoreFirstUpdate) {
108-
this(pressedKeys, charList, new ArrayList<>(), ignoreFirstUpdate);
108+
this(pressedKeys, charList, null, ignoreFirstUpdate);
109109
}
110110

111111
/**

0 commit comments

Comments
 (0)