diff --git a/1.11/src/main/java/nmd/primal/forgecraft/init/ModItems.java b/1.11/src/main/java/nmd/primal/forgecraft/init/ModItems.java index 3d988fd1..d19800a3 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/init/ModItems.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/init/ModItems.java @@ -140,7 +140,7 @@ public class ModItems { GameRegistry.register(ironhoe); GameRegistry.register(ironsword); - //GameRegistry.register(matchlockmusket); + GameRegistry.register(matchlockmusket); //GameRegistry.register(forgingmanual); } @@ -165,7 +165,7 @@ public class ModItems { registerRender(ironsword); //registerRender(forgingmanual); - //registerRender(matchlockmusket); + registerRender(matchlockmusket); } @SideOnly(Side.CLIENT) diff --git a/1.11/src/main/java/nmd/primal/forgecraft/init/ModSounds.java b/1.11/src/main/java/nmd/primal/forgecraft/init/ModSounds.java index b47544fb..dd060956 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/init/ModSounds.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/init/ModSounds.java @@ -13,10 +13,12 @@ import nmd.primal.forgecraft.api.ForgecraftSounds; public class ModSounds { public static SoundEvent PISTON_BELLOWS; + public static SoundEvent MUSKET_SHOT; public static void registerSounds() { PISTON_BELLOWS = registerSound("piston_bellows"); + MUSKET_SHOT = registerSound("musket_shot"); } private static SoundEvent registerSound(String name) diff --git a/1.11/src/main/java/nmd/primal/forgecraft/items/weapons/Musket.java b/1.11/src/main/java/nmd/primal/forgecraft/items/weapons/Musket.java index 46a5cd67..17c01e9e 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/items/weapons/Musket.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/items/weapons/Musket.java @@ -1,14 +1,19 @@ package nmd.primal.forgecraft.items.weapons; import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.SoundEvents; import net.minecraft.item.IItemPropertyGetter; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; +import net.minecraft.stats.StatList; +import net.minecraft.util.*; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import nmd.primal.core.common.entities.projectiles.EntityMuckBall; import nmd.primal.forgecraft.ModInfo; +import nmd.primal.forgecraft.init.ModSounds; import nmd.primal.forgecraft.items.BaseItem; import javax.annotation.Nullable; @@ -24,6 +29,7 @@ public class Musket extends BaseItem{ this.setCreativeTab(ModInfo.TAB_FORGECRAFT); this.setMaxStackSize(1); this.setNoRepair(); + //this.description = ".72 Calibre" this.addPropertyOverride(new ResourceLocation("type"), new IItemPropertyGetter() { @SideOnly(Side.CLIENT) public float apply(ItemStack item, @Nullable World worldIn, @Nullable EntityLivingBase entityIn) { @@ -32,4 +38,28 @@ public class Musket extends BaseItem{ } }); } + // Temporary onItemRightClick method + @Override + public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand) + { + ItemStack stack = player.getHeldItem(hand); + /* + if (!player.capabilities.isCreativeMode) + { + stack.shrink(1); + } + */ + + + if (!world.isRemote) + { + world.playSound((EntityPlayer)null, player.posX, player.posY, player.posZ, ModSounds.MUSKET_SHOT, SoundCategory.BLOCKS, 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F)); + EntityMuckBall entity = new EntityMuckBall(world, player); + entity.setHeadingFromThrower(player, player.rotationPitch, player.rotationYaw, 0.0F, 1.5F, 1.0F); + world.spawnEntity(entity); + } + + player.addStat(StatList.getObjectUseStats(this)); + return new ActionResult(EnumActionResult.SUCCESS, stack); + } } diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/matchlock_musket.json b/1.11/src/main/resources/assets/forgecraft/models/item/matchlock_musket.json index e782e9a9..9fe6b62e 100644 --- a/1.11/src/main/resources/assets/forgecraft/models/item/matchlock_musket.json +++ b/1.11/src/main/resources/assets/forgecraft/models/item/matchlock_musket.json @@ -1,372 +1,11 @@ { - "__comment": "Designed by Captainaviator with Cubik Studio - https://cubik.studio", - "textures": { - "particle": "forgecraft:items/iron_ingot", - "texture": "blocks/planks_oak", - "texture1": "forgecraft:items/iron_ingot" - }, - "elements": [ - { - "__comment": "Barrel", - "from": [ 7.25, 10.875, 2.25 ], - "to": [ 8.25, 11.375, 29.75 ], - "faces": { - "down": { "uv": [ 7.25, 0, 8.25, 13.75 ], "texture": "#texture1" }, - "up": { "uv": [ 7.25, 2.25, 8.25, 16 ], "texture": "#texture1" }, - "north": { "uv": [ 7.75, 4.625, 8.75, 5.125 ], "texture": "#texture1" }, - "south": { "uv": [ 7.25, 4.625, 8.25, 5.125 ], "texture": "#texture1" }, - "west": { "uv": [ 2.25, 4.625, 16, 5.125 ], "texture": "#texture1" }, - "east": { "uv": [ 0, 4.625, 13.75, 5.125 ], "texture": "#texture1" } - } - }, - { - "__comment": "Cube2", - "from": [ 7, 9.75, -1.5 ], - "to": [ 8.5, 11.25, 24.5 ], - "faces": { - "down": { "uv": [ 7, 0, 8.5, 16 ], "texture": "#texture" }, - "up": { "uv": [ 7, 0, 8.5, 16 ], "texture": "#texture" }, - "north": { "uv": [ 7.5, 4.75, 9, 6.25 ], "texture": "#texture" }, - "south": { "uv": [ 7, 4.75, 8.5, 6.25 ], "texture": "#texture" }, - "west": { "uv": [ 0, 4.75, 16, 6.25 ], "texture": "#texture" }, - "east": { "uv": [ 0, 4.75, 16, 6.25 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube3", - "from": [ 7, 10.25, 24.25 ], - "to": [ 8.5, 11.25, 28.25 ], - "faces": { - "down": { "uv": [ 7, 3.75, 8.5, 7.75 ], "texture": "#texture" }, - "up": { "uv": [ 7, 8.25, 8.5, 12.25 ], "texture": "#texture" }, - "north": { "uv": [ 7.5, 4.75, 9, 5.75 ], "texture": "#texture" }, - "south": { "uv": [ 7, 4.75, 8.5, 5.75 ], "texture": "#texture" }, - "west": { "uv": [ 8.25, 4.75, 12.25, 5.75 ], "texture": "#texture" }, - "east": { "uv": [ 3.75, 4.75, 7.75, 5.75 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube4", - "from": [ 7.5, 9.875, 24.25 ], - "to": [ 8, 10.375, 28.75 ], - "faces": { - "down": { "uv": [ 7.5, 3.25, 8, 7.75 ], "texture": "#texture1" }, - "up": { "uv": [ 7.5, 8.25, 8, 12.75 ], "texture": "#texture1" }, - "north": { "uv": [ 8, 5.625, 8.5, 6.125 ], "texture": "#texture1" }, - "south": { "uv": [ 7.5, 5.625, 8, 6.125 ], "texture": "#texture1" }, - "west": { "uv": [ 8.25, 5.625, 12.75, 6.125 ], "texture": "#texture1" }, - "east": { "uv": [ 3.25, 5.625, 7.75, 6.125 ], "texture": "#texture1" } - } - }, - { - "__comment": "Cube5", - "from": [ 7, 7.2071, -6.2929 ], - "to": [ 8.5, 8.7071, -0.2928996 ], - "rotation": { "origin": [ 7, 7.5, -7 ], "axis": "x", "angle": -22.5 }, - "faces": { - "down": { "uv": [ 4, 5.5, 5, 9 ], "texture": "#texture" }, - "up": { "uv": [ 12, 9, 11, 5.5 ], "texture": "#texture" }, - "north": { "uv": [ 5, 6, 4, 4.5 ], "texture": "#texture" }, - "south": { "uv": [ 4, 10, 5, 11.5 ], "texture": "#texture" }, - "west": { "uv": [ 10, 5.5, 11.5, 9 ], "texture": "#texture", "rotation": 90 }, - "east": { "uv": [ 4.5, 5.5, 6, 9 ], "texture": "#texture", "rotation": 270 } - } - }, - { - "__comment": "Cube6", - "from": [ 7, 8.25, -7.375 ], - "to": [ 8.5, 10.75, -6.375 ], - "rotation": { "origin": [ 7, 8.25, -7.375 ], "axis": "x", "angle": -22.5 }, - "faces": { - "down": { "uv": [ 4, 10, 5, 11.5 ], "texture": "#texture" }, - "up": { "uv": [ 4, 4.5, 5, 6 ], "texture": "#texture" }, - "north": { "uv": [ 11, 6, 12, 11.5 ], "texture": "#texture" }, - "south": { "uv": [ 4, 6, 5, 11.5 ], "texture": "#texture" }, - "west": { "uv": [ 4.5, 6, 6, 11.5 ], "texture": "#texture" }, - "east": { "uv": [ 10, 6, 11.5, 11.5 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube7", - "from": [ 7, 5.625, -6.9786 ], - "to": [ 8.5, 9.125, -5.4786 ], - "rotation": { "origin": [ 7, 9.375, -5.375 ], "axis": "x", "angle": 22.5 }, - "faces": { - "down": { "uv": [ 4, 8, 5, 9 ], "texture": "#texture" }, - "up": { "uv": [ 4, 7, 5, 8 ], "texture": "#texture" }, - "north": { "uv": [ 5, 5.5, 4, 2 ], "texture": "#texture" }, - "south": { "uv": [ 12, 5.5, 11, 2 ], "texture": "#texture" }, - "west": { "uv": [ 8, 2, 9, 5.5 ], "texture": "#texture", "rotation": 180 }, - "east": { "uv": [ 7, 2, 8, 5.5 ], "texture": "#texture", "rotation": 180 } - } - }, - { - "__comment": "Cube8", - "from": [ 7, 10, -7.875 ], - "to": [ 8.5, 11, -4.875 ], - "rotation": { "origin": [ 7, 10, -7.875 ], "axis": "x", "angle": 22.5 }, - "faces": { - "down": { "uv": [ 4, 3.5, 5, 10.5 ], "texture": "#texture" }, - "up": { "uv": [ 4, 5.5, 5, 12.5 ], "texture": "#texture" }, - "north": { "uv": [ 11, 5, 12, 6 ], "texture": "#texture" }, - "south": { "uv": [ 4, 5, 5, 6 ], "texture": "#texture" }, - "west": { "uv": [ 5.5, 5, 12.5, 6 ], "texture": "#texture" }, - "east": { "uv": [ 3.5, 5, 10.5, 6 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube9", - "from": [ 7, 9.75, -3 ], - "to": [ 8.5, 10.75, -2 ], - "faces": { - "down": { "uv": [ 7, 2, 8.5, 3 ], "texture": "#texture" }, - "up": { "uv": [ 7, 13, 8.5, 14 ], "texture": "#texture" }, - "north": { "uv": [ 7.5, 5.25, 9, 6.25 ], "texture": "#texture" }, - "south": { "uv": [ 7, 5.25, 8.5, 6.25 ], "texture": "#texture" }, - "west": { "uv": [ 13, 5.25, 14, 6.25 ], "texture": "#texture" }, - "east": { "uv": [ 2, 5.25, 3, 6.25 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube10", - "from": [ 7, 7.25, -7.875 ], - "to": [ 8.5, 9.75, -6.875 ], - "faces": { - "down": { "uv": [ 7, 6.875, 8.5, 7.875 ], "texture": "#texture" }, - "up": { "uv": [ 7, 8.125, 8.5, 9.125 ], "texture": "#texture" }, - "north": { "uv": [ 7.5, 6.25, 9, 8.75 ], "texture": "#texture" }, - "south": { "uv": [ 7, 6.25, 8.5, 8.75 ], "texture": "#texture" }, - "west": { "uv": [ 8.125, 6.25, 9.125, 8.75 ], "texture": "#texture" }, - "east": { "uv": [ 6.875, 6.25, 7.875, 8.75 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube11", - "from": [ 7, 9, -7 ], - "to": [ 8.5, 10.5, -4 ], - "faces": { - "down": { "uv": [ 7, 4, 8.5, 7 ], "texture": "#texture" }, - "up": { "uv": [ 7, 9, 8.5, 12 ], "texture": "#texture" }, - "north": { "uv": [ 7.5, 5.5, 9, 7 ], "texture": "#texture" }, - "south": { "uv": [ 7, 5.5, 8.5, 7 ], "texture": "#texture" }, - "west": { "uv": [ 9, 5.5, 12, 7 ], "texture": "#texture" }, - "east": { "uv": [ 4, 5.5, 7, 7 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube12", - "from": [ 7, 8.5, -6.875 ], - "to": [ 8.5, 9.5, -2.375 ], - "rotation": { "origin": [ 7, 8.5, -6.875 ], "axis": "x", "angle": -22.5 }, - "faces": { - "down": { "uv": [ 4, 1.5, 5, 5 ], "texture": "#texture" }, - "up": { "uv": [ 4, 11, 5, 14.5 ], "texture": "#texture" }, - "north": { "uv": [ 11, 4, 12, 4.5 ], "texture": "#texture" }, - "south": { "uv": [ 4, 4, 5, 4.5 ], "texture": "#texture" }, - "west": { "uv": [ 11, 4, 14.5, 4.5 ], "texture": "#texture" }, - "east": { "uv": [ 1.5, 4, 5, 4.5 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube13", - "from": [ 7, 9.25, -2.25 ], - "to": [ 8.5, 10.25, 6.75 ], - "faces": { - "down": { "uv": [ 7, 9.25, 8.5, 16 ], "texture": "#texture" }, - "up": { "uv": [ 7, 0, 8.5, 6.75 ], "texture": "#texture" }, - "north": { "uv": [ 7.5, 5.75, 9, 6.75 ], "texture": "#texture" }, - "south": { "uv": [ 7, 5.75, 8.5, 6.75 ], "texture": "#texture" }, - "west": { "uv": [ 0, 5.75, 6.75, 6.75 ], "texture": "#texture" }, - "east": { "uv": [ 9.25, 5.75, 16, 6.75 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube14", - "from": [ 6.875, 9.75, -0.875 ], - "to": [ 7.875, 10.75, 6.125 ], - "faces": { - "down": { "uv": [ 6.875, 9.875, 7.875, 16 ], "texture": "#texture1" }, - "up": { "uv": [ 6.875, 0, 7.875, 6.125 ], "texture": "#texture1" }, - "north": { "uv": [ 8.125, 5.25, 9.125, 6.25 ], "texture": "#texture1" }, - "south": { "uv": [ 6.875, 5.25, 7.875, 6.25 ], "texture": "#texture1" }, - "west": { "uv": [ 0, 5.25, 6.125, 6.25 ], "texture": "#texture1" }, - "east": { "uv": [ 9.875, 5.25, 16, 6.25 ], "texture": "#texture1" } - } - }, - { - "__comment": "Cube15", - "from": [ 7.5, 8.625, 0 ], - "to": [ 8, 9.625, 0.5 ], - "faces": { - "down": { "uv": [ 7.5, 15.5, 8, 16 ], "texture": "#texture1" }, - "up": { "uv": [ 7.5, 0, 8, 0.5 ], "texture": "#texture1" }, - "north": { "uv": [ 8, 6.375, 8.5, 7.375 ], "texture": "#texture1" }, - "south": { "uv": [ 7.5, 6.375, 8, 7.375 ], "texture": "#texture1" }, - "west": { "uv": [ 0, 6.375, 0.5, 7.375 ], "texture": "#texture1" }, - "east": { "uv": [ 15.5, 6.375, 16, 7.375 ], "texture": "#texture1" } - } - }, - { - "__comment": "Cube16", - "from": [ 7.5, 8.125, -0.5 ], - "to": [ 8, 8.625, 0.5 ], - "faces": { - "down": { "uv": [ 7.5, 15.5, 8, 16 ], "texture": "#texture1" }, - "up": { "uv": [ 7.5, 0, 8, 0.5 ], "texture": "#texture1" }, - "north": { "uv": [ 8, 7.375, 8.5, 7.875 ], "texture": "#texture1" }, - "south": { "uv": [ 7.5, 7.375, 8, 7.875 ], "texture": "#texture1" }, - "west": { "uv": [ 0, 7.375, 0.5, 7.875 ], "texture": "#texture1" }, - "east": { "uv": [ 15.5, 7.375, 16, 7.875 ], "texture": "#texture1" } - } - }, - { - "__comment": "Cube17", - "from": [ 7.5, 7, -3 ], - "to": [ 8, 7.5, 0 ], - "rotation": { "origin": [ 7.5, 7, -3 ], "axis": "x", "angle": -22.5 }, - "faces": { - "down": { "uv": [ 4, 0, 4.5, 2 ], "texture": "#texture1" }, - "up": { "uv": [ 4, 14, 4.5, 16 ], "texture": "#texture1" }, - "north": { "uv": [ 11.5, 8, 12, 8.5 ], "texture": "#texture1" }, - "south": { "uv": [ 4, 8, 4.5, 8.5 ], "texture": "#texture1" }, - "west": { "uv": [ 14, 8, 16, 8.5 ], "texture": "#texture1" }, - "east": { "uv": [ 0, 8, 2, 8.5 ], "texture": "#texture1" } - } - }, - { - "__comment": "Cube18", - "from": [ 7.5, 6.125, -4.5 ], - "to": [ 8, 8.125, -4 ], - "rotation": { "origin": [ 7.5, 6.125, -4.5 ], "axis": "x", "angle": 45 }, - "faces": { - "down": { "uv": [ 4, 1, 4.5, 1.5 ], "texture": "#texture1" }, - "up": { "uv": [ 4, 14.5, 4.5, 15 ], "texture": "#texture1" }, - "north": { "uv": [ 11.5, 7.5, 12, 9.5 ], "texture": "#texture1" }, - "south": { "uv": [ 4, 7.5, 4.5, 9.5 ], "texture": "#texture1" }, - "west": { "uv": [ 14.5, 7.5, 15, 9.5 ], "texture": "#texture1" }, - "east": { "uv": [ 1, 7.5, 1.5, 9.5 ], "texture": "#texture1" } - } - }, - { - "__comment": "Cube19", - "from": [ 6.375, 10, 5.5 ], - "to": [ 6.875, 10.5, 7 ], - "rotation": { "origin": [ 6.375, 10, 5.5 ], "axis": "x", "angle": -45 }, - "faces": { - "down": { "uv": [ 4, 10.5, 5, 12 ], "texture": "#texture1" }, - "up": { "uv": [ 4, 4, 5, 5.5 ], "texture": "#texture1" }, - "north": { "uv": [ 11, 8.5, 12, 9 ], "texture": "#texture1" }, - "south": { "uv": [ 4, 8.5, 5, 9 ], "texture": "#texture1" }, - "west": { "uv": [ 4, 8.5, 5.5, 9 ], "texture": "#texture1" }, - "east": { "uv": [ 10.5, 8.5, 12, 9 ], "texture": "#texture1" } - } - }, - { - "__comment": "Cube20", - "from": [ 6.375, 11, 6 ], - "to": [ 6.875, 12, 6.5 ], - "faces": { - "down": { "uv": [ 4, 11.5, 5, 12 ], "texture": "#texture1" }, - "up": { "uv": [ 4, 4, 5, 4.5 ], "texture": "#texture1" }, - "north": { "uv": [ 11, 7.5, 12, 9 ], "texture": "#texture1" }, - "south": { "uv": [ 4, 7.5, 5, 9 ], "texture": "#texture1" }, - "west": { "uv": [ 4, 7.5, 4.5, 9 ], "texture": "#texture1" }, - "east": { "uv": [ 11.5, 7.5, 12, 9 ], "texture": "#texture1" } - } - }, - { - "__comment": "Cube21", - "from": [ 6.375, 11.75, 6 ], - "to": [ 6.875, 13.25, 6.5 ], - "rotation": { "origin": [ 6.375, 11.75, 6 ], "axis": "x", "angle": -22.5 }, - "faces": { - "down": { "uv": [ 4, 11.5, 5, 12 ], "texture": "#texture1" }, - "up": { "uv": [ 4, 4, 5, 4.5 ], "texture": "#texture1" }, - "north": { "uv": [ 11, 7.5, 12, 9 ], "texture": "#texture1" }, - "south": { "uv": [ 4, 7.5, 5, 9 ], "texture": "#texture1" }, - "west": { "uv": [ 4, 7.5, 4.5, 9 ], "texture": "#texture1" }, - "east": { "uv": [ 11.5, 7.5, 12, 9 ], "texture": "#texture1" } - } - }, - { - "__comment": "Cube22", - "from": [ 6.375, 12.875, 4.375 ], - "to": [ 6.875, 13.375, 5.875 ], - "faces": { - "down": { "uv": [ 4, 11, 4.5, 12.5 ], "texture": "#texture1" }, - "up": { "uv": [ 4, 3.5, 4.5, 5 ], "texture": "#texture1" }, - "north": { "uv": [ 11.5, 2.5, 12, 3 ], "texture": "#texture1" }, - "south": { "uv": [ 4, 2.5, 4.5, 3 ], "texture": "#texture1" }, - "west": { "uv": [ 3.5, 2.5, 5, 3 ], "texture": "#texture1" }, - "east": { "uv": [ 11, 2.5, 12.5, 3 ], "texture": "#texture1" } - } - }, - { - "__comment": "Cube23", - "from": [ 7, 11.25, 2.25 ], - "to": [ 7.5, 11.75, 2.75 ], - "faces": { - "down": { "uv": [ 7, 13.25, 7.5, 13.75 ], "texture": "#texture1" }, - "up": { "uv": [ 7, 2.25, 7.5, 2.75 ], "texture": "#texture1" }, - "north": { "uv": [ 8.5, 4.25, 9, 4.75 ], "texture": "#texture1" }, - "south": { "uv": [ 7, 4.25, 7.5, 4.75 ], "texture": "#texture1" }, - "west": { "uv": [ 2.25, 4.25, 2.75, 4.75 ], "texture": "#texture1" }, - "east": { "uv": [ 13.25, 4.25, 13.75, 4.75 ], "texture": "#texture1" } - } - }, - { - "__comment": "Cube24", - "from": [ 7.5, 11.5, 28.5 ], - "to": [ 8, 12, 29 ], - "faces": { - "down": { "uv": [ 7.5, 3, 8, 3.5 ], "texture": "#texture1" }, - "up": { "uv": [ 7.5, 12.5, 8, 13 ], "texture": "#texture1" }, - "north": { "uv": [ 8, 4, 8.5, 4.5 ], "texture": "#texture1" }, - "south": { "uv": [ 7.5, 4, 8, 4.5 ], "texture": "#texture1" }, - "west": { "uv": [ 12.5, 4, 13, 4.5 ], "texture": "#texture1" }, - "east": { "uv": [ 3, 4, 3.5, 4.5 ], "texture": "#texture1" } - } - }, - { - "__comment": "Cube25", - "from": [ 7.5, 10.625, 2.25 ], - "to": [ 8, 11.625, 29.75 ], - "faces": { - "down": { "uv": [ 7.5, 0, 8, 13.5 ], "texture": "#texture1" }, - "up": { "uv": [ 7.5, 2.5, 8, 16 ], "texture": "#texture1" }, - "north": { "uv": [ 8, 4.375, 8.5, 5.375 ], "texture": "#texture1" }, - "south": { "uv": [ 7.5, 4.375, 8, 5.375 ], "texture": "#texture1" }, - "west": { "uv": [ 2.5, 4.375, 16, 5.375 ], "texture": "#texture1" }, - "east": { "uv": [ 0, 4.375, 13.5, 5.375 ], "texture": "#texture1" } - } - } - ], - "display": { - "thirdperson_righthand": { - "rotation": [ 90, -180, 0 ], - "translation": [ -0.695, 4.1739, -1.391 ] - }, - "thirdperson_lefthand": { - "rotation": [ 6, 0, 0 ], - "translation": [ 0.0002, -1.389, 13.912 ] - }, - "firstperson_righthand": { - "rotation": [ 29, 166, 0 ], - "translation": [ -2.781, 2.0869, 0.0003 ] - }, - "firstperson_lefthand": { - "rotation": [ -60, 0, 0 ], - "translation": [ 0, 7.6544, 6.2598 ] - }, - "gui": { - "rotation": [ 90, 135, -90 ], - "translation": [ 0, -1.4, 0 ], - "scale": [ 0.5, 0.5, 0.5 ] - }, - "fixed": { - "rotation": [ 90, -135, 90 ], - "translation": [ 0.7, -1.4, 0 ], - "scale": [ 0.6, 0.6, 0.6 ] - } - } -} \ No newline at end of file + "parent": "forgecraft:item/matchlock_musket_model", + "textures": { + "particle": "forgecraft:items/iron_ingot", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:items/iron_ingot" + }, + "overrides": [ + {"predicate": {"type": 0.0},"model": "forgecraft:item/matchlock_musket_0"} + ] +} diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/matchlock_musket_0.json b/1.11/src/main/resources/assets/forgecraft/models/item/matchlock_musket_0.json new file mode 100644 index 00000000..f24515ad --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/matchlock_musket_0.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/matchlock_musket_model", + "textures": { + "particle": "forgecraft:items/iron_ingot", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:items/iron_ingot" + } +} diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/matchlock_musket_model.json b/1.11/src/main/resources/assets/forgecraft/models/item/matchlock_musket_model.json new file mode 100644 index 00000000..98a54a19 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/matchlock_musket_model.json @@ -0,0 +1,372 @@ +{ + "__comment": "Designed by Captainaviator with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "items/iron_ingot", + "texture": "blocks/planks_oak", + "texture1": "items/iron_ingot" + }, + "elements": [ + { + "__comment": "Barrel", + "from": [ 7.249578, 10.87535, 2.24967 ], + "to": [ 8.249578, 11.37535, 29.74967 ], + "faces": { + "down": { "uv": [ 7.25, 0, 8.25, 13.75 ], "texture": "#texture1" }, + "up": { "uv": [ 7.25, 2.25, 8.25, 16 ], "texture": "#texture1" }, + "north": { "uv": [ 7.75, 4.625, 8.75, 5.125 ], "texture": "#texture1" }, + "south": { "uv": [ 7.25, 4.625, 8.25, 5.125 ], "texture": "#texture1" }, + "west": { "uv": [ 2.25, 4.625, 16, 5.125 ], "texture": "#texture1" }, + "east": { "uv": [ 0, 4.625, 13.75, 5.125 ], "texture": "#texture1" } + } + }, + { + "__comment": "Cube2", + "from": [ 7.000288, 9.749179, -1.499485 ], + "to": [ 8.500288, 11.24918, 24.50052 ], + "faces": { + "down": { "uv": [ 7, 0, 8.5, 16 ], "texture": "#texture" }, + "up": { "uv": [ 7, 0, 8.5, 16 ], "texture": "#texture" }, + "north": { "uv": [ 7.5, 4.75, 9, 6.25 ], "texture": "#texture" }, + "south": { "uv": [ 7, 4.75, 8.5, 6.25 ], "texture": "#texture" }, + "west": { "uv": [ 0, 4.75, 16, 6.25 ], "texture": "#texture" }, + "east": { "uv": [ 0, 4.75, 16, 6.25 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube3", + "from": [ 6.999616, 10.25006, 24.25041 ], + "to": [ 8.499617, 11.25006, 28.25041 ], + "faces": { + "down": { "uv": [ 7, 3.75, 8.5, 7.75 ], "texture": "#texture" }, + "up": { "uv": [ 7, 8.25, 8.5, 12.25 ], "texture": "#texture" }, + "north": { "uv": [ 7.5, 4.75, 9, 5.75 ], "texture": "#texture" }, + "south": { "uv": [ 7, 4.75, 8.5, 5.75 ], "texture": "#texture" }, + "west": { "uv": [ 8.25, 4.75, 12.25, 5.75 ], "texture": "#texture" }, + "east": { "uv": [ 3.75, 4.75, 7.75, 5.75 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube4", + "from": [ 7.500176, 9.874222, 24.24928 ], + "to": [ 8.000175, 10.37422, 28.74928 ], + "faces": { + "down": { "uv": [ 7.5, 3.25, 8, 7.75 ], "texture": "#texture1" }, + "up": { "uv": [ 7.5, 8.25, 8, 12.75 ], "texture": "#texture1" }, + "north": { "uv": [ 8, 5.625, 8.5, 6.125 ], "texture": "#texture1" }, + "south": { "uv": [ 7.5, 5.625, 8, 6.125 ], "texture": "#texture1" }, + "west": { "uv": [ 8.25, 5.625, 12.75, 6.125 ], "texture": "#texture1" }, + "east": { "uv": [ 3.25, 5.625, 7.75, 6.125 ], "texture": "#texture1" } + } + }, + { + "__comment": "Cube5", + "from": [ 6.998993, 7.207395, -6.293286 ], + "to": [ 8.498993, 8.707394, -0.2932854 ], + "rotation": { "origin": [ 7, 7.5, -7 ], "axis": "x", "angle": -22.5 }, + "faces": { + "down": { "uv": [ 4, 5.5, 5, 9 ], "texture": "#texture", "cullface": "down" }, + "up": { "uv": [ 12, 9, 11, 5.5 ], "texture": "#texture", "cullface": "up" }, + "north": { "uv": [ 5, 6, 4, 4.5 ], "texture": "#texture", "cullface": "north" }, + "south": { "uv": [ 4, 10, 5, 11.5 ], "texture": "#texture", "cullface": "south" }, + "west": { "uv": [ 10, 5.5, 11.5, 9 ], "texture": "#texture", "cullface": "west", "rotation": 90 }, + "east": { "uv": [ 4.5, 5.5, 6, 9 ], "texture": "#texture", "cullface": "east", "rotation": 270 } + } + }, + { + "__comment": "Cube6", + "from": [ 6.998842, 8.24864, -7.375104 ], + "to": [ 8.498841, 10.74864, -6.375104 ], + "rotation": { "origin": [ 7, 8.25, -7.375 ], "axis": "x", "angle": -22.5 }, + "faces": { + "down": { "uv": [ 4, 10, 5, 11.5 ], "texture": "#texture" }, + "up": { "uv": [ 4, 4.5, 5, 6 ], "texture": "#texture" }, + "north": { "uv": [ 11, 6, 12, 11.5 ], "texture": "#texture" }, + "south": { "uv": [ 4, 6, 5, 11.5 ], "texture": "#texture" }, + "west": { "uv": [ 4.5, 6, 6, 11.5 ], "texture": "#texture" }, + "east": { "uv": [ 10, 6, 11.5, 11.5 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube7", + "from": [ 6.99983, 5.625526, -6.97769 ], + "to": [ 8.499829, 9.125526, -5.47769 ], + "rotation": { "origin": [ 7, 9.375, -5.375 ], "axis": "x", "angle": 22.5 }, + "faces": { + "down": { "uv": [ 4, 8, 5, 9 ], "texture": "#texture" }, + "up": { "uv": [ 4, 7, 5, 8 ], "texture": "#texture" }, + "north": { "uv": [ 5, 5.5, 4, 2 ], "texture": "#texture" }, + "south": { "uv": [ 12, 5.5, 11, 2 ], "texture": "#texture" }, + "west": { "uv": [ 8, 2, 9, 5.5 ], "texture": "#texture", "rotation": 180 }, + "east": { "uv": [ 7, 2, 8, 5.5 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "Cube8", + "from": [ 6.999656, 10.00056, -7.874739 ], + "to": [ 8.499657, 11.00056, -4.874739 ], + "rotation": { "origin": [ 7, 10, -7.875 ], "axis": "x", "angle": 22.5 }, + "faces": { + "down": { "uv": [ 4, 3.5, 5, 10.5 ], "texture": "#texture" }, + "up": { "uv": [ 4, 5.5, 5, 12.5 ], "texture": "#texture" }, + "north": { "uv": [ 11, 5, 12, 6 ], "texture": "#texture" }, + "south": { "uv": [ 4, 5, 5, 6 ], "texture": "#texture" }, + "west": { "uv": [ 5.5, 5, 12.5, 6 ], "texture": "#texture" }, + "east": { "uv": [ 3.5, 5, 10.5, 6 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube9", + "from": [ 6.998741, 9.749154, -2.999348 ], + "to": [ 8.498741, 10.74916, -1.999348 ], + "faces": { + "down": { "uv": [ 7, 2, 8.5, 3 ], "texture": "#texture" }, + "up": { "uv": [ 7, 13, 8.5, 14 ], "texture": "#texture" }, + "north": { "uv": [ 7.5, 5.25, 9, 6.25 ], "texture": "#texture" }, + "south": { "uv": [ 7, 5.25, 8.5, 6.25 ], "texture": "#texture" }, + "west": { "uv": [ 13, 5.25, 14, 6.25 ], "texture": "#texture" }, + "east": { "uv": [ 2, 5.25, 3, 6.25 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube10", + "from": [ 7.000068, 7.248573, -7.875664 ], + "to": [ 8.500068, 9.748573, -6.875664 ], + "faces": { + "down": { "uv": [ 7, 6.875, 8.5, 7.875 ], "texture": "#texture" }, + "up": { "uv": [ 7, 8.125, 8.5, 9.125 ], "texture": "#texture" }, + "north": { "uv": [ 7.5, 6.25, 9, 8.75 ], "texture": "#texture" }, + "south": { "uv": [ 7, 6.25, 8.5, 8.75 ], "texture": "#texture" }, + "west": { "uv": [ 8.125, 6.25, 9.125, 8.75 ], "texture": "#texture" }, + "east": { "uv": [ 6.875, 6.25, 7.875, 8.75 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube11", + "from": [ 7.001097, 9.001348, -7.00077 ], + "to": [ 8.501097, 10.50135, -4.00077 ], + "faces": { + "down": { "uv": [ 7, 4, 8.5, 7 ], "texture": "#texture" }, + "up": { "uv": [ 7, 9, 8.5, 12 ], "texture": "#texture" }, + "north": { "uv": [ 7.5, 5.5, 9, 7 ], "texture": "#texture" }, + "south": { "uv": [ 7, 5.5, 8.5, 7 ], "texture": "#texture" }, + "west": { "uv": [ 9, 5.5, 12, 7 ], "texture": "#texture" }, + "east": { "uv": [ 4, 5.5, 7, 7 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube12", + "from": [ 6.999147, 8.500894, -6.874561 ], + "to": [ 8.499147, 9.500894, -2.374561 ], + "rotation": { "origin": [ 7, 8.5, -6.875 ], "axis": "x", "angle": -22.5 }, + "faces": { + "down": { "uv": [ 4, 1.5, 5, 5 ], "texture": "#texture" }, + "up": { "uv": [ 4, 11, 5, 14.5 ], "texture": "#texture" }, + "north": { "uv": [ 11, 4, 12, 4.5 ], "texture": "#texture" }, + "south": { "uv": [ 4, 4, 5, 4.5 ], "texture": "#texture" }, + "west": { "uv": [ 11, 4, 14.5, 4.5 ], "texture": "#texture" }, + "east": { "uv": [ 1.5, 4, 5, 4.5 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube13", + "from": [ 7.000247, 9.249915, -2.250595 ], + "to": [ 8.500246, 10.24991, 6.749406 ], + "faces": { + "down": { "uv": [ 7, 9.25, 8.5, 16 ], "texture": "#texture" }, + "up": { "uv": [ 7, 0, 8.5, 6.75 ], "texture": "#texture" }, + "north": { "uv": [ 7.5, 5.75, 9, 6.75 ], "texture": "#texture" }, + "south": { "uv": [ 7, 5.75, 8.5, 6.75 ], "texture": "#texture" }, + "west": { "uv": [ 0, 5.75, 6.75, 6.75 ], "texture": "#texture" }, + "east": { "uv": [ 9.25, 5.75, 16, 6.75 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube14", + "from": [ 6.874835, 9.750017, -0.8751202 ], + "to": [ 7.874835, 10.75001, 6.12488 ], + "faces": { + "down": { "uv": [ 6.875, 9.875, 7.875, 16 ], "texture": "#texture1" }, + "up": { "uv": [ 6.875, 0, 7.875, 6.125 ], "texture": "#texture1" }, + "north": { "uv": [ 8.125, 5.25, 9.125, 6.25 ], "texture": "#texture1" }, + "south": { "uv": [ 6.875, 5.25, 7.875, 6.25 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 5.25, 6.125, 6.25 ], "texture": "#texture1" }, + "east": { "uv": [ 9.875, 5.25, 16, 6.25 ], "texture": "#texture1" } + } + }, + { + "__comment": "Cube15", + "from": [ 7.498806, 8.624012, -5.146611E-05 ], + "to": [ 7.998806, 9.624012, 0.4999485 ], + "faces": { + "down": { "uv": [ 7.5, 15.5, 8, 16 ], "texture": "#texture1" }, + "up": { "uv": [ 7.5, 0, 8, 0.5 ], "texture": "#texture1" }, + "north": { "uv": [ 8, 6.375, 8.5, 7.375 ], "texture": "#texture1" }, + "south": { "uv": [ 7.5, 6.375, 8, 7.375 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 6.375, 0.5, 7.375 ], "texture": "#texture1" }, + "east": { "uv": [ 15.5, 6.375, 16, 7.375 ], "texture": "#texture1" } + } + }, + { + "__comment": "Cube16", + "from": [ 7.499121, 8.126087, -0.5004326 ], + "to": [ 7.999121, 8.626087, 0.4995674 ], + "faces": { + "down": { "uv": [ 7.5, 15.5, 8, 16 ], "texture": "#texture1" }, + "up": { "uv": [ 7.5, 0, 8, 0.5 ], "texture": "#texture1" }, + "north": { "uv": [ 8, 7.375, 8.5, 7.875 ], "texture": "#texture1" }, + "south": { "uv": [ 7.5, 7.375, 8, 7.875 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 7.375, 0.5, 7.875 ], "texture": "#texture1" }, + "east": { "uv": [ 15.5, 7.375, 16, 7.875 ], "texture": "#texture1" } + } + }, + { + "__comment": "Cube17", + "from": [ 7.501094, 7.000739, -3.000887 ], + "to": [ 8.001094, 7.500739, -0.0008869171 ], + "rotation": { "origin": [ 7.5, 7, -3 ], "axis": "x", "angle": -22.5 }, + "faces": { + "down": { "uv": [ 4, 0, 4.5, 2 ], "texture": "#texture1" }, + "up": { "uv": [ 4, 14, 4.5, 16 ], "texture": "#texture1" }, + "north": { "uv": [ 11.5, 8, 12, 8.5 ], "texture": "#texture1" }, + "south": { "uv": [ 4, 8, 4.5, 8.5 ], "texture": "#texture1" }, + "west": { "uv": [ 14, 8, 16, 8.5 ], "texture": "#texture1" }, + "east": { "uv": [ 0, 8, 2, 8.5 ], "texture": "#texture1" } + } + }, + { + "__comment": "Cube18", + "from": [ 7.498623, 6.125509, -4.499953 ], + "to": [ 7.998623, 8.125509, -3.999953 ], + "rotation": { "origin": [ 7.5, 6.125, -4.5 ], "axis": "x", "angle": 45 }, + "faces": { + "down": { "uv": [ 4, 1, 4.5, 1.5 ], "texture": "#texture1" }, + "up": { "uv": [ 4, 14.5, 4.5, 15 ], "texture": "#texture1" }, + "north": { "uv": [ 11.5, 7.5, 12, 9.5 ], "texture": "#texture1" }, + "south": { "uv": [ 4, 7.5, 4.5, 9.5 ], "texture": "#texture1" }, + "west": { "uv": [ 14.5, 7.5, 15, 9.5 ], "texture": "#texture1" }, + "east": { "uv": [ 1, 7.5, 1.5, 9.5 ], "texture": "#texture1" } + } + }, + { + "__comment": "Cube19", + "from": [ 6.374935, 9.999828, 5.500293 ], + "to": [ 6.874935, 10.49983, 7.000293 ], + "rotation": { "origin": [ 6.375, 10, 5.5 ], "axis": "x", "angle": -45 }, + "faces": { + "down": { "uv": [ 4, 10.5, 5, 12 ], "texture": "#texture1" }, + "up": { "uv": [ 4, 4, 5, 5.5 ], "texture": "#texture1" }, + "north": { "uv": [ 11, 8.5, 12, 9 ], "texture": "#texture1" }, + "south": { "uv": [ 4, 8.5, 5, 9 ], "texture": "#texture1" }, + "west": { "uv": [ 4, 8.5, 5.5, 9 ], "texture": "#texture1" }, + "east": { "uv": [ 10.5, 8.5, 12, 9 ], "texture": "#texture1" } + } + }, + { + "__comment": "Cube20", + "from": [ 6.37376, 11.00004, 6.000043 ], + "to": [ 6.87376, 12.00004, 6.500043 ], + "faces": { + "down": { "uv": [ 4, 11.5, 5, 12 ], "texture": "#texture1" }, + "up": { "uv": [ 4, 4, 5, 4.5 ], "texture": "#texture1" }, + "north": { "uv": [ 11, 7.5, 12, 9 ], "texture": "#texture1" }, + "south": { "uv": [ 4, 7.5, 5, 9 ], "texture": "#texture1" }, + "west": { "uv": [ 4, 7.5, 4.5, 9 ], "texture": "#texture1" }, + "east": { "uv": [ 11.5, 7.5, 12, 9 ], "texture": "#texture1" } + } + }, + { + "__comment": "Cube21", + "from": [ 6.374581, 11.74971, 6.000688 ], + "to": [ 6.874581, 13.24971, 6.500688 ], + "rotation": { "origin": [ 6.375, 11.75, 6 ], "axis": "x", "angle": -22.5 }, + "faces": { + "down": { "uv": [ 4, 11.5, 5, 12 ], "texture": "#texture1" }, + "up": { "uv": [ 4, 4, 5, 4.5 ], "texture": "#texture1" }, + "north": { "uv": [ 11, 7.5, 12, 9 ], "texture": "#texture1" }, + "south": { "uv": [ 4, 7.5, 5, 9 ], "texture": "#texture1" }, + "west": { "uv": [ 4, 7.5, 4.5, 9 ], "texture": "#texture1" }, + "east": { "uv": [ 11.5, 7.5, 12, 9 ], "texture": "#texture1" } + } + }, + { + "__comment": "Cube22", + "from": [ 6.375763, 12.87609, 4.375019 ], + "to": [ 6.875763, 13.37609, 5.875019 ], + "faces": { + "down": { "uv": [ 4, 11, 4.5, 12.5 ], "texture": "#texture1" }, + "up": { "uv": [ 4, 3.5, 4.5, 5 ], "texture": "#texture1" }, + "north": { "uv": [ 11.5, 2.5, 12, 3 ], "texture": "#texture1" }, + "south": { "uv": [ 4, 2.5, 4.5, 3 ], "texture": "#texture1" }, + "west": { "uv": [ 3.5, 2.5, 5, 3 ], "texture": "#texture1" }, + "east": { "uv": [ 11, 2.5, 12.5, 3 ], "texture": "#texture1" } + } + }, + { + "__comment": "Cube23", + "from": [ 7.000611, 11.25027, 2.250069 ], + "to": [ 7.500611, 11.75027, 2.750069 ], + "faces": { + "down": { "uv": [ 7, 13.25, 7.5, 13.75 ], "texture": "#texture1" }, + "up": { "uv": [ 7, 2.25, 7.5, 2.75 ], "texture": "#texture1" }, + "north": { "uv": [ 8.5, 4.25, 9, 4.75 ], "texture": "#texture1" }, + "south": { "uv": [ 7, 4.25, 7.5, 4.75 ], "texture": "#texture1" }, + "west": { "uv": [ 2.25, 4.25, 2.75, 4.75 ], "texture": "#texture1" }, + "east": { "uv": [ 13.25, 4.25, 13.75, 4.75 ], "texture": "#texture1" } + } + }, + { + "__comment": "Cube24", + "from": [ 7.49977, 11.49944, 28.50008 ], + "to": [ 7.99977, 11.99944, 29.00008 ], + "faces": { + "down": { "uv": [ 7.5, 3, 8, 3.5 ], "texture": "#texture1" }, + "up": { "uv": [ 7.5, 12.5, 8, 13 ], "texture": "#texture1" }, + "north": { "uv": [ 8, 4, 8.5, 4.5 ], "texture": "#texture1" }, + "south": { "uv": [ 7.5, 4, 8, 4.5 ], "texture": "#texture1" }, + "west": { "uv": [ 12.5, 4, 13, 4.5 ], "texture": "#texture1" }, + "east": { "uv": [ 3, 4, 3.5, 4.5 ], "texture": "#texture1" } + } + }, + { + "__comment": "Cube25", + "from": [ 7.499866, 10.62502, 2.249212 ], + "to": [ 7.999866, 11.62502, 29.74922 ], + "faces": { + "down": { "uv": [ 7.5, 0, 8, 13.5 ], "texture": "#texture1" }, + "up": { "uv": [ 7.5, 2.5, 8, 16 ], "texture": "#texture1" }, + "north": { "uv": [ 8, 4.375, 8.5, 5.375 ], "texture": "#texture1" }, + "south": { "uv": [ 7.5, 4.375, 8, 5.375 ], "texture": "#texture1" }, + "west": { "uv": [ 2.5, 4.375, 16, 5.375 ], "texture": "#texture1" }, + "east": { "uv": [ 0, 4.375, 13.5, 5.375 ], "texture": "#texture1" } + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [ 90, -180, 0 ], + "translation": [ -0.695, 4.1739, -1.391 ] + }, + "thirdperson_lefthand": { + "rotation": [ 6, 0, 0 ], + "translation": [ 0.0002, -1.389, 13.912 ] + }, + "firstperson_righthand": { + "rotation": [ 29, 166, 0 ], + "translation": [ -2.781, 2.0869, 0.0003 ] + }, + "firstperson_lefthand": { + "rotation": [ -60, 0, 0 ], + "translation": [ 0, 7.6544, 6.2598 ] + }, + "gui": { + "rotation": [ 90, 135, -90 ], + "translation": [ 0, -1.4, 0 ], + "scale": [ 0.5, 0.5, 0.5 ] + }, + "fixed": { + "rotation": [ 90, -90, 90 ], + "translation": [ 0.7, -4.182, -0.695 ], + "scale": [ 2, 2, 2 ] + } + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/sounds.json b/1.11/src/main/resources/assets/forgecraft/sounds.json index edcdb08b..285b4cee 100644 --- a/1.11/src/main/resources/assets/forgecraft/sounds.json +++ b/1.11/src/main/resources/assets/forgecraft/sounds.json @@ -3,5 +3,10 @@ "category": "block", "subtitle": "forgecraft.subtitle.piston_bellows", "sounds": [ "forgecraft:piston_bellows" ] + }, + "musket_shot": { + "category": "block", + "subtitle": "forgecraft.subtitle.musket_shot", + "sounds": [ "forgecraft:musket_shot" ] } } \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/sounds/musket_shot.ogg b/1.11/src/main/resources/assets/forgecraft/sounds/musket_shot.ogg new file mode 100644 index 00000000..4bfb91b5 Binary files /dev/null and b/1.11/src/main/resources/assets/forgecraft/sounds/musket_shot.ogg differ