mirrors
/
CC-Tweaked
mirror of https://github.com/SquidDev-CC/CC-Tweaked
1
0
Fork 0
Code Issues Releases Wiki Activity

Bump checkstyle, fix warnings from TeaVM upgrade

This commit is contained in:
Jonathan Coates 2024-03-13 21:52:09 +00:00
parent 6fb291112d
commit ffb62dfa02
No known key found for this signature in database
GPG Key ID: B9E431FF07C98D06
6 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config/checkstyle/checkstyle.xml
View File

@ -13,8 +13,12 @@ SPDX-License-Identifier: MPL-2.0
<property name="tabWidth" value="4"/>
<property name="charset" value="UTF-8" />
<module name="BeforeExecutionExclusionFileFilter">
<property name="fileNamePattern" value="module\-info\.java$"/>
</module>
<module name="SuppressionFilter">
<property name="file" value="${config_loc}/suppressions.xml" />
<property name="file" value="${config_loc}/suppressions.xml" />
</module>
<module name="BeforeExecutionExclusionFileFilter">

2
gradle/libs.versions.toml
View File

@ -55,7 +55,7 @@ jmh = "1.37"
# Build tools
cctJavadoc = "1.8.2"
checkstyle = "10.12.6"
checkstyle = "10.14.1"
curseForgeGradle = "1.0.14"
errorProne-core = "2.23.0"
errorProne-plugin = "3.1.0"

4
projects/web/src/main/java/cc/tweaked/web/js/JavascriptConv.java
View File

@ -78,11 +78,11 @@ public class JavascriptConv {
* @return The wrapped array.
*/
public static byte[] asByteArray(ArrayBuffer view) {
return asByteArray(Int8Array.create(view));
return asByteArray(new Int8Array(view));
}
public static Int8Array toArray(ByteBuffer buffer) {
var array = Int8Array.create(buffer.remaining());
var array = new Int8Array(buffer.remaining());
for (var i = 0; i < array.getLength(); i++) array.set(i, buffer.get(i));
return array;
}

4
projects/web/src/main/java/cc/tweaked/web/peripheral/SpeakerPeripheral.java
View File

@ -53,11 +53,13 @@ public void tick() {
}
@LuaFunction
@SuppressWarnings("DoNotCallSuggester")
public final boolean playNote(String instrumentA, Optional<Double> volumeA, Optional<Double> pitchA) throws LuaException {
throw new LuaException("Cannot play notes outside of Minecraft");
}
@LuaFunction
@SuppressWarnings("DoNotCallSuggester")
public final boolean playSound(String name, Optional<Double> volumeA, Optional<Double> pitchA) throws LuaException {
throw new LuaException("Cannot play sounds outside of Minecraft");
}
@ -70,7 +72,7 @@ public final boolean playAudio(LuaTable<?, ?> audio, Optional<Double> volume) th
if (length <= 0) throw new LuaException("Cannot play empty audio");
if (length > 128 * 1024) throw new LuaException("Audio data is too large");
if (audioContext == null) audioContext = AudioContext.create();
if (audioContext == null) audioContext = new AudioContext();
if (state == null || !state.isPlaying()) state = new AudioState(audioContext);
return state.pushBuffer(audio, length, volume);

2
projects/web/src/main/java/dan200/computercraft/core/apis/http/request/THttpRequest.java
View File

@ -92,7 +92,7 @@ public void request(URI uri, HttpMethod method) {
if (isClosed()) return;
try {
var request = XMLHttpRequest.create();
var request = new XMLHttpRequest();
request.setOnReadyStateChange(() -> onResponseStateChange(request));
request.setResponseType("arraybuffer");
var address = uri.toASCIIString();

4
projects/web/src/main/java/dan200/computercraft/core/apis/http/websocket/TWebsocket.java
View File

@ -40,7 +40,7 @@ public TWebsocket(ResourceGroup<TWebsocket> limiter, IAPIEnvironment environment
public void connect() {
if (isClosed()) return;
var client = this.websocket = WebSocket.create(uri.toASCIIString());
var client = this.websocket = new WebSocket(uri.toASCIIString());
client.setBinaryType("arraybuffer");
client.onOpen(e -> success(Action.ALLOW.toPartial().toOptions()));
client.onError(e -> {
@ -50,7 +50,7 @@ public void connect() {
client.onMessage(e -> {
if (isClosed()) return;
if (JavascriptConv.isArrayBuffer(e.getData())) {
var array = Int8Array.create(e.getDataAsArray());
var array = new Int8Array(e.getDataAsArray());
var contents = new byte[array.getLength()];
for (var i = 0; i < contents.length; i++) contents[i] = array.get(i);
environment.queueEvent("websocket_message", address, contents, true);