mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2025-07-19 19:12:33 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,803 Commits 88 Branches 16 Tags
Commit Graph

369 Commits

Author SHA1 Message Date
solonovamax
9d30130f85
Merge remote-tracking branch 'upstream/ver/6.0.0' into architecture/slf4j-logging 2021-11-21 17:57:56 -05:00
dfsek
e227095319 update to 1.18 prerelease 5 & Java 17 2021-11-21 14:12:51 -07: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
d506f5f3a3 fix BinaryColumn 2021-11-20 22:34:40 -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
5d3afcc82c add license headers 2021-11-19 15:42:34 -07:00
dfsek
1028ed0989 delete old addon system 2021-11-18 21:50:41 -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
3737e3510d format 2021-11-17 16:28:40 -07:00
dfsek
92341751fc fix TerraAddon -> BaseAddon 2021-11-17 08:38:51 -07:00
dfsek
901ec1cda3 fix /te reload 2021-10-17 12:16:33 -07:00
dfsek
a1a043c296 refactor FabricEntryPoint#getPlatform 2021-10-15 21:26:06 -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
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
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
dda2ed955d move vectors to util project 2021-09-24 12:22:44 -07:00
dfsek
c35d1acbbf refactor StringIdentifiable and Logger 2021-09-24 07:57:49 -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
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
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
f73366fcb3 Lazy#of -> Lazy#lazy 2021-07-24 20:14:19 -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
e8ee7bc64f create AbstractTerraPlugin 2021-07-24 19:42:03 -07:00
dfsek
7b70478a7f remove configureCommon function 2021-07-23 15:01:48 -07:00
dfsek
a3a4cf8251 remove configureCommon call from platform impls 2021-07-23 14:51:19 -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
6cd60d3f4f remove redundant publishing configs 2021-07-23 11:20:27 -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