diff --git a/src/main/java/com/github/ethanicuss/astraladditions/items/weapons/ShotgunItem.java b/src/main/java/com/github/ethanicuss/astraladditions/items/weapons/ShotgunItem.java
index 171b566..db6a7d0 100644
--- a/src/main/java/com/github/ethanicuss/astraladditions/items/weapons/ShotgunItem.java
+++ b/src/main/java/com/github/ethanicuss/astraladditions/items/weapons/ShotgunItem.java
@@ -2,19 +2,24 @@
 
 import com.github.ethanicuss.astraladditions.registry.ModEntities;
 import com.github.ethanicuss.astraladditions.entities.scrap_projectile.ScrapProjectileEntity;
+import com.github.ethanicuss.astraladditions.registry.ModItems;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.BowItem;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
+import net.minecraft.item.RangedWeaponItem;
 import net.minecraft.sound.SoundCategory;
 import net.minecraft.sound.SoundEvents;
 import net.minecraft.stat.Stats;
+import net.minecraft.tag.ItemTags;
 import net.minecraft.util.Hand;
 import net.minecraft.util.TypedActionResult;
 import net.minecraft.world.World;
 
+import java.util.function.Predicate;
+
 public class ShotgunItem extends BowItem {
 
     public ShotgunItem(Settings settings) {
@@ -26,13 +31,26 @@ public void onStoppedUsing(ItemStack stack, World world, LivingEntity user, int
         if (!(user instanceof PlayerEntity playerEntity)) {
             return;
         }
-        boolean bl2;
-        boolean bl = playerEntity.getAbilities().creativeMode;
-        ItemStack itemStack = playerEntity.getArrowType(stack);//change
-        boolean bl3 = bl2 = bl && itemStack.isOf(Items.ARROW);
+        boolean bl2 = false;
+        boolean isCreative = playerEntity.getAbilities().creativeMode;
+
+        Predicate<ItemStack> predicate = (ammoStack) -> ammoStack.isOf(ModItems.SPUD_MAG);
+
+        PlayerEntity p = (PlayerEntity) user;
+
+        ItemStack itemStack = stack;//set to stack just to init
+
+        for(int i = 0; i < p.getInventory().size(); ++i) {
+            ItemStack itemStack2 = p.getInventory().getStack(i);
+            if (predicate.test(itemStack2)) {
+                bl2 = true;
+                itemStack = itemStack2;
+            }
+        }
+
         float f = getPullProgress(this.getMaxUseTime(stack) - remainingUseTicks);
 
-        if (!world.isClient && !itemStack.isEmpty()) {
+        if (!world.isClient && (isCreative || bl2)) {
             int k;
             int j;
             for (var i = 0; i < 15; i++) {
@@ -41,12 +59,10 @@ public void onStoppedUsing(ItemStack stack, World world, LivingEntity user, int
                 proj.setVelocity(playerEntity, playerEntity.getPitch(), playerEntity.getYaw(), 1.0f, 1.5f + f-1, 12f);
                 world.spawnEntity(proj);
             }
-            stack.damage(1, playerEntity, p -> p.sendToolBreakStatus(playerEntity.getActiveHand()));
-        }
-        if (!itemStack.isEmpty() || bl) {
+            stack.damage(1, playerEntity, p2 -> p2.sendToolBreakStatus(playerEntity.getActiveHand()));
             world.playSound(null, playerEntity.getX(), playerEntity.getY(), playerEntity.getZ(), SoundEvents.ENTITY_GENERIC_EXPLODE, SoundCategory.PLAYERS, 0.8f, 0.5f / (world.getRandom().nextFloat() * 0.4f + 1.2f) + 0.3f);
         }
-        if (!bl2 && !bl) {
+        if (bl2 && !isCreative) {
             itemStack.decrement(1);
             if (itemStack.isEmpty()) {
                 playerEntity.getInventory().removeOne(itemStack);
diff --git a/src/main/java/com/github/ethanicuss/astraladditions/registry/ModItems.java b/src/main/java/com/github/ethanicuss/astraladditions/registry/ModItems.java
index bc5baaf..bb4dbc9 100644
--- a/src/main/java/com/github/ethanicuss/astraladditions/registry/ModItems.java
+++ b/src/main/java/com/github/ethanicuss/astraladditions/registry/ModItems.java
@@ -51,8 +51,9 @@ public class ModItems {
     //public static final Item SHIMMER_BOTTLE = new ShimmerBottleItem(new FabricItemSettings().group(ItemGroup.BREWING).maxCount(1));
     public static final Item SHIMMER_BOTTLE = new ShimmerBottleItem(StatusEffects.NIGHT_VISION, 3600, 0, new TranslatableText("Multiplies XP gain by 1.5 (3:00)").formatted(Formatting.BLUE), new FabricItemSettings().group(ItemGroup.BREWING).maxCount(1).rarity(Rarity.UNCOMMON));
     public static final Item CHROMATIC_VACUUM = new ChromaticVacuumItem(new FabricItemSettings().group(ItemGroup.TOOLS).maxCount(1).maxDamage(512));
-    public static final Item SHOTGUN = new ShotgunItem(new FabricItemSettings().group(ItemGroup.TOOLS).maxCount(1).maxDamage(512));
-    public static final Item MACHINEGUN = new MachinegunItem(new FabricItemSettings().group(ItemGroup.TOOLS).maxCount(1).maxDamage(1024));
+    public static final Item SPUDSHOTGUN = new ShotgunItem(new FabricItemSettings().group(ItemGroup.COMBAT).maxCount(1).maxDamage(512));
+    public static final Item SPUD_MAG = new Item(new FabricItemSettings().group(ItemGroup.COMBAT));
+    public static final Item MACHINEGUN = new MachinegunItem(new FabricItemSettings().group(ItemGroup.COMBAT).maxCount(1).maxDamage(1024));
     public static final Item BETA_IRON_SWORD = new BetaSwordItem(new FabricItemSettings().group(ItemGroup.COMBAT).maxCount(1).rarity(Rarity.COMMON).maxDamage(250), 4);
     public static final Item BETA_DIAMOND_SWORD = new BetaSwordItem(new FabricItemSettings().group(ItemGroup.COMBAT).maxCount(1).rarity(Rarity.COMMON).maxDamage(1561), 5);
     public static final Item BETA_DESH_SWORD = new BetaSwordItem(new FabricItemSettings().group(ItemGroup.COMBAT).maxCount(1).rarity(Rarity.UNCOMMON).maxDamage(1024), 5);
@@ -110,7 +111,8 @@ public static void registerItems() {
         Registry.register(Registry.ITEM, new Identifier(AstralAdditions.MOD_ID, "shimmer_bottle"), SHIMMER_BOTTLE);
         Registry.register(Registry.ITEM, new Identifier(AstralAdditions.MOD_ID, "chromatic_vacuum"), CHROMATIC_VACUUM);
         Registry.register(Registry.ITEM, new Identifier(AstralAdditions.MOD_ID, "machinegun"), MACHINEGUN);
-        Registry.register(Registry.ITEM, new Identifier(AstralAdditions.MOD_ID, "shotgun"), SHOTGUN);
+        Registry.register(Registry.ITEM, new Identifier(AstralAdditions.MOD_ID, "spudshotgun"), SPUDSHOTGUN);
+        Registry.register(Registry.ITEM, new Identifier(AstralAdditions.MOD_ID, "spud_mag"), SPUD_MAG);
         Registry.register(Registry.ITEM, new Identifier(AstralAdditions.MOD_ID, "astral_hoe"), ASTRAL_HOE);
         Registry.register(Registry.ITEM, new Identifier(AstralAdditions.MOD_ID, "soulsteal_dagger"), SOULSTEAL_DAGGER);
         Registry.register(Registry.ITEM, new Identifier(AstralAdditions.MOD_ID, "diamond_boomer"), DIAMOND_BOOMER);
diff --git a/src/main/resources/assets/astraladditions/lang/en_us.json b/src/main/resources/assets/astraladditions/lang/en_us.json
index 3894ddb..b095552 100644
--- a/src/main/resources/assets/astraladditions/lang/en_us.json
+++ b/src/main/resources/assets/astraladditions/lang/en_us.json
@@ -51,6 +51,8 @@
 	"item.astraladditions.beta_ostrum_weapon": "Beta Ostrum Sword",
 	"item.astraladditions.beta_calorite_weapon": "Beta Calorite Sword",
 	"item.astraladditions.beta_ender_weapon": "Beta Ender Sword",
+	"item.astraladditions.spudshotgun": "Spud Shotgun",
+	"item.astraladditions.spud_mag": "Spud Magazine",
 
 	"item.astraladditions.shimmer_fishing_rod": "Shimmer Fishing Rod",
 	"item.astraladditions.shimmering_thread": "Shimmering Thread",
@@ -58,6 +60,16 @@
 	"item.astraladditions.shish": "Shish",
 	"item.astraladditions.bottomless_water_bucket": "Bottomless Water Bucket",
 
+	"item.minecraft.potion.effect.shimmer": "Bottle of Shimmer",
+	"item.minecraft.splash_potion.effect.shimmer": "Splash Bottle of Shimmer",
+	"item.minecraft.lingering_potion.effect.shimmer": "Lingering Bottle of Shimmer",
+	"item.minecraft.tipped_arrow.effect.shimmer": "Arrow of Shimmer",
+
+	"item.minecraft.potion.effect.sputum": "Bottle of Sputum",
+	"item.minecraft.splash_potion.effect.sputum": "Splash Bottle of Sputum",
+	"item.minecraft.lingering_potion.effect.sputum": "Lingering Bottle of Sputum",
+	"item.minecraft.tipped_arrow.effect.sputum": "Arrow of Sputum",
+
 	"block.astraladditions.enderrack": "Enderrack",
 	"block.astraladditions.twisted_nylium": "Twisted Nylium",
 	"block.astraladditions.ender_sprouts": "Ender Sprouts",
@@ -130,16 +142,6 @@
 	"effect.astraladditions.parry": "Parry",
 	"effect.astraladditions.frost": "Frost",
 
-	"item.minecraft.potion.effect.shimmer": "Bottle of Shimmer",
-	"item.minecraft.splash_potion.effect.shimmer": "Splash Bottle of Shimmer",
-	"item.minecraft.lingering_potion.effect.shimmer": "Lingering Bottle of Shimmer",
-	"item.minecraft.tipped_arrow.effect.shimmer": "Arrow of Shimmer",
-
-	"item.minecraft.potion.effect.sputum": "Bottle of Sputum",
-	"item.minecraft.splash_potion.effect.sputum": "Splash Bottle of Sputum",
-	"item.minecraft.lingering_potion.effect.sputum": "Lingering Bottle of Sputum",
-	"item.minecraft.tipped_arrow.effect.sputum": "Arrow of Sputum",
-
 	"tooltip.astraladditions.cogfly": "W.I.P for 2.2",
 	"tooltip.astraladditions.beta_sword_smell": "It smells like thick fog",
 
diff --git a/src/main/resources/assets/astraladditions/models/item/spud_mag.json b/src/main/resources/assets/astraladditions/models/item/spud_mag.json
new file mode 100644
index 0000000..7a8762f
--- /dev/null
+++ b/src/main/resources/assets/astraladditions/models/item/spud_mag.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "astraladditions:item/spud_mag"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/astraladditions/models/item/spudshotgun.json b/src/main/resources/assets/astraladditions/models/item/spudshotgun.json
new file mode 100644
index 0000000..907722f
--- /dev/null
+++ b/src/main/resources/assets/astraladditions/models/item/spudshotgun.json
@@ -0,0 +1,463 @@
+{
+	"format_version": "1.9.0",
+	"credit": "Made with Blockbench",
+	"texture_size": [64, 64],
+	"textures": {
+		"2": "astraladditions:item/spudshotgun",
+		"particle": "astraladditions:item/spudshotgun"
+	},
+	"elements": [
+		{
+			"from": [8, 6.8, 3.1],
+			"to": [10, 9.8, 5.1],
+			"rotation": {"angle": -22.5, "axis": "z", "origin": [8, 6.8, 3.1]},
+			"faces": {
+				"north": {"uv": [8.25, 9, 8.75, 9.75], "texture": "#2"},
+				"east": {"uv": [9.25, 1.25, 9.75, 2], "texture": "#2"},
+				"south": {"uv": [2.75, 9.25, 3.25, 10], "texture": "#2"},
+				"west": {"uv": [3.25, 9.25, 3.75, 10], "texture": "#2"},
+				"up": {"uv": [10.5, 3.25, 10, 2.75], "texture": "#2"},
+				"down": {"uv": [4.75, 10, 4.25, 10.5], "texture": "#2"}
+			}
+		},
+		{
+			"from": [7.45, 5.3, 4],
+			"to": [9.45, 8.3, 6],
+			"rotation": {"angle": 22.5, "axis": "z", "origin": [7.45, 5.3, 4]},
+			"faces": {
+				"north": {"uv": [3.75, 9.25, 4.25, 10], "texture": "#2"},
+				"east": {"uv": [4.25, 9.25, 4.75, 10], "texture": "#2"},
+				"south": {"uv": [4.75, 9.25, 5.25, 10], "texture": "#2"},
+				"west": {"uv": [9.25, 6, 9.75, 6.75], "texture": "#2"},
+				"up": {"uv": [5.25, 10.5, 4.75, 10], "texture": "#2"},
+				"down": {"uv": [10.5, 6.75, 10, 7.25], "texture": "#2"}
+			}
+		},
+		{
+			"from": [8.25, 6.3, 4.8],
+			"to": [10.25, 9.3, 6.8],
+			"rotation": {"angle": 22.5, "axis": "x", "origin": [8.25, 6.3, 4.8]},
+			"faces": {
+				"north": {"uv": [8.75, 9.25, 9.25, 10], "texture": "#2"},
+				"east": {"uv": [9.25, 9.25, 9.75, 10], "texture": "#2"},
+				"south": {"uv": [9.5, 2.75, 10, 3.5], "texture": "#2"},
+				"west": {"uv": [9.5, 6.75, 10, 7.5], "texture": "#2"},
+				"up": {"uv": [7.75, 10.5, 7.25, 10], "texture": "#2"},
+				"down": {"uv": [8.25, 10, 7.75, 10.5], "texture": "#2"}
+			}
+		},
+		{
+			"from": [5.45, 6.1, 4.6],
+			"to": [7.45, 9.1, 6.6],
+			"rotation": {"angle": 22.5, "axis": "x", "origin": [5.45, 6.1, 4.6]},
+			"faces": {
+				"north": {"uv": [9.5, 8.5, 10, 9.25], "texture": "#2"},
+				"east": {"uv": [9.75, 0, 10.25, 0.75], "texture": "#2"},
+				"south": {"uv": [9.75, 1.25, 10.25, 2], "texture": "#2"},
+				"west": {"uv": [2, 9.75, 2.5, 10.5], "texture": "#2"},
+				"up": {"uv": [10.5, 8.25, 10, 7.75], "texture": "#2"},
+				"down": {"uv": [10.5, 8.5, 10, 9], "texture": "#2"}
+			}
+		},
+		{
+			"from": [5.1, 5.95, 3.95],
+			"to": [7.1, 8.95, 5.95],
+			"rotation": {"angle": -22.5, "axis": "x", "origin": [7.1, 5.95, 3.95]},
+			"faces": {
+				"north": {"uv": [9.75, 4, 10.25, 4.75], "texture": "#2"},
+				"east": {"uv": [9.75, 4.75, 10.25, 5.5], "texture": "#2"},
+				"south": {"uv": [9.75, 5.5, 10.25, 6.25], "texture": "#2"},
+				"west": {"uv": [8.25, 9.75, 8.75, 10.5], "texture": "#2"},
+				"up": {"uv": [9.25, 10.5, 8.75, 10], "texture": "#2"},
+				"down": {"uv": [10.5, 9, 10, 9.5], "texture": "#2"}
+			}
+		},
+		{
+			"from": [4.6, 5.9, 2.35],
+			"to": [11.35, 7.9, 7.85],
+			"rotation": {"angle": 0, "axis": "y", "origin": [4.35, 5.9, 3.1]},
+			"faces": {
+				"north": {"uv": [6, 3.5, 7.75, 4], "texture": "#2"},
+				"east": {"uv": [7.25, 8.5, 8.625, 9], "texture": "#2"},
+				"south": {"uv": [8, 5.5, 9.75, 6], "texture": "#2"},
+				"west": {"uv": [8.5, 7.75, 9.875, 8.25], "texture": "#2"},
+				"up": {"uv": [3.5, 7.125, 1.75, 5.75], "texture": "#2"},
+				"down": {"uv": [5.25, 5.75, 3.5, 7.125], "texture": "#2"}
+			}
+		},
+		{
+			"from": [12.76421, 9.31321, 4.1],
+			"to": [14.76421, 9.31321, 6.1],
+			"rotation": {"angle": 0, "axis": "y", "origin": [12.76421, 7.31321, 0.1]},
+			"faces": {
+				"north": {"uv": [0, 0, 0.5, 0], "texture": "#2"},
+				"east": {"uv": [0, 0, 0.5, 0], "texture": "#2"},
+				"south": {"uv": [0, 0, 0.5, 0], "texture": "#2"},
+				"west": {"uv": [0, 0, 0.5, 0], "texture": "#2"},
+				"up": {"uv": [9.75, 10.5, 9.25, 10], "texture": "#2"},
+				"down": {"uv": [10.5, 9.5, 10, 10], "texture": "#2"}
+			}
+		},
+		{
+			"from": [12.76492, 8.48508, 4.1],
+			"to": [14.76492, 8.48508, 6.1],
+			"rotation": {"angle": 45, "axis": "z", "origin": [12.76492, 6.48508, 4.1]},
+			"faces": {
+				"north": {"uv": [0, 0, 0.5, 0], "texture": "#2"},
+				"east": {"uv": [0, 0, 0.5, 0], "texture": "#2"},
+				"south": {"uv": [0, 0, 0.5, 0], "texture": "#2"},
+				"west": {"uv": [0, 0, 0.5, 0], "texture": "#2"},
+				"up": {"uv": [10.5, 10.5, 10, 10], "texture": "#2"},
+				"down": {"uv": [10.75, 0, 10.25, 0.5], "texture": "#2"}
+			}
+		},
+		{
+			"from": [3.5, 2, 8],
+			"to": [12.5, 7, 9],
+			"rotation": {"angle": 0, "axis": "y", "origin": [5.5, 5, 4]},
+			"faces": {
+				"north": {"uv": [2, 3, 4.25, 4.25], "texture": "#2"},
+				"east": {"uv": [1.5, 10, 1.75, 11.25], "texture": "#2"},
+				"south": {"uv": [4, 0, 6.25, 1.25], "texture": "#2"},
+				"west": {"uv": [1.75, 10, 2, 11.25], "texture": "#2"},
+				"up": {"uv": [9.5, 7, 7.25, 6.75], "texture": "#2"},
+				"down": {"uv": [10.75, 8.25, 8.5, 8.5], "texture": "#2"}
+			}
+		},
+		{
+			"from": [11.5, 2, 2],
+			"to": [12.5, 7, 8],
+			"rotation": {"angle": 0, "axis": "y", "origin": [5.5, 5, 4]},
+			"faces": {
+				"north": {"uv": [2.75, 10, 3, 11.25], "texture": "#2"},
+				"east": {"uv": [6.25, 0, 7.75, 1.25], "texture": "#2"},
+				"south": {"uv": [3, 10, 3.25, 11.25], "texture": "#2"},
+				"west": {"uv": [6.25, 1.25, 7.75, 2.5], "texture": "#2"},
+				"up": {"uv": [2.75, 11.25, 2.5, 9.75], "texture": "#2"},
+				"down": {"uv": [10, 9.25, 9.75, 10.75], "texture": "#2"}
+			}
+		},
+		{
+			"from": [4.5, 6.5, 2],
+			"to": [11.5, 6.5, 8],
+			"rotation": {"angle": 0, "axis": "y", "origin": [5.5, 6.5, 4]},
+			"faces": {
+				"north": {"uv": [0, 0, 1.75, 0], "texture": "#2"},
+				"east": {"uv": [0, 0, 1.5, 0], "texture": "#2"},
+				"south": {"uv": [0, 0, 1.75, 0], "texture": "#2"},
+				"west": {"uv": [0, 0, 1.5, 0], "texture": "#2"},
+				"up": {"uv": [4, 5.75, 2.25, 4.25], "texture": "#2"},
+				"down": {"uv": [6, 2.5, 4.25, 4], "texture": "#2"}
+			}
+		},
+		{
+			"from": [4.5, 2, 2],
+			"to": [11.5, 3, 8],
+			"rotation": {"angle": 0, "axis": "y", "origin": [5.5, 2, 4]},
+			"faces": {
+				"north": {"uv": [0, 4, 1.75, 4.25], "texture": "#2"},
+				"east": {"uv": [4.25, 4, 5.75, 4.25], "texture": "#2"},
+				"south": {"uv": [9.25, 1, 11, 1.25], "texture": "#2"},
+				"west": {"uv": [9.5, 7.5, 11, 7.75], "texture": "#2"},
+				"up": {"uv": [5.75, 5.75, 4, 4.25], "texture": "#2"},
+				"down": {"uv": [1.75, 5.5, 0, 7], "texture": "#2"}
+			}
+		},
+		{
+			"from": [3.5, 2, 2],
+			"to": [4.5, 7, 8],
+			"rotation": {"angle": 0, "axis": "y", "origin": [5.5, 5, 4]},
+			"faces": {
+				"north": {"uv": [3.25, 10, 3.5, 11.25], "texture": "#2"},
+				"east": {"uv": [0, 7, 1.5, 8.25], "texture": "#2"},
+				"south": {"uv": [3.5, 10, 3.75, 11.25], "texture": "#2"},
+				"west": {"uv": [5.25, 7, 6.75, 8.25], "texture": "#2"},
+				"up": {"uv": [0.25, 11.5, 0, 10], "texture": "#2"},
+				"down": {"uv": [0.5, 10, 0.25, 11.5], "texture": "#2"}
+			}
+		},
+		{
+			"from": [3.5, 2, 1],
+			"to": [12.5, 7, 2],
+			"rotation": {"angle": 0, "axis": "y", "origin": [5.5, 5, 3]},
+			"faces": {
+				"north": {"uv": [4, 1.25, 6.25, 2.5], "texture": "#2"},
+				"east": {"uv": [3.75, 10, 4, 11.25], "texture": "#2"},
+				"south": {"uv": [0, 4.25, 2.25, 5.5], "texture": "#2"},
+				"west": {"uv": [4, 10, 4.25, 11.25], "texture": "#2"},
+				"up": {"uv": [4.25, 9, 2, 8.75], "texture": "#2"},
+				"down": {"uv": [11, 2, 8.75, 2.25], "texture": "#2"}
+			}
+		},
+		{
+			"from": [3.5, 2.5, -7.35],
+			"to": [12.5, 6.5, -6.35],
+			"rotation": {"angle": 0, "axis": "y", "origin": [5.5, 4.5, -5.35]},
+			"faces": {
+				"north": {"uv": [5.75, 4, 8, 5], "texture": "#2"},
+				"east": {"uv": [10.25, 4, 10.5, 5], "texture": "#2"},
+				"south": {"uv": [5.75, 5, 8, 6], "texture": "#2"},
+				"west": {"uv": [10.25, 5, 10.5, 6], "texture": "#2"},
+				"up": {"uv": [11, 2.5, 8.75, 2.25], "texture": "#2"},
+				"down": {"uv": [11, 2.5, 8.75, 2.75], "texture": "#2"}
+			}
+		},
+		{
+			"from": [7.5, 5.5, -6.35],
+			"to": [8.5, 6.5, -4.35],
+			"rotation": {"angle": 0, "axis": "y", "origin": [5.5, 4.5, -4.35]},
+			"faces": {
+				"north": {"uv": [1.75, 4, 2, 4.25], "texture": "#2"},
+				"east": {"uv": [1.75, 5.5, 2.25, 5.75], "texture": "#2"},
+				"south": {"uv": [1.5, 7, 1.75, 7.25], "texture": "#2"},
+				"west": {"uv": [5.25, 5.75, 5.75, 6], "texture": "#2"},
+				"up": {"uv": [4.25, 3, 4, 2.5], "texture": "#2"},
+				"down": {"uv": [8, 3.5, 7.75, 4], "texture": "#2"}
+			}
+		},
+		{
+			"from": [4, 3, -7],
+			"to": [12, 6, 1],
+			"rotation": {"angle": 0, "axis": "y", "origin": [5, 5, 2]},
+			"faces": {
+				"north": {"uv": [6.75, 7, 8.75, 7.75], "texture": "#2"},
+				"east": {"uv": [1.5, 7.25, 3.5, 8], "texture": "#2"},
+				"south": {"uv": [7.25, 6, 9.25, 6.75], "texture": "#2"},
+				"west": {"uv": [7.75, 0, 9.75, 0.75], "texture": "#2"},
+				"up": {"uv": [2, 2, 0, 0], "texture": "#2"},
+				"down": {"uv": [2, 2, 0, 4], "texture": "#2"}
+			}
+		},
+		{
+			"from": [5, 0, 2],
+			"to": [8, 3, 9],
+			"rotation": {"angle": -45, "axis": "z", "origin": [6, 2, 10]},
+			"faces": {
+				"north": {"uv": [8.75, 2.75, 9.5, 3.5], "texture": "#2"},
+				"east": {"uv": [6.75, 7.75, 8.5, 8.5], "texture": "#2"},
+				"south": {"uv": [8.75, 7, 9.5, 7.75], "texture": "#2"},
+				"west": {"uv": [1.5, 8, 3.25, 8.75], "texture": "#2"},
+				"up": {"uv": [5.25, 9, 4.5, 7.25], "texture": "#2"},
+				"down": {"uv": [8.75, 2.25, 8, 4], "texture": "#2"}
+			}
+		},
+		{
+			"from": [9, 0, 2],
+			"to": [12, 3, 9],
+			"rotation": {"angle": -45, "axis": "z", "origin": [10, 2, 10]},
+			"faces": {
+				"north": {"uv": [8.75, 8.5, 9.5, 9.25], "texture": "#2"},
+				"east": {"uv": [8, 4, 9.75, 4.75], "texture": "#2"},
+				"south": {"uv": [2, 9, 2.75, 9.75], "texture": "#2"},
+				"west": {"uv": [8, 4.75, 9.75, 5.5], "texture": "#2"},
+				"up": {"uv": [0.75, 10, 0, 8.25], "texture": "#2"},
+				"down": {"uv": [1.5, 8.25, 0.75, 10], "texture": "#2"}
+			}
+		},
+		{
+			"from": [5.5, 0, 9],
+			"to": [6.5, 1, 11],
+			"rotation": {"angle": 0, "axis": "y", "origin": [5.5, -2, 18]},
+			"faces": {
+				"north": {"uv": [7.75, 2.25, 8, 2.5], "texture": "#2"},
+				"east": {"uv": [10, 3.25, 10.5, 3.5], "texture": "#2"},
+				"south": {"uv": [4.25, 8.75, 4.5, 9], "texture": "#2"},
+				"west": {"uv": [10, 7.25, 10.5, 7.5], "texture": "#2"},
+				"up": {"uv": [4.75, 11, 4.5, 10.5], "texture": "#2"},
+				"down": {"uv": [5, 10.5, 4.75, 11], "texture": "#2"}
+			}
+		},
+		{
+			"from": [9.5, 0, 9],
+			"to": [10.5, 1, 11],
+			"rotation": {"angle": 0, "axis": "y", "origin": [9.5, -2, 18]},
+			"faces": {
+				"north": {"uv": [5, 9, 5.25, 9.25], "texture": "#2"},
+				"east": {"uv": [10.25, 0.5, 10.75, 0.75], "texture": "#2"},
+				"south": {"uv": [8.25, 10.5, 8.5, 10.75], "texture": "#2"},
+				"west": {"uv": [10.25, 1.75, 10.75, 2], "texture": "#2"},
+				"up": {"uv": [5.25, 11, 5, 10.5], "texture": "#2"},
+				"down": {"uv": [10.75, 5, 10.5, 5.5], "texture": "#2"}
+			}
+		},
+		{
+			"from": [7, -1, 12],
+			"to": [9, 1, 13],
+			"rotation": {"angle": 0, "axis": "y", "origin": [7, -1, 11]},
+			"faces": {
+				"north": {"uv": [10.25, 1.25, 10.75, 1.75], "texture": "#2"},
+				"east": {"uv": [5.25, 10.5, 5.5, 11], "texture": "#2"},
+				"south": {"uv": [2, 10.5, 2.5, 11], "texture": "#2"},
+				"west": {"uv": [5.5, 10.5, 5.75, 11], "texture": "#2"},
+				"up": {"uv": [10.75, 6.25, 10.25, 6], "texture": "#2"},
+				"down": {"uv": [11, 5.5, 10.5, 5.75], "texture": "#2"}
+			}
+		},
+		{
+			"from": [7, -2, 13],
+			"to": [9, -1, 22],
+			"rotation": {"angle": 0, "axis": "y", "origin": [7, -2, 13]},
+			"faces": {
+				"north": {"uv": [5.75, 10.5, 6.25, 10.75], "texture": "#2"},
+				"east": {"uv": [8.75, 3.5, 11, 3.75], "texture": "#2"},
+				"south": {"uv": [10.5, 5.75, 11, 6], "texture": "#2"},
+				"west": {"uv": [8.75, 3.75, 11, 4], "texture": "#2"},
+				"up": {"uv": [5.75, 10.5, 5.25, 8.25], "texture": "#2"},
+				"down": {"uv": [6.25, 8.25, 5.75, 10.5], "texture": "#2"}
+			}
+		},
+		{
+			"from": [7, 3, 13],
+			"to": [9, 4, 22],
+			"rotation": {"angle": 0, "axis": "y", "origin": [7, 3, 13]},
+			"faces": {
+				"north": {"uv": [6.25, 10.5, 6.75, 10.75], "texture": "#2"},
+				"east": {"uv": [2.75, 9, 5, 9.25], "texture": "#2"},
+				"south": {"uv": [10.5, 6.75, 11, 7], "texture": "#2"},
+				"west": {"uv": [9.25, 0.75, 11.5, 1], "texture": "#2"},
+				"up": {"uv": [6.75, 10.5, 6.25, 8.25], "texture": "#2"},
+				"down": {"uv": [7.25, 8.5, 6.75, 10.75], "texture": "#2"}
+			}
+		},
+		{
+			"from": [7, -1, 21],
+			"to": [9, 3, 22],
+			"rotation": {"angle": 0, "axis": "y", "origin": [7, 2, 13]},
+			"faces": {
+				"north": {"uv": [7.25, 9, 7.75, 10], "texture": "#2"},
+				"east": {"uv": [10.5, 4, 10.75, 5], "texture": "#2"},
+				"south": {"uv": [7.75, 9, 8.25, 10], "texture": "#2"},
+				"west": {"uv": [4.25, 10.5, 4.5, 11.5], "texture": "#2"},
+				"up": {"uv": [11, 7.25, 10.5, 7], "texture": "#2"},
+				"down": {"uv": [7.75, 10.5, 7.25, 10.75], "texture": "#2"}
+			}
+		},
+		{
+			"from": [7, -2, 8],
+			"to": [9, -1, 13],
+			"rotation": {"angle": 0, "axis": "y", "origin": [4, -2, 18]},
+			"faces": {
+				"north": {"uv": [10.5, 7.25, 11, 7.5], "texture": "#2"},
+				"east": {"uv": [9.75, 6.25, 11, 6.5], "texture": "#2"},
+				"south": {"uv": [7.75, 10.5, 8.25, 10.75], "texture": "#2"},
+				"west": {"uv": [9.75, 6.5, 11, 6.75], "texture": "#2"},
+				"up": {"uv": [9.25, 2, 8.75, 0.75], "texture": "#2"},
+				"down": {"uv": [2, 8.75, 1.5, 10], "texture": "#2"}
+			}
+		},
+		{
+			"from": [7, -2, 7],
+			"to": [9, 1, 8],
+			"rotation": {"angle": 0, "axis": "y", "origin": [4, -2, 13]},
+			"faces": {
+				"north": {"uv": [0.5, 10, 1, 10.75], "texture": "#2"},
+				"east": {"uv": [3.25, 8, 3.5, 8.75], "texture": "#2"},
+				"south": {"uv": [1, 10, 1.5, 10.75], "texture": "#2"},
+				"west": {"uv": [10.5, 2.75, 10.75, 3.5], "texture": "#2"},
+				"up": {"uv": [11, 8, 10.5, 7.75], "texture": "#2"},
+				"down": {"uv": [11, 8, 10.5, 8.25], "texture": "#2"}
+			}
+		},
+		{
+			"from": [4, 1, 9],
+			"to": [12, 7, 13],
+			"rotation": {"angle": 0, "axis": "y", "origin": [5, 4, 18]},
+			"faces": {
+				"north": {"uv": [2, 0, 4, 1.5], "texture": "#2"},
+				"east": {"uv": [3.5, 7.25, 4.5, 8.75], "texture": "#2"},
+				"south": {"uv": [2, 1.5, 4, 3], "texture": "#2"},
+				"west": {"uv": [7.75, 0.75, 8.75, 2.25], "texture": "#2"},
+				"up": {"uv": [8, 3.5, 6, 2.5], "texture": "#2"},
+				"down": {"uv": [7.25, 6, 5.25, 7], "texture": "#2"}
+			}
+		}
+	],
+	"display": {
+		"thirdperson_righthand": {
+			"translation": [-1.75, 3.5, 0],
+			"scale": [0.8, 0.8, 0.8]
+		},
+		"thirdperson_lefthand": {
+			"translation": [-1.75, 3.5, 0],
+			"scale": [0.8, 0.8, 0.8]
+		},
+		"firstperson_righthand": {
+			"rotation": [11.36, 2, 2.46],
+			"translation": [0, 4.5, 2.75],
+			"scale": [0.8, 0.8, 0.8]
+		},
+		"firstperson_lefthand": {
+			"rotation": [11.36, 2, 2.46],
+			"translation": [0, 4.5, 2.75],
+			"scale": [0.8, 0.8, 0.8]
+		},
+		"ground": {
+			"translation": [0, 6, 0]
+		},
+		"gui": {
+			"rotation": [33, 135, 0],
+			"translation": [0.75, 2.5, 0],
+			"scale": [0.7, 0.7, 0.7]
+		},
+		"head": {
+			"translation": [0, 12.5, 0]
+		},
+		"fixed": {
+			"rotation": [0, 90, 0],
+			"translation": [0.5, 2, 0],
+			"scale": [0.65, 0.65, 0.65]
+		},
+		"on_shelf": {
+			"rotation": [74, 0, 0],
+			"translation": [0, 0, 5.25]
+		}
+	},
+	"groups": [
+		{
+			"name": "shotgun",
+			"origin": [6, 1, 6],
+			"color": 0,
+			"children": [
+				{
+					"name": "Fries",
+					"origin": [8.8, 6.6, 3.1],
+					"color": 0,
+					"children": [
+						{
+							"name": "potato",
+							"origin": [8.8, 6.6, 3.1],
+							"color": 0,
+							"children": [0, 1, 2, 3, 4]
+						},
+						{
+							"name": "basket",
+							"origin": [6, 1, 6],
+							"color": 0,
+							"children": [5, 6, 7]
+						}
+					]
+				},
+				{
+					"name": "Bucket",
+					"origin": [7, 5, 7],
+					"color": 0,
+					"children": [8, 9, 10, 11, 12, 13]
+				},
+				14,
+				15,
+				16,
+				17,
+				18,
+				19,
+				20,
+				21,
+				22,
+				23,
+				24,
+				25,
+				26,
+				27
+			]
+		}
+	]
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/astraladditions/textures/item/spudshotgun.png b/src/main/resources/assets/astraladditions/textures/item/spudshotgun.png
new file mode 100644
index 0000000..e156435
Binary files /dev/null and b/src/main/resources/assets/astraladditions/textures/item/spudshotgun.png differ
diff --git a/src/main/resources/data/astraladditions/tags/blocks/desizer_casing_blocks.json b/src/main/resources/data/astraladditions/tags/blocks/desizer_casing_blocks.json
index 205902b..3df428f 100644
--- a/src/main/resources/data/astraladditions/tags/blocks/desizer_casing_blocks.json
+++ b/src/main/resources/data/astraladditions/tags/blocks/desizer_casing_blocks.json
@@ -1,14 +1,7 @@
 {
   "replace": false,
   "values": [
-    "astraladditions:desizer_1",
-    "astraladditions:desizer_2",
-    "astraladditions:desizer_3",
-    "astraladditions:desizer_4",
-    "astraladditions:desizer_6",
-    "astraladditions:desizer_7",
-    "astraladditions:desizer_8",
-    "astraladditions:desizer_9",
-    "astraladditions:desizer_9"
+    "astraladditions:desizer_controller",
+    "astraladditions:desizer_base"
   ]
 }
\ No newline at end of file
diff --git a/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json
index b7bbad0..58fd058 100644
--- a/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json
+++ b/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json
@@ -3,18 +3,10 @@
   "values": [
     "astraladditions:moonset_crystal_block",
     "astraladditions:the_end",
-		"astraladditions:desizer_controller",
-		"astraladditions:desizer_1",
-		"astraladditions:desizer_2",
-		"astraladditions:desizer_3",
-		"astraladditions:desizer_4",
-		"astraladditions:desizer_6",
-		"astraladditions:desizer_7",
-		"astraladditions:desizer_8",
-		"astraladditions:desizer_9",
-	    "astraladditions:desizer_base",
-		"astraladditions:enderrack",
-		"astraladditions:twisted_nylium",
-		"astraladditions:ender_tip"
+	"astraladditions:desizer_controller",
+	"astraladditions:desizer_base",
+	"astraladditions:enderrack",
+	"astraladditions:twisted_nylium",
+	"astraladditions:ender_tip"
   ]
 }
\ No newline at end of file