From 2274852c9b6f788eb38d4991efb73ec047cc693a Mon Sep 17 00:00:00 2001
From: Sunskimmer822 <92886026+Sunskimmer822@users.noreply.github.com>
Date: Mon, 18 Jul 2022 17:02:38 -0700
Subject: [PATCH] glock stuff

---
 src/main/java/net/serenas/shitmod/Shitmod.java    | 5 +++++
 src/main/java/net/serenas/shitmod/glock.java      | 3 +++
 src/main/resources/assets/shitmod/lang/en_us.json | 3 ++-
 src/main/resources/assets/shitmod/sounds.json     | 2 +-
 src/main/resources/assets/shitmod/sounds/f        | 0
 5 files changed, 11 insertions(+), 2 deletions(-)
 delete mode 100644 src/main/resources/assets/shitmod/sounds/f

diff --git a/src/main/java/net/serenas/shitmod/Shitmod.java b/src/main/java/net/serenas/shitmod/Shitmod.java
index 260acf2..272d49a 100644
--- a/src/main/java/net/serenas/shitmod/Shitmod.java
+++ b/src/main/java/net/serenas/shitmod/Shitmod.java
@@ -17,6 +17,7 @@ import net.minecraft.item.ItemGroup;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.ShovelItem;
 import net.minecraft.item.ToolItem;
+import net.minecraft.sound.SoundEvent;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.Rarity;
 import net.minecraft.util.registry.Registry;
@@ -116,6 +117,8 @@ 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 SoundEvent GLOCK_NOISE = new SoundEvent(new Identifier("shitmod:glock"));
 
     @Override
     public void onInitialize() {
@@ -202,5 +205,7 @@ public class Shitmod implements ModInitializer {
         Registry.register(Registry.ITEM, new Identifier("shitmod", "copper_hoe"), COPPER_HOE);
 
         Registry.register(Registry.ITEM, new Identifier("shitmod", "glock"), GLOCK);
+
+        Registry.register(Registry.SOUND_EVENT, new Identifier("shitmod", "glock_noise"), GLOCK_NOISE);
     }
   }
diff --git a/src/main/java/net/serenas/shitmod/glock.java b/src/main/java/net/serenas/shitmod/glock.java
index 1b7c8a9..f5f7d7f 100644
--- a/src/main/java/net/serenas/shitmod/glock.java
+++ b/src/main/java/net/serenas/shitmod/glock.java
@@ -5,6 +5,7 @@ import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.projectile.ArrowEntity;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraft.sound.SoundCategory;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.Hand;
 import net.minecraft.util.TypedActionResult;
@@ -19,7 +20,9 @@ public class glock extends Item{
     public TypedActionResult<ItemStack> use(World world, PlayerEntity playerEntity, Hand hand) {
         ArrowEntity arro = new ArrowEntity(world, playerEntity.getX(), playerEntity.getEyeY(), playerEntity.getZ());
         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);
         playerEntity.getMainHandStack().damage(1,playerEntity,e-> e.sendEquipmentBreakStatus(EquipmentSlot.MAINHAND));
         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 76cea67..58217de 100644
--- a/src/main/resources/assets/shitmod/lang/en_us.json
+++ b/src/main/resources/assets/shitmod/lang/en_us.json
@@ -41,5 +41,6 @@
     "item.shitmod.copper_hoe": "Copper Hoe",
     "itemGroup.shitmod.general": "Shitmod Misc",
     "itemGroup.shitmod.tools": "Shitmod Tools",
-    "item.shitmod.glock": "Glock"
+    "item.shitmod.glock": "Glock",
+    "subtitles.shitmod.glock": "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 d8bcd08..37ac726 100644
--- a/src/main/resources/assets/shitmod/sounds.json
+++ b/src/main/resources/assets/shitmod/sounds.json
@@ -1,5 +1,5 @@
 {
-    "glock": {
+    "glocknoise": {
         "subtitle": "subtitles.shitmod.glock",
         "shitmod": [
             "shitmod:glock"
diff --git a/src/main/resources/assets/shitmod/sounds/f b/src/main/resources/assets/shitmod/sounds/f
deleted file mode 100644
index e69de29..0000000