r1 1.15

config-instructions.yml

@@ -4,8 +4,10 @@ general:
   checkforupdate: true
   #Set to true to only allow Vivecraft players to play.
   vive-only: false
+  #If true, creates an exclusion for vive-only for opped players. No effect if vive-only is false.
+  allow-op: true
   #The message to show kicked non-vive players.
-  vive-only-kickmessage: This server is configured for Vivecraft players only.
+  vive-only-kickmessage: This server is configured for Vivecraft VR players only.
   #Ticks to wait before kicking a player. The player's client must send a Vivecraft VERSION info in that time.
   vive-only-kickwaittime: 100
 SendPlayerData:

config.yml

@@ -2,10 +2,12 @@ general:
   debug: false
   #will check for a newer version and alert any OP when they login to the server
   checkforupdate: true
-  #Set to true to only allow Vivecraft players to play.
+  #Set to true to only allow Vivecraft (VR) players to play.
   vive-only: false
+  #If true, creates an exclusion for vive-only for opped players. No effect if vive-only is false.
+  allow-op: true
   #The message to show kicked non-vive players.
-  vive-only-kickmessage: This server is configured for Vivecraft players only.
+  vive-only-kickmessage: This server is configured for Vivecraft VR players only.
   #Ticks to wait before kicking a player. The player's client must send a Vivecraft VERSION info in that time.
   vive-only-kickwaittime: 100
 SendPlayerData:

plugin.yml

@@ -1,5 +1,5 @@
 name: Vivecraft-Spigot-Extensions
-version: '1.14.4-r6'
+version: '1.15.2-r1'
 main: org.vivecraft.VSE
 website: http://www.vivecraft.org/
 author: jrbudda, jaron780

src/org/vivecraft/VSE.java

@@ -20,9 +20,9 @@
 import org.bukkit.World;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.file.FileConfiguration;
-import org.bukkit.craftbukkit.v1_14_R1.entity.CraftCreeper;
-import org.bukkit.craftbukkit.v1_14_R1.entity.CraftEnderman;
-import org.bukkit.craftbukkit.v1_14_R1.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_15_R1.entity.CraftCreeper;
+import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEnderman;
+import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
@@ -52,12 +52,13 @@
 import org.vivecraft.utils.Headshot;
 
 import net.milkbowl.vault.permission.Permission;
