From 80344127fef5d03b8942d1090042c3b09985b3d7 Mon Sep 17 00:00:00 2001 From: Sweenus <48658188+Sweenus@users.noreply.github.com> Date: Thu, 18 Aug 2022 15:57:57 +1000 Subject: [PATCH] Now supports 1.19.x Storm proc only when raining Bramblethorn added (AoE poison/slow on hit) --- gradle.properties | 8 +- .../sweenus/simplyswords/SimplySwords.java | 1 + .../config/SimplySwordsConfig.java | 2 + .../simplyswords/effect/ModEffects.java | 1 + .../simplyswords/effect/PlagueEffect.java | 51 ++ .../simplyswords/effect/StormEffect.java | 6 +- .../sweenus/simplyswords/item/ModItems.java | 10 +- .../item/custom/BrambleSwordItem.java | 49 ++ .../item/custom/PlagueSwordItem.java | 32 + .../item/custom/StormSwordItem.java | 1 - .../util/ModLootTableModifiers.java | 1 + .../assets/simplyswords/lang/en_us.json | 1 + .../models/item/bramblethorn.json | 647 ++++++++++++++++++ .../textures/item/blade_thorn.png | Bin 0 -> 406 bytes .../textures/item/bramble_chromatic.png | Bin 0 -> 16997 bytes .../item/bramble_chromatic.png.mcmeta | 7 + .../textures/item/bramble_chromatic_e.png | Bin 0 -> 16997 bytes .../item/bramble_chromatic_e.png.mcmeta | 7 + .../simplyswords/textures/item/hilt_wood.png | Bin 0 -> 429 bytes .../simplyswords/textures/item/leaves.png | Bin 0 -> 196 bytes .../textures/mob_effect/bramble.png | Bin 0 -> 142 bytes .../textures/mob_effect/storm.png | Bin 0 -> 142 bytes .../data/simplyswords/tags/items/swords.json | 1 + .../weapon_attributes/bramblethorn.json | 3 + src/main/resources/fabric.mod.json | 11 +- 25 files changed, 824 insertions(+), 15 deletions(-) create mode 100644 src/main/java/net/sweenus/simplyswords/effect/PlagueEffect.java create mode 100644 src/main/java/net/sweenus/simplyswords/item/custom/BrambleSwordItem.java create mode 100644 src/main/java/net/sweenus/simplyswords/item/custom/PlagueSwordItem.java create mode 100644 src/main/resources/assets/simplyswords/models/item/bramblethorn.json create mode 100644 src/main/resources/assets/simplyswords/textures/item/blade_thorn.png create mode 100644 src/main/resources/assets/simplyswords/textures/item/bramble_chromatic.png create mode 100644 src/main/resources/assets/simplyswords/textures/item/bramble_chromatic.png.mcmeta create mode 100644 src/main/resources/assets/simplyswords/textures/item/bramble_chromatic_e.png create mode 100644 src/main/resources/assets/simplyswords/textures/item/bramble_chromatic_e.png.mcmeta create mode 100644 src/main/resources/assets/simplyswords/textures/item/hilt_wood.png create mode 100644 src/main/resources/assets/simplyswords/textures/item/leaves.png create mode 100644 src/main/resources/assets/simplyswords/textures/mob_effect/bramble.png create mode 100644 src/main/resources/assets/simplyswords/textures/mob_effect/storm.png create mode 100644 src/main/resources/data/simplyswords/weapon_attributes/bramblethorn.json diff --git a/gradle.properties b/gradle.properties index a18cac94..319cd776 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,14 +3,14 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://fabricmc.net/develop - minecraft_version=1.19 - yarn_mappings=1.19+build.4 + minecraft_version=1.19.2 + yarn_mappings=1.19.2+build.4 loader_version=0.14.9 # Mod Properties - mod_version = 1.02-1.19 + mod_version = 1.04-1.19 maven_group = net.sweenus archives_base_name = simplyswords # Dependencies - fabric_version=0.58.0+1.19 + fabric_version=0.60.0+1.19.2 diff --git a/src/main/java/net/sweenus/simplyswords/SimplySwords.java b/src/main/java/net/sweenus/simplyswords/SimplySwords.java index 60f26e84..6511d167 100644 --- a/src/main/java/net/sweenus/simplyswords/SimplySwords.java +++ b/src/main/java/net/sweenus/simplyswords/SimplySwords.java @@ -28,6 +28,7 @@ public void onInitialize() { ModEffects.registerEffects(); Registry.register(Registry.STATUS_EFFECT, new Identifier("simplyswords", "burn"), ModEffects.BURN); + Registry.register(Registry.STATUS_EFFECT, new Identifier("simplyswords", "plague"), ModEffects.PLAGUE); Registry.register(Registry.STATUS_EFFECT, new Identifier("simplyswords", "wildfire"), ModEffects.WILDFIRE); Registry.register(Registry.STATUS_EFFECT, new Identifier("simplyswords", "storm"), ModEffects.STORM); Registry.register(Registry.STATUS_EFFECT, new Identifier("simplyswords", "electric"), ModEffects.ELECTRIC); diff --git a/src/main/java/net/sweenus/simplyswords/config/SimplySwordsConfig.java b/src/main/java/net/sweenus/simplyswords/config/SimplySwordsConfig.java index ef008077..98a2e447 100644 --- a/src/main/java/net/sweenus/simplyswords/config/SimplySwordsConfig.java +++ b/src/main/java/net/sweenus/simplyswords/config/SimplySwordsConfig.java @@ -54,6 +54,8 @@ public static void init() { INT_OPTIONS.put("slowness_duration", 50); INT_OPTIONS.put("wildfire_duration", 8); INT_OPTIONS.put("toxin_duration", 150); + INT_OPTIONS.put("plague_duration", 300); + INT_OPTIONS.put("plague_chance", 15); FLOAT_OPTIONS.put("standard_loot_table_weight", 0.1f); diff --git a/src/main/java/net/sweenus/simplyswords/effect/ModEffects.java b/src/main/java/net/sweenus/simplyswords/effect/ModEffects.java index 9b023aa3..91cabd0c 100644 --- a/src/main/java/net/sweenus/simplyswords/effect/ModEffects.java +++ b/src/main/java/net/sweenus/simplyswords/effect/ModEffects.java @@ -20,6 +20,7 @@ public static void registerEffects() { public static final StatusEffect BURN = new BurnEffect(StatusEffectCategory.HARMFUL, 2124687); public static final StatusEffect ELECTRIC = new ElectricEffect(StatusEffectCategory.HARMFUL, 2184187); + public static final StatusEffect PLAGUE = new PlagueEffect(StatusEffectCategory.HARMFUL, 2184187); public static final StatusEffect WILDFIRE = new WildfireEffect(StatusEffectCategory.HARMFUL, 1124687); public static final StatusEffect STORM = new StormEffect(StatusEffectCategory.HARMFUL, 1124687); public static final StatusEffect OMEN = new OmenEffect(StatusEffectCategory.HARMFUL, 1124687); diff --git a/src/main/java/net/sweenus/simplyswords/effect/PlagueEffect.java b/src/main/java/net/sweenus/simplyswords/effect/PlagueEffect.java new file mode 100644 index 00000000..427cb86b --- /dev/null +++ b/src/main/java/net/sweenus/simplyswords/effect/PlagueEffect.java @@ -0,0 +1,51 @@ +package net.sweenus.simplyswords.effect; + +import net.minecraft.entity.Entity; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.effect.StatusEffect; +import net.minecraft.entity.effect.StatusEffectCategory; +import net.minecraft.entity.effect.StatusEffectInstance; +import net.minecraft.entity.effect.StatusEffects; +import net.minecraft.predicate.entity.EntityPredicates; +import net.minecraft.server.world.ServerWorld; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Box; +import net.sweenus.simplyswords.config.SimplySwordsConfig; +import net.sweenus.simplyswords.item.custom.PlagueSwordItem; + +public class PlagueEffect extends StatusEffect { + public PlagueEffect(StatusEffectCategory statusEffectCategory, int color) {super (statusEffectCategory, color); } + + @Override + public void applyUpdateEffect(LivingEntity pLivingEntity, int pAmplifier) { + if (!pLivingEntity.world.isClient()) { + ServerWorld world = (ServerWorld)pLivingEntity.world; + BlockPos position = pLivingEntity.getBlockPos(); + double x = pLivingEntity.getX(); + double y = pLivingEntity.getY(); + double z = pLivingEntity.getZ(); + var attacker = pLivingEntity.getAttacker(); + //int spreadchance = SimplySwordsConfig.getIntValue("plague_spread_chance"); + + if (pLivingEntity.getRandom().nextInt(100) <= 10) { + Box box = new Box(x + 10, y + 5, z + 10, x - 10, y - 5, z - 10); + + for(Entity e: world.getOtherEntities(attacker, box, EntityPredicates.VALID_ENTITY)) { + if (e != null) { + //end me + } + } + } + + } + + super.applyUpdateEffect(pLivingEntity, pAmplifier); + + } + + @Override + public boolean canApplyUpdateEffect(int pDuration, int pAmplifier) { + return true; + } + +} diff --git a/src/main/java/net/sweenus/simplyswords/effect/StormEffect.java b/src/main/java/net/sweenus/simplyswords/effect/StormEffect.java index d6d73803..93a7c869 100644 --- a/src/main/java/net/sweenus/simplyswords/effect/StormEffect.java +++ b/src/main/java/net/sweenus/simplyswords/effect/StormEffect.java @@ -30,8 +30,10 @@ public void applyUpdateEffect(LivingEntity pLivingEntity, int pAmplifier) { for(Entity e: world.getOtherEntities(pPlayer, box, EntityPredicates.VALID_ENTITY)) { if (e != null) { - var stormtarget = e.getBlockPos(); - Entity storm = EntityType.LIGHTNING_BOLT.spawn(world, null, null, null, stormtarget, SpawnReason.TRIGGERED, true, true); + if (e.isTouchingWaterOrRain()) { + var stormtarget = e.getBlockPos(); + Entity storm = EntityType.LIGHTNING_BOLT.spawn(world, null, null, null, stormtarget, SpawnReason.TRIGGERED, true, true); + } } } diff --git a/src/main/java/net/sweenus/simplyswords/item/ModItems.java b/src/main/java/net/sweenus/simplyswords/item/ModItems.java index 14d3e70b..d0f7df32 100644 --- a/src/main/java/net/sweenus/simplyswords/item/ModItems.java +++ b/src/main/java/net/sweenus/simplyswords/item/ModItems.java @@ -92,7 +92,7 @@ public class ModItems { //RUNIC public static final Item RUNIC_LONGSWORD = registerItem( "runic_longsword", - new ElectricSwordItem(ToolMaterials.NETHERITE, 3, -2.4f, + new PoisonSwordItem(ToolMaterials.NETHERITE, 3, -2.4f, new FabricItemSettings().group(ModItemGroup.SIMPLYSWORDS).rarity(Rarity.EPIC))); public static final Item RUNIC_TWINBLADE = registerItem( "runic_twinblade", @@ -123,11 +123,15 @@ public class ModItems { new FabricItemSettings().group(ModItemGroup.SIMPLYSWORDS).rarity(Rarity.EPIC))); public static final Item SWORD_ON_A_STICK = registerItem( "sword_on_a_stick", - new SwordItem(ToolMaterials.WOOD, 5, -1.9f, + new SwordItem(ToolMaterials.WOOD, 5, -2.2f, + new FabricItemSettings().group(ModItemGroup.SIMPLYSWORDS).rarity(Rarity.EPIC))); + + public static final Item BRAMBLETHORN = registerItem( "bramblethorn", + new BrambleSwordItem(ToolMaterials.WOOD, 6, -1.6f, new FabricItemSettings().group(ModItemGroup.SIMPLYSWORDS).rarity(Rarity.EPIC))); public static final Item TOXIC_LONGSWORD = registerItem( "toxic_longsword", - new PoisonSwordItem(ToolMaterials.NETHERITE, 3, -2.4f, + new PlagueSwordItem(ToolMaterials.NETHERITE, 3, -2.4f, new FabricItemSettings().group(ModItemGroup.SIMPLYSWORDS).rarity(Rarity.EPIC))); private static Item registerItem(String name, Item item) { diff --git a/src/main/java/net/sweenus/simplyswords/item/custom/BrambleSwordItem.java b/src/main/java/net/sweenus/simplyswords/item/custom/BrambleSwordItem.java new file mode 100644 index 00000000..d6bea9a7 --- /dev/null +++ b/src/main/java/net/sweenus/simplyswords/item/custom/BrambleSwordItem.java @@ -0,0 +1,49 @@ +package net.sweenus.simplyswords.item.custom; + + +import net.minecraft.entity.Entity; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.effect.StatusEffectInstance; +import net.minecraft.entity.effect.StatusEffects; +import net.minecraft.item.ItemStack; +import net.minecraft.item.SwordItem; +import net.minecraft.item.ToolMaterial; +import net.minecraft.predicate.entity.EntityPredicates; +import net.minecraft.server.world.ServerWorld; +import net.minecraft.util.math.Box; +import net.sweenus.simplyswords.config.SimplySwordsConfig; +import net.sweenus.simplyswords.effect.ModEffects; + +public class BrambleSwordItem extends SwordItem { + public BrambleSwordItem(ToolMaterial toolMaterial, int attackDamage, float attackSpeed, Settings settings) { + super(toolMaterial, attackDamage, attackSpeed, settings); + } + + @Override + public boolean postHit(ItemStack stack, LivingEntity target, LivingEntity attacker) { + int fhitchance = 50; //SimplySwordsConfig.getIntValue("brimstone_chance"); + + + if (attacker.getRandom().nextInt(100) <= fhitchance) { + if (!target.world.isClient()) { + double x = target.getX(); + double y = target.getY(); + double z = target.getZ(); + ServerWorld world = (ServerWorld) target.world; + Box box = new Box(x + 10, y + 5, z + 10, x - 10, y - 5, z - 10); + + for(Entity e: world.getOtherEntities(attacker, box, EntityPredicates.VALID_LIVING_ENTITY)) { + if (e != null) { + target = (LivingEntity) e; + target.addStatusEffect(new StatusEffectInstance(StatusEffects.POISON, 300, 1), attacker); + target.addStatusEffect(new StatusEffectInstance(StatusEffects.SLOWNESS, 150, 1), attacker); + } + } + } + } + + return super.postHit(stack, target, attacker); + + } + +} diff --git a/src/main/java/net/sweenus/simplyswords/item/custom/PlagueSwordItem.java b/src/main/java/net/sweenus/simplyswords/item/custom/PlagueSwordItem.java new file mode 100644 index 00000000..b3e5324e --- /dev/null +++ b/src/main/java/net/sweenus/simplyswords/item/custom/PlagueSwordItem.java @@ -0,0 +1,32 @@ +package net.sweenus.simplyswords.item.custom; + + +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.effect.StatusEffectInstance; +import net.minecraft.entity.effect.StatusEffects; +import net.minecraft.item.ItemStack; +import net.minecraft.item.SwordItem; +import net.minecraft.item.ToolMaterial; +import net.sweenus.simplyswords.config.SimplySwordsConfig; +import net.sweenus.simplyswords.effect.ModEffects; + +public class PlagueSwordItem extends SwordItem { + public PlagueSwordItem(ToolMaterial toolMaterial, int attackDamage, float attackSpeed, Settings settings) { + super(toolMaterial, attackDamage, attackSpeed, settings); + } + + @Override + public boolean postHit(ItemStack stack, LivingEntity target, LivingEntity attacker) { + + int phitchance = SimplySwordsConfig.getIntValue("plague_chance"); + int pduration = SimplySwordsConfig.getIntValue("plague_duration"); + + if (attacker.getRandom().nextInt(100) <= phitchance) { + target.addStatusEffect(new StatusEffectInstance(StatusEffects.WITHER, pduration, 1), attacker); + } + + return super.postHit(stack, target, attacker); + + } + +} diff --git a/src/main/java/net/sweenus/simplyswords/item/custom/StormSwordItem.java b/src/main/java/net/sweenus/simplyswords/item/custom/StormSwordItem.java index bc21771b..a4be8ebe 100644 --- a/src/main/java/net/sweenus/simplyswords/item/custom/StormSwordItem.java +++ b/src/main/java/net/sweenus/simplyswords/item/custom/StormSwordItem.java @@ -8,7 +8,6 @@ import net.minecraft.item.ToolMaterial; import net.minecraft.world.World; import net.minecraft.world.biome.Biome; -import net.minecraft.world.gen.structure.OceanRuinStructure; import net.sweenus.simplyswords.config.SimplySwordsConfig; import net.sweenus.simplyswords.effect.ModEffects; diff --git a/src/main/java/net/sweenus/simplyswords/util/ModLootTableModifiers.java b/src/main/java/net/sweenus/simplyswords/util/ModLootTableModifiers.java index e98fabc3..3e0d08c4 100644 --- a/src/main/java/net/sweenus/simplyswords/util/ModLootTableModifiers.java +++ b/src/main/java/net/sweenus/simplyswords/util/ModLootTableModifiers.java @@ -82,6 +82,7 @@ public static void modifyLootTables() { .with(ItemEntry.builder(ModItems.WATCHER_CLAYMORE)) .with(ItemEntry.builder(ModItems.TOXIC_LONGSWORD)) .with(ItemEntry.builder(ModItems.SWORD_ON_A_STICK)) + .with(ItemEntry.builder(ModItems.BRAMBLETHORN)) .with(ItemEntry.builder(ModItems.STORMS_EDGE)) .with(ItemEntry.builder(ModItems.BRIMSTONE_CLAYMORE)); tableBuilder.pool(upool); diff --git a/src/main/resources/assets/simplyswords/lang/en_us.json b/src/main/resources/assets/simplyswords/lang/en_us.json index 3b1b6f53..fd970ee3 100644 --- a/src/main/resources/assets/simplyswords/lang/en_us.json +++ b/src/main/resources/assets/simplyswords/lang/en_us.json @@ -29,6 +29,7 @@ "item.simplyswords.netherite_twinblade": "Netherite Twinblade", "item.simplyswords.storms_edge": "Storm's Edge", "item.simplyswords.sword_on_a_stick": "Sword on a Stick", + "item.simplyswords.bramblethorn": "Bramblethorn", "itemGroup.simplyswords.simplyswords": "Simply Swords", diff --git a/src/main/resources/assets/simplyswords/models/item/bramblethorn.json b/src/main/resources/assets/simplyswords/models/item/bramblethorn.json new file mode 100644 index 00000000..15f43591 --- /dev/null +++ b/src/main/resources/assets/simplyswords/models/item/bramblethorn.json @@ -0,0 +1,647 @@ +{ + "credit": "Made by Sweenus using Blockbench", + "texture_size": [32, 32], + "textures": { + "0": "simplyswords:item/hilt_wood", + "1": "simplyswords:item/blade_thorn", + "2": "simplyswords:item/leaves", + "3": "simplyswords:item/bramble_chromatic", + "particle": "simplyswords:item/hilt_wood" + }, + "elements": [ + { + "from": [8, 7, 8.5], + "to": [8.5, 8, 8.75], + "faces": { + "north": {"uv": [2, 2, 2.25, 2.5], "texture": "#1"}, + "east": {"uv": [2, 2.5, 2.25, 3], "texture": "#1"}, + "south": {"uv": [2.5, 2, 2.75, 2.5], "texture": "#1"}, + "west": {"uv": [2.5, 2.5, 2.75, 3], "texture": "#1"}, + "up": {"uv": [2.75, 3.25, 2.5, 3], "texture": "#1"}, + "down": {"uv": [3.25, 2.5, 3, 2.75], "texture": "#1"} + } + }, + { + "from": [6.5, 7, 8.5], + "to": [7, 8, 8.75], + "faces": { + "north": {"uv": [3, 0, 3.25, 0.5], "texture": "#1"}, + "east": {"uv": [3, 0.5, 3.25, 1], "texture": "#1"}, + "south": {"uv": [3, 1, 3.25, 1.5], "texture": "#1"}, + "west": {"uv": [3, 1.5, 3.25, 2], "texture": "#1"}, + "up": {"uv": [3.25, 3.25, 3, 3], "texture": "#1"}, + "down": {"uv": [3.75, 0, 3.5, 0.25], "texture": "#1"} + } + }, + { + "from": [6.75, 7.25, 7.75], + "to": [8.25, 7.75, 8.75], + "faces": { + "north": {"uv": [2, 1, 2.75, 1.25], "texture": "#1"}, + "east": {"uv": [2, 3, 2.5, 3.25], "texture": "#1"}, + "south": {"uv": [2, 1.5, 2.75, 1.75], "texture": "#1"}, + "west": {"uv": [3, 2, 3.5, 2.25], "texture": "#1"}, + "up": {"uv": [2.75, 0.5, 2, 0], "texture": "#1"}, + "down": {"uv": [2.75, 0.5, 2, 1], "texture": "#1"} + } + }, + { + "from": [6.75, 30.25, 8.25], + "to": [7.25, 30.75, 8.75], + "faces": { + "north": {"uv": [3.5, 0.5, 3.75, 0.75], "texture": "#1"}, + "east": {"uv": [3.5, 1, 3.75, 1.25], "texture": "#1"}, + "south": {"uv": [3.5, 1.5, 3.75, 1.75], "texture": "#1"}, + "west": {"uv": [2, 3.5, 2.25, 3.75], "texture": "#1"}, + "up": {"uv": [3.75, 2.25, 3.5, 2], "texture": "#1"}, + "down": {"uv": [2.75, 3.5, 2.5, 3.75], "texture": "#1"} + } + }, + { + "from": [7.75, 26.25, 8.25], + "to": [8.25, 26.75, 8.75], + "faces": { + "north": {"uv": [3.5, 2.5, 3.75, 2.75], "texture": "#1"}, + "east": {"uv": [3, 3.5, 3.25, 3.75], "texture": "#1"}, + "south": {"uv": [3.5, 3, 3.75, 3.25], "texture": "#1"}, + "west": {"uv": [3.5, 3.5, 3.75, 3.75], "texture": "#1"}, + "up": {"uv": [4.25, 0.25, 4, 0], "texture": "#1"}, + "down": {"uv": [4.25, 0.5, 4, 0.75], "texture": "#1"} + } + }, + { + "from": [7.75, 24.25, 8.25], + "to": [8.25, 24.75, 8.75], + "faces": { + "north": {"uv": [4, 1, 4.25, 1.25], "texture": "#1"}, + "east": {"uv": [4, 1.5, 4.25, 1.75], "texture": "#1"}, + "south": {"uv": [2, 4, 2.25, 4.25], "texture": "#1"}, + "west": {"uv": [4, 2, 4.25, 2.25], "texture": "#1"}, + "up": {"uv": [2.75, 4.25, 2.5, 4], "texture": "#1"}, + "down": {"uv": [4.25, 2.5, 4, 2.75], "texture": "#1"} + } + }, + { + "from": [7.25, 28.5, 7.75], + "to": [7.75, 29, 8.25], + "faces": { + "north": {"uv": [3, 4, 3.25, 4.25], "texture": "#1"}, + "east": {"uv": [4, 3, 4.25, 3.25], "texture": "#1"}, + "south": {"uv": [3.5, 4, 3.75, 4.25], "texture": "#1"}, + "west": {"uv": [4, 3.5, 4.25, 3.75], "texture": "#1"}, + "up": {"uv": [4.25, 4.25, 4, 4], "texture": "#1"}, + "down": {"uv": [4.75, 0, 4.5, 0.25], "texture": "#1"} + } + }, + { + "from": [7.25, 16.25, 7.75], + "to": [7.75, 16.75, 8.25], + "faces": { + "north": {"uv": [4.5, 0.5, 4.75, 0.75], "texture": "#1"}, + "east": {"uv": [4.5, 1, 4.75, 1.25], "texture": "#1"}, + "south": {"uv": [4.5, 1.5, 4.75, 1.75], "texture": "#1"}, + "west": {"uv": [2, 4.5, 2.25, 4.75], "texture": "#1"}, + "up": {"uv": [4.75, 2.25, 4.5, 2], "texture": "#1"}, + "down": {"uv": [2.75, 4.5, 2.5, 4.75], "texture": "#1"} + } + }, + { + "from": [7.25, 22, 8.75], + "to": [7.75, 22.5, 9.25], + "faces": { + "north": {"uv": [4.5, 2.5, 4.75, 2.75], "texture": "#1"}, + "east": {"uv": [3, 4.5, 3.25, 4.75], "texture": "#1"}, + "south": {"uv": [4.5, 3, 4.75, 3.25], "texture": "#1"}, + "west": {"uv": [3.5, 4.5, 3.75, 4.75], "texture": "#1"}, + "up": {"uv": [4.75, 3.75, 4.5, 3.5], "texture": "#1"}, + "down": {"uv": [4.25, 4.5, 4, 4.75], "texture": "#1"} + } + }, + { + "from": [7.25, 25, 8.75], + "to": [7.75, 25.5, 9.25], + "faces": { + "north": {"uv": [4.5, 4, 4.75, 4.25], "texture": "#1"}, + "east": {"uv": [4.5, 4.5, 4.75, 4.75], "texture": "#1"}, + "south": {"uv": [5, 0, 5.25, 0.25], "texture": "#1"}, + "west": {"uv": [5, 0.5, 5.25, 0.75], "texture": "#1"}, + "up": {"uv": [5.25, 1.25, 5, 1], "texture": "#1"}, + "down": {"uv": [5.25, 1.5, 5, 1.75], "texture": "#1"} + } + }, + { + "from": [7.25, 13, 8.75], + "to": [7.75, 13.5, 9.25], + "faces": { + "north": {"uv": [2, 5, 2.25, 5.25], "texture": "#1"}, + "east": {"uv": [5, 2, 5.25, 2.25], "texture": "#1"}, + "south": {"uv": [2.5, 5, 2.75, 5.25], "texture": "#1"}, + "west": {"uv": [5, 2.5, 5.25, 2.75], "texture": "#1"}, + "up": {"uv": [3.25, 5.25, 3, 5], "texture": "#1"}, + "down": {"uv": [5.25, 3, 5, 3.25], "texture": "#1"} + } + }, + { + "from": [6.75, 19.25, 8.25], + "to": [7.25, 19.75, 8.75], + "faces": { + "north": {"uv": [3.5, 5, 3.75, 5.25], "texture": "#1"}, + "east": {"uv": [5, 3.5, 5.25, 3.75], "texture": "#1"}, + "south": {"uv": [4, 5, 4.25, 5.25], "texture": "#1"}, + "west": {"uv": [5, 4, 5.25, 4.25], "texture": "#1"}, + "up": {"uv": [4.75, 5.25, 4.5, 5], "texture": "#1"}, + "down": {"uv": [5.25, 4.5, 5, 4.75], "texture": "#1"} + } + }, + { + "from": [7.75, 14, 8.25], + "to": [8.25, 14.5, 8.75], + "faces": { + "north": {"uv": [5, 5, 5.25, 5.25], "texture": "#1"}, + "east": {"uv": [5.5, 0, 5.75, 0.25], "texture": "#1"}, + "south": {"uv": [5.5, 0.5, 5.75, 0.75], "texture": "#1"}, + "west": {"uv": [5.5, 1, 5.75, 1.25], "texture": "#1"}, + "up": {"uv": [5.75, 1.75, 5.5, 1.5], "texture": "#1"}, + "down": {"uv": [2.25, 5.5, 2, 5.75], "texture": "#1"} + } + }, + { + "from": [7.25, 12, 8.25], + "to": [7.75, 32, 8.75], + "faces": { + "north": {"uv": [0, 0, 0.25, 10], "texture": "#1"}, + "east": {"uv": [0.5, 0, 0.75, 10], "texture": "#1"}, + "south": {"uv": [1, 0, 1.25, 10], "texture": "#1"}, + "west": {"uv": [1.5, 0, 1.75, 10], "texture": "#1"}, + "up": {"uv": [5.75, 2.25, 5.5, 2], "texture": "#1"}, + "down": {"uv": [2.75, 5.5, 2.5, 5.75], "texture": "#1"} + } + }, + { + "from": [7, 2, 8], + "to": [8, 8, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [7.5, 15.5, 8.5]}, + "faces": { + "north": {"uv": [0, 0, 1, 6], "texture": "#0"}, + "east": {"uv": [1, 0, 2, 6], "texture": "#0"}, + "south": {"uv": [2, 0, 3, 6], "texture": "#0"}, + "west": {"uv": [3, 0, 4, 6], "texture": "#0"}, + "up": {"uv": [11, 3, 10, 2], "texture": "#0"}, + "down": {"uv": [11, 3, 10, 4], "texture": "#0"} + } + }, + { + "from": [7.75, 1.75, 8.25], + "to": [8.25, 3.75, 8.75], + "rotation": {"angle": -22.5, "axis": "z", "origin": [8.5, 3, 8.5]}, + "faces": { + "north": {"uv": [4, 10, 4.5, 12], "texture": "#0"}, + "east": {"uv": [10, 4, 10.5, 6], "texture": "#0"}, + "south": {"uv": [10, 6, 10.5, 8], "texture": "#0"}, + "west": {"uv": [7, 10, 7.5, 12], "texture": "#0"}, + "up": {"uv": [13.5, 4.5, 13, 4], "texture": "#0"}, + "down": {"uv": [13.5, 5, 13, 5.5], "texture": "#0"} + } + }, + { + "from": [6.75, 2.75, 8.25], + "to": [7.25, 3.75, 8.75], + "rotation": {"angle": 22.5, "axis": "z", "origin": [8.5, 3, 8.5]}, + "faces": { + "north": {"uv": [12, 8, 12.5, 9], "texture": "#0"}, + "east": {"uv": [12, 9, 12.5, 10], "texture": "#0"}, + "south": {"uv": [10, 12, 10.5, 13], "texture": "#0"}, + "west": {"uv": [12, 10, 12.5, 11], "texture": "#0"}, + "up": {"uv": [6.5, 13.5, 6, 13], "texture": "#0"}, + "down": {"uv": [13.5, 6, 13, 6.5], "texture": "#0"} + } + }, + { + "from": [7.29434, -0.31127, 9], + "to": [7.79434, 1.18873, 9.5], + "rotation": {"angle": 45, "axis": "x", "origin": [6.79434, 0.18873, 8.5]}, + "faces": { + "north": {"uv": [11, 5, 11.5, 6.5], "texture": "#0"}, + "east": {"uv": [6, 11, 6.5, 12.5], "texture": "#0"}, + "south": {"uv": [11, 7, 11.5, 8.5], "texture": "#0"}, + "west": {"uv": [8, 11, 8.5, 12.5], "texture": "#0"}, + "up": {"uv": [13.5, 7.5, 13, 7], "texture": "#0"}, + "down": {"uv": [8.5, 13, 8, 13.5], "texture": "#0"} + } + }, + { + "from": [7, 10, 8], + "to": [8, 12, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [7.5, 15.5, 8.5]}, + "faces": { + "north": {"uv": [2, 9, 3, 11], "texture": "#0"}, + "east": {"uv": [9, 2, 10, 4], "texture": "#0"}, + "south": {"uv": [3, 9, 4, 11], "texture": "#0"}, + "west": {"uv": [9, 4, 10, 6], "texture": "#0"}, + "up": {"uv": [9, 11, 8, 10], "texture": "#0"}, + "down": {"uv": [11, 8, 10, 9], "texture": "#0"} + } + }, + { + "from": [6.75, 8, 8], + "to": [7.75, 10, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [7.5, 15.5, 8.5]}, + "faces": { + "north": {"uv": [5, 9, 6, 11], "texture": "#0"}, + "east": {"uv": [6, 9, 7, 11], "texture": "#0"}, + "south": {"uv": [9, 6, 10, 8], "texture": "#0"}, + "west": {"uv": [9, 8, 10, 10], "texture": "#0"}, + "up": {"uv": [10, 11, 9, 10], "texture": "#0"}, + "down": {"uv": [11, 9, 10, 10], "texture": "#0"} + } + }, + { + "from": [7, 7, 7.25], + "to": [7.5, 9, 7.75], + "rotation": {"angle": -45, "axis": "x", "origin": [7.25, 9, 7.25]}, + "faces": { + "north": {"uv": [10, 10, 10.5, 12], "texture": "#0"}, + "east": {"uv": [0, 11, 0.5, 13], "texture": "#0"}, + "south": {"uv": [11, 0, 11.5, 2], "texture": "#0"}, + "west": {"uv": [1, 11, 1.5, 13], "texture": "#0"}, + "up": {"uv": [13.5, 8.5, 13, 8], "texture": "#0"}, + "down": {"uv": [9.5, 13, 9, 13.5], "texture": "#0"} + } + }, + { + "from": [6.25, 10, 8.25], + "to": [6.75, 11, 8.75], + "rotation": {"angle": 45, "axis": "z", "origin": [6.5, 11, 8.5]}, + "faces": { + "north": {"uv": [12, 11, 12.5, 12], "texture": "#0"}, + "east": {"uv": [12, 12, 12.5, 13], "texture": "#0"}, + "south": {"uv": [0, 13, 0.5, 14], "texture": "#0"}, + "west": {"uv": [13, 0, 13.5, 1], "texture": "#0"}, + "up": {"uv": [13.5, 9.5, 13, 9], "texture": "#0"}, + "down": {"uv": [10.5, 13, 10, 13.5], "texture": "#0"} + } + }, + { + "from": [7, -1, 8.25], + "to": [8, 2, 9.25], + "rotation": {"angle": 0, "axis": "y", "origin": [7.5, 15.5, 8.5]}, + "faces": { + "north": {"uv": [4, 4, 5, 7], "texture": "#0"}, + "east": {"uv": [5, 4, 6, 7], "texture": "#0"}, + "south": {"uv": [0, 6, 1, 9], "texture": "#0"}, + "west": {"uv": [1, 6, 2, 9], "texture": "#0"}, + "up": {"uv": [3, 12, 2, 11], "texture": "#0"}, + "down": {"uv": [12, 2, 11, 3], "texture": "#0"} + } + }, + { + "from": [6.75, -4, 8], + "to": [7.75, -1, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [7.5, 15.5, 8.5]}, + "faces": { + "north": {"uv": [2, 6, 3, 9], "texture": "#0"}, + "east": {"uv": [3, 6, 4, 9], "texture": "#0"}, + "south": {"uv": [6, 4, 7, 7], "texture": "#0"}, + "west": {"uv": [4, 7, 5, 10], "texture": "#0"}, + "up": {"uv": [4, 12, 3, 11], "texture": "#0"}, + "down": {"uv": [12, 3, 11, 4], "texture": "#0"} + } + }, + { + "from": [5, 7, 9], + "to": [10, 8, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [7.5, 9.5, 8.5]}, + "faces": { + "north": {"uv": [4, 0, 9, 1], "texture": "#0"}, + "east": {"uv": [11, 4, 12, 5], "texture": "#0"}, + "south": {"uv": [4, 1, 9, 2], "texture": "#0"}, + "west": {"uv": [5, 11, 6, 12], "texture": "#0"}, + "up": {"uv": [9, 3, 4, 2], "texture": "#0"}, + "down": {"uv": [9, 3, 4, 4], "texture": "#0"} + } + }, + { + "from": [8, 6.75, 8.75], + "to": [8.5, 8.25, 10.25], + "rotation": {"angle": 0, "axis": "y", "origin": [7.5, 9.5, 8.5]}, + "faces": { + "north": {"uv": [2, 12, 2.5, 13.5], "texture": "#0"}, + "east": {"uv": [7, 6, 8.5, 7.5], "texture": "#0"}, + "south": {"uv": [12, 2, 12.5, 3.5], "texture": "#0"}, + "west": {"uv": [7, 8, 8.5, 9.5], "texture": "#0"}, + "up": {"uv": [3.5, 13.5, 3, 12], "texture": "#0"}, + "down": {"uv": [4.5, 12, 4, 13.5], "texture": "#0"} + } + }, + { + "from": [6.5, 6.75, 8.75], + "to": [7, 8.25, 10.25], + "rotation": {"angle": 0, "axis": "y", "origin": [7.5, 9.5, 8.5]}, + "faces": { + "north": {"uv": [12, 4, 12.5, 5.5], "texture": "#0"}, + "east": {"uv": [0, 9, 1.5, 10.5], "texture": "#0"}, + "south": {"uv": [5, 12, 5.5, 13.5], "texture": "#0"}, + "west": {"uv": [9, 0, 10.5, 1.5], "texture": "#0"}, + "up": {"uv": [12.5, 7.5, 12, 6], "texture": "#0"}, + "down": {"uv": [7.5, 12, 7, 13.5], "texture": "#0"} + } + }, + { + "from": [9.5, 8.75, 9.25], + "to": [10.25, 9.25, 9.75], + "rotation": {"angle": 45, "axis": "z", "origin": [10.875, 8, 9.5]}, + "faces": { + "north": {"uv": [1, 13, 2, 13.5], "texture": "#0"}, + "east": {"uv": [13, 10, 13.5, 10.5], "texture": "#0"}, + "south": {"uv": [13, 1, 14, 1.5], "texture": "#0"}, + "west": {"uv": [11, 13, 11.5, 13.5], "texture": "#0"}, + "up": {"uv": [14, 2.5, 13, 2], "texture": "#0"}, + "down": {"uv": [14, 3, 13, 3.5], "texture": "#0"} + } + }, + { + "from": [6, 10.5, 8.5], + "to": [7, 11.5, 8.5], + "faces": { + "north": {"uv": [0, 0, 2, 2], "texture": "#2"}, + "east": {"uv": [0, 0, 0, 2], "texture": "#2"}, + "south": {"uv": [0, 2, 2, 4], "texture": "#2"}, + "west": {"uv": [0, 0, 0, 2], "texture": "#2"}, + "up": {"uv": [2, 0, 0, 0], "texture": "#2"}, + "down": {"uv": [2, 0, 0, 0], "texture": "#2"} + } + }, + { + "from": [5.5, 11, 8.5], + "to": [6, 11.5, 8.5], + "faces": { + "north": {"uv": [4, 8, 5, 9], "texture": "#2"}, + "east": {"uv": [0, 0, 0, 1], "texture": "#2"}, + "south": {"uv": [8, 4, 9, 5], "texture": "#2"}, + "west": {"uv": [0, 0, 0, 1], "texture": "#2"}, + "up": {"uv": [1, 0, 0, 0], "texture": "#2"}, + "down": {"uv": [1, 0, 0, 0], "texture": "#2"} + } + }, + { + "from": [5.5, 11.5, 8.5], + "to": [6.5, 12, 8.5], + "faces": { + "north": {"uv": [6, 0, 8, 1], "texture": "#2"}, + "east": {"uv": [0, 0, 0, 1], "texture": "#2"}, + "south": {"uv": [2, 6, 4, 7], "texture": "#2"}, + "west": {"uv": [0, 0, 0, 1], "texture": "#2"}, + "up": {"uv": [2, 0, 0, 0], "texture": "#2"}, + "down": {"uv": [2, 0, 0, 0], "texture": "#2"} + } + }, + { + "from": [6, 2.5, 8.5], + "to": [7, 3.5, 8.5], + "faces": { + "north": {"uv": [2, 0, 4, 2], "texture": "#2"}, + "east": {"uv": [0, 0, 0, 2], "texture": "#2"}, + "south": {"uv": [2, 2, 4, 4], "texture": "#2"}, + "west": {"uv": [0, 0, 0, 2], "texture": "#2"}, + "up": {"uv": [2, 0, 0, 0], "texture": "#2"}, + "down": {"uv": [2, 0, 0, 0], "texture": "#2"} + } + }, + { + "from": [5.5, 3, 8.5], + "to": [6, 3.5, 8.5], + "faces": { + "north": {"uv": [6, 8, 7, 9], "texture": "#2"}, + "east": {"uv": [0, 0, 0, 1], "texture": "#2"}, + "south": {"uv": [8, 6, 9, 7], "texture": "#2"}, + "west": {"uv": [0, 0, 0, 1], "texture": "#2"}, + "up": {"uv": [1, 0, 0, 0], "texture": "#2"}, + "down": {"uv": [1, 0, 0, 0], "texture": "#2"} + } + }, + { + "from": [5.5, 3.5, 8.5], + "to": [6.5, 4, 8.5], + "faces": { + "north": {"uv": [6, 2, 8, 3], "texture": "#2"}, + "east": {"uv": [0, 0, 0, 1], "texture": "#2"}, + "south": {"uv": [4, 6, 6, 7], "texture": "#2"}, + "west": {"uv": [0, 0, 0, 1], "texture": "#2"}, + "up": {"uv": [2, 0, 0, 0], "texture": "#2"}, + "down": {"uv": [2, 0, 0, 0], "texture": "#2"} + } + }, + { + "from": [8, 3.5, 8.5], + "to": [9, 4.5, 8.5], + "rotation": {"angle": -22.5, "axis": "z", "origin": [8.125, 3.375, 8.5]}, + "faces": { + "north": {"uv": [0, 4, 2, 6], "texture": "#2"}, + "east": {"uv": [0, 0, 0, 2], "texture": "#2"}, + "south": {"uv": [4, 0, 6, 2], "texture": "#2"}, + "west": {"uv": [0, 0, 0, 2], "texture": "#2"}, + "up": {"uv": [2, 0, 0, 0], "texture": "#2"}, + "down": {"uv": [2, 0, 0, 0], "texture": "#2"} + } + }, + { + "from": [8.5, 4.5, 8.5], + "to": [9, 5, 8.5], + "rotation": {"angle": -22.5, "axis": "z", "origin": [8.125, 3.375, 8.5]}, + "faces": { + "north": {"uv": [8, 8, 9, 9], "texture": "#2"}, + "east": {"uv": [0, 0, 0, 1], "texture": "#2"}, + "south": {"uv": [0, 10, 1, 11], "texture": "#2"}, + "west": {"uv": [0, 0, 0, 1], "texture": "#2"}, + "up": {"uv": [1, 0, 0, 0], "texture": "#2"}, + "down": {"uv": [1, 0, 0, 0], "texture": "#2"} + } + }, + { + "from": [9, 4, 8.5], + "to": [9.5, 5, 8.5], + "rotation": {"angle": -22.5, "axis": "z", "origin": [8.125, 3.375, 8.5]}, + "faces": { + "north": {"uv": [6, 4, 7, 6], "texture": "#2"}, + "east": {"uv": [0, 0, 0, 2], "texture": "#2"}, + "south": {"uv": [6, 6, 7, 8], "texture": "#2"}, + "west": {"uv": [0, 0, 0, 2], "texture": "#2"}, + "up": {"uv": [1, 0, 0, 0], "texture": "#2"}, + "down": {"uv": [1, 0, 0, 0], "texture": "#2"} + } + }, + { + "from": [7.65276, 0.16246, 9.45581], + "to": [7.65276, 1.16246, 10.45581], + "rotation": {"angle": 0, "axis": "y", "origin": [9.15276, 4.10754, 9.5]}, + "faces": { + "north": {"uv": [0, 0, 0, 2], "texture": "#2"}, + "east": {"uv": [2, 4, 4, 6], "texture": "#2"}, + "south": {"uv": [0, 0, 0, 2], "texture": "#2"}, + "west": {"uv": [4, 2, 6, 4], "texture": "#2"}, + "up": {"uv": [0, 2, 0, 0], "texture": "#2"}, + "down": {"uv": [0, 0, 0, 2], "texture": "#2"} + } + }, + { + "from": [7.65276, 1.16246, 9.95581], + "to": [7.65276, 1.66246, 10.45581], + "rotation": {"angle": 0, "axis": "y", "origin": [9.15276, 4.10754, 9.5]}, + "faces": { + "north": {"uv": [0, 0, 0, 1], "texture": "#2"}, + "east": {"uv": [10, 0, 11, 1], "texture": "#2"}, + "south": {"uv": [0, 0, 0, 1], "texture": "#2"}, + "west": {"uv": [2, 10, 3, 11], "texture": "#2"}, + "up": {"uv": [0, 1, 0, 0], "texture": "#2"}, + "down": {"uv": [0, 0, 0, 1], "texture": "#2"} + } + }, + { + "from": [7.65276, 0.66246, 10.45581], + "to": [7.65276, 1.66246, 10.95581], + "rotation": {"angle": 0, "axis": "y", "origin": [9.15276, 4.10754, 9.5]}, + "faces": { + "north": {"uv": [0, 0, 0, 2], "texture": "#2"}, + "east": {"uv": [0, 8, 1, 10], "texture": "#2"}, + "south": {"uv": [0, 0, 0, 2], "texture": "#2"}, + "west": {"uv": [8, 0, 9, 2], "texture": "#2"}, + "up": {"uv": [0, 1, 0, 0], "texture": "#2"}, + "down": {"uv": [0, 0, 0, 1], "texture": "#2"} + } + }, + { + "from": [7.15276, 8.91246, 6.70581], + "to": [7.15276, 9.91246, 7.70581], + "rotation": {"angle": 0, "axis": "y", "origin": [7.65276, 1.03746, 6.83081]}, + "faces": { + "north": {"uv": [0, 0, 0, 2], "texture": "#2"}, + "east": {"uv": [4, 4, 6, 6], "texture": "#2"}, + "south": {"uv": [0, 0, 0, 2], "texture": "#2"}, + "west": {"uv": [0, 6, 2, 8], "texture": "#2"}, + "up": {"uv": [0, 2, 0, 0], "texture": "#2"}, + "down": {"uv": [0, 0, 0, 2], "texture": "#2"} + } + }, + { + "from": [7.15276, 9.41246, 6.20581], + "to": [7.15276, 9.91246, 6.70581], + "rotation": {"angle": 0, "axis": "y", "origin": [7.65276, 1.03746, 6.83081]}, + "faces": { + "north": {"uv": [0, 0, 0, 1], "texture": "#2"}, + "east": {"uv": [10, 2, 11, 3], "texture": "#2"}, + "south": {"uv": [0, 0, 0, 1], "texture": "#2"}, + "west": {"uv": [4, 10, 5, 11], "texture": "#2"}, + "up": {"uv": [0, 1, 0, 0], "texture": "#2"}, + "down": {"uv": [0, 0, 0, 1], "texture": "#2"} + } + }, + { + "from": [7.15276, 9.91246, 6.20581], + "to": [7.15276, 10.41246, 7.20581], + "rotation": {"angle": 0, "axis": "y", "origin": [7.65276, 1.03746, 6.83081]}, + "faces": { + "north": {"uv": [0, 0, 0, 1], "texture": "#2"}, + "east": {"uv": [2, 8, 4, 9], "texture": "#2"}, + "south": {"uv": [0, 0, 0, 1], "texture": "#2"}, + "west": {"uv": [8, 2, 10, 3], "texture": "#2"}, + "up": {"uv": [0, 2, 0, 0], "texture": "#2"}, + "down": {"uv": [0, 0, 0, 2], "texture": "#2"} + } + }, + { + "from": [3, 31, 4], + "to": [12, 31, 13], + "faces": { + "north": {"uv": [0, 0, 4.5, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 4.5, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 4.5, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 4.5, 0], "texture": "#3"}, + "up": {"uv": [15.5, 15.5, 0.5, 0.5], "texture": "#3"}, + "down": {"uv": [15.5, 0.5, 0.5, 15.5], "texture": "#3"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [56, -90, 55], + "translation": [0, 1, 2.5], + "scale": [0.85, 0.85, 0.85] + }, + "thirdperson_lefthand": { + "rotation": [56, 90, -55], + "translation": [0, 1, 2.5], + "scale": [0.85, 0.85, 0.85] + }, + "firstperson_righthand": { + "rotation": [0, -90, 25], + "translation": [1.13, 3.2, 1.13], + "scale": [0.68, 0.68, 0.68] + }, + "firstperson_lefthand": { + "rotation": [0, 90, -25], + "translation": [1.13, 3.2, 1.13], + "scale": [0.68, 0.68, 0.68] + }, + "ground": { + "scale": [0.46, 0.47, 0.44] + }, + "gui": { + "rotation": [-2, 180, 44], + "translation": [-2.75, -1.75, 0.25], + "scale": [0.6, 0.6, 0.6] + }, + "head": { + "rotation": [0, 0, 129], + "translation": [9.5, -6.5, 5.25], + "scale": [1.5, 1.5, 1.5] + }, + "fixed": { + "rotation": [-2, 180, 44], + "translation": [-2.75, -2.5, 0.25], + "scale": [0.7, 0.7, 0.7] + } + }, + "groups": [ + { + "name": "Body", + "origin": [8, 8, 8], + "color": 0, + "nbt": "{}", + "armAnimationEnabled": false, + "children": [ + { + "name": "Blade", + "origin": [7.5, 15.5, 8.5], + "color": 0, + "nbt": "{}", + "armAnimationEnabled": false, + "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13] + }, + { + "name": "Hilt", + "origin": [7.5, 15.5, 8.5], + "color": 0, + "nbt": "{}", + "armAnimationEnabled": false, + "children": [14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27] + }, + { + "name": "leaves", + "origin": [8, 8, 8], + "color": 0, + "nbt": "{}", + "armAnimationEnabled": false, + "children": [28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42] + } + ] + }, + { + "name": "effect", + "origin": [8, 8, 8], + "color": 0, + "nbt": "{}", + "armAnimationEnabled": false, + "children": [43] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/simplyswords/textures/item/blade_thorn.png b/src/main/resources/assets/simplyswords/textures/item/blade_thorn.png new file mode 100644 index 0000000000000000000000000000000000000000..101d901d1679115d4f6d665f20a68f0246c52ae8 GIT binary patch literal 406 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1SD0tpLH@YFvfbiIEG|2zMZi#i^);Mb-tni z=gV#JN!j8XVmuz3v;5(B`?sa0(>^g%(j$F!#O}ErjNKyqj&o{n-V80if57&{1|6~D zccp1}-q!fp#m$>v_IrMJp~0K(j*gnM(>EW@3i(oE^W^xuXNEGYN1XqJySw_kl&pK$ zaY*FGH0!@7GGDd-`Ek5skt1{1H$UkOA13cjYTN$rUdX-gllKZ;J&?0;(yA-AUoI5! zMwI`P4|WI+U-tO>_3d{~*`3~0eQrbBiVr2WB}=V-Z_;^hyj>%21KS1{&X)8IkE+Bk z-QSxgZ}uSZf1uU1`IcXfBpFI?nDh;3JXeJJy7s;Q=S<^mxvmjqCJ?tc<3hvv*cFb< z_vW!onboZGkZnqf^oI#~Jf_(P?0e^T?sa4|5pi%vCSG#Ch(1!_)A~i)!T&*&MnfA@ f1~y`n_z%{Wu&a9g=OxU6;mzRb>gTe~DWM4f3zxJo literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/simplyswords/textures/item/bramble_chromatic.png b/src/main/resources/assets/simplyswords/textures/item/bramble_chromatic.png new file mode 100644 index 0000000000000000000000000000000000000000..c459eb031cf4f570a2ba72c8873178f6ab92b4da GIT binary patch literal 16997 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/simplyswords/textures/item/bramble_chromatic.png.mcmeta b/src/main/resources/assets/simplyswords/textures/item/bramble_chromatic.png.mcmeta new file mode 100644 index 00000000..d825a74b --- /dev/null +++ b/src/main/resources/assets/simplyswords/textures/item/bramble_chromatic.png.mcmeta @@ -0,0 +1,7 @@ +{ + "animation": { + "frametime": 1, + "interpolate": false + } + +} \ No newline at end of file diff --git a/src/main/resources/assets/simplyswords/textures/item/bramble_chromatic_e.png b/src/main/resources/assets/simplyswords/textures/item/bramble_chromatic_e.png new file mode 100644 index 0000000000000000000000000000000000000000..c459eb031cf4f570a2ba72c8873178f6ab92b4da GIT binary patch literal 16997 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/simplyswords/textures/item/bramble_chromatic_e.png.mcmeta b/src/main/resources/assets/simplyswords/textures/item/bramble_chromatic_e.png.mcmeta new file mode 100644 index 00000000..d825a74b --- /dev/null +++ b/src/main/resources/assets/simplyswords/textures/item/bramble_chromatic_e.png.mcmeta @@ -0,0 +1,7 @@ +{ + "animation": { + "frametime": 1, + "interpolate": false + } + +} \ No newline at end of file diff --git a/src/main/resources/assets/simplyswords/textures/item/hilt_wood.png b/src/main/resources/assets/simplyswords/textures/item/hilt_wood.png new file mode 100644 index 0000000000000000000000000000000000000000..bd8ae10bc659d4d49c5cfea8f64ebdeaa4c59291 GIT binary patch literal 429 zcmV;e0aE^nP)U&B@M+$@PzRfrxBex(APT1_lPE?>~Qk|M?rD8Ey)GJ(!Nb%7y?IxC1d6 zXxcEvG1X(LVIj$}a6m9*;DCud3n1X@r?+sFoEJcS3y1+^1`#r_varM>OEn+NowR`* z3m~b2lbsdLK$hj^6Xxa*93TVCR78b1Kr7PG07Y@|_0wAh1_pRmU|?X-*HS}EQB;cq zc#=gEXY!ABfgrMt_K&n+fMs&bI3OX2h^YfGeL!+)itI*A<1piZ=}TQS$985s0jX6_Ua5o*XZo9xZx zFte4pd*eKDhMAiJ(th3*d%WQ3R%e#`3tfvi_B!vrp}Obkm#SL(XKa7PzJ7MQ)S5B> v1)KWDHw&Aub%*dezII*Jcewn|gbxgH5rNX$w^j3j&SLO%^>bP0l+XkKCDluh literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/simplyswords/textures/mob_effect/bramble.png b/src/main/resources/assets/simplyswords/textures/mob_effect/bramble.png new file mode 100644 index 0000000000000000000000000000000000000000..2fdde97b411958b869c5101e70397d9fd0ef6cf2 GIT binary patch literal 142 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9F3${@^GvDCf{DCpqn z;uvDloBZehe|u)thEAosCgu;;E`R=i`@DHiBtKlcEG%YG!JIjv{on?&t;ucLK6THZ7=!& literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/simplyswords/textures/mob_effect/storm.png b/src/main/resources/assets/simplyswords/textures/mob_effect/storm.png new file mode 100644 index 0000000000000000000000000000000000000000..2fdde97b411958b869c5101e70397d9fd0ef6cf2 GIT binary patch literal 142 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9F3${@^GvDCf{DCpqn z;uvDloBZehe|u)thEAosCgu;;E`R=i`@DHiBtKlcEG%YG!JIjv{on?&t;ucLK6THZ7=!& literal 0 HcmV?d00001 diff --git a/src/main/resources/data/simplyswords/tags/items/swords.json b/src/main/resources/data/simplyswords/tags/items/swords.json index c11037e2..1b039682 100644 --- a/src/main/resources/data/simplyswords/tags/items/swords.json +++ b/src/main/resources/data/simplyswords/tags/items/swords.json @@ -25,6 +25,7 @@ "simplyswords:brimstone_claymore", "simplyswords:storms_edge", "simplyswords:sword_on_a_stick", + "simplyswords:bramblethorn", "simplyswords:runic_twinblade", "simplyswords:runic_claymore", "simplyswords:runic_cutlass", diff --git a/src/main/resources/data/simplyswords/weapon_attributes/bramblethorn.json b/src/main/resources/data/simplyswords/weapon_attributes/bramblethorn.json new file mode 100644 index 00000000..8d3980c1 --- /dev/null +++ b/src/main/resources/data/simplyswords/weapon_attributes/bramblethorn.json @@ -0,0 +1,3 @@ +{ + "parent": "bettercombat:rapier" +} \ No newline at end of file diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 6384cc12..61f7cf05 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -9,12 +9,13 @@ "Sweenus" ], "contact": { - "homepage": "https://fabricmc.net/", - "sources": "https://github.com/Sweenus/SimplySwords-1.19" + "homepage": "https://www.curseforge.com/minecraft/mc-mods/simply-swords", + "sources": "https://github.com/Sweenus/SimplySwords-1.19", + "issues": "https://github.com/Sweenus/SimplySwords/issues" }, "license": "GNU LESSER GENERAL PUBLIC LICENSE", - "icon": "assets/modid/icon.png", + "icon": "assets/simplyswords/SimplySwords_logo.png", "environment": "*", "entrypoints": { @@ -27,9 +28,9 @@ ], "depends": { - "fabricloader": ">=0.14.6", + "fabricloader": ">=0.14.0", "fabric": "*", - "minecraft": "~1.19", + "minecraft": "1.19.X", "java": ">=17" }, "suggests": {