Upstream
/
furniture
mirror of https://github.com/Ste3et/furniture.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add 1.16.x Camera Utils

This commit is contained in:
Ste3et_C0st 2020-09-08 14:11:07 +02:00
parent b74e779087
commit 1ce07b9b4d
2 changed files with 45 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/de/Ste3et_C0st/Furniture/Camera/Utils/v1_16/BlockColor.java Normal file
View File

@ -0,0 +1,35 @@
package de.Ste3et_C0st.Furniture.Camera.Utils.v1_16;
import org.apache.commons.lang.reflect.MethodUtils;
import org.bukkit.block.Block;
import de.Ste3et_C0st.Furniture.Camera.Utils.MinecraftBlockColor;
public class BlockColor extends MinecraftBlockColor{
private static Class<?> CraftMagicNumbersClass;
static {
try {
CraftMagicNumbersClass = Class.forName("org.bukkit.craftbukkit." + getBukkitVersion() + ".util.CraftMagicNumbers");
}catch (Exception e) {
e.printStackTrace();
}
}
@Override
public Byte getBlockColor(Block b) {
try {
Object nmsBlock = CraftMagicNumbersClass.getMethod("getBlock", org.bukkit.Material.class).invoke(null, b.getType());
Object iBlockData = nmsBlock.getClass().getMethod("getBlockData").invoke(nmsBlock);
Object Material = MethodUtils.invokeMethod(iBlockData, "getMaterial", null);
Object MaterialMapColor = MethodUtils.invokeMethod(Material, "h", null);
int color = MaterialMapColor.getClass().getField("aj").getInt(MaterialMapColor) * 4;
return (byte) color;
}catch (Exception e) {
e.printStackTrace();
}
return null;
}
}

16
src/de/Ste3et_C0st/Furniture/Objects/garden/sunshade.java
View File

@ -43,7 +43,7 @@ public class sunshade extends Furniture{
if(player == null) return;
ItemStack is = player.getInventory().getItemInMainHand();
if(is.getType().name().contains("BANNER")){
if(canBuild(player, false)) {
if(canBuild(player)) {
for(fEntity packet : getfAsList()){
if(packet.getInventory().getHelmet()!=null&&packet.getInventory().getHelmet().getType().name().contains("BANNER")){
packet.getInventory().setHelmet(is.clone());
@ -54,12 +54,16 @@ public class sunshade extends Furniture{
}
update();
consumeItem(player);
return;
}
}else if(!isOpen()){
open();
}else{
close();
return;
}else {
if(canInteract(player)){
if(!isOpen()){
open();
}else{
close();
}
}
}
}