Skip to content

Commit 37e53b5

Browse files
ScribbleTASScribbleTAS
committed
[PlaybackController] Rename TickContainer to InputContainer
It just makes more sense at this point...
1 parent d98498e commit 37e53b5

17 files changed

+155
-157
lines changed

‎src/main/java/com/minecrafttas/tasmod/events/EventPlaybackClient.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.minecrafttas.mctcommon.events.EventListenerRegistry.EventBase;
44
import com.minecrafttas.tasmod.playback.PlaybackControllerClient;
55
import com.minecrafttas.tasmod.playback.PlaybackControllerClient.TASstate;
6-
import com.minecrafttas.tasmod.playback.PlaybackControllerClient.TickContainer;
6+
import com.minecrafttas.tasmod.playback.PlaybackControllerClient.InputContainer;
77

88
public interface EventPlaybackClient {
99

@@ -53,9 +53,9 @@ public interface EventRecordTick extends EventBase {
5353
* Fired when a tick is being recorded
5454
*
5555
* @param index The index of the tick that is being recorded
56-
* @param container The {@link TickContainer} that is being recorded
56+
* @param container The {@link InputContainer} that is being recorded
5757
*/
58-
public void onRecordTick(long index, TickContainer container);
58+
public void onRecordTick(long index, InputContainer container);
5959
}
6060

6161
/**
@@ -68,9 +68,9 @@ public interface EventPlaybackTick extends EventBase {
6868
* Fired when a tick is being recorded
6969
*
7070
* @param index The index of the tick that is being recorded
71-
* @param container The {@link TickContainer} that is being recorded
71+
* @param container The {@link InputContainer} that is being recorded
7272
*/
73-
public void onPlaybackTick(long index, TickContainer container);
73+
public void onPlaybackTick(long index, InputContainer container);
7474
}
7575

