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
|
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
|
9715171aba
|
move registry api to new module
|
2021-11-09 23:49:49 -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 |
|
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
|
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
|
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 |
|
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 |
|
dfsek
|
193c09f60b
|
Merge remote-tracking branch 'origin/ver/6.0.0' into ver/6.0.0
# Conflicts:
# README.md
# platforms/forge/src/main/java/com/dfsek/terra/forge/ForgeAdapter.java
# platforms/forge/src/main/java/com/dfsek/terra/forge/ForgeUtil.java
# platforms/forge/src/main/java/com/dfsek/terra/forge/TerraForgePlugin.java
# platforms/forge/src/main/java/com/dfsek/terra/forge/block/ForgeBlock.java
# platforms/forge/src/main/java/com/dfsek/terra/forge/block/ForgeBlockData.java
# platforms/forge/src/main/java/com/dfsek/terra/forge/block/data/ForgeAnaloguePowerable.java
# platforms/forge/src/main/java/com/dfsek/terra/forge/block/data/ForgeDirectional.java
# platforms/forge/src/main/java/com/dfsek/terra/forge/block/data/ForgeEnumAdapter.java
# platforms/forge/src/main/java/com/dfsek/terra/forge/block/data/ForgeMultipleFacing.java
# platforms/forge/src/main/java/com/dfsek/terra/forge/block/data/ForgeOrientable.java
# platforms/forge/src/main/java/com/dfsek/terra/forge/block/data/ForgeRotatable.java
# platforms/forge/src/main/java/com/dfsek/terra/forge/block/data/ForgeSlab.java
# platforms/forge/src/main/java/com/dfsek/terra/forge/block/data/ForgeStairs.java
# platforms/forge/src/main/java/com/dfsek/terra/forge/block/data/ForgeWaterlogged.java
# platforms/forge/src/main/java/com/dfsek/terra/forge/config/PostLoadCompatibilityOptions.java
# platforms/forge/src/main/java/com/dfsek/terra/forge/config/PreLoadCompatibilityOptions.java
# platforms/forge/src/main/java/com/dfsek/terra/forge/generation/ForgeChunkGeneratorWrapper.java
# platforms/forge/src/main/java/com/dfsek/terra/forge/generation/PopulatorFeature.java
# platforms/forge/src/main/java/com/dfsek/terra/forge/generation/TerraBiomeSource.java
# platforms/forge/src/main/java/com/dfsek/terra/forge/generation/TerraGeneratorType.java
# platforms/forge/src/main/java/com/dfsek/terra/forge/handle/ForgeItemHandle.java
# platforms/forge/src/main/java/com/dfsek/terra/forge/handle/ForgeWorldHandle.java
# platforms/forge/src/main/java/com/dfsek/terra/forge/listener/ForgeListener.java
# platforms/forge/src/main/java/com/dfsek/terra/forge/listener/RegistryListener.java
# platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/DimensionGeneratorSettingsMixin.java
# platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/ServerWorldMixin.java
# platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/access/AbstractSpawnerAccessor.java
# platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/access/BiomeGeneratorTypeScreensAccessor.java
# platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/BiomeMixin.java
# platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/ChunkGeneratorMixin.java
# platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/ConfiguredFeatureMixin.java
# platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/block/BlockMixin.java
# platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/block/TileEntityMixin.java
# platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/block/state/LockableLootTileEntityMixin.java
# platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/block/state/MobSpawnerTileEntityMixin.java
# platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/block/state/SignTileEntityMixin.java
# platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/chunk/ChunkMixin.java
# platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/chunk/WorldGenRegionMixin.java
# platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/chunk/data/ChunkPrimerMixin.java
# platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/entity/CommandSourceMixin.java
# platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/entity/EntityMixin.java
# platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/entity/EntityTypeMixin.java
# platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/entity/PlayerEntityMixin.java
# platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/inventory/LockableTileEntityMixin.java
# platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/inventory/item/ItemMixin.java
# platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/inventory/item/ItemStackMixin.java
# platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/inventory/meta/EnchantmentMixin.java
# platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/inventory/meta/ItemStackDamageableMixin.java
# platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/inventory/meta/ItemStackMetaMixin.java
# platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/package-info.java
# platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/world/ServerWorldMixin.java
# platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/world/WorldGenRegionMixin.java
# platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/init/MinecraftClientMixin.java
# platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/init/MinecraftServerMixin.java
# platforms/forge/src/main/resources/terra.mixins.json
|
2021-09-03 10:46:48 -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
|
859b968555
|
remove Forge implementation
|
2021-08-29 17:20:34 -07: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
|
5919d5f031
|
create "merged" platform
|
2021-08-02 23:29:29 -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 |
|