From 7a11f4dad6f7ce082c5035c67ea753dc660e5559 Mon Sep 17 00:00:00 2001 From: Atsuihsio <842960157@qq.com> Date: Wed, 26 Jun 2024 16:07:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=88=86=E7=82=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../target/entity/BocekArrowEntity.java | 4 +- .../target/entity/ClaymoreEntity.java | 10 +- .../target/entity/GunGrenadeEntity.java | 2 +- .../target/entity/ProjectileEntity.java | 4 +- .../target/entity/RpgRocketEntity.java | 2 +- .../target/event/LivingEventHandler.java | 32 +- .../target/procedures/M79fireProcedure.java | 2 +- .../target/procedures/RpgFireProcedure.java | 2 +- .../target/models/custom/tiesiwang.json | 1550 +++-------------- .../minecraft/tags/blocks/mineable/axe.json | 6 + .../tags/blocks/mineable/shovel.json | 6 + 11 files changed, 279 insertions(+), 1341 deletions(-) create mode 100644 src/main/resources/data/minecraft/tags/blocks/mineable/axe.json create mode 100644 src/main/resources/data/minecraft/tags/blocks/mineable/shovel.json diff --git a/src/main/java/net/mcreator/target/entity/BocekArrowEntity.java b/src/main/java/net/mcreator/target/entity/BocekArrowEntity.java index 6409df6d1..37b761ca6 100644 --- a/src/main/java/net/mcreator/target/entity/BocekArrowEntity.java +++ b/src/main/java/net/mcreator/target/entity/BocekArrowEntity.java @@ -149,9 +149,9 @@ public class BocekArrowEntity extends AbstractArrow implements ItemSupplier { } } else { if (entity instanceof Monster monster) { - hurt = monster.hurt(TargetModDamageTypes.causeArrowInBrainDamage(this.level().registryAccess(), this, this.getOwner()), (float) i * damageMultiplier); + hurt = monster.hurt(TargetModDamageTypes.causeArrowInKneeDamage(this.level().registryAccess(), this, this.getOwner()), (float) i * damageMultiplier); } else { - hurt = entity.hurt(TargetModDamageTypes.causeArrowInBrainDamage(this.level().registryAccess(), this, this.getOwner()), (float) i); + hurt = entity.hurt(TargetModDamageTypes.causeArrowInKneeDamage(this.level().registryAccess(), this, this.getOwner()), (float) i); } } diff --git a/src/main/java/net/mcreator/target/entity/ClaymoreEntity.java b/src/main/java/net/mcreator/target/entity/ClaymoreEntity.java index 145954063..b32fd2b17 100644 --- a/src/main/java/net/mcreator/target/entity/ClaymoreEntity.java +++ b/src/main/java/net/mcreator/target/entity/ClaymoreEntity.java @@ -1,9 +1,8 @@ package net.mcreator.target.entity; import net.mcreator.target.TargetMod; -import net.mcreator.target.init.TargetModDamageTypes; -import net.mcreator.target.init.TargetModEntities; -import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.init.*; +import net.mcreator.target.network.TargetModVariables; import net.mcreator.target.tools.CustomExplosion; import net.mcreator.target.tools.ParticleTool; import net.minecraft.core.registries.Registries; @@ -28,6 +27,7 @@ import net.minecraft.world.entity.projectile.ThrownPotion; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.SpawnEggItem; +import net.minecraft.world.item.enchantment.EnchantmentHelper; import net.minecraft.world.level.Explosion; import net.minecraft.world.level.Level; import net.minecraft.world.phys.AABB; @@ -249,13 +249,11 @@ public class ClaymoreEntity extends TamableAnimal implements GeoEntity, Animated private void triggerExplode(Entity target) { CustomExplosion explosion = new CustomExplosion(this.level(), this, - TargetModDamageTypes.causeProjectileBoomDamage(this.level().registryAccess(), this, this.getOwner()), 150f, + TargetModDamageTypes.causeMineDamage(this.level().registryAccess(), this.getOwner()), 150f, target.getX(), target.getY(), target.getZ(), 4f, Explosion.BlockInteraction.KEEP).setDamageMultiplier(1); explosion.explode(); net.minecraftforge.event.ForgeEventFactory.onExplosionStart(this.level(), explosion); explosion.finalizeExplosion(false); - - ParticleTool.spawnMediumExplosionParticles(this.level(), this.position()); } @Override diff --git a/src/main/java/net/mcreator/target/entity/GunGrenadeEntity.java b/src/main/java/net/mcreator/target/entity/GunGrenadeEntity.java index 23c00db81..43b52ef56 100644 --- a/src/main/java/net/mcreator/target/entity/GunGrenadeEntity.java +++ b/src/main/java/net/mcreator/target/entity/GunGrenadeEntity.java @@ -171,7 +171,7 @@ public class GunGrenadeEntity extends ThrowableItemProjectile { private void causeExplode() { CustomExplosion explosion = new CustomExplosion(this.level(), this, - TargetModDamageTypes.causeProjectileBoomDamage(this.level().registryAccess(), this, this.getOwner()), 72f, + TargetModDamageTypes.causeProjectileBoomDamage(this.level().registryAccess(), this, this.getOwner()), 1.8f * this.damage, this.getX(), this.getY(), this.getZ(), 7.5f, Explosion.BlockInteraction.KEEP).setDamageMultiplier(this.monsterMultiplier); explosion.explode(); net.minecraftforge.event.ForgeEventFactory.onExplosionStart(this.level(), explosion); diff --git a/src/main/java/net/mcreator/target/entity/ProjectileEntity.java b/src/main/java/net/mcreator/target/entity/ProjectileEntity.java index 206552f0f..bd6e1c888 100644 --- a/src/main/java/net/mcreator/target/entity/ProjectileEntity.java +++ b/src/main/java/net/mcreator/target/entity/ProjectileEntity.java @@ -198,10 +198,10 @@ public class ProjectileEntity extends Entity implements IEntityAdditionalSpawnDa boolean legshot = false; float eyeHeight = entity.getEyeHeight(); float BodyHeight = entity.getBbHeight(); - if ((eyeHeight - 0.35) < hitBoxPos.y && hitBoxPos.y < (eyeHeight + 0.4)) { + if ((eyeHeight - 0.35) < hitBoxPos.y && hitBoxPos.y < (eyeHeight + 0.4) && !(entity instanceof ClaymoreEntity || entity instanceof MortarEntity)) { headshot = true; } - if (hitBoxPos.y < (0.33 * BodyHeight)) { + if (hitBoxPos.y < (0.33 * BodyHeight) && !(entity instanceof ClaymoreEntity || entity instanceof MortarEntity)) { legshot = true; } diff --git a/src/main/java/net/mcreator/target/entity/RpgRocketEntity.java b/src/main/java/net/mcreator/target/entity/RpgRocketEntity.java index d7753e080..a0597cf45 100644 --- a/src/main/java/net/mcreator/target/entity/RpgRocketEntity.java +++ b/src/main/java/net/mcreator/target/entity/RpgRocketEntity.java @@ -185,7 +185,7 @@ public class RpgRocketEntity extends ThrowableItemProjectile { private void causeExplode() { CustomExplosion explosion = new CustomExplosion(this.level(), this, - TargetModDamageTypes.causeProjectileBoomDamage(this.level().registryAccess(), this, this.getOwner()), 100f, + TargetModDamageTypes.causeProjectileBoomDamage(this.level().registryAccess(), this, this.getOwner()), (float) 2 / 3 * this.damage, this.getX(), this.getY(), this.getZ(), 10f, Explosion.BlockInteraction.KEEP).setDamageMultiplier(this.monsterMultiplier); explosion.explode(); net.minecraftforge.event.ForgeEventFactory.onExplosionStart(this.level(), explosion); diff --git a/src/main/java/net/mcreator/target/event/LivingEventHandler.java b/src/main/java/net/mcreator/target/event/LivingEventHandler.java index a32b819cf..26b9b2f41 100644 --- a/src/main/java/net/mcreator/target/event/LivingEventHandler.java +++ b/src/main/java/net/mcreator/target/event/LivingEventHandler.java @@ -43,15 +43,6 @@ public class LivingEventHandler { reduceBulletDamage(event, event.getSource(), event.getEntity(), event.getSource().getEntity(), event.getAmount()); } - @SubscribeEvent - public static void onEntityAttacked(LivingAttackEvent event) { - if (event == null || event.getEntity() == null) { - return; - } - - claymoreDamage(event); - } - @SubscribeEvent public static void onEntityDeath(LivingDeathEvent event) { if (event == null || event.getEntity() == null) { @@ -72,7 +63,7 @@ public class LivingEventHandler { if (damagesource.is(TargetModDamageTypes.ARROW_IN_KNEE) || damagesource.is(TargetModDamageTypes.ARROW_IN_BRAIN)) { stack.getOrCreateTag().putDouble("damagetotal", stack.getOrCreateTag().getDouble("damagetotal") + damage); } - if ((damagesource.is(DamageTypes.EXPLOSION) || damagesource.is(DamageTypes.PLAYER_EXPLOSION) || damagesource.is(DamageTypes.ARROW)) + if ((damagesource.is(TargetModDamageTypes.PROJECTILE_BOOM) || damagesource.is(DamageTypes.ARROW)) && (stack.getItem() == TargetModItems.M_79.get() || stack.getItem() == TargetModItems.RPG.get()) ) { stack.getOrCreateTag().putDouble("damagetotal", stack.getOrCreateTag().getDouble("damagetotal") + damage); @@ -94,10 +85,10 @@ public class LivingEventHandler { } event.setAmount((float) damage); stack.getOrCreateTag().putDouble("damagetotal", stack.getOrCreateTag().getDouble("damagetotal") + damage); + } - if (entity instanceof Target1Entity && sourceentity instanceof Player player) { - player.displayClientMessage(Component.literal("Damage:" + new java.text.DecimalFormat("##.#").format(damage) + " Distance:" + new java.text.DecimalFormat("##.#").format((entity.position()).distanceTo((sourceentity.position()))) + "M"), false); - } + if (entity instanceof Target1Entity && sourceentity instanceof Player player) { + player.displayClientMessage(Component.literal("Damage:" + new java.text.DecimalFormat("##.#").format(damage) + " Distance:" + new java.text.DecimalFormat("##.#").format((entity.position()).distanceTo((sourceentity.position()))) + "M"), false); } } @@ -105,21 +96,6 @@ public class LivingEventHandler { return amount / (1 + rate * Math.max(0, distance - minDistance)); } - private static void claymoreDamage(LivingAttackEvent event) { - LivingEntity entity = event.getEntity(); - DamageSource source = event.getSource(); - Entity sourceentity = source.getEntity(); - - if (event.getEntity() == null || entity == null || sourceentity == null) { - return; - } - - if ((source.is(DamageTypes.EXPLOSION) || source.is(DamageTypes.PLAYER_EXPLOSION)) && sourceentity instanceof ClaymoreEntity claymore) { - event.setCanceled(true); - entity.hurt(TargetModDamageTypes.causeMineDamage(entity.level().registryAccess(), claymore.getOwner()), event.getAmount()); - } - } - private static void killIndication(Entity sourceEntity) { if (sourceEntity == null) { return; diff --git a/src/main/java/net/mcreator/target/procedures/M79fireProcedure.java b/src/main/java/net/mcreator/target/procedures/M79fireProcedure.java index 5adae4c3a..cbd350562 100644 --- a/src/main/java/net/mcreator/target/procedures/M79fireProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/M79fireProcedure.java @@ -36,7 +36,7 @@ public class M79fireProcedure { Level level = entity.level(); if (!level.isClientSide()) { int monsterMultiple = EnchantmentHelper.getTagEnchantmentLevel(TargetModEnchantments.MONSTER_HUNTER.get(), stack); - GunGrenadeEntity gunGrenadeEntity = new GunGrenadeEntity(player, level, (float) stack.getOrCreateTag().getDouble("damage"), monsterMultiple); + GunGrenadeEntity gunGrenadeEntity = new GunGrenadeEntity(player, level, (float) stack.getOrCreateTag().getDouble("damage") * (float) stack.getOrCreateTag().getDouble("damageadd"), monsterMultiple); gunGrenadeEntity.setPos(entity.getX(), entity.getEyeY() - 0.1, entity.getZ()); gunGrenadeEntity.shoot(entity.getLookAngle().x, entity.getLookAngle().y, entity.getLookAngle().z, (float) stack.getOrCreateTag().getDouble("velocity"), diff --git a/src/main/java/net/mcreator/target/procedures/RpgFireProcedure.java b/src/main/java/net/mcreator/target/procedures/RpgFireProcedure.java index 1f64af375..a99eb69c0 100644 --- a/src/main/java/net/mcreator/target/procedures/RpgFireProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/RpgFireProcedure.java @@ -39,7 +39,7 @@ public class RpgFireProcedure { if (!level.isClientSide()) { int monsterMultiple = EnchantmentHelper.getTagEnchantmentLevel(TargetModEnchantments.MONSTER_HUNTER.get(), mainHandItem); - RpgRocketEntity rocketEntity = new RpgRocketEntity(player, level, (float) tag.getDouble("damage"), monsterMultiple); + RpgRocketEntity rocketEntity = new RpgRocketEntity(player, level, (float) tag.getDouble("damage") * (float) tag.getDouble("damageadd"), monsterMultiple); rocketEntity.setPos(player.getX(), player.getEyeY() - 0.1, player.getZ()); rocketEntity.shoot(player.getLookAngle().x, player.getLookAngle().y, player.getLookAngle().z, (float) tag.getDouble("velocity"), (float) player.getAttribute(TargetModAttributes.SPREAD.get()).getBaseValue()); diff --git a/src/main/resources/assets/target/models/custom/tiesiwang.json b/src/main/resources/assets/target/models/custom/tiesiwang.json index ff4797f0b..ae41975a7 100644 --- a/src/main/resources/assets/target/models/custom/tiesiwang.json +++ b/src/main/resources/assets/target/models/custom/tiesiwang.json @@ -1,1301 +1,253 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 64, - 64 - ], - "elements": [ - { - "from": [ - 0, - 0, - 1 - ], - "to": [ - 2, - 23, - 2 - ], - "rotation": { - "angle": -45, - "axis": "z", - "origin": [ - 1, - 1, - 1 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 0, - 0.5, - 5.75 - ], - "texture": "#1" - }, - "east": { - "uv": [ - 5, - 2, - 5.25, - 7.75 - ], - "texture": "#1" - }, - "south": { - "uv": [ - 0.5, - 0, - 1, - 5.75 - ], - "texture": "#1" - }, - "west": { - "uv": [ - 5.25, - 2, - 5.5, - 7.75 - ], - "texture": "#1" - }, - "up": { - "uv": [ - 1, - 6, - 0.5, - 5.75 - ], - "texture": "#1" - }, - "down": { - "uv": [ - 1.5, - 5.75, - 1, - 6 - ], - "texture": "#1" - } - } - }, - { - "from": [ - 14, - 0, - 0 - ], - "to": [ - 16, - 22, - 1 - ], - "rotation": { - "angle": 45, - "axis": "z", - "origin": [ - 15, - 1, - 1 - ] - }, - "faces": { - "north": { - "uv": [ - 2, - 0, - 2.5, - 5.5 - ], - "texture": "#1" - }, - "east": { - "uv": [ - 2.25, - 5.5, - 2.5, - 11 - ], - "texture": "#1" - }, - "south": { - "uv": [ - 2.5, - 0, - 3, - 5.5 - ], - "texture": "#1" - }, - "west": { - "uv": [ - 2.5, - 5.5, - 2.75, - 11 - ], - "texture": "#1" - }, - "up": { - "uv": [ - 2, - 6, - 1.5, - 5.75 - ], - "texture": "#1" - }, - "down": { - "uv": [ - 6.25, - 2, - 5.75, - 2.25 - ], - "texture": "#1" - } - } - }, - { - "from": [ - 14.5, - 10.5, - -0.1 - ], - "to": [ - 15.5, - 11.5, - 0 - ], - "rotation": { - "angle": 45, - "axis": "z", - "origin": [ - 15, - 1, - 1 - ] - }, - "faces": { - "north": { - "uv": [ - 3.75, - 5.5, - 4, - 5.75 - ], - "texture": "#1" - }, - "east": { - "uv": [ - 5.75, - 3.25, - 6, - 3.5 - ], - "texture": "#1" - }, - "south": { - "uv": [ - 5.75, - 3.5, - 6, - 3.75 - ], - "texture": "#1" - }, - "west": { - "uv": [ - 3.75, - 5.75, - 4, - 6 - ], - "texture": "#1" - }, - "up": { - "uv": [ - 6, - 4, - 5.75, - 3.75 - ], - "texture": "#1" - }, - "down": { - "uv": [ - 6, - 4, - 5.75, - 4.25 - ], - "texture": "#1" - } - } - }, - { - "from": [ - 14.5, - 10.5, - 16 - ], - "to": [ - 15.5, - 11.5, - 16.1 - ], - "rotation": { - "angle": 45, - "axis": "z", - "origin": [ - 15, - 1, - 15 - ] - }, - "faces": { - "north": { - "uv": [ - 5.75, - 4.25, - 6, - 4.5 - ], - "texture": "#1" - }, - "east": { - "uv": [ - 5.75, - 4.5, - 6, - 4.75 - ], - "texture": "#1" - }, - "south": { - "uv": [ - 5.75, - 4.75, - 6, - 5 - ], - "texture": "#1" - }, - "west": { - "uv": [ - 5.75, - 5, - 6, - 5.25 - ], - "texture": "#1" - }, - "up": { - "uv": [ - 6, - 5.5, - 5.75, - 5.25 - ], - "texture": "#1" - }, - "down": { - "uv": [ - 6, - 5.5, - 5.75, - 5.75 - ], - "texture": "#1" - } - } - }, - { - "from": [ - 0, - 0, - 14 - ], - "to": [ - 2, - 23, - 15 - ], - "rotation": { - "angle": -45, - "axis": "z", - "origin": [ - 1, - 1, - 15 - ] - }, - "faces": { - "north": { - "uv": [ - 1, - 0, - 1.5, - 5.75 - ], - "texture": "#1" - }, - "east": { - "uv": [ - 2, - 5.5, - 2.25, - 11.25 - ], - "texture": "#1" - }, - "south": { - "uv": [ - 1.5, - 0, - 2, - 5.75 - ], - "texture": "#1" - }, - "west": { - "uv": [ - 5.5, - 2, - 5.75, - 7.75 - ], - "texture": "#1" - }, - "up": { - "uv": [ - 6.25, - 2.5, - 5.75, - 2.25 - ], - "texture": "#1" - }, - "down": { - "uv": [ - 6.25, - 2.5, - 5.75, - 2.75 - ], - "texture": "#1" - } - } - }, - { - "from": [ - -2, - 11.9, - 0.5 - ], - "to": [ - 0, - 13.9, - 15.5 - ], - "rotation": { - "angle": -45, - "axis": "z", - "origin": [ - 1, - 1, - 15 - ] - }, - "faces": { - "north": { - "uv": [ - 3.25, - 5.5, - 3.75, - 6 - ], - "texture": "#1" - }, - "east": { - "uv": [ - 4, - 0, - 7.75, - 0.5 - ], - "texture": "#1" - }, - "south": { - "uv": [ - 0, - 5.75, - 0.5, - 6.25 - ], - "texture": "#1" - }, - "west": { - "uv": [ - 4, - 0.5, - 7.75, - 1 - ], - "texture": "#1" - }, - "up": { - "uv": [ - 4.5, - 4.75, - 4, - 1 - ], - "texture": "#1" - }, - "down": { - "uv": [ - 5, - 1, - 4.5, - 4.75 - ], - "texture": "#1" - } - } - }, - { - "from": [ - 14, - 0, - 15 - ], - "to": [ - 16, - 22, - 16 - ], - "rotation": { - "angle": 45, - "axis": "z", - "origin": [ - 15, - 1, - 15 - ] - }, - "faces": { - "north": { - "uv": [ - 3, - 0, - 3.5, - 5.5 - ], - "texture": "#1" - }, - "east": { - "uv": [ - 2.75, - 5.5, - 3, - 11 - ], - "texture": "#1" - }, - "south": { - "uv": [ - 3.5, - 0, - 4, - 5.5 - ], - "texture": "#1" - }, - "west": { - "uv": [ - 3, - 5.5, - 3.25, - 11 - ], - "texture": "#1" - }, - "up": { - "uv": [ - 6.25, - 3, - 5.75, - 2.75 - ], - "texture": "#1" - }, - "down": { - "uv": [ - 6.25, - 3, - 5.75, - 3.25 - ], - "texture": "#1" - } - } - }, - { - "from": [ - 0.92929, - 14.07142, - 1 - ], - "to": [ - 0.92929, - 16.07142, - 15 - ], - "rotation": { - "angle": -45, - "axis": "z", - "origin": [ - 0.92929, - 15.07142, - 8 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 0, - 0, - 0.5 - ], - "texture": "#1" - }, - "east": { - "uv": [ - 5, - 1, - 8.5, - 1.5 - ], - "texture": "#1" - }, - "south": { - "uv": [ - 0, - 0, - 0, - 0.5 - ], - "texture": "#1" - }, - "west": { - "uv": [ - 5, - 1.5, - 8.5, - 2 - ], - "texture": "#1" - }, - "up": { - "uv": [ - 0, - 3.5, - 0, - 0 - ], - "texture": "#1" - }, - "down": { - "uv": [ - 0, - 0, - 0, - 3.5 - ], - "texture": "#1" - } - } - }, - { - "from": [ - -10, - 10.9, - 1 - ], - "to": [ - -8, - 10.9, - 15 - ], - "rotation": { - "angle": -45, - "axis": "z", - "origin": [ - 1, - 1, - 15 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 0, - 0.5, - 0 - ], - "texture": "#1" - }, - "east": { - "uv": [ - 0, - 0, - 3.5, - 0 - ], - "texture": "#1" - }, - "south": { - "uv": [ - 0, - 0, - 0.5, - 0 - ], - "texture": "#1" - }, - "west": { - "uv": [ - 0, - 0, - 3.5, - 0 - ], - "texture": "#1" - }, - "up": { - "uv": [ - 4.5, - 8.25, - 4, - 4.75 - ], - "texture": "#1" - }, - "down": { - "uv": [ - 5, - 4.75, - 4.5, - 8.25 - ], - "texture": "#1" - } - } - }, - { - "from": [ - 10.92929, - 25.07142, - 1 - ], - "to": [ - 10.92929, - 27.07142, - 15 - ], - "rotation": { - "angle": -45, - "axis": "z", - "origin": [ - 0.92929, - 15.07142, - 8 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 0, - 0, - 0.5 - ], - "texture": "#1" - }, - "east": { - "uv": [ - 5, - 1, - 8.5, - 1.5 - ], - "texture": "#1" - }, - "south": { - "uv": [ - 0, - 0, - 0, - 0.5 - ], - "texture": "#1" - }, - "west": { - "uv": [ - 5, - 1.5, - 8.5, - 2 - ], - "texture": "#1" - }, - "up": { - "uv": [ - 0, - 3.5, - 0, - 0 - ], - "texture": "#1" - }, - "down": { - "uv": [ - 0, - 0, - 0, - 3.5 - ], - "texture": "#1" - } - } - }, - { - "from": [ - 0, - 21.9, - 1 - ], - "to": [ - 2, - 21.9, - 15 - ], - "rotation": { - "angle": -45, - "axis": "z", - "origin": [ - 1, - 1, - 15 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 0, - 0.5, - 0 - ], - "texture": "#1" - }, - "east": { - "uv": [ - 0, - 0, - 3.5, - 0 - ], - "texture": "#1" - }, - "south": { - "uv": [ - 0, - 0, - 0.5, - 0 - ], - "texture": "#1" - }, - "west": { - "uv": [ - 0, - 0, - 3.5, - 0 - ], - "texture": "#1" - }, - "up": { - "uv": [ - 4.5, - 8.25, - 4, - 4.75 - ], - "texture": "#1" - }, - "down": { - "uv": [ - 5, - 4.75, - 4.5, - 8.25 - ], - "texture": "#1" - } - } - }, - { - "from": [ - 10.92929, - 5.07142, - 1 - ], - "to": [ - 10.92929, - 7.07142, - 15 - ], - "rotation": { - "angle": -45, - "axis": "z", - "origin": [ - 0.92929, - 15.07142, - 8 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 0, - 0, - 0.5 - ], - "texture": "#1" - }, - "east": { - "uv": [ - 5, - 1, - 8.5, - 1.5 - ], - "texture": "#1" - }, - "south": { - "uv": [ - 0, - 0, - 0, - 0.5 - ], - "texture": "#1" - }, - "west": { - "uv": [ - 5, - 1.5, - 8.5, - 2 - ], - "texture": "#1" - }, - "up": { - "uv": [ - 0, - 3.5, - 0, - 0 - ], - "texture": "#1" - }, - "down": { - "uv": [ - 0, - 0, - 0, - 3.5 - ], - "texture": "#1" - } - } - }, - { - "from": [ - 0, - 1.9, - 1 - ], - "to": [ - 2, - 1.9, - 15 - ], - "rotation": { - "angle": -45, - "axis": "z", - "origin": [ - 1, - 1, - 15 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 0, - 0.5, - 0 - ], - "texture": "#1" - }, - "east": { - "uv": [ - 0, - 0, - 3.5, - 0 - ], - "texture": "#1" - }, - "south": { - "uv": [ - 0, - 0, - 0.5, - 0 - ], - "texture": "#1" - }, - "west": { - "uv": [ - 0, - 0, - 3.5, - 0 - ], - "texture": "#1" - }, - "up": { - "uv": [ - 4.5, - 8.25, - 4, - 4.75 - ], - "texture": "#1" - }, - "down": { - "uv": [ - 5, - 4.75, - 4.5, - 8.25 - ], - "texture": "#1" - } - } - }, - { - "from": [ - 9, - 10.9, - 1 - ], - "to": [ - 11, - 10.9, - 15 - ], - "rotation": { - "angle": -45, - "axis": "z", - "origin": [ - 1, - 1, - 15 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 0, - 0.5, - 0 - ], - "texture": "#1" - }, - "east": { - "uv": [ - 0, - 0, - 3.5, - 0 - ], - "texture": "#1" - }, - "south": { - "uv": [ - 0, - 0, - 0.5, - 0 - ], - "texture": "#1" - }, - "west": { - "uv": [ - 0, - 0, - 3.5, - 0 - ], - "texture": "#1" - }, - "up": { - "uv": [ - 4.5, - 8.25, - 4, - 4.75 - ], - "texture": "#1" - }, - "down": { - "uv": [ - 5, - 4.75, - 4.5, - 8.25 - ], - "texture": "#1" - } - } - }, - { - "from": [ - 19.92929, - 14.07142, - 1 - ], - "to": [ - 19.92929, - 16.07142, - 15 - ], - "rotation": { - "angle": -45, - "axis": "z", - "origin": [ - 0.92929, - 15.07142, - 8 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 0, - 0, - 0.5 - ], - "texture": "#1" - }, - "east": { - "uv": [ - 5, - 1, - 8.5, - 1.5 - ], - "texture": "#1" - }, - "south": { - "uv": [ - 0, - 0, - 0, - 0.5 - ], - "texture": "#1" - }, - "west": { - "uv": [ - 5, - 1.5, - 8.5, - 2 - ], - "texture": "#1" - }, - "up": { - "uv": [ - 0, - 3.5, - 0, - 0 - ], - "texture": "#1" - }, - "down": { - "uv": [ - 0, - 0, - 0, - 3.5 - ], - "texture": "#1" - } - } - } - ], - "gui_light": "front", - "display": { - "thirdperson_righthand": { - "translation": [ - 0, - 1, - -3.5 - ], - "scale": [ - 0.5, - 0.5, - 0.5 - ] - }, - "thirdperson_lefthand": { - "translation": [ - 0, - 1, - -3.5 - ], - "scale": [ - 0.5, - 0.5, - 0.5 - ] - }, - "firstperson_righthand": { - "rotation": [ - 21.15, - 23.99, - -8.94 - ], - "translation": [ - 0, - 3.5, - -0.5 - ], - "scale": [ - 0.5, - 0.5, - 0.5 - ] - }, - "firstperson_lefthand": { - "rotation": [ - 21.15, - 23.99, - -8.94 - ], - "translation": [ - 0, - 3.5, - -0.5 - ], - "scale": [ - 0.5, - 0.5, - 0.5 - ] - }, - "ground": { - "translation": [ - 0, - 3.25, - 0 - ], - "scale": [ - 0.4, - 0.4, - 0.4 - ] - }, - "gui": { - "rotation": [ - 19.29, - 47.82, - -2.83 - ], - "translation": [ - 0, - 0, - -6.25 - ], - "scale": [ - 0.6, - 0.6, - 0.6 - ] - }, - "head": { - "translation": [ - 0, - 14.25, - 0 - ] - }, - "fixed": { - "rotation": [ - 0, - 90, - 0 - ], - "translation": [ - 0, - 0, - -6.25 - ] - } - }, - "groups": [ - { - "name": "group", - "origin": [ - 15, - 1, - 15 - ], - "color": 0, - "children": [ - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11, - 12, - 13, - 14 - ] - } - ] + "credit": "Made with Blockbench", + "texture_size": [64, 64], + "elements": [ + { + "from": [1.35391, -2.94254, 6.75], + "to": [2.35391, 20.05746, 8.75], + "rotation": {"angle": 45, "axis": "x", "origin": [8.35391, 8.70746, 8]}, + "faces": { + "north": {"uv": [5, 2, 5.25, 7.75], "texture": "#1"}, + "east": {"uv": [0.5, 0, 1, 5.75], "texture": "#1"}, + "south": {"uv": [5.25, 2, 5.5, 7.75], "texture": "#1"}, + "west": {"uv": [0, 0, 0.5, 5.75], "texture": "#1"}, + "up": {"uv": [1, 6, 0.5, 5.75], "rotation": 270, "texture": "#1"}, + "down": {"uv": [1.5, 5.75, 1, 6], "rotation": 90, "texture": "#1"} + } + }, + { + "from": [0.35391, -2.44203, 7.7505], + "to": [1.35391, 19.55797, 9.7505], + "rotation": {"angle": -45, "axis": "x", "origin": [8.35391, 8.70746, 8]}, + "faces": { + "north": {"uv": [2.25, 5.5, 2.5, 11], "texture": "#1"}, + "east": {"uv": [2.5, 0, 3, 5.5], "texture": "#1"}, + "south": {"uv": [2.5, 5.5, 2.75, 11], "texture": "#1"}, + "west": {"uv": [2, 0, 2.5, 5.5], "texture": "#1"}, + "up": {"uv": [2, 6, 1.5, 5.75], "rotation": 270, "texture": "#1"}, + "down": {"uv": [6.25, 2, 5.75, 2.25], "rotation": 90, "texture": "#1"} + } + }, + { + "from": [0.25391, 8.05797, 8.2505], + "to": [0.35391, 9.05797, 9.2505], + "rotation": {"angle": -45, "axis": "x", "origin": [8.35391, 8.70746, 8]}, + "faces": { + "north": {"uv": [5.75, 3.25, 6, 3.5], "texture": "#1"}, + "east": {"uv": [5.75, 3.5, 6, 3.75], "texture": "#1"}, + "south": {"uv": [3.75, 5.75, 4, 6], "texture": "#1"}, + "west": {"uv": [3.75, 5.5, 4, 5.75], "texture": "#1"}, + "up": {"uv": [6, 4, 5.75, 3.75], "rotation": 270, "texture": "#1"}, + "down": {"uv": [6, 4, 5.75, 4.25], "rotation": 90, "texture": "#1"} + } + }, + { + "from": [16.35391, 8.05797, 8.2505], + "to": [16.45391, 9.05797, 9.2505], + "rotation": {"angle": -45, "axis": "x", "origin": [8.35391, 8.70746, 8]}, + "faces": { + "north": {"uv": [5.75, 4.5, 6, 4.75], "texture": "#1"}, + "east": {"uv": [5.75, 4.75, 6, 5], "texture": "#1"}, + "south": {"uv": [5.75, 5, 6, 5.25], "texture": "#1"}, + "west": {"uv": [5.75, 4.25, 6, 4.5], "texture": "#1"}, + "up": {"uv": [6, 5.5, 5.75, 5.25], "rotation": 270, "texture": "#1"}, + "down": {"uv": [6, 5.5, 5.75, 5.75], "rotation": 90, "texture": "#1"} + } + }, + { + "from": [14.35391, -2.94254, 6.75], + "to": [15.35391, 20.05746, 8.75], + "rotation": {"angle": 45, "axis": "x", "origin": [8.35391, 8.70746, 8]}, + "faces": { + "north": {"uv": [2, 5.5, 2.25, 11.25], "texture": "#1"}, + "east": {"uv": [1.5, 0, 2, 5.75], "texture": "#1"}, + "south": {"uv": [5.5, 2, 5.75, 7.75], "texture": "#1"}, + "west": {"uv": [1, 0, 1.5, 5.75], "texture": "#1"}, + "up": {"uv": [6.25, 2.5, 5.75, 2.25], "rotation": 270, "texture": "#1"}, + "down": {"uv": [6.25, 2.5, 5.75, 2.75], "rotation": 90, "texture": "#1"} + } + }, + { + "from": [0.85391, 8.95746, 8.75], + "to": [15.85391, 10.95746, 10.75], + "rotation": {"angle": 45, "axis": "x", "origin": [8.35391, 8.70746, 8]}, + "faces": { + "north": {"uv": [4, 0, 7.75, 0.5], "texture": "#1"}, + "east": {"uv": [0, 5.75, 0.5, 6.25], "texture": "#1"}, + "south": {"uv": [4, 0.5, 7.75, 1], "texture": "#1"}, + "west": {"uv": [3.25, 5.5, 3.75, 6], "texture": "#1"}, + "up": {"uv": [4.5, 4.75, 4, 1], "rotation": 270, "texture": "#1"}, + "down": {"uv": [5, 1, 4.5, 4.75], "rotation": 90, "texture": "#1"} + } + }, + { + "from": [15.35391, -2.44203, 7.7505], + "to": [16.35391, 19.55797, 9.7505], + "rotation": {"angle": -45, "axis": "x", "origin": [8.35391, 8.70746, 8]}, + "faces": { + "north": {"uv": [2.75, 5.5, 3, 11], "texture": "#1"}, + "east": {"uv": [3.5, 0, 4, 5.5], "texture": "#1"}, + "south": {"uv": [3, 5.5, 3.25, 11], "texture": "#1"}, + "west": {"uv": [3, 0, 3.5, 5.5], "texture": "#1"}, + "up": {"uv": [6.25, 3, 5.75, 2.75], "rotation": 270, "texture": "#1"}, + "down": {"uv": [6.25, 3, 5.75, 3.25], "rotation": 90, "texture": "#1"} + } + }, + { + "from": [1.35391, 6.95746, 17.75], + "to": [15.35391, 8.95746, 17.75], + "rotation": {"angle": 45, "axis": "x", "origin": [8.35391, 8.70746, 8]}, + "faces": { + "north": {"uv": [5, 1, 8.5, 1.5], "texture": "#1"}, + "east": {"uv": [0, 0, 0, 0.5], "texture": "#1"}, + "south": {"uv": [5, 1.5, 8.5, 2], "texture": "#1"}, + "west": {"uv": [0, 0, 0, 0.5], "texture": "#1"}, + "up": {"uv": [0, 3.5, 0, 0], "rotation": 270, "texture": "#1"}, + "down": {"uv": [0, 0, 0, 3.5], "rotation": 90, "texture": "#1"} + } + }, + { + "from": [1.35391, 7.95746, 16.75], + "to": [15.35391, 7.95746, 18.75], + "rotation": {"angle": 45, "axis": "x", "origin": [8.35391, 8.70746, 8]}, + "faces": { + "north": {"uv": [0, 0, 3.5, 0], "texture": "#1"}, + "east": {"uv": [0, 0, 0.5, 0], "texture": "#1"}, + "south": {"uv": [0, 0, 3.5, 0], "texture": "#1"}, + "west": {"uv": [0, 0, 0.5, 0], "texture": "#1"}, + "up": {"uv": [4.5, 8.25, 4, 4.75], "rotation": 270, "texture": "#1"}, + "down": {"uv": [5, 4.75, 4.5, 8.25], "rotation": 90, "texture": "#1"} + } + }, + { + "from": [1.35391, 17.95746, 7.75], + "to": [15.35391, 19.95746, 7.75], + "rotation": {"angle": 45, "axis": "x", "origin": [8.35391, 8.70746, 8]}, + "faces": { + "north": {"uv": [5, 1, 8.5, 1.5], "texture": "#1"}, + "east": {"uv": [0, 0, 0, 0.5], "texture": "#1"}, + "south": {"uv": [5, 1.5, 8.5, 2], "texture": "#1"}, + "west": {"uv": [0, 0, 0, 0.5], "texture": "#1"}, + "up": {"uv": [0, 3.5, 0, 0], "rotation": 270, "texture": "#1"}, + "down": {"uv": [0, 0, 0, 3.5], "rotation": 90, "texture": "#1"} + } + }, + { + "from": [1.35391, 18.95746, 6.75], + "to": [15.35391, 18.95746, 8.75], + "rotation": {"angle": 45, "axis": "x", "origin": [8.35391, 8.70746, 8]}, + "faces": { + "north": {"uv": [0, 0, 3.5, 0], "texture": "#1"}, + "east": {"uv": [0, 0, 0.5, 0], "texture": "#1"}, + "south": {"uv": [0, 0, 3.5, 0], "texture": "#1"}, + "west": {"uv": [0, 0, 0.5, 0], "texture": "#1"}, + "up": {"uv": [4.5, 8.25, 4, 4.75], "rotation": 270, "texture": "#1"}, + "down": {"uv": [5, 4.75, 4.5, 8.25], "rotation": 90, "texture": "#1"} + } + }, + { + "from": [1.35391, -2.04254, 7.75], + "to": [15.35391, -0.04254, 7.75], + "rotation": {"angle": 45, "axis": "x", "origin": [8.35391, 8.70746, 8]}, + "faces": { + "north": {"uv": [5, 1, 8.5, 1.5], "texture": "#1"}, + "east": {"uv": [0, 0, 0, 0.5], "texture": "#1"}, + "south": {"uv": [5, 1.5, 8.5, 2], "texture": "#1"}, + "west": {"uv": [0, 0, 0, 0.5], "texture": "#1"}, + "up": {"uv": [0, 3.5, 0, 0], "rotation": 270, "texture": "#1"}, + "down": {"uv": [0, 0, 0, 3.5], "rotation": 90, "texture": "#1"} + } + }, + { + "from": [1.35391, -1.04254, 6.75], + "to": [15.35391, -1.04254, 8.75], + "rotation": {"angle": 45, "axis": "x", "origin": [8.35391, 8.70746, 8]}, + "faces": { + "north": {"uv": [0, 0, 3.5, 0], "texture": "#1"}, + "east": {"uv": [0, 0, 0.5, 0], "texture": "#1"}, + "south": {"uv": [0, 0, 3.5, 0], "texture": "#1"}, + "west": {"uv": [0, 0, 0.5, 0], "texture": "#1"}, + "up": {"uv": [4.5, 8.25, 4, 4.75], "rotation": 270, "texture": "#1"}, + "down": {"uv": [5, 4.75, 4.5, 8.25], "rotation": 90, "texture": "#1"} + } + }, + { + "from": [1.35391, 7.95746, -2.25], + "to": [15.35391, 7.95746, -0.25], + "rotation": {"angle": 45, "axis": "x", "origin": [8.35391, 8.70746, 8]}, + "faces": { + "north": {"uv": [0, 0, 3.5, 0], "texture": "#1"}, + "east": {"uv": [0, 0, 0.5, 0], "texture": "#1"}, + "south": {"uv": [0, 0, 3.5, 0], "texture": "#1"}, + "west": {"uv": [0, 0, 0.5, 0], "texture": "#1"}, + "up": {"uv": [4.5, 8.25, 4, 4.75], "rotation": 270, "texture": "#1"}, + "down": {"uv": [5, 4.75, 4.5, 8.25], "rotation": 90, "texture": "#1"} + } + }, + { + "from": [1.35391, 6.95746, -1.25], + "to": [15.35391, 8.95746, -1.25], + "rotation": {"angle": 45, "axis": "x", "origin": [8.35391, 8.70746, 8]}, + "faces": { + "north": {"uv": [5, 1, 8.5, 1.5], "texture": "#1"}, + "east": {"uv": [0, 0, 0, 0.5], "texture": "#1"}, + "south": {"uv": [5, 1.5, 8.5, 2], "texture": "#1"}, + "west": {"uv": [0, 0, 0, 0.5], "texture": "#1"}, + "up": {"uv": [0, 3.5, 0, 0], "rotation": 270, "texture": "#1"}, + "down": {"uv": [0, 0, 0, 3.5], "rotation": 90, "texture": "#1"} + } + } + ], + "gui_light": "front", + "display": { + "thirdperson_righthand": { + "translation": [0, 1, -3.5], + "scale": [0.5, 0.5, 0.5] + }, + "thirdperson_lefthand": { + "translation": [0, 1, -3.5], + "scale": [0.5, 0.5, 0.5] + }, + "firstperson_righthand": { + "rotation": [21.15, 23.99, -8.94], + "translation": [0, 3.5, -0.5], + "scale": [0.5, 0.5, 0.5] + }, + "firstperson_lefthand": { + "rotation": [21.15, 23.99, -8.94], + "translation": [0, 3.5, -0.5], + "scale": [0.5, 0.5, 0.5] + }, + "ground": { + "translation": [0, 3.25, 0], + "scale": [0.4, 0.4, 0.4] + }, + "gui": { + "rotation": [19.29, 47.82, -2.83], + "translation": [0, 0, -6.25], + "scale": [0.6, 0.6, 0.6] + }, + "head": { + "translation": [0, 14.25, 0] + }, + "fixed": { + "rotation": [0, 90, 0], + "translation": [0, 0, -6.25] + } + }, + "groups": [ + { + "name": "group", + "origin": [15, 1, 15], + "color": 0, + "children": [ + { + "name": "group", + "origin": [8.35391, 8.70746, 8], + "color": 0, + "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14] + } + ] + } + ] } \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/mineable/axe.json b/src/main/resources/data/minecraft/tags/blocks/mineable/axe.json new file mode 100644 index 000000000..23584a2d1 --- /dev/null +++ b/src/main/resources/data/minecraft/tags/blocks/mineable/axe.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "target:barbed_wire" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/mineable/shovel.json b/src/main/resources/data/minecraft/tags/blocks/mineable/shovel.json new file mode 100644 index 000000000..e2ff8d719 --- /dev/null +++ b/src/main/resources/data/minecraft/tags/blocks/mineable/shovel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "target:sandbag" + ] +} \ No newline at end of file