Compare commits

...

3028 Commits

Author SHA1 Message Date
Zoë Gidiere
6b60246694
Merge pull request #514 from PolyhedralDev/dev/1.21.7
Update to 1.21.7
2025-06-30 11:13:24 -06:00
OakLoaf
1a1f461550 Corrected version in fabric.mod.json 2025-06-30 17:57:19 +01:00
OakLoaf
da20e282ce Updated Fabric to 1.21.7 2025-06-30 17:53:50 +01:00
OakLoaf
9b14b0ee96 Updated Bukkit to 1.21.7 2025-06-30 16:47:29 +01:00
Zoë Gidiere
118aeb872f
Merge pull request #511 from PolyhedralDev/dev/wolves
Fixed wolf variant support for Paper platform
2025-06-23 13:17:18 -06:00
OakLoaf
5446b729f9 Finalised wolves 2025-06-19 21:44:24 +01:00
Oak
d71c6bb25f Corrected checks 2025-06-19 21:22:06 +01:00
Oak
d8524603c6 Implemented wolf variant support 2025-06-19 21:12:24 +01:00
OakLoaf
85234ddc39 Progress on wolves 2025-06-19 20:50:31 +01:00
OakLoaf
78162eaafe Added vanilla biome key to biome context 2025-06-19 20:49:57 +01:00
OakLoaf
7a041d8a63 Removed unused import 2025-06-19 20:49:37 +01:00
Zoë Gidiere
8cfa2e1467
bump version 2025-06-19 12:23:59 -06:00
Zoë Gidiere
5f367c0f2c
Merge pull request #510 from PolyhedralDev/dev/multiverse-fix
Fixed issues causing plugin to fail to load if Multiverse is not present
2025-06-19 12:00:07 -06:00
OakLoaf
f4db7fc507 Added initial wolf variant support (not functional) 2025-06-19 15:46:46 +01:00
OakLoaf
ad9d16f48c Updated biome collection 2025-06-19 15:46:18 +01:00
OakLoaf
85b6dcc891 Moved all code that requires Multiverse imports into MultiverseGeneratorPluginHook 2025-06-19 14:24:04 +01:00
Zoë Gidiere
29691dfb4d
Merge pull request #509 from everbuild-org/master
feat: backport latest minestom support from 7.0 branch
2025-06-18 17:49:21 -06:00
Christian Bergschneider
81eab13ce1
feat: backport latest minestom support from 7.0 branch 2025-06-19 01:42:31 +02:00
Zoë Gidiere
68d5b22ca4 bump fabric dep version 2025-06-17 19:08:14 -06:00
Zoë Gidiere
40b8c85c75 Cleanup 2025-06-17 18:50:24 -06:00
Zoë Gidiere
63367e5f03 Final changes 2025-06-17 18:41:09 -06:00
Zoë Gidiere
1d95e7a87d
Merge pull request #506 from benwoo1110/feat/multiverse-hook
Implement multiverse generator plugin hook
2025-06-17 16:23:19 -06:00
Zoë Gidiere
b2e21d8b70
Merge pull request #508 from PolyhedralDev/dev/1.21.6
Dev/1.21.6
2025-06-17 15:34:38 -06:00
Zoë Gidiere
4041239b03 fix build 2025-06-17 15:28:47 -06:00
Zoë Gidiere
280699bbce Update to 1.21.6 and fix a lot of bugs in fabric impl 2025-06-17 15:21:21 -06:00
Zoë Gidiere
6984dc29d0 Fix fabric 2025-06-14 00:45:32 -06:00
Zoë Gidiere
bd253ea5d2 Merge branch 'master' into dev/1.21.6 2025-06-13 22:08:53 -06:00
OakLoaf
d743d7d1df Updated fabric to rc1 2025-06-13 22:50:55 +01:00
OakLoaf
238a7954a7 Added paperweight to bukkit platform for runDevBundleServer task 2025-06-13 21:56:54 +01:00
OakLoaf
c2319ca4ab Updated to 1.21.6-rc.1 2025-06-13 20:17:56 +01:00
Ben Woo
95172bfa7e Fix checkstyle for catch 2025-06-13 22:33:41 +08:00
Ben Woo
124dbc8836 Improve error checking for multiverse hook 2025-06-13 19:13:57 +08:00
Zoë Gidiere
8706340584 Fix wolves 2025-06-12 16:25:14 -06:00
OakLoaf
9a9f90aa0d Updated fabric platform to 1.21.6 2025-06-10 12:01:17 +01:00
OakLoaf
20a5bfdd0f Updated bukkit platform to 1.21.6 2025-06-10 11:44:10 +01:00
Ben Woo
4fee8cdb24 More example usages by iterating config pack 2025-06-10 12:06:24 +08:00
Ben Woo
70de38ffcb Fix exception variable name 2025-06-10 12:05:59 +08:00
Ben Woo
6722d22f72 Fix onarandombox repo url 2025-06-10 12:05:46 +08:00
Ben Woo
c5526c86a2 Implement multiverse plugin hook 2025-06-09 22:58:41 +08:00
Zoë Gidiere
84fa72f96c Catch all runtime errors when loading packs 2025-06-07 22:14:36 -06:00
Zoë Gidiere
cc5258ce73 bump version 2025-06-07 21:12:26 -06:00
Zoë Gidiere
748e027282
Merge pull request #505 from HaHaWTH/master
Identify Moonrise worker threads correctly
2025-06-07 07:18:45 +00:00
HaHaWTH
bf6612edd0 Identify Moonrise worker threads correctly 2025-06-07 00:17:51 +14:00
Zoë Gidiere
d90a4200fe
Update gradle-build.yml 2025-06-05 19:19:43 -06:00
Zoë Gidiere
af9fb211a8 bump fabric minecraft dep 2025-06-05 17:50:44 -06:00
Zoë Gidiere
e4395cec83 bump version 2025-06-05 17:18:55 -06:00
Zoë Gidiere
bab8923f1e
update overworld version 2025-06-04 00:21:14 -06:00
Zoë Gidiere
b4068e6c59 Merge branch 'dev/1.21.5' 2025-06-03 22:28:48 -06:00
Zoë Gidiere
b143c72d0e
Dev/1.21.5 (#495)
* Bukkit Build Fix (#494)

* Bukkit Build Fix

* remove comments

* remove papermc repo from gradle settings

* add back gradle shasum

* fix formatting, update gradle hash

* Initial Fabric 1.21.5

* Updated dependencies

* Updated SpawnerData with backwards compat

* Updated dependencies

* Updated setBlockState usage - needs verifying as flags are confusing

* Refactored Bukkit NMS packages

* Initial attempt at updating mixin-commons

* Continue fabric 1.21.5 WIP

* Some additional logging

* Update deps

* Build fixes and update allay

* Add oak to authors

---------

Co-authored-by: Mikal <Ifiht@users.noreply.github.com>
Co-authored-by: OakLoaf <oak@beaconstudios.org>
2025-06-03 22:20:23 -06:00
Zoë Gidiere
5f5e70970b Add oak to authors 2025-06-03 21:40:14 -06:00
Zoë Gidiere
ec812ef5fb Build fixes and update allay 2025-06-03 21:33:56 -06:00
Zoë Gidiere
85826071cb Update deps 2025-06-03 20:25:55 -06:00
Zoë Gidiere
c4f093210a Some additional logging 2025-06-03 15:15:07 -06:00
Zoë Gidiere
f14d22b264 Continue fabric 1.21.5 WIP 2025-06-03 13:59:11 -06:00
OakLoaf
016961c19c Initial attempt at updating mixin-commons 2025-04-17 17:41:45 +01:00
OakLoaf
9f3e225b62 Refactored Bukkit NMS packages 2025-04-17 16:32:59 +01:00
OakLoaf
c95df25d30 Updated setBlockState usage - needs verifying as flags are confusing 2025-03-27 20:22:35 +00:00
OakLoaf
0adca3c227 Updated dependencies 2025-03-27 20:21:13 +00:00
OakLoaf
782b300d1f Updated SpawnerData with backwards compat 2025-03-27 19:22:34 +00:00
OakLoaf
967a4a0b2b Updated dependencies 2025-03-27 19:22:23 +00:00
Zoë Gidiere
d3df5e56c3 Initial Fabric 1.21.5 2025-03-25 16:26:43 -06:00
Mikal
dabc2359b3 Bukkit Build Fix (#494)
* Bukkit Build Fix

* remove comments

* remove papermc repo from gradle settings

* add back gradle shasum

* fix formatting, update gradle hash
2025-03-25 16:25:51 -06:00
solo
1d658bd52d
Remove Allay Mappings Submodules (#493)
* Download allay mappings from github instead of using git submodules

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>

* Remove allay gitignore

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>

* Use the same dependency notation as the rest of the project

---------

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
2025-03-25 15:14:51 -06:00
Zoë Gidiere
4bef2f5a7f
Merge pull request #491 from PolyhedralDev/duplexsystem-patch-1
Update Mapping.java
2025-03-06 21:45:41 +00:00
Zoë Gidiere
18cb08b622
Update Mapping.java 2025-03-06 21:45:23 +00:00
Zoë Gidiere
1b15694878
Merge pull request #490 from AllayMC/dev/allay-api-0.2.0
feat: adapt allay-api 0.2.0
2025-03-06 21:32:44 +00:00
Dmitry Luk
267994427e fix: .gitignore 2025-03-07 01:05:15 +04:00
Dmitry Luk
248eb174d8 refactor: use submodules 2025-03-07 01:02:32 +04:00
Dmitry Luk
0a93b0fac3 fix: apply project code style 2025-03-07 00:39:22 +04:00
Dmitry Luk
03124cb008 refactor: mappings loading
docs: add how to use in README.md
2025-03-06 15:22:04 +04:00
Dmitry Luk
14a07602ee fix: correct bundle mapping [
6808d0e](6808d0e16a)
chores: sort je default states and add new
2025-03-03 16:23:54 +04:00
daoge_cmd
167a712c0e feat: adapt allay-api 0.2.0 2025-03-03 19:52:25 +08:00
Zoë Gidiere
83bc2c9022
Bump Version 2025-03-02 06:42:12 -07:00
Zoë Gidiere
06a60b3db4
Merge pull request #489 from RitaSister/patch-1
fix crash chunk generate column in generate chunk process
2025-03-02 06:41:41 -07:00
Mirai
1b4824c5db
fix crash chunk generate column in generate chunk process
The change removes the subtraction of one from properties.getMinHeight(), fixing a crash on version 1.21.4.
2025-03-02 09:57:48 +02:00
Zoë Gidiere
49c6e70037 try catch downloading packs for offline usage 2025-03-01 10:48:58 -07:00
Zoë Gidiere
c36b12e657 Fix Vanilla Features Spawning in Terra Biomes 2025-03-01 10:48:42 -07:00
Zoë Gidiere
9906771fbc
Merge pull request #472 from PolyhedralDev/ver/6.6.0
Ver/6.6.0
2025-02-28 04:31:06 +00:00
Zoe Gidiere
e0a26046a0 Update Fabric version info 2025-02-27 19:51:18 -07:00
Zoe Gidiere
8bad33ef22 fabric 1.21.4 2025-02-27 19:33:51 -07:00
Zoë Gidiere
f278ae7ab5 update licence 2025-02-26 22:34:41 -07:00
Zoë Gidiere
a61c6b8a97 Merge remote-tracking branch 'everbuild-org/feat/platform/minestom' into ver/6.6.0 2025-02-26 10:22:37 -07:00
Zoë Gidiere
830ede9272
Merge pull request #484 from AllayMC/dev/allay-update
fix: adapt allay update
2025-02-26 10:20:43 -07:00
Zoë Gidiere
8e544a68d4
Merge pull request #483 from PolyhedralDev/dev/1.21.4
Add support for 1.21.4 on Paper
2025-02-26 10:20:25 -07:00
daoge_cmd
e8e9f69fac feat: use allay-api 0.1.3 2025-01-26 19:48:23 +08:00
Christian Bergschneider
3a7d1a69d0
feat: use system property for configurable data folder path
Updated `getDataFolder` to allow customization via the `terra.datafolder` system property. This ensures greater flexibility for specifying the data folder location, while maintaining the default path if the property is not set.
2025-01-25 04:42:52 +01:00
Christian Bergschneider
7b29d25847
fix: remove unused application plugin from Minestom platform build script 2025-01-05 17:04:27 +01:00
Christian Bergschneider
810d10ac0a
fix: move minestom example to own module 2025-01-05 16:58:28 +01:00
Christian Bergschneider
aecc003f23
fix: minestom and slf4j as transitive dependencies 2025-01-05 16:49:20 +01:00
Christian Bergschneider
d0bc006faa
chore: reformat 2025-01-04 20:42:54 +01:00
daoge
98aadc816b
feat: use allay-api 0.1.2 2025-01-04 17:49:38 +08:00
Christian Bergschneider
992ae592fd
fix: Implement GeneratorWrapper interface in Minestom wrapper 2025-01-04 00:14:32 +01:00
Christian Bergschneider
7711e67999
feat: support reload 2025-01-04 00:10:35 +01:00
Christian Bergschneider
35bdc99873
build: make available via maven repo 2025-01-03 23:52:31 +01:00
Christian Bergschneider
5ba5d6efdd
revert: block type implementation hint 2025-01-03 22:19:08 +01:00
Christian Bergschneider
c848c33bc0
fix: add lighting engine to test server 2025-01-03 17:28:47 +01:00
Christian Bergschneider
ff153ddc21
feat: allow external block entity implementations 2025-01-02 23:22:44 +01:00
Christian Bergschneider
cb2841ed4f
fix: Adjust progress bar update interval to every 60 ticks. 2025-01-02 20:54:56 +01:00
Christian Bergschneider
4f668adb67
feat: add chunk filtering for debugging and remove feature caching
Removed Feature caching since it was buggy asf
2025-01-02 20:49:07 +01:00
Christian Bergschneider
1d8a208d10
feat: implement platform enchantments 2025-01-02 19:32:14 +01:00
Christian Bergschneider
6279638363
feat: implement platform biome 2025-01-02 12:27:40 +01:00
Christian Bergschneider
23b846eca9
feat: get faster generation times 2025-01-02 00:48:26 +01:00
Christian Bergschneider
d1f881ca2c
feat: minestom entities 2025-01-01 20:39:09 +01:00
Christian Bergschneider
b4ab3769b0
Merge branch 'ver/6.6.0' into feat/platform/minestom 2025-01-01 18:48:48 +01:00
Christian Bergschneider
d5ab3e23f5
feat: better example server 2025-01-01 18:41:33 +01:00
Christian Bergschneider
3a28551e97 fix: generate populators in every chunk 2024-12-29 18:55:47 +01:00
Christian Bergschneider
ac66fc7d69 fix: different populators now know about each other 2024-12-29 15:51:05 +01:00
Christian Bergschneider
bfc1c32d46 feat: surface decoration generation but only in even chunks 2024-12-29 15:17:35 +01:00
Christian Bergschneider
fa6e0e0ae4 feat: feature generation but only in even chunks 2024-12-28 21:41:51 +01:00
Christian Bergschneider
f953c5085d feat: start generating features 2024-12-28 20:05:50 +01:00
Christian Bergschneider
7288373dbc feat: cache generated chunks
This commit is in preparation of multi-layered worldgen with minestom
2024-12-28 18:18:17 +01:00
Christian Bergschneider
983cb1f012 feat: base terrain generation with minestom 2024-12-28 12:22:07 +01:00
daoge_cmd
944c04b9b8 feat: use allay-api 0.1.0 2024-12-23 00:43:51 +08:00
Dmitry Luk
73a2c70794 chores: pretty-print biomes.json 2024-12-17 13:53:18 +04:00
daoge_cmd
088523222d chores: remove unrelated code reformatting 2024-12-17 13:17:11 +08:00
daoge_cmd
6badce6bc7 chores: use pretty print for je_block_default_states.json 2024-12-17 12:48:24 +08:00
daoge_cmd
92a5134458 revert: revert code format related changes 2024-12-17 12:43:46 +08:00
daoge_cmd
4222eef531 deps: use specified allay-api version 2024-12-17 12:31:03 +08:00
Dmitry Luk
9b6a503f31 fix: adapt allay update
* feat: update mapping files to latest
2024-12-16 23:28:19 +04:00
OakLoaf
82a9ecf736 Fixed typo 2024-12-12 15:24:38 +00:00
OakLoaf
eec4db43b2 Added support for 1.21.4 2024-12-12 12:40:33 +00:00
OakLoaf
1d3c380784 Reverted to old methods grass and foliage color methods 2024-11-05 16:50:04 +00:00
OakLoaf
65e4c9a149 Removed comment 2024-11-01 19:46:34 +00:00
OakLoaf
d4549643fc The definition of AwfulBukkitHacks 2024-11-01 16:46:33 +00:00
OakLoaf
a87ad8c966 Bumped Paper version 2024-11-01 16:10:36 +00:00
OakLoaf
153f6e5a87 Recreated old reset tags method 2024-11-01 13:36:41 +00:00
OakLoaf
a385a43250 Moved registry unfreeze 2024-11-01 12:02:49 +00:00
OakLoaf
3cd6aead64 Changed biome registry casting 2024-11-01 12:02:32 +00:00
OakLoaf
4f33b11828 Fixed issue with RegistryFetcher 2024-11-01 12:02:09 +00:00
OakLoaf
f5bbaa3c3a Corrected class proxy 2024-11-01 11:57:35 +00:00
Zoe Gidiere
4fd84a3f2d Fix paralithic relocating 2024-10-31 13:42:41 -06:00
Zoë Gidiere
bed67c211d
Merge pull request #478 from PolyhedralDev/dev/let-expression
Add let expression support
2024-10-30 18:51:05 +00:00
Astrash
2c8d3416ab Load parse options before registering metaconfig 2024-10-30 14:04:40 +11:00
Astrash
5e43f0afef Add support for Paralithic let expressions 2024-10-30 14:04:40 +11:00
Zoe Gidiere
02fdcee705 Fix fabric 2024-10-29 20:24:32 -06:00
Zoe Gidiere
4165224c51 Mark Cache Sampler Experimental 2024-10-29 16:04:55 -06:00
Zoe Gidiere
710bbc33c9 Refractor bukkit to v1_21_3 2024-10-29 15:53:48 -06:00
Zoë Gidiere
1929239015
Merge pull request #473 from PolyhedralDev/dev/biomes3
Some refractors and updates to platofrm biomes
2024-10-29 20:27:42 +00:00
Zoe Gidiere
3ca90808f0 Fix up 2024-10-29 14:23:45 -06:00
Zoe Gidiere
9d91440997 fixup 2024-10-29 14:14:25 -06:00
Zoe Gidiere
f98062d417 Merge remote-tracking branch 'origin/dev/bukkit/biome-settings' into dev/biomes3 2024-10-29 13:53:08 -06:00
OakLoaf
8df3a4dd02 Added NMSAddon override for BukkitAddon 2024-10-29 19:38:59 +00:00
OakLoaf
afd2c81b19 Made grass colour use default if none is defined 2024-10-29 18:31:37 +00:00
Zoë Gidiere
4432ae4867
Merge pull request #476 from AllayMC/dev/support-world-unload
feat: support world unloading
2024-10-28 18:18:23 +00:00
daoge_cmd
16c951838b feat: support world unloading 2024-10-28 17:39:25 +08:00
OakLoaf
8de4f1198a Started adding more biome settings to bukkit 2024-10-26 10:02:32 +01:00
Zoe Gidiere
144c932703 mixin tweak 2024-10-25 16:09:42 -06:00
Zoë Gidiere
e56b8856fa
Merge pull request #474 from AllayMC/allay
feat: add support for allay platform
2024-10-25 16:05:58 -06:00
Zoë Gidiere
04f6d18198
Merge pull request #470 from PolyhedralDev/dev/1.21.2
Dev/1.21.2
2024-10-25 14:09:16 -06:00
Zoe Gidiere
640645b96b fix version 2024-10-25 14:03:27 -06:00
Zoe Gidiere
a70738eda5 Version updates 2024-10-25 13:58:33 -06:00
OakLoaf
62756d2784 Updated Bukkit to support 1.21.3 2024-10-25 19:36:18 +01:00
Zoe Gidiere
32f8907cb1 Merge branch 'ver/6.6.0' into dev/1.21.2 2024-10-25 12:28:03 -06:00
Astrash
b75e9c152e Refactor palette addon 2024-10-18 19:29:48 +11:00
Astrash
c190485dbe Use more appropriate names in probability collection loader 2024-10-18 17:50:41 +11:00
Astrash
e756953828 Use singleton impl for map based probability collections 2024-10-18 17:49:07 +11:00
daoge
071f9d39af
docs: fix a typo in README.md 2024-10-15 10:03:54 +08:00
daoge_cmd
d2107fd258 fix: chunkGenerator should be overwritten after reloading 2024-10-14 22:37:09 +08:00
daoge_cmd
df3e623530 feat: implement config pack reloading 2024-10-14 22:13:54 +08:00
daoge_cmd
f0d03d4538 feat: fallback to FLAT generator if config pack name is missing 2024-10-14 21:34:23 +08:00
daoge_cmd
84fe8792d6 fix: fix entrance in plugin.json 2024-10-14 21:33:59 +08:00
daoge_cmd
67fc2ba4dc docs: remove useless TODOs 2024-10-14 21:21:54 +08:00
daoge_cmd
8d63c40e2f refactor: replace 'var' with explicit type 2024-10-14 21:13:00 +08:00
daoge_cmd
b0bc37c34d refactor: remove version info in mapping files 2024-10-14 21:05:06 +08:00
daoge_cmd
f2c5c15650 refactor: use com.dfsek as the new package name 2024-10-14 21:02:07 +08:00
daoge_cmd
f5de88215c build: use fixed allay api version 2024-10-14 21:00:15 +08:00
daoge_cmd
8a6ad95947 refactor: delombok and move version info to Versions.kt 2024-10-14 20:55:11 +08:00
daoge_cmd
cc14c716bf build: move repo declaration to DependencyConfig.kt 2024-10-14 20:36:40 +08:00
daoge_cmd
ece5213a87 feat: use macro in plugin.json and update author list 2024-10-14 11:33:40 +08:00
daoge_cmd
a01f700653 build: rollback github action file changes 2024-10-14 11:24:54 +08:00
daoge_cmd
0ca7171bae docs: add README.md to allay platform 2024-10-14 11:23:59 +08:00
daoge_cmd
6261f0849c feat: remove java version declaration in allay platform as all platforms are in java 21 now 2024-10-14 11:23:27 +08:00
daoge
4fc24f022f
Merge branch 'PolyhedralDev:master' into allay 2024-10-14 11:07:34 +08:00
daoge_cmd
61ed302137 feat: adapting terra 6.5.1 (WIP) 2024-10-14 11:07:12 +08:00
Zoe Gidiere
053ec39b7b Merge branch 'master' into ver/6.6.0 2024-10-13 16:32:26 -06:00
Zoe Gidiere
0a952cff4c bump build number 2024-10-13 16:06:35 -06:00
Zoe Gidiere
12faae8fd5 Use reflection remapper for worldGenContext on bukkit
How this even worked before astounds me
2024-10-13 15:55:29 -06:00
daoge_cmd
1496f2c929 build: update jitpack repo link 2024-10-13 15:41:03 +08:00
Zoe Gidiere
40a938be19 Merge branch 'ver/6.6.0' into dev/biomes3 2024-10-12 15:44:19 -06:00
Zoe Gidiere
4be2390294 Small cache fix 2024-10-12 15:43:23 -06:00
Zoe Gidiere
da16f65ea2 Merge branch 'ver/6.6.0' into dev/biomes3 2024-10-12 15:39:03 -06:00
Zoe Gidiere
65d026a130 Fix Cache Deadlock 2024-10-12 15:38:51 -06:00
Zoe Gidiere
d45256b2f7 Another merge fixup 2024-10-12 14:52:11 -06:00
Zoe Gidiere
16d8e8f29d Fix up merge 2024-10-12 14:49:53 -06:00
Zoe Gidiere
a58b2a5193 Merge remote-tracking branch 'origin/dev/biome2' into ver/6.6.0 2024-10-12 14:40:33 -06:00
Zoe Gidiere
1e5a1e20c2 Merge remote-tracking branch 'origin/master' into ver/6.6.0 2024-10-12 14:29:42 -06:00
Zoë Gidiere
592788450c
Update CODEOWNERS 2024-10-12 13:45:55 -06:00
Zoë Gidiere
060cbfd0c4
Update CODEOWNERS 2024-10-12 13:44:02 -06:00
Zoe Gidiere
b9c2f4e63b Update Licence year 2024-10-12 02:03:43 -06:00
Zoe Gidiere
87674aa0ba fix cellular sampler 2024-10-12 02:02:28 -06:00
Zoe Gidiere
40ccf80c7f Optimization when Terra Profiler is not running
Do not set Profiler SAFE Threadlocal var when profiler is not running but ensure it is set to false after the profiler stops to ensure consistent behavior
2024-10-12 00:58:08 -06:00
Zoe Gidiere
6946755e31 Minor Cellular opt 2024-10-12 00:56:37 -06:00
Zoë Gidiere
3b9962662e
Merge pull request #471 from PolyhedralDev/dev/caching
Dev/caching
2024-10-12 00:22:43 -06:00
Zoe Gidiere
7ca61f82b2 Some API clean up 2024-10-12 00:22:18 -06:00
Zoe Gidiere
6851999926 Some refactoring 2024-10-11 19:45:12 -06:00
Zoe Gidiere
585967157d 1.21.2-pre3 2024-10-11 18:40:59 -06:00
Zoe Gidiere
305255511d More cache improvements 2024-10-11 18:27:37 -06:00
Zoe Gidiere
819be16d83 Merge branch 'dev/cli' into dev/caching 2024-10-11 16:40:26 -06:00
Zoe Gidiere
8a028b193a Add no save option 2024-10-11 16:35:26 -06:00
Zoe Gidiere
d31679e6be remove stuff from example 2024-10-11 16:06:40 -06:00
Zoe Gidiere
9d328b12b3 More cache improvements 2024-10-11 16:06:23 -06:00
Zoe Gidiere
a743e9c015 Merge branch 'dev/cli' into dev/caching 2024-10-11 15:16:20 -06:00
Zoe Gidiere
43d52e4bc1 CLI Improvements 2024-10-11 15:16:04 -06:00
Zoe Gidiere
accc07fa07 Bump Version 2024-10-11 15:15:38 -06:00
Zoe Gidiere
c1d3155ddd Cache Improvements 2024-10-11 15:15:10 -06:00
Zoe Gidiere
9a01a6c6a0 more WIP on cache 2024-10-11 00:20:46 -06:00
Zoe Gidiere
3033fbbf29 Fix a ton of fabric impl bugs 2024-10-10 16:49:40 -06:00
Zoe Gidiere
c78a984a11 Update to pre2 2024-10-10 14:02:53 -06:00
Zoe Gidiere
1ae0d1f867 WIP Caching Hints and Caching Sampler 2024-10-09 23:36:12 -06:00
Zoe Gidiere
be7e10c30c Fix runtime errors 2024-10-09 16:41:04 -06:00
Zoe Gidiere
2ccf8a8805 1.21.2-pre1 builds 2024-10-09 16:18:47 -06:00
Zoe Gidiere
197cb12be2 Update fabric versions to 1.21.2-pre1 2024-10-09 15:28:52 -06:00
Zoe Gidiere
adb43dcaa8 Gradle update 2024-10-09 15:17:09 -06:00
Zoe Gidiere
b03d128913 Addon dependency updates 2024-10-09 14:01:24 -06:00
Zoe Gidiere
725fa88466 Remap fabric 2024-10-09 14:01:12 -06:00
Zoe Gidiere
370b2e0122 Fix import 2024-10-09 13:01:54 -06:00
Zoe Gidiere
331075e54d Refractor name 2024-10-09 12:59:19 -06:00
Zoë Gidiere
973590f5fd Add parameter to turn off salting cellular lookup
another updated astrash commit
2024-10-09 12:42:24 -06:00
Astrash
1a5ab6b505 Add meta annotations 2024-10-09 12:42:13 -06:00
Astrash
14732328cd Add default 'from' values for linear map template 2024-10-09 12:41:55 -06:00
Zoë Gidiere
6c7974c302 Implement linear map normalizer
Updated astrash commit
2024-10-09 12:41:40 -06:00
Zoe Gidiere
1204b7a8c1 ArithmeticSampler Derivatives 2024-10-09 12:37:50 -06:00
Astrash
fbe1c76e26 Forgot to include 4th derivative array index for 3D FBM 2024-10-09 21:50:08 +11:00
Astrash
add7803e65 Simplify isDifferentiable static method impl 2024-10-09 20:56:37 +11:00
Astrash
4393a16b2f Use proper static isDifferentiable method 2024-10-09 20:56:11 +11:00
Astrash
b4fa635455 Ensure throw with incorrect use of SimplexStyle derivatives
This should ensure that in the case an implementation fails to correctly
check isDifferentiable then performs a subsequent derivative based sample,
an error is thrown, rather than potentially missing a logic bug due to
noise of 0 and derivative of 0 being returned which could otherwise be
hard to narrow down.
2024-10-09 20:45:25 +11:00
Astrash
9f425c6159 Add support for derivatives in FBM 2024-10-09 20:39:45 +11:00
Astrash
158ffba2a5 Make FractalNoiseFunction impls support derivatives 2024-10-09 20:39:13 +11:00
Zoë Gidiere
b7326c0ff6
Merge pull request #469 from PolyhedralDev/dev/fix-bukkit-spawner
fix spawners on bukkit
2024-09-24 23:27:44 -06:00
Zoe Gidiere
f70a83aec3 fix spawners on bukkit 2024-09-24 23:26:49 -06:00
astrsh
589cf83c38 Flip comparison
As per request from @duplexsystem
2024-09-25 14:08:19 +10:00
Zoë Gidiere
c374c2d5ef
Merge pull request #467 from PolyhedralDev/ver/6.5.0
Ver/6.5.0
2024-09-24 09:41:58 -06:00
Zoe Gidiere
13782bb51e Remforamt 2024-09-24 09:11:43 -06:00
Zoe Gidiere
1aa3ef813c add default sampler to pseudoerosion 2024-09-24 09:05:33 -06:00
Zoe Gidiere
6cc53beecb Fix Sin/Cos 2024-09-23 23:14:35 -06:00
Zoe Gidiere
2c45ba91aa Fix up commit 2024-09-23 22:40:37 -06:00
Zoe Gidiere
6244ffca63 Revert "Sin/Cos Opts"
This reverts commit 1d05f95f746639fdbc4c242d84aa4fcd93d666f4.
2024-09-23 22:38:45 -06:00
Zoe Gidiere
59d943b3ea Revert "Fix build"
This reverts commit 10d723372daf14bc551159d050412c71c7f69a76.
2024-09-23 22:38:17 -06:00
Zoe Gidiere
f605ee1937 Remove Final from psuedoerosion template 2024-09-23 22:35:01 -06:00
Zoe Gidiere
f87b7c07d9 Reformat 2024-09-23 22:27:53 -06:00
Zoe Gidiere
f1124aae6b Update platform mod file versions and authors 2024-09-23 21:18:47 -06:00
Zoe Gidiere
9c8298fe53 convert pseudoerosion to double 2024-09-23 21:09:19 -06:00
Zoe Gidiere
d69b0dba90 reformat 2 2024-09-23 21:06:07 -06:00
Zoe Gidiere
42166d5239 bump version number 2024-09-23 20:59:02 -06:00
Zoe Gidiere
d6772f51ea Reformat 2024-09-23 20:56:13 -06:00
Zoe Gidiere
f469193909 Make seed affect pseudoerosion hasing 2024-09-23 20:51:00 -06:00
Zoe Gidiere
10d723372d Fix build 2024-09-23 20:45:47 -06:00
Zoe Gidiere
1d05f95f74 Sin/Cos Opts 2024-09-23 20:38:22 -06:00
Zoe Gidiere
bd73427072 OpenSimplex 2 Derivative Impl 2024-09-23 20:29:41 -06:00
Zoe Gidiere
017b4608bc Fix build 2024-09-23 19:49:16 -06:00
Zoe Gidiere
5f340f8ffd slight open simplex 2s op\pt 2024-09-23 19:48:22 -06:00
Zoe Gidiere
5b35eb041b Remove temp DerivativeFractl nose 2024-09-23 19:43:56 -06:00
Zoe Gidiere
699d5d1d62 Derivable OpenSimplex2S Impl
baased on https://gist.github.com/KdotJPG/882f36b2ae5ae56a8fc91627ec1c87f4
2024-09-23 19:42:50 -06:00
Zoe Gidiere
07e3d0058d Refractor PseudoErosion 2024-09-23 16:46:48 -06:00
Zoe Gidiere
b1ad820e1c Move pseudoerosion to NoiseFunction 2024-09-23 16:37:42 -06:00
Zoe Gidiere
3644ee7fca Implement DerivateNoiseFunction 2024-09-23 16:28:34 -06:00
Zoe Gidiere
b14b355c6f Merge branch 'dev/fractal-gavoro-pseudoerosion' into ver/6.5.0 2024-09-21 17:22:47 -06:00
daoge_cmd
6042f1c036 build: update build.gradle.kts 2024-09-21 00:57:18 +08:00
daoge_cmd
af2ac64cd4 feat: using the new safe getter api 2024-09-20 19:47:49 +08:00
Zoe Gidiere
06457bf3ce some fixes 2024-09-18 15:43:31 -06:00
Zoe Gidiere
b63f5f4a8f Reformat 2024-09-18 12:43:41 -06:00
daoge_cmd
4bad8f702c docs: format javadoc 2024-09-18 13:02:16 +08:00
daoge_cmd
76f12e0cb8 build: prepare for merging 2024-09-18 12:59:30 +08:00
Zoë Gidiere
8cf766e77b
Merge pull request #455 from pumken/seasoned-samplers-2
Add salted version of sampler functions in EXPRESSION samplers
2024-09-17 17:59:26 -06:00
Zoe Gidiere
a23d624ab9 Merge branch 'dev/1.21.1' into ver/6.5.0 2024-09-17 17:41:25 -06:00
Zoe Gidiere
15a298304e working 1.21.1 2024-09-17 17:40:56 -06:00
Zoe Gidiere
664d1a3191 working 1.20.6 2024-09-17 16:34:30 -06:00
Zoë Gidiere
73047284c8
Merge pull request #461 from OakLoaf/dev/1.21/bukkit
Updated Bukkit to 1.21/1.21.1
2024-09-17 09:43:05 -06:00
daoge_cmd
ce9fb53df4 build: disable useless modules 2024-09-17 22:28:04 +08:00
daoge
1f01b99d29
ci: should check allay branch 2024-09-17 20:40:24 +08:00
daoge
18a24562ec
ci: upload jar 2024-09-17 20:39:49 +08:00
daoge
2f2d43e1b8
build: disable mixin platform 2024-09-17 20:00:42 +08:00
daoge
6c8a7da254
build: disable mixin platform 2024-09-17 19:59:43 +08:00
daoge
ca4461ba2a
build: disable bukkit platform 2024-09-17 19:56:45 +08:00
daoge
c6df3c302b
build: disable fabric platform 2024-09-17 19:56:03 +08:00
daoge
328ebf5aa9
build: disable cli platform 2024-09-17 19:55:20 +08:00
daoge
2c476a25d9
build: fix build for allay platform 2024-09-17 19:45:26 +08:00
daoge
b432a4e01d
build: use jdk21 for allay platform 2024-09-17 19:39:01 +08:00
daoge
f73eadda76
ci: use jdk 21 2024-09-17 19:18:08 +08:00
daoge
1acdad5c6b
ci: run github action when pushing 2024-09-17 19:01:41 +08:00
daoge
732a894945
ci: trigger github action 2024-09-17 18:59:53 +08:00
daoge_cmd
bbf0915bc9 build: use org.allaymc.allay as the group id 2024-09-07 19:47:19 +08:00
daoge_cmd
5f70ecb943 feat: use jitpack 2024-09-04 23:55:24 +08:00
daoge_cmd
2e709dace6 feat: sync allay 2024-08-27 19:15:42 +08:00
OakLoaf
3bef7d8572 Resolved errors when tab completing 2024-08-26 12:34:08 +01:00
OakLoaf
08df5fc278 Added 1.21.1 support 2024-08-26 11:24:04 +01:00
daoge_cmd
c97f25cb95 feat: support 1.21.20 and newer versions 2024-08-23 20:18:45 +08:00
daoge_cmd
28c689d16f feat: fetch allay's changes 2024-08-19 01:36:32 +08:00
daoge_cmd
a34946cece feat: return air if block type not found 2024-08-18 19:39:23 +08:00
OakLoaf
922cd35e84 Updated Cloud dependency to v2 2024-08-16 11:07:03 +01:00
daoge_cmd
4acd0de6fa feat: fetch allay's changes 2024-07-24 20:30:24 +08:00
Oak
44d23573b3 Updated dependencies to Paper 1.21 snapshot 2024-07-20 20:17:25 +01:00
daoge_cmd
2443fff0a4 feat: fetch allay's changes 2024-07-17 01:32:01 +08:00
daoge_cmd
cd767a648c feat: fetch allay's changes 2024-07-17 01:27:56 +08:00
Oak
e7cc275340 Corrected issues with worldGenContext not correctly being set (Ref: https://stackoverflow.com/questions/56039341/get-declared-fields-of-java-lang-reflect-fields-in-jdk12/56043252#56043252) 2024-06-23 14:16:50 +01:00
Oak
fddc9a52b9 Temporarily disabled commands whilst awaiting Cloud Framework update 2024-06-19 13:34:35 +01:00
Oak
0758e13bc7 Made patch version optional as not all Minecraft versions have a patch number 2024-06-19 13:33:55 +01:00
daoge_cmd
d490324bfc feat: support waterlogged 2024-06-19 18:09:31 +08:00
daoge_cmd
5fa7007d45 fix: fix a typo 2024-06-19 17:19:17 +08:00
daoge_cmd
2d0e4a83b0 fix: OtherChunkAccessibleContext.get/setBlockState() should use level pos instead of chunk local pos 2024-06-19 01:05:37 +08:00
daoge_cmd
e68f928e38 feat: use OtherChunkAccessibleContext directly 2024-06-18 14:59:42 +08:00
daoge_cmd
4a3678cea9 feat: update to 1.21 2024-06-18 03:41:17 +08:00
Oak
d810cad8d0 Adjusted code for Spigot compatibility 2024-06-17 15:50:06 +01:00
Oak
4e7de501c0 Updated bukkit platform to 1.21 2024-06-16 19:21:34 +01:00
daoge_cmd
6ff0903d83 fix: fix an mistake 2024-06-17 01:21:14 +08:00
daoge_cmd
133df45968 feat: make it works! 2024-06-17 00:37:16 +08:00
daoge_cmd
1f937a2ae0 feat: fake entity 2024-06-16 15:55:28 +08:00
daoge_cmd
d861d3e849 feat: more works 2024-06-16 15:48:18 +08:00
daoge_cmd
3d4aec4abb chores: improve imports 2024-06-16 15:03:19 +08:00
daoge_cmd
62e589870d feat: more works 2024-06-16 15:02:42 +08:00
daoge_cmd
2b125414c9 feat: more works 2024-06-16 06:01:38 +08:00
daoge_cmd
59d7632927 feat: add mapping files 2024-06-16 03:30:50 +08:00
daoge_cmd
d81f886e8c feat: more works 2024-06-16 03:29:03 +08:00
daoge_cmd
b29ba2db70 feat: more works 2024-06-16 01:33:46 +08:00
daoge_cmd
02a7363f01 feat: init work on allay 2024-06-16 00:07:52 +08:00
Oak
9e60db4b0d Updated MinecraftVersionInfo 2024-06-10 11:07:24 +01:00
Oak
4536767794 Updated to 1.20.6 2024-06-03 11:36:50 +01:00
Oak
3fa4b21247 Attempted to fix paper versions 2024-06-02 21:27:07 +01:00
Oak
17acde09a3 Updated Bukkit to 1.20.6 2024-05-31 12:11:07 +01:00
Zoe Gidiere
dd272bce64 WIP 1.20.6 2024-05-01 17:04:34 -06:00
Gavin Tran
c20b1eaf10 Apply code style fixes 2024-04-21 15:39:48 -04:00
Gavin Tran
72f761678a Add SaltedNoiseFunctions in sampler conversion 2024-04-21 14:54:45 -04:00
Gavin Tran
62317a2f3f Add SaltedNoiseFunctions 2024-04-21 14:48:46 -04:00
Astrash
823afd592b Reduce number of erosion impulses
A reduction of impulse evaluations from 5^2 to 3^2, original algorithm used exponential falloff function which required evaluating impulses from further away to avoid artifacts. I've changed it to a parabolic falloff function which is exactly 0 at the largest possible distance from a cell origin, meaning any cells further than that will not have an effect, preventing said artifacting from occurring. The parabolic function could be replaced with an exponential function (or any other similar easing function) as long as it has an x-intercept at maxCellDistSq. In addition, an option to control whether averaging impulses has been added as it has more of a visual impact with the aforementioned changes.
2024-04-20 15:55:59 +10:00
Astrash
ff03b38b81 Derivative API documentation 2024-04-19 21:25:16 +10:00
Astrash
35246d65b9 Require implementing derivable check 2024-04-19 21:07:53 +10:00
Astrash
41652d29df Use proper check for derivative sampler validation 2024-04-19 21:05:52 +10:00
Astrash
142d364682 WIP fractal-gavoro-pseudoerosion 2024-04-19 20:55:14 +10:00
Zoë Gidiere
01e011a9ed UX tweaks to biome config 2024-03-28 14:47:12 -05:00
Zoë
94949c9120
Merge pull request #449 from Browsit/ver/6.5.0
Prevent exception with other world generators
2024-02-23 14:58:51 +00:00
Browsit
c52ad56ccc
Return null for empty generator IDs 2024-02-02 08:15:37 -05:00
Astrash
f3476c5cc8 Add feature stage blending 2024-01-07 17:02:08 +11:00
Astrash
9c181f7ee1 Add ability to disable slant palettes globally 2024-01-06 09:13:02 +11:00
Astrash
271e7f3c69 Fix empty slant holders attempting to calculate slant
This occurs when the NoiseChunkGenerator3D#getSlant method is invoked at
a position where the biome has an empty slant holder, currently possible
when using the slant locator addon.

This is fixed by making slant calculation independent of SlantHolders.
Some minor refactoring has also been done as a result of this change.
2024-01-05 18:42:35 +11:00
Zoë
6681bdfbf2 Merge remote-tracking branch 'origin/master' into ver/6.5.0 2023-12-24 22:39:06 -06:00
dfsek
ab60f14ff1
Merge pull request #444 from PolyhedralDev/dev/fix-lerp
6.4.3 - Fix lerp (urgent)
2023-12-24 02:15:54 -07:00
dfsek
d8ba9e1016 bump version 2023-12-24 02:06:11 -07:00
dfsek
3622003a39 fix other lerp issues 2023-12-24 02:02:46 -07:00
dfsek
84cd96ecf7 fix BrownianMotionSampler lerp usage 2023-12-24 01:53:05 -07:00
Zoë
8afda7424c Merge branch 'master' into ver/6.5.0 2023-12-22 15:02:53 -06:00
Zoë
da4ab8b71c
Merge pull request #441 from PolyhedralDev/ver/6.4.2
Ver/6.4.2
2023-12-18 13:01:36 -07:00
Zoë Gidiere
3745c3e947 fix typos 2023-12-17 15:32:35 -07:00
Zoë Gidiere
fd20837b55 fix error on startup 2023-12-17 15:29:18 -07:00
Zoë Gidiere
0091e5b785 spell check 2023-12-10 18:50:40 -07:00
Zoë Gidiere
41045ae8aa literally forgor the most important part 2023-12-10 18:47:12 -07:00
Zoë Gidiere
4a83f01c1f fix incase mods are used 2023-12-10 18:44:26 -07:00
Zoë Gidiere
fc764a0fb3 fix issues with spawners and entity parsing 2023-12-10 18:40:43 -07:00
Zoë Gidiere
22c46f2f80 Pin OWConfig Version 2023-12-10 17:45:52 -07:00
Zoë Gidiere
f408faaa80 reformat 2023-12-10 17:07:18 -07:00
Zoë Gidiere
0ad7ee4f9f fix CME 2023-12-10 16:57:27 -07:00
Zoë Gidiere
1e55074cfa Enforce NMS bindings 2023-12-10 15:46:00 -07:00
Zoë
2a92d76276
Merge pull request #437 from PolyhedralDev/dev/1.20.3
Dev/1.20.3
2023-12-09 15:13:11 -07:00
Zoë Gidiere
687ad5db59 Final dep update
confirmed working on paper and fabric
2023-12-09 15:00:46 -07:00
Zoë Gidiere
f9c9789016 remove unused maven repo 2023-12-09 01:16:38 -07:00
Zoë Gidiere
3142c2a4f0 update paper to 1.20.4 2023-12-08 22:57:01 -07:00
Zoë Gidiere
b5532b7679 Merge branch 'ver/6.4.2' into dev/1.20.3 2023-12-08 22:31:12 -07:00
Zoë Gidiere
8af299d09c fix path of vale ignore 2023-12-08 22:31:04 -07:00
Zoë Gidiere
5cf8a5061d Merge branch 'ver/6.4.2' into dev/1.20.3 2023-12-08 22:11:57 -07:00
Zoë Gidiere
017876475e Add Vale config to gitignore 2023-12-08 22:11:48 -07:00
Zoë Gidiere
d88e4f1f9b fix stupid error
thank you caffeine mc peeps
2023-12-08 19:57:05 -07:00
Zoë Gidiere
17eac505a0 Merge branch 'ver/6.4.2' into dev/1.20.3 2023-12-07 11:29:31 -07:00
Zoë Gidiere
8043814138 pull up version range of fabric 2023-12-07 11:29:19 -07:00
Zoë Gidiere
554887ab54 build fabric against 1.20.4 2023-12-07 11:27:06 -07:00
Zoë Gidiere
2f46a01adc Merge remote-tracking branch 'origin/master' into ver/6.4.2 2023-12-07 00:34:00 -07:00
Zoë Gidiere
a1db0574e9 Merge branch 'ver/6.4.2' into dev/1.20.3 2023-12-07 00:33:45 -07:00
Zoë
fd6decc706
Merge pull request #439 from PolyhedralDev/dev/github-actions
Create gradle-build.yml
2023-12-06 23:11:33 -07:00
Zoë Gidiere
0ba0d472e6 seems arch loom auto uses vineflower now 2023-12-06 22:47:35 -07:00
Zoë Gidiere
11b03eb93d actually bump bukkit version 2023-12-06 22:27:26 -07:00
Zoë Gidiere
46ca45cb1d fix bukkit build 2023-12-06 22:25:53 -07:00
Zoë Gidiere
4e5b066b91 add bukkit grass workaround 2023-12-06 22:24:55 -07:00
Zoë Gidiere
db8df9741f bukkit 1.20.3 2023-12-06 22:22:18 -07:00
Zoë Gidiere
80c52870f5 add additional spigot warning 2023-12-06 12:00:03 -07:00
Zoë Gidiere
5048bc8ede Remove folialib 2023-12-06 10:52:31 -07:00
Zoë Gidiere
fc0d7374e4 remove old bukkit versions 2023-12-06 10:14:43 -07:00
Zoë Gidiere
e4c3affb9f pull up version range 2023-12-05 20:11:00 -07:00
Zoë Gidiere
e160cae3d8 reformat 2023-12-05 20:04:08 -07:00
Zoë Gidiere
cb9aa4f167 fix permissions 2023-12-05 19:53:05 -07:00
Zoë Gidiere
b612d1c7aa fix name 2023-12-05 19:52:50 -07:00
Zoë Gidiere
e4df8dce1d proper gradle cache 2023-12-05 19:52:12 -07:00
Zoë Gidiere
601d174720 pin versions and remove dead lines 2023-12-05 19:44:00 -07:00
Zoë
3339d08e11
Create gradle-build.yml 2023-12-05 19:35:23 -07:00
Zoë Gidiere
bc65015af0 update gradle 2023-12-05 18:53:19 -07:00
Zoë Gidiere
913637b0a5 update deps 2023-12-05 18:29:43 -07:00
Zoë Gidiere
86f2356cc8 Merge branch 'ver/6.4.2' into ver/6.5.0 2023-11-27 17:55:40 -07:00
Zoë
55d09818f7
Merge pull request #436 from PolyhedralDev/dev/flatten-biome-array
Dev/flatten biome array
2023-11-27 17:54:38 -07:00
Zoë Gidiere
aecdcd578c initial 1.20.3
also disable forge. we're not publishing it anyway
2023-11-27 13:35:48 -07:00
Zoë Gidiere
382069b094 Bump Version to 6.4.2 2023-11-27 11:35:06 -07:00
Zoë Gidiere
734d4bfb94 reformat 2023-11-27 11:31:20 -07:00
Zoë Gidiere
c82e015559 flatten array for pipeline biomes 2023-11-27 11:31:11 -07:00
Astrash
ffb1198da2 Merge branch 'master' into ver/6.5.0 2023-11-25 12:33:51 +11:00
Astrash
2c211f0aa6 Merge branch 'master' into ver/6.5.0 2023-11-25 12:29:54 +11:00
Astrashh
3aef977384
Patch version 6.4.1 (#435)
* Bump version to 6.4.1

* fix fabric dev env

* Invert exposed ore logic (#433)

* Invert exposed ore logic

* Bump ore addon version

* Use logger in Gradle over println (#434)

* Log info instead of println in gradle scripts

* Missed buildSrc printlns

---------

Co-authored-by: Zoë <duplexsys@protonmail.com>
2023-11-25 01:02:45 +00:00
Zoë
6060ceae57
Merge pull request #432 from PolyhedralDev/dev/codeowners
update condeowners
2023-11-18 10:05:10 +00:00
Zoë Gidiere
0efb0916e6 Initial Bukkit Biome Config 2023-11-17 16:16:18 -07:00
Zoë Gidiere
82fbf796da Refractor BiomeUtil 2023-11-17 15:26:53 -07:00
Zoë Gidiere
94bf67d09d fix dev env by having fabric api at runtime 2023-11-17 14:57:14 -07:00
Zoë Gidiere
e499ddebd4 update condeowners 2023-11-17 13:34:56 -07:00
Zoë Gidiere
f86d4bae32 remove old bukkit versions 2023-11-17 13:22:10 -07:00
Zoë Gidiere
c7cecaebe6 Merge remote-tracking branch 'origin/dev/biome2' into ver/6.5.0 2023-11-17 13:21:39 -07:00
Zoë Gidiere
866d527d35 bump version 2023-11-17 13:11:28 -07:00
Zoë
4f706f5502
Merge pull request #430 from PolyhedralDev/ver/6.4.0
We've had one, yes. What about second build issue?
2023-11-17 19:12:52 +00:00
Zoë Gidiere
fe954a7b2b We've had one, yes. What about second build issue? 2023-11-17 12:12:13 -07:00
Zoë
15e72bae35
Merge pull request #429 from PolyhedralDev/ver/6.4.0
fix building
2023-11-17 18:07:22 +00:00
Zoë Gidiere
513c2df9f9 fix building
for real this time
2023-11-17 11:06:41 -07:00
Zoë
aec00d9169
Merge pull request #428 from PolyhedralDev/ver/6.4.0
Ver/6.4.0 2: Electric Boogaloo
2023-11-13 23:07:22 +00:00
Zoë Gidiere
540552d301 Partially Revert "Fix stupid build error and a couple gradle warnings"
This reverts commit 77812545df6304ccc04dd129b8ea953deaac40b3.
2023-11-13 15:22:09 -07:00
Zoë Gidiere
4dfe2054e9 Revert "Actually fix issue"
This reverts commit 0b1d67b53354fdb0a8fdd89dc4f7f90e9f9388dc.
2023-11-13 15:21:17 -07:00
Zoë Gidiere
16e61098d9 depend on fabric api 2023-11-13 15:08:15 -07:00
Zoë Gidiere
8aecf6b97f don't include fabric api 2023-11-13 15:05:21 -07:00
Zoë Gidiere
4788483139 remove gc flags from build 2023-11-13 15:04:44 -07:00
Zoë
9e8aefe7f7
Merge pull request #420 from PolyhedralDev/ver/6.4.0
Terra Version 6.4.0
2023-11-13 04:55:02 +00:00
Zoë Gidiere
272556ed81 final reformat and import optimize 2023-11-12 21:45:47 -07:00
Zoë Gidiere
fd0c4df04c Revert "add stub for not physics"
This reverts commit 839bc23a5a2ee5919b7c99620b1d14bdd61923c1.
2023-11-12 21:18:27 -07:00
Astrashh
1c3ee86376
Simplify PR template (#427) 2023-11-13 00:57:27 +00:00
Astrashh
defd775f13
Change Java whitespace handling in .editorconfig (#425)
* Change whitespace handling in .editorconfig

* Reformat code

* fix format error

* Reformat code

---------

Co-authored-by: Zoë Gidiere <duplexsys@protonmail.com>
2023-11-13 00:57:01 +00:00
Astrash
a73fda7d04 Forgot @Meta 2023-11-13 11:48:06 +11:00
Astrash
b8586135b8 Make RangeLoader inner class private
Also removes redundant suppression
2023-11-10 13:34:05 +11:00
Astrashh
4065cfea53
Fix YAML formatting (#426)
* Remove trailing whitespace in YAML formatting

* Reformat YAML files
2023-11-10 00:47:12 +00:00
Zoë Gidiere
a117db40be change formatting 2023-11-09 12:47:48 -07:00
Zoë Gidiere
72e0974cc5 fix cli build 2023-11-09 11:40:19 -07:00
Zoë Gidiere
d8938c5519 remove comments 2023-11-09 11:37:46 -07:00
Zoë Gidiere
acf79f5c53 change class structure of LifecycleEntryPoint 2023-11-09 11:37:01 -07:00
Zoë Gidiere
839bc23a5a add stub for not physics 2023-11-09 11:29:09 -07:00
Zoë Gidiere
852cf0321b Merge remote-tracking branch 'origin/ver/6.4.0' into ver/6.4.0 2023-11-08 21:59:14 -07:00
Zoë Gidiere
89d497d500 Some requested changes 2023-11-08 21:58:57 -07:00
Zoë Gidiere
0df940d688 improve invSqrt formatting
Co-authored-by: solonovamax <solonovamax@12oclockpoint.com>

what the fuck?
2023-11-08 21:20:01 -07:00
Zoë Gidiere
dd7bebb27f Update lerp usage and docs 2023-11-08 21:18:35 -07:00
solonovamax
72649d5cf7
Merge remote-tracking branch 'upstream/ver/6.4.0' into ver/6.4.0 2023-11-08 22:42:23 -05:00
solonovamax
7cf87de463
Add TODO to replace FoliaLib when we drop support for 1.18 and 1.19
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
2023-11-08 22:42:14 -05:00
Zoë Gidiere
020033f839 add rsqrt ts function 2023-11-08 19:53:36 -07:00
Zoë Gidiere
b3ef4ac79c optimized tan 2023-11-08 19:52:05 -07:00
solonovamax
3f9f2bdce4
Use kotlin's Path extensions rather than Files.whatever
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
2023-11-08 20:38:25 -05:00
Zoë Gidiere
0ab463f34f bukkit clean up 2023-11-05 21:07:25 -07:00
Zoë Gidiere
0b1d67b533 Actually fix issue 2023-11-05 20:51:28 -07:00
Zoë Gidiere
c4f665ffc5 fix format error 2023-11-05 20:13:04 -07:00
Zoë Gidiere
c00753b0fc let reformat have another go at it 2023-11-05 20:12:57 -07:00
Zoë Gidiere
77812545df Fix stupid build error and a couple gradle warnings
thank you gradle .replaceFirstChar { if (it.isLowerCase()) it.titlecase(Locale.getDefault()) else it.toString() } is clearly better than .capitalize()
2023-11-05 20:07:13 -07:00
Zoë Gidiere
ad9bc7f67c fix format error 2023-11-02 18:47:45 -06:00
Zoë Gidiere
81a96d6b76 Reformat code 2023-11-02 18:47:36 -06:00
Zoë Gidiere
d696e4fd24 Optimize imports 2023-11-02 18:45:13 -06:00
Zoë Gidiere
c98d39c5d7 Update licence year 2023-11-02 18:42:51 -06:00
Zoë
a6fe268f79
Merge pull request #422 from PolyhedralDev/dev/image-caching
Improve image caching
2023-11-03 00:10:52 +00:00
Zoë
648da95e7d
Scattered ore (#424)
* Scattered Ore Impl

* remove break

* remove another break

* sphereCount -> blockCount

---------

Co-authored-by: Astrash <astrash@protonmail.com>
2023-10-29 17:33:50 -06:00
Zoë Gidiere
5829112a74 Merge branch 'ver/6.4.0' into dev/image-caching 2023-10-26 12:56:17 -06:00
Zoë Gidiere
c41bf55b7b implement missing methods from last comit 2023-10-26 12:53:55 -06:00
Zoë Gidiere
5d12a560f1 add zero and unit vectors 2023-10-26 11:08:36 -06:00
Zoë Gidiere
6f08908bb4 merge ovre-v2 into ore(v1) 2023-10-26 10:43:13 -06:00
Zoë Gidiere
9292d3de17 Remove FastMath
hotspot has intrinsics for almost everything we use it for
2023-10-26 10:37:25 -06:00
Astrash
0149a29b04 Load correct path 2023-10-24 14:08:56 +11:00
Astrash
cd8605850f Replace unload-on-timeout with timeout > 0 2023-10-24 13:47:25 +11:00
Astrash
148b8dfe35 Bump image lib patch version 2023-10-24 13:34:10 +11:00
Astrash
3f485b1825 Add to unload on timeout description 2023-10-24 13:30:09 +11:00
Astrash
cb6ecff113 Remove sout 2023-10-24 13:29:53 +11:00
Astrash
e30bcbf1ba Improve image caching options 2023-10-24 13:26:35 +11:00
Astrash
805f99f57a Make ore algorithm readable 2023-10-20 10:55:23 +11:00
Astrash
4e5b02ef42 Pass correct coords for ore block checks 2023-10-20 10:30:25 +11:00
Astrash
e80e998cec Only log warnings with debug logging 2023-10-20 10:03:04 +11:00
Zoë
fde29220af
Merge pull request #419 from PolyhedralDev/dev/disable-quilt
Dev/disable quilt
2023-10-19 17:31:40 +00:00
Zoë Gidiere
d3a9b57872 disable quilt 2023-10-18 19:53:59 -06:00
Zoë
4671ec5bd3
Merge pull request #417 from PolyhedralDev/dev/folia
Dev/folia
2023-10-19 01:18:45 +00:00
Zoë
9f4a8e06e1
Update DependencyConfig.kt 2023-10-17 21:00:28 -06:00
Zoë
c8f2871aaa
Update build.gradle.kts 2023-10-17 20:59:27 -06:00
Zoë
4a537a56aa
Merge pull request #415 from PolyhedralDev/dev/ore-v2
Add updated ore-v2
2023-10-18 00:33:15 +00:00
Zoë
4917160123
Update README.md 2023-10-17 18:32:00 -06:00
Zoë
b3f80dcb64
Merge pull request #410 from PolyhedralDev/dev/1.20.2
1.20.2 + update libs
2023-10-15 19:45:43 +00:00
Zoë Gidiere
d49b9ccad5 Merge branch 'dev/1.20.2' into dev/folia 2023-10-14 16:02:54 -06:00
Zoë Gidiere
a8387ce419 Merge remote-tracking branch 'origin/ver/6.4.0' into dev/1.20.2 2023-10-14 16:02:40 -06:00
Zoë Gidiere
94854f2bdb update versions 2023-10-14 15:55:43 -06:00
Astrashh
47f531089e
Add slant locator (#413)
* Add slant locator addon

* Bump slant locator noise3d dependency version

* Fix slant locator dependency version range

* Actually fix slant locator dependency version range
2023-10-10 00:35:47 +00:00
Astrashh
abd83e8278
Add number predicate addon (#412) 2023-10-10 00:35:26 +00:00
Astrash
b5e7c7c112 Fix TOP locator 2023-10-10 09:44:53 +11:00
Zoë Gidiere
d71f7d4c36 clarify value and change default 2023-10-03 21:03:44 -06:00
Zoë Gidiere
84898a7a6b fixes 2023-10-03 20:03:46 -06:00
Zoë Gidiere
0c1a6efc72 refractor classes 2023-10-03 19:42:15 -06:00
Zoë Gidiere
200281f140 dep orev1 2023-10-03 11:58:32 -06:00
Zoë Gidiere
f1ea8074de config-ore-v2 2023-10-03 11:54:18 -06:00
Astrash
f896a9a278 Bump noise3d addon minor version 2023-10-03 11:01:50 +11:00
Astrash
79b3b34669 Add slant API for noise3d 2023-10-03 09:51:39 +11:00
Zoë Gidiere
ce2b964ce3 Merge branch 'dev/1.20.2' into dev/folia 2023-10-02 01:38:24 -06:00
Zoë Gidiere
0ee5f49972 quilt 2023-10-02 01:38:01 -06:00
Zoë Gidiere
3bc10cdb6a Merge branch 'dev/1.20.2' into dev/folia 2023-10-02 00:42:11 -06:00
Zoë Gidiere
86ba52850d update strata 2023-10-02 00:41:54 -06:00
Zoë Gidiere
27eebf6a47 Folia support
Co-authored-by: Janet Blackquill <uhhadd@gmail.com>
2023-10-02 00:23:19 -06:00
Zoë Gidiere
2d2bba20b6 found an untrue in read me 2023-10-01 23:22:44 -06:00
Zoë Gidiere
eb3994005c fix me being fucking stupid 2023-10-01 22:46:41 -06:00
Zoë Gidiere
0a7cdb82a3 update deps + 1.20.2 2023-10-01 22:18:54 -06:00
Zoë
158deaa971
Merge pull request #408 from PolyhedralDev/dev/physics
Allows you to create a block with physics enabled
2023-10-01 19:07:15 -06:00
Astrash
e51e025e9c Implement cubic spline sampler 2023-10-02 11:14:43 +11:00
Zoë Gidiere
70b1c3bbf3 warning 2023-09-30 12:06:21 -06:00
Zoë Gidiere
e9b145b6c3 unbreaking via deprecation 2023-09-30 11:50:15 -06:00
Zoë
99d848b394 UX tweaks to biome config 2023-09-30 11:42:05 -06:00
Zoë Gidiere
4828d51da4 Merge branch 'dev/physics' into dev/biome2 2023-09-30 11:38:18 -06:00
Zoë Gidiere
8e0d64dccd Make bukkit work 2023-09-30 10:49:28 -06:00
Zoë Gidiere
23f47de10a fix pack loading error 2023-09-29 23:35:17 -06:00
Zoë Gidiere
89651597c2 default to info logging 2023-09-29 23:32:40 -06:00
Zoë
5c0c833b70 Update LifecycleEntryPoint.java 2023-09-29 23:09:41 -06:00
Zoë Gidiere
33d654dc8e impl fabric 2023-09-29 23:05:05 -06:00
Zoë Gidiere
f0c602d7e7 implement physics on the api side
we will see if platform changes are needed
2023-09-29 22:10:03 -06:00
Zoë Gidiere
0e37a839fe We do a little commonifying 2023-09-29 21:44:12 -06:00
Astrash
3f9ead0d66 Remove repeated code in cellular sampler 2023-09-27 13:39:51 +10:00
David W
5eeb5af6c4
Add cell center offset return to CELLULAR sampler (#407)
* Add offset lookup return to cellular sampler

* bump noise function plugin version

* revert version to 1.1.0

* rename OffsetNoiseLookup, switch axis orientation

* rename return type aswell in cellcampler
2023-09-21 22:23:49 +00:00
Astrash
81e354f91c Use tectonic properly 2023-07-18 22:06:08 +10:00
Astrash
aab28ff4f9 Bump version to 6.4.0 2023-07-18 14:32:12 +10:00
Astrash
0e3a756011 Bump config-noise-function to v1.1.0 2023-07-18 14:29:54 +10:00
Astrash
02198e1b88 Implement distance sampler 2023-07-18 14:29:28 +10:00
Astrash
00aeb98419 Implement translation sampler 2023-07-18 14:27:36 +10:00
Astrash
1a784b51ac Implement expression normalizer sampler 2023-07-18 14:25:07 +10:00
Astrash
34c0895c1f Make metalist injection error more user friendly 2023-07-16 22:46:23 +10:00
Astrash
379fa601a3 Meta annotate LINEAR_HEIGHTMAP sampler 2023-07-16 17:04:51 +10:00
Astrash
fcbf51d80b Allow Range keys to be meta annotated 2023-07-16 11:51:51 +10:00
Astrash
9d83dfd164 Bump version to 6.3.2 2023-07-16 11:49:14 +10:00
Astrashh
72686601ee
Merge pull request #406 from PolyhedralDev/ver/6.3.1
Ver/6.3.1
2023-07-15 07:04:10 +10:00
Astrash
73baaec6cd Bump version to 6.3.1 2023-07-11 09:33:57 +10:00
Astrashh
0be7213ee5
Merge pull request #401 from PolyhedralDev/dev/reduce-pipeline-caching
Reduce pipeline v2 caching
2023-06-20 10:10:35 +10:00
Astrash
3f3e2fe97c Reduce pipeline v2 caching 2023-06-20 09:57:43 +10:00
dfsek
549edd11ea update ServerCommandSourceMixin 2023-06-15 17:27:26 -07:00
dfsek
36f89946d4 update SignBlockEntityMixin 2023-06-15 17:26:04 -07:00
dfsek
18644d6100 update fabric dependencies 2023-06-15 17:22:21 -07:00
dfsek
9d38ee4329 repackage NMS 1.20.1 2023-06-15 17:18:36 -07:00
dfsek
b75a8f85e4 restore NMSChunkGeneratorDelegate#getBaseColumn 2023-06-15 17:16:20 -07:00
dfsek
aad58f5968 update nms imports 2023-06-15 17:14:45 -07:00
dfsek
a548c30484 clean up unused bstats relocation 2023-06-15 17:11:53 -07:00
dfsek
9ba46ae3a5 make new bukkit NMS module 2023-06-15 17:11:32 -07:00
dfsek
49efbed6f5 update versions 2023-06-15 17:11:04 -07:00
dfsek
4001a56100
Merge pull request #400 from PolyhedralDev/ver/6.3.0
make forge compile
2023-06-15 15:55:49 -07:00
dfsek
f46f35d2ad make forge compile 2023-06-15 15:52:36 -07:00
dfsek
70dbd2f2c0
Merge pull request #399 from PolyhedralDev/ver/6.3.0
Ver/6.3.0
2023-06-15 14:05:02 -07:00
dfsek
bf1be62d54
Merge pull request #385 from PolyhedralDev/dev/img-lib
Image library
2023-06-15 14:00:44 -07:00
Astrash
a5cbce3667 Optimize cardinal rotations for RotateColorSampler 2023-06-14 12:07:37 +10:00
Astrash
d0591f292e Use primitive int over Integer 2023-06-14 11:15:25 +10:00
dfsek
27874ce0a5
Merge pull request #396 from ccorp2002/master
1.19.4 Support...?
2023-06-10 15:55:12 -07:00
dfsek
170687abdb remove unused mixin 2023-06-10 15:53:27 -07:00
dfsek
46b61d841d remove unneeded buildscript 2023-06-10 15:50:45 -07:00
dfsek
41b7021121 fix fabric pack reloading 2023-06-10 15:49:33 -07:00
dfsek
183255140b remove unused RegistrarInstance class 2023-06-10 15:28:46 -07:00
dfsek
bea8f97179 fix bukkit pack reloading 2023-06-09 03:33:47 -07:00
dfsek
60fec05e12 Merge remote-tracking branch 'origin/ver/6.3.0'
# Conflicts:
#	build.gradle.kts
#	buildSrc/src/main/kotlin/Versions.kt
#	platforms/bukkit/build.gradle.kts
#	platforms/bukkit/nms/v1_19_R1/build.gradle.kts
#	platforms/bukkit/nms/v1_19_R2/build.gradle.kts
#	platforms/mixin-common/src/main/java/com/dfsek/terra/mod/ModPlatform.java
#	platforms/mixin-common/src/main/java/com/dfsek/terra/mod/generation/TerraBiomeSource.java
#	platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/PresetUtil.java
#	platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/LifecyclePlatform.java
#	platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/mixin/lifecycle/RegistryLoaderMixin.java
#	platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/util/LifecycleUtil.java
2023-06-09 03:16:18 -07:00
dfsek
e79cc21c11 1.19.4 fabric 2023-06-09 03:04:41 -07:00
Astrash
5188477a6d Merge branch 'ver/6.3.0' into dev/img-lib 2023-05-02 14:21:31 +10:00
Astrash
58b743e6e8 Distance transform documentation 2023-05-02 14:15:20 +10:00
Astrash
9fa5307a60 Remove image sampler addon
The image sampler is implemented as the 'CHANNEL' sampler provided
directly by the library-image addon instead.
2023-05-02 13:41:42 +10:00
Astrash
b4ea09929c ColorUtil documentation 2023-05-02 13:37:22 +10:00
Astrash
09d847bc5a Add argb method to Channel class 2023-05-02 13:12:23 +10:00
Astrash
dacddef5d6 rgb -> argb 2023-05-02 13:04:23 +10:00
Astrash
3c593c7013 Fix method call 2023-05-02 13:03:13 +10:00
Astrash
36d0ef77fb Add image support addon for biome pipeline 2023-05-02 12:58:37 +10:00
Astrash
105be0c346 Implement color parsing from strings 2023-05-02 12:58:29 +10:00
Astrash
39d21fbe08 Implement channel noise sampler 2023-05-01 13:58:56 +10:00
Astrash
50fc589001 Move distance transform to appropriate package 2023-05-01 13:58:18 +10:00
Astrash
ffa55cb7a3 Implement premultiplication in ColorUtil 2023-05-01 13:57:07 +10:00
Astrash
ff0985bd31 Make imagelib MathUtil 2023-05-01 13:10:58 +10:00
Astrash
622fed96e5 Use colorsampler package name instead of sampler 2023-05-01 12:48:13 +10:00
Astrash
c219eff149 Implement distance transform sampler 2023-05-01 12:45:26 +10:00
Astrash
514e7065e2 Update image provider v2 readme 2023-05-01 12:02:53 +10:00
dfsek
0a16453f98 remove devlaunch lazydfu 2023-04-13 18:20:16 -07:00
dfsek
ca2fe27fb3 fix preset creation 2023-04-13 18:15:35 -07:00
dfsek
6f2c01ceb3 update biome builder 2023-04-13 17:20:20 -07:00
dfsek
8b74a5dee0 implement biomeStream 2023-04-13 16:45:09 -07:00
dfsek
460a7651bc fix bukkit build 2023-04-13 16:44:01 -07:00
dfsek
b7a6b839e6 Merge remote-tracking branch 'origin/dev/1.19.3'
# Conflicts:
#	buildSrc/src/main/kotlin/Versions.kt
#	platforms/bukkit/build.gradle.kts
2023-04-13 16:34:43 -07:00
dfsek
75bff93ecd update mod versions 2023-04-13 16:31:49 -07:00
dfsek
57a45f08f0 re-package bukkit 1.19.4 code 2023-04-13 16:31:41 -07:00
C_Corp2002
ba35b56016
Delete AwfulBukkitHacks.java.txt
Unneeded.
2023-04-13 15:40:13 -07:00
C_Corp2002
8fd10956e4
Update build.gradle.kts 2023-04-12 00:51:49 -07:00
C_Corp2002
9a5c1302ac
Fixing...?
We gottem.
2023-04-12 00:51:12 -07:00
C_Corp2002
f918f1ef66
An attempt at 1.19.4 Support
I tried.
2023-04-09 21:08:38 -07:00
Astrash
2afcee28a6 Base key names on internal names 2023-03-01 13:39:09 +11:00
Astrash
6efff02c19 Implement stitched image support 2023-03-01 13:38:36 +11:00
Astrash
d3e0831d9e Use config type based image loading
Rename `path` key to `image`
2023-03-01 13:28:45 +11:00
Astrash
345012810a Fix biome-provider-image-v2 addon manifest 2023-03-01 13:22:39 +11:00
Astrash
73e0899e7c Only use WorldEdit relative offset for v2 sponge schematics 2023-02-28 13:05:36 +11:00
Astrash
8deae0480c Add support for WorldEdit schematic relative offsets 2023-02-28 11:58:39 +11:00
Astrash
7b87498751 Don't load same image multiple times 2023-02-07 11:59:03 +11:00
Astrash
33f1aa07d3 Mark BufferedImageLoader as deprecated 2023-02-07 11:38:12 +11:00
Astrash
3ab671827d Re-add old image sampler to config-noise-function w/ deprecation notice 2023-02-07 11:31:23 +11:00
Astrash
4d17edef80 Add deprecation notice for biome-provider-image addon 2023-02-07 11:31:23 +11:00
Astrash
9d5b33f130 Re-add original image biome provider
This is so we aren't breaking existing packs
2023-02-07 11:31:23 +11:00
Astrash
97c0dcad9d Rename image lib biome provider to v2 2023-02-07 11:31:23 +11:00
Astrash
ef4fe4eb7a Revert "Bump image provider major version"
This reverts commit f1bf3990c114e03e5429541499aba64ce0ed6816.
2023-02-07 11:31:23 +11:00
Astrash
9514641e1e Revert "Bump config-noise-function major version"
This reverts commit 68875cc17bd4bbe78dcdc3af06afb5723182732f.
2023-02-07 11:31:23 +11:00
Astrash
e6c51bcfd0 Merge branch 'ver/6.3.0' into dev/img-lib
fogor import
2023-02-07 11:30:54 +11:00
Astrash
084ecb9ad8 Forgot to delet sout 2023-02-06 20:36:28 +11:00
Astrash
5cc58babca Bump version to 6.3.0 2023-02-06 19:18:08 +11:00
Astrash
b10130c5c6 Cache loaded BufferedImages 2023-02-06 19:18:08 +11:00
dfsek
5bc34eb626 update version to 6.2.2 2023-02-06 19:18:08 +11:00
dfsek
7d74245109 make forge compile 2023-02-06 19:18:08 +11:00
dfsek
11b6080413 update bukkit to 1.19.3 2023-02-06 19:18:08 +11:00
dfsek
4df23e464b begin working on Forge 2023-02-06 19:18:08 +11:00
dfsek
7ea5747f8e clean up sysout logging 2023-02-06 19:18:08 +11:00
dfsek
caad76f6dd add mixin to inject flora 2023-02-06 19:18:08 +11:00
dfsek
ba2f24f1f5 1.19.3 launch and enter world 2023-02-06 19:18:08 +11:00
dfsek
57bb6bca94 evil registry hacks 2023-02-06 19:18:08 +11:00
dfsek
4bb09b126a continue registry wrangling 2023-02-06 19:18:08 +11:00
dfsek
ae96d8f526 fix inject parameters in NoiseConfigMixin 2023-02-06 19:18:08 +11:00
dfsek
4a918d00a3 allow registry manager to be overwritten 2023-02-06 19:18:08 +11:00
dfsek
cd65785de4 fix SaveLoadingMixin 2023-02-06 19:18:08 +11:00
dfsek
51cd4cd4b7 fix RegistryMixin target class 2023-02-06 19:18:08 +11:00
dfsek
e7efdd61a6 fabric compiles now 2023-02-06 19:18:08 +11:00
dfsek
0006762ff3 update platform biome delegate logic 2023-02-06 19:18:08 +11:00
dfsek
4e4627d11d update minecraft data config templates 2023-02-06 19:18:08 +11:00
dfsek
228b26f7c4 more work on evil update 2023-02-06 19:18:08 +11:00
dfsek
ef846d53ad update MinecraftChunkGeneratorWrapper and its codec 2023-02-06 19:18:08 +11:00
dfsek
f6f7529cb5 begin working on fabric 1.19.3 2023-02-06 19:18:08 +11:00
dfsek
606315ea64 update platform versions to 1.19.3 2023-02-06 19:18:08 +11:00
Astrash
46f7c95314 Implement BiomeProvider#getBaseBiome in pipeline v2 2023-01-30 12:57:50 +11:00
dfsek
4d826c880c update version to 6.2.2 2022-12-21 23:49:15 -07:00
dfsek
6da3acc8a1 make forge compile 2022-12-21 23:49:06 -07:00
dfsek
8fff27fddd update bukkit to 1.19.3 2022-12-21 23:00:40 -07:00
dfsek
75673b5b8e begin working on Forge 2022-12-21 21:59:39 -07:00
dfsek
5ded3552d3 clean up sysout logging 2022-12-21 21:38:40 -07:00
dfsek
ded308c01c add mixin to inject flora 2022-12-21 21:34:44 -07:00
dfsek
ee336b01a6 1.19.3 launch and enter world 2022-12-21 21:14:38 -07:00
dfsek
66465f27ff evil registry hacks 2022-12-21 14:41:43 -07:00
dfsek
764a4fa535 continue registry wrangling 2022-12-19 01:27:35 -07:00
dfsek
5dd5c37055 fix inject parameters in NoiseConfigMixin 2022-12-18 22:54:30 -07:00
dfsek
2e0f892fff allow registry manager to be overwritten 2022-12-18 22:53:10 -07:00
dfsek
cad0e4105c fix SaveLoadingMixin 2022-12-18 22:49:59 -07:00
dfsek
b10898b837 fix RegistryMixin target class 2022-12-18 22:46:57 -07:00
dfsek
6255ac7379 fabric compiles now 2022-12-18 22:44:53 -07:00
dfsek
c90ca076ab update platform biome delegate logic 2022-12-18 22:44:06 -07:00
dfsek
73af05bf09 update minecraft data config templates 2022-12-18 22:39:18 -07:00
dfsek
84eab0de4a more work on evil update 2022-12-18 22:03:00 -07:00
dfsek
393a868e6a update MinecraftChunkGeneratorWrapper and its codec 2022-12-18 20:05:17 -07:00
dfsek
8955e4bb81 begin working on fabric 1.19.3 2022-12-14 19:14:16 -07:00
dfsek
bae2af80c8 update platform versions to 1.19.3 2022-12-14 18:28:25 -07:00
Astrashh
6826f44770
Merge pull request #386 from PolyhedralDev/dev/dot-product-slant-again
Refactor Noise3D palettes to optionally use dot product slants
2022-11-29 13:28:23 +11:00
Astrash
1b5095dd36 Refactor Noise3d palettes to support multiple slant methods 2022-11-26 19:18:58 +11:00
Astrash
95992cc49b Don't apply align to single image fallback 2022-11-26 14:43:15 +11:00
Astrash
7b0185ba7c Add translate color sampler 2022-11-26 14:42:12 +11:00
Astrash
6b7fb82202 Put mutator color samplers in their own packages 2022-11-26 14:21:02 +11:00
Astrash
f246c8ada3 Put image based color samplers in own packages 2022-11-26 14:14:15 +11:00
Astrash
a97273f358 Skip color dist calc if exact match 2022-11-26 14:05:39 +11:00
Astrash
878bede60b Name changes 2022-11-26 13:52:15 +11:00
Astrash
b771e108b6 Use color sampler as fallback instead of constant 2022-11-26 13:52:15 +11:00
Astrash
5c916f7758 Add rotate color sampler 2022-11-26 13:52:05 +11:00
Astrash
e9db14f52c Wrap BufferedImage access 2022-11-26 13:49:10 +11:00
Astrash
b3f072d689 Properly ignore alpha of lookup map 2022-11-25 14:11:16 +11:00
Astrash
4fdef98bd9 Use generic key mapping function 2022-11-25 14:10:07 +11:00
Astrash
8670c4cdf3 ColorPicker -> ColorSampler 2022-11-25 10:17:56 +11:00
Astrash
64c2a41d19 Ignore alpha channel by default with ExactColorConverter 2022-11-24 13:56:11 +11:00
Astrash
4e225a6592 Add utility methods for zero-ing color channels 2022-11-24 13:55:36 +11:00
Astrash
c491ac5b24 ColorUtil.Channel getChannel() -> from() 2022-11-24 13:55:16 +11:00
Astrash
68875cc17b Bump config-noise-function major version
* Removed IMAGE sampler
2022-11-24 12:06:51 +11:00
Astrash
f1bf3990c1 Bump image provider major version 2022-11-24 12:06:51 +11:00
Astrash
4334b16ded Use color pickers in image sampler 2022-11-24 12:06:51 +11:00
Astrash
274f864d6a Move channels into image lib 2022-11-24 12:06:51 +11:00
Astrash
329d94ba9c Move image sampler to separate addon 2022-11-24 12:06:51 +11:00
Astrash
03ab463723 Rewrite the image biome provider to use the image library 2022-11-24 12:06:51 +11:00
Astrash
3580267532 Image library initial implementation
*Moves the BufferedImage loader into the library, rather than being
a loader implemented in common/implementation
2022-11-24 12:06:51 +11:00
dfsek
358e09d05b
Merge pull request #383 from PolyhedralDev/ver/6.2.1
6.2.1 but for real this time
2022-11-16 14:03:21 -07:00
dfsek
1f7c4ee4e7 rename from "2" to "v2" 2022-11-16 14:02:34 -07:00
dfsek
b3100e01e2 Merge remote-tracking branch 'origin/master' into ver/6.2.1 2022-11-16 13:49:13 -07:00
Astrash
02d3445dd9 Include deprecation notice for pipeline v1 2022-11-16 16:01:28 +11:00
Astrash
c1c85174ed Re-add original pipeline implementation 2022-11-16 16:01:28 +11:00
Astrash
6cdef5d4ad Move pipeline reimplementation to separate addon 2022-11-16 16:01:27 +11:00
Astrash
57cbea4000 Replace sout with logger debug calls 2022-11-16 16:01:27 +11:00
Astrash
3522b5f17c Remove test class from source 2022-11-16 16:01:27 +11:00
Astrash
5c58bd54a3 Ephemeral -> Placeholder 2022-11-16 16:01:27 +11:00
Astrash
ee6d475ad0 Move reimplementation classes into main package 2022-11-16 16:01:27 +11:00
Astrash
d170b4e0fd Handle resolution and biome blending 2022-11-16 16:01:27 +11:00
Astrash
bc324df7ca Working state for pipeline implementation 2022-11-16 16:01:27 +11:00
dfsek
9b75410ea7 configure bukkit resource config properly 2022-11-15 21:09:16 -07:00
dfsek
44550e8d8e
Merge pull request #382 from PolyhedralDev/ver/6.2.1
update version
2022-11-15 19:20:18 -07:00
dfsek
12845a6004 update version 2022-11-15 19:17:14 -07:00
dfsek
140295602c
Merge pull request #381 from PolyhedralDev/ver/6.2.1
Ver/6.2.1
2022-11-10 01:16:39 -07:00
dfsek
547f4884aa fix beard 2022-11-09 18:52:36 -07:00
dfsek
72e5ac76e6 update paper dev bundle to 1.19.2 2022-11-09 18:48:09 -07:00
dfsek
7d3bdeee8f
Merge pull request #379 from PolyhedralDev/fix/ender_crystal
Fix End Crystals on Bukkit
2022-11-09 18:18:57 -07:00
dfsek
e471950047
Merge pull request #380 from PolyhedralDev/fix/bukkit-beard
implement beardification on Bukkit (closes #370)
2022-11-09 18:18:42 -07:00
dfsek
1306dad776 implement beardification on Bukkit (closes #370) 2022-11-07 17:49:49 -07:00
dfsek
eb9685c734 fix #378 2022-11-07 17:31:41 -07:00
solonovamax
e8fa5514cc
Clean up language in code of conduct's license & attribution section 2022-09-06 10:42:05 -04:00
solonovamax
f1290b36d8
Fix more weird list formatting in code of conduct 2022-09-06 10:40:43 -04:00
solonovamax
befc0c6636
Fix an oopsie in the code of conduct with weird list formatting 2022-09-06 10:15:01 -04:00
Zoë
f851276fc2
Merge pull request #351 from Browsit/patch-2
Fix type mismatch
2022-08-26 10:56:45 -05:00
Zoë
bc334fa214
Merge pull request #350 from Browsit/patch-1
Update BUG_REPORT.md
2022-08-26 10:56:26 -05:00
Browsit
829696ccc8
Use jar URI prefix
Fixes `Path component should be '/'` on Windows
2022-07-21 02:35:38 -04:00
Browsit
43adf056c3
Fix type mismatch
Just pulled the master branch and got the error:

`C:\Users\{owner}\IdeaProjects\Terra\buildSrc\src\main\kotlin\DistributionConfig.kt: (49, 39): Type mismatch: inferred type is Path! but URI! was expected`
2022-07-20 22:27:22 -04:00
Browsit
f8a602790a
Update BUG_REPORT.md 2022-07-20 08:28:58 -04:00
dfsek
a175601424 disable parallel build 2022-07-07 23:27:20 -07:00
Zoë
7d056bd88c try fix packs 2022-07-07 20:35:46 -07:00
dfsek
eb79a6f762 create resources dir if not exist 2022-07-07 18:49:33 -07:00
Zoë
59af552be2 fix bukkit 2022-07-07 12:33:15 -07:00
dfsek
d63606a9b1 maybe fix bukkit resource manifest building 2022-07-07 09:10:14 -07:00
dfsek
fa0fb3cd15 specify exact arch loom version 2022-07-07 07:03:17 -07:00
dfsek
6c8c4f0e01 remove suspect options 2022-07-06 22:55:40 -07:00
dfsek
155349a00c dont run gradle tasks in parallel 2022-07-06 20:03:07 -07:00
dfsek
5f13536dc3
Merge pull request #329 from PolyhedralDev/ver/6.2.0
Minor version 6.2.0
2022-07-06 19:43:00 -07:00
dfsek
75a2dd7b6e revert formatting of PULL_REQUEST_TEMPLATE.md 2022-07-06 19:36:01 -07:00
dfsek
3cec404c6b specify platform in loom builds 2022-07-06 19:32:23 -07:00
dfsek
b3a8f375bc reformat all code 2022-07-06 19:28:07 -07:00
Zoë
dc5e71e3de fix tooling hell 2022-07-06 17:32:43 -07:00
dfsek
1d5abbcb6b specify mixin refmaps 2022-07-06 17:15:08 -07:00
dfsek
a1acfef721 fix remapping 2022-07-06 16:42:32 -07:00
dfsek
7bef490125 increase Gradle memory 2022-07-06 16:10:29 -07:00
dfsek
8a2c54c85b
Merge pull request #335 from duplexsystem/dev/enviroment
make villager biome types work and also quilt
2022-07-06 14:55:05 -07:00
Zoë
ef4a28fd23 Revert "remove dep because we shade"
This reverts commit 19e46fbe4c246d3ba4328c5551c0bf135c7317cb.
2022-07-06 13:05:59 -07:00
Zoë
10d44ce217 Expand the AwfulHacks series 2022-07-06 00:51:47 -07:00
Zoë
36ceabd749 Refactor Mixin build setup 2022-07-06 00:26:42 -07:00
Zoë
29e1d05c71 quilt works! 2022-07-05 22:57:03 -07:00
dfsek
f92ecb31a7 Merge remote-tracking branch 'Duplex/dev/enviroment' into dev/enviroment 2022-07-05 18:04:53 -07:00
dfsek
b7343ca327 fix typo 2022-07-05 18:04:39 -07:00
Zoë
b6d8453042 update QSL 2022-07-05 16:36:30 -07:00
Zoë
0ee359b0a3 Git ignore 2022-07-05 14:18:26 -07:00
Zoë
60046c4664 Revert "Quilt progress 2"
This reverts commit 639fc71f7af1c7ea057dd837f84c6d52275b5c68.
2022-07-05 14:18:01 -07:00
Zoë
b31f917acf Fix cloud in dev env 2022-07-05 14:17:44 -07:00
Zoë
639fc71f7a Quilt progress 2 2022-07-05 12:54:27 -07:00
Zoë
8d19368999 quilt progress 2022-07-05 11:24:18 -07:00
Zoë
19e46fbe4c remove dep because we shade 2022-07-05 02:24:25 -07:00
Zoë
d280e113e6 Villagers on lifecycle 2022-07-05 01:58:32 -07:00
Zoë
0e9f9bd2b0 Merge remote-tracking branch 'PolyhedralDev/ver/6.2.0' into dev/enviroment 2022-07-05 01:53:05 -07:00
Zoë
7e883ab5ce Villager Types 2022-07-05 01:52:24 -07:00
dfsek
892ba38fec specify fabric mixin in fabric-quilt shared code 2022-07-05 01:20:50 -07:00
dfsek
5da26e2b53 split most fabric and quilt code into common project 2022-07-05 01:11:32 -07:00
dfsek
2edf365781 create mixin-lifecycle project 2022-07-04 21:13:30 -07:00
dfsek
82920e570f add quilt platform implementation 2022-07-04 20:54:07 -07:00
dfsek
f5da9d1dfb
Merge pull request #330 from duplexsystem/dev/enviroment
moar biome settings 2: electric boogaloo
2022-07-03 22:11:26 -07:00
Zoë
cdb957403e Change memory to align to 1024mb 2022-07-03 13:50:16 -07:00
Zoë
21d8be4726 abstract addon id 2022-07-03 13:44:53 -07:00
Zoë
7a4bf38cbc actually version ify burningwave 2022-06-30 22:00:21 -07:00
Zoë
18de2c3f99 Fix dev launch for fabric and forge 2022-06-30 21:58:11 -07:00
Zoë
d7be33fa55 Merge remote-tracking branch 'origin/ver/6.2.0' into dev/enviroment 2022-06-29 14:18:00 -07:00
dfsek
ca791026bd bump version 2022-06-27 20:20:23 -07:00
Zoë
e21bb5c26d Refractor 2022-06-26 23:58:48 -07:00
Zoë
71aa42011f Spawning! 2022-06-26 23:43:15 -07:00
Zoë
b0bf9d042e oops 2022-06-26 22:02:18 -07:00
Zoë
dbd5edabae Imports 2022-06-26 21:48:38 -07:00
Zoë
4487be03f1 Merge remote-tracking branch 'duplexsystem/dev/enviroment' into ver/6.2.0 2022-06-26 21:46:18 -07:00
dfsek
3610230c71
Merge pull request #328 from PolyhedralDev/dev/architectury
Use Architectury to share mixins and mod code not dependent on mod loader
2022-06-25 13:34:10 -07:00
dfsek
6e6a378225
Merge pull request #326 from Astrashh/patch-1
Use correct dimensions in TS sampler function
2022-06-24 17:58:04 -07:00
dfsek
b05852e074 make slf4j testImplementation 2022-06-24 17:50:40 -07:00
dfsek
cffdf7aeeb use Fabric Loom 2022-06-24 16:00:47 -07:00
dfsek
e4d05312aa ignore mixins from common package in AwfulForgeHacks 2022-06-24 16:00:35 -07:00
Astrashh
0997326aef
Use correct dimensions in TS sampler function 2022-06-24 17:53:54 +10:00
dfsek
3139416b35 rename mod-common to mixin-common 2022-06-22 07:23:39 -07:00
dfsek
42cf7b9543 move DataPackContentsMixin to common 2022-06-22 06:31:38 -07:00
dfsek
2ae4f80351 move tagutil into common 2022-06-22 06:10:41 -07:00
dfsek
3b156586dc common-ify LifecycleUtil 2022-06-21 18:21:54 -07:00
dfsek
6ba4a48e29 move biomeutil stuff into common 2022-06-21 18:00:48 -07:00
dfsek
7c2908e5ca move most mod code into mod common 2022-06-21 17:53:46 -07:00
dfsek
2a24fa56d7 move seedhack into common 2022-06-21 16:01:59 -07:00
dfsek
2a6d130d20 move world handle into common module 2022-06-21 15:48:09 -07:00
dfsek
1a1000bbef fix forge build 2022-06-21 15:38:28 -07:00
dfsek
e1cbb29ae4 begin splitting mixins into common 2022-06-21 14:46:50 -07:00
dfsek
37c358e3d1 rename all platform references 2022-06-21 11:12:35 -07:00
dfsek
32b2f15f3b fix chunk generator codec name 2022-06-21 10:26:58 -07:00
dfsek
752f57bbea fix addon ID 2022-06-21 10:26:20 -07:00
dfsek
e2bb2d8712 refactor handles 2022-06-21 10:25:52 -07:00
dfsek
aeb2da4ede refactor chunk generator wrapper name 2022-06-21 10:25:23 -07:00
dfsek
0c02e4cb9a rename architectury implementation util class 2022-06-21 09:59:54 -07:00
dfsek
546431bbef clean up adapter 2022-06-21 09:59:16 -07:00
dfsek
111eb6b593 fix NoiseConfigMixin 2022-06-21 07:22:07 -07:00
dfsek
7c2982aa0a use registerhelper to register biomes 2022-06-20 23:33:14 -07:00
dfsek
e1656bac20 create registry sanity check 2022-06-20 23:25:03 -07:00
dfsek
a0225d6ece legitimately evil hack to fix forge weirdness 2022-06-20 23:08:22 -07:00
dfsek
13497a02a4 register stuff with events 2022-06-20 21:46:06 -07:00
dfsek
c120ab76d0 Revert "remove RegistryMixin"
This reverts commit 14273268
2022-06-20 21:35:32 -07:00
dfsek
a47541cfeb use annotation event subscriptions 2022-06-20 21:34:52 -07:00
dfsek
14273268c8 remove RegistryMixin 2022-06-20 21:03:30 -07:00
dfsek
cce9b69c45 load terra data on RegisterEvent 2022-06-20 20:05:02 -07:00
dfsek
e85afd7dd6 convert most lifecycle mixins to event listeners 2022-06-20 19:37:17 -07:00
dfsek
f3329bbff1 rename mixin configs 2022-06-20 18:33:28 -07:00
dfsek
c6428cff66 make slf4j compileOnlyAPI 2022-06-20 13:58:45 -07:00
dfsek
cb4c8f28ef clean up bukkit buildscript 2022-06-19 23:27:30 -07:00
dfsek
0829960232 simplify Fabric buildscript 2022-06-19 23:08:52 -07:00
dfsek
924783adb2 clean up buildscript 2022-06-19 22:47:06 -07:00
dfsek
86d34347db graceful fallback if resource cannot be loaded 2022-06-19 22:46:46 -07:00
dfsek
ccb8adec10 architectury launches now 2022-06-19 22:11:12 -07:00
dfsek
98a9035ae8 begin architectury implementation 2022-06-19 21:24:22 -07:00
dfsek
536733911b meta annotate BiomeExtrusionTemplate 2022-06-19 17:50:47 -07:00
dfsek
865ec58d70 fix Column erroneously caching 2022-06-19 02:05:36 -07:00
dfsek
33ca98ccaf dont shade caffeine into pipeline addon 2022-06-19 01:01:12 -07:00
dfsek
41fc28e1e9 use biome query API in ReplaceExtrusion 2022-06-19 00:34:03 -07:00
dfsek
abca785b1e refactor query addon package 2022-06-19 00:25:54 -07:00
dfsek
92d173cb89 rename tag addon to query addon 2022-06-19 00:20:42 -07:00
dfsek
dff2388b37 implement biome query API 2022-06-19 00:19:07 -07:00
dfsek
2f2fb54dea create biome tag API module 2022-06-18 23:58:37 -07:00
dfsek
2daac81565 update to cloud 1.7.0 2022-06-18 23:53:48 -07:00
dfsek
901b58f56a use Caffeine cache in SamplerProvider 2022-06-18 23:52:27 -07:00
dfsek
3000547ee9 cache column in ChunkInterpolator 2022-06-18 23:31:52 -07:00
dfsek
15fec550c7 use column in ChunkInterpolator and NoiseChunkGenerator3D 2022-06-18 03:31:23 -07:00
dfsek
c49202017f implement BaseBiomeColumn 2022-06-18 03:14:53 -07:00
dfsek
78d34498d9 add caching option to config pack 2022-06-18 02:33:25 -07:00
dfsek
8a2024e8d8 remove BiomeProviderHolder 2022-06-18 02:02:38 -07:00
dfsek
7de66fecf8 remove ChunkLocalCachingBiomeProvider 2022-06-18 02:01:06 -07:00
dfsek
642372eaa1 add caffeine as API 2022-06-18 01:28:48 -07:00
dfsek
6a95810e65 use max-1 as max Y in LazilyEvaluatedInterpolator 2022-06-18 01:16:36 -07:00
dfsek
4c6c284b93 properly clamp max Y in LazilyEvaluatedInterpolator 2022-06-18 01:10:18 -07:00
dfsek
1d8c012ae5 fix MatchPattern 2022-06-18 00:56:58 -07:00
dfsek
522d4e4d3a use vanilla getBaseColumn 2022-06-17 17:51:30 -07:00
dfsek
915dcf9b9b cache biome providers on Bukkit 2022-06-17 17:39:27 -07:00
dfsek
4dd43ea86d collapse single-entry probability collections to singletons 2022-06-17 16:28:32 -07:00
dfsek
21ec335db9 store cache between same column instances with different clamps 2022-06-17 01:44:21 -07:00
dfsek
46c03438b3 add optimization for AdjacentPatternLocator 2022-06-17 01:34:11 -07:00
dfsek
9ced14b813 clean up 2022-06-17 01:22:07 -07:00
dfsek
d2055d60fd optimize caching biomes in CLIWorld 2022-06-17 00:53:34 -07:00
dfsek
529cd463de add cli run task 2022-06-17 00:40:49 -07:00
dfsek
ab78bea9aa pull CLI versions to Versions.kt 2022-06-17 00:00:46 -07:00
dfsek
5df016e43e pull bukkit versions to Versions.kt 2022-06-16 23:58:25 -07:00
dfsek
cacfd66cf7 pull all fabric versions to Versions.kt 2022-06-16 23:55:22 -07:00
dfsek
fce8c823be bump fabric api version 2022-06-16 23:53:21 -07:00
dfsek
036a166909 fix ParserTest 2022-06-16 23:40:52 -07:00
dfsek
36682bc04c add biome sound configs 2022-06-16 22:02:08 -07:00
dfsek
7574c356a0 apply particles on Bukkit 2022-06-16 21:58:48 -07:00
dfsek
e1ce5e117c apply vanilla biome particle config 2022-06-16 21:57:50 -07:00
dfsek
ef0692977c bump terrascript addon version 2022-06-16 20:17:42 -07:00
dfsek
cfdce200dd bump feature stage addon version 2022-06-16 20:17:11 -07:00
dfsek
727f7ce2fb bump locator addon version 2022-06-16 20:16:53 -07:00
dfsek
bcae15225f fix matchpattern when min >= max 2022-06-16 17:47:54 -07:00
dfsek
baccd04c8d use correct y value in LazilyEvaluatedInterpolator 2022-06-16 17:21:46 -07:00
dfsek
34b1aca556 fix Minecraft bee issue 2022-06-16 16:46:44 -07:00
dfsek
ba179c0991 add BeeMoveGoalsUnsynchronizedRandomAccessFix 2022-06-16 16:37:14 -07:00
dfsek
01ba75a29b refactor mixins 2022-06-16 16:17:12 -07:00
dfsek
c96e908a1e fix Fabric entity spawning 2022-06-16 15:59:25 -07:00
dfsek
355805347b fix feature context registration 2022-06-16 02:04:31 -07:00
dfsek
e13f8163a2 simplify ChunkRegionMixin height accessors 2022-06-16 02:01:24 -07:00
dfsek
099d5f60c8 use propertykey for features 2022-06-16 01:56:44 -07:00
dfsek
80583e1596 add alternative methods for interacting with Context 2022-06-16 01:53:02 -07:00
dfsek
c83924a7a4 remove unneeded resolution application 2022-06-15 23:38:29 -07:00
dfsek
9081f3a004 use resolution in CachingBiomeProviders 2022-06-15 23:08:12 -07:00
dfsek
cfeeb432ea fully implement resolution in BiomeExtrusionProvider 2022-06-15 21:54:47 -07:00
dfsek
c31925f383 add default #resolution method in BiomeProvider 2022-06-15 21:49:41 -07:00
dfsek
72ad5b65df remove unneeded floorToInt in BiomePipelineProvider 2022-06-15 21:49:24 -07:00
dfsek
b7c381b0f9 dont use column in ChunkInterpolator 2022-06-15 21:46:20 -07:00
dfsek
7b23aa796f fix OOBE in NoiseChunkGenerator3D when using low res palette 2022-06-15 21:43:02 -07:00
dfsek
2c44857575 fix palette fuzz noise config 2022-06-15 20:23:05 -07:00
dfsek
2001b4c6f8 remove TerraScript PerformanceTest 2022-06-15 20:03:32 -07:00
dfsek
d73872a1c6 properly access 3d biomes in LazilyEvaluatedInterpolator 2022-06-15 19:55:06 -07:00
dfsek
23a35f8097 implement blockstate cache in Column 2022-06-15 18:59:12 -07:00
dfsek
df4636428c remove unneeded fabric permissions API dependency 2022-06-15 00:09:10 -07:00
dfsek
589e46477e fix low res column 2022-06-14 23:56:02 -07:00
dfsek
11cf4c3a95 add NetherFossilOptimization 2022-06-14 23:23:00 -07:00
dfsek
7d92d273cf dont use range iterator in MatchPattern 2022-06-14 22:42:10 -07:00
dfsek
e5fa4fd1f1 remove decimal on whole numbers (keeps parity with old scripts) 2022-06-14 22:18:31 -07:00
dfsek
8c9afc4592 recursively update variable table size 2022-06-14 22:01:54 -07:00
dfsek
3122962dc1 fix Function#applyDouble 2022-06-14 21:54:19 -07:00
dfsek
14e035bf2e use applyDouble and applyBoolean in applicable ops 2022-06-14 21:51:05 -07:00
dfsek
b2cc0d48aa use local variable table for terrascript 2022-06-14 21:30:58 -07:00
dfsek
613b96288a add primitive overrides to TerraScript items 2022-06-14 19:09:43 -07:00
dfsek
8b12dda604 fix OOBE with low res column 2022-06-14 18:57:01 -07:00
dfsek
61a40b4825 remove unneeded specialised column impl 2022-06-14 18:56:51 -07:00
dfsek
eac8d3b4e8 add resolution parameter to Column#forRanges 2022-06-14 18:34:58 -07:00
dfsek
5799b81414 use chunklocal cache for misses in FabricChunkGeneratorWrapper 2022-06-14 18:32:43 -07:00
dfsek
1aa73bf742 optimise equals and hashCode of SeededVector 2022-06-14 09:07:41 -07:00
dfsek
9f6dcfd71b drastically optimize ChunkLocalCachingBiomeProvider 2022-06-13 23:13:41 -07:00
dfsek
d80d653d3a optimization for when palette resolution is 1 2022-06-13 22:46:22 -07:00
dfsek
4f92205085 palette blend resolution default to 1 2022-06-13 22:45:31 -07:00
dfsek
b62c4d742f drastically optimize ChunkInterpolator 2022-06-13 22:39:39 -07:00
dfsek
012209cfcf implement palette sparse sampling 2022-06-13 15:42:15 -07:00
dfsek
4d6d14a3d8 inject palette resolution options 2022-06-13 13:56:46 -07:00
dfsek
7f05933a1a add palette resolution config options 2022-06-13 13:54:10 -07:00
dfsek
29d8e7eed4 caching biome provider in BukkitProtoWorld 2022-06-13 10:07:08 -07:00
dfsek
3cf680ab88 Merge remote-tracking branch 'origin/ver/6.1.2' into ver/6.2.0
# Conflicts:
#	platforms/fabric/src/main/resources/terra.mixins.json
2022-06-13 09:57:18 -07:00
dfsek
9abac34b83
Merge pull request #323 from PolyhedralDev/ver/6.1.2
Reimplement Cloud and update Bukkit implementation to 1.19 with Paperweight
2022-06-12 22:26:43 -07:00
dfsek
a94c0adeb5 bump versions 2022-06-12 22:22:50 -07:00
dfsek
e2088bbbb8 implement stronghold hack on 1.19 bukkit 2022-06-12 22:20:47 -07:00
dfsek
1d7ddc2844 remove ReloadCommandMixin 2022-06-12 21:57:47 -07:00
dfsek
443b372736 reimplement Cloud in Fabric 2022-06-12 21:57:19 -07:00
dfsek
170b3d95ea fix vanilla features generating in terra biomes 2022-06-12 21:57:10 -07:00
dfsek
ee88f9e75f apply downfall to 1.19 NMS biomes 2022-06-12 21:36:29 -07:00
dfsek
fbc1a38a8d depend on Cloud again in Fabric 2022-06-12 21:33:45 -07:00
dfsek
d333b186b1 update cloud to 1.70-SNAPSHOT 2022-06-12 21:31:12 -07:00
dfsek
2363ad8c6c fix reflection proxies 2022-06-12 21:24:19 -07:00
dfsek
55686e2704 shade reflection remapper 2022-06-12 21:20:35 -07:00
dfsek
5a445fefac fix bukkit reobf nms shadow 2022-06-12 20:47:59 -07:00
dfsek
2c85284cfb improve bukkit build 2022-06-12 20:27:14 -07:00
dfsek
0c2a8c6bbc use mapped 1.18 NMS 2022-06-12 18:13:00 -07:00
dfsek
b3efaa4f6a use paperweight for 1.18.2 2022-06-12 17:33:14 -07:00
dfsek
69b994df0d 1.19 bukkit compiles now 2022-06-12 17:04:00 -07:00
dfsek
2141e7489e add 1.19 NMS module 2022-06-12 16:12:21 -07:00
dfsek
f4f0dca3bd add papermc maven to build setting 2022-06-12 14:33:31 -07:00
dfsek
9d6ad582d8 more clear palette level logic 2022-06-12 01:41:39 -07:00
dfsek
0aadfdb356 allow meta on updatePalette 2022-06-12 01:14:35 -07:00
dfsek
7d6746ad47 allow metaconfiguration on PaletteLayerLoader 2022-06-12 01:02:16 -07:00
dfsek
5409725709 fix palette level when caves use palettes 2022-06-12 00:10:44 -07:00
dfsek
779834267e fix BiomeProviderHolder NPE 2022-06-11 23:56:28 -07:00
dfsek
a33982a432 add carving.update-palette option 2022-06-11 23:30:53 -07:00
dfsek
881477c42f use ChunkLocalCachingBiomeProvider 2022-06-11 21:50:04 -07:00
dfsek
d58eb699f1 create ChunkLocalCachingBiomeProvider 2022-06-11 21:39:15 -07:00
dfsek
1aa0c715b9 properly implement caching getColumn 2022-06-11 21:16:46 -07:00
dfsek
db61729e11 pass caching provider through all stages 2022-06-11 21:11:20 -07:00
dfsek
dbadef5672 add null check for biome provider 2022-06-11 20:58:41 -07:00
dfsek
aac16414d9 attach caching biome provider to protochunk 2022-06-11 20:50:48 -07:00
dfsek
47d2b66046 fix getHeight again 2022-06-11 12:58:49 -07:00
dfsek
e2ba671626 add replace extrusion 2022-06-11 02:46:59 -07:00
dfsek
0cb29e471e use column sampler in NoiseChunkGenerator3D 2022-06-11 02:33:51 -07:00
dfsek
ad5435f69d use column in ChunkInterpolator 2022-06-11 02:27:45 -07:00
dfsek
c9221ca64c implement feature stage resolution 2022-06-11 01:47:32 -07:00
dfsek
e5f0e64cf3 fix ChunkInterpolator 3d biome fetching 2022-06-11 00:33:29 -07:00
dfsek
2c5567296d add extruded biomes to provider list 2022-06-10 18:56:00 -07:00
dfsek
2da54b9843 use base biome in ElevationInterpolator 2022-06-10 18:52:21 -07:00
dfsek
8126f3c2be implement getBaseBiome 2022-06-10 18:50:34 -07:00
dfsek
3b2f2ab679 add optional getBaseBiome method 2022-06-10 18:47:22 -07:00
dfsek
ee6ecb9613 fix getHeight in air section 2022-06-10 18:33:58 -07:00
dfsek
12d51e3f27 fix extrusion registration 2022-06-10 18:31:10 -07:00
dfsek
d71b1ca984 implement ExtrusionColumn 2022-06-10 18:18:31 -07:00
dfsek
37d98df8c3 use extrusions to calculate biomes 2022-06-10 17:36:16 -07:00
dfsek
132a200e43 create and register SetExtrusionTemplate 2022-06-10 17:33:41 -07:00
dfsek
aa5947a9bd create BiomeExtrusionTemplate 2022-06-10 17:15:28 -07:00
dfsek
deb6de3d6c implement ReplaceableBiome 2022-06-10 17:09:39 -07:00
dfsek
b148401f0f null entity 2022-06-10 15:28:48 -07:00
dfsek
33a39cb237 optimize biome pipeline cache for 3 dimensions 2022-06-10 15:23:06 -07:00
dfsek
8f5d2c80f4 cache biome provider in chunkregion 2022-06-10 15:02:46 -07:00
dfsek
50f895c8f4 begin implementing BiomeExtrusionAddon 2022-06-10 14:48:59 -07:00
dfsek
dad0a0bd29 create extrusion biome provider project 2022-06-10 14:15:25 -07:00
dfsek
4a3f21f8f7 add loom-quiltflower plugin 2022-06-10 13:51:35 -07:00
dfsek
47d2ec6bb0 update Loom run addon configuration 2022-06-10 13:39:04 -07:00
dfsek
0e815500d0 update Loom 2022-06-10 13:36:43 -07:00
dfsek
6d2a634686 registerChecked config packs 2022-06-09 23:23:44 -07:00
dfsek
158adb55af bound check SurfaceLocator 2022-06-09 16:09:54 -07:00
dfsek
dc80fc1ffb fix BiomeProvider#getColumn 2022-06-09 16:09:46 -07:00
dfsek
09e7d58eaf add ColumnTest#testForRangesContiguous 2022-06-09 15:33:35 -07:00
dfsek
cc9f9cc8d8 fix Column 2022-06-09 15:28:33 -07:00
dfsek
7ce8dfbc65 add ColumnTest#testForRangesIndividual 2022-06-09 15:24:43 -07:00
dfsek
d95e998e5d add test for Column 2022-06-09 15:21:54 -07:00
dfsek
81023e1d67 bounds check 2022-06-09 14:44:21 -07:00
dfsek
6434b6b213 delegate constructor 2022-06-09 13:39:25 -07:00
dfsek
20c7f2f1fb fix SurfaceLocator 2022-06-09 13:21:48 -07:00
dfsek
e5e926cf10 fix column iterator 2022-06-09 13:17:36 -07:00
dfsek
544b3767d2 remove column check 2022-06-09 13:04:05 -07:00
dfsek
876e4b86ae add y to exception message 2022-06-09 08:29:08 -07:00
dfsek
089710247b fix range sample 2022-06-09 08:29:00 -07:00
dfsek
0797c113a6 cache columns in BiomeProvider 2022-06-09 08:12:36 -07:00
dfsek
1e3cb91ed2 fix max/min assignment 2022-06-09 07:52:02 -07:00
dfsek
dcc6f025a6 fix oobe in ChunkInterpolator 2022-06-08 23:06:01 -07:00
Zoë
f23e7f29fd Merge remote-tracking branch 'origin/ver/6.2.0' into biomestuff 2022-06-08 22:18:49 -05:00
Zoë
3c94b5960d More environment settings for fabric 2022-06-08 22:18:21 -05:00
dfsek
245acde336 use 3d biomes in FeatureGenerationStage 2022-06-08 19:17:00 -07:00
dfsek
53df9a47fc add Column#clamp 2022-06-08 19:13:57 -07:00
dfsek
f036bddf9e add Column#forRanges 2022-06-08 19:03:52 -07:00
dfsek
3d4e2e4263 use y-level in ChunkInterpolator 2022-06-08 18:53:57 -07:00
dfsek
111470c9f4 bump noise-chunk-generator-3d addon version 2022-06-08 18:39:45 -07:00
dfsek
8a1d329fd9 use biome y-level for palette in NoiseChunkGenerator3D 2022-06-08 18:39:19 -07:00
dfsek
2307138fa8 add IntObjConsumer and forEach implementation in Column 2022-06-08 18:35:49 -07:00
dfsek
84cb428b6c add BiomeProvider#getColumn 2022-06-08 18:33:31 -07:00
dfsek
c46f84a00e create Column interface 2022-06-08 18:27:08 -07:00
dfsek
d93f11b5f2 fix resource dumping on windows 2022-06-07 18:39:43 -07:00
dfsek
6f41d16408 bump version 2022-06-07 18:36:41 -07:00
dfsek
0feae25be5
Merge pull request #318 from PolyhedralDev/dev/1.19
Update to 1.19
2022-06-07 15:40:41 -07:00
dfsek
d0069ffe83 bump version 2022-06-07 15:13:19 -07:00
dfsek
cec83aeb78
Merge pull request #317 from PolyhedralDev/ver/6.0.1
Update addons when new minor and patch versions are available
2022-06-07 15:06:21 -07:00
dfsek
c468054bbe spawn entity in serverworld with no world object 2022-06-07 15:05:47 -07:00
dfsek
372931a9c5 fix chunkregion entity spawn crash 2022-06-07 13:56:02 -07:00
dfsek
9a640de8d3 fix file dumping 2022-06-07 11:38:53 -07:00
dfsek
f4968e1509 downgrade loom 2022-06-07 11:38:40 -07:00
dfsek
1858bab210 only remove old resources if replacement exists 2022-06-07 11:19:53 -07:00
dfsek
c811fd31b1 warn about nonexistent classpath resources 2022-06-07 11:17:07 -07:00
dfsek
098cb740dd fix addon check on fresh install 2022-06-07 11:02:58 -07:00
dfsek
9ac63ce469 fix (??) Loom issues 2022-06-07 11:01:14 -07:00
dfsek
db0067a6d9 improve addonDir addon installation 2022-06-07 10:19:42 -07:00
dfsek
5de8df188a specify failed addon path 2022-06-07 08:53:57 -07:00
dfsek
fa66bd3c42 create addon dir if it doesn't exist 2022-06-07 08:32:55 -07:00
dfsek
e89d473669 update to 1.19 2022-06-07 08:24:58 -07:00
dfsek
90f3138395 Merge remote-tracking branch 'origin/ver/6.0.1' into dev/1.19 2022-06-07 08:18:05 -07:00
dfsek
4e789479e4 update loom 2022-06-07 08:13:59 -07:00
dfsek
3fbb93d157
Merge pull request #312 from duplexsystem/patch-1
Fix fabric config
2022-06-07 00:39:51 -07:00
dfsek
90a48345c2 automatically update addons when minor & patch versions are changed 2022-06-07 00:39:05 -07:00
dfsek
7c00cad4c9 add Pair function API 2022-06-07 00:38:09 -07:00
solo
963e070f92
Merge pull request #313 from duplexsystem/patch-2
fix new lines in PULL_REQUEST_TEMPLATE.md so that check boxes render …
2022-06-06 12:53:05 -04:00
dfsek
908a5dc309 use main executor for generation 2022-06-05 20:59:37 -07:00
dfsek
3adcdb4019 implement air threshold in beardifier 2022-06-05 19:28:08 -07:00
dfsek
fbbf09a937 fix beardification 2022-06-05 18:55:43 -07:00
dfsek
254bc93f93 remove unneeded seed from TerraBiomeSource 2022-06-05 17:48:12 -07:00
dfsek
ed7bfd2d68 register normal tag to Terra world presets 2022-06-05 17:18:24 -07:00
dfsek
76e8c2d2b1 tag collection util method 2022-06-05 16:57:43 -07:00
dfsek
b0aca47e74 registerTags -> registerBiomeTags 2022-06-05 16:56:43 -07:00
dfsek
5d703327db bump versions 2022-06-04 15:11:59 -07:00
dfsek
5ebe09444b
Merge pull request #314 from PolyhedralDev/ver/6.0.1
Patch version 6.0.1
2022-06-04 15:05:22 -07:00
dfsek
136ceddff5 getOrDefault with empty list 2022-06-04 14:27:48 -07:00
dfsek
b4bee3a65d add ReloadCommandMixin 2022-06-04 01:15:53 -07:00
dfsek
f870dab568 correct key used to register world type 2022-06-04 00:36:36 -07:00
dfsek
7027574d35 Merge remote-tracking branch 'origin/ver/6.0.1' into dev/1.19 2022-06-04 00:11:58 -07:00
dfsek
c55c19a32e reduce seed hack console spam 2022-06-03 22:36:56 -07:00
dfsek
f05e4c1852 register terra world preset 2022-06-03 22:32:30 -07:00
dfsek
1eb2d5c3ac fix mapping change in BeardGenerator 2022-06-03 20:39:14 -07:00
dfsek
3b98f8c0ab add seed hack for biome provider 2022-06-03 20:39:05 -07:00
dfsek
229886d84c update to minecraft 1.19-rc2 2022-06-03 17:24:44 -07:00
dfsek
c1dc637eb2 fix run task addon dependency 2022-06-02 22:05:24 -07:00
dfsek
a5db29f2ad fix TerraScript EqualsStatement 2022-06-02 22:04:52 -07:00
dfsek
20e6b8bb63 promote terrascript log function to info level 2022-06-02 22:03:36 -07:00
Zoë
c7f6e34647
fix new lines in PULL_REQUEST_TEMPLATE.md so that check boxes render correctly on github 2022-06-02 23:44:05 -04:00
Zoë
dc59bb5d2e
Fix fabric config
the config.yml in the fabric implementation is outdated and presumably unneeded
2022-06-02 23:40:30 -04:00
dfsek
64f66474b1 remove fabric command api dependency 2022-06-02 08:16:25 -07:00
dfsek
d4abedaa05 remove cloud Fabric dependency entirely 2022-06-02 08:11:09 -07:00
dfsek
6e18978586 use default block registry 2022-06-02 08:07:21 -07:00
dfsek
5b2e8b7fbd temporarily disable Cloud 2022-06-02 08:05:09 -07:00
dfsek
2608e94980 fix run task addon dependency 2022-06-02 07:47:31 -07:00
dfsek
1d469687cb Merge branch 'master' into dev/1.19 2022-06-02 07:19:14 -07:00
dfsek
a9248435a2
Merge pull request #227 from PolyhedralDev/ver/6.0.0
Major Version 6.0 Tracking PR
2022-06-01 11:01:24 -07:00
dfsek
b4cdb7f16c yell very loudly if NMS bindings fail to initialize 2022-05-31 23:00:44 -07:00
dfsek
675a4465d7 redo addon bundling 2022-05-31 22:31:51 -07:00
dfsek
839013d89a split NMS away from core bukkit code 2022-05-31 22:31:40 -07:00
dfsek
8e933a1bb4 remove println 2022-05-31 18:41:39 -07:00
dfsek
10308959a1 fix stronghold deadlock 2022-05-31 18:33:39 -07:00
dfsek
68ac277471 clean up 2022-05-31 16:43:43 -07:00
dfsek
b93ff99b2e use server structure registry 2022-05-31 15:51:58 -07:00
dfsek
285367f616 dont inject vanilla gen settings in bukkit biome delegate 2022-05-31 15:43:24 -07:00
dfsek
e3dd42c856 fix deadlock 2022-05-31 15:20:23 -07:00
dfsek
a54b48f68a fix NMSBiomeProvider 2022-05-31 15:12:14 -07:00
dfsek
de2d37cdf5 implement more vanilla methods in NMSChunkGeneratorDelegate 2022-05-31 14:54:41 -07:00
dfsek
75b72a500d remove unneeded chunkgenerator overrides 2022-05-31 14:37:30 -07:00
dfsek
7da0580eda Revert "implement hacky Bukkit structure workaround"
This reverts commit 688315180962ee8d17169003b3e62c31ff18d1b2.
2022-05-31 14:22:36 -07:00
dfsek
6883151809 implement hacky Bukkit structure workaround 2022-05-31 13:23:38 -07:00
dfsek
00e9ab4263 pass seed into NMSChunkGeneratorDelegate 2022-05-31 00:26:05 -07:00
dfsek
2acfada4f8 add core count throttling option to bukkit buildscript 2022-05-30 22:32:17 -07:00
dfsek
d07f9fe341 clean up BeardGenerator 2022-05-30 20:44:29 -07:00
dfsek
9c9487ced6 1.19 fabric compiles now 2022-05-30 20:44:04 -07:00
dfsek
9d131a8992 update FabricChunkGeneratorWrapper 2022-05-30 19:55:42 -07:00
dfsek
cd57a32f31 update build to support 1.19 2022-05-30 19:48:37 -07:00
dfsek
4c2ece3eb7 dont shade fastmath when it's unneeded 2022-05-30 17:56:13 -07:00
dfsek
59318d75fc use caffeine cache in biome pipeline provider 2022-05-30 17:43:27 -07:00
dfsek
d9eef2e5d5 clean up imports 2022-05-30 17:32:05 -07:00
dfsek
2f189d94ac add inject lock 2022-05-30 15:53:37 -07:00
dfsek
223db88462 log when spawn found 2022-05-30 14:05:51 -07:00
dfsek
f2d9511f01 implement BukkitChunkGeneratorWrapper#getFixedSpawnLocation 2022-05-30 13:58:09 -07:00
dfsek
ef1f1c0af0 fix range bounds check 2022-05-29 23:49:25 -07:00
dfsek
da28244f81 typo 2022-05-29 23:46:05 -07:00
dfsek
77ba13ce93 actually fix rangeloader 2022-05-29 23:44:43 -07:00
dfsek
eb8bafe5d8 fix rangeloader singleton 2022-05-29 23:37:54 -07:00
dfsek
411ef10c0c fix versioning issues 2022-05-29 21:44:52 -07:00
dfsek
01d4174092 bump all addon versions 2022-05-29 21:33:45 -07:00
dfsek
d072e72590 fix bukkit isSolid check 2022-05-29 21:09:02 -07:00
dfsek
38e4e9bc94 simplify NMS impl 2022-05-29 21:04:48 -07:00
dfsek
126ddaf9c7 dont shade unneeded bukkit dependencies 2022-05-29 20:42:11 -07:00
dfsek
4bf5be5734 demote biome registration to debug log 2022-05-29 19:17:23 -07:00
dfsek
c8a4f8be6a fix colors 2022-05-29 19:13:00 -07:00
dfsek
049c5cc83a inject tags into Bukkit biome delegates 2022-05-29 18:51:29 -07:00
dfsek
ef1f2e882d implement NMS chunk generator on bukkit 2022-05-29 18:35:38 -07:00
dfsek
e94d90050a remove unneeded PaperListener 2022-05-29 15:28:06 -07:00
dfsek
8977e82b73 add Bukkit NMS dependency 2022-05-29 15:05:29 -07:00
dfsek
dfff178bfe update paper build number 2022-05-29 05:08:24 -07:00
dfsek
4f00dadc22 update purpur URL 2022-05-29 05:06:14 -07:00
dfsek
7b439f005e geerate vanilla structures on bukkit 2022-05-29 05:02:47 -07:00
dfsek
5c165cd40d fix chunk generator wrapper codec 2022-05-29 04:51:25 -07:00
dfsek
43a84cca3d simplify biome tag injection 2022-05-29 03:36:52 -07:00
dfsek
a4d87a428c add vanilla bonemeal flowers to Terra biomes 2022-05-29 03:05:01 -07:00
dfsek
414c0b8a38 cache UserDefinedFunctions 2022-05-28 17:39:52 -07:00
dfsek
a11e02a84a use paralithic eval in MetaNumberPreprocessor 2022-05-28 17:16:12 -07:00
dfsek
1a08414822 bump paralithic version 2022-05-28 17:11:30 -07:00
dfsek
0b6b66b7e6 apply vanilla biome flower feature supplier to terra biomes 2022-05-28 16:39:10 -07:00
dfsek
278ab648dd fix tag injection logger 2022-05-28 15:56:00 -07:00
dfsek
fe101f1221 refactor fabric util methods 2022-05-28 14:05:25 -07:00
dfsek
b6b6cb185d implement API for 3d biomes 2022-05-27 14:40:50 -07:00
dfsek
ee373bbe4b reformat code 2022-05-26 19:40:41 -07:00
dfsek
49857f6b91 remove Properties 2022-05-26 19:33:37 -07:00
dfsek
8655f7811a remove rotationutil methods 2022-05-26 19:32:20 -07:00
dfsek
ce47cd9316 bump fabric API version 2022-05-26 15:23:38 -07:00
dfsek
c4c71ac9ef add slant singleton 2022-05-26 14:40:58 -07:00
dfsek
eaebc445f6 apply narrowing operation to BinaryColumn#and 2022-05-26 13:18:00 -07:00
dfsek
3ec15960cf reduce overhead of profiler when not profiling 2022-05-26 12:51:18 -07:00
dfsek
5275c40c6a remove some @Shadow methods in favor of casts 2022-05-26 12:16:40 -07:00
dfsek
68ef5a5a32 demote tag log to debug 2022-05-25 23:57:00 -07:00
dfsek
63bfa6bf14 fix NotEqualsStatement 2022-05-25 23:01:14 -07:00
dfsek
bce25b8702 fix refactor typo in BUG_REPORT.md 2022-05-25 22:27:52 -07:00
dfsek
c88fbc0321 remove unneeded lang file 2022-05-25 22:27:18 -07:00
dfsek
0d1e7fd686 Merge remote-tracking branch 'origin/master' into ver/6.0.0
# Conflicts:
#	build.gradle.kts
#	common/src/main/resources/lang/de_de.yml
#	platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitTree.java
#	platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraFabricPlugin.java
2022-05-25 22:26:09 -07:00
dfsek
bd2ec52832 fix tag registration 2022-05-25 20:44:26 -07:00
dfsek
c3b9902c5f remove unneeded jank warning 2022-05-25 19:59:04 -07:00
dfsek
69a5cfecd1 remove println 2022-05-25 17:51:32 -07:00
dfsek
304ae3075b Revert "remove unneeded lifecycle mixins"
This reverts commit af90088505977cac679039f10912e58d0235bd83.
2022-05-25 14:48:30 -07:00
dfsek
0550f36447 fix biome provider codec 2022-05-25 14:36:41 -07:00
dfsek
b82e84d447 better error message when injecting tags 2022-05-25 12:22:30 -07:00
dfsek
7a59aeb80c add BukkitAdapter util method 2022-05-25 12:22:30 -07:00
dfsek
0228facd71 sort of fix more stuff 2022-05-25 00:43:52 -07:00
dfsek
af90088505 remove unneeded lifecycle mixins 2022-05-24 23:53:23 -07:00
dfsek
2ddf620fb8 register biomes to builtin registries 2022-05-24 23:35:28 -07:00
dfsek
0c3d4f4f4e lazily evaluate terrascript binary operations 2022-05-24 18:25:24 -07:00
dfsek
e339b26657 remove unused hashmap impl 2022-05-15 22:13:20 -07:00
dfsek
cee42ac467 bump fabric loader dependency 2022-05-15 19:22:14 -07:00
dfsek
a2b061ce0d fix JIJ 2022-05-15 19:22:05 -07:00
dfsek
7d2c2bb141 use cast for ServerWorldMixin#getSeed 2022-05-15 18:41:10 -07:00
dfsek
8cd31ead99 bump mixin config java version 2022-05-15 18:40:54 -07:00
dfsek
3a8fb37cd6 remove unneeded iface map option 2022-05-15 18:32:40 -07:00
dfsek
2abf809d0f improve constant baking in SamplerFunction 2022-05-14 14:19:49 -07:00
dfsek
cc9c7870ba shade api into Fabric 2022-05-14 13:01:33 -07:00
dfsek
2fe04d7f6b Merge remote-tracking branch 'origin/ver/6.0.0' into ver/6.0.0
# Conflicts:
#	build.gradle.kts
#	buildSrc/src/main/kotlin/DependencyConfig.kt
#	buildSrc/src/main/kotlin/DistributionConfig.kt
#	common/addons/biome-provider-image/build.gradle.kts
#	common/addons/biome-provider-pipeline/build.gradle.kts
#	common/addons/biome-provider-single/build.gradle.kts
#	common/addons/chunk-generator-noise-3d/build.gradle.kts
#	common/addons/command-addons/build.gradle.kts
#	common/addons/command-packs/build.gradle.kts
#	common/addons/command-profiler/build.gradle.kts
#	common/addons/command-structures/build.gradle.kts
#	common/addons/config-biome/build.gradle.kts
#	common/addons/config-distributors/build.gradle.kts
#	common/addons/config-feature/build.gradle.kts
#	common/addons/config-flora/build.gradle.kts
#	common/addons/config-locators/build.gradle.kts
#	common/addons/config-noise-function/build.gradle.kts
#	common/addons/config-ore/build.gradle.kts
#	common/addons/config-palette/build.gradle.kts
#	common/addons/config-structure/build.gradle.kts
#	common/addons/generation-stage-feature/build.gradle.kts
#	common/addons/generation-stage-structure/build.gradle.kts
#	common/addons/language-yaml/build.gradle.kts
#	common/addons/manifest-addon-loader/build.gradle.kts
#	common/addons/palette-block-shortcut/build.gradle.kts
#	common/addons/structure-block-shortcut/build.gradle.kts
#	common/addons/structure-mutator/build.gradle.kts
#	common/addons/structure-sponge-loader/build.gradle.kts
#	common/addons/structure-terrascript-loader/build.gradle.kts
#	common/addons/terrascript-function-check-noise-3d/build.gradle.kts
#	common/addons/terrascript-function-sampler/build.gradle.kts
#	common/api/build.gradle.kts
#	common/implementation/base/build.gradle.kts
#	common/implementation/bootstrap-addon-loader/build.gradle.kts
#	platforms/bukkit/build.gradle.kts
#	platforms/cli/build.gradle.kts
#	platforms/merged/build.gradle.kts
2022-05-14 12:03:56 -07:00
dfsek
977316c57f make bukkit warning less obnoxious 2022-05-05 15:25:53 -07:00
dfsek
d2c5f711ef Merge remote-tracking branch 'origin/ver/6.0.0' into ver/6.0.0 2022-05-05 15:16:40 -07:00
dfsek
b8baa05922 fix bukkit shading 2022-05-05 15:16:27 -07:00
dfsek
98b332fe54 fix shading config 2022-05-05 14:56:51 -07:00
dfsek
6e61154cc5 update paralithic version 2022-05-05 14:47:38 -07:00
dfsek
0a5450a345 shade paralithic in noise addon 2022-05-05 10:16:09 -07:00
dfsek
83baf377e0 fix bootstrap addon class referencing from addons 2022-05-05 09:14:45 -07:00
dfsek
ffc884384c create BootstrapAddonClassLoader 2022-05-05 08:56:35 -07:00
dfsek
0c302456a2 use shadowJar for addon packaging 2022-05-05 08:32:48 -07:00
dfsek
41e7ad35bd simplify dependency configuration 2022-05-05 08:25:30 -07:00
dfsek
82b474ead2
Merge pull request #307 from LtPeriwinkle/posterization-normalizer
Implement posterization normalizer
2022-05-03 18:10:14 -07:00
LtPeriwinkle
d544e16885 Feat: Implement posterization normalizer
Closes #204
2022-05-03 17:45:19 -07:00
dfsek
4396623420 improve addon dependency system 2022-04-29 23:03:18 -07:00
dfsek
d2795bfdb6 replace ChunkInterpolator mod by 4 with and by 3 2022-04-29 22:00:22 -07:00
dfsek
42fb3642f9 update bukkit testing stuff 2022-04-24 23:43:37 -07:00
dfsek
834404c477 remove BiomeEffectsAccessor 2022-04-24 21:57:51 -07:00
dfsek
85d951e367 remove empty FabricTree class 2022-04-24 21:55:36 -07:00
dfsek
5b5a531731 use proper inputFile option for remap task 2022-04-24 21:48:41 -07:00
dfsek
7faadc3529 update Loom 2022-04-24 21:37:53 -07:00
dfsek
2ff456dd45 update slf4j 2022-04-24 21:35:02 -07:00
dfsek
3ac7099db5 update Fabric API and Yarn 2022-04-24 21:32:55 -07:00
dfsek
3b936b68e6 update fabric loader version 2022-04-24 21:29:40 -07:00
dfsek
3034f748df fix slf4j shading 2022-04-24 21:27:29 -07:00
dfsek
4daf2d65ee
Merge pull request #304 from PolyhedralDev/dev/1.18.2
Update to 1.18.2
2022-04-17 21:34:13 -07:00
dfsek
cccc819fd8 fix reloading 2022-04-17 21:33:38 -07:00
dfsek
d4ec346254 fix server initialisation injection point 2022-04-17 21:14:48 -07:00
dfsek
b0c6dc612f fix config pack fetching on server 2022-04-17 21:11:30 -07:00
dfsek
78503cf1b7 add jank warning for future me 2022-04-17 20:44:57 -07:00
dfsek
eb51a89971 remove location test mixin 2022-04-17 20:42:12 -07:00
dfsek
e2350650d0 fix structure location 2022-04-17 20:41:55 -07:00
dfsek
b93a6703cb make sure tags are clear 2022-04-17 19:41:34 -07:00
dfsek
83bc8cb026 less jank registration mixin 2022-04-11 09:08:02 -07:00
dfsek
3a89dc8309 remove BiomeRegistrationEvent 2022-04-11 09:03:37 -07:00
dfsek
6d1e592f32 clean up 2022-04-04 18:34:19 -07:00
dfsek
42880e01b9 remove unused FabricUtil method 2022-04-04 18:17:42 -07:00
dfsek
e2f38ed577 demote tag log messages to debug 2022-04-04 18:17:22 -07:00
dfsek
c62a1cf8b5 register all tags 2022-04-04 18:16:48 -07:00
dfsek
ef95b25c2d mark codecs stable 2022-04-04 18:07:45 -07:00
dfsek
4b8efd1a36 biome tagging debugging 2022-04-04 18:04:26 -07:00
dfsek
7d03d5a26b clean up 2022-04-04 17:37:50 -07:00
dfsek
0b49bf4dc9 register some tags 2022-04-04 17:37:43 -07:00
dfsek
b4d34589d8 do tag stuff at proper time 2022-04-04 16:31:05 -07:00
dfsek
60ead9f7a0 use only delegate biomes in biome source 2022-04-04 16:10:09 -07:00
dfsek
d46de7b324 fix formatting error 2022-03-30 17:56:33 -07:00
dfsek
4a3c22a8d6 reformat all code 2022-03-30 14:43:56 -07:00
dfsek
d79c37fc49 bump fabric loader version 2022-03-30 14:36:36 -07:00
dfsek
15107459be move more fabric versions to Versions.kt 2022-03-30 14:35:53 -07:00
dfsek
9fc9688fa6 fix biome registration 2022-03-23 23:52:05 -07:00
dfsek
ee3dd1259c remove broken biome registration mixin 2022-03-23 23:38:56 -07:00
dfsek
ff16246e42 require non-null biome delegate 2022-03-23 22:36:18 -07:00
dfsek
a71da4f4c2 register terra chunk generators alongside vanilla 2022-03-23 22:30:21 -07:00
dfsek
2267759378 fix ServerMainMixin 2022-03-23 22:22:51 -07:00
dfsek
2b0b06e14f better codec names 2022-03-23 22:18:16 -07:00
dfsek
518eda919d fix access widener 2022-03-23 22:16:42 -07:00
dfsek
c8a58ce702 fix codecs 2022-03-23 22:14:40 -07:00
dfsek
61797170b6 fix BeardGenerator 2022-03-23 22:07:28 -07:00
dfsek
480bc738dd fix MinecraftServer_BiomeRegistrationMixin 2022-03-23 22:01:47 -07:00
dfsek
2075ed101b fix GeneratorOptionsMixin 2022-03-23 21:51:42 -07:00
dfsek
e771588647 clean up ServerWorldMixin 2022-03-23 21:46:36 -07:00
dfsek
0529a5017e remove static world registration 2022-03-23 21:44:54 -07:00
dfsek
f16bd6cc61 fix ServerWorldMixin 2022-03-23 21:42:37 -07:00
dfsek
2a8b9b1c35 fix MinecraftServerMixin 2022-03-23 21:41:40 -07:00
dfsek
f507ba5474 remove ConfiguredStructureFeaturesMixin 2022-03-23 21:40:40 -07:00
dfsek
422de4eea1 fix biome creation method 2022-03-23 21:38:57 -07:00
dfsek
c6e745c796 apply access widener to Biome#getCategory 2022-03-23 21:31:45 -07:00
dfsek
c7437f8fb7 fix withSeed method in FabricChunkGeneratorWrapper 2022-03-23 21:18:59 -07:00
dfsek
f7b5ca5690 remove unneeded cast in GeneratorOptionsMixin 2022-03-23 21:17:42 -07:00
dfsek
05a0c28a1c fix references in TerraBiomeSource 2022-03-23 21:17:24 -07:00
dfsek
09416bc34c use noise registry in wrapper instantiation 2022-03-23 21:11:43 -07:00
dfsek
d188a79ed7 pass noise registry into FabricChunkGeneratorWrapper 2022-03-23 21:10:34 -07:00
dfsek
a9372553f5 use zero multinoise 2022-03-23 21:03:18 -07:00
dfsek
c81e4f4b40 update minecraft version 2022-03-23 11:05:12 -07:00
dfsek
55bcad82d2 update cloud version 2022-03-23 11:01:25 -07:00
dfsek
21136f4c3c update gradle version 2022-03-07 15:03:03 -07:00
dfsek
aeadfb21dd create basic terrascript performance test 2022-02-22 09:42:52 -07:00
dfsek
a02847e3ed drastically optimise terrascript scoping 2022-02-16 15:55:46 -07:00
dfsek
aa39dc4b81 optimise BinaryColumn get 2022-02-15 10:55:09 -07:00
dfsek
f13d66d095 calculate locator positions before application 2022-02-15 09:12:30 -07:00
dfsek
b99085b49f fix pattern locator range 2022-02-14 09:33:37 -07:00
dfsek
68f8c8cea8 short-circuit locators 2022-02-14 09:30:45 -07:00
dfsek
0f767c6896 fix ClassCastException in ChunkRegionMixin due to assumption of terra chunk generator 2022-01-31 10:07:29 -07:00
dfsek
862d008f4c join resource reload in fabric impl 2022-01-31 10:01:17 -07:00
dfsek
1a105b3417 Merge remote-tracking branch 'origin/ver/6.0.0' into ver/6.0.0 2022-01-28 22:54:08 -07:00
dfsek
fb2cc99382 add ALL tag to ephemeral biome 2022-01-28 22:53:27 -07:00
dfsek
6bd0efbcf0 perform null check on biome in BorderMutator 2022-01-28 22:49:40 -07:00
dfsek
9fe8ac7b32 implement spawnEntity in ChunkRegionMixin 2022-01-28 22:46:24 -07:00
dfsek
c131d81686 soft-implement proper method in ServerWorldMixin 2022-01-28 22:45:56 -07:00
dfsek
5ab0e0d6c5 Merge remote-tracking branch 'origin/ver/6.0.0' into ver/6.0.0 2022-01-22 22:52:23 -07:00
dfsek
5cbd815092 ignore meta string templates in MetaValuePreprocessor 2022-01-22 22:52:14 -07:00
dfsek
c051040b12 equation -> expression 2022-01-20 14:02:43 -07:00
dfsek
17d903ff32 add pow2 terrascript function 2022-01-18 23:38:18 -07:00
dfsek
2c1f599abf dynamically fetch pack in ServerWorldMixin 2022-01-18 22:21:57 -07:00
dfsek
754b06881d add error messages for invalid noise functions 2022-01-18 21:39:22 -07:00
dfsek
eea72a8470 correct 2d sampler function index 2022-01-18 21:33:10 -07:00
dfsek
fdbf2b2f58 fix sampler addon dependency 2022-01-18 21:31:51 -07:00
dfsek
cc769fa871 fix missing dep error message 2022-01-18 21:30:45 -07:00
dfsek
aa605b7402 add SamplerFunction 2022-01-18 21:22:34 -07:00
dfsek
bef81d2704 adjust TerraScriptAddon event priority 2022-01-18 20:51:57 -07:00
dfsek
42e357892f create TerraScriptSamplerFunctionAddon 2022-01-18 20:51:46 -07:00
dfsek
44595a861a put NoiseConfigPackTemplate in config context 2022-01-18 20:51:32 -07:00
dfsek
14e406c45b create sampler function addon module 2022-01-18 20:14:34 -07:00
dfsek
003f6c7e74 remove bukkit soft depend on worldedit 2022-01-17 11:22:55 -07:00
dfsek
57c38307f5 remove terra command from plugin.yml 2022-01-17 11:22:41 -07:00
dfsek
f6fd338bd7 remove unused world.yml file 2022-01-17 11:22:16 -07:00
dfsek
fc10d0c303 ignore hidden files when loading addons 2022-01-15 19:01:24 -07:00
dfsek
7939005428 clean up SurfaceLocatorTemplate 2022-01-15 01:44:54 -07:00
dfsek
072ce5b03e add TopLocator 2022-01-15 01:44:45 -07:00
dfsek
9794bf3565 add match-all option to AdjacentPatternLocator 2022-01-15 01:41:26 -07:00
dfsek
37d80b63d9 Merge remote-tracking branch 'origin/ver/6.0.0' into ver/6.0.0 2022-01-14 23:24:13 -07:00
dfsek
077b14a998 add ALL tag 2022-01-14 23:24:05 -07:00
dfsek
c6458c901d eliminate boxing in BinaryColumn boolean ops 2022-01-11 08:58:38 -07:00
dfsek
52b6de12ae correct BinaryColumn logic for boolean ops on columns with differeny min Y 2022-01-08 11:32:37 -07:00
dfsek
03671ad209 fix binary column point selection 2022-01-08 11:10:21 -07:00
dfsek
b99980e5c0 correct BinaryColumn boolean combination indices 2022-01-08 10:56:33 -07:00
dfsek
5e0a6b9472 correct OrDistributorTemplate error message 2022-01-08 10:49:57 -07:00
dfsek
3540753ff8 add XOR distributor 2022-01-08 10:49:40 -07:00
dfsek
2b3cee6b7c add Distributor#xor 2022-01-08 10:45:27 -07:00
dfsek
5881e4465f add XOR pattern 2022-01-08 10:40:57 -07:00
dfsek
48c7e4ab40 add Pattern#xor 2022-01-08 10:40:09 -07:00
dfsek
9bcf06e1b2 register XOR locator 2022-01-08 10:39:18 -07:00
dfsek
0bfa6f4b04 correct OrLocatorTemplate error message 2022-01-08 10:38:25 -07:00
dfsek
0bf8d54598 add XorLocatorTemplate 2022-01-08 10:36:28 -07:00
dfsek
0c43cfcc5f add Locator#xor 2022-01-08 10:36:01 -07:00
dfsek
2ea66cd295 add BinaryColumn#xor 2022-01-08 10:34:41 -07:00
dfsek
a7d0d52dfb abstract BinaryColumn boolean operators 2022-01-08 10:28:49 -07:00
dfsek
8a35e3f21d make BinaryColumn#or able to OR columns of different size 2022-01-08 10:25:53 -07:00
dfsek
9c024df9e5 use search range for binary column in pattern locator 2022-01-08 10:20:06 -07:00
dfsek
bde7760634 make color modifier default to vanilla 2022-01-07 14:04:51 -07:00
dfsek
ed986ddcb8 fix biome fog 2022-01-07 14:00:57 -07:00
dfsek
b6aae73ef6 remove color map from BiomeTemplate 2022-01-07 13:38:18 -07:00
dfsek
7883a39375 add more vanilla biome properties 2022-01-07 13:09:01 -07:00
dfsek
f0a71b3ad0 remove unused shadow method 2022-01-07 10:01:52 -07:00
dfsek
5e77878427 fix buffered world offset 2022-01-05 13:51:52 -07:00
dfsek
7b9891150d create and register mutated structure config 2022-01-05 08:12:00 -07:00
dfsek
e5d5a88cbe increase feature priority 2022-01-04 14:33:31 -07:00
dfsek
3c3e3dafb5 create MutatedStructure 2022-01-04 14:32:46 -07:00
dfsek
cb3ec5f300 add probability collection vector methods 2022-01-04 14:32:37 -07:00
dfsek
2a08645265 increase biome priority 2022-01-04 14:32:24 -07:00
dfsek
6b060a1ff6 buffered world builder api 2022-01-04 09:37:06 -07:00
dfsek
1d6eb0c48f create structure-mutator module 2022-01-04 08:55:21 -07:00
dfsek
42c407698d configurable beard threshold 2022-01-04 08:24:32 -07:00
dfsek
3fd5aaf56c load addons in separate method 2022-01-02 01:25:33 -07:00
dfsek
b4a4d7e377 dump resources in separate method 2022-01-02 01:24:10 -07:00
dfsek
f7d53c9db3 add vanilla biomes option on fabric 2022-01-02 00:46:13 -07:00
dfsek
3dc98a2bc2 create AdjacentPatternLocator 2022-01-01 22:48:34 -07:00
dfsek
f393f76a87 add WritableWorld#column 2022-01-01 22:48:26 -07:00
dfsek
a00dfac937 move column impl to main api 2022-01-01 22:48:02 -07:00
dfsek
999e09a653 optimize ElevationInterpolator 2022-01-01 22:14:48 -07:00
dfsek
29580e125d uninclude fastutil 2022-01-01 21:40:46 -07:00
dfsek
c3e083607d add default int noise methods 2022-01-01 20:12:30 -07:00
dfsek
463c323f0a depend on fastutil 2022-01-01 20:12:21 -07:00
dfsek
d13c0dd198 Revert "optimize ElevationInterpolator"
This reverts commit 74237e75686608578ae2bbff692aa0b55dca9fd2.
2022-01-01 19:58:06 -07:00
dfsek
aa5ccd0196 make ocean palette optional 2021-12-31 23:46:44 -07:00
dfsek
039e45ef97 implement biome colors on fabric 2021-12-31 23:43:32 -07:00
dfsek
3a626d9101 remove unneeded access widener 2021-12-31 23:22:54 -07:00
dfsek
069b0d425a add beardification support 2021-12-31 23:19:21 -07:00
dfsek
83029989b9 clean up AddonsCommandAddon 2021-12-31 18:21:02 -07:00
dfsek
edac8953c1 move profiler command to separate addon 2021-12-31 18:20:44 -07:00
dfsek
012a01da71 move addons command into separate addon 2021-12-31 18:16:50 -07:00
dfsek
17470fd74b create PacksCommandAddon 2021-12-31 18:12:56 -07:00
dfsek
43235f2fc8 add yourkit info to README.md 2021-12-31 13:20:20 -07:00
dfsek
3c58d6decd fix shaded jar resources config 2021-12-31 13:11:22 -07:00
dfsek
8560438bac implement reloads on bukkit 2021-12-30 17:39:50 -07:00
dfsek
c6f42da61b create MaterialSet$Singleton class 2021-12-30 16:35:51 -07:00
dfsek
121dd16652 use caching provider in getBlock 2021-12-30 16:28:45 -07:00
dfsek
d36fc7dec1 implement caching biome provider 2021-12-30 16:01:19 -07:00
dfsek
74237e7568 optimize ElevationInterpolator 2021-12-30 15:20:02 -07:00
dfsek
53cc36c879 fix profiler fetch concurrency issues 2021-12-30 15:05:24 -07:00
dfsek
fc50f53944 synchronize profiler queries 2021-12-30 01:47:47 -07:00
dfsek
570a3bccc5 manually specify shadowjar task on shaded addons 2021-12-30 01:22:50 -07:00
dfsek
7039a28326 fix sponge structure generation 2021-12-30 01:11:25 -07:00
dfsek
ca52a3e740 seed differently for every unique coordinate pair 2021-12-30 00:56:38 -07:00
dfsek
1801c831ba dont set failed pack 2021-12-29 02:21:35 -07:00
dfsek
e72669354a provide platform with server instance to redeclare platform biomes 2021-12-29 02:07:29 -07:00
dfsek
0ce072a2ca dont crash on minecraft:reload 2021-12-29 00:08:12 -07:00
dfsek
62b3f47fa7 correctly clear registry 2021-12-28 23:28:07 -07:00
dfsek
cd018fb970 clear registry before reload 2021-12-28 23:23:08 -07:00
dfsek
8e2683c165 use properties for compat options 2021-12-28 23:22:57 -07:00
dfsek
b6abe0e7ac implement propertyholder in ConfigPack 2021-12-28 23:22:40 -07:00
dfsek
f6ee8a3a1d dont retain references to config packs 2021-12-28 23:22:19 -07:00
dfsek
f07519565b add max slant depth option 2021-12-28 22:30:32 -07:00
dfsek
ffedfcc781 make exposed value a double 2021-12-28 21:55:10 -07:00
dfsek
fb7c827e15 implement structure command 2021-12-28 21:46:06 -07:00
dfsek
f921e22b5c add Vector3#toInt 2021-12-28 21:45:57 -07:00
dfsek
719260e3da add api for RegistryArgument to get registry at runtime 2021-12-28 21:45:44 -07:00
dfsek
34c83e87c4 improve CommandSender API 2021-12-28 21:44:58 -07:00
dfsek
70b0c55a39 create command-structures addon 2021-12-28 20:14:42 -07:00
dfsek
c926625090 hash PaddedGridDistributor seed 2021-12-28 20:00:20 -07:00
dfsek
ea7e78c498 xor world seed into PaddedGridDistributor seed 2021-12-28 19:12:06 -07:00
dfsek
36d417d3db implement padded grid distributor 2021-12-28 17:46:40 -07:00
dfsek
ecc4504f00 add ore exposed option 2021-12-28 17:04:47 -07:00
dfsek
ddebb8fec1 remove unused class 2021-12-28 16:57:57 -07:00
dfsek
7852165907 fix depth tracker from MetaListLikePreprocessor 2021-12-27 23:16:50 -07:00
dfsek
ea5dd297cb implement new tectonic depthtracker API 2021-12-27 23:01:48 -07:00
dfsek
8d7468457f bump tectonic version 2021-12-27 20:34:54 -07:00
dfsek
eb29da7639 fix potential cme in fabric biome source 2021-12-27 17:35:11 -07:00
dfsek
ad7d173b7e make StructureScript properly return registry key 2021-12-27 15:59:51 -07:00
dfsek
287c029bda create GeometryUtil 2021-12-27 14:45:37 -07:00
dfsek
4be63b8c65 add Registry#getAllWithID method 2021-12-26 20:31:09 -07:00
dfsek
6d844c2d3a use single-parameter Keyed registration 2021-12-26 19:27:12 -07:00
dfsek
1c93c2bbb4 implement single-parameter Keyed registration methods 2021-12-26 19:26:23 -07:00
dfsek
3792a1ab05 make Keyed generic 2021-12-26 19:26:09 -07:00
dfsek
9c5b789aa2 unimplement Keyed in Structure 2021-12-26 19:26:02 -07:00
dfsek
1ac3964589 make Keyed generic 2021-12-26 15:11:04 -07:00
dfsek
5e3f310154 make WebsiteConfig optional 2021-12-25 16:33:51 -07:00
dfsek
d10a1d1660 maybe fix empty jar issue 2021-12-25 12:56:57 -07:00
dfsek
a0a05436a0 pull getOrCreateRegistry methods to RegistryProvider interface 2021-12-25 11:38:59 -07:00
dfsek
c8d24f1694 clean up TypeKey 2021-12-25 11:01:48 -07:00
dfsek
7c32626bc0 add Registry#getRawType 2021-12-25 11:00:10 -07:00
dfsek
46e7bd917a getFromID -> getByID 2021-12-25 01:10:49 -07:00
dfsek
dc688e49ce add registry tests 2021-12-25 01:10:29 -07:00
dfsek
e1a6cdb484 tryGet -> getFromID 2021-12-25 01:06:20 -07:00
dfsek
2b92e2e73b getKey -> key 2021-12-25 01:04:19 -07:00
dfsek
8467a19781 implement namespaced registries 2021-12-25 01:01:32 -07:00
dfsek
bb87bfa1de implement Namespaced in BaseAddon 2021-12-24 22:59:52 -07:00
dfsek
c07d5052b2 implement Namespaced in ConfigPack 2021-12-24 22:58:57 -07:00
dfsek
f7eba23081 inject logger into ManifestAddons 2021-12-24 11:33:00 -07:00
dfsek
6729565a59 remove world instance from BukkitChunkGeneratorWrapper 2021-12-24 00:08:45 -07:00
dfsek
5da0a861b6 synchronize BukkitWorldHandle#createBlockState 2021-12-24 00:03:58 -07:00
dfsek
9ae259f1ed add Namespaced and RegistryKey interfaces 2021-12-24 00:00:50 -07:00
dfsek
a092dfdc3b document a bunch of stuff 2021-12-23 14:43:43 -07:00
dfsek
f353d1686c
Merge pull request #292 from PolyhedralDev/dev/cli
CLI generator & performance improvements
2021-12-23 13:53:46 -07:00
dfsek
0f50b29c4e Move API to one package 2021-12-23 13:51:21 -07:00
dfsek
3d9d0d46fb remove world field from FabricChunkGeneratorWrapper 2021-12-22 23:41:00 -07:00
dfsek
b4e6f2775e make getBlock accept WorldProperties 2021-12-22 23:07:01 -07:00
dfsek
631c8b705a move world property access to WorldProperties 2021-12-22 23:04:54 -07:00
dfsek
d2b52e486a remove access to world field from FabricChunkGeneratorWrapper 2021-12-22 23:02:43 -07:00
dfsek
fd3335508b include generator settings in FabricChunkGeneratorWrapper codec 2021-12-22 17:53:12 -07:00
dfsek
26dd7e1eea use generator field for column sample 2021-12-22 17:42:27 -07:00
dfsek
4000899d6d lazily create chunks to improve memory usage 2021-12-22 16:23:03 -07:00
dfsek
17e2bdc6f7 fix region overlap 2021-12-22 16:11:56 -07:00
dfsek
737f95e458 dont set unneeded blocks 2021-12-22 15:02:40 -07:00
dfsek
51c8da51d3 throw informative exception 2021-12-22 13:58:15 -07:00
dfsek
ffb93d0a6f dont redundantly evaluate expressions 2021-12-22 13:34:21 -07:00
dfsek
086d944f10 parse TerraScripts in parallel 2021-12-22 13:34:08 -07:00
dfsek
a461a57f0d dont evaluate derivatives for empty slant palettes 2021-12-22 02:55:56 -07:00
dfsek
7307b58696 increase default chunk cache size 2021-12-22 02:45:37 -07:00
dfsek
0f9592a508 parallel config loading 2021-12-22 02:31:40 -07:00
dfsek
fb13ab40ca fix region serialization 2021-12-22 01:15:08 -07:00
dfsek
6b26cfc964 set main class of cli implementation 2021-12-22 01:14:50 -07:00
dfsek
4646fdee89 increase biome cache size 2021-12-22 01:14:28 -07:00
dfsek
27561931cc resolve circular dependency issue in cli build 2021-12-21 23:13:49 -07:00
dfsek
13c696b392 add biome cache to ChunkInterpolator 2021-12-21 23:13:34 -07:00
dfsek
849b3116c9 add hashCode to Vector2Int 2021-12-21 23:10:35 -07:00
dfsek
0e87da2eff use record for SeededVector 2021-12-21 22:37:20 -07:00
dfsek
4c9cfbfdf9 cli serialization 2021-12-21 22:35:07 -07:00
dfsek
d49ee4f3fc implement CLI world & chunk 2021-12-21 20:54:39 -07:00
dfsek
5ea6f44a96 implement block data stuff 2021-12-21 20:24:54 -07:00
dfsek
71620c2b29 create basic CLI impl 2021-12-21 20:04:28 -07:00
dfsek
fa3849b85e remove region implementation 2021-12-21 19:56:42 -07:00
dfsek
49211bf6e0
Merge pull request #291 from Astrashh/optional-gen-stages
Make pack manifest `stages` key optional
2021-12-21 19:45:30 -07:00
Astrash
5df7dc7590 Make pack manifest stages key optional 2021-12-22 13:42:12 +11:00
dfsek
9ed4375165
Merge pull request #290 from Astrashh/optional-global-samplers
Make pack manifest `samplers` key optional
2021-12-21 19:37:19 -07:00
Astrash
de68334249 Make pack manifest samplers key optional 2021-12-22 13:32:55 +11:00
dfsek
c21ebddfb6 inject biomes when datapack resources are loaded 2021-12-21 18:51:03 -07:00
dfsek
5f993cca57 fix task name in assemble dependency 2021-12-21 16:37:01 -07:00
dfsek
3caf3a9380 correctly jar-in-jar dependencies 2021-12-21 16:33:49 -07:00
dfsek
5dbc2c2895 implement BlockState with mixin on Fabric 2021-12-21 13:09:40 -07:00
dfsek
1a1016bdf8 mark Properties as deprecated 2021-12-21 11:43:08 -07:00
dfsek
b5047fc5ab implement Handle interface in single mixin 2021-12-21 01:26:36 -07:00
dfsek
a199ea2c20 remove unneeded equals override in ServerWorldMixin 2021-12-21 01:15:28 -07:00
dfsek
dc8a5933bf remove unneeded hashCode and equals override in ChunkRegionMixin 2021-12-21 01:14:26 -07:00
dfsek
9d832391e4 dont use world as cache parameter 2021-12-21 01:13:48 -07:00
dfsek
78c3e14086 refactor integer vectors 2021-12-20 00:38:27 -07:00
dfsek
b9965bdbc5 make Vector3 immutable by default 2021-12-20 00:37:54 -07:00
dfsek
961a42d1cb make vector2 immutable by default 2021-12-20 00:19:09 -07:00
dfsek
026547bdfc make Vector2 constructor private 2021-12-20 00:08:30 -07:00
dfsek
fb6c86801e make Vector3 constructor private 2021-12-20 00:06:35 -07:00
dfsek
007c761537 remove buffer items 2021-12-20 00:04:08 -07:00
dfsek
4db94e50e5 remove StructureBuffer 2021-12-20 00:02:10 -07:00
dfsek
7a9ea7f281 remove DirectBuffer 2021-12-20 00:01:54 -07:00
dfsek
62d0f109b4 remove buffer api 2021-12-20 00:01:04 -07:00
dfsek
f088928483 clean up Structure API 2021-12-19 23:14:02 -07:00
dfsek
30b02a03c4 add permissions to commands 2021-12-19 22:43:12 -07:00
dfsek
cfc7960c70 remove old command API 2021-12-19 19:57:19 -07:00
dfsek
4c01cb4b8d remove old structure commands 2021-12-19 19:54:34 -07:00
dfsek
03e8d0f381 remove biome commands 2021-12-19 19:53:21 -07:00
dfsek
a8f12ae847 implement profiler command 2021-12-19 19:52:25 -07:00
dfsek
81b2f352de remove old main commands 2021-12-19 19:52:19 -07:00
dfsek
2ad8e381fd start removing old commands 2021-12-19 19:43:41 -07:00
dfsek
d5da0e4002 implement reload and packs commands 2021-12-19 19:27:49 -07:00
dfsek
46153cb358 begin implementing commands with Cloud 2021-12-19 19:09:08 -07:00
dfsek
ea3f8096fd fix StructureScript 2021-12-19 18:39:28 -07:00
dfsek
9872d22c06 implement getType method in registries 2021-12-19 17:41:04 -07:00
dfsek
aeb0372d59 pull versions out to Versions config 2021-12-19 15:30:50 -07:00
dfsek
2a965e847f refactor buildSrc scripts to root directory 2021-12-19 15:02:41 -07:00
dfsek
626c65fc3e begin pulling versions into buildSrc/Versions 2021-12-19 14:56:52 -07:00
dfsek
fb1ebd0e11 add dependency on cloud 2021-12-19 14:22:35 -07:00
dfsek
30f7f002d5 warn at out-of-bounds access rather than crash on Bukkit. 2021-12-19 13:48:51 -07:00
dfsek
77d341ebab update fabric versions 2021-12-18 23:59:38 -07:00
dfsek
0a896862fe
Merge pull request #285 from Astrashh/key-name-refactor
Key name refactor
2021-12-17 19:37:51 -07:00
Astrash
68d262b6b6 Noise3DLocator -> Sampler3DLocator 2021-12-18 10:11:40 +11:00
Astrash
ebba3472e2 NoiseLocator -> SamplerLocator 2021-12-18 10:09:52 +11:00
Astrash
7ccb126571 NoiseDistributor -> SamplerDistributor 2021-12-18 10:05:59 +11:00
Astrash
d3ea370b74 BiomeNoiseConfigTemplate key name changes 2021-12-18 09:32:09 +11:00
Astrash
58fcf0b808 Pipeline NoiseSource -> SamplerSource 2021-12-18 09:32:09 +11:00
Astrash
decd99a15c StageTemplate noise -> sampler 2021-12-18 09:32:09 +11:00
Astrash
a4764d3158 Biome provider blend.noise -> blend.sampler 2021-12-18 09:32:09 +11:00
Astrash
3225746940 noise -> sampler in palette configs 2021-12-18 09:32:09 +11:00
Astrash
df8489c1af function -> sampler in various sampler templates 2021-12-18 09:32:09 +11:00
Astrash
2a2db4bc52 noise -> samplers in pack manifest 2021-12-18 09:32:09 +11:00
dfsek
8ff6c3e65c create structure-block-shortcut addon 2021-12-17 09:48:06 -07:00
dfsek
df0a2f29d1 repair ServerWorldMixin 2021-12-17 09:15:14 -07:00
dfsek
e94d1cb98c repair ChunkRegionMixin 2021-12-17 09:14:47 -07:00
dfsek
fa098666f1 repair BlockEntityMixin 2021-12-17 08:43:07 -07:00
dfsek
9f1e97d9a2 repair BlockMixin 2021-12-17 08:40:53 -07:00
dfsek
31e20b12c0 setBlockData -> setBlockState 2021-12-17 08:40:02 -07:00
dfsek
23fcd4a651 getBlockData -> getBlockState 2021-12-17 08:38:28 -07:00
dfsek
7da87c27ee getBlockState -> getBlockEntity 2021-12-17 08:37:51 -07:00
dfsek
5401917703 createBlockData -> createBlockState 2021-12-17 08:36:43 -07:00
dfsek
2c12892111 getBlockData -> getBlockState 2021-12-17 08:36:03 -07:00
dfsek
e5eaba9150 getDefaultData -> getDefaultState 2021-12-17 08:35:29 -07:00
dfsek
27d12efb31 relocate ShortcutLoader 2021-12-17 08:32:36 -07:00
dfsek
6a4f6c509b LoaderHolder -> ConfigLoadingDelegate 2021-12-17 08:32:08 -07:00
dfsek
1004eefbf6 use formatted version 2021-12-16 22:59:38 -07:00
dfsek
ff40bf5a3a create and register VersionLoader 2021-12-16 22:58:21 -07:00
dfsek
bcdfb42fa1 update ConfigPack#getVersion to use Strata version 2021-12-16 22:52:36 -07:00
dfsek
8773c414c5 remove vanilla methods from ConfigPack 2021-12-16 22:50:48 -07:00
dfsek
1852d9103f remove RegistryFactory 2021-12-16 22:14:23 -07:00
dfsek
fb1b440e72 remove ConfigPack#getRegistryFactory 2021-12-16 22:13:34 -07:00
dfsek
0ad3867a91 remove registry provider from ConfigType 2021-12-16 22:12:42 -07:00
dfsek
011a915d38 implement PaletteBlockShortcutAddon 2021-12-16 22:07:53 -07:00
dfsek
5726a07249 create palette-block-shortcut addon 2021-12-16 22:02:27 -07:00
dfsek
b3a75b3738 clean up palette addon 2021-12-16 22:00:07 -07:00
dfsek
888cecdc16 clean up Palette API 2021-12-16 21:57:18 -07:00
dfsek
28b16943f7 implement shortcut API 2021-12-16 21:54:49 -07:00
dfsek
a0c46aaf7a remove unused lang stuff 2021-12-16 19:51:29 -07:00
dfsek
89c43e98b9 use UnsupportedOperationException if cannot get checked registry 2021-12-16 19:49:34 -07:00
dfsek
7a238f833b dont use shadow in BlockEntityMixin 2021-12-16 16:21:08 -07:00
dfsek
909de9409b dont shadow fields in BlockMixin 2021-12-16 16:17:20 -07:00
dfsek
0aa10a631a ignore out of bounds values in RandomLocator 2021-12-16 10:46:54 -07:00
dfsek
6c8b8a3d51 add meta annotation to ScaleNormalizerTemplate 2021-12-16 09:43:44 -07:00
dfsek
b73cbdd8a2 add meta annotations to BinaryArithmeticTemplate 2021-12-16 09:43:18 -07:00
dfsek
e0f5d51b71 Merge remote-tracking branch 'origin/ver/6.0.0' into ver/6.0.0 2021-12-16 09:38:43 -07:00
dfsek
e76e17439f reinclude sponge project 2021-12-16 09:34:35 -07:00
dfsek
d1140556c7
Merge pull request #283 from Astrashh/locator-fix-meta
Add missing meta annotations to locators
2021-12-16 09:33:05 -07:00
Astrash
e34a788353 Add missing meta annotation to random locator 2021-12-16 20:10:29 +11:00
Astrash
ca3f39c2a2 Add missing meta annotations to gaussian locator 2021-12-16 20:09:57 +11:00
dfsek
5cf1b56782 temporarily disable Sponge submodule 2021-12-15 22:03:49 -07:00
dfsek
305c29dad2 salt RandomLocator and GaussianRandomLocator 2021-12-15 22:03:19 -07:00
dfsek
1fc139cc8c create and register GaussianRandomLocatorTemplate 2021-12-15 21:59:32 -07:00
dfsek
7305236724 create GaussianRandomLocator 2021-12-15 21:22:41 -07:00
dfsek
353f5a1f26 register min sampler 2021-12-15 20:54:59 -07:00
dfsek
ad3bcf5a98 register max sampler 2021-12-15 20:54:39 -07:00
dfsek
cfa1c39889 register division sampler 2021-12-15 20:54:21 -07:00
dfsek
72d4c0a0c1 register multiplication sampler 2021-12-15 20:54:09 -07:00
dfsek
5ce87b0e35 register subtraction sampler 2021-12-15 20:53:32 -07:00
dfsek
4c43b35e0e register addition sampelr 2021-12-15 20:53:07 -07:00
dfsek
650892f340 create BinaryArithmeticTemplate 2021-12-15 20:51:59 -07:00
dfsek
33cdc55e21 create and register ScaleNormalizerTemplate 2021-12-15 20:49:10 -07:00
dfsek
90aa1e1dce create ScaleNormalizer 2021-12-15 20:48:07 -07:00
dfsek
907c1519bd create MinSampler 2021-12-15 20:46:08 -07:00
dfsek
0228761452 create MaxSampler 2021-12-15 20:45:48 -07:00
dfsek
a01bfe35e8 create DivisionSampler 2021-12-15 20:45:22 -07:00
dfsek
a193d7534f create MultiplicationSampler 2021-12-15 20:45:05 -07:00
dfsek
c1e6a3d7d8 create SubtractionSampler 2021-12-15 20:44:43 -07:00
dfsek
3f0b4131be create AdditionSampler 2021-12-15 20:44:36 -07:00
dfsek
6a2fedb773 create BinaryArithmeticSampler 2021-12-15 20:43:42 -07:00
dfsek
177cc512fa create and register LinearHeightmapSamplerTemplate 2021-12-15 20:41:42 -07:00
dfsek
8579b6f6eb implement LinearHeightmapSampler 2021-12-15 20:38:22 -07:00
dfsek
bce7481290 register PositiveWhiteNoiseSampler 2021-12-15 19:53:27 -07:00
dfsek
7a935e10f0 create PositiveWhiteNoiseSampler 2021-12-15 19:52:36 -07:00
dfsek
3d5b23d0f5 create and register ProbabilityNormalizerTemplate 2021-12-15 19:50:43 -07:00
dfsek
1e0ffd10c6 add ProbabilityNormalizer 2021-12-15 19:49:29 -07:00
dfsek
799e1c9bf3 reverse NoiseDistributor threshold 2021-12-15 19:37:38 -07:00
dfsek
d92a68e3f2 remove pointless override 2021-12-15 16:39:47 -07:00
dfsek
039d004fa5 remove unused BiomeConfigType registry override 2021-12-14 21:51:48 -07:00
dfsek
5d2e3f03fa fix NoiseLocator coordinates 2021-12-14 20:09:13 -07:00
dfsek
9cb0f1aeb8 automatically remove "Template" from end of config templates in docs 2021-12-14 19:50:27 -07:00
dfsek
2f19a95437 properly handle generic types 2021-12-14 17:56:30 -07:00
dfsek
04b748979e dont use full name in docs 2021-12-14 17:35:03 -07:00
dfsek
4247f85f70 cleanup 2021-12-14 17:33:00 -07:00
dfsek
0e3b40564b use config key instead of field name 2021-12-14 17:22:08 -07:00
dfsek
ddd5dbaeed clean up buildscripts and apply doc plugin 2021-12-14 17:19:08 -07:00
dfsek
3c3b24fc03 basic automatic documentation 2021-12-14 17:18:32 -07:00
dfsek
f6d5295980
Merge pull request #280 from PolyhedralDev/dev/feature-stages
refactor stages & introduce new cellular return type
2021-12-14 15:30:48 -07:00
solonovamax
39160f9ff8
use #getFormatted to print the string when loading addons
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
2021-12-14 17:17:06 -05:00
dfsek
f87540472a document StageTemplate 2021-12-14 14:00:16 -07:00
dfsek
e8e80c9a7a document biome pipeline 2021-12-14 13:55:39 -07:00
dfsek
e39730c238 document ImageProviderTemplate 2021-12-14 13:45:33 -07:00
dfsek
58acca3078 reformat 2021-12-14 11:01:28 -07:00
dfsek
bf5e7f589d fix frequency calculation in angle return 2021-12-13 18:44:13 -07:00
dfsek
da5a7a7856 add cellular return type Angle 2021-12-13 18:16:11 -07:00
dfsek
1c78c4a80e finalize FeatureGenerationAddon 2021-12-13 17:29:44 -07:00
dfsek
05064861a6 implement features using dynamic templates 2021-12-13 17:29:10 -07:00
dfsek
3296120a2a update to tectonic 3.1.0 2021-12-13 17:02:35 -07:00
dfsek
69b1c86055 update to tectonic 3.0.1 2021-12-13 16:47:21 -07:00
dfsek
b1945d1593 use GenerationStage, not specific FeatureGenerationStage 2021-12-13 14:25:36 -07:00
dfsek
56214bf03f finish feature stage impl 2021-12-12 21:42:25 -07:00
dfsek
c804947923 feature addon registry configuration 2021-12-12 20:50:55 -07:00
dfsek
480bb84d9c move stages to ConfigPack instance 2021-12-12 16:09:40 -07:00
dfsek
e45b44c0aa remove unused OreTemplate options 2021-12-12 13:33:38 -07:00
dfsek
e0ec34c638 implement ore addon 2021-12-12 13:32:47 -07:00
dfsek
bf4b5a94a4 update to 1.18.1 2021-12-10 19:12:51 -07:00
dfsek
7ddb2346f1 allow metaconfiguration of biome colors keys 2021-12-09 20:43:19 -07:00
dfsek
0603d58f6b remove unused variables key 2021-12-09 20:43:03 -07:00
dfsek
07e8360c90 clean up BiomeTemplate 2021-12-09 17:13:10 -07:00
dfsek
41be7598ea remove unused biome blend values 2021-12-09 17:11:49 -07:00
dfsek
c4fd4fa9d3 remove unused biome noise value 2021-12-09 17:11:26 -07:00
dfsek
00578c55c2 remove unused biome elevation values 2021-12-09 17:11:07 -07:00
dfsek
f8a366308a remove unused original carving equation 2021-12-09 17:10:36 -07:00
dfsek
52e269dbe9 remove unused biome noise config value 2021-12-09 17:10:18 -07:00
dfsek
86af411991 make slant palettes metaconfigurable 2021-12-09 16:20:46 -07:00
dfsek
41aeafe54c move palette loading to BiomePaletteTemplate 2021-12-09 16:08:38 -07:00
dfsek
39a62edc7d original map keys take priority over metamap 2021-12-09 15:56:43 -07:00
dfsek
15b0e265cc fix y index out of range in carver 2021-12-09 14:58:10 -07:00
dfsek
e1e851d6f3 sort biomes in pipeline leakage error message 2021-12-08 21:36:58 -07:00
dfsek
7dea8b143f fix DelegatedBiome hashCode & equals 2021-12-08 21:28:35 -07:00
dfsek
0e6b93023c fix EphemeralBiomeDelegate hashCode & equals 2021-12-08 21:26:59 -07:00
dfsek
66126067c0 remove unused parameter in BiomePipelineProvider constructor 2021-12-08 08:06:18 -07:00
dfsek
c08f779171 increase pipeline cache size 2021-12-07 21:31:36 -07:00
dfsek
8ca4e380fa optimize kernel sampler when kernel values are zero 2021-12-07 21:25:49 -07:00
dfsek
81900d80b5 fix biome delegate loading 2021-12-07 21:05:54 -07:00
dfsek
ac9ab133a9 improve biome error message 2021-12-07 21:01:52 -07:00
dfsek
f0385e4096 implement SELF biome without horrible null impl 2021-12-07 20:51:56 -07:00
dfsek
163129e245 refactor biome pipeline api 2021-12-05 18:33:07 -07:00
dfsek
e60a8a109b implement biome delegates in pipeline 2021-12-05 17:26:32 -07:00
dfsek
9416e2fbaa make BiomeSource use biome delegates 2021-12-05 17:07:23 -07:00
dfsek
3afc9d2c5d remove unused config loader 2021-12-05 17:07:12 -07:00
dfsek
66555b21a6 register BiomeDelegate loader 2021-12-05 17:04:35 -07:00
dfsek
f93842dc94 create BiomeDelegateLoader 2021-12-05 17:02:27 -07:00
dfsek
3bb52b5cfe create pipeline BiomeDelegate 2021-12-05 16:58:03 -07:00
dfsek
95c5e7022e remove bstats 2021-12-05 12:36:59 -07:00
dfsek
b0adc47907 remove bstats dependency 2021-12-05 12:32:52 -07:00
dfsek
508fc17d05 update paper api dependency 2021-12-05 12:31:52 -07:00
dfsek
f90a1c7883 update paper download url 2021-12-05 12:29:23 -07:00
dfsek
c1f8be668c fix vanilla structure gen 2021-12-05 12:25:50 -07:00
dfsek
1442660e49 register structures to Terra biomes 2021-12-05 12:20:04 -07:00
dfsek
95749bea5d generate vanilla structures 2021-12-05 10:16:04 -07:00
dfsek
f46e285bc9 switch x and z ChunkGenerator params 2021-12-04 23:34:18 -07:00
dfsek
2fa8831c63 add carver resolution config to pack.yml 2021-12-04 23:33:36 -07:00
dfsek
86336eea01 create lazily evaluated carver 2021-12-04 23:29:38 -07:00
dfsek
71bd433442 remove unneeded RegistrationEvent 2021-12-04 20:41:09 -07:00
dfsek
99a2f1af3a fix yaml addon 2021-12-04 20:40:14 -07:00
dfsek
72488c9d18 move config discovery to separate method 2021-12-04 20:40:07 -07:00
dfsek
cb90563519 format 2021-12-04 20:34:17 -07:00
dfsek
bf9fcc37cb make EventManager#callEvent return event 2021-12-04 20:32:40 -07:00
dfsek
4dcd013db4 move meta registration to separate method 2021-12-04 20:31:12 -07:00
dfsek
6c69e3fad1 create RegistrationEvent 2021-12-04 20:29:38 -07:00
dfsek
709b41aceb move unneeded fields to local constructor vars 2021-12-04 20:21:53 -07:00
dfsek
845b932451 remove unused load method 2021-12-04 20:18:58 -07:00
dfsek
3215c17609 clean up ConfigPackImpl constructors 2021-12-04 20:18:31 -07:00
dfsek
8a6e61469b refactor configs 2021-12-04 19:51:42 -07:00
dfsek
ec77519923 convert PaletteInfo to record 2021-12-04 19:51:03 -07:00
dfsek
b52e00a842 move NoiseChunkGenerator3D 2021-12-04 19:48:53 -07:00
dfsek
edb9b13bd1 correct carving logic 2021-12-04 19:39:35 -07:00
dfsek
1eb515e751 nested user defined functions 2021-12-04 19:34:24 -07:00
dfsek
4083597f23 remove unneeded ChunkInterpolator interface 2021-12-04 19:07:39 -07:00
dfsek
48f799e1c5 remove unneeded Sampler interface 2021-12-04 19:06:04 -07:00
dfsek
f08f79f754 rename SamplerProviderImpl to SamplerProvider 2021-12-04 19:04:42 -07:00
dfsek
672cf59972 move Sampler to chunk generator addon 2021-12-04 19:04:11 -07:00
dfsek
dc88c322fb move derivative method to PaletteUtil 2021-12-04 19:03:25 -07:00
dfsek
df16edac7f implement carving 2021-12-04 19:01:48 -07:00
dfsek
0c8aedd972 load biome noise templates 2021-12-04 18:52:50 -07:00
dfsek
3da2565f57 remove GenerationSettings 2021-12-04 18:49:43 -07:00
dfsek
ca84628eb9 remove Biome#getGenerator 2021-12-04 18:48:47 -07:00
dfsek
88adbb16d2 move generator options to addon 2021-12-04 18:48:25 -07:00
dfsek
0912b8b161 remove unused class 2021-12-04 18:19:37 -07:00
dfsek
af53987fbd move ChunkInterpolator to noise chunk generator addon 2021-12-04 18:19:03 -07:00
dfsek
0818f943b1 make platform biome return singular 2021-12-04 18:17:32 -07:00
dfsek
2ef2b61cc5 TerraBiome -> Biome 2021-12-04 17:47:41 -07:00
dfsek
16c80a0976 Biome -> PlatformBiome 2021-12-04 17:46:26 -07:00
dfsek
4d2639207d fix terrascript loading on windows 2021-12-03 15:55:56 -07:00
dfsek
fe57ae2471 actually implement getheight methods 2021-12-03 09:46:37 -07:00
dfsek
c09231b039 updade fabric entity generation 2021-12-03 09:39:30 -07:00
dfsek
f7ccb00bbe remove unused configpack methods 2021-12-03 09:38:11 -07:00
dfsek
b925fe8ff5 create parent classloader for addons 2021-12-02 21:10:05 -07:00
dfsek
275320af0b use decimal for CheckFunction 2021-12-02 20:45:27 -07:00
dfsek
9bee597cb9 fix addon ID 2021-12-02 19:49:21 -07:00
dfsek
50c1e8f1a7 add todo for removing jank hashcode 2021-12-02 19:47:49 -07:00
dfsek
2c963e14d5 remove WorldConfig 2021-12-02 19:46:35 -07:00
dfsek
a2a8f6e471 remove ConfigPack#toWorldConfig 2021-12-02 19:45:55 -07:00
dfsek
e533555b52 drastically simplify generator API 2021-12-02 19:45:22 -07:00
dfsek
71a39ba05b unimplement PropertyHolder 2021-12-02 18:08:08 -07:00
dfsek
1c7c7af105 implement PropertyHolder in ChunkGenerator 2021-12-02 18:05:52 -07:00
dfsek
ad66fa8022 implement TerraScriptCheckFunctionAddon 2021-12-02 18:04:16 -07:00
dfsek
b222129478 terrascript check function addon depends on terrascript addon 2021-12-02 17:47:02 -07:00
dfsek
c6eeb9a3ea remove layer addon for now 2021-12-02 17:45:08 -07:00
dfsek
b9c77fbdfa move elevation interpolation to new addon 2021-12-02 17:44:30 -07:00
dfsek
c68d092814 clean up chunkgenerator stuff 2021-12-02 17:43:44 -07:00
dfsek
4a8d19cbf2 remove unused methods from WorldConfig 2021-12-02 09:42:38 -07:00
dfsek
fab02d4d16 remove ChunkGenerator#getPack 2021-12-02 09:23:34 -07:00
dfsek
fc073325fb remove ChunkGenerator#getPlatform 2021-12-02 09:12:16 -07:00
dfsek
f8d270540e start implementing LayeredChunkGeneratorAddon 2021-12-02 09:12:02 -07:00
dfsek
69ec02341f create base LayerChunkGeneratorAddon 2021-12-02 08:13:22 -07:00
dfsek
e10948a7cf fix RegistryTest 2021-12-01 21:15:36 -07:00
dfsek
ed2e56c776 fix bukkit impl 2021-12-01 21:14:22 -07:00
dfsek
4db469199c fix duplicate mixin method 2021-12-01 21:10:18 -07:00
dfsek
a69be58b58 make registry return optional for get operations 2021-12-01 17:48:41 -07:00
dfsek
4cc07a7b02 update to latest Tectonic version 2021-12-01 10:21:20 -07:00
dfsek
8214b17a4e update to latest Paralithic 2021-12-01 10:17:33 -07:00
dfsek
7a665d6f9c annotate Registry methods with nullability and contract 2021-12-01 10:15:02 -07:00
dfsek
2d7cf5151f annotate WorldHandle methods with nullability and contract 2021-12-01 08:29:14 -07:00
dfsek
65d8dc803d annotate Platform methods with nullability and contract 2021-12-01 08:26:30 -07:00
dfsek
5749af4bb2 update to 1.18 release 2021-11-30 20:06:37 -07:00
dfsek
d0872f42da fix project versioning 2021-11-29 16:17:24 -07:00
dfsek
8b7cf2a74c fix publishing config 2021-11-29 16:07:25 -07:00
dfsek
7dc1f2fe92 add info comment to config.yml 2021-11-28 21:55:40 -07:00
dfsek
ffe05bc7f9 clean up config.yml 2021-11-28 21:53:42 -07:00
dfsek
135e8269fa remove unused language stuff 2021-11-28 21:52:15 -07:00
dfsek
1832e58498 move StructureAccessorAccessor to accessor package 2021-11-28 19:56:43 -07:00
dfsek
b4408f048c cleanup generic type 2021-11-28 16:52:59 -07:00
dfsek
397c464fb2 finish refactoring world api 2021-11-28 16:51:04 -07:00
dfsek
6b9dfc5d43 refactor world classes 2021-11-28 16:43:27 -07:00
dfsek
b882e5e62b remove unused generator classes 2021-11-28 16:42:08 -07:00
dfsek
2d5b384ae4 pull members of WritableWorld up 2021-11-28 16:42:00 -07:00
dfsek
86dee3bb29 create base World interface 2021-11-28 16:36:57 -07:00
dfsek
4287ff8a3c World -> ServerWorld 2021-11-28 16:36:29 -07:00
dfsek
da34aeed42 create readable and writable world interfaces 2021-11-28 16:35:13 -07:00
dfsek
402ac166ff worldaccess -> WritableWorld 2021-11-28 16:32:59 -07:00
dfsek
27f472dd57 for some reason we were shading all of SpongeAPI 2021-11-28 13:52:01 -07:00
dfsek
64d9eca618 update paper 2021-11-28 13:40:50 -07:00
dfsek
6f88519df8 reimplement strata 2021-11-28 13:09:30 -07:00
dfsek
2325886adb biome determinism 2021-11-28 12:58:26 -07:00
dfsek
a5947be122 fix fabric protoworld impl 2021-11-28 12:26:01 -07:00
dfsek
1e9e1dce75 implement world api changes 2021-11-28 12:19:10 -07:00
dfsek
01f6df4a19 pull more methods to WorldAccess 2021-11-28 12:01:12 -07:00
dfsek
5ed7733320 add ProtoWorld#getWorld 2021-11-28 11:36:29 -07:00
dfsek
b880b6592b move spawnEntity to WorldAccess 2021-11-28 11:35:12 -07:00
dfsek
a52271dfb9 implement BukkitProtoWorld 2021-11-27 17:25:55 -07:00
dfsek
bf0ac5afe2 refactor world API 2021-11-27 17:15:20 -07:00
dfsek
a30451597c create ProtoWorld 2021-11-27 17:13:26 -07:00
dfsek
d8d9d99598 pull World methods up to WorldAccess 2021-11-27 17:13:04 -07:00
dfsek
381cf0a6ee run server with nogui 2021-11-27 17:08:21 -07:00
dfsek
45dec188a6 fix Paper launch 2021-11-27 16:51:59 -07:00
dfsek
fda30ff76d getBiomeProviderBuilder -> getBiomeProvider 2021-11-27 15:44:52 -07:00
dfsek
429c9a5d33 update paper API to 1.18 snapshot 2021-11-27 15:42:44 -07:00
dfsek
51df2daaa8 dont include Minecraft or Java in Fabric mod injection 2021-11-27 11:26:23 -07:00
dfsek
73c210a1bf sort addons before listing 2021-11-27 11:10:40 -07:00
dfsek
85206d5239 implement ephemeral addons for platform version comparison 2021-11-27 11:08:01 -07:00
dfsek
e3f7e7b246 update to RC3 2021-11-27 10:21:54 -07:00
dfsek
7376533027 dont check addon versions until Strata is fixed 2021-11-27 09:58:01 -07:00
dfsek
baf7230b1b remove Tree 2021-11-27 09:55:31 -07:00
dfsek
e616d21bea refactor generation stuff 2021-11-27 09:52:41 -07:00
dfsek
7aaa94dedc start updating to new bukkit world generation API 2021-11-27 09:36:54 -07:00
dfsek
50da6d9d9b clean up ChunkGenerator 2021-11-27 08:55:40 -07:00
dfsek
7a3597a722 remove BiomeGrid 2021-11-27 08:46:59 -07:00
dfsek
ac50f23090 remove unused code 2021-11-27 08:40:40 -07:00
dfsek
2307897b31 use pattern variables 2021-11-27 08:34:03 -07:00
dfsek
2d316fa042 buidscript cleanup 2021-11-27 08:30:05 -07:00
dfsek
2aa9c86499 getNoiseSeeded -> noise 2021-11-27 08:25:14 -07:00
dfsek
bfee773229 add intvector default getNoise methods 2021-11-27 08:23:49 -07:00
dfsek
0441760cae clean up gradle 2021-11-25 11:27:33 -07:00
dfsek
35194fc09c update description 2021-11-25 09:40:37 -07:00
dfsek
6c0628ddcb reorganize Fabric buildscript 2021-11-25 09:38:41 -07:00
dfsek
9e1ab776cf remove redundant Fabric relocation config 2021-11-25 09:38:00 -07:00
dfsek
034b01a04c run shaded remapped JAR task automatically on Fabric 2021-11-25 09:37:08 -07:00
dfsek
a2dcbf69c7 suppress unused variable warnings for dependency configs 2021-11-25 09:33:52 -07:00
dfsek
f761559e6e addon versioning 2021-11-25 09:32:43 -07:00
dfsek
017a4f8e08 redo how prereleases are configured 2021-11-25 09:01:06 -07:00
dfsek
2018e3aa9f dont change version quite yet 2021-11-24 20:40:21 -07:00
dfsek
7cf51356a6 update to 1.18 prerelease 8 2021-11-24 20:26:17 -07:00
dfsek
0001c20eea redo how versioning works 2021-11-24 20:20:55 -07:00
dfsek
0940611b89 make version a function, not class 2021-11-24 19:25:49 -07:00
dfsek
05911027bd annotate experimental API @Experimental 2021-11-24 15:25:48 -07:00
dfsek
c57e55c286 update JetBrains annotations 2021-11-24 15:22:50 -07:00
dfsek
8f4818709a remove unused code 2021-11-24 15:19:32 -07:00
dfsek
b04f7cfc55 start moving to int vector impls where possible 2021-11-24 13:54:43 -07:00
dfsek
ba7722ce45 create biome structure config 2021-11-24 13:28:47 -07:00
dfsek
5e5ce0722f create StructureGenerationAddon 2021-11-24 13:01:07 -07:00
dfsek
325035822f somehow intellij forgot about this stuff 2021-11-23 21:09:42 -07:00
dfsek
3557536968 clean up unused stuff 2021-11-23 21:04:18 -07:00
dfsek
07520b9014 refactor Pairs 2021-11-23 21:00:35 -07:00
dfsek
d17dcc17b0 demote dead entry messages to debug level 2021-11-23 20:57:52 -07:00
dfsek
8b4e51b876 dont dual-write getHandle 2021-11-23 20:55:34 -07:00
dfsek
65ec50577d Bootstrap-Addon-Entry-Point to Terra-Bootstrap-Addon-Entry-Point 2021-11-23 20:53:28 -07:00
dfsek
516c19c312 remove unused exceptions 2021-11-23 20:48:38 -07:00
dfsek
dcee8b8e8b remove unused BootstrapAddonLoader constructor parameter 2021-11-23 20:47:36 -07:00
dfsek
a1306c88c0 Merge remote-tracking branch 'origin/ver/6.0.0' into ver/6.0.0 2021-11-23 20:41:33 -07:00
dfsek
e4fd2d1d48 update modrinth publishing task 2021-11-23 20:41:27 -07:00
solonovamax
711451a4b3
Minor code refactors, clean up logging significantly, and close resources
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
2021-11-23 17:13:04 -05:00
solonovamax
2d4e46a43f
Fix logging in a dev environment
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
2021-11-23 16:30:32 -05:00
solonovamax
2b2255a590
Optimize logging statements to avoid string concatenation
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
2021-11-23 15:13:50 -05:00
solonovamax
92046fe345
Update purpur url
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
2021-11-23 15:09:50 -05:00
solonovamax
7a53175a5f
fix: slf4j not working properly when used in prod
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
2021-11-23 14:54:37 -05:00
solonovamax
5a35d8b40e
fix: shadedImplementation configuration not actually being shaded
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
2021-11-23 14:54:37 -05:00
dfsek
596262bd64 pre7 2021-11-23 12:43:05 -07:00
dfsek
37ef406a78 update to pre6 2021-11-23 10:09:17 -07:00
dfsek
2a4e6830e1 update README.md 2021-11-22 18:11:33 -07:00
solonovamax
8ffa931a2f
Sort repositories by what should be resolved first.
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
2021-11-22 14:05:05 -05:00
solonovamax
8bfb69baee
Update dependencies so that logging *actually* works this time
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
2021-11-22 14:04:45 -05:00
dfsek
45c682c595 fix mixin remap issue 2021-11-22 09:03:02 -07:00
dfsek
1c9724c232 fix bootstrap addon packaging 2021-11-22 09:02:54 -07:00
dfsek
c29dac9847 remove unused WorldEditUtil 2021-11-22 07:48:46 -07:00
dfsek
42ea10f72c fix builds 2021-11-22 07:48:37 -07:00
dfsek
7bc42e07c4 add licensing information to README.md 2021-11-21 22:01:29 -07:00
solonovamax
dc07b60688
Use latest fancy gradle features to not do that dumb string bullshit from before
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
2021-11-21 23:58:24 -05:00
dfsek
7e0fa4854f reconfigure implementation projects 2021-11-21 21:41:19 -07:00
solonovamax
22eae6d515
Fix compile error with bukkit platform impl
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
2021-11-21 23:29:42 -05:00
dfsek
d8ad9e043e accidentally committed this script 2021-11-21 21:25:48 -07:00
dfsek
5e3efc8cae finalize licensing changes 2021-11-21 21:22:34 -07:00
dfsek
02bf258d9b remove empty gitmodules file 2021-11-21 21:18:38 -07:00
dfsek
b07aaa5bb5 Merge submodule contents for common/addons/structure-terrascript-loader/master 2021-11-21 21:15:13 -07:00
dfsek
f70f353329 Remove submodule common/addons/structure-terrascript-loader 2021-11-21 21:15:00 -07:00
dfsek
1e16c9a7c3 Merge submodule contents for common/addons/structure-sponge-loader/master 2021-11-21 21:14:57 -07:00
dfsek
ec42ffbf60 Remove submodule common/addons/structure-sponge-loader 2021-11-21 21:14:45 -07:00
dfsek
0de7a437bb Merge submodule contents for common/addons/manifest-addon-loader/master 2021-11-21 21:14:38 -07:00
dfsek
09b751243a Remove submodule common/addons/manifest-addon-loader 2021-11-21 21:14:25 -07:00
dfsek
3a0b20a5bd Merge submodule contents for common/addons/language-yaml/master 2021-11-21 21:14:21 -07:00
dfsek
478416aedd Remove submodule common/addons/language-yaml 2021-11-21 21:14:09 -07:00
dfsek
677da12d1e Merge submodule contents for common/addons/generation-stage-structure/master 2021-11-21 21:14:03 -07:00
dfsek
b23c7c33aa Remove submodule common/addons/generation-stage-structure 2021-11-21 21:13:51 -07:00
dfsek
a0816e2edc Merge submodule contents for common/addons/generation-stage-feature/master 2021-11-21 21:13:48 -07:00
dfsek
460b5f0fa5 Remove submodule common/addons/generation-stage-feature 2021-11-21 21:13:36 -07:00
dfsek
a18610d07d Merge submodule contents for common/addons/config-structure/master 2021-11-21 21:13:29 -07:00
dfsek
b434036684 Remove submodule common/addons/config-structure 2021-11-21 21:13:17 -07:00
dfsek
8637992b56 Merge submodule contents for common/addons/config-palette/master 2021-11-21 21:13:11 -07:00
dfsek
4ca4b40053 Remove submodule common/addons/config-palette 2021-11-21 21:12:59 -07:00
dfsek
17634f0fb5 Merge submodule contents for common/addons/config-ore/master 2021-11-21 21:12:55 -07:00
dfsek
c86b84832d Remove submodule common/addons/config-ore 2021-11-21 21:12:43 -07:00
dfsek
eaeab7adaf Merge submodule contents for common/addons/config-noise-function/master 2021-11-21 21:12:37 -07:00
dfsek
a2d64499e1 Remove submodule common/addons/config-noise-function 2021-11-21 21:12:25 -07:00
dfsek
0958f29e6e Merge submodule contents for common/addons/config-locators/master 2021-11-21 21:11:59 -07:00
dfsek
a12fe99ad7 Remove submodule common/addons/config-locators 2021-11-21 21:11:46 -07:00
dfsek
5b1ebf1d61 Merge submodule contents for common/addons/config-flora/master 2021-11-21 21:11:40 -07:00
dfsek
9fe6c2b137 Remove submodule common/addons/config-flora 2021-11-21 21:11:28 -07:00
dfsek
6ad29f5002 Merge submodule contents for common/addons/config-feature/master 2021-11-21 21:11:23 -07:00
dfsek
190e4a7702 Remove submodule common/addons/config-feature 2021-11-21 21:11:11 -07:00
dfsek
efe5564b6f Merge submodule contents for common/addons/config-distributors/master 2021-11-21 21:11:04 -07:00
dfsek
082946936f Remove submodule common/addons/config-distributors 2021-11-21 21:10:52 -07:00
dfsek
1fd1dd92d3 Merge submodule contents for common/addons/config-carver/master 2021-11-21 21:10:44 -07:00
dfsek
1633eacd67 Remove submodule common/addons/config-carver 2021-11-21 21:10:32 -07:00
dfsek
b8f00dd20b Merge submodule contents for common/addons/config-biome/master 2021-11-21 21:10:27 -07:00
dfsek
c1ddc70a53 Remove submodule common/addons/config-biome 2021-11-21 21:10:14 -07:00
dfsek
eb34d30b00 Merge submodule contents for common/addons/chunk-generator-noise-3d/master 2021-11-21 21:10:07 -07:00
dfsek
fba5fc05d1 Remove submodule common/addons/chunk-generator-noise-3d 2021-11-21 21:09:55 -07:00
dfsek
8a38377443 Merge submodule contents for common/addons/biome-provider-single/master 2021-11-21 21:09:35 -07:00
dfsek
cca697a272 Remove submodule common/addons/biome-provider-single 2021-11-21 21:09:23 -07:00
dfsek
11c37b087d Merge submodule contents for common/addons/biome-provider-pipeline/master 2021-11-21 21:09:17 -07:00
dfsek
085bfc5533 Remove submodule common/addons/biome-provider-pipeline 2021-11-21 21:09:05 -07:00
dfsek
34b7c8f098 Merge submodule contents for common/addons/biome-provider-image/master 2021-11-21 21:08:44 -07:00
dfsek
20d25ffbba Remove submodule common/addons/biome-provider-image 2021-11-21 21:08:32 -07:00
dfsek
10dbc97bea Merge submodule contents for common/addons/api-addon-loader/master 2021-11-21 21:08:00 -07:00
dfsek
9089703c1d Remove submodule common/addons/api-addon-loader 2021-11-21 21:07:48 -07:00
dfsek
7ca02a945d cleanup 2021-11-21 20:17:12 -07:00
dfsek
75bd324897 Merge remote-tracking branch 'origin/ver/6.0.0' into ver/6.0.0 2021-11-21 19:54:00 -07:00
dfsek
1a9fdabc4a clean up FunctionalEventHandlerImpl 2021-11-21 18:47:23 -07:00
dfsek
f1fbe8e55c
Merge pull request #279 from solonovamax/chore/remove-debug-logging
Remove debug logging config value
2021-11-21 18:38:58 -07:00
solonovamax
e60dfe0242
Remove debug logging config value
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
2021-11-21 20:13:06 -05:00
dfsek
ee9c60b127 point to new config repo 2021-11-21 17:57:49 -07:00
dfsek
ac7a7f3129
Merge pull request #274 from NeumimTo/ver/6.0.0
fix win loading
2021-11-21 17:47:07 -07:00
dfsek
c4d15aa64a update logging 2021-11-21 17:39:08 -07:00
dfsek
3b07aece86 update logging 2021-11-21 17:39:03 -07:00
dfsek
e3be3d2453 update logging 2021-11-21 17:39:03 -07:00
dfsek
966d48241b update logging 2021-11-21 17:39:03 -07:00
dfsek
bedde0d061 update logging 2021-11-21 17:39:03 -07:00
dfsek
b50330df93 update logging 2021-11-21 17:39:02 -07:00
dfsek
023ae3e269 Merge remote-tracking branch 'origin/ver/6.0.0' into ver/6.0.0 2021-11-21 17:22:54 -07:00
dfsek
97fb779b19
Merge pull request #269 from solonovamax/architecture/slf4j-logging
Improve logging and migrate to SLF4J for logging instead of internal logging classes.
2021-11-21 17:22:23 -07:00
dfsek
8010e64ecc package bootstrap addons correctly 2021-11-21 17:19:37 -07:00
solonovamax
dd259c4d8f
Make logging actually work
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
2021-11-21 19:18:00 -05:00
solonovamax
9d30130f85
Merge remote-tracking branch 'upstream/ver/6.0.0' into architecture/slf4j-logging 2021-11-21 17:57:56 -05:00
dfsek
42cd6d82ca Merge remote-tracking branch 'origin/ver/6.0.0' into ver/6.0.0 2021-11-21 14:13:13 -07:00
dfsek
e227095319 update to 1.18 prerelease 5 & Java 17 2021-11-21 14:12:51 -07:00
solo
dfcf8c6185
Update gitignore file to ignore a few things that annoyed me (#278)
* Update gitignore file to ignore a few things that annoyed me

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>

* Remove .conf because hocon uses it.

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
2021-11-21 13:47:44 -07:00
solonovamax
d2d96813ad
Have your newline back
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
2021-11-21 01:25:06 -05:00
solonovamax
7fee2b9718
Actually include git submodules this time
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
2021-11-21 01:23:43 -05:00
solonovamax
1c97ec10e1
Don't remove all the addons, thanks
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
2021-11-21 01:14:54 -05:00
solonovamax
28eed33e40
Merge remote-tracking branch 'upstream/ver/6.0.0' into architecture/slf4j-logging
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
2021-11-21 00:52:05 -05:00
dfsek
bb515444c6 fix BinaryColumn 2021-11-20 22:34:46 -07:00
dfsek
de267a8251 fix BinaryColumn 2021-11-20 22:34:40 -07:00
dfsek
d506f5f3a3 fix BinaryColumn 2021-11-20 22:34:40 -07:00
dfsek
40ef026f82 launch on 1.18 2021-11-20 20:56:57 -07:00
dfsek
a447be3c50 launch on 1.18 2021-11-20 20:56:57 -07:00
dfsek
a6edb6aef6 pre5 2021-11-20 18:37:33 -07:00
dfsek
4b944ee2fe update tooling for 1.18 2021-11-20 18:09:40 -07:00
dfsek
da4d6b26d8 pass structure id into TerraStructure 2021-11-20 17:30:04 -07:00
dfsek
733e6282a8 pass structure id into TerraStructure 2021-11-20 13:35:57 -07:00
dfsek
c79ce49e4d structure configtype impl 2021-11-20 12:47:29 -07:00
dfsek
94ee2c27eb structure configtype impl 2021-11-20 12:47:20 -07:00
dfsek
1267661819 default impl of ConfigType#registrySupplier 2021-11-20 12:44:32 -07:00
dfsek
a59763da64 default impl of ConfigType#registrySupplier 2021-11-20 12:44:32 -07:00
dfsek
e5ab20e167 default impl of ConfigType#registrySupplier 2021-11-20 12:44:32 -07:00
dfsek
b3a14432ce clean up NoiseChunkGenerator3D 2021-11-20 12:38:57 -07:00
dfsek
5d3afcc82c add license headers 2021-11-19 15:42:34 -07:00
dfsek
6a0f026cc1 add license headers 2021-11-19 15:42:26 -07:00
dfsek
9b723888ab add license headers 2021-11-19 15:42:26 -07:00
dfsek
f25f3053cd add license headers 2021-11-19 15:42:25 -07:00
dfsek
932da70534 add license headers 2021-11-19 15:42:25 -07:00
dfsek
f0c343e6fa add license headers 2021-11-19 15:42:25 -07:00
dfsek
9545ba3801 add license headers 2021-11-19 15:42:25 -07:00
dfsek
51ea7a11e0 add license headers 2021-11-19 15:42:25 -07:00
dfsek
7a15b150eb add license headers 2021-11-19 15:42:25 -07:00
dfsek
43426ea084 add license headers 2021-11-19 15:42:25 -07:00
dfsek
e1dadaca6a add license headers 2021-11-19 15:42:25 -07:00
dfsek
d8f948919d add license headers 2021-11-19 15:42:25 -07:00
dfsek
c55c404973 add license headers 2021-11-19 15:42:25 -07:00
dfsek
ade6a7685b add license headers 2021-11-19 15:42:24 -07:00
dfsek
ca0e93d61b add license headers 2021-11-19 15:42:24 -07:00
dfsek
d276514305 add license headers 2021-11-19 15:42:24 -07:00
dfsek
6579df929b add license headers 2021-11-19 15:42:24 -07:00
dfsek
3cec0aa9ce add license headers 2021-11-19 15:42:24 -07:00
dfsek
323d58aeb0 add license headers 2021-11-19 15:42:24 -07:00
dfsek
320279f9a6 add license headers 2021-11-19 15:42:24 -07:00
dfsek
4f873f7730 add license headers 2021-11-19 15:42:24 -07:00
dfsek
c52d8b3804 relicense addons under MIT license 2021-11-19 08:47:24 -07:00
dfsek
9f52c9e055 relicense addons under MIT license 2021-11-19 08:47:17 -07:00
dfsek
610336e868 relicense addons under MIT license 2021-11-19 08:47:17 -07:00
dfsek
b89df817ff relicense addons under MIT license 2021-11-19 08:47:17 -07:00
dfsek
1ccc2e477f relicense addons under MIT license 2021-11-19 08:47:17 -07:00
dfsek
13a5d15139 relicense addons under MIT license 2021-11-19 08:47:17 -07:00
dfsek
6e06bfa86d relicense addons under MIT license 2021-11-19 08:47:17 -07:00
dfsek
1c3148d96b relicense addons under MIT license 2021-11-19 08:47:17 -07:00
dfsek
5d1c3b16e6 relicense addons under MIT license 2021-11-19 08:47:17 -07:00
dfsek
a2907e5808 relicense addons under MIT license 2021-11-19 08:47:17 -07:00
dfsek
28373086ad relicense addons under MIT license 2021-11-19 08:47:16 -07:00
dfsek
16159c9723 relicense addons under MIT license 2021-11-19 08:47:16 -07:00
dfsek
1d341b6a00 relicense addons under MIT license 2021-11-19 08:47:16 -07:00
dfsek
691d8ff6f1 relicense addons under MIT license 2021-11-19 08:47:16 -07:00
dfsek
532138b71e relicense addons under MIT license 2021-11-19 08:47:16 -07:00
dfsek
06493819a6 relicense addons under MIT license 2021-11-19 08:47:16 -07:00
dfsek
f4e6259a44 relicense addons under MIT license 2021-11-19 08:47:15 -07:00
dfsek
c03c230e70 relicense addons under MIT license 2021-11-19 08:47:15 -07:00
dfsek
4535151d0d relicense addons under MIT license 2021-11-19 08:47:15 -07:00
dfsek
68e7631a3b relicense addons under MIT license 2021-11-19 08:47:15 -07:00
dfsek
6a235e66a0 relicense addons under MIT license 2021-11-19 08:47:15 -07:00
dfsek
61d0daf9c7 relicense addons under MIT license 2021-11-19 08:47:15 -07:00
dfsek
03e58f48a9 update README 2021-11-18 22:04:10 -07:00
dfsek
1028ed0989 delete old addon system 2021-11-18 21:50:41 -07:00
dfsek
7bf1ba13c8 fix circular dependency checking 2021-11-18 21:45:12 -07:00
dfsek
869edff873 add feature dependencies 2021-11-18 21:38:46 -07:00
dfsek
b2a50e6141 add feature dependencies 2021-11-18 21:38:46 -07:00
dfsek
6bb0f29433 add feature dependencies 2021-11-18 21:38:46 -07:00
dfsek
84537e2f99 fix dependency sorting 2021-11-18 21:38:33 -07:00
dfsek
c53aa12377 addon dependency sorting 2021-11-18 21:13:33 -07:00
dfsek
a6440187ed addon dependency sorting 2021-11-18 21:13:32 -07:00
dfsek
83126454ea addon dependency sorting 2021-11-18 21:13:32 -07:00
dfsek
ceeb59301e remove unused gradle enterprise stuff 2021-11-17 19:22:27 -07:00
dfsek
46b918f9be load platform addons 2021-11-17 18:00:23 -07:00
dfsek
8fc3977236 remove AddonRegistry 2021-11-17 17:23:27 -07:00
dfsek
79dcc63152 addon initialization 2021-11-17 17:22:29 -07:00
dfsek
208cbbd8e0 addon initialization 2021-11-17 17:22:29 -07:00
dfsek
243a7fd8d1 format 2021-11-17 16:28:40 -07:00
dfsek
76f8af1b64 format 2021-11-17 16:28:40 -07:00
dfsek
c406bfd63f format 2021-11-17 16:28:40 -07:00
dfsek
da3a5f67fa format 2021-11-17 16:28:40 -07:00
dfsek
184bce293f format 2021-11-17 16:28:40 -07:00
dfsek
34acf03564 format 2021-11-17 16:28:40 -07:00
dfsek
3737e3510d format 2021-11-17 16:28:40 -07:00
dfsek
d0e20ea6ca format 2021-11-17 16:28:39 -07:00
dfsek
062f5a5152 format 2021-11-17 16:28:39 -07:00
dfsek
8207d55848 format 2021-11-17 16:28:39 -07:00
dfsek
44e0a8452f format 2021-11-17 16:28:39 -07:00
dfsek
ad7cc4fce0 format 2021-11-17 16:28:39 -07:00
dfsek
1a733d10c0 format 2021-11-17 16:28:39 -07:00
dfsek
7c30ab095e format 2021-11-17 16:28:38 -07:00
dfsek
2e60de8916 format 2021-11-17 16:28:38 -07:00
dfsek
20992e4334 format 2021-11-17 16:28:38 -07:00
dfsek
0e059f7000 format 2021-11-17 16:28:38 -07:00
dfsek
20a9c0d718 format 2021-11-17 16:28:38 -07:00
dfsek
9b30d11791 format 2021-11-17 16:28:38 -07:00
dfsek
8c721bc0b0 format 2021-11-17 16:28:38 -07:00
dfsek
172006f2f6 initialize manifest addons 2021-11-17 16:22:14 -07:00
dfsek
a5d9fca932 initialize manifest addons 2021-11-17 16:22:14 -07:00
dfsek
174b23c8ef add logging 2021-11-17 15:29:28 -07:00
dfsek
42ece3f27a add logging 2021-11-17 15:29:28 -07:00
dfsek
a76e583c51 manifest addon loading 2021-11-17 15:22:12 -07:00
dfsek
939b528d11 manifest addon loading 2021-11-17 15:22:12 -07:00
dfsek
e1feb9bc5e manifest addon loading 2021-11-17 15:22:12 -07:00
dfsek
226420b1d2 api addon bootstrap config 2021-11-17 12:39:44 -07:00
dfsek
8eaf0e1880 api addon bootstrap config 2021-11-17 12:39:44 -07:00
dfsek
26e5e4c0c8 create addon manifests 2021-11-17 12:39:24 -07:00
dfsek
db20ad5539 create addon manifests 2021-11-17 12:39:24 -07:00
dfsek
4ba759c374 create addon manifests 2021-11-17 12:39:24 -07:00
dfsek
eb9f484863 create addon manifests 2021-11-17 12:39:24 -07:00
dfsek
a2a3dbbc87 create addon manifests 2021-11-17 12:39:24 -07:00
dfsek
dbfd354338 create addon manifests 2021-11-17 12:39:24 -07:00
dfsek
217bfb4565 create addon manifests 2021-11-17 12:39:24 -07:00
dfsek
3cffdf54d8 create addon manifests 2021-11-17 12:39:23 -07:00
dfsek
bfa4a062c4 create addon manifests 2021-11-17 12:39:23 -07:00
dfsek
424cceef03 create addon manifests 2021-11-17 12:39:23 -07:00
dfsek
8de78ef5f2 create addon manifests 2021-11-17 12:39:23 -07:00
dfsek
927273511c create addon manifests 2021-11-17 12:39:23 -07:00
dfsek
712ec7b74c create addon manifests 2021-11-17 12:39:23 -07:00
dfsek
146afbece6 create addon manifests 2021-11-17 12:39:23 -07:00
dfsek
af1c04ebdc create addon manifests 2021-11-17 12:39:23 -07:00
dfsek
626f5c4471 create addon manifests 2021-11-17 12:39:23 -07:00
dfsek
43510c20de create addon manifests 2021-11-17 12:39:23 -07:00
dfsek
c0392b206b create addon manifests 2021-11-17 12:39:23 -07:00
dfsek
408cfceb92 create addon manifests 2021-11-17 12:39:23 -07:00
dfsek
e96f43f3b0 depend on manifest addons in core addon modules 2021-11-17 12:20:18 -07:00
dfsek
0205b7ac55 depend on manifest addons in core addon modules 2021-11-17 12:20:18 -07:00
dfsek
7736b7b73d depend on manifest addons in core addon modules 2021-11-17 12:20:18 -07:00
dfsek
416be81124 depend on manifest addons in core addon modules 2021-11-17 12:20:18 -07:00
dfsek
317ba915e7 depend on manifest addons in core addon modules 2021-11-17 12:20:18 -07:00
dfsek
4fc1605c8d depend on manifest addons in core addon modules 2021-11-17 12:20:18 -07:00
dfsek
b1f69203eb depend on manifest addons in core addon modules 2021-11-17 12:20:18 -07:00
dfsek
790aa540f8 depend on manifest addons in core addon modules 2021-11-17 12:20:17 -07:00
dfsek
a902798c7c depend on manifest addons in core addon modules 2021-11-17 12:20:17 -07:00
dfsek
07a145d3c3 depend on manifest addons in core addon modules 2021-11-17 12:20:17 -07:00
dfsek
b36f9fda45 depend on manifest addons in core addon modules 2021-11-17 12:20:17 -07:00
dfsek
b9dd1e007c depend on manifest addons in core addon modules 2021-11-17 12:20:17 -07:00
dfsek
c207f51bfc depend on manifest addons in core addon modules 2021-11-17 12:20:17 -07:00
dfsek
b06e04e306 depend on manifest addons in core addon modules 2021-11-17 12:20:17 -07:00
dfsek
6cf8cec2c3 depend on manifest addons in core addon modules 2021-11-17 12:20:17 -07:00
dfsek
1f27a6e735 depend on manifest addons in core addon modules 2021-11-17 12:20:17 -07:00
dfsek
ce5e691851 depend on manifest addons in core addon modules 2021-11-17 12:20:17 -07:00
dfsek
b9b49508b9 depend on manifest addons in core addon modules 2021-11-17 12:20:17 -07:00
dfsek
158cb1d08e depend on manifest addons in core addon modules 2021-11-17 12:20:17 -07:00
dfsek
368be1d112 depend on manifest addons in core addon modules 2021-11-17 12:20:17 -07:00
dfsek
81bc6b90fe create addon manifests 2021-11-17 10:20:06 -07:00
dfsek
f6af478765 create addon manifests 2021-11-17 10:20:06 -07:00
dfsek
eda6afa79b create addon manifests 2021-11-17 10:20:06 -07:00
dfsek
2afd8b9b8d create addon manifests 2021-11-17 10:20:06 -07:00
dfsek
f6cc6d682f create addon manifests 2021-11-17 10:20:05 -07:00
dfsek
ed35d62b8b create addon manifests 2021-11-17 10:20:05 -07:00
dfsek
d7a131b733 create addon manifests 2021-11-17 10:20:05 -07:00
dfsek
2a8a11b035 create addon manifests 2021-11-17 10:20:05 -07:00
dfsek
0e7f323036 create addon manifests 2021-11-17 10:20:05 -07:00
dfsek
d2b6963763 create addon manifests 2021-11-17 10:20:05 -07:00
dfsek
0259b620e4 create addon manifests 2021-11-17 10:20:05 -07:00
dfsek
16bcc12ccb create addon manifests 2021-11-17 10:20:04 -07:00
dfsek
98a708ceae create addon manifests 2021-11-17 10:20:04 -07:00
dfsek
5586cc99b0 create addon manifests 2021-11-17 10:20:04 -07:00
dfsek
fdf112b0b2 create addon manifests 2021-11-17 10:20:04 -07:00
dfsek
628f695abb create addon manifests 2021-11-17 10:20:04 -07:00
dfsek
5a8ca230c0 create addon manifests 2021-11-17 10:20:04 -07:00
dfsek
a3aa6d49cf create addon manifests 2021-11-17 10:20:04 -07:00
dfsek
bf78577d26 create addon manifests 2021-11-17 10:20:04 -07:00
dfsek
38a3936938 create addon manifests 2021-11-17 10:20:04 -07:00
dfsek
da8c62d961 create addon manifests 2021-11-17 10:20:03 -07:00
dfsek
fb93d417ee bootstrap addon dumping 2021-11-17 09:22:45 -07:00
dfsek
b9a6f11245 bootstrap addon dumping 2021-11-17 09:22:45 -07:00
dfsek
c0bcc40f6a load bootstrap addons 2021-11-17 08:52:23 -07:00
dfsek
c6e6478043 load bootstrap addons 2021-11-17 08:52:23 -07:00
dfsek
92341751fc fix TerraAddon -> BaseAddon 2021-11-17 08:38:51 -07:00
dfsek
71b053bee6 implement addon loading 2021-11-17 08:35:00 -07:00
dfsek
9840bf09fa generify BootstrapBaseAddon 2021-11-17 08:22:06 -07:00
dfsek
4f4dc45a48 generify BootstrapBaseAddon 2021-11-17 08:22:06 -07:00
dfsek
e3b00d45ec manifest addon loading 2021-11-16 10:11:44 -07:00
dfsek
e211b27a80 manifest addon loading 2021-11-16 10:11:44 -07:00
dfsek
491b6aa96d strata version loading 2021-11-16 09:17:43 -07:00
dfsek
06d09bc422 strata version loading 2021-11-16 09:17:36 -07:00
dfsek
c4171f1a26 manifest addon config stuff 2021-11-16 08:56:41 -07:00
dfsek
fd22dca0fa work on addon bootstrapping 2021-11-15 18:23:23 -07:00
dfsek
9d2b354a33 work on addon bootstrapping 2021-11-15 18:23:23 -07:00
dfsek
b4e9ad0412 work on addon bootstrapping 2021-11-15 18:23:23 -07:00
dfsek
aa3991592c create api-addon-loader module 2021-11-12 17:11:39 -07:00
dfsek
ec17781f4a create api-addon-loader module 2021-11-12 17:11:39 -07:00
dfsek
72bf8da59d add api addon loader module 2021-11-10 12:18:49 -07:00
dfsek
7a37e3044c Create LICENSE 2021-11-10 12:12:50 -07:00
dfsek
4fa8e7f17a create RegistryTest 2021-11-09 23:59:54 -07:00
dfsek
eb50b29e95 clean up tests 2021-11-09 23:54:46 -07:00
dfsek
3d141fc47f move registry api to new module 2021-11-09 23:49:49 -07:00
dfsek
9715171aba move registry api to new module 2021-11-09 23:49:49 -07:00
NeumimTo
8a5666227d fix win loading 2021-10-22 22:53:55 +02:00
NeumimTo
614431af2f
fix win build (#272) 2021-10-18 11:00:34 -07:00
dfsek
48d9b44344 add terrascript addon as submodule 2021-10-17 15:42:00 -07:00
dfsek
aff3e474af remove terrascript addon from main repo 2021-10-17 15:41:48 -07:00
dfsek
ddf9ed86a7 Initial commit 2021-10-17 15:41:05 -07:00
dfsek
9cd45686d3 add sponge loader addon as submodule 2021-10-17 15:39:35 -07:00
dfsek
76d165e21b remove sponge loader addon from main repo 2021-10-17 15:39:24 -07:00
dfsek
6002620d4d Initial commit 2021-10-17 15:38:31 -07:00
dfsek
3f1cbc9095 add manifest addon loader as submodule 2021-10-17 15:37:18 -07:00
dfsek
fa2a25b7c6 remove manifest loader addon from main repo 2021-10-17 15:36:51 -07:00
dfsek
9b3e64a595 Initial commit 2021-10-17 15:36:22 -07:00
dfsek
63cb98a327 add YAML addon as submodule 2021-10-17 15:32:42 -07:00
dfsek
f4fa8c861e remove YAML addon from main repo 2021-10-17 15:32:12 -07:00
dfsek
8c577c39ab Initial commit 2021-10-17 15:31:43 -07:00
dfsek
c3487f95ec add structure gen addon as submodule 2021-10-17 15:30:11 -07:00
dfsek
427e20a4dc remove structure gen addon from main repo 2021-10-17 15:29:44 -07:00
dfsek
5b0617888c Initial commit 2021-10-17 15:28:56 -07:00
dfsek
25d6f1debf add feature gen addon as submodule 2021-10-17 15:26:45 -07:00
dfsek
ce2807b1f6 remove feature gen addon from main repo 2021-10-17 15:26:22 -07:00
dfsek
d0f3ae6581 Initial commit 2021-10-17 15:25:45 -07:00
dfsek
7de4d84c39 add structure config addon as submodule 2021-10-17 15:24:42 -07:00
dfsek
48abed87db remove structure addon from main repo 2021-10-17 15:24:27 -07:00
dfsek
65b52e76ec Initial commit 2021-10-17 15:23:38 -07:00
dfsek
c3a90b2022 add palette addon as submodule 2021-10-17 15:22:42 -07:00
dfsek
67e30df22b remove palette addon from main repo 2021-10-17 15:22:27 -07:00
dfsek
3d6e9f69de Initial commit 2021-10-17 15:21:51 -07:00
dfsek
75209dc6eb add ore addon as submodule 2021-10-17 15:20:34 -07:00
dfsek
097d33a056 remove ore addon from main repo 2021-10-17 15:20:14 -07:00
dfsek
f044b25769 Initial commit 2021-10-17 15:19:41 -07:00
dfsek
76f6184640 add noise addon as submodule 2021-10-17 15:18:50 -07:00
dfsek
6e3c09d081 remove noise addon from main repo 2021-10-17 15:18:00 -07:00
dfsek
7e0fd93708 Initial commit 2021-10-17 15:07:58 -07:00
dfsek
eb1df32714 add locators addon as submodule 2021-10-17 15:06:54 -07:00
dfsek
e32d9433d5 remove locators addon from main repo 2021-10-17 15:06:44 -07:00
dfsek
41e6b7f243 Initial commit 2021-10-17 15:05:52 -07:00
dfsek
6f5de4d0b4 add flora addon as submodule 2021-10-17 15:04:37 -07:00
dfsek
c2c67fbe72 remove flora addon from main repo 2021-10-17 15:04:27 -07:00
dfsek
6ef6e39128 Initial commit 2021-10-17 15:03:26 -07:00
dfsek
914f0bd862 add feature addon as submodule 2021-10-17 14:45:09 -07:00
dfsek
4d0ca617a0 remove feature addon from main repo 2021-10-17 14:44:41 -07:00
dfsek
72e9e0cf9a Initial commit 2021-10-17 14:44:13 -07:00
dfsek
d143ff87fb add distributor addon as submodule 2021-10-17 14:38:44 -07:00
dfsek
db8c15b49c remove distributors addon from main repo 2021-10-17 14:38:29 -07:00
dfsek
2368763d74 Initial commit 2021-10-17 14:37:50 -07:00
dfsek
476828985e add carver addon as submodule 2021-10-17 14:34:46 -07:00
dfsek
8df87df374 remove carver addon from main repo 2021-10-17 14:34:34 -07:00
dfsek
cb2e4da32c Initial commit 2021-10-17 14:29:15 -07:00
dfsek
765322ef57 add biome config addon as submodule 2021-10-17 14:25:43 -07:00
dfsek
720295650b remove biome config addon from main repo 2021-10-17 14:25:17 -07:00
dfsek
d37fad80b6 Initial commit 2021-10-17 14:24:31 -07:00
dfsek
50637f03d6 add chunk generator addon as submodule 2021-10-17 14:19:54 -07:00
dfsek
37a70891f3 remove chunk generator addon from main repo 2021-10-17 14:19:21 -07:00
dfsek
16b0ea2c13 Initial commit 2021-10-17 14:18:48 -07:00
dfsek
f1bcd5fd79 remove single biome provider from main repo 2021-10-17 14:15:38 -07:00
dfsek
bdcf3099b1 Initial commit 2021-10-17 14:13:51 -07:00
dfsek
445b87f1fa add biome pipeline addon as submodule 2021-10-17 14:10:40 -07:00
dfsek
61600c96c4 remove biome pipeline addon from main repo 2021-10-17 14:10:02 -07:00
dfsek
b25878414f Initial commit 2021-10-17 14:08:44 -07:00
dfsek
09031d5c90 add image provider addon as submodule 2021-10-17 14:05:49 -07:00
dfsek
e56cf9f36e Remove image provider addon from main repo 2021-10-17 14:04:46 -07:00
dfsek
8998d46f20 Initial commit 2021-10-17 14:03:11 -07:00
dfsek
901ec1cda3 fix /te reload 2021-10-17 12:16:33 -07:00
dfsek
c93dd19678 enforce registry IDs to be alphanumeric with hyphens & underscores 2021-10-17 11:35:39 -07:00
dfsek
56170d8392 remove CheckedRegistry#registerUnchecked 2021-10-17 11:27:33 -07:00
dfsek
f5fdb6cb30 sort registry items in error message 2021-10-17 11:27:05 -07:00
dfsek
1892dd1c37 improve registry load error message 2021-10-17 11:22:23 -07:00
dfsek
d7811959fa include script path in script compile errors 2021-10-17 11:16:41 -07:00
dfsek
18bc083431 remove TerraScript ID keyword in favor of file name 2021-10-17 11:16:24 -07:00
dfsek
ab100c85a1 finish sponge schematic addon 2021-10-15 22:44:37 -07:00
dfsek
e971223e4f implement SpongeStructure 2021-10-15 22:15:35 -07:00
dfsek
56651a6307 make RotationUtil#rotateVector return vector 2021-10-15 22:15:20 -07:00
dfsek
cd4ccc993b refactor buffers 2021-10-15 22:05:29 -07:00
dfsek
7c5b7e5b45 refactor BufferedBlock 2021-10-15 22:04:01 -07:00
dfsek
cc660e820d create SpongeSchematicAddon 2021-10-15 22:02:51 -07:00
dfsek
b8a841f88e create sponge loader project 2021-10-15 21:31:52 -07:00
dfsek
a1a043c296 refactor FabricEntryPoint#getPlatform 2021-10-15 21:26:06 -07:00
solo
e3df44e16f
Add String#strip to AddonRegistry to remove trialing newline 2021-09-27 10:57:06 -04:00
solo
764f93f40f
Add String#strip invocations to SpigotListener to remove trailing newline 2021-09-27 10:56:10 -04:00
dfsek
9bcdc40eb5 implement global and local functions in expression samplers 2021-09-26 23:41:00 -07:00
dfsek
10f62b75b6 resolve conflicts 2021-09-26 22:49:47 -07:00
dfsek
0a6a3268da Merge remote-tracking branch 'origin/ver/6.0.0' into architecture/slf4j-logging
# Conflicts:
#	common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/generators/NoiseChunkGenerator3D.java
#	common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/structure/StructureExportCommand.java
#	common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/structures/loot/functions/EnchantFunction.java
#	common/addons/language-yaml/src/main/java/com/dfsek/terra/addons/yaml/YamlAddon.java
#	common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/items/BufferedBlock.java
#	common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/items/BufferedLootApplication.java
#	common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/items/BufferedStateManipulator.java
#	common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/StructureScript.java
#	common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/LootFunction.java
#	common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/StructureFunction.java
#	common/api/core/src/main/java/com/dfsek/terra/api/Platform.java
#	common/implementation/src/main/java/com/dfsek/terra/AbstractPlatform.java
#	common/implementation/src/main/java/com/dfsek/terra/InternalAddon.java
#	common/implementation/src/main/java/com/dfsek/terra/commands/AddonsCommand.java
#	common/implementation/src/main/java/com/dfsek/terra/commands/ReloadCommand.java
#	common/implementation/src/main/java/com/dfsek/terra/commands/profiler/ProfileQueryCommand.java
#	common/implementation/src/main/java/com/dfsek/terra/config/PluginConfigImpl.java
#	common/implementation/src/main/java/com/dfsek/terra/config/lang/LangUtil.java
#	common/implementation/src/main/java/com/dfsek/terra/config/pack/ConfigPackImpl.java
#	common/implementation/src/main/java/com/dfsek/terra/event/FunctionalEventHandlerImpl.java
#	common/implementation/src/main/java/com/dfsek/terra/registry/config/ConfigTypeRegistry.java
#	common/implementation/src/main/java/com/dfsek/terra/registry/master/AddonRegistry.java
#	common/implementation/src/main/java/com/dfsek/terra/registry/master/ConfigRegistry.java
#	platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitAddon.java
#	platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/PlatformImpl.java
#	platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/SpigotListener.java
#	platforms/fabric/src/main/java/com/dfsek/terra/fabric/FabricAddon.java
#	platforms/fabric/src/main/java/com/dfsek/terra/fabric/FabricEntryPoint.java
#	platforms/fabric/src/main/java/com/dfsek/terra/fabric/PlatformImpl.java
#	platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/FabricChunkGeneratorWrapper.java
#	platforms/sponge/src/main/java/com/dfsek/terra/sponge/PlatformImpl.java
2021-09-26 22:46:54 -07:00
dfsek
0e88d95ed5 properly disable the plugin 2021-09-26 15:11:42 -07:00
dfsek
2dc2d00c0c remove unneeded toString 2021-09-26 15:08:43 -07:00
dfsek
6cde584dd9 better server brand check 2021-09-26 15:06:42 -07:00
dfsek
13cfb3adc6 we run on 1.13-1.17 2021-09-26 15:05:15 -07:00
dfsek
bb463dae7e remove VersionUtil bloat 2021-09-26 15:04:58 -07:00
dfsek
98d147a304 depend on Strata 2021-09-26 14:40:41 -07:00
dfsek
4d8d8f656a make ParseException unchecked 2021-09-26 13:35:54 -07:00
dfsek
89d53d0ea3 cleanup 2021-09-26 13:24:42 -07:00
dfsek
4945a3bbfa rename main parameters/fields to platform 2021-09-26 13:22:45 -07:00
dfsek
8f51707505 use expression switches 2021-09-26 13:16:43 -07:00
dfsek
3de02c5d63 rename TerraPlugin to Platform 2021-09-26 13:02:19 -07:00
solonovamax
ca55f06853
Forgot to invoke doVersionCheck lol
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
2021-09-25 01:25:28 -04:00
solonovamax
33276f1cf3
Forgot space lol
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
2021-09-25 01:19:08 -04:00
dfsek
e7b13d2063 register YES and NO distributors 2021-09-24 22:15:42 -07:00
dfsek
1fc16772af create NoDistributorTemplate 2021-09-24 22:15:07 -07:00
dfsek
318aede719 create YesDistributorTemplate 2021-09-24 22:14:29 -07:00
dfsek
cc55588967 more Distributor API 2021-09-24 22:14:17 -07:00
solonovamax
53296b2367
Remap log4j-slf4j-impl
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
2021-09-25 01:12:35 -04:00
solonovamax
9eef2599b9
Finish up merge into ver/6.0.0, as there were still some errors.
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
2021-09-25 01:12:06 -04:00
dfsek
6a1ac49e54 register Noise3DLocator 2021-09-24 22:09:36 -07:00
dfsek
1c06a39df3 create Noise3DLocatorTemplate 2021-09-24 22:09:07 -07:00
dfsek
4778149c50 create Noise3DLocator 2021-09-24 22:08:01 -07:00
dfsek
c928a1a806 more Column API 2021-09-24 22:06:26 -07:00
solonovamax
4c1ac827ad
Merge remote-tracking branch 'upstream/ver/6.0.0' into architecture/slf4j-logging
# Conflicts:
#	common/api/util/src/main/java/com/dfsek/terra/api/util/Logger.java
#	common/implementation/src/main/java/com/dfsek/terra/AbstractTerraPlugin.java
#	common/implementation/src/main/java/com/dfsek/terra/config/PluginConfigImpl.java
#	common/implementation/src/main/java/com/dfsek/terra/config/lang/LangUtil.java
#	common/implementation/src/main/java/com/dfsek/terra/registry/master/AddonRegistry.java
#	common/implementation/src/main/java/com/dfsek/terra/util/logging/DebugLogger.java
#	common/implementation/src/main/java/com/dfsek/terra/util/logging/JavaLogger.java
#	platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/TerraPluginImpl.java
#	platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraPluginImpl.java
#	platforms/sponge/src/main/java/com/dfsek/terra/sponge/TerraPluginImpl.java
2021-09-25 00:42:09 -04:00
dfsek
687efb7444 make InjectionException unchecked 2021-09-24 12:35:20 -07:00
dfsek
09b4da7974 move DI stuff to new subproject 2021-09-24 12:31:08 -07:00
dfsek
1dc2f2c23c create separate subproject for DI 2021-09-24 12:29:21 -07:00
dfsek
ed1eb02256 move NoiseSampler to noise project 2021-09-24 12:24:06 -07:00
dfsek
dda2ed955d move vectors to util project 2021-09-24 12:22:44 -07:00
dfsek
b3503026b4 create noise project 2021-09-24 12:20:57 -07:00
dfsek
328bdee602 move MathUtil to util project 2021-09-24 12:19:37 -07:00
dfsek
988579b708 move Sampler to util package 2021-09-24 12:18:57 -07:00
dfsek
a7d0e7f49b base API project 2021-09-24 12:06:06 -07:00
solonovamax
b03c8b4a11
Merge remote-tracking branch 'upstream/ver/6.0.0' into architecture/slf4j-logging
# Conflicts:
#	common/api/core/src/main/java/com/dfsek/terra/api/Logger.java
2021-09-24 13:50:21 -04:00
dfsek
c35d1acbbf refactor StringIdentifiable and Logger 2021-09-24 07:57:49 -07:00
dfsek
016fbaf468 create config api subproject 2021-09-24 07:54:57 -07:00
dfsek
0a6cde69d6 move mutable utils 2021-09-19 11:32:24 -07:00
dfsek
05cd7084ef move reflection utils 2021-09-19 11:31:59 -07:00
dfsek
33ab4c5bfd move generic utils to util project 2021-09-19 11:30:49 -07:00
dfsek
554369be31 create util api package 2021-09-19 11:23:17 -07:00
dfsek
acf3844139 move API project 2021-09-19 11:20:50 -07:00
dfsek
c6bdf2e37a start addon API 2021-09-19 11:09:48 -07:00
dfsek
06ab30339d create manifest-addon-loader module 2021-09-19 10:56:38 -07:00
dfsek
3c354df5d8 remove unused api-features core addon 2021-09-19 10:51:37 -07:00
dfsek
a2a8728203 feature after flora 2021-09-19 00:33:57 -07:00
dfsek
0366e2e33c registry merge debug message 2021-09-19 00:33:49 -07:00
dfsek
5919bdac50 remove flora generation addon 2021-09-19 00:22:41 -07:00
dfsek
c4415c6fd2 convert TerraFlora to structure 2021-09-19 00:17:28 -07:00
dfsek
1968bdf88d fix final config template values 2021-09-18 23:43:00 -07:00
dfsek
13ffb0ace1 fix sponge build 2021-09-18 23:30:19 -07:00
dfsek
471059a03e update paralithic api 2021-09-18 23:30:11 -07:00
dfsek
02be2969a2 remove unused class 2021-09-18 23:29:59 -07:00
dfsek
c8bb538c36 fix final variable in config template 2021-09-18 23:29:52 -07:00
dfsek
4c12483a57 bump paralithic to 0.5.0 2021-09-18 23:06:40 -07:00
dfsek
e445fd986d
Bump version 2021-09-06 12:45:53 -07:00
Cubxity
d7bb818f51
Mitigate issues with tree generation in paper (#260)
* fix: mitigate cocoa tree generation crash

* chore: suppress warnings

* chore: fix formatting

* refactor: catch specific exception

* chore: added reference to PaperMC/Paper#6028
2021-09-06 12:44:43 -07:00
dfsek
eef0e04682
Merge pull request #238 from pavog/patch-1
Fix spelling issues / typos in german translation
2021-09-06 12:44:24 -07:00
dfsek
9c857bf86b
Merge pull request #255 from uRyanxD/master
Addition: Portuguese translation.
2021-09-06 12:44:13 -07:00
dfsek
d440dacf30
Merge pull request #233 from ishland/fix/devlaunch
Fix fabric development environment launch
2021-09-06 12:43:58 -07:00
dfsek
193c09f60b Merge remote-tracking branch 'origin/ver/6.0.0' into ver/6.0.0
# Conflicts:
#	README.md
#	platforms/forge/src/main/java/com/dfsek/terra/forge/ForgeAdapter.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/ForgeUtil.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/TerraForgePlugin.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/block/ForgeBlock.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/block/ForgeBlockData.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/block/data/ForgeAnaloguePowerable.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/block/data/ForgeDirectional.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/block/data/ForgeEnumAdapter.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/block/data/ForgeMultipleFacing.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/block/data/ForgeOrientable.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/block/data/ForgeRotatable.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/block/data/ForgeSlab.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/block/data/ForgeStairs.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/block/data/ForgeWaterlogged.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/config/PostLoadCompatibilityOptions.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/config/PreLoadCompatibilityOptions.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/generation/ForgeChunkGeneratorWrapper.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/generation/PopulatorFeature.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/generation/TerraBiomeSource.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/generation/TerraGeneratorType.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/handle/ForgeItemHandle.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/handle/ForgeWorldHandle.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/listener/ForgeListener.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/listener/RegistryListener.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/DimensionGeneratorSettingsMixin.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/ServerWorldMixin.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/access/AbstractSpawnerAccessor.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/access/BiomeGeneratorTypeScreensAccessor.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/BiomeMixin.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/ChunkGeneratorMixin.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/ConfiguredFeatureMixin.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/block/BlockMixin.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/block/TileEntityMixin.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/block/state/LockableLootTileEntityMixin.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/block/state/MobSpawnerTileEntityMixin.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/block/state/SignTileEntityMixin.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/chunk/ChunkMixin.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/chunk/WorldGenRegionMixin.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/chunk/data/ChunkPrimerMixin.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/entity/CommandSourceMixin.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/entity/EntityMixin.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/entity/EntityTypeMixin.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/entity/PlayerEntityMixin.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/inventory/LockableTileEntityMixin.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/inventory/item/ItemMixin.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/inventory/item/ItemStackMixin.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/inventory/meta/EnchantmentMixin.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/inventory/meta/ItemStackDamageableMixin.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/inventory/meta/ItemStackMetaMixin.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/package-info.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/world/ServerWorldMixin.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/world/WorldGenRegionMixin.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/init/MinecraftClientMixin.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/init/MinecraftServerMixin.java
#	platforms/forge/src/main/resources/terra.mixins.json
2021-09-03 10:46:48 -07:00
dfsek
7392a46118
Merge pull request #263 from solonovamax/style/editor-config
Update editor config
2021-08-31 18:36:22 -07:00
solonovamax
b6c40302b6
Improve logging
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
2021-08-30 22:04:17 -04:00
solonovamax
7b9c88f8a6
Improve bukkit logging
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
2021-08-30 20:35:18 -04:00
solonovamax
a776ecfc2b
Migrate logging to SLF4J
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
2021-08-30 19:53:35 -04:00
solonovamax
c445a0434d
Reformat all code
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
2021-08-30 17:34:44 -04:00
solonovamax
1655381413
Style: update editor config
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
2021-08-30 16:29:18 -04:00
dfsek
351bdb26f2 remove forge from README.md 2021-08-29 17:21:32 -07:00
dfsek
859b968555 remove Forge implementation 2021-08-29 17:20:34 -07:00
dfsek
1c124e8b75 use namespaced IDs for entities 2021-08-17 10:04:11 -07:00
dfsek
0d04f79cd4 createBlockEntity method 2021-08-17 09:38:12 -07:00
uRyanxD
ffbc253477
Addition: Portuguese translation. 2021-08-12 20:48:27 -03:00
dfsek
5919d5f031 create "merged" platform 2021-08-02 23:29:29 -07:00
dfsek
03241fa412 register event listeners 2021-07-31 00:56:45 -07:00
dfsek
9eecaf71c8 hold air blockstate in Lazy 2021-07-31 00:46:33 -07:00
dfsek
f5c73e926f remove mixin stuff for now 2021-07-31 00:44:06 -07:00
dfsek
bea45ff030 begin sponge impl 2021-07-30 15:23:39 -07:00
dfsek
2263e6722b set up mixin and vanillagradle 2021-07-30 10:53:22 -07:00
dfsek
df6cdf37aa reset sponge build 2021-07-30 10:45:24 -07:00
dfsek
6010ea3bd6 bump test version to 1.17.1 2021-07-30 10:25:58 -07:00
dfsek
c8429141c8 fix class cast issue 2021-07-30 10:23:09 -07:00
dfsek
a15c5f2cca shade ioutils in terrascript addon 2021-07-30 10:17:17 -07:00
dfsek
7becdf7f64 dont delete addons in bukkit build 2021-07-30 08:40:27 -07:00
dfsek
76173c1f31 correct bukkit addon dirs 2021-07-30 08:37:47 -07:00
dfsek
3a47fd5aa9 fire initialization event on bukkit 2021-07-30 08:37:12 -07:00
dfsek
ddf1334f6f properly initialize config.yml 2021-07-30 08:25:35 -07:00
dfsek
bda3594025 addon dump bukkit 2021-07-30 08:14:01 -07:00
dfsek
1dbcb031ea move resource dumping to AbstractTerraPlugin 2021-07-30 08:09:37 -07:00
dfsek
b407ca8821 move platform addon registration 2021-07-30 07:56:18 -07:00
dfsek
0b0742d850 compile bukkit 2021-07-29 10:44:49 -07:00
dfsek
102828039d split up bukkit terraplugin impl 2021-07-29 09:32:41 -07:00
dfsek
a21eb2c3ba fix deprecation warning on bukkit 2021-07-29 08:24:36 -07:00
dfsek
43874521db remove jcenter from buildscripts 2021-07-29 08:22:41 -07:00
dfsek
7f7dc23b09
Merge pull request #254 from PolyhedralDev/dev/addon-splits
Implement other biome provider types, streamline pipeline config syntax, implement more locators
2021-07-29 08:11:03 -07:00
dfsek
a2d8a5a259 implement ImageBiomeProviderAddon 2021-07-29 08:06:41 -07:00
dfsek
1c5945706f implement single biome provider addon 2021-07-29 08:01:12 -07:00
dfsek
480e41b99a register biome provider types 2021-07-29 07:56:21 -07:00
dfsek
276c78a329 remove StageLoader 2021-07-29 07:48:43 -07:00
dfsek
dd0ef7ea45 register all stage types 2021-07-29 07:47:56 -07:00
dfsek
d5fd653130 register stages 2021-07-29 07:38:41 -07:00
dfsek
6da14f58df remove BiomeSource.Type 2021-07-29 07:28:09 -07:00
dfsek
13ab02984b remove SourceLoader 2021-07-29 07:27:30 -07:00
dfsek
fa8a66833e register biome sources 2021-07-29 07:27:00 -07:00
dfsek
9d24e8a282 remove unneeded TypeKeys 2021-07-29 07:23:05 -07:00
dfsek
6df5aa112a register noise locator 2021-07-28 09:15:02 -07:00
dfsek
dd0c6b557d implement NoiseLocatorTemplate 2021-07-28 09:14:37 -07:00
dfsek
1522e6b57d implement NoiseLocator 2021-07-28 09:12:22 -07:00
dfsek
cefa4369f2 register and/or locator templates 2021-07-28 09:04:10 -07:00
dfsek
d6b36f4d3f OrLocatorTemplate 2021-07-28 09:03:08 -07:00
dfsek
12c068b252 AndLocatorTemplate 2021-07-28 09:02:37 -07:00
dfsek
26152ec94e add boolean methods to Locator 2021-07-28 08:58:10 -07:00
dfsek
19861ec27b binary column SurfaceLocator 2021-07-28 08:40:48 -07:00
dfsek
fda44b8e99 RandomLocator binary column 2021-07-28 08:33:36 -07:00
dfsek
1624c999ac PatternLocator binarycolumn 2021-07-28 08:19:03 -07:00
dfsek
d43eccc442 column min/max y 2021-07-28 08:16:59 -07:00
dfsek
7a44b74b61 use binarycolumn in locator 2021-07-28 08:12:38 -07:00
dfsek
220a981b05 implement BinaryColumn 2021-07-28 08:08:03 -07:00
dfsek
987de074c6 refactor MatchPattern 2021-07-28 07:28:17 -07:00
dfsek
e356291bba expressions -> functions 2021-07-28 07:27:51 -07:00
dfsek
12d78e0b73 equation -> expression 2021-07-28 07:27:31 -07:00
dfsek
bc199d9b06
Merge pull request #253 from PolyhedralDev/dev/addon-splits
Boolean distributors, pattern matching locator
2021-07-27 20:50:08 -07:00
dfsek
926e5a8ca9 remove github workflow 2021-07-27 20:48:25 -07:00
dfsek
4ad638983a fix pattern Y level 2021-07-27 20:39:17 -07:00
dfsek
90e127a512 MetaNumberPreprocessor after MetaValuePreprocessor 2021-07-27 20:25:37 -07:00
dfsek
9d12fe1bf1 singleton range shorthand 2021-07-27 20:23:00 -07:00
dfsek
d09fe9b2a4 register number preprocessor 2021-07-27 20:17:02 -07:00
dfsek
f00766ea93 register map preprocessor 2021-07-27 20:16:08 -07:00
dfsek
122e72e842 register string preprocessor first 2021-07-27 20:15:15 -07:00
dfsek
b3f15b77ee register value preprocessor last 2021-07-27 20:14:44 -07:00
dfsek
ec19c468a2 meta annotate distributors 2021-07-27 20:13:35 -07:00
dfsek
782a43ca53 meta annotate pattern templates 2021-07-27 20:13:00 -07:00
dfsek
8ec438ab15 register pattern locator 2021-07-27 20:11:34 -07:00
dfsek
002b311827 create PatternLocatorTemplate 2021-07-27 20:11:03 -07:00
dfsek
36e6d1270d create PatternLocator 2021-07-27 20:09:32 -07:00
dfsek
07c8bfb29e register patterns 2021-07-27 20:07:35 -07:00
dfsek
63667f256b implement BlockSetMatchPatternTemplate 2021-07-27 20:06:33 -07:00
dfsek
abfd050acb create SingleBlockMatchPatternTemplate 2021-07-27 20:05:06 -07:00
dfsek
db93c9e2e9 create NotPatternTemplate 2021-07-27 20:02:42 -07:00
dfsek
1739c51ce6 create OrPatternTemplate 2021-07-27 20:01:55 -07:00
dfsek
9693fa641b Pattern#not 2021-07-27 20:01:29 -07:00
dfsek
167ab3146e create AndPatternTemplate 2021-07-27 20:00:46 -07:00
dfsek
5321662847 simplify AirMatchPatternTemplate 2021-07-27 19:58:08 -07:00
dfsek
347e0d2bd1 create SolidMatchPatternTemplate 2021-07-27 19:57:46 -07:00
dfsek
ca02187b0c create AirMatchPatternTemplate 2021-07-27 19:56:11 -07:00
dfsek
649273db01 create MatchPattern 2021-07-27 19:50:26 -07:00
dfsek
fb3f90a9cd Pattern boolean operations 2021-07-27 19:39:53 -07:00
dfsek
7430116fa9 create Pattern interface 2021-07-27 19:39:02 -07:00
dfsek
c8bb780312 update noise IDs 2021-07-26 23:19:57 -07:00
dfsek
b25be7ae98 register OR distributor 2021-07-26 21:40:06 -07:00
dfsek
4567011313 create OrDistributorTemplate 2021-07-26 21:39:43 -07:00
dfsek
a24de0ab97 register AND distributor 2021-07-26 21:38:19 -07:00
dfsek
f76ef93fe6 create AndDistributorTemplate 2021-07-26 21:37:52 -07:00
dfsek
c64266febb
Merge pull request #252 from PolyhedralDev/dev/addon-splits
Make TerraPlugin implementations less boilerplate-y
2021-07-26 21:34:06 -07:00
dfsek
6da8c72593 remove TerraPlugin#saveDefaultConfig 2021-07-25 22:43:36 -07:00
dfsek
c13494ca03 implement AbstractTerraPlugin#load 2021-07-25 22:42:53 -07:00
dfsek
19d4673afe fix logger issue 2021-07-25 22:33:18 -07:00
dfsek
7f09ee4af3 cleanup AbstractTerraPlugin 2021-07-24 20:50:01 -07:00
dfsek
f73366fcb3 Lazy#of -> Lazy#lazy 2021-07-24 20:14:19 -07:00
dfsek
074528003b clean up addon registry initialization 2021-07-24 20:11:04 -07:00
dfsek
22aa03cd51 update FabricAddon ID 2021-07-24 20:06:39 -07:00
dfsek
cb876d12f9 use FabricAddon in TerraPluginImpl 2021-07-24 20:06:14 -07:00
dfsek
41d3e2f6b0 delete TerraFabricPlugin 2021-07-24 20:05:10 -07:00
dfsek
5cafd4999a use FabricEntryPoint as entry point 2021-07-24 20:04:25 -07:00
dfsek
4ec1ab7c16 remove references to TerraFabricPlugin 2021-07-24 20:03:52 -07:00
dfsek
b19b85fd60 move FabricAddon to upper level 2021-07-24 20:02:30 -07:00
dfsek
68f82fef02 use TerraPluginImpl over TerraFabricPlugin 2021-07-24 19:56:54 -07:00
dfsek
af4af84a48 register Fabric-specific loaders in TerraPluginImpl 2021-07-24 19:51:26 -07:00
dfsek
e882be2ba4 create FabricEntryPoint 2021-07-24 19:49:59 -07:00
dfsek
34868680c1 Fabric TerraPluginImpl 2021-07-24 19:47:40 -07:00
dfsek
5bd70da0bc add getLanguage to AbstractTerraPlugin 2021-07-24 19:43:50 -07:00
dfsek
e8ee7bc64f create AbstractTerraPlugin 2021-07-24 19:42:03 -07:00
dfsek
7f3a7645bd BasePluginConvention -> BasePluginExtension 2021-07-23 18:08:42 -07:00
dfsek
2790373071 JavaPluginConvention -> JavaPluginExtension 2021-07-23 18:02:10 -07:00
dfsek
8751346693 fix gradle property enabled deprecation warning 2021-07-23 16:06:34 -07:00
dfsek
f987ffa6d0
Merge pull request #251 from PolyhedralDev/dev/refactors-6.0
Grable
2021-07-23 15:05:08 -07:00
dfsek
d83e6f09a7 bump gradle version from 7.0.2 -> 7.1.1 2021-07-23 15:04:15 -07:00
dfsek
7b70478a7f remove configureCommon function 2021-07-23 15:01:48 -07:00
dfsek
363b70c1a6 correct afterEvaluate nesting 2021-07-23 14:54:51 -07:00
dfsek
a3a4cf8251 remove configureCommon call from platform impls 2021-07-23 14:51:19 -07:00
dfsek
47c284656b automatically configureDistribution of platform impls 2021-07-23 14:50:47 -07:00
dfsek
1ae9ae71de remove configureAddon 2021-07-23 11:51:41 -07:00
dfsek
3b5e6b80d5 remove calls to configureAddon 2021-07-23 11:51:07 -07:00
dfsek
fb26b02ad1 apply common configurations automatically 2021-07-23 11:47:54 -07:00
dfsek
67d3af71bf move Tectonic YAML dependency to implementation 2021-07-23 11:42:29 -07:00
dfsek
672349f5b7 run configurePublishing in API 2021-07-23 11:36:06 -07:00
dfsek
aecb7201b8 remove redundant group declarations 2021-07-23 11:31:35 -07:00
dfsek
cdd7abc596 remove redundant plugin dependencies 2021-07-23 11:27:35 -07:00
dfsek
4c7179cfa2 apply java plugin in CompilationConfig 2021-07-23 11:22:58 -07:00
dfsek
fb6f591f0b apply java-library plugin in CompilationConfig 2021-07-23 11:22:29 -07:00
dfsek
6cd60d3f4f remove redundant publishing configs 2021-07-23 11:20:27 -07:00
dfsek
507ea8bc88 run configurePublishing from CommonConfig 2021-07-23 11:16:15 -07:00
dfsek
bbcd571156 create PublishingConfig and configurePublishing function 2021-07-23 11:15:21 -07:00
dfsek
321c50c417 use configureAddon in addons 2021-07-23 11:10:03 -07:00
dfsek
fe18d89580 create configureAddon method 2021-07-23 11:03:39 -07:00
dfsek
a15e45875e automatically depend on API in addons 2021-07-23 10:59:24 -07:00
dfsek
bcc6e314eb fix afterEvaluate issue 2021-07-23 10:58:02 -07:00
dfsek
789d5d1e23 automatically declare addon dependencies 2021-07-23 10:53:59 -07:00
dfsek
9d540d471d remove redundant Guava dependency declarations 2021-07-23 10:52:15 -07:00
dfsek
e16208bd76 depend on guava in DependencyConfig 2021-07-23 10:47:37 -07:00
dfsek
579195481b compileOnly API in addons 2021-07-23 10:40:48 -07:00
dfsek
f297636c61 feature API README 2021-07-23 10:34:46 -07:00
dfsek
2fdada2121 create api-features module 2021-07-23 10:33:04 -07:00
dfsek
1613ea843d
Merge pull request #249 from PolyhedralDev/dev/refactors-6.0
Several refactors
2021-07-22 20:29:54 -07:00
dfsek
169ed64568 Structure#generateDirect -> #generate 2021-07-22 18:44:51 -07:00
dfsek
9d687208c9 remove useless Structure#generate implementation 2021-07-22 18:44:23 -07:00
dfsek
6d0a32f251 remove redundant suppression in Structure 2021-07-22 18:43:01 -07:00
dfsek
7d70b8fcdf remove test method from Structure 2021-07-22 18:42:37 -07:00
dfsek
89b03aa3fb implement StringIdentifiable 2021-07-22 18:40:48 -07:00
dfsek
696ee07c33 create StringIdentifiable 2021-07-22 18:37:59 -07:00
dfsek
55030450b5 remove world parameter from TerraBiome#getGenerator 2021-07-22 18:36:30 -07:00
dfsek
be9e817c88 Generator -> GenerationSettings 2021-07-22 18:35:10 -07:00
dfsek
2f9387fbf0 refactor BiomeSource to pipeline addon 2021-07-22 18:33:50 -07:00
dfsek
4da5ce748d TerraChunkGenerator -> ChunkGenerator 2021-07-22 18:30:44 -07:00
dfsek
f659c32749 delete ChunkGenerator 2021-07-22 18:30:09 -07:00
dfsek
cdcbd28aa0 remove sponge buildscript 2021-07-22 18:29:16 -07:00
dfsek
8ae457b251 remove region buildscript 2021-07-22 18:28:50 -07:00
dfsek
9bf7b373b1 delete GenWrapper 2021-07-22 18:27:30 -07:00
dfsek
b3f92410e0 delete BukkitChunkGenerator 2021-07-22 18:26:29 -07:00
dfsek
6ea11de2fd cleanup 2021-07-22 18:25:53 -07:00
dfsek
ad9cc1afcb World#getTerraGenerator -> World#getGenerator 2021-07-22 14:28:37 -07:00
dfsek
ec14666c6d remove World#getGenerator 2021-07-22 14:28:11 -07:00
dfsek
2517b74951 remove isTerraWorld from Fabric mixins 2021-07-22 14:25:06 -07:00
dfsek
fe68aa6279 remove World#isTerraWorld 2021-07-22 14:21:14 -07:00
dfsek
a753351137 Move BukkitChunkData out of BukkitChunkGenerator 2021-07-22 14:19:04 -07:00
dfsek
2e2f9d854d delete ChunkGeneratorMixin 2021-07-22 14:18:07 -07:00
dfsek
76b6c0a984 TerraGenerationStage -> GenerationStage 2021-07-22 14:17:12 -07:00
dfsek
1f9a51fc40 delete GenerationStage 2021-07-22 14:16:42 -07:00
dfsek
1039bf6001 delete TerraWorld 2021-07-22 14:15:06 -07:00
dfsek
109b5e38cd remove most terraworld dependency 2021-07-22 14:13:37 -07:00
dfsek
ea60b30321 remove TerraWorld#getConfig 2021-07-22 14:00:16 -07:00
dfsek
8898bbd5c4 remove usages of TerraWorld#getConfig 2021-07-22 13:59:39 -07:00
dfsek
a56d1818c8 implement World#getConfig 2021-07-22 13:51:51 -07:00
dfsek
7f050b37a4 remove TerraWorld#getBiomeProvider 2021-07-22 13:33:19 -07:00
dfsek
2948f25b50 remove uses of TerraWorld#getBiomeProvider 2021-07-22 13:32:34 -07:00
dfsek
a91a5019f8 implement getBiomeProvider in World 2021-07-22 13:28:14 -07:00
dfsek
82169f0921 ConfigType#getTypeClass -> getTypeKey 2021-07-22 13:04:33 -07:00
dfsek
9359ba0c97
Merge pull request #247 from PolyhedralDev/dev/functionalevents
Abstract event system with functional default implementation
2021-07-22 10:11:53 -07:00
dfsek
ba53923e8c use FailThrough when available 2021-07-21 22:20:20 -07:00
dfsek
deb1063592 properly compute priorities 2021-07-21 22:17:04 -07:00
dfsek
2ea16f68a2 throw exception on non-failthrough events registered as failthrough 2021-07-21 22:12:16 -07:00
dfsek
2175ea849f only failthrough on FailThroughEvent 2021-07-21 22:09:05 -07:00
dfsek
b630ab6531 remove event annotations 2021-07-21 22:06:20 -07:00
dfsek
8eddffb0a6 delete EventListener 2021-07-21 22:05:14 -07:00
dfsek
953318d9c0 implement FunctionalEventHandler 2021-07-21 22:04:40 -07:00
dfsek
6f1938ef82 functional events in FabricAddon 2021-07-21 20:23:45 -07:00
dfsek
1d6d63b399 functional events in TerraScriptAddon 2021-07-21 20:20:32 -07:00
dfsek
d8a5951f6e functional events in FloraGenerationAddon 2021-07-21 20:19:12 -07:00
dfsek
185df6e8a4 functional events in YamlAddon 2021-07-21 20:17:54 -07:00
dfsek
315da531b7 delete TerraListener 2021-07-21 20:16:42 -07:00
dfsek
ec26e7b1b0 functional events in FeatureGenerationAddon 2021-07-21 20:15:40 -07:00
dfsek
7363a305af functional events in StructureAddon 2021-07-21 20:13:59 -07:00
dfsek
bff0106e65 functional events in PaletteAddon 2021-07-21 20:12:53 -07:00
dfsek
089eac9dc5 functional events in OreAddon 2021-07-21 20:12:02 -07:00
dfsek
a0a15802e4 functional events in NoiseAddon 2021-07-21 20:10:57 -07:00
dfsek
dce3742fcb LocatorAddon functional events 2021-07-21 20:09:43 -07:00
dfsek
502d2b5814 functional events in FloraAddon 2021-07-21 20:08:23 -07:00
dfsek
36ce88af0a functional events in FeatureAddon 2021-07-21 20:07:30 -07:00
dfsek
3f42b9ab3e functional events in DistributorAddon 2021-07-21 20:06:28 -07:00
dfsek
facd878788 functional events in BiomeAddon 2021-07-21 20:04:53 -07:00
dfsek
9713a7a7ba implement functional events in NoiseChunkGenerator3DAddon 2021-07-21 20:03:52 -07:00
dfsek
a030fb93f3 use functional events in BiomePipelineAddon 2021-07-21 20:00:50 -07:00
dfsek
67c45b7be3 functional event API 2021-07-21 19:58:42 -07:00
dfsek
af1520eb83 fix gradle dependency stuff 2021-07-21 16:18:06 -07:00
dfsek
7932a97985
Merge pull request #246 from PolyhedralDev/dev/no-block-constant
Dont require constant in TerraScript block function
2021-07-21 15:20:45 -07:00
dfsek
5c92316725 implement BlockFunction Constant override 2021-07-21 15:18:42 -07:00
dfsek
a28f46eca3 allow dynamic block data in TerraScript block function by default 2021-07-21 15:06:56 -07:00
dfsek
36838d8938
Merge pull request #245 from PolyhedralDev/dev/metaconfiguration
Metaconfiguration
2021-07-21 14:55:53 -07:00
dfsek
662196c7a6 MetaNumberPreprocessor fixes 2021-07-21 14:52:59 -07:00
dfsek
d8bbc95c1e implement MetaNumberPreprocessor 2021-07-21 14:38:55 -07:00
dfsek
57658d2268 create test for metastring 2021-07-21 14:31:21 -07:00
dfsek
73fd1c9edd register StringPreprocessor 2021-07-21 14:25:16 -07:00
dfsek
d054be5f25 implement MetaStringPreprocessor 2021-07-21 14:24:26 -07:00
dfsek
5a85099357 metaset impl 2021-07-21 10:02:10 -07:00
dfsek
f7a5066008 typo 2021-07-21 09:59:21 -07:00
dfsek
5a8f5aa29c create test for MetaMap 2021-07-21 09:58:08 -07:00
dfsek
d0434ef05e create MetaMapPreprocessor 2021-07-21 09:57:57 -07:00
dfsek
5c3cd73c03 add TypeKey#getAnnotatedType 2021-07-21 09:48:21 -07:00
dfsek
6f03cfa600 correctly remove placeholder in MetaListPreprocessor 2021-07-20 22:24:29 -07:00
dfsek
4c4df28adb create and implement MetaListPreprocessor 2021-07-20 22:15:06 -07:00
dfsek
de4376dd9c Create MetaPreprocessor abstract class 2021-07-20 22:11:29 -07:00
dfsek
f27e732b39 add metalist test 2021-07-20 21:58:43 -07:00
dfsek
90e60ca6aa MetaList processing 2021-07-20 21:52:37 -07:00
dfsek
2373174132 @Meta all the things 2021-07-20 21:29:30 -07:00
dfsek
6158cda740 debug-log discovered configs 2021-07-20 21:08:23 -07:00
dfsek
6285b7646b dont exclude pack.yml 2021-07-20 21:05:55 -07:00
dfsek
299bf0dae8 Only sort configs with type key 2021-07-20 21:05:01 -07:00
dfsek
fe60e12f16 create MetaValuePreprocessor 2021-07-20 21:01:37 -07:00
dfsek
c71445d3e5 create Meta annotation 2021-07-20 20:22:01 -07:00
dfsek
feea26dea7 fix typo 2021-07-20 20:13:21 -07:00
dfsek
12540f3a2c
Merge pull request #244 from PolyhedralDev/dev/features
Dev/features
2021-07-20 20:11:45 -07:00
dfsek
a6324ae6e2 dont inject trees on Fabric 2021-07-20 20:07:17 -07:00
dfsek
e63d675549 delete tree config addon 2021-07-20 20:04:00 -07:00
dfsek
1349d5b00e delete tree generation stage addon 2021-07-20 20:03:30 -07:00
dfsek
6be4c0b7c6 create and register PointSetDistributor 2021-07-20 19:57:31 -07:00
dfsek
7b9a473275 create and register RandomLocatorTemplate 2021-07-20 19:48:00 -07:00
dfsek
137206884c create RandomLocator 2021-07-20 19:44:12 -07:00
dfsek
5ea08eb898
Merge pull request #243 from PolyhedralDev/dev/features
Feature config
2021-07-20 19:34:24 -07:00
dfsek
d6e2acce38 make salt long 2021-07-20 17:34:33 -07:00
dfsek
7b1853823c remove unneeded NoiseSamplerBuilderLoader 2021-07-20 16:08:58 -07:00
dfsek
c8bb9bbfeb automatically register loader for Supplier<ObjectTemplate<T>> 2021-07-20 16:05:54 -07:00
dfsek
3a7edcb1e4 feature configuration 2021-07-20 15:18:03 -07:00
dfsek
0ff6a9cce1 dont use pack instance where unneeded 2021-07-20 15:12:06 -07:00
dfsek
d807abb165 pass pack to ConfigType#registrySupplier 2021-07-20 15:09:51 -07:00
dfsek
c1dfcafa1d create base FeatureAddon 2021-07-20 15:06:23 -07:00
dfsek
7a554a1fdb create feature config addon module 2021-07-20 15:00:46 -07:00
dfsek
7fef7125fe
Merge pull request #240 from PolyhedralDev/dev/features
Distributor/Locator addons + basic implementations, remove seed context
2021-07-19 23:21:00 -07:00
dfsek
4c25a8f909 RandomSource -> NoiseSource 2021-07-19 22:23:32 -07:00
dfsek
a8d4354851 StandardBiomeProvider -> BiomePipelineProvider 2021-07-19 22:23:03 -07:00
dfsek
f9a199f177 BiomePipelineImpl -> BiomePipeline 2021-07-19 22:22:24 -07:00
dfsek
04d78c1e32 fix config loading issues 2021-07-19 22:21:49 -07:00
dfsek
4dc04131f4 BiomeProviderBuilderLoader -> BiomeProviderLoader 2021-07-19 22:03:41 -07:00
dfsek
e7af30350b StageBuilderLoader -> StageLoader 2021-07-19 22:03:12 -07:00
dfsek
165642806c register cellular enum loaders 2021-07-19 21:57:53 -07:00
dfsek
9673ab8ce1 cleanup 2021-07-19 21:51:38 -07:00
dfsek
24a4ff4044 delete SeededBuilder 2021-07-19 21:47:21 -07:00
dfsek
d997fc69bf delete StageSeeded 2021-07-19 21:43:47 -07:00
dfsek
03e4636ef9 remove SeededTerraBiome 2021-07-19 21:35:53 -07:00
dfsek
458fc422de directly instantiate biomes 2021-07-19 21:29:41 -07:00
dfsek
04bdd0b4a3 BiomeConfigAddon -> BiomeAddon 2021-07-19 21:26:52 -07:00
dfsek
785323f3f6 register DimensionApplicableNoiseSampler loader 2021-07-19 21:23:37 -07:00
dfsek
d036ed289c delete SeededNoiseSampler 2021-07-19 21:21:56 -07:00
dfsek
96b52f9a3e remove unused class ExpressionSampler 2021-07-19 21:20:59 -07:00
dfsek
f0441cbefc dont implement seedednoisesampler in noise addon 2021-07-19 21:19:57 -07:00
dfsek
6f40e7b1f5 remove SeededNoiseSampler from configs 2021-07-19 21:10:49 -07:00
dfsek
3bf8fe7901 pass seed to noise functions 2021-07-19 19:24:54 -07:00
dfsek
7acfc5e3d0 register SurfaceLocator 2021-07-18 15:52:39 -07:00
dfsek
913e7fd6df configure SurfaceLocator 2021-07-18 15:51:59 -07:00
dfsek
a70641e01b create SurfaceLocator 2021-07-18 15:50:16 -07:00
dfsek
ac99d89e96 register locator registry 2021-07-18 15:43:09 -07:00
dfsek
fc63798103 create LocatorAddon 2021-07-18 15:41:08 -07:00
dfsek
1a3a7df3f7 create noise distributor 2021-07-18 15:38:40 -07:00
dfsek
46f64b5434 refactor ReflectionUtil to util.reflection package 2021-07-18 14:11:08 -07:00
dfsek
4447005b43 refactor TypeToken to TypeKey 2021-07-18 14:10:34 -07:00
dfsek
15f749bfe9 generify SeededBiomeSource 2021-07-18 14:08:59 -07:00
dfsek
11f161d546 remove DistributorProvider 2021-07-18 14:05:52 -07:00
dfsek
04e998748d remove LocatorProvider 2021-07-18 14:05:36 -07:00
dfsek
40cd6607b2 generify biome provider 2021-07-18 14:05:04 -07:00
dfsek
4b4c26eb84 generify noise registry 2021-07-18 13:59:26 -07:00
dfsek
d5601229ac use TypeToken for registries 2021-07-18 13:55:35 -07:00
dfsek
ebc81b196a typetoken getOrCreateRegistry 2021-07-18 13:37:40 -07:00
dfsek
d10e2050cb default impl of getCheckedRegistry 2021-07-18 13:32:10 -07:00
dfsek
cd208cbd18 use typetokens in RegistryHolder 2021-07-18 13:31:17 -07:00
dfsek
d4e678fd65 bump Tectonic version 2021-07-18 13:21:38 -07:00
dfsek
03b96816c9 create TypeToken 2021-07-18 13:17:44 -07:00
dfsek
d3a080127a remove ExceptionalConsumer 2021-07-18 10:00:48 -07:00
dfsek
3fecbe5d1d LocatorProvider API 2021-07-18 09:56:06 -07:00
dfsek
4a893cf081 DistributorProvider api 2021-07-18 09:55:37 -07:00
dfsek
a2dac6dfca fix/suppress warnings 2021-07-17 21:59:48 -07:00
dfsek
bc96006c4b remove unneeded semicolon 2021-07-17 21:56:35 -07:00
dfsek
d4112e46c7 BiomeProviderBuilder -> SeededBiomeProvider 2021-07-17 21:51:18 -07:00
dfsek
ec28f613d3 make SeededBuilder use unboxed long 2021-07-17 21:50:12 -07:00
dfsek
3a94c5287c BiomeBuilder -> SeededTerraBiome 2021-07-17 21:37:57 -07:00
dfsek
689fe0bc70 SourceSeeded -> SeededBiomeSource 2021-07-17 21:37:12 -07:00
dfsek
84e7d11156 NoiseSeeded -> SeededNoiseSampler 2021-07-17 21:36:27 -07:00
dfsek
1194cca485 refactor to distibguish providers from builders 2021-07-17 21:35:10 -07:00
dfsek
ced5a05370 create base DistributorAddon 2021-07-17 21:33:52 -07:00
dfsek
6cff6db152 remove redundant catch block 2021-07-17 21:30:06 -07:00
dfsek
be55f4a62d create distributors addon module 2021-07-17 21:28:10 -07:00
dfsek
f57c5f39b9 create locators addon module 2021-07-17 21:27:38 -07:00
dfsek
180aae6e34 implement FeatureGenerationStage 2021-07-17 20:04:27 -07:00
dfsek
0f638b0317 feature configuration 2021-07-17 19:57:50 -07:00
dfsek
6b191ac00b initial FeatureGenerationAddon impl 2021-07-17 19:50:23 -07:00
dfsek
b52dcf2f15 add world context to Feature 2021-07-17 19:37:14 -07:00
dfsek
62cf861c22 Locator API 2021-07-17 19:36:37 -07:00
dfsek
fec5b138d2 create Column 2021-07-17 19:35:51 -07:00
dfsek
f4f595425a Distributor api 2021-07-17 19:34:19 -07:00
dfsek
fc2ce229ed basic Feature API 2021-07-17 19:30:07 -07:00
dfsek
3c4c8c62b2
Merge pull request #236 from PolyhedralDev/dev/addonification
Addonification
2021-07-17 18:07:36 -07:00
dfsek
deedfb1f8d delete JarUtil 2021-07-17 18:00:37 -07:00
dfsek
3261e7451f dont load lang files in LangUtil 2021-07-17 17:59:41 -07:00
dfsek
98a0c9e052 include lang files in resource manifest 2021-07-17 17:59:16 -07:00
dfsek
453e1ebb87 dump resources from resource manifest 2021-07-17 17:53:25 -07:00
dfsek
c65ea812ed create Gradle task to generate resource manifest 2021-07-17 16:57:49 -07:00
dfsek
c26418b5ba depend on SnakeYAML in buildSrc 2021-07-17 16:32:43 -07:00
dfsek
b626b74624 dont minify 2021-07-17 14:48:26 -07:00
dfsek
ff329b2d18 structure generation stage addon 2021-07-17 14:34:02 -07:00
dfsek
6f5cca5e4e ore generation stage addon 2021-07-17 14:33:21 -07:00
dfsek
1e5a0bb93f split tree addon 2021-07-17 13:41:25 -07:00
dfsek
78735ec769 create TreeGenerationAddon 2021-07-17 13:28:50 -07:00
dfsek
887b17a421 refactor FloraPopulator to FloraGenerationStage 2021-07-17 13:26:13 -07:00
dfsek
d43f226f2d create tree generation stage addon 2021-07-17 13:25:24 -07:00
dfsek
53b5ee2ca9 split flora addon into separate config and generation addons 2021-07-17 13:25:00 -07:00
dfsek
3ec536dc03 create FloraGenerationAddon template 2021-07-17 13:16:32 -07:00
dfsek
2f5751cda7 create flora generation stage submodule 2021-07-17 13:14:14 -07:00
dfsek
f0e3b1aa1d structure addon work 2021-07-17 13:12:04 -07:00
dfsek
72f0b07a38 programmatically include subprojects 2021-07-17 12:41:26 -07:00
dfsek
810340dbfb property-ify trees 2021-07-17 12:25:08 -07:00
dfsek
f4820e5a06 remove PlaceableLayer.java 2021-07-17 12:08:18 -07:00
dfsek
55733b0e28 lowercase artifact ID 2021-07-17 12:06:48 -07:00
dfsek
5bae639923 property-ify flora 2021-07-17 12:02:58 -07:00
dfsek
a673f961b3 property-ify Chunk Generator addon 2021-07-17 10:34:14 -07:00
dfsek
a66641cb8a create Linked annotation and link TerraBiome and BiomeBuilder 2021-07-17 10:28:05 -07:00
dfsek
b1589ed046 implement PropertyHolder in TerraBiome 2021-07-17 10:23:40 -07:00
dfsek
60edef989c create simple property API 2021-07-17 10:22:21 -07:00
dfsek
646d8970aa remove palette definition from base biome config 2021-07-16 12:38:47 -07:00
dfsek
2e6b62d690 ocean and slant palettes 2021-07-16 12:07:10 -07:00
dfsek
0bd6ff9469 load palettes in chunk generator 2021-07-15 20:01:36 -07:00
dfsek
9e7bab340e slant palette loading 2021-07-15 18:09:06 -07:00
dfsek
2cd71cdcd3 slant palette things 2021-07-15 17:57:54 -07:00
dfsek
319df9e638 clean up biome template 2021-07-15 14:58:11 -07:00
dfsek
9d2ae0a828 fix fabric tree injection issue 2021-07-15 14:45:26 -07:00
dfsek
d94ddb3e76 create config type loading events 2021-07-15 14:40:00 -07:00
dfsek
cb4b537a2f document and refactor config events 2021-07-15 14:34:48 -07:00
dfsek
2705e7d6a2 dont implement LoaderHolder in TerraPlugin 2021-07-15 14:05:44 -07:00
dfsek
b3594b2479 make DuplicateEntryException unchecked 2021-07-15 13:55:47 -07:00
dfsek
8cd2554d3a fix registry overwrite issue 2021-07-15 13:54:01 -07:00
dfsek
95e6479505 cleanup 2021-07-15 13:24:05 -07:00
dfsek
34e78ab55e implement tree populator 2021-07-14 14:49:58 -07:00
dfsek
089af42623 working flora populator impl 2021-07-14 10:27:14 -07:00
dfsek
7a38284158 implement flora populator 2021-07-14 07:30:22 -07:00
dfsek
7fa2e8251e create and implement ConfigLoadEvent 2021-07-14 07:15:16 -07:00
dfsek
bac5557873 finish READMEs 2021-07-13 20:47:39 -07:00
dfsek
2745bb8ba3 chunk generator README 2021-07-13 20:44:14 -07:00
dfsek
26d91a715c biome addon READMEs 2021-07-13 20:42:42 -07:00
dfsek
19672b1083 update to tectonic 2.0.0 2021-07-13 20:37:53 -07:00
dfsek
c21038a21e implement YAML addon 2021-07-13 15:47:19 -07:00
dfsek
d2aa7cf5d5 create language-yaml addons 2021-07-13 15:28:29 -07:00
dfsek
f12d23b4cb create ConfigurationLoadEvent 2021-07-13 15:25:46 -07:00
dfsek
0dfde174ad begin tectonic update process 2021-07-13 15:23:28 -07:00
dfsek
27d9716c5d update to Tectonic 2.0.0 2021-07-13 14:50:35 -07:00
dfsek
589158ee71 reformat 2021-07-13 14:24:33 -07:00
dfsek
dea68d0ede apache rng dependency stuff 2021-07-13 12:45:49 -07:00
dfsek
61d03a7022 org.json dependency stuff 2021-07-13 12:39:23 -07:00
dfsek
3be90cab53 paralithic dependency stuff 2021-07-13 12:32:24 -07:00
dfsek
cf88c51fda commons IO dependency changes 2021-07-13 12:30:04 -07:00
dfsek
6f7b7a2336 asm dependency changes 2021-07-13 11:25:08 -07:00
dfsek
cfaa2f33ae jafama dependency changes 2021-07-13 11:22:50 -07:00
dfsek
9b6247dcb8 remove duplicate ioutils dependency 2021-07-13 11:05:44 -07:00
dfsek
113568da9b clean up snakeyaml dependency 2021-07-13 11:04:30 -07:00
dfsek
52295af5a7 clean up tectonic dependency 2021-07-13 10:59:53 -07:00
dfsek
43f77f1531 implement TreeLayer 2021-07-10 22:41:07 -07:00
dfsek
0ba02719c0 create FloraLayer 2021-07-10 22:37:59 -07:00
dfsek
9664e003c6 remove GlueList 2021-07-10 21:45:49 -07:00
dfsek
519956dc11 refactor implementation 2021-07-10 21:44:38 -07:00
dfsek
d09ef5052a correct link to ShadowJar issue 2021-07-10 21:19:57 -07:00
dfsek
3f539b1e30 bundle addons in JAR 2021-07-10 21:17:21 -07:00
dfsek
3dc564c0f7 move compiled addons to run directories 2021-07-09 13:06:29 -07:00
dfsek
f61883547e add gradle stuff to automatically build addons 2021-07-09 08:21:30 -07:00
dfsek
f8b0f03d11 compile structure addon 2021-07-09 06:58:46 -07:00
dfsek
d0c9145aad compile carver addon 2021-07-09 06:44:07 -07:00
dfsek
b36955a10a change addon IDs to reflect new module names 2021-07-08 23:29:28 -07:00
dfsek
40e28c5e4b move modules to better directory structure 2021-07-08 23:08:56 -07:00
dfsek
b609a0ba63 add stages to ConfigPackTemplate 2021-07-08 22:39:29 -07:00
dfsek
8dcd50d3fb BlockPopulator -> GenerationStage 2021-07-08 10:12:44 -07:00
dfsek
719ea83bcd populator registration 2021-07-08 09:54:18 -07:00
dfsek
6ca9ba029b clean up biome and structure things 2021-07-08 06:18:16 -07:00
dfsek
e1abc67989 clean up and annotate generic utils 2021-07-07 20:38:16 -07:00
Paul Vogel
b4ed874043
Fix spelling issues / typos in german translation 2021-07-07 23:10:43 +02:00
dfsek
6a1cc16dc3 load addon dependencies before pack manifest 2021-07-07 13:15:09 -07:00
dfsek
1ac903cf91 get or create chunk generator registry 2021-07-07 11:25:59 -07:00
dfsek
2f55206cf0 registered chunk generators in impl 2021-07-07 11:22:47 -07:00
dfsek
43395fef08 refactor to NoiseChunkGenerator3D 2021-07-07 10:58:44 -07:00
dfsek
99d64fec36 build chunk generator addon 2021-07-07 10:54:25 -07:00
dfsek
66a5cce399 create ChunkGeneratorProvider 2021-07-07 10:31:01 -07:00
dfsek
88dfb299a5 create chunk generator addon module 2021-07-07 07:56:33 -07:00
dfsek
25073199f0 correct some errors in carver and structure addons 2021-07-06 22:23:04 -07:00
dfsek
5c4ef3f23b implement biome pipeline addon 2021-07-06 21:50:52 -07:00
dfsek
9c3b6ea8bd compile biome pipeline addon 2021-07-06 21:31:34 -07:00
dfsek
7ca0be40dd Merge remote-tracking branch 'origin/master' into dev/addonification 2021-07-06 14:32:54 -07:00
dfsek
da26a1c54e bump minecraft version to 1.17.1 2021-07-06 14:29:58 -07:00
dfsek
01351883d1 use getOrCreateRegistry 2021-07-05 22:39:48 -07:00
dfsek
4acfeab948 getOrCreateRegistry 2021-07-05 21:56:14 -07:00
dfsek
04725698e8 use getCheckedRegistry where possible 2021-07-05 21:52:28 -07:00
dfsek
52a269b686 pull BiomeProviderBuilder out of BiomeProvider 2021-07-05 21:39:55 -07:00
dfsek
39f5aef0c5 noise addon + pack.yml noise functions 2021-07-05 20:35:39 -07:00
dfsek
b8e1e99b84 noise addon impl 2021-07-05 20:09:59 -07:00
dfsek
fe28fcedd1 fix addon registry stack overflow 2021-07-05 19:47:02 -07:00
dfsek
27a54101e7 make all util classes final 2021-07-05 19:31:26 -07:00
dfsek
7f1963a367 refactor ExceptionalConsumer 2021-07-05 19:24:02 -07:00
dfsek
6f8a7d6364 CheckedRegistry#addUnchecked -> #registerUnchecked 2021-07-05 19:22:45 -07:00
dfsek
9221a4f1ae CheckedRegistry#add -> #register 2021-07-05 19:22:21 -07:00
dfsek
d4a784ddb5 Registry#addChecked -> #registerChecked 2021-07-05 19:21:21 -07:00
dfsek
888e9e8def Registry#add -> #register 2021-07-05 19:20:47 -07:00
dfsek
a89b250765 refactor ProbabilityCollection and MaterialSet 2021-07-05 19:18:55 -07:00
dfsek
e7a2758722 PaletteHolderLoader 2021-07-05 16:38:49 -07:00
dfsek
d2298240ed fix probability collection loading 2021-07-05 15:25:05 -07:00
dfsek
dea12d3056 apply palette loader 2021-07-05 13:10:49 -07:00
dfsek
b4f464c428 terrascript addon impl 2021-07-05 02:23:18 -07:00
dfsek
7fcce19897 api to access Loader 2021-07-05 02:06:14 -07:00
dfsek
58a5160d53 api to access Loader 2021-07-05 02:05:26 -07:00
dfsek
9f37285c9a create TerraScriptAddon 2021-07-05 01:37:53 -07:00
dfsek
8213d23d72 compile terrascript 2021-07-05 01:36:24 -07:00
dfsek
fb63e38862 refactor terrascript 2021-07-05 01:29:19 -07:00
dfsek
d4d1a4434e terrascript module 2021-07-05 01:18:27 -07:00
dfsek
d8eeeded60 fix MaterialSet issues 2021-07-05 01:14:34 -07:00
dfsek
1a50060ff0 flora addon impl 2021-07-05 01:00:52 -07:00
dfsek
0441837b19 compile palette addon 2021-07-05 00:55:01 -07:00
dfsek
7c30437031 flora addon impl 2021-07-05 00:47:51 -07:00
dfsek
3da777459e compile flora addon 2021-07-05 00:43:17 -07:00
dfsek
32b0cd0b26 tree addon impl 2021-07-05 00:35:35 -07:00
dfsek
1ad08a599d compile tree addon 2021-07-05 00:30:53 -07:00
dfsek
1777dc1aca ore addon impl 2021-07-05 00:18:51 -07:00
dfsek
3ea6724e6c build ore addon 2021-07-05 00:13:23 -07:00
dfsek
25339ca4ef working biome config addon 2021-07-05 00:02:48 -07:00
dfsek
3364a75cec build biome config addon 2021-07-04 23:11:08 -07:00
dfsek
19d482f249 cleanup and config registering 2021-07-04 21:51:18 -07:00
dfsek
2b2aa493b1 compile Fabric 2021-07-04 21:34:59 -07:00
dfsek
54f4722297 implementation compiles now 2021-07-04 19:59:46 -07:00
ishland
f1845b1ecd Made requested changes 2021-07-04 13:41:56 +08:00
ishland
f2946d85aa Fix fabric development environment launch 2021-07-04 00:15:53 +08:00
dfsek
e9dc7d3db6 fix some refactor errors 2021-07-02 10:49:17 -07:00
dfsek
5c66dd4f17 refactor structures 2021-07-02 10:17:31 -07:00
dfsek
46c6113020 refactor trees 2021-07-02 10:05:26 -07:00
dfsek
bff7e44984 refactor ores 2021-07-02 09:58:12 -07:00
dfsek
7834509390 more modules 2021-07-02 09:50:34 -07:00
dfsek
8ff022cbc8 palette refactors 2021-07-02 09:50:15 -07:00
dfsek
6755054c97 refactor flora stuff 2021-07-02 09:36:24 -07:00
dfsek
62520af8e7 move more things to new modules 2021-07-02 07:44:30 -07:00
dfsek
215a1e0e86 more addonification progress 2021-06-30 21:29:19 -07:00
dfsek
8a000137a2 more addon modules 2021-06-30 12:30:44 -07:00
dfsek
f4873f7569 noise addon compiles now 2021-06-30 10:48:51 -07:00
dfsek
445bf3d053 refactor Vector2 2021-06-30 10:47:51 -07:00
dfsek
bf5e8d903c put vector3 in class in API 2021-06-30 10:39:03 -07:00
dfsek
abd3683a49 create noise addon module 2021-06-29 19:48:23 -07:00
dfsek
22c97ca390 refactor addon loader to new module 2021-06-29 19:34:54 -07:00
dfsek
9880f488e5 implementation depends on loaders (for now) 2021-06-29 19:23:31 -07:00
dfsek
7cd60d6d4e set up modules for addon/config loaders 2021-06-29 19:21:12 -07:00
dfsek
ca3a9180be sort of working fabric impl 2021-06-29 19:10:13 -07:00
dfsek
bce7a181bd property based block data implementation 2021-06-26 02:17:31 -07:00
dfsek
43307b737c refactor block state package 2021-06-25 20:51:38 -07:00
dfsek
4ecb08619f refactor block entity package 2021-06-25 20:30:55 -07:00
dfsek
edb5e316ba more properties 2021-06-25 20:30:19 -07:00
dfsek
a3cbf9a945 BlockData -> BlockState 2021-06-25 19:13:42 -07:00
dfsek
002c7037f1 basic property interfaces 2021-06-25 19:12:43 -07:00
dfsek
3386570439 BlockState -> BlockEntity 2021-06-25 19:12:23 -07:00
dfsek
d880d95637 Location is gone. 2021-06-25 13:47:56 -07:00
dfsek
966e1eb2a6 imports 2021-06-25 13:33:43 -07:00
dfsek
56029851f0 begin removing Location 2021-06-25 13:27:56 -07:00
dfsek
4306b179bb fix Vector3Impl#equals 2021-06-25 07:57:17 -07:00
dfsek
cbb746c752 fix bukkit impl 2021-06-25 06:30:29 -07:00
dfsek
da0fb7dd15 fix world coordinate issues on Fabric 2021-06-25 00:45:24 -07:00
dfsek
ff4cbda294 fix flora issue 2021-06-24 23:48:28 -07:00
dfsek
9fa660409d sort of working fabric implementation 2021-06-24 23:41:08 -07:00
dfsek
dc1f1a0339 compile Fabric 2021-06-24 19:19:44 -07:00
dfsek
ab9f98994d Merge remote-tracking branch 'origin/ver/6.0.0' into ver/6.0.0 2021-06-24 15:02:56 -07:00
dfsek
03ecf6197a implementation compilation 2021-06-24 14:53:57 -07:00
dfsek
0acff143fb
Merge pull request #229 from ajgeiss0702/ver/6.0.0
Remove bukkit-style biome IDs
2021-06-24 13:48:06 -07:00
ajgeiss0702
c4de7e578a Remove bukkit-style biome IDs 2021-06-24 13:27:10 -07:00
dfsek
18d071128d remove Block from API 2021-06-24 08:25:50 -07:00
dfsek
255e4396dd refactor registries 2021-06-24 08:16:15 -07:00
dfsek
c26f4dfc2f remove redundant openregistry implementations 2021-06-24 06:59:59 -07:00
dfsek
9838a4ce0b
Merge pull request #228 from Astrashh/astrash/bonk-hardcoded-flora
Remove hardcoded flora registry entries
2021-06-24 06:22:02 -07:00
Astrashh
cf30f3d067 Remove hardcoded flora registry entries 2021-06-24 21:38:07 +10:00
dfsek
4bac67b8d7 fix imports 2021-06-24 00:19:18 -07:00
dfsek
c0b55c3e4e undeprecate Location and Block, will deal with them in separate PRs 2021-06-24 00:05:06 -07:00
dfsek
f69fdbe37e fix EntityMixin 2021-06-23 23:59:38 -07:00
dfsek
918ff28ed4 bukkit pass 2 2021-06-23 15:56:41 -07:00
dfsek
2906a4f891 fabric pass 2 2021-06-23 15:35:52 -07:00
dfsek
d4d2b659dc fabric pass 1 2021-06-23 14:53:00 -07:00
dfsek
89657e362a implementation pass 1 2021-06-23 13:33:59 -07:00
dfsek
9631b1b578 begin work on impl 2021-06-23 13:18:16 -07:00
dfsek
f380247613 API compiles now 2021-06-23 12:43:16 -07:00
dfsek
686680d731 location garbage 2021-06-23 12:03:17 -07:00
dfsek
e34e2dd0b2 cleanup 2021-06-23 10:48:57 -07:00
dfsek
24b8fc859c more refactors, create platform module 2021-06-23 10:39:37 -07:00
dfsek
506f59f8af fix Range 2021-06-23 10:22:19 -07:00
dfsek
fa0bd103f3 minor cleanup 2021-06-23 10:13:50 -07:00
dfsek
a5f879ae7a ConfigPack interfaceification 2021-06-23 10:09:55 -07:00
dfsek
bb888380aa more refactors 2021-06-23 10:05:29 -07:00
dfsek
7495a6b4a1 begin refactor 2021-06-23 09:42:17 -07:00
dfsek
cf214cc274 split common 2021-06-22 23:56:34 -07:00
dfsek
10f633be9a resolve merge conflicts 2021-06-22 22:09:46 -07:00
dfsek
43aa3fc086 Merge remote-tracking branch 'origin/master' into ver/6.0.0
# Conflicts:
#	build.gradle.kts
#	common/src/main/java/com/dfsek/terra/api/world/palette/holder/PaletteHolder.java
#	common/src/main/java/com/dfsek/terra/api/world/palette/holder/PaletteHolderBuilder.java
#	common/src/main/java/com/dfsek/terra/config/builder/GeneratorBuilder.java
#	common/src/main/java/com/dfsek/terra/config/pack/ConfigPack.java
#	common/src/main/java/com/dfsek/terra/config/templates/BiomeTemplate.java
#	common/src/main/java/com/dfsek/terra/config/templates/OreTemplate.java
#	gradle.properties
#	platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraFabricPlugin.java
#	platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/FabricChunkGeneratorWrapper.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/TerraForgePlugin.java
2021-06-22 21:59:27 -07:00
dfsek
efd1665c1d
Merge pull request #222 from PolyhedralDev/dev/bukkit-1.17
bukkit version 1_17
2021-06-19 14:07:09 -07:00
dfsek
40e950732b bukkit version 1_17 2021-06-19 14:05:06 -07:00
dfsek
b15ec9a215
Merge pull request #221 from PolyhedralDev/dev/bukkit-1.17
Bump Paper API version to 1.17, implement custom world height support on Bukkit.
2021-06-19 13:55:43 -07:00
dfsek
2316043c1e implement BukkitWorld#getMinHeight 2021-06-19 13:47:51 -07:00
dfsek
ec20387aea update dependency versions 2021-06-19 13:39:43 -07:00
dfsek
85e4c0eca1
Merge pull request #217 from PolyhedralDev/dev/late-inject
Inject biomes later, fix getHeight issues (again)
2021-06-19 13:26:29 -07:00
dfsek
fa01c47f43 fix re-registering issue 2021-06-19 13:25:20 -07:00
dfsek
b85880fc92 server only mixins 2021-06-18 14:11:25 -07:00
dfsek
d5dc37629e fabric lifecycle api 2021-06-18 14:08:27 -07:00
dfsek
b3e2685564 init biomes on server 2021-06-18 12:18:08 -07:00
dfsek
b948202ef2 cleanup FabricChunkGeneratorWrapper 2021-06-18 09:07:56 -07:00
dfsek
9ba544bf71 dont hold static biomes 2021-06-17 00:07:06 -07:00
dfsek
82dfe652e0 bump version 2021-06-15 02:03:42 -07:00
dfsek
392ad207d9 use getUngeneratedBlock in getColumnSample 2021-06-15 01:58:46 -07:00
dfsek
01e47b0bab fix getHeight crash 2021-06-15 01:56:23 -07:00
dfsek
c7cbf11631 override ChunkGenerator#getEntitySpawnList 2021-06-15 01:42:53 -07:00
dfsek
afdb4fbfa2 late init biomes 2021-06-15 01:37:28 -07:00
dfsek
ef8a5b1453
Merge pull request #215 from PolyhedralDev/dev/multi-inheritance
Implement multi-inheritance in configs
2021-06-14 22:18:12 -07:00
dfsek
1f56673c77 add parent info to BiomeInfoCommand 2021-06-13 13:58:22 -07:00
dfsek
0ad0355250 bump version 2021-06-13 13:24:32 -07:00
dfsek
8d3b3c7024 remove extends value from biome config 2021-06-13 13:23:58 -07:00
dfsek
b63ea99167 bump tectonic version 2021-06-13 12:41:52 -07:00
dfsek
33288c057c
Merge pull request #210 from PolyhedralDev/fabric/1.17-dev
1.17 implementation
2021-06-08 10:21:08 -07:00
dfsek
6027c282ab 1.17 full release 2021-06-08 10:17:39 -07:00
dfsek
0068f69982 move chunkified populators to earlier generation stage 2021-06-07 21:54:01 -07:00
dfsek
9df379644b DeformedSphereOre height corrections 2021-06-07 21:13:04 -07:00
dfsek
492939b5d1 correct max_y = 255 assumption 2021-06-07 20:30:46 -07:00
dfsek
20d45a4b1e 1.17 pre-2 2021-06-07 14:33:54 -07:00
dfsek
db70b6c88c correct args of zero arg function 2021-06-07 01:07:53 -07:00
dfsek
1cee01a36c material override ore config options 2021-06-05 16:06:10 -07:00
dfsek
a9c252f91c 1.17 rc1 2021-06-05 00:58:05 -07:00
dfsek
86ad5b5041 1.17 pre3 2021-06-01 23:25:39 -07:00
solo
c1c2ab6df8
General repository maintenance. (#94)
* Fixes #93

Add pull request and issue templates.

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>

* Add CODEOWNERS file

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>

* Fix yaml issues

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>

fix yaml??

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>

Fix name of issue template.

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>

* Testing if I can do this with prs too

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>

Can I do this with pr templates too??

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>

Can I do this with pr templates too??

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>

Can I do this with pr templates too??

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>

* Move PULL_REQUEST_TEMPLATE/PULL_REQUEST.md to PULL_REQUEST_TEMPLATE.md, because github :poob:

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>

* I don't think I can... oof.

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>

* Oops, forgot to add this link.

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>

* Perform requested changes

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>

* Forgot one

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>

* Server software -> Platform & Merge platform + platform version

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>

* Inclusion of "addon" in language

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>

* compat with other terrain gen mods

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>

* inclusion of "addon" in FEATURE_REQUEST.md

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>

* Update CODEOWNERS

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>

* add discord link to config.yml

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>

* update PULL_REQUEST_TEMPLATE.md to no longer use "plugin"

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>

* Reintroduce stacktrace section

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>

* be more specific about compat issues

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>

* modify CODEOWNERS

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>

* Add CODE_OF_CONDUCT.md

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>

* Repo: add CONTRIBUTING.md file

Add CONTRIBUTING.md file with some basic guidelines on how to get started contributing.

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>

* Repo: Update git commit types

Update git commit types in CONTRIBUTING.md and sort them.

Add new entries under "types of changes" for PULL_REQUEST_TEMPLATE.md.

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>

* Repo: Performed requested changes

forgot some stuff lol

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
2021-05-31 17:57:55 -07:00
dfsek
7061328cc7 1.17 pre2 2021-05-31 12:16:59 -07:00
dfsek
3f56da3a65 correct mixin compatibility level 2021-05-28 15:19:55 -07:00
dfsek
16fcf09c78 gradle 7 (temporarily remove Forge module) 2021-05-28 15:10:30 -07:00
dfsek
cba3388cb1 resolve merge conflicts 2021-05-28 14:50:24 -07:00
dfsek
94611913c3 Merge remote-tracking branch 'origin/master' into fabric/1.17-dev
# Conflicts:
#	platforms/fabric/build.gradle.kts
#	platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/FabricChunkGeneratorWrapper.java
#	platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/block/state/FabricBlockState.java
#	platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/block/state/FabricMobSpawner.java
#	platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/block/state/FabricSign.java
#	platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/features/PopulatorFeature.java
#	platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/handles/FabricWorld.java
#	platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/handles/chunk/FabricChunk.java
#	platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/handles/world/FabricSeededWorldAccess.java
#	platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/handles/world/FabricWorldAccess.java
#	platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/handles/world/FabricWorldHandle.java
#	platforms/fabric/src/main/resources/fabric.mod.json
#	platforms/fabric/src/main/resources/terra.accesswidener
#	platforms/fabric/src/main/resources/terra.mixins.json
2021-05-28 13:50:59 -07:00
dfsek
fa164e5281
Merge pull request #199 from PolyhedralDev/dev/forge-tweaks
Forge Tweaks
2021-05-22 21:48:12 -07:00
dfsek
ec3b0e5d04 implement vanilla mob override 2021-05-22 21:37:16 -07:00
dfsek
4c63c2681f implement ForgeChunkGeneratorWrapper#getBaseColumn 2021-05-22 21:34:28 -07:00
dfsek
dd661feaf1 implement dimension type injection/caching 2021-05-22 21:24:25 -07:00
dfsek
1f17bfff1b delegate strongholds to vanilla if vanilla structures are enabled 2021-05-22 21:12:44 -07:00
dfsek
809a0b375d implement identifier loader 2021-05-22 21:11:52 -07:00
dfsek
d55b3415ac implement structure locate override on Forge 2021-05-22 21:08:51 -07:00
dfsek
edcb818842 basic compatibility stuff on Forge 2021-05-22 18:03:34 -07:00
dfsek
1e429e1bb3 create forge compatibility configs 2021-05-22 17:11:50 -07:00
dfsek
3472859afb remove unused event handlers 2021-05-22 17:10:50 -07:00
dfsek
444324e7c6
Merge pull request #200 from Astrashh/astrash/tesf-anywhere
Remove script sub-directory requirement
2021-05-22 15:20:16 -07:00
Astrashh
4908c7bb73 Remove script sub-directory requirement 2021-05-22 23:10:47 +10:00
dfsek
26025ec276 remove unused class 2021-05-22 00:19:38 -07:00
dfsek
3b3905b513 mixin injection on client in forge 2021-05-21 23:36:20 -07:00
dfsek
ce3d09cf2e add background to pack selection GUI 2021-05-19 09:23:20 -07:00
dfsek
5dd00db8d2
Merge pull request #191 from PolyhedralDev/dev/fabric-compat
Options for mod compatibility on Fabric
2021-05-18 20:07:24 -07:00
dfsek
2dc7b50141 implement getColumnSample 2021-05-18 19:50:05 -07:00
dfsek
b2ebcc63aa Merge remote-tracking branch 'origin/dev/fabric-compat' into dev/fabric-compat 2021-05-18 18:26:34 -07:00
dfsek
f45bc0a0cc Merge remote-tracking branch 'origin/dev/fabric-compat' into dev/fabric-compat 2021-05-18 18:25:46 -07:00
dfsek
bbe53cbca3 fix height again 2021-05-18 18:25:31 -07:00
dfsek
7354155c52 bump version 2021-05-18 18:19:25 -07:00
dfsek
62b60fcdb3
Merge pull request #152 from Astrashh/dev/debug-enhancements
Debug enhancements (#149)
2021-05-18 17:59:53 -07:00
dfsek
c1acfee910
Merge pull request #189 from Shadowhackercz/master
Creating new locale for Czech
2021-05-18 17:56:31 -07:00
dfsek
5287323865 only inject carvers if vanilla.caves is enabled 2021-05-18 09:24:20 -07:00
dfsek
b09d0e42aa fix biome specific exclusions 2021-05-18 09:06:43 -07:00
dfsek
a3f14061dd fix structure location 2021-05-17 23:04:21 -07:00
dfsek
557098de17 use debug logger for feature info 2021-05-17 22:48:03 -07:00
dfsek
2fdb96a850 cleanup and add per-biome exclusions 2021-05-17 22:45:39 -07:00
dfsek
d93d064d97 fix getHeight 2021-05-17 20:50:27 -07:00
dfsek
ae76fb7dc4 use dimensiontype to get world 2021-05-17 20:16:32 -07:00
dfsek
2626afd066 override entity generation 2021-05-17 19:41:45 -07:00
dfsek
c0042cfb6b switch to DimensionType map 2021-05-17 19:39:46 -07:00
dfsek
a549d2ef34 move client init code to MinecraftClientMixin 2021-05-17 19:26:25 -07:00
dfsek
4aa20c32b8 fix fabric debuglogger 2021-05-17 17:35:56 -07:00
dfsek
ce7033b4ca filter out non-Terra biomes in TerraBiomeSource 2021-05-17 10:07:22 -07:00
dfsek
41a54f4b25 vanilla structures 2021-05-17 10:07:06 -07:00
dfsek
f96740f1fa refactor util classes 2021-05-17 08:38:03 -07:00
Shadowhacker
8844cd5069
Creating new locale for Czech
I've created a new localization file for Czech language
2021-05-17 03:53:07 +02:00
dfsek
800d846af4 carver and structure compatibility options 2021-05-16 16:47:17 -07:00
dfsek
95d50a0391 resolve merge conflicts 2021-05-16 00:42:29 -07:00
dfsek
5a83eab1fe Merge remote-tracking branch 'origin/master' into dev/fabric-compat
# Conflicts:
#	platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraFabricPlugin.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/TerraForgePlugin.java
2021-05-16 00:34:42 -07:00
dfsek
bac026a1f4
Merge pull request #187 from PolyhedralDev/dev/fabric-no-api
Remove dependency on Fabric API
2021-05-15 21:18:27 -07:00
dfsek
65482c493a remove dependency on Fabric API 2021-05-15 20:30:06 -07:00
dfsek
a05f837ca2
Merge pull request #183 from PolyhedralDev/dev/cleanup/gradleproperties
Update mod description and use Gradle properties so we dont forget some platforms if we change things in the future
2021-05-15 14:20:44 -07:00
dfsek
6fbb5d712e add license, wiki, source and issue URLs to properties 2021-05-14 23:30:36 -07:00
dfsek
2c9d195474 remove unused command from bukkit manifest 2021-05-14 23:09:21 -07:00
dfsek
b663d34320 add DESCRIPTION to processResources 2021-05-14 23:09:08 -07:00
dfsek
43095d0df1 add version stuff to plugin/mod manifests 2021-05-14 23:05:22 -07:00
dfsek
47e0dc862c add Terra description and mod ID to gradle.properties 2021-05-14 23:02:14 -07:00
dfsek
460b11b9c8
Merge pull request #182 from PolyhedralDev/dev/forge-mixins
Mixinify Forge implementation and fix several issues on Forge
2021-05-14 22:40:05 -07:00
dfsek
d974a72cb9 fix commands on forge 2021-05-14 22:36:55 -07:00
dfsek
e86f37fdfb Forge build hacks 2021-05-14 22:30:27 -07:00
dfsek
2ed120dc4c forge cleanup 2021-05-14 19:15:13 -07:00
dfsek
973ae785f4 Forge server fixes 2021-05-14 18:40:03 -07:00
dfsek
4835813e2e fix chunk generator reset on forge 2021-05-14 18:25:28 -07:00
dfsek
632409050b Merge remote-tracking branch 'origin/master' into dev/forge-mixins
# Conflicts:
#	gradle.properties
2021-05-14 17:47:50 -07:00
dfsek
9d991dbb97
Merge pull request #181 from PolyhedralDev/dev/fabric-worldedit
Implement WorldEdit integration for structure exporting on Fabric
2021-05-14 09:38:13 -07:00
dfsek
cddf7c20e4 bump version 2021-05-13 22:10:35 -07:00
dfsek
5fd2fc59f4 worldedit integration on Fabric 2021-05-13 21:28:49 -07:00
dfsek
97d7ccacbf add worldedit dependency 2021-05-13 18:15:07 -07:00
dfsek
242e56b1d8 conditional biome injection 2021-05-12 09:27:20 -07:00
dfsek
4c7aa11353 clean up TerraFabricPlugin 2021-05-12 08:39:43 -07:00
dfsek
cac84ffe03 fix typo 2021-05-12 00:55:14 -07:00
dfsek
cf66e1e226 registry injection 2021-05-12 00:53:25 -07:00
dfsek
fa647e1e2c make loadConfig less jank 2021-05-12 00:48:38 -07:00
dfsek
4203121d40 basic feature loading implementation 2021-05-12 00:33:00 -07:00
dfsek
82fe6d5aa4 add api to load custom values from pack manifest. 2021-05-12 00:09:21 -07:00
dfsek
32db83f091 remove NotNullValidator 2021-05-11 23:56:08 -07:00
dfsek
0ab949174a
Update README.md 2021-05-11 16:06:37 -07:00
dfsek
2bfaa95a81
add forge disclaimer to README 2021-05-11 16:03:32 -07:00
dfsek
96de1554f1 disable configureondemand 2021-05-11 15:56:53 -07:00
dfsek
f83dcd802c Merge remote-tracking branch 'origin/master' 2021-05-11 09:03:14 -07:00
dfsek
808aa50f5f update config.yml 2021-05-11 09:02:59 -07:00
dfsek
e00271e493
Merge pull request #162 from PolyhedralDev/dev/fabric-late-init
initialize later
2021-05-10 23:14:57 -07:00
dfsek
76bf245e16 type check ChunkGenerator in PopulatorFeature 2021-05-10 22:52:34 -07:00
Astrashh
9b52277d9a Add debugBlock function 2021-05-11 15:48:40 +10:00
Astrashh
1209842bcd Implement ignorable functions to parser 2021-05-11 15:48:28 +10:00
Astrashh
596ac1c389 Remove isDebug from forge 2021-05-11 15:47:37 +10:00
Astrashh
9551a1e875
Merge pull request #1 from PolyhedralDev/ver/6.0.0
Ver/6.0.0
2021-05-11 10:59:44 +10:00
dfsek
37e441206a fix getHandle overwrite conflicts and annotate getHandle methods as @Intrinsic. 2021-05-10 01:11:22 -07:00
dfsek
5376f7e22e fix server init 2021-05-10 01:03:13 -07:00
dfsek
77bb04e91f fix structure completer 2021-05-09 22:34:44 -07:00
dfsek
97aa9d9a91 resolve merge conflicts 2021-05-09 22:28:52 -07:00
dfsek
526049523f Merge remote-tracking branch 'origin/master' into ver/6.0.0
# Conflicts:
#	build.gradle.kts
#	common/src/main/java/com/dfsek/terra/api/TerraPlugin.java
#	common/src/main/java/com/dfsek/terra/api/structures/script/StructureScript.java
#	common/src/main/java/com/dfsek/terra/config/pack/ConfigPack.java
#	common/src/main/java/com/dfsek/terra/profiler/Profiler.java
#	common/src/main/java/com/dfsek/terra/profiler/ProfilerImpl.java
#	common/src/main/java/com/dfsek/terra/registry/OpenRegistry.java
#	common/src/main/java/com/dfsek/terra/world/generation/generators/DefaultChunkGenerator3D.java
#	common/src/main/java/com/dfsek/terra/world/population/FloraPopulator.java
#	common/src/main/java/com/dfsek/terra/world/population/OrePopulator.java
#	common/src/main/java/com/dfsek/terra/world/population/StructurePopulator.java
#	common/src/main/java/com/dfsek/terra/world/population/TreePopulator.java
#	common/src/test/java/biome/DistributionTest.java
#	common/src/test/java/biome/ImageTest.java
#	platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/population/PopulationManager.java
#	platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraFabricPlugin.java
#	platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/FabricTree.java
2021-05-09 22:20:47 -07:00
dfsek
1186fc6624 bump version 2021-05-05 15:24:55 -07:00
dfsek
a1b3680643 initialize later 2021-05-05 15:22:02 -07:00
dfsek
501399919f implement vanilla carver/structure options on Fabric & Forge (we will still yell at you if you use them) 2021-05-04 22:40:37 -07:00
dfsek
725d57d967 rename mixins for mojmap 2021-05-04 22:35:30 -07:00
dfsek
a821501392 refactor forge stuff 2021-05-04 22:09:50 -07:00
dfsek
d3458148bd default disable forge registry dump 2021-05-04 21:38:44 -07:00
dfsek
df4da810ec fix forge mixin issues 2021-05-04 21:37:36 -07:00
dfsek
8f47c84c8e fix forge builds 2021-05-04 21:29:07 -07:00
dfsek
f61a544a57 account for null ignored in StructureLocateEvent 2021-05-04 20:32:22 -07:00
dfsek
3217d66c69 forge mixins (probably dont work yet) 2021-05-04 19:22:10 -07:00
dfsek
fd48f5f110
Merge pull request #158 from PolyhedralDev/dev/fabric-locate
Override structure location on Fabric
2021-05-04 16:45:25 -07:00
dfsek
77a4c95c4a override structure location on Fabric 2021-05-04 16:44:43 -07:00
dfsek
dbc60b1d82
Merge pull request #153 from PolyhedralDev/dev/fabric-mixins
Implement Terra interfaces directly in Minecraft classes using Mixin.
2021-05-04 16:16:31 -07:00
dfsek
ed942bb997 update README.md 2021-05-04 16:13:05 -07:00
dfsek
6866084872 SignBlockEntityMixin cleanup 2021-05-04 16:10:37 -07:00
dfsek
4c77419dcd fix sign getText on server 2021-05-04 15:04:53 -07:00
dfsek
ecba6e0843 Merge remote-tracking branch 'origin/dev/fabric-mixins' into dev/fabric-mixins 2021-05-04 09:21:21 -07:00
dfsek
86dcb476f1 update README with modern build instructions and Forge download links 2021-05-04 09:21:12 -07:00
dfsek
13e0857882 merge FabricEnumAdapter into FabricAdapter 2021-05-03 22:49:21 -07:00
dfsek
bf93a9239c bump version 2021-05-03 22:28:01 -07:00
dfsek
2d18aab709 fix funky yaml formatting 2021-05-03 22:13:42 -07:00
dfsek
a1359da374 terrascript trig functions 2021-05-03 22:13:32 -07:00
dfsek
f7bda835f9 fix itemmeta application 2021-05-03 20:52:03 -07:00
dfsek
7595896831 fix refmap issues 2021-05-03 20:40:56 -07:00
dfsek
6614d19845 suppress warnings 2021-05-03 20:14:06 -07:00
dfsek
6209b86560 mixin maintenance 2021-05-03 20:12:48 -07:00
dfsek
a30859a3d4 dont try to remap Terra interfaces 2021-05-03 20:08:13 -07:00
dfsek
ddbb46289b add package-info.java to implementation mixin package. 2021-05-03 20:03:25 -07:00
dfsek
64c35a9609 refactor Fabric project 2021-05-03 20:02:08 -07:00
dfsek
f21069ab2e fix cache misses 2021-05-03 19:43:52 -07:00
dfsek
457729b832 replace most access wideners with mixins 2021-05-03 19:33:57 -07:00
dfsek
756f04a0b3 implement LockableContainerBlockEntityMixin 2021-05-03 18:38:40 -07:00
dfsek
5ee32cc3ba add ConfiguredFeatureMixin 2021-05-03 17:35:43 -07:00
dfsek
955558bc21 implement BlockMixin 2021-05-03 11:37:54 -07:00
dfsek
c43a872c23 finish blockstate mixins 2021-05-03 11:27:36 -07:00
dfsek
de41b92d5d add SignBlockEntityMixin 2021-05-03 10:27:40 -07:00
dfsek
03091230ed refactor mixins 2021-05-03 10:09:21 -07:00
dfsek
a8c88915ea override chunkregion hashcode 2021-05-02 23:39:40 -07:00
dfsek
4cd4720101 fix loot NPE 2021-05-02 23:08:54 -07:00
dfsek
3b9280b19c start work on state mixins 2021-05-02 23:00:21 -07:00
dfsek
2d27e07441 implement BiomeMixin 2021-05-02 22:49:57 -07:00
dfsek
20a5762d2e refactor mixins 2021-05-02 22:48:21 -07:00
dfsek
146f71f704 finish World mixins 2021-05-02 22:45:34 -07:00
dfsek
1d4b0bc100 cleanup 2021-05-02 22:26:23 -07:00
dfsek
138ee0a448 refactor fabric handles 2021-05-02 22:22:32 -07:00
dfsek
2c8cae9d45 create ChunkGeneratorMixin 2021-05-02 22:21:50 -07:00
dfsek
061d2b6493 implement EntityTypeMixin 2021-05-02 21:48:06 -07:00
dfsek
e71df936ab EnchantmentMixin 2021-05-02 21:35:39 -07:00
dfsek
f4253acb78 item mixins 2021-05-02 21:27:25 -07:00
dfsek
c12518fa49 delete FabricItem.java 2021-05-02 21:11:09 -07:00
dfsek
4704b2ebf7 implement ItemMixin 2021-05-02 21:10:48 -07:00
dfsek
89fdfdfb34 suppress warnings 2021-05-02 20:42:54 -07:00
dfsek
35d85f2aa3 PlayerEntityMixin and EntityMixin 2021-05-02 20:38:25 -07:00
dfsek
c0368f1c6d implement ServerCommandSourceMixin 2021-05-02 20:17:59 -07:00
dfsek
abc069046c add ProtoChunkMixin and WorldChunkMixin 2021-05-02 20:13:24 -07:00
dfsek
46d0b08068 implement ChunkRegionMixin 2021-05-02 19:49:59 -07:00
Astrashh
f7ea81cb51 Add new debug options to plugin config 2021-05-03 11:39:45 +10:00
dfsek
a7e3a0286e add -forge and -fabric to Modrinth version numbers. 2021-05-02 17:46:55 -07:00
dfsek
6da8924868
Merge pull request #145 from PolyhedralDev/dev/forge
Forge implementation
2021-05-02 17:38:56 -07:00
dfsek
d9dd6afe4b
Merge pull request #143 from solonovamax/improvement/better-gradle-performance
Improve gradle performance significantly
2021-05-02 17:37:36 -07:00
dfsek
dfec26f789 fix forge modrinth task 2021-05-02 17:21:05 -07:00
dfsek
d13be5e159 add Forge modrinth publish task 2021-05-02 17:16:03 -07:00
dfsek
51c5f70d64 forge jarfile nightmare "solution" 2021-05-02 17:08:59 -07:00
dfsek
05b1902c06
Merge pull request #151 from DJtheRedstoner/patch-mixin-ap
Fix mixin annotation processor issues
2021-05-02 15:47:32 -07:00
dfsek
f4ae2cac68 add MixinGeneratorOptions 2021-05-02 15:46:03 -07:00
dfsek
ea3995afce fix refmap name 2021-05-02 15:44:30 -07:00
dfsek
c41d60c38f remove manual refmap 2021-05-02 15:43:12 -07:00
DJtheRedstoner
19edcbddd5
Fix mixin annotation processor issues
These issues were caused by CompilationConfig.configureCompilation()
overwriting JavaCompile's options.compilerArgs list which removed any
previously added arguments, including those added by fabric-loom and
mixingradle.
2021-05-02 18:17:18 -04:00
dfsek
4f65555e82 remove mixins until annotation processor gets fixed. 2021-05-02 14:37:34 -07:00
dfsek
9956cab507 dont use vanilla registries 2021-05-01 22:21:27 -07:00
dfsek
fddf0c51b7 cleanup PopulationManager 2021-05-01 20:27:59 -07:00
dfsek
e2a52afb67 remove methods only used for cursed Bukkit stuff from common World interface. 2021-05-01 19:07:19 -07:00
dfsek
c8c3a33912 fix loot table issue 2021-05-01 18:40:31 -07:00
dfsek
b178f69e47 Merge remote-tracking branch 'origin/dev/forge' into dev/forge 2021-05-01 18:20:23 -07:00
dfsek
049a56fcb0 Mixin on Forge 2021-05-01 18:20:11 -07:00
solonovamax
2d41dd8f08
Don't use all cores processors for tests
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
2021-05-01 16:53:45 -04:00
solonovamax
aa9e33af1d
Remove old and deprecated compile configuration + some minor refactoring
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
2021-05-01 16:53:45 -04:00
dfsek
02870805c7 hoist calculations in chunk generator 2021-04-30 09:35:15 -07:00
dfsek
e493825ab7 bump version 2021-04-30 09:25:56 -07:00
dfsek
762b248641 update to latest Tectonic 2021-04-29 23:42:56 -07:00
dfsek
f81ccee020 cleanup 2021-04-29 23:31:03 -07:00
dfsek
3561e5f30f commands on Forge 2021-04-29 23:19:49 -07:00
dfsek
c67817b9d2 fix structure issues 2021-04-29 22:00:40 -07:00
dfsek
756619edb6 Forge actually loads to worlds now 2021-04-29 21:48:32 -07:00
dfsek
ee1c889d54 world screen type 2021-04-29 21:11:26 -07:00
dfsek
9f3dcf07b6 Pack loading on Forge 2021-04-29 20:30:48 -07:00
dfsek
93a2f103f7 add pack.mcmeta 2021-04-29 16:41:14 -07:00
dfsek
3ea12ceeab start implementing terraplugin 2021-04-29 12:30:17 -07:00
dfsek
ce8ec51ae4 forge actually loads now 2021-04-29 12:24:29 -07:00
dfsek
54bb4ef109 sort of working Forge project 2021-04-29 01:55:24 -07:00
dfsek
59b655ce5d working forge buildscript 2021-04-29 01:27:28 -07:00
dfsek
9ea8dc7eee
Merge pull request #141 from Astrashh/dev/slant-list
Implement multiple slant thresholds (#91)
2021-04-29 00:51:56 -07:00
Astrashh
df2c654192 Only calculate slope if slant is defined 2021-04-29 16:42:00 +10:00
solonovamax
4c1e1bb7d5
Improve gradle performance significantly
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
2021-04-28 20:43:53 -04:00
Astrashh
5542dee7b7 Implement multiple slant thresholds 2021-04-29 10:03:04 +10:00
dfsek
eee54f507e
Merge pull request #138 from PolyhedralDev/dev/profilerimpl
Fancy stack-based profiler
2021-04-26 21:32:42 -07:00
dfsek
6f1b1611ab fix dumb gradle issue 2021-04-26 21:26:44 -07:00
dfsek
205499220d profile more things 2021-04-26 20:59:21 -07:00
dfsek
a0c5631eba bump version 2021-04-26 20:46:36 -07:00
dfsek
9323abc788 document Profiler 2021-04-26 19:04:20 -07:00
dfsek
632f898dc8 implement Profiler#reset 2021-04-26 19:01:53 -07:00
dfsek
8737b0d984 resolve merge conflict 2021-04-25 17:12:42 -07:00
dfsek
bcb68853d5 @SuppressWarnings go brrr 2021-04-25 17:11:50 -07:00
dfsek
8823d6d65e fix stack size assumption at profiler start 2021-04-25 17:11:50 -07:00
dfsek
5d3a2b6e84 profile more things 2021-04-25 17:11:50 -07:00
dfsek
23fb7753ab fancy unicode symbols B) 2021-04-25 17:11:50 -07:00
dfsek
f8e7e343cb fix % parent issue 2021-04-25 17:11:50 -07:00
dfsek
e5f4c5dc8d implement terrascript profiling 2021-04-25 17:11:49 -07:00
dfsek
8a10867e5f implement new profiler 2021-04-25 17:11:04 -07:00
dfsek
da366a75e8 add autocloseable option 2021-04-25 17:09:08 -07:00
dfsek
eb4bf74cc6 implement TerraPlugin#getProfier 2021-04-25 17:09:08 -07:00
dfsek
168c0ced13 improve performance in deep operations 2021-04-25 17:09:07 -07:00
dfsek
5d4bdb431b improve data output 2021-04-25 17:09:07 -07:00
dfsek
40188c671f basic profiler implementation 2021-04-25 17:09:07 -07:00
dfsek
f396e0e5eb
Merge pull request #133 from PolyhedralDev/ver/5.1.4
Fix minor Fabric issues
2021-04-16 09:01:29 -07:00
dfsek
942a8c9c8b
Merge pull request #131 from xieve/fix-disable-config
Fixed populator disable config (#130)
2021-04-15 10:29:20 -07:00
dfsek
414dcdae3e use vanilla delegate spawn rules 2021-04-15 10:20:14 -07:00
dfsek
1195a6676f implement getHeight on Fabric 2021-04-15 10:00:22 -07:00
dfsek
5501f53056 implement TerraFabricPlugin#getWorld(long) 2021-04-15 09:59:13 -07:00
xieve
41d6e1c648 Fixed populator disable config (#130) 2021-04-15 18:18:27 +02:00
dfsek
5397df57b8
Merge pull request #125 from PolyhedralDev/dev/profiler
Implement fancy stack-based profiler
2021-04-12 09:30:26 -07:00
dfsek
aa0de88821 @SuppressWarnings go brrr 2021-04-12 09:23:02 -07:00
dfsek
bd3136ca92 fix stack size assumption at profiler start 2021-04-12 09:19:03 -07:00
dfsek
339413c0de profile more things 2021-04-12 08:46:56 -07:00
dfsek
31b55ca682 fancy unicode symbols B) 2021-04-12 01:16:26 -07:00
dfsek
aaf0830d66 fix % parent issue 2021-04-12 00:46:00 -07:00
dfsek
f78ee70609 implement terrascript profiling 2021-04-12 00:45:52 -07:00
dfsek
9c1a35f444 implement new profiler 2021-04-12 00:24:13 -07:00
dfsek
f4716cb28f add autocloseable option 2021-04-12 00:07:22 -07:00
dfsek
b3e3c28276 implement TerraPlugin#getProfier 2021-04-12 00:05:53 -07:00
dfsek
4eadbb7d83 improve performance in deep operations 2021-04-11 23:24:44 -07:00
dfsek
7b3b341627 improve data output 2021-04-11 23:08:32 -07:00
dfsek
89267ce8cb basic profiler implementation 2021-04-11 22:54:55 -07:00
dfsek
78e3575d9b
Merge pull request #118 from PolyhedralDev/dev/directories
Remove hard-coded registries, allow addons to register custom config types, remove strict directory requirements
2021-04-11 21:26:36 -07:00
dfsek
e671ef783f completely dynamic registries 2021-04-11 20:56:15 -07:00
dfsek
91144dc8f8 Merge remote-tracking branch 'origin/master' into dev/directories
# Conflicts:
#	build.gradle.kts
2021-04-11 18:57:33 -07:00
dfsek
5ac7257517
Merge pull request #119 from PolyhedralDev/ver/5.1.3
Fix Fabric Physics, add "dead" entry checking to registries.
2021-04-11 18:56:25 -07:00
dfsek
9f4f9702a6 bump version 2021-04-11 17:54:07 -07:00
dfsek
01d169256e properly relocate dependencies 2021-04-11 17:49:39 -07:00
dfsek
7a703ad091 add publication config to Fabric 2021-04-11 14:15:13 -07:00
dfsek
4202875675 dynamic registris in WorldConfig 2021-04-11 03:15:44 -07:00
dfsek
4237657dad remove most hard coded registries 2021-04-11 02:39:21 -07:00
dfsek
75cb6be36f resolve merge issues 2021-04-11 00:53:21 -07:00
dfsek
88a7397bbe Merge branch 'ver/5.1.3' into dev/directories
# Conflicts:
#	common/src/main/java/com/dfsek/terra/config/pack/ConfigPack.java
#	common/src/main/java/com/dfsek/terra/registry/OpenRegistry.java
2021-04-11 00:51:51 -07:00
dfsek
ce9273c7e8 proper fluid updating on Fabric 2021-04-11 00:45:53 -07:00
dfsek
653a414ac1 should(tm) fix fabric physics 2021-04-10 23:49:02 -07:00
dfsek
2080db21ca warn about dead registry entries when debug mode is enabled 2021-04-10 19:22:41 -07:00
dfsek
a6a1810b4a bump version 2021-04-05 17:08:57 -07:00
dfsek
da4aebe498 fix parser EOF NPE 2021-04-05 17:08:50 -07:00
dfsek
03ebafc7b6 working config loading 2021-04-05 12:26:54 -07:00
dfsek
a78e64a9bb rename ore "type" to "algorithm" 2021-04-05 09:59:52 -07:00
dfsek
6374b0ab08 add ConfigPack#getConfigTypeRegistry 2021-04-05 09:52:47 -07:00
dfsek
473ed45dee add config type registry to ConfigPack loader registry 2021-04-05 09:50:07 -07:00
dfsek
d96d834a08 redo ConfigType and loading 2021-04-05 09:48:11 -07:00
dfsek
f756ebef44 fix unhandled exception 2021-04-05 01:36:39 -07:00
dfsek
e6931a53d6 basic implementation 2021-04-05 01:31:22 -07:00
dfsek
58b5f3a5fe bump Tectonic version 2021-04-05 00:27:58 -07:00
dfsek
8a933609ee
Merge pull request #107 from PolyhedralDev/ver/5.1.2
5.1.2 LootPopulateEvent patch
2021-04-01 15:14:14 -07:00
dfsek
ba4a50e234 add getStructureScript method to LootPopulateEvent 2021-04-01 15:03:48 -07:00
dfsek
f8e8ce8bc2
Bump version 2021-03-31 20:50:17 -07:00
dfsek
0013d4e682
Merge pull request #106 from PolyhedralDev/ver/5.1.2
Add LootPopulateEvent and EntitySpawnEvent
2021-03-31 20:49:44 -07:00
dfsek
9a97f1178d release modrinth to beta channel 2021-03-31 08:34:17 -07:00
dfsek
e6a551d84d add getter/setter for loot table in LootPopulateEvent 2021-03-30 09:23:21 -07:00
dfsek
92921430d8 add EntitySpawnEvent 2021-03-30 00:27:16 -07:00
dfsek
20c905aae4 add LootPopulateEvent 2021-03-30 00:19:32 -07:00
dfsek
ec0730ef73 test commit so version is different B) 2021-03-29 21:14:34 -07:00
dfsek
e4576b3405 Add modrinth publish task 2021-03-29 21:09:36 -07:00
dfsek
c5800970a8 i totally didnt forget to bump version 2021-03-29 16:39:10 -07:00
dfsek
8f88b1c156
Merge pull request #101 from PolyhedralDev/ver/5.1.1
API to add populators, Buildscript improvements
2021-03-29 16:26:59 -07:00
dfsek
1360994a67 Add options to disable default populators 2021-03-29 11:56:16 -07:00
dfsek
e00b28d27e remove sysout 2021-03-29 10:07:25 -07:00
dfsek
c5ff5c101d custom biome color configuration 2021-03-29 09:52:54 -07:00
dfsek
b1a1001c49 clean up buildscripts 2021-03-26 08:50:58 -07:00
dfsek
77d5162e73 add API for addons to register populators 2021-03-23 11:40:22 -07:00
dfsek
709180de13 multithread structure and cave population 2021-03-21 22:25:19 -07:00
dfsek
5182651947 multithreaded chunk gen 2021-03-18 17:31:36 -07:00
dfsek
7f33fb20ed remove other assumptions that world bottom is y=0 2021-03-17 21:50:59 -07:00
dfsek
c9f49fb06f fix palettes below y=0 2021-03-17 21:22:04 -07:00
dfsek
d065f78c0a mostly working 1.17-ification 2021-03-17 21:17:15 -07:00
dfsek
2e8cd54ac2
Merge pull request #96 from PolyhedralDev/ver/5.1.0
Address several issues
2021-03-17 10:53:32 -07:00
dfsek
28222c074e bump version 2021-03-16 22:29:13 -07:00
dfsek
1b70766a17 remove legacy fractal trees (will be available in an addon) 2021-03-16 21:49:08 -07:00
dfsek
cda2d4688c implement DynamicBlockFunction 2021-03-16 21:20:02 -07:00
dfsek
5028582198 add smart waterlog 2021-03-16 21:04:56 -07:00
dfsek
5458564cfa fix CommandTest issues 2021-03-16 11:06:58 -07:00
dfsek
7f11373f75
Merge pull request #80 from PolyhedralDev/ver/5.0.0
Addon loader, fleshed out addon API, and Fabric finalization
2021-03-16 10:45:42 -07:00
dfsek
f9ca8d139b fix ExpressionFunction issue 2021-03-16 09:09:30 -07:00
dfsek
6f287a1894 use LinkedHashMap for loading functions to preserve order 2021-03-15 23:24:49 -07:00
dfsek
6f4251796e optimize ores and sampling 2021-03-15 21:15:53 -07:00
dfsek
5ad349e350 document event API 2021-03-14 23:54:10 -07:00
dfsek
ec4e0694a4 add structure locate command 2021-03-14 16:45:32 -07:00
dfsek
6ab8cd5b5b fix mushrooms on fabric 2021-03-14 16:30:27 -07:00
dfsek
b3868bd750 allow paralithic expressions to be defined in expression samplers 2021-03-13 15:18:25 -07:00
dfsek
ff8181bbfa fix function loading issues 2021-03-13 14:48:02 -07:00
dfsek
074ad44bca add Gabor noise 2021-03-11 19:03:57 -07:00
dfsek
9a6c34a2d5 fix fabric teleportation issues 2021-03-10 16:33:55 -07:00
dfsek
ce3c0f105e more specific duplicate ID message 2021-03-10 16:26:15 -07:00
dfsek
58162027a9 specify problematic addon class 2021-03-10 16:21:04 -07:00
dfsek
39400cce0a
Merge pull request #89 from PolyhedralDev/dev/commands
Platform-agnostic command API
2021-03-10 16:16:40 -07:00
dfsek
819d795c23 Fabric cleanup 2021-03-10 16:16:11 -07:00
dfsek
d6b5f60b18 implement Bukkit-specific commands 2021-03-10 16:08:25 -07:00
dfsek
1f16a82a8d implement GeometryCommands 2021-03-10 16:02:25 -07:00
dfsek
51fa58b481 add command main-menu messages 2021-03-10 15:52:20 -07:00
dfsek
bed8c561a4 add "usage" to all commands 2021-03-10 15:33:38 -07:00
dfsek
fdb2441b1a export command 2021-03-10 15:28:50 -07:00
dfsek
bf5be91868 clean up WorldHandle, add generic utility classes 2021-03-10 15:20:17 -07:00
dfsek
06956a7a2d fix command NPEs on invalid IDs 2021-03-10 03:20:34 -07:00
dfsek
a584ac2401 Bukkit command cleanup/fixes 2021-03-10 03:03:04 -07:00
dfsek
513c6a647f Bukkit command cleanup 2021-03-10 02:54:03 -07:00
dfsek
5a85aced45 BiomeInfoCommand 2021-03-10 02:50:40 -07:00
dfsek
41933b84a0 implement entity teleportation and biome locate 2021-03-10 02:46:00 -07:00
dfsek
67aae87754 work on fabric commands 2021-03-10 01:57:01 -07:00
Daniil Z
13346daa6a
Russian translation (#88)
* Russian translation

* Move file to commons
2021-03-09 23:30:14 -07:00
dfsek
5e9b841cac trigger block re-render on Fabric 2021-03-09 23:20:47 -07:00
dfsek
5820fe1db3 fix imageloader issue 2021-03-09 20:05:52 -07:00
dfsek
f5c0174473 more command stuff 2021-03-09 20:05:42 -07:00
dfsek
31b583910e fabric command fixes 2021-03-09 03:48:26 -07:00
dfsek
fac4cb43a8 cleanup fabric commands 2021-03-09 03:15:43 -07:00
dfsek
0f39d64d72 sort of working Fabric commands 2021-03-09 03:07:02 -07:00
dfsek
5fc012f7ba injection for argumentparser 2021-03-08 23:56:58 -07:00
dfsek
f773ca2322 ArgumentTarget and SwitchTarget 2021-03-08 23:56:06 -07:00
dfsek
52c56af02c tab completion 2021-03-08 03:17:22 -07:00
dfsek
22d6fdf293 add tab completion 2021-03-08 02:27:35 -07:00
dfsek
b1256427a2 basic bukkit implementation 2021-03-08 01:40:12 -07:00
dfsek
026a6066d3 implement switches 2021-03-08 00:52:57 -07:00
dfsek
0cd5898107 fix child command issues 2021-03-08 00:38:52 -07:00
dfsek
a5d101ff61 fix child command issues 2021-03-08 00:38:52 -07:00
dfsek
c1b04d1772 argument parsing 2021-03-08 00:14:19 -07:00
dfsek
0d58201e3f mock command API 2021-03-07 23:44:19 -07:00
dfsek
939121dea6
Merge pull request #87 from PolyhedralDev/dev/fabric
Fabric stuff
2021-03-07 23:42:01 -07:00
dfsek
c44d26cc18 loom is pain 2021-03-07 21:41:13 -07:00
dfsek
c047209b86 manually create terra-refmap.json because loom is dumb 2021-03-06 22:26:13 -07:00
dfsek
f989e4dc89 fix fabric mixin stuff 2021-03-06 11:37:28 -07:00
dfsek
c8c3ab312b separate generator and GeneratorWrapper 2021-03-06 10:05:11 -07:00
dfsek
dc52dd635b update README.md 2021-03-03 15:59:26 -07:00
dfsek
4e97ba6da9 Merge remote-tracking branch 'origin/ver/5.0.0' into ver/5.0.0 2021-03-03 13:42:22 -07:00
dfsek
c0d26256af fix typo 2021-03-03 13:42:15 -07:00
dfsek
7828de74aa work on loom stuff 2021-03-02 00:30:26 -07:00
dfsek
01396e739c
Merge pull request #84 from PolyhedralDev/dev/world-maps
World specific config pack instances
2021-03-01 18:41:30 -07:00
dfsek
e4c1a056ae fix server issues 2021-03-01 17:20:19 -07:00
dfsek
613e9c0c54 fabric ID fix 2021-03-01 16:54:56 -07:00
dfsek
c5a174ba7a remove sys.out 2021-03-01 16:49:32 -07:00
dfsek
72296cf960 cleanup 2021-03-01 16:45:27 -07:00
dfsek
265449c5a7 fix ProbabilityCollection map issues 2021-03-01 16:43:14 -07:00
dfsek
1125b498ec remove unneeded generic from BiomeBuilder 2021-03-01 15:39:10 -07:00
dfsek
a28f3fa660 working WorldConfig impl 2021-03-01 15:20:09 -07:00
dfsek
5a6b7ac4c1 begin work on WorldConfig stuff
This doesn't compile right now. A lot of work needs to be done.
2021-03-01 09:58:18 -07:00
dfsek
7f988dcf26 implement FabricDirectional 2021-02-25 01:43:01 -07:00
dfsek
7c177d568b implement FabricRotatable 2021-02-25 01:33:10 -07:00
dfsek
12af19edba fabric entities 2021-02-25 01:21:28 -07:00
dfsek
924bc6e469 Fabric Enchantments 2021-02-25 00:57:36 -07:00
dfsek
4569a9ed13 working damage 2021-02-25 00:45:25 -07:00
dfsek
4ca2f0c08d fabric inventory stuff 2021-02-24 23:46:43 -07:00
dfsek
4a47815be7 remove assumption that world starts at Y=0 2021-02-24 19:49:39 -07:00
dfsek
dd446b3034 add HPROF to ignored files 2021-02-24 14:12:30 -07:00
dfsek
0fcc0f798c fabric cleanup, move lang and config to common 2021-02-24 13:59:25 -07:00
dfsek
1637644bdd accesswideners B) 2021-02-24 13:14:21 -07:00
dfsek
2b114f225e bump version 2021-02-24 09:54:20 -07:00
dfsek
32746e8dd9 target 1.16.5 for Fabric 2021-02-24 09:40:56 -07:00
dfsek
d29c1e572e basic Fabric pack selection 2021-02-24 09:17:44 -07:00
dfsek
bb6dcb3880 fix structure buffer weirdness 2021-02-24 08:51:42 -07:00
dfsek
3c56813d6b cursed #equals 2021-02-24 02:00:47 -07:00
dfsek
5c0482e972 more fabric stuff 2021-02-24 01:33:19 -07:00
dfsek
83f981111a remove debug stuff 2021-02-23 22:36:29 -07:00
dfsek
4171768cc9 semi working fabric inventories 2021-02-23 22:33:08 -07:00
dfsek
df2acfaa40 FabricMobSpawner 2021-02-23 20:44:40 -07:00
dfsek
533380107b working FabricSign 2021-02-23 17:29:39 -07:00
dfsek
9c2b844290 preparations for Sponge API8 2021-02-23 15:57:27 -07:00
dfsek
98c1fea7fd more fabric stuff 2021-02-22 22:23:57 -07:00
dfsek
415df211ed fabric cleanup 2021-02-22 21:41:15 -07:00
dfsek
ac09e059fc caves on fabric actually work now 2021-02-22 21:02:59 -07:00
dfsek
268cc7c48b fabric stuff 2021-02-22 20:47:06 -07:00
dfsek
358bd350b5 MaterialData is gone 2021-02-22 19:47:15 -07:00
dfsek
a328ff2f2a refactor API 2021-02-22 16:13:53 -07:00
dfsek
46a08e49f5 registry stuff 2021-02-22 10:32:38 -07:00
dfsek
05cd0b625c notnull annotations 2021-02-21 23:08:51 -07:00
dfsek
5e940187d9 documentation 2021-02-21 22:25:00 -07:00
dfsek
8b196716a4 CheckedRegistry API 2021-02-21 22:04:29 -07:00
dfsek
6025e0f557 cleanup 2021-02-21 17:49:07 -07:00
dfsek
e00209c99c rework chunkgenerator API to allow easier extension 2021-02-21 14:19:42 -07:00
dfsek
03e9f6b882 more cleanup 2021-02-20 23:59:17 -07:00
dfsek
fab8c90e92 clean up ChunkGenerator API 2021-02-20 23:49:47 -07:00
dfsek
3b719d0880 add dependency injection API 2021-02-20 23:23:17 -07:00
dfsek
45dbe45fb4 set up dependency stuff 2021-02-20 22:31:13 -07:00
dfsek
76f2a3fbc4 fleshed out addon loading 2021-02-19 22:49:11 -07:00
dfsek
5e761c3e29 basic addon loading 2021-02-19 20:36:35 -07:00
dfsek
6d51da3118
Merge pull request #77 from PolyhedralDev/ver/4.3.0
Noise Changes
2021-02-18 20:39:49 -07:00
dfsek
839f429806 documentation 2021-02-18 20:34:36 -07:00
dfsek
e533180dab add GaussianNoiseSampler 2021-02-18 19:51:25 -07:00
dfsek
40b9c6c08c Add KernelSampler 2021-02-18 16:04:22 -07:00
dfsek
c8c9247dfe cleanup 2021-02-17 22:14:03 -07:00
dfsek
7f8749239f add ConstantNoiseTemplate, bump version 2021-02-17 18:35:49 -07:00
dfsek
2b84967e05 fix freq issues 2021-02-17 17:39:14 -07:00
dfsek
6446f9b4a7 Merge remote-tracking branch 'origin/ver/4.3.0' into ver/4.3.0 2021-02-17 17:13:36 -07:00
dfsek
5933f97f93 add ExpressionFunction 2021-02-17 17:13:28 -07:00
dfsek
d670fc904f Merge branch 'master' into ver/4.3.0 2021-02-17 10:37:14 -07:00
dfsek
33371675e1 add event priorities 2021-02-17 10:35:38 -07:00
dfsek
bd91506069 remove unneeded setSeed call 2021-02-17 01:50:13 -07:00
dfsek
393a92730f fix frequency issues 2021-02-17 01:40:31 -07:00
dfsek
5ff016ea1f finish new noise options, remove FastNoise 2021-02-17 01:30:52 -07:00
dfsek
84b8df6d96 calculate bounding in fractal types. 2021-02-17 00:16:54 -07:00
dfsek
353999aa45 cleanup 2021-02-17 00:15:49 -07:00
dfsek
4a4e7e42cc split up FastNoise 2021-02-16 15:35:13 -07:00
dfsek
06cd1dc562 use event API for registration of Bukkit trees 2021-02-16 12:57:35 -07:00
dfsek
48296fb14a Add separate publishing for Bukkit impl 2021-02-16 10:43:13 -07:00
dfsek
b3a4c3af19
Merge pull request #76 from PolyhedralDev/functionregistry
Function Registry and Event System
2021-02-16 10:12:48 -07:00
dfsek
c0773be780 add getters for all registries to ConfigPack 2021-02-15 22:38:57 -07:00
dfsek
79df7eed21 cleanup 2021-02-15 21:12:18 -07:00
dfsek
14ce12f08e Finish event system 2021-02-15 21:11:10 -07:00
dfsek
7cfa96f925 implement Event API 2021-02-15 19:56:55 -07:00
dfsek
4131b45c6f
Merge pull request #72 from PolyhedralDev/asmparser
Implement Paralithic expression parser
2021-02-15 18:01:00 -07:00
dfsek
4bf31d863e bump paralithic version 2021-02-15 15:53:59 -07:00
dfsek
92db30e181 move expressions to registry 2021-02-14 23:08:43 -07:00
dfsek
0f152f9281 remove tstructure yelling 2021-02-14 22:15:26 -07:00
dfsek
7ca779f845 improve logging 2021-02-14 22:15:09 -07:00
dfsek
76a2d08906 remove debug logging 2021-02-14 21:45:15 -07:00
dfsek
161b047c39 cleanup 2021-02-14 16:27:45 -07:00
dfsek
8309ad665e refactor registries 2021-02-14 14:31:14 -07:00
dfsek
b6e414f944 completely redo biome loading 2021-02-14 14:19:45 -07:00
dfsek
36db83b253 Merge remote-tracking branch 'origin/master' into asmparser
# Conflicts:
#	build.gradle.kts
2021-02-12 14:30:28 -07:00
dfsek
c4e641069d Merge remote-tracking branch 'origin/asmparser' into asmparser 2021-02-12 14:29:50 -07:00
dfsek
5e40fbbf07 add image align options 2021-02-12 14:29:39 -07:00
dfsek
8a47a01dd8 bump listener to highest priority 2021-02-12 14:17:14 -07:00
dfsek
e41587dbd9 fix user defined functions 2021-02-11 08:35:13 -07:00
dfsek
d5de91a864 fix minor sapling issues 2021-02-07 22:15:42 -07:00
dfsek
f8cf61e281 bump version for patch config update 2021-02-07 18:00:51 -07:00
dfsek
7323b051db remove debug logging 2021-02-07 16:30:33 -07:00
dfsek
72f86e68e8 Merge remote-tracking branch 'origin/master' into asmparser 2021-02-07 16:18:02 -07:00
dfsek
5f9b21ea09 apparently this got removed somehow 2021-02-07 15:49:33 -07:00
dfsek
dd44839bd3
Merge pull request #57 from PolyhedralDev/biome
Biome Stuff
2021-02-07 15:40:45 -07:00
dfsek
b8cec40317 cleanup again 2021-02-07 13:58:17 -07:00
dfsek
19f781af31 fix Directional rotations 2021-02-07 00:52:18 -07:00
dfsek
af825761c7 update to latest Paralithic 2021-02-06 22:41:42 -07:00
dfsek
490fed8c2c Merge branch 'biome' into asmparser
# Conflicts:
#	platforms/bukkit/build.gradle.kts
2021-02-06 22:28:53 -07:00
dfsek
85efa44673 cleanup 2021-02-06 22:03:46 -07:00
dfsek
985443e228 remove unneeded config file 2021-02-06 20:14:39 -07:00
M3RGeo
a2f3752c31
Update afr_sa.yml (#73) 2021-02-05 13:21:54 -07:00
dfsek
7418d67b09 update to latest paralithic 2021-02-04 00:03:57 -07:00
dfsek
565266992f paralithic implementation 2021-02-03 23:15:36 -07:00
snake
d05fdeb94c
Update ja_jp (#64) 2021-01-27 16:39:42 -07:00
dfsek
01d0d4c00a
Merge pull request #59 from PolyhedralDev/structurelocate
StructureLocateEvent implementation
2021-01-18 14:53:15 -07:00
LeoDog896
d65c700bb9
[ImgBot] Optimize images (#53)
/platforms/fabric/src/main/resources/assets/terra/icon.png -- 142.09kb -> 126.82kb (10.75%)

Signed-off-by: ImgBotApp <ImgBotHelp@gmail.com>

Co-authored-by: ImgBotApp <ImgBotHelp@gmail.com>
2021-01-14 11:24:13 -07:00
1639 changed files with 58735 additions and 29535 deletions

View File

@ -8,142 +8,156 @@ indent_style = space
insert_final_newline = false
max_line_length = 140
tab_width = 4
ij_continuation_indent_size = 8
ij_continuation_indent_size = 4
ij_formatter_off_tag = @formatter:off
ij_formatter_on_tag = @formatter:on
ij_formatter_tags_enabled = false
ij_smart_tabs = false
ij_visual_guides = 140
ij_wrap_on_typing = false
[*.java]
ij_visual_guides = none
ij_java_align_consecutive_assignments = false
ij_java_align_consecutive_variable_declarations = false
ij_java_align_group_field_declarations = false
ij_java_align_multiline_annotation_parameters = false
ij_java_align_multiline_array_initializer_expression = false
ij_java_align_multiline_assignment = false
ij_java_align_multiline_binary_operation = false
ij_java_align_multiline_annotation_parameters = true
ij_java_align_multiline_array_initializer_expression = true
ij_java_align_multiline_assignment = true
ij_java_align_multiline_binary_operation = true
ij_java_align_multiline_chained_methods = false
ij_java_align_multiline_extends_list = false
ij_java_align_multiline_extends_list = true
ij_java_align_multiline_for = true
ij_java_align_multiline_method_parentheses = false
ij_java_align_multiline_parameters = true
ij_java_align_multiline_parameters_in_calls = false
ij_java_align_multiline_parenthesized_expression = false
ij_java_align_multiline_parenthesized_expression = true
ij_java_align_multiline_records = true
ij_java_align_multiline_resources = true
ij_java_align_multiline_ternary_operation = false
ij_java_align_multiline_text_blocks = false
ij_java_align_multiline_throws_list = false
ij_java_align_subsequent_simple_methods = false
ij_java_align_throws_keyword = false
ij_java_annotation_parameter_wrap = off
ij_java_array_initializer_new_line_after_left_brace = false
ij_java_array_initializer_right_brace_on_new_line = false
ij_java_array_initializer_wrap = off
ij_java_assert_statement_colon_on_next_line = false
ij_java_assert_statement_wrap = off
ij_java_assignment_wrap = off
ij_java_align_multiline_ternary_operation = true
ij_java_align_multiline_text_blocks = true
ij_java_align_multiline_throws_list = true
ij_java_align_subsequent_simple_methods = true
ij_java_align_throws_keyword = true
ij_java_annotation_parameter_wrap = on_every_item
ij_java_array_initializer_new_line_after_left_brace = true
ij_java_array_initializer_right_brace_on_new_line = true
ij_java_array_initializer_wrap = normal
ij_java_assert_statement_colon_on_next_line = true
ij_java_assert_statement_wrap = on_every_item
ij_java_assignment_wrap = normal
ij_java_binary_operation_sign_on_next_line = false
ij_java_binary_operation_wrap = off
ij_java_binary_operation_wrap = normal
ij_java_blank_lines_after_anonymous_class_header = 0
ij_java_blank_lines_after_class_header = 0
ij_java_blank_lines_after_imports = 1
ij_java_blank_lines_after_imports = 2
ij_java_blank_lines_after_package = 1
ij_java_blank_lines_around_class = 1
ij_java_blank_lines_around_class = 2
ij_java_blank_lines_around_field = 0
ij_java_blank_lines_around_field_in_interface = 0
ij_java_blank_lines_around_initializer = 1
ij_java_blank_lines_around_initializer = 0
ij_java_blank_lines_around_method = 1
ij_java_blank_lines_around_method_in_interface = 1
ij_java_blank_lines_before_class_end = 0
ij_java_blank_lines_before_imports = 1
ij_java_blank_lines_before_method_body = 0
ij_java_blank_lines_before_package = 0
ij_java_blank_lines_before_package = 1
ij_java_block_brace_style = end_of_line
ij_java_block_comment_at_first_column = true
ij_java_builder_methods = none
ij_java_call_parameters_new_line_after_left_paren = false
ij_java_call_parameters_right_paren_on_new_line = false
ij_java_call_parameters_wrap = off
ij_java_call_parameters_wrap = normal
ij_java_case_statement_on_separate_line = true
ij_java_catch_on_new_line = false
ij_java_class_annotation_wrap = split_into_lines
ij_java_class_brace_style = end_of_line
ij_java_class_count_to_use_import_on_demand = 30
ij_java_class_names_in_javadoc = 1
ij_java_class_count_to_use_import_on_demand = 200
ij_java_class_names_in_javadoc = 3
ij_java_do_not_indent_top_level_class_members = false
ij_java_do_not_wrap_after_single_annotation = false
ij_java_do_while_brace_force = never
ij_java_doc_add_blank_line_after_description = true
ij_java_doc_add_blank_line_after_param_comments = false
ij_java_doc_add_blank_line_after_return = false
ij_java_doc_add_blank_line_after_param_comments = true
ij_java_doc_add_blank_line_after_return = true
ij_java_doc_add_p_tag_on_empty_lines = true
ij_java_doc_align_exception_comments = true
ij_java_doc_align_param_comments = true
ij_java_doc_do_not_wrap_if_one_line = false
ij_java_doc_enable_formatting = true
ij_java_doc_enable_leading_asterisks = true
ij_java_doc_indent_on_continuation = false
ij_java_doc_indent_on_continuation = true
ij_java_doc_keep_empty_lines = true
ij_java_doc_keep_empty_parameter_tag = true
ij_java_doc_keep_empty_return_tag = true
ij_java_doc_keep_empty_throws_tag = true
ij_java_doc_keep_invalid_tags = true
ij_java_doc_param_description_on_new_line = false
ij_java_doc_preserve_line_breaks = false
ij_java_doc_preserve_line_breaks = true
ij_java_doc_use_throws_not_exception_tag = true
ij_java_else_on_new_line = false
ij_java_enum_constants_wrap = off
ij_java_extends_keyword_wrap = off
ij_java_extends_list_wrap = off
ij_java_entity_dd_suffix = EJB
ij_java_entity_eb_suffix = Bean
ij_java_entity_hi_suffix = Home
ij_java_entity_lhi_prefix = Local
ij_java_entity_lhi_suffix = Home
ij_java_entity_li_prefix = Local
ij_java_entity_pk_class = java.lang.String
ij_java_entity_vo_suffix = VO
ij_java_enum_constants_wrap = split_into_lines
ij_java_extends_keyword_wrap = normal
ij_java_extends_list_wrap = on_every_item
ij_java_field_annotation_wrap = split_into_lines
ij_java_finally_on_new_line = false
ij_java_for_brace_force = never
ij_java_for_statement_new_line_after_left_paren = false
ij_java_for_statement_right_paren_on_new_line = false
ij_java_for_statement_wrap = off
ij_java_for_statement_wrap = on_every_item
ij_java_generate_final_locals = false
ij_java_generate_final_parameters = false
ij_java_if_brace_force = never
ij_java_imports_layout = *,|,javax.**,java.**,|,$*
ij_java_imports_layout = *, |, javax.**, java.**, |, com.dfsek.terra.**, |, $org.junit.jupiter.api.Assertions.**, |, $*
ij_java_indent_case_from_switch = true
ij_java_insert_inner_class_imports = false
ij_java_insert_inner_class_imports = true
ij_java_insert_override_annotation = true
ij_java_keep_blank_lines_before_right_brace = 2
ij_java_keep_blank_lines_between_package_declaration_and_header = 2
ij_java_keep_blank_lines_between_package_declaration_and_header = 1
ij_java_keep_blank_lines_in_code = 2
ij_java_keep_blank_lines_in_declarations = 2
ij_java_keep_builder_methods_indents = true
ij_java_keep_control_statement_in_one_line = true
ij_java_keep_first_column_comment = true
ij_java_keep_first_column_comment = false
ij_java_keep_indents_on_empty_lines = false
ij_java_keep_line_breaks = true
ij_java_keep_multiple_expressions_in_one_line = false
ij_java_keep_simple_blocks_in_one_line = false
ij_java_keep_simple_blocks_in_one_line = true
ij_java_keep_simple_classes_in_one_line = false
ij_java_keep_simple_lambdas_in_one_line = false
ij_java_keep_simple_methods_in_one_line = false
ij_java_keep_simple_lambdas_in_one_line = true
ij_java_keep_simple_methods_in_one_line = true
ij_java_label_indent_absolute = false
ij_java_label_indent_size = 0
ij_java_lambda_brace_style = end_of_line
ij_java_layout_static_imports_separately = true
ij_java_line_comment_add_space = false
ij_java_line_comment_at_first_column = true
ij_java_message_dd_suffix = EJB
ij_java_message_eb_suffix = Bean
ij_java_method_annotation_wrap = split_into_lines
ij_java_method_brace_style = end_of_line
ij_java_method_call_chain_wrap = off
ij_java_method_call_chain_wrap = on_every_item
ij_java_method_parameters_new_line_after_left_paren = false
ij_java_method_parameters_right_paren_on_new_line = false
ij_java_method_parameters_wrap = off
ij_java_method_parameters_wrap = normal
ij_java_modifier_list_wrap = false
ij_java_names_count_to_use_import_on_demand = 3
ij_java_names_count_to_use_import_on_demand = 50
ij_java_new_line_after_lparen_in_record_header = false
ij_java_packages_to_use_import_on_demand = java.awt.*,javax.swing.*
ij_java_parameter_annotation_wrap = off
ij_java_packages_to_use_import_on_demand = $org.junit.jupiter.api.Assertions.*
ij_java_parameter_annotation_wrap = on_every_item
ij_java_parentheses_expression_new_line_after_left_paren = false
ij_java_parentheses_expression_right_paren_on_new_line = false
ij_java_place_assignment_sign_on_next_line = false
ij_java_prefer_longer_names = true
ij_java_prefer_parameters_wrap = false
ij_java_prefer_parameters_wrap = true
ij_java_record_components_wrap = normal
ij_java_repeat_synchronized = true
ij_java_replace_instanceof_and_cast = false
@ -151,8 +165,15 @@ ij_java_replace_null_check = true
ij_java_replace_sum_lambda_with_method_ref = true
ij_java_resource_list_new_line_after_left_paren = false
ij_java_resource_list_right_paren_on_new_line = false
ij_java_resource_list_wrap = off
ij_java_resource_list_wrap = on_every_item
ij_java_rparen_on_new_line_in_record_header = false
ij_java_session_dd_suffix = EJB
ij_java_session_eb_suffix = Bean
ij_java_session_hi_suffix = Home
ij_java_session_lhi_prefix = Local
ij_java_session_lhi_suffix = Home
ij_java_session_li_prefix = Local
ij_java_session_si_suffix = Service
ij_java_space_after_closing_angle_bracket_in_type_argument = false
ij_java_space_after_colon = true
ij_java_space_after_comma = true
@ -162,7 +183,7 @@ ij_java_space_after_quest = true
ij_java_space_after_type_cast = true
ij_java_space_before_annotation_array_initializer_left_brace = false
ij_java_space_before_annotation_parameter_list = false
ij_java_space_before_array_initializer_left_brace = true
ij_java_space_before_array_initializer_left_brace = false
ij_java_space_before_catch_keyword = true
ij_java_space_before_catch_left_brace = true
ij_java_space_before_catch_parentheses = false
@ -196,7 +217,7 @@ ij_java_space_before_while_keyword = true
ij_java_space_before_while_left_brace = true
ij_java_space_before_while_parentheses = false
ij_java_space_inside_one_line_enum_braces = false
ij_java_space_within_empty_array_initializer_braces = false
ij_java_space_within_empty_array_initializer_braces = true
ij_java_space_within_empty_method_call_parentheses = false
ij_java_space_within_empty_method_parentheses = false
ij_java_spaces_around_additive_operators = true
@ -213,8 +234,8 @@ ij_java_spaces_around_type_bounds_in_type_parameters = true
ij_java_spaces_around_unary_operator = false
ij_java_spaces_within_angle_brackets = false
ij_java_spaces_within_annotation_parentheses = false
ij_java_spaces_within_array_initializer_braces = false
ij_java_spaces_within_braces = false
ij_java_spaces_within_array_initializer_braces = true
ij_java_spaces_within_braces = true
ij_java_spaces_within_brackets = false
ij_java_spaces_within_cast_parentheses = false
ij_java_spaces_within_catch_parentheses = false
@ -223,80 +244,276 @@ ij_java_spaces_within_if_parentheses = false
ij_java_spaces_within_method_call_parentheses = false
ij_java_spaces_within_method_parentheses = false
ij_java_spaces_within_parentheses = false
ij_java_spaces_within_record_header = false
ij_java_spaces_within_switch_parentheses = false
ij_java_spaces_within_synchronized_parentheses = false
ij_java_spaces_within_try_parentheses = false
ij_java_spaces_within_while_parentheses = false
ij_java_special_else_if_treatment = true
ij_java_subclass_name_suffix = Impl
ij_java_ternary_operation_signs_on_next_line = false
ij_java_ternary_operation_wrap = off
ij_java_ternary_operation_signs_on_next_line = true
ij_java_ternary_operation_wrap = on_every_item
ij_java_test_name_suffix = Test
ij_java_throws_keyword_wrap = off
ij_java_throws_list_wrap = off
ij_java_throws_keyword_wrap = normal
ij_java_throws_list_wrap = normal
ij_java_use_external_annotations = false
ij_java_use_fq_class_names = false
ij_java_use_relative_indents = false
ij_java_use_single_class_imports = true
ij_java_variable_annotation_wrap = off
ij_java_variable_annotation_wrap = on_every_item
ij_java_visibility = public
ij_java_while_brace_force = never
ij_java_while_on_new_line = false
ij_java_wrap_comments = false
ij_java_wrap_comments = true
ij_java_wrap_first_method_in_call_chain = false
ij_java_wrap_long_lines = false
ij_java_wrap_long_lines = true
[{*.gradle.kts,*.kt,*.kts,*.main.kts}]
ij_kotlin_align_in_columns_case_branch = false
[.editorconfig]
ij_visual_guides = none
ij_editorconfig_align_group_field_declarations = false
ij_editorconfig_space_after_colon = false
ij_editorconfig_space_after_comma = true
ij_editorconfig_space_before_colon = false
ij_editorconfig_space_before_comma = false
ij_editorconfig_spaces_around_assignment_operators = true
[{*.gant, *.gradle, *.groovy, *.gson, *.gy}]
ij_visual_guides = none
ij_groovy_align_group_field_declarations = false
ij_groovy_align_multiline_array_initializer_expression = false
ij_groovy_align_multiline_assignment = false
ij_groovy_align_multiline_binary_operation = false
ij_groovy_align_multiline_chained_methods = false
ij_groovy_align_multiline_extends_list = false
ij_groovy_align_multiline_for = true
ij_groovy_align_multiline_list_or_map = true
ij_groovy_align_multiline_method_parentheses = false
ij_groovy_align_multiline_parameters = true
ij_groovy_align_multiline_parameters_in_calls = false
ij_groovy_align_multiline_resources = true
ij_groovy_align_multiline_ternary_operation = false
ij_groovy_align_multiline_throws_list = false
ij_groovy_align_named_args_in_map = true
ij_groovy_align_throws_keyword = false
ij_groovy_array_initializer_new_line_after_left_brace = false
ij_groovy_array_initializer_right_brace_on_new_line = false
ij_groovy_array_initializer_wrap = off
ij_groovy_assert_statement_wrap = off
ij_groovy_assignment_wrap = off
ij_groovy_binary_operation_wrap = off
ij_groovy_blank_lines_after_class_header = 0
ij_groovy_blank_lines_after_imports = 1
ij_groovy_blank_lines_after_package = 1
ij_groovy_blank_lines_around_class = 1
ij_groovy_blank_lines_around_field = 0
ij_groovy_blank_lines_around_field_in_interface = 0
ij_groovy_blank_lines_around_method = 1
ij_groovy_blank_lines_around_method_in_interface = 1
ij_groovy_blank_lines_before_imports = 1
ij_groovy_blank_lines_before_method_body = 0
ij_groovy_blank_lines_before_package = 0
ij_groovy_block_brace_style = end_of_line
ij_groovy_block_comment_at_first_column = true
ij_groovy_call_parameters_new_line_after_left_paren = false
ij_groovy_call_parameters_right_paren_on_new_line = false
ij_groovy_call_parameters_wrap = off
ij_groovy_catch_on_new_line = false
ij_groovy_class_annotation_wrap = split_into_lines
ij_groovy_class_brace_style = end_of_line
ij_groovy_class_count_to_use_import_on_demand = 5
ij_groovy_do_while_brace_force = never
ij_groovy_else_on_new_line = false
ij_groovy_enum_constants_wrap = off
ij_groovy_extends_keyword_wrap = off
ij_groovy_extends_list_wrap = off
ij_groovy_field_annotation_wrap = split_into_lines
ij_groovy_finally_on_new_line = false
ij_groovy_for_brace_force = never
ij_groovy_for_statement_new_line_after_left_paren = false
ij_groovy_for_statement_right_paren_on_new_line = false
ij_groovy_for_statement_wrap = off
ij_groovy_if_brace_force = never
ij_groovy_import_annotation_wrap = 2
ij_groovy_imports_layout = *, |, javax.**, java.**, |, $*
ij_groovy_indent_case_from_switch = true
ij_groovy_indent_label_blocks = true
ij_groovy_insert_inner_class_imports = false
ij_groovy_keep_blank_lines_before_right_brace = 2
ij_groovy_keep_blank_lines_in_code = 2
ij_groovy_keep_blank_lines_in_declarations = 2
ij_groovy_keep_control_statement_in_one_line = true
ij_groovy_keep_first_column_comment = true
ij_groovy_keep_indents_on_empty_lines = false
ij_groovy_keep_line_breaks = true
ij_groovy_keep_multiple_expressions_in_one_line = false
ij_groovy_keep_simple_blocks_in_one_line = false
ij_groovy_keep_simple_classes_in_one_line = true
ij_groovy_keep_simple_lambdas_in_one_line = true
ij_groovy_keep_simple_methods_in_one_line = true
ij_groovy_label_indent_absolute = false
ij_groovy_label_indent_size = 0
ij_groovy_lambda_brace_style = end_of_line
ij_groovy_layout_static_imports_separately = true
ij_groovy_line_comment_add_space = false
ij_groovy_line_comment_at_first_column = true
ij_groovy_method_annotation_wrap = split_into_lines
ij_groovy_method_brace_style = end_of_line
ij_groovy_method_call_chain_wrap = off
ij_groovy_method_parameters_new_line_after_left_paren = false
ij_groovy_method_parameters_right_paren_on_new_line = false
ij_groovy_method_parameters_wrap = off
ij_groovy_modifier_list_wrap = false
ij_groovy_names_count_to_use_import_on_demand = 3
ij_groovy_parameter_annotation_wrap = off
ij_groovy_parentheses_expression_new_line_after_left_paren = false
ij_groovy_parentheses_expression_right_paren_on_new_line = false
ij_groovy_prefer_parameters_wrap = false
ij_groovy_resource_list_new_line_after_left_paren = false
ij_groovy_resource_list_right_paren_on_new_line = false
ij_groovy_resource_list_wrap = off
ij_groovy_space_after_assert_separator = true
ij_groovy_space_after_colon = true
ij_groovy_space_after_comma = true
ij_groovy_space_after_comma_in_type_arguments = true
ij_groovy_space_after_for_semicolon = true
ij_groovy_space_after_quest = true
ij_groovy_space_after_type_cast = true
ij_groovy_space_before_annotation_parameter_list = false
ij_groovy_space_before_array_initializer_left_brace = false
ij_groovy_space_before_assert_separator = false
ij_groovy_space_before_catch_keyword = true
ij_groovy_space_before_catch_left_brace = true
ij_groovy_space_before_catch_parentheses = true
ij_groovy_space_before_class_left_brace = true
ij_groovy_space_before_closure_left_brace = true
ij_groovy_space_before_colon = true
ij_groovy_space_before_comma = false
ij_groovy_space_before_do_left_brace = true
ij_groovy_space_before_else_keyword = true
ij_groovy_space_before_else_left_brace = true
ij_groovy_space_before_finally_keyword = true
ij_groovy_space_before_finally_left_brace = true
ij_groovy_space_before_for_left_brace = true
ij_groovy_space_before_for_parentheses = true
ij_groovy_space_before_for_semicolon = false
ij_groovy_space_before_if_left_brace = true
ij_groovy_space_before_if_parentheses = true
ij_groovy_space_before_method_call_parentheses = false
ij_groovy_space_before_method_left_brace = true
ij_groovy_space_before_method_parentheses = false
ij_groovy_space_before_quest = true
ij_groovy_space_before_switch_left_brace = true
ij_groovy_space_before_switch_parentheses = true
ij_groovy_space_before_synchronized_left_brace = true
ij_groovy_space_before_synchronized_parentheses = true
ij_groovy_space_before_try_left_brace = true
ij_groovy_space_before_try_parentheses = true
ij_groovy_space_before_while_keyword = true
ij_groovy_space_before_while_left_brace = true
ij_groovy_space_before_while_parentheses = true
ij_groovy_space_in_named_argument = true
ij_groovy_space_in_named_argument_before_colon = false
ij_groovy_space_within_empty_array_initializer_braces = false
ij_groovy_space_within_empty_method_call_parentheses = false
ij_groovy_spaces_around_additive_operators = true
ij_groovy_spaces_around_assignment_operators = true
ij_groovy_spaces_around_bitwise_operators = true
ij_groovy_spaces_around_equality_operators = true
ij_groovy_spaces_around_lambda_arrow = true
ij_groovy_spaces_around_logical_operators = true
ij_groovy_spaces_around_multiplicative_operators = true
ij_groovy_spaces_around_regex_operators = true
ij_groovy_spaces_around_relational_operators = true
ij_groovy_spaces_around_shift_operators = true
ij_groovy_spaces_within_annotation_parentheses = false
ij_groovy_spaces_within_array_initializer_braces = false
ij_groovy_spaces_within_braces = true
ij_groovy_spaces_within_brackets = false
ij_groovy_spaces_within_cast_parentheses = false
ij_groovy_spaces_within_catch_parentheses = false
ij_groovy_spaces_within_for_parentheses = false
ij_groovy_spaces_within_gstring_injection_braces = false
ij_groovy_spaces_within_if_parentheses = false
ij_groovy_spaces_within_list_or_map = false
ij_groovy_spaces_within_method_call_parentheses = false
ij_groovy_spaces_within_method_parentheses = false
ij_groovy_spaces_within_parentheses = false
ij_groovy_spaces_within_switch_parentheses = false
ij_groovy_spaces_within_synchronized_parentheses = false
ij_groovy_spaces_within_try_parentheses = false
ij_groovy_spaces_within_tuple_expression = false
ij_groovy_spaces_within_while_parentheses = false
ij_groovy_special_else_if_treatment = true
ij_groovy_ternary_operation_wrap = off
ij_groovy_throws_keyword_wrap = off
ij_groovy_throws_list_wrap = off
ij_groovy_use_flying_geese_braces = false
ij_groovy_use_fq_class_names = false
ij_groovy_use_fq_class_names_in_javadoc = true
ij_groovy_use_relative_indents = false
ij_groovy_use_single_class_imports = true
ij_groovy_variable_annotation_wrap = off
ij_groovy_while_brace_force = never
ij_groovy_while_on_new_line = false
ij_groovy_wrap_long_lines = false
[{*.gql, *.graphql, *.graphqls}]
ij_visual_guides = none
[{*.kt, *.kts}]
ij_visual_guides = none
ij_kotlin_align_in_columns_case_branch = true
ij_kotlin_align_multiline_binary_operation = false
ij_kotlin_align_multiline_extends_list = false
ij_kotlin_align_multiline_method_parentheses = false
ij_kotlin_align_multiline_extends_list = true
ij_kotlin_align_multiline_method_parentheses = true
ij_kotlin_align_multiline_parameters = true
ij_kotlin_align_multiline_parameters_in_calls = false
ij_kotlin_align_multiline_parameters_in_calls = true
ij_kotlin_allow_trailing_comma = false
ij_kotlin_allow_trailing_comma_on_call_site = false
ij_kotlin_assignment_wrap = off
ij_kotlin_assignment_wrap = normal
ij_kotlin_blank_lines_after_class_header = 0
ij_kotlin_blank_lines_around_block_when_branches = 0
ij_kotlin_blank_lines_around_block_when_branches = 1
ij_kotlin_blank_lines_before_declaration_with_comment_or_annotation_on_separate_line = 1
ij_kotlin_block_comment_at_first_column = true
ij_kotlin_call_parameters_new_line_after_left_paren = false
ij_kotlin_call_parameters_right_paren_on_new_line = false
ij_kotlin_call_parameters_wrap = off
ij_kotlin_call_parameters_new_line_after_left_paren = true
ij_kotlin_call_parameters_right_paren_on_new_line = true
ij_kotlin_call_parameters_wrap = on_every_item
ij_kotlin_catch_on_new_line = false
ij_kotlin_class_annotation_wrap = split_into_lines
ij_kotlin_continuation_indent_for_chained_calls = true
ij_kotlin_continuation_indent_for_expression_bodies = true
ij_kotlin_continuation_indent_in_argument_lists = true
ij_kotlin_continuation_indent_in_elvis = true
ij_kotlin_continuation_indent_in_if_conditions = true
ij_kotlin_continuation_indent_in_parameter_lists = true
ij_kotlin_continuation_indent_in_supertype_lists = true
ij_kotlin_continuation_indent_for_chained_calls = false
ij_kotlin_continuation_indent_for_expression_bodies = false
ij_kotlin_continuation_indent_in_argument_lists = false
ij_kotlin_continuation_indent_in_elvis = false
ij_kotlin_continuation_indent_in_if_conditions = false
ij_kotlin_continuation_indent_in_parameter_lists = false
ij_kotlin_continuation_indent_in_supertype_lists = false
ij_kotlin_else_on_new_line = false
ij_kotlin_enum_constants_wrap = off
ij_kotlin_extends_list_wrap = off
ij_kotlin_field_annotation_wrap = split_into_lines
ij_kotlin_enum_constants_wrap = on_every_item
ij_kotlin_extends_list_wrap = normal
ij_kotlin_field_annotation_wrap = on_every_item
ij_kotlin_finally_on_new_line = false
ij_kotlin_if_rparen_on_new_line = false
ij_kotlin_if_rparen_on_new_line = true
ij_kotlin_import_nested_classes = false
ij_kotlin_imports_layout = *, java.*, javax.*, kotlin.**
ij_kotlin_insert_whitespaces_in_simple_one_line_method = true
ij_kotlin_keep_blank_lines_before_right_brace = 2
ij_kotlin_keep_blank_lines_before_right_brace = 1
ij_kotlin_keep_blank_lines_in_code = 2
ij_kotlin_keep_blank_lines_in_declarations = 2
ij_kotlin_keep_first_column_comment = true
ij_kotlin_keep_indents_on_empty_lines = false
ij_kotlin_keep_indents_on_empty_lines = true
ij_kotlin_keep_line_breaks = true
ij_kotlin_lbrace_on_next_line = false
ij_kotlin_line_comment_add_space = false
ij_kotlin_line_comment_at_first_column = true
ij_kotlin_method_annotation_wrap = split_into_lines
ij_kotlin_method_call_chain_wrap = off
ij_kotlin_method_parameters_new_line_after_left_paren = false
ij_kotlin_method_parameters_right_paren_on_new_line = false
ij_kotlin_method_parameters_wrap = off
ij_kotlin_name_count_to_use_star_import = 5
ij_kotlin_name_count_to_use_star_import_for_members = 3
ij_kotlin_parameter_annotation_wrap = off
ij_kotlin_method_annotation_wrap = on_every_item
ij_kotlin_method_call_chain_wrap = normal
ij_kotlin_method_parameters_new_line_after_left_paren = true
ij_kotlin_method_parameters_right_paren_on_new_line = true
ij_kotlin_method_parameters_wrap = on_every_item
ij_kotlin_name_count_to_use_star_import = 2147483647
ij_kotlin_name_count_to_use_star_import_for_members = 2147483647
ij_kotlin_packages_to_use_import_on_demand = java.util.*, kotlinx.android.synthetic.*, io.ktor.*
ij_kotlin_parameter_annotation_wrap = on_every_item
ij_kotlin_space_after_comma = true
ij_kotlin_space_after_extend_colon = true
ij_kotlin_space_after_type_colon = true
@ -315,33 +532,63 @@ ij_kotlin_spaces_around_equality_operators = true
ij_kotlin_spaces_around_function_type_arrow = true
ij_kotlin_spaces_around_logical_operators = true
ij_kotlin_spaces_around_multiplicative_operators = true
ij_kotlin_spaces_around_range = false
ij_kotlin_spaces_around_range = true
ij_kotlin_spaces_around_relational_operators = true
ij_kotlin_spaces_around_unary_operator = false
ij_kotlin_spaces_around_when_arrow = true
ij_kotlin_variable_annotation_wrap = off
ij_kotlin_variable_annotation_wrap = on_every_item
ij_kotlin_while_on_new_line = false
ij_kotlin_wrap_elvis_expressions = 1
ij_kotlin_wrap_expression_body_functions = 0
ij_kotlin_wrap_expression_body_functions = 1
ij_kotlin_wrap_first_method_in_call_chain = false
[{*.har,*.jsb2,*.jsb3,*.json,.babelrc,.eslintrc,.stylelintrc,bowerrc,jest.config}]
indent_size = 2
ij_json_keep_blank_lines_in_code = 0
[{*.graphqlconfig, *.har, *.jsb2, *.jsb3, *.json, .babelrc, .eslintrc, .stylelintrc, bowerrc, jest.config, mcmod.info, pack.mcmeta}]
ij_visual_guides = none
ij_json_keep_blank_lines_in_code = 1
ij_json_keep_indents_on_empty_lines = false
ij_json_keep_line_breaks = true
ij_json_space_after_colon = true
ij_json_space_after_comma = true
ij_json_space_before_colon = true
ij_json_space_before_comma = false
ij_json_spaces_within_braces = false
ij_json_spaces_within_brackets = false
ij_json_spaces_within_braces = true
ij_json_spaces_within_brackets = true
ij_json_wrap_long_lines = false
[{*.yaml,*.yml}]
[{*.markdown, *.md}]
max_line_length = 80
ij_visual_guides = 80
ij_markdown_force_one_space_after_blockquote_symbol = true
ij_markdown_force_one_space_after_header_symbol = true
ij_markdown_force_one_space_after_list_bullet = true
ij_markdown_force_one_space_between_words = true
ij_markdown_keep_indents_on_empty_lines = false
ij_markdown_max_lines_around_block_elements = 1
ij_markdown_max_lines_around_header = 1
ij_markdown_max_lines_between_paragraphs = 1
ij_markdown_min_lines_around_block_elements = 1
ij_markdown_min_lines_around_header = 1
ij_markdown_min_lines_between_paragraphs = 1
[{*.properties, spring.handlers, spring.schemas}]
ij_visual_guides = none
ij_properties_align_group_field_declarations = false
ij_properties_keep_blank_lines = false
ij_properties_key_value_delimiter = equals
ij_properties_spaces_around_key_value_delimiter = false
[{*.yml, *.yaml}]
indent_size = 2
ij_yaml_keep_indents_on_empty_lines = true
ij_visual_guides = none
ij_yaml_align_values_properties = do_not_align
ij_yaml_autoinsert_sequence_marker = true
ij_yaml_block_mapping_on_new_line = false
ij_yaml_indent_sequence_value = true
ij_yaml_keep_indents_on_empty_lines = false
ij_yaml_keep_line_breaks = true
ij_yaml_space_before_colon = true
ij_yaml_sequence_on_new_line = false
ij_yaml_space_before_colon = false
ij_yaml_spaces_within_braces = true
ij_yaml_spaces_within_brackets = true

14
.github/CODEOWNERS vendored Normal file
View File

@ -0,0 +1,14 @@
# Global owners, automatically request review when pull request is submitted
* @dfsek @solonovamax @duplexsystem @astrsh @justaureus
# Platforms
/platforms/ @dfsek @solonovamax @duplexsystem @justaureus
/platforms/bukkit @dfsek @solonovamax @duplexsystem @justaureus @OakLoaf
# Common
/common/ @dfsek @solonovamax @duplexsystem @astrsh
# Gradle Stuff
/buildSrc/ @dfsek @solonovamax @duplexsystem
*.gradle.kts @dfsek @solonovamax @duplexsystem
/gradle/ @dfsek @solonovamax @duplexsystem

108
.github/ISSUE_TEMPLATE/BUG_REPORT.md vendored Normal file
View File

@ -0,0 +1,108 @@
---
name: "Bug Report"
about: "Open a bug report to help us identify issues with Terra."
title: "[Bug] <Put your title here>"
labels: "Type: Bug, Status: Pending"
assignees: ""
---
<!--
##############################################################################
## WARNING! ##
## IGNORING THE FOLLOWING TEMPLATE WILL RESULT IN YOUR ISSUE BEING CLOSED ##
##############################################################################
-->
## Pre-Issue Checklist
<!--
Please go through this checklist item by item and make sure you have successfully completed each of these steps.
- You must be on the LATEST version of Terra to receive any support. There is no support for older versions of Terra.
- Make sure that this is not a *specific* compatibility issue with another terrain generation mod.
Do not request *specific* compatibility with mods or plugins (e.g. "Compatibility with TechCraft v7").
That should be implemented in an addon, **not** in the main project.
*General* compatibility (e.g. "Ability to pull Vanilla/Modded features from parent biomes") will be considered in the main project.
- Make sure that there are no already existing issues open with your problem. If you open a duplicate, it will be closed as such.
- Make sure that it is actually Terra causing the issue, and not another mod/plugin.
You can do this by testing to see if you can recreate the issue without Terra installed.
- Make sure that this is not an issue with a specific Terra *pack* or Terra *addon*, and instead applies to all of Terra.
- Make sure that you attach a copy of the latest.log file.
Putting *just* the exception IS NOT ENOUGH. We need to be able to check that there wasn't anything else before that caused it.
- Make sure that you have filled out all the required information and given descriptions of everything.
You must put an x in all the boxes you have completed. (Like this: [x])
To make sure that your issue is rendered properly, you may check the "Preview" tab (below the title) to see a rendered version of it before you submit it.
-->
- [ ] I have checked that I am on the latest version of Terra.
- [ ] I have searched the github issue tracker for similar issues, including
closed ones.
- [ ] I have made sure that this is not a bug with another mod or plugin, and it
is Terra that is causing the issue.
- [ ] I have checked that this is an issue with Terra and not an issue with the
pack I am using.
<!-- If this is an issue with the default Terra pack, please open an issue on the pack repo: https://github.com/PolyhedralDev/TerraOverworldConfig/issues/new -->
- [ ] I have attached a copy of the `latest.log` file
- [ ] I have filled out and provided all the appropriate information.
## Environment
<!-- You can fill out the different items by putting the correct value beside each cell. -->
| Name | Value |
|------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| Terra Version | <!-- Put your Terra version here. (remove the comment) -->
| Platform / Platform Version | <!-- Put your platform and platform version here. (remove the comment) (eg. Spigot, Fabric, Paper, etc.) (If you are using the Region generator, put that here instead) -->
| Any External Plugins or Mods | <!-- Put a list of all the plugins or mods you have installed here. (remove the comment) (Make sure to NOT include any new lines) -->
| Terra Packs In Use | <!-- Put a list of all the Terra packs you have installed here. (remove the comment) (Make sure to NOT include any new lines) (/te packs may be used to get a list) -->
| Terra Addons In Use | <!-- Put a list of all the Terra addons you have installed here. (remove the comment) (Make sure to NOT include any new lines) (/te addons may be used to get a list) -->
## Issue Description
<!--
Put a quick description of the issue here.
Example: 'When generating terrain, something causes the chunks to not load properly', etc.
-->
### Steps to reproduce
<!--
Describe what you were doing when this happened.
Make sure to include ALL information. Including anything you were doing before that may have caused it.
-->
1. <!-- Put step #1 here. -->
2. <!-- Put step #2 here. -->
3. <!-- etc. -->
### Expected behavior
<!-- Describe what you think *should* happen here: -->
### Actual behavior
<!-- Describe what *actually* happens here: -->
<!-- example: When I do _______, it actually does _______ -->
### Full stacktrace
<details>
<summary>Exception Stacktrace</summary>
<!--
If Terra logs an exception, please put it in the following section: (You will find any error logs in your console, or your latest.log)
Note: this *must* be included, in ADDITION to the latest.log file.
-->
```
```
</details>
### Additional details
<!-- Any other information you think should be added -->

View File

@ -0,0 +1,72 @@
---
name: "Feature Request"
about: "Give us suggestions of features we could add to Terra."
title: "[Feature] <Put your title here>"
labels: "Type: Enhancement, Status: Pending"
assignees: ""
---
<!--
########################################################################################
## WARNING! ##
## IGNORING THE FOLLOWING TEMPLATE WILL RESULT IN YOUR FEATURE REQUEST BEING CLOSED ##
########################################################################################
-->
### Pre-Request Checklist
<!--
Please go through this checklist item by item and make sure you have successfully completed each of these steps.
- You must be on the LATEST version of Terra to make sure your feature hasn't been added yet.
- Make sure that there are no already existing feature requests similar to yours. (Including closed!) If you open a duplicate, it will be closed as such.
- Make sure that this is actually in the scope of Terra.
- Make sure that this is not a feature request that should be made for a specific Terra *pack*, and instead applies to all of Terra.
- Make sure that you attach a copy of the latest.log file, if there are any exceptions thrown in the console.
Putting *just* the exception IS NOT ENOUGH. We need to be able to check that there wasn't anything else before that caused it.
You must put an x in all the boxes you have completed. (Like this: [x])
To make sure that your issue is rendered properly, you may check the "Preview" tab (below the title) to see a rendered version of it before you submit it.
-->
- [ ] I have checked that I am on the latest version of Terra.
- [ ] I have searched github for similar features requests, including closed
ones, and found none.
- [ ] I believe this is within the scope of Terra.
- [ ] This feature request is for *all* of Terra, and isn't something that
should be implemented by a pack or addon.
## Feature Description
<!--
Quickly describe the basics of your feature request.
Example: 'More noise presets should be added to Terra.'
-->
### What Problem Does This Solve?
<!--
Describe here what the issue is that you have.
Examples: 'When I do _______, it annoys me that _______ does _______.' or 'There is not enough customization in _______ to do _______.'
NOTE: This should NOT be used for a bug report. If this is unintentional, then please submit a bug report instead.
-->
### A Solution You'd Like
<!-- Provide a clear and accurate description of how you would like this to be solved. -->
### Alternative Solutions
<!-- Provide a description of alternatives you have considered to this. -->
1. <!-- Alternative #1. -->
2. <!-- Alternative #2. -->
3. <!-- Alternative #3. -->
### Additonal Context
<!--
Is there any additional context you would like to add?
If not, you may remove this section.
-->

13
.github/ISSUE_TEMPLATE/OTHER_ISSUES.md vendored Normal file
View File

@ -0,0 +1,13 @@
---
name: "Other Issue"
about: "Use this template if your issue doesn't accurately fit into any of the
other categories."
title: ""
labels: "Type: Question, Status: Pending"
assignees: ""
---
## Describe the issue
<!-- Please describe the issue as clearly and as concisely as possible, without missing any details. -->

11
.github/ISSUE_TEMPLATE/config.yml vendored Normal file
View File

@ -0,0 +1,11 @@
blank_issues_enabled: false
contact_links:
- name: Which Issue Template do I Choose?
url: https://github.com/PolyhedralDev/Terra/wiki/How-To-Choose-An-Issue-Template
about: Click this if you don't know which issue template to select. This will help you make sure you choose the right one and provide enough information for us to help you.
- name: Terra Wiki
url: https://github.com/PolyhedralDev/Terra/wiki
about: Documentation for all things Terra.
- name: Join the Support Discord
url: https://discord.dfsek.com
about: If you have a basic support question, join the Discord instead.

104
.github/PULL_REQUEST_TEMPLATE.md vendored Normal file
View File

@ -0,0 +1,104 @@
# Pull Request
## Description
<!-- Include a description of the PR here -->
<!--
If applicable, include 'Fixes #XXXX' or 'Closes #XXXX' for any related open issues.
This helps us relate, track, and close the relevant issues.
-->
### Changelog
<!--
Fill out a changelog below of what has been done, and what might be planned to be done.
You may delete this if your PR is not adding new features, only fixing bugs or adding translations.
-->
- [ ] <!-- First thing -->
- [ ] <!-- A requirement of the first thing. -->
- [ ] <!-- A second requirement of the first thing. -->
- [ ] <!-- Second thing -->
- [ ] <!-- etc. -->
## Checklist
<!--
Select the options below that apply.
You must put an x in all the boxes that it applies to. (Like this: [x])
-->
#### Mandatory checks
- [ ] The base branch of this PR is an unreleased version branch (that has a `ver/` prefix)
or is a branch that is intended to be merged into a version branch.
<!--
This is not applicable if the PR is a version branch itself.
PRs for new versions should use the `master` branch instead.
-->
- [ ] There are no already existing PRs that provide the same changes.
<!-- If this is not applicable, the PR will be removed as a duplicate. -->
- [ ] The PR is within the scope of Terra (i.e. is something a configurable terrain generator should be doing).
- [ ] Changes follow the code style for this project.
<!-- There is an included `.editorconfig` file in the base of the repo. Please use a plugin for your IDE of choice that follows those settings. -->
- [ ] I have read the [`CONTRIBUTING.md`](https://github.com/PolyhedralDev/Terra/blob/master/CONTRIBUTING.md)
document in the root of the git repository.
#### Types of changes
- [ ] Bug Fix <!-- Changes include bug fixes. -->
- [ ] Build system <!-- Changes the build system. -->
- [ ] Documentation <!-- Changes add to or improve documentation. -->
- [ ] New Feature <!-- Changes add new functionality to Terra. -->
- [ ] Performance <!-- Changes improve the performance of Terra. -->
- [ ] Refactoring <!-- Changes do not add any new code, only moves code around. -->
- [ ] Repository <!-- Changes affect the repository. E.g. changes to the `README.md` file. -->
- [ ] Revert <!-- Changes revert previous commits. -->
- [ ] Style <!-- Changes update style, namely the .editorconfig file. -->
- [ ] Tests <!-- Changes add or update tests. -->
- [ ] Translation <!-- Changes include translations to other languages for Terra. -->
#### Compatibility
<!-- The following options determine if the PR pertains to a major, minor, or patch version bump -->
- [ ] Introduces a breaking change
<!--
Breaking changes are any fix or feature that breaks some previous functionality to Terra / is not backwards compatible.
Breaking changes do not include:
- changes that are backwards compatible and will work with *any* previously existing supported features.
- changes to code marked as in a pre-release
state (annotated with @Incubating, @Preview, @Experimental
or in a package called something similar to the previous annotations)
-->
- [ ] Introduces new functionality in a backwards compatible way.
- [ ] Introduces bug fixes
#### Documentation
- [ ] My change requires a change to the documentation.
- [ ] I have updated the documentation accordingly.
#### Testing
- [ ] I have added tests to cover my changes.
- [ ] All new and existing tests passed.
<!--
Tests are typically not necessary for small changes.
Including *some* testing is recommended for large changes where applicable.
-->
#### Licensing
<!-- In order to be accepted, your changes must be under the GPLv3 license. Please check one of the following: -->
- [ ] I am the original author of this code, and I am willing to
release it under [GPLv3](https://www.gnu.org/licenses/gpl-3.0.en.html).
- [ ] I am not the original author of this code, but it is in public domain or
released under [GPLv3](https://www.gnu.org/licenses/gpl-3.0.en.html) or a compatible license.
<!--
Please provide reliable evidence of this.
NOTE: for compatible licenses, you must make sure to add the included license somewhere in the program, if so required.
(And even if it's not required, it's still nice to do it. Also add attribution somewhere.)
-->

View File

@ -1,40 +0,0 @@
# This workflow will build a Java project with Gradle
# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
name: Java CI with Gradle
on:
push:
tags:
- "v*" # Push events to matching v*, i.e. v1.0, v20.15.10
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up JDK 1.8
uses: actions/setup-java@v1
with:
java-version: 1.8
- name: Build Terra
run: gradle shadowJar
- name: Upload artifacts
uses: actions/upload-artifact@v2
with:
name: Package
path: build/libs
- name: Publish release
uses: marvinpinto/action-automatic-releases@latest
with:
repo_token: ${{ secrets.GITHUB_TOKEN }}
prerelease: false
files: |
build/libs/Terra-*.jar
LICENSE

47
.github/workflows/gradle-build.yml vendored Normal file
View File

@ -0,0 +1,47 @@
# This workflow uses actions that are not certified by GitHub.
# They are provided by a third-party and are governed by
# separate terms of service, privacy policy, and support
# documentation.
# This workflow will build a package using Gradle and then publish it to GitHub packages when a release is created
# For more information see: https://github.com/actions/setup-java/blob/main/docs/advanced-usage.md#Publishing-using-gradle
name: Gradle Build
on: [ pull_request ]
jobs:
build:
runs-on: ubuntu-latest
permissions:
contents: read
steps:
- uses: actions/checkout@v4.2.2
- name: Set up JDK 21
uses: actions/setup-java@v4.7.1
with:
java-version: '21'
distribution: 'temurin'
server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
settings-path: ${{ github.workspace }} # location for the settings.xml file
- uses: burrunan/gradle-cache-action@v3.0.1
name: Build Terra
with:
# Specifies arguments for Gradle execution
# If arguments is missing or empty, then Gradle is not executed
arguments: build
# arguments can be multi-line for better readability
# arguments: |
# --no-paralell
# build
# -x test
# Gradle version to use for execution:
# wrapper (default), current, rc, nightly, release-nightly, or
# versions like 6.6 (see https://services.gradle.org/versions/all)
gradle-version: wrapper
# Properties are passed as -Pname=value
properties: |
kotlin.js.compiler=ir
kotlin.parallel.tasks.in.project=true

152
.gitignore vendored
View File

@ -52,6 +52,7 @@ gradle-app.setting
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
*.hprof
### JetBrains template
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
@ -64,6 +65,8 @@ hs_err_pid*
.idea/**/dictionaries
.idea/**/shelf
.idea/
# Generated files
.idea/**/contentModel.xml
@ -84,14 +87,14 @@ hs_err_pid*
# When using Gradle or Maven with auto-import, you should exclude module files,
# since they will be recreated, and may cause churn. Uncomment if using
# auto-import.
.idea/artifacts
.idea/compiler.xml
.idea/jarRepositories.xml
.idea/modules.xml
.idea/*.iml
.idea/modules
*.iml
*.ipr
.idea/artifacts
.idea/compiler.xml
.idea/jarRepositories.xml
.idea/modules.xml
.idea/**.iml
.idea/modules
*.iml
*.ipr
# CMake
cmake-build-*/
@ -126,20 +129,125 @@ fabric.properties
# Android studio 3.1+ serialized cache file
.idea/caches/build_file_checksums.ser
# Ignore Gradle build output directory
build
/target/
### Windows template
# Windows thumbnail cache files
Thumbs.db
Thumbs.db:encryptable
ehthumbs.db
ehthumbs_vista.db
.idea/sonarlint/**
.idea/codeStyles/**
.idea/**.xml
.idea/modules/**.iml
# Dump file
*.stackdump
# Folder config file
[Dd]esktop.ini
# Recycle Bin used on file shares
$RECYCLE.BIN/
# Windows Installer files
*.cab
*.msi
*.msix
*.msm
*.msp
# Windows shortcuts
*.lnk
### macOS template
# General
.DS_Store
.AppleDouble
.LSOverride
# Icon must end with two \r
Icon
# Thumbnails
._*
# Files that might appear in the root of a volume
.DocumentRevisions-V100
.fseventsd
.Spotlight-V100
.TemporaryItems
.Trashes
.VolumeIcon.icns
.com.apple.timemachine.donotpresent
# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk
### Linux template
*~
# temporary files which can be created if a process still has a handle open of a deleted file
.fuse_hidden*
# KDE directory preferences
.directory
# Linux trash folder which might appear on any partition or disk
.Trash-*
# .nfs files are created when an open file is removed but is still being accessed
.nfs*
### Application
# Archive love files
*.log.gz
# binary files
*.bin
# Database files
*.db
# Cache files
*.meta
*.data
### JEnv template
# JEnv local Java version configuration file
.java-version
# Used by previous versions of JEnv
.jenv-version
### VisualStudioCode template
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
*.code-workspace
# Local History for Visual Studio Code
.history/
### NetBeans template
**/nbproject/private/
**/nbproject/Makefile-*.mk
**/nbproject/Package-*.bash
build/
nbbuild/
dist/
nbdist/
.nb-gradle/
###
**/target/
!lib/*.jar
.idea/Terra.iml
/run/
.idea/**.iml
/lang/
/packs/
/config.yml
/region/
**/testDir/
platforms/**/run/**
#Vale Config File
**/.vale.ini

429
CODE_OF_CONDUCT.md Normal file
View File

@ -0,0 +1,429 @@
# Terra Community Code of Conduct
# TL;DR
Polyhedral Development is dedicated to providing a harassment-free experience
for everyone, regardless of gender, gender identity and expression, preferred
pronouns, sexual orientation, disability, physical appearance, age, race,
religion, etc. We do not tolerate harassment of participants in any form.
This code of conduct applies to all Terra community spaces, including the github
discussions tab, our [community discord server](https://discord.gg/PXUEbbF),
the [community subreddit](https://reddit.com/r/TerraGenerator), or any other
Terra space, both online and off. Anyone in violation of this code, as
determined by the applicable moderators, may be subject to verbal warning,
expulsion from these spaces, or future events and activities for an undetermined
amount of time.
Some Terra community spaces may have additional rules in place, which will be
made clearly available to all participants. Participants are responsible for
knowing and abiding by these rules.
# Longer version
Polyhedral Development is dedicated to providing a harassment-free experience
for everyone. We do not tolerate harassment of participants in any form.
## When and How to Use These Guidelines
This code of conduct applies to all Terra community spaces, both online and off.
This applies to the github discussion tab, the
[Polyhedral Development community discord server](https://discord.gg/PXUEbbF),
and any other Terra community. In addition, we may choose to invoke them in
instances of harassment outside the Terra communities, and we will punish the
responsible individuals appropriately. We will not tolerate harassment in any
form, even outside of Terra.
Some Terra spaces may have additional rules in place, which will be made clearly
available to participants. Participants are responsible for knowing and abiding
by these rules, in addition to this code of conduct.
## Expected Behavior
The following behaviors are expected of all members of the Terra community:
### Be Respectful
Value each other's ideas, styles and viewpoints. We may not always agree, but
disagreement is no excuse for poor manners. Be open to different possibilities
and to being wrong. Be respectful in all interactions and communications,
especially when debating the merits of different options. Be aware of your
impact and how intense interactions may be affecting people. Be direct,
constructive and positive. Take responsibility for your impact, and your
mistakes if someone says they have been harmed through your words or actions,
listen carefully, apologize sincerely, and correct the behavior going forward.
#### Be Prepared to Admit When You are Wrong
Any member of the Terra community should always be open to new ideas and must
always be open to the possibility of being wrong. Nobody can always be right,
and we are only human; we are
[fallible](https://www.merriam-webster.com/dictionary/fallible) by nature. It is
okay to make mistakes, but we must be willing to admit when we make one.
### Be Direct but Professional
We are likely to have some discussions about if and when criticism is respectful
and when it's not. We must be able to speak directly when we disagree and when
we think we need to improve. We cannot withhold hard truths. Doing so
respectfully is hard, doing so when others don't seem to be listening is harder,
and hearing such comments when one is the recipient can be even harder still. We
need to be honest and direct, as well as respectful.
### Be Inclusive
Seek diverse perspectives. Diversity of views and of people on teams powers
innovation, even if it is not always comfortable. Encourage all voices. Help new
perspectives be heard and listen actively. If you find yourself dominating a
discussion, it is especially important to step back and encourage other voices
to join in. Be aware of how much time is taken up by dominant members of the
group. Provide alternative ways to contribute or participate when possible.
Be inclusive of everyone in an interaction, respecting and facilitating people's
participation whether they are:
- Not native language speakers
- Coming from a different culture
- Using pronouns other than "he", "she", or "they"
- Living in a different time zone
- Facing other challenges to participate
- Or anything else. Be respectful of *everyone* at *all times*.
Think about how you might facilitate alternative ways to contribute or
participate. If you find yourself dominating a discussion, step back. Make way
for other voices and listen actively to them.
### Understand Different Perspectives
Our goal should not be to "win" every disagreement or argument. A more
productive goal is to be open to ideas that make our own ideas better. Strive to
be an example for inclusive thinking. "Winning" is when different perspectives
make our work richer and stronger. That means, you must pay attention to all
ideas proposed. Don't disregard one without giving it the attention it deserves.
### Appreciate and Accommodate Our Similarities and Differences
People come from many cultures and backgrounds. Cultural differences can
encompass everything from official religious observances to personal habits to
clothing. Be respectful of anyone with different cultural practices, attitudes
and beliefs. Work to eliminate your own biases, prejudices and discriminatory
practices. Think of others' needs from their point of view. Use preferred
titles (including pronouns<sup>[\[1\]](#1)</sup>) and the appropriate tone of
voice. Respect people's right to privacy and confidentiality. Be open to
learning from and educating others as well as educating yourself; it is
unrealistic to expect someone to know the cultural practices of every ethnic and
cultural group. Therefore we must be ready to correct someone if they make a
mistake, and must be ready ourselves to change and learn if we make a mistake.
### Lead by Example
By matching your actions with your words, you become a person others want to
follow. Your actions influence others to behave and respond in ways that are
valuable and appropriate for our organizational outcomes. Design your community
and your work for inclusion. Hold yourself and others accountable for inclusive
behaviors.
## Behavior That Will Not Be Tolerated
The following behaviors are considered to be unacceptable and will not be
tolerated:
### Violence and Threats of Violence
Violence and threats of violence are not acceptable - online or offline. This
includes incitement of violence toward any individual, including encouraging a
person to commit self-harm, engage in self-harm, or put themselves in a negative
position (e.g. one which can lead to an increase of depression, etc.).
### Personal Attacks
Conflicts will inevitably arise, but frustration should never turn into a
personal attack. It is not okay to insult, demean or belittle others. Attacking
someone for their opinions, beliefs and ideas is not acceptable. It is important
to speak directly when we disagree and when we think we need to improve, but
such discussions must be conducted respectfully and professionally, remaining
focused on the issue at hand.
### Derogatory Language
Offensive, unwelcome, or hurtful comments related to:
- Gender
- Gender identity or expression
- Preferred pronouns<sup>[\[1\]](#1)</sup>
- Marital status
- Sex
- Sexual orientation or identity
- Native language
- Age
- (Dis)ability
- Mental illness
- Neuro(a)typicality
- Race and/or ethnicity
- Physical appearance
- A person's lifestyle choices or practices,
- A person's physical condition
- A person's mental condition
- Socioeconomic status
- Religion
- Employment
- Or anything really. Just don't be offensive towards people, insult them, or
make unwanted comments.
is not acceptable. This includes deliberately referring to someone by a gender
that they do not identify with, and/or questioning the legitimacy of an
individual's gender identity. If you're unsure if a word is derogatory, don't
use it. This also includes repeated subtle and/or indirect discrimination; when
asked to stop, stop the behavior in question.
### Unwelcome Sexual Attention or Physical Contact
Unwelcome sexual attention or unwelcome physical contact is not acceptable. This
includes sexualized comments, jokes or imagery in interactions, communications
or presentation materials, as well as inappropriate touching, groping, or sexual
advances. Additionally, touching a person without permission, including
sensitive areas such as their hair, pregnant stomach, mobility device (
wheelchair, scooter, etc) or tattoos is unacceptable. This includes physically
blocking or intimidating another person. Physical contact or simulated physical
contact (e.g. emojis like ":&#8203;kiss:", ":hug:", or ":kiss_mark:", textual
descriptions like "\*hug\*", "\*backrub\*", or "\*kisses you\*", etc.) without
affirmative consent or after a request to stop will not be accepted.
### Sexual Behaviour Where it is Not Appropriate
Uninvited or off-topic sexual images, text, or behaviour in spaces where they're
not appropriate will not be accepted whatsoever. We are an open community, which
means spaces must be appropriate for all ages, and everybody must feel
comfortable. Discussion of sexual things, will be prohibited unless otherwise
noted.
### Discussion of Sensitive Topics
Discussion of sensitive topics when asked to stop, or when not appropriate.
Including, but not limited to:
- Anything sexual
- Gore
- Suicide
- Self harm
- Anything related to death
- Or really anything that someone may be sensitive about.
shall not be tolerated. As a community for all ages and all kinds of people, we
must cater to everyone, and must make sure everyone feels comfortable here.
Repeatedly breaking someone else's boundaries will not be tolerated.
### Disruptive Behavior
Sustained disruption of events, forums, or meetings, online or otherwise,
including talks and presentations, will not be tolerated. This includes:
- 'Talking over', 'heckling', or otherwise disrupting speakers.
- Making derogatory comments about someone else's choices, pushing people to do
something they do not wish to do, talking about their choices or personal
preferences to others, or pressuring them to do something they don't wish to -
physically or through jeering.
- Behaviour that intentionally disrupts an event.
- Otherwise influencing actions that may cause hostility in the session.
### Influencing Unacceptable Behavior
We will treat influencing or leading such activities the same way we treat the
activities themselves, and thus the same consequences apply. To make someone do
something bad is the same thing as if you were to do it yourself, and we will
not tolerate it.
### Stalking or Following
Stalking or following in any form (offline or online) is unnacceptable. In
addition, you may not take pictures or record video of others without their
express permission or when asked to stop. Any individual may also request for
you to delete all footage you have of them, even if you took it with their prior
consent.
### Publication of Personal Information
The publication of personally identifying information (commonly known
as "[doxxing](https://en.wikipedia.org/wiki/Doxing)") is directly prohibited.
You may not publish information that someone wants to keep private, unless it is
necessary to protect vulnerable people from intentional abuse. Addditionally,
you may not deliberately "out" any aspect of a person's identity without their
consent, this includes gender, pronouns, sexual identity, etc.
Unless it pretains to a case of harassment, as outlined here, in which case some
personally identifying information may need to be brought up in private with the
appropriate moderation team to help aid our efforts in keeping the community
safe.
### Deliberate Misuse of Pronouns<sup>[\[1\]](#1)</sup> or Names
As an inclusive community, we must respect everyone. That means respecting the
pronouns or names they wish for us to use. Deliberate misgendering, misuse of
preferred pronouns<sup>[\[1\]](#1)</sup>, or use of 'dead' or rejected names is
not to be tolerated. (If someone
*accidentally* uses the incorrect pronouns, gender, or name, politely ask them
to use the correct pronouns/gender/name. But if they are to continue using the
incorrect pronouns, gender, or name, then you should escalate and report them to
us.)
### Not Stopping After Multiple Requests
If someone asks you to stop doing something, then you should stop. Continuing to
do it may be considered harassment, and can lead you to be removed from our
community.
## Complains We May Ignore
Additionally, Terra prioritizes marginalized people's safety over privileged
people's comfort. We reserve the right to ignore complaints regarding:
- Claims of discrimination against non-marginalized or oppressed groups (eg.
being 'superphobic', meaning to not support people who are
'superstraight', which is a dog whistle for transphobic groups, or being '
cisphobic' without large amounts of evidence, etc.), or claims of
discrimination with no evidence. (Basically, don't report 'cisphobia' to us,
because it doesn't exist. But if someone is mocking you or making fun of you
for being cis, and it is *really* getting out of hand, then do tell us.)
- Reasonable communication of boundaries, such as "leave me alone," "go away,"
or "I'm not discussing this with you." (If someone is asking you to stop, that
is not reason for you to report them as harassing you.)
- Communicating in a 'tone' you don't
find [congenial](https://www.thefreedictionary.com/congenial). (You may not
report someone for harassment for being 'annoyed with you' or 'talking sternly
to you')
- Criticizing or calling out racist, sexist, discriminatory, or otherwise
oppressive behavior or assumptions. (You may not say that someone is harassing
you if they are telling you to stop discriminating against someone.)
- Disagreements that do not qualify as harassment. If you have a simple
disagreement with someone, and they have not been discriminating to anyone, in
any form, then we will not take action against them. Two people are allowed to
disagree on things without it getting toxic.
We may also additionally choose to enact punishment for submitting a complaint
in bad-faith or without adequate justification, if we deem necessary; if you're
submitting a complaint just to troll or to annoy people, we may choose to have
you banned or removed from the community spaces. Don't waste our time.
In order to protect volunteers from abuse and burnout, we reserve the right to
reject any report we believe to have been made in bad faith or with misintent.
Reports intended to silence legitimate criticism may be deleted without
response.
## Reporting
Terra has a global moderation team which is currently comprised of the following
members:
- solonovamax
- discord: [@solonovamax#6983](https://discord.com/channels/@me/566146322273402881)*
- github: [@solonovamax](https://github.com/solonovamax)
- email: [solonovamax@12oclockpoint.com](mailto:solonovamax@12oclockpoint.com)
- dfsek
- discord: [@dfsek#4208](https://discord.com/channels/@me/378350362236682240)*
- github: [@dfsek](https://github.com/dfsek)
- email: [dfsek@protonmail.com](mailto:dfsek@protonmail.com)
- duplex (duplexsystem)
- discord: [@Duplex#0797](https://discord.com/channels/@me/356822848641171456)*
- github: [@duplexsystem](https://github.com/duplexsystem)
- email: [duplexsys@protonmail.com](mailto:duplexsys@protonmail.com)
\* The preferred method of communication is through discord. Although we will
still be responsive on the other platforms, we will be more responsive on
discord.
These are people you can contact for anything regarding this code of conduct.
If you are being harassed by a member of the Terra community, or by someone in a
Terra community space, notice that someone else is being harassed, or have any
other concerns, please contact a moderator of the platform it occurred on, or
someone on the global moderation team. If the person who is harassing you is on
the global moderation team, they
will [recuse](https://www.thefreedictionary.com/recuse) themselves from handling
your incident. (Meaning: if you are reporting someone on the team, they will not
be involved in the discussion.) We will respond within a reasonable time frame,
but generally within about 1 day.
This code of conduct applies to Terra community spaces, but if you are being
harassed by a member of Terra *outside* our spaces, we still want to know about
it as we may choose to take action within our community. We will take all
good-faith reports seriously and will always attempt to handle them
appropriately. This includes harassment outside our spaces and harassment that
took place at any point in time. The moderation team reserves the right to
exclude people from Terra communities based on their past behavior, including
behavior outside Terra spaces and behavior towards people who are not in Terra.
Note: although we only have the ability to moderate official community spaces,
if you are being harassed by someone in a non-official community space, and the
moderation team of that platform refuses to do anything to help you (or even if
they *do* help you), then you should notify us so that we may take appropriate
action.
We will respect confidentiality requests for the purpose of protecting victims
of abuse. At our discretion, we may publicly name a person which we have
received harassment complaints about, or privately warn third parties about
them, but only if we believe that doing so will increase the safety of Terra
community members or the general public. We will not name harassment victims or
reporters of harassment
(assuming the report was made in good-faith) without their explicit consent; all
reports will remain anonymous by default.
## Consequences of Unacceptable Behavior
Participants asked to stop any harassing behavior are expected to comply
immediately. Whether or not you comply immediately, you may still face
consequences for you actions, but if the harasser doesn't comply immediately
then we may choose to take additional actions to protect the Terra community
members or the individual being harassed.
Violation of this code can result in being asked to leave an event or online
space, either temporarily or for the duration of the event, or being banned from
participation in spaces, or future events and activities in perpetuity. If a
participant engages in harassing behavior, the global moderation team may take
any action they deem appropriate, up to and including expulsion from all Terra
community spaces and identification of the participant as a harasser to other
Terra community members or the general public. Bad behavior from any community
member, including those with decision-making authority, will not be tolerated.
In addition, any participants who abuse the reporting process will be considered
to be in violation of these guidelines and subject to consequences. False
reporting, especially to retaliate or exclude, will not be accepted or
tolerated.
## Questions
if you have further questions for anything not addressed here, you may open an
issue on this github repo, or contact a member of the global moderation team.
## License and Attribution
This set of guidelines is distributed under a
[Creative Commons Attribution-ShareAlike license](https://creativecommons.org/licenses/by-sa/3.0/).
These guidelines have been adapted with modifications from the following sources:
- [Mozilla's Community Participation Guidelines](https://www.mozilla.org/en-US/about/governance/policies/participation/)
- The [Ubuntu Code of Conduct](https://ubuntu.com/community/code-of-conduct)
- Mozilla's [View Source Conference Code of Conduct](https://viewsourceconf.org/berlin-2016/code-of-conduct/)
- The [Rust Language Code of Conduct](https://www.rust-lang.org/policies/code-of-conduct)
- The [Stumptown Syndicate's Citizen Code of Conduct](http://citizencodeofconduct.org/)
- The [LGBTQ in Technology Code of Conduct](https://lgbtq.technology/coc.html)
- The [WisCon code of conduct](http://wiscon.net/policies/anti-harassment/code-of-conduct/)
## Notes
#### \[1\]
You provide a set of pronouns that everyone is comfortable addressing you with.
Although some people are comfortable
using [neopronouns](https://www.mypronouns.org/neopronouns), not everyone is.
Therefore, if you use neopronouns, you should have at *least*
one set of more common pronouns (One of he/him, she/her, or they/them; it
doesn't matter which one. Anyone who doesn't respect your basic pronouns will be
removed from the community.) that people may use, should they so choose, as some
people are not comfortable
using [neopronouns](https://www.mypronouns.org/neopronouns). But if someone
refuses to use your more common pronouns, you should report them to us.
Additionally, you may not ask people to use unreasonable pronouns, such as '
acab/acabself', 'that/bitch', 'ur/mom', or anything else that may be considered
disrectful. Doing so will be considered mockery of individuals who use
non-standard pronouns and is very disrespectful.

404
CONTRIBUTING.md Normal file
View File

@ -0,0 +1,404 @@
# Contributing to Terra
First off, thank you for considering contributing to Terra. It's people like you
that make Terra such a great tool.
Following these guidelines helps to effectively use the time of the developers
managing and developing this open source project, making it more enjoyable for
all of us.
Terra is an open source project and we love to receive contributions from our
community, you! There are many ways to contribute, from writing tutorials or
blog posts, improving the documentation, submitting bug reports and feature
requests or writing code which can be incorporated into Terra.
The following is a set of guidelines for contributing to Terra and its packages,
which are hosted in
the [PolyhedralDev Organization](https://github.com/PolyhedralDev) on GitHub.
These are mostly guidelines, not rules. Use your best judgment, and feel free to
propose changes to this document in a pull request.
#### Table Of Contents
[Code of Conduct](#code-of-conduct)
[I don't want to read this whole thing, I just have a question!!!](#i-dont-want-to-read-this-whole-thing-i-just-have-a-question)
[Getting Started](#getting-started)
- [Your First Contribution](#your-first-contribution)
- [Reporting Bugs](#reporting-bugs)
- [Before Submitting A Bug Report](#before-submitting-a-bug-report)
- [How Do I Submit A (Good) Bug Report?](#how-do-i-submit-a-good-bug-report)
- [Suggesting Enhancements](#suggesting-enhancements)
- [Before Submitting An Enhancement Suggestion](#before-submitting-an-enhancement-suggestion)
- [How Do I Submit A (Good) Enhancement Suggestion?](#how-do-i-submit-a-good-enhancement-suggestion)
- [Pull Requests](#pull-requests)
- [Before Submitting A Pull Request](#before-submitting-a-pull-request)
- [How Do I Submit A (Good) Pull Request?](#how-do-i-submit-a-good-pull-request)
[Styleguides](#styleguides)
- [Git Commits](#git-commits)
- [Committing](#committing)
- [Git Commit Messages](#git-commit-messages)
- [Code Styleguide](#code-styleguide)
- [Documentation Styleguide](#documentation-styleguide)
- TODO
[Coding Pratices](#coding-practices)
- [Compatibility](#compatibility)
- [General Compatibility](#general-compatibility)
- [Specific Compatibility](#specific-compatibility)
- [Platform-Agnostic Design](#platform-agnostic-design)
- [Data-Driven](#data-driven)
## Code of Conduct
This project and everyone participating in it is governed by
the [Terra of Conduct](CODE_OF_CONDUCT.md). By participating, you are expected
to uphold this code. Please report unacceptable behavior
to [Terra global moderation team](CODE_OF_CONDUCT.md#Reporting).
## I don't want to read this whole thing I just have a question!!!
> **Note:** Please don't file an issue to ask a question. You'll get faster
> results by using the resources below.
We have an official discord server where you can request help from various users
- [The official PolyhedralDev discord server](https://discord.dfsek.com)
## Getting Started
### Your First Contribution
Unsure where to begin contributing to Terra? You can start by looking through "
beginner" and "help wanted" issues:
- [Beginner issues](https://github.com/PolyhedralDev/Terra/labels/Note%3A%20Good%20First%20Issue)
- issues which should be friendly to anyone new to terra.
- [Help wanted issues](https://github.com/PolyhedralDev/Terra/labels/Note%3A%20Help%20Wanted)
- issues which should be a bit more involved than "beginner" issues.
New to github? Working on your first Pull Request? Check
out [How to Contribute to an Open Source Project on GitHub](https://app.egghead.io/playlists/how-to-contribute-to-an-open-source-project-on-github)
to get you up on your feet.
At this point, you're ready to make your changes! Feel free to ask for help;
everyone is a beginner at first!
If a maintainer asks you to "rebase" your PR, they're saying that a lot of code
has changed, and that you need to update your branch so it's easier to merge.
### Reporting Bugs
This section guides you through submitting a bug report for Terra. Following
these guidelines helps maintainers and the community understand your report, and
spend their time fixing the issue instead of understanding what you mean.
Before creating bug reports, please
check [this list](#before-submitting-a-bug-report) as you might find out that
you don't need to create one. When you are creating a bug report,
please [include as many details as possible](#how-do-i-submit-a-good-bug-report)
.
> **Note:** If you find a **Closed** issue that seems like it is the same thing
> that you're experiencing, open a new issue and include a link to the original
> issue in the body of your new one.
#### Before Submitting A Bug Report
- Join the [discord server](https://discord.dfsek.com) to help resolve simple
issues.
- You must be on the LATEST version of Terra to receive any support. There is no
support for older versions of Terra.
- Make sure that this is not a *specific* compatibility issue with another
terrain generation mod. Do not request *specific* compatibility with mods or
plugins (e.g. "Compatibility with TechCraft v7"). That should be implemented
in an addon, **not** in the platform project.
*General* compatibility (e.g. "Ability to pull Vanilla/Modded features from
parent biomes") will be considered in the platform project.
- Search for
any [already existing issues](https://github.com/PolyhedralDev/Terra/issues?q=is%3Aissue+)
open with your problem. If you open a duplicate, it will be closed as such.
- Make sure that it is actually Terra causing the issue, and not another
mod/plugin. You can do this by testing to see if you can recreate the issue
without Terra installed.
- Double check that this is not an issue with a specific Terra *pack* or Terra *
addon*, and instead applies to all of Terra.
- Include a copy of the latest.log file. Putting *just* the exception is not
enough. We need to be able to check that there wasn't anything else before
that caused it.
- Be sure to fill out all the required information and give descriptions of
everything.
#### How Do I Submit A (Good) Bug Report?
Bugs are tracked as [GitHub issues](https://guides.github.com/features/issues/)
. [Create an issue](https://github.com/PolyhedralDev/Terra/issues/new) and
provide the prerequisite information by filling in the Bug Report template.
Explain the problem and include additional details to help maintainers reproduce
the problem:
- **Use a clear and descriptive title** for the issue to identify the problem.
- **Describe the exact steps which reproduce the problem** in as many details as
possible. When listing steps, **don't just say what you did, but explain how
you did it**.
- **Provide specific examples to demonstrate the steps**.
- **Describe the behavior you observed after following the steps** and point out
what exactly is the problem with that behavior.
- **Explain which behavior you expected to see instead and why.**
- **If the problem wasn't triggered by a specific action**, describe what you
were doing before the problem happened and share more information using the
guidelines below.
Include details about your configuration and environment:
- **Which version of Terra are you using?** You can get the exact version by
running `/te version`.
- **What's the name and version of the platform you're using**? (eg. Spigot,
Fabric, Paper, etc.)
- **Which external plugins or mods do you have installed?**
- **Which Terra packs do you have installed?** You can get that list by
running `/te packs`.
- **Which Terra addons do you have installed?** You can get that list by
running `/te addons`.
### Suggesting Enhancements
This section guides you through submitting an enhancement suggestion for Terra,
including completely new features and minor improvements to existing
functionality. Following these guidelines helps maintainers and the community
understand your suggestion and find related suggestions.
Before creating enhancement suggestions, please
check [this list](#before-submitting-an-enhancement-suggestion) as you might
find out that you don't need to create one. When you are creating an enhancement
suggestion,
please [include as many details as possible](#how-do-i-submit-a-good-enhancement-suggestion)
.
#### Before Submitting An Enhancement Suggestion
- You must be on the **LATEST** version of Terra to make sure your feature
hasn't been added yet.
- Search for
any [already existing issues](https://github.com/PolyhedralDev/Terra/issues?q=is%3Aissue+) (
Including closed!) with your problem. If you open a duplicate, it will be
closed as such.
- Verify that this is actually within the scope of Terra.
- Be sure that this is not a feature request that should be made for a specific
Terra *pack*, and instead applies to all of Terra.
- Be sure that this is not something that should be implemented as a Terra
addon, and instead applies to all of Terra.
- Make sure that you attach a copy of the latest.log file, if there are any
exceptions thrown in the console. Putting *just* the exception
**is not enough**. We need to be able to check that there wasn't anything else
before that caused it.
#### How Do I Submit A (Good) Enhancement Suggestion?
Enhancement suggestions are tracked
as [GitHub issues](https://guides.github.com/features/issues/). Create an issue
on our platform repository and provide the following information:
- **Use a clear and descriptive title** for the issue to identify the
suggestion.
- **Provide a step-by-step description of the suggested enhancement** in as many
details as possible.
- **Provide specific examples to demonstrate the steps**.
- **Describe the current behavior** and **explain which behavior you expected to
see instead** and why.
- **Explain why this enhancement would be useful** to most Terra users and isn't
something that can or should be implemented as an addon.
### Pull Requests
This section guides you through submitting a pull request for Terra.
While the prerequisites above must be satisfied prior to having your pull
request reviewed, the reviewer(s) may ask you to complete additional design
work, tests, or other changes before your pull request can be ultimately
accepted.
#### Before Submitting A Pull Request
- You must be on the **LATEST** version of Terra to make sure your feature
hasn't been added yet.
- Search for
any [already existing issues](https://github.com/PolyhedralDev/Terra/issues?q=is%3Aissue+) (
Including closed!) with your problem. If you open a duplicate, it will be
closed as such.
- Verify that this is actually within the scope of Terra.
- Be sure that this is not a feature request that should be made for a specific
Terra *pack*, and instead applies to all of Terra.
- Be sure that this is not something that should be implemented as a Terra
addon, and instead applies to all of Terra.
- Make sure that you attach a copy of the latest.log file, if there are any
exceptions thrown in the console. Putting *just* the exception **is not
enough**. We need to be able to check that there wasn't anything else before
that caused it.
#### How Do I Submit A (Good) Pull Request?
Pull Requests are tracked
as [GitHub Pull Requests](https://guides.github.com/activities/forking/#making-a-pull-request)
. Create a pr on our platform repository and provide the following information:
- **Use a clear and descriptive title** to identify the pull request.
- **State what this pull request adds/fixes**.
- **Be sure that you are the owner of the code you contributed** or that it can
be licensed under the GPLv3.
- **Provide a description goals and non-goals of the pull request** in as many
details as possible.
- **Describe the current behavior** and **explain which behavior you expected to
see instead** and why.
- **Explain why this enhancement would be useful** to most Terra users and isn't
something that can or should be implemented as an addon.
## Styleguides
### Git Commits
Following this is not mandatory, but rather a set of guidelines. As long as your
commit messages aren't absolutely awful, it's probably fine. But it would be
nice if you followed them.
#### Committing
When you commit code, try to avoid committing large amounts of code in a single
go. Splitting up code into smaller commits is much nicer and makes it easier to
trace a feature to a single commit.
Try to stick to one feature/fix/etc. per commit. A good rule of thumb is if you
need to use the word "and" in the subject line, then it should probably™ be two
commits.
#### Git Commit Messages
- Subject line must fit the following format: `<type>: <short summary>`. Type
must be one of the following:
- Build: Changes that affect the build system or external dependencies.
- Docs: Documentation only changes.
- Feat: A new feature.
- Fix: A bug fix.
- Perf: Performance improvements.
- Refactor: Refactoring sections of the codebase.
- Repo: Changes to the repository structure that do not affect code. (Eg.
modification of the `README.md` file, etc.)
- Revert: Revert a previous commit.
- Style: Code style updates.
- Test: Anything related to testing.
- Trans: Translation and localization of Terra to other languages.
- WIP: Work in progress.
- Separate the subject line from the body with a single blank line.
- Do not end subject line with a period.
- Limit the subject line to 50 or less.
- The subject line and all body lines should be in sentence case.
- Use the present tense. ("Add feature" not "Added feature")
- Use the imperative mood. ("Move cursor to..." not "Moves cursor to...")
- Reference relevant issues and pull requests in the body.
>
> Here is a template you can follow:
> ```
> Capitalized, short (50 chars or less) summary
>
> More detailed explanatory text, if necessary. Wrap it to about 72
> characters or so. In some contexts, the first line is treated as
> the subject of the commit and the rest of the text as the body. The
> blank line separating the summary from the body is critical (unless
> you omit the body entirely); various tools like `log`, `shortlog` and
> `rebase` can get confused if you run the two together.
>
> Explain the problem that this commit is solving. Focus on why you are
> making this change as opposed to how (the code explains that). Are
> there side effects or other unintuitive consequences of this
> change? Here's the place to explain them.
>
>
> Further paragraphs come after blank lines.
> - Bullet points are okay, too
> - Typically a hyphen or asterisk is used for the bullet, followed
> by a single space, with blank lines in between, but conventions vary
> here
> - Use a hanging indent
>
> Reference any relevant issues at the bottom, like so:
>
> Resolves: #123
> See also: #456, #789
> ```
### Code Styleguide
Use an IDE with support for `.editorconfig` files. There is an included
editorconfig file in the base of the project so that your IDE should
automatically use the correct code style settings.
### Documentation Styleguide
TODO
## Coding Practices
### Compatibility
#### General Compatibility
General compatibility (example: injection of Vanilla structures/features/carvers
into packs) is acceptable in the platform project.
- General compatibility features should be *disabled by default*. Having things
auto-injected causes unpredictable behaviour that is annoying to diagnose.
General-compatibility options should have config values attached which are
disabled by default.
- These config options should also be *simple to use*. Think of the people who
will be using these compatibility options. They want to flick a switch and
have things be compatible. That means that a majority of compatibility options
should stay in `pack.yml`, to make it simple to go into a pack and turn on
specific compatibilities. This does *not* mean that more advanced
compatibility options are off the table, for example, look at Feature
compatibility, where features can either be automatically injected, *or*
configured individually per Terra biome, depending on how much control the
user wants.
#### Specific Compatibility
Specific compatibility should *not* be put in the platform project. (Example:
Adding the ability to generate TechCraft v7's doo-dads with a TerraScript
function)
Having specific compatibilities leads to tons of extra dependencies to keep
track of, as well as adding lots of additional stuff to maintain. It quickly
becomes a mess. Especially when most users will never need to use this feature.
We have designed an addon API for exactly this purpose. **Specific
compatibilities are welcome and encouraged, in the form of addons.**
### Platform-Agnostic Design
Terra must, at all times, remain platform agnostic. This means it must be able
to run on theoretically any voxel based platform. Including non-minecraft games
like Terasology.
When adding a new feature to `common`, make no assumptions about what platform
it'll be running on.
Examples:
- Don't assume the world height is 256.
- Don't assume that a specific block, item, or entity exists. (Eg. don't assume
there exists a block called `minecraft:grass_block`)
### Data-Driven
When adding a new feature, make it abstract. Don't make assumptions about "
specific use cases." If you can only think of a few use cases, your idea should
probably be generalized.
You must use configs effectively. Make configs that are *powerful* but also *
make sense* and are \[easy\] to use.

695
LICENSE
View File

@ -1,674 +1,21 @@
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
Preamble
The GNU General Public License is a free, copyleft license for
software and other kinds of works.
The licenses for most software and other practical works are designed
to take away your freedom to share and change the works. By contrast,
the GNU General Public License is intended to guarantee your freedom to
share and change all versions of a program--to make sure it remains free
software for all its users. We, the Free Software Foundation, use the
GNU General Public License for most of our software; it applies also to
any other work released this way by its authors. You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
price. Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
them if you wish), that you receive source code or can get it if you
want it, that you can change the software or use pieces of it in new
free programs, and that you know you can do these things.
To protect your rights, we need to prevent others from denying you
these rights or asking you to surrender the rights. Therefore, you have
certain responsibilities if you distribute copies of the software, or if
you modify it: responsibilities to respect the freedom of others.
For example, if you distribute copies of such a program, whether
gratis or for a fee, you must pass on to the recipients the same
freedoms that you received. You must make sure that they, too, receive
or can get the source code. And you must show them these terms so they
know their rights.
Developers that use the GNU GPL protect your rights with two steps:
(1) assert copyright on the software, and (2) offer you this License
giving you legal permission to copy, distribute and/or modify it.
For the developers' and authors' protection, the GPL clearly explains
that there is no warranty for this free software. For both users' and
authors' sake, the GPL requires that modified versions be marked as
changed, so that their problems will not be attributed erroneously to
authors of previous versions.
Some devices are designed to deny users access to install or run
modified versions of the software inside them, although the manufacturer
can do so. This is fundamentally incompatible with the aim of
protecting users' freedom to change the software. The systematic
pattern of such abuse occurs in the area of products for individuals to
use, which is precisely where it is most unacceptable. Therefore, we
have designed this version of the GPL to prohibit the practice for those
products. If such problems arise substantially in other domains, we
stand ready to extend this provision to those domains in future versions
of the GPL, as needed to protect the freedom of users.
Finally, every program is threatened constantly by software patents.
States should not allow patents to restrict development and use of
software on general-purpose computers, but in those that do, we wish to
avoid the special danger that patents applied to a free program could
make it effectively proprietary. To prevent this, the GPL assures that
patents cannot be used to render the program non-free.
The precise terms and conditions for copying, distribution and
modification follow.
TERMS AND CONDITIONS
0. Definitions.
"This License" refers to version 3 of the GNU General Public License.
"Copyright" also means copyright-like laws that apply to other kinds of
works, such as semiconductor masks.
"The Program" refers to any copyrightable work licensed under this
License. Each licensee is addressed as "you". "Licensees" and
"recipients" may be individuals or organizations.
To "modify" a work means to copy from or adapt all or part of the work
in a fashion requiring copyright permission, other than the making of an
exact copy. The resulting work is called a "modified version" of the
earlier work or a work "based on" the earlier work.
A "covered work" means either the unmodified Program or a work based
on the Program.
To "propagate" a work means to do anything with it that, without
permission, would make you directly or secondarily liable for
infringement under applicable copyright law, except executing it on a
computer or modifying a private copy. Propagation includes copying,
distribution (with or without modification), making available to the
public, and in some countries other activities as well.
To "convey" a work means any kind of propagation that enables other
parties to make or receive copies. Mere interaction with a user through
a computer network, with no transfer of a copy, is not conveying.
An interactive user interface displays "Appropriate Legal Notices"
to the extent that it includes a convenient and prominently visible
feature that (1) displays an appropriate copyright notice, and (2)
tells the user that there is no warranty for the work (except to the
extent that warranties are provided), that licensees may convey the
work under this License, and how to view a copy of this License. If
the interface presents a list of user commands or options, such as a
menu, a prominent item in the list meets this criterion.
1. Source Code.
The "source code" for a work means the preferred form of the work
for making modifications to it. "Object code" means any non-source
form of a work.
A "Standard Interface" means an interface that either is an official
standard defined by a recognized standards body, or, in the case of
interfaces specified for a particular programming language, one that
is widely used among developers working in that language.
The "System Libraries" of an executable work include anything, other
than the work as a whole, that (a) is included in the normal form of
packaging a Major Component, but which is not part of that Major
Component, and (b) serves only to enable use of the work with that
Major Component, or to implement a Standard Interface for which an
implementation is available to the public in source code form. A
"Major Component", in this context, means a major essential component
(kernel, window system, and so on) of the specific operating system
(if any) on which the executable work runs, or a compiler used to
produce the work, or an object code interpreter used to run it.
The "Corresponding Source" for a work in object code form means all
the source code needed to generate, install, and (for an executable
work) run the object code and to modify the work, including scripts to
control those activities. However, it does not include the work's
System Libraries, or general-purpose tools or generally available free
programs which are used unmodified in performing those activities but
which are not part of the work. For example, Corresponding Source
includes interface definition files associated with source files for
the work, and the source code for shared libraries and dynamically
linked subprograms that the work is specifically designed to require,
such as by intimate data communication or control flow between those
subprograms and other parts of the work.
The Corresponding Source need not include anything that users
can regenerate automatically from other parts of the Corresponding
Source.
The Corresponding Source for a work in source code form is that
same work.
2. Basic Permissions.
All rights granted under this License are granted for the term of
copyright on the Program, and are irrevocable provided the stated
conditions are met. This License explicitly affirms your unlimited
permission to run the unmodified Program. The output from running a
covered work is covered by this License only if the output, given its
content, constitutes a covered work. This License acknowledges your
rights of fair use or other equivalent, as provided by copyright law.
You may make, run and propagate covered works that you do not
convey, without conditions so long as your license otherwise remains
in force. You may convey covered works to others for the sole purpose
of having them make modifications exclusively for you, or provide you
with facilities for running those works, provided that you comply with
the terms of this License in conveying all material for which you do
not control copyright. Those thus making or running the covered works
for you must do so exclusively on your behalf, under your direction
and control, on terms that prohibit them from making any copies of
your copyrighted material outside their relationship with you.
Conveying under any other circumstances is permitted solely under
the conditions stated below. Sublicensing is not allowed; section 10
makes it unnecessary.
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
No covered work shall be deemed part of an effective technological
measure under any applicable law fulfilling obligations under article
11 of the WIPO copyright treaty adopted on 20 December 1996, or
similar laws prohibiting or restricting circumvention of such
measures.
When you convey a covered work, you waive any legal power to forbid
circumvention of technological measures to the extent such circumvention
is effected by exercising rights under this License with respect to
the covered work, and you disclaim any intention to limit operation or
modification of the work as a means of enforcing, against the work's
users, your or third parties' legal rights to forbid circumvention of
technological measures.
4. Conveying Verbatim Copies.
You may convey verbatim copies of the Program's source code as you
receive it, in any medium, provided that you conspicuously and
appropriately publish on each copy an appropriate copyright notice;
keep intact all notices stating that this License and any
non-permissive terms added in accord with section 7 apply to the code;
keep intact all notices of the absence of any warranty; and give all
recipients a copy of this License along with the Program.
You may charge any price or no price for each copy that you convey,
and you may offer support or warranty protection for a fee.
5. Conveying Modified Source Versions.
You may convey a work based on the Program, or the modifications to
produce it from the Program, in the form of source code under the
terms of section 4, provided that you also meet all of these conditions:
a) The work must carry prominent notices stating that you modified
it, and giving a relevant date.
b) The work must carry prominent notices stating that it is
released under this License and any conditions added under section
7. This requirement modifies the requirement in section 4 to
"keep intact all notices".
c) You must license the entire work, as a whole, under this
License to anyone who comes into possession of a copy. This
License will therefore apply, along with any applicable section 7
additional terms, to the whole of the work, and all its parts,
regardless of how they are packaged. This License gives no
permission to license the work in any other way, but it does not
invalidate such permission if you have separately received it.
d) If the work has interactive user interfaces, each must display
Appropriate Legal Notices; however, if the Program has interactive
interfaces that do not display Appropriate Legal Notices, your
work need not make them do so.
A compilation of a covered work with other separate and independent
works, which are not by their nature extensions of the covered work,
and which are not combined with it such as to form a larger program,
in or on a volume of a storage or distribution medium, is called an
"aggregate" if the compilation and its resulting copyright are not
used to limit the access or legal rights of the compilation's users
beyond what the individual works permit. Inclusion of a covered work
in an aggregate does not cause this License to apply to the other
parts of the aggregate.
6. Conveying Non-Source Forms.
You may convey a covered work in object code form under the terms
of sections 4 and 5, provided that you also convey the
machine-readable Corresponding Source under the terms of this License,
in one of these ways:
a) Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by the
Corresponding Source fixed on a durable physical medium
customarily used for software interchange.
b) Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by a
written offer, valid for at least three years and valid for as
long as you offer spare parts or customer support for that product
model, to give anyone who possesses the object code either (1) a
copy of the Corresponding Source for all the software in the
product that is covered by this License, on a durable physical
medium customarily used for software interchange, for a price no
more than your reasonable cost of physically performing this
conveying of source, or (2) access to copy the
Corresponding Source from a network server at no charge.
c) Convey individual copies of the object code with a copy of the
written offer to provide the Corresponding Source. This
alternative is allowed only occasionally and noncommercially, and
only if you received the object code with such an offer, in accord
with subsection 6b.
d) Convey the object code by offering access from a designated
place (gratis or for a charge), and offer equivalent access to the
Corresponding Source in the same way through the same place at no
further charge. You need not require recipients to copy the
Corresponding Source along with the object code. If the place to
copy the object code is a network server, the Corresponding Source
may be on a different server (operated by you or a third party)
that supports equivalent copying facilities, provided you maintain
clear directions next to the object code saying where to find the
Corresponding Source. Regardless of what server hosts the
Corresponding Source, you remain obligated to ensure that it is
available for as long as needed to satisfy these requirements.
e) Convey the object code using peer-to-peer transmission, provided
you inform other peers where the object code and Corresponding
Source of the work are being offered to the general public at no
charge under subsection 6d.
A separable portion of the object code, whose source code is excluded
from the Corresponding Source as a System Library, need not be
included in conveying the object code work.
A "User Product" is either (1) a "consumer product", which means any
tangible personal property which is normally used for personal, family,
or household purposes, or (2) anything designed or sold for incorporation
into a dwelling. In determining whether a product is a consumer product,
doubtful cases shall be resolved in favor of coverage. For a particular
product received by a particular user, "normally used" refers to a
typical or common use of that class of product, regardless of the status
of the particular user or of the way in which the particular user
actually uses, or expects or is expected to use, the product. A product
is a consumer product regardless of whether the product has substantial
commercial, industrial or non-consumer uses, unless such uses represent
the only significant mode of use of the product.
"Installation Information" for a User Product means any methods,
procedures, authorization keys, or other information required to install
and execute modified versions of a covered work in that User Product from
a modified version of its Corresponding Source. The information must
suffice to ensure that the continued functioning of the modified object
code is in no case prevented or interfered with solely because
modification has been made.
If you convey an object code work under this section in, or with, or
specifically for use in, a User Product, and the conveying occurs as
part of a transaction in which the right of possession and use of the
User Product is transferred to the recipient in perpetuity or for a
fixed term (regardless of how the transaction is characterized), the
Corresponding Source conveyed under this section must be accompanied
by the Installation Information. But this requirement does not apply
if neither you nor any third party retains the ability to install
modified object code on the User Product (for example, the work has
been installed in ROM).
The requirement to provide Installation Information does not include a
requirement to continue to provide support service, warranty, or updates
for a work that has been modified or installed by the recipient, or for
the User Product in which it has been modified or installed. Access to a
network may be denied when the modification itself materially and
adversely affects the operation of the network or violates the rules and
protocols for communication across the network.
Corresponding Source conveyed, and Installation Information provided,
in accord with this section must be in a format that is publicly
documented (and with an implementation available to the public in
source code form), and must require no special password or key for
unpacking, reading or copying.
7. Additional Terms.
"Additional permissions" are terms that supplement the terms of this
License by making exceptions from one or more of its conditions.
Additional permissions that are applicable to the entire Program shall
be treated as though they were included in this License, to the extent
that they are valid under applicable law. If additional permissions
apply only to part of the Program, that part may be used separately
under those permissions, but the entire Program remains governed by
this License without regard to the additional permissions.
When you convey a copy of a covered work, you may at your option
remove any additional permissions from that copy, or from any part of
it. (Additional permissions may be written to require their own
removal in certain cases when you modify the work.) You may place
additional permissions on material, added by you to a covered work,
for which you have or can give appropriate copyright permission.
Notwithstanding any other provision of this License, for material you
add to a covered work, you may (if authorized by the copyright holders of
that material) supplement the terms of this License with terms:
a) Disclaiming warranty or limiting liability differently from the
terms of sections 15 and 16 of this License; or
b) Requiring preservation of specified reasonable legal notices or
author attributions in that material or in the Appropriate Legal
Notices displayed by works containing it; or
c) Prohibiting misrepresentation of the origin of that material, or
requiring that modified versions of such material be marked in
reasonable ways as different from the original version; or
d) Limiting the use for publicity purposes of names of licensors or
authors of the material; or
e) Declining to grant rights under trademark law for use of some
trade names, trademarks, or service marks; or
f) Requiring indemnification of licensors and authors of that
material by anyone who conveys the material (or modified versions of
it) with contractual assumptions of liability to the recipient, for
any liability that these contractual assumptions directly impose on
those licensors and authors.
All other non-permissive additional terms are considered "further
restrictions" within the meaning of section 10. If the Program as you
received it, or any part of it, contains a notice stating that it is
governed by this License along with a term that is a further
restriction, you may remove that term. If a license document contains
a further restriction but permits relicensing or conveying under this
License, you may add to a covered work material governed by the terms
of that license document, provided that the further restriction does
not survive such relicensing or conveying.
If you add terms to a covered work in accord with this section, you
must place, in the relevant source files, a statement of the
additional terms that apply to those files, or a notice indicating
where to find the applicable terms.
Additional terms, permissive or non-permissive, may be stated in the
form of a separately written license, or stated as exceptions;
the above requirements apply either way.
8. Termination.
You may not propagate or modify a covered work except as expressly
provided under this License. Any attempt otherwise to propagate or
modify it is void, and will automatically terminate your rights under
this License (including any patent licenses granted under the third
paragraph of section 11).
However, if you cease all violation of this License, then your
license from a particular copyright holder is reinstated (a)
provisionally, unless and until the copyright holder explicitly and
finally terminates your license, and (b) permanently, if the copyright
holder fails to notify you of the violation by some reasonable means
prior to 60 days after the cessation.
Moreover, your license from a particular copyright holder is
reinstated permanently if the copyright holder notifies you of the
violation by some reasonable means, this is the first time you have
received notice of violation of this License (for any work) from that
copyright holder, and you cure the violation prior to 30 days after
your receipt of the notice.
Termination of your rights under this section does not terminate the
licenses of parties who have received copies or rights from you under
this License. If your rights have been terminated and not permanently
reinstated, you do not qualify to receive new licenses for the same
material under section 10.
9. Acceptance Not Required for Having Copies.
You are not required to accept this License in order to receive or
run a copy of the Program. Ancillary propagation of a covered work
occurring solely as a consequence of using peer-to-peer transmission
to receive a copy likewise does not require acceptance. However,
nothing other than this License grants you permission to propagate or
modify any covered work. These actions infringe copyright if you do
not accept this License. Therefore, by modifying or propagating a
covered work, you indicate your acceptance of this License to do so.
10. Automatic Licensing of Downstream Recipients.
Each time you convey a covered work, the recipient automatically
receives a license from the original licensors, to run, modify and
propagate that work, subject to this License. You are not responsible
for enforcing compliance by third parties with this License.
An "entity transaction" is a transaction transferring control of an
organization, or substantially all assets of one, or subdividing an
organization, or merging organizations. If propagation of a covered
work results from an entity transaction, each party to that
transaction who receives a copy of the work also receives whatever
licenses to the work the party's predecessor in interest had or could
give under the previous paragraph, plus a right to possession of the
Corresponding Source of the work from the predecessor in interest, if
the predecessor has it or can get it with reasonable efforts.
You may not impose any further restrictions on the exercise of the
rights granted or affirmed under this License. For example, you may
not impose a license fee, royalty, or other charge for exercise of
rights granted under this License, and you may not initiate litigation
(including a cross-claim or counterclaim in a lawsuit) alleging that
any patent claim is infringed by making, using, selling, offering for
sale, or importing the Program or any portion of it.
11. Patents.
A "contributor" is a copyright holder who authorizes use under this
License of the Program or a work on which the Program is based. The
work thus licensed is called the contributor's "contributor version".
A contributor's "essential patent claims" are all patent claims
owned or controlled by the contributor, whether already acquired or
hereafter acquired, that would be infringed by some manner, permitted
by this License, of making, using, or selling its contributor version,
but do not include claims that would be infringed only as a
consequence of further modification of the contributor version. For
purposes of this definition, "control" includes the right to grant
patent sublicenses in a manner consistent with the requirements of
this License.
Each contributor grants you a non-exclusive, worldwide, royalty-free
patent license under the contributor's essential patent claims, to
make, use, sell, offer for sale, import and otherwise run, modify and
propagate the contents of its contributor version.
In the following three paragraphs, a "patent license" is any express
agreement or commitment, however denominated, not to enforce a patent
(such as an express permission to practice a patent or covenant not to
sue for patent infringement). To "grant" such a patent license to a
party means to make such an agreement or commitment not to enforce a
patent against the party.
If you convey a covered work, knowingly relying on a patent license,
and the Corresponding Source of the work is not available for anyone
to copy, free of charge and under the terms of this License, through a
publicly available network server or other readily accessible means,
then you must either (1) cause the Corresponding Source to be so
available, or (2) arrange to deprive yourself of the benefit of the
patent license for this particular work, or (3) arrange, in a manner
consistent with the requirements of this License, to extend the patent
license to downstream recipients. "Knowingly relying" means you have
actual knowledge that, but for the patent license, your conveying the
covered work in a country, or your recipient's use of the covered work
in a country, would infringe one or more identifiable patents in that
country that you have reason to believe are valid.
If, pursuant to or in connection with a single transaction or
arrangement, you convey, or propagate by procuring conveyance of, a
covered work, and grant a patent license to some of the parties
receiving the covered work authorizing them to use, propagate, modify
or convey a specific copy of the covered work, then the patent license
you grant is automatically extended to all recipients of the covered
work and works based on it.
A patent license is "discriminatory" if it does not include within
the scope of its coverage, prohibits the exercise of, or is
conditioned on the non-exercise of one or more of the rights that are
specifically granted under this License. You may not convey a covered
work if you are a party to an arrangement with a third party that is
in the business of distributing software, under which you make payment
to the third party based on the extent of your activity of conveying
the work, and under which the third party grants, to any of the
parties who would receive the covered work from you, a discriminatory
patent license (a) in connection with copies of the covered work
conveyed by you (or copies made from those copies), or (b) primarily
for and in connection with specific products or compilations that
contain the covered work, unless you entered into that arrangement,
or that patent license was granted, prior to 28 March 2007.
Nothing in this License shall be construed as excluding or limiting
any implied license or other defenses to infringement that may
otherwise be available to you under applicable patent law.
12. No Surrender of Others' Freedom.
If conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License. If you cannot convey a
covered work so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you may
not convey it at all. For example, if you agree to terms that obligate you
to collect a royalty for further conveying from those to whom you convey
the Program, the only way you could satisfy both those terms and this
License would be to refrain entirely from conveying the Program.
13. Use with the GNU Affero General Public License.
Notwithstanding any other provision of this License, you have
permission to link or combine any covered work with a work licensed
under version 3 of the GNU Affero General Public License into a single
combined work, and to convey the resulting work. The terms of this
License will continue to apply to the part which is the covered work,
but the special requirements of the GNU Affero General Public License,
section 13, concerning interaction through a network will apply to the
combination as such.
14. Revised Versions of this License.
The Free Software Foundation may publish revised and/or new versions of
the GNU General Public License from time to time. Such new versions will
be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.
Each version is given a distinguishing version number. If the
Program specifies that a certain numbered version of the GNU General
Public License "or any later version" applies to it, you have the
option of following the terms and conditions either of that numbered
version or of any later version published by the Free Software
Foundation. If the Program does not specify a version number of the
GNU General Public License, you may choose any version ever published
by the Free Software Foundation.
If the Program specifies that a proxy can decide which future
versions of the GNU General Public License can be used, that proxy's
public statement of acceptance of a version permanently authorizes you
to choose that version for the Program.
Later license versions may give you additional or different
permissions. However, no additional obligations are imposed on any
author or copyright holder as a result of your choosing to follow a
later version.
15. Disclaimer of Warranty.
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
16. Limitation of Liability.
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
SUCH DAMAGES.
17. Interpretation of Sections 15 and 16.
If the disclaimer of warranty and limitation of liability provided
above cannot be given local legal effect according to their terms,
reviewing courts shall apply local law that most closely approximates
an absolute waiver of all civil liability in connection with the
Program, unless a warranty or assumption of liability accompanies a
copy of the Program in return for a fee.
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.
To do so, attach the following notices to the program. It is safest
to attach them to the start of each source file to most effectively
state the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
<one line to give the program's name and a brief idea of what it does.>
Copyright (C) <year> <name of author>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
Also add information on how to contact you by electronic and paper mail.
If the program does terminal interaction, make it output a short
notice like this when it starts in an interactive mode:
<program> Copyright (C) <year> <name of author>
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
The hypothetical commands `show w' and `show c' should show the appropriate
parts of the General Public License. Of course, your program's commands
might be different; for a GUI interface, you would use an "about box".
You should also get your employer (if you work as a programmer) or school,
if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU GPL, see
<https://www.gnu.org/licenses/>.
The GNU General Public License does not permit incorporating your program
into proprietary programs. If your program is a subroutine library, you
may consider it more useful to permit linking proprietary applications with
the library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. But first, please read
<https://www.gnu.org/licenses/why-not-lgpl.html>.
MIT License
Copyright (c) 2020-2025 Polyhedral Development
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

112
README.md
View File

@ -1,25 +1,101 @@
<img align="left" width="64" height="64" src="https://raw.githubusercontent.com/wiki/PolyhedralDev/Terra/images/terra_logo.png" alt="Terra Logo">
# Terra
Terra is a data-driven world generator based on [Gaea](https://github.com/PolyhedralDev/Gaea). Find out more on our
[Spigot page](https://www.spigotmc.org/resources/85151/)!
## Building and running Terra
To build, simply run `./gradlew build` on Linux/MacOS, or `gradlew.bat build` on Windows.
This will produce a jar in `build/libs` called `Terra-[CURRENT VERSION].jar`.
You can put this right into your plugins dir, along with the correct Gaea version.
Terra is a modern world generation modding platform, primarily for Minecraft.
Terra allows complete customization of world generation with an advanced API,
tightly integrated with a powerful configuration system.
If you would like to test it with a default server config, just run `./gradlew setupServer` or
`./gradlew.bat setupServer` to set up the server, then `./gradlew testWithPaper` or `gradlew.bat testWithPaper` to run
the server. If you want a clean installation of the server, re-run the `setupServer` task.
This will download a default server config from [here](https://github.com/PolyhedralDev/WorldGenTestServer)
and install the server in the `target/server` directory, along with all the needed plugins.
**Note: You will need to adjust the `NAME` variable `bukkit.yml` of the test server if you are not using the default
Terra config.**
Terra consists of several parts:
* A voxel world generation API with emphasis on configuration and extensibility
* Several platform implementations, the layer between the API and the platform
it's running on.
* An addon loader, which allows addons to interface with the Terra API in a
platform-agnostic setting
* Several "core addons," which implement the "default" configurations of Terra.
These addons can be thought of as the config "standard library"
Terra currently officially supports the Fabric mod loader and the Bukkit API
(Paper and friends). We welcome Pull Requests implementing additional platforms!
## Downloads:
* Fabric: [Modrinth](https://modrinth.com/mod/terra)
/ [CurseForge](https://www.curseforge.com/minecraft/mc-mods/terra-world-generator)
* Paper+ servers (Paper, Tuinity, Purpur,
etc): [SpigotMC](https://www.spigotmc.org/resources/85151/)
## Building and Running Terra
To build, simply run `./gradlew build` (`gradlew.bat build` on Windows). This
will build all platforms, and produce JARs in `platforms/<platform>/build/libs`
### Production JARs:
* Bukkit: `Terra-<version>-shaded.jar`
* Fabric: `Terra-<version>-shaded-mapped.jar`
### Building a Specific Platform
To build a specific platform, run `gradlew :platforms:<platform>:build`.
JARs are produced in `platforms/<platform>/build/libs`.
### Running Minecraft in the IDE
To run Minecraft with Terra in the IDE (for testing) use the following tasks:
* Bukkit
* `runServer` - Run the Paper test server with Terra installed.
* Fabric
* `runClient` - Run a Minecraft Fabric client with Terra installed.
* `runServer` - Run a Minecraft Fabric server with Terra installed.
## Contributing
Contributions are welcome! If you want to see a feature in Terra, please, open an issue, or implement it yourself and
submit a PR!
Join the discord [here](https://discord.gg/PXUEbbF) if you would like to talk more about the project!
Contributions are welcome! If you want to see a feature in Terra, please, open
an issue, or implement it yourself and submit a PR!
Join the discord [here](https://discord.gg/PXUEbbF) if you would like to talk
more about the project!
## Licensing
Parts of Terra are licensed under either the MIT License or the GNU General
Public License, version 3.0.
* Our API is licensed under the [MIT License](LICENSE), to ensure that everyone
is able to freely use it however they want.
* Our core addons are also licensed under the [MIT License](LICENSE), to ensure
that people can freely use code from them to learn and make their own addons,
without worrying about GPL infection.
* Our platform-agnostic implementations and platform implementations are
licensed under
the [GNU General Public License, version 3.0](common/implementation/LICENSE),
to ensure that they remain free software wherever they are used.
If you're not sure which license a particular file is under, check:
* The file's header
* The LICENSE file in the closest parent folder of the file in question
## Beta
Terra is still in beta! While it is stable, it is not feature-complete. There is a lot to be added!
Terra is still in beta! While it is stable, it is not feature-complete. There is
a lot to be added!
## Special Thanks
[![YourKit-Logo](https://www.yourkit.com/images/yklogo.png)](https://www.yourkit.com/)
YourKit has granted Polyhedral Development an open-source license to their
outstanding Java profiler, allowing us to make our software as performant as it
can be!
YourKit supports open source projects with innovative and intelligent tools for
monitoring and profiling Java and .NET applications. YourKit is the creator of
the
[YourKit Java Profiler](https://www.yourkit.com/java/profiler/),
[YourKit .NET Profiler](https://www.yourkit.com/.net/profiler/),
and [YourKit YouMonitor](https://www.yourkit.com/youmonitor/).

View File

@ -1,21 +1,60 @@
import com.dfsek.terra.getGitHash
preRelease(true)
versionProjects(":common:api", version("6.6.5"))
versionProjects(":common:implementation", version("6.6.5"))
versionProjects(":platforms", version("6.6.5"))
val versionObj = Version("4", "0", "0", true)
allprojects {
version = versionObj
group = "com.dfsek.terra"
}
/**
* Version class that does version stuff.
*/
@Suppress("MemberVisibilityCanBePrivate")
class Version(val major: String, val minor: String, val revision: String, val preRelease: Boolean = false) {
override fun toString(): String {
return if (!preRelease)
"$major.$minor.$revision"
else //Only use git hash if it's a prerelease.
"$major.$minor.$revision-BETA+${getGitHash()}"
configureCompilation()
configureDependencies()
configurePublishing()
tasks.withType<JavaCompile>().configureEach {
options.isFork = true
options.isIncremental = true
options.release.set(21)
}
}
tasks.withType<Test>().configureEach {
useJUnitPlatform()
maxHeapSize = "2G"
ignoreFailures = false
failFast = true
maxParallelForks = (Runtime.getRuntime().availableProcessors() - 1).takeIf { it > 0 } ?: 1
reports.html.required.set(false)
reports.junitXml.required.set(false)
}
tasks.withType<Copy>().configureEach {
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
}
tasks.withType<Jar>().configureEach {
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
}
}
afterEvaluate {
forImmediateSubProjects(":platforms") {
configureDistribution()
}
project(":platforms:bukkit:common").configureDistribution()
project(":platforms:minestom:example").configureDistribution()
forSubProjects(":common:addons") {
apply(plugin = "com.gradleup.shadow")
tasks.named("build") {
finalizedBy(tasks.named("shadowJar"))
}
dependencies {
"compileOnly"(project(":common:api"))
"testImplementation"(project(":common:api"))
}
}
}

View File

@ -6,8 +6,27 @@ plugins {
repositories {
mavenCentral()
gradlePluginPortal()
maven("https://maven.solo-studios.ca/releases") {
name = "Solo Studios"
}
maven("https://maven.solo-studios.ca/snapshots") {
name = "Solo Studios"
}
maven("https://repo.codemc.org/repository/maven-public") {
name = "CodeMC"
}
maven("https://repo.papermc.io/repository/maven-public/") {
name = "PaperMC"
}
}
dependencies {
"implementation"("com.github.jengelman.gradle.plugins:shadow:+")
//TODO Allow pulling from Versions.kt
implementation("com.gradleup.shadow", "shadow-gradle-plugin", "8.3.6")
implementation("io.papermc.paperweight.userdev", "io.papermc.paperweight.userdev.gradle.plugin", "2.0.0-beta.17")
implementation("org.ow2.asm", "asm", "9.8")
implementation("org.ow2.asm", "asm-tree", "9.8")
implementation("com.dfsek.tectonic", "common", "4.2.1")
implementation("org.yaml", "snakeyaml", "2.4")
}

View File

@ -0,0 +1,47 @@
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
import java.io.File
import java.util.function.Predicate
import org.gradle.api.Project
import org.gradle.api.Task
import org.gradle.kotlin.dsl.extra
import kotlin.streams.asStream
/**
* Configures a directory where addons will be put.
*/
fun Project.addonDir(dir: File, task: Task) {
val moveAddons = tasks.register("moveAddons" + task.name) {
dependsOn("compileAddons")
doLast {
dir.parentFile.mkdirs()
matchingAddons(dir) {
it.name.startsWith("Terra-") // Assume everything that starts with Terra- is a core addon.
}.forEach {
logger.info("Deleting old addon: " + it.absolutePath)
it.delete()
}
forSubProjects(":common:addons") {
val jar = tasks.named("shadowJar").get() as ShadowJar
val boot = if (extra.has("bootstrap") && extra.get("bootstrap") as Boolean) "bootstrap/" else ""
val target = File(dir, boot + jar.archiveFileName.get())
val base = "${jar.archiveBaseName.get()}-${version}"
logger.info("Copying addon ${jar.archiveFileName.get()} to ${target.absolutePath}. Base name: $base")
jar.archiveFile.orNull?.asFile?.copyTo(target)
}
}
}
task.dependsOn(moveAddons)
}
fun matchingAddons(dir: File, matcher: Predicate<File>): Set<File> {
val matching = HashSet<File>()
dir.walk().asStream().filter(matcher).forEach(matching::add)
return matching
}

View File

@ -0,0 +1,78 @@
import com.dfsek.terra.tectonicdoc.TectonicDocPlugin
import org.apache.tools.ant.filters.ReplaceTokens
import org.gradle.api.JavaVersion
import org.gradle.api.Project
import org.gradle.api.plugins.JavaPluginExtension
import org.gradle.api.tasks.bundling.Jar
import org.gradle.api.tasks.compile.JavaCompile
import org.gradle.api.tasks.javadoc.Javadoc
import org.gradle.kotlin.dsl.apply
import org.gradle.kotlin.dsl.configure
import org.gradle.kotlin.dsl.filter
import org.gradle.kotlin.dsl.getByName
import org.gradle.kotlin.dsl.register
import org.gradle.kotlin.dsl.withType
import org.gradle.language.jvm.tasks.ProcessResources
fun Project.configureCompilation() {
apply(plugin = "maven-publish")
apply(plugin = "java")
apply(plugin = "java-library")
apply(plugin = "idea")
apply<TectonicDocPlugin>()
configure<JavaPluginExtension> {
sourceCompatibility = JavaVersion.VERSION_21
targetCompatibility = JavaVersion.VERSION_21
}
tasks.withType<JavaCompile> {
options.encoding = "UTF-8"
doFirst {
options.compilerArgs.add("-Xlint:all")
}
}
tasks.withType<ProcessResources> {
include("**/*.*")
filter<ReplaceTokens>(
"tokens" to mapOf(
"DESCRIPTION" to properties["terra.description"],
"WIKI" to properties["terra.wiki"],
"SOURCE" to properties["terra.source"],
"ISSUES" to properties["terra.issues"],
"LICENSE" to properties["terra.license"]
)
)
}
afterEvaluate {
tasks.withType<ProcessResources> {
include("**/*.*")
filter<ReplaceTokens>(
"tokens" to mapOf(
"VERSION" to version.toString()
)
)
}
}
tasks.withType<Javadoc> {
options.encoding = "UTF-8"
}
tasks.withType<Jar> {
archiveBaseName.set("Terra-${archiveBaseName.get()}")
from("../LICENSE", "../../LICENSE")
}
tasks.register<Jar>("sourcesJar") {
archiveClassifier.set("sources")
}
tasks.register<Jar>("javadocJar") {
dependsOn("javadoc")
archiveClassifier.set("javadoc")
from(tasks.getByName<Javadoc>("javadoc").destinationDir)
}
}

View File

@ -0,0 +1,82 @@
import org.gradle.api.Project
import org.gradle.kotlin.dsl.creating
import org.gradle.kotlin.dsl.dependencies
import org.gradle.kotlin.dsl.getValue
import org.gradle.kotlin.dsl.getting
import org.gradle.kotlin.dsl.maven
import org.gradle.kotlin.dsl.repositories
fun Project.configureDependencies() {
val testImplementation by configurations.getting
val compileOnly by configurations.getting
val api by configurations.getting
val implementation by configurations.getting
val shaded by configurations.creating
@Suppress("UNUSED_VARIABLE")
val shadedApi by configurations.creating {
shaded.extendsFrom(this)
api.extendsFrom(this)
}
@Suppress("UNUSED_VARIABLE")
val shadedImplementation by configurations.creating {
shaded.extendsFrom(this)
implementation.extendsFrom(this)
}
repositories {
mavenCentral()
gradlePluginPortal()
maven("https://maven.solo-studios.ca/releases") {
name = "Solo Studios"
}
maven("https://maven.solo-studios.ca/snapshots") {
name = "Solo Studios"
}
maven("https://maven.fabricmc.net/") {
name = "FabricMC"
}
maven("https://repo.codemc.org/repository/maven-public") {
name = "CodeMC"
}
maven("https://repo.papermc.io/repository/maven-public/") {
name = "PaperMC"
}
maven("https://files.minecraftforge.net/maven/") {
name = "Forge"
}
maven("https://maven.quiltmc.org/repository/release/") {
name = "Quilt"
}
maven("https://jitpack.io") {
name = "JitPack"
}
maven("https://s01.oss.sonatype.org/content/repositories/snapshots/") {
name = "Sonatype Snapshots"
}
maven("https://repo.opencollab.dev/maven-releases/") {
name = "OpenCollab Releases"
}
maven("https://repo.opencollab.dev/maven-snapshots/") {
name = "OpenCollab Snapshots"
}
maven("https://storehouse.okaeri.eu/repository/maven-public/") {
name = "Okaeri"
}
maven("https://repo.onarandombox.com/multiverse-releases") {
name = "onarandombox"
}
}
dependencies {
testImplementation("org.junit.jupiter", "junit-jupiter", Versions.Libraries.Internal.junit)
"testRuntimeOnly"("org.junit.platform", "junit-platform-launcher")
compileOnly("org.jetbrains", "annotations", Versions.Libraries.Internal.jetBrainsAnnotations)
compileOnly("com.google.guava", "guava", Versions.Libraries.Internal.guava)
testImplementation("com.google.guava", "guava", Versions.Libraries.Internal.guava)
}
}

View File

@ -0,0 +1,173 @@
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
import io.papermc.paperweight.util.path
import java.io.File
import java.io.FileWriter
import java.net.URL
import java.nio.file.FileSystems
import java.nio.file.Path
import org.gradle.api.DefaultTask
import org.gradle.api.Project
import org.gradle.api.plugins.BasePluginExtension
import org.gradle.jvm.tasks.Jar
import org.gradle.kotlin.dsl.apply
import org.gradle.kotlin.dsl.configure
import org.gradle.kotlin.dsl.extra
import org.gradle.kotlin.dsl.get
import org.gradle.kotlin.dsl.named
import org.yaml.snakeyaml.DumperOptions
import org.yaml.snakeyaml.Yaml
import kotlin.io.path.copyTo
import kotlin.io.path.createDirectories
import kotlin.io.path.createFile
import kotlin.io.path.exists
private fun Project.installAddonsInto(dest: Path) {
FileSystems.newFileSystem(dest, mapOf("create" to "false"), null).use { fs ->
forSubProjects(":common:addons") {
val jar = getJarTask()
logger.info("Packaging addon ${jar.archiveFileName.get()} to $dest. size: ${jar.archiveFile.get().asFile.length() / 1024}KB")
val boot = if (extra.has("bootstrap") && extra.get("bootstrap") as Boolean) "bootstrap/" else ""
val addonPath = fs.getPath("/addons/$boot${jar.archiveFileName.get()}")
if (!addonPath.exists()) {
addonPath.parent.createDirectories()
addonPath.createFile()
jar.archiveFile.get().asFile.toPath().copyTo(addonPath, overwrite = true)
}
}
}
}
fun Project.configureDistribution() {
apply(plugin = "com.gradleup.shadow")
val downloadDefaultPacks = tasks.create("downloadDefaultPacks") {
group = "terra"
doFirst {
try {
file("${buildDir}/resources/main/packs/").deleteRecursively()
val defaultPackUrl =
URL("https://github.com/PolyhedralDev/TerraOverworldConfig/releases/download/" + Versions.Terra.overworldConfig + "/default.zip")
downloadPack(defaultPackUrl, project)
} catch (_:Exception) {}
}
}
val compileAddons = tasks.create("compileAddons") {
forSubProjects(":common:addons") {
afterEvaluate {
dependsOn(getJarTask())
}
}
}
val installAddons = tasks.create("installAddons") {
group = "terra"
dependsOn(compileAddons)
doLast {
// https://github.com/johnrengelman/shadow/issues/111
val dest = tasks.named<ShadowJar>("shadowJar").get().archiveFile.get().path
installAddonsInto(dest)
}
}
tasks.create("installAddonsIntoDefaultJar") {
group = "terra"
dependsOn(compileAddons)
doLast {
val dest = tasks.named<Jar>("jar").get().archiveFile.get().path
installAddonsInto(dest)
}
}
val generateResourceManifest = tasks.create("generateResourceManifest") {
group = "terra"
doLast {
val resources = HashMap<String, MutableList<String>>()
val packsDir = File("${project.buildDir}/resources/main/packs/")
packsDir.walkTopDown().forEach {
if (it.isDirectory || !it.name.endsWith(".zip")) return@forEach
resources.computeIfAbsent("packs") { ArrayList() }.add(it.name)
}
val langDir = File("${project(":common:implementation").buildDir}/resources/main/lang/")
langDir.walkTopDown().forEach {
if (it.isDirectory || !it.name.endsWith(".yml")) return@forEach
resources.computeIfAbsent("lang") { ArrayList() }.add(it.name)
}
forSubProjects(":common:addons") {
val jar = getJarTask().archiveFileName.get()
resources.computeIfAbsent(
if (extra.has("bootstrap") && extra.get("bootstrap") as Boolean) "addons/bootstrap"
else "addons"
) { ArrayList() }.add(jar)
}
val options = DumperOptions()
options.indent = 2
options.indentWithIndicator = true
options.indicatorIndent = 2
options.isPrettyFlow = true
options.defaultFlowStyle = DumperOptions.FlowStyle.BLOCK
options.defaultScalarStyle = DumperOptions.ScalarStyle.DOUBLE_QUOTED
val yaml = Yaml(options)
val manifest = File("${project.buildDir}/resources/main/resources.yml")
if (manifest.exists()) manifest.delete()
manifest.parentFile.mkdirs()
manifest.createNewFile()
FileWriter(manifest).use {
yaml.dump(resources, it)
}
}
}
tasks.named("processResources") {
generateResourceManifest.mustRunAfter(downloadDefaultPacks)
finalizedBy(downloadDefaultPacks)
finalizedBy(generateResourceManifest)
}
tasks.named<ShadowJar>("shadowJar") {
// Tell shadow to download the packs
dependsOn(downloadDefaultPacks)
configurations = listOf(project.configurations["shaded"])
archiveClassifier.set("shaded")
version = project.version
relocate("org.apache.commons", "com.dfsek.terra.lib.commons")
relocate("org.objectweb.asm", "com.dfsek.terra.lib.asm")
relocate("org.json", "com.dfsek.terra.lib.json")
relocate("org.yaml", "com.dfsek.terra.lib.yaml")
finalizedBy(installAddons)
}
configure<BasePluginExtension> {
archivesName.set(project.name)
}
tasks.named<DefaultTask>("build") {
dependsOn(tasks["shadowJar"])
}
}
fun downloadPack(packUrl: URL, project: Project) {
val fileName = packUrl.file.substring(packUrl.file.lastIndexOf("/"))
val file = File("${project.buildDir}/resources/main/packs/${fileName}")
file.parentFile.mkdirs()
file.outputStream().write(packUrl.readBytes())
}
fun Project.getJarTask() = tasks.named("shadowJar").get() as ShadowJar

View File

@ -0,0 +1,34 @@
import org.gradle.api.Project
import org.gradle.api.publish.PublishingExtension
import org.gradle.api.publish.maven.MavenPublication
import org.gradle.kotlin.dsl.configure
import org.gradle.kotlin.dsl.create
import org.gradle.kotlin.dsl.get
import org.gradle.kotlin.dsl.maven
import org.gradle.kotlin.dsl.provideDelegate
fun Project.configurePublishing() {
configure<PublishingExtension> {
publications {
create<MavenPublication>("mavenJava") {
from(components["java"])
}
}
repositories {
val mavenUrl = "https://repo.codemc.io/repository/maven-releases/"
//val mavenSnapshotUrl = "https://repo.codemc.io/repository/maven-snapshots/"
maven(mavenUrl) {
val mavenUsername: String? by project
val mavenPassword: String? by project
if (mavenUsername != null && mavenPassword != null) {
credentials {
username = mavenUsername
password = mavenPassword
}
}
}
}
}
}

View File

@ -0,0 +1,56 @@
import java.io.ByteArrayOutputStream
import org.gradle.api.Action
import org.gradle.api.Project
var isPrerelease = false
fun Project.getGitHash(): String {
val stdout = ByteArrayOutputStream()
exec {
commandLine = mutableListOf("git", "rev-parse", "--short", "HEAD")
standardOutput = stdout
}
return stdout.toString().trim()
}
fun Project.gitClone(name: String) {
val stdout = ByteArrayOutputStream()
exec {
commandLine = mutableListOf("git", "clone", name)
standardOutput = stdout
}
}
fun Project.forSubProjects(project: String, action: Action<Project>) {
project(project).subprojects.forEach {
action.execute(it)
}
}
fun Project.forImmediateSubProjects(project: String, action: Action<Project>) {
project(project).childProjects.forEach {
action.execute(it.value)
}
}
fun preRelease(preRelease: Boolean) {
isPrerelease = preRelease
}
fun Project.versionProjects(project: String, version: String) {
forSubProjects(project) {
this.version = version
logger.info("Setting version of $path to $version")
}
project(project).version = version
logger.info("Setting version of $project to $version")
}
fun Project.version(version: String): String {
return if (!isPrerelease)
version
else //Only use git hash if it's a prerelease.
"$version-BETA+${getGitHash()}"
}

View File

@ -0,0 +1,93 @@
object Versions {
object Terra {
const val overworldConfig = "v1.5.2"
}
object Libraries {
const val tectonic = "4.2.1"
const val paralithic = "0.8.1"
const val strata = "1.3.2"
const val cloud = "2.0.0"
const val caffeine = "3.2.1"
const val slf4j = "2.0.17"
object Internal {
const val shadow = "8.3.6"
const val apacheText = "1.13.1"
const val apacheIO = "2.19.0"
const val guava = "33.4.8-jre"
const val asm = "9.8"
const val snakeYml = "2.4"
const val jetBrainsAnnotations = "26.0.2"
const val junit = "5.13.1"
const val nbt = "6.1"
}
}
object Fabric {
const val fabricAPI = "0.128.1+${Mod.minecraft}"
const val cloud = "2.0.0-beta.10"
}
//
// object Quilt {
// const val quiltLoader = "0.20.2"
// const val fabricApi = "7.3.1+0.89.3-1.20.1"
// }
object Mod {
const val mixin = "0.15.5+mixin.0.8.7"
const val mixinExtras = "0.4.1"
const val minecraft = "1.21.7"
const val yarn = "$minecraft+build.1"
const val fabricLoader = "0.16.14"
const val architecuryLoom = "1.10.431"
const val architecturyPlugin = "3.4.161"
}
//
// object Forge {
// const val forge = "${Mod.minecraft}-48.0.13"
// const val burningwave = "12.63.0"
// }
object Bukkit {
const val minecraft = "1.21.7-R0.1"
const val paperBuild = "$minecraft-20250630.144242-1"
const val paper = paperBuild
const val paperLib = "1.0.8"
const val reflectionRemapper = "0.1.2"
const val paperDevBundle = paperBuild
const val runPaper = "2.3.1"
const val paperWeight = "2.0.0-beta.17"
const val cloud = "2.0.0-beta.10"
const val multiverse = "5.0.2"
}
//
// object Sponge {
// const val sponge = "9.0.0-SNAPSHOT"
// const val mixin = "0.8.2"
// const val minecraft = "1.17.1"
// }
//
object CLI {
const val logback = "1.5.18"
const val picocli = "4.7.7"
}
object Allay {
const val api = "0.4.1"
const val gson = "2.13.1"
const val mappings = "3626653"
const val mappingsGenerator = "366618e"
}
object Minestom {
const val minestom = "1_21_6-c3ccee696b"
}
}

View File

@ -1,47 +0,0 @@
package com.dfsek.terra
import org.gradle.api.Project
import org.gradle.api.tasks.testing.Test
import org.gradle.kotlin.dsl.apply
import org.gradle.kotlin.dsl.withType
import java.io.ByteArrayOutputStream
fun Project.configureCommon() {
apply(plugin = "java-library")
apply(plugin = "maven-publish")
apply(plugin = "idea")
configureDependencies()
configureCompilation()
configureDistribution()
version = rootProject.version
tasks.withType<Test>().configureEach {
useJUnitPlatform()
maxHeapSize = "2G"
ignoreFailures = false
failFast = true
maxParallelForks = 12
}
}
fun Project.getGitHash(): String {
val stdout = java.io.ByteArrayOutputStream()
exec {
commandLine = mutableListOf("git", "rev-parse", "--short", "HEAD")
standardOutput = stdout
}
return stdout.toString().trim()
}
fun Project.gitClone(name: String) {
val stdout = ByteArrayOutputStream()
exec {
commandLine = mutableListOf("git", "clone", name)
standardOutput = stdout
}
}

View File

@ -1,27 +0,0 @@
package com.dfsek.terra
import org.gradle.api.JavaVersion
import org.gradle.api.Project
import org.gradle.api.plugins.JavaPluginConvention
import org.gradle.api.tasks.compile.JavaCompile
import org.gradle.api.tasks.javadoc.Javadoc
import org.gradle.kotlin.dsl.configure
import org.gradle.kotlin.dsl.withType
fun Project.configureCompilation() {
configure<JavaPluginConvention> {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}
tasks.withType<JavaCompile> {
options.encoding = "UTF-8"
doFirst {
options.compilerArgs = mutableListOf("-Xlint:all")
}
}
tasks.withType<Javadoc> {
options.encoding = "UTF-8"
}
}

View File

@ -1,27 +0,0 @@
package com.dfsek.terra
import org.gradle.api.Project
import org.gradle.kotlin.dsl.dependencies
import org.gradle.kotlin.dsl.repositories
fun Project.configureDependencies() {
repositories {
maven { url = uri("https://papermc.io/repo/repository/maven-public/") }
maven { url = uri("http://maven.enginehub.org/repo/") }
maven { url = uri("https://repo.codemc.org/repository/maven-public") }
maven { url = uri("https://papermc.io/repo/repository/maven-public/") }
maven { url = uri("https://maven.fabricmc.net/") }
gradlePluginPortal()
jcenter()
mavenCentral()
}
dependencies {
"testImplementation"("org.junit.jupiter:junit-jupiter-api:5.7.0")
"testImplementation"("org.yaml:snakeyaml:1.27")
"testImplementation"("com.googlecode.json-simple:json-simple:1.1.1")
"testRuntimeOnly"("org.junit.jupiter:junit-jupiter-engine:5.7.0")
"compileOnly"("org.jetbrains:annotations:20.1.0")
}
}

View File

@ -1,88 +0,0 @@
package com.dfsek.terra
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
import org.gradle.api.DefaultTask
import org.gradle.api.Project
import org.gradle.api.plugins.BasePluginConvention
import org.gradle.api.tasks.bundling.Jar
import org.gradle.api.tasks.javadoc.Javadoc
import org.gradle.kotlin.dsl.*
import java.io.File
import java.net.URL
fun Project.configureDistribution() {
apply(plugin = "java-library")
apply(plugin = "com.github.johnrengelman.shadow")
// configurations.create("shaded")
configurations {
val shaded = create("shaded")
getByName("compile").extendsFrom(shaded)
// shaded.extendsFrom(getByName("compile"))
val shadedApi = create("shadedApi")
shaded.extendsFrom(shadedApi)
getByName("api").extendsFrom(shadedApi)
val shadedImplementation = create("shadedImplementation")
shaded.extendsFrom(shadedImplementation)
getByName("implementation").extendsFrom(shadedImplementation)
}
// tasks.withType<JavaCompile> {
// classpath +=
// }
val downloadDefaultPacks = tasks.create("downloadDefaultPacks") {
doFirst {
file("${buildDir}/resources/main/packs/").deleteRecursively()
val defaultPackUrl = URL("https://github.com/PolyhedralDev/TerraDefaultConfig/releases/download/latest/default.zip")
downloadPack(defaultPackUrl, project)
val netherPackUrl = URL("https://github.com/PolyhedralDev/TerraDefaultConfig/releases/download/latest/nether.zip")
downloadPack(netherPackUrl, project)
}
}
tasks["processResources"].dependsOn(downloadDefaultPacks)
tasks.withType<Jar> {
archiveBaseName.set("Terra-${archiveBaseName.get()}")
from("../LICENSE", "../../LICENSE")
}
tasks.register<Jar>("sourcesJar") {
archiveClassifier.set("sources")
}
tasks.register<Jar>("javadocJar") {
dependsOn("javadoc")
archiveClassifier.set("javadoc")
from(tasks.getByName<Javadoc>("javadoc").destinationDir)
}
tasks.named<ShadowJar>("shadowJar") {
// Tell shadow to download the packs
dependsOn(downloadDefaultPacks)
configurations = listOf(project.configurations["shaded"])
archiveClassifier.set("shaded")
setVersion(project.version)
relocate("org.apache.commons", "com.dfsek.terra.lib.commons")
relocate("parsii", "com.dfsek.terra.lib.parsii")
relocate("net.jafama", "com.dfsek.terra.lib.jafama")
minimize()
}
convention.getPlugin<BasePluginConvention>().archivesBaseName = project.name
tasks.named<DefaultTask>("build") {
dependsOn(tasks["shadowJar"])
}
}
fun downloadPack(packUrl: URL, project: Project) {
val fileName = packUrl.file.substring(packUrl.file.lastIndexOf("/"))
val file = File("${project.buildDir}/resources/main/packs/${fileName}")
file.parentFile.mkdirs()
file.outputStream().write(packUrl.readBytes())
}

View File

@ -0,0 +1,20 @@
package com.dfsek.terra.tectonicdoc
class DocumentedTemplate(private val name: String) {
private val template = HashMap<String, String>()
fun add(name: String, content: String) {
template[name] = content
}
fun format(): String {
val builder = StringBuilder("# ").append(name).append("\n\n")
template.forEach { name, content ->
builder
.append("### $name\n\n")
.append(content)
.append("\n\n")
}
return builder.toString()
}
}

View File

@ -0,0 +1,150 @@
package com.dfsek.terra.tectonicdoc
import com.dfsek.tectonic.api.config.template.annotations.Description
import com.dfsek.tectonic.api.config.template.annotations.Final
import com.dfsek.tectonic.api.config.template.annotations.Value
import java.io.File
import java.io.FileInputStream
import java.io.InputStream
import org.gradle.api.DefaultTask
import org.gradle.api.plugins.JavaPluginExtension
import org.gradle.api.tasks.TaskAction
import org.objectweb.asm.ClassReader
import org.objectweb.asm.tree.ClassNode
import org.objectweb.asm.tree.FieldNode
abstract class GenerateDocsTask : DefaultTask() {
@TaskAction
fun generateDocs() {
project.extensions.getByType(JavaPluginExtension::class.java).sourceSets.forEach { sources ->
val classes = HashMap<String, ClassNode>()
sources.java.classesDirectory.get().asFileTree.forEach { file ->
if (file.name.endsWith(".class")) {
val node = createClassNode(FileInputStream(file))
if (node.fields.stream().anyMatch { field ->
field.visibleAnnotations?.stream()?.anyMatch {
it.desc.equals(descriptor(Value::class.java.canonicalName))
} == true
}) {
var name = sources
.java
.classesDirectory
.get()
.asFile
.toPath()
.relativize(file.toPath())
.toString()
.substringBeforeLast('.')
if (name.endsWith("Template")) {
name = name.substringBeforeLast("Template")
}
classes[name] = node
}
}
}
val docsDir = File(project.buildDir, "tectonic")
docsDir.mkdirs()
classes.forEach { (name, clazz) ->
val template = DocumentedTemplate(name.substringAfterLast('/'))
clazz.fields
.stream()
.filter { field ->
field.visibleAnnotations?.stream()?.anyMatch {
it.desc.equals(descriptor(Value::class.java.canonicalName))
} == true
}.forEach { field ->
val annotations = field.visibleAnnotations
val description = StringBuilder()
annotations.stream().filter {
it.desc.equals(descriptor(Description::class.java.canonicalName))
}.forEach {
description.append(it.values[1])
}
val keyName = StringBuilder()
if (annotations.stream().anyMatch { it.desc.equals(descriptor(Final::class.java.canonicalName)) }) {
keyName.append("final ")
}
keyName.append(getType(field))
.append(" ")
annotations.stream().filter {
it.desc.equals(descriptor(Value::class.java.canonicalName))
}.forEach {
keyName.append(it.values[1])
}
template.add(keyName.toString(), description.toString().ifBlank {
logger.info("No description provided for field " + field.name + " in class " + name)
"*No description provided.*"
})
}
val save = File(docsDir, "$name.md")
if (save.exists()) save.delete()
save.parentFile.mkdirs()
save.createNewFile()
save.writeText(template.format())
}
}
}
private fun getType(node: FieldNode): String {
if (node.signature != null) {
return generic(node.signature)
}
return descriptorToHumanReadable(node.desc).substringAfterLast('.')
}
private fun generic(type: String): String {
val clean = descriptorToHumanReadable(type)
if (clean.contains('<')) {
val typeIndex = clean.indexOf('<')
return clean.substring(0, typeIndex + 1).substringAfterLast('.') + generic(clean.substring(typeIndex + 1)) + "\\>"
}
return clean.substringAfterLast('.')
}
private fun createClassNode(input: InputStream): ClassNode {
val reader = ClassReader(input)
val node = ClassNode()
try {
reader.accept(node, ClassReader.EXPAND_FRAMES)
} catch (e: Exception) {
reader.accept(node, ClassReader.SKIP_FRAMES or ClassReader.SKIP_DEBUG)
}
return node
}
private fun descriptorToHumanReadable(descriptor: String): String {
if (descriptor.startsWith('L')) {
return descriptor.substring(1).substringBeforeLast(';').replace('/', '.')
}
if (descriptor.startsWith("[")) {
return "${descriptorToHumanReadable(descriptor.substring(1))}[]"
}
return when (descriptor) {
"B" -> "byte"
"C" -> "char"
"I" -> "int"
"D" -> "double"
"F" -> "float"
"J" -> "long"
"S" -> "short"
"Z" -> "boolean"
else -> descriptor
}
}
private fun descriptor(name: String): String = "L${name.replace('.', '/')};"
}

View File

@ -0,0 +1,10 @@
package com.dfsek.terra.tectonicdoc
import org.gradle.api.Plugin
import org.gradle.api.Project
class TectonicDocPlugin : Plugin<Project> {
override fun apply(project: Project) {
project.tasks.create("generateDocs", GenerateDocsTask::class.java)
}
}

View File

@ -1,4 +0,0 @@
colors:
- 0x000000: 20
- 0xffffff: 3
enable: false

4
common/addons/README.md Normal file
View File

@ -0,0 +1,4 @@
# Core Addons
This directory contains the modularized "core addons" that implement Terra's
default behavior.

View File

@ -0,0 +1,21 @@
MIT License
Copyright (c) 2020-2025 Polyhedral Development
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

View File

@ -0,0 +1,3 @@
# api addon loader
Loads dependencies as addons

View File

@ -0,0 +1,12 @@
version = version("0.1.0")
dependencies {
}
tasks.withType<Jar> {
manifest {
attributes("Terra-Bootstrap-Addon-Entry-Point" to "com.dfsek.terra.addon.loader.ApiAddonLoader")
}
}
project.extra.set("bootstrap", true)

View File

@ -0,0 +1,26 @@
package com.dfsek.terra.addon.loader;
import ca.solostudios.strata.version.Version;
import com.dfsek.terra.api.addon.BaseAddon;
public class ApiAddon implements BaseAddon {
private final Version version;
private final String id;
public ApiAddon(Version version, String id) {
this.version = version;
this.id = id;
}
@Override
public Version getVersion() {
return version;
}
@Override
public String getID() {
return id;
}
}

View File

@ -0,0 +1,22 @@
/*
* Copyright (c) 2020-2025 Polyhedral Development
*
* The Terra Core Addons are licensed under the terms of the MIT License. For more details,
* reference the LICENSE file in this module's root directory.
*/
package com.dfsek.terra.addon.loader;
import java.net.URL;
import java.net.URLClassLoader;
public class ApiAddonClassLoader extends URLClassLoader {
static {
ClassLoader.registerAsParallelCapable();
}
public ApiAddonClassLoader(URL[] urls, ClassLoader parent) {
super(urls, parent);
}
}

View File

@ -0,0 +1,39 @@
/*
* Copyright (c) 2020-2025 Polyhedral Development
*
* The Terra Core Addons are licensed under the terms of the MIT License. For more details,
* reference the LICENSE file in this module's root directory.
*/
package com.dfsek.terra.addon.loader;
import ca.solostudios.strata.Versions;
import ca.solostudios.strata.version.Version;
import java.nio.file.Path;
import java.util.Collections;
import com.dfsek.terra.api.addon.BaseAddon;
import com.dfsek.terra.api.addon.bootstrap.BootstrapAddonClassLoader;
import com.dfsek.terra.api.addon.bootstrap.BootstrapBaseAddon;
public class ApiAddonLoader implements BootstrapBaseAddon<BaseAddon> {
private static final Version VERSION = Versions.getVersion(1, 0, 0);
@Override
public Iterable<BaseAddon> loadAddons(Path addonsFolder, BootstrapAddonClassLoader parent) {
return Collections.emptySet();
}
@Override
public String getID() {
return "API";
}
@Override
public Version getVersion() {
return VERSION;
}
}

View File

@ -0,0 +1,6 @@
version = version("1.0.0")
dependencies {
compileOnlyApi(project(":common:addons:manifest-addon-loader"))
compileOnlyApi(project(":common:addons:biome-query-api"))
}

View File

@ -0,0 +1,51 @@
package com.dfsek.terra.addons.biome.extrusion;
import com.dfsek.terra.api.util.Column;
import com.dfsek.terra.api.world.biome.Biome;
class BaseBiomeColumn implements Column<Biome> {
private final BiomeExtrusionProvider biomeProvider;
private final Biome base;
private final int min;
private final int max;
private final int x;
private final int z;
private final long seed;
protected BaseBiomeColumn(BiomeExtrusionProvider biomeProvider, Biome base, int min, int max, int x, int z, long seed) {
this.biomeProvider = biomeProvider;
this.base = base;
this.min = min;
this.max = max;
this.x = x;
this.z = z;
this.seed = seed;
}
@Override
public int getMinY() {
return min;
}
@Override
public int getMaxY() {
return max;
}
@Override
public int getX() {
return x;
}
@Override
public int getZ() {
return z;
}
@Override
public Biome get(int y) {
return biomeProvider.extrude(base, x, y, z, seed);
}
}

View File

@ -0,0 +1,67 @@
package com.dfsek.terra.addons.biome.extrusion;
import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
import java.util.function.Supplier;
import com.dfsek.terra.addons.biome.extrusion.api.Extrusion;
import com.dfsek.terra.addons.biome.extrusion.api.ReplaceableBiome;
import com.dfsek.terra.addons.biome.extrusion.config.BiomeExtrusionTemplate;
import com.dfsek.terra.addons.biome.extrusion.config.ReplaceableBiomeLoader;
import com.dfsek.terra.addons.biome.extrusion.config.extrusions.ReplaceExtrusionTemplate;
import com.dfsek.terra.addons.biome.extrusion.config.extrusions.SetExtrusionTemplate;
import com.dfsek.terra.addons.manifest.api.AddonInitializer;
import com.dfsek.terra.api.Platform;
import com.dfsek.terra.api.addon.BaseAddon;
import com.dfsek.terra.api.event.events.config.pack.ConfigPackPostLoadEvent;
import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent;
import com.dfsek.terra.api.event.functional.FunctionalEventHandler;
import com.dfsek.terra.api.inject.annotations.Inject;
import com.dfsek.terra.api.registry.CheckedRegistry;
import com.dfsek.terra.api.registry.Registry;
import com.dfsek.terra.api.util.reflection.TypeKey;
import com.dfsek.terra.api.world.biome.Biome;
import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
public class BiomeExtrusionAddon implements AddonInitializer {
public static final TypeKey<Supplier<ObjectTemplate<Extrusion>>> EXTRUSION_REGISTRY_KEY = new TypeKey<>() {
};
public static final TypeKey<Supplier<ObjectTemplate<BiomeProvider>>> PROVIDER_REGISTRY_KEY = new TypeKey<>() {
};
@Inject
private Platform platform;
@Inject
private BaseAddon addon;
@Override
public void initialize() {
platform.getEventManager()
.getHandler(FunctionalEventHandler.class)
.register(addon, ConfigPackPreLoadEvent.class)
.then(event -> {
CheckedRegistry<Supplier<ObjectTemplate<BiomeProvider>>> providerRegistry =
event.getPack()
.getOrCreateRegistry(PROVIDER_REGISTRY_KEY);
providerRegistry.register(addon.key("EXTRUSION"), BiomeExtrusionTemplate::new);
})
.then(event -> {
CheckedRegistry<Supplier<ObjectTemplate<Extrusion>>> extrusionRegistry = event.getPack().getOrCreateRegistry(
EXTRUSION_REGISTRY_KEY);
extrusionRegistry.register(addon.key("SET"), SetExtrusionTemplate::new);
extrusionRegistry.register(addon.key("REPLACE"), ReplaceExtrusionTemplate::new);
})
.failThrough();
platform.getEventManager()
.getHandler(FunctionalEventHandler.class)
.register(addon, ConfigPackPostLoadEvent.class)
.then(event -> {
Registry<Biome> biomeRegistry = event.getPack().getRegistry(Biome.class);
event.getPack().applyLoader(ReplaceableBiome.class, new ReplaceableBiomeLoader(biomeRegistry));
});
}
}

View File

@ -0,0 +1,67 @@
package com.dfsek.terra.addons.biome.extrusion;
import java.util.List;
import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;
import com.dfsek.terra.addons.biome.extrusion.api.Extrusion;
import com.dfsek.terra.api.util.Column;
import com.dfsek.terra.api.world.biome.Biome;
import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
public class BiomeExtrusionProvider implements BiomeProvider {
private final BiomeProvider delegate;
private final Set<Biome> biomes;
private final List<Extrusion> extrusions;
private final int resolution;
public BiomeExtrusionProvider(BiomeProvider delegate, List<Extrusion> extrusions, int resolution) {
this.delegate = delegate;
this.biomes = delegate.stream().collect(Collectors.toSet());
extrusions.forEach(e -> biomes.addAll(e.getBiomes()));
this.extrusions = extrusions;
this.resolution = resolution;
}
@Override
public Biome getBiome(int x, int y, int z, long seed) {
Biome delegated = delegate.getBiome(x, y, z, seed);
return extrude(delegated, x, y, z, seed);
}
public Biome extrude(Biome original, int x, int y, int z, long seed) {
for(Extrusion extrusion : extrusions) {
original = extrusion.extrude(original, x, y, z, seed);
}
return original;
}
@Override
public Column<Biome> getColumn(int x, int z, long seed, int min, int max) {
return delegate.getBaseBiome(x, z, seed)
.map(base -> (Column<Biome>) new BaseBiomeColumn(this, base, min, max, x, z, seed))
.orElseGet(() -> BiomeProvider.super.getColumn(x, z, seed, min, max));
}
@Override
public Optional<Biome> getBaseBiome(int x, int z, long seed) {
return delegate.getBaseBiome(x, z, seed);
}
@Override
public Iterable<Biome> getBiomes() {
return biomes;
}
@Override
public int resolution() {
return resolution;
}
public BiomeProvider getDelegate() {
return delegate;
}
}

View File

@ -0,0 +1,12 @@
package com.dfsek.terra.addons.biome.extrusion.api;
import com.dfsek.terra.api.world.biome.Biome;
import java.util.Collection;
public interface Extrusion {
Biome extrude(Biome original, int x, int y, int z, long seed);
Collection<Biome> getBiomes();
}

View File

@ -0,0 +1,23 @@
package com.dfsek.terra.addons.biome.extrusion.api;
import com.dfsek.terra.api.world.biome.Biome;
final class PresentBiome implements ReplaceableBiome {
private final Biome biome;
PresentBiome(Biome biome) {
this.biome = biome;
}
@Override
public Biome get(Biome existing) {
return biome;
}
@Override
public boolean isSelf() {
return false;
}
}

View File

@ -0,0 +1,31 @@
package com.dfsek.terra.addons.biome.extrusion.api;
import java.util.Optional;
import com.dfsek.terra.api.world.biome.Biome;
/**
* Basically just a specialised implementation of {@link Optional} for biomes where a biome may be a "self" reference.
*/
public sealed interface ReplaceableBiome permits PresentBiome, SelfBiome {
static ReplaceableBiome of(Biome biome) {
return new PresentBiome(biome);
}
static ReplaceableBiome self() {
return SelfBiome.INSTANCE;
}
Biome get(Biome existing);
default Biome get() {
if(isSelf()) {
throw new IllegalStateException("Cannot get() self biome!");
}
return get(null);
}
boolean isSelf();
}

View File

@ -0,0 +1,21 @@
package com.dfsek.terra.addons.biome.extrusion.api;
import java.util.Objects;
import com.dfsek.terra.api.world.biome.Biome;
final class SelfBiome implements ReplaceableBiome {
public static final SelfBiome INSTANCE = new SelfBiome();
@Override
public Biome get(Biome existing) {
return Objects.requireNonNull(existing);
}
@Override
public boolean isSelf() {
return true;
}
}

View File

@ -0,0 +1,30 @@
package com.dfsek.terra.addons.biome.extrusion.config;
import com.dfsek.tectonic.api.config.template.annotations.Default;
import com.dfsek.tectonic.api.config.template.annotations.Value;
import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
import java.util.List;
import com.dfsek.terra.addons.biome.extrusion.BiomeExtrusionProvider;
import com.dfsek.terra.addons.biome.extrusion.api.Extrusion;
import com.dfsek.terra.api.config.meta.Meta;
import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
public class BiomeExtrusionTemplate implements ObjectTemplate<BiomeProvider> {
@Value("provider")
private @Meta BiomeProvider provider;
@Value("resolution")
@Default
private @Meta int resolution = 4;
@Value("extrusions")
private @Meta List<@Meta Extrusion> extrusions;
@Override
public BiomeProvider get() {
return new BiomeExtrusionProvider(provider, extrusions, resolution);
}
}

View File

@ -0,0 +1,32 @@
package com.dfsek.terra.addons.biome.extrusion.config;
import com.dfsek.tectonic.api.depth.DepthTracker;
import com.dfsek.tectonic.api.exception.LoadException;
import com.dfsek.tectonic.api.loader.ConfigLoader;
import com.dfsek.tectonic.api.loader.type.TypeLoader;
import org.jetbrains.annotations.NotNull;
import java.lang.reflect.AnnotatedType;
import com.dfsek.terra.addons.biome.extrusion.api.ReplaceableBiome;
import com.dfsek.terra.api.registry.Registry;
import com.dfsek.terra.api.world.biome.Biome;
public class ReplaceableBiomeLoader implements TypeLoader<ReplaceableBiome> {
private final Registry<Biome> biomeRegistry;
public ReplaceableBiomeLoader(Registry<Biome> biomeRegistry) {
this.biomeRegistry = biomeRegistry;
}
@Override
public ReplaceableBiome load(@NotNull AnnotatedType t, @NotNull Object c, @NotNull ConfigLoader loader, DepthTracker depthTracker)
throws LoadException {
if(c.equals("SELF")) return ReplaceableBiome.self();
return biomeRegistry
.getByID((String) c)
.map(ReplaceableBiome::of)
.orElseThrow(() -> new LoadException("No such biome: " + c, depthTracker));
}
}

View File

@ -0,0 +1,23 @@
package com.dfsek.terra.addons.biome.extrusion.config.extrusions;
import com.dfsek.tectonic.api.config.template.annotations.Value;
import com.dfsek.terra.addons.biome.extrusion.api.Extrusion;
import com.dfsek.terra.addons.biome.extrusion.api.ReplaceableBiome;
import com.dfsek.terra.addons.biome.extrusion.extrusions.ReplaceExtrusion;
import com.dfsek.terra.api.config.meta.Meta;
import com.dfsek.terra.api.util.collection.ProbabilityCollection;
public class ReplaceExtrusionTemplate extends SamplerExtrusionTemplate {
@Value("to")
private @Meta ProbabilityCollection<@Meta ReplaceableBiome> biomes;
@Value("from")
private @Meta String fromTag;
@Override
public Extrusion get() {
return new ReplaceExtrusion(sampler, range, biomes, fromTag);
}
}

View File

@ -0,0 +1,18 @@
package com.dfsek.terra.addons.biome.extrusion.config.extrusions;
import com.dfsek.tectonic.api.config.template.annotations.Value;
import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
import com.dfsek.terra.addons.biome.extrusion.api.Extrusion;
import com.dfsek.terra.api.config.meta.Meta;
import com.dfsek.terra.api.noise.NoiseSampler;
import com.dfsek.terra.api.util.Range;
public abstract class SamplerExtrusionTemplate implements ObjectTemplate<Extrusion> {
@Value("sampler")
protected @Meta NoiseSampler sampler;
@Value("range")
protected @Meta Range range;
}

View File

@ -0,0 +1,20 @@
package com.dfsek.terra.addons.biome.extrusion.config.extrusions;
import com.dfsek.tectonic.api.config.template.annotations.Value;
import com.dfsek.terra.addons.biome.extrusion.api.Extrusion;
import com.dfsek.terra.addons.biome.extrusion.api.ReplaceableBiome;
import com.dfsek.terra.addons.biome.extrusion.extrusions.SetExtrusion;
import com.dfsek.terra.api.config.meta.Meta;
import com.dfsek.terra.api.util.collection.ProbabilityCollection;
public class SetExtrusionTemplate extends SamplerExtrusionTemplate {
@Value("to")
private @Meta ProbabilityCollection<@Meta ReplaceableBiome> biomes;
@Override
public Extrusion get() {
return new SetExtrusion(sampler, range, biomes);
}
}

View File

@ -0,0 +1,52 @@
package com.dfsek.terra.addons.biome.extrusion.extrusions;
import java.util.Collection;
import java.util.function.Predicate;
import java.util.stream.Collectors;
import com.dfsek.terra.addons.biome.extrusion.api.Extrusion;
import com.dfsek.terra.addons.biome.extrusion.api.ReplaceableBiome;
import com.dfsek.terra.addons.biome.query.api.BiomeQueries;
import com.dfsek.terra.api.noise.NoiseSampler;
import com.dfsek.terra.api.util.Range;
import com.dfsek.terra.api.util.collection.ProbabilityCollection;
import com.dfsek.terra.api.world.biome.Biome;
/**
* Sets biomes at locations based on a sampler.
*/
public class ReplaceExtrusion implements Extrusion {
private final NoiseSampler sampler;
private final Range range;
private final ProbabilityCollection<ReplaceableBiome> biomes;
private final Predicate<Biome> hasTag;
public ReplaceExtrusion(NoiseSampler sampler, Range range, ProbabilityCollection<ReplaceableBiome> biomes, String tag) {
this.sampler = sampler;
this.range = range;
this.biomes = biomes;
this.hasTag = BiomeQueries.has(tag);
}
@Override
public Biome extrude(Biome original, int x, int y, int z, long seed) {
if(hasTag.test(original)) {
return range.ifInRange(y, () -> biomes.get(sampler, x, y, z, seed).get(original), original);
}
return original;
}
@Override
public Collection<Biome> getBiomes() {
return biomes
.getContents()
.stream()
.filter(Predicate.not(ReplaceableBiome::isSelf))
.map(ReplaceableBiome::get)
.collect(Collectors.toSet());
}
}

View File

@ -0,0 +1,45 @@
package com.dfsek.terra.addons.biome.extrusion.extrusions;
import java.util.Collection;
import java.util.function.Predicate;
import java.util.stream.Collectors;
import com.dfsek.terra.addons.biome.extrusion.api.Extrusion;
import com.dfsek.terra.addons.biome.extrusion.api.ReplaceableBiome;
import com.dfsek.terra.api.noise.NoiseSampler;
import com.dfsek.terra.api.util.Range;
import com.dfsek.terra.api.util.collection.ProbabilityCollection;
import com.dfsek.terra.api.world.biome.Biome;
/**
* Sets biomes at locations based on a sampler.
*/
public class SetExtrusion implements Extrusion {
private final NoiseSampler sampler;
private final Range range;
private final ProbabilityCollection<ReplaceableBiome> biomes;
public SetExtrusion(NoiseSampler sampler, Range range, ProbabilityCollection<ReplaceableBiome> biomes) {
this.sampler = sampler;
this.range = range;
this.biomes = biomes;
}
@Override
public Biome extrude(Biome original, int x, int y, int z, long seed) {
return range.ifInRange(y, () -> biomes.get(sampler, x, y, z, seed).get(original), original);
}
@Override
public Collection<Biome> getBiomes() {
return biomes
.getContents()
.stream()
.filter(Predicate.not(ReplaceableBiome::isSelf))
.map(ReplaceableBiome::get)
.collect(Collectors.toSet());
}
}

View File

@ -0,0 +1,14 @@
schema-version: 1
contributors:
- Terra contributors
id: biome-provider-extrusion
version: @VERSION@
entrypoints:
- "com.dfsek.terra.addons.biome.extrusion.BiomeExtrusionAddon"
website:
issues: https://github.com/PolyhedralDev/Terra/issues
source: https://github.com/PolyhedralDev/Terra
docs: https://terra.polydev.org
license: MIT License
depends:
biome-query-api: "1.+"

View File

@ -0,0 +1,21 @@
MIT License
Copyright (c) 2020-2025 Polyhedral Development
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

View File

@ -0,0 +1,5 @@
# biome-provider-image-v2
Implements and registers the `IMAGE` biome provider, which
utilizes various config types provided by the `library-image` addon to
distribute biomes based on images.

View File

@ -0,0 +1,8 @@
version = version("1.0.1")
dependencies {
compileOnlyApi(project(":common:addons:manifest-addon-loader"))
compileOnlyApi(project(":common:addons:library-image"))
}

View File

@ -0,0 +1,51 @@
/*
* Copyright (c) 2020-2025 Polyhedral Development
*
* The Terra Core Addons are licensed under the terms of the MIT License. For more details,
* reference the LICENSE file in this module's root directory.
*/
package com.dfsek.terra.addons.biome.image.v2;
import java.util.Optional;
import com.dfsek.terra.addons.image.colorsampler.ColorSampler;
import com.dfsek.terra.addons.image.converter.ColorConverter;
import com.dfsek.terra.api.world.biome.Biome;
import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
public class ImageBiomeProvider implements BiomeProvider {
private final int resolution;
private final ColorConverter<Biome> colorConverter;
private final ColorSampler colorSampler;
public ImageBiomeProvider(ColorConverter<Biome> colorConverter, ColorSampler colorSampler, int resolution) {
this.resolution = resolution;
this.colorConverter = colorConverter;
this.colorSampler = colorSampler;
}
@Override
public Biome getBiome(int x, int y, int z, long seed) {
return getBiome(x, z);
}
public Biome getBiome(int x, int z) {
x /= resolution;
z /= resolution;
return colorConverter.apply(colorSampler.apply(x, z));
}
@Override
public Optional<Biome> getBaseBiome(int x, int z, long seed) {
return Optional.of(getBiome(x, z));
}
@Override
public Iterable<Biome> getBiomes() {
return colorConverter.getEntries();
}
}

View File

@ -0,0 +1,78 @@
/*
* Copyright (c) 2020-2025 Polyhedral Development
*
* The Terra Core Addons are licensed under the terms of the MIT License. For more details,
* reference the LICENSE file in this module's root directory.
*/
package com.dfsek.terra.addons.biome.image.v2;
import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
import java.util.function.Supplier;
import com.dfsek.terra.addons.biome.image.v2.config.ImageProviderTemplate;
import com.dfsek.terra.addons.biome.image.v2.config.converter.ClosestBiomeColorConverterTemplate;
import com.dfsek.terra.addons.biome.image.v2.config.converter.ExactBiomeColorConverterTemplate;
import com.dfsek.terra.addons.biome.image.v2.config.converter.mapping.DefinedBiomeColorMappingTemplate;
import com.dfsek.terra.addons.image.converter.ColorConverter;
import com.dfsek.terra.addons.image.converter.mapping.BiomeDefinedColorMapping;
import com.dfsek.terra.addons.image.converter.mapping.ColorMapping;
import com.dfsek.terra.addons.manifest.api.AddonInitializer;
import com.dfsek.terra.api.Platform;
import com.dfsek.terra.api.addon.BaseAddon;
import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent;
import com.dfsek.terra.api.event.functional.FunctionalEventHandler;
import com.dfsek.terra.api.inject.annotations.Inject;
import com.dfsek.terra.api.registry.CheckedRegistry;
import com.dfsek.terra.api.util.reflection.TypeKey;
import com.dfsek.terra.api.world.biome.Biome;
import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
public class ImageBiomeProviderAddon implements AddonInitializer {
public static final TypeKey<Supplier<ObjectTemplate<BiomeProvider>>> PROVIDER_REGISTRY_KEY = new TypeKey<>() {
};
public static final TypeKey<Supplier<ObjectTemplate<ColorConverter<Biome>>>> BIOME_COLOR_CONVERTER_REGISTRY_KEY = new TypeKey<>() {
};
public static final TypeKey<Supplier<ObjectTemplate<ColorMapping<Biome>>>> BIOME_COLOR_MAPPING_REGISTRY_KEY = new TypeKey<>() {
};
@Inject
private Platform platform;
@Inject
private BaseAddon addon;
@Override
public void initialize() {
platform.getEventManager()
.getHandler(FunctionalEventHandler.class)
.register(addon, ConfigPackPreLoadEvent.class)
.priority(501)
.then(event -> {
CheckedRegistry<Supplier<ObjectTemplate<BiomeProvider>>> providerRegistry = event.getPack().getOrCreateRegistry(
PROVIDER_REGISTRY_KEY);
providerRegistry.register(addon.key("IMAGE"), ImageProviderTemplate::new);
})
.then(event -> {
CheckedRegistry<Supplier<ObjectTemplate<ColorConverter<Biome>>>> biomeColorConverterRegistry =
event.getPack().getOrCreateRegistry(
BIOME_COLOR_CONVERTER_REGISTRY_KEY);
biomeColorConverterRegistry.register(addon.key("EXACT"), ExactBiomeColorConverterTemplate::new);
biomeColorConverterRegistry.register(addon.key("CLOSEST"), ClosestBiomeColorConverterTemplate::new);
})
.then(event -> {
CheckedRegistry<Supplier<ObjectTemplate<ColorMapping<Biome>>>> biomeColorMappingRegistry =
event.getPack().getOrCreateRegistry(
BIOME_COLOR_MAPPING_REGISTRY_KEY);
biomeColorMappingRegistry.register(addon.key("USE_BIOME_COLORS"),
() -> () -> new BiomeDefinedColorMapping<>(event.getPack().getRegistry(Biome.class),
b -> b));
biomeColorMappingRegistry.register(addon.key("MAP"), DefinedBiomeColorMappingTemplate::new);
})
.failThrough();
}
}

View File

@ -0,0 +1,40 @@
/*
* Copyright (c) 2020-2025 Polyhedral Development
*
* The Terra Core Addons are licensed under the terms of the MIT License. For more details,
* reference the LICENSE file in this module's root directory.
*/
package com.dfsek.terra.addons.biome.image.v2.config;
import com.dfsek.tectonic.api.config.template.annotations.Default;
import com.dfsek.tectonic.api.config.template.annotations.Description;
import com.dfsek.tectonic.api.config.template.annotations.Value;
import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
import com.dfsek.terra.addons.biome.image.v2.ImageBiomeProvider;
import com.dfsek.terra.addons.image.colorsampler.ColorSampler;
import com.dfsek.terra.addons.image.converter.ColorConverter;
import com.dfsek.terra.api.world.biome.Biome;
import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
@SuppressWarnings("FieldMayBeFinal")
public class ImageProviderTemplate implements ObjectTemplate<BiomeProvider> {
@Value("resolution")
@Default
@Description("Sets the resolution at which to sample the image.")
private int resolution = 1;
@Value("color-sampler")
private ColorSampler colorSampler;
@Value("color-conversion")
private ColorConverter<Biome> colorConverter;
@Override
public BiomeProvider get() {
return new ImageBiomeProvider(colorConverter, colorSampler, resolution);
}
}

View File

@ -0,0 +1,19 @@
package com.dfsek.terra.addons.biome.image.v2.config.converter;
import com.dfsek.tectonic.api.config.template.annotations.Value;
import com.dfsek.terra.addons.image.config.converter.ClosestColorConverterTemplate;
import com.dfsek.terra.addons.image.converter.mapping.ColorMapping;
import com.dfsek.terra.api.world.biome.Biome;
public class ClosestBiomeColorConverterTemplate extends ClosestColorConverterTemplate<Biome> {
@Value("match")
private ColorMapping<Biome> match;
@Override
protected ColorMapping<Biome> getMapping() {
return match;
}
}

View File

@ -0,0 +1,37 @@
package com.dfsek.terra.addons.biome.image.v2.config.converter;
import com.dfsek.tectonic.api.config.template.annotations.Default;
import com.dfsek.tectonic.api.config.template.annotations.Value;
import com.dfsek.terra.addons.image.config.converter.ExactColorConverterTemplate;
import com.dfsek.terra.addons.image.converter.mapping.ColorMapping;
import com.dfsek.terra.api.world.biome.Biome;
public class ExactBiomeColorConverterTemplate extends ExactColorConverterTemplate<Biome> {
@Value("match")
private ColorMapping<Biome> match;
@Value("else")
private Biome fallback;
@Value("ignore-alpha")
@Default
private boolean ignoreAlpha = true;
@Override
protected ColorMapping<Biome> getMapping() {
return match;
}
@Override
protected Biome getFallback() {
return fallback;
}
@Override
protected boolean ignoreAlpha() {
return ignoreAlpha;
}
}

View File

@ -0,0 +1,24 @@
package com.dfsek.terra.addons.biome.image.v2.config.converter.mapping;
import com.dfsek.tectonic.api.config.template.annotations.Value;
import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
import java.util.Map;
import com.dfsek.terra.addons.image.config.ColorLoader.ColorString;
import com.dfsek.terra.addons.image.converter.mapping.ColorMapping;
import com.dfsek.terra.addons.image.util.MapUtil;
import com.dfsek.terra.api.world.biome.Biome;
public class DefinedBiomeColorMappingTemplate implements ObjectTemplate<ColorMapping<Biome>> {
@Value("map")
Map<ColorString, Biome> map;
@Override
public ColorMapping<Biome> get() {
var map = MapUtil.mapKeys(this.map, ColorString::getColor);
return () -> map;
}
}

View File

@ -0,0 +1,14 @@
schema-version: 1
contributors:
- Terra contributors
id: biome-provider-image-v2
version: @VERSION@
entrypoints:
- "com.dfsek.terra.addons.biome.image.v2.ImageBiomeProviderAddon"
website:
issues: https://github.com/PolyhedralDev/Terra/issues
source: https://github.com/PolyhedralDev/Terra
docs: https://terra.polydev.org
license: MIT License
depends:
library-image: "1.+"

View File

@ -0,0 +1,21 @@
MIT License
Copyright (c) 2020-2025 Polyhedral Development
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

View File

@ -0,0 +1,6 @@
# biome-provider-image
Implements and registers the `IMAGE` biome provider, a biome provider which
generates biomes from an image, using the `color` attribute of biomes.
This addon registers the provider type, and all associated config options.

View File

@ -0,0 +1,7 @@
version = version("1.0.1")
dependencies {
compileOnlyApi(project(":common:addons:manifest-addon-loader"))
}

View File

@ -0,0 +1,84 @@
/*
* Copyright (c) 2020-2025 Polyhedral Development
*
* The Terra Core Addons are licensed under the terms of the MIT License. For more details,
* reference the LICENSE file in this module's root directory.
*/
package com.dfsek.terra.addons.biome.image;
import java.awt.Color;
import java.awt.image.BufferedImage;
import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
import com.dfsek.terra.api.world.biome.Biome;
import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
public class ImageBiomeProvider implements BiomeProvider {
private final Map<Color, Biome> colorBiomeMap = new HashMap<>();
private final BufferedImage image;
private final int resolution;
private final Align align;
public ImageBiomeProvider(Set<Biome> registry, BufferedImage image, int resolution, Align align) {
this.image = image;
this.resolution = resolution;
this.align = align;
registry.forEach(biome -> colorBiomeMap.put(new Color(biome.getColor()), biome));
}
private static int distance(Color a, Color b) {
return Math.abs(a.getRed() - b.getRed()) + Math.abs(a.getGreen() - b.getGreen()) + Math.abs(a.getBlue() - b.getBlue());
}
@Override
public Biome getBiome(int x, int y, int z, long seed) {
return getBiome(x, z);
}
public Biome getBiome(int x, int z) {
x /= resolution;
z /= resolution;
Color color = align.getColor(image, x, z);
return colorBiomeMap.get(colorBiomeMap.keySet()
.stream()
.reduce(colorBiomeMap.keySet().stream().findAny().orElseThrow(IllegalStateException::new),
(running, element) -> {
int d1 = distance(color, running);
int d2 = distance(color, element);
return d1 < d2 ? running : element;
}));
}
@Override
public Optional<Biome> getBaseBiome(int x, int z, long seed) {
return Optional.of(getBiome(x, z));
}
@Override
public Iterable<Biome> getBiomes() {
return colorBiomeMap.values();
}
public enum Align {
CENTER {
@Override
public Color getColor(BufferedImage image, int x, int z) {
return new Color(image.getRGB(Math.floorMod(x - image.getWidth() / 2, image.getWidth()),
Math.floorMod(z - image.getHeight() / 2, image.getHeight())));
}
},
NONE {
@Override
public Color getColor(BufferedImage image, int x, int z) {
return new Color(image.getRGB(Math.floorMod(x, image.getWidth()), Math.floorMod(z, image.getHeight())));
}
};
public abstract Color getColor(BufferedImage image, int x, int z);
}
}

View File

@ -0,0 +1,56 @@
/*
* Copyright (c) 2020-2025 Polyhedral Development
*
* The Terra Core Addons are licensed under the terms of the MIT License. For more details,
* reference the LICENSE file in this module's root directory.
*/
package com.dfsek.terra.addons.biome.image;
import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.function.Supplier;
import com.dfsek.terra.addons.manifest.api.AddonInitializer;
import com.dfsek.terra.api.Platform;
import com.dfsek.terra.api.addon.BaseAddon;
import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent;
import com.dfsek.terra.api.event.functional.FunctionalEventHandler;
import com.dfsek.terra.api.inject.annotations.Inject;
import com.dfsek.terra.api.registry.CheckedRegistry;
import com.dfsek.terra.api.util.reflection.TypeKey;
import com.dfsek.terra.api.world.biome.Biome;
import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
public class ImageBiomeProviderAddon implements AddonInitializer {
public static final TypeKey<Supplier<ObjectTemplate<BiomeProvider>>> PROVIDER_REGISTRY_KEY = new TypeKey<>() {
};
private static final Logger logger = LoggerFactory.getLogger(ImageBiomeProviderAddon.class);
@Inject
private Platform platform;
@Inject
private BaseAddon addon;
@Override
public void initialize() {
platform.getEventManager()
.getHandler(FunctionalEventHandler.class)
.register(addon, ConfigPackPreLoadEvent.class)
.then(event -> {
CheckedRegistry<Supplier<ObjectTemplate<BiomeProvider>>> providerRegistry = event.getPack().getOrCreateRegistry(
PROVIDER_REGISTRY_KEY);
providerRegistry.register(addon.key("IMAGE"),
() -> new ImageProviderTemplate(event.getPack().getRegistry(Biome.class)));
})
.failThrough();
if(platform.getTerraConfig().isDebugLog())
logger.warn(
"The biome-provider-image addon is deprecated and scheduled for removal in Terra 7.0. It is recommended to use the " +
"biome-provider-image-v2 addon for future pack development instead.");
}
}

View File

@ -0,0 +1,45 @@
/*
* Copyright (c) 2020-2025 Polyhedral Development
*
* The Terra Core Addons are licensed under the terms of the MIT License. For more details,
* reference the LICENSE file in this module's root directory.
*/
package com.dfsek.terra.addons.biome.image;
import com.dfsek.tectonic.api.config.template.annotations.Default;
import com.dfsek.tectonic.api.config.template.annotations.Description;
import com.dfsek.tectonic.api.config.template.annotations.Value;
import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
import java.awt.image.BufferedImage;
import java.util.HashSet;
import com.dfsek.terra.api.registry.Registry;
import com.dfsek.terra.api.world.biome.Biome;
import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
@SuppressWarnings("FieldMayBeFinal")
public class ImageProviderTemplate implements ObjectTemplate<BiomeProvider> {
private final Registry<Biome> biomes;
@Value("resolution")
@Default
@Description("Sets the resolution at which to sample the image.")
private int resolution = 1;
@Value("image.name")
@Description("Sets the location of the image on the filesystem, relative to the pack root.")
private BufferedImage image;
@Value("image.align")
@Description("Sets the alignment style to use for the image.")
private ImageBiomeProvider.Align align;
public ImageProviderTemplate(Registry<Biome> set) {
this.biomes = set;
}
@Override
public BiomeProvider get() {
return new ImageBiomeProvider(new HashSet<>(biomes.entries()), image, resolution, align);
}
}

View File

@ -0,0 +1,12 @@
schema-version: 1
contributors:
- Terra contributors
id: biome-provider-image
version: @VERSION@
entrypoints:
- "com.dfsek.terra.addons.biome.image.ImageBiomeProviderAddon"
website:
issues: https://github.com/PolyhedralDev/Terra/issues
source: https://github.com/PolyhedralDev/Terra
docs: https://terra.polydev.org
license: MIT License

View File

@ -0,0 +1,21 @@
MIT License
Copyright (c) 2020-2025 Polyhedral Development
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

View File

@ -0,0 +1,12 @@
# biome-provider-pipeline-2
The second version of the Biome Pipeline, a procedural biome provider that uses a series
of "stages" to apply "mutations" to a 2D grid of biomes.
Version 2 is a re-implementation of the original addon with the primary goal of providing
consistent scaling for noise relative to the world
(See https://github.com/PolyhedralDev/Terra/issues/264 for more details), and has been
included as a separate addon to maintain parity with packs utilizing the first version.
This addon registers the `PIPELINE` biome provider type, and all associated
configurations.

View File

@ -0,0 +1,5 @@
version = version("1.0.1")
dependencies {
compileOnlyApi(project(":common:addons:manifest-addon-loader"))
}

View File

@ -0,0 +1,89 @@
/*
* Copyright (c) 2020-2025 Polyhedral Development
*
* The Terra Core Addons are licensed under the terms of the MIT License. For more details,
* reference the LICENSE file in this module's root directory.
*/
package com.dfsek.terra.addons.biome.pipeline.v2;
import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
import java.util.function.Supplier;
import com.dfsek.terra.addons.biome.pipeline.v2.api.Source;
import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage;
import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
import com.dfsek.terra.addons.biome.pipeline.v2.config.BiomePipelineTemplate;
import com.dfsek.terra.addons.biome.pipeline.v2.config.PipelineBiomeLoader;
import com.dfsek.terra.addons.biome.pipeline.v2.config.source.SamplerSourceTemplate;
import com.dfsek.terra.addons.biome.pipeline.v2.config.stage.expander.ExpanderStageTemplate;
import com.dfsek.terra.addons.biome.pipeline.v2.config.stage.mutator.BorderListStageTemplate;
import com.dfsek.terra.addons.biome.pipeline.v2.config.stage.mutator.BorderStageTemplate;
import com.dfsek.terra.addons.biome.pipeline.v2.config.stage.mutator.ReplaceListStageTemplate;
import com.dfsek.terra.addons.biome.pipeline.v2.config.stage.mutator.ReplaceStageTemplate;
import com.dfsek.terra.addons.biome.pipeline.v2.config.stage.mutator.SmoothStageTemplate;
import com.dfsek.terra.addons.manifest.api.AddonInitializer;
import com.dfsek.terra.api.Platform;
import com.dfsek.terra.api.addon.BaseAddon;
import com.dfsek.terra.api.event.events.config.pack.ConfigPackPostLoadEvent;
import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent;
import com.dfsek.terra.api.event.functional.FunctionalEventHandler;
import com.dfsek.terra.api.inject.annotations.Inject;
import com.dfsek.terra.api.registry.CheckedRegistry;
import com.dfsek.terra.api.registry.Registry;
import com.dfsek.terra.api.util.reflection.TypeKey;
import com.dfsek.terra.api.world.biome.Biome;
import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
public class BiomePipelineAddon implements AddonInitializer {
public static final TypeKey<Supplier<ObjectTemplate<Source>>> SOURCE_REGISTRY_KEY = new TypeKey<>() {
};
public static final TypeKey<Supplier<ObjectTemplate<Stage>>> STAGE_REGISTRY_KEY = new TypeKey<>() {
};
public static final TypeKey<Supplier<ObjectTemplate<BiomeProvider>>> PROVIDER_REGISTRY_KEY = new TypeKey<>() {
};
@Inject
private Platform platform;
@Inject
private BaseAddon addon;
@Override
public void initialize() {
platform.getEventManager()
.getHandler(FunctionalEventHandler.class)
.register(addon, ConfigPackPreLoadEvent.class)
.then(event -> {
CheckedRegistry<Supplier<ObjectTemplate<BiomeProvider>>> providerRegistry = event.getPack().getOrCreateRegistry(
PROVIDER_REGISTRY_KEY);
providerRegistry.register(addon.key("PIPELINE"), BiomePipelineTemplate::new);
})
.then(event -> {
CheckedRegistry<Supplier<ObjectTemplate<Source>>> sourceRegistry = event.getPack().getOrCreateRegistry(
SOURCE_REGISTRY_KEY);
sourceRegistry.register(addon.key("SAMPLER"), SamplerSourceTemplate::new);
})
.then(event -> {
CheckedRegistry<Supplier<ObjectTemplate<Stage>>> stageRegistry = event.getPack().getOrCreateRegistry(
STAGE_REGISTRY_KEY);
stageRegistry.register(addon.key("FRACTAL_EXPAND"), ExpanderStageTemplate::new);
stageRegistry.register(addon.key("SMOOTH"), SmoothStageTemplate::new);
stageRegistry.register(addon.key("REPLACE"), ReplaceStageTemplate::new);
stageRegistry.register(addon.key("REPLACE_LIST"), ReplaceListStageTemplate::new);
stageRegistry.register(addon.key("BORDER"), BorderStageTemplate::new);
stageRegistry.register(addon.key("BORDER_LIST"), BorderListStageTemplate::new);
})
.failThrough();
platform.getEventManager()
.getHandler(FunctionalEventHandler.class)
.register(addon, ConfigPackPostLoadEvent.class)
.then(event -> {
Registry<Biome> biomeRegistry = event.getPack().getRegistry(Biome.class);
event.getPack().applyLoader(PipelineBiome.class, new PipelineBiomeLoader(biomeRegistry));
});
}
}

View File

@ -0,0 +1,71 @@
package com.dfsek.terra.addons.biome.pipeline.v2;
import java.util.function.Consumer;
import com.dfsek.terra.api.util.Column;
import com.dfsek.terra.api.util.function.IntIntObjConsumer;
import com.dfsek.terra.api.util.function.IntObjConsumer;
import com.dfsek.terra.api.world.biome.Biome;
import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
public class BiomePipelineColumn implements Column<Biome> {
private final int min;
private final int max;
private final int x;
private final int z;
private final Biome biome;
protected BiomePipelineColumn(BiomeProvider biomeProvider, int min, int max, int x, int z, long seed) {
this.min = min;
this.max = max;
this.x = x;
this.z = z;
this.biome = biomeProvider.getBiome(x, 0, z, seed);
}
@Override
public int getMinY() {
return min;
}
@Override
public int getMaxY() {
return max;
}
@Override
public int getX() {
return x;
}
@Override
public int getZ() {
return z;
}
@Override
public Biome get(int y) {
return biome;
}
@Override
public void forRanges(int resolution, IntIntObjConsumer<Biome> consumer) {
consumer.accept(min, max, biome);
}
@Override
public void forEach(Consumer<Biome> consumer) {
for(int y = min; y < max; y++) {
consumer.accept(biome);
}
}
@Override
public void forEach(IntObjConsumer<Biome> consumer) {
for(int y = min; y < max; y++) {
consumer.accept(y, biome);
}
}
}

View File

@ -0,0 +1,116 @@
package com.dfsek.terra.addons.biome.pipeline.v2;
import com.dfsek.terra.api.util.cache.SeededVector2Key;
import com.github.benmanes.caffeine.cache.Caffeine;
import com.github.benmanes.caffeine.cache.LoadingCache;
import java.util.Comparator;
import java.util.HashSet;
import java.util.Optional;
import java.util.Set;
import java.util.stream.StreamSupport;
import com.dfsek.terra.addons.biome.pipeline.v2.api.BiomeChunk;
import com.dfsek.terra.addons.biome.pipeline.v2.api.Pipeline;
import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage;
import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
import com.dfsek.terra.api.noise.NoiseSampler;
import com.dfsek.terra.api.registry.key.StringIdentifiable;
import com.dfsek.terra.api.util.Column;
import com.dfsek.terra.api.world.biome.Biome;
import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
public class PipelineBiomeProvider implements BiomeProvider {
private final LoadingCache<SeededVector2Key, BiomeChunk> biomeChunkCache;
private final int chunkSize;
private final int resolution;
private final NoiseSampler mutator;
private final double noiseAmp;
private final Set<Biome> biomes;
public PipelineBiomeProvider(Pipeline pipeline, int resolution, NoiseSampler mutator, double noiseAmp) {
this.resolution = resolution;
this.mutator = mutator;
this.noiseAmp = noiseAmp;
this.chunkSize = pipeline.getChunkSize();
this.biomeChunkCache = Caffeine.newBuilder()
.maximumSize(64)
.build(pipeline::generateChunk);
Set<PipelineBiome> biomeSet = new HashSet<>();
pipeline.getSource().getBiomes().forEach(biomeSet::add);
Iterable<PipelineBiome> result = biomeSet;
for(Stage stage : pipeline.getStages()) {
result = stage.getBiomes(result);
}
this.biomes = new HashSet<>();
Iterable<PipelineBiome> finalResult = result;
result.forEach(pipelineBiome -> {
if(pipelineBiome.isPlaceholder()) {
StringBuilder biomeList = new StringBuilder("\n");
StreamSupport.stream(finalResult.spliterator(), false)
.sorted(Comparator.comparing(StringIdentifiable::getID))
.forEach(delegate -> biomeList
.append(" - ")
.append(delegate.getID())
.append(':')
.append(delegate.getClass().getCanonicalName())
.append('\n'));
throw new IllegalArgumentException("Biome Pipeline leaks placeholder biome \"" + pipelineBiome.getID() +
"\". Ensure there is a stage to guarantee replacement of the placeholder biome. " +
"Biomes: " +
biomeList);
}
this.biomes.add(pipelineBiome.getBiome());
});
}
@Override
public Biome getBiome(int x, int y, int z, long seed) {
return getBiome(x, z, seed);
}
public Biome getBiome(int x, int z, long seed) {
x += mutator.noise(seed + 1, x, z) * noiseAmp;
z += mutator.noise(seed + 2, x, z) * noiseAmp;
x /= resolution;
z /= resolution;
int chunkX = Math.floorDiv(x, chunkSize);
int chunkZ = Math.floorDiv(z, chunkSize);
int chunkWorldX = chunkX * chunkSize;
int chunkWorldZ = chunkZ * chunkSize;
int xInChunk = x - chunkWorldX;
int zInChunk = z - chunkWorldZ;
return biomeChunkCache.get(new SeededVector2Key(chunkWorldX, chunkWorldZ, seed)).get(xInChunk, zInChunk).getBiome();
}
@Override
public Iterable<Biome> getBiomes() {
return biomes;
}
@Override
public Optional<Biome> getBaseBiome(int x, int z, long seed) {
return Optional.of(getBiome(x, z, seed));
}
@Override
public Column<Biome> getColumn(int x, int z, long seed, int min, int max) {
return new BiomePipelineColumn(this, min, max, x, z, seed);
}
@Override
public int resolution() {
return resolution;
}
}

View File

@ -0,0 +1,10 @@
package com.dfsek.terra.addons.biome.pipeline.v2.api;
import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
public interface BiomeChunk {
PipelineBiome get(int xInChunk, int zInChunk);
}

View File

@ -0,0 +1,29 @@
package com.dfsek.terra.addons.biome.pipeline.v2.api;
import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
import com.dfsek.terra.addons.biome.pipeline.v2.pipeline.BiomeChunkImpl.ViewPoint;
/**
* Resizes the internal grid of a BiomeChunk when applied, serves the purpose of
* filling in null biomes as a result of this resizing.
*/
public interface Expander extends Stage {
PipelineBiome fillBiome(ViewPoint viewPoint);
@Override
default int maxRelativeReadDistance() {
return 0;
}
@Override
default PipelineBiome apply(ViewPoint viewPoint) {
PipelineBiome currentBiome = viewPoint.getBiome();
if(currentBiome == null) {
return fillBiome(viewPoint);
} else {
return currentBiome;
}
}
}

View File

@ -0,0 +1,16 @@
package com.dfsek.terra.addons.biome.pipeline.v2.api;
import com.dfsek.terra.api.util.cache.SeededVector2Key;
import java.util.List;
public interface Pipeline {
BiomeChunk generateChunk(SeededVector2Key worldCoordinates);
int getChunkSize();
Source getSource();
List<Stage> getStages();
}

View File

@ -0,0 +1,11 @@
package com.dfsek.terra.addons.biome.pipeline.v2.api;
import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
public interface Source {
PipelineBiome get(long seed, int x, int z);
Iterable<PipelineBiome> getBiomes();
}

View File

@ -0,0 +1,15 @@
package com.dfsek.terra.addons.biome.pipeline.v2.api;
import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
import com.dfsek.terra.addons.biome.pipeline.v2.pipeline.BiomeChunkImpl.ViewPoint;
public interface Stage {
PipelineBiome apply(ViewPoint viewPoint);
int maxRelativeReadDistance();
default Iterable<PipelineBiome> getBiomes(Iterable<PipelineBiome> biomes) {
return biomes;
}
}

View File

@ -0,0 +1,40 @@
package com.dfsek.terra.addons.biome.pipeline.v2.api.biome;
import java.util.Set;
import com.dfsek.terra.api.world.biome.Biome;
public final class DelegatedPipelineBiome implements PipelineBiome {
private final Biome biome;
public DelegatedPipelineBiome(Biome biome) {
this.biome = biome;
}
@Override
public Biome getBiome() {
return biome;
}
@Override
public int hashCode() {
return biome.hashCode();
}
@Override
public boolean equals(Object obj) {
if(!(obj instanceof DelegatedPipelineBiome that)) return false;
return that.biome.equals(this.biome);
}
@Override
public Set<String> getTags() {
return biome.getTags();
}
@Override
public String getID() {
return biome.getID();
}
}

View File

@ -0,0 +1,35 @@
package com.dfsek.terra.addons.biome.pipeline.v2.api.biome;
import java.util.Set;
import com.dfsek.terra.api.registry.key.StringIdentifiable;
import com.dfsek.terra.api.world.biome.Biome;
public interface PipelineBiome extends StringIdentifiable {
static PipelineBiome placeholder(String id) {
return new PlaceholderPipelineBiome(id);
}
static PipelineBiome from(Biome biome) {
return new DelegatedPipelineBiome(biome);
}
static PipelineBiome self() {
return SelfPipelineBiome.INSTANCE;
}
Biome getBiome();
Set<String> getTags();
default boolean isPlaceholder() {
return false;
}
default boolean isSelf() {
return false;
}
}

View File

@ -0,0 +1,51 @@
package com.dfsek.terra.addons.biome.pipeline.v2.api.biome;
import java.util.HashSet;
import java.util.Set;
import com.dfsek.terra.api.world.biome.Biome;
final class PlaceholderPipelineBiome implements PipelineBiome {
private final Set<String> tags;
private final String id;
public PlaceholderPipelineBiome(String id) {
this.id = id;
tags = new HashSet<>();
tags.add(id);
tags.add("ALL");
}
@Override
public Biome getBiome() {
throw new UnsupportedOperationException("Cannot get raw biome from placeholder pipeline biome");
}
@Override
public Set<String> getTags() {
return tags;
}
@Override
public String getID() {
return id;
}
@Override
public boolean isPlaceholder() {
return true;
}
@Override
public int hashCode() {
return id.hashCode();
}
@Override
public boolean equals(Object obj) {
if(!(obj instanceof PlaceholderPipelineBiome that)) return false;
return this.id.equals(that.id);
}
}

View File

@ -0,0 +1,40 @@
package com.dfsek.terra.addons.biome.pipeline.v2.api.biome;
import java.util.Collections;
import java.util.Set;
import com.dfsek.terra.api.world.biome.Biome;
final class SelfPipelineBiome implements PipelineBiome {
public static final SelfPipelineBiome INSTANCE = new SelfPipelineBiome();
private SelfPipelineBiome() {
}
@Override
public Biome getBiome() {
throw new UnsupportedOperationException("Cannot get biome from self delegate");
}
@Override
public boolean isSelf() {
return true;
}
@Override
public boolean isPlaceholder() {
return true;
}
@Override
public Set<String> getTags() {
return Collections.emptySet();
}
@Override
public String getID() {
return "SELF";
}
}

View File

@ -0,0 +1,55 @@
/*
* Copyright (c) 2020-2025 Polyhedral Development
*
* The Terra Core Addons are licensed under the terms of the MIT License. For more details,
* reference the LICENSE file in this module's root directory.
*/
package com.dfsek.terra.addons.biome.pipeline.v2.config;
import com.dfsek.tectonic.api.config.template.annotations.Default;
import com.dfsek.tectonic.api.config.template.annotations.Description;
import com.dfsek.tectonic.api.config.template.annotations.Value;
import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
import java.util.List;
import com.dfsek.terra.addons.biome.pipeline.v2.PipelineBiomeProvider;
import com.dfsek.terra.addons.biome.pipeline.v2.api.Source;
import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage;
import com.dfsek.terra.addons.biome.pipeline.v2.pipeline.PipelineImpl;
import com.dfsek.terra.api.config.meta.Meta;
import com.dfsek.terra.api.noise.NoiseSampler;
import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
@SuppressWarnings({ "FieldMayBeFinal", "unused" })
public class BiomePipelineTemplate implements ObjectTemplate<BiomeProvider> {
@Value("resolution")
@Default
@Description("""
The resolution at which to sample biomes.
Larger values are quadratically faster, but produce lower quality results.
For example, a value of 3 would sample every 3 blocks.""")
protected @Meta int resolution = 1;
@Value("blend.sampler")
@Default
@Description("A sampler to use for blending the edges of biomes via domain warping.")
protected @Meta NoiseSampler blendSampler = NoiseSampler.zero();
@Value("blend.amplitude")
@Default
@Description("The amplitude at which to perform blending.")
protected @Meta double blendAmplitude = 0d;
@Value("pipeline.source")
@Description("The Biome Source to use for initial population of biomes.")
private @Meta Source source;
@Value("pipeline.stages")
@Description("A list of pipeline stages to apply to the result of #source")
private @Meta List<@Meta Stage> stages;
@Override
public BiomeProvider get() {
return new PipelineBiomeProvider(new PipelineImpl(source, stages, resolution, 128), resolution, blendSampler, blendAmplitude);
}
}

View File

@ -0,0 +1,32 @@
package com.dfsek.terra.addons.biome.pipeline.v2.config;
import com.dfsek.tectonic.api.depth.DepthTracker;
import com.dfsek.tectonic.api.exception.LoadException;
import com.dfsek.tectonic.api.loader.ConfigLoader;
import com.dfsek.tectonic.api.loader.type.TypeLoader;
import org.jetbrains.annotations.NotNull;
import java.lang.reflect.AnnotatedType;
import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
import com.dfsek.terra.api.registry.Registry;
import com.dfsek.terra.api.world.biome.Biome;
public class PipelineBiomeLoader implements TypeLoader<PipelineBiome> {
private final Registry<Biome> biomeRegistry;
public PipelineBiomeLoader(Registry<Biome> biomeRegistry) {
this.biomeRegistry = biomeRegistry;
}
@Override
public PipelineBiome load(@NotNull AnnotatedType t, @NotNull Object c, @NotNull ConfigLoader loader, DepthTracker depthTracker)
throws LoadException {
if(c.equals("SELF")) return PipelineBiome.self();
return biomeRegistry
.getByID((String) c)
.map(PipelineBiome::from)
.orElseGet(() -> PipelineBiome.placeholder((String) c));
}
}

View File

@ -0,0 +1,34 @@
/*
* Copyright (c) 2020-2025 Polyhedral Development
*
* The Terra Core Addons are licensed under the terms of the MIT License. For more details,
* reference the LICENSE file in this module's root directory.
*/
package com.dfsek.terra.addons.biome.pipeline.v2.config.source;
import com.dfsek.tectonic.api.config.template.annotations.Description;
import com.dfsek.tectonic.api.config.template.annotations.Value;
import com.dfsek.terra.addons.biome.pipeline.v2.api.Source;
import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
import com.dfsek.terra.addons.biome.pipeline.v2.source.SamplerSource;
import com.dfsek.terra.api.config.meta.Meta;
import com.dfsek.terra.api.noise.NoiseSampler;
import com.dfsek.terra.api.util.collection.ProbabilityCollection;
public class SamplerSourceTemplate extends SourceTemplate {
@Value("sampler")
@Description("The sampler used to distribute biomes.")
private @Meta NoiseSampler noise;
@Value("biomes")
@Description("The biomes to be distributed.")
private @Meta ProbabilityCollection<@Meta PipelineBiome> biomes;
@Override
public Source get() {
return new SamplerSource(biomes, noise);
}
}

View File

@ -0,0 +1,17 @@
/*
* Copyright (c) 2020-2025 Polyhedral Development
*
* The Terra Core Addons are licensed under the terms of the MIT License. For more details,
* reference the LICENSE file in this module's root directory.
*/
package com.dfsek.terra.addons.biome.pipeline.v2.config.source;
import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
import com.dfsek.terra.addons.biome.pipeline.v2.api.Source;
public abstract class SourceTemplate implements ObjectTemplate<Source> {
}

View File

@ -0,0 +1,23 @@
/*
* Copyright (c) 2020-2025 Polyhedral Development
*
* The Terra Core Addons are licensed under the terms of the MIT License. For more details,
* reference the LICENSE file in this module's root directory.
*/
package com.dfsek.terra.addons.biome.pipeline.v2.config.stage;
import com.dfsek.tectonic.api.config.template.annotations.Description;
import com.dfsek.tectonic.api.config.template.annotations.Value;
import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage;
import com.dfsek.terra.api.config.meta.Meta;
import com.dfsek.terra.api.noise.NoiseSampler;
public abstract class StageTemplate implements ObjectTemplate<Stage> {
@Value("sampler")
@Description("Sampler to use for stage distribution.")
protected @Meta NoiseSampler noise;
}

View File

@ -0,0 +1,20 @@
/*
* Copyright (c) 2020-2025 Polyhedral Development
*
* The Terra Core Addons are licensed under the terms of the MIT License. For more details,
* reference the LICENSE file in this module's root directory.
*/
package com.dfsek.terra.addons.biome.pipeline.v2.config.stage.expander;
import com.dfsek.terra.addons.biome.pipeline.v2.api.Expander;
import com.dfsek.terra.addons.biome.pipeline.v2.config.stage.StageTemplate;
import com.dfsek.terra.addons.biome.pipeline.v2.stage.expander.FractalExpander;
public class ExpanderStageTemplate extends StageTemplate {
@Override
public Expander get() {
return new FractalExpander(noise);
}
}

View File

@ -0,0 +1,41 @@
/*
* Copyright (c) 2020-2025 Polyhedral Development
*
* The Terra Core Addons are licensed under the terms of the MIT License. For more details,
* reference the LICENSE file in this module's root directory.
*/
package com.dfsek.terra.addons.biome.pipeline.v2.config.stage.mutator;
import com.dfsek.tectonic.api.config.template.annotations.Value;
import java.util.Map;
import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage;
import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
import com.dfsek.terra.addons.biome.pipeline.v2.config.stage.StageTemplate;
import com.dfsek.terra.addons.biome.pipeline.v2.stage.mutators.BorderListStage;
import com.dfsek.terra.api.config.meta.Meta;
import com.dfsek.terra.api.util.collection.ProbabilityCollection;
@SuppressWarnings("unused")
public class BorderListStageTemplate extends StageTemplate {
@Value("from")
private @Meta String from;
@Value("default-replace")
private @Meta String defaultReplace;
@Value("default-to")
private @Meta ProbabilityCollection<@Meta PipelineBiome> defaultTo;
@Value("replace")
private @Meta Map<@Meta PipelineBiome, @Meta ProbabilityCollection<@Meta PipelineBiome>> replace;
@Override
public Stage get() {
return new BorderListStage(replace, from, defaultReplace, noise, defaultTo);
}
}

View File

@ -0,0 +1,35 @@
/*
* Copyright (c) 2020-2025 Polyhedral Development
*
* The Terra Core Addons are licensed under the terms of the MIT License. For more details,
* reference the LICENSE file in this module's root directory.
*/
package com.dfsek.terra.addons.biome.pipeline.v2.config.stage.mutator;
import com.dfsek.tectonic.api.config.template.annotations.Value;
import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage;
import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
import com.dfsek.terra.addons.biome.pipeline.v2.config.stage.StageTemplate;
import com.dfsek.terra.addons.biome.pipeline.v2.stage.mutators.BorderStage;
import com.dfsek.terra.api.config.meta.Meta;
import com.dfsek.terra.api.util.collection.ProbabilityCollection;
@SuppressWarnings("unused")
public class BorderStageTemplate extends StageTemplate {
@Value("from")
private @Meta String from;
@Value("replace")
private @Meta String replace;
@Value("to")
private @Meta ProbabilityCollection<@Meta PipelineBiome> to;
@Override
public Stage get() {
return new BorderStage(from, replace, noise, to);
}
}

View File

@ -0,0 +1,37 @@
/*
* Copyright (c) 2020-2025 Polyhedral Development
*
* The Terra Core Addons are licensed under the terms of the MIT License. For more details,
* reference the LICENSE file in this module's root directory.
*/
package com.dfsek.terra.addons.biome.pipeline.v2.config.stage.mutator;
import com.dfsek.tectonic.api.config.template.annotations.Value;
import java.util.Map;
import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage;
import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
import com.dfsek.terra.addons.biome.pipeline.v2.config.stage.StageTemplate;
import com.dfsek.terra.addons.biome.pipeline.v2.stage.mutators.ReplaceListStage;
import com.dfsek.terra.api.config.meta.Meta;
import com.dfsek.terra.api.util.collection.ProbabilityCollection;
@SuppressWarnings("unused")
public class ReplaceListStageTemplate extends StageTemplate {
@Value("default-from")
private @Meta String defaultFrom;
@Value("default-to")
private @Meta ProbabilityCollection<@Meta PipelineBiome> defaultTo;
@Value("to")
private @Meta Map<@Meta PipelineBiome, @Meta ProbabilityCollection<@Meta PipelineBiome>> replace;
@Override
public Stage get() {
return new ReplaceListStage(replace, defaultFrom, defaultTo, noise);
}
}

View File

@ -0,0 +1,32 @@
/*
* Copyright (c) 2020-2025 Polyhedral Development
*
* The Terra Core Addons are licensed under the terms of the MIT License. For more details,
* reference the LICENSE file in this module's root directory.
*/
package com.dfsek.terra.addons.biome.pipeline.v2.config.stage.mutator;
import com.dfsek.tectonic.api.config.template.annotations.Value;
import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage;
import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
import com.dfsek.terra.addons.biome.pipeline.v2.config.stage.StageTemplate;
import com.dfsek.terra.addons.biome.pipeline.v2.stage.mutators.ReplaceStage;
import com.dfsek.terra.api.config.meta.Meta;
import com.dfsek.terra.api.util.collection.ProbabilityCollection;
@SuppressWarnings("unused")
public class ReplaceStageTemplate extends StageTemplate {
@Value("from")
private @Meta String from;
@Value("to")
private @Meta ProbabilityCollection<@Meta PipelineBiome> to;
@Override
public Stage get() {
return new ReplaceStage(from, to, noise);
}
}

View File

@ -0,0 +1,20 @@
/*
* Copyright (c) 2020-2025 Polyhedral Development
*
* The Terra Core Addons are licensed under the terms of the MIT License. For more details,
* reference the LICENSE file in this module's root directory.
*/
package com.dfsek.terra.addons.biome.pipeline.v2.config.stage.mutator;
import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage;
import com.dfsek.terra.addons.biome.pipeline.v2.config.stage.StageTemplate;
import com.dfsek.terra.addons.biome.pipeline.v2.stage.mutators.SmoothStage;
public class SmoothStageTemplate extends StageTemplate {
@Override
public Stage get() {
return new SmoothStage(noise);
}
}

View File

@ -0,0 +1,222 @@
package com.dfsek.terra.addons.biome.pipeline.v2.pipeline;
import java.util.List;
import com.dfsek.terra.addons.biome.pipeline.v2.api.BiomeChunk;
import com.dfsek.terra.addons.biome.pipeline.v2.api.Expander;
import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage;
import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
import com.dfsek.terra.api.util.cache.SeededVector2Key;
public class BiomeChunkImpl implements BiomeChunk {
private final SeededVector2Key worldOrigin;
private final int chunkOriginArrayIndex;
private final int worldCoordinateScale;
private final int size;
private PipelineBiome[] biomes;
public BiomeChunkImpl(SeededVector2Key worldOrigin, PipelineImpl pipeline) {
this.worldOrigin = worldOrigin;
this.chunkOriginArrayIndex = pipeline.getChunkOriginArrayIndex();
this.worldCoordinateScale = pipeline.getResolution();
this.size = pipeline.getArraySize();
int expanderCount = pipeline.getExpanderCount();
int expansionsApplied = 0;
// Allocate working arrays
this.biomes = new PipelineBiome[size * size];
PipelineBiome[] lookupArray = new PipelineBiome[size * size];
// A second lookup array is required such that stage application doesn't affect lookups, otherwise application may cascade
// Construct working grid
int gridOrigin = 0;
int gridInterval = calculateGridInterval(expanderCount, expansionsApplied);
int gridSize = (size / gridInterval);
gridSize += expanderCount > 0 ? 1 : 0; // Add an extra border if expansion occurs
// Fill working grid with initial cells
for(int gridX = 0; gridX < gridSize; gridX++) {
for(int gridZ = 0; gridZ < gridSize; gridZ++) {
int xIndex = gridOrigin + gridX * gridInterval;
int zIndex = gridOrigin + gridZ * gridInterval;
biomes[(xIndex * size) + zIndex] = pipeline.getSource().get(worldOrigin.seed, xIndexToWorldCoordinate(xIndex),
zIndexToWorldCoordinate(zIndex));
}
}
for(Stage stage : pipeline.getStages()) {
if(stage instanceof Expander) {
// Shrink working grid size, the expander will fill in null cells (as a result of shrinking the grid) during mutation
expansionsApplied++;
gridInterval = calculateGridInterval(expanderCount, expansionsApplied);
gridSize = expandSize(gridSize);
}
int stageReadDistance = stage.maxRelativeReadDistance();
if(stageReadDistance > 0) {
// Discard edges such that adjacent lookups are only ran on valid cells
gridSize = contractBordersFromSize(gridSize, stageReadDistance);
gridOrigin += stageReadDistance * gridInterval;
}
// Cycle arrays, the previously populated array is swapped to be used for lookups, and the result of the stage application
// overwrites the previous lookup array. This saves having to allocate a new array copy each time
PipelineBiome[] tempArray = biomes;
biomes = lookupArray;
lookupArray = tempArray;
// Apply stage to working grid
for(int gridZ = 0; gridZ < gridSize; gridZ = gridZ + 1) {
for(int gridX = 0; gridX < gridSize; gridX = gridX + 1) {
int xIndex = gridOrigin + gridX * gridInterval;
int zIndex = gridOrigin + gridZ * gridInterval;
biomes[(xIndex * size) + zIndex] = stage.apply(
new ViewPoint(this, gridInterval, gridX, gridZ, xIndex, zIndex, lookupArray, size));
}
}
}
}
protected static int initialSizeToArraySize(int expanderCount, int initialSize) {
int size = initialSize;
for(int i = 0; i < expanderCount; i++) {
size = expandSize(size);
}
return size;
}
protected static int calculateChunkOriginArrayIndex(int totalExpanderCount, List<Stage> stages) {
int finalGridOrigin = calculateFinalGridOrigin(totalExpanderCount, stages);
int initialGridInterval = calculateGridInterval(totalExpanderCount, 0);
// Round the final grid origin up to the nearest multiple of initialGridInterval, such that each
// chunk samples points on the same overall grid.
// Without this, shared chunk borders (required because of adjacent cell reads) will not be identical
// because points would be sampled on grids at different offsets, resulting in artifacts at borders.
return (int) Math.ceil((double) finalGridOrigin / initialGridInterval) * initialGridInterval;
}
private static int calculateFinalGridOrigin(int totalExpanderCount, List<Stage> stages) {
int gridOrigin = 0;
int expansionsApplied = 0;
int gridInterval = calculateGridInterval(totalExpanderCount, expansionsApplied);
for(Stage stage : stages) {
if(stage instanceof Expander) {
expansionsApplied++;
gridInterval = calculateGridInterval(totalExpanderCount, expansionsApplied);
}
gridOrigin += stage.maxRelativeReadDistance() * gridInterval;
}
return gridOrigin;
}
protected static int calculateChunkSize(int arraySize, int chunkOriginArrayIndex, int totalExpanderCount) {
return contractBordersFromSize(arraySize, chunkOriginArrayIndex) - (totalExpanderCount > 0 ? 1 : 0);
}
private static int expandSize(int size) {
return size * 2 - 1;
}
private static int contractBordersFromSize(int size, int border) {
return size - border * 2;
}
private static int calculateGridInterval(int totalExpansions, int expansionsApplied) {
return 1 << (totalExpansions - expansionsApplied);
}
@Override
public PipelineBiome get(int xInChunk, int zInChunk) {
int xIndex = xInChunk + chunkOriginArrayIndex;
int zIndex = zInChunk + chunkOriginArrayIndex;
return biomes[(xIndex * size) + zIndex];
}
private int xIndexToWorldCoordinate(int xIndex) {
return (worldOrigin.x + xIndex - chunkOriginArrayIndex) * worldCoordinateScale;
}
private int zIndexToWorldCoordinate(int zIndex) {
return (worldOrigin.z + zIndex - chunkOriginArrayIndex) * worldCoordinateScale;
}
private SeededVector2Key getOrigin() {
return worldOrigin;
}
/**
* Represents a point on the operating grid within the biomes array
*/
public static class ViewPoint {
private final BiomeChunkImpl chunk;
private final PipelineBiome biome;
private final int gridInterval;
private final int gridX;
private final int gridZ;
private final int xIndex;
private final int zIndex;
private final PipelineBiome[] lookupArray;
private final int size;
private ViewPoint(BiomeChunkImpl chunk, int gridInterval, int gridX, int gridZ, int xIndex, int zIndex,
PipelineBiome[] lookupArray, int size) {
this.chunk = chunk;
this.gridInterval = gridInterval;
this.gridX = gridX;
this.gridZ = gridZ;
this.xIndex = xIndex;
this.zIndex = zIndex;
this.lookupArray = lookupArray;
this.size = size;
this.biome = lookupArray[(this.xIndex * this.size) + this.zIndex];
}
public PipelineBiome getRelativeBiome(int x, int z) {
int lookupXIndex = this.xIndex + x * gridInterval;
int lookupZIndex = this.zIndex + z * gridInterval;
return lookupArray[(lookupXIndex * this.size) + lookupZIndex];
}
public PipelineBiome getBiome() {
return biome;
}
/**
* @return X position of the point relative to the operating grid
*/
public int gridX() {
return gridX;
}
/**
* @return Z position of the point relative to the operating grid
*/
public int gridZ() {
return gridZ;
}
/**
* @return X position of the point in the world
*/
public int worldX() {
return chunk.xIndexToWorldCoordinate(xIndex);
}
/**
* @return Z position of the point in the world
*/
public int worldZ() {
return chunk.zIndexToWorldCoordinate(zIndex);
}
public long worldSeed() {
return chunk.getOrigin().seed;
}
}
}

View File

@ -0,0 +1,93 @@
package com.dfsek.terra.addons.biome.pipeline.v2.pipeline;
import com.dfsek.terra.api.util.cache.SeededVector2Key;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.List;
import com.dfsek.terra.addons.biome.pipeline.v2.api.BiomeChunk;
import com.dfsek.terra.addons.biome.pipeline.v2.api.Expander;
import com.dfsek.terra.addons.biome.pipeline.v2.api.Pipeline;
import com.dfsek.terra.addons.biome.pipeline.v2.api.Source;
import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage;
public class PipelineImpl implements Pipeline {
private static final Logger logger = LoggerFactory.getLogger(PipelineImpl.class);
private final Source source;
private final List<Stage> stages;
private final int chunkSize;
private final int expanderCount;
private final int arraySize;
private final int chunkOriginArrayIndex;
private final int resolution;
public PipelineImpl(Source source, List<Stage> stages, int resolution, int idealChunkArraySize) {
this.source = source;
this.stages = stages;
this.resolution = resolution;
this.expanderCount = (int) stages.stream().filter(s -> s instanceof Expander).count();
// Optimize for the ideal array size
int arraySize;
int chunkOriginArrayIndex;
int chunkSize;
int initialSize = 1;
while(true) {
arraySize = BiomeChunkImpl.initialSizeToArraySize(expanderCount, initialSize);
chunkOriginArrayIndex = BiomeChunkImpl.calculateChunkOriginArrayIndex(expanderCount, stages);
chunkSize = BiomeChunkImpl.calculateChunkSize(arraySize, chunkOriginArrayIndex, expanderCount);
if(chunkSize > 1 && arraySize >= idealChunkArraySize) break;
initialSize++;
}
this.arraySize = arraySize;
this.chunkOriginArrayIndex = chunkOriginArrayIndex;
this.chunkSize = chunkSize;
logger.debug("Initialized a new biome pipeline:");
logger.debug("Array size: {} (Target: {})", arraySize, idealChunkArraySize);
logger.debug("Internal array origin: {}", chunkOriginArrayIndex);
logger.debug("Chunk size: {}", chunkSize);
}
@Override
public BiomeChunk generateChunk(SeededVector2Key worldCoordinates) {
return new BiomeChunkImpl(worldCoordinates, this);
}
@Override
public int getChunkSize() {
return chunkSize;
}
@Override
public Source getSource() {
return source;
}
@Override
public List<Stage> getStages() {
return stages;
}
protected int getExpanderCount() {
return expanderCount;
}
protected int getArraySize() {
return arraySize;
}
protected int getChunkOriginArrayIndex() {
return chunkOriginArrayIndex;
}
protected int getResolution() {
return resolution;
}
}

View File

@ -0,0 +1,27 @@
package com.dfsek.terra.addons.biome.pipeline.v2.source;
import com.dfsek.terra.addons.biome.pipeline.v2.api.Source;
import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
import com.dfsek.terra.api.noise.NoiseSampler;
import com.dfsek.terra.api.util.collection.ProbabilityCollection;
public class SamplerSource implements Source {
private final ProbabilityCollection<PipelineBiome> biomes;
private final NoiseSampler sampler;
public SamplerSource(ProbabilityCollection<PipelineBiome> biomes, NoiseSampler sampler) {
this.biomes = biomes;
this.sampler = sampler;
}
@Override
public PipelineBiome get(long seed, int x, int z) {
return biomes.get(sampler, x, z, seed);
}
@Override
public Iterable<PipelineBiome> getBiomes() {
return biomes.getContents();
}
}

Some files were not shown because too many files have changed in this diff Show More