Fix shears, update to 1.17.1, bump version

UnknownSilicon · UnknownSilicon · commit d1230f258287 · 2021-07-10T12:22:45.000-04:00
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>parallelmc</groupId>
     <artifactId>parallelutils</artifactId>
-    <version>1.2.0</version>
+    <version>1.2.1</version>
     <packaging>jar</packaging>
 
     <name>Parallelutils</name>
@@ -106,7 +106,7 @@
         <dependency>
             <groupId>io.papermc.paper</groupId>
             <artifactId>paper</artifactId>
-            <version>1.17-R0.1-SNAPSHOT</version>
+            <version>1.17.1-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <!--<dependency>
diff --git a/src/main/java/parallelmc/parallelutils/Constants.java b/src/main/java/parallelmc/parallelutils/Constants.java
@@ -2,7 +2,7 @@
 
 public class Constants {
 
-	public static final Version VERSION = new Version(1, 2, 0);
+	public static final Version VERSION = new Version(1, 2, 1);
 	public static final String PLUGIN_NAME = "ParallelUtils";
 	public static final String DEFAULT_WORLD = "world";
 }
diff --git a/src/main/java/parallelmc/parallelutils/modules/custommobs/nmsmobs/CustomEntityHelper.java b/src/main/java/parallelmc/parallelutils/modules/custommobs/nmsmobs/CustomEntityHelper.java
@@ -2,6 +2,7 @@
 
 import net.minecraft.world.entity.EntityInsentient;
 import net.minecraft.world.entity.ai.goal.PathfinderGoalSelector;
+import net.minecraft.world.entity.ai.navigation.NavigationAbstract;
 
 import java.lang.reflect.Field;
 import java.util.Map;
