mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-19 19:25:48 +00:00
Code Releases Activity

Merge pull request #3784 from JustAHuman-xD/fix/ancient-pedestal

Browse Source 
Ancient Pedestal Fixes
This commit is contained in:
Sfiguz7 2023-07-12 14:21:26 +02:00 committed by GitHub
commit f2fb911ec2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 110 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/altar/AncientPedestal.java
View File

@ -9,6 +9,7 @@ import javax.annotation.ParametersAreNonnullByDefault;
import org.bukkit.GameMode;
import org.bukkit.Location;
import org.bukkit.block.Block;
import org.bukkit.entity.ArmorStand;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Item;
import org.bukkit.entity.Player;
@ -23,6 +24,7 @@ import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup;
import io.github.thebusybiscuit.slimefun4.api.items.ItemSpawnReason;
import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack;
import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType;
import io.github.thebusybiscuit.slimefun4.core.attributes.NotHopperable;
import io.github.thebusybiscuit.slimefun4.core.handlers.BlockBreakHandler;
import io.github.thebusybiscuit.slimefun4.core.handlers.BlockDispenseHandler;
import io.github.thebusybiscuit.slimefun4.core.services.sounds.SoundEffect;
@ -31,6 +33,7 @@ import io.github.thebusybiscuit.slimefun4.implementation.handlers.SimpleBlockBre
import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem;
import io.github.thebusybiscuit.slimefun4.implementation.listeners.AncientAltarListener;
import io.github.thebusybiscuit.slimefun4.implementation.tasks.AncientAltarTask;
import io.github.thebusybiscuit.slimefun4.utils.ArmorStandUtils;
import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils;
/**
@ -40,13 +43,14 @@ import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils;
*
* @author Redemption198
* @author TheBusyBiscuit
* @author JustAHuman
*
* @see AncientAltar
* @see AncientAltarListener
* @see AncientAltarTask
*
*/
public class AncientPedestal extends SimpleSlimefunItem<BlockDispenseHandler> {
public class AncientPedestal extends SimpleSlimefunItem<BlockDispenseHandler> implements NotHopperable {
public static final String ITEM_PREFIX = ChatColors.color("&dALTAR &3Probe - &e");
@ -63,7 +67,8 @@ public class AncientPedestal extends SimpleSlimefunItem<BlockDispenseHandler> {
@Override
public void onBlockBreak(@Nonnull Block b) {
Optional<Item> entity = getPlacedItem(b);
ArmorStand armorStand = getArmorStand(b, false);
if (entity.isPresent()) {
Item stack = entity.get();
@ -73,6 +78,10 @@ public class AncientPedestal extends SimpleSlimefunItem<BlockDispenseHandler> {
stack.remove();
}
}
if (armorStand != null && armorStand.isValid()) {
armorStand.remove();
}
}
};
}
@ -93,6 +102,23 @@ public class AncientPedestal extends SimpleSlimefunItem<BlockDispenseHandler> {
return Optional.empty();
}
public @Nullable ArmorStand getArmorStand(@Nonnull Block pedestal, boolean createIfNoneExists) {
Optional<Item> entity = getPlacedItem(pedestal);
if (entity.isPresent() && entity.get().getVehicle() instanceof ArmorStand armorStand) {
return armorStand;
}
Location l = pedestal.getLocation().add(0.5, 1.2, 0.5);
for (Entity n : l.getWorld().getNearbyEntities(l, 0.5, 0.5, 0.5, this::testArmorStand)) {
if (n instanceof ArmorStand armorStand) {
return armorStand;
}
}
return createIfNoneExists ? ArmorStandUtils.spawnArmorStand(l) : null;
}
private boolean testItem(@Nullable Entity n) {
if (n instanceof Item item && n.isValid()) {
@ -103,17 +129,24 @@ public class AncientPedestal extends SimpleSlimefunItem<BlockDispenseHandler> {
return false;
}
}
private boolean testArmorStand(@Nullable Entity n) {
if (n instanceof ArmorStand && n.isValid()) {
String customName = n.getCustomName();
return customName != null && customName.startsWith(ITEM_PREFIX);
} else {
return false;
}
}
public @Nonnull ItemStack getOriginalItemStack(@Nonnull Item item) {
ItemStack stack = item.getItemStack().clone();
ItemMeta im = stack.getItemMeta();
String customName = item.getCustomName();
im.setDisplayName(null);
stack.setItemMeta(im);
if (customName.equals(ItemUtils.getItemName(new ItemStack(stack.getType())))) {
ItemMeta im = stack.getItemMeta();
im.setDisplayName(null);
stack.setItemMeta(im);
} else {
ItemMeta im = stack.getItemMeta();
if (customName == null || !customName.equals(ItemUtils.getItemName(stack))) {
im.setDisplayName(customName);
stack.setItemMeta(im);
}
@ -123,7 +156,8 @@ public class AncientPedestal extends SimpleSlimefunItem<BlockDispenseHandler> {
public void placeItem(@Nonnull Player p, @Nonnull Block b) {
ItemStack hand = p.getInventory().getItemInMainHand();
ItemStack displayItem = new CustomItemStack(hand, ITEM_PREFIX + System.nanoTime());
String displayName = ITEM_PREFIX + System.nanoTime();
ItemStack displayItem = new CustomItemStack(hand, displayName);
displayItem.setAmount(1);
// Get the display name of the original Item in the Player's hand
@ -136,9 +170,14 @@ public class AncientPedestal extends SimpleSlimefunItem<BlockDispenseHandler> {
Item entity = SlimefunUtils.spawnItem(b.getLocation().add(0.5, 1.2, 0.5), displayItem, ItemSpawnReason.ANCIENT_PEDESTAL_PLACE_ITEM);
if (entity != null) {
ArmorStand armorStand = getArmorStand(b, true);
entity.setInvulnerable(true);
entity.setUnlimitedLifetime(true);
entity.setVelocity(new Vector(0, 0.1, 0));
entity.setCustomNameVisible(true);
entity.setCustomName(nametag);
armorStand.setCustomName(displayName);
armorStand.addPassenger(entity);
SlimefunUtils.markAsNoPickup(entity, "altar_item");
SoundEffect.ANCIENT_PEDESTAL_ITEM_PLACE_SOUND.playAt(b);
}

20
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/HologramProjector.java
View File

@ -8,7 +8,6 @@ import org.bukkit.Material;
import org.bukkit.block.Block;
import org.bukkit.entity.ArmorStand;
import org.bukkit.entity.Entity;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Player;
import org.bukkit.event.block.BlockPlaceEvent;
import org.bukkit.inventory.ItemStack;
@ -26,6 +25,7 @@ import io.github.thebusybiscuit.slimefun4.core.handlers.BlockUseHandler;
import io.github.thebusybiscuit.slimefun4.core.services.holograms.HologramsService;
import io.github.thebusybiscuit.slimefun4.implementation.Slimefun;
import io.github.thebusybiscuit.slimefun4.implementation.handlers.SimpleBlockBreakHandler;
import io.github.thebusybiscuit.slimefun4.utils.ArmorStandUtils;
import io.github.thebusybiscuit.slimefun4.utils.ChatUtils;
import io.github.thebusybiscuit.slimefun4.utils.NumberUtils;
@ -152,22 +152,8 @@ public class HologramProjector extends SlimefunItem implements HologramOwner {
if (!createIfNoneExists) {
return null;
}
ArmorStand hologram = spawnArmorStand(l);
hologram.setCustomName(nametag);
return hologram;
}
private static @Nonnull ArmorStand spawnArmorStand(@Nonnull Location l) {
ArmorStand armorStand = (ArmorStand) l.getWorld().spawnEntity(l, EntityType.ARMOR_STAND);
armorStand.setVisible(false);
armorStand.setSilent(true);
armorStand.setMarker(true);
armorStand.setGravity(false);
armorStand.setBasePlate(false);
armorStand.setCustomNameVisible(true);
armorStand.setRemoveWhenFarAway(false);
return armorStand;
return ArmorStandUtils.spawnArmorStand(l, nametag);
}
private static void killArmorStand(@Nonnull Block b) {

59
src/main/java/io/github/thebusybiscuit/slimefun4/utils/ArmorStandUtils.java Normal file
View File

@ -0,0 +1,59 @@
package io.github.thebusybiscuit.slimefun4.utils;
import javax.annotation.Nonnull;
import org.bukkit.Location;
import org.bukkit.entity.ArmorStand;
import io.github.thebusybiscuit.slimefun4.core.services.holograms.HologramsService;
import io.github.thebusybiscuit.slimefun4.implementation.items.altar.AncientPedestal;
import io.github.thebusybiscuit.slimefun4.implementation.items.blocks.HologramProjector;
/**
* This class holds utilities for {@link ArmorStand}, useful for classes
* dealing with {@link ArmorStand}s that are not from {@link HologramsService}
*
* @see HologramProjector
* @see AncientPedestal
*
* @author JustAHuman
*/
public class ArmorStandUtils {
/**
* Spawns an {@link ArmorStand} at the given {@link Location} with the given custom name
* <br>
* Set Properties: Invisible, Silent, Marker, No-Gravity, No Base Plate, Don't Remove When Far Away
*
* @param location The {@link Location} to spawn the {@link ArmorStand}
* @param customName The {@link String} custom name the {@link ArmorStand} should display
*
* @return The spawned {@link ArmorStand}
*/
public static @Nonnull ArmorStand spawnArmorStand(@Nonnull Location location, @Nonnull String customName) {
ArmorStand armorStand = spawnArmorStand(location);
armorStand.setCustomName(customName);
armorStand.setCustomNameVisible(true);
return armorStand;
}
/**
* Spawns an {@link ArmorStand} at the given {@link Location}
* <br>
* Set Properties: Invisible, Silent, Marker, No-Gravity, No Base Plate, Don't Remove When Far Away
*
* @param location The {@link Location} to spawn the {@link ArmorStand}
*
* @return The spawned {@link ArmorStand}
*/
public static @Nonnull ArmorStand spawnArmorStand(@Nonnull Location location) {
return location.getWorld().spawn(location, ArmorStand.class, armorStand -> {
armorStand.setVisible(false);
armorStand.setSilent(true);
armorStand.setMarker(true);
armorStand.setGravity(false);
armorStand.setBasePlate(false);
armorStand.setRemoveWhenFarAway(false);
});
}
}