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

Merge many fixes from GreenSurvivors #381

Closed
wants to merge 162 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
162 commits
Select commit Hold shift + click to select a range
44f9d2e
Fixing not visible tool-points
joshi1999 Jan 30, 2022
848223e
Fixing Loadout for Offhand
joshi1999 Mar 8, 2022
1663f14
Adding new 1.16 materials
joshi1999 Mar 8, 2022
c87ed8e
Merge pull request #1 from GreenSurvivors/dev
Schpammer Mar 8, 2022
9978137
MatchTeamColor Condidtion showing matching item to color
joshi1999 Mar 8, 2022
c32475a
Fixes PlayerHasItemCondition
joshi1999 Mar 8, 2022
da8b7ad
Fixing AsyncInventoryEvent Calls
joshi1999 Mar 9, 2022
f7dbe71
Adding GameTickTrigger
joshi1999 Mar 10, 2022
5630353
Fixing Region Select NoSuchElementError
joshi1999 Mar 10, 2022
89f039b
Adding keep inventory option
joshi1999 Jul 19, 2022
3f1b9f7
Update to 1.19
joshi1999 Aug 5, 2022
7b64d34
Update minigamesdistribution to 1.19
joshi1999 Aug 5, 2022
442a00e
Update Mavenworkflow to Java 17
joshi1999 Aug 5, 2022
fdb29ea
Adding potionFriendlyFire configuration
joshi1999 Sep 23, 2022
8705cbf
T::28 Correcting GUI information
joshi1999 Sep 27, 2022
49c4814
T::32,39,42 Translation strings missing
joshi1999 Oct 1, 2022
a7f0952
Added every possible vanilla potion effekt.
joshi1999 Oct 14, 2022
891bdb6
Fixes T::45, T::46, T::49, T::53
joshi1999 Oct 30, 2022
a41fc9b
Merge pull request #2 from GreenSurvivors/keepInv
joshi1999 Oct 30, 2022
f3aa5ff
Merge branch 'master' of github.com:GreenSurvivors/GreenMinigames int…
joshi1999 Nov 4, 2022
f87dd28
T::44 Support for signs
joshi1999 Mar 14, 2023
827968d
T::9 Autocomplete Commands: set node/region
joshi1999 Mar 20, 2023
92e3848
T::22 Wrong message when there's no lobby
joshi1999 Mar 20, 2023
c6afe45
T::18 Flag falling in lava does not respawn
joshi1999 Mar 22, 2023
19ae085
Replaced deprecated MinigameUtils.formStr call
joshi1999 Mar 23, 2023
39f3d81
Fixed reset of Blocks in Minigames. (#3)
FireInstall Apr 14, 2023
3279507
Rebuilt how the regeneration region works (#4)
FireInstall Apr 17, 2023
8592d4d
Rebuilt FloorDegeneration to use the new Regeneration Regions (#7)
FireInstall Apr 17, 2023
420accd
Code cleanup (#5)
FireInstall Apr 17, 2023
af2c6c8
Merging Memory and Region Actions from Turidus (#8)
FireInstall Apr 17, 2023
4e7e177
Fix MemorySwapBlock for unordered created regions
joshi1999 Apr 18, 2023
deb1728
Updating actions to use a cache for faster building (#10)
joshi1999 Apr 18, 2023
dbcb0af
fix regen regions and lists not getting saved
FireInstall Apr 18, 2023
4aabe44
fix regen regions not regenerating properly
FireInstall Apr 18, 2023
74b276f
added feedback how many blocks are in a regenregion total
FireInstall Apr 18, 2023
a3850c7
added a new trigger to fire whenever a player moves inside a region (…
FireInstall Apr 18, 2023
770cadb
fix binding to first item in inventory instead of in hands
FireInstall Apr 18, 2023
5d62c06
fix minigame objective error (rolling back the lines, still have to g…
FireInstall Apr 18, 2023
21d2076
fix false calculation, if one coord was 0
FireInstall Apr 18, 2023
d727d22
Merge pull request #11 from GreenSurvivors/devfeuer
joshi1999 Apr 18, 2023
4f91a98
Merge branch 'AddstarMC:master' into master
joshi1999 Jun 19, 2023
83d7a79
Fixing PullRequest Template
joshi1999 Jun 19, 2023
56e0690
Merge remote-tracking branch 'Addstar-upstream/master'
FireInstall Jul 14, 2023
bca29c7
Fixing hanging CTFFlags and min/max respawn heights
joshi1999 Jun 16, 2023
0c8d9d7
Adding new option to ctf: Teammates can now bring the flag back
joshi1999 Jun 17, 2023
f7f0684
fixing AddstarMC#360 : bets letting player join even if the betting f…
FireInstall Apr 18, 2023
df6f119
update dependencies, some dokumentation and code clean for turis code
FireInstall Apr 19, 2023
d3d1a78
added new blocks to MemorySwapBlockAction (the default list definitel…
FireInstall Apr 19, 2023
fb66b3e
fixing AddstarMC#247 : showing 0 as scores in case of a draw
FireInstall Apr 21, 2023
626a57a
Fixing Unlimited ammo multiplying it
FireInstall Apr 21, 2023
e390dc8
don't multiply bets as much
FireInstall Apr 21, 2023
6b7345c
remove unnecessary classes from jar
FireInstall Apr 21, 2023
aae9700
fix being able to break blocks regardless of black- / whitelist
FireInstall Apr 27, 2023
a2f196c
better MemorySwapBlockAction-blacklist
FireInstall Apr 27, 2023
e551aba
update deprecated BlockChanges
FireInstall Apr 27, 2023
f821d01
use tags instead of strings
FireInstall Apr 27, 2023
5bfc962
remove uses of stringToList
FireInstall Apr 28, 2023
e8444f1
MinigameUtils
FireInstall Apr 29, 2023
b7f9e23
fix create set regen command listening to tool
FireInstall Apr 29, 2023
b8dc3d0
T::59 SwapBlockAction is not affected by a BlockRecorder
joshi1999 Apr 18, 2023
1e7a04c
fixing AddstarMC#361 loadout config not properly loaded
joshi1999 Apr 18, 2023
2574abd
Wrong named Action "TIMED_TRIGGER" in Actions.java
joshi1999 Jun 24, 2023
f2ae2da
Devfeuer20 (#19)
FireInstall Jul 19, 2023
e262b37
use apache commons 3 WordUtils
FireInstall Jul 19, 2023
69ef4fb
Merge pull request #26 from GreenSurvivors/wordutils
FireInstall Jul 19, 2023
b21afe8
Added a list option for RegenRegions and added them to the nodes/regi…
FireInstall Jul 5, 2023
860cf72
Fix merge error
FireInstall Jul 24, 2023
b740f0c
fix api version
FireInstall Jul 24, 2023
a83ff71
Merge remote-tracking branch 'Addstar-upstream/master'
FireInstall Oct 13, 2023
74e660c
fix broken builds with newer maven versions
FireInstall Oct 25, 2023
166e500
exclude some newer jars from also getting distributed since there is …
FireInstall Oct 25, 2023
f3a23f4
possibly fix maven verify error of updated source plugin
FireInstall Oct 25, 2023
0445169
Merge pull request #27 from GreenSurvivors/buildline
FireInstall Dec 13, 2023
75c8ba3
Added GreenSurvivors as authors
FireInstall Jun 19, 2023
8a4f3df
update dependencies
FireInstall Jul 3, 2023
4362f40
Fix AddstarMc#269
FireInstall Jul 3, 2023
9a79fba
Fix AddstarMc#251
FireInstall Jul 3, 2023
55f1c7f
Fix Treasure out of bounds errors
FireInstall Jul 5, 2023
8460715
reactivate some menu items.
FireInstall Jul 7, 2023
351d87a
Fix AddstarMC#364
FireInstall Jul 9, 2023
e7e269f
Fix SCULK_CATALYST not being movable.
FireInstall Jul 13, 2023
9db8f6b
Fix error message
FireInstall Jul 13, 2023
bd7e3e9
Fix info messages missing a space
FireInstall Jul 13, 2023
2d8916c
Fix Whitelist not working because it's expecting always a material no…
FireInstall Jul 13, 2023
c39f92f
Lower if-else depth in TakeItemAction
joshi1999 Jul 19, 2023
a77c594
update MenuItemBlockData to show the material of the block
FireInstall Jul 24, 2023
4c8fd33
fix silent error if no start points for singleplayer where defined
FireInstall Jul 31, 2023
ca9458f
fix black/white list not blocking blocks to place
FireInstall Sep 17, 2023
38f4d0b
Fix TeamColors with two words failing in set start command
FireInstall Oct 10, 2023
244c90e
added a GameEnded trigger that fires whenever the minigame really has…
FireInstall Oct 24, 2023
6a8463e
some code health changes
FireInstall Oct 24, 2023
737a540
Fix NullPointerException in TimerCondition (was thrown if the game ha…
FireInstall Oct 25, 2023
65bf1bd
Fix wrong tool mode descriptions
FireInstall Oct 25, 2023
64cec22
(hopefully) fix using String menu items sometimes not working and wri…
FireInstall Dec 7, 2023
c552bf8
Fix Score commands still using red/blue teams
FireInstall Dec 12, 2023
a7f6274
Don't allow breaking of blocks CTF-flags are attached to
FireInstall Dec 12, 2023
8b3cf5c
Fix null error when quitting a Minigame with regen regions
FireInstall Dec 29, 2023
2f6b90c
Minigame spectators teleported using quit location if end location is…
FireInstall Dec 30, 2023
cf6abd1
fix hardcoded height limits for treasures
FireInstall Dec 30, 2023
64e094f
Fix timed remote trigger falsely claiming to not carry a player while…
FireInstall Jan 4, 2024
d2f1405
optimized entity check condition
FireInstall Jan 4, 2024
b4d1bca
make timer more clear
FireInstall Jan 4, 2024
0046e74
added Minigame field to Regions and nodes to get access to it without…
FireInstall Jan 4, 2024
f2a077a
Fix MatchBlockCondition, SwapBlockAction and SetBlockAction displayin…
FireInstall Jan 4, 2024
a6d1396
removed unused updateChecker setting
FireInstall Jan 6, 2024
b9ced8a
fix error setting start location (single player / first multiplayer)
FireInstall Jan 10, 2024
e21615f
fix langtag not getting detected correctly
FireInstall Jan 23, 2024
3833599
Fix language setting not getting used
FireInstall Jan 23, 2024
b8eb683
Fix builds broken if MockBukkit was not cached (aka github actions)
FireInstall Jan 23, 2024
eb5825c
Made entity settings work and expanded possibilities
FireInstall Jan 24, 2024
bcd985a
Fix a possibility for double messages.
FireInstall Jan 24, 2024
e330743
Fix oversight allowing modification of menus
FireInstall Jan 24, 2024
51ff7ef
added SelectCommand
FireInstall Jan 24, 2024
9ea2008
removed own position implementation, using the paper once should be fine
FireInstall Jul 4, 2023
30b8598
use paper as version
FireInstall Aug 4, 2023
cd61d01
Move lang files to proper dictionary
FireInstall Dec 14, 2023
8a1aad2
quick clean in translation files
FireInstall Dec 14, 2023
e979fe4
Next step lang rework
FireInstall Dec 15, 2023
ea78ccd
step 3 lang rework
FireInstall Dec 15, 2023
5506039
step 4 lang rework
FireInstall Dec 18, 2023
756ecbf
step 5 lang rework
FireInstall Dec 18, 2023
f3a4481
step 6 lang rework
FireInstall Dec 20, 2023
27b5ec2
Use Component logger
FireInstall Dec 28, 2023
4f5313c
HIGHLY EXPERIMENTAL:
FireInstall Dec 28, 2023
d7ebe61
step 7 lang rework (fist commands ready, yeah!)
FireInstall Dec 29, 2023
0924988
step 8 lang rework
FireInstall Jan 6, 2024
95e661f
step 9 lang rework
FireInstall Jan 8, 2024
834b7ba
step 10 lang rework
FireInstall Jan 9, 2024
2aee1a6
step 11 lang rework - set commands finally ready!
FireInstall Jan 13, 2024
8b30c0c
bit of code maturity
FireInstall Jan 14, 2024
36da357
Fix merge artifacts
FireInstall Jan 23, 2024
2c955b4
readme explanation of this branch
FireInstall Jan 23, 2024
0aa15cc
Init and update Langfiles
FireInstall Jan 24, 2024
cbb5eef
extended meta handling for player has item condition and laid groundw…
FireInstall Jan 28, 2024
efb6b67
some code health
FireInstall Jan 28, 2024
a59b45e
Merge branch 'feuerFeatures' into paperMerged
FireInstall Jan 28, 2024
ec92d64
Fix merge artifacts
FireInstall Jan 28, 2024
0365c7a
remove Guava as much as possible as it is not needed anymore
FireInstall Jan 29, 2024
9ff337f
Add boss bar as timer display
FireInstall Feb 1, 2024
c44a08c
add more match options to take item action
FireInstall Feb 1, 2024
c3cbc96
Step 12 lang rework
FireInstall Feb 1, 2024
71204be
lang 13 rework
FireInstall Feb 1, 2024
391127f
Merge branch 'paperMerged' into paperMerged2
FireInstall Feb 1, 2024
5b0dd1e
Merge branch 'feuerFeatures' into paperMerged2
FireInstall Feb 1, 2024
804dfd9
lang 14 rework
FireInstall Feb 1, 2024
492c41f
lang 15 rework
FireInstall Feb 6, 2024
82365d5
lang 16 rework
FireInstall Feb 7, 2024
5847728
lang 17 rework
FireInstall Feb 8, 2024
5797d1c
Fix merge artifacts
FireInstall Feb 8, 2024
3a259b2
Merge branch 'paperMerged' into paperMerged2
FireInstall Feb 8, 2024
d4e4fde
Update Descriptions the correct way
FireInstall Feb 9, 2024
6618639
Langrework 18
FireInstall Feb 8, 2024
d5acd48
lang 19 rework
FireInstall Feb 12, 2024
908abff
lang 20 rework
FireInstall Feb 13, 2024
91839c2
Merge branch 'paperMerged' into paperMerged2
FireInstall Feb 13, 2024
c51a7de
Fix merge artifacts once again
FireInstall Feb 13, 2024
3b8261e
lang 21 rework
FireInstall Feb 14, 2024
da5bacc
Merge branch 'paperMerged' into paperMerged2
FireInstall Feb 15, 2024
a224ac5
lang 22 rework
FireInstall Feb 15, 2024
0fe7f18
Merge branch 'paperMerged' into paperMerged2
FireInstall Feb 15, 2024
b8c2b33
Lang rework 23
FireInstall Feb 15, 2024
7c7b3bb
Lang rework 24
FireInstall Feb 16, 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
  •  
  •  
  •  
18 changes: 9 additions & 9 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: 17
cache: 'maven'
- name: Build with Maven
run: mvn -B package --file pom.xml
- uses: actions/checkout@v3
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: 17
cache: 'maven'
- name: Build with Maven
run: mvn -B package --file pom.xml
4 changes: 2 additions & 2 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ notifications:
secure: "drNgYCrHpXj/sSrnoRUpMUp4jq3Jq/EXV6llQ0JYo3qkRirUec7ZgVA59Ln57Higv+EG8qpbRT/dohzV7mqn0bb2inXPJCI7JJtUJZNNjo/fkDZaSPFHJAWa1XjtEfAnIbQCd7EtU9RnIAGn7IwXqfxZOLakP0ZpkpNOjfuTdcI2S3GEkZJSDrwB7Q7LlzGuAlZkx0BWHkoyb7zCUVJ94ftiwHPy3nT05EzlbXyQ3xUUe1Y+pGZ7oBWsN8k7LumHN3SMwTnFu7mvVoTN53BH2zD3I2mACKsnF2KIyk+6p4IUiFeYQc2z5lnX8YMFiWkUpFbWhetUwsnjNRUZ4TvtqBkOBaEHyBn82nigUiYbW8Ea8ZjzqrcBTxOaK9Qt8C/LC0CcclxyHFQD7fSrD4IYNv6/vC/jWB+CCoVPFF+ZaJLQhiN847p+wlU0EJuyewqrb57n3Xfzzk5AtIzYpculg62CCW2caCfXR4rEa8JdDATQr/c7tvnrx2XXwlKWA/crRPAOVCj6fA0FADNvC0W3QexLDGOpwobqKbN5z2Ouw4sISyPAhfCsgGVrbTz4HYtFf3riIzbW5lJcs63XhNZdaYI8eDL8PTpxtFwhhyOHtOR+p0ez5TSWO9N2e6+HOGMm7rG0ykNY+Vs2Pri2FwRLjq/sQLLdyJpejkgrrIF/vzE="
cache:
directories:
- $HOME/.m2
- $HOME/.m2
env:
matrix:
- PROFILE=BUKKIT
Expand Down
55 changes: 42 additions & 13 deletions Minigames/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,12 @@
<id>jitpack.io</id>
<url>https://jitpack.io</url>
</repository>
<!-- WorldEdit -->
<repository>
<id>enginehub.org</id>
<url>https://maven.enginehub.org/repo/</url>
</repository>

</repositories>

<dependencies>
Expand Down Expand Up @@ -71,13 +77,13 @@
<dependency>
<groupId>io.papermc</groupId>
<artifactId>paperlib</artifactId>
<version>1.0.5</version>
<version>1.0.7</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.github.MockBukkit</groupId>
<artifactId>MockBukkit</artifactId>
<version>v3.4.3</version>
<groupId>com.github.seeseemelk</groupId>
<artifactId>MockBukkit-v1.20</artifactId>
<version>3.9.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
Expand All @@ -87,15 +93,15 @@
</exclusions>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>8.0.28</version>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
<version>8.2.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.xerial</groupId>
<artifactId>sqlite-jdbc</artifactId>
<version>3.41.2.1</version>
<version>3.44.1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand All @@ -120,6 +126,19 @@
<artifactId>commons-text</artifactId>
<version>1.10.0</version>
</dependency>
<!-- part of org.apache.commons -->
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.15.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.sk89q.worldedit</groupId>
<artifactId>worldedit-bukkit</artifactId>
<version>7.3.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
<build>
<resources>
Expand All @@ -132,6 +151,16 @@
<include>config.yml</include>
<include>*.properties</include>
<include>presets/*.yml</include>
</includes>
</resource>
<!-- With maven-resources-plugin(shipped with maven 3.9.0+
filtering binary / compressed data breaks since it assumes UTF-8.
We don't need filtering of it anyway.-->
<resource>
<targetPath>.</targetPath>
<filtering>false</filtering>
<directory>src/main/resources</directory>
<includes>
<include>resourcepack/*.zip</include>
</includes>
</resource>
Expand All @@ -152,7 +181,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.4.0</version>
<version>3.5.1</version>
<configuration>
<filters>
<filter>
Expand Down Expand Up @@ -200,7 +229,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.2.1</version>
<version>3.3.0</version>
<executions>
<execution>
<id>attach-sources</id>
Expand All @@ -214,7 +243,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M6</version>
<version>3.2.1</version>
<configuration>
<skipTests>true</skipTests>
<forkCount>1</forkCount>
Expand All @@ -224,12 +253,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.5.0</version>
<version>3.6.1</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<version>2.8.1</version>
<version>2.16.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ public int compareTo(Item item) {
public String toString() {
StringBuilder buffer = new StringBuilder();
for (Item item : this) {
if (buffer.length() > 0) {
if (!buffer.isEmpty()) {
buffer.append((item instanceof ListItem) ? '-' : '.');
}
buffer.append(item);
Expand Down
Loading
Loading