PonyMirrors/MineLittlePony
1
0
Fork 0
mirror of https://github.com/MineLittlePony/MineLittlePony.git synced 2025-02-13 16:24:23 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix positioning of the crossbow when held by unicorns

Browse source
This commit is contained in:
Sollace 2019-06-11 12:22:58 +02:00
parent 276c86ebe0
commit f2a7189897
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/main/java/com/minelittlepony/client/render/LevitatingItemRenderer.java
View file

@ -43,9 +43,9 @@ public class LevitatingItemRenderer {
scalef(1.1F, 1.1F, 1.1F); scalef(1.1F, 1.1F, 1.1F);
translatef(0, 0.01F, 0.01F); translatef(0.01F, 0.01F, 0.01F);
renderItem.renderHeldItem(drop, entity, transform, hand == AbsoluteHand.LEFT); renderItem.renderHeldItem(drop, entity, transform, hand == AbsoluteHand.LEFT);
translatef(0.01F, -0.01F, -0.02F); translatef(-0.02F, -0.02F, -0.02F);
renderItem.renderHeldItem(drop, entity, transform, hand == AbsoluteHand.LEFT); renderItem.renderHeldItem(drop, entity, transform, hand == AbsoluteHand.LEFT);
((IRenderItem) renderItem).useTransparency(false); ((IRenderItem) renderItem).useTransparency(false);
@ -93,9 +93,9 @@ public class LevitatingItemRenderer {
scalef(1.1F, 1.1F, 1.1F); scalef(1.1F, 1.1F, 1.1F);
translatef(-0.015F, 0.01F, 0.01F); translatef(0.01F, 0.01F, 0.01F);
renderer.renderItemFromSide(entity, stack, transform, left); renderer.renderItemFromSide(entity, stack, transform, left);
translatef(0.03F, -0.01F, -0.02F); translatef(-0.02F, -0.02F, -0.02F);
renderer.renderItemFromSide(entity, stack, transform, left); renderer.renderItemFromSide(entity, stack, transform, left);
((IRenderItem)itemRenderer).useTransparency(false); ((IRenderItem)itemRenderer).useTransparency(false);
@ -117,7 +117,7 @@ public class LevitatingItemRenderer {
private void setupPerspective(ItemRenderer renderer, LivingEntity entity, ItemStack stack, boolean left) { private void setupPerspective(ItemRenderer renderer, LivingEntity entity, ItemStack stack, boolean left) {
UseAction action = stack.getUseAction(); UseAction action = stack.getUseAction();
boolean doNormal = entity.getItemUseTime() <= 0 || action == UseAction.NONE; boolean doNormal = entity.getItemUseTime() <= 0 || action == UseAction.NONE || action == UseAction.CROSSBOW;
if (doNormal) { // eating, blocking, and drinking are not transformed. Only held items. if (doNormal) { // eating, blocking, and drinking are not transformed. Only held items.
float ticks = MinecraftClient.getInstance().getTickDelta() - entity.age; float ticks = MinecraftClient.getInstance().getTickDelta() - entity.age;
@ -125,8 +125,9 @@ public class LevitatingItemRenderer {
float floatAmount = (float)Math.sin(ticks / 9) / 40; float floatAmount = (float)Math.sin(ticks / 9) / 40;
float driftAmount = (float)Math.cos(ticks / 6) / 40; float driftAmount = (float)Math.cos(ticks / 6) / 40;
boolean handHeldTool = stack.getUseAction() == UseAction.BOW boolean handHeldTool = action == UseAction.BOW
|| stack.getUseAction() == UseAction.BLOCK; || action == UseAction.CROSSBOW
|| action == UseAction.BLOCK;
translatef(driftAmount - floatAmount / 4, floatAmount, handHeldTool ? -0.3F : -0.6F); translatef(driftAmount - floatAmount / 4, floatAmount, handHeldTool ? -0.3F : -0.6F);