Repo-Mirror/eco
9
0
Fork 0
Code Issues Releases 2 Activity

Fixed kotlin errors

Browse Source
This commit is contained in:
Auxilor
2021-08-06 16:40:47 +01:00
parent 3233bad307
commit bd7f22cb02
5 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/config/json/EcoJSONConfigWrapper.kt
View File

@@ -1,5 +1,6 @@
package com.willfp.eco.internal.config.json
import com.google.gson.Gson
import com.google.gson.GsonBuilder
import com.willfp.eco.core.config.interfaces.JSONConfig
import com.willfp.eco.util.StringUtils
@@ -8,7 +9,7 @@ import java.util.*
@Suppress("UNCHECKED_CAST")
open class EcoJSONConfigWrapper : JSONConfig {
private val handle = GsonBuilder().setPrettyPrinting().create()
val handle: Gson = GsonBuilder().setPrettyPrinting().create()
val values: MutableMap<String, Any?> = HashMap()
@@ -53,7 +54,7 @@ open class EcoJSONConfigWrapper : JSONConfig {
}
return if (values[closestPath] is Map<*, *> && path != closestPath) {
val section =
EcoJSONConfigSection((values[closestPath] as Map<String?, Any?>?)!!)
EcoJSONConfigSection((values[closestPath] as Map<String, Any?>?)!!)
section.getOfKnownType(path.substring(closestPath.length + 1), clazz, false)
} else {
if (values.containsKey(closestPath)) {
@@ -79,7 +80,7 @@ open class EcoJSONConfigWrapper : JSONConfig {
for (key in values.keys) {
list.add(root + key)
if (values[key] is Map<*, *>) {
val section = EcoJSONConfigSection((values[key] as Map<String?, Any?>?)!!)
val section = EcoJSONConfigSection((values[key] as Map<String, Any?>?)!!)
list.addAll(section.getDeepKeys(list, "$root$key."))
}
}
@@ -108,7 +109,7 @@ open class EcoJSONConfigWrapper : JSONConfig {
closestPath = split[0]
}
if (values[closestPath] is Map<*, *> && path != closestPath) {
val section = EcoJSONConfigSection((values[closestPath] as Map<String?, Any?>?)!!)
val section = EcoJSONConfigSection((values[closestPath] as Map<String, Any?>?)!!)
section.setRecursively(path.substring(closestPath.length + 1), obj)
values[closestPath] = section.values
} else {

2
eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/gui/menu/EcoMenu.kt
View File

@@ -13,7 +13,7 @@ import java.util.function.Consumer
class EcoMenu(
private val rows: Int,
val slots: MutableList<MutableList<Slot>>,
val slots: List<MutableList<Slot?>>,
private val title: String,
val onClose: Consumer<InventoryCloseEvent>
): Menu {

4
eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/gui/menu/EcoMenuBuilder.kt
View File

@@ -49,9 +49,7 @@ class EcoMenuBuilder(private val rows: Int) : MenuBuilder {
for (i in slots.indices) {
for (j in slots[i].indices) {
val slot = slots[i][j]
if (slot != null) {
finalSlots[i][j] = slot
}
finalSlots[i][j] = slot
}
}
for (finalSlot in finalSlots) {

10
eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/gui/slot/EcoFillerSlot.kt
View File

@@ -3,5 +3,11 @@ package com.willfp.eco.internal.gui.slot
import org.bukkit.inventory.ItemStack
import java.util.function.Function
class EcoFillerSlot(itemStack: ItemStack) :
EcoSlot(Function { itemStack }, null, null, null, null, null)
class EcoFillerSlot(itemStack: ItemStack) : EcoSlot(
Function { itemStack },
{ _, _ -> },
{ _, _ -> },
{ _, _ -> },
{ _, _ -> },
{ _, _ -> }
)

2
eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/gui/slot/EcoSlot.kt
View File

@@ -8,7 +8,7 @@ import org.bukkit.inventory.ItemStack
import java.util.function.BiConsumer
import java.util.function.Function
class EcoSlot(
open class EcoSlot(
val provider: Function<Player, ItemStack>,
private val onLeftClick: BiConsumer<InventoryClickEvent, Slot>,
private val onRightClick: BiConsumer<InventoryClickEvent, Slot>,