Skip to content

Commit 4fbb962

Browse files
authored
add keyboard to know component
1 parent bb8f430 commit 4fbb962

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

src/vm/computer/Machine.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ public class Machine {
6363
public HashMap<String,Tunnel> tunnelComponents = new HashMap<>();
6464
public HashMap<String,Internet> internetComponents = new HashMap<>();
6565
public HashMap<String,Data> dataComponents = new HashMap<>();
66+
public HashMap<String,Keyboard> keyboardComponents= new HashMap<>();
6667

6768

6869
public HashMap<String,UnknownComponent> unknownComponents = new HashMap<>();
@@ -132,6 +133,9 @@ public static void fromJSONObject(JSONObject machineConfig) {
132133
case "data":
133134
machine.dataComponents.put(address,new Data(machine,address, component.optInt("tier",3)));
134135
break;
136+
case "keyboard":
137+
machine.keyboardComponents.put(address,new Keyboard(machine,address));
138+
break;
135139
default:
136140
machine.unknownComponents.put(address,new UnknownComponent(machine,address,component.getString("type")));
137141
}

src/vm/computer/components/Internet.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ public Internet(Machine machine, String address) {
1717
super(machine, address, "internet");
1818
}
1919

20+
@SuppressWarnings("unchecked")
2021
@Override
2122
public void pushProxyFields() {
2223
super.pushProxyFields();
@@ -88,8 +89,8 @@ public void pushProxyFields() {
8889
catch (IOException ignored) {}
8990
finally {
9091
machine.lua.pushBoolean(true);
91-
return 1;
9292
}
93+
return 1;
9394
});
9495
machine.lua.setField(-2, "close");
9596

@@ -117,7 +118,7 @@ public void pushProxyFields() {
117118

118119
// Подрубаем хедеры
119120
if (!requestArgs.isNoneOrNil(3) && requestArgs.isTable(3)) {
120-
requestArgs.toJavaObject(3, Map.class).forEach((key, value) -> {
121+
((Map<String, String>) requestArgs.toJavaObject(3, Map.class)).forEach((key, value) -> {
121122
// System.out.println("Setting header: "+ key.toString() + " : " + value.toString());
122123
connection.setRequestProperty(key.toString(), value.toString());
123124
});
@@ -180,8 +181,8 @@ public void pushProxyFields() {
180181
catch (IOException ignored) {}
181182
finally {
182183
machine.lua.pushBoolean(true);
183-
return 1;
184184
}
185+
return 1;
185186
});
186187
machine.lua.setField(-2, "close");
187188

0 commit comments

Comments
 (0)