diff --git a/kfc/src/main/java/nmd/primal/forgecraft/blocks/YewStave.java b/kfc/src/main/java/nmd/primal/forgecraft/blocks/YewStave.java index e1b00dfc..18224dbe 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/blocks/YewStave.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/blocks/YewStave.java @@ -3,25 +3,29 @@ package nmd.primal.forgecraft.blocks; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; +import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import nmd.primal.core.api.PrimalSounds; import nmd.primal.core.common.helper.PlayerHelper; import nmd.primal.core.common.items.tools.WorkBlade; import nmd.primal.core.common.helper.CommonUtils; import nmd.primal.forgecraft.init.ModItems; +import nmd.primal.forgecraft.init.ModSounds; /** * Created by mminaie on 7/2/17. */ public class YewStave extends BlockCustomBase { - public AxisAlignedBB AABBSTAVE = new AxisAlignedBB(13/32D, 0.0D, 13/32/16D, 19/32D, 1.0D, 19/32D); + public AxisAlignedBB AABBSTAVE = new AxisAlignedBB(13/32D, 0.0D, 13/32D, 19/32D, 1.0D, 19/32D); public YewStave(Material material, String registryName, Float hardness) { super(material, registryName, hardness); @@ -40,13 +44,16 @@ public class YewStave extends BlockCustomBase { if (world.isRemote) return true; - ItemStack pItem = player.getActiveItemStack(); + ItemStack pItem = player.inventory.getCurrentItem(); if(pItem.getItem() instanceof WorkBlade){ if(world.getBlockState(pos.up()).getBlock() instanceof YewStave ) { - //TODO play sound, swingArm + //world.playSound(player, player.posX, player.posY, player.posZ, PrimalSounds.TOOL_BLADE_SCRAPE, SoundCategory.PLAYERS, 1.0F, 1F); + world.playSound(null, pos, PrimalSounds.TOOL_BLADE_SCRAPE, SoundCategory.PLAYERS, 1.0F, 1.0F); if(CommonUtils.randomCheck(3) ) { PlayerHelper.spawnItemOnGround(world, pos, new ItemStack(ModItems.unstrunglongbow, 1)); + world.setBlockState(pos, Blocks.AIR.getDefaultState(), 2); + world.setBlockState(pos.up(), Blocks.AIR.getDefaultState(), 2); return true; } } diff --git a/kfc/src/main/java/nmd/primal/forgecraft/init/ModItems.java b/kfc/src/main/java/nmd/primal/forgecraft/init/ModItems.java index a7b26aa1..05442258 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/init/ModItems.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/init/ModItems.java @@ -21,6 +21,7 @@ import nmd.primal.forgecraft.items.parts.ToolPart; import nmd.primal.forgecraft.items.tools.*; import nmd.primal.forgecraft.items.weapons.CustomShield; import nmd.primal.forgecraft.items.weapons.CustomSword; +import nmd.primal.forgecraft.items.weapons.Longbow; import nmd.primal.forgecraft.items.weapons.SlayerSword; /** @@ -136,6 +137,7 @@ public class ModItems { castingmud = new BaseItem("castingmud"); unstrunglongbow = new BaseItem("unstrunglongbow"); + longbow = new Longbow("longbow"); //matchlockmusket = new Musket("matchlock_musket"); @@ -334,6 +336,7 @@ public class ModItems { GameRegistry.register(steelslayer); GameRegistry.register(unstrunglongbow); + GameRegistry.register(longbow); //GameRegistry.register(matchlockmusket); //GameRegistry.register(forgingmanual); @@ -435,6 +438,8 @@ public class ModItems { registerRender(cleanironslayer); registerRender(steelslayer); + registerRender(unstrunglongbow); + registerRender(longbow); //registerRender(forgingmanual); //registerRender(matchlockmusket); } diff --git a/kfc/src/main/java/nmd/primal/forgecraft/items/weapons/Longbow.java b/kfc/src/main/java/nmd/primal/forgecraft/items/weapons/Longbow.java new file mode 100644 index 00000000..8a9a5808 --- /dev/null +++ b/kfc/src/main/java/nmd/primal/forgecraft/items/weapons/Longbow.java @@ -0,0 +1,264 @@ +package nmd.primal.forgecraft.items.weapons; + +import net.minecraft.enchantment.EnchantmentHelper; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.projectile.EntityArrow; +import net.minecraft.init.Enchantments; +import net.minecraft.init.Items; +import net.minecraft.init.SoundEvents; +import net.minecraft.item.*; +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.forgecraft.ModInfo; +import nmd.primal.forgecraft.items.BaseItem; + +import javax.annotation.Nullable; + +/** + * Created by mminaie on 7/2/17. + */ +public class Longbow extends BaseItem { + + int mod=5; + + public Longbow(String name) { + super(name); + this.setMaxDamage(9000); + this.setMaxStackSize(1); + this.setNoRepair(); + + this.addPropertyOverride(new ResourceLocation("type"), new IItemPropertyGetter() { + + @SideOnly(Side.CLIENT) + public float apply(ItemStack item, @Nullable World worldIn, @Nullable EntityLivingBase player) { + int time = item.getMaxItemUseDuration() - player.getItemInUseCount(); + System.out.println(time); + if(time < 1*mod){ + return 0.0F; + } + if(time>=1*mod && time<2*mod){ + return 0.1F; + } + if(time>=2*mod && time<3*mod){ + return 0.2F; + } + if(time>=3*mod && time<4*mod){ + return 0.3F; + } + if(time>=4*mod && time<5*mod){ + return 0.4F; + } + if(time>=5*mod && time<6*mod){ + return 0.5F; + } + if(time>=6*mod && time<7*mod){ + return 0.6F; + } + if(time>=7*mod && time<8*mod){ + return 0.7F; + } + if(time>=8*mod && time<72000 ){ + return 0.8F; + } + return 0.0f; + } + }); + } + + + private ItemStack findAmmo(EntityPlayer player) + { + if (this.isArrow(player.getHeldItem(EnumHand.OFF_HAND))) + { + return player.getHeldItem(EnumHand.OFF_HAND); + } + else if (this.isArrow(player.getHeldItem(EnumHand.MAIN_HAND))) + { + return player.getHeldItem(EnumHand.MAIN_HAND); + } + else + { + for (int i = 0; i < player.inventory.getSizeInventory(); ++i) + { + ItemStack itemstack = player.inventory.getStackInSlot(i); + + if (this.isArrow(itemstack)) + { + return itemstack; + } + } + + return ItemStack.EMPTY; + } + } + + protected boolean isArrow(ItemStack stack) + { + return stack.getItem() instanceof ItemArrow; + } + + /** + * Called when the player stops using an Item (stops holding the right mouse button). + */ + @Override + public void onPlayerStoppedUsing(ItemStack stack, World worldIn, EntityLivingBase entityLiving, int timeLeft) + { + if (entityLiving instanceof EntityPlayer) + { + EntityPlayer entityplayer = (EntityPlayer)entityLiving; + boolean flag = entityplayer.capabilities.isCreativeMode || EnchantmentHelper.getEnchantmentLevel(Enchantments.INFINITY, stack) > 0; + ItemStack itemstack = this.findAmmo(entityplayer); + + int i = this.getMaxItemUseDuration(stack) - timeLeft; + i = net.minecraftforge.event.ForgeEventFactory.onArrowLoose(stack, worldIn, entityplayer, i, !itemstack.isEmpty() || flag); + if (i < 0) return; + + if (!itemstack.isEmpty() || flag) + { + if (itemstack.isEmpty()) + { + itemstack = new ItemStack(Items.ARROW); + } + + float f = getArrowVelocity(i); + + if ((double)f >= 0.1D) + { + boolean flag1 = entityplayer.capabilities.isCreativeMode || (itemstack.getItem() instanceof ItemArrow && ((ItemArrow) itemstack.getItem()).isInfinite(itemstack, stack, entityplayer)); + + if (!worldIn.isRemote) + { + ItemArrow itemarrow = (ItemArrow)((ItemArrow)(itemstack.getItem() instanceof ItemArrow ? itemstack.getItem() : Items.ARROW)); + EntityArrow entityarrow = itemarrow.createArrow(worldIn, itemstack, entityplayer); + entityarrow.setAim(entityplayer, entityplayer.rotationPitch, entityplayer.rotationYaw, 0.0F, f * 3.0F, 1.0F); + + if (f == 1.0F) + { + entityarrow.setIsCritical(true); + } + + int j = EnchantmentHelper.getEnchantmentLevel(Enchantments.POWER, stack); + + if (j > 0) + { + entityarrow.setDamage(entityarrow.getDamage() + (double)j * 0.5D + 0.5D); + } + + int k = EnchantmentHelper.getEnchantmentLevel(Enchantments.PUNCH, stack); + + if (k > 0) + { + entityarrow.setKnockbackStrength(k); + } + + if (EnchantmentHelper.getEnchantmentLevel(Enchantments.FLAME, stack) > 0) + { + entityarrow.setFire(100); + } + + stack.damageItem(1, entityplayer); + + if (flag1 || entityplayer.capabilities.isCreativeMode && (itemstack.getItem() == Items.SPECTRAL_ARROW || itemstack.getItem() == Items.TIPPED_ARROW)) + { + entityarrow.pickupStatus = EntityArrow.PickupStatus.CREATIVE_ONLY; + } + + worldIn.spawnEntity(entityarrow); + } + + worldIn.playSound((EntityPlayer)null, entityplayer.posX, entityplayer.posY, entityplayer.posZ, SoundEvents.ENTITY_ARROW_SHOOT, SoundCategory.PLAYERS, 1.0F, 1.0F / (itemRand.nextFloat() * 0.4F + 1.2F) + f * 0.5F); + + if (!flag1 && !entityplayer.capabilities.isCreativeMode) + { + itemstack.shrink(1); + + if (itemstack.isEmpty()) + { + entityplayer.inventory.deleteStack(itemstack); + } + } + + entityplayer.addStat(StatList.getObjectUseStats(this)); + } + } + //entityLiving.stopActiveHand(); + if(!worldIn.isRemote){ + entityLiving.resetActiveHand(); + } + if(worldIn.isRemote){ + entityLiving.resetActiveHand(); + } + + } + } + + /** + * Gets the velocity of the arrow entity from the bow's charge + */ + + public static float getArrowVelocity(int charge) + { + float f = (float)charge / 20.0F; + f = (f * f + f * 2.0F) / 3.0F; + + if (f > 1.0F) + { + f = 1.0F; + } + + return f; + } + + /** + * How long it takes to use or consume an item + */ + @Override + public int getMaxItemUseDuration(ItemStack stack) + { + return 72000; + } + + + + /** + * returns the action that specifies what animation to play when the items is being used + */ + @Override + public EnumAction getItemUseAction(ItemStack stack) + { + return EnumAction.BOW; + } + + /** + * Called when the equipped item is right clicked. + */ + @Override + public ActionResult onItemRightClick(World worldIn, EntityPlayer playerIn, EnumHand handIn) + { + ItemStack itemstack = playerIn.getHeldItem(handIn); + boolean flag = !this.findAmmo(playerIn).isEmpty(); + + ActionResult ret = net.minecraftforge.event.ForgeEventFactory.onArrowNock(itemstack, worldIn, playerIn, handIn, flag); + if (ret != null) return ret; + + if (!playerIn.capabilities.isCreativeMode && !flag) + { + return flag ? new ActionResult(EnumActionResult.PASS, itemstack) : new ActionResult(EnumActionResult.FAIL, itemstack); + } + else + { + playerIn.setActiveHand(handIn); + return new ActionResult(EnumActionResult.SUCCESS, itemstack); + } + } + + @Override + public int getItemEnchantability() + { + return 0; + } +} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/e_particle.png b/kfc/src/main/resources/assets/forgecraft/models/item/e_particle.png deleted file mode 100644 index e557878f..00000000 Binary files a/kfc/src/main/resources/assets/forgecraft/models/item/e_particle.png and /dev/null differ diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/e_texture.png b/kfc/src/main/resources/assets/forgecraft/models/item/e_texture.png deleted file mode 100644 index 7291f2ea..00000000 Binary files a/kfc/src/main/resources/assets/forgecraft/models/item/e_texture.png and /dev/null differ diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/longbow.json b/kfc/src/main/resources/assets/forgecraft/models/item/longbow.json new file mode 100644 index 00000000..cfff7558 --- /dev/null +++ b/kfc/src/main/resources/assets/forgecraft/models/item/longbow.json @@ -0,0 +1,25 @@ +{ + "parent": "forgecraft:item/longbow_default", + "textures": { + "particle": "primal:blocks/log_stripped_yew_side", + "texture": "primal:blocks/log_stripped_yew_side", + "texture1": "forgecraft:items/bowstring", + "arrow": "blocks/e_texture" + }, + "overrides": [ + {"predicate": {"type": 0.0},"model": "forgecraft:item/longbow/longbow_0"}, + {"predicate": {"type": 0.1},"model": "forgecraft:item/longbow/longbow_1"}, + {"predicate": {"type": 0.2},"model": "forgecraft:item/longbow/longbow_2"}, + {"predicate": {"type": 0.3},"model": "forgecraft:item/longbow/longbow_3"}, + {"predicate": {"type": 0.4},"model": "forgecraft:item/longbow/longbow_4"}, + {"predicate": {"type": 0.5},"model": "forgecraft:item/longbow/longbow_5"}, + {"predicate": {"type": 0.6},"model": "forgecraft:item/longbow/longbow_6"}, + {"predicate": {"type": 0.7},"model": "forgecraft:item/longbow/longbow_7"}, + {"predicate": {"type": 0.8},"model": "forgecraft:item/longbow/longbow_8"} + + ] +} + + + + diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/longbow/longbow_0.json b/kfc/src/main/resources/assets/forgecraft/models/item/longbow/longbow_0.json new file mode 100644 index 00000000..7b6bfd72 --- /dev/null +++ b/kfc/src/main/resources/assets/forgecraft/models/item/longbow/longbow_0.json @@ -0,0 +1,9 @@ +{ + "parent": "forgecraft:item/longbow_default", + "textures": { + "particle": "primal:blocks/log_stripped_yew_side", + "texture": "primal:blocks/log_stripped_yew_side", + "texture1": "forgecraft:items/bowstring", + "arrow": "blocks/e_texture" + } +} diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/longbow_1.json b/kfc/src/main/resources/assets/forgecraft/models/item/longbow/longbow_1.json similarity index 99% rename from kfc/src/main/resources/assets/forgecraft/models/item/longbow_1.json rename to kfc/src/main/resources/assets/forgecraft/models/item/longbow/longbow_1.json index 3ddb7771..0f73333f 100644 --- a/kfc/src/main/resources/assets/forgecraft/models/item/longbow_1.json +++ b/kfc/src/main/resources/assets/forgecraft/models/item/longbow/longbow_1.json @@ -1,9 +1,9 @@ { "__comment": "Designed by Kitsushadow with Cubik Studio - https://cubik.studio", "textures": { - "particle": "blocks/e_particle", - "texture": "blocks/log_stripped_yew_side", - "texture1": "blocks/e_texture", + "particle": "primal:blocks/log_stripped_yew_side", + "texture": "primal:blocks/log_stripped_yew_side", + "texture1": "forgecraft:items/bowstring", "arrow": "blocks/e_texture" }, "elements": [ diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/longbow_2.json b/kfc/src/main/resources/assets/forgecraft/models/item/longbow/longbow_2.json similarity index 99% rename from kfc/src/main/resources/assets/forgecraft/models/item/longbow_2.json rename to kfc/src/main/resources/assets/forgecraft/models/item/longbow/longbow_2.json index d5e4d51e..0ca16ef1 100644 --- a/kfc/src/main/resources/assets/forgecraft/models/item/longbow_2.json +++ b/kfc/src/main/resources/assets/forgecraft/models/item/longbow/longbow_2.json @@ -1,9 +1,9 @@ { "__comment": "Designed by Kitsushadow with Cubik Studio - https://cubik.studio", "textures": { - "particle": "blocks/e_particle", - "texture": "blocks/log_stripped_yew_side", - "texture1": "blocks/e_texture", + "particle": "primal:blocks/log_stripped_yew_side", + "texture": "primal:blocks/log_stripped_yew_side", + "texture1": "forgecraft:items/bowstring", "arrow": "blocks/e_texture" }, "elements": [ diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/longbow_3.json b/kfc/src/main/resources/assets/forgecraft/models/item/longbow/longbow_3.json similarity index 99% rename from kfc/src/main/resources/assets/forgecraft/models/item/longbow_3.json rename to kfc/src/main/resources/assets/forgecraft/models/item/longbow/longbow_3.json index 8879a9b2..ababaf65 100644 --- a/kfc/src/main/resources/assets/forgecraft/models/item/longbow_3.json +++ b/kfc/src/main/resources/assets/forgecraft/models/item/longbow/longbow_3.json @@ -1,9 +1,9 @@ { "__comment": "Designed by Kitsushadow with Cubik Studio - https://cubik.studio", "textures": { - "particle": "blocks/e_particle", - "texture": "blocks/log_stripped_yew_side", - "texture1": "blocks/e_texture", + "particle": "primal:blocks/log_stripped_yew_side", + "texture": "primal:blocks/log_stripped_yew_side", + "texture1": "forgecraft:items/bowstring", "arrow": "blocks/e_texture" }, "elements": [ diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/longbow_4.json b/kfc/src/main/resources/assets/forgecraft/models/item/longbow/longbow_4.json similarity index 99% rename from kfc/src/main/resources/assets/forgecraft/models/item/longbow_4.json rename to kfc/src/main/resources/assets/forgecraft/models/item/longbow/longbow_4.json index 43b9d2eb..77ca0593 100644 --- a/kfc/src/main/resources/assets/forgecraft/models/item/longbow_4.json +++ b/kfc/src/main/resources/assets/forgecraft/models/item/longbow/longbow_4.json @@ -1,9 +1,9 @@ { "__comment": "Designed by Kitsushadow with Cubik Studio - https://cubik.studio", "textures": { - "particle": "blocks/e_particle", - "texture": "blocks/log_stripped_yew_side", - "texture1": "blocks/e_texture", + "particle": "primal:blocks/log_stripped_yew_side", + "texture": "primal:blocks/log_stripped_yew_side", + "texture1": "forgecraft:items/bowstring", "arrow": "blocks/e_texture" }, "elements": [ diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/longbow_5.json b/kfc/src/main/resources/assets/forgecraft/models/item/longbow/longbow_5.json similarity index 99% rename from kfc/src/main/resources/assets/forgecraft/models/item/longbow_5.json rename to kfc/src/main/resources/assets/forgecraft/models/item/longbow/longbow_5.json index f8007d47..d78b6aed 100644 --- a/kfc/src/main/resources/assets/forgecraft/models/item/longbow_5.json +++ b/kfc/src/main/resources/assets/forgecraft/models/item/longbow/longbow_5.json @@ -1,9 +1,9 @@ { "__comment": "Designed by Kitsushadow with Cubik Studio - https://cubik.studio", "textures": { - "particle": "blocks/e_particle", - "texture": "blocks/log_stripped_yew_side", - "texture1": "blocks/e_texture", + "particle": "primal:blocks/log_stripped_yew_side", + "texture": "primal:blocks/log_stripped_yew_side", + "texture1": "forgecraft:items/bowstring", "arrow": "blocks/e_texture" }, "elements": [ diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/longbow_6.json b/kfc/src/main/resources/assets/forgecraft/models/item/longbow/longbow_6.json similarity index 87% rename from kfc/src/main/resources/assets/forgecraft/models/item/longbow_6.json rename to kfc/src/main/resources/assets/forgecraft/models/item/longbow/longbow_6.json index 6327ce3c..94e7b40d 100644 --- a/kfc/src/main/resources/assets/forgecraft/models/item/longbow_6.json +++ b/kfc/src/main/resources/assets/forgecraft/models/item/longbow/longbow_6.json @@ -1,9 +1,9 @@ { "__comment": "Designed by Kitsushadow with Cubik Studio - https://cubik.studio", "textures": { - "particle": "blocks/e_particle", - "texture": "blocks/log_stripped_yew_side", - "texture1": "blocks/e_texture", + "particle": "primal:blocks/log_stripped_yew_side", + "texture": "primal:blocks/log_stripped_yew_side", + "texture1": "forgecraft:items/bowstring", "arrow": "blocks/e_texture" }, "elements": [ @@ -257,7 +257,7 @@ { "__comment": "4base", "from": [ 7.5, 20.5, 11 ], - "to": [ 8.5, 21, 12.5 ], + "to": [ 8.5, 21.5, 12.5 ], "faces": { "down": { "uv": [ 7, 6, 9, 7.5 ], "texture": "#texture" }, "up": { "uv": [ 7, 8.5, 9, 10 ], "texture": "#texture" }, @@ -269,8 +269,8 @@ }, { "__comment": "4base1", - "from": [ 7.5, 21.5, 12.5 ], - "to": [ 8.5, 22, 13.5 ], + "from": [ 7.5, 22.5, 13 ], + "to": [ 8.5, 23.5, 14 ], "faces": { "down": { "uv": [ 7, 6, 9, 7.5 ], "texture": "#texture" }, "up": { "uv": [ 7, 8.5, 9, 10 ], "texture": "#texture" }, @@ -308,8 +308,8 @@ }, { "__comment": "Box39", - "from": [ 7.5, 22, 13 ], - "to": [ 8.5, 22.5, 14 ], + "from": [ 7.5, 23.5, 14 ], + "to": [ 8.5, 24, 15 ], "faces": { "down": { "uv": [ 7.5, 5, 8.5, 6 ], "texture": "#texture" }, "up": { "uv": [ 7.5, 10, 8.5, 11 ], "texture": "#texture" }, @@ -321,8 +321,8 @@ }, { "__comment": "Box39", - "from": [ 7.5, 22.5, 14 ], - "to": [ 8.5, 23, 15 ], + "from": [ 7.5, 24, 15 ], + "to": [ 8.5, 24.5, 16 ], "faces": { "down": { "uv": [ 7.5, 5, 8.5, 6 ], "texture": "#texture" }, "up": { "uv": [ 7.5, 10, 8.5, 11 ], "texture": "#texture" }, @@ -334,8 +334,8 @@ }, { "__comment": "Box39", - "from": [ 7.5, -5.5, 12 ], - "to": [ 8.5, -5, 13 ], + "from": [ 7.5, -6.5, 12 ], + "to": [ 8.5, -5.5, 13 ], "faces": { "down": { "uv": [ 7.5, 5.5, 8.5, 6.5 ], "texture": "#texture" }, "up": { "uv": [ 7.5, 9.5, 8.5, 10.5 ], "texture": "#texture" }, @@ -347,8 +347,8 @@ }, { "__comment": "Box39", - "from": [ 7.5, -6, 12.5 ], - "to": [ 8.5, -5.5, 13.5 ], + "from": [ 7.5, -7.5, 13 ], + "to": [ 8.5, -6.5, 14 ], "faces": { "down": { "uv": [ 7.5, 4, 8.5, 5 ], "texture": "#texture" }, "up": { "uv": [ 7.5, 11, 8.5, 12 ], "texture": "#texture" }, @@ -360,8 +360,8 @@ }, { "__comment": "Box39", - "from": [ 7.5, -7, 14 ], - "to": [ 8.5, -6.5, 15 ], + "from": [ 7.5, -8.5, 15 ], + "to": [ 8.5, -8, 16 ], "faces": { "down": { "uv": [ 7.5, 4, 8.5, 5 ], "texture": "#texture" }, "up": { "uv": [ 7.5, 11, 8.5, 12 ], "texture": "#texture" }, @@ -373,21 +373,8 @@ }, { "__comment": "Box39", - "from": [ 7.5, -7.5, 15 ], - "to": [ 8.5, -7, 16 ], - "faces": { - "down": { "uv": [ 7.5, 4, 8.5, 5 ], "texture": "#texture" }, - "up": { "uv": [ 7.5, 11, 8.5, 12 ], "texture": "#texture" }, - "north": { "uv": [ 7.5, 14, 8.5, 15 ], "texture": "#texture" }, - "south": { "uv": [ 7.5, 14, 8.5, 15 ], "texture": "#texture" }, - "west": { "uv": [ 11, 14, 12, 15 ], "texture": "#texture" }, - "east": { "uv": [ 4, 14, 5, 15 ], "texture": "#texture" } - } - }, - { - "__comment": "Box39", - "from": [ 7.5, -8, 16 ], - "to": [ 8.5, -7.5, 17 ], + "from": [ 7.5, -9, 16 ], + "to": [ 8.5, -8.5, 17 ], "faces": { "down": { "uv": [ 7.5, 4, 8.5, 5 ], "texture": "#texture" }, "up": { "uv": [ 7.5, 11, 8.5, 12 ], "texture": "#texture" }, @@ -412,8 +399,8 @@ }, { "__comment": "Box39", - "from": [ 7.5, 23, 15 ], - "to": [ 8.5, 23.5, 16 ], + "from": [ 7.5, 24.5, 16 ], + "to": [ 8.5, 25, 17 ], "faces": { "down": { "uv": [ 7.5, 5, 8.5, 6 ], "texture": "#texture" }, "up": { "uv": [ 7.5, 10, 8.5, 11 ], "texture": "#texture" }, @@ -425,8 +412,8 @@ }, { "__comment": "Box39", - "from": [ 7.5, -6.5, 13 ], - "to": [ 8.5, -6, 14 ], + "from": [ 7.5, -8, 14 ], + "to": [ 8.5, -7.5, 15 ], "faces": { "down": { "uv": [ 7.5, 4, 8.5, 5 ], "texture": "#texture" }, "up": { "uv": [ 7.5, 11, 8.5, 12 ], "texture": "#texture" }, @@ -439,7 +426,7 @@ { "__comment": "PlaneX45", "from": [ 8, 8, 22 ], - "to": [ 8.001, 9, 22.5 ], + "to": [ 8.001, 9.5, 22.5 ], "faces": { "west": { "uv": [ 2, 5, 2.5, 8 ], "texture": "#texture1" }, "east": { "uv": [ 13.5, 5, 14, 8 ], "texture": "#texture1" } @@ -447,30 +434,17 @@ }, { "__comment": "PlaneX45", - "from": [ 8, 7, 22 ], + "from": [ 8, 6.5, 22 ], "to": [ 8.001, 8, 22.5 ], "faces": { "west": { "uv": [ 12.5, 0, 13, 8 ], "texture": "#texture1" }, "east": { "uv": [ 3, 0, 3.5, 8 ], "texture": "#texture1" } } }, - { - "__comment": "Box39", - "from": [ 7.5, 23.5, 16 ], - "to": [ 8.5, 24, 17 ], - "faces": { - "down": { "uv": [ 7.5, 5, 8.5, 6 ], "texture": "#texture" }, - "up": { "uv": [ 7.5, 10, 8.5, 11 ], "texture": "#texture" }, - "north": { "uv": [ 7.5, 5, 8.5, 6 ], "texture": "#texture" }, - "south": { "uv": [ 7.5, 5, 8.5, 6 ], "texture": "#texture" }, - "west": { "uv": [ 10, 5, 11, 6 ], "texture": "#texture" }, - "east": { "uv": [ 5, 5, 6, 6 ], "texture": "#texture" } - } - }, { "__comment": "4base1", - "from": [ 7.5, 21, 12 ], - "to": [ 8.5, 21.5, 13 ], + "from": [ 7.5, 21.5, 12 ], + "to": [ 8.5, 22.5, 13 ], "faces": { "down": { "uv": [ 7, 6, 9, 7.5 ], "texture": "#texture" }, "up": { "uv": [ 7, 8.5, 9, 10 ], "texture": "#texture" }, @@ -482,7 +456,7 @@ }, { "__comment": "4base", - "from": [ 7.5, -5, 11 ], + "from": [ 7.5, -5.5, 11 ], "to": [ 8.5, -4.5, 12.5 ], "faces": { "down": { "uv": [ 7, 6, 9, 7.5 ], "texture": "#texture" }, @@ -495,8 +469,8 @@ }, { "__comment": "PlaneX45", - "from": [ 8, 9, 21.5 ], - "to": [ 8.001, 10.5, 22 ], + "from": [ 8, 9.5, 21.5 ], + "to": [ 8.001, 11, 22 ], "faces": { "west": { "uv": [ 2, 5, 2.5, 8 ], "texture": "#texture1" }, "east": { "uv": [ 13.5, 5, 14, 8 ], "texture": "#texture1" } @@ -504,8 +478,8 @@ }, { "__comment": "PlaneX45", - "from": [ 8, 10.5, 21 ], - "to": [ 8.001, 12, 21.5 ], + "from": [ 8, 11, 21 ], + "to": [ 8.001, 12.5, 21.5 ], "faces": { "west": { "uv": [ 2, 5, 2.5, 8 ], "texture": "#texture1" }, "east": { "uv": [ 13.5, 5, 14, 8 ], "texture": "#texture1" } @@ -513,8 +487,8 @@ }, { "__comment": "PlaneX45", - "from": [ 8, 12, 20.5 ], - "to": [ 8.001, 13.5, 21 ], + "from": [ 8, 12.5, 20.5 ], + "to": [ 8.001, 14, 21 ], "faces": { "west": { "uv": [ 2, 5, 2.5, 8 ], "texture": "#texture1" }, "east": { "uv": [ 13.5, 5, 14, 8 ], "texture": "#texture1" } @@ -522,8 +496,8 @@ }, { "__comment": "PlaneX45", - "from": [ 8, 13.5, 20 ], - "to": [ 8.001, 15, 20.5 ], + "from": [ 8, 14, 20 ], + "to": [ 8.001, 15.5, 20.5 ], "faces": { "west": { "uv": [ 2, 5, 2.5, 8 ], "texture": "#texture1" }, "east": { "uv": [ 13.5, 5, 14, 8 ], "texture": "#texture1" } @@ -531,8 +505,8 @@ }, { "__comment": "PlaneX45", - "from": [ 8, 22.5, 17 ], - "to": [ 8.001, 23.5, 17.5 ], + "from": [ 8, 23, 17 ], + "to": [ 8.001, 24.5, 17.5 ], "faces": { "west": { "uv": [ 2, 5, 2.5, 8 ], "texture": "#texture1" }, "east": { "uv": [ 13.5, 5, 14, 8 ], "texture": "#texture1" } @@ -540,8 +514,8 @@ }, { "__comment": "PlaneX45", - "from": [ 8, 16.5, 19 ], - "to": [ 8.001, 18, 19.5 ], + "from": [ 8, 17, 19 ], + "to": [ 8.001, 18.5, 19.5 ], "faces": { "west": { "uv": [ 2, 5, 2.5, 8 ], "texture": "#texture1" }, "east": { "uv": [ 13.5, 5, 14, 8 ], "texture": "#texture1" } @@ -549,8 +523,8 @@ }, { "__comment": "PlaneX45", - "from": [ 8, 18, 18.5 ], - "to": [ 8.001, 19.5, 19 ], + "from": [ 8, 18.5, 18.5 ], + "to": [ 8.001, 20, 19 ], "faces": { "west": { "uv": [ 2, 5, 2.5, 8 ], "texture": "#texture1" }, "east": { "uv": [ 13.5, 5, 14, 8 ], "texture": "#texture1" } @@ -558,8 +532,8 @@ }, { "__comment": "PlaneX45", - "from": [ 8, 19.5, 18 ], - "to": [ 8.001, 21, 18.5 ], + "from": [ 8, 20, 18 ], + "to": [ 8.001, 21.5, 18.5 ], "faces": { "west": { "uv": [ 2, 5, 2.5, 8 ], "texture": "#texture1" }, "east": { "uv": [ 13.5, 5, 14, 8 ], "texture": "#texture1" } @@ -567,8 +541,8 @@ }, { "__comment": "PlaneX45", - "from": [ 8, 21, 17.5 ], - "to": [ 8.001, 22.5, 18 ], + "from": [ 8, 21.5, 17.5 ], + "to": [ 8.001, 23, 18 ], "faces": { "west": { "uv": [ 2, 5, 2.5, 8 ], "texture": "#texture1" }, "east": { "uv": [ 13.5, 5, 14, 8 ], "texture": "#texture1" } @@ -576,8 +550,8 @@ }, { "__comment": "PlaneX45", - "from": [ 8, 15, 19.5 ], - "to": [ 8.001, 16.5, 20 ], + "from": [ 8, 15.5, 19.5 ], + "to": [ 8.001, 17, 20 ], "faces": { "west": { "uv": [ 2, 5, 2.5, 8 ], "texture": "#texture1" }, "east": { "uv": [ 13.5, 5, 14, 8 ], "texture": "#texture1" } @@ -585,8 +559,8 @@ }, { "__comment": "PlaneX45", - "from": [ 8, -7.5, 17 ], - "to": [ 8.001, -6.5, 17.5 ], + "from": [ 8, -8.5, 17 ], + "to": [ 8.001, -7, 17.5 ], "faces": { "west": { "uv": [ 12.5, 0, 13, 8 ], "texture": "#texture1" }, "east": { "uv": [ 3, 0, 3.5, 8 ], "texture": "#texture1" } @@ -594,8 +568,8 @@ }, { "__comment": "PlaneX45", - "from": [ 8, 5.5, 21.5 ], - "to": [ 8.001, 7, 22 ], + "from": [ 8, 5, 21.5 ], + "to": [ 8.001, 6.5, 22 ], "faces": { "west": { "uv": [ 2, 5, 2.5, 8 ], "texture": "#texture1" }, "east": { "uv": [ 13.5, 5, 14, 8 ], "texture": "#texture1" } @@ -603,8 +577,8 @@ }, { "__comment": "PlaneX45", - "from": [ 8, 4, 21 ], - "to": [ 8.001, 5.5, 21.5 ], + "from": [ 8, 3.5, 21 ], + "to": [ 8.001, 5, 21.5 ], "faces": { "west": { "uv": [ 2, 5, 2.5, 8 ], "texture": "#texture1" }, "east": { "uv": [ 13.5, 5, 14, 8 ], "texture": "#texture1" } @@ -612,8 +586,8 @@ }, { "__comment": "PlaneX45", - "from": [ 8, 2.5, 20.5 ], - "to": [ 8.001, 4, 21 ], + "from": [ 8, 2, 20.5 ], + "to": [ 8.001, 3.5, 21 ], "faces": { "west": { "uv": [ 2, 5, 2.5, 8 ], "texture": "#texture1" }, "east": { "uv": [ 13.5, 5, 14, 8 ], "texture": "#texture1" } @@ -621,8 +595,8 @@ }, { "__comment": "PlaneX45", - "from": [ 8, 1, 20 ], - "to": [ 8.001, 2.5, 20.5 ], + "from": [ 8, 0.5, 20 ], + "to": [ 8.001, 2, 20.5 ], "faces": { "west": { "uv": [ 2, 5, 2.5, 8 ], "texture": "#texture1" }, "east": { "uv": [ 13.5, 5, 14, 8 ], "texture": "#texture1" } @@ -630,8 +604,8 @@ }, { "__comment": "PlaneX45", - "from": [ 8, -0.5, 19.5 ], - "to": [ 8.001, 1, 20 ], + "from": [ 8, -1, 19.5 ], + "to": [ 8.001, 0.5, 20 ], "faces": { "west": { "uv": [ 2, 5, 2.5, 8 ], "texture": "#texture1" }, "east": { "uv": [ 13.5, 5, 14, 8 ], "texture": "#texture1" } @@ -639,8 +613,8 @@ }, { "__comment": "PlaneX45", - "from": [ 8, -2, 19 ], - "to": [ 8.001, -0.5, 19.5 ], + "from": [ 8, -2.5, 19 ], + "to": [ 8.001, -1, 19.5 ], "faces": { "west": { "uv": [ 2, 5, 2.5, 8 ], "texture": "#texture1" }, "east": { "uv": [ 13.5, 5, 14, 8 ], "texture": "#texture1" } @@ -648,8 +622,8 @@ }, { "__comment": "PlaneX45", - "from": [ 8, -3.5, 18.5 ], - "to": [ 8.001, -2, 19 ], + "from": [ 8, -4, 18.5 ], + "to": [ 8.001, -2.5, 19 ], "faces": { "west": { "uv": [ 2, 5, 2.5, 8 ], "texture": "#texture1" }, "east": { "uv": [ 13.5, 5, 14, 8 ], "texture": "#texture1" } @@ -657,8 +631,8 @@ }, { "__comment": "PlaneX45", - "from": [ 8, -5, 18 ], - "to": [ 8.001, -3.5, 18.5 ], + "from": [ 8, -5.5, 18 ], + "to": [ 8.001, -4, 18.5 ], "faces": { "west": { "uv": [ 2, 5, 2.5, 8 ], "texture": "#texture1" }, "east": { "uv": [ 13.5, 5, 14, 8 ], "texture": "#texture1" } @@ -666,8 +640,8 @@ }, { "__comment": "PlaneX45", - "from": [ 8, -6.5, 17.5 ], - "to": [ 8.001, -5, 18 ], + "from": [ 8, -7, 17.5 ], + "to": [ 8.001, -5.5, 18 ], "faces": { "west": { "uv": [ 2, 5, 2.5, 8 ], "texture": "#texture1" }, "east": { "uv": [ 13.5, 5, 14, 8 ], "texture": "#texture1" } diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/longbow_7.json b/kfc/src/main/resources/assets/forgecraft/models/item/longbow/longbow_7.json similarity index 81% rename from kfc/src/main/resources/assets/forgecraft/models/item/longbow_7.json rename to kfc/src/main/resources/assets/forgecraft/models/item/longbow/longbow_7.json index 7710cd62..c7934f12 100644 --- a/kfc/src/main/resources/assets/forgecraft/models/item/longbow_7.json +++ b/kfc/src/main/resources/assets/forgecraft/models/item/longbow/longbow_7.json @@ -1,9 +1,9 @@ { "__comment": "Designed by Kitsushadow with Cubik Studio - https://cubik.studio", "textures": { - "particle": "blocks/e_particle", - "texture": "blocks/log_stripped_yew_side", - "texture1": "blocks/e_texture", + "particle": "primal:blocks/log_stripped_yew_side", + "texture": "primal:blocks/log_stripped_yew_side", + "texture1": "forgecraft:items/bowstring", "arrow": "blocks/e_texture" }, "elements": [ @@ -256,7 +256,7 @@ }, { "__comment": "4base", - "from": [ 7.5, 20, 11.5 ], + "from": [ 7.5, 20, 12 ], "to": [ 8.5, 20.5, 13 ], "faces": { "down": { "uv": [ 7, 6, 9, 7.5 ], "texture": "#texture" }, @@ -308,8 +308,8 @@ }, { "__comment": "Box39", - "from": [ 7.5, 21.5, 14 ], - "to": [ 8.5, 22, 15 ], + "from": [ 7.5, 21.5, 13.5 ], + "to": [ 8.5, 22, 14.5 ], "faces": { "down": { "uv": [ 7.5, 5, 8.5, 6 ], "texture": "#texture" }, "up": { "uv": [ 7.5, 10, 8.5, 11 ], "texture": "#texture" }, @@ -321,8 +321,8 @@ }, { "__comment": "Box39", - "from": [ 7.5, 22, 15 ], - "to": [ 8.5, 22.5, 16 ], + "from": [ 7.5, 22, 14.5 ], + "to": [ 8.5, 22.5, 15.5 ], "faces": { "down": { "uv": [ 7.5, 5, 8.5, 6 ], "texture": "#texture" }, "up": { "uv": [ 7.5, 10, 8.5, 11 ], "texture": "#texture" }, @@ -360,8 +360,8 @@ }, { "__comment": "Box39", - "from": [ 7.5, -6.5, 15 ], - "to": [ 8.5, -6, 16 ], + "from": [ 7.5, -6.5, 14.5 ], + "to": [ 8.5, -6, 15.5 ], "faces": { "down": { "uv": [ 7.5, 4, 8.5, 5 ], "texture": "#texture" }, "up": { "uv": [ 7.5, 11, 8.5, 12 ], "texture": "#texture" }, @@ -373,8 +373,8 @@ }, { "__comment": "Box39", - "from": [ 7.5, -7, 16 ], - "to": [ 8.5, -6.5, 17 ], + "from": [ 7.5, -7, 15.5 ], + "to": [ 8.5, -6.5, 16.5 ], "faces": { "down": { "uv": [ 7.5, 4, 8.5, 5 ], "texture": "#texture" }, "up": { "uv": [ 7.5, 11, 8.5, 12 ], "texture": "#texture" }, @@ -399,8 +399,8 @@ }, { "__comment": "Box39", - "from": [ 7.5, 22.5, 16 ], - "to": [ 8.5, 23, 17 ], + "from": [ 7.5, 22.5, 15.5 ], + "to": [ 8.5, 23, 16.5 ], "faces": { "down": { "uv": [ 7.5, 5, 8.5, 6 ], "texture": "#texture" }, "up": { "uv": [ 7.5, 10, 8.5, 11 ], "texture": "#texture" }, @@ -412,8 +412,8 @@ }, { "__comment": "Box39", - "from": [ 7.5, -6, 14 ], - "to": [ 8.5, -5.5, 15 ], + "from": [ 7.5, -6, 13.5 ], + "to": [ 8.5, -5.5, 14.5 ], "faces": { "down": { "uv": [ 7.5, 4, 8.5, 5 ], "texture": "#texture" }, "up": { "uv": [ 7.5, 11, 8.5, 12 ], "texture": "#texture" }, @@ -438,7 +438,7 @@ }, { "__comment": "4base", - "from": [ 7.5, -4.5, 11.5 ], + "from": [ 7.5, -4.5, 12 ], "to": [ 8.5, -4, 13 ], "faces": { "down": { "uv": [ 7, 6, 9, 7.5 ], "texture": "#texture" }, @@ -451,7 +451,7 @@ }, { "__comment": "PlaneX45", - "from": [ 8, 7, 24 ], + "from": [ 8, 6.5, 24 ], "to": [ 8.001, 8, 24.5 ], "faces": { "west": { "uv": [ 12.5, 0, 13, 8 ], "texture": "#texture1" }, @@ -461,7 +461,42 @@ { "__comment": "PlaneX45", "from": [ 8, 8, 24 ], - "to": [ 8.001, 9, 24.5 ], + "to": [ 8.001, 9.5, 24.5 ], + "faces": { + "west": { "uv": [ 2, 5, 2.5, 8 ], "texture": "#texture1" }, + "east": { "uv": [ 13.5, 5, 14, 8 ], "texture": "#texture1" } + } + }, + { + "__comment": "Box39", + "from": [ 7.5, 23, 16.5 ], + "to": [ 8.5, 23.5, 17.5 ], + "faces": { + "down": { "uv": [ 7.5, 5, 8.5, 6 ], "texture": "#texture" }, + "up": { "uv": [ 7.5, 10, 8.5, 11 ], "texture": "#texture" }, + "north": { "uv": [ 7.5, 5, 8.5, 6 ], "texture": "#texture" }, + "south": { "uv": [ 7.5, 5, 8.5, 6 ], "texture": "#texture" }, + "west": { "uv": [ 10, 5, 11, 6 ], "texture": "#texture" }, + "east": { "uv": [ 5, 5, 6, 6 ], "texture": "#texture" } + } + }, + { + "__comment": "Box39", + "from": [ 7.5, -7.5, 16.5 ], + "to": [ 8.5, -7, 17.5 ], + "faces": { + "down": { "uv": [ 7.5, 4, 8.5, 5 ], "texture": "#texture" }, + "up": { "uv": [ 7.5, 11, 8.5, 12 ], "texture": "#texture" }, + "north": { "uv": [ 7.5, 14, 8.5, 15 ], "texture": "#texture" }, + "south": { "uv": [ 7.5, 14, 8.5, 15 ], "texture": "#texture" }, + "west": { "uv": [ 11, 14, 12, 15 ], "texture": "#texture" }, + "east": { "uv": [ 4, 14, 5, 15 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX45", + "from": [ 8, 9.5, 23.5 ], + "to": [ 8.001, 10.5, 24 ], "faces": { "west": { "uv": [ 2, 5, 2.5, 8 ], "texture": "#texture1" }, "east": { "uv": [ 13.5, 5, 14, 8 ], "texture": "#texture1" } @@ -469,8 +504,8 @@ }, { "__comment": "PlaneX45", - "from": [ 8, 9, 23.5 ], - "to": [ 8.001, 10, 24 ], + "from": [ 8, 10.5, 23 ], + "to": [ 8.001, 11.5, 23.5 ], "faces": { "west": { "uv": [ 2, 5, 2.5, 8 ], "texture": "#texture1" }, "east": { "uv": [ 13.5, 5, 14, 8 ], "texture": "#texture1" } @@ -478,8 +513,8 @@ }, { "__comment": "PlaneX45", - "from": [ 8, 10, 23 ], - "to": [ 8.001, 11, 23.5 ], + "from": [ 8, 11.5, 22.5 ], + "to": [ 8.001, 12.5, 23 ], "faces": { "west": { "uv": [ 2, 5, 2.5, 8 ], "texture": "#texture1" }, "east": { "uv": [ 13.5, 5, 14, 8 ], "texture": "#texture1" } @@ -487,8 +522,8 @@ }, { "__comment": "PlaneX45", - "from": [ 8, 11, 22.5 ], - "to": [ 8.001, 12, 23 ], + "from": [ 8, 12.5, 22 ], + "to": [ 8.001, 13.5, 22.5 ], "faces": { "west": { "uv": [ 2, 5, 2.5, 8 ], "texture": "#texture1" }, "east": { "uv": [ 13.5, 5, 14, 8 ], "texture": "#texture1" } @@ -496,8 +531,8 @@ }, { "__comment": "PlaneX45", - "from": [ 8, 12, 22 ], - "to": [ 8.001, 13, 22.5 ], + "from": [ 8, 13.5, 21.5 ], + "to": [ 8.001, 14.5, 22 ], "faces": { "west": { "uv": [ 2, 5, 2.5, 8 ], "texture": "#texture1" }, "east": { "uv": [ 13.5, 5, 14, 8 ], "texture": "#texture1" } @@ -505,8 +540,8 @@ }, { "__comment": "PlaneX45", - "from": [ 8, 14, 21 ], - "to": [ 8.001, 15, 21.5 ], + "from": [ 8, 14.5, 21 ], + "to": [ 8.001, 15.5, 21.5 ], "faces": { "west": { "uv": [ 2, 5, 2.5, 8 ], "texture": "#texture1" }, "east": { "uv": [ 13.5, 5, 14, 8 ], "texture": "#texture1" } @@ -514,8 +549,8 @@ }, { "__comment": "PlaneX45", - "from": [ 8, 13, 21.5 ], - "to": [ 8.001, 14, 22 ], + "from": [ 8, 15.5, 20.5 ], + "to": [ 8.001, 17, 21 ], "faces": { "west": { "uv": [ 2, 5, 2.5, 8 ], "texture": "#texture1" }, "east": { "uv": [ 13.5, 5, 14, 8 ], "texture": "#texture1" } @@ -523,8 +558,8 @@ }, { "__comment": "PlaneX45", - "from": [ 8, 16, 20 ], - "to": [ 8.001, 17, 20.5 ], + "from": [ 8, 17, 20 ], + "to": [ 8.001, 18, 20.5 ], "faces": { "west": { "uv": [ 2, 5, 2.5, 8 ], "texture": "#texture1" }, "east": { "uv": [ 13.5, 5, 14, 8 ], "texture": "#texture1" } @@ -532,8 +567,8 @@ }, { "__comment": "PlaneX45", - "from": [ 8, 15, 20.5 ], - "to": [ 8.001, 16, 21 ], + "from": [ 8, 18, 19.5 ], + "to": [ 8.001, 19, 20 ], "faces": { "west": { "uv": [ 2, 5, 2.5, 8 ], "texture": "#texture1" }, "east": { "uv": [ 13.5, 5, 14, 8 ], "texture": "#texture1" } @@ -541,8 +576,8 @@ }, { "__comment": "PlaneX45", - "from": [ 8, 18, 19 ], - "to": [ 8.001, 19, 19.5 ], + "from": [ 8, 19, 19 ], + "to": [ 8.001, 20, 19.5 ], "faces": { "west": { "uv": [ 2, 5, 2.5, 8 ], "texture": "#texture1" }, "east": { "uv": [ 13.5, 5, 14, 8 ], "texture": "#texture1" } @@ -550,8 +585,8 @@ }, { "__comment": "PlaneX45", - "from": [ 8, 17, 19.5 ], - "to": [ 8.001, 18, 20 ], + "from": [ 8, 20, 18.5 ], + "to": [ 8.001, 21, 19 ], "faces": { "west": { "uv": [ 2, 5, 2.5, 8 ], "texture": "#texture1" }, "east": { "uv": [ 13.5, 5, 14, 8 ], "texture": "#texture1" } @@ -559,8 +594,8 @@ }, { "__comment": "PlaneX45", - "from": [ 8, 19, 18.5 ], - "to": [ 8.001, 20, 19 ], + "from": [ 8, 21, 18 ], + "to": [ 8.001, 22, 18.5 ], "faces": { "west": { "uv": [ 2, 5, 2.5, 8 ], "texture": "#texture1" }, "east": { "uv": [ 13.5, 5, 14, 8 ], "texture": "#texture1" } @@ -568,8 +603,8 @@ }, { "__comment": "PlaneX45", - "from": [ 8, 20, 18 ], - "to": [ 8.001, 21, 18.5 ], + "from": [ 8, 22, 17.5 ], + "to": [ 8.001, 23, 18 ], "faces": { "west": { "uv": [ 2, 5, 2.5, 8 ], "texture": "#texture1" }, "east": { "uv": [ 13.5, 5, 14, 8 ], "texture": "#texture1" } @@ -577,8 +612,8 @@ }, { "__comment": "PlaneX45", - "from": [ 8, 21, 17.5 ], - "to": [ 8.001, 22, 18 ], + "from": [ 8, 5.5, 23.5 ], + "to": [ 8.001, 6.5, 24 ], "faces": { "west": { "uv": [ 2, 5, 2.5, 8 ], "texture": "#texture1" }, "east": { "uv": [ 13.5, 5, 14, 8 ], "texture": "#texture1" } @@ -586,8 +621,8 @@ }, { "__comment": "PlaneX45", - "from": [ 8, 22, 17 ], - "to": [ 8.001, 22.5, 17.5 ], + "from": [ 8, 4.5, 23 ], + "to": [ 8.001, 5.5, 23.5 ], "faces": { "west": { "uv": [ 2, 5, 2.5, 8 ], "texture": "#texture1" }, "east": { "uv": [ 13.5, 5, 14, 8 ], "texture": "#texture1" } @@ -595,128 +630,101 @@ }, { "__comment": "PlaneX45", - "from": [ 8, 6, 23.5 ], - "to": [ 8.001, 7, 24 ], + "from": [ 8, 3.5, 22.5 ], + "to": [ 8.001, 4.5, 23 ], "faces": { - "west": { "uv": [ 12.5, 0, 13, 8 ], "texture": "#texture1" }, - "east": { "uv": [ 3, 0, 3.5, 8 ], "texture": "#texture1" } + "west": { "uv": [ 2, 5, 2.5, 8 ], "texture": "#texture1" }, + "east": { "uv": [ 13.5, 5, 14, 8 ], "texture": "#texture1" } } }, { "__comment": "PlaneX45", - "from": [ 8, 5, 23 ], - "to": [ 8.001, 6, 23.5 ], + "from": [ 8, 2.5, 22 ], + "to": [ 8.001, 3.5, 22.5 ], "faces": { - "west": { "uv": [ 12.5, 0, 13, 8 ], "texture": "#texture1" }, - "east": { "uv": [ 3, 0, 3.5, 8 ], "texture": "#texture1" } + "west": { "uv": [ 2, 5, 2.5, 8 ], "texture": "#texture1" }, + "east": { "uv": [ 13.5, 5, 14, 8 ], "texture": "#texture1" } } }, { "__comment": "PlaneX45", - "from": [ 8, 4, 22.5 ], - "to": [ 8.001, 5, 23 ], + "from": [ 8, 1.5, 21.5 ], + "to": [ 8.001, 2.5, 22 ], "faces": { - "west": { "uv": [ 12.5, 0, 13, 8 ], "texture": "#texture1" }, - "east": { "uv": [ 3, 0, 3.5, 8 ], "texture": "#texture1" } + "west": { "uv": [ 2, 5, 2.5, 8 ], "texture": "#texture1" }, + "east": { "uv": [ 13.5, 5, 14, 8 ], "texture": "#texture1" } } }, { "__comment": "PlaneX45", - "from": [ 8, 3, 22 ], - "to": [ 8.001, 4, 22.5 ], + "from": [ 8, 0.5, 21 ], + "to": [ 8.001, 1.5, 21.5 ], "faces": { - "west": { "uv": [ 12.5, 0, 13, 8 ], "texture": "#texture1" }, - "east": { "uv": [ 3, 0, 3.5, 8 ], "texture": "#texture1" } + "west": { "uv": [ 2, 5, 2.5, 8 ], "texture": "#texture1" }, + "east": { "uv": [ 13.5, 5, 14, 8 ], "texture": "#texture1" } } }, { "__comment": "PlaneX45", - "from": [ 8, 2, 21.5 ], - "to": [ 8.001, 3, 22 ], + "from": [ 8, -1, 20.5 ], + "to": [ 8.001, 0.5, 21 ], "faces": { - "west": { "uv": [ 12.5, 0, 13, 8 ], "texture": "#texture1" }, - "east": { "uv": [ 3, 0, 3.5, 8 ], "texture": "#texture1" } + "west": { "uv": [ 2, 5, 2.5, 8 ], "texture": "#texture1" }, + "east": { "uv": [ 13.5, 5, 14, 8 ], "texture": "#texture1" } } }, { "__comment": "PlaneX45", - "from": [ 8, 1, 21 ], - "to": [ 8.001, 2, 21.5 ], + "from": [ 8, -2, 20 ], + "to": [ 8.001, -1, 20.5 ], "faces": { - "west": { "uv": [ 12.5, 0, 13, 8 ], "texture": "#texture1" }, - "east": { "uv": [ 3, 0, 3.5, 8 ], "texture": "#texture1" } + "west": { "uv": [ 2, 5, 2.5, 8 ], "texture": "#texture1" }, + "east": { "uv": [ 13.5, 5, 14, 8 ], "texture": "#texture1" } } }, { "__comment": "PlaneX45", - "from": [ 8, 0, 20.5 ], - "to": [ 8.001, 1, 21 ], + "from": [ 8, -3, 19.5 ], + "to": [ 8.001, -2, 20 ], "faces": { - "west": { "uv": [ 12.5, 0, 13, 8 ], "texture": "#texture1" }, - "east": { "uv": [ 3, 0, 3.5, 8 ], "texture": "#texture1" } + "west": { "uv": [ 2, 5, 2.5, 8 ], "texture": "#texture1" }, + "east": { "uv": [ 13.5, 5, 14, 8 ], "texture": "#texture1" } } }, { "__comment": "PlaneX45", - "from": [ 8, -1, 20 ], - "to": [ 8.001, 0, 20.5 ], + "from": [ 8, -4, 19 ], + "to": [ 8.001, -3, 19.5 ], "faces": { - "west": { "uv": [ 12.5, 0, 13, 8 ], "texture": "#texture1" }, - "east": { "uv": [ 3, 0, 3.5, 8 ], "texture": "#texture1" } + "west": { "uv": [ 2, 5, 2.5, 8 ], "texture": "#texture1" }, + "east": { "uv": [ 13.5, 5, 14, 8 ], "texture": "#texture1" } } }, { "__comment": "PlaneX45", - "from": [ 8, -2, 19.5 ], - "to": [ 8.001, -1, 20 ], + "from": [ 8, -5, 18.5 ], + "to": [ 8.001, -4, 19 ], "faces": { - "west": { "uv": [ 12.5, 0, 13, 8 ], "texture": "#texture1" }, - "east": { "uv": [ 3, 0, 3.5, 8 ], "texture": "#texture1" } + "west": { "uv": [ 2, 5, 2.5, 8 ], "texture": "#texture1" }, + "east": { "uv": [ 13.5, 5, 14, 8 ], "texture": "#texture1" } } }, { "__comment": "PlaneX45", - "from": [ 8, -3, 19 ], - "to": [ 8.001, -2, 19.5 ], + "from": [ 8, -6, 18 ], + "to": [ 8.001, -5, 18.5 ], "faces": { - "west": { "uv": [ 12.5, 0, 13, 8 ], "texture": "#texture1" }, - "east": { "uv": [ 3, 0, 3.5, 8 ], "texture": "#texture1" } + "west": { "uv": [ 2, 5, 2.5, 8 ], "texture": "#texture1" }, + "east": { "uv": [ 13.5, 5, 14, 8 ], "texture": "#texture1" } } }, { "__comment": "PlaneX45", - "from": [ 8, -4, 18.5 ], - "to": [ 8.001, -3, 19 ], + "from": [ 8, -7, 17.5 ], + "to": [ 8.001, -6, 18 ], "faces": { - "west": { "uv": [ 12.5, 0, 13, 8 ], "texture": "#texture1" }, - "east": { "uv": [ 3, 0, 3.5, 8 ], "texture": "#texture1" } - } - }, - { - "__comment": "PlaneX45", - "from": [ 8, -5, 18 ], - "to": [ 8.001, -4, 18.5 ], - "faces": { - "west": { "uv": [ 12.5, 0, 13, 8 ], "texture": "#texture1" }, - "east": { "uv": [ 3, 0, 3.5, 8 ], "texture": "#texture1" } - } - }, - { - "__comment": "PlaneX45", - "from": [ 8, -6, 17.5 ], - "to": [ 8.001, -5, 18 ], - "faces": { - "west": { "uv": [ 12.5, 0, 13, 8 ], "texture": "#texture1" }, - "east": { "uv": [ 3, 0, 3.5, 8 ], "texture": "#texture1" } - } - }, - { - "__comment": "PlaneX45", - "from": [ 8, -6.5, 17 ], - "to": [ 8.001, -6, 17.5 ], - "faces": { - "west": { "uv": [ 12.5, 0, 13, 8 ], "texture": "#texture1" }, - "east": { "uv": [ 3, 0, 3.5, 8 ], "texture": "#texture1" } + "west": { "uv": [ 2, 5, 2.5, 8 ], "texture": "#texture1" }, + "east": { "uv": [ 13.5, 5, 14, 8 ], "texture": "#texture1" } } } ], diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/longbow_8.json b/kfc/src/main/resources/assets/forgecraft/models/item/longbow/longbow_8.json similarity index 94% rename from kfc/src/main/resources/assets/forgecraft/models/item/longbow_8.json rename to kfc/src/main/resources/assets/forgecraft/models/item/longbow/longbow_8.json index ef2bd9fd..f5e22a3d 100644 --- a/kfc/src/main/resources/assets/forgecraft/models/item/longbow_8.json +++ b/kfc/src/main/resources/assets/forgecraft/models/item/longbow/longbow_8.json @@ -1,9 +1,9 @@ { "__comment": "Designed by Kitsushadow with Cubik Studio - https://cubik.studio", "textures": { - "particle": "blocks/e_particle", - "texture": "blocks/log_stripped_yew_side", - "texture1": "blocks/e_texture", + "particle": "primal:blocks/log_stripped_yew_side", + "texture": "primal:blocks/log_stripped_yew_side", + "texture1": "forgecraft:items/bowstring", "arrow": "blocks/e_texture" }, "elements": [ @@ -308,8 +308,8 @@ }, { "__comment": "Box39", - "from": [ 7.5, 21, 15.5 ], - "to": [ 8.5, 21.5, 16.5 ], + "from": [ 7.5, 21, 15 ], + "to": [ 8.5, 21.5, 16 ], "faces": { "down": { "uv": [ 7.5, 5, 8.5, 6 ], "texture": "#texture" }, "up": { "uv": [ 7.5, 10, 8.5, 11 ], "texture": "#texture" }, @@ -321,8 +321,8 @@ }, { "__comment": "Box39", - "from": [ 7.5, 21.5, 16.5 ], - "to": [ 8.5, 22, 18 ], + "from": [ 7.5, 22, 16.5 ], + "to": [ 8.5, 22.5, 18 ], "faces": { "down": { "uv": [ 7.5, 5, 8.5, 6 ], "texture": "#texture" }, "up": { "uv": [ 7.5, 10, 8.5, 11 ], "texture": "#texture" }, @@ -360,8 +360,8 @@ }, { "__comment": "Box39", - "from": [ 7.5, -6, 16.5 ], - "to": [ 8.5, -5.5, 18 ], + "from": [ 7.5, -6.5, 16.5 ], + "to": [ 8.5, -6, 18 ], "faces": { "down": { "uv": [ 7.5, 4, 8.5, 5 ], "texture": "#texture" }, "up": { "uv": [ 7.5, 11, 8.5, 12 ], "texture": "#texture" }, @@ -386,8 +386,8 @@ }, { "__comment": "Box39", - "from": [ 7.5, -5.5, 15.5 ], - "to": [ 8.5, -5, 16.5 ], + "from": [ 7.5, -5.5, 15 ], + "to": [ 8.5, -5, 16 ], "faces": { "down": { "uv": [ 7.5, 4, 8.5, 5 ], "texture": "#texture" }, "up": { "uv": [ 7.5, 11, 8.5, 12 ], "texture": "#texture" }, @@ -728,6 +728,32 @@ "west": { "uv": [ 2, 5, 2.5, 8 ], "texture": "#texture1" }, "east": { "uv": [ 13.5, 5, 14, 8 ], "texture": "#texture1" } } + }, + { + "__comment": "Box39", + "from": [ 7.5, -6, 16 ], + "to": [ 8.5, -5.5, 17 ], + "faces": { + "down": { "uv": [ 7.5, 4, 8.5, 5 ], "texture": "#texture" }, + "up": { "uv": [ 7.5, 11, 8.5, 12 ], "texture": "#texture" }, + "north": { "uv": [ 7.5, 14, 8.5, 15 ], "texture": "#texture" }, + "south": { "uv": [ 7.5, 14, 8.5, 15 ], "texture": "#texture" }, + "west": { "uv": [ 11, 14, 12, 15 ], "texture": "#texture" }, + "east": { "uv": [ 4, 14, 5, 15 ], "texture": "#texture" } + } + }, + { + "__comment": "Box39", + "from": [ 7.5, 21.5, 16 ], + "to": [ 8.5, 22, 17 ], + "faces": { + "down": { "uv": [ 7.5, 5, 8.5, 6 ], "texture": "#texture" }, + "up": { "uv": [ 7.5, 10, 8.5, 11 ], "texture": "#texture" }, + "north": { "uv": [ 7.5, 5, 8.5, 6 ], "texture": "#texture" }, + "south": { "uv": [ 7.5, 5, 8.5, 6 ], "texture": "#texture" }, + "west": { "uv": [ 10, 5, 11, 6 ], "texture": "#texture" }, + "east": { "uv": [ 5, 5, 6, 6 ], "texture": "#texture" } + } } ], "display": { diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/longbow_default.json b/kfc/src/main/resources/assets/forgecraft/models/item/longbow_default.json index 0572f6e4..3e865afc 100644 --- a/kfc/src/main/resources/assets/forgecraft/models/item/longbow_default.json +++ b/kfc/src/main/resources/assets/forgecraft/models/item/longbow_default.json @@ -1,9 +1,9 @@ { "__comment": "Designed by Kitsushadow with Cubik Studio - https://cubik.studio", "textures": { - "particle": "blocks/e_particle", - "texture": "blocks/log_stripped_yew_side", - "texture1": "blocks/e_texture" + "particle": "primal:blocks/log_stripped_yew_side", + "texture": "primal:blocks/log_stripped_yew_side", + "texture1": "forgecraft:items/bowstring" }, "elements": [ { diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/longbow_unstrung.json b/kfc/src/main/resources/assets/forgecraft/models/item/unstrunglongbow.json similarity index 99% rename from kfc/src/main/resources/assets/forgecraft/models/item/longbow_unstrung.json rename to kfc/src/main/resources/assets/forgecraft/models/item/unstrunglongbow.json index 20f89958..da0984b1 100644 --- a/kfc/src/main/resources/assets/forgecraft/models/item/longbow_unstrung.json +++ b/kfc/src/main/resources/assets/forgecraft/models/item/unstrunglongbow.json @@ -1,9 +1,9 @@ { "__comment": "Designed by Kitsushadow with Cubik Studio - https://cubik.studio", "textures": { - "particle": "blocks/e_particle", - "texture": "blocks/log_stripped_yew_side", - "texture1": "blocks/e_texture" + "particle": "primal:blocks/log_stripped_yew_side", + "texture": "primal:blocks/log_stripped_yew_side", + "texture1": "primal:blocks/log_stripped_yew_side" }, "elements": [ { diff --git a/kfc/src/main/resources/assets/forgecraft/textures/items/bowstring.png b/kfc/src/main/resources/assets/forgecraft/textures/items/bowstring.png new file mode 100644 index 00000000..d3df4a22 Binary files /dev/null and b/kfc/src/main/resources/assets/forgecraft/textures/items/bowstring.png differ