387 Commits

Author SHA1 Message Date
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
solonovamax
e60dfe0242
Remove debug logging config value
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
2021-11-21 20:13:06 -05:00
dfsek
ac7a7f3129
Merge pull request #274 from NeumimTo/ver/6.0.0
fix win loading
2021-11-21 17:47:07 -07:00
solonovamax
dd259c4d8f
Make logging actually work
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
2021-11-21 19:18:00 -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
a447be3c50 launch on 1.18 2021-11-20 20:56:57 -07:00
dfsek
5d3afcc82c add license headers 2021-11-19 15:42:34 -07:00
dfsek
7bf1ba13c8 fix circular dependency checking 2021-11-18 21:45:12 -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
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
208cbbd8e0 addon initialization 2021-11-17 17:22:29 -07:00
dfsek
3737e3510d format 2021-11-17 16:28:40 -07:00
dfsek
172006f2f6 initialize manifest addons 2021-11-17 16:22:14 -07:00
dfsek
174b23c8ef add logging 2021-11-17 15:29:28 -07:00
dfsek
c0bcc40f6a 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
4f4dc45a48 generify BootstrapBaseAddon 2021-11-17 08:22:06 -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
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
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
solo
e3df44e16f
Add String#strip to AddonRegistry to remove trialing newline 2021-09-27 10:57:06 -04: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
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
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
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
09b4da7974 move DI stuff to new subproject 2021-09-24 12:31:08 -07:00
dfsek
dda2ed955d move vectors to util project 2021-09-24 12:22:44 -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
acf3844139 move API project 2021-09-19 11:20:50 -07:00
dfsek
0366e2e33c registry merge debug message 2021-09-19 00:33:49 -07:00
dfsek
1968bdf88d fix final config template values 2021-09-18 23:43:00 -07:00
solonovamax
b6c40302b6
Improve logging
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
2021-08-30 22:04:17 -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
dfsek
ddf1334f6f properly initialize config.yml 2021-07-30 08:25:35 -07:00