diff --git a/common/src/main/java/com/iafenvoy/sow/entity/GrimEntity.java b/common/src/main/java/com/iafenvoy/sow/entity/GrimEntity.java index 239e81b..d41a067 100644 --- a/common/src/main/java/com/iafenvoy/sow/entity/GrimEntity.java +++ b/common/src/main/java/com/iafenvoy/sow/entity/GrimEntity.java @@ -2,9 +2,9 @@ import com.iafenvoy.neptune.object.entity.MonsterEntityBase; import com.iafenvoy.neptune.render.EntityTextureProvider; -import com.iafenvoy.sow.render.glint.GlintManager; import com.iafenvoy.sow.SongsOfWar; import com.iafenvoy.sow.registry.SowWeapons; +import com.iafenvoy.sow.render.glint.GlintManager; import net.minecraft.entity.EntityGroup; import net.minecraft.entity.EntityType; import net.minecraft.entity.LivingEntity; diff --git a/common/src/main/java/com/iafenvoy/sow/entity/ardoni/DeathSingerEntity.java b/common/src/main/java/com/iafenvoy/sow/entity/ardoni/DeathSingerEntity.java index 9cc4e46..695a103 100644 --- a/common/src/main/java/com/iafenvoy/sow/entity/ardoni/DeathSingerEntity.java +++ b/common/src/main/java/com/iafenvoy/sow/entity/ardoni/DeathSingerEntity.java @@ -1,10 +1,10 @@ package com.iafenvoy.sow.entity.ardoni; -import com.iafenvoy.sow.render.glint.GlintManager; import com.iafenvoy.neptune.util.Color4i; import com.iafenvoy.sow.SongsOfWar; import com.iafenvoy.sow.data.ArdoniType; import com.iafenvoy.sow.registry.SowWeapons; +import com.iafenvoy.sow.render.glint.GlintManager; import net.minecraft.entity.EntityType; import net.minecraft.entity.mob.HostileEntity; import net.minecraft.item.ItemStack; diff --git a/common/src/main/java/com/iafenvoy/sow/entity/ardoni/RiaEntity.java b/common/src/main/java/com/iafenvoy/sow/entity/ardoni/RiaEntity.java index 20db4e5..d195028 100644 --- a/common/src/main/java/com/iafenvoy/sow/entity/ardoni/RiaEntity.java +++ b/common/src/main/java/com/iafenvoy/sow/entity/ardoni/RiaEntity.java @@ -1,10 +1,10 @@ package com.iafenvoy.sow.entity.ardoni; -import com.iafenvoy.sow.render.glint.GlintManager; import com.iafenvoy.neptune.util.Color4i; import com.iafenvoy.sow.SongsOfWar; import com.iafenvoy.sow.data.ArdoniType; import com.iafenvoy.sow.registry.SowWeapons; +import com.iafenvoy.sow.render.glint.GlintManager; import net.minecraft.entity.EntityType; import net.minecraft.entity.mob.HostileEntity; import net.minecraft.item.ItemStack; diff --git a/common/src/main/java/com/iafenvoy/sow/entity/ardoni/ThalleousEntity.java b/common/src/main/java/com/iafenvoy/sow/entity/ardoni/ThalleousEntity.java index 15ce4a8..f673264 100644 --- a/common/src/main/java/com/iafenvoy/sow/entity/ardoni/ThalleousEntity.java +++ b/common/src/main/java/com/iafenvoy/sow/entity/ardoni/ThalleousEntity.java @@ -1,12 +1,12 @@ package com.iafenvoy.sow.entity.ardoni; -import com.iafenvoy.sow.render.glint.GlintManager; import com.iafenvoy.neptune.util.Color4i; import com.iafenvoy.sow.SongsOfWar; import com.iafenvoy.sow.config.Anniversary; import com.iafenvoy.sow.data.ArdoniType; import com.iafenvoy.sow.registry.SowDelight; import com.iafenvoy.sow.registry.SowWeapons; +import com.iafenvoy.sow.render.glint.GlintManager; import net.minecraft.entity.EntityType; import net.minecraft.entity.mob.HostileEntity; import net.minecraft.item.ItemStack; diff --git a/common/src/main/java/com/iafenvoy/sow/entity/ardoni/TideSingerEntity.java b/common/src/main/java/com/iafenvoy/sow/entity/ardoni/TideSingerEntity.java index 8ce9d62..cac26eb 100644 --- a/common/src/main/java/com/iafenvoy/sow/entity/ardoni/TideSingerEntity.java +++ b/common/src/main/java/com/iafenvoy/sow/entity/ardoni/TideSingerEntity.java @@ -1,10 +1,10 @@ package com.iafenvoy.sow.entity.ardoni; -import com.iafenvoy.sow.render.glint.GlintManager; import com.iafenvoy.neptune.util.Color4i; import com.iafenvoy.sow.SongsOfWar; import com.iafenvoy.sow.data.ArdoniType; import com.iafenvoy.sow.registry.SowWeapons; +import com.iafenvoy.sow.render.glint.GlintManager; import net.minecraft.entity.EntityType; import net.minecraft.entity.mob.HostileEntity; import net.minecraft.item.ItemStack; diff --git a/common/src/main/java/com/iafenvoy/sow/item/EnchantmentFragmentItem.java b/common/src/main/java/com/iafenvoy/sow/item/EnchantmentFragmentItem.java index 94132c6..47a7f45 100644 --- a/common/src/main/java/com/iafenvoy/sow/item/EnchantmentFragmentItem.java +++ b/common/src/main/java/com/iafenvoy/sow/item/EnchantmentFragmentItem.java @@ -1,9 +1,9 @@ package com.iafenvoy.sow.item; import com.google.common.collect.Multimap; -import com.iafenvoy.sow.render.glint.GlintManager; import com.iafenvoy.sow.SongsOfWar; import com.iafenvoy.sow.registry.SowItemGroups; +import com.iafenvoy.sow.render.glint.GlintManager; import net.minecraft.client.item.TooltipContext; import net.minecraft.entity.EquipmentSlot; import net.minecraft.entity.attribute.EntityAttribute; diff --git a/common/src/main/java/com/iafenvoy/sow/mixin/EntityMixin.java b/common/src/main/java/com/iafenvoy/sow/mixin/EntityMixin.java index efa8281..7974052 100644 --- a/common/src/main/java/com/iafenvoy/sow/mixin/EntityMixin.java +++ b/common/src/main/java/com/iafenvoy/sow/mixin/EntityMixin.java @@ -1,6 +1,5 @@ package com.iafenvoy.sow.mixin; -import com.iafenvoy.sow.power.PowerCategory; import com.iafenvoy.sow.power.SongPowerData; import com.iafenvoy.sow.registry.power.MobiliumPowers; import net.minecraft.entity.Entity; @@ -15,7 +14,7 @@ public class EntityMixin { @Inject(method = "getJumpVelocityMultiplier", at = @At("RETURN"), cancellable = true) private void modifyJumpHeight(CallbackInfoReturnable cir) { Entity self = (Entity) (Object) this; - if (self instanceof PlayerEntity player && SongPowerData.byPlayer(player).powerEnabled(PowerCategory.MOBILIUM, MobiliumPowers.MOBILILEAP)) + if (self instanceof PlayerEntity player && SongPowerData.byPlayer(player).powerEnabled(MobiliumPowers.MOBILILEAP)) cir.setReturnValue(cir.getReturnValue() * 5); } } diff --git a/common/src/main/java/com/iafenvoy/sow/mixin/GrindstoneScreenHandlerMixin.java b/common/src/main/java/com/iafenvoy/sow/mixin/GrindstoneScreenHandlerMixin.java index bf1194e..a2f3178 100644 --- a/common/src/main/java/com/iafenvoy/sow/mixin/GrindstoneScreenHandlerMixin.java +++ b/common/src/main/java/com/iafenvoy/sow/mixin/GrindstoneScreenHandlerMixin.java @@ -1,7 +1,7 @@ package com.iafenvoy.sow.mixin; -import com.iafenvoy.sow.render.glint.GlintManager; import com.iafenvoy.sow.item.EnchantmentFragmentItem; +import com.iafenvoy.sow.render.glint.GlintManager; import net.minecraft.inventory.Inventory; import net.minecraft.item.AxeItem; import net.minecraft.item.ItemStack; diff --git a/common/src/main/java/com/iafenvoy/sow/mixin/LivingEntityMixin.java b/common/src/main/java/com/iafenvoy/sow/mixin/LivingEntityMixin.java index 40bf4b8..ac6c952 100644 --- a/common/src/main/java/com/iafenvoy/sow/mixin/LivingEntityMixin.java +++ b/common/src/main/java/com/iafenvoy/sow/mixin/LivingEntityMixin.java @@ -1,6 +1,5 @@ package com.iafenvoy.sow.mixin; -import com.iafenvoy.sow.power.PowerCategory; import com.iafenvoy.sow.power.SongPowerData; import com.iafenvoy.sow.registry.power.MobiliumPowers; import com.llamalad7.mixinextras.injector.ModifyExpressionValue; @@ -25,7 +24,7 @@ public LivingEntityMixin(EntityType type, World world) { private void handleFallFlyingCheck(CallbackInfo ci) { LivingEntity entity = (LivingEntity) (Object) this; if (!entity.getWorld().isClient && entity instanceof PlayerEntity player && !player.isOnGround() && !player.hasVehicle() && !player.hasStatusEffect(StatusEffects.LEVITATION)) - if (SongPowerData.byPlayer(player).powerEnabled(PowerCategory.MOBILIUM, MobiliumPowers.MOBILIWINGS)) { + if (SongPowerData.byPlayer(player).powerEnabled(MobiliumPowers.MOBILIWINGS)) { this.setFlag(7, true); ci.cancel(); } @@ -34,7 +33,7 @@ private void handleFallFlyingCheck(CallbackInfo ci) { @SuppressWarnings("all") @ModifyExpressionValue(method = "travel", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/LivingEntity;hasStatusEffect(Lnet/minecraft/entity/effect/StatusEffect;)Z", ordinal = 0)) private boolean handleSlideSpeed(boolean original) { - if ((Object) this instanceof PlayerEntity player && SongPowerData.byPlayer(player).powerEnabled(PowerCategory.MOBILIUM, MobiliumPowers.MOBILIGLIDE)) { + if ((Object) this instanceof PlayerEntity player && SongPowerData.byPlayer(player).powerEnabled(MobiliumPowers.MOBILIGLIDE)) { this.fallDistance = 0; return true; } diff --git a/common/src/main/java/com/iafenvoy/sow/mixin/PlayerEntityMixin.java b/common/src/main/java/com/iafenvoy/sow/mixin/PlayerEntityMixin.java index 60def9a..041d2af 100644 --- a/common/src/main/java/com/iafenvoy/sow/mixin/PlayerEntityMixin.java +++ b/common/src/main/java/com/iafenvoy/sow/mixin/PlayerEntityMixin.java @@ -1,6 +1,5 @@ package com.iafenvoy.sow.mixin; -import com.iafenvoy.sow.power.PowerCategory; import com.iafenvoy.sow.power.SongPowerData; import com.iafenvoy.sow.registry.power.MobiliumPowers; import net.minecraft.entity.EntityType; @@ -21,7 +20,7 @@ protected PlayerEntityMixin(EntityType entityType, World @SuppressWarnings("all") @Inject(method = "tick", at = @At("RETURN")) private void handleFallDistance(CallbackInfo ci) { - if (SongPowerData.byPlayer((PlayerEntity) (Object) this).powerEnabled(PowerCategory.MOBILIUM, MobiliumPowers.MOBILILEAP)) + if (SongPowerData.byPlayer((PlayerEntity) (Object) this).powerEnabled(MobiliumPowers.MOBILILEAP)) this.fallDistance = 0; } } diff --git a/common/src/main/java/com/iafenvoy/sow/network/ServerNetworkHelper.java b/common/src/main/java/com/iafenvoy/sow/network/ServerNetworkHelper.java index 61c8522..08ea5c7 100644 --- a/common/src/main/java/com/iafenvoy/sow/network/ServerNetworkHelper.java +++ b/common/src/main/java/com/iafenvoy/sow/network/ServerNetworkHelper.java @@ -1,7 +1,7 @@ package com.iafenvoy.sow.network; -import com.iafenvoy.sow.SongsOfWar; import com.iafenvoy.sow.Constants; +import com.iafenvoy.sow.SongsOfWar; import com.iafenvoy.sow.power.PowerCategory; import com.iafenvoy.sow.power.SongPowerData; import com.iafenvoy.sow.power.component.MobiliWingsComponent; @@ -34,7 +34,7 @@ public static void init() { NetworkManager.registerReceiver(NetworkManager.Side.C2S, Constants.JUMP_PRESS, (buf, context) -> { PlayerEntity player = context.getPlayer(); SongPowerData data = SongPowerData.byPlayer(player); - if (data.powerEnabled(PowerCategory.MOBILIUM, MobiliumPowers.MOBILIWINGS)) + if (data.powerEnabled(MobiliumPowers.MOBILIWINGS)) context.queue(() -> { if (SongPowerData.byPlayer(player).getComponent(MobiliWingsComponent.ID) instanceof MobiliWingsComponent component) component.speedUp(); diff --git a/common/src/main/java/com/iafenvoy/sow/power/SongPowerData.java b/common/src/main/java/com/iafenvoy/sow/power/SongPowerData.java index daf8eee..c30e4ed 100644 --- a/common/src/main/java/com/iafenvoy/sow/power/SongPowerData.java +++ b/common/src/main/java/com/iafenvoy/sow/power/SongPowerData.java @@ -120,6 +120,10 @@ public void removeComponent(String id) { this.components.remove(id); } + public boolean powerEnabled(AbstractSongPower power) { + return this.powerEnabled(power.getCategory(), power); + } + public boolean powerEnabled(PowerCategory category, AbstractSongPower power) { SinglePowerData data = this.get(category); return data.hasPower() && data.getActivePower() == power && data.isEnabled(); diff --git a/common/src/main/java/com/iafenvoy/sow/registry/SowItemGroups.java b/common/src/main/java/com/iafenvoy/sow/registry/SowItemGroups.java index 552f609..10f2811 100644 --- a/common/src/main/java/com/iafenvoy/sow/registry/SowItemGroups.java +++ b/common/src/main/java/com/iafenvoy/sow/registry/SowItemGroups.java @@ -1,7 +1,7 @@ package com.iafenvoy.sow.registry; -import com.iafenvoy.sow.render.glint.GlintManager; import com.iafenvoy.sow.SongsOfWar; +import com.iafenvoy.sow.render.glint.GlintManager; import dev.architectury.registry.CreativeTabRegistry; import dev.architectury.registry.registries.DeferredRegister; import dev.architectury.registry.registries.RegistrySupplier; diff --git a/common/src/main/java/com/iafenvoy/sow/registry/SowItems.java b/common/src/main/java/com/iafenvoy/sow/registry/SowItems.java index 55250b2..ae0e255 100644 --- a/common/src/main/java/com/iafenvoy/sow/registry/SowItems.java +++ b/common/src/main/java/com/iafenvoy/sow/registry/SowItems.java @@ -1,10 +1,10 @@ package com.iafenvoy.sow.registry; -import com.iafenvoy.sow.render.glint.GlintManager; import com.iafenvoy.sow.SongsOfWar; import com.iafenvoy.sow.item.*; import com.iafenvoy.sow.item.impl.ProtepointShieldItem; import com.iafenvoy.sow.power.PowerCategory; +import com.iafenvoy.sow.render.glint.GlintManager; import dev.architectury.registry.registries.DeferredRegister; import dev.architectury.registry.registries.RegistrySupplier; import net.minecraft.item.ArmorItem; diff --git a/common/src/main/java/com/iafenvoy/sow/registry/SowKeybindings.java b/common/src/main/java/com/iafenvoy/sow/registry/SowKeybindings.java index 097a3ee..e18bf07 100644 --- a/common/src/main/java/com/iafenvoy/sow/registry/SowKeybindings.java +++ b/common/src/main/java/com/iafenvoy/sow/registry/SowKeybindings.java @@ -1,8 +1,8 @@ package com.iafenvoy.sow.registry; import com.iafenvoy.neptune.network.PacketBufferUtils; -import com.iafenvoy.sow.SongsOfWar; import com.iafenvoy.sow.Constants; +import com.iafenvoy.sow.SongsOfWar; import com.iafenvoy.sow.power.PowerCategory; import dev.architectury.event.events.client.ClientTickEvent; import dev.architectury.networking.NetworkManager; diff --git a/common/src/main/java/com/iafenvoy/sow/registry/power/ProtisiumPowers.java b/common/src/main/java/com/iafenvoy/sow/registry/power/ProtisiumPowers.java index 83cb588..0d0c36d 100644 --- a/common/src/main/java/com/iafenvoy/sow/registry/power/ProtisiumPowers.java +++ b/common/src/main/java/com/iafenvoy/sow/registry/power/ProtisiumPowers.java @@ -37,7 +37,7 @@ public final class ProtisiumPowers { .onInit(self -> LivingEntityEvents.DAMAGE.register((entity, source, amount) -> { if (entity instanceof PlayerEntity player) { SongPowerData data = SongPowerData.byPlayer(player); - if (data.powerEnabled(PowerCategory.PROTISIUM, self)) { + if (data.powerEnabled(self)) { data.get(PowerCategory.PROTISIUM).disable(); return Math.max(amount - SowConfig.INSTANCE.protisium.protearmorMaxReduceDamage.getValue().floatValue(), 0); } diff --git a/common/src/main/java/com/iafenvoy/sow/registry/power/SowPowers.java b/common/src/main/java/com/iafenvoy/sow/registry/power/SowPowers.java index 08061dd..bd8a11f 100644 --- a/common/src/main/java/com/iafenvoy/sow/registry/power/SowPowers.java +++ b/common/src/main/java/com/iafenvoy/sow/registry/power/SowPowers.java @@ -1,6 +1,6 @@ package com.iafenvoy.sow.registry.power; -import com.iafenvoy.sow.power.type.*; +import com.iafenvoy.sow.power.type.AbstractSongPower; import com.iafenvoy.sow.registry.SowItemGroups; import dev.architectury.registry.CreativeTabRegistry; diff --git a/common/src/main/java/com/iafenvoy/sow/render/glint/GlintLayerManager.java b/common/src/main/java/com/iafenvoy/sow/render/glint/GlintLayerManager.java index b9a7768..aa10fae 100644 --- a/common/src/main/java/com/iafenvoy/sow/render/glint/GlintLayerManager.java +++ b/common/src/main/java/com/iafenvoy/sow/render/glint/GlintLayerManager.java @@ -1,6 +1,5 @@ package com.iafenvoy.sow.render.glint; -import com.iafenvoy.sow.render.glint.GlintManager; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.render.*; diff --git a/common/src/main/java/com/iafenvoy/sow/render/power/MobiliumElytraFeatureRenderer.java b/common/src/main/java/com/iafenvoy/sow/render/power/MobiliumElytraFeatureRenderer.java index cfc4548..3c7c72e 100644 --- a/common/src/main/java/com/iafenvoy/sow/render/power/MobiliumElytraFeatureRenderer.java +++ b/common/src/main/java/com/iafenvoy/sow/render/power/MobiliumElytraFeatureRenderer.java @@ -1,7 +1,6 @@ package com.iafenvoy.sow.render.power; import com.iafenvoy.sow.SongsOfWar; -import com.iafenvoy.sow.power.PowerCategory; import com.iafenvoy.sow.power.SongPowerData; import com.iafenvoy.sow.registry.power.MobiliumPowers; import net.fabricmc.api.EnvType; @@ -32,7 +31,7 @@ public MobiliumElytraFeatureRenderer(FeatureRendererContext context, Entit @Override public void render(MatrixStack matrixStack, VertexConsumerProvider vertexConsumerProvider, int i, T entity, float f, float g, float h, float j, float k, float l) { - if (SongPowerData.byPlayer(entity).powerEnabled(PowerCategory.MOBILIUM, MobiliumPowers.MOBILIWINGS)) { + if (SongPowerData.byPlayer(entity).powerEnabled(MobiliumPowers.MOBILIWINGS)) { matrixStack.push(); matrixStack.translate(0.0F, 0.0F, 0.125F); this.getContextModel().copyStateTo(this.elytra); diff --git a/common/src/main/java/com/iafenvoy/sow/render/power/ProteArmorFeatureRenderer.java b/common/src/main/java/com/iafenvoy/sow/render/power/ProteArmorFeatureRenderer.java index f249600..5a4e018 100644 --- a/common/src/main/java/com/iafenvoy/sow/render/power/ProteArmorFeatureRenderer.java +++ b/common/src/main/java/com/iafenvoy/sow/render/power/ProteArmorFeatureRenderer.java @@ -1,6 +1,5 @@ package com.iafenvoy.sow.render.power; -import com.iafenvoy.sow.power.PowerCategory; import com.iafenvoy.sow.power.SongPowerData; import com.iafenvoy.sow.registry.power.ProtisiumPowers; import com.iafenvoy.sow.render.RenderConstants; @@ -29,7 +28,7 @@ public ProteArmorFeatureRenderer(FeatureRendererContext context, A model) @Override public void render(MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, T entity, float limbAngle, float limbDistance, float tickDelta, float animationProgress, float headYaw, float headPitch) { - if (SongPowerData.byPlayer(entity).powerEnabled(PowerCategory.PROTISIUM, ProtisiumPowers.PROTEARMOR)) { + if (SongPowerData.byPlayer(entity).powerEnabled(ProtisiumPowers.PROTEARMOR)) { matrices.push(); this.getContextModel().copyBipedStateTo(this.model); VertexConsumer consumer = vertexConsumers.getBuffer(RenderLayer.getEntityTranslucentEmissive(RenderConstants.WHITE_TEXTURE)); diff --git a/common/src/main/java/com/iafenvoy/sow/render/power/ProtisiumSphereFeatureRenderer.java b/common/src/main/java/com/iafenvoy/sow/render/power/ProtisiumSphereFeatureRenderer.java index 4d83b3e..b3994f6 100644 --- a/common/src/main/java/com/iafenvoy/sow/render/power/ProtisiumSphereFeatureRenderer.java +++ b/common/src/main/java/com/iafenvoy/sow/render/power/ProtisiumSphereFeatureRenderer.java @@ -1,6 +1,5 @@ package com.iafenvoy.sow.render.power; -import com.iafenvoy.sow.power.PowerCategory; import com.iafenvoy.sow.power.SongPowerData; import com.iafenvoy.sow.registry.power.ProtisiumPowers; import com.iafenvoy.sow.render.RenderConstants; @@ -28,7 +27,7 @@ public ProtisiumSphereFeatureRenderer(FeatureRendererContext context) { @Override public void render(MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, T entity, float limbAngle, float limbDistance, float tickDelta, float animationProgress, float headYaw, float headPitch) { - if (SongPowerData.byPlayer(entity).powerEnabled(PowerCategory.PROTISIUM, ProtisiumPowers.PROTESPHERE)) { + if (SongPowerData.byPlayer(entity).powerEnabled(ProtisiumPowers.PROTESPHERE)) { matrices.push(); matrices.scale(2.5f, 2.5f, 2.5f); matrices.translate(0, -0.8, 0); diff --git a/common/src/main/resources/assets/sow/models/item/ender_blade.json b/common/src/main/resources/assets/sow/models/item/ender_blade.json index 3209ef9..d39f547 100644 --- a/common/src/main/resources/assets/sow/models/item/ender_blade.json +++ b/common/src/main/resources/assets/sow/models/item/ender_blade.json @@ -1,6 +1,27 @@ { - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "sow:item/ender_blade" - } + "credit": "Made with Blockbench", + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "sow:item/ender_blade" + }, + "display": { + "thirdperson_righthand": { + "rotation": [0, -90, 55], + "translation": [0, 4, 0.5] + }, + "thirdperson_lefthand": { + "rotation": [0, 90, -55], + "translation": [0, 4, 0.5] + }, + "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] + } + } } \ No newline at end of file diff --git a/common/src/main/resources/assets/sow/models/item/ender_sword.json b/common/src/main/resources/assets/sow/models/item/ender_sword.json index 5f7f794..65cb0fc 100644 --- a/common/src/main/resources/assets/sow/models/item/ender_sword.json +++ b/common/src/main/resources/assets/sow/models/item/ender_sword.json @@ -2,5 +2,25 @@ "parent": "minecraft:item/handheld", "textures": { "layer0": "sow:item/ender_sword" + }, + "display": { + "thirdperson_righthand": { + "rotation": [0, -90, 55], + "translation": [0, 4, 0.5] + }, + "thirdperson_lefthand": { + "rotation": [0, 90, -55], + "translation": [0, 4, 0.5] + }, + "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] + } } } \ No newline at end of file diff --git a/common/src/main/resources/assets/sow/models/item/fire_sword.json b/common/src/main/resources/assets/sow/models/item/fire_sword.json index 677027f..922b101 100644 --- a/common/src/main/resources/assets/sow/models/item/fire_sword.json +++ b/common/src/main/resources/assets/sow/models/item/fire_sword.json @@ -2,5 +2,25 @@ "parent": "minecraft:item/handheld", "textures": { "layer0": "sow:item/fire_sword" + }, + "display": { + "thirdperson_righthand": { + "rotation": [0, -90, 55], + "translation": [0, 4, 0.5] + }, + "thirdperson_lefthand": { + "rotation": [0, 90, -55], + "translation": [0, 4, 0.5] + }, + "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] + } } } \ No newline at end of file diff --git a/common/src/main/resources/assets/sow/models/item/fire_sword_1.json b/common/src/main/resources/assets/sow/models/item/fire_sword_1.json index a3884fc..d5d4d92 100644 --- a/common/src/main/resources/assets/sow/models/item/fire_sword_1.json +++ b/common/src/main/resources/assets/sow/models/item/fire_sword_1.json @@ -2,5 +2,25 @@ "parent": "minecraft:item/handheld", "textures": { "layer0": "sow:item/fire_sword_1" + }, + "display": { + "thirdperson_righthand": { + "rotation": [0, -90, 55], + "translation": [0, 4, 0.5] + }, + "thirdperson_lefthand": { + "rotation": [0, 90, -55], + "translation": [0, 4, 0.5] + }, + "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] + } } } \ No newline at end of file