Commit Graph
552 Commits
Author SHA1 Message Date
gnembon 8f2c935fe6 Merge branch 'master' into 1.17
# Conflicts:
#	src/main/java/carpet/network/ClientNetworkHandler.java
#	src/main/resources/assets/carpet/scripts/ai_tracker.sc
2021-04-17 01:37:40 -03:00
gnembon 3e24c24648 silenced obtrusive log message with custom biomes. Fixes #810 2021-04-17 00:47:12 -03:00
gnembon 18705e44ba fixed distance_beta app 2021-04-16 23:23:42 -03:00
gnembon f517d2b79d Merge pull request #741 from Ghoulboy78/distance_beta-upgrade
Update distance_beta.sc
2021-04-16 23:08:19 -03:00
gnembon 6ef85437a9 fixed ai_tracker commands 2021-04-16 23:07:00 -03:00
gnembon 0fd7057138 Merge pull request #739 from Ghoulboy78/ai_tracker-upgrade
Update ai_tracker.sc
2021-04-16 22:51:00 -03:00
gnembon d0fa948a46 Merge branch 'master' into 1.17 2021-04-16 13:02:12 -03:00
gnembon df26e9853a fixed camera's commands 2021-04-16 12:34:11 -03:00
Fallen_Breath 0f051cb4f7 Fixed #745 2021-04-16 11:06:40 +08:00
gnembon 0dd88cd1dc Merge branch 'master' into 1.17
# Conflicts:
#	src/main/java/carpet/utils/WoolTool.java
2021-04-15 14:49:17 -03:00
gnembon a1e0cfbc69 naming 2021-04-14 22:49:06 -03:00
b7252a3465 Fixing small issues (#717)
* adding unix_time and convert_dat eto editor autocomplete

I never used it, and only realised rn when I needed it.

* updating npp docs too

* Fixes #690

Fixes #690

* Fixes #687

Fixes #687

* fixes #672

* adding comma to make it look gooder

* Update src/main/java/carpet/helpers/HopperCounter.java

* using alias to shorten code

* compacting wool code

* Fixing minor todos

* removing hit/hand garbage

* removing scoreboards garbage

* making sure I dont edit file accidentally

* fixing borken code and problem with pink and magenta showing same colour

* Change name of mod to, you know, actually be the name of the mod

* Reverting previous change because it is more descriptive of the actual mod

* Update src/main/java/carpet/script/api/WorldAccess.java

Co-authored-by: Ghoulboy78 <ghoulboy78@gmail.com>
Co-authored-by: gnembon <41132274+gnembon@users.noreply.github.com>
2021-04-14 22:47:14 -03:00
gnembon d3295e6b4e 21w15a 2021-04-14 15:07:08 -03:00
replaceitemandgnembon c878ffd637 Added renewableDeepslate (#806)
* Added renewableDeepslate

* Check for stillness

Co-authored-by: gnembon <41132274+gnembon@users.noreply.github.com>
2021-04-13 10:44:49 -03:00
gnembon 388a3de577 Merge branch 'master' into 1.17
# Conflicts:
#	src/main/java/carpet/mixins/ServerWorld_scarpetMixin.java
#	src/main/java/carpet/script/api/WorldAccess.java
2021-04-09 01:40:38 -03:00
gnembon e063748e83 added create_explosion and more event handlers. 2021-04-09 01:38:00 -03:00
7b00952653 Added onExplosion Scarpet Event (#620)
* Added onExplosion Scarpet Event

* Reverted changes to Full.md

* Grammar corrections by James103

Co-authored-by: James103 <37945304+James103@users.noreply.github.com>

* Separated Explosion Mixins

Applied Ghoulboy78 suggestion.
WARNING: 'blocks' list is now empty if 'explosionNoBlockDamage' carpet rule is set to 'true'

* List Value from Triple

Suggested by Gnembon

* Explosion Mixin priority

Suggestion by Gnembon

* Added affectedEntities parameter

* Updated docs

* Optimizing calls

* Update src/main/java/carpet/helpers/OptimizedExplosion.java

* Update docs/scarpet/api/Events.md

Co-authored-by: gnembon <41132274+gnembon@users.noreply.github.com>

* Update docs/scarpet/api/Events.md

Co-authored-by: gnembon <41132274+gnembon@users.noreply.github.com>

* Update src/main/java/carpet/mixins/Explosion_scarpetEventMixin.java

Co-authored-by: gnembon <41132274+gnembon@users.noreply.github.com>

Co-authored-by: James103 <37945304+James103@users.noreply.github.com>
Co-authored-by: gnembon <41132274+gnembon@users.noreply.github.com>
2021-04-08 18:05:13 -03:00
Ghoulboy e3f1302be0 Removing random line of code... 2021-04-08 18:03:45 +02:00
gnembon 0cce983092 Merge branch 'master' into 1.17
# Conflicts:
#	src/main/java/carpet/commands/PerimeterInfoCommand.java
#	src/main/resources/carpet.mixins.json
2021-04-04 22:34:38 -03:00
gnembon 00f932bafc Can place skulls inside when creativeNoClip. Fixes #775 2021-04-04 18:28:25 -03:00
gnembon 5dd2a12aa7 mapping 2021-04-02 18:38:55 -03:00
Ghoulboy 0a54176383 removing random variable declaration 2021-03-31 16:05:53 +02:00
gnembon 365892b9ca cleaner 2021-03-24 02:22:21 -03:00
gnembon 8be832a74c Merge branch 'master' into 1.17 2021-03-23 20:15:44 -03:00
gnembon ff4b292871 Merge pull request #742 from Ghoulboy78/draw_beta-upgrade
Update draw_beta.sc
2021-03-23 08:36:42 -03:00
Ghoulboy 36f766ae75 Removing return statements to improve performance by a few microprocessor ticks to satisfy @altrisi 2021-03-12 22:36:25 +01:00
gnembon a82a9a60a3 Merge branch 'master' into 1.17
# Conflicts:
#	src/main/java/carpet/script/api/Inventories.java
#	src/main/java/carpet/script/api/WorldAccess.java
#	src/main/java/carpet/script/value/EntityValue.java
2021-03-07 16:39:17 -04:00
gnembon 38458a8e35 added create_datapack, check_hidden_dimensions and world_dimensions in system info. 2021-03-07 16:37:13 -04:00
Ghoulboy78 6d7f7a7bdc improving prims not to calculate blocks unnecessarily (thx @Firigion) 2021-03-05 22:24:42 +01:00
Ghoulboy a957af32d1 removing _carpets stuff to detach from carpet rules 2021-03-02 18:32:04 +01:00
Ghoulboy 356f3e94d6 fixing editing oopsies 2021-03-02 18:29:55 +01:00
gnembon a58dface03 Merge branch 'master' into 1.17 2021-03-02 09:17:13 -04:00
gnembon 8f592735ca fixes 2021-03-02 09:16:56 -04:00
gnembon 34bfe32e39 Merge branch 'master' into 1.17 2021-03-02 08:48:46 -04:00
Andrew S 69a0eeed7d Add pingPlayerListLimit setting (#704)
* Update CarpetSettings.java

* Add pingPlayerListLimit

* Fix formatting & fail softer
2021-03-01 22:48:31 -04:00
Ghoulboy78 41186c1da3 using in-built distance func (cos previous one wasnt even used lol) 2021-02-24 12:33:50 +01:00
Ghoulboy78 facac439cf compacting hollow code 2021-02-24 12:11:51 +01:00
Ghoulboy78 467767a8e7 using bresenham algorithm for circles to make it more efficient 2021-02-24 12:06:17 +01:00
Ghoulboy78 fa75401278 minor editing tweaks 2021-02-24 10:17:06 +01:00
Ghoulboy78 eafc618792 oboi, remember that caching bs? I apparently forgot to remove this bit lol 2021-02-24 10:14:57 +01:00
Ghoulboy78 ac031090ef making the shapes in shapes.scl purely mathematical, no strings attached, only returning a set of the positions to iterate over. 2021-02-24 10:14:28 +01:00
Ghoulboy78 8eba0b9b8a removed debug and easter egg 2021-02-24 09:46:28 +01:00
Ghoulboy78 180b2285f9 moved drawing commands to separate library app
now gotta import, and fix issues
2021-02-24 09:44:43 +01:00
Ghoulboy78 96bce75db1 Update draw_beta.sc 2021-02-24 09:40:20 +01:00
Ghoulboy78 5287fed712 Update distance_beta.sc 2021-02-24 09:39:04 +01:00
Ghoulboy78 b649f5c830 Update camera.sc 2021-02-24 09:37:21 +01:00
Ghoulboy78 71c82acdb1 Update ai_tracker.sc 2021-02-24 09:35:23 +01:00
gnembon d537faae98 restored structureBlockOutlineDistance 2021-02-17 23:36:11 -04:00
gnembon 6108cdce23 Merge branch 'master' into 1.17 2021-02-08 23:54:23 -04:00
gnembon 4c09d6b736 added __on_start and defined better meta-events 2021-02-08 18:08:38 -04:00