- Switch to maven (idk how to use gradle dont judge)

- Make it so that when you lose a life, you only respawn with 2 hearts
(rather than max)
- Allow crafting bedrock with 4 netherite blocks
  - STILL NO BEDROCK PICKAXE THOUGH ITS ON MY TODO LIST SHUT UP
- Play an enderman teleporting sound when you can't use the lifextractor
for any reason (the Hypixel error sound)
This commit is contained in:
TheTechRobo 2022-03-14 21:08:46 -04:00
parent 2d3afc8234
commit 3a7b49c6ad
9 changed files with 76 additions and 8 deletions

View File

@ -1,12 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
<attributes>
<attribute name="module" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" path="src"/>
<classpathentry kind="lib" path="/home/thetechrobo/BT/Spigot/Spigot-API/target/spigot-api-1.18.1-R0.1-SNAPSHOT-shaded.jar"/>
<classpathentry kind="lib" path="/home/thetechrobo/json-simple-1.1.jar"/>
<classpathentry kind="output" path="bin"/>
<classpathentry kind="src" output="target/classes" path="src">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>

1
.gitignore vendored
View File

@ -1 +1,2 @@
bin/
target/

View File

@ -10,8 +10,14 @@
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>

View File

@ -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

View File

@ -0,0 +1,4 @@
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1

38
pom.xml Normal file
View File

@ -0,0 +1,38 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>ca.thetechrobo.lifesteal</groupId>
<artifactId>lifesteal</artifactId>
<version>1.0-SNAPSHOT</version>
<name>BukkitLifesteal</name>
<description>Lifesteal SMP plugin for Bukkit.</description>
<build>
<sourceDirectory>src</sourceDirectory>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<release>17</release>
</configuration>
</plugin>
</plugins>
</build>
<repositories>
<!-- This adds the Spigot Maven repository to the build -->
<repository>
<id>spigot-repo</id>
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
</repository>
</repositories>
<dependencies>
<!--This adds the Spigot API artifact to the build -->
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>1.18.2-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
</project>

View File

@ -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);

View File

@ -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() {

View File

@ -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);