-import net.minecraft.server.v1_14_R1.EntityCreeper;
-import net.minecraft.server.v1_14_R1.EntityEnderman;
-import net.minecraft.server.v1_14_R1.IRegistry;
-import net.minecraft.server.v1_14_R1.MinecraftKey;
-import net.minecraft.server.v1_14_R1.PathfinderGoalSelector;
-import net.minecraft.server.v1_14_R1.PathfinderGoalWrapped;
+import net.minecraft.server.v1_15_R1.EntityCreeper;
+import net.minecraft.server.v1_15_R1.EntityEnderman;
+import net.minecraft.server.v1_15_R1.IRegistry;
+import net.minecraft.server.v1_15_R1.MinecraftKey;
+import net.minecraft.server.v1_15_R1.PathfinderGoalSelector;
+import net.minecraft.server.v1_15_R1.PathfinderGoalWrapped;
+
 
 public class VSE extends JavaPlugin implements Listener {
 	FileConfiguration config = getConfig();
@@ -68,7 +69,7 @@ public class VSE extends JavaPlugin implements Listener {
 	public static VSE me;
 
 	int task = 0;
-	private String readurl = "https://raw.githubusercontent.com/jrbudda/Vivecraft_Spigot_Extensions/1.14/version.txt";
+	private String readurl = "https://raw.githubusercontent.com/jrbudda/Vivecraft_Spigot_Extensions/1.15/version.txt";
 
 	public List<String> blocklist = new ArrayList<>();
 
@@ -340,8 +341,10 @@ public void run() {
 						if(debug)
 							getLogger().info(p.getName() + " Vivecraft not detected");
 						if (getConfig().getBoolean("general.vive-only")) {
-							getLogger().info(p.getName() + " " + "got kicked for not using Vivecraft");
-							p.kickPlayer(getConfig().getString("general.vive-only-kickmessage"));
+							if (getConfig().getBoolean("general.allow-op") == false || !p.isOp()) {
+								getLogger().info(p.getName() + " " + "got kicked for not using Vivecraft");
+								p.kickPlayer(getConfig().getString("general.vive-only-kickmessage"));
+							}						
 							return;
 						}
 					}		

src/org/vivecraft/VivePlayer.java

@@ -5,13 +5,14 @@
 import java.io.DataInputStream;
 import java.io.IOException;
 import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_14_R1.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_15_R1.entity.CraftPlayer;
 import org.bukkit.entity.Player;
 import org.vivecraft.listeners.VivecraftNetworkListener;
 import org.vivecraft.utils.Quaternion;
 import org.vivecraft.utils.Vector3;
 
-import net.minecraft.server.v1_14_R1.Vec3D;
+import net.minecraft.server.v1_15_R1.Vec3D;
+
 
 public class VivePlayer {
 
@@ -20,7 +21,7 @@ public class VivePlayer {
 	public byte[] controller1data;
 	public byte[] draw;
 	public float worldScale;
-	public float heightScale;
+	public float heightScale = 1f;
 	boolean isTeleportMode;
 	boolean isReverseHands;
 	boolean isVR;

src/org/vivecraft/command/ViveCommand.java

@@ -4,7 +4,7 @@
 import java.util.Iterator;
 import java.util.Map;
 
-
+import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
@@ -13,10 +13,6 @@
 import org.vivecraft.VSE;
 import org.vivecraft.VivePlayer;
 
-import net.md_5.bungee.api.ChatColor;
-import net.md_5.bungee.api.chat.ComponentBuilder;
-import net.md_5.bungee.api.chat.HoverEvent;
-import net.md_5.bungee.api.chat.TextComponent;
 
 public class ViveCommand implements CommandExecutor {
 
@@ -197,10 +193,10 @@ else if (command.equals("help")) {
 			sender.sendMessage(ChatColor.BLUE + "-------------- " + ChatColor.GRAY + "VSE Commands" + ChatColor.BLUE + " --------------");
 			for (Cmd cm : commands) {
 
-				TextComponent tc = new TextComponent();
-				tc.setText(ChatColor.BLUE + cm.getCommand() + ": " + ChatColor.WHITE + cm.getDescription());
-				tc.setHoverEvent(new HoverEvent(net.md_5.bungee.api.chat.HoverEvent.Action.SHOW_TEXT, new ComponentBuilder(cm.getHoverText()).color(ChatColor.BLUE).create()));
-				sender.spigot().sendMessage(tc);
+			//	TextComponent tc = new TextComponent();
+			//	tc.setText(ChatColor.BLUE + cm.getCommand() + ": " + ChatColor.WHITE + cm.getDescription());
+			//	tc.setHoverEvent(new HoverEvent(net.md_5.bungee.api.chat.HoverEvent.Action.SHOW_TEXT, new ComponentBuilder(cm.getHoverText()).color(ChatColor.BLUE).create()));
+				sender.sendMessage(ChatColor.BLUE + cm.getCommand() + ": " + ChatColor.WHITE + cm.getDescription());
 			}
 		} else {
 			if(!sender.isOp()){

src/org/vivecraft/entities/CustomGoalSwell.java

@@ -4,10 +4,10 @@
 
 import org.vivecraft.VSE;
 
-import net.minecraft.server.v1_14_R1.Entity;
-import net.minecraft.server.v1_14_R1.EntityCreeper;
-import net.minecraft.server.v1_14_R1.EntityLiving;
-import net.minecraft.server.v1_14_R1.PathfinderGoal;
+import net.minecraft.server.v1_15_R1.Entity;
+import net.minecraft.server.v1_15_R1.EntityCreeper;
+import net.minecraft.server.v1_15_R1.EntityLiving;
+import net.minecraft.server.v1_15_R1.PathfinderGoal;
 
 public class CustomGoalSwell extends PathfinderGoal {
 

src/org/vivecraft/entities/CustomPathFinderGoalPlayerWhoLookedAtTarget.java

@@ -7,18 +7,18 @@
 import org.vivecraft.VSE;
 import org.vivecraft.VivePlayer;
 
-import net.minecraft.server.v1_14_R1.Blocks;
-import net.minecraft.server.v1_14_R1.Entity;
-import net.minecraft.server.v1_14_R1.EntityEnderman;
-import net.minecraft.server.v1_14_R1.EntityHuman;
-import net.minecraft.server.v1_14_R1.EntityLiving;
-import net.minecraft.server.v1_14_R1.EntityPlayer;
-import net.minecraft.server.v1_14_R1.ItemStack;
-import net.minecraft.server.v1_14_R1.MovingObjectPosition;
-import net.minecraft.server.v1_14_R1.PathfinderGoalNearestAttackableTarget;
-import net.minecraft.server.v1_14_R1.PathfinderTargetCondition;
-import net.minecraft.server.v1_14_R1.RayTrace;
-import net.minecraft.server.v1_14_R1.Vec3D;
+import net.minecraft.server.v1_15_R1.Blocks;
+import net.minecraft.server.v1_15_R1.Entity;
+import net.minecraft.server.v1_15_R1.EntityEnderman;
+import net.minecraft.server.v1_15_R1.EntityHuman;
+import net.minecraft.server.v1_15_R1.EntityLiving;
+import net.minecraft.server.v1_15_R1.EntityPlayer;
+import net.minecraft.server.v1_15_R1.ItemStack;
+import net.minecraft.server.v1_15_R1.MovingObjectPosition;
+import net.minecraft.server.v1_15_R1.PathfinderGoalNearestAttackableTarget;
+import net.minecraft.server.v1_15_R1.PathfinderTargetCondition;
+import net.minecraft.server.v1_15_R1.RayTrace;
+import net.minecraft.server.v1_15_R1.Vec3D;
 
 public class CustomPathFinderGoalPlayerWhoLookedAtTarget 
 extends PathfinderGoalNearestAttackableTarget<EntityHuman> {
@@ -28,13 +28,13 @@ public class CustomPathFinderGoalPlayerWhoLookedAtTarget
 	   private int l;
 	   private final PathfinderTargetCondition m;
 	   private final PathfinderTargetCondition n = (new PathfinderTargetCondition()).c();
-	   private Method dV;
+	   private Method eq;
 	   private Method a_entity;
 
 	   public CustomPathFinderGoalPlayerWhoLookedAtTarget(EntityEnderman entityenderman) {
 	      super(entityenderman, EntityHuman.class, false);
 	      this.i = entityenderman;
-	      this.dV = VSE.getPrivateMethod("dV", EntityEnderman.class, null);
+	      this.eq = VSE.getPrivateMethod("eq", EntityEnderman.class, null);
 	      this.a_entity = VSE.getPrivateMethod("a", EntityEnderman.class, Entity.class);
 	      this.m = (new PathfinderTargetCondition()).a(this.k()).a((entityliving) -> {
 	         return isLookingAtMe((EntityHuman)entityliving);
@@ -65,7 +65,7 @@ private boolean isLookingAtMe(EntityHuman entityhuman) {
 			   return false;
 		   } else {
 			   Vec3D vec3d = entityhuman.f(1.0F).d();
-			   Vec3D vec3d1 = new Vec3D(i.locX - entityhuman.locX, i.getBoundingBox().minY + (double)i.getHeadHeight() - (entityhuman.locY + (double)entityhuman.getHeadHeight()), i.locZ - entityhuman.locZ);
+			   Vec3D vec3d1 = new Vec3D(i.locX() - entityhuman.locX(), i.getHeadY() - entityhuman.getHeadY(), i.locZ() - entityhuman.locZ());
 			   //VSE MODIFICATION
 			   boolean vr = entityhuman instanceof EntityPlayer && VSE.isVive((Player)entityhuman.getBukkitEntity());
 			   VivePlayer vp = null;
@@ -75,13 +75,17 @@ private boolean isLookingAtMe(EntityHuman entityhuman) {
 				   vec3d = vp.getHMDDir();
 				   Location h = vp.getHMDPos();
 				   hmdpos = new Vec3D(h.getX(), h.getY(), h.getZ());
-				   vec3d1 = new Vec3D(i.locX - hmdpos.getX(), i.getBoundingBox().minY + (double)i.getHeadHeight() - hmdpos.getY(), i.locZ - hmdpos.getZ());
+				   vec3d1 = new Vec3D(i.locX() - hmdpos.getX(), i.getHeadY() - hmdpos.getY(), i.locZ() - hmdpos.getZ());
 			   }
 			   ////
 			   double d0 = vec3d1.f();
 			   vec3d1 = vec3d1.d();
 			   double d1 = vec3d.b(vec3d1);
-			   return d1 > 1.0D - 0.025D / d0 ? (vr ? hasLineOfSight(hmdpos, new Vec3D(i.locX, i.locY + (double)i.getHeadHeight(), i.locZ)) : entityhuman.hasLineOfSight(i)) : false;
+			   if (!(d1 > 1.0 - 0.025 / d0)) return false;
+			   if (vr)
+				   return hasLineOfSight(hmdpos, new Vec3D(i.locX(), i.getHeadY(), i.locZ()));
+			   else
+				   return entityhuman.hasLineOfSight((Entity)i);
 		   }
 	   }
 
@@ -116,7 +120,7 @@ public void e() {
 	         if (this.c != null && !this.i.isPassenger()) {
 	            if (isLookingAtMe((EntityHuman)this.c)) {
 	               if (this.c.h(this.i) < 16.0D) {
-	            	   VSE.invoke(this.dV, this.i, null);
+	            	   VSE.invoke(this.eq, this.i, null);
 	               }
 
 	               this.l = 0;

src/org/vivecraft/listeners/VivecraftCombatListener.java

@@ -18,7 +18,7 @@
 import org.vivecraft.VivePlayer;
 import org.vivecraft.utils.Headshot;
 
-import net.minecraft.server.v1_14_R1.Vec3D;
+import net.minecraft.server.v1_15_R1.Vec3D;
 
 
 public class VivecraftCombatListener implements Listener{

src/org/vivecraft/listeners/VivecraftItemListener.java

@@ -11,8 +11,9 @@
 import org.vivecraft.VSE;
 import org.vivecraft.VivePlayer;
 
-import net.minecraft.server.v1_14_R1.MathHelper;
-import net.minecraft.server.v1_14_R1.Vec3D;
+import net.minecraft.server.v1_15_R1.MathHelper;
+import net.minecraft.server.v1_15_R1.Vec3D;
+
 
 public class VivecraftItemListener implements Listener{
 	VSE vse = null;

src/org/vivecraft/listeners/VivecraftNetworkListener.java

@@ -9,17 +9,18 @@
 import java.lang.reflect.Field;
 import java.util.Arrays;
 
-import org.bukkit.craftbukkit.v1_14_R1.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_15_R1.entity.CraftPlayer;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.messaging.PluginMessageListener;
 import org.vivecraft.VSE;
 import org.vivecraft.VivePlayer;
 
 import com.google.common.base.Charsets;
 
-import net.minecraft.server.v1_14_R1.EntityPlayer;
-import net.minecraft.server.v1_14_R1.MathHelper;
-import net.minecraft.server.v1_14_R1.PlayerConnection;
+import net.minecraft.server.v1_15_R1.EntityPlayer;
+import net.minecraft.server.v1_15_R1.MathHelper;
+import net.minecraft.server.v1_15_R1.PlayerConnection;
+
 
 public class VivecraftNetworkListener implements PluginMessageListener {
 	public VSE vse;

src/org/vivecraft/utils/ItemVivecraft.java

@@ -1,6 +1,6 @@
 package org.vivecraft.utils;
 
-import net.minecraft.server.v1_14_R1.Item;
+import net.minecraft.server.v1_15_R1.Item;
 
 public class ItemVivecraft extends Item{
 

version.txt

@@ -1,7 +1,2 @@
 #this file is used to check for updates
-1.14.3-r1: An update is available!
-1.14.3-r2: An update is available!
-1.14.3-r3: An update is available!
-1.14.3-r4: An update is available!
-1.14.4-r5: An update is available!
-1.14.4-r6: VSE is up to date!
+1.15.2-r1: VSE is up to date!