so://phie

poppy

A feature-rich Minecraft plugin which enhances gaming experience
git clone git://soophie.de/poppy

• log
• tree
• refs
• README

branch:feat/fast-travel branch:feat/magic branch:feat/shulkerbox branch:feat/spleef branch:feat/world branch:main

• .gitignore [new file] [old file]

  6*.prefs
  7/build/**
  8/.gradle/**
  9/.env/**
  

• build.gradle [new file] [old file]

  1plugins {
  2	id 'org.hidetake.ssh' version '2.10.1'
  3}
  4
  5apply plugin: 'java'
  6
  7sourceSets {
  

  28dependencies {
  29    implementation 'org.spigotmc:spigot-api:1.16.4-R0.1-SNAPSHOT'
  30	implementation 'com.google.code.gson:gson:2.8.6'
  31}
  32
  33remotes {
  34	server {
  35		host = 'mc.typable.dev'
  36		user = 'pi'
  37		identity = file('.env/id_rsa')
  38	}
  39}
  40
  41task deploy {
  42	doLast {
  43		ssh.run {
  44			session(remotes.server) {
  45				put from: project.file('build/libs/MinecraftHub.jar'), into: '/home/pi/host/plugins'
  46			}
  47		}
  48	}
  49}
  49
  \ No newline at end of file
  

• build.sh [old file]

  1#!/bin/bash
  2
  3path=$(pwd)
  4
  5if [[ ! -z $1 ]]; then
  6	if [ $1 = "--path" ]; then
  7		if [[ -z $2 ]]; then
  8			echo "Invalid arguments '--path <directory>'!"
  9			exit 0
  10		fi
  11		path=$2
  12	fi
  13fi
  14
  15if [ ! -d $path ]; then
  16	echo "Unable to find directory '$path'!"
  17	exit 0
  18fi
  19
  20if [ ! -f "$(pwd)/plugin.yml" ]; then
  21	echo "Unable to find plugin.yml in '$(pwd)'!"
  22	exit 0
  23fi
  24
  25jar cf "$path/MinecraftHub.jar" plugin.yml lib/* -C bin .
  26if [ $? = "0" ]; then
  27	echo "Successfully compile into $path/MinecraftHub.jar"
  28else
  29	echo "Build failed!"
  30fi
  30
  \ No newline at end of file
  

• gradle.properties [new file]

  1org.gradle.console=plain
  

• src/de/typable/minecrafthub/event/ChairListener.java [new file] [old file]

  7import org.bukkit.Location;
  8import org.bukkit.Material;
  9import org.bukkit.block.Block;
  10import org.bukkit.block.BlockFace;
  10import org.bukkit.block.data.Bisected.Half;
  11import org.bukkit.block.data.type.Stairs;
  12import org.bukkit.entity.ArmorStand;
  

  20import org.bukkit.event.player.PlayerInteractEvent;
  21import org.spigotmc.event.entity.EntityDismountEvent;
  22
  23import de.typable.minecrafthub.util.Util;
  24
  25
  26public class ChairListener implements Listener
  27{
  

  40
  41	private Map<Block, ArmorStand> blockMap = new HashMap<>();
  42
  42	@SuppressWarnings("deprecation")
  43	public void onDisable()
  44	{
  45		for(ArmorStand armorStand : blockMap.values())
  46		{
  47			armorStand.eject();
  48			armorStand.remove();
  49		}
  50	}
  51
  52	@EventHandler
  53	public void onPlayerInteract(PlayerInteractEvent event)
  54	{
  

  62
  63				if(isChair(block.getType()))
  64				{
  56					if(block.getLocation().add(0.5, 0.5, 0.5).distance(player.getLocation()) > 2)
  65					if(!isInRange(block, player))
  66					{
  67						return;
  68					}
  

  72						return;
  73					}
  74
  66					Block upperBlock = block.getWorld().getBlockAt(block.getLocation().add(0, 1, 0));
  67
  68					if(upperBlock != null && upperBlock.getType() == Material.AIR)
  75					if(isCompatible(block))
  76					{
  70						Stairs stairs = (Stairs) block.getState().getBlockData();
  77						ArmorStand armorStand = createMountableChair(block, player);
  78
  72						if(isCompatible(stairs))
  79						if(armorStand == null)
  80						{
  74							Float yaw = convertFacingToYaw(stairs.getFacing());
  75
  76							if(yaw == null)
  77							{
  78								return;
  79							}
  80
  81							Location location = block.getLocation().add(0.5, -0.4, 0.5);
  82							location.setYaw(yaw);
  83
  84							ArmorStand armorStand = (ArmorStand) block.getWorld().spawnEntity(location, EntityType.ARMOR_STAND);
  85							armorStand.setPassenger((Entity) event.getPlayer());
  86							armorStand.setSmall(true);
  87							armorStand.setGravity(false);
  88							armorStand.setInvulnerable(true);
  89							armorStand.setVisible(false);
  81							return;
  82						}
  83
  91							event.setCancelled(true);
  84						event.setCancelled(true);
  85
  93							blockMap.put(block, armorStand);
  94						}
  86						blockMap.put(block, armorStand);
  87					}
  88				}
  89			}
  

  131		}
  132	}
  133
  134	private boolean isInRange(Block block, Player player)
  135	{
  136		return block.getLocation().add(0.5, 0.5, 0.5).distance(player.getLocation()) <= 2;
  137	}
  138
  139	private boolean isChair(Material material)
  140	{
  141		for(Material chair : CHAIR_TYPE)
  

  149		return false;
  150	}
  151
  155	private boolean isCompatible(Stairs stairs)
  152	private boolean isCompatible(Block block)
  153	{
  154		Block upperBlock = block.getWorld().getBlockAt(block.getLocation().add(0, 1, 0));
  155
  156		if(!Util.isAir(upperBlock.getType()))
  157		{
  158			return false;
  159		}
  160
  161		Stairs stairs = (Stairs) block.getState().getBlockData();
  162
  163		if(stairs.getHalf() != Half.BOTTOM)
  164		{
  165			return false;
  

  178		return true;
  179	}
  180
  175	private Float convertFacingToYaw(BlockFace face)
  181	@SuppressWarnings("deprecation")
  182	private ArmorStand createMountableChair(Block block, Player player)
  183	{
  177		switch(face)
  178		{
  179			case NORTH:
  180				return 0F;
  181			case EAST:
  182				return 90F;
  183			case SOUTH:
  184				return 180F;
  185			case WEST:
  186				return -90F;
  187			default:
  188				break;
  189		}
  184		Stairs stairs = (Stairs) block.getState().getBlockData();
  185
  191		return null;
  192	}
  186		Float yaw = Util.convertFacingToYaw(stairs.getFacing());
  187
  194	public void onDisable()
  195	{
  196		for(ArmorStand armorStand : blockMap.values())
  188		if(yaw == null)
  189		{
  198			armorStand.eject();
  199			armorStand.remove();
  190			return null;
  191		}
  192
  193		Location location = block.getLocation().add(0.5, -0.4, 0.5);
  194		location.setYaw(yaw);
  195
  196		ArmorStand armorStand = (ArmorStand) block.getWorld().spawnEntity(location, EntityType.ARMOR_STAND);
  197		armorStand.setPassenger((Entity) player);
  198		armorStand.setSmall(true);
  199		armorStand.setGravity(false);
  200		armorStand.setInvulnerable(true);
  201		armorStand.setVisible(false);
  202
  203		return armorStand;
  204	}
  205}
  

• src/de/typable/minecrafthub/util/Util.java [new file] [old file]

  2
  3import org.bukkit.Bukkit;
  4import org.bukkit.Material;
  5import org.bukkit.block.BlockFace;
  6import org.bukkit.entity.Player;
  7import org.bukkit.inventory.Inventory;
  8import org.bukkit.inventory.ItemStack;
  

  108			}
  109		}, 0L, DefaultConstants.TICK);
  110	}
  111
  112	public static Float convertFacingToYaw(BlockFace face)
  113	{
  114		switch(face)
  115		{
  116			case NORTH:
  117				return 0F;
  118			case EAST:
  119				return 90F;
  120			case SOUTH:
  121				return 180F;
  122			case WEST:
  123				return -90F;
  124			default:
  125				break;
  126		}
  127
  128		return null;
  129	}
  130
  131	public static boolean isAir(Material material)
  132	{
  133		return material == Material.AIR || material == Material.CAVE_AIR || material == Material.VOID_AIR;
  134	}
  135}
  

• todo.txt [old file]

  1Legend:
  2[ ] = Open  [?] = Test  [X] = Done  [-] = Ignore  [!] = Stuck  [/] = Partial  [i] = Clarify
  3
  4Syntax: [<state>] <message>
  5Example: [?] Test latest changes
  6
  7----------------------------------------------------------------------------------------------------