Exception handling stuff

Java: 2019.04.07.
PXC: 2019.03.10.

VirtualComputer/src/main/java/sznp/virtualcomputer/Commands.java

@@ -5,6 +5,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+import org.virtualbox_6_0.VBoxException;
 
 public class Commands implements CommandExecutor {
 
@@ -65,6 +66,7 @@ public class Commands implements CommandExecutor {
 			case "mouse":
 				boolean showusage = true;
 				if (args.length < 6) {
+					try {
 						// Command overloading, because I can :P
 						if (args.length > 4) // 4<x<6
 						{
@@ -81,6 +83,12 @@ public class Commands implements CommandExecutor {
 							}
 						}
 					}
+					catch (VBoxException e) {
+						e.printStackTrace();
+					}
+					catch (Exception ignored) { //It will show the usage here
+					}
+				}
 				if (showusage) {
 					sender.sendMessage("§cUsage: /computer mouse <relx> <rely> <relz> <relw>");
 					sender.sendMessage("§cOr: /computer mouse <button> [up/down]");
@@ -118,10 +126,15 @@ public class Commands implements CommandExecutor {
 					case "mspeed":
 					case "mousespeed":
 						if (args.length < 3) {
-							sender.sendMessage("§cUsage: /computer input mspeed <integer>");
+							sender.sendMessage("§cUsage: /computer input mspeed <number>");
 							return true;
 						}
+						try {
 							MouseLockerPlayerListener.LockedSpeed = Float.parseFloat(args[2]);
+						} catch(NumberFormatException e) {
+							sender.sendMessage("§cThe speed must be a number.");
+							break;
+						}
 						sender.sendMessage("§aMouse speed set to " + MouseLockerPlayerListener.LockedSpeed);
 				}
 				break;

VirtualComputer/src/main/java/sznp/virtualcomputer/Computer.java

@@ -176,17 +176,17 @@ public final class Computer {
         }
     }
 
-    public void UpdateMouse(CommandSender sender, int x, int y, int z, int w, String mbs, boolean down) {
+    public void UpdateMouse(CommandSender sender, int x, int y, int z, int w, String mbs, boolean down) throws Exception {
         if (checkMachineNotRunning(sender))
             return;
         int state = 0;
         if (mbs.length() > 0 && down)
             state = Arrays.stream(MouseButtonState.values()).filter(mousebs -> mousebs.name().equalsIgnoreCase(mbs))
-                    .findAny().orElseThrow(() -> new RuntimeException("Unknown mouse button")).value();
+                    .findAny().orElseThrow(() -> new Exception("Unknown mouse button")).value();
         session.getConsole().getMouse().putMouseEvent(x, y, z, w, state);
     }
 
-    public void UpdateMouse(CommandSender sender, int x, int y, int z, int w, String mbs) {
+    public void UpdateMouse(CommandSender sender, int x, int y, int z, int w, String mbs) throws Exception {
         if (checkMachineNotRunning(sender))
             return;
         UpdateMouse(sender, x, y, z, w, mbs, true);

VirtualComputer/src/main/java/sznp/virtualcomputer/MouseLockerPlayerListener.java

@@ -25,8 +25,12 @@ public class MouseLockerPlayerListener implements Runnable, Listener {
 			if (yaw2 - yaw1 == 0 || pitch2 - pitch1 == 0)
 				return;
 
+			try {
 				Computer.getInstance().UpdateMouse(null, (int) ((yaw2 - yaw1) * LockedSpeed),
 						(int) ((pitch2 - pitch1) * LockedSpeed), 0, 0, "");
+			} catch (Exception e) { //Should not happen
+				e.printStackTrace();
+			}
 
 			entry.getKey().teleport(entry.getValue(), TeleportCause.PLUGIN);
 		}

libpxc/makefile

@@ -5,7 +5,7 @@ pxct: pxct.c pxc
 	$(CC) -Wall pxct.c -Lout -lpxc -Wl,-rpath=out -o out/pxct
 
 pxc: pxc.c
-	$(CC) -Wall -c -fpic pxc.c -o obj/pxc.o
+	$(CC) -Wall -O4 -c -fpic pxc.c -o obj/pxc.o
 	$(CC) -Wall -shared obj/pxc.o -o out/libpxc.so
 	cp out/libpxc.so ../
 

libpxc/pxc.c

@@ -14,15 +14,15 @@
 
 typedef long long int addr;
 typedef struct { //RGB
-	int red : 8;
+	unsigned int red : 8;
-	int green : 8;
+	unsigned int green : 8;
-	int blue : 8;
+	unsigned int blue : 8;
 } Color; //Used for Bukkit's initializers (for simplicity)
 typedef struct { //BGRA
-	int blue : 8;
+	unsigned int blue : 8;
-	int green : 8;
+	unsigned int green : 8;
-	int red : 8;
+	unsigned int red : 8;
-	int alpha : 8;
+	unsigned int alpha : 8;
 } NativeColor; //Used for the screen data
 
 char matchColor(NativeColor nc);
@@ -55,34 +55,17 @@ char* getMapColor(int x, int y) {
 //May return 0
 void* updateAndGetMap(int x, int y, int w, int h, int** out_changed) { //TODO: Support the parameters
 	if(image==NULL || maps==NULL) return 0;
-	char* mapp = maps;
+	for(int l=y; l<y+h; l++) {
-	NativeColor* imgp = image;
+		//printf("PXC: l=%d\n", l);
-	printf("PXC: mapp=%p imgp=%p\n", mapp, imgp);
+		for(int k=x; k<x+w; k++) {
-	for(int k=0; k<mapcx; k++) {
+			//printf("PXC: k=%d\n", k);
-		printf("PXC: k=%d\n", k);
+			char *mapp=getMapColor(k, l);
-		for(int l=0; l<mapcy; l++) {
+			char color=matchColor(*getNativeColor(k, l));
-			printf("PXC: l=%d\n", l);
+			//NativeColor x={.red=0, .green=0, .blue=255, .alpha=255};
-			mapp = maps + MAPSIZE*k + MAPSIZE*mapcx*MAPSIZE*l; //Go to the start of the map
+			//*mapp=matchColor(x);
-			printf("PXC: mapp=%p imgp=%p - %d\n", mapp, imgp, *mapp);
+			*mapp=color;
-			for(short i=0; i<MAPSIZE; i++) { //We need to jump
+			//printf("PXC: mapp: %d %d - %x\n", k, l, *mapp);	//TODO: The bottom of the image
-				for(short j=0; j<MAPSIZE; j++) {
+			//printf("PXC: mapcx: %d mapcy: %d\n", k, l); 		//TODO: Has nothing
-					//*mapp=matchColor(*imgp); - TODO
-					NativeColor x={.red=0, .green=0, .blue=255};
-					*mapp=matchColor(x);
-					printf("PXC: imgp: %ld - %x\n", (void*)imgp-image, *imgp); //TODO: The bottom of the image
-					printf("PXC: mapcx: %d mapcy: %d\n", k, l); //TODO: Has nothing
-					imgp++; //Increment by the size of NativeColor so 4
-					mapp++;
-				}
-				imgp+=width-MAPSIZE; //Go back to the first column
-				//printf("Row done, imgp=%p\n", imgp);
-			}
-			imgp+=MAPSIZE; //Go to the next map, kind of - TODO: Use X and Y coords!
-			if((void*)mapp - maps     >    MAPSIZE * MAPSIZE * mapcx * mapcy ||
-			   (void*)imgp - image    >    width   * height  * sizeof(NativeColor)) {
-				mapp = maps;  //Start over
-				imgp = image; //Start over
-			}
 		}
 	}
 	printf("PXC: ret maps=%p\n", maps);
@@ -159,7 +142,7 @@ double getDistance(Color c1, Color c2) {
 
 //Code from Bukkit's MapPalette class
 char matchColor(NativeColor nc) {
-	if (nc.alpha < 128) return 0;
+	//if (nc.alpha < 128) return 0;
 	Color color={.red=nc.red, .green=nc.green, .blue=nc.blue};
 
 	char index = 0;

libpxc/pxct.c

@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <time.h>
 
 /* https://www.cprogramming.com/tutorial/shared-libraries-linux-gcc.html
 gcc -Wall -c -fpic pxc.c
@@ -17,8 +18,13 @@ int main() {
 	printf("Setting source...");
 	void* p = malloc(640*480*4);
 	setSource((addr)p, 640, 480, 5, 4);
+	printf("Adding random values...\n");
+	srand(time(NULL));
+	unsigned int* xp=p;
+	for(int i=0; i<640*480; i++)
+		*(xp++)=rand();
 	printf("Updating map...");
-	void* x=updateAndGetMap(0, 0, 640, 480, NULL);
+	void* x=updateAndGetMap(0, 0, 320, 240, NULL);
 	free(p);
 	return 0;
 }