Merge remote-tracking branch 'origin/master'

# Conflicts: # src/main/java/me/jakedadream/ParadisuPlugin/paradisumain.java
Paradisu · Aug 13, 2021 · 9bd32ab · 9bd32ab
2 parents f9f42f4 + ec624e9
commit 9bd32ab
Show file tree

Hide file tree

Showing 9 changed files with 117 additions and 359 deletions.
diff --git a/.gitignore b/.gitignore
@@ -113,4 +113,52 @@ dependency-reduced-pom.xml
 buildNumber.properties
 .mvn/timing.properties
 # https://github.com/takari/maven-wrapper#usage-without-binary-jar
-.mvn/wrapper/maven-wrapper.jar
+.mvn/wrapper/maven-wrapper.jar
+
+# Eclipse/VSCode
+.metadata
+bin/
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.settings/
+.loadpath
+.recommenders
+# External tool builders
+.externalToolBuilders/
+# Locally stored "Eclipse launch configurations"
+*.launch
+# PyDev specific (Python IDE for Eclipse)
+*.pydevproject
+# CDT-specific (C/C++ Development Tooling)
+.cproject
+# CDT- autotools
+.autotools
+# Java annotation processor (APT)
+.factorypath
+# PDT-specific (PHP Development Tools)
+.buildpath
+# sbteclipse plugin
+.target
+# Tern plugin
+.tern-project
+# TeXlipse plugin
+.texlipse
+# STS (Spring Tool Suite)
+.springBeans
+# Code Recommenders
+.recommenders/
+# Annotation Processing
+.apt_generated/
+.apt_generated_test/
+# Scala IDE specific (Scala & Java development for Eclipse)
+.cache-main
+.scala_dependencies
+.worksheet
+# VSCode project
+*.workspace
+.classpath
+.project
diff --git a/src/main/java/me/jakedadream/ParadisuPlugin/commands/snwcommands.java b/src/main/java/me/jakedadream/ParadisuPlugin/commands/snwcommands.java
@@ -65,37 +65,6 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
                 return true;
 
 
-            case "mgive":
-                if (player.hasPermission("snw.models")) {
-                    try {
-                        id = Short.parseShort(args[0]);
-                        player.getInventory().addItem(ItemManager.createmodel(id));
-                    } catch (Exception ex) {
-                        player.sendMessage("§e§l<!> §cDumbass, this isn't a registered number. Please try again, or don't.");
-                    }
-                } else {
-                    player.sendMessage("§3[§dParadisu §bツ§3] §7You do not have permission to use that command.");
-                }
-                return true;
-
-            case "mhat":
-                if (player.hasPermission("snw.models")) {
-                    try {
-                        id = Short.parseShort(args[0]);
-
-                        ItemStack[] armor = player.getInventory().getArmorContents();
-                        armor[3] = ItemManager.createmodel(id);
-                        player.getInventory().setArmorContents(armor);
-
-                    } catch (Exception ex) {
-                        player.sendMessage("§e§l<!> §cDumbass, this isn't a registered number. Please try again, or don't.");
-
-                    }
-                } else {
-                    player.sendMessage("§3[§dParadisu §bツ§3] §7You do not have permission to use that command.");
-                }
-                return true;
-
             case "sc":
                 if (player.hasPermission("snw.sc")) {
                     if (args.length == 0) {
@@ -137,7 +106,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
                         for (World w : Bukkit.getWorlds()) {
                             for (Player p : w.getPlayers()) {
                                 if (p.hasPermission("snw.ac")) {
-                                    p.sendMessage("§c『§4§l§oSC§c』 §c" + player.getDisplayName() + " §f»§3 " + allArgs);
+                                    p.sendMessage("§c『§4§l§oAC§c』 §c" + player.getDisplayName() + " §f»§3 " + allArgs);
                                     // /AC <message>;
                                 }
                             }

diff --git a/src/main/java/me/jakedadream/ParadisuPlugin/events/chatevents.java b/src/main/java/me/jakedadream/ParadisuPlugin/events/chatevents.java
diff --git a/src/main/java/me/jakedadream/ParadisuPlugin/events/snwevents.java b/src/main/java/me/jakedadream/ParadisuPlugin/events/snwevents.java
@@ -56,13 +56,13 @@ public void onPlayerInteractAtEntity(PlayerInteractAtEntityEvent intEvent) {
         }
     }
 
+
     @EventHandler
     public static void WearHatEvent(PlayerInteractEvent wearhat) {
         Player player = wearhat.getPlayer();
 
         if (player.getInventory().getItemInMainHand().getType() == Material.AIR) return;
         if (wearhat.getAction() == Action.RIGHT_CLICK_AIR) {
-
             if (wearhat.getItem() != null && wearhat.getItem().getType() == Material.CARVED_PUMPKIN) {
                 ItemStack[] armor = player.getInventory().getArmorContents();
                 ItemStack swap = armor[3];
@@ -103,24 +103,8 @@ public void InvenClick(InventoryClickEvent event) {
                 return;
             }
 
-            if (item.getItemMeta().equals(ItemManager.acceptbutton.getItemMeta())) {
-                player.getOpenInventory().getTopInventory().clear();
-                // Delete the items and reopen a new Trashcan inv using 'trashcans.TrashCanInv(player);'
-            }
-
-            if (item.getItemMeta().equals(ItemManager.denybutton.getItemMeta())) {
-                for (int i = 0; i < 27; i++) {
-                    player.getInventory().addItem(open.getItem(i));
-                }
-                event.setCancelled(true);
-                // GIVES ALL THE ITEMS BACK AND CLOSES TRASHCAN
-            }
-
-            if (item.getItemMeta().equals(ItemManager.blankbutton.getItemMeta())) {
-                event.setCancelled(true);
             }
         }
-    }
 /*
     @EventHandler
     public void onPlayerCloseInventory(InventoryCloseEvent event) {