diff --git a/src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoProjectileRenderMode.java b/src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoProjectileRenderMode.java index aa8111556..5ef85b0dc 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoProjectileRenderMode.java +++ b/src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoProjectileRenderMode.java @@ -33,9 +33,8 @@ public interface PotatoProjectileRenderMode { .subtract(p1); MatrixTransformStack.of(ms) - .rotateY(AngleHelper.deg(MathHelper.atan2(diff.x, diff.z))) - .rotateX(180 - + AngleHelper.deg(MathHelper.atan2(diff.y, -MathHelper.sqrt(diff.x * diff.x + diff.z * diff.z)))); + .rotateY(AngleHelper.deg(MathHelper.atan2(diff.x, diff.z)) + 180) + .rotateX(AngleHelper.deg(MathHelper.atan2(diff.y, MathHelper.sqrt(diff.x * diff.x + diff.z * diff.z)))); } } diff --git a/src/main/java/com/simibubi/create/content/curiosities/zapper/ShootableGadgetItemMethods.java b/src/main/java/com/simibubi/create/content/curiosities/zapper/ShootableGadgetItemMethods.java index a403f6ef0..4ea63ab04 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/zapper/ShootableGadgetItemMethods.java +++ b/src/main/java/com/simibubi/create/content/curiosities/zapper/ShootableGadgetItemMethods.java @@ -17,6 +17,9 @@ public class ShootableGadgetItemMethods { public static void applyCooldown(PlayerEntity player, ItemStack item, Hand hand, Predicate predicate, int cooldown) { + if (cooldown <= 0) + return; + boolean gunInOtherHand = predicate.test(player.getItemInHand(hand == Hand.MAIN_HAND ? Hand.OFF_HAND : Hand.MAIN_HAND)); player.getCooldowns() diff --git a/src/main/java/com/simibubi/create/content/logistics/block/depot/DepotRenderer.java b/src/main/java/com/simibubi/create/content/logistics/block/depot/DepotRenderer.java index f22a1f0cb..5ad787fc3 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/depot/DepotRenderer.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/depot/DepotRenderer.java @@ -117,8 +117,8 @@ public class DepotRenderer extends SafeTileEntityRenderer { Vector3d positionVec = renderViewEntity.position(); Vector3d vectorForOffset = itemPosition; Vector3d diff = vectorForOffset.subtract(positionVec); - float yRot = (float) -MathHelper.atan2(diff.z, diff.x); - ms.mulPose(Vector3f.YP.rotation((float) (yRot - Math.PI / 2))); + float yRot = (float) (MathHelper.atan2(diff.x, diff.z) + Math.PI); + ms.mulPose(Vector3f.YP.rotation(yRot)); } ms.translate(0, 3 / 32d, -1 / 16f); } diff --git a/src/main/java/com/simibubi/create/foundation/config/CKinetics.java b/src/main/java/com/simibubi/create/foundation/config/CKinetics.java index 1f0e7013a..00b14b08c 100644 --- a/src/main/java/com/simibubi/create/foundation/config/CKinetics.java +++ b/src/main/java/com/simibubi/create/foundation/config/CKinetics.java @@ -40,9 +40,9 @@ public class CKinetics extends ConfigBase { e(ContraptionMovementSetting.NO_PICKUP, "movableSpawners", Comments.spawnerMovement); public final ConfigEnum obsidianMovement = e(ContraptionMovementSetting.UNMOVABLE, "movableObsidian", Comments.obsidianMovement); - public ConfigBool moveItemsToStorage = b(true, "moveItemsToStorage", Comments.moveItemsToStorage); - public ConfigBool harvestPartiallyGrown = b(false, "harvestPartiallyGrown", Comments.harvestPartiallyGrown); - public ConfigBool harvesterReplants = b(true, "harvesterReplants", Comments.harvesterReplants); + public final ConfigBool moveItemsToStorage = b(true, "moveItemsToStorage", Comments.moveItemsToStorage); + public final ConfigBool harvestPartiallyGrown = b(false, "harvestPartiallyGrown", Comments.harvestPartiallyGrown); + public final ConfigBool harvesterReplants = b(true, "harvesterReplants", Comments.harvesterReplants); public final CStress stressValues = nested(1, CStress::new, Comments.stress);