diff --git a/common/src/main/java/common/item/tool/ItemShears.java b/common/src/main/java/common/item/tool/ItemShears.java index a9ef7cfc..29a17426 100755 --- a/common/src/main/java/common/item/tool/ItemShears.java +++ b/common/src/main/java/common/item/tool/ItemShears.java @@ -58,6 +58,6 @@ public class ItemShears extends Item } public WieldType getWieldType() { - return WieldType.DEFAULT; + return WieldType.TOOL; } } diff --git a/common/src/main/java/common/model/Transform.java b/common/src/main/java/common/model/Transform.java index 2f8b277a..a9d88a13 100755 --- a/common/src/main/java/common/model/Transform.java +++ b/common/src/main/java/common/model/Transform.java @@ -1,43 +1,19 @@ package common.model; public enum Transform { - IDENTITY( - 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f - ), - DICE( - 135.0f, -55.0f, 180.0f, 0.0f, 0.0f, 0.0f, 2.75f - ), - STAIRS( - 0.0f, 180.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f - ), - SMALL( - 0.0f, 0.0f, 0.0f, 0.0f, 0.25f, 0.0f, 1.25f - ), - SMALL_FLAT( - 0.0f, 0.0f, 0.0f, 0.0f, 1.5f, 0.0f, 1.25f - ), - CROSS( - 0.0f, 45.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.25f - ), - CROSS_SMALL( - 0.0f, 45.0f, 0.0f, 0.0f, 0.5f, 0.0f, 1.5f - ), - WIRE( - 90.0f, 45.0f, -90.0f, 0.0f, -4.0f, 0.0f, 1.75f - ), - THIN_WIRE( - 50.0f, 45.0f, -50.0f, 5.0f, 1.75f, 0.0f, 2.25f - ), - PANE( - 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.25f - ), - PANE_SIDE( - 0.0f, 0.0f, 0.0f, -4.5f, -3.75f, 0.0f, 1.25f - ), - FENCE( - 0.0f, 90.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f - ); - + IDENTITY(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f), + DICE(135.0f, -55.0f, 180.0f, 0.0f, 0.0f, 0.0f, 2.75f), + STAIRS(0.0f, 180.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f), + SMALL(0.0f, 0.0f, 0.0f, 0.0f, 0.25f, 0.0f, 1.25f), + SMALL_FLAT(0.0f, 0.0f, 0.0f, 0.0f, 1.5f, 0.0f, 1.25f), + CROSS(0.0f, 45.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.25f), + CROSS_SMALL(0.0f, 45.0f, 0.0f, 0.0f, 0.5f, 0.0f, 1.5f), + WIRE(90.0f, 45.0f, -90.0f, 0.0f, -4.0f, 0.0f, 1.75f), + THIN_WIRE(50.0f, 45.0f, -50.0f, 5.0f, 1.75f, 0.0f, 2.25f), + PANE(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.25f), + PANE_SIDE(0.0f, 0.0f, 0.0f, -4.5f, -3.75f, 0.0f, 1.25f), + FENCE(0.0f, 90.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f); + private final float rotationX; private final float rotationY; private final float rotationZ;