SimplexDevelopment/FeelingLucky
1
0
Fork 0
mirror of https://github.com/SimplexDevelopment/FeelingLucky.git synced 2024-12-03 16:32:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Beta 20220414-SNAPSHOT

Browse Source 
Changelog:
 - Added the ability to fully mature crops when using bone meal
 - Added the ability to cheat death (Grants 1 half heart and between 2.5 and 5 points of absorption)
 - Added #info, #warn, and #err to MiniComponent, and utilized these across the board.
 - Switched the #color method to use org.bukkit.ChatColor instead of TextColor for accessibility.
 - Moved loading configurations and listener registration to separate methods.
This commit is contained in:
Paldiu 2022-04-14 14:58:14 -05:00
parent 899768819e
commit 8e70e1de73
7 changed files with 143 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/io/github/simplex/lib/Messages.java
View File

@ -1,17 +1,13 @@
package io.github.simplex.lib;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.format.TextColor;
import net.kyori.adventure.text.format.TextDecoration;
public enum Messages {
NOT_FROM_CONSOLE(MiniComponent.of("This command may only be used in game.").send()),
NO_PERMISSION(MiniComponent
.of("You do not have permission to use this command.")
.color(TextColor.color(255, 0, 0))
.decorate(TextDecoration.ITALIC)
.send());
NOT_FROM_CONSOLE(MiniComponent.err("This command may only be used in game.")),
NO_PERMISSION(MiniComponent.err("You do not have permission to use this command.")),
NO_PLAYER(MiniComponent.warn("That player cannot be found.")),
OUT_OF_BOUNDS(MiniComponent.err("Number must be between -1024.0 and 1024.0"));
private final Component message;

20
src/main/java/io/github/simplex/lib/MiniComponent.java
View File

@ -3,6 +3,7 @@ package io.github.simplex.lib;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.format.TextColor;
import net.kyori.adventure.text.format.TextDecoration;
import org.bukkit.ChatColor;
import org.jetbrains.annotations.Contract;
public class MiniComponent {
@ -15,6 +16,21 @@ public class MiniComponent {
return new MiniComponent(content);
}
@Contract("_ -> new")
public static Component info(String content) {
return new MiniComponent(content).color(ChatColor.GREEN).send();
}
@Contract("_ -> new")
public static Component warn(String content) {
return new MiniComponent(content).color(ChatColor.YELLOW).decorate(TextDecoration.ITALIC).send();
}
@Contract("_ -> new")
public static Component err(String content) {
return new MiniComponent(content).color(ChatColor.RED).decorate(TextDecoration.BOLD).send();
}
public MiniComponent(String content) {
this.content = content;
}
@ -24,8 +40,8 @@ public class MiniComponent {
return this;
}
public MiniComponent color(TextColor color) {
this.color = color;
public MiniComponent color(ChatColor color) {
this.color = TextColor.color(color.asBungee().getColor().getRGB());
return this;
}

48
src/main/java/io/github/simplex/luck/FeelingLucky.java
View File

@ -28,27 +28,9 @@ public final class FeelingLucky extends JavaPlugin {
getLogger().info("Initializing the PlayerHandler...");
handler = new PlayerHandler(this);
getLogger().info("Initialization complete! Attempting to register the Listeners...");
new PlayerListener(this);
new BlockDrops(this);
new ItemDrops(this);
new TakeDamage(this);
new RestoreHunger(this);
new EnchantmentBoost(this);
new ExpBoost(this);
registerListeners();
getLogger().info("Registration complete! Attempting to load all player configuration files...");
File[] files = getDataFolder().listFiles();
if (files != null) {
Arrays.stream(files).forEach(file -> {
UUID uuid = UUID.fromString(file.getName().split("\\.")[0]);
configMap.put(uuid, PlayerConfig.loadFrom(this, file));
});
configMap.forEach((u, pc) -> pc.load());
getLogger().info("Successfully loaded all configurations!");
} else {
getLogger().info("There are no player configurations to load.");
}
loadConfigurations();
Bukkit.getLogger().info("Attempting to load the Luck command...");
cmd = new LuckCMD(this);
Bukkit.getLogger().info("Successfully loaded the Luck command!");
@ -61,4 +43,30 @@ public final class FeelingLucky extends JavaPlugin {
Bukkit.getLogger().info("Saving all player configurations...");
configMap.values().forEach(PlayerConfig::save);
}
private void loadConfigurations() {
File[] files = getDataFolder().listFiles();
if (files != null) {
Arrays.stream(files).forEach(file -> {
UUID uuid = UUID.fromString(file.getName().split("\\.")[0]);
configMap.put(uuid, PlayerConfig.loadFrom(this, file));
});
configMap.forEach((u, pc) -> pc.load());
getLogger().info("Successfully loaded all configurations!");
} else {
getLogger().info("There are no player configurations to load.");
}
}
private void registerListeners() {
new PlayerListener(this);
new BlockDrops(this);
new ItemDrops(this);
new TakeDamage(this);
new RestoreHunger(this);
new EnchantmentBoost(this);
new ExpBoost(this);
new CheatDeath(this);
new BonemealFullCrop(this);
}
}

2
src/main/java/io/github/simplex/luck/listener/BlockDrops.java
View File

@ -1,8 +1,8 @@
package io.github.simplex.luck.listener;
import io.github.simplex.luck.FeelingLucky;
import io.github.simplex.luck.util.SneakyWorker;
import io.github.simplex.luck.player.Luck;
import io.github.simplex.luck.util.SneakyWorker;
import org.bukkit.entity.Item;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;

50
src/main/java/io/github/simplex/luck/listener/BonemealFullCrop.java Normal file
View File

@ -0,0 +1,50 @@
package io.github.simplex.luck.listener;
import io.github.simplex.lib.ItemBuilder;
import io.github.simplex.lib.MiniComponent;
import io.github.simplex.luck.FeelingLucky;
import io.github.simplex.luck.player.Luck;
import org.bukkit.Material;
import org.bukkit.block.Block;
import org.bukkit.block.BlockFace;
import org.bukkit.block.data.Ageable;
import org.bukkit.block.data.BlockData;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.block.Action;
import org.bukkit.event.player.PlayerInteractEvent;
import org.bukkit.inventory.ItemStack;
public record BonemealFullCrop(FeelingLucky plugin) implements Listener {
public BonemealFullCrop {
plugin.getServer().getPluginManager().registerEvents(this, plugin);
}
@EventHandler
public void bonemealFullCrop(PlayerInteractEvent event) {
Player player = event.getPlayer();
Action action = event.getAction();
ItemStack bonemeal = ItemBuilder.of(Material.BONE_MEAL).build();
Luck luck = plugin.handler.getLuckContainer(player);
ItemStack handItem = event.getItem();
if (handItem == null) return;
Block block = event.getClickedBlock();
if (block == null) return;
BlockData data = block.getBlockData();
if (action.isRightClick()
&& handItem.isSimilar(bonemeal)
&& (data instanceof Ageable crop)
&& luck.quickRNG(luck.getPercentage())) {
crop.setAge(crop.getMaximumAge());
data.merge(crop);
block.setBlockData(data);
player.sendMessage(MiniComponent.info("You got lucky and your crops grew to maturity."));
}
}
}

30
src/main/java/io/github/simplex/luck/listener/CheatDeath.java Normal file
View File

@ -0,0 +1,30 @@
package io.github.simplex.luck.listener;
import io.github.simplex.lib.MiniComponent;
import io.github.simplex.luck.FeelingLucky;
import io.github.simplex.luck.player.Luck;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.entity.PlayerDeathEvent;
public record CheatDeath(FeelingLucky plugin) implements Listener {
public CheatDeath(FeelingLucky plugin) {
this.plugin = plugin;
plugin.getServer().getPluginManager().registerEvents(this, plugin);
}
@EventHandler
public void cheatDeath(PlayerDeathEvent event) {
Player player = event.getPlayer();
Luck luck = plugin.handler.getLuckContainer(player);
double absorption = Math.round(Luck.RNG().nextDouble(5.0, 10.0));
if (luck.quickRNG(luck.getPercentage())) {
event.setCancelled(true);
player.setHealth(1.0);
player.setAbsorptionAmount(absorption);
player.sendMessage(MiniComponent.of("You got lucky and cheated death!").send());
}
}
}

23
src/main/java/io/github/simplex/luck/util/LuckCMD.java
View File

@ -1,6 +1,7 @@
package io.github.simplex.luck.util;
import io.github.simplex.lib.Messages;
import io.github.simplex.lib.MiniComponent;
import io.github.simplex.luck.FeelingLucky;
import io.github.simplex.luck.player.Luck;
import io.github.simplex.luck.player.PlayerConfig;
@ -36,12 +37,12 @@ public class LuckCMD extends Command implements TabCompleter {
double amount = Double.parseDouble(args[2]);
if (player == null) {
sender.sendMessage(Component.empty().content("That player cannot be found."));
sender.sendMessage(Messages.NO_PLAYER.get());
return true;
}
if (amount > 1024.0 || amount < -1024.0) {
sender.sendMessage(Component.empty().content("Number must be between -1024.0 and 1024.0"));
sender.sendMessage(Messages.OUT_OF_BOUNDS.get());
return true;
}
@ -53,21 +54,21 @@ public class LuckCMD extends Command implements TabCompleter {
luck.setValue(amount);
plugin.handler.updatePlayer(player, luck);
config.setLuck(luck.getValue());
sender.sendMessage(Component.empty().content("Successfully reset " + args[1] + "'s Luck stat."));
sender.sendMessage(MiniComponent.info("Successfully reset " + args[1] + "'s Luck stat."));
return true;
}
case "give" -> {
luck.addTo(amount);
plugin.handler.updatePlayer(player, luck);
config.setLuck(luck.getValue());
sender.sendMessage(Component.empty().content("Successfully reset " + args[1] + "'s Luck stat."));
sender.sendMessage(MiniComponent.info("Successfully reset " + args[1] + "'s Luck stat."));
return true;
}
case "take" -> {
luck.takeFrom(amount);
plugin.handler.updatePlayer(player, luck);
config.setLuck(luck.getValue());
sender.sendMessage(Component.empty().content("Successfully reset " + args[1] + "'s Luck stat."));
sender.sendMessage(MiniComponent.info("Successfully reset " + args[1] + "'s Luck stat."));
return true;
}
}
@ -83,12 +84,12 @@ public class LuckCMD extends Command implements TabCompleter {
Player player = Bukkit.getPlayer(args[1]);
if (player == null) {
sender.sendMessage("That player cannot be found.");
sender.sendMessage(Messages.NO_PLAYER.get());
return true;
}
Luck luck = plugin.handler.getLuckContainer(player);
sender.sendMessage(Component.empty().content("Luck stat for " + args[1] + ": " + luck.getValue()));
sender.sendMessage(MiniComponent.info("Luck stat for " + args[1] + ": " + luck.getValue()));
return true;
}
@ -96,7 +97,7 @@ public class LuckCMD extends Command implements TabCompleter {
Player player = Bukkit.getPlayer(args[1]);
if (player == null) {
sender.sendMessage(Component.empty().content("That player cannot be found."));
sender.sendMessage(Messages.NO_PLAYER.get());
return true;
}
@ -105,7 +106,7 @@ public class LuckCMD extends Command implements TabCompleter {
luck.reset();
plugin.handler.updatePlayer(player, luck);
config.setLuck(luck.getValue());
sender.sendMessage(Component.empty().content("Successfully reset " + args[1] + "'s Luck stat."));
sender.sendMessage(MiniComponent.info("Successfully reset " + args[1] + "'s Luck stat."));
return true;
}
} else {
@ -117,14 +118,14 @@ public class LuckCMD extends Command implements TabCompleter {
if (args.length == 1) {
if (args[0].equalsIgnoreCase("reload") && sender.hasPermission("luck.admin")) {
plugin.getConfigMap().values().forEach(PlayerConfig::reload);
sender.sendMessage(MiniComponent.info("Player configurations reloaded."));
return true;
}
if ((sender instanceof Player player) && player.hasPermission("luck.default")) {
if (args[0].equalsIgnoreCase("info")) {
Luck luck = plugin.handler.getLuckContainer(player);
TextComponent c = Component.text("Your Luck: " + luck.getPercentage());
player.sendMessage(c.color(TextColor.color(0, 255, 0)));
player.sendMessage(MiniComponent.info("Your Luck: " + luck.getPercentage()));
return true;
}
} else if (sender instanceof ConsoleCommandSender) {