Skip to content

Commit

Permalink
[6.1.2] 1.21, XBlock.java, XEnchantment.java
Browse files Browse the repository at this point in the history
  • Loading branch information
@Bkm016
Bkm016 committed Jun 15, 2024
1 parent 418f03d commit 3dcb14c
Show file tree
Hide file tree
Showing 2 changed files with 215 additions and 142 deletions.
180 changes: 109 additions & 71 deletions module/module-bukkit-xseries/src/main/java/taboolib/library/xseries/XBlock.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* The MIT License (MIT)
*
* Copyright (c) 2023 Crypto Morin
* Copyright (c) 2024 Crypto Morin
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
Expand All @@ -23,17 +23,17 @@

import org.bukkit.DyeColor;
import org.bukkit.Material;
import org.bukkit.SkullType;
import org.bukkit.TreeSpecies;
import org.bukkit.block.Banner;
import org.bukkit.block.Block;
import org.bukkit.block.BlockFace;
import org.bukkit.block.BlockState;
import org.bukkit.block.Skull;
import org.bukkit.block.*;
import org.bukkit.block.data.BlockData;
import org.bukkit.inventory.InventoryHolder;
import org.bukkit.material.*;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

import javax.annotation.Nullable;
import java.util.*;

/**
Expand All @@ -46,7 +46,7 @@
* This class doesn't and shouldn't support materials that are {@link Material#isLegacy()}.
*
* @author Crypto Morin
* @version 2.2.1
* @version 3.1.0
* @see Block
* @see BlockState
* @see MaterialData
Expand All @@ -63,7 +63,7 @@ public final class XBlock {
XMaterial.MELON_SEEDS, XMaterial.BEETROOT_SEEDS, XMaterial.BEETROOTS, XMaterial.SUGAR_CANE,
XMaterial.BAMBOO_SAPLING, XMaterial.BAMBOO, XMaterial.CHORUS_PLANT,
XMaterial.KELP, XMaterial.KELP_PLANT, XMaterial.SEA_PICKLE, XMaterial.BROWN_MUSHROOM, XMaterial.RED_MUSHROOM,
XMaterial.MELON_STEM, XMaterial.PUMPKIN_STEM
XMaterial.MELON_STEM, XMaterial.PUMPKIN_STEM, XMaterial.COCOA, XMaterial.COCOA_BEANS

));
public static final Set<XMaterial> DANGEROUS = Collections.unmodifiableSet(EnumSet.of(
Expand Down Expand Up @@ -247,12 +247,19 @@ public static boolean setType(@NotNull Block block, @Nullable XMaterial material
if (material == null) material = XMaterial.AIR;
XMaterial smartConversion = ITEM_TO_BLOCK.get(material);
if (smartConversion != null) material = smartConversion;
if (material.parseMaterial() == null) return false;

block.setType(material.parseMaterial(), applyPhysics);
Material parsedMat = material.parseMaterial();
if (parsedMat == null) return false;

String parsedName = parsedMat.name();

// SKULL_ITEM is for items and SKULL is for blocks.
SkullType skullType = getSkullType(material);
if (!ISFLAT && (parsedName.equals("SKULL_ITEM") || skullType != null)) parsedMat = Material.valueOf("SKULL");

block.setType(parsedMat, applyPhysics);
if (ISFLAT) return false;

String parsedName = material.parseMaterial().name();
if (parsedName.endsWith("_ITEM")) {
String blockName = parsedName.substring(0, parsedName.length() - "_ITEM".length());
Material blockMaterial = Objects.requireNonNull(Material.getMaterial(blockName),
Expand Down Expand Up @@ -352,14 +359,53 @@ public static boolean setType(@NotNull Block block, @Nullable XMaterial material
throw new AssertionError("Unknown block type " + legacyMaterial + " for tree species: " + species);
}
} else if (material.getData() != 0) {
state.setRawData(material.getData());
if (skullType != null) {
boolean isWallSkull = material.name().contains("WALL");
state.setRawData((byte) (isWallSkull ? 0 : 1));
} else {
state.setRawData(material.getData());
}
update = true;
}

if (update) state.update(false, applyPhysics);
if (skullType != null) {
Skull skull = (Skull) state;
skull.setSkullType(skullType);
update = true;
}

if (update) state.update(true, applyPhysics);
return update;
}

public static SkullType getSkullType(XMaterial material) {
switch (material) {
case PLAYER_HEAD:
case PLAYER_WALL_HEAD:
return SkullType.PLAYER;
case DRAGON_HEAD:
case DRAGON_WALL_HEAD:
return SkullType.DRAGON;
case ZOMBIE_HEAD:
case ZOMBIE_WALL_HEAD:
return SkullType.ZOMBIE;
case CREEPER_HEAD:
case CREEPER_WALL_HEAD:
return SkullType.CREEPER;
case SKELETON_SKULL:
case SKELETON_WALL_SKULL:
return SkullType.SKELETON;
case WITHER_SKELETON_SKULL:
case WITHER_SKELETON_WALL_SKULL:
return SkullType.WITHER;
case PIGLIN_HEAD:
case PIGLIN_WALL_HEAD:
return SkullType.PIGLIN;
default:
return null;
}
}

public static boolean setType(@NotNull Block block, @Nullable XMaterial material) {
return setType(block, material, true);
}
Expand Down Expand Up @@ -465,6 +511,10 @@ public static boolean isLava(Material material) {
return material == Material.LAVA || material == BlockMaterial.STATIONARY_LAVA.material;
}

/**
* @deprecated use {@link XTag#anyMatch(Object, Collection)} instead.
*/
@Deprecated
public static boolean isOneOf(Block block, Collection<String> blocks) {
if (blocks == null || blocks.isEmpty()) return false;
String name = block.getType().name();
Expand All @@ -485,9 +535,7 @@ public static boolean isOneOf(Block block, Collection<String> blocks) {

// Direct Object Equals
Optional<XMaterial> xMat = XMaterial.matchXMaterial(comp);
if (xMat.isPresent()) {
if (matched == xMat.get() || isType(block, xMat.get())) return true;
}
if (xMat.isPresent() && isSimilar(block, xMat.get())) return true;
}
return false;
}
Expand Down Expand Up @@ -564,61 +612,16 @@ public static void setEnderPearlOnFrame(Block endPortalFrame, boolean eye) {
}

