Merge Upstream #24
Merged
Merge Upstream #24
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ItemData - fixes
* Entity Invulnerability Syntax * Changes * Test
* Entity Silence Syntax * License * Merge EffSilence and EffUnsilence * Changes * Change pattern * Change pattern * Test
* ExprPlayerWeather - fix - Fix some issues with not properly setting/resetting player's weather * ExprPlayerWeather - change - Change suggested by Blueyescat
- Removed some really old code that was used before MC 1.6 - Updated to use newer attributes to make this class more future proof in the event the deprecated Damageable#getMaxHealth and Damageable#setMaxHealth methods are removed
* ExprPlayerWeather - fix - Fix some issues with not properly setting/resetting player's weather * ExprPlayerWeather - change - Change suggested by Blueyescat
* Skript - mainClass - change - Add version to addon * Skript - mainClass - change - Shortened everything down to getFullName * Revert "Skript - mainClass - change - Shortened everything down to getFullName" This reverts commit 8950547 * Skript - mainClass - changes - Changed to getFullName
* new CustomModelData expressions/condition * ExprItemWithCustomModelData - changes - Remove a line i had for testing/reading - Import ParseResult directly * CondHasCustomModelData - changes - Forgot the RequiredPlugins 1.14 part for this class * CondHasCustomModelData - changes - Use itemtypes instead of itemstacks * ExprCustomModelData - changes - Use itemtypes instead of itemstacks * ExprCustomModelData - changes - Changed item meta call * CustomModelData - changes - Added a test for custom model data * ExprCustomModelData - changes - moved test script
* HealthUtils - update - Removed some really old code that was used before MC 1.6 - Updated to use newer attributes to make this class more future proof in the event the deprecated Damageable#getMaxHealth and Damageable#setMaxHealth methods are removed * HealthUtils - update - Added a test script for health utils
* ExprClientViewDistance - new * ExprClientViewDistance - changes - Changed to SimplePropertyExpression as suggested by Blueyescat * ExprClientViewDistance - changes - forgot plural * ExprClientViewDistance - changes - Removed parenthesis as requested by Bensku * ExprClientViewDistance - changes - Add explanation to difference between player view distance and client view distance
* FishData * Comparison Fixes Asterisk Asterisk Asterisk * Add Space Co-Authored-By: Giovanni <42092549+Matocolotoe@users.noreply.github.com>
It was decided that ExprLastDeathTime should just be handled in a to-be-made ExprStatistic
Time Since Expression
* Add ItemStack stuff to ExprName * Actual Fix * Make AIR constant static
Modifying Korean Language Accuracy
* Remove Unnecessary Casts * Remove Unnecessary Type Specifications
* Fix inventory showing wrong type when using "show" effect * line change
* Create ExprExplosionYield.java * Fix event tag * Fix issues * Update naming * add clarity * Update changer, patterns, and formatting
* Fiery Explosion Stuff * Fix Condition * Merge conditions * Make Requested Changes * Fix test * Pattern Changes & Refactoring * Test and pattern fixes
* Add expressions * Creeper Support / Suggestions * Make Requested Changes * Cleanup * Rename element files and update formatting
* First Pass
* Add version checks
* Fix issues
* More Fixes
- Make it work with items and valid blocks
- Add test
- Add to documentation
* Improve PersistentDataType & Make Variable Change
* List Support
took some time but it's here!
review is definitely needed.
* Refactoring and More Changers and Tests
- The custom persistent data types were moved to their own classes
- The methods within the utility class have been split up into two categories: single var and list var
- Two methods were added to get/set the list var map of a user
- Added changers for add, remove, and remove all
- The test has been expanded to support the new additions
- The syntax files had there init methods cleaned up
- New Javadoc for all methods and classes
* Make some changes & fix issues
- The ADD changer has been reworked:
- avoid replacing "*" in varName multiple times
- can now ADD even when the varMap is null
- use Collections#addAll instead of looping & adding
- Removed pointless replacement in B64 conversion
- Removed null checks for the NamespacedKey (it can't be null anymore)
- Rework getList to use getListMap to avoid code repetition
- Update the test
- Fix a critical issue where {myTag::1} existing would result in {myTag} also existing in some cases (fixed by appending "!!SINGLE!!" and "!!LIST!!" where needed)
- Updated the persistent data holder type description
- Cleaned up imports
* Avoid unnecessary and/or repetitive serialization/deserialization
- Make "persistent data" optional in the syntax
- ADD no longer deserializes every value in the list
- Most methods now take in multiple holders
- Javadoc cleanup
* Gamerule Expression * Add Gamerule and GameruleValue Types for Gamerule Expression * GameRule Version Requires 1.13 or newer * Proper gamerule version checks * Fix example * revert LF to CRLF * fix more conflicts * remove settings changes * ExprName fix and minor changes * Conditionally add gamerule type to Expr
* Rename Persistent Data * Update Test
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Target Minecraft Versions:
Requirements:
Related Issues: