Tianpao/Arclight
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implement item merge radius

Browse Source
This commit is contained in:
IzzelAliz 2021-10-29 13:09:18 +08:00
parent 77bead3ba2
commit 58740de7a5
No known key found for this signature in database
GPG Key ID: EE50E123A11D8338
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/item/ItemEntityMixin.java
View File

@ -5,6 +5,7 @@ import io.izzel.arclight.common.bridge.core.entity.player.PlayerEntityBridge;
import io.izzel.arclight.common.bridge.core.entity.player.PlayerInventoryBridge;
import io.izzel.arclight.common.bridge.core.entity.player.ServerPlayerEntityBridge;
import io.izzel.arclight.common.bridge.core.network.datasync.EntityDataManagerBridge;
import io.izzel.arclight.common.bridge.core.world.WorldBridge;
import io.izzel.arclight.common.mixin.core.world.entity.EntityMixin;
import net.minecraft.network.syncher.EntityDataAccessor;
import net.minecraft.stats.Stats;
@ -12,6 +13,7 @@ import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.entity.item.ItemEntity;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.phys.AABB;
import net.minecraftforge.fmllegacy.hooks.BasicEventHooks;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v.event.CraftEventFactory;
@ -132,4 +134,10 @@ public abstract class ItemEntityMixin extends EntityMixin {
itemEntity.setItem(stack);
}
}
@Redirect(method = "mergeWithNeighbours", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/phys/AABB;inflate(DDD)Lnet/minecraft/world/phys/AABB;"))
private AABB arclight$mergeRadius(AABB instance, double pX, double pY, double pZ) {
double radius = ((WorldBridge) level).bridge$spigotConfig().itemMerge;
return instance.inflate(radius);
}
}

2
build.gradle
View File

@ -1,6 +1,6 @@
allprojects {
group 'io.izzel.arclight'
version '1.0.0'
version '1.0.1-SNAPSHOT'
def getGitHash = { ->
def stdout = new ByteArrayOutputStream()