60 Commits

Author SHA1 Message Date
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ë
18de2c3f99 Fix dev launch for fabric and forge 2022-06-30 21:58:11 -07:00
dfsek
4396623420 improve addon dependency system 2022-04-29 23:03:18 -07:00
dfsek
4a3c22a8d6 reformat all code 2022-03-30 14:43:56 -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
aeb0372d59 pull versions out to Versions config 2021-12-19 15:30:50 -07:00
dfsek
5401917703 createBlockData -> createBlockState 2021-12-17 08:36:43 -07:00
dfsek
e5eaba9150 getDefaultData -> getDefaultState 2021-12-17 08:35:29 -07:00
dfsek
e76e17439f reinclude sponge project 2021-12-16 09:34:35 -07:00
dfsek
5cf1b56782 temporarily disable Sponge submodule 2021-12-15 22:03:49 -07:00
dfsek
58acca3078 reformat 2021-12-14 11:01:28 -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
27f472dd57 for some reason we were shading all of SpongeAPI 2021-11-28 13:52:01 -07: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
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
dfsek
c4d15aa64a update logging 2021-11-21 17:39:08 -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
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
3737e3510d format 2021-11-17 16:28:40 -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
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
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
13ffb0ace1 fix sponge build 2021-09-18 23:30:19 -07: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
0d04f79cd4 createBlockEntity method 2021-08-17 09:38:12 -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
43874521db remove jcenter from buildscripts 2021-07-29 08:22:41 -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
cdcbd28aa0 remove sponge buildscript 2021-07-22 18:29:16 -07:00
dfsek
109b5e38cd remove most terraworld dependency 2021-07-22 14:13:37 -07:00
dfsek
589158ee71 reformat 2021-07-13 14:24:33 -07:00
dfsek
519956dc11 refactor implementation 2021-07-10 21:44:38 -07:00
dfsek
43307b737c refactor block state package 2021-06-25 20:51:38 -07:00
dfsek
a3cbf9a945 BlockData -> BlockState 2021-06-25 19:13:42 -07:00
dfsek
4bac67b8d7 fix imports 2021-06-24 00:19:18 -07:00