7676
/**

‎src/main/java/com/minecrafttas/tasmod/handlers/InterpolationHandler.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import com.minecrafttas.mctcommon.events.EventClient.EventCamera;
44
import com.minecrafttas.tasmod.TASmodClient;
5-
import com.minecrafttas.tasmod.playback.PlaybackControllerClient.TickContainer;
5+
import com.minecrafttas.tasmod.playback.PlaybackControllerClient.InputContainer;
66

77
import net.minecraft.client.Minecraft;
88
import net.minecraft.util.math.MathHelper;
@@ -22,7 +22,7 @@ public class InterpolationHandler implements EventCamera {
2222
@Override
2323
public CameraData onCameraEvent(CameraData dataIn) {
2424
if (TASmodClient.controller.isPlayingback() /*&& ControlByteHandler.shouldInterpolate*/) {
25-
TickContainer input = TASmodClient.controller.get();
25+
InputContainer input = TASmodClient.controller.get();
2626
if (input == null)
2727
return dataIn;
2828
float nextPitch = input.getCameraAngle().getPitch();

‎src/main/java/com/minecrafttas/tasmod/playback/PlaybackControllerClient.java‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ public class PlaybackControllerClient implements ClientPacketHandler, EventClien
119119
/**
120120
* The place where all inputs get stored
121121
*/
122-
private BigArrayList<TickContainer> inputs;
122+
private BigArrayList<InputContainer> inputs;
123123

124124
// private long startSeed = TASmod.ktrngHandler.getGlobalSeedClient(); // TODO Replace with Metadata extension
125125

@@ -130,7 +130,7 @@ public class PlaybackControllerClient implements ClientPacketHandler, EventClien
130130
public PlaybackControllerClient() {
131131
tasFileDirectory = TASmodClient.tasfiledirectory;
132132

133-
inputs = new BigArrayList<TickContainer>(tasFileDirectory.resolve("temp").toAbsolutePath().toString());
133+
inputs = new BigArrayList<InputContainer>(tasFileDirectory.resolve("temp").toAbsolutePath().toString());
134134
}
135135

136136
/**
@@ -263,7 +263,7 @@ private void startRecording() {
263263
Float yaw = CAMERA_ANGLE.getCurrentYaw();
264264
this.camera.set(pitch, yaw);
265265

266-
inputs.add(new TickContainer());
266+
inputs.add(new InputContainer());
267267
}
268268
}
269269

@@ -417,7 +417,7 @@ public void onClientTickPost(Minecraft mc) {
417417

418418
private void recordNextTick() {
419419
index++;
420-
TickContainer container = new TickContainer(keyboard.clone(), mouse.clone(), camera.clone());
420+
InputContainer container = new InputContainer(keyboard.clone(), mouse.clone(), camera.clone());
421421
if (inputs.size() <= index) {
422422
if (inputs.size() < index) {
423423
LOGGER.warn("Index is {} inputs bigger than the container!", index - inputs.size());
@@ -460,7 +460,7 @@ private void playbackNextTick() {
460460
}
461461
/* Continue condition */
462462
else {
463-
TickContainer container = inputs.get(index); // Loads the new inputs from the container
463+
InputContainer container = inputs.get(index); // Loads the new inputs from the container
464464
this.keyboard = container.getKeyboard().clone();
465465
this.mouse = container.getMouse().clone();
466466
this.camera = container.getCameraAngle().clone();
@@ -483,21 +483,21 @@ public long index() {
483483
return index;
484484
}
485485

486-
public BigArrayList<TickContainer> getInputs() {
486+
public BigArrayList<InputContainer> getInputs() {
487487
return inputs;
488488
}
489489

490-
public void setInputs(BigArrayList<TickContainer> inputs) {
490+
public void setInputs(BigArrayList<InputContainer> inputs) {
491491
this.setInputs(inputs, 0);
492492
}
493493

494-
public void setInputs(BigArrayList<TickContainer> inputs, long index) {
494+
public void setInputs(BigArrayList<InputContainer> inputs, long index) {
495495
try {
496496
this.inputs.clearMemory();
497497
} catch (IOException e) {
498498
e.printStackTrace();
499499
}
500-
this.inputs = new BigArrayList<TickContainer>(tasFileDirectory + File.separator + "temp");
500+
this.inputs = new BigArrayList<InputContainer>(tasFileDirectory + File.separator + "temp");
501501
SerialiserFlavorBase.addAll(this.inputs, inputs);
502502
setIndex(index);
503503
}
@@ -506,30 +506,30 @@ public void setIndex(long index) throws IndexOutOfBoundsException {
506506
if (index <= size()) {
507507
this.index = index;
508508
if (state == TASstate.PLAYBACK) {
509-
TickContainer tickcontainer = inputs.get(index);
510-
this.keyboard = tickcontainer.getKeyboard();
511-
this.mouse = tickcontainer.getMouse();
512-
this.camera = tickcontainer.getCameraAngle();
509+
InputContainer inputcontainer = inputs.get(index);
510+
this.keyboard = inputcontainer.getKeyboard();
511+
this.mouse = inputcontainer.getMouse();
512+
this.camera = inputcontainer.getCameraAngle();
513513
}
514514
} else {
515515
throw new IndexOutOfBoundsException("Index is bigger than the container");
516516
}
517517
}
518518

519-
public TickContainer get(long index) {
520-
TickContainer tickcontainer = null;
519+
public InputContainer get(long index) {
520+
InputContainer inputcontainer = null;
521521
try {
522-
tickcontainer = inputs.get(index);
522+
inputcontainer = inputs.get(index);
523523
} catch (IndexOutOfBoundsException e) {
524524
return null;
525525
}
526-
return tickcontainer;
526+
return inputcontainer;
527527
}
528528

529529
/**
530-
* @return The {@link TickContainer} at the current index
530+
* @return The {@link InputContainer} at the current index
531531
*/
532-
public TickContainer get() {
532+
public InputContainer get() {
533533
return get(index);
534534
}
535535

@@ -541,7 +541,7 @@ public void clear() {
541541
} catch (IOException e) {
542542
e.printStackTrace();
543543
}
544-
inputs = new BigArrayList<TickContainer>(tasFileDirectory + File.separator + "temp");
544+
inputs = new BigArrayList<InputContainer>(tasFileDirectory + File.separator + "temp");
545545
index = 0;
546546
}
547547

@@ -585,7 +585,7 @@ public void setPlayUntil(int until) {
585585
* @author Scribble
586586
*
587587
*/
588-
public static class TickContainer implements Serializable {
588+
public static class InputContainer implements Serializable {
589589

590590
private VirtualKeyboard keyboard;
591591

@@ -595,18 +595,18 @@ public static class TickContainer implements Serializable {
595595

596596
private CommentContainer comments;
597597

598-
public TickContainer(VirtualKeyboard keyboard, VirtualMouse mouse, VirtualCameraAngle subticks) {
598+
public InputContainer(VirtualKeyboard keyboard, VirtualMouse mouse, VirtualCameraAngle subticks) {
599599
this(keyboard, mouse, subticks, new CommentContainer());
600600
}
601601

602-
public TickContainer(VirtualKeyboard keyboard, VirtualMouse mouse, VirtualCameraAngle camera, CommentContainer comments) {
602+
public InputContainer(VirtualKeyboard keyboard, VirtualMouse mouse, VirtualCameraAngle camera, CommentContainer comments) {
603603
this.keyboard = keyboard;
604604
this.mouse = mouse;
605605
this.cameraAngle = camera;
606606
this.comments = comments;
607607
}
608608

609-
public TickContainer() {
609+
public InputContainer() {
610610
this(new VirtualKeyboard(), new VirtualMouse(), new VirtualCameraAngle());
611611
}
612612

@@ -639,14 +639,14 @@ public CommentContainer getComments() {
639639
}
640640

641641
@Override
642-
public TickContainer clone() {
643-
return new TickContainer(keyboard, mouse, cameraAngle);
642+
public InputContainer clone() {
643+
return new InputContainer(keyboard, mouse, cameraAngle);
644644
}
645645

646646
@Override
647647
public boolean equals(Object other) {
648-
if (other instanceof TickContainer) {
649-
TickContainer container = (TickContainer) other;
648+
if (other instanceof InputContainer) {
649+
InputContainer container = (InputContainer) other;
650650
return keyboard.equals(container.keyboard) && mouse.equals(container.mouse) && cameraAngle.equals(container.cameraAngle) && comments.equals(container.comments);
651651
}
652652
return super.equals(other);

‎src/main/java/com/minecrafttas/tasmod/playback/filecommands/PlaybackFileCommand.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import com.minecrafttas.mctcommon.file.AbstractDataFile;
1313
import com.minecrafttas.mctcommon.registry.Registerable;
1414
import com.minecrafttas.tasmod.TASmodClient;
15-
import com.minecrafttas.tasmod.playback.PlaybackControllerClient.TickContainer;
15+
import com.minecrafttas.tasmod.playback.PlaybackControllerClient.InputContainer;
1616

1717
public class PlaybackFileCommand {
1818

@@ -99,24 +99,24 @@ public void onDisable() {
9999
public void onClear() {
100100
};
101101

102-
public void onRecord(long tick, TickContainer tickContainer) {
102+
public void onRecord(long tick, InputContainer inputContainer) {
103103
};
104104

105-
public void onPlayback(long tick, TickContainer tickContainer) {
105+
public void onPlayback(long tick, InputContainer inputContainer) {
106106
};
107107

108-
public PlaybackFileCommandContainer onSerialiseInlineComment(long tick, TickContainer tickContainer) {
108+
public PlaybackFileCommandContainer onSerialiseInlineComment(long tick, InputContainer inputContainer) {
109109
return null;
110110
}
111111

112-
public PlaybackFileCommandContainer onSerialiseEndlineComment(long currentTick, TickContainer tickContainer) {
112+
public PlaybackFileCommandContainer onSerialiseEndlineComment(long currentTick, InputContainer inputContainer) {
113113
return null;
114114
}
115115

116-
public void onDeserialiseInlineComment(long tick, TickContainer container, PlaybackFileCommandContainer fileCommandContainer) {
116+
public void onDeserialiseInlineComment(long tick, InputContainer container, PlaybackFileCommandContainer fileCommandContainer) {
117117
}
118118

119-
public void onDeserialiseEndlineComment(long tick, TickContainer container, PlaybackFileCommandContainer fileCommandContainer) {
119+
public void onDeserialiseEndlineComment(long tick, InputContainer container, PlaybackFileCommandContainer fileCommandContainer) {
120120
}
121121

122122
public boolean isEnabled() {

‎src/main/java/com/minecrafttas/tasmod/playback/filecommands/PlaybackFileCommandsRegistry.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import com.minecrafttas.mctcommon.Configuration;
99
import com.minecrafttas.mctcommon.registry.AbstractRegistry;
1010
import com.minecrafttas.tasmod.events.EventPlaybackClient;
11-
import com.minecrafttas.tasmod.playback.PlaybackControllerClient.TickContainer;
11+
import com.minecrafttas.tasmod.playback.PlaybackControllerClient.InputContainer;
1212
import com.minecrafttas.tasmod.playback.filecommands.PlaybackFileCommand.PlaybackFileCommandContainer;
1313
import com.minecrafttas.tasmod.playback.filecommands.PlaybackFileCommand.PlaybackFileCommandExtension;
1414
import com.minecrafttas.tasmod.registries.TASmodConfig;
@@ -93,7 +93,7 @@ public List<PlaybackFileCommandExtension> getAll() {
9393
}
9494

9595
@Override
96-
public void onRecordTick(long index, TickContainer container) {
96+
public void onRecordTick(long index, InputContainer container) {
9797
enabledExtensions.forEach(extension -> {
9898
if (extension.isEnabled()) {
9999
extension.onRecord(index, container);
@@ -102,15 +102,15 @@ public void onRecordTick(long index, TickContainer container) {
102102
}
103103

104104
@Override
105-
public void onPlaybackTick(long index, TickContainer container) {
105+
public void onPlaybackTick(long index, InputContainer container) {
106106
enabledExtensions.forEach(extension -> {
107107
if (extension.isEnabled()) {
108108
extension.onPlayback(index, container);
109109
}
110110
});
111111
}
112112

113-
public PlaybackFileCommandContainer handleOnSerialiseInline(long currentTick, TickContainer container) {
113+
public PlaybackFileCommandContainer handleOnSerialiseInline(long currentTick, InputContainer container) {
114114
PlaybackFileCommandContainer out = new PlaybackFileCommandContainer();
115115
for (PlaybackFileCommandExtension extension : enabledExtensions) {
116116
PlaybackFileCommandContainer extensionContainer = extension.onSerialiseInlineComment(currentTick, container);
@@ -121,7 +121,7 @@ public PlaybackFileCommandContainer handleOnSerialiseInline(long currentTick, Ti
121121
return out;
122122
}
123123

124-
public PlaybackFileCommandContainer handleOnSerialiseEndline(long currentTick, TickContainer container) {
124+
public PlaybackFileCommandContainer handleOnSerialiseEndline(long currentTick, InputContainer container) {
125125
PlaybackFileCommandContainer out = new PlaybackFileCommandContainer();
126126
for (PlaybackFileCommandExtension extension : enabledExtensions) {
127127
PlaybackFileCommandContainer extensionContainer = extension.onSerialiseEndlineComment(currentTick, container);
@@ -132,15 +132,15 @@ public PlaybackFileCommandContainer handleOnSerialiseEndline(long currentTick, T
132132
return out;
133133
}
134134

135-
public void handleOnDeserialiseInline(long currentTick, TickContainer deserialisedContainer, List<List<PlaybackFileCommand>> inlineFileCommands) {
135+
public void handleOnDeserialiseInline(long currentTick, InputContainer deserialisedContainer, List<List<PlaybackFileCommand>> inlineFileCommands) {
136136
PlaybackFileCommandContainer fileCommandContainer = new PlaybackFileCommandContainer(inlineFileCommands);
137137
for (PlaybackFileCommandExtension extension : enabledExtensions) {
138138
String[] fileCommandNames = extension.getFileCommandNames();
139139
extension.onDeserialiseInlineComment(currentTick, deserialisedContainer, fileCommandContainer.split(fileCommandNames));
140140
}
141141
}
142142

143-
public void handleOnDeserialiseEndline(long currentTick, TickContainer deserialisedContainer, List<List<PlaybackFileCommand>> endlineFileCommands) {
143+
public void handleOnDeserialiseEndline(long currentTick, InputContainer deserialisedContainer, List<List<PlaybackFileCommand>> endlineFileCommands) {
144144
PlaybackFileCommandContainer fileCommandContainer = new PlaybackFileCommandContainer(endlineFileCommands);
145145
for (PlaybackFileCommandExtension extension : enabledExtensions) {
146146
String[] fileCommandNames = extension.getFileCommandNames();

‎src/main/java/com/minecrafttas/tasmod/playback/filecommands/builtin/DesyncMonitorFileCommandExtension.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import com.minecrafttas.tasmod.TASmodClient;
1313
import com.minecrafttas.tasmod.events.EventPlaybackClient;
1414
import com.minecrafttas.tasmod.playback.PlaybackControllerClient.TASstate;
15-
import com.minecrafttas.tasmod.playback.PlaybackControllerClient.TickContainer;
15+
import com.minecrafttas.tasmod.playback.PlaybackControllerClient.InputContainer;
1616
import com.minecrafttas.tasmod.playback.filecommands.PlaybackFileCommand;
1717
import com.minecrafttas.tasmod.playback.filecommands.PlaybackFileCommand.PlaybackFileCommandContainer;
1818
import com.minecrafttas.tasmod.playback.filecommands.PlaybackFileCommand.PlaybackFileCommandExtension;
@@ -75,7 +75,7 @@ public void onControllerStateChange(TASstate newstate, TASstate oldstate) {
7575
}
7676

7777
@Override
78-
public void onRecord(long tick, TickContainer tickContainer) {
78+
public void onRecord(long tick, InputContainer inputContainer) {
7979
EntityPlayerSP player = Minecraft.getMinecraft().player;
8080
MonitorContainer values = null;
8181
if (player != null) {
@@ -97,7 +97,7 @@ public void onDisable() {
9797
}
9898

9999
@Override
100-
public PlaybackFileCommandContainer onSerialiseEndlineComment(long currentTick, TickContainer tickContainer) {
100+
public PlaybackFileCommandContainer onSerialiseEndlineComment(long currentTick, InputContainer inputContainer) {
101101
PlaybackFileCommandContainer out = new PlaybackFileCommandContainer();
102102
MonitorContainer monitoredValues = monitorContainer.get(currentTick);
103103
PlaybackFileCommand command = new PlaybackFileCommand("desyncMonitor", monitoredValues.toStringArray());
@@ -108,7 +108,7 @@ public PlaybackFileCommandContainer onSerialiseEndlineComment(long currentTick,
108108
}
109109

110110
@Override
111-
public void onDeserialiseEndlineComment(long tick, TickContainer container, PlaybackFileCommandContainer fileCommandContainer) {
111+
public void onDeserialiseEndlineComment(long tick, InputContainer container, PlaybackFileCommandContainer fileCommandContainer) {
112112
List<PlaybackFileCommand> commandsEndline = fileCommandContainer.get("desyncMonitor");
113113
if (commandsEndline == null || commandsEndline.isEmpty()) {
114114
recordNull(tick);
@@ -128,7 +128,7 @@ public void recordNull(long tick) {
128128
}
129129

130130
@Override
131-
public void onPlayback(long tick, TickContainer tickContainer) {
131+
public void onPlayback(long tick, InputContainer inputContainer) {
132132
currentValues = get(tick - 1);
133133
}
134134

0 commit comments

Comments
 (0)