@@ -17,13 +18,14 @@ public class CustomEntityHelper {
 	 * @param entity The entity to clear the pathfinding goals of
 	 */
 	public static void clearGoals(EntityInsentient entity) {
-		Map goalC = (Map) getPrivateField("c", PathfinderGoalSelector.class, entity.bO);
+
+		Map goalC = (Map) getPrivateField("c", PathfinderGoalSelector.class, entity.bP);
 		goalC.clear();
-		Set goalD = (Set) getPrivateField("d", PathfinderGoalSelector.class, entity.bO);
+		Set goalD = (Set) getPrivateField("d", PathfinderGoalSelector.class, entity.bP);
 		goalD.clear();
-		Map targetC = (Map) getPrivateField("c", PathfinderGoalSelector.class, entity.bP);
+		Map targetC = (Map) getPrivateField("c", PathfinderGoalSelector.class, entity.bQ);
 		targetC.clear();
-		Set targetD = (Set) getPrivateField("d", PathfinderGoalSelector.class, entity.bP);
+		Set targetD = (Set) getPrivateField("d", PathfinderGoalSelector.class, entity.bQ);
 		targetD.clear();
 	}
 
diff --git a/src/main/java/parallelmc/parallelutils/modules/custommobs/nmsmobs/EntityFireWisp.java b/src/main/java/parallelmc/parallelutils/modules/custommobs/nmsmobs/EntityFireWisp.java
@@ -43,10 +43,10 @@ public static void initPathfinder(EntityZombie zombie) {
         //clearing Zombie goals
         CustomEntityHelper.clearGoals(zombie);
 
-        zombie.bO.a(0, new PathfinderGoalMeleeAttack(zombie, 1.0, false));
-        zombie.bO.a(1, new PathfinderGoalRandomStroll(zombie, 1.0));
+        zombie.bP.a(0, new PathfinderGoalMeleeAttack(zombie, 1.0, false));
+        zombie.bP.a(1, new PathfinderGoalRandomStroll(zombie, 1.0));
 
-        zombie.bP.a(0, new PathfinderGoalNearestAttackableTarget<>(zombie,
+        zombie.bQ.a(0, new PathfinderGoalNearestAttackableTarget<>(zombie,
                 EntityPlayer.class, true));
     }
 
diff --git a/src/main/java/parallelmc/parallelutils/modules/custommobs/nmsmobs/EntityWisp.java b/src/main/java/parallelmc/parallelutils/modules/custommobs/nmsmobs/EntityWisp.java
@@ -43,10 +43,10 @@ public static void initPathfinder(EntityZombie zombie) {
 		//clearing Zombie goals
 		CustomEntityHelper.clearGoals(zombie);
 
-		zombie.bO.a(0, new PathfinderGoalMeleeAttack(zombie, 1.0, false));
-		zombie.bO.a(1, new PathfinderGoalRandomStroll(zombie, 1.0));
+		zombie.bP.a(0, new PathfinderGoalMeleeAttack(zombie, 1.0, false));
+		zombie.bP.a(1, new PathfinderGoalRandomStroll(zombie, 1.0));
 
-		zombie.bP.a(0, new PathfinderGoalHurtByTarget(zombie));
+		zombie.bQ.a(0, new PathfinderGoalHurtByTarget(zombie));
 	}
 
 	public static EntityWisp spawn(JavaPlugin plugin, CraftServer server, CraftWorld world, Location l) {
diff --git a/src/main/java/parallelmc/parallelutils/modules/discordintegration/BotManager.java b/src/main/java/parallelmc/parallelutils/modules/discordintegration/BotManager.java
@@ -178,6 +178,8 @@ public void onMessageReceived(@NotNull MessageReceivedEvent event) {
 	 */
 	private void executeCommand(@NotNull MessageReceivedEvent event, String command, String[] args) {
 		if (command.strip().equals("vanish")) {
+			if (args.length <= 0) return;
+
 			String target = args[0].strip();
 			synchronized (JoinQuitSuppressorListener.hiddenUsersLock) {
 				if (!JoinQuitSuppressorListener.hiddenUsers.contains(target)) {
diff --git a/src/main/java/parallelmc/parallelutils/modules/parallelitems/PlayerInteractListener.java b/src/main/java/parallelmc/parallelutils/modules/parallelitems/PlayerInteractListener.java
@@ -1,5 +1,6 @@
 package parallelmc.parallelutils.modules.parallelitems;
 
+import net.minecraft.world.item.ItemShears;
 import org.bukkit.*;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
@@ -19,6 +20,7 @@
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.event.player.PlayerShearEntityEvent;
 import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.Damageable;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.material.Mushroom;
 import org.bukkit.persistence.PersistentDataType;
@@ -170,7 +172,7 @@ public void onHumanEat(FoodLevelChangeEvent event){
     // Looting shears
     @EventHandler(priority = EventPriority.HIGH)
     public void playerShearEvent(PlayerShearEntityEvent event) {
-        if (event.getEntity() instanceof Sheep) {
+        if (event.getEntity() instanceof Sheep sheep) {
             // check for looting level
             ItemStack shears = event.getItem();
             if (shears.getType() == Material.SHEARS) {
@@ -183,7 +185,6 @@ public void playerShearEvent(PlayerShearEntityEvent event) {
                     int numWool = random.nextInt((max-level)+1) + level;
 
                     // Make sheep drop their respective color of wool
-                    Sheep sheep  = (Sheep) event.getEntity();
                     DyeColor woolColor = sheep.getColor();
                     if (woolColor == null) {
                         woolColor = DyeColor.WHITE;
@@ -196,8 +197,31 @@ public void playerShearEvent(PlayerShearEntityEvent event) {
                         event.setCancelled(true);
                         sheep.setSheared(true);
                         event.getEntity().getWorld().dropItemNaturally(event.getEntity().getLocation(), new ItemStack(wool, numWool));
+
                         Player player = event.getPlayer();
-                        player.playSound(player.getLocation(),Sound.ENTITY_SHEEP_SHEAR, 1f, 1f);
+                        player.playSound(sheep.getLocation(),Sound.ENTITY_SHEEP_SHEAR, 1f, 1f);
+
+                        // TODO: Implement unbreaking here
+
+                        if (!player.getGameMode().equals(GameMode.CREATIVE)) {
+
+                            ItemStack shearsInventory = player.getInventory().getItem(event.getHand());
+
+                            if (shearsInventory != null) {
+                                ItemMeta shearsMeta = shearsInventory.getItemMeta();
+
+                                if (shearsMeta instanceof Damageable shearsDamageable) {
+                                    int newDamage = shearsDamageable.getDamage() + 1;
+                                    shearsDamageable.setDamage(newDamage);
+
+                                    if (shearsDamageable.getDamage() < 0) {
+                                        shearsInventory.setAmount(0);
+                                    } else {
+                                        shearsInventory.setItemMeta(shearsMeta);
+                                    }
+                                }
+                            }
+                        }
                     }
                 }
             }
@@ -211,11 +235,17 @@ public void playerShearEvent(PlayerShearEntityEvent event) {
                     // make mooshroom drop the extra 1-3 respective type of mushroom
                     MushroomCow mooshroom = (MushroomCow) event.getEntity();
                     MushroomCow.Variant variant = mooshroom.getVariant();
+
+                    Material itemMat;
+
                     if (variant == MushroomCow.Variant.RED) {
-                        event.getEntity().getWorld().dropItemNaturally(event.getEntity().getLocation(), new ItemStack(Material.getMaterial("RED_MUSHROOM"), level));
-                    } else if (variant == MushroomCow.Variant.BROWN) {
-                        event.getEntity().getWorld().dropItemNaturally(event.getEntity().getLocation(), new ItemStack(Material.getMaterial("BROWN_MUSHROOM"), level));
+                        itemMat = Material.RED_MUSHROOM;
+                    } else  {
+                        itemMat = Material.BROWN_MUSHROOM;
                     }
+
+                    event.getEntity().getWorld().dropItemNaturally(event.getEntity().getLocation(),
+                            new ItemStack(itemMat, level));
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`public class Constants {`
`4`	`4`
`5`		`- public static final Version VERSION = new Version(1, 2, 0);`
	`5`	`+ public static final Version VERSION = new Version(1, 2, 1);`
`6`	`6`	`public static final String PLUGIN_NAME = "ParallelUtils";`
`7`	`7`	`public static final String DEFAULT_WORLD = "world";`
`8`	`8`	`}`