mirror of
https://github.com/Samsuik/Sakura.git
synced 2026-01-03 22:16:38 +00:00
7abe0b920b
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@056268e [ci skip] Correct javadoc for Weapon Component (#13096) PaperMC/Paper@a0ea729 Fix minimum tick time reporting and off thread reading PaperMC/Paper@ba2fb8c Update spark-paper dependency version (#13171) PaperMC/Paper@ce983d7 Misc fixes to tick reporting (#13174) PaperMC/Paper@9d95cd5 Use BUILD_STARTED_AT instead of Instant.now() for build timestamp (#13175) PaperMC/Paper@610f1d2 Update fill-gradle to v1.0.9 PaperMC/Paper@ffcb7b2 Update Parchment (#13177) PaperMC/Paper@c33a9ce Fix incorrect variable use in Entity#startRiding PaperMC/Paper@c710b66 Add MapPalette.getNearestColor (#13104) PaperMC/Paper@b57d641 Expose isReplaceable on BlockData (#13180) PaperMC/Paper@af1823d Reduce impact of tick time calculations (#13188) PaperMC/Paper@89ca94a [ci skip] Rebuild patches PaperMC/Paper@e5cc256 [ci skip] Update CONTRIBUTING.md for Gradle and Windows Docs (#13190) PaperMC/Paper@ab99393 Fix charged creeper explosions not dropping mob skulls (#13167)
91 lines
5.0 KiB
Diff
91 lines
5.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Samsuik <kfian294ma4@gmail.com>
|
|
Date: Fri, 9 Aug 2024 20:43:53 +0100
|
|
Subject: [PATCH] Configurable left shooting and adjusting limits
|
|
|
|
|
|
diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
|
|
index 2d54ee2493f03af8fb5cb1a44a2e802742675042..805d7dbc497e4763c0017fc2031ec9e1b8524d89 100644
|
|
--- a/net/minecraft/world/entity/Entity.java
|
|
+++ b/net/minecraft/world/entity/Entity.java
|
|
@@ -615,6 +615,47 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
|
|
return Math.max(x, z) >= this.travelDistanceLimit;
|
|
}
|
|
// Sakura end - entity travel distance limits
|
|
+ // Sakura start - configurable left shooting and adjusting limits
|
|
+ protected final void limitLeftShooting() {
|
|
+ final Vec3 movement = this.getDeltaMovement();
|
|
+ final int threshold = this.level.sakuraConfig().cannons.restrictions.leftShootingThreshold.or(-1);
|
|
+ if (threshold > 0 && (movement.x != 0.0 || movement.z != 0.0) && this.origin != null) {
|
|
+ final double travelledX = Math.abs(this.getX() - this.origin.x());
|
|
+ final double travelledZ = Math.abs(this.getZ() - this.origin.z());
|
|
+ final boolean xSmaller = travelledX < travelledZ; // intended // todo is it?
|
|
+
|
|
+ // Once entities have travelled past the threshold changing direction is restricted.
|
|
+ if (xSmaller && travelledX > threshold) {
|
|
+ this.setDeltaMovement(movement.multiply(1.0, 1.0, 0.0)); // limit z
|
|
+ } else if (!xSmaller && travelledZ > threshold) {
|
|
+ this.setDeltaMovement(movement.multiply(0.0, 1.0, 1.0)); // limit x
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+
|
|
+ private void limitAdjustMovement(final AABB currBoundingBox, final double dir, final boolean xAdjust, final List<VoxelShape> shapes) {
|
|
+ final int adjustDistance = this.level.sakuraConfig().cannons.restrictions.maxAdjustDistance.or(-1);
|
|
+ if (adjustDistance > 0 && Math.abs(dir) > adjustDistance) {
|
|
+ double minX = Double.NEGATIVE_INFINITY;
|
|
+ double minZ = Double.NEGATIVE_INFINITY;
|
|
+ double maxX = Double.POSITIVE_INFINITY;
|
|
+ double maxZ = Double.POSITIVE_INFINITY;
|
|
+ if (xAdjust) { // limit x adjust
|
|
+ minX = Math.floor(currBoundingBox.minX) - adjustDistance;
|
|
+ maxX = Math.floor(currBoundingBox.maxX) + adjustDistance + 1;
|
|
+ } else { // limit z adjust
|
|
+ minZ = Math.floor(currBoundingBox.minZ) - adjustDistance;
|
|
+ maxZ = Math.floor(currBoundingBox.maxZ) + adjustDistance + 1;
|
|
+ }
|
|
+
|
|
+ final VoxelShape safeSpace = Shapes.box(
|
|
+ minX, Double.NEGATIVE_INFINITY, minZ,
|
|
+ maxX, Double.POSITIVE_INFINITY, maxZ
|
|
+ );
|
|
+ shapes.add(Shapes.join(Shapes.INFINITY, safeSpace, BooleanOp.ONLY_FIRST));
|
|
+ }
|
|
+ }
|
|
+ // Sakura end - configurable left shooting and adjusting limits
|
|
|
|
public Entity(EntityType<?> type, Level level) {
|
|
this.type = type;
|
|
@@ -1655,6 +1696,7 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
|
|
}
|
|
|
|
if (xSmaller && z != 0.0) {
|
|
+ this.limitAdjustMovement(currBoundingBox, z, false, voxelList); // Sakura - configurable left shooting and adjusting limits
|
|
z = this.scanZ(currBoundingBox, z, voxelList, bbList);
|
|
if (z != 0.0) {
|
|
currBoundingBox = ca.spottedleaf.moonrise.patches.collisions.CollisionUtil.offsetZ(currBoundingBox, z);
|
|
@@ -1662,6 +1704,11 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
|
|
}
|
|
|
|
if (x != 0.0) {
|
|
+ // Sakura start - configurable left shooting and adjusting limits
|
|
+ if (!xSmaller) {
|
|
+ this.limitAdjustMovement(currBoundingBox, x, true, voxelList);
|
|
+ }
|
|
+ // Sakura end - configurable left shooting and adjusting limits
|
|
x = this.scanX(currBoundingBox, x, voxelList, bbList);
|
|
if (x != 0.0) {
|
|
currBoundingBox = ca.spottedleaf.moonrise.patches.collisions.CollisionUtil.offsetX(currBoundingBox, x);
|
|
diff --git a/net/minecraft/world/entity/item/FallingBlockEntity.java b/net/minecraft/world/entity/item/FallingBlockEntity.java
|
|
index 46d7f001d299ed6bb7987fe3c06c9cd1651bda80..802e890e743e85be9cc28798b12ba0e61ccabcc5 100644
|
|
--- a/net/minecraft/world/entity/item/FallingBlockEntity.java
|
|
+++ b/net/minecraft/world/entity/item/FallingBlockEntity.java
|
|
@@ -269,6 +269,7 @@ public class FallingBlockEntity extends Entity implements me.samsuik.sakura.enti
|
|
// Sakura end - configure server mechanics
|
|
this.time++;
|
|
this.applyGravity();
|
|
+ this.limitLeftShooting(); // Sakura - configurable left shooting and adjusting limits
|
|
this.move(MoverType.SELF, this.getDeltaMovement());
|
|
this.applyEffectsFromBlocks();
|
|
// Paper start - Configurable falling blocks height nerf
|