Skip to content

Commit

Permalink
Move BukkitFcLocale and BukkitFcTranslatable into text package.
Browse files Browse the repository at this point in the history
  • Loading branch information
@BenWoodworth
BenWoodworth committed Mar 1, 2019
1 parent 7478318 commit 1e01822
Show file tree
Hide file tree
Showing 21 changed files with 38 additions and 50 deletions.
4 changes: 2 additions & 2 deletions ....1/src/main/kotlin/net/benwoodworth/fastcraft/bukkit/item/BukkitFcItemType_1_13_00_R01.kt
View file
@@ -1,7 +1,7 @@
package net.benwoodworth.fastcraft.bukkit.item

import net.benwoodworth.fastcraft.bukkit.locale.BukkitFcTranslatable_1_13_00_R01
import net.benwoodworth.fastcraft.platform.locale.FcTranslatable
import net.benwoodworth.fastcraft.bukkit.text.BukkitFcTranslatable_1_13_00_R01
import net.benwoodworth.fastcraft.platform.text.FcTranslatable
import org.bukkit.Material

class BukkitFcItemType_1_13_00_R01(
Expand Down
4 changes: 2 additions & 2 deletions ....1/src/main/kotlin/net/benwoodworth/fastcraft/bukkit/server/BukkitFcPlayer_1_13_00_R01.kt
View file
@@ -1,8 +1,8 @@
package net.benwoodworth.fastcraft.bukkit.server

import net.benwoodworth.fastcraft.bukkit.locale.BukkitFcLocale_1_13_00_R01
import net.benwoodworth.fastcraft.bukkit.text.BukkitFcLocale_1_13_00_R01
import net.benwoodworth.fastcraft.bukkit.text.BukkitFcRawTextFactory
import net.benwoodworth.fastcraft.platform.locale.FcLocale
import net.benwoodworth.fastcraft.platform.text.FcLocale
import net.benwoodworth.fastcraft.platform.text.FcText
import org.bukkit.Server
import org.bukkit.entity.Player
Expand Down
6 changes: 1 addition & 5 deletions ...in/kotlin/net/benwoodworth/fastcraft/bukkit/text/BukkitFcLegacyTextFactory_1_13_00_R01.kt
View file
@@ -1,11 +1,7 @@
package net.benwoodworth.fastcraft.bukkit.text

import net.benwoodworth.fastcraft.bukkit.bukkit
import net.benwoodworth.fastcraft.platform.locale.FcLocale
import net.benwoodworth.fastcraft.platform.text.FcLegacyText
import net.benwoodworth.fastcraft.platform.text.FcText
import net.benwoodworth.fastcraft.platform.text.FcTextColor
import net.benwoodworth.fastcraft.platform.text.FcTextColors
import net.benwoodworth.fastcraft.platform.text.*
import org.bukkit.ChatColor
import javax.inject.Inject

Expand Down
2 changes: 1 addition & 1 deletion ...kkit/locale/BukkitFcLocale_1_13_00_R01.kt → ...bukkit/text/BukkitFcLocale_1_13_00_R01.kt
View file
@@ -1,4 +1,4 @@
package net.benwoodworth.fastcraft.bukkit.locale
package net.benwoodworth.fastcraft.bukkit.text

class BukkitFcLocale_1_13_00_R01(
override val localeId: String
Expand Down
2 changes: 1 addition & 1 deletion ...src/main/kotlin/net/benwoodworth/fastcraft/bukkit/text/BukkitFcTextFactory_1_13_00_R01.kt
View file
@@ -1,9 +1,9 @@
package net.benwoodworth.fastcraft.bukkit.text

import net.benwoodworth.fastcraft.platform.locale.FcTranslatable
import net.benwoodworth.fastcraft.platform.text.FcLegacyText
import net.benwoodworth.fastcraft.platform.text.FcText
import net.benwoodworth.fastcraft.platform.text.FcTextColor
import net.benwoodworth.fastcraft.platform.text.FcTranslatable
import javax.inject.Inject

class BukkitFcTextFactory_1_13_00_R01 @Inject constructor(
Expand Down
2 changes: 1 addition & 1 deletion ...0-R0.1/src/main/kotlin/net/benwoodworth/fastcraft/bukkit/text/BukkitFcText_1_13_00_R01.kt
View file
@@ -1,8 +1,8 @@
package net.benwoodworth.fastcraft.bukkit.text

import net.benwoodworth.fastcraft.platform.locale.FcTranslatable
import net.benwoodworth.fastcraft.platform.text.FcText
import net.benwoodworth.fastcraft.platform.text.FcTextColor
import net.benwoodworth.fastcraft.platform.text.FcTranslatable

class BukkitFcText_1_13_00_R01(
override val text: String?,
Expand Down
4 changes: 2 additions & 2 deletions ...ocale/BukkitFcTranslatable_1_13_00_R01.kt → .../text/BukkitFcTranslatable_1_13_00_R01.kt
View file
@@ -1,6 +1,6 @@
package net.benwoodworth.fastcraft.bukkit.locale
package net.benwoodworth.fastcraft.bukkit.text

import net.benwoodworth.fastcraft.platform.locale.FcLocale
import net.benwoodworth.fastcraft.platform.text.FcLocale

class BukkitFcTranslatable_1_13_00_R01(
override val key: String
Expand Down
4 changes: 0 additions & 4 deletions fastcraft-bukkit/bukkit/src/main/kotlin/net/benwoodworth/fastcraft/bukkit/BukkitTypeCasts.kt
View file
Expand Up @@ -8,8 +8,6 @@ import net.benwoodworth.fastcraft.bukkit.item.BukkitFcItem
import net.benwoodworth.fastcraft.bukkit.item.BukkitFcItemFactory
import net.benwoodworth.fastcraft.bukkit.item.BukkitFcItemType
import net.benwoodworth.fastcraft.bukkit.item.BukkitFcItemTypes
import net.benwoodworth.fastcraft.bukkit.locale.BukkitFcLocale
import net.benwoodworth.fastcraft.bukkit.locale.BukkitFcTranslatable
import net.benwoodworth.fastcraft.bukkit.recipe.BukkitFcCraftingRecipe
import net.benwoodworth.fastcraft.bukkit.recipe.BukkitFcIngredient
import net.benwoodworth.fastcraft.bukkit.recipe.BukkitFcRecipeService
Expand All @@ -23,8 +21,6 @@ import net.benwoodworth.fastcraft.platform.item.FcItem
import net.benwoodworth.fastcraft.platform.item.FcItemFactory
import net.benwoodworth.fastcraft.platform.item.FcItemType
import net.benwoodworth.fastcraft.platform.item.FcItemTypes
import net.benwoodworth.fastcraft.platform.locale.FcLocale
import net.benwoodworth.fastcraft.platform.locale.FcTranslatable
import net.benwoodworth.fastcraft.platform.recipe.FcCraftingRecipe
import net.benwoodworth.fastcraft.platform.recipe.FcIngredient
import net.benwoodworth.fastcraft.platform.recipe.FcRecipeService
Expand Down
8 changes: 0 additions & 8 deletions ...-bukkit/bukkit/src/main/kotlin/net/benwoodworth/fastcraft/bukkit/locale/BukkitFcLocale.kt
View file

This file was deleted.

11 changes: 0 additions & 11 deletions ...t/bukkit/src/main/kotlin/net/benwoodworth/fastcraft/bukkit/locale/BukkitFcTranslatable.kt
View file

This file was deleted.

8 changes: 8 additions & 0 deletions ...ft-bukkit/bukkit/src/main/kotlin/net/benwoodworth/fastcraft/bukkit/text/BukkitFcLocale.kt
View file
@@ -0,0 +1,8 @@
package net.benwoodworth.fastcraft.bukkit.text

import net.benwoodworth.fastcraft.platform.text.FcLocale

interface BukkitFcLocale : FcLocale {

val localeId: String
}
2 changes: 1 addition & 1 deletion ...raft-bukkit/bukkit/src/main/kotlin/net/benwoodworth/fastcraft/bukkit/text/BukkitFcText.kt
View file
@@ -1,8 +1,8 @@
package net.benwoodworth.fastcraft.bukkit.text

import net.benwoodworth.fastcraft.platform.locale.FcTranslatable
import net.benwoodworth.fastcraft.platform.text.FcText
import net.benwoodworth.fastcraft.platform.text.FcTextColor
import net.benwoodworth.fastcraft.platform.text.FcTranslatable


interface BukkitFcText : FcText {
Expand Down
11 changes: 11 additions & 0 deletions ...kit/bukkit/src/main/kotlin/net/benwoodworth/fastcraft/bukkit/text/BukkitFcTranslatable.kt
View file
@@ -0,0 +1,11 @@
package net.benwoodworth.fastcraft.bukkit.text

import net.benwoodworth.fastcraft.platform.text.FcLocale
import net.benwoodworth.fastcraft.platform.text.FcTranslatable

interface BukkitFcTranslatable : FcTranslatable {

val key: String

fun translate(locale: FcLocale): String?
}
2 changes: 1 addition & 1 deletion fastcraft/src/main/kotlin/net/benwoodworth/fastcraft/platform/item/FcItemType.kt
View file
@@ -1,6 +1,6 @@
package net.benwoodworth.fastcraft.platform.item

import net.benwoodworth.fastcraft.platform.locale.FcTranslatable
import net.benwoodworth.fastcraft.platform.text.FcTranslatable

interface FcItemType {

Expand Down
3 changes: 0 additions & 3 deletions fastcraft/src/main/kotlin/net/benwoodworth/fastcraft/platform/locale/FcLocale.kt
View file

This file was deleted.

3 changes: 0 additions & 3 deletions fastcraft/src/main/kotlin/net/benwoodworth/fastcraft/platform/locale/FcTranslatable.kt
View file

This file was deleted.

2 changes: 1 addition & 1 deletion fastcraft/src/main/kotlin/net/benwoodworth/fastcraft/platform/server/FcPlayer.kt
View file
@@ -1,6 +1,6 @@
package net.benwoodworth.fastcraft.platform.server

import net.benwoodworth.fastcraft.platform.locale.FcLocale
import net.benwoodworth.fastcraft.platform.text.FcLocale
import net.benwoodworth.fastcraft.platform.text.FcText
import java.util.*

Expand Down
2 changes: 0 additions & 2 deletions fastcraft/src/main/kotlin/net/benwoodworth/fastcraft/platform/text/FcLegacyTextFactory.kt
View file
@@ -1,7 +1,5 @@
package net.benwoodworth.fastcraft.platform.text

import net.benwoodworth.fastcraft.platform.locale.FcLocale

interface FcLegacyTextFactory {

fun createFcLegacyText(text: FcText, locale: FcLocale): FcLegacyText
Expand Down
3 changes: 3 additions & 0 deletions fastcraft/src/main/kotlin/net/benwoodworth/fastcraft/platform/text/FcLocale.kt
View file
@@ -0,0 +1,3 @@
package net.benwoodworth.fastcraft.platform.text

interface FcLocale
2 changes: 0 additions & 2 deletions fastcraft/src/main/kotlin/net/benwoodworth/fastcraft/platform/text/FcTextFactory.kt
View file
@@ -1,7 +1,5 @@
package net.benwoodworth.fastcraft.platform.text

import net.benwoodworth.fastcraft.platform.locale.FcTranslatable

interface FcTextFactory {

fun createFcText(
Expand Down
3 changes: 3 additions & 0 deletions fastcraft/src/main/kotlin/net/benwoodworth/fastcraft/platform/text/FcTranslatable.kt
View file
@@ -0,0 +1,3 @@
package net.benwoodworth.fastcraft.platform.text

interface FcTranslatable

0 comments on commit 1e01822

Please sign in to comment.