Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: LewMC/Essence
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1.3.1
Choose a base ref
...
head repository: LewMC/Essence
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref
Loading
Showing with 10,115 additions and 1,489 deletions.
  1. +0 −40 .circleci/config.yml
  2. +0 −28 .github/ISSUE_TEMPLATE/bug_report.md
  3. +32 −0 .github/ISSUE_TEMPLATE/bug_report.yml
  4. +1 −0 .github/ISSUE_TEMPLATE/config.yml
  5. +0 −20 .github/ISSUE_TEMPLATE/feature_request.md
  6. +20 −0 .github/ISSUE_TEMPLATE/feature_request.yml
  7. +12 −0 .github/dependabot.yml
  8. +39 −0 .github/workflows/dependency-review.yml
  9. +44 −0 .github/workflows/documentation.yml
  10. +40 −0 .github/workflows/maven.yml
  11. +36 −3 README.md
  12. +1 −4 SECURITY.md
  13. +3 −0 crowdin.yml
  14. +40 −5 dependency-reduced-pom.xml
  15. +1 −1 essence.iml
  16. +53 −7 pom.xml
  17. +267 −78 src/main/java/net/lewmc/essence/Essence.java
  18. +91 −7 src/main/java/net/lewmc/essence/commands/EssenceCommands.java
  19. +15 −6 src/main/java/net/lewmc/essence/commands/GamemodeCommands.java
  20. +165 −76 src/main/java/net/lewmc/essence/commands/HelpCommand.java
  21. +104 −0 src/main/java/net/lewmc/essence/commands/KitCommand.java
  22. +71 −0 src/main/java/net/lewmc/essence/commands/RulesCommands.java
  23. +82 −66 src/main/java/net/lewmc/essence/commands/TeamCommands.java
  24. +84 −0 src/main/java/net/lewmc/essence/commands/admin/InfoCommand.java
  25. +79 −0 src/main/java/net/lewmc/essence/commands/admin/SeenCommand.java
  26. +10 −3 src/main/java/net/lewmc/essence/commands/chat/BroadcastCommand.java
  27. +82 −0 src/main/java/net/lewmc/essence/commands/chat/MsgCommand.java
  28. +80 −0 src/main/java/net/lewmc/essence/commands/chat/ReplyCommand.java
  29. +10 −6 src/main/java/net/lewmc/essence/commands/economy/BalanceCommand.java
  30. +21 −19 src/main/java/net/lewmc/essence/commands/economy/PayCommand.java
  31. +9 −0 src/main/java/net/lewmc/essence/commands/inventories/AnvilCommand.java
  32. +9 −0 src/main/java/net/lewmc/essence/commands/inventories/CartographyCommand.java
  33. +10 −1 src/main/java/net/lewmc/essence/commands/inventories/CraftCommand.java
  34. +10 −1 src/main/java/net/lewmc/essence/commands/inventories/EnderchestCommand.java
  35. +9 −0 src/main/java/net/lewmc/essence/commands/inventories/GrindstoneCommand.java
  36. +9 −0 src/main/java/net/lewmc/essence/commands/inventories/LoomCommand.java
  37. +9 −0 src/main/java/net/lewmc/essence/commands/inventories/SmithingCommand.java
  38. +9 −0 src/main/java/net/lewmc/essence/commands/inventories/StonecutterCommand.java
  39. +10 −1 src/main/java/net/lewmc/essence/commands/inventories/TrashCommand.java
  40. +56 −27 src/main/java/net/lewmc/essence/commands/stats/FeedCommand.java
  41. +56 −27 src/main/java/net/lewmc/essence/commands/stats/HealCommand.java
  42. +79 −0 src/main/java/net/lewmc/essence/commands/stats/RepairCommand.java
  43. +24 −19 src/main/java/net/lewmc/essence/commands/teleportation/BackCommand.java
  44. +80 −0 src/main/java/net/lewmc/essence/commands/teleportation/SetspawnCommand.java
  45. +146 −0 src/main/java/net/lewmc/essence/commands/teleportation/SpawnCommand.java
  46. +0 −132 src/main/java/net/lewmc/essence/commands/teleportation/TeleportCommand.java
  47. +0 −109 src/main/java/net/lewmc/essence/commands/teleportation/TprandomCommand.java
  48. +16 −13 src/main/java/net/lewmc/essence/commands/teleportation/{ → home}/DelhomeCommand.java
  49. +64 −52 src/main/java/net/lewmc/essence/commands/teleportation/{ → home}/HomeCommand.java
  50. +13 −26 src/main/java/net/lewmc/essence/commands/teleportation/{ → home}/HomesCommand.java
  51. +19 −26 src/main/java/net/lewmc/essence/commands/teleportation/{ → home}/SethomeCommand.java
  52. +100 −0 src/main/java/net/lewmc/essence/commands/teleportation/home/team/DelthomeCommand.java
  53. +122 −0 src/main/java/net/lewmc/essence/commands/teleportation/home/team/SetthomeCommand.java
  54. +162 −0 src/main/java/net/lewmc/essence/commands/teleportation/home/team/ThomeCommand.java
  55. +83 −0 src/main/java/net/lewmc/essence/commands/teleportation/home/team/ThomesCommand.java
  56. +296 −0 src/main/java/net/lewmc/essence/commands/teleportation/tp/TeleportCommand.java
  57. +94 −0 src/main/java/net/lewmc/essence/commands/teleportation/tp/TpaCommand.java
  58. +66 −0 src/main/java/net/lewmc/essence/commands/teleportation/tp/TpacceptCommand.java
  59. +94 −0 src/main/java/net/lewmc/essence/commands/teleportation/tp/TpahereCommand.java
  60. +68 −0 src/main/java/net/lewmc/essence/commands/teleportation/tp/TpcancelCommand.java
  61. +65 −0 src/main/java/net/lewmc/essence/commands/teleportation/tp/TpdenyCommand.java
  62. +141 −0 src/main/java/net/lewmc/essence/commands/teleportation/tp/TprandomCommand.java
  63. +79 −0 src/main/java/net/lewmc/essence/commands/teleportation/tp/TptoggleCommand.java
  64. +16 −16 src/main/java/net/lewmc/essence/commands/teleportation/{ → warp}/DelwarpCommand.java
  65. +21 −23 src/main/java/net/lewmc/essence/commands/teleportation/{ → warp}/SetwarpCommand.java
  66. +33 −34 src/main/java/net/lewmc/essence/commands/teleportation/{ → warp}/WarpCommand.java
  67. +18 −17 src/main/java/net/lewmc/essence/commands/teleportation/{ → warp}/WarpsCommand.java
  68. +13 −4 src/main/java/net/lewmc/essence/events/DeathEvent.java
  69. +153 −32 src/main/java/net/lewmc/essence/events/JoinEvent.java
  70. +38 −0 src/main/java/net/lewmc/essence/events/LeaveEvent.java
  71. +45 −0 src/main/java/net/lewmc/essence/events/PlayerBedEnter.java
  72. +17 −5 src/main/java/net/lewmc/essence/events/PlayerDamageEvent.java
  73. +39 −0 src/main/java/net/lewmc/essence/events/PlayerMove.java
  74. +109 −0 src/main/java/net/lewmc/essence/events/RespawnEvent.java
  75. +22 −8 src/main/java/net/lewmc/essence/tabcompleter/EssenceTabCompleter.java
  76. +28 −1 src/main/java/net/lewmc/essence/tabcompleter/GamemodeTabCompleter.java
  77. +20 −16 src/main/java/net/lewmc/essence/tabcompleter/HomeTabCompleter.java
  78. +14 −2 src/main/java/net/lewmc/essence/tabcompleter/TeamTabCompleter.java
  79. +20 −15 src/main/java/net/lewmc/essence/tabcompleter/WarpTabCompleter.java
  80. +57 −6 src/main/java/net/lewmc/essence/utils/CommandUtil.java
  81. +0 −192 src/main/java/net/lewmc/essence/utils/DataUtil.java
  82. +413 −0 src/main/java/net/lewmc/essence/utils/FileUtil.java
  83. +155 −2 src/main/java/net/lewmc/essence/utils/HomeUtil.java
  84. +142 −0 src/main/java/net/lewmc/essence/utils/ImportUtil.java
  85. +61 −0 src/main/java/net/lewmc/essence/utils/KitUtil.java
  86. +17 −18 src/main/java/net/lewmc/essence/utils/LocationUtil.java
  87. +26 −0 src/main/java/net/lewmc/essence/utils/LogUtil.java
  88. +79 −47 src/main/java/net/lewmc/essence/utils/MessageUtil.java
  89. +67 −1 src/main/java/net/lewmc/essence/utils/PermissionHandler.java
  90. +123 −3 src/main/java/net/lewmc/essence/utils/PlayerUtil.java
  91. +8 −0 src/main/java/net/lewmc/essence/utils/SecurityUtil.java
  92. +43 −0 src/main/java/net/lewmc/essence/utils/TagUtil.java
  93. +272 −193 src/main/java/net/lewmc/essence/utils/TeamUtil.java
  94. +101 −0 src/main/java/net/lewmc/essence/utils/TeleportRequestUtil.java
  95. +170 −19 src/main/java/net/lewmc/essence/utils/TeleportUtil.java
  96. +71 −6 src/main/java/net/lewmc/essence/utils/UpdateUtil.java
  97. +79 −0 src/main/java/net/lewmc/essence/utils/WarpUtil.java
  98. +544 −0 src/main/java/net/lewmc/essence/utils/economy/VaultEconomy.java
  99. +32 −3 src/main/resources/config.yml
  100. +6 −0 src/main/resources/data/kits.yml
  101. +1 −0 src/main/resources/data/spawns.yml
  102. +3 −0 src/main/resources/language/README.md
  103. +267 −0 src/main/resources/language/bn-BD.yml
  104. +267 −0 src/main/resources/language/de-DE.yml
  105. +267 −0 src/main/resources/language/en-GB.yml
  106. +267 −0 src/main/resources/language/es-ES.yml
  107. +267 −0 src/main/resources/language/fr-FR.yml
  108. +267 −0 src/main/resources/language/hi-IN.yml
  109. +267 −0 src/main/resources/language/ja-JP.yml
  110. +267 −0 src/main/resources/language/ko-KR.yml
  111. +267 −0 src/main/resources/language/pt-PT.yml
  112. +267 −0 src/main/resources/language/ro-RO.yml
  113. +267 −0 src/main/resources/language/tr-TR.yml
  114. +119 −16 src/main/resources/language/{en-gb.yml → vi-VN.yml}
  115. +267 −0 src/main/resources/language/zh-CN.yml
  116. +223 −7 src/main/resources/plugin.yml
  117. +3 −0 src/main/resources/rules.txt
