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

Various fixes #38

Merged
merged 29 commits into from
Jan 10, 2024
Merged

Various fixes #38

merged 29 commits into from
Jan 10, 2024

Conversation

Lagggpixel
Copy link
Member

Don't merge yet

version-bump[github-action] and others added 9 commits November 29, 2023 22:13
Note getKitByName should be avoided as kit names may change
# Conflicts:
#	.github/CHANGELOG.md
#	MiniGamesBox Classic/build.gradle.kts
#	MiniGamesBox Classic/src/main/java/plugily/projects/minigamesbox/classic/kits/KitRegistry.java
#	MiniGamesBox Classic/src/main/java/plugily/projects/minigamesbox/classic/kits/basekits/Kit.java
#	MiniGamesBox Classic/src/main/java/plugily/projects/minigamesbox/classic/utils/engine/ScriptEngineHandler.java
#	MiniGamesBox Classic/src/main/resources/kits/knight.yml
#	gradle.properties
@Lagggpixel
Copy link
Member Author

With commit 8e01d1d, this means that each plugin has to handle with setting their own default kit.

@Lagggpixel
Copy link
Member Author

Mark - Start up issue with kits fixed.

@Lagggpixel
Copy link
Member Author

Complete for merging

@Lagggpixel
Copy link
Member Author

Have fun with the code review max. Everything should now be fixed.

Copy link

sonarcloud bot commented Jan 10, 2024

Quality Gate Passed Quality Gate passed

Kudos, no new issues were introduced!

0 New issues
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarCloud

@Tigerpanzer02 Tigerpanzer02 merged commit d6035af into Plugily-Projects:development Jan 10, 2024
1 check passed
Tigerpanzer02 added a commit that referenced this pull request Jan 13, 2024
* Bump version from 1.3.5 to 1.3.5-SNAPSHOT0

* More Kit enabled checks

* Bump version from 1.3.5-SNAPSHOT0 to 1.3.5-SNAPSHOT1

* Fixed kit loading & arena starting, Default config.yml changes, Added more debug messages (#38)

For reference:
config.yml
Kits: removed
Kit.Enabled and Kit.Default-Kit added
Rewards set to false by default

Removed default_kit from kitsname.yml files

* Bump version from 1.3.3 to 1.3.3-SNAPSHOT0

* Fixed script engine on upper java 11/(15)

* Moved kits.yml into kits folder, separate file per kit

* Bump version from 1.3.3-SNAPSHOT0 to 1.3.3-SNAPSHOT1

* Added getKitByKey and getKitByName

Note getKitByName should be avoided as kit names may change

* Merging changes

* Removed default kit config option from KitRegistry.loadKitConfig

* Moved config options

* Converted KitRegistry.java to use FileUtils

* Added even more debug messages

* Added outputs for performance monitoring

* Potential fix for tb

This may break other plugins, further testing and confirmation is required

* Reformat file

Took 9 seconds

* Re-sequenced changes to arena state

Took 2 minutes

* Revert for redundancy in setting timer

Took 3 minutes

* Added ArenaUpdate debug message

Took 21 minutes

* Moved ArenaUpdate debug message

Took 3 minutes

* Fixes that Max came up with

Took 25 minutes

* Kits config options

Took 8 minutes

* Changes by Max

Took 17 seconds

* Default kit loading moved to MiniGamesBox

Took 9 minutes

* Fix for kits config file being loaded on startup

Took 6 minutes

* Fix for default kit

Took 10 minutes

* Fix for a kit config option issue

Took 51 minutes

* Sub-fixes

Took 9 seconds

* Redundancy checks for disabling kits and config.yml added more comments

Took 7 minutes

* Fix for a console display issue

Took 1 minute

* Update KitRegistry.java

---------

Co-authored-by: version-bump[github-action] <41898282+version-bump[github-action]@users.noreply.github.com>
Co-authored-by: Tigerpanzer_02 <[email protected]>

* Bump version from 1.3.5-SNAPSHOT1 to 1.3.5-SNAPSHOT2

* Moved Plugin-Chat-Format to Chat.Format in config.yml

* Bump version from 1.3.5-SNAPSHOT2 to 1.3.5-SNAPSHOT3

* Removed legacy particles on newer version to prevent IllegalArgumentException because no class found of modern material

* Bump version from 1.3.5-SNAPSHOT3 to 1.3.5-SNAPSHOT4

* Cleaned up ActionBarManager

* Bump version from 1.3.5-SNAPSHOT4 to 1.3.5-SNAPSHOT5

* Fixed NPE on Setup MaterialLocationItem / Multi Handleritem RIGHT_CLICK_AIR

* Bump version from 1.3.5-SNAPSHOT5 to 1.3.5-SNAPSHOT6

* Fixed IAE Cannot measure distance between worlds if players are in different worlds

* Bump version from 1.3.5-SNAPSHOT6 to 1.3.5-SNAPSHOT7

* Adjusted CHANGELOG.md

* Bump version from 1.3.5-SNAPSHOT7 to 1.3.5-SNAPSHOT8

---------

Co-authored-by: version-bump[github-action] <41898282+version-bump[github-action]@users.noreply.github.com>
Co-authored-by: Tigerpanzer_02 <[email protected]>
Co-authored-by: Wanbin Cao <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants