Commit Graph
185 Commits
Author SHA1 Message Date
gnembon 544cf53fbf catching error when server is closing. 2021-03-18 00:39:54 -03:00
altrisi a0528ca7ed Add a way to load global configs 2020-11-29 17:34:31 +01:00
gnembon 1e7457c27f wording fixes #558 2020-11-25 02:07:46 -04:00
gnembon 209c3b9262 fixed issues with reload and missing command handler 2020-11-24 22:52:05 -04:00
gnembon a297fd1441 Scarpet rules can provide multinary boolean permission level, fixes #572 2020-11-23 02:35:01 -04:00
gnembon 3875a1708a Je ne mangerai pas 2020-11-16 09:47:01 -04:00
altrisiandgnembon ba1071a8d1 Javadocs, cleanup, extension's client rules, built-in BundledModules generators, etc (#544)
* Add javadocs to many methods

* Added built-in ways to generate BundledModules and documented them

* Add Eclipse launch files to .gitignore and fix 11 warnings

* Remove many unused imports

* Remove some dead and unused code around app loading

* Allow extensions to have client-side rules in their SettingsManager

Also change tabs to spaces when those changed

* Remove unnecessary classloader param in BundledModule

* Change max tickwarp duration to Integer.MAX_VALUE

* Move RulePrinter into the source so it can be managed by the IDE

* Properly reset hopperCounters when changing worlds

Also change tabs to spaces again and minor tweaks to javadocs

* Run mergedocs even if Full.md was modified

* Update src/main/java/carpet/commands/TickCommand.java

Co-authored-by: gnembon <41132274+gnembon@users.noreply.github.com>
2020-11-16 09:30:59 -04:00
gnembon 741edf1465 three things:
- logger is carpet, fixes #522
 - fixed fancy commands to functions - so could be used later with lambdas and functions that use different argument names
 - moved a few builtin apps to commands via /carpet
