Redstoner/Parcels
Archived
0
Fork 0
Code Activity

Successfully connecting to h2 database

Browse Source
This commit is contained in:
Dico200
2018-07-22 16:44:32 +02:00
parent 0aa8b1fa90
commit 8a0a77b8ba
10 changed files with 123 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/kotlin/io/dico/parcels2/Options.kt
View File

@@ -22,8 +22,6 @@ class Options {
fun addWorld(name: String, options: WorldOptions) = (worlds as MutableMap).put(name, options)
fun addDefaultWorld() = addWorld("plotworld", WorldOptions())
fun writeTo(writer: Writer) = yamlObjectMapper.writeValue(writer, this)
fun mergeFrom(reader: Reader) = yamlObjectMapper.readerForUpdating(this).readValue<Options>(reader)
@@ -50,7 +48,7 @@ abstract class GeneratorOptions {
abstract fun generatorFactory(): GeneratorFactory
fun getGenerator(worldName: String) = generatorFactory().newParcelGenerator(worldName, this)
fun getGenerator(worlds: Worlds, worldName: String) = generatorFactory().newParcelGenerator(worlds, worldName, this)
}

58
src/main/kotlin/io/dico/parcels2/ParcelWorld.kt
View File

@@ -13,47 +13,49 @@ import org.bukkit.entity.Player
import java.util.*
import kotlin.coroutines.experimental.buildSequence
val worlds: Map<String, ParcelWorld> get() = _worlds
private val _worlds: MutableMap<String, ParcelWorld> = HashMap()
class Worlds {
val worlds: Map<String, ParcelWorld> get() = _worlds
private val _worlds: MutableMap<String, ParcelWorld> = HashMap()
fun getWorld(name: String): ParcelWorld? = _worlds.get(name)
fun getWorld(name: String): ParcelWorld? = _worlds.get(name)
fun getWorld(world: World): ParcelWorld? = getWorld(world.name)
fun getWorld(world: World): ParcelWorld? = getWorld(world.name)
fun getParcelAt(block: Block): Parcel? = getParcelAt(block.world, block.x, block.z)
fun getParcelAt(block: Block): Parcel? = getParcelAt(block.world, block.x, block.z)
fun getParcelAt(player: Player): Parcel? = getParcelAt(player.location)
fun getParcelAt(player: Player): Parcel? = getParcelAt(player.location)
fun getParcelAt(location: Location): Parcel? = getParcelAt(location.world, location.x.floor(), location.z.floor())
fun getParcelAt(location: Location): Parcel? = getParcelAt(location.world, location.x.floor(), location.z.floor())
fun getParcelAt(world: World, x: Int, z: Int): Parcel? = getParcelAt(world.name, x, z)
fun getParcelAt(world: World, x: Int, z: Int): Parcel? = getParcelAt(world.name, x, z)
fun getParcelAt(world: String, x: Int, z: Int): Parcel? {
with (getWorld(world) ?: return null) {
return generator.parcelAt(x, z)
}
}
fun loadWorlds(options: Options) {
for ((worldName, worldOptions) in options.worlds.entries) {
val world: ParcelWorld
try {
world = ParcelWorld(worldName, worldOptions, worldOptions.generator.getGenerator(worldName))
} catch (ex: Exception) {
ex.printStackTrace()
continue
fun getParcelAt(world: String, x: Int, z: Int): Parcel? {
with(getWorld(world) ?: return null) {
return generator.parcelAt(x, z)
}
}
_worlds.put(worldName, world)
fun loadWorlds(options: Options) {
for ((worldName, worldOptions) in options.worlds.entries) {
val world: ParcelWorld
try {
world = ParcelWorld(worldName, worldOptions, worldOptions.generator.getGenerator(this, worldName))
} catch (ex: Exception) {
ex.printStackTrace()
continue
}
_worlds.put(worldName, world)
if (Bukkit.getWorld(worldName) == null) {
val bworld = WorldCreator(worldName).generator(world.generator).createWorld()
val spawn = world.generator.getFixedSpawnLocation(bworld, null)
bworld.setSpawnLocation(spawn.x.floor(), spawn.y.floor(), spawn.z.floor())
}
if (Bukkit.getWorld(worldName) == null) {
val bworld = WorldCreator(worldName).generator(world.generator).createWorld()
val spawn = world.generator.getFixedSpawnLocation(bworld, null)
bworld.setSpawnLocation(spawn.x.floor(), spawn.y.floor(), spawn.z.floor())
}
}
}
interface ParcelProvider {

47
src/main/kotlin/io/dico/parcels2/ParcelsPlugin.kt
View File

@@ -1,15 +1,60 @@
package io.dico.parcels2
import io.dico.parcels2.storage.Storage
import io.dico.parcels2.storage.yamlObjectMapper
import io.dico.parcels2.util.tryCreate
import org.bukkit.Bukkit
import org.bukkit.plugin.java.JavaPlugin
import org.slf4j.LoggerFactory
import java.io.File
import java.util.logging.Level
val logger = LoggerFactory.getLogger("ParcelsPlugin")
private inline val plogger get() = logger
class ParcelsPlugin : JavaPlugin() {
lateinit var optionsFile: File
lateinit var options: Options
lateinit var worlds: Worlds
lateinit var storage: Storage
override fun onEnable() {
super.onEnable()
if (!init()) {
Bukkit.getPluginManager().disablePlugin(this)
}
}
private fun init(): Boolean {
optionsFile = File(dataFolder, "options.yml")
options = Options()
worlds = Worlds()
try {
if (optionsFile.exists()) {
yamlObjectMapper.readerForUpdating(options).readValue<Options>(optionsFile)
} else if (optionsFile.tryCreate()) {
options.addWorld("plotworld", WorldOptions())
yamlObjectMapper.writeValue(optionsFile, options)
} else {
plogger.error("Failed to save options file ${optionsFile.canonicalPath}")
return false
}
try {
storage = options.storage.newStorageInstance()
} catch (ex: Exception) {
plogger.error("Failed to connect to database", ex)
return false
}
worlds.loadWorlds(options)
} catch (ex: Exception) {
plogger.error("Error loading options", ex)
return false
}
return true
}
}

10
src/main/kotlin/io/dico/parcels2/WorldGenerator.kt
View File

@@ -71,19 +71,19 @@ interface GeneratorFactory {
val optionsClass: KClass<out GeneratorOptions>
fun newParcelGenerator(worldName: String, options: GeneratorOptions): ParcelGenerator
fun newParcelGenerator(worlds: Worlds, worldName: String, options: GeneratorOptions): ParcelGenerator
}
class DefaultParcelGenerator(name: String, private val o: DefaultGeneratorOptions) : ParcelGenerator() {
override val world: ParcelWorld by lazy { TODO() }
class DefaultParcelGenerator(val worlds: Worlds, val name: String, private val o: DefaultGeneratorOptions) : ParcelGenerator() {
override val world: ParcelWorld by lazy { worlds.getWorld(name)!! }
override val factory = Factory
companion object Factory : GeneratorFactory {
override val name get() = "default"
override val optionsClass get() = DefaultGeneratorOptions::class
override fun newParcelGenerator(worldName: String, options: GeneratorOptions): ParcelGenerator {
return DefaultParcelGenerator(worldName, options as DefaultGeneratorOptions)
override fun newParcelGenerator(worlds: Worlds, worldName: String, options: GeneratorOptions): ParcelGenerator {
return DefaultParcelGenerator(worlds, worldName, options as DefaultGeneratorOptions)
}
}

5
src/main/kotlin/io/dico/parcels2/storage/Hikari.kt
View File

@@ -27,6 +27,11 @@ fun getHikariDataSource(dialectName: String,
// copied from github.com/lucko/LuckPerms
if (dialectName.toLowerCase() == "mariadb") {
addDataSourceProperty("properties", "useUnicode=true;characterEncoding=utf8")
} else if (dialectName.toLowerCase() == "h2") {
dataSourceProperties.remove("serverName")
dataSourceProperties.remove("port")
dataSourceProperties.remove("databaseName")
addDataSourceProperty("url", "jdbc:h2:tcp://$address/~/${dco.database}")
} else {
// doesn't exist on the MariaDB driver
addDataSourceProperty("cachePrepStmts", "true")

7
src/main/kotlin/io/dico/parcels2/storage/Jackson.kt
View File

@@ -34,10 +34,8 @@ val yamlObjectMapper = ObjectMapper(YAMLFactory()).apply {
addSerializer(BlockDataSerializer())
addDeserializer(BlockData::class.java, BlockDataDeserializer())
/*
addSerializer(StorageOptionsSerializer())
addDeserializer(StorageOptions::class.java, StorageOptionsDeserializer())
*/
addDeserializer(GeneratorOptions::class.java, GeneratorOptionsDeserializer())
}
@@ -65,7 +63,6 @@ private class BlockDataDeserializer : StdDeserializer<BlockData>(BlockData::clas
}
/*
class StorageOptionsDeserializer : JsonDeserializer<StorageOptions>() {
override fun deserialize(p: JsonParser?, ctxt: DeserializationContext?): StorageOptions {
@@ -74,7 +71,7 @@ class StorageOptionsDeserializer : JsonDeserializer<StorageOptions>() {
val optionsNode = node.get("options")
val factory = StorageFactory.getFactory(dialect) ?: throw IllegalStateException("Unknown storage dialect: $dialect")
val options = p.codec.treeToValue(optionsNode, factory.optionsClass.java)
return StorageOptions(dialect, factory, options)
return StorageOptions(dialect, options)
}
}
@@ -92,8 +89,6 @@ class StorageOptionsSerializer : StdSerializer<StorageOptions>(StorageOptions::c
}
}
*/
class GeneratorOptionsDeserializer : JsonDeserializer<GeneratorOptions>() {

9
src/main/kotlin/io/dico/parcels2/storage/StorageFactory.kt
View File

@@ -1,6 +1,7 @@
package io.dico.parcels2.storage
import io.dico.parcels2.DataConnectionOptions
import net.minecraft.server.v1_13_R1.WorldType.types
import kotlin.reflect.KClass
interface StorageFactory {
@@ -27,10 +28,10 @@ interface StorageFactory {
class ConnectionStorageFactory : StorageFactory {
override val optionsClass = DataConnectionOptions::class
private val types: Map<String, String> = with(HashMap<String, String>()) {
put("mysql", "com.mysql.jdbc.jdbc2.optional.MysqlDataSource")
this
}
private val types: Map<String, String> = mutableMapOf(
"mysql" to "com.mysql.jdbc.jdbc2.optional.MysqlDataSource",
"h2" to "org.h2.jdbcx.JdbcDataSource"
)
fun register(companion: StorageFactory.StorageFactories) {
types.keys.forEach {

15
src/main/kotlin/io/dico/parcels2/util/MiscExtensions.kt Normal file
View File

@@ -0,0 +1,15 @@
package io.dico.parcels2.util
import io.dico.parcels2.logger
import org.slf4j.Logger
import java.io.File
import java.io.PrintWriter
fun File.tryCreate(): Boolean {
val parent = parentFile
if (parent == null || !(parent.exists() || parent.mkdirs()) || !createNewFile()) {
logger.warn("Failed to create file ${canonicalPath}")
return false
}
return true
}

3
src/main/resources/plugin.yml
View File

@@ -2,4 +2,5 @@ name: Parcels
author: Dico
main: io.dico.parcels2.ParcelsPlugin
version: 0.1
api-version: 1.13
api-version: 1.13
load: STARTUP