Merge pull request #10 from preprocessor/main

Added better randomness and reset some positions 🙃

src/main/java/lusiiplugin/commands/PayCommand.java

@@ -38,13 +38,10 @@ public boolean execute(CommandHandler handler, CommandSender sender, String[] ar
 		return true;
 	}
 
-
 	public boolean opRequired(String[] args) {
 		return false;
 	}
 
-
-
 	public void sendCommandSyntax(CommandHandler handler, CommandSender sender) {
 		sender.sendMessage("§3/pay §4<username> <amount>");
 		sender.sendMessage("§5Pay another user with points");

src/main/java/lusiiplugin/commands/RTPCommand.java

@@ -37,8 +37,8 @@ public boolean execute(CommandHandler handler, CommandSender sender, String[] ar
 			return true;
 		}
 		Random r = new Random();
-		int randX = r.nextInt() * (25000 + 25000 + 1) - 25000; // (r * 50001) - 25000
-		int randZ = r.nextInt() * (25000 + 25000 + 1) - 25000;
+		int randX = (int) (r.nextDouble() * 50001.0 - 25000.0);
+		int randZ = (int) (r.nextDouble() * 50001.0 - 25000.0);
 
 		tpInfo.update(p);
 

src/main/java/lusiiplugin/mixin/ChunkMixin.java

@@ -31,11 +31,6 @@ public void debugAddEntity(Entity entity, CallbackInfo ci) {
 		System.out.println("Problem entity: " + entity.getClass().getName());
 		System.out.println("Entity XYZ | entity's chunk XZ: " + entity.x + " " + entity.y  + " " + entity.z + " | " + entity.chunkCoordX + " " + entity.chunkCoordZ);
 
-		double x = this.xPosition * 16.0;
-		double y = entity.y;
-		double z = this.zPosition * 16.0;
-
-		System.out.println("Attempting to move entity to: " + x + " " + y + " " + z);
-		entity.absMoveTo(x, y, z, entity.yRot, entity.xRot);
+		((EntityMixin) entity).invokeResetPos();
 	}
 }

src/main/java/lusiiplugin/mixin/EntityMixin.java

@@ -0,0 +1,11 @@
+package lusiiplugin.mixin;
+
+import net.minecraft.core.entity.Entity;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Invoker;
+
+@Mixin(Entity.class)
+public interface EntityMixin  {
+	@Invoker("resetPos")
+	void invokeResetPos();
+}

src/main/resources/lusiiplugin.mixins.json

@@ -13,6 +13,7 @@
     "CommandsMixin",
     "ContainerWorkbenchMixin",
     "EntityBobberMixin",
+    "EntityMixin",
     "EntityPlayerMixin",
     "EntityTNTMixin",
     "NetServerHandlerMixin",