Skip to content

Commit d115de0

Browse files
committed
Update to BigArrayList 1.6
1 parent 241e63e commit d115de0

File tree

5 files changed

+8
-42
lines changed

5 files changed

+8
-42
lines changed

build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ loom {
3232
repositories {
3333
mavenCentral()
3434
maven { url = "https://maven.minecrafttas.com/main" }
35+
//maven { url = "https://maven.minecrafttas.com/snapshots" }
3536
maven { url = "https://raw.githubusercontent.com/BleachDev/cursed-mappings/main/" }
3637
maven { url = "https://jitpack.io" }
3738
maven { url = "https://repo.spongepowered.org/maven" }
@@ -46,7 +47,7 @@ configurations {
4647
// dependencies
4748
dependencies {
4849
// tasmod dependencies
49-
embed "com.dselent:bigarraylist:1.5"
50+
embed "com.dselent:bigarraylist:1.6"
5051
embed "com.github.KaptainWutax:SeedUtils:b6a383113c"
5152

5253
// loom dependencies

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

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
import static com.minecrafttas.tasmod.registries.TASmodPackets.PLAYBACK_SAVE;
1010
import static com.minecrafttas.tasmod.registries.TASmodPackets.PLAYBACK_STATE;
1111

12-
import java.io.File;
13-
import java.io.IOException;
1412
import java.io.Serializable;
1513
import java.nio.ByteBuffer;
1614
import java.nio.file.Path;
@@ -51,7 +49,6 @@
5149
import com.minecrafttas.tasmod.playback.tasfile.PlaybackSerialiser;
5250
import com.minecrafttas.tasmod.playback.tasfile.exception.PlaybackLoadException;
5351
import com.minecrafttas.tasmod.playback.tasfile.exception.PlaybackSaveException;
54-
import com.minecrafttas.tasmod.playback.tasfile.flavor.SerialiserFlavorBase;
5552
import com.minecrafttas.tasmod.registries.TASmodConfig;
5653
import com.minecrafttas.tasmod.registries.TASmodPackets;
5754
import com.minecrafttas.tasmod.util.Ducks.GuiScreenDuck;
@@ -572,7 +569,7 @@ public void setInputs(BigArrayList<InputContainer> inputs) {
572569

573570
public void setInputs(BigArrayList<InputContainer> inputs, long index) {
574571
clearInputList();
575-
SerialiserFlavorBase.addAll(this.inputs, inputs);
572+
this.inputs.addAll(inputs);
576573
setIndex(index);
577574
}
578575

@@ -616,12 +613,7 @@ public void clear() {
616613
}
617614

618615
private void clearInputList() {
619-
try {
620-
inputs.clearMemory();
621-
} catch (IOException e) {
622-
e.printStackTrace();
623-
}
624-
inputs = new BigArrayList<InputContainer>(tasFileDirectory + File.separator + "temp");
616+
inputs.clear();
625617
}
626618

627619
public VirtualKeyboard getNextPlaybackKeyboard() {

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

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -193,14 +193,8 @@ public void onDisable() {
193193
* Make sure to call <code>super.onClear()</code> as it clears the {@link BigArrayLists} in this extension!
194194
*/
195195
public void onClear() {
196-
try {
197-
inlineFileCommandStorage.clearMemory();
198-
endlineFileCommandStorage.clearMemory();
199-
} catch (IOException e) {
200-
e.printStackTrace();
201-
}
202-
inlineFileCommandStorage = new BigArrayList<>();
203-
endlineFileCommandStorage = new BigArrayList<>();
196+
inlineFileCommandStorage.clear();
197+
endlineFileCommandStorage.clear();
204198
};
205199

206200
/**

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

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.minecrafttas.tasmod.playback.filecommands.builtin;
22

3-
import java.io.IOException;
43
import java.io.Serializable;
54
import java.nio.file.Path;
65
import java.text.NumberFormat;
@@ -356,12 +355,7 @@ private double parseDouble(String doublestring) throws ParseException {
356355
@Override
357356
public void onClear() {
358357
currentValues = null;
359-
try {
360-
monitorContainer.clearMemory();
361-
} catch (IOException e) {
362-
e.printStackTrace();
363-
}
364-
monitorContainer = new BigArrayList<MonitorContainer>();
358+
monitorContainer.clear();
365359
lastStatus = TextFormatting.GRAY + "Empty";
366360
lastPos = "";
367361
lastMotion = "";

src/main/java/com/minecrafttas/tasmod/playback/tasfile/flavor/SerialiserFlavorBase.java

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.minecrafttas.tasmod.playback.tasfile.flavor;
22

3-
import java.io.Serializable;
43
import java.util.ArrayList;
54
import java.util.Arrays;
65
import java.util.HashSet;
@@ -765,7 +764,7 @@ protected void mergeInputs(BigArrayList<String> out, List<String> serialisedKeyb
765764
* // This is an inline comment
766765
* 1|||0;0
767766
*/
768-
addAll(out, serialisedInlineComments);
767+
out.addAll(serialisedInlineComments);
769768

770769
/*
771770
* Copy inputs with ticks and subticks into a queue,
@@ -1955,20 +1954,6 @@ private static String createPaddedString(char spacingChar, int width) {
19551954
return new String(spacingLine);
19561955
}
19571956

1958-
public static <T extends Serializable> void addAll(BigArrayList<T> list, BigArrayList<T> toAdd) { //TODO Add this to BigArrayList itself
1959-
for (int i = 0; i < toAdd.size(); i++) {
1960-
T element = toAdd.get(i);
1961-
list.add(element);
1962-
}
1963-
}
1964-
1965-
public static <T extends Serializable> void addAll(BigArrayList<T> list, List<T> toAdd) {
1966-
for (int i = 0; i < toAdd.size(); i++) {
1967-
T element = toAdd.get(i);
1968-
list.add(element);
1969-
}
1970-
}
1971-
19721957
/**
19731958
* Empties the list starting from the back if the values are null
19741959
*

0 commit comments

Comments
 (0)