administrator/MCPlugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: clean up code formatting and remove unnecessary comments

Browse Source
This commit is contained in:
Janik Heß
2025-03-08 12:48:28 +01:00
parent d6ad531769
commit 7b3bff385a
6 changed files with 146 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
environmentex/src/main/java/de/hessj/environmentex/BetterTotems.java
View File

@@ -17,41 +17,37 @@ import org.bukkit.inventory.meta.BlockStateMeta;
import org.bukkit.potion.PotionEffect;
import org.bukkit.potion.PotionEffectType;
public class BetterTotems implements Listener{
public boolean removeTotemFromShulker(ItemStack item) {
BlockStateMeta blockMeta = (BlockStateMeta)item.getItemMeta();
public class BetterTotems implements Listener {
public boolean removeTotemFromShulker(ItemStack item) {
BlockStateMeta blockMeta = (BlockStateMeta) item.getItemMeta();
if (blockMeta.getBlockState() instanceof ShulkerBox) {
ShulkerBox box = (ShulkerBox)blockMeta.getBlockState();
ShulkerBox box = (ShulkerBox) blockMeta.getBlockState();
Inventory inv = box.getSnapshotInventory();
ItemStack totem = new ItemStack(Material.TOTEM_OF_UNDYING, 1);
if (inv.containsAtLeast(totem, 1)) {
inv.removeItem(new ItemStack[]{totem});
inv.removeItem(new ItemStack[] { totem });
box.update(true, false);
blockMeta.setBlockState(box);
item.setItemMeta(blockMeta);
return true;
}
}
else { //wenn einer von Backpacks
} else { // wenn einer von Backpacks
}
return false;
}
@EventHandler(
priority = EventPriority.LOWEST
)
@EventHandler(priority = EventPriority.LOWEST)
public void onPlayerDamage(EntityDamageEvent event) {
if (event.getEntity() instanceof Player) {
Player player = (Player)event.getEntity();
Player player = (Player) event.getEntity();
double pHealth = player.getHealth();
double pDamage = event.getFinalDamage();
if (event.getCause().equals(DamageCause.VOID)) {
return;
}
if (pDamage >= pHealth) {
PlayerInventory pInv = player.getInventory();
ItemStack totem = new ItemStack(Material.TOTEM_OF_UNDYING, 1);
@@ -61,9 +57,9 @@ public boolean removeTotemFromShulker(ItemStack item) {
if (!hasTotem) {
var17 = pInv.iterator();
while(var17.hasNext()) {
ItemStack item = (ItemStack)var17.next();
if (item != null && (item.getType().toString().endsWith("SHULKER_BOX") /*|| BACKPACK!*/)) {
while (var17.hasNext()) {
ItemStack item = (ItemStack) var17.next();
if (item != null && (item.getType().toString().endsWith("SHULKER_BOX") /* || BACKPACK! */)) {
hasShulkerTotem = removeTotemFromShulker(item);
break;
}
@@ -72,25 +68,21 @@ public boolean removeTotemFromShulker(ItemStack item) {
if (hasTotem || hasShulkerTotem) {
try {
player.getInventory().removeItem(new ItemStack[]{totem});
player.getInventory().removeItem(new ItemStack[] { totem });
} finally {
event.setDamage(0.0D);
player.setHealth(5);
}
player.addPotionEffect(new PotionEffect(PotionEffectType.ABSORPTION, 5*20, 2));
player.addPotionEffect(new PotionEffect(PotionEffectType.REGENERATION, 45*20, 2));
player.addPotionEffect(new PotionEffect(PotionEffectType.FIRE_RESISTANCE, 40*20, 1));
player.addPotionEffect(new PotionEffect(PotionEffectType.WATER_BREATHING, 5*20, 1));
player.playEffect(EntityEffect.TOTEM_RESURRECT);
player.addPotionEffect(new PotionEffect(PotionEffectType.ABSORPTION, 5 * 20, 2));
player.addPotionEffect(new PotionEffect(PotionEffectType.REGENERATION, 45 * 20, 2));
player.addPotionEffect(new PotionEffect(PotionEffectType.FIRE_RESISTANCE, 40 * 20, 1));
player.addPotionEffect(new PotionEffect(PotionEffectType.WATER_BREATHING, 5 * 20, 1));
player.playEffect(EntityEffect.PROTECTED_FROM_DEATH);
return;
}
}
}
}
}

1
environmentex/src/main/java/de/hessj/environmentex/ExpBottleListener.java
View File

@@ -42,7 +42,6 @@ public class ExpBottleListener implements Listener {
@EventHandler
public void on_prepare_anvil(PrepareAnvilEvent event) {
//TODO: check if replacement method worked
AnvilView av = event.getView();
av.setMaximumRepairCost(999999);
if (av.getRepairCost() > 40) {

135
environmentex/src/main/java/de/hessj/environmentex/InfinityWaterBucket.java
View File

@@ -18,10 +18,10 @@ import org.bukkit.event.block.Action;
import org.bukkit.event.inventory.PrepareAnvilEvent;
import org.bukkit.event.player.PlayerBucketEntityEvent;
import org.bukkit.event.player.PlayerInteractEvent;
import org.bukkit.inventory.AnvilInventory;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.EnchantmentStorageMeta;
import org.bukkit.inventory.meta.ItemMeta;
import org.bukkit.inventory.view.AnvilView;
import org.bukkit.scheduler.BukkitRunnable;
import de.hessj.helper.Helper;
import de.hessj.helper.Helper.Type;
@@ -29,109 +29,106 @@ import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.format.Style;
import net.kyori.adventure.text.format.TextDecoration;
public class InfinityWaterBucket implements Listener{
public class InfinityWaterBucket implements Listener {
@EventHandler(priority = EventPriority.HIGHEST)
public void onAnvilUse(PrepareAnvilEvent e){
if(e.getView().getBottomInventory().getHolder() instanceof Player){
AnvilInventory inv = e.getInventory();
ItemStack slot1 = inv.getItem(0);
ItemStack slot2 = inv.getItem(1);
if(slot1 == null || slot2 == null) return;
if(slot1.getType() == Material.WATER_BUCKET && slot2.getType() == Material.ENCHANTED_BOOK){
@EventHandler(priority = EventPriority.HIGHEST)
public void onAnvilUse(PrepareAnvilEvent e) {
if (e.getView().getBottomInventory().getHolder() instanceof Player) {
AnvilView av = e.getView();
ItemStack slot1 = av.getItem(0);
ItemStack slot2 = av.getItem(1);
if (slot1 == null || slot2 == null)
return;
if (slot1.getType() == Material.WATER_BUCKET && slot2.getType() == Material.ENCHANTED_BOOK) {
EnchantmentStorageMeta enchMeta = (EnchantmentStorageMeta) slot2.getItemMeta();
Map<Enchantment,Integer> enchs = enchMeta.getStoredEnchants();
if(enchs.containsKey(Enchantment.INFINITY) && enchs.get(Enchantment.INFINITY)>0){
Map<Enchantment, Integer> enchs = enchMeta.getStoredEnchants();
if (enchs.containsKey(Enchantment.INFINITY) && enchs.get(Enchantment.INFINITY) > 0) {
ItemStack result = slot1.clone();
ItemMeta meta = result.getItemMeta();
meta.displayName(Component.text(inv.getRenameText()));
Style st = Style.style().decoration(TextDecoration.ITALIC,false).build();
if(inv.getRenameText() == ""){
meta.displayName(Component.translatable(slot1.getType().getItemTranslationKey()).style(st));
}
else {
meta.displayName(Component.text(inv.getRenameText()).style(st));
}
meta.addEnchant(Enchantment.INFINITY, 1, true);
new BukkitRunnable(){
@Override
public void run() {
result.setItemMeta(meta);
inv.setRepairCost(2);
inv.setItem(2, result);
meta.displayName(Component.text(av.getRenameText()));
Style st = Style.style().decoration(TextDecoration.ITALIC, false).build();
if (av.getRenameText().length() == 0) {
meta.displayName(Component.translatable(slot1.getType().getItemTranslationKey()).style(st));
} else {
meta.displayName(Component.text(av.getRenameText()).style(st));
}
}.runTaskLater(App.main, 1);
meta.addEnchant(Enchantment.INFINITY, 1, true);
new BukkitRunnable() {
@Override
public void run() {
result.setItemMeta(meta);
av.setRepairCost(2);
av.setItem(2, result);
}
}.runTaskLater(App.main, 1);
}
}
}
}
@EventHandler
public void onFishPickUp(PlayerBucketEntityEvent e){
public void onFishPickUp(PlayerBucketEntityEvent e) {
var helper = new Helper();
Player player = e.getPlayer();
ItemStack item = e.getOriginalBucket();
if(item == null) return;
if(item.getEnchantments().size() <= 0) return;
if(e.getEntity() instanceof Fish || e.getEntity() instanceof Axolotl){
if (item == null)
return;
if (item.getEnchantments().size() <= 0)
return;
if (e.getEntity() instanceof Fish || e.getEntity() instanceof Axolotl) {
e.setCancelled(true);
player.sendMessage(helper.R3SMessage(Type.ERROR, "Du kannst mit diesem Eimer nichts fangen!"));
}
}
@EventHandler
public void onBucketUse(PlayerInteractEvent e){
if(e.getItem() == null) return;
@EventHandler
public void onBucketUse(PlayerInteractEvent e) {
if (e.getItem() == null)
return;
ItemStack itm = e.getItem().clone();
if(itm.getType() == Material.WATER_BUCKET && itm.getEnchantments().size() > 0 && e.getAction()==Action.RIGHT_CLICK_BLOCK && e.useItemInHand()!=Result.DENY){
e.setCancelled(true);
if (itm.getType() == Material.WATER_BUCKET && itm.getEnchantments().size() > 0
&& e.getAction() == Action.RIGHT_CLICK_BLOCK && e.useItemInHand() != Result.DENY) {
e.setCancelled(true);
Player player = e.getPlayer();
if(player.getWorld().getEnvironment()==Environment.NETHER || (e.getClickedBlock().getType().isInteractable() && !e.getPlayer().isSneaking())) return;
if (player.getWorld().getEnvironment() == Environment.NETHER
|| (e.getClickedBlock().getType().isInteractable() && !e.getPlayer().isSneaking()))
return;
Block block = e.getClickedBlock().getRelative(e.getBlockFace());
if(!e.getClickedBlock().isEmpty() && e.getClickedBlock().getBlockData() instanceof Waterlogged){
if (!e.getClickedBlock().isEmpty() && e.getClickedBlock().getBlockData() instanceof Waterlogged) {
Waterlogged waterlogged = (Waterlogged) e.getClickedBlock().getBlockData();
Waterlogged waterlogged = (Waterlogged) e.getClickedBlock().getBlockData();
if (!waterlogged.isWaterlogged()) {
if (!waterlogged.isWaterlogged()) {
waterlogged.setWaterlogged(true);
e.getClickedBlock().setBlockData(waterlogged);
}
else {
} else {
waterlogged.setWaterlogged(false);
e.getClickedBlock().setBlockData(waterlogged);
}
}
else{
if(block.getType().equals(Material.WATER)){ //aber nicht bei flowing water!!
} else {
if (block.getType().equals(Material.WATER)) { // aber nicht bei flowing water!!
Levelled lv = (Levelled)block.getBlockData();
Levelled lv = (Levelled) block.getBlockData();
App.main.log(lv.getLevel());
App.main.log(lv.getMaximumLevel());
App.main.log(lv.getLevel());
App.main.log(lv.getMaximumLevel());
if (lv.getLevel() == 0) {
block.setType(Material.AIR, true);
} else {
block.setType(Material.WATER, true);
}
if(lv.getLevel() == 0){
block.setType(Material.AIR,true);
}else {
block.setType(Material.WATER,true);
}
} else {
block.setType(Material.WATER, true);
}
}
else {
block.setType(Material.WATER,true);
}
}
}

4
environmentex/src/main/java/de/hessj/environmentex/InventoryUtils.java
View File

@@ -1,4 +1,4 @@
package de.hessj.environmentex;
/*package de.hessj.environmentex;
import org.bukkit.inventory.ItemStack;
import org.bukkit.util.io.BukkitObjectInputStream;
@@ -39,4 +39,4 @@ public class InventoryUtils {
}
return null;
}
}
}*/

103
environmentex/src/main/java/de/hessj/environmentex/VillagerListener.java
View File

@@ -17,70 +17,65 @@ import org.bukkit.inventory.meta.EnchantmentStorageMeta;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.title.Title;
public class VillagerListener implements Listener {
@EventHandler
public void onClickNPC(PlayerInteractAtEntityEvent e){
public void onClickNPC(PlayerInteractAtEntityEvent e) {
if (e.getPlayer().displayName().toString().contains("R3STEAS")) {
if(e.getRightClicked() instanceof Villager && e.getPlayer().getInventory().getItemInMainHand().getType() == Material.BELL){
Villager vil = (Villager) e.getRightClicked();
if(vil.getProfession() == Profession.LIBRARIAN && vil.getVillagerExperience() == 0){
vil.setProfession(Profession.NONE);
vil.setProfession(Profession.LIBRARIAN);
Bukkit.getScheduler().scheduleSyncDelayedTask(App.main, new Runnable() {
public void run() {
e.getPlayer().getOpenInventory().close();
if (e.getRightClicked() instanceof Villager
&& e.getPlayer().getInventory().getItemInMainHand().getType() == Material.BELL) {
for (MerchantRecipe mr : vil.getRecipes()) {
Collection<Player> en = Bukkit.getServer().getWorlds().get(0)
.getNearbyPlayers(vil.getLocation(), 5);
for (Entity ent : en) {
if (ent instanceof Player) {
if (mr.getResult().getItemMeta() instanceof EnchantmentStorageMeta) {
EnchantmentStorageMeta meta = (EnchantmentStorageMeta) mr.getResult()
.getItemMeta();
Map<Enchantment, Integer> storedEn = meta.getStoredEnchants();
for (Map.Entry<Enchantment, Integer> entry : storedEn.entrySet()) {
Enchantment entc = entry.getKey();
Integer val = entry.getValue();
if(val == entc.getMaxLevel()){
ent.showTitle(Title.title(Component.text("MAX LEVEL!"),Component.translatable(entc.translationKey())));
}
else {
ent.sendMessage("");
ent.sendMessage("");
ent.sendMessage("");
ent.sendMessage("");
ent.sendMessage("");
ent.sendMessage("");
ent.sendMessage(Component.translatable(entc.translationKey()));
ent.sendMessage(Component.text("LVL " + val));
}
}
}
Villager vil = (Villager) e.getRightClicked();
if (vil.getProfession() == Profession.LIBRARIAN && vil.getVillagerExperience() == 0) {
vil.setProfession(Profession.NONE);
vil.setProfession(Profession.LIBRARIAN);
Bukkit.getScheduler().scheduleSyncDelayedTask(App.main, new Runnable() {
public void run() {
e.getPlayer().getOpenInventory().close();
for (MerchantRecipe mr : vil.getRecipes()) {
Collection<Player> en = Bukkit.getServer().getWorlds().get(0)
.getNearbyPlayers(vil.getLocation(), 5);
for (Entity ent : en) {
if (ent instanceof Player) {
if (mr.getResult().getItemMeta() instanceof EnchantmentStorageMeta) {
EnchantmentStorageMeta meta = (EnchantmentStorageMeta) mr.getResult()
.getItemMeta();
Map<Enchantment, Integer> storedEn = meta.getStoredEnchants();
for (Map.Entry<Enchantment, Integer> entry : storedEn.entrySet()) {
Enchantment entc = entry.getKey();
Integer val = entry.getValue();
String enchantmentName = "enchantment.minecraft."
+ entc.getKey().getKey();
if (val == entc.getMaxLevel()) {
ent.showTitle(Title.title(Component.text("MAX LEVEL!"),
Component.translatable(enchantmentName)));
} else {
ent.sendMessage("----");
ent.sendMessage("");
ent.sendMessage(Component.translatable(enchantmentName));
ent.sendMessage(Component.text("LVL " + val));
}
}
}
}
}
}
}, 1L);
}
}, 1L);
}
}
}
}
}
}

13
environmentex/src/main/java/de/hessj/environmentex/WorkbenchToGo.java
View File

@@ -1,5 +1,8 @@
package de.hessj.environmentex;
import java.util.Arrays;
import java.util.List;
import org.bukkit.Material;
import org.bukkit.NamespacedKey;
import org.bukkit.event.EventHandler;
@@ -10,6 +13,7 @@ import org.bukkit.event.server.ServerLoadEvent;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.ShapedRecipe;
import org.bukkit.inventory.meta.ItemMeta;
import org.bukkit.inventory.meta.components.CustomModelDataComponent;
import org.bukkit.persistence.PersistentDataType;
import net.kyori.adventure.text.Component;
@@ -26,6 +30,10 @@ public class WorkbenchToGo implements Listener {
mWorkbench.getPersistentDataContainer().set(nskWorkbench, PersistentDataType.STRING, "R3S_WORKBENCH");
mWorkbench.displayName(nameWorkbench);
mWorkbench.setCustomModelData(1000020);
CustomModelDataComponent cmdc = mWorkbench.getCustomModelDataComponent();
List<String> list = Arrays.asList("crafting_table_to_go");
cmdc.setStrings(list);
mWorkbench.setCustomModelDataComponent(cmdc);
isWorkbench.setItemMeta(mWorkbench);
ShapedRecipe srWorkbench = new ShapedRecipe(new NamespacedKey(App.main, "R3S_SR_Workbench"), isWorkbench);
srWorkbench.shape("DDD", "DWD", "DDD");
@@ -44,8 +52,9 @@ public class WorkbenchToGo implements Listener {
.getPersistentDataContainer() != null
&& e.getPlayer().getInventory().getItemInMainHand().getItemMeta().getPersistentDataContainer()
.has(nskWorkbench, PersistentDataType.STRING)) {
if (e.getAction() == Action.LEFT_CLICK_AIR || e.getAction() == Action.LEFT_CLICK_BLOCK || e.getAction() == Action.PHYSICAL
if (e.getAction() == Action.LEFT_CLICK_AIR || e.getAction() == Action.LEFT_CLICK_BLOCK
|| e.getAction() == Action.PHYSICAL
|| (e.getClickedBlock() != null && e.getClickedBlock().getType().isInteractable())) {
return;
}