diff --git a/.classpath b/.classpath index 5f31624..a0e398d 100644 --- a/.classpath +++ b/.classpath @@ -1,12 +1,20 @@ - + - + - - - - + + + + + + + + + + + + diff --git a/.gitignore b/.gitignore index e660fd9..fb60f67 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ bin/ +target/ diff --git a/.project b/.project index 50807d2..516f7eb 100644 --- a/.project +++ b/.project @@ -10,8 +10,14 @@ + + org.eclipse.m2e.core.maven2Builder + + + + org.eclipse.m2e.core.maven2Nature org.eclipse.jdt.core.javanature diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index e613e89..6219a3b 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -21,8 +21,9 @@ org.eclipse.jdt.core.compiler.maxProblemPerUnit=100 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning -org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.incompatibleJDKLevel=ignore org.eclipse.jdt.core.incompleteClasspath=error diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 0000000..f897a7f --- /dev/null +++ b/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..797fb98 --- /dev/null +++ b/pom.xml @@ -0,0 +1,38 @@ + + 4.0.0 + ca.thetechrobo.lifesteal + lifesteal + 1.0-SNAPSHOT + BukkitLifesteal + Lifesteal SMP plugin for Bukkit. + + src + + + maven-compiler-plugin + 3.8.1 + + 17 + + + + + + + + spigot-repo + https://hub.spigotmc.org/nexus/content/repositories/snapshots/ + + + + + + + org.spigotmc + spigot-api + 1.18.2-R0.1-SNAPSHOT + provided + + + + \ No newline at end of file diff --git a/src/ca/thetechrobo/smp/DeathListener.java b/src/ca/thetechrobo/smp/DeathListener.java index c545a58..2cda276 100644 --- a/src/ca/thetechrobo/smp/DeathListener.java +++ b/src/ca/thetechrobo/smp/DeathListener.java @@ -2,6 +2,7 @@ package ca.thetechrobo.smp; import java.util.ArrayList; +import org.bukkit.Sound; import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; @@ -65,10 +66,12 @@ public class DeathListener implements Listener { if ((i.getType() == f.m) && (i.getItemMeta().getDisplayName().equals(f.dn))) { if (p.getInventory().firstEmpty() == (-1)) { p.sendMessage("§4Not enough room in your inventory."); + p.playSound(p, Sound.ENTITY_ENDERMAN_TELEPORT, 76, 0); return; } if (this.scores.die(p, 0) == 1) { p.sendMessage("§4Performing this operation will cause you to get banned. Cancelled."); + p.playSound(p, Sound.ENTITY_ENDERMAN_TELEPORT, 69, 0); return; } this.scores.die(p, 1); diff --git a/src/ca/thetechrobo/smp/LifestealPlugin.java b/src/ca/thetechrobo/smp/LifestealPlugin.java index d8222e5..71ef896 100644 --- a/src/ca/thetechrobo/smp/LifestealPlugin.java +++ b/src/ca/thetechrobo/smp/LifestealPlugin.java @@ -29,6 +29,13 @@ public class LifestealPlugin extends JavaPlugin { recipe.setIngredient('A', Material.ANVIL); recipe.setIngredient('s', Material.NETHERITE_INGOT); Bukkit.addRecipe(recipe); + + ItemStack bedrock = new ItemStack(Material.BEDROCK); + key = new NamespacedKey(this, "bedrock"); + recipe = new ShapedRecipe(key, bedrock); + recipe.shape("NN ", "NN ", " "); + recipe.setIngredient('N', Material.NETHERITE_BLOCK); + Bukkit.addRecipe(recipe); } @Override public void onEnable() { diff --git a/src/ca/thetechrobo/smp/ScoreboardWrapper.java b/src/ca/thetechrobo/smp/ScoreboardWrapper.java index c1c1479..739cbe7 100644 --- a/src/ca/thetechrobo/smp/ScoreboardWrapper.java +++ b/src/ca/thetechrobo/smp/ScoreboardWrapper.java @@ -75,7 +75,7 @@ public class ScoreboardWrapper { Double health = access.getBaseValue(); Double neww = health - dec; if (neww <= 0) { - neww = 20.0; + neww = 4.0; die(p, 1); } access.setBaseValue(neww);