9
0
mirror of https://github.com/Samsuik/Sakura.git synced 2025-12-27 18:59:06 +00:00
Files
SakuraMC/patches/server/0029-Explosion-Durable-Blocks.patch
2024-02-26 21:59:32 +00:00

176 lines
9.3 KiB
Diff

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Samsuik <40902469+Samsuik@users.noreply.github.com>
Date: Wed, 15 Nov 2023 23:18:38 +0000
Subject: [PATCH] Explosion Durable Blocks
diff --git a/src/main/java/me/samsuik/sakura/explosion/durable/DurableBlockManager.java b/src/main/java/me/samsuik/sakura/explosion/durable/DurableBlockManager.java
new file mode 100644
index 0000000000000000000000000000000000000000..c58e52f7cc012babf4235e405e5fb5015c6e95d9
--- /dev/null
+++ b/src/main/java/me/samsuik/sakura/explosion/durable/DurableBlockManager.java
@@ -0,0 +1,63 @@
+package me.samsuik.sakura.explosion.durable;
+
+import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
+import me.samsuik.sakura.utils.objects.Expiry;
+import net.minecraft.core.BlockPos;
+import net.minecraft.server.MinecraftServer;
+
+public final class DurableBlockManager {
+
+ private final Long2ObjectOpenHashMap<DurableBlock> blocks = new Long2ObjectOpenHashMap<>();
+
+ public boolean damage(BlockPos pos, DurableMaterial material) {
+ long packed = pos.asLong();
+
+ DurableBlock block = this.blocks.computeIfAbsent(packed, k -> new DurableBlock(
+ material.durability(),
+ // expire after 1 minute
+ new Expiry(MinecraftServer.currentTickLong, 1200)
+ ));
+
+ if (block.damage()) {
+ this.blocks.remove(packed);
+ return true;
+ } else {
+ block.getExpiry().refresh(MinecraftServer.currentTickLong);
+ return false;
+ }
+ }
+
+ public int durability(BlockPos pos, DurableMaterial material) {
+ DurableBlock block = this.blocks.get(pos.asLong());
+ return block != null ? block.getDurability() : material.durability();
+ }
+
+ public void expire(long tick) {
+ if (tick % 200 == 0) {
+ this.blocks.values().removeIf(block -> block.getExpiry().isExpired(tick));
+ }
+ }
+
+ private static class DurableBlock {
+ private int durability;
+ private final Expiry expiry;
+
+ public DurableBlock(int durability, Expiry expiry) {
+ this.durability = durability;
+ this.expiry = expiry;
+ }
+
+ public Expiry getExpiry() {
+ return expiry;
+ }
+
+ public int getDurability() {
+ return durability;
+ }
+
+ public boolean damage() {
+ return --this.durability <= 0;
+ }
+ }
+
+}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index a9049e2cf29bdf90eb308f6b15a4374779032eec..cd095a5a921d1c1dd7cbc2adc2f3111801d23a5c 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1580,6 +1580,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
worldserver.minimalTNT.clear(); // Sakura - visibility api
worldserver.mergeHistory.expire(currentTickLong); // Sakura - merge cannoning entities
worldserver.densityCache.clear(); // Sakura
+ worldserver.durabilityManager.expire(currentTickLong); // Sakura
}
this.isIteratingOverLevels = false; // Paper
diff --git a/src/main/java/net/minecraft/world/item/ItemNameBlockItem.java b/src/main/java/net/minecraft/world/item/ItemNameBlockItem.java
index a8008c7550488be34b51f4280f5569170b1ebd1d..2e5c4d610d648ec8608ff0e5bbe0f3b2bdc3973d 100644
--- a/src/main/java/net/minecraft/world/item/ItemNameBlockItem.java
+++ b/src/main/java/net/minecraft/world/item/ItemNameBlockItem.java
@@ -6,6 +6,33 @@ public class ItemNameBlockItem extends BlockItem {
public ItemNameBlockItem(Block block, Item.Properties settings) {
super(block, settings);
}
+
+ // Sakura start
+ @Override
+ public net.minecraft.world.InteractionResult useOn(net.minecraft.world.item.context.UseOnContext context) {
+ Block itemBlock = this.getBlock();
+ if (context.getPlayer() != null && itemBlock.equals(net.minecraft.world.level.block.Blocks.POTATOES)) {
+ net.minecraft.world.entity.player.Player player = context.getPlayer();
+ net.minecraft.world.level.block.state.BlockState state = context.getLevel().getBlockState(context.getClickedPos());
+ Block block = state.getBlock();
+ me.samsuik.sakura.explosion.durable.DurableMaterial material = context.getLevel().localConfig().config(context.getClickedPos()).durableMaterials.get(block);
+
+ if (material != null) {
+ int durability = context.getLevel().durabilityManager.durability(context.getClickedPos(), material);
+ this.sendPotatoMessage(player, durability, material.durability());
+ }
+ }
+ return super.useOn(context);
+ }
+
+ private void sendPotatoMessage(net.minecraft.world.entity.player.Player player, int remaining, int durability) {
+ player.getBukkitEntity().sendMessage(net.kyori.adventure.text.minimessage.MiniMessage.miniMessage().deserialize(
+ me.samsuik.sakura.configuration.GlobalConfiguration.get().players.potatoMessage,
+ net.kyori.adventure.text.minimessage.tag.resolver.Placeholder.unparsed("remaining", String.valueOf(remaining)),
+ net.kyori.adventure.text.minimessage.tag.resolver.Placeholder.unparsed("durability", String.valueOf(durability))
+ ));
+ }
+ // Sakura end
@Override
public String getDescriptionId() {
diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
index 88fccb17260c203111147a2a458d81855cf12152..2fdfd6bbe87d3c93efd368307447f0577b714fa8 100644
--- a/src/main/java/net/minecraft/world/level/Explosion.java
+++ b/src/main/java/net/minecraft/world/level/Explosion.java
@@ -287,6 +287,16 @@ public class Explosion {
Optional<Float> optional = this.damageCalculator.getBlockExplosionResistance(this, this.level, blockposition, iblockdata, fluid);
+ // Sakura start - durable materials
+ // todo: on 1.20.2+ and higher this logic is only ran once, here it is every ray -> new block
+ Block block = iblockdata.getBlock();
+ me.samsuik.sakura.explosion.durable.DurableMaterial material = this.level.localConfig().config(mutableBlockPos).durableMaterials.get(block);
+
+ if (material != null && material.resistance() >= 0.0f && (this.level.sakuraConfig().cannons.explosion.allowNonTntBreakingDurableBlocks || this.source instanceof net.minecraft.world.entity.item.PrimedTnt)) {
+ optional = Optional.of(material.resistance());
+ }
+ // Sakura end
+
if (optional.isPresent()) {
f -= ((Float) optional.get() + 0.3F) * 0.3F;
}
@@ -491,6 +501,16 @@ public class Explosion {
BlockState iblockdata = this.level.getBlockState(blockposition);
Block block = iblockdata.getBlock();
// CraftBukkit start - TNTPrimeEvent
+ // Sakura start - durable materials
+ if (this.level.sakuraConfig().cannons.explosion.allowNonTntBreakingDurableBlocks || this.source instanceof net.minecraft.world.entity.item.PrimedTnt) {
+ me.samsuik.sakura.explosion.durable.DurableMaterial material = this.level.localConfig().config(blockposition).durableMaterials.get(block);
+
+ if (material != null && material.durability() >= 0 && !this.level.durabilityManager.damage(blockposition, material)) {
+ objectlistiterator.remove();
+ continue;
+ }
+ }
+ // Sakura end
if (block instanceof net.minecraft.world.level.block.TntBlock) {
Entity sourceEntity = this.source == null ? null : this.source;
BlockPos sourceBlock = sourceEntity == null ? BlockPos.containing(this.x, this.y, this.z) : null;
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index 9ebd7ae21f1fa492636bfa9979311a8105f5e3d6..c34d484661588d31d3ff59c5621c80c8c6b2c4ed 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -290,6 +290,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
public final it.unimi.dsi.fastutil.longs.Long2IntMap minimalTNT = new it.unimi.dsi.fastutil.longs.Long2IntOpenHashMap(); // Sakura - visibility api
public final me.samsuik.sakura.entity.merge.MergeHistory mergeHistory = new me.samsuik.sakura.entity.merge.MergeHistory(); // Sakura
public final me.samsuik.sakura.explosion.DensityCache densityCache = new me.samsuik.sakura.explosion.DensityCache(); // Sakura
+ public final me.samsuik.sakura.explosion.durable.DurableBlockManager durabilityManager = new me.samsuik.sakura.explosion.durable.DurableBlockManager(); // Sakura
// Sakura start - limited get entities
public void getLimitedEntities(Entity except, AABB box, Predicate<? super Entity> predicate, List<Entity> into, int limit, int search) {