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 |
|
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
|
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 |
|
dfsek
|
bda3594025
|
addon dump bukkit
|
2021-07-30 08:14:01 -07:00 |
|
dfsek
|
0b0742d850
|
compile bukkit
|
2021-07-29 10:44:49 -07:00 |
|
dfsek
|
102828039d
|
split up bukkit terraplugin impl
|
2021-07-29 09:32:41 -07:00 |
|
dfsek
|
a21eb2c3ba
|
fix deprecation warning on bukkit
|
2021-07-29 08:24:36 -07:00 |
|
dfsek
|
43874521db
|
remove jcenter from buildscripts
|
2021-07-29 08:22:41 -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 |
|