Skip to content
This repository was archived by the owner on Jul 1, 2018. It is now read-only.

Commit 7b5289f

Browse files
committed
Remove IArguments
Whilst it was historically useful, now that the string bug has been fixed we no longer have a use for it.
1 parent db212e6 commit 7b5289f

File tree

18 files changed

+12
-697
lines changed

18 files changed

+12
-697
lines changed

README.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,14 @@ This will inject CCTweaks into the class loader, adding modifications.
1313
## Features
1414
- Custom computer timeout
1515
- Whitelist globals (such as debug)
16-
- Fix the binary strings (for fs, http, rednet and os.queueEvent)
17-
- TCP socket API (`socket`)
16+
- TCP and websocket socket API (`socket`)
1817
- Compression API (`data`)
1918
- [Cobalt](https://github.com/SquidDev/Cobalt) VM (reentrant fork of LuaJ)
2019
- Custom termination handler
2120
- Several bugs fixed (any object error messages, string pattern matching, number format strings)
2221
- Run multiple computers at once
2322
- Additional VMs provided by [CCTweaks-Runtimes](https://github.com/SquidDev-CC/CCTweaks-Runtimes)
24-
- Return HTTP handle on failures
25-
- Allow getting headers from HTTP responses
2623
- API for adding custom APIs
27-
- Limit number of open file handles
2824
- Boot from custom `bios.lua` file
2925

3026
## Documentation

src/main/java/org/squiddev/cctweaks/api/lua/ArgumentDelegator.java

Lines changed: 0 additions & 64 deletions
This file was deleted.

src/main/java/org/squiddev/cctweaks/api/lua/IArguments.java

Lines changed: 0 additions & 101 deletions
This file was deleted.

src/main/java/org/squiddev/cctweaks/api/lua/ILuaObjectWithArguments.java

Lines changed: 0 additions & 32 deletions
This file was deleted.

src/main/java/org/squiddev/cctweaks/api/lua/IPeripheralWithArguments.java

Lines changed: 0 additions & 35 deletions
This file was deleted.

src/main/java/org/squiddev/cctweaks/lua/asm/BinaryMachine.java

Lines changed: 0 additions & 59 deletions
This file was deleted.

src/main/java/org/squiddev/cctweaks/lua/asm/Tweaks.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,6 @@ public static void setup(TransformationChain chain) {
2424
"dan200.computercraft.core.computer.Computer",
2525
"org.squiddev.cctweaks.lua.patch.Computer_Patch"
2626
));
27-
// Binary patches
28-
chain.add(new BinaryMachine());
29-
chain.add(new ClassMerger(TweaksLogger.instance, "dan200.computercraft.core.apis.PeripheralAPI", "org.squiddev.cctweaks.lua.patch.PeripheralAPI_Patch"));
30-
chain.add(new ClassMerger(TweaksLogger.instance, "dan200.computercraft.shared.peripheral.modem.ModemPeripheral", "org.squiddev.cctweaks.lua.patch.ModemPeripheral_Patch"));
3127
}
3228

3329
private static void addMulti(TransformationChain chain, ClassReplacer replacer) {

src/main/java/org/squiddev/cctweaks/lua/lib/DataAPI.java

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

33
import dan200.computercraft.api.lua.ILuaContext;
44
import dan200.computercraft.api.lua.LuaException;
5-
import org.squiddev.cctweaks.api.lua.*;
5+
import org.squiddev.cctweaks.api.lua.IExtendedComputerAccess;
6+
import org.squiddev.cctweaks.api.lua.ILuaAPI;
7+
import org.squiddev.cctweaks.api.lua.ILuaAPIFactory;
8+
import org.squiddev.cctweaks.api.lua.IMethodDescriptor;
69
import org.squiddev.cctweaks.lua.Config;
710

811
import javax.annotation.Nonnull;
@@ -18,7 +21,7 @@
1821
/**
1922
* Adds inflate/deflate APIs
2023
*/
21-
public class DataAPI implements ILuaAPI, ILuaObjectWithArguments, ILuaAPIFactory, IMethodDescriptor {
24+
public class DataAPI implements ILuaAPI, ILuaAPIFactory, IMethodDescriptor {
2225
@Override
2326
public void startup() {
2427
}
@@ -61,19 +64,6 @@ public Object[] callMethod(@Nonnull ILuaContext context, int method, @Nonnull Ob
6164
return null;
6265
}
6366

64-
@Override
65-
public Object[] callMethod(@Nonnull ILuaContext context, int method, @Nonnull IArguments args) throws LuaException, InterruptedException {
66-
switch (method) {
67-
case 0:
68-
return inflate(args.getStringBytes(0));
69-
70-
case 1:
71-
return deflate(args.getStringBytes(0));
72-
}
73-
74-
return null;
75-
}
76-
7767
private Object[] inflate(byte[] data) throws LuaException {
7868
if (data.length >= Config.APIs.Data.limit) throw new LuaException("Data is too long");
7969

src/main/java/org/squiddev/cctweaks/lua/lib/LuaEnvironment.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ public static String getPreBios() {
169169
return factory.getPreBios();
170170
}
171171

172-
private static class LuaAPI implements ILuaAPI, ILuaObjectWithArguments, IExtendedLuaObject, IMethodDescriptor {
172+
private static class LuaAPI implements ILuaAPI, IExtendedLuaObject, IMethodDescriptor {
173173
private final org.squiddev.cctweaks.api.lua.ILuaAPI api;
174174
private final ILuaAPIFactory factory;
175175

@@ -209,11 +209,6 @@ public Object[] callMethod(@Nonnull ILuaContext context, int method, @Nonnull Ob
209209
return api.callMethod(context, method, args);
210210
}
211211

212-
@Override
213-
public Object[] callMethod(@Nonnull ILuaContext context, int method, @Nonnull IArguments arguments) throws LuaException, InterruptedException {
214-
return ArgumentDelegator.delegateLuaObject(api, context, method, arguments);
215-
}
216-
217212
@Nonnull
218213
@Override
219214
public Map<Object, Object> getAdditionalData() {

0 commit comments

Comments
 (0)