From dacd67a6e73662c2965adc110c02f4d8d937b3e2 Mon Sep 17 00:00:00 2001 From: Samsuik Date: Fri, 23 Feb 2024 16:20:10 +0000 Subject: [PATCH] Add config for potion mechanics --- .../0004-Sakura-Configuration-Files.patch | 11 ++- ...n-speed-and-breaking-inside-entities.patch | 69 +++++++++++++++++++ 2 files changed, 78 insertions(+), 2 deletions(-) create mode 100644 patches/server/0060-Configure-potion-speed-and-breaking-inside-entities.patch diff --git a/patches/server/0004-Sakura-Configuration-Files.patch b/patches/server/0004-Sakura-Configuration-Files.patch index 2dea55b..0084644 100644 --- a/patches/server/0004-Sakura-Configuration-Files.patch +++ b/patches/server/0004-Sakura-Configuration-Files.patch @@ -613,10 +613,10 @@ index 0000000000000000000000000000000000000000..03b5e3243831b64b30c431134681ad37 +} diff --git a/src/main/java/me/samsuik/sakura/configuration/WorldConfiguration.java b/src/main/java/me/samsuik/sakura/configuration/WorldConfiguration.java new file mode 100644 -index 0000000000000000000000000000000000000000..3d58183f9f3748cfb35a9c70ad434b29064783f2 +index 0000000000000000000000000000000000000000..57d8f714a092c94dfd407ff3b7ad466df4b35dd9 --- /dev/null +++ b/src/main/java/me/samsuik/sakura/configuration/WorldConfiguration.java -@@ -0,0 +1,177 @@ +@@ -0,0 +1,184 @@ +package me.samsuik.sakura.configuration; + +import com.mojang.logging.LogUtils; @@ -780,6 +780,13 @@ index 0000000000000000000000000000000000000000..3d58183f9f3748cfb35a9c70ad434b29 + public Map, Integer> chunkTravelLimit = Util.make(new Reference2ObjectOpenHashMap<>(), map -> { + map.put(EntityType.ENDER_PEARL, 8); + }); ++ ++ public ThrownPotion thrownPotion = new ThrownPotion(); ++ public class ThrownPotion extends ConfigurationPart { ++ public double horizontalSpeed = 1.0; ++ public double verticalSpeed = 1.0; ++ public boolean allowBreakingInsideEntities = false; ++ } + } + + public Environment environment; diff --git a/patches/server/0060-Configure-potion-speed-and-breaking-inside-entities.patch b/patches/server/0060-Configure-potion-speed-and-breaking-inside-entities.patch new file mode 100644 index 0000000..bba75b7 --- /dev/null +++ b/patches/server/0060-Configure-potion-speed-and-breaking-inside-entities.patch @@ -0,0 +1,69 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Samsuik +Date: Fri, 23 Feb 2024 16:18:51 +0000 +Subject: [PATCH] Configure potion speed and breaking inside entities + + +diff --git a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java +index a211ca048dddc75afce1f83ee1700bad66e457fc..429708583d5b6ed3565e6caf6f2488011b99da50 100644 +--- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java ++++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java +@@ -135,7 +135,7 @@ public abstract class Projectile extends Entity implements TraceableEntity { + super.tick(); + } + +- private boolean checkLeftOwner() { ++ protected boolean checkLeftOwner() { // Sakura - configure potion mechanics + Entity entity = this.getOwner(); + + if (entity != null) { +diff --git a/src/main/java/net/minecraft/world/entity/projectile/ProjectileUtil.java b/src/main/java/net/minecraft/world/entity/projectile/ProjectileUtil.java +index 0524161f7cb414d526e6118258bddd989be6cc9a..a14eb401d739850fa1fa6eb673442462b4c8e435 100644 +--- a/src/main/java/net/minecraft/world/entity/projectile/ProjectileUtil.java ++++ b/src/main/java/net/minecraft/world/entity/projectile/ProjectileUtil.java +@@ -29,7 +29,14 @@ public final class ProjectileUtil { + vec33 = hitResult.getLocation(); + } + +- HitResult hitResult2 = getEntityHitResult(level, entity, vec32, vec33, entity.getBoundingBox().expandTowards(entity.getDeltaMovement()).inflate(1.0D), predicate); ++ // Sakura start - configure potion mechanics ++ final HitResult hitResult2; ++ if (level.sakuraConfig().entity.thrownPotion.allowBreakingInsideEntities && entity instanceof ThrownPotion) { ++ hitResult2 = getEntityHitResult(entity, vec32, vec33, entity.getBoundingBox().expandTowards(entity.getDeltaMovement()).inflate(1.0D), predicate, 0.3); ++ } else { ++ hitResult2 = getEntityHitResult(level, entity, vec32, vec33, entity.getBoundingBox().expandTowards(entity.getDeltaMovement()).inflate(1.0D), predicate); ++ } ++ // Sakura end - configure potion mechanics + if (hitResult2 != null) { + hitResult = hitResult2; + } +diff --git a/src/main/java/net/minecraft/world/entity/projectile/ThrownPotion.java b/src/main/java/net/minecraft/world/entity/projectile/ThrownPotion.java +index 8d448ea844309af8d90e285919bfc76774a53904..b1883d7e4d8449a395b01aaa5980152708752bbe 100644 +--- a/src/main/java/net/minecraft/world/entity/projectile/ThrownPotion.java ++++ b/src/main/java/net/minecraft/world/entity/projectile/ThrownPotion.java +@@ -59,6 +59,25 @@ public class ThrownPotion extends ThrowableItemProjectile implements ItemSupplie + super(EntityType.POTION, x, y, z, world); + } + ++ // Sakura start - configure potion mechanics ++ @Override ++ public void shoot(double x, double y, double z, float speed, float divergence) { ++ super.shoot(x, y, z, speed, divergence); ++ ++ net.minecraft.world.phys.Vec3 movement = getDeltaMovement(); ++ double moveX = movement.x * level.sakuraConfig().entity.thrownPotion.horizontalSpeed; ++ double moveY = movement.y * level.sakuraConfig().entity.thrownPotion.verticalSpeed; ++ double moveZ = movement.z * level.sakuraConfig().entity.thrownPotion.horizontalSpeed; ++ ++ setDeltaMovement(moveX, moveY, moveZ); ++ } ++ ++ @Override ++ protected final boolean checkLeftOwner() { ++ return super.checkLeftOwner() || level.sakuraConfig().entity.thrownPotion.allowBreakingInsideEntities && tickCount >= 5; ++ } ++ // Sakura end - configure potion mechanics ++ + @Override + protected Item getDefaultItem() { + return Items.SPLASH_POTION;