493 Commits

Author SHA1 Message Date
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
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
2307897b31 use pattern variables 2021-11-27 08:34:03 -07:00
solonovamax
92046fe345
Update purpur url
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
2021-11-23 15:09:50 -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
c29dac9847 remove unused WorldEditUtil 2021-11-22 07:48:46 -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
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
1028ed0989 delete old addon system 2021-11-18 21:50:41 -07:00
dfsek
3737e3510d format 2021-11-17 16:28:40 -07:00
solo
764f93f40f
Add String#strip invocations to SpigotListener to remove trailing newline 2021-09-27 10:56:10 -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
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
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
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
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
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
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
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
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