From 6074a9969eaf1a9931c7d505502f116d44d5ba49 Mon Sep 17 00:00:00 2001 From: Samsuik Date: Thu, 31 Oct 2024 11:51:26 +0000 Subject: [PATCH] Remove unused imports --- patches/server/0019-Specialised-Explosions.patch | 15 ++++----------- ...0037-Configure-cannon-physics-by-version.patch | 8 ++++---- .../0072-Set-entity-impulse-on-explosion.patch | 4 ++-- 3 files changed, 10 insertions(+), 17 deletions(-) diff --git a/patches/server/0019-Specialised-Explosions.patch b/patches/server/0019-Specialised-Explosions.patch index 27cdc8e..eebe174 100644 --- a/patches/server/0019-Specialised-Explosions.patch +++ b/patches/server/0019-Specialised-Explosions.patch @@ -23,10 +23,10 @@ index c21e00812f1aaa1279834a0562d360d6b89e146c..1e1329adde1457898a3002279b53b1bb if (index >= 0) { diff --git a/src/main/java/me/samsuik/sakura/explosion/special/SpecialisedExplosion.java b/src/main/java/me/samsuik/sakura/explosion/special/SpecialisedExplosion.java new file mode 100644 -index 0000000000000000000000000000000000000000..4cbef703a70208191d13075c2c54581eb8239f70 +index 0000000000000000000000000000000000000000..161728f788ef6bfebbc9efb6560d1af933907f42 --- /dev/null +++ b/src/main/java/me/samsuik/sakura/explosion/special/SpecialisedExplosion.java -@@ -0,0 +1,206 @@ +@@ -0,0 +1,205 @@ +package me.samsuik.sakura.explosion.special; + +import ca.spottedleaf.moonrise.common.util.WorldUtil; @@ -37,7 +37,6 @@ index 0000000000000000000000000000000000000000..4cbef703a70208191d13075c2c54581e +import net.minecraft.util.Mth; +import net.minecraft.world.damagesource.DamageSource; +import net.minecraft.world.entity.Entity; -+import net.minecraft.world.entity.item.PrimedTnt; +import net.minecraft.world.level.ExplosionDamageCalculator; +import net.minecraft.world.level.ServerExplosion; +import net.minecraft.world.phys.AABB; @@ -235,30 +234,24 @@ index 0000000000000000000000000000000000000000..4cbef703a70208191d13075c2c54581e +} diff --git a/src/main/java/me/samsuik/sakura/explosion/special/TntExplosion.java b/src/main/java/me/samsuik/sakura/explosion/special/TntExplosion.java new file mode 100644 -index 0000000000000000000000000000000000000000..d5bd783cca91ab292cd9957fe25803773f75c4ee +index 0000000000000000000000000000000000000000..45d9204f888c57d27ac5544e42f779ba425fcc4a --- /dev/null +++ b/src/main/java/me/samsuik/sakura/explosion/special/TntExplosion.java -@@ -0,0 +1,208 @@ +@@ -0,0 +1,202 @@ +package me.samsuik.sakura.explosion.special; + +import ca.spottedleaf.moonrise.common.list.IteratorSafeOrderedReferenceSet; -+import ca.spottedleaf.moonrise.patches.collisions.ExplosionBlockCache; +import it.unimi.dsi.fastutil.objects.ObjectArrayList; +import me.samsuik.sakura.entity.EntityState; +import me.samsuik.sakura.entity.merge.MergeLevel; +import me.samsuik.sakura.entity.merge.MergeableEntity; +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; -+import net.minecraft.core.Holder; -+import net.minecraft.core.particles.ParticleOptions; +import net.minecraft.server.level.ServerLevel; -+import net.minecraft.sounds.SoundEvent; -+import net.minecraft.util.Mth; +import net.minecraft.world.damagesource.DamageSource; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.item.PrimedTnt; +import net.minecraft.world.level.ExplosionDamageCalculator; -+import net.minecraft.world.level.Level; +import net.minecraft.world.phys.AABB; +import net.minecraft.world.phys.Vec3; +import org.bukkit.craftbukkit.util.CraftVector; diff --git a/patches/server/0037-Configure-cannon-physics-by-version.patch b/patches/server/0037-Configure-cannon-physics-by-version.patch index f32e9f0..b8f542f 100644 --- a/patches/server/0037-Configure-cannon-physics-by-version.patch +++ b/patches/server/0037-Configure-cannon-physics-by-version.patch @@ -67,10 +67,10 @@ index 149e461fcb23b2ed7ae8dcc09837de501ba9eafb..613d2d90571546a482ba493fae5cbc7c if (xSmaller && z != 0.0) { z = performAABBCollisionsZ(axisalignedbb, z, aabbs); diff --git a/src/main/java/me/samsuik/sakura/explosion/special/SpecialisedExplosion.java b/src/main/java/me/samsuik/sakura/explosion/special/SpecialisedExplosion.java -index 4cbef703a70208191d13075c2c54581eb8239f70..2ac8bd2cc879c493d9a008f7555c7277977129f5 100644 +index 161728f788ef6bfebbc9efb6560d1af933907f42..ca96bec3333b59b620a657c3c0d153e4596a5459 100644 --- a/src/main/java/me/samsuik/sakura/explosion/special/SpecialisedExplosion.java +++ b/src/main/java/me/samsuik/sakura/explosion/special/SpecialisedExplosion.java -@@ -164,9 +164,15 @@ public abstract class SpecialisedExplosion extends ServerExplo +@@ -163,9 +163,15 @@ public abstract class SpecialisedExplosion extends ServerExplo if (distanceFromBottom <= 1.0) { double x = entity.getX() - pos.x; @@ -88,10 +88,10 @@ index 4cbef703a70208191d13075c2c54581eb8239f70..2ac8bd2cc879c493d9a008f7555c7277 if (distance != 0.0D) { x /= distance; diff --git a/src/main/java/me/samsuik/sakura/explosion/special/TntExplosion.java b/src/main/java/me/samsuik/sakura/explosion/special/TntExplosion.java -index d5bd783cca91ab292cd9957fe25803773f75c4ee..f08500cb89099896de45270386bb9b85f1230157 100644 +index 45d9204f888c57d27ac5544e42f779ba425fcc4a..048946c210e263b90880a431ea5ff243932c3e0f 100644 --- a/src/main/java/me/samsuik/sakura/explosion/special/TntExplosion.java +++ b/src/main/java/me/samsuik/sakura/explosion/special/TntExplosion.java -@@ -43,6 +43,13 @@ public final class TntExplosion extends SpecialisedExplosion { +@@ -37,6 +37,13 @@ public final class TntExplosion extends SpecialisedExplosion { this.bounds = new AABB(center, center); } diff --git a/patches/server/0072-Set-entity-impulse-on-explosion.patch b/patches/server/0072-Set-entity-impulse-on-explosion.patch index aff3a2f..391a969 100644 --- a/patches/server/0072-Set-entity-impulse-on-explosion.patch +++ b/patches/server/0072-Set-entity-impulse-on-explosion.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Set entity impulse on explosion diff --git a/src/main/java/me/samsuik/sakura/explosion/special/SpecialisedExplosion.java b/src/main/java/me/samsuik/sakura/explosion/special/SpecialisedExplosion.java -index 2ac8bd2cc879c493d9a008f7555c7277977129f5..8f5e17d6c132aedcd49e92bd0c82c9c6a4435282 100644 +index ca96bec3333b59b620a657c3c0d153e4596a5459..51388b968a96fef99e0db250a55266ebde03d903 100644 --- a/src/main/java/me/samsuik/sakura/explosion/special/SpecialisedExplosion.java +++ b/src/main/java/me/samsuik/sakura/explosion/special/SpecialisedExplosion.java -@@ -207,6 +207,7 @@ public abstract class SpecialisedExplosion extends ServerExplo +@@ -206,6 +206,7 @@ public abstract class SpecialisedExplosion extends ServerExplo moveZ += z; }