mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-11-14 14:34:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4036 from jacquerol/mc1.18/dev

Browse Source 
Add 3rd person crossbow holding animation to potato cannon and zapper
This commit is contained in:
simibubi 2022-12-07 18:18:24 +01:00 committed by GitHub
commit 8e64f387bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 41 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/main/java/com/simibubi/create/foundation/mixin/PlayerEntityRendererMixin.java Normal file
View File

@ -0,0 +1,31 @@
package com.simibubi.create.foundation.mixin;
import com.simibubi.create.content.curiosities.zapper.ZapperItem;
import net.minecraft.world.item.Item;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import com.simibubi.create.content.curiosities.weapons.PotatoCannonItem;
import net.minecraft.client.model.HumanoidModel;
import net.minecraft.client.player.AbstractClientPlayer;
import net.minecraft.client.renderer.entity.player.PlayerRenderer;
import net.minecraft.world.InteractionHand;
@Mixin(PlayerRenderer.class)
public class PlayerEntityRendererMixin {
@Inject(
method = "getArmPose",
at = @At("HEAD"),
cancellable = true
)
private static void getArmPose(AbstractClientPlayer player, InteractionHand hand, CallbackInfoReturnable<HumanoidModel.ArmPose> ci) {
Item handItem = player.getItemInHand(hand).getItem();
if (!player.swinging && (handItem instanceof PotatoCannonItem || handItem instanceof ZapperItem))
ci.setReturnValue(HumanoidModel.ArmPose.CROSSBOW_HOLD);
}
}

16
src/main/resources/assets/create/models/item/potato_cannon/item.json
View File

@ -96,18 +96,20 @@
],
"display": {
"thirdperson_righthand": {
"translation": [0, 2, 0]
"rotation": [0, -15, 0],
"translation": [0, 0, -4]
},
"thirdperson_lefthand": {
"translation": [0, 2, 0]
"rotation": [0, -15, 0],
"translation": [0, 0, -4]
},
"firstperson_righthand": {
"rotation": [5, 4, 5],
"translation": [0.25, 4, 0.75]
"rotation": [5, 5, 5],
"translation": [0.25, 5, 0.75]
},
"firstperson_lefthand": {
"rotation": [5, 4, 5],
"translation": [0.25, 4, 0.75]
"rotation": [5, 5, 5],
"translation": [0.25, 5, 0.75]
},
"ground": {
"rotation": [0, 0, 90],
@ -129,4 +131,4 @@
"scale": [0.72, 0.72, 0.72]
}
}
}
}

1
src/main/resources/create.mixins.json
View File

@ -24,6 +24,7 @@
"HeavyBootsOnPlayerMixin",
"LevelRendererMixin",
"MapRendererMapInstanceMixin",
"PlayerEntityRendererMixin",
"ModelDataRefreshMixin",
"WindowResizeMixin",
"accessor.AgeableListModelAccessor",