/**
* @param block the block to get its XMaterial type.
* @return the XMaterial of the block.
* @deprecated Not stable, use {@link #isType(Block, XMaterial)} or {@link #isSimilar(Block, XMaterial)} instead.
* If you want to save a block material somewhere, you need to use {@link XMaterial#matchXMaterial(Material)}
*/
@Deprecated
public static XMaterial getType(Block block) {
if (ISFLAT) return XMaterial.matchXMaterial(block.getType());
String type = block.getType().name();
BlockState state = block.getState();
MaterialData data = state.getData();
byte dataValue;

if (data instanceof Wood) {
TreeSpecies species = ((Wood) data).getSpecies();
dataValue = species.getData();
} else if (data instanceof Colorable) {
DyeColor color = ((Colorable) data).getColor();
dataValue = color.getDyeData();
} else {
dataValue = data.getData();
}

return XMaterial.matchDefinedXMaterial(type, dataValue)
.orElseThrow(() -> new IllegalArgumentException("Unsupported material for block " + dataValue + ": " + block.getType().name()));
}

/**
* Same as {@link #isType(Block, XMaterial)} except it also does a simple {@link XMaterial#matchXMaterial(Material)}
* comparison with the given block and material.
* <b>Universal Method</b>
*
* @param block the block to compare.
* @param material the material to compare with.
* @return true if block type is similar to the given material.
* @see #isType(Block, XMaterial)
* @since 1.3.0
*/
public static boolean isSimilar(Block block, XMaterial material) {
return material == XMaterial.matchXMaterial(block.getType()) || isType(block, material);
}

/**
* <b>Universal Method</b>
* <p>
* Check if the block type matches the specified XMaterial.
* Note that this method assumes that you've already tried doing {@link XMaterial#matchXMaterial(Material)} using
* {@link Block#getType()} and compared it with the other XMaterial. If not, use {@link #isSimilar(Block, XMaterial)}
*
* @param block the block to check.
* @param material the XMaterial similar to this block type.
* @return true if the raw block type matches with the material.
* @see #isSimilar(Block, XMaterial)
*/
public static boolean isType(Block block, XMaterial material) {
Material mat = block.getType();
if (material == XMaterial.matchXMaterial(mat)) return true;
switch (material) {
case CAKE:
return isCake(mat);
Expand Down Expand Up @@ -726,26 +729,61 @@ public static void setOpened(Block block, boolean opened) {
Openable openable = (Openable) state.getData();
openable.setOpen(opened);
state.setData((MaterialData) openable);
state.update();
state.update(true, true);
}

public static BlockFace getRotation(Block block) {
if (ISFLAT) {
if (!(block.getBlockData() instanceof org.bukkit.block.data.Rotatable)) return null;
org.bukkit.block.data.Rotatable rotatable = (org.bukkit.block.data.Rotatable) block.getBlockData();
return rotatable.getRotation();
BlockData blockData = block.getBlockData();
if (blockData instanceof org.bukkit.block.data.Rotatable) {
return ((org.bukkit.block.data.Rotatable) blockData).getRotation();
} else if (blockData instanceof org.bukkit.block.data.Directional) {
return ((org.bukkit.block.data.Directional) blockData).getFacing();
}
} else {
BlockState state = block.getState();
if (state instanceof Skull) {
return ((Skull) state).getRotation();
} else {
MaterialData data = state.getData();
if (data instanceof Directional) {
return ((Directional) data).getFacing();
}
}
}

return null;
}

public static void setRotation(Block block, BlockFace facing) {
if (ISFLAT) {
if (!(block.getBlockData() instanceof org.bukkit.block.data.Rotatable)) return;
BlockData data = block.getBlockData();
org.bukkit.block.data.Rotatable rotatable = (org.bukkit.block.data.Rotatable) data;
rotatable.setRotation(facing);
block.setBlockData(data, false);
BlockData blockData = block.getBlockData();
if (blockData instanceof org.bukkit.block.data.Rotatable) {
((org.bukkit.block.data.Rotatable) blockData).setRotation(facing);
} else if (blockData instanceof org.bukkit.block.data.Directional) {
((org.bukkit.block.data.Directional) blockData).setFacing(facing);
}
block.setBlockData(blockData, false);
} else {
BlockState state = block.getState();
if (state instanceof Skull) {
// Special case because the raw data is used for both rotation and
// whether the block should be considered a wall skull or a normal skull
// on the ground. Some of the raw data values represent wall skulls with
// various rotations, but only values that represent normal skull values
// on the ground only has one rotation.
// https://www.spigotmc.org/threads/getting-player-skull-to-spawn-on-top-of-fence.385083/
// https://www.spigotmc.org/threads/placing-skull-in-world.212900/
// https://www.spigotmc.org/threads/skull-position-above-block-1-13.343247/
// https://www.spigotmc.org/threads/solved-update-skull-rotation.47795/
((Skull) state).setRotation(facing);
} else {
MaterialData data = state.getData();
if (!(data instanceof Directional)) return;
Directional directional = (Directional) data;
directional.setFacingDirection(facing);
}
state.update(true, true);
}
}

Expand Down
Loading

0 comments on commit 3dcb14c

Please sign in to comment.