2020-11-03 04:45:08 -04:00
altrisi b9eee6e58b Allow rules to manage Scarpet apps (Scarpet Rules) (#519)
by altrisi
2020-11-02 21:52:21 -04:00
gnembon 8a2ddcbf2a 1.4.12 2020-10-01 14:14:01 -03:00
gnembon dcfdfbfff7 settings command sends now proper command feedback messages 2020-09-10 01:38:25 -03:00
gnembon fb29177d5d Merge branch 'master' into 1.16 2020-08-04 04:24:06 -03:00
Ghoulboy 3dc5f713ab added "ops" setting to each rule (#390)
* added "ops" setting to each rule

* removing changes

* implementing gnembon's fix

* removing unnecessary stuffs

* removing unnecessary changes v2

* removing unnecessary changes v3

* Separating bool from command
2020-08-03 01:32:26 -03:00
gnembon 59a0f9e32d Merge branch 'master' into 1.16 2020-06-21 17:26:30 -03:00
gnembon 04c91e7311 confirmation when rule removed from conf 2020-06-21 17:26:12 -03:00
gnembon f29153c3d2 Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/CarpetSettings.java
#	src/main/java/carpet/script/CarpetScriptServer.java
#	src/main/java/carpet/script/bundled/Module.java
2020-06-07 01:59:15 -03:00
gnembon b3484fd012 fixed missing client side server references. fixes #311 2020-06-06 20:39:25 -03:00
gnembon c61429099a mappings 2020-06-04 15:59:46 -03:00
gnembon d6845487ce changes in 1.16 require to re-register commands after datapack reload. May affect extensions with custom CMs - doubt there is any. 2020-06-02 21:05:44 -03:00
gnembon 1c46393c4d Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/utils/Messenger.java
2020-05-31 02:54:14 -03:00
gnembon f6fb8e5899 ++ got eaten 2020-05-31 01:06:41 -03:00
gnembon e540f9e238 carpet client synchronizations and protocols 2020-05-28 00:06:28 -03:00
gnembon 571a77ce64 Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/utils/Messenger.java
2020-05-26 14:44:50 -03:00
gnembon 2c777ea3ad fix client crash when accessing messenger 2020-05-26 14:44:06 -03:00
gnembon cf817c2e39 mappings 2020-05-21 14:23:04 -03:00
gnembon aabfda3797 Merge branch 'master' into 1.16 2020-05-15 20:00:55 -03:00
gnembon 74c62e5a13 simplified translations keys 2020-05-15 20:00:27 -03:00
gnembon 1e39f6caa8 updates to translations 2020-05-15 17:26:36 -03:00
X-Green 1f5b06daa2 Add Language Support For Carpet Settings (#267)
* Added language supports for carpet settings

use /set-carpet-language to set your language.

* Added zh_cn.json - in progress

Not accomplished yet, only translations for testing the language support.

* Create model_for_new_language.jsons.txt

* Rename model_for_new_language.jsons.txt to model_for_new_language.json

* Update model_for_new_language.json

* Update model_for_new_language.json

* Update and rename model_for_new_language.json to en_us.json

* Added setting CarpetLanguage

* Delete SetLanguageCommand.java

* Add files via upload

* Update SettingsManager.java

* Add files via upload

* Update LanguageUtils.java

* Update SettingsManager.java
2020-05-15 14:58:50 -03:00
gnembon 903fe1e31a Merge branch 'master' into 1.16 2020-05-13 10:37:27 -03:00
gnembon 9afd1f3211 validators to creative movement controls 2020-05-13 10:33:43 -03:00
gnembon f2e9a9de91 20w17a 2020-04-22 17:00:31 -03:00
gnembon 76080f1a59 20w14a 2020-04-02 23:38:19 -03:00
gnembon fe63334509 enabled some client side command interpretation. 2020-03-30 17:14:16 -03:00
gnembon 893122fe1f scarpet run() runs with scriptACE permissions. Fixes #175 2020-03-15 22:37:24 -03:00
gnembon 493cea2c13 added commandScriptACE setting and custom permissions for scarpet. 2020-03-11 02:39:39 -03:00
gnembon e04a8be9e8 Merge branch 'master' into 1.15
# Conflicts:
#	src/main/java/carpet/script/CarpetExpression.java
2020-02-03 10:58:17 -04:00
gnembon b4a50b8c3f mulitple counters in hud - not really needed but why not. 2020-02-02 00:03:38 -04:00
gnembon c995716357 Merge branch 'master' into 1.15
# Conflicts:
#	src/main/java/carpet/fakes/StructureFeatureInterface.java
#	src/main/java/carpet/mixins/PistonBlock_movableTEMixin.java
2020-01-06 21:28:07 -04:00
gnembon 6ac249968a remove a few warnings 2020-01-06 21:26:44 -04:00
gnembon 8f9dd66cdf Merge branch 'master' into 1.15
# Conflicts:
#	src/main/java/carpet/mixins/BuriedTreasureGeneratorPieceMixin.java
#	src/main/java/carpet/mixins/ClientPlayerInteractionManager_ghostBlocksMixin.java
#	src/main/java/carpet/mixins/FossilFeatureMixin.java
#	src/main/java/carpet/mixins/GravityStructureProcessorMixin.java
#	src/main/java/carpet/mixins/IglooGeneratorPieceMixin.java
#	src/main/java/carpet/mixins/KelpFeatureMixin.java
#	src/main/java/carpet/mixins/MobEntity_leashMixin.java
#	src/main/java/carpet/mixins/OceanRuinGeneratorPieceMixin.java
#	src/main/java/carpet/mixins/PistonBlockEntityRenderer_movableTEMixin.java
#	src/main/java/carpet/mixins/PlayerEntity_horseFixMixin.java
#	src/main/java/carpet/mixins/PortalBlock_portalCachingMixin.java
#	src/main/java/carpet/mixins/PortalForcer_portalCachingMixin.java
#	src/main/java/carpet/mixins/SaplingBlockMixin.java
#	src/main/java/carpet/mixins/ServerPlayerInteractionManager_ghostBlocksMixin.java
#	src/main/java/carpet/mixins/ShipwreckGeneratorPieceMixin.java
#	src/main/java/carpet/mixins/SpawnHelperMixin.java
#	src/main/java/carpet/mixins/StructurePieceMixin.java
2019-12-10 23:14:04 -04:00
gnembon 55065a38a6 moved CarpetSettings up from settings manager, should be easier to find later. 2019-12-10 23:08:40 -04:00
gnembon 8b1286f8af fixed missed command registration for extension, 1.3.0, added optional version. 2019-12-10 23:01:30 -04:00
gnembon 442b802638 Merge branch 'master' into 1.15 2019-12-09 10:36:40 -04:00
gnembon 5b2d45f152 1.2.6 aka 1.3 pre-1 2019-12-09 10:34:32 -04:00
gnembon 56ea9ac961 cleaning up fixed 1.15 features 2019-12-06 16:49:50 -04:00
gnembon 3907a949a3 Merge branch 'master' into 1.15 2019-12-06 13:41:39 -04:00
gnembon 9cca6ddfb5 just to make sure string booleans are handled properly 2019-12-06 13:41:13 -04:00
gnembon 645f5db2bf block commands by default supports new extended boolean values 2019-12-06 12:47:52 -04:00
gnembon 8cb2455eab Merge branch 'master' into 1.15 2019-12-03 16:41:03 -04:00