40 changes: 0 additions & 40 deletions .circleci/config.yml

This file was deleted.

28 changes: 0 additions & 28 deletions .github/ISSUE_TEMPLATE/bug_report.md

This file was deleted.

32 changes: 32 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
---
name: Bug report
description: Create a report to help us improve our software.
title: Bug report
labels: bug
assignees: "LewMilburn"
body:
- type: textarea
attributes:
label: "Please describe the bug"
description: "Please provide a clear and concise description of what the bug is."
- type: textarea
attributes:
label: "Steps to reproduce the behavior"
description: "What steps can we take to make the same bug or issue happen in our testing environment? What did you do before the issue happened?"
- type: textarea
attributes:
label: "Expected behavior"
description: "What did you expect to happen instead of the issue you're reporting?"
- type: textarea
attributes:
label: "Server information:"
value: "Minecraft Version: [e.g. 1.21.1] - Server Implementation: [e.g. Bukkit, Spigot, Paper, etc.] - Essence Version: [e.g. 1.1.0]"
- type: textarea
attributes:
label: "Please enter a link to your logs"
description: "Links to logs are extremely helpful. We recommend using https://mclo.gs/"
- type: textarea
attributes:
label: "Anything else?"
description: "Please enter any additional information here:"
---
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
blank_issues_enabled: false
20 changes: 0 additions & 20 deletions .github/ISSUE_TEMPLATE/feature_request.md

