79 Commits

Author SHA1 Message Date
Zoë Gidiere
118dc32d64 Merge branch 'master' into dev/7.0-2 2025-06-03 22:38:32 -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
Zoe Gidiere
bd28d8170c Merge branch 'ver/6.6.0' into dev/7.0-2 2024-10-29 15:56:30 -06:00
Zoe Gidiere
3ca90808f0 Fix up 2024-10-29 14:23:45 -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
Zoe Gidiere
d48b610b39 Merge remote-tracking branch 'origin/ver/6.6.0' into dev/7.0-2 2024-10-25 15:21:47 -06:00
Zoe Gidiere
32f8907cb1 Merge branch 'ver/6.6.0' into dev/1.21.2 2024-10-25 12:28:03 -06:00
Zoe Gidiere
cd2421bb49 Merge branch 'ver/6.6.0' into dev/7.0-2 2024-10-12 15:42:47 -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
3033fbbf29 Fix a ton of fabric impl bugs 2024-10-10 16:49:40 -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
725fa88466 Remap fabric 2024-10-09 14:01:12 -06:00
Zoe Gidiere
581651e83b reformat 2024-09-24 10:06:57 -06:00
Zoe Gidiere
c95b3c09a8 Merge branch 'ver/6.5.0' into dev/7.0-2 2024-09-24 09:44:35 -06:00
Zoe Gidiere
d6772f51ea Reformat 2024-09-23 20:56:13 -06:00
Zoe Gidiere
ddb131d413 Merge remote-tracking branch 'origin/ver/6.5.0' into dev/7.0-2 2024-09-20 16:42:39 -06: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
Zoe Gidiere
5bc73dec37 Merge branch 'ver/6.5.0' into dev/7.0-2 2024-09-17 17:46:33 -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
OakLoaf
922cd35e84 Updated Cloud dependency to v2 2024-08-16 11:07:03 +01:00
Zoë Gidiere
4c71355535 Reformat 2023-12-12 19:07:57 -07:00
Zoë Gidiere
9d200565d7 more fixes 2023-12-12 16:54:27 -07:00
Zoë Gidiere
f6c2795eaf remove debug loging 2023-12-12 16:12:36 -07:00
Zoë Gidiere
e11a235386 WIP Dim opts 2023-12-12 13:55:03 -07:00
Zoë Gidiere
db1e924246 more metapack work 2023-12-12 13:35:52 -07:00
Zoë Gidiere
d4a328eb38 who let the datadrive (the dimensions) 2023-12-11 21:14:43 -07:00
Zoë Gidiere
b039629b2d WIP meta pack system 2023-12-11 16:25:13 -07:00
Zoë Gidiere
d48fa96ec7 opt import 2023-12-11 14:56:07 -07:00
Astrash
59ea5a69d8 Refactor pack loading
- Combine initial load and reload logic together between each platform implementation
- Should prevent pack load errors from blocking other packs from loading.
2023-11-25 15:10:43 +11:00
Astrash
5c7441241c Replace Loader with java.nio.files 2023-11-25 13:31:42 +11:00
Zoë Gidiere
82fbf796da Refractor BiomeUtil 2023-11-17 15:26:53 -07: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
Zoë Gidiere
acf79f5c53 change class structure of LifecycleEntryPoint 2023-11-09 11:37:01 -07:00
Zoë Gidiere
81a96d6b76 Reformat code 2023-11-02 18:47:36 -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
Zoë Gidiere
d3a9b57872 disable quilt 2023-10-18 19:53:59 -06:00
Zoë
5c0c833b70 Update LifecycleEntryPoint.java 2023-09-29 23:09:41 -06:00
Zoë Gidiere
0e37a839fe We do a little commonifying 2023-09-29 21:44:12 -06:00
dfsek
41b7021121 fix fabric pack reloading 2023-06-10 15:49:33 -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
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