mirror of
https://github.com/Sollace/Unicopia.git
synced 2024-11-27 07:17:58 +01:00
Added horseshoes
This commit is contained in:
parent
dc29729419
commit
35ac79bf3d
20 changed files with 251 additions and 4 deletions
|
@ -29,6 +29,7 @@ public interface UTags {
|
||||||
TagKey<Item> FLOATS_ON_CLOUDS = item("floats_on_clouds");
|
TagKey<Item> FLOATS_ON_CLOUDS = item("floats_on_clouds");
|
||||||
|
|
||||||
TagKey<Item> POLEARMS = item("polearms");
|
TagKey<Item> POLEARMS = item("polearms");
|
||||||
|
TagKey<Item> HORSE_SHOES = item("horse_shoes");
|
||||||
TagKey<Item> APPLE_SEEDS = item("apple_seeds");
|
TagKey<Item> APPLE_SEEDS = item("apple_seeds");
|
||||||
|
|
||||||
TagKey<Item> ACORNS = item("acorns");
|
TagKey<Item> ACORNS = item("acorns");
|
||||||
|
|
|
@ -0,0 +1,112 @@
|
||||||
|
package com.minelittlepony.unicopia.item;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
|
||||||
|
import com.google.common.collect.ImmutableMultimap;
|
||||||
|
import com.google.common.collect.Multimap;
|
||||||
|
import com.minelittlepony.unicopia.Race;
|
||||||
|
import com.minelittlepony.unicopia.USounds;
|
||||||
|
import com.minelittlepony.unicopia.Unicopia;
|
||||||
|
import com.minelittlepony.unicopia.entity.mob.UEntityAttributes;
|
||||||
|
import com.minelittlepony.unicopia.entity.player.Pony;
|
||||||
|
import com.minelittlepony.unicopia.projectile.PhysicsBodyProjectileEntity;
|
||||||
|
|
||||||
|
import net.minecraft.client.item.TooltipContext;
|
||||||
|
import net.minecraft.entity.EquipmentSlot;
|
||||||
|
import net.minecraft.entity.attribute.EntityAttribute;
|
||||||
|
import net.minecraft.entity.attribute.EntityAttributeModifier;
|
||||||
|
import net.minecraft.entity.player.PlayerEntity;
|
||||||
|
import net.minecraft.item.ItemStack;
|
||||||
|
import net.minecraft.sound.SoundEvent;
|
||||||
|
import net.minecraft.text.Text;
|
||||||
|
import net.minecraft.util.Formatting;
|
||||||
|
import net.minecraft.world.World;
|
||||||
|
|
||||||
|
public class HorseShoeItem extends HeavyProjectileItem {
|
||||||
|
|
||||||
|
private final float projectileInnacuracy;
|
||||||
|
private final float baseProjectileSpeed;
|
||||||
|
|
||||||
|
private final Multimap<EntityAttribute, EntityAttributeModifier> attributeModifiers;
|
||||||
|
|
||||||
|
public HorseShoeItem(Settings settings, float projectileDamage, float projectileInnacuracy, float baseProjectileSpeed) {
|
||||||
|
super(settings, projectileDamage);
|
||||||
|
this.projectileInnacuracy = projectileInnacuracy;
|
||||||
|
this.baseProjectileSpeed = baseProjectileSpeed;
|
||||||
|
|
||||||
|
ImmutableMultimap.Builder<EntityAttribute, EntityAttributeModifier> builder = ImmutableMultimap.builder();
|
||||||
|
builder.put(UEntityAttributes.EXTENDED_ATTACK_DISTANCE, new EntityAttributeModifier(PolearmItem.ATTACK_RANGE_MODIFIER_ID, "Weapon modifier", -3F, EntityAttributeModifier.Operation.ADDITION));
|
||||||
|
attributeModifiers = builder.build();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean canRepair(ItemStack stack, ItemStack ingredient) {
|
||||||
|
return ingredient.isOf(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void appendTooltip(ItemStack stack, @Nullable World world, List<Text> tooltip, TooltipContext context) {
|
||||||
|
float degradation = (stack.getDamage() / (float)stack.getMaxDamage());
|
||||||
|
float inaccuracy = projectileInnacuracy + degradation * 30;
|
||||||
|
tooltip.add(Text.empty());
|
||||||
|
|
||||||
|
Pony pony = Unicopia.SIDE.getPony().orElse(null);
|
||||||
|
float speed = baseProjectileSpeed;
|
||||||
|
if (pony != null) {
|
||||||
|
var race = pony.getCompositeRace();
|
||||||
|
|
||||||
|
if (race.any(Race::canUseEarth)) {
|
||||||
|
speed += 0.5F;
|
||||||
|
}
|
||||||
|
if (!race.includes(Race.ALICORN) && race.physical().canFly()) {
|
||||||
|
speed /= 1.5F;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
speed /= 1.5F;
|
||||||
|
speed *= 1 - (0.6F * degradation);
|
||||||
|
|
||||||
|
tooltip.add(Text.translatable("item.unicopia.horse_shoe.accuracy", 100 * (30 - inaccuracy) / 30).formatted(Formatting.GRAY));
|
||||||
|
tooltip.add(Text.translatable("item.unicopia.horse_shoe.speed", Math.max(0.2F, speed)).formatted(Formatting.GRAY));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected PhysicsBodyProjectileEntity createProjectile(ItemStack stack, World world, @Nullable PlayerEntity player) {
|
||||||
|
PhysicsBodyProjectileEntity projectile = super.createProjectile(stack, world, player);
|
||||||
|
|
||||||
|
float degradation = (stack.getDamage() / (float)stack.getMaxDamage());
|
||||||
|
|
||||||
|
if (player != null) {
|
||||||
|
Pony pony = Pony.of(player);
|
||||||
|
var race = pony.getCompositeRace();
|
||||||
|
float speed = baseProjectileSpeed + 0.1F;
|
||||||
|
if (race.any(Race::canUseEarth)) {
|
||||||
|
speed += 0.5F;
|
||||||
|
}
|
||||||
|
if (!race.includes(Race.ALICORN) && race.physical().canFly()) {
|
||||||
|
speed /= 1.5F;
|
||||||
|
}
|
||||||
|
speed /= 1.5F;
|
||||||
|
speed *= 1 - (0.6F * degradation);
|
||||||
|
float inaccuracy = projectileInnacuracy + degradation * 30;
|
||||||
|
projectile.setVelocity(player, player.getPitch(), player.getYaw(), 0, Math.max(0.2F, speed), inaccuracy);
|
||||||
|
}
|
||||||
|
return projectile;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected SoundEvent getThrowSound(ItemStack stack) {
|
||||||
|
return USounds.Vanilla.ITEM_TRIDENT_THROW;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Multimap<EntityAttribute, EntityAttributeModifier> getAttributeModifiers(EquipmentSlot slot) {
|
||||||
|
if (slot == EquipmentSlot.MAINHAND) {
|
||||||
|
return attributeModifiers;
|
||||||
|
}
|
||||||
|
return super.getAttributeModifiers(slot);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
|
@ -15,7 +15,7 @@ import net.minecraft.entity.attribute.*;
|
||||||
import net.minecraft.item.*;
|
import net.minecraft.item.*;
|
||||||
|
|
||||||
public class PolearmItem extends SwordItem {
|
public class PolearmItem extends SwordItem {
|
||||||
protected static final UUID ATTACK_RANGE_MODIFIER_ID = UUID.fromString("A7B3659C-AA74-469C-963A-09A391DCAA0F");
|
static final UUID ATTACK_RANGE_MODIFIER_ID = UUID.fromString("A7B3659C-AA74-469C-963A-09A391DCAA0F");
|
||||||
|
|
||||||
private final Multimap<EntityAttribute, EntityAttributeModifier> attributeModifiers;
|
private final Multimap<EntityAttribute, EntityAttributeModifier> attributeModifiers;
|
||||||
|
|
||||||
|
|
|
@ -40,7 +40,7 @@ abstract class ProjectileItem extends Item {
|
||||||
0.4F / (world.random.nextFloat() * 0.4F + 0.8F));
|
0.4F / (world.random.nextFloat() * 0.4F + 0.8F));
|
||||||
|
|
||||||
if (!world.isClient) {
|
if (!world.isClient) {
|
||||||
world.spawnEntity(createProjectile(stack, world, player));
|
world.spawnEntity(createProjectile(stack.copyWithCount(1), world, player));
|
||||||
}
|
}
|
||||||
|
|
||||||
player.incrementStat(Stats.USED.getOrCreateStat(this));
|
player.incrementStat(Stats.USED.getOrCreateStat(this));
|
||||||
|
|
|
@ -127,6 +127,11 @@ public interface UItems {
|
||||||
Item MEADOWBROOKS_STAFF = register("meadowbrooks_staff", new StaffItem(new Settings().rarity(Rarity.UNCOMMON).maxCount(1).maxDamage(120)), ItemGroups.TOOLS);
|
Item MEADOWBROOKS_STAFF = register("meadowbrooks_staff", new StaffItem(new Settings().rarity(Rarity.UNCOMMON).maxCount(1).maxDamage(120)), ItemGroups.TOOLS);
|
||||||
Item MAGIC_STAFF = register("magic_staff", new EnchantedStaffItem(new Settings().rarity(Rarity.UNCOMMON).maxCount(1).maxDamage(120)), ItemGroups.TOOLS);
|
Item MAGIC_STAFF = register("magic_staff", new EnchantedStaffItem(new Settings().rarity(Rarity.UNCOMMON).maxCount(1).maxDamage(120)), ItemGroups.TOOLS);
|
||||||
|
|
||||||
|
Item IRON_HORSE_SHOE = register("iron_horse_shoe", new HorseShoeItem(new Item.Settings().maxDamage(200), 4, 0.6F, 1), ItemGroups.COMBAT);
|
||||||
|
Item GOLDEN_HORSE_SHOE = register("golden_horse_shoe", new HorseShoeItem(new Item.Settings().maxDamage(100), 5, 0.1F, 0.5F), ItemGroups.COMBAT);
|
||||||
|
Item COPPER_HORSE_SHOE = register("copper_horse_shoe", new HorseShoeItem(new Item.Settings().maxDamage(250), 6, 0.5F, 0.8F), ItemGroups.COMBAT);
|
||||||
|
Item NETHERITE_HORSE_SHOE = register("netherite_horse_shoe", new HorseShoeItem(new Item.Settings().maxDamage(800), 3, 0.7F, 1.2F), ItemGroups.COMBAT);
|
||||||
|
|
||||||
Item WOODEN_POLEARM = register("wooden_polearm", new PolearmItem(ToolMaterials.WOOD, 2, -3.6F, 2, new Item.Settings()), ItemGroups.COMBAT);
|
Item WOODEN_POLEARM = register("wooden_polearm", new PolearmItem(ToolMaterials.WOOD, 2, -3.6F, 2, new Item.Settings()), ItemGroups.COMBAT);
|
||||||
Item STONE_POLEARM = register("stone_polearm", new PolearmItem(ToolMaterials.STONE, 2, -3.6F, 2, new Item.Settings()), ItemGroups.COMBAT);
|
Item STONE_POLEARM = register("stone_polearm", new PolearmItem(ToolMaterials.STONE, 2, -3.6F, 2, new Item.Settings()), ItemGroups.COMBAT);
|
||||||
Item IRON_POLEARM = register("iron_polearm", new PolearmItem(ToolMaterials.IRON, 2, -3.6F, 3, new Item.Settings()), ItemGroups.COMBAT);
|
Item IRON_POLEARM = register("iron_polearm", new PolearmItem(ToolMaterials.IRON, 2, -3.6F, 3, new Item.Settings()), ItemGroups.COMBAT);
|
||||||
|
|
|
@ -7,7 +7,6 @@ import com.minelittlepony.unicopia.UTags;
|
||||||
import com.minelittlepony.unicopia.ability.magic.Caster;
|
import com.minelittlepony.unicopia.ability.magic.Caster;
|
||||||
import com.minelittlepony.unicopia.entity.damage.UDamageTypes;
|
import com.minelittlepony.unicopia.entity.damage.UDamageTypes;
|
||||||
import com.minelittlepony.unicopia.entity.mob.UEntities;
|
import com.minelittlepony.unicopia.entity.mob.UEntities;
|
||||||
|
|
||||||
import net.minecraft.block.BlockState;
|
import net.minecraft.block.BlockState;
|
||||||
import net.minecraft.block.ButtonBlock;
|
import net.minecraft.block.ButtonBlock;
|
||||||
import net.minecraft.block.HopperBlock;
|
import net.minecraft.block.HopperBlock;
|
||||||
|
@ -131,6 +130,16 @@ public class PhysicsBodyProjectileEntity extends PersistentProjectileEntity impl
|
||||||
setYaw(getYaw() + 180);
|
setYaw(getYaw() + 180);
|
||||||
prevYaw += 180;
|
prevYaw += 180;
|
||||||
return;
|
return;
|
||||||
|
} else {
|
||||||
|
ItemStack stack = asItemStack();
|
||||||
|
if (stack.isIn(UTags.HORSE_SHOES)) {
|
||||||
|
if (stack.damage(1 + random.nextInt(10), random, null)) {
|
||||||
|
playSound(USounds.Vanilla.ENTITY_ITEM_BREAK, 1, 1);
|
||||||
|
} else {
|
||||||
|
dropStack(stack);
|
||||||
|
}
|
||||||
|
setStack(ItemStack.EMPTY);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
super.onEntityHit(hit);
|
super.onEntityHit(hit);
|
||||||
}
|
}
|
||||||
|
@ -221,12 +230,28 @@ public class PhysicsBodyProjectileEntity extends PersistentProjectileEntity impl
|
||||||
}
|
}
|
||||||
|
|
||||||
setSound(state.getSoundGroup().getStepSound());
|
setSound(state.getSoundGroup().getStepSound());
|
||||||
getWorld().playSoundFromEntity(null, this, state.getSoundGroup().getStepSound(), SoundCategory.BLOCKS, 1, 1);
|
|
||||||
emitGameEvent(GameEvent.STEP);
|
emitGameEvent(GameEvent.STEP);
|
||||||
|
|
||||||
|
if (!isBouncy()) {
|
||||||
|
if (stack.isIn(UTags.HORSE_SHOES)) {
|
||||||
|
if (stack.damage(1 + random.nextInt(10), random, null)) {
|
||||||
|
playSound(USounds.Vanilla.ENTITY_ITEM_BREAK, 1, 1);
|
||||||
|
discard();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
getWorld().playSoundFromEntity(null, this, getHitSound(), SoundCategory.BLOCKS, 0.6F, 1);
|
||||||
|
} else {
|
||||||
|
getWorld().playSoundFromEntity(null, this, state.getSoundGroup().getStepSound(), SoundCategory.BLOCKS, 1, 1);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected SoundEvent getHitSound() {
|
protected SoundEvent getHitSound() {
|
||||||
|
if (getStack().isIn(UTags.HORSE_SHOES)) {
|
||||||
|
return USounds.Vanilla.ITEM_TRIDENT_HIT_GROUND;
|
||||||
|
}
|
||||||
return isBouncy() ? USounds.ITEM_MUFFIN_BOUNCE.value() : USounds.ITEM_ROCK_LAND;
|
return isBouncy() ? USounds.ITEM_MUFFIN_BOUNCE.value() : USounds.ITEM_ROCK_LAND;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -141,6 +141,13 @@
|
||||||
"item.unicopia.alicorn_amulet": "Alicorn Amulet",
|
"item.unicopia.alicorn_amulet": "Alicorn Amulet",
|
||||||
"item.unicopia.alicorn_amulet.lore": "Time worn: %d",
|
"item.unicopia.alicorn_amulet.lore": "Time worn: %d",
|
||||||
|
|
||||||
|
"item.unicopia.horse_shoe.accuracy": "Accuracy: %d%%",
|
||||||
|
"item.unicopia.horse_shoe.speed": "Speed: %d",
|
||||||
|
"item.unicopia.iron_horse_shoe": "Iron Horse Shoe",
|
||||||
|
"item.unicopia.golden_horse_shoe": "Golden Horse Shoe",
|
||||||
|
"item.unicopia.copper_horse_shoe": "Copper Horse Shoe",
|
||||||
|
"item.unicopia.netherite_horse_shoe": "Netherite Horse Shoe",
|
||||||
|
|
||||||
"item.unicopia.broken_alicorn_amulet": "Broken Alicorn Amulet",
|
"item.unicopia.broken_alicorn_amulet": "Broken Alicorn Amulet",
|
||||||
"item.unicopia.unicorn_amulet": "Unicorn Amulet",
|
"item.unicopia.unicorn_amulet": "Unicorn Amulet",
|
||||||
"item.unicopia.unicorn_amulet.lore": "Grants magical abilities to whoever wears it",
|
"item.unicopia.unicorn_amulet.lore": "Grants magical abilities to whoever wears it",
|
||||||
|
|
|
@ -0,0 +1,6 @@
|
||||||
|
{
|
||||||
|
"parent": "item/generated",
|
||||||
|
"textures": {
|
||||||
|
"layer0": "unicopia:item/copper_horse_shoe"
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,6 @@
|
||||||
|
{
|
||||||
|
"parent": "item/generated",
|
||||||
|
"textures": {
|
||||||
|
"layer0": "unicopia:item/golden_horse_shoe"
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,6 @@
|
||||||
|
{
|
||||||
|
"parent": "item/generated",
|
||||||
|
"textures": {
|
||||||
|
"layer0": "unicopia:item/iron_horse_shoe"
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,6 @@
|
||||||
|
{
|
||||||
|
"parent": "item/generated",
|
||||||
|
"textures": {
|
||||||
|
"layer0": "unicopia:item/netherite_horse_shoe"
|
||||||
|
}
|
||||||
|
}
|
Binary file not shown.
After Width: | Height: | Size: 7.3 KiB |
Binary file not shown.
After Width: | Height: | Size: 7.3 KiB |
Binary file not shown.
After Width: | Height: | Size: 7 KiB |
Binary file not shown.
After Width: | Height: | Size: 7.2 KiB |
|
@ -0,0 +1,16 @@
|
||||||
|
{
|
||||||
|
"type": "minecraft:crafting_shaped",
|
||||||
|
"pattern": [
|
||||||
|
"* *",
|
||||||
|
"* *",
|
||||||
|
" * "
|
||||||
|
],
|
||||||
|
"key": {
|
||||||
|
"*": {
|
||||||
|
"item": "minecraft:copper_ingot"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"result": {
|
||||||
|
"item": "unicopia:copper_horse_shoe"
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,16 @@
|
||||||
|
{
|
||||||
|
"type": "minecraft:crafting_shaped",
|
||||||
|
"pattern": [
|
||||||
|
"* *",
|
||||||
|
"* *",
|
||||||
|
" * "
|
||||||
|
],
|
||||||
|
"key": {
|
||||||
|
"*": {
|
||||||
|
"item": "minecraft:gold_ingot"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"result": {
|
||||||
|
"item": "unicopia:golden_horse_shoe"
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,16 @@
|
||||||
|
{
|
||||||
|
"type": "minecraft:crafting_shaped",
|
||||||
|
"pattern": [
|
||||||
|
"* *",
|
||||||
|
"* *",
|
||||||
|
" * "
|
||||||
|
],
|
||||||
|
"key": {
|
||||||
|
"*": {
|
||||||
|
"item": "minecraft:iron_ingot"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"result": {
|
||||||
|
"item": "unicopia:iron_horse_shoe"
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,16 @@
|
||||||
|
{
|
||||||
|
"type": "minecraft:crafting_shaped",
|
||||||
|
"pattern": [
|
||||||
|
"* *",
|
||||||
|
"* *",
|
||||||
|
" * "
|
||||||
|
],
|
||||||
|
"key": {
|
||||||
|
"*": {
|
||||||
|
"item": "minecraft:netherite_ingot"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"result": {
|
||||||
|
"item": "unicopia:netherite_horse_shoe"
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,9 @@
|
||||||
|
{
|
||||||
|
"replace": false,
|
||||||
|
"values": [
|
||||||
|
"unicopia:iron_horse_shoe",
|
||||||
|
"unicopia:golden_horse_shoe",
|
||||||
|
"unicopia:copper_horse_shoe",
|
||||||
|
"unicopia:netherite_horse_shoe"
|
||||||
|
]
|
||||||
|
}
|
Loading…
Reference in a new issue