This file was deleted.

20 changes: 20 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
name: Feature request
description: Request or suggest a new feature.
title: Feature request
labels: feature request
assignees: "LewMilburn"
body:
- type: textarea
attributes:
label: "What feature would you like to request?"
- type: textarea
attributes:
label: "Are you able to help implement the feature?"
- type: textarea
attributes:
label: "Is your feature request related to an existing bug or issue?"
- type: textarea
attributes:
label: "Please enter any additional comments below."
---
12 changes: 12 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for all configuration options:
# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file

version: 2
updates:
- package-ecosystem: "maven" # See documentation for possible values
directory: "/" # Location of package manifests
schedule:
interval: "weekly"
target-branch: "next-update"
39 changes: 39 additions & 0 deletions .github/workflows/dependency-review.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# Dependency Review Action
#
# This Action will scan dependency manifest files that change as part of a Pull Request,
# surfacing known-vulnerable versions of the packages declared or updated in the PR.
# Once installed, if the workflow run is marked as required, PRs introducing known-vulnerable
# packages will be blocked from merging.
#
# Source repository: https://github.com/actions/dependency-review-action
# Public documentation: https://docs.github.com/en/code-security/supply-chain-security/understanding-your-software-supply-chain/about-dependency-review#dependency-review-enforcement
name: 'Dependency review'
on:
pull_request:
branches: [ "main" ]

