From 8bbecbf135d2154ae2563d6f969af5e200d39676 Mon Sep 17 00:00:00 2001
From: Sunskimmer822 <92886026+Sunskimmer822@users.noreply.github.com>
Date: Mon, 18 Jul 2022 17:34:31 -0700
Subject: [PATCH] fix glock stuff

---
 src/main/java/net/serenas/shitmod/Shitmod.java      |   4 ++--
 src/main/java/net/serenas/shitmod/glock.java        |   5 ++++-
 src/main/resources/assets/shitmod/lang/en_us.json   |   2 +-
 src/main/resources/assets/shitmod/sounds.json       |   8 ++++----
 .../shitmod/sounds/{glock.ogg => glock_noise.ogg}   | Bin
 5 files changed, 11 insertions(+), 8 deletions(-)
 rename src/main/resources/assets/shitmod/sounds/{glock.ogg => glock_noise.ogg} (100%)

diff --git a/src/main/java/net/serenas/shitmod/Shitmod.java b/src/main/java/net/serenas/shitmod/Shitmod.java
index 272d49a..0fcbce0 100644
--- a/src/main/java/net/serenas/shitmod/Shitmod.java
+++ b/src/main/java/net/serenas/shitmod/Shitmod.java
@@ -116,9 +116,9 @@ public class Shitmod implements ModInitializer {
 
     public static final ToolItem COPPER_HOE = new copperHoe(copperMaterial.INSTANCE, -3, -1f, new Item.Settings().group(Shitmod.TOOLS_GROUP).maxDamage(250));
 
-    public static final Item GLOCK = new glock(new Item.Settings().group(Shitmod.TOOLS_GROUP).maxDamage(1000));
+    public static final Item GLOCK = new glock(new FabricItemSettings().group(Shitmod.TOOLS_GROUP).maxDamage(1000).rarity(Rarity.EPIC));
     
-    public static final SoundEvent GLOCK_NOISE = new SoundEvent(new Identifier("shitmod:glock"));
+    public static final SoundEvent GLOCK_NOISE = new SoundEvent(new Identifier("shitmod:glock_noise"));
 
     @Override
     public void onInitialize() {
diff --git a/src/main/java/net/serenas/shitmod/glock.java b/src/main/java/net/serenas/shitmod/glock.java
index f5f7d7f..bcbe68c 100644
--- a/src/main/java/net/serenas/shitmod/glock.java
+++ b/src/main/java/net/serenas/shitmod/glock.java
@@ -22,8 +22,11 @@ public class glock extends Item{
         arro.setVelocity(playerEntity, playerEntity.getPitch(), playerEntity.getHeadYaw(), 0f, 100, 0);
         arro.setOwner(playerEntity);
         world.spawnEntity(arro);
-        world.playSound(playerEntity.getX(), playerEntity.getY(), playerEntity.getZ(), Shitmod.GLOCK_NOISE, SoundCategory.PLAYERS, 1f, 1f, true);
+        if (!world.isClient()) {
+            world.playSound(null, playerEntity.getX(), playerEntity.getY(), playerEntity.getZ(), Shitmod.GLOCK_NOISE, SoundCategory.NEUTRAL, 1f, 1f, 1);
+        }
         playerEntity.getMainHandStack().damage(1,playerEntity,e-> e.sendEquipmentBreakStatus(EquipmentSlot.MAINHAND));
+        playerEntity.getItemCooldownManager().set(this, 20);
         return new TypedActionResult<ItemStack>(ActionResult.SUCCESS, playerEntity.getStackInHand(hand));
     }
 
diff --git a/src/main/resources/assets/shitmod/lang/en_us.json b/src/main/resources/assets/shitmod/lang/en_us.json
index 58217de..4794565 100644
--- a/src/main/resources/assets/shitmod/lang/en_us.json
+++ b/src/main/resources/assets/shitmod/lang/en_us.json
@@ -42,5 +42,5 @@
     "itemGroup.shitmod.general": "Shitmod Misc",
     "itemGroup.shitmod.tools": "Shitmod Tools",
     "item.shitmod.glock": "Glock",
-    "subtitles.shitmod.glock": "Glock Fires"
+    "subtitles.shitmod.glock_noise": "Glock Fires"
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/shitmod/sounds.json b/src/main/resources/assets/shitmod/sounds.json
index 37ac726..b1f6341 100644
--- a/src/main/resources/assets/shitmod/sounds.json
+++ b/src/main/resources/assets/shitmod/sounds.json
@@ -1,8 +1,8 @@
 {
-    "glocknoise": {
-        "subtitle": "subtitles.shitmod.glock",
-        "shitmod": [
-            "shitmod:glock"
+    "glock_noise": {
+        "subtitle": "subtitles.shitmod.glock_noise",
+        "sounds": [
+            "shitmod:glock_noise"
         ]
     }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/shitmod/sounds/glock.ogg b/src/main/resources/assets/shitmod/sounds/glock_noise.ogg
similarity index 100%
rename from src/main/resources/assets/shitmod/sounds/glock.ogg
rename to src/main/resources/assets/shitmod/sounds/glock_noise.ogg