Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Paper merged #31

Closed
wants to merge 80 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
80 commits
Select commit Hold shift + click to select a range
734f888
removed own position implementation, using the paper once should be fine
FireInstall Jul 4, 2023
160d128
use paper as version
FireInstall Aug 4, 2023
30666ee
Move lang files to proper dictionary
FireInstall Dec 14, 2023
38233f7
quick clean in translation files
FireInstall Dec 14, 2023
1a6a5e9
Next step lang rework
FireInstall Dec 15, 2023
abee60f
step 3 lang rework
FireInstall Dec 15, 2023
311d866
step 4 lang rework
FireInstall Dec 18, 2023
249511a
step 5 lang rework
FireInstall Dec 18, 2023
ba8b93e
step 6 lang rework
FireInstall Dec 20, 2023
4ee629b
Use Component logger
FireInstall Dec 28, 2023
2d8b617
HIGHLY EXPERIMENTAL:
FireInstall Dec 28, 2023
dd55064
step 7 lang rework (fist commands ready, yeah!)
FireInstall Dec 29, 2023
7a9ec86
step 8 lang rework
FireInstall Jan 6, 2024
ce2d9bb
step 9 lang rework
FireInstall Jan 8, 2024
beef97f
step 10 lang rework
FireInstall Jan 9, 2024
e895a20
step 11 lang rework - set commands finally ready!
FireInstall Jan 13, 2024
71f41e8
bit of code maturity
FireInstall Jan 14, 2024
e07ad61
Fix merge artifacts
FireInstall Jan 23, 2024
d1b9403
readme explanation of this branch
FireInstall Jan 23, 2024
f96db2d
Init and update Langfiles
FireInstall Jan 24, 2024
1374651
optimized entity check condition
FireInstall Jan 4, 2024
f6526dd
make timer more clear
FireInstall Jan 4, 2024
8ed796d
added Minigame field to Regions and nodes to get access to it without…
FireInstall Jan 4, 2024
36b89d5
Fix MatchBlockCondition, SwapBlockAction and SetBlockAction displayin…
FireInstall Jan 4, 2024
b9df4d9
Made entity settings work and expanded possibilities
FireInstall Jan 24, 2024
3853a5d
added SelectCommand
FireInstall Jan 24, 2024
d1ab489
extended meta handling for player has item condition and laid groundw…
FireInstall Jan 28, 2024
9d3b5e4
some code health
FireInstall Jan 28, 2024
3fa41c1
Fix merge artifacts
FireInstall Jan 28, 2024
ceeaa9f
Step 12 lang rework
FireInstall Feb 1, 2024
ab2b7fd
lang 13 rework
FireInstall Feb 1, 2024
8107e30
remove Guava as much as possible as it is not needed anymore
FireInstall Jan 29, 2024
65df1ed
Add boss bar as timer display
FireInstall Feb 1, 2024
124cc87
add more match options to take item action
FireInstall Feb 1, 2024
c2d17a2
lang 14 rework
FireInstall Feb 1, 2024
6601d45
lang 15 rework
FireInstall Feb 6, 2024
ac48235
lang 16 rework
FireInstall Feb 7, 2024
88c5177
lang 17 rework
FireInstall Feb 8, 2024
2c8ac6f
Fix merge artifacts
FireInstall Feb 8, 2024
d8ab081
Update Descriptions the correct way
FireInstall Feb 9, 2024
16fd8f7
Langrework 18
FireInstall Feb 8, 2024
7648ded
lang 19 rework
FireInstall Feb 12, 2024
7937b33
lang 20 rework
FireInstall Feb 13, 2024
96a7bf5
Fix merge artifacts once again
FireInstall Feb 13, 2024
ee83319
lang 21 rework
FireInstall Feb 14, 2024
5667a82
lang 22 rework
FireInstall Feb 15, 2024
6bbb498
Lang rework 23
FireInstall Feb 15, 2024
8a5eeb2
Lang rework 24
FireInstall Feb 16, 2024
19b3c6c
Lang rework 25
FireInstall Feb 20, 2024
d988450
Lang rework 26
FireInstall Feb 22, 2024
c30e048
Lang rework 27
FireInstall Feb 24, 2024
cdeefa5
removed cmd-file output for good.
FireInstall Feb 27, 2024
517b29b
merge dev aftermath (couldn't bring another 8 hour rebase over me)
FireInstall Feb 27, 2024
37a4fea
dataFixer for TeamMessages
FireInstall Feb 27, 2024
37910da
Update dependencies in hopes the test wouldn't break anymore.
FireInstall Feb 27, 2024
24342dc
Better MessageType use
FireInstall Feb 27, 2024
3345536
Don't hardcore time unit
FireInstall Feb 27, 2024
93956cb
Force correct use of MinigameLangKey vs identifier
FireInstall Feb 27, 2024
930cee8
Fix broken signs
FireInstall Mar 1, 2024
5e25968
Fix some nullPointer problems
FireInstall Mar 6, 2024
01216e3
Fix Minigames signs not working
FireInstall Mar 6, 2024
f41f94e
Fix Commands tabComplete if argument amount was used directly
FireInstall Mar 6, 2024
afc791d
Fix loading Teams
FireInstall Mar 7, 2024
1d054cf
Redid how the LoadoutAddons interact with Loadouts to be consistent w…
FireInstall Mar 7, 2024
4b5a7ca
System dependent path separators
FireInstall Mar 8, 2024
f322de5
Fix legacy Effect types not loading
FireInstall Mar 9, 2024
d768079
Fix Loadouts not loading legacy PotionEffects
FireInstall Mar 10, 2024
7cc6c22
Fix Fr messages
FireInstall Mar 11, 2024
7a77f5b
Renaming RewardScheme to be in line with other abstract classes
FireInstall Mar 13, 2024
9ce19b9
bump dependencies
FireInstall Mar 13, 2024
bd44dab
Added playerBlockRecorder setting to lang file (this sorted them)
FireInstall May 29, 2024
1f0ca50
Get Plugin prefix from lang file
FireInstall Jun 10, 2024
798964e
use bukkits name of scoreboards to be more in line with their API
FireInstall Jul 17, 2024
eab6af3
update (dependencies) to 1.21 and Java 21 - please note: our tests ar…
FireInstall Jul 19, 2024
ebfbc37
Fix table formatting
FireInstall Jul 19, 2024
071c4f5
gradle init
FireInstall Jul 21, 2024
554c16f
adding a bunch of nullability annotations
FireInstall Jul 31, 2024
73c8e2d
- yeet mockbukkit. It's just a broken mess and does more harm than it…
FireInstall Oct 11, 2024
0042f1b
make gradle executable on linux for actions
FireInstall Sep 28, 2024
f47055c
Merge remote-tracking branch 'green/dev' into paperMerged2
FireInstall Oct 11, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

**Server (please complete the following information):**
- Minigames Version: X.X.X
- Server Type: [Spigot|Paper|CraftBukkit]
- Server Type: [Paper|Purpur|Pufferfish]
- Server Version: X.X.X

**Additional context**
Expand Down
4 changes: 2 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
version: 2
updates:
- package-ecosystem: "maven"
- package-ecosystem: "gradle"
directory: "/Minigames"
schedule:
interval: "weekly"

- package-ecosystem: "maven"
- package-ecosystem: "gradle"
directory: "/Regions"
schedule:
interval: "weekly"
61 changes: 61 additions & 0 deletions .github/workflows/codacy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
# This workflow uses actions that are not certified by GitHub.
# They are provided by a third-party and are governed by
# separate terms of service, privacy policy, and support
# documentation.

# This workflow checks out code, performs a Codacy security scan
# and integrates the results with the
# GitHub Advanced Security code scanning feature. For more information on
# the Codacy security scan action usage and parameters, see
# https://github.com/codacy/codacy-analysis-cli-action.
# For more information on Codacy Analysis CLI in general, see
# https://github.com/codacy/codacy-analysis-cli.

name: Codacy Security Scan

on:
push:
branches: [ "master" ]
pull_request:
# # The branches below must be a subset of the branches above
# branches: [ "master" ]
schedule:
- cron: '44 13 * * 4'

permissions:
contents: read

jobs:
codacy-security-scan:
permissions:
contents: read # for actions/checkout to fetch code
security-events: write # for github/codeql-action/upload-sarif to upload SARIF results
actions: read # only required for a private repository by github/codeql-action/upload-sarif to get the Action run status
name: Codacy Security Scan
runs-on: ubuntu-latest
steps:
# Checkout the repository to the GitHub Actions runner
- name: Checkout code
uses: actions/checkout@v4

# Execute Codacy Analysis CLI and generate a SARIF output with the security issues identified during the analysis
- name: Run Codacy Analysis CLI
uses: codacy/codacy-analysis-cli-action@d840f886c4bd4edc059706d09c6a1586111c540b
with:
# Check https://github.com/codacy/codacy-analysis-cli#project-token to get your project token from your Codacy repository
# You can also omit the token and run the tools that support default configurations
project-token: ${{ secrets.CODACY_PROJECT_TOKEN }}
verbose: true
output: results.sarif
format: sarif
# Adjust severity of non-security issues
gh-code-scanning-compat: true
# Force 0 exit code to allow SARIF file generation
# This will handover control about PR rejection to the GitHub side
max-allowed-issues: 2147483647

# Upload the SARIF file generated in the previous step
- name: Upload SARIF results file
uses: github/codeql-action/upload-sarif@v3
with:
sarif_file: results.sarif
70 changes: 70 additions & 0 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
# This workflow uses actions that are not certified by GitHub.
# They are provided by a third-party and are governed by
# separate terms of service, privacy policy, and support
# documentation.
# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-gradle

name: Java CI with Gradle

# build on every push.
on: [push]
# if you want to just build if pushes to master occur use the one below.
#on:
# push:
# branches: [ "master" ]
# pull_request:
# branches: [ "master" ]

jobs:
build:

runs-on: ubuntu-latest
permissions:
contents: read

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

# Configure Gradle for optimal use in GitHub Actions, including caching of downloaded dependencies.
# See: https://github.com/gradle/actions/blob/main/setup-gradle/README.md
- name: Setup Gradle
uses: gradle/actions/setup-gradle@dbbdc275be76ac10734476cc723d82dfe7ec6eda # v3.4.2

- name: Build with Gradle Wrapper
run: ./gradlew build

# NOTE: The Gradle Wrapper is the default and recommended way to run Gradle (https://docs.gradle.org/current/userguide/gradle_wrapper.html).
# If your project does not have the Gradle Wrapper configured, you can use the following configuration to run Gradle with a specified version.
#
# - name: Setup Gradle
# uses: gradle/actions/setup-gradle@dbbdc275be76ac10734476cc723d82dfe7ec6eda # v3.4.2
# with:
# gradle-version: '8.5'
#
# - name: Build with Gradle 8.5
# run: gradle build

dependency-submission:

runs-on: ubuntu-latest
permissions:
contents: write

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

# Generates and submits a dependency graph, enabling Dependabot Alerts for all project dependencies.
# See: https://github.com/gradle/actions/blob/main/dependency-submission/README.md
- name: Generate and submit dependency graph
uses: gradle/actions/dependency-submission@dbbdc275be76ac10734476cc723d82dfe7ec6eda # v3.4.2
19 changes: 0 additions & 19 deletions .github/workflows/maven.yml

This file was deleted.

113 changes: 110 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,112 @@
.settings
target
.idea/
# ---> JetBrains
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio

*.iml

## Directory-based project format:
.idea/
# if you remove the above rule, at least ignore the following:

# User-specific stuff:
# .idea/workspace.xml
# .idea/tasks.xml
# .idea/dictionaries

# Sensitive or high-churn files:
# .idea/dataSources.ids
# .idea/dataSources.xml
# .idea/sqlDataSources.xml
# .idea/dynamic.xml
# .idea/uiDesigner.xml

# Gradle:
# .idea/gradle.xml
# .idea/libraries

# Mongo Explorer plugin:
# .idea/mongoSettings.xml

## File-based project format:
*.ipr
*.iws

## Plugin-specific files:

# IntelliJ
/out/

# mpeltonen/sbt-idea plugin
.idea_modules/

# JIRA plugin
atlassian-ide-plugin.xml

# Crashlytics plugin (for Android Studio and IntelliJ)
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties

# ---> Eclipse
*.pydevproject
.metadata
bin/
tmp/
*.tmp
*.bak
*.swp
*~.nib
local.properties
.settings/
.loadpath

# Eclipse Core
.project

# External tool builders
.externalToolBuilders/

# Locally stored "Eclipse launch configurations"
*.launch

# CDT-specific
.cproject

# JDT-specific (Eclipse Java Development Tools)
.classpath

# Java annotation processor (APT)
.factorypath

# PDT-specific
.buildpath

# sbteclipse plugin
.target

# TeXlipse plugin
.texlipse

# ---> Maven
target/
pom.xml.tag
pom.xml.releaseBackup
pom.xml.versionsBackup
pom.xml.next
release.properties
dependency-reduced-pom.xml
buildNumber.properties
.mvn/timing.properties

# ---> Gradle
.gradle/
*/build/
target
*/run/

.settings

# wiki
docs/build/

# --> junit tests
*/logs/
8 changes: 4 additions & 4 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ version: 2

# Set the version of Python and other tools you might need
build:
os: ubuntu-20.04
os: ubuntu-22.04
tools:
python: "3.9"
python: "3.12"

# Build documentation in the docs/ directory with Sphinx
sphinx:
Expand All @@ -21,5 +21,5 @@ sphinx:

# Optionally declare the Python requirements required to build your docs
python:
install:
- requirements: docs/source/requirements.txt
install:
- requirements: docs/source/requirements.txt
18 changes: 15 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,23 @@ notifications:
email: false
slack:
secure: "drNgYCrHpXj/sSrnoRUpMUp4jq3Jq/EXV6llQ0JYo3qkRirUec7ZgVA59Ln57Higv+EG8qpbRT/dohzV7mqn0bb2inXPJCI7JJtUJZNNjo/fkDZaSPFHJAWa1XjtEfAnIbQCd7EtU9RnIAGn7IwXqfxZOLakP0ZpkpNOjfuTdcI2S3GEkZJSDrwB7Q7LlzGuAlZkx0BWHkoyb7zCUVJ94ftiwHPy3nT05EzlbXyQ3xUUe1Y+pGZ7oBWsN8k7LumHN3SMwTnFu7mvVoTN53BH2zD3I2mACKsnF2KIyk+6p4IUiFeYQc2z5lnX8YMFiWkUpFbWhetUwsnjNRUZ4TvtqBkOBaEHyBn82nigUiYbW8Ea8ZjzqrcBTxOaK9Qt8C/LC0CcclxyHFQD7fSrD4IYNv6/vC/jWB+CCoVPFF+ZaJLQhiN847p+wlU0EJuyewqrb57n3Xfzzk5AtIzYpculg62CCW2caCfXR4rEa8JdDATQr/c7tvnrx2XXwlKWA/crRPAOVCj6fA0FADNvC0W3QexLDGOpwobqKbN5z2Ouw4sISyPAhfCsgGVrbTz4HYtFf3riIzbW5lJcs63XhNZdaYI8eDL8PTpxtFwhhyOHtOR+p0ez5TSWO9N2e6+HOGMm7rG0ykNY+Vs2Pri2FwRLjq/sQLLdyJpejkgrrIF/vzE="

before_cache:
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
- rm -fr $HOME/.gradle/caches/*/plugin-resolution/

cache:
directories:
- $HOME/.m2
- $HOME/.gradle/caches/
- $HOME/.gradle/wrapper/

env:
matrix:
- PROFILE=BUKKIT
install: "mvn clean install -P ${PROFILE} -DskipTests=true -Dmaven.javadoc.skip=true -B -V"
script: "mvn test -P ${PROFILE} -B"

# todo
# old install
#"mvn clean install -P ${PROFILE} -DskipTests=true -Dmaven.javadoc.skip=true -B -V"

script:
- ./gradlew build -q -D
Loading
Loading