# If using a dependency submission action in this workflow this permission will need to be set to:
#
# permissions:
# contents: write
#
# https://docs.github.com/en/enterprise-cloud@latest/code-security/supply-chain-security/understanding-your-software-supply-chain/using-the-dependency-submission-api
permissions:
contents: read
# Write permissions for pull-requests are required for using the `comment-summary-in-pr` option, comment out if you aren't using this option
pull-requests: write

jobs:
dependency-review:
runs-on: ubuntu-latest
steps:
- name: 'Checkout repository'
uses: actions/checkout@v4
- name: 'Dependency Review'
uses: actions/dependency-review-action@v4
# Commonly enabled options, see https://github.com/actions/dependency-review-action#configuration-options for all available options.
with:
comment-summary-in-pr: always
# fail-on-severity: moderate
# deny-licenses: GPL-1.0-or-later, LGPL-2.0-or-later
# retry-on-snapshot-warnings: true
44 changes: 44 additions & 0 deletions .github/workflows/documentation.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
name: Deploy JavaDoc
permissions:
contents: write
pages: write
pull-requests: write

on:
push:
branches:
- main
paths-ignore:
- '**/*.md'
- '**/*.txt'
- '**/*.xml'
- '**/*.json'
- '**/*.html'

jobs:
build:
runs-on: ubuntu-latest

steps:
- name: Checkout Repository 📡
uses: actions/checkout@v2

- name: Set up JDK 21 🔧
uses: actions/setup-java@v2
with:
distribution: 'temurin'
java-version: '21'

- name: Build with Maven 🏗️
run: |
mvn clean package -Dmaven.test.skip=true -X
- name: Deploy JavaDoc 🚀
uses: MathieuSoysal/Javadoc-publisher.yml@v2.5.0
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
javadoc-branch: javadocs
java-version: '21'
target-folder: .
javadoc-source-folder: target/site/apidocs
project: maven
40 changes: 40 additions & 0 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
name: Maven Build

