steven-legion/fantasysmp
3
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects 1 Releases 3 Wiki Activity

Compare commits

merge into: steven-legion/fantasysmp:main
Branches Tags
steven-legion/fantasysmp:main steven-legion/fantasysmp:ItemRecode steven-legion/fantasysmp:teams-fix steven-legion/fantasysmp:dev
steven-legion/fantasysmp:ItemRecode steven-legion/fantasysmp:dev steven-legion/fantasysmp:main
..
pull from: steven-legion/fantasysmp:teams-fix
Branches Tags
steven-legion/fantasysmp:ItemRecode steven-legion/fantasysmp:teams-fix steven-legion/fantasysmp:dev steven-legion/fantasysmp:main
steven-legion/fantasysmp:ItemRecode steven-legion/fantasysmp:dev steven-legion/fantasysmp:main

4 Commits
main .. teams-fix

Author SHA1 Message Date
zxq5 ec542a6188 fixed some lints and some bugs in the teams implementation 2025-09-07 20:45:27 +01:00
zxq5 3ca436b7e4 fixed team warps. still need to document what works and what doesn't. 
probably a job for tomorrow
 2025-09-06 23:18:22 +01:00
zxq5 b56a3c8218 for non-main branches CI/CD only runs on pull req
Java CI with Maven / build (pull_request) Successful in 27s
Details
2025-09-06 20:40:11 +01:00
zxq5 27fd92ff2c added more death messages
Java CI with Maven / build (push) Successful in 29s
Details
2025-09-02 20:57:56 +01:00
25 changed files with 1103 additions and 494 deletions
Expand all files Collapse all files
.classpath
+57
View File
@@ -0,0 +1,57 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="optional" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="test" value="true"/>
<attribute name="optional" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
<attributes>
<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="src" path="target/generated-sources/annotations">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
<attribute name="ignore_optional_problems" value="true"/>
<attribute name="m2e-apt" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
<attribute name="ignore_optional_problems" value="true"/>
<attribute name="m2e-apt" value="true"/>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
.gitea/workflows/main.yml
+10 -4
View File
@@ -1,6 +1,12 @@
name: Java CI with Maven
on: [push]
on:
push:
branches:
- "main"
pull_request:
branches:
- "*"
jobs:
build:
@@ -10,8 +16,8 @@ jobs:
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
java-version: '21'
distribution: 'temurin'
java-version: "21"
distribution: "temurin"
cache: maven
- uses: stCarolas/setup-maven@v5
- name: Build with Maven
@@ -20,4 +26,4 @@ jobs:
uses: akkuman/gitea-release-action@v1
with:
files: ./target/fantasysmp*.jar
token: '${{secrets.RELEASE_TOKEN}}'
token: "${{secrets.RELEASE_TOKEN}}"
.project
+34
View File
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>fantasysmp</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures>
<filteredResources>
<filter>
<id>1756828330981</id>
<name></name>
<type>30</type>
<matcher>
<id>org.eclipse.core.resources.regexFilterMatcher</id>
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription>
.settings/org.eclipse.core.resources.prefs
+4
View File
@@ -0,0 +1,4 @@
eclipse.preferences.version=1
encoding//src/main/java=UTF-8
encoding//src/main/resources=UTF-8
encoding/<project>=UTF-8
.settings/org.eclipse.jdt.apt.core.prefs
+2
View File
@@ -0,0 +1,2 @@
eclipse.preferences.version=1
org.eclipse.jdt.apt.aptEnabled=false
.settings/org.eclipse.jdt.core.prefs
+9
View File
@@ -0,0 +1,9 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
org.eclipse.jdt.core.compiler.compliance=21
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
org.eclipse.jdt.core.compiler.processAnnotations=disabled
org.eclipse.jdt.core.compiler.release=disabled
org.eclipse.jdt.core.compiler.source=21
.settings/org.eclipse.m2e.core.prefs
+4
View File
@@ -0,0 +1,4 @@
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1
.zed/tasks.json
+37
View File
@@ -0,0 +1,37 @@
// Project tasks configuration. See https://zed.dev/docs/tasks for documentation.
[
{
"label": "Maven Compile",
"command": "mvn",
"args": ["compile"],
"shell": "system",
"use_new_terminal": false
},
{
"label": "Maven Clean Package",
"command": "mvn",
"args": ["clean", "package"],
"shell": "system",
"use_new_terminal": false
},
{
"label": "Maven Test",
"command": "mvn",
"args": ["test"],
"shell": "system",
"use_new_terminal": false
},
{
"label": "Run Project",
"command": "./run.sh",
"shell": "system",
"use_new_terminal": false
},
{
"label": "Maven Package (Skip Tests)",
"command": "mvn",
"args": ["clean", "package", "-DskipTests"],
"shell": "system",
"use_new_terminal": false
}
]
run.sh
Executable
+4
View File
@@ -0,0 +1,4 @@
mkdir -p ./run/plugins/
cp ./target/fantasysmp*.jar run/plugins/fantasysmp.jar
cd run/
java -jar ./paper.jar nogui
src/main/java/dev/zxq5/fantasysmp/Fantasysmp.java
+3 -4
View File
@@ -12,7 +12,6 @@ public final class Fantasysmp extends JavaPlugin {
@Override
public void onEnable() {
Items items = new Items(this);
getCommand("items").setExecutor(items);
// Plugin startup logic
@@ -39,9 +38,9 @@ public final class Fantasysmp extends JavaPlugin {
heresyChecker.scheduleHeresyChecker();
getServer().getPluginManager().registerEvents(heresyChecker, this);
getServer().getPluginManager().registerEvents(new DeathMessageCustomiser(), this);
getServer()
.getPluginManager()
.registerEvents(new DeathMessageCustomiser(), this);
XrayDetector xrayDetector = new XrayDetector();
getServer().getPluginManager().registerEvents(xrayDetector, this);
src/main/java/dev/zxq5/fantasysmp/events/DeathMessageCustomiser.java
+5 -1
View File
@@ -20,7 +20,11 @@ public class DeathMessageCustomiser implements Listener {
"%p thought the ravine was a boulder problem",
"%p's fingers were not cut out for crack climbing",
"%p got a leg cramp",
"%p forgot to check their harness"
"%p forgot to check their harness",
"%p didn't send the dyno",
"%p tried to static a 4 block jump",
"%p's climbing shoes didn't fit",
"%p wasn't flexible enough"
};
@EventHandler
src/main/java/dev/zxq5/fantasysmp/events/HeresyChecker.java
-2
View File
@@ -3,7 +3,6 @@ package dev.zxq5.fantasysmp.events;
import org.bukkit.*;
import org.bukkit.entity.Chicken;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Item;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
@@ -11,7 +10,6 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent;
import org.bukkit.event.entity.EntityDamageEvent;
import org.bukkit.event.entity.ProjectileHitEvent;
import org.bukkit.event.player.PlayerItemConsumeEvent;
import org.bukkit.inventory.ItemStack;
import org.bukkit.plugin.Plugin;
import org.bukkit.potion.PotionEffect;
import org.bukkit.potion.PotionEffectType;
src/main/java/dev/zxq5/fantasysmp/events/XrayDetector.java
+59 -52
View File
@@ -1,6 +1,20 @@
package dev.zxq5.fantasysmp.events;
import static org.bukkit.Bukkit.*;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
import java.net.URI;
import java.net.http.HttpClient;
import java.net.http.HttpRequest;
import java.net.http.HttpResponse;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.entity.Player;
@@ -9,26 +23,14 @@ import org.bukkit.event.Listener;
import org.bukkit.event.block.BlockBreakEvent;
import org.bukkit.plugin.Plugin;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
import java.net.URI;
import java.net.URL;
import java.net.http.HttpClient;
import java.net.http.HttpRequest;
import java.net.http.HttpResponse;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
import static org.bukkit.Bukkit.*;
public class XrayDetector implements Listener {
private final HashMap<Player, HashMap<Material, Integer>> players = new HashMap<>();
private final HashMap<Player, HashMap<Material, Integer>> players =
new HashMap<>();
private String token;
private final ArrayList<Material> trackedBlocks = new ArrayList<>(Arrays.asList(
private final ArrayList<Material> trackedBlocks = new ArrayList<>(
Arrays.asList(
Material.ANCIENT_DEBRIS,
Material.DIAMOND_ORE,
Material.EMERALD_ORE,
@@ -36,7 +38,8 @@ public class XrayDetector implements Listener {
Material.IRON_ORE,
Material.LAPIS_ORE,
Material.REDSTONE_ORE
));
)
);
@EventHandler
public void onBlockBreak(BlockBreakEvent event) {
@@ -45,80 +48,84 @@ public class XrayDetector implements Listener {
Material block = event.getBlock().getType();
Plugin plugin = getPluginManager().getPlugin("fantasysmp");
if (!this.players.containsKey(player)) this.players.put(player, new HashMap<>());
if (!this.players.containsKey(player)) this.players.put(
player,
new HashMap<>()
);
blocks = this.players.get(player);
if (this.trackedBlocks.contains(block)) {
if (!(blocks.containsKey(block))) blocks.put(block, 0);
blocks.put(block, blocks.get(block) + 1);
Bukkit.getScheduler().runTaskLater(plugin, () -> {
Bukkit.getScheduler().runTaskLater(
plugin,
() -> {
blocks.put(block, blocks.get(block) - 1);
}, 1200);
},
1200
);
}
}
private void uploadData() {
HashMap<String, HashMap<String, Integer>> data = new HashMap<>();
for (Map.Entry<Player, HashMap<Material, Integer>> entry : players.entrySet()) {
for (Map.Entry<
Player,
HashMap<Material, Integer>
> entry : players.entrySet()) {
HashMap<String, Integer> materials = new HashMap<>();
for (Map.Entry<Material, Integer> materialEntry : entry.getValue().entrySet()) {
materials.put(materialEntry.getKey().toString(), materialEntry.getValue());
for (Map.Entry<Material, Integer> materialEntry : entry
.getValue()
.entrySet()) {
materials.put(
materialEntry.getKey().toString(),
materialEntry.getValue()
);
}
data.put(entry.getKey().getName(), materials);
}
Gson gson = new Gson();
Gson gson = new GsonBuilder().setPrettyPrinting().create();
HttpClient client = HttpClient.newHttpClient();
HttpRequest request = HttpRequest.newBuilder(URI.create("https://mcapi.zxq5.dev/xray?token=" + token))
HttpRequest request = HttpRequest.newBuilder(
URI.create("https://mcapi.zxq5.dev/xray?token=" + token)
)
.header("Content-Type", "application/json")
.POST(HttpRequest.BodyPublishers.ofString(gson.toJson(data)))
.build();
client.sendAsync(request, HttpResponse.BodyHandlers.ofString())
client
.sendAsync(request, HttpResponse.BodyHandlers.ofString())
.thenApply(HttpResponse::body)
.join();
}
public XrayDetector() {
File dataFolder = getServer().getPluginManager().getPlugin("Fantasysmp").getDataFolder();
File dataFolder = getServer()
.getPluginManager()
.getPlugin("Fantasysmp")
.getDataFolder();
File file = new File(dataFolder, "token.txt");
BufferedReader reader;
try {
reader = new BufferedReader(new FileReader(file));
this.token = reader.readLine();
reader.close();
} catch (Exception e) {
e.printStackTrace();
return;
}
Bukkit.getScheduler().runTaskTimerAsynchronously(getPluginManager().getPlugin("fantasysmp"), this::uploadData, 0, 20 * 60);
Bukkit.getScheduler().runTaskTimerAsynchronously(
getPluginManager().getPlugin("fantasysmp"),
this::uploadData,
0,
20 * 60
);
}
}
src/main/java/dev/zxq5/fantasysmp/groups/Commands.java
+93 -72
View File
@@ -1,31 +1,30 @@
package dev.zxq5.fantasysmp.groups;
import static org.bukkit.Bukkit.getServer;
import dev.zxq5.fantasysmp.chatutils.Chat;
import dev.zxq5.fantasysmp.warps.Warp;
import dev.zxq5.fantasysmp.warps.WarpType;
import java.util.ArrayList;
import org.bukkit.command.CommandExecutor;
import org.bukkit.entity.Player;
import java.util.ArrayList;
import static org.bukkit.Bukkit.getServer;
/*
* Commands:
*
* ** PLAYER **
*
* team list => TODO
* team create <name> => TODO
* team rename <new name> => TODO
* team list => DONE
* team create <name> => DONE
* team rename <new name> => TODO TEST
* team transfer <player> => TODO
* team join <name> => TODO
* team invite <player> => TODO
* team leave => TODO
* team disband => TODO
* team setwarp => TODO
* team disband => DONE
* team setwarp => DONE
* team delwarp => TODO
* team warp <name> => TODO
* team warp <name> => TODO TEST
* team kick => TODO
* team log => TODO
*
@@ -41,7 +40,12 @@ import static org.bukkit.Bukkit.getServer;
public class Commands implements CommandExecutor {
@Override
public boolean onCommand(org.bukkit.command.CommandSender sender, org.bukkit.command.Command command, String label, String[] args) {
public boolean onCommand(
org.bukkit.command.CommandSender sender,
org.bukkit.command.Command command,
String label,
String[] args
) {
if (!(sender instanceof Player player)) return false;
if (command.getName().equals("team")) handleTeamCommands(player, args);
@@ -72,7 +76,10 @@ public class Commands implements CommandExecutor {
public void handleRankCommands(Player player, String[] args) {
// check perms
if (!(player.hasPermission("fantasysmp.ranks"))) {
Chat.error(player, "You do not have permission to use this command.");
Chat.error(
player,
"You do not have permission to use this command."
);
return;
}
@@ -87,167 +94,181 @@ public class Commands implements CommandExecutor {
public void handleList(Player player, String[] args) {
String[] teams = Team.getTeams();
String result = "Teams: [\n " + String.join("\n ", teams) + "\n]";
Chat.info(player, result);
Chat.info(player, String.join(" ", teams));
}
public void handleCreate(Player player, String[] args) {
public void handleCreate(Player caller, String[] args) {
if (args.length != 2) {
Chat.error(player, "Usage: /team create <name>");
Chat.error(caller, "Usage: /team create <name>");
return;
}
Team.createTeam(player, args[1]);
Team.createTeam(caller, args[1]);
}
public void handleSetColour(Player player, String[] args) {
public void handleSetColour(Player caller, String[] args) {
if (args.length != 2) {
Chat.error(player, "Usage: /team colour <color>");
Chat.error(caller, "Usage: /team colour <color>");
return;
}
Team team = Team.fromMember(player);
Team team = Team.fromMember(caller);
if (team == null) return;
team.setColour(player, args[1]);
team.setColour(caller, args[1]);
}
public void handleRename(Player player, String[] args) {
public void handleRename(Player caller, String[] args) {
if (args.length != 2) {
Chat.error(player, "Usage: /team rename <new name>");
Chat.error(caller, "Usage: /team rename <new name>");
return;
}
if (args[1].isEmpty() || args[1].contains(" ") || args[1].contains("\t")) {
Chat.error(player, "Invalid name!");
if (
args[1].isEmpty() || args[1].contains(" ") || args[1].contains("\t")
) {
Chat.error(caller, "Invalid name!");
return;
}
Team team = Team.fromMember(player);
Team team = Team.fromMember(caller);
if (team == null) return;
team.renameTeam(player, args[1]);
team.renameTeam(caller, args[1]);
}
public void handleSetTag(Player player, String[] args) {
public void handleSetTag(Player caller, String[] args) {
if (args.length != 2) {
Chat.error(player, "Usage: /team tag <tag>");
Chat.error(caller, "Usage: /team tag <tag>");
return;
}
if (args[1].length() < 3 || args[1].contains(" ") || args[1].contains("\t") || args[1].length() > 8) {
Chat.error(player, "Invalid tag!");
Chat.error(player, "tags should be 3-8 chars, alphanumeric and have no spaces");
if (
args[1].length() < 3 ||
args[1].contains(" ") ||
args[1].contains("\t") ||
args[1].length() > 8
) {
Chat.error(caller, "Invalid tag!");
Chat.error(
caller,
"tags should be 3-8 chars, alphanumeric and have no spaces"
);
return;
}
Team team = Team.fromMember(player);
Team team = Team.fromMember(caller);
if (team == null) return;
team.changeTeamTag(player, args[1]);
team.changeTeamTag(caller, args[1]);
Chat.success(caller, "Changed tag to " + args[1] + "!");
}
public void handleTransfer(Player player, String[] args) {
public void handleTransfer(Player caller, String[] args) {
if (args.length != 2) {
Chat.error(player, "Usage: /team transfer <player>");
Chat.error(caller, "Usage: /team transfer <player>");
return;
}
Team.fromMember(caller).transferTeam(caller, args[1]);
// Chat.success(caller, "Transferred ownership to: " + args[1] + "!");
}
public void handleJoin(Player player, String[] args) {
public void handleJoin(Player caller, String[] args) {
if (args.length != 2) {
Chat.error(player, "Usage: /team join <name>");
Chat.error(caller, "Usage: /team join <name>");
return;
}
// Chat.success(caller, "Joined team: " + args[1] + "!");
}
public void handleInvite(Player player, String[] args) {
public void handleInvite(Player caller, String[] args) {
if (args.length != 2) {
Chat.error(player, "Usage: /team invite <player>");
Chat.error(caller, "Usage: /team invite <player>");
return;
}
// Chat.success(caller, "Changed tag to: " + args[1] + "!");
}
public void handleLeave(Player player, String[] args) {
public void handleLeave(Player caller, String[] args) {
if (args.length != 1) {
Chat.error(player, "Usage: /team leave");
Chat.error(caller, "Usage: /team leave");
return;
}
Team team = Team.fromMember(player);
Team team = Team.fromMember(caller);
if (team == null) return;
team.leaveTeam(player);
team.leaveTeam(caller);
}
public void handleDisband(Player player, String[] args) {
public void handleDisband(Player caller, String[] args) {
if (args.length != 1) {
Chat.error(player, "Usage: /team disband");
Chat.error(caller, "Usage: /team disband");
return;
}
Team team = Team.fromMember(player);
Team team = Team.fromMember(caller);
if (team == null) return;
team.disbandTeam(player);
team.disbandTeam(caller);
}
public void handleSetWarp(Player player, String[] args) {
public void handleSetWarp(Player caller, String[] args) {
if (args.length != 2) {
Chat.error(player, "Usage: /team setwarp <name>");
Chat.error(caller, "Usage: /team setwarp <name>");
return;
}
Warp.setWarp(args[1], player, WarpType.TEAM);
Warp.setWarp(args[1], caller, WarpType.TEAM);
}
public void handleDelWarp(Player player, String[] args) {
public void handleDelWarp(Player caller, String[] args) {}
}
public void handleWarp(Player player, String[] args) {
public void handleWarp(Player caller, String[] args) {
if (args.length != 2) {
Chat.error(player, "Usage: /team warp <name>");
Chat.error(caller, "Usage: /team warp <name>");
return;
}
Team team = Team.fromMember(player);
Team team = Team.fromMember(caller);
if (team == null) return;
Warp warp = Warp.getTeamWarp(team, args[1]);
Warp warp = Warp.getTeamWarp(team, caller, args[1]);
warp.execute(caller);
}
public void handleKick(Player player, String[] args) {
public void handleKick(Player caller, String[] args) {
if (args.length != 2) {
Chat.error(player, "Usage: /team kick <player>");
Chat.error(caller, "Usage: /team kick <player>");
return;
}
Team team = Team.fromMember(player);
Team team = Team.fromMember(caller);
if (team == null) return;
team.removePlayer(player, args[1]);
team.removePlayer(caller, args[1]);
}
public void handleLog(Player player, String[] args) {
public void handleLog(Player caller, String[] args) {
if (args.length != 1) {
Chat.error(player, "Usage: /team log");
Chat.error(caller, "Usage: /team log");
return;
}
Team team = Team.fromMember(player);
Team team = Team.fromMember(caller);
if (team == null) return;
ArrayList<String> logs = team.getLogs(player);
ArrayList<String> logs = team.getLogs(caller);
String result = "Logs: [\n " + String.join("\n ", logs) + "\n]";
Chat.info(player, result);
Chat.info(caller, result);
}
public void handleCreateRank(Player player, String[] args) {}
public void handleCreateRank(Player caller, String[] args) {}
public void handleRenameRank(Player player, String[] args) {}
public void handleRenameRank(Player caller, String[] args) {}
public void handleDeleteRank(Player player, String[] args) {}
public void handleDeleteRank(Player caller, String[] args) {}
public void handleAddRank(Player player, String[] args) {}
public void handleAddRank(Player caller, String[] args) {}
public void handleRemoveRank(Player player, String[] args) {}
public void handleRemoveRank(Player caller, String[] args) {}
public Commands() {}
}
src/main/java/dev/zxq5/fantasysmp/groups/Team.java
+111 -47
View File
@@ -1,28 +1,31 @@
package dev.zxq5.fantasysmp.groups;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import dev.zxq5.fantasysmp.chatutils.Chat;
import org.bukkit.ChatColor;
import org.bukkit.entity.Player;
import java.io.*;
import java.util.ArrayList;
import java.util.UUID;
import static org.bukkit.Bukkit.broadcastMessage;
import static org.bukkit.Bukkit.getServer;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;
import dev.zxq5.fantasysmp.chatutils.Chat;
import java.io.*;
import java.util.ArrayList;
import java.util.UUID;
import org.bukkit.ChatColor;
import org.bukkit.entity.Player;
public class Team {
private static ArrayList<Team> teams;
private final static String FILENAME = "teams.json";
private static final String FILENAME = "teams.json";
private String name;
private String ownerUUID;
private ArrayList<String> members;
private ArrayList<String> invites;
private ArrayList<String> logs;
private String teamUUID;
private String tag;
private ChatColor color;
public Team(Player creator, String name, String tag) {
this.name = name;
@@ -50,7 +53,9 @@ public class Team {
public static Team fromMember(Player member) {
for (Team team : teams) {
if (team.members.contains(member.getUniqueId().toString())) return team;
if (
team.members.contains(member.getUniqueId().toString())
) return team;
}
Team.error(member, Error.TEAM_NOT_FOUND);
@@ -87,7 +92,10 @@ public class Team {
this.tag = newTag;
this.log(player.getName() + " changed the team tag to " + newTag + ".");
Chat.success(player, "You changed the tag of " + this.name + " to " + newTag + ".");
Chat.success(
player,
"You changed the tag of " + this.name + " to " + newTag + "."
);
}
public void setColour(Player player, String colour) {
@@ -96,26 +104,32 @@ public class Team {
return;
}
switch (colour) {
case "red" -> this.tag = ChatColor.RED + this.tag;
case "green" -> this.tag = ChatColor.GREEN + this.tag;
case "blue" -> this.tag = ChatColor.BLUE + this.tag;
case "yellow" -> this.tag = ChatColor.YELLOW + this.tag;
case "aqua" -> this.tag = ChatColor.AQUA + this.tag;
case "dark_aqua" -> this.tag = ChatColor.DARK_AQUA + this.tag;
case "dark_blue" -> this.tag = ChatColor.DARK_BLUE + this.tag;
case "dark_gray" -> this.tag = ChatColor.DARK_GRAY + this.tag;
case "dark_green" -> this.tag = ChatColor.DARK_GREEN + this.tag;
case "dark_purple" -> this.tag = ChatColor.DARK_PURPLE + this.tag;
case "gold" -> this.tag = ChatColor.GOLD + this.tag;
case "gray" -> this.tag = ChatColor.GRAY + this.tag;
case "light_purple" -> this.tag = ChatColor.LIGHT_PURPLE + this.tag;
case "white" -> this.tag = ChatColor.WHITE + this.tag;
case "black" -> this.tag = ChatColor.BLACK + this.tag;
}
this.color = switch (colour) {
case "red" -> ChatColor.RED;
case "green" -> ChatColor.GREEN;
case "blue" -> ChatColor.BLUE;
case "yellow" -> ChatColor.YELLOW;
case "aqua" -> ChatColor.AQUA;
case "dark_aqua" -> ChatColor.DARK_AQUA;
case "dark_blue" -> ChatColor.DARK_BLUE;
case "dark_gray" -> ChatColor.DARK_GRAY;
case "dark_green" -> ChatColor.DARK_GREEN;
case "dark_purple" -> ChatColor.DARK_PURPLE;
case "gold" -> ChatColor.GOLD;
case "gray" -> ChatColor.GRAY;
case "light_purple" -> ChatColor.LIGHT_PURPLE;
case "white" -> ChatColor.WHITE;
case "black" -> ChatColor.BLACK;
default -> ChatColor.WHITE;
};
this.log(player.getName() + " changed the team colour to " + colour + ".");
Chat.success(player, "You changed the colour of " + this.name + " to " + colour + ".");
this.log(
player.getName() + " changed the team colour to " + colour + "."
);
Chat.success(
player,
"You changed the colour of " + this.name + " to " + colour + "."
);
}
public void transferTeam(Player player, String playerName) {
@@ -137,9 +151,21 @@ public class Team {
}
this.ownerUUID = newUUID;
this.log(player.getName() + " transferred ownership to " + newOwner.getName() + ".");
this.log(
player.getName() +
" transferred ownership to " +
newOwner.getName() +
"."
);
Chat.success(player, "You transferred ownership of " + this.name + " to " + newOwner.getName() + ".");
Chat.success(
player,
"You transferred ownership of " +
this.name +
" to " +
newOwner.getName() +
"."
);
}
public void removePlayer(Player remover, String playerName) {
@@ -169,9 +195,21 @@ public class Team {
}
this.members.remove(removedPlayerUUID);
this.log(remover.getName() + " removed " + removedPlayer.getName() + " from the team.");
this.log(
remover.getName() +
" removed " +
removedPlayer.getName() +
" from the team."
);
Chat.success(remover, "You removed " + removedPlayer.getName() + " from " + this.name + ".");
Chat.success(
remover,
"You removed " +
removedPlayer.getName() +
" from " +
this.name +
"."
);
}
public void leaveTeam(Player member) {
@@ -211,7 +249,9 @@ public class Team {
}
public ArrayList<String> getLogs(Player member) {
if (this.ownerUUID.equals(member.getUniqueId().toString())) return this.logs;
if (
this.ownerUUID.equals(member.getUniqueId().toString())
) return this.logs;
Team.error(member, Error.NO_PERMISSION);
return null;
@@ -223,7 +263,10 @@ public class Team {
}
public static void loadTeams() throws Exception {
File dataFolder = getServer().getPluginManager().getPlugin("Fantasysmp").getDataFolder();
File dataFolder = getServer()
.getPluginManager()
.getPlugin("Fantasysmp")
.getDataFolder();
File file = new File(dataFolder, FILENAME);
if (!file.exists()) {
@@ -233,17 +276,23 @@ public class Team {
BufferedReader reader;
reader = new BufferedReader(new FileReader(file));
Gson gson = new Gson();
teams = gson.fromJson(reader, new TypeToken<ArrayList<Team>>(){}.getType());
Gson gson = new GsonBuilder().setPrettyPrinting().create();
teams = gson.fromJson(
reader,
new TypeToken<ArrayList<Team>>() {}.getType()
);
reader.close();
}
public static void saveTeams() {
File dataFolder = getServer().getPluginManager().getPlugin("Fantasysmp").getDataFolder();
File dataFolder = getServer()
.getPluginManager()
.getPlugin("Fantasysmp")
.getDataFolder();
File file = new File(dataFolder, FILENAME);
Gson gson = new Gson();
Gson gson = new GsonBuilder().setPrettyPrinting().create();
String json = gson.toJson(teams);
try {
@@ -257,13 +306,16 @@ public class Team {
}
public static void createTeamsFile() {
File dataFolder = getServer().getPluginManager().getPlugin("Fantasysmp").getDataFolder();
File dataFolder = getServer()
.getPluginManager()
.getPlugin("Fantasysmp")
.getDataFolder();
File file = new File(dataFolder, FILENAME);
if (!file.exists()) {
try {
Team[] t = new Team[0];
Gson gson = new Gson();
Gson gson = new GsonBuilder().setPrettyPrinting().create();
String json = gson.toJson(t);
Writer writer = new FileWriter(file);
writer.write(json);
@@ -274,16 +326,27 @@ public class Team {
}
}
// utility methods
public boolean hasMember(Player player) {
for (String uuid : this.members) {
if (player.getUniqueId().toString() == uuid) return true;
}
return false;
}
public String getUUID() {
return this.teamUUID;
}
public String getTag() {
return this.tag;
return this.color + this.tag;
}
public static void error(Player player, Error error) {
Chat.error(player, switch (error) {
Chat.error(
player,
switch (error) {
case NO_PERMISSION -> "You do not have permission to do that!";
case SELF_IN_TEAM -> "You are already in a team!";
case NOT_IN_TEAM -> "You are not in a team!";
@@ -292,7 +355,8 @@ public class Team {
case ALREADY_TAKEN -> "That name is already taken!";
case PLAYER_IN_TEAM -> "That player is already in a team!";
case TEAM_OWNER -> "You cannot do this to/as the owner!";
});
}
);
}
}
src/main/java/dev/zxq5/fantasysmp/items/gear/BlazingGear.java
+81 -33
View File
@@ -1,45 +1,43 @@
package dev.zxq5.fantasysmp.items.gear;
import static org.bukkit.Bukkit.*;
import dev.zxq5.fantasysmp.items.GenericGearSet;
import dev.zxq5.fantasysmp.util.LoreChecker;
import java.util.ArrayList;
import java.util.List;
import org.bukkit.*;
import org.bukkit.command.CommandExecutor;
import org.bukkit.damage.DamageType;
import org.bukkit.entity.Fireball;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
import org.bukkit.entity.SmallFireball;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.block.Action;
import org.bukkit.event.entity.EntityDamageByEntityEvent;
import org.bukkit.event.player.PlayerInteractEvent;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.RecipeChoice;
import org.bukkit.inventory.SmithingTransformRecipe;
import org.bukkit.plugin.Plugin;
import org.bukkit.potion.PotionEffect;
import org.bukkit.potion.PotionEffectType;
import org.bukkit.util.Vector;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
public class BlazingGear extends GenericGearSet implements CommandExecutor {
import static org.bukkit.Bukkit.*;
public class BlazingGear extends GenericGearSet implements Listener, CommandExecutor {
private ArrayList<Player> cooldown = new ArrayList<>();
private final ArrayList<DamageType> damageTypes = new ArrayList<>(List.of(
private final ArrayList<DamageType> damageTypes = new ArrayList<>(
List.of(
DamageType.HOT_FLOOR,
DamageType.ON_FIRE,
DamageType.IN_FIRE,
DamageType.LAVA
));
)
);
@Override
public boolean onCommand(org.bukkit.command.CommandSender sender, org.bukkit.command.Command command, String label, String[] args) {
public boolean onCommand(
org.bukkit.command.CommandSender sender,
org.bukkit.command.Command command,
String label,
String[] args
) {
Player player = (Player) sender;
player.getInventory().addItem(this.getSword());
player.getInventory().addItem(this.getHelmet());
@@ -54,15 +52,39 @@ public class BlazingGear extends GenericGearSet implements Listener, CommandExec
public void registerRecipes() {}
@EventHandler
public void onPlayerSetOnFire(org.bukkit.event.entity.EntityDamageEvent event) {
public void onPlayerSetOnFire(
org.bukkit.event.entity.EntityDamageEvent event
) {
if (!(event.getEntity() instanceof Player player)) return;
if (!(LoreChecker.itemLoreContains(player.getInventory().getHelmet(), this.helmet.lore))) return;
if (!(LoreChecker.itemLoreContains(player.getInventory().getChestplate(), this.chestplate.lore))) return;
if (!(LoreChecker.itemLoreContains(player.getInventory().getLeggings(), this.leggings.lore))) return;
if (!(LoreChecker.itemLoreContains(player.getInventory().getBoots(), this.boots.lore))) return;
if (
!(LoreChecker.itemLoreContains(
player.getInventory().getHelmet(),
this.helmet.lore
))
) return;
if (
!(LoreChecker.itemLoreContains(
player.getInventory().getChestplate(),
this.chestplate.lore
))
) return;
if (
!(LoreChecker.itemLoreContains(
player.getInventory().getLeggings(),
this.leggings.lore
))
) return;
if (
!(LoreChecker.itemLoreContains(
player.getInventory().getBoots(),
this.boots.lore
))
) return;
if (damageTypes.contains(event.getDamageSource().getDamageType())) event.setCancelled(true);
if (
damageTypes.contains(event.getDamageSource().getDamageType())
) event.setCancelled(true);
player.setFireTicks(0);
}
@@ -72,7 +94,10 @@ public class BlazingGear extends GenericGearSet implements Listener, CommandExec
Player player = event.getPlayer();
ItemStack item = event.getItem(); // Get the item the player interacted with
if (!(event.getAction() == Action.RIGHT_CLICK_AIR || event.getAction() == Action.RIGHT_CLICK_BLOCK)) {
if (
!(event.getAction() == Action.RIGHT_CLICK_AIR ||
event.getAction() == Action.RIGHT_CLICK_BLOCK)
) {
return;
}
@@ -82,18 +107,37 @@ public class BlazingGear extends GenericGearSet implements Listener, CommandExec
Plugin plugin = getPluginManager().getPlugin("fantasysmp");
cooldown.add(player);
Bukkit.getScheduler().runTaskLater(plugin, () -> cooldown.remove(player), 25);
Bukkit.getScheduler().runTaskLater(
plugin,
() -> cooldown.remove(player),
25
);
shootFireball(player);
Bukkit.getScheduler().runTaskLater(plugin, () -> shootFireball(player), 4);
Bukkit.getScheduler().runTaskLater(plugin, () -> shootFireball(player), 8);
Bukkit.getScheduler().runTaskLater(
plugin,
() -> shootFireball(player),
4
);
Bukkit.getScheduler().runTaskLater(
plugin,
() -> shootFireball(player),
8
);
}
@EventHandler
public void onEntityDamageByEntity(EntityDamageByEntityEvent event) {
if (!(event.getDamager() instanceof Player player)) return;
if (!(LoreChecker.itemLoreContains(player.getInventory().getItemInMainHand(), this.sword.lore))) return;
if (event.getEntity().getFireTicks() < 240) event.getEntity().setFireTicks(240);
if (
!(LoreChecker.itemLoreContains(
player.getInventory().getItemInMainHand(),
this.sword.lore
))
) return;
if (event.getEntity().getFireTicks() < 240) event
.getEntity()
.setFireTicks(240);
}
public void shootFireball(Player player) {
@@ -115,11 +159,13 @@ public class BlazingGear extends GenericGearSet implements Listener, CommandExec
this.helmet.customItemModel = "blazing_helmet";
this.helmet.customEquipmentModel = "blazing";
this.chestplate.name = ChatColor.GOLD + "Blazing Chestplate" + ChatColor.RESET;
this.chestplate.name =
ChatColor.GOLD + "Blazing Chestplate" + ChatColor.RESET;
this.chestplate.customItemModel = "blazing_chestplate";
this.chestplate.customEquipmentModel = "blazing";
this.leggings.name = ChatColor.GOLD + "Blazing Leggings" + ChatColor.RESET;
this.leggings.name =
ChatColor.GOLD + "Blazing Leggings" + ChatColor.RESET;
this.leggings.customItemModel = "blazing_leggings";
this.leggings.customEquipmentModel = "blazing";
@@ -129,8 +175,10 @@ public class BlazingGear extends GenericGearSet implements Listener, CommandExec
this.sword.lore = "Forged from molten lava and the essence of blazes";
this.helmet.lore = "Forged from molten lava and the essence of blazes";
this.chestplate.lore = "Forged from molten lava and the essence of blazes";
this.leggings.lore = "Forged from molten lava and the essence of blazes";
this.chestplate.lore =
"Forged from molten lava and the essence of blazes";
this.leggings.lore =
"Forged from molten lava and the essence of blazes";
this.boots.lore = "Forged from molten lava and the essence of blazes";
}
}
src/main/java/dev/zxq5/fantasysmp/items/gear/CrimsonGear.java
+61 -18
View File
@@ -6,11 +6,16 @@ import org.bukkit.ChatColor;
import org.bukkit.command.CommandExecutor;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
public class CrimsonGear extends GenericGearSet implements CommandExecutor, Listener {
public class CrimsonGear extends GenericGearSet implements CommandExecutor {
@Override
public boolean onCommand(org.bukkit.command.CommandSender sender, org.bukkit.command.Command command, String label, String[] args) {
public boolean onCommand(
org.bukkit.command.CommandSender sender,
org.bukkit.command.Command command,
String label,
String[] args
) {
Player player = (Player) sender;
player.getInventory().addItem(this.getSword());
@@ -22,18 +27,49 @@ public class CrimsonGear extends GenericGearSet implements CommandExecutor, List
}
@EventHandler
public void onEntityDamageByEntity(org.bukkit.event.entity.EntityDamageByEntityEvent event) {
public void onEntityDamageByEntity(
org.bukkit.event.entity.EntityDamageByEntityEvent event
) {
if (!(event.getDamager() instanceof Player player)) return;
if (!(LoreChecker.itemLoreContains(player.getInventory().getItemInMainHand(), this.sword.lore))) return;
if (
!(LoreChecker.itemLoreContains(
player.getInventory().getItemInMainHand(),
this.sword.lore
))
) return;
player.setHealth( Math.min(player.getHealth() + 1, player.getMaxHealth()) );
player.setHealth(
Math.min(player.getHealth() + 1, player.getMaxHealth())
);
if (!(LoreChecker.itemLoreContains(player.getInventory().getHelmet(), this.helmet.lore))) return;
if (!(LoreChecker.itemLoreContains(player.getInventory().getChestplate(), this.chestplate.lore))) return;
if (!(LoreChecker.itemLoreContains(player.getInventory().getLeggings(), this.leggings.lore))) return;
if (!(LoreChecker.itemLoreContains(player.getInventory().getBoots(), this.boots.lore))) return;
if (
!(LoreChecker.itemLoreContains(
player.getInventory().getHelmet(),
this.helmet.lore
))
) return;
if (
!(LoreChecker.itemLoreContains(
player.getInventory().getChestplate(),
this.chestplate.lore
))
) return;
if (
!(LoreChecker.itemLoreContains(
player.getInventory().getLeggings(),
this.leggings.lore
))
) return;
if (
!(LoreChecker.itemLoreContains(
player.getInventory().getBoots(),
this.boots.lore
))
) return;
player.setHealth( Math.min(player.getHealth() + 1, player.getMaxHealth()) );
player.setHealth(
Math.min(player.getHealth() + 1, player.getMaxHealth())
);
player.setFoodLevel(Math.min(player.getFoodLevel() + 1, 20));
}
@@ -46,24 +82,31 @@ public class CrimsonGear extends GenericGearSet implements CommandExecutor, List
this.sword.customItemModel = "crimson_sword";
this.sword.lore = "Live off the blood of your enemies.";
this.helmet.name = ChatColor.DARK_RED + "Crimson Helmet" + ChatColor.RESET;
this.helmet.name =
ChatColor.DARK_RED + "Crimson Helmet" + ChatColor.RESET;
this.helmet.customItemModel = "crimson_helmet";
this.helmet.customEquipmentModel = "crimson";
this.helmet.lore = "A helmet that grants its wearer vampiric senses.";
this.chestplate.name = ChatColor.DARK_RED + "Crimson Chestplate" + ChatColor.RESET;
this.chestplate.name =
ChatColor.DARK_RED + "Crimson Chestplate" + ChatColor.RESET;
this.chestplate.customItemModel = "crimson_chestplate";
this.chestplate.customEquipmentModel = "crimson";
this.chestplate.lore = "A chestplate that strengthens the heart of the wearer.";
this.chestplate.lore =
"A chestplate that strengthens the heart of the wearer.";
this.leggings.name = ChatColor.DARK_RED + "Crimson Leggings" + ChatColor.RESET;
this.leggings.name =
ChatColor.DARK_RED + "Crimson Leggings" + ChatColor.RESET;
this.leggings.customItemModel = "crimson_leggings";
this.leggings.customEquipmentModel = "crimson";
this.leggings.lore = "Leggings that enhance the wearer's speed and agility.";
this.leggings.lore =
"Leggings that enhance the wearer's speed and agility.";
this.boots.name = ChatColor.DARK_RED + "Crimson Boots" + ChatColor.RESET;
this.boots.name =
ChatColor.DARK_RED + "Crimson Boots" + ChatColor.RESET;
this.boots.customItemModel = "crimson_boots";
this.boots.customEquipmentModel = "crimson";
this.boots.lore = "Boots that allow the wearer to move silently and swiftly.";
this.boots.lore =
"Boots that allow the wearer to move silently and swiftly.";
}
}
src/main/java/dev/zxq5/fantasysmp/items/gear/DragonGear.java
+85 -39
View File
@@ -1,40 +1,34 @@
package dev.zxq5.fantasysmp.items.gear;
import static org.bukkit.Bukkit.broadcastMessage;
import dev.zxq5.fantasysmp.items.GenericGearSet;
import dev.zxq5.fantasysmp.items.ItemStats;
import dev.zxq5.fantasysmp.util.LoreChecker;
import java.util.ArrayList;
import java.util.Objects;
import org.bukkit.*;
import org.bukkit.attribute.Attribute;
import org.bukkit.attribute.AttributeModifier;
import org.bukkit.command.CommandExecutor;
import org.bukkit.damage.DamageType;
import org.bukkit.enchantments.Enchantment;
import org.bukkit.entity.LivingEntity;
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.*;
import org.bukkit.inventory.meta.ItemMeta;
import org.bukkit.inventory.meta.components.EquippableComponent;
import org.bukkit.potion.PotionEffect;
import org.bukkit.potion.PotionEffectType;
import org.bukkit.util.Vector;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.UUID;
public class DragonGear extends GenericGearSet implements CommandExecutor {
import static org.bukkit.Bukkit.broadcastMessage;
import static org.bukkit.Bukkit.getServer;
public class DragonGear extends GenericGearSet implements Listener, CommandExecutor {
private ArrayList<Player> cooldown = new ArrayList<>();
@Override
public boolean onCommand(org.bukkit.command.CommandSender sender, org.bukkit.command.Command command, String label, String[] args) {
public boolean onCommand(
org.bukkit.command.CommandSender sender,
org.bukkit.command.Command command,
String label,
String[] args
) {
Player player = (Player) sender;
player.getInventory().addItem(this.getSword());
player.getInventory().addItem(this.getHelmet());
@@ -49,7 +43,9 @@ public class DragonGear extends GenericGearSet implements Listener, CommandExecu
public void registerRecipes() {}
@EventHandler
public void onEntityPotionEffectEvent(org.bukkit.event.entity.EntityPotionEffectEvent event) {
public void onEntityPotionEffectEvent(
org.bukkit.event.entity.EntityPotionEffectEvent event
) {
if (event.getEntity() instanceof Player player) {
if (event.getNewEffect() == null) return;
@@ -58,10 +54,23 @@ public class DragonGear extends GenericGearSet implements Listener, CommandExecu
}
try {
if (LoreChecker.itemLoreContains(player.getInventory().getHelmet(), this.helmet.lore)
&& LoreChecker.itemLoreContains(player.getInventory().getChestplate(), this.chestplate.lore)
&& LoreChecker.itemLoreContains(player.getInventory().getLeggings(), this.leggings.lore)
&& LoreChecker.itemLoreContains(player.getInventory().getBoots(), this.boots.lore)
if (
LoreChecker.itemLoreContains(
player.getInventory().getHelmet(),
this.helmet.lore
) &&
LoreChecker.itemLoreContains(
player.getInventory().getChestplate(),
this.chestplate.lore
) &&
LoreChecker.itemLoreContains(
player.getInventory().getLeggings(),
this.leggings.lore
) &&
LoreChecker.itemLoreContains(
player.getInventory().getBoots(),
this.boots.lore
)
) {
event.setCancelled(true);
}
@@ -72,27 +81,54 @@ public class DragonGear extends GenericGearSet implements Listener, CommandExecu
}
@EventHandler
public void onEntityDamage(org.bukkit.event.entity.EntityDamageEvent event) {
public void onEntityDamage(
org.bukkit.event.entity.EntityDamageEvent event
) {
// check if fall damage
if (!(event.getEntity() instanceof Player player)) return;
if (!(LoreChecker.itemLoreContains(player.getInventory().getHelmet(), this.helmet.lore)
&& LoreChecker.itemLoreContains(player.getInventory().getChestplate(), this.chestplate.lore)
&& LoreChecker.itemLoreContains(player.getInventory().getLeggings(), this.leggings.lore)
&& LoreChecker.itemLoreContains(player.getInventory().getBoots(), this.boots.lore)
)) return;
if (!(event.getDamageSource().getDamageType() == DamageType.FLY_INTO_WALL)) return;
if (
!(LoreChecker.itemLoreContains(
player.getInventory().getHelmet(),
this.helmet.lore
) &&
LoreChecker.itemLoreContains(
player.getInventory().getChestplate(),
this.chestplate.lore
) &&
LoreChecker.itemLoreContains(
player.getInventory().getLeggings(),
this.leggings.lore
) &&
LoreChecker.itemLoreContains(
player.getInventory().getBoots(),
this.boots.lore
))
) return;
if (
!(event.getDamageSource().getDamageType() ==
DamageType.FLY_INTO_WALL)
) return;
event.setCancelled(true);
}
@EventHandler
public void onEntityDamageByEntity(org.bukkit.event.entity.EntityDamageByEntityEvent event) {
public void onEntityDamageByEntity(
org.bukkit.event.entity.EntityDamageByEntityEvent event
) {
if (!(event.getDamager() instanceof Player player)) return;
if (!(LoreChecker.itemLoreContains(player.getInventory().getItemInMainHand(), this.sword.lore))) return;
if (
!(LoreChecker.itemLoreContains(
player.getInventory().getItemInMainHand(),
this.sword.lore
))
) return;
if (!(player.isFlying() || player.isGliding())) return;
double baseDamage = event.getDamage();
double newDamage = baseDamage * Math.min(Math.max(player.getVelocity().length(), 1.0), 2.0);
double newDamage =
baseDamage *
Math.min(Math.max(player.getVelocity().length(), 1.0), 2.0);
broadcastMessage("damage " + baseDamage);
broadcastMessage("velocity " + player.getVelocity().length());
@@ -106,7 +142,10 @@ public class DragonGear extends GenericGearSet implements Listener, CommandExecu
Player player = event.getPlayer();
ItemStack item = event.getItem(); // Get the item the player interacted with
if (!(event.getAction() == Action.RIGHT_CLICK_AIR || event.getAction() == Action.RIGHT_CLICK_BLOCK)) {
if (
!(event.getAction() == Action.RIGHT_CLICK_AIR ||
event.getAction() == Action.RIGHT_CLICK_BLOCK)
) {
return;
}
@@ -123,7 +162,9 @@ public class DragonGear extends GenericGearSet implements Listener, CommandExecu
cooldown.add(player);
Bukkit.getScheduler().scheduleSyncDelayedTask(
Objects.requireNonNull(Bukkit.getPluginManager().getPlugin("fantasysmp")),
Objects.requireNonNull(
Bukkit.getPluginManager().getPlugin("fantasysmp")
),
() -> cooldown.remove(player),
25
);
@@ -147,22 +188,27 @@ public class DragonGear extends GenericGearSet implements Listener, CommandExecu
public DragonGear() {
this.setTier5();
this.sword.name = ChatColor.DARK_PURPLE + "Dragon Sword" + ChatColor.RESET;
this.sword.name =
ChatColor.DARK_PURPLE + "Dragon Sword" + ChatColor.RESET;
this.sword.customItemModel = "dragon_sword";
this.helmet.name = ChatColor.DARK_PURPLE + "Dragon Helmet" + ChatColor.RESET;
this.helmet.name =
ChatColor.DARK_PURPLE + "Dragon Helmet" + ChatColor.RESET;
this.helmet.customItemModel = "dragon_helmet";
this.helmet.customEquipmentModel = "dragon";
this.chestplate.name = ChatColor.DARK_PURPLE + "Dragon Chestplate" + ChatColor.RESET;
this.chestplate.name =
ChatColor.DARK_PURPLE + "Dragon Chestplate" + ChatColor.RESET;
this.chestplate.customItemModel = "dragon_chestplate";
this.chestplate.customEquipmentModel = "dragon";
this.leggings.name = ChatColor.DARK_PURPLE + "Dragon Leggings" + ChatColor.RESET;
this.leggings.name =
ChatColor.DARK_PURPLE + "Dragon Leggings" + ChatColor.RESET;
this.leggings.customItemModel = "dragon_leggings";
this.leggings.customEquipmentModel = "dragon";
this.boots.name = ChatColor.DARK_PURPLE + "Dragon Boots" + ChatColor.RESET;
this.boots.name =
ChatColor.DARK_PURPLE + "Dragon Boots" + ChatColor.RESET;
this.boots.customItemModel = "dragon_boots";
this.boots.customEquipmentModel = "dragon";
src/main/java/dev/zxq5/fantasysmp/items/gear/EnderGear.java
+49 -17
View File
@@ -2,25 +2,29 @@ package dev.zxq5.fantasysmp.items.gear;
import dev.zxq5.fantasysmp.items.GenericGearSet;
import dev.zxq5.fantasysmp.util.LoreChecker;
import java.util.ArrayList;
import java.util.Objects;
import org.bukkit.*;
import org.bukkit.block.Block;
import org.bukkit.command.CommandExecutor;
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.*;
import org.bukkit.util.Vector;
import java.util.ArrayList;
import java.util.Objects;
public class EnderGear extends GenericGearSet implements CommandExecutor {
public class EnderGear extends GenericGearSet implements Listener, CommandExecutor {
private ArrayList<Player> cooldown = new ArrayList<>();
@Override
public boolean onCommand(org.bukkit.command.CommandSender sender, org.bukkit.command.Command command, String label, String[] args) {
public boolean onCommand(
org.bukkit.command.CommandSender sender,
org.bukkit.command.Command command,
String label,
String[] args
) {
Player player = (Player) sender;
player.getInventory().addItem(this.getSword());
player.getInventory().addItem(this.getHelmet());
@@ -39,7 +43,10 @@ public class EnderGear extends GenericGearSet implements Listener, CommandExecut
Player player = event.getPlayer();
ItemStack item = event.getItem(); // Get the item the player interacted with
if (!(event.getAction() == Action.RIGHT_CLICK_AIR || event.getAction() == Action.RIGHT_CLICK_BLOCK)) {
if (
!(event.getAction() == Action.RIGHT_CLICK_AIR ||
event.getAction() == Action.RIGHT_CLICK_BLOCK)
) {
return;
}
@@ -48,30 +55,50 @@ public class EnderGear extends GenericGearSet implements Listener, CommandExecut
Location old_location = player.getLocation();
World world = player.getWorld();
Vector direction = old_location.getDirection();
// find nearest block in that direction
Block block = player.getTargetBlock(null, 64);
if (block.getType() == Material.AIR || block.getType() == Material.CAVE_AIR) {
if (
block.getType() == Material.AIR ||
block.getType() == Material.CAVE_AIR
) {
return;
}
player.playSound(old_location, Sound.ENTITY_ENDERMAN_TELEPORT, 1.0f, 1.0f);
player.playSound(
old_location,
Sound.ENTITY_ENDERMAN_TELEPORT,
1.0f,
1.0f
);
world.spawnParticle(Particle.PORTAL, old_location, 100);
Location new_location = block.getLocation();
new_location.setPitch(old_location.getPitch());
new_location.setYaw(old_location.getYaw());
player.setVelocity(new Vector(player.getVelocity().getX(), 0, player.getVelocity().getZ()));
player.setVelocity(
new Vector(
player.getVelocity().getX(),
0,
player.getVelocity().getZ()
)
);
player.teleport(new_location);
player.playSound(new_location, Sound.ENTITY_ENDERMAN_TELEPORT, 1.0f, 1.0f);
player.playSound(
new_location,
Sound.ENTITY_ENDERMAN_TELEPORT,
1.0f,
1.0f
);
world.spawnParticle(Particle.PORTAL, new_location, 100);
cooldown.add(player);
Bukkit.getScheduler().scheduleSyncDelayedTask(
Objects.requireNonNull(Bukkit.getPluginManager().getPlugin("fantasysmp")),
Objects.requireNonNull(
Bukkit.getPluginManager().getPlugin("fantasysmp")
),
() -> cooldown.remove(player),
25
);
@@ -84,15 +111,18 @@ public class EnderGear extends GenericGearSet implements Listener, CommandExecut
this.sword.name = ChatColor.DARK_AQUA + "Ender Sword" + ChatColor.RESET;
this.sword.customItemModel = "ender_sword";
this.helmet.name = ChatColor.DARK_AQUA + "Ender Helmet" + ChatColor.RESET;
this.helmet.name =
ChatColor.DARK_AQUA + "Ender Helmet" + ChatColor.RESET;
this.helmet.customItemModel = "ender_helmet";
this.helmet.customEquipmentModel = "ender";
this.chestplate.name = ChatColor.DARK_AQUA + "Ender Chestplate" + ChatColor.RESET;
this.chestplate.name =
ChatColor.DARK_AQUA + "Ender Chestplate" + ChatColor.RESET;
this.chestplate.customItemModel = "ender_chestplate";
this.chestplate.customEquipmentModel = "ender";
this.leggings.name = ChatColor.DARK_AQUA + "Ender Leggings" + ChatColor.RESET;
this.leggings.name =
ChatColor.DARK_AQUA + "Ender Leggings" + ChatColor.RESET;
this.leggings.customItemModel = "ender_leggings";
this.leggings.customEquipmentModel = "ender";
@@ -102,8 +132,10 @@ public class EnderGear extends GenericGearSet implements Listener, CommandExecut
this.sword.lore = "A sword forged from the essence of ender pearls,";
this.helmet.lore = "A helmet forged from the essence of ender pearls,";
this.chestplate.lore = "A chestplate forged from the essence of ender pearls,";
this.leggings.lore = "Leggings forged from the essence of ender pearls,";
this.chestplate.lore =
"A chestplate forged from the essence of ender pearls,";
this.leggings.lore =
"Leggings forged from the essence of ender pearls,";
this.boots.lore = "Boots forged from the essence of ender pearls,";
}
}
src/main/java/dev/zxq5/fantasysmp/items/gear/LightningSword.java
+61 -24
View File
@@ -1,5 +1,7 @@
package dev.zxq5.fantasysmp.items.gear;
import static org.bukkit.Bukkit.getServer;
import dev.zxq5.fantasysmp.items.GenericGearSet;
import dev.zxq5.fantasysmp.util.LoreChecker;
import org.bukkit.Location;
@@ -9,17 +11,19 @@ import org.bukkit.World;
import org.bukkit.command.CommandExecutor;
import org.bukkit.entity.*;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.ShapedRecipe;
import org.bukkit.potion.PotionEffectType;
import static org.bukkit.Bukkit.getServer;
public class LightningSword extends GenericGearSet implements Listener, CommandExecutor {
public class LightningSword extends GenericGearSet implements CommandExecutor {
@Override
public boolean onCommand(org.bukkit.command.CommandSender sender, org.bukkit.command.Command command, String label, String[] args) {
public boolean onCommand(
org.bukkit.command.CommandSender sender,
org.bukkit.command.Command command,
String label,
String[] args
) {
Player player = (Player) sender;
player.getInventory().addItem(this.getSword());
return true;
@@ -28,7 +32,10 @@ public class LightningSword extends GenericGearSet implements Listener, CommandE
@Override
public void registerRecipes() {
ItemStack sword = this.getSword();
NamespacedKey swordKey = new NamespacedKey("fantasysmp.items", "lightning_sword");
NamespacedKey swordKey = new NamespacedKey(
"fantasysmp.items",
"lightning_sword"
);
ShapedRecipe swordRecipe = new ShapedRecipe(swordKey, sword);
swordRecipe.shape(" N ", " N ", " R ");
swordRecipe.setIngredient('N', Material.NETHER_STAR);
@@ -37,23 +44,29 @@ public class LightningSword extends GenericGearSet implements Listener, CommandE
}
@EventHandler
public void onEntityDamageByEntity(org.bukkit.event.entity.EntityDamageByEntityEvent event) {
public void onEntityDamageByEntity(
org.bukkit.event.entity.EntityDamageByEntityEvent event
) {
// checks that it is a player that is performing the attack.
if (!(event.getDamager() instanceof org.bukkit.entity.Player player)) {
return;
}
if (!( LoreChecker.itemLoreContains(player.getInventory().getItemInMainHand(), this.sword.lore) )) return;
if (
player.isOnGround()
|| player.getVelocity().getY() >= 0
|| player.isClimbing()
|| player.isInWater()
|| player.isInsideVehicle()
|| player.hasPotionEffect(PotionEffectType.BLINDNESS)
!(LoreChecker.itemLoreContains(
player.getInventory().getItemInMainHand(),
this.sword.lore
))
) return;
if (
player.isOnGround() ||
player.getVelocity().getY() >= 0 ||
player.isClimbing() ||
player.isInWater() ||
player.isInsideVehicle() ||
player.hasPotionEffect(PotionEffectType.BLINDNESS)
) return;
Location location = event.getEntity().getLocation();
World world = location.getWorld();
@@ -64,17 +77,25 @@ public class LightningSword extends GenericGearSet implements Listener, CommandE
}
@EventHandler
public void onEntityDamage(org.bukkit.event.entity.EntityDamageEvent event) {
public void onEntityDamage(
org.bukkit.event.entity.EntityDamageEvent event
) {
if (event.getEntity() instanceof Player player) {
if (!(event
if (
!(event
.getDamageSource()
.getDamageType()
.getKey()
.toString()
.equals("minecraft:lightning_bolt")
)) return;
.equals("minecraft:lightning_bolt"))
) return;
if (LoreChecker.itemLoreContains(player.getInventory().getItemInMainHand(), this.sword.lore)) {
if (
LoreChecker.itemLoreContains(
player.getInventory().getItemInMainHand(),
this.sword.lore
)
) {
event.setCancelled(true);
return;
}
@@ -83,13 +104,29 @@ public class LightningSword extends GenericGearSet implements Listener, CommandE
@EventHandler
public void onEntityDeath(org.bukkit.event.entity.EntityDeathEvent event) {
if (event.getEntity() instanceof Mob mob) {
if (event.getEntity() instanceof Mob) {
if (
event.getDamageSource().getDamageType().getKey().toString().equals("minecraft:lightning_bolt")
|| event.getDamageSource().getDamageType().getKey().toString().equals("minecraft:on_fire")
event
.getDamageSource()
.getDamageType()
.getKey()
.toString()
.equals("minecraft:lightning_bolt") ||
event
.getDamageSource()
.getDamageType()
.getKey()
.toString()
.equals("minecraft:on_fire")
) {
Entity e = event.getEntity();
((ExperienceOrb) e.getLocation().getWorld().spawn(e.getLocation(), ExperienceOrb.class)).setExperience(10);
((ExperienceOrb) e
.getLocation()
.getWorld()
.spawn(
e.getLocation(),
ExperienceOrb.class
)).setExperience(10);
}
}
}
src/main/java/dev/zxq5/fantasysmp/items/gear/PoseidonGear.java
+31 -16
View File
@@ -1,23 +1,25 @@
package dev.zxq5.fantasysmp.items.gear;
import static org.bukkit.Bukkit.getPluginManager;
import dev.zxq5.fantasysmp.items.GenericGearSet;
import dev.zxq5.fantasysmp.items.ItemStats;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Material;
import org.bukkit.command.CommandExecutor;
import org.bukkit.enchantments.Enchantment;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;
import static org.bukkit.Bukkit.getPluginManager;
public class PoseidonGear extends GenericGearSet implements CommandExecutor {
public class PoseidonGear extends GenericGearSet implements CommandExecutor, Listener {
@Override
public boolean onCommand(org.bukkit.command.CommandSender sender, org.bukkit.command.Command command, String label, String[] args) {
public boolean onCommand(
org.bukkit.command.CommandSender sender,
org.bukkit.command.Command command,
String label,
String[] args
) {
Player player = (Player) sender;
player.getInventory().addItem(this.getTrident());
@@ -48,7 +50,12 @@ public class PoseidonGear extends GenericGearSet implements CommandExecutor, Lis
@Override
public void registerRecipes() {
Bukkit.getScheduler().scheduleSyncRepeatingTask(getPluginManager().getPlugin("fantasysmp"), this::checkPlayerAir, 0, 20);
Bukkit.getScheduler().scheduleSyncRepeatingTask(
getPluginManager().getPlugin("fantasysmp"),
this::checkPlayerAir,
0,
20
);
}
public void checkPlayerAir() {
@@ -68,26 +75,34 @@ public class PoseidonGear extends GenericGearSet implements CommandExecutor, Lis
this.sword.attackDamage = 10;
this.sword.attackSpeed = 1.2f;
this.sword.name = ChatColor.AQUA + "Poseidon's Fury" + ChatColor.RESET;
this.sword.lore = "A powerful trident imbued with the power of the ocean.";
this.sword.lore =
"A powerful trident imbued with the power of the ocean.";
this.sword.customItemModel = "poseidons_trident";
this.helmet.name = ChatColor.AQUA + "Poseidon's Crown" + ChatColor.RESET;
this.helmet.lore = "A helmet granted to those who harness the power of the ocean.";
this.helmet.name =
ChatColor.AQUA + "Poseidon's Crown" + ChatColor.RESET;
this.helmet.lore =
"A helmet granted to those who harness the power of the ocean.";
this.helmet.customItemModel = "poseidons_helmet";
this.helmet.customEquipmentModel = "poseidon";
this.chestplate.name = ChatColor.AQUA + "Poseidon's Chestplate" + ChatColor.RESET;
this.chestplate.lore = "A chestplate granted to those who harness the power of the ocean.";
this.chestplate.name =
ChatColor.AQUA + "Poseidon's Chestplate" + ChatColor.RESET;
this.chestplate.lore =
"A chestplate granted to those who harness the power of the ocean.";
this.chestplate.customItemModel = "poseidons_chestplate";
this.chestplate.customEquipmentModel = "poseidon";
this.leggings.name = ChatColor.AQUA + "Poseidon's Leggings" + ChatColor.RESET;
this.leggings.lore = "Leggings granted to those who harness the power of the ocean.";
this.leggings.name =
ChatColor.AQUA + "Poseidon's Leggings" + ChatColor.RESET;
this.leggings.lore =
"Leggings granted to those who harness the power of the ocean.";
this.leggings.customItemModel = "poseidons_leggings";
this.leggings.customEquipmentModel = "poseidon";
this.boots.name = ChatColor.AQUA + "Poseidon's Boots" + ChatColor.RESET;
this.boots.lore = "Boots granted to those who harness the power of the ocean.";
this.boots.lore =
"Boots granted to those who harness the power of the ocean.";
this.boots.customItemModel = "poseidons_boots";
this.boots.customEquipmentModel = "poseidon";
}
src/main/java/dev/zxq5/fantasysmp/items/gear/StevensWrath.java
+48 -20
View File
@@ -6,21 +6,29 @@ import org.bukkit.*;
import org.bukkit.command.CommandExecutor;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
public class StevensWrath extends GenericGearSet implements Listener, CommandExecutor {
public class StevensWrath extends GenericGearSet implements CommandExecutor {
@Override
public boolean onCommand(org.bukkit.command.CommandSender sender, org.bukkit.command.Command command, String label, String[] args) {
public boolean onCommand(
org.bukkit.command.CommandSender sender,
org.bukkit.command.Command command,
String label,
String[] args
) {
Player player = (Player) sender;
player.getInventory().addItem(this.getSword());
return true;
}
@EventHandler
public void onCraft(org.bukkit.event.inventory.PrepareItemCraftEvent event) {
public void onCraft(
org.bukkit.event.inventory.PrepareItemCraftEvent event
) {
if (!event.getInventory().contains(Material.NETHERITE_BLOCK)) return;
if (!event.getInventory().contains(new LightningSword().getSword())) return;
if (
!event.getInventory().contains(new LightningSword().getSword())
) return;
event.getInventory().setResult(new StevensWrath().getSword());
}
@@ -28,17 +36,24 @@ public class StevensWrath extends GenericGearSet implements Listener, CommandExe
public void registerRecipes() {}
@EventHandler
public void onEntityDamageByEntity(org.bukkit.event.entity.EntityDamageByEntityEvent event) {
public void onEntityDamageByEntity(
org.bukkit.event.entity.EntityDamageByEntityEvent event
) {
// checks that it is a player that is performing the attack.
if (!(event.getDamager() instanceof org.bukkit.entity.Player player)) {
return;
}
if (!(
LoreChecker.itemLoreContains(player.getInventory().getItemInMainHand(), this.sword.lore)
|| LoreChecker.itemLoreContains(player.getInventory().getItemInOffHand(), this.sword.lore)
)) return;
if (
!(LoreChecker.itemLoreContains(
player.getInventory().getItemInMainHand(),
this.sword.lore
) ||
LoreChecker.itemLoreContains(
player.getInventory().getItemInOffHand(),
this.sword.lore
))
) return;
Location location = event.getEntity().getLocation();
World world = location.getWorld();
@@ -49,19 +64,29 @@ public class StevensWrath extends GenericGearSet implements Listener, CommandExe
}
@EventHandler
public void onEntityDamage(org.bukkit.event.entity.EntityDamageEvent event) {
public void onEntityDamage(
org.bukkit.event.entity.EntityDamageEvent event
) {
if (event.getEntity() instanceof Player player) {
if (!(event
if (
!(event
.getDamageSource()
.getDamageType()
.getKey()
.toString()
.equals("minecraft:lightning_bolt")
)) return;
.equals("minecraft:lightning_bolt"))
) return;
if (LoreChecker.itemLoreContains(player.getInventory().getItemInMainHand(), this.sword.lore) ||
LoreChecker.itemLoreContains(player.getInventory().getItemInOffHand(), this.sword.lore)) {
if (
LoreChecker.itemLoreContains(
player.getInventory().getItemInMainHand(),
this.sword.lore
) ||
LoreChecker.itemLoreContains(
player.getInventory().getItemInOffHand(),
this.sword.lore
)
) {
event.setCancelled(true);
}
}
@@ -71,8 +96,11 @@ public class StevensWrath extends GenericGearSet implements Listener, CommandExe
public StevensWrath() {
this.setTier6();
this.sword.name = ChatColor.LIGHT_PURPLE + "Stevens Wrath" + ChatColor.RESET;
this.sword.name =
ChatColor.LIGHT_PURPLE + "Stevens Wrath" + ChatColor.RESET;
this.sword.customItemModel = "stevens_wrath";
this.sword.lore = ChatColor.LIGHT_PURPLE + "All who oppose the mighty Steven shall face his wrath of lightning.";
this.sword.lore =
ChatColor.LIGHT_PURPLE +
"All who oppose the mighty Steven shall face his wrath of lightning.";
}
}
src/main/java/dev/zxq5/fantasysmp/items/gear/TrueNetheriteGear.java
+26 -11
View File
@@ -4,11 +4,18 @@ import dev.zxq5.fantasysmp.items.GenericGearSet;
import org.bukkit.ChatColor;
import org.bukkit.command.CommandExecutor;
import org.bukkit.entity.Player;
import org.bukkit.event.Listener;
public class TrueNetheriteGear extends GenericGearSet implements CommandExecutor, Listener {
public class TrueNetheriteGear
extends GenericGearSet
implements CommandExecutor {
@Override
public boolean onCommand(org.bukkit.command.CommandSender sender, org.bukkit.command.Command command, String label, String[] args) {
public boolean onCommand(
org.bukkit.command.CommandSender sender,
org.bukkit.command.Command command,
String label,
String[] args
) {
Player player = (Player) sender;
player.getInventory().addItem(this.getSword());
@@ -24,27 +31,35 @@ public class TrueNetheriteGear extends GenericGearSet implements CommandExecutor
public TrueNetheriteGear() {
this.setTier6();
this.sword.name = ChatColor.WHITE + "True Netherite Sword" + ChatColor.RESET;
this.sword.name =
ChatColor.WHITE + "True Netherite Sword" + ChatColor.RESET;
this.sword.lore = "A sword forged with the skulls of wither skeletons.";
this.sword.customItemModel = "true_netherite_sword";
this.sword.lore = "Destruction awaits.";
this.helmet.name = ChatColor.WHITE + "True Netherite Helmet" + ChatColor.RESET;
this.helmet.lore = "A helmet forged with the skulls of wither skeletons.";
this.helmet.name =
ChatColor.WHITE + "True Netherite Helmet" + ChatColor.RESET;
this.helmet.lore =
"A helmet forged with the skulls of wither skeletons.";
this.helmet.customItemModel = "true_netherite_helmet";
this.helmet.customEquipmentModel = "true_netherite";
this.chestplate.name = ChatColor.WHITE + "True Netherite Chestplate" + ChatColor.RESET;
this.chestplate.lore = "A chestplate forged with the skulls of wither skeletons.";
this.chestplate.name =
ChatColor.WHITE + "True Netherite Chestplate" + ChatColor.RESET;
this.chestplate.lore =
"A chestplate forged with the skulls of wither skeletons.";
this.chestplate.customItemModel = "true_netherite_chestplate";
this.chestplate.customEquipmentModel = "true_netherite";
this.leggings.name = ChatColor.WHITE + "True Netherite Leggings" + ChatColor.RESET;
this.leggings.lore = "Leggings forged with the skulls of wither skeletons.";
this.leggings.name =
ChatColor.WHITE + "True Netherite Leggings" + ChatColor.RESET;
this.leggings.lore =
"Leggings forged with the skulls of wither skeletons.";
this.leggings.customItemModel = "true_netherite_leggings";
this.leggings.customEquipmentModel = "true_netherite";
this.boots.name = ChatColor.WHITE + "True Netherite Boots" + ChatColor.RESET;
this.boots.name =
ChatColor.WHITE + "True Netherite Boots" + ChatColor.RESET;
this.boots.lore = "Boots forged with the skulls of wither skeletons.";
this.boots.customItemModel = "true_netherite_boots";
this.boots.customEquipmentModel = "true_netherite";
src/main/java/dev/zxq5/fantasysmp/items/gear/WitheriteGear.java
+133 -41
View File
@@ -1,14 +1,17 @@
package dev.zxq5.fantasysmp.items.gear;
import static org.bukkit.Bukkit.getServer;
import dev.zxq5.fantasysmp.items.GenericGearSet;
import dev.zxq5.fantasysmp.util.LoreChecker;
import java.util.ArrayList;
import java.util.Objects;
import org.bukkit.*;
import org.bukkit.command.CommandExecutor;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
import org.bukkit.entity.WitherSkull;
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;
@@ -16,17 +19,17 @@ import org.bukkit.inventory.RecipeChoice;
import org.bukkit.inventory.SmithingTransformRecipe;
import org.bukkit.potion.PotionEffect;
import java.util.ArrayList;
import java.util.Objects;
public class WitheriteGear extends GenericGearSet implements CommandExecutor {
import static org.bukkit.Bukkit.broadcastMessage;
import static org.bukkit.Bukkit.getServer;
public class WitheriteGear extends GenericGearSet implements Listener, CommandExecutor {
private ArrayList<Player> cooldown = new ArrayList<>();
@Override
public boolean onCommand(org.bukkit.command.CommandSender sender, org.bukkit.command.Command command, String label, String[] args) {
public boolean onCommand(
org.bukkit.command.CommandSender sender,
org.bukkit.command.Command command,
String label,
String[] args
) {
Player player = (Player) sender;
player.getInventory().addItem(this.getSword());
player.getInventory().addItem(this.getHelmet());
@@ -40,45 +43,106 @@ public class WitheriteGear extends GenericGearSet implements Listener, CommandEx
@Override
public void registerRecipes() {
ItemStack sword = this.getSword();
NamespacedKey swordKey = new NamespacedKey("fantasysmp.items", "witherite_sword");
RecipeChoice swordChoice = new RecipeChoice.MaterialChoice(Material.NETHERITE_SWORD);
SmithingTransformRecipe swordRecipe = new SmithingTransformRecipe(swordKey, sword, NETHERITE_UPGRADE, swordChoice, WITHER_SKULL);
NamespacedKey swordKey = new NamespacedKey(
"fantasysmp.items",
"witherite_sword"
);
RecipeChoice swordChoice = new RecipeChoice.MaterialChoice(
Material.NETHERITE_SWORD
);
SmithingTransformRecipe swordRecipe = new SmithingTransformRecipe(
swordKey,
sword,
NETHERITE_UPGRADE,
swordChoice,
WITHER_SKULL
);
getServer().addRecipe(swordRecipe);
ItemStack helmet = this.getHelmet();
NamespacedKey helmetKey = new NamespacedKey("fantasysmp.items", "witherite_helmet");
RecipeChoice helmetChoice = new RecipeChoice.MaterialChoice(Material.NETHERITE_HELMET);
SmithingTransformRecipe helmetRecipe = new SmithingTransformRecipe(helmetKey, helmet, NETHERITE_UPGRADE, helmetChoice, WITHER_SKULL);
NamespacedKey helmetKey = new NamespacedKey(
"fantasysmp.items",
"witherite_helmet"
);
RecipeChoice helmetChoice = new RecipeChoice.MaterialChoice(
Material.NETHERITE_HELMET
);
SmithingTransformRecipe helmetRecipe = new SmithingTransformRecipe(
helmetKey,
helmet,
NETHERITE_UPGRADE,
helmetChoice,
WITHER_SKULL
);
getServer().addRecipe(helmetRecipe);
ItemStack chestplate = this.getChestplate();
NamespacedKey chestplateKey = new NamespacedKey("fantasysmp.items", "witherite_chestplate");
RecipeChoice chestplateChoice = new RecipeChoice.MaterialChoice(Material.NETHERITE_CHESTPLATE);
SmithingTransformRecipe chestplateRecipe = new SmithingTransformRecipe(chestplateKey, chestplate, NETHERITE_UPGRADE, chestplateChoice, WITHER_SKULL);
NamespacedKey chestplateKey = new NamespacedKey(
"fantasysmp.items",
"witherite_chestplate"
);
RecipeChoice chestplateChoice = new RecipeChoice.MaterialChoice(
Material.NETHERITE_CHESTPLATE
);
SmithingTransformRecipe chestplateRecipe = new SmithingTransformRecipe(
chestplateKey,
chestplate,
NETHERITE_UPGRADE,
chestplateChoice,
WITHER_SKULL
);
getServer().addRecipe(chestplateRecipe);
ItemStack leggings = this.getLeggings();
NamespacedKey leggingsKey = new NamespacedKey("fantasysmp.items", "witherite_leggings");
RecipeChoice leggingsChoice = new RecipeChoice.MaterialChoice(Material.NETHERITE_LEGGINGS);
SmithingTransformRecipe leggingsRecipe = new SmithingTransformRecipe(leggingsKey, leggings, NETHERITE_UPGRADE, leggingsChoice, WITHER_SKULL);
NamespacedKey leggingsKey = new NamespacedKey(
"fantasysmp.items",
"witherite_leggings"
);
RecipeChoice leggingsChoice = new RecipeChoice.MaterialChoice(
Material.NETHERITE_LEGGINGS
);
SmithingTransformRecipe leggingsRecipe = new SmithingTransformRecipe(
leggingsKey,
leggings,
NETHERITE_UPGRADE,
leggingsChoice,
WITHER_SKULL
);
getServer().addRecipe(leggingsRecipe);
ItemStack boots = this.getBoots();
NamespacedKey bootsKey = new NamespacedKey("fantasysmp.items", "witherite_boots");
RecipeChoice bootsChoice = new RecipeChoice.MaterialChoice(Material.NETHERITE_BOOTS);
SmithingTransformRecipe bootsRecipe = new SmithingTransformRecipe(bootsKey, boots, NETHERITE_UPGRADE, bootsChoice, WITHER_SKULL);
NamespacedKey bootsKey = new NamespacedKey(
"fantasysmp.items",
"witherite_boots"
);
RecipeChoice bootsChoice = new RecipeChoice.MaterialChoice(
Material.NETHERITE_BOOTS
);
SmithingTransformRecipe bootsRecipe = new SmithingTransformRecipe(
bootsKey,
boots,
NETHERITE_UPGRADE,
bootsChoice,
WITHER_SKULL
);
getServer().addRecipe(bootsRecipe);
}
@EventHandler
public void onEntityDamageByEntity(org.bukkit.event.entity.EntityDamageByEntityEvent event) {
public void onEntityDamageByEntity(
org.bukkit.event.entity.EntityDamageByEntityEvent event
) {
// checks that it is a player that is performing the attack.
if (!(event.getDamager() instanceof org.bukkit.entity.Player player)) {
return;
}
if (!LoreChecker.itemLoreContains(player.getInventory().getItemInMainHand(), this.sword.lore)) {
if (
!LoreChecker.itemLoreContains(
player.getInventory().getItemInMainHand(),
this.sword.lore
)
) {
return;
}
@@ -88,7 +152,6 @@ public class WitheriteGear extends GenericGearSet implements Listener, CommandEx
1
);
effect.apply((LivingEntity) event.getEntity());
}
@EventHandler
@@ -96,7 +159,10 @@ public class WitheriteGear extends GenericGearSet implements Listener, CommandEx
Player player = event.getPlayer();
ItemStack item = event.getItem(); // Get the item the player interacted with
if (!(event.getAction() == Action.RIGHT_CLICK_AIR || event.getAction() == Action.RIGHT_CLICK_BLOCK)) {
if (
!(event.getAction() == Action.RIGHT_CLICK_AIR ||
event.getAction() == Action.RIGHT_CLICK_BLOCK)
) {
return;
}
@@ -111,26 +177,46 @@ public class WitheriteGear extends GenericGearSet implements Listener, CommandEx
cooldown.add(player);
Bukkit.getScheduler().scheduleSyncDelayedTask(
Objects.requireNonNull(Bukkit.getPluginManager().getPlugin("fantasysmp")),
Objects.requireNonNull(
Bukkit.getPluginManager().getPlugin("fantasysmp")
),
() -> cooldown.remove(player),
25
);
}
@EventHandler
public void onEntityPotionEffectEvent(org.bukkit.event.entity.EntityPotionEffectEvent event) {
public void onEntityPotionEffectEvent(
org.bukkit.event.entity.EntityPotionEffectEvent event
) {
if (event.getEntity() instanceof Player player) {
if (event.getNewEffect() == null) return;
if (event.getNewEffect().getType() != org.bukkit.potion.PotionEffectType.WITHER) {
if (
event.getNewEffect().getType() !=
org.bukkit.potion.PotionEffectType.WITHER
) {
return;
}
try {
if (LoreChecker.itemLoreContains(player.getInventory().getHelmet(), this.helmet.lore)
&& LoreChecker.itemLoreContains(player.getInventory().getChestplate(), this.chestplate.lore)
&& LoreChecker.itemLoreContains(player.getInventory().getLeggings(), this.leggings.lore)
&& LoreChecker.itemLoreContains(player.getInventory().getBoots(), this.boots.lore)
if (
LoreChecker.itemLoreContains(
player.getInventory().getHelmet(),
this.helmet.lore
) &&
LoreChecker.itemLoreContains(
player.getInventory().getChestplate(),
this.chestplate.lore
) &&
LoreChecker.itemLoreContains(
player.getInventory().getLeggings(),
this.leggings.lore
) &&
LoreChecker.itemLoreContains(
player.getInventory().getBoots(),
this.boots.lore
)
) {
event.setCancelled(true);
}
@@ -148,18 +234,24 @@ public class WitheriteGear extends GenericGearSet implements Listener, CommandEx
this.sword.lore = "A sword forged with the skulls of wither skeletons.";
this.sword.customItemModel = "witherite_sword";
this.helmet.name = ChatColor.BLACK + "Witherite Helmet" + ChatColor.RESET;
this.helmet.lore = "A helmet forged with the skulls of wither skeletons.";
this.helmet.name =
ChatColor.BLACK + "Witherite Helmet" + ChatColor.RESET;
this.helmet.lore =
"A helmet forged with the skulls of wither skeletons.";
this.helmet.customItemModel = "witherite_helmet";
this.helmet.customEquipmentModel = "witherite";
this.chestplate.name = ChatColor.BLACK + "Witherite Chestplate" + ChatColor.RESET;
this.chestplate.lore = "A chestplate forged with the skulls of wither skeletons.";
this.chestplate.name =
ChatColor.BLACK + "Witherite Chestplate" + ChatColor.RESET;
this.chestplate.lore =
"A chestplate forged with the skulls of wither skeletons.";
this.chestplate.customItemModel = "witherite_chestplate";
this.chestplate.customEquipmentModel = "witherite";
this.leggings.name = ChatColor.BLACK + "Witherite Leggings" + ChatColor.RESET;
this.leggings.lore = "Leggings forged with the skulls of wither skeletons.";
this.leggings.name =
ChatColor.BLACK + "Witherite Leggings" + ChatColor.RESET;
this.leggings.lore =
"Leggings forged with the skulls of wither skeletons.";
this.leggings.customItemModel = "witherite_leggings";
this.leggings.customEquipmentModel = "witherite";
src/main/java/dev/zxq5/fantasysmp/warps/Warp.java
+38 -35
View File
@@ -1,19 +1,15 @@
package dev.zxq5.fantasysmp.warps;
import com.google.gson.Gson;
import dev.zxq5.fantasysmp.groups.Team;
import org.bukkit.ChatColor;
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.command.CommandExecutor;
import org.bukkit.entity.Player;
import java.io.*;
import java.util.UUID;
import static org.bukkit.Bukkit.broadcastMessage;
import static org.bukkit.Bukkit.getServer;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import dev.zxq5.fantasysmp.groups.Team;
import java.io.*;
import java.util.UUID;
import org.bukkit.ChatColor;
import org.bukkit.Location;
import org.bukkit.entity.Player;
public class Warp {
@@ -30,7 +26,12 @@ public class Warp {
private int z;
public boolean execute(Player player) {
Location location = new Location(getServer().getWorld(world), this.x, this.y, this.z);
Location location = new Location(
getServer().getWorld(world),
this.x,
this.y,
this.z
);
location.setPitch(player.getLocation().getPitch());
location.setYaw(player.getLocation().getYaw());
player.teleport(location);
@@ -38,7 +39,10 @@ public class Warp {
}
public static void loadWarps() throws Exception {
File dataFolder = getServer().getPluginManager().getPlugin("Fantasysmp").getDataFolder();
File dataFolder = getServer()
.getPluginManager()
.getPlugin("Fantasysmp")
.getDataFolder();
File file = new File(dataFolder, FILENAME);
if (!file.exists()) {
@@ -48,17 +52,20 @@ public class Warp {
BufferedReader reader;
reader = new BufferedReader(new FileReader(file));
Gson gson = new Gson();
Gson gson = new GsonBuilder().setPrettyPrinting().create();
warps = gson.fromJson(reader, Warp[].class);
reader.close();
}
public static void saveWarps() throws Exception {
File dataFolder = getServer().getPluginManager().getPlugin("Fantasysmp").getDataFolder();
File dataFolder = getServer()
.getPluginManager()
.getPlugin("Fantasysmp")
.getDataFolder();
File file = new File(dataFolder, FILENAME);
Gson gson = new Gson();
Gson gson = new GsonBuilder().setPrettyPrinting().create();
String json = gson.toJson(warps);
Writer writer = new FileWriter(file);
writer.write(json);
@@ -66,13 +73,16 @@ public class Warp {
}
public static void createWarpFile() {
File dataFolder = getServer().getPluginManager().getPlugin("Fantasysmp").getDataFolder();
File dataFolder = getServer()
.getPluginManager()
.getPlugin("Fantasysmp")
.getDataFolder();
File file = new File(dataFolder, FILENAME);
if (!file.exists()) {
try {
Warp[] w = new Warp[0];
Gson gson = new Gson();
Gson gson = new GsonBuilder().setPrettyPrinting().create();
String json = gson.toJson(w);
Writer writer = new FileWriter(file);
writer.write(json);
@@ -108,10 +118,13 @@ public class Warp {
return null;
}
public static Warp getTeamWarp(Team team, String name) {
public static Warp getTeamWarp(Team team, Player player, String name) {
for (Warp warp : warps) {
if (warp.type.equals(WarpType.TEAM)) {
if (warp.name.equals(name) && warp.setby.equals(team.getUUID())) {
if (
warp.name.equals(name) &&
warp.setby.equals(player.getUniqueId().toString())
) {
return warp;
}
}
@@ -123,7 +136,10 @@ public class Warp {
String message = ChatColor.WHITE + "All Warps: [\n" + ChatColor.GREEN;
for (Warp warp : warps) {
if (warp.type.equals(WarpType.PUBLIC) || warp.setby.equals(player.toString())) {
if (
warp.type.equals(WarpType.PUBLIC) ||
warp.setby.equals(player.toString())
) {
message += " " + warp.name + "\n";
}
}
@@ -175,16 +191,3 @@ public class Warp {
}
}
}