simon987/Much-Assembly-Required
1
0
Fork 0
mirror of https://github.com/simon987/Much-Assembly-Required.git synced 2025-12-12 22:38:54 +00:00
Code Issues Projects Releases Wiki Activity

Support for color in hologram. Renamed classes: fixes #72

Browse Source
This commit is contained in:
simon
2017-12-30 19:58:47 -05:00
parent 1ed9e9e4db
commit 83f05efff6
10 changed files with 32 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Server/Server.iml
View File

@@ -6,6 +6,7 @@
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
@@ -15,5 +16,7 @@
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
<orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.42" level="project" />
<orderEntry type="library" name="Maven: com.googlecode.json-simple:json-simple:1.1.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-text:1.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.7" level="project" />
</component>
</module>

1
Server/src/main/java/net/simon987/server/Main.java
View File

@@ -22,6 +22,7 @@ public class Main {
GameServer.INSTANCE.setSocketServer(socketServer);
System.out.println(GameServer.INSTANCE.getGameUniverse().getWorld(0x7fff, 0x7fff));
(new Thread(socketServer)).start();
(new Thread(GameServer.INSTANCE)).start();

8
Server/src/main/java/net/simon987/server/assembly/instruction/DivInstruction.java
View File

@@ -28,8 +28,8 @@ public class DivInstruction extends Instruction {
public Status execute(Target src, int srcIndex, Status status) {
//Source = Y:A
int source = ((((char) cpu.getRegisterSet().getRegister("Y").getValue() & 0xFFFF) << 16)) |
((char) cpu.getRegisterSet().getRegister("A").getValue() & 0xFFFF);
int source = (((cpu.getRegisterSet().getRegister("Y").getValue() & 0xFFFF) << 16)) |
(cpu.getRegisterSet().getRegister("A").getValue() & 0xFFFF);
if (src.get(srcIndex) == 0) {
//Division by 0
@@ -48,8 +48,8 @@ public class DivInstruction extends Instruction {
//Source = Y:A
int source = ((((char) cpu.getRegisterSet().getRegister("Y").getValue() & 0xFFFF) << 16)) |
((char) cpu.getRegisterSet().getRegister("A").getValue() & 0xFFFF);
int source = (((cpu.getRegisterSet().getRegister("Y").getValue() & 0xFFFF) << 16)) |
(cpu.getRegisterSet().getRegister("A").getValue() & 0xFFFF);
if (src == 0) {
//Division by 0

2
Server/src/main/java/net/simon987/server/webserver/SocketServer.java
View File

@@ -180,8 +180,6 @@ public class SocketServer extends WebSocketServer {
try {
ControllableUnit unit = user.getUser().getControlledUnit();
System.out.println("Sent " + unit.getConsoleMessagesBuffer().size() + " messages to " + user.getUser().getUsername());
//Send keyboard updated buffer
ArrayList<Integer> kbBuffer = unit.getKeyboardBuffer();
JSONArray keys = new JSONArray();