on:
push:
branches:
- "*"
paths-ignore:
- '**/*.md'
- '**/*.txt'
- '**/*.xml'
- '**/*.json'
- '**/*.html'

jobs:
build:
runs-on: ubuntu-latest

steps:
- name: Checkout Repository 📡
uses: actions/checkout@v4

- name: Set up JDK 21 🔧
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '21'

- name: Build with Maven 🏗️
run: mvn -B package --file pom.xml

- name: Extract Version from pom.xml 📄
id: extract_version
run: echo "VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_ENV

- name: Upload Plugin jar 📁
uses: actions/upload-artifact@v4
with:
name: essence-${{ env.VERSION }}.jar
path: /home/runner/work/Essence/Essence/target/essence-${{ env.VERSION }}.jar

39 changes: 36 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,37 @@
# Essence
[![CircleCI](https://dl.circleci.com/status-badge/img/circleci/J4aQrof3tuEV777kzxuWe6/Y5N36CErUKsyybBwBT4bDk/tree/main.svg?style=svg&circle-token=a1b270ad2bcd3486d032639a2443684e1ac89424)](https://dl.circleci.com/status-badge/redirect/circleci/J4aQrof3tuEV777kzxuWe6/Y5N36CErUKsyybBwBT4bDk/tree/main)
![Essence](https://cdn.modrinth.com/data/cached_images/1a9959eb6d98d5e50f561c021de086a8212cc7cc.png)

If you like Essence, please consider leaving us a review on Spigot!
- 💾 **Download Essence** - https://lewmc.net/plugin/essence
- 🔧 **View the JavaDocs** - https://lewmc.github.io/Essence
- 🌐 **Help Translate Essence** - https://crowdin.com/project/lewmc-essence
- ⭐ Enjoying Essence? We'd love to hear your feedback on Spigot. Leave us a review [here](https://www.spigotmc.org/resources/essence.114553/).

[![Crowdin](https://badges.crowdin.net/lewmc-essence/localized.svg)](https://crowdin.com/project/lewmc-essence) [![Maven Build](https://github.com/LewMC/Essence/actions/workflows/maven.yml/badge.svg)](https://github.com/LewMC/Essence/actions/workflows/maven.yml)

## Build Process

Install JDK 21 before continuing. Click [here](https://docs.oracle.com/en/java/javase/21/install/index.html) for documentation.

- You will also need Maven for the `mvn` command, which can be installed [here](https://maven.apache.org/download.cgi).
- Make sure that your version of JDK 21 includes JavaDoc.
- For example, Eclipse Temurin JDK with Hotspot 21 includes this executable.

```sh
# Clone the repository and move into it.
git clone https://github.com/lewmc/essence && cd essence

# Perform a clean build (optional if you're rebuilding).
mvn clean package -Dmaven.test.skip=true

# Build the package with an explicit version target of 21.
mvn -B package --file pom.xml -Dmaven.compiler.source=21 -Dmaven.compiler.target=21
```

## Contributing

We welcome contributions from the community. Please fork the repository, make your changes, and submit a pull request.

When adding new features for the next update, please merge them into the `next-update` branch. This helps us keep our CI Builds separate as `-SNAPSHOT` builds.

## Licensing

Essence is licensed under the Apache License 2.0. See [LICENSE](LICENSE) for more information.
5 changes: 1 addition & 4 deletions SECURITY.md
Original file line number Diff line number Diff line change
@@ -2,10 +2,7 @@

## Supported Versions

| Version | Supported |
| ------- | --------------------------- |
| Latest | Bugfixes & Security Updates |
| 1.x.x | Security Updates |
See https://wiki.lewmc.net/es-system-requirements.html

## Reporting a Vulnerability

3 changes: 3 additions & 0 deletions crowdin.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
files:
- source: /src/main/resources/language/en-GB.yml
translation: /src/main/resources/language/%locale%.yml
Loading