Skip to content

Commit e37c7b1

Browse files
MairwunNxMairwunNx
committed
Changes synced with 1.14.4 branch.
Signed-off-by: Pavel Erokhin (MairwunNx) <[email protected]>
1 parent 4ae232f commit e37c7b1

File tree

11 files changed

+132
-69
lines changed

11 files changed

+132
-69
lines changed

‎build.gradle

Lines changed: 34 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ apply(plugin: "net.minecraftforge.gradle")
2626
apply(plugin: "kotlin")
2727
apply(plugin: "kotlinx-serialization")
2828

29+
String packagesToken = new String(package_public_token.decodeBase64())
30+
2931
version = module_version
3032
group = "com.mairwunnx.$module_id"
3133
archivesBaseName = module_name
@@ -68,39 +70,52 @@ minecraft {
6870
repositories {
6971
jcenter()
7072
mavenCentral()
71-
maven { url("https://minecraft.curseforge.com/api/maven/") }
7273
maven { url("https://libraries.minecraft.net") }
7374
maven { url("https://jitpack.io") }
75+
maven {
76+
name = "GitHubPackages"
77+
url = uri "https://maven.pkg.github.com/projectessentials/projectessentials-core"
78+
credentials {
79+
username = "[email protected]"
80+
password = packagesToken
81+
}
82+
}
83+
maven {
84+
name = "GitHubPackages"
85+
url = uri "https://maven.pkg.github.com/projectessentials/projectessentials-permissions"
86+
credentials {
87+
username = "[email protected]"
88+
password = packagesToken
89+
}
90+
}
91+
maven {
92+
name = "GitHubPackages"
93+
url = uri "https://maven.pkg.github.com/ProjectEssentials/ProjectEssentials-Cooldown"
94+
credentials {
95+
username = "[email protected]"
96+
password = packagesToken
97+
}
98+
}
7499
}
75100

76101
dependencies {
77102
minecraft(group: "net.minecraftforge", name: "forge", version: forge_version)
78-
compile(group: "com.mojang", name: "brigadier", version: brigadier_version)
79-
compile(
103+
104+
implementation 'com.mairwunnx.project_essentials_core:ProjectEssentials-Core:1.15.2-1.1.0'
105+
implementation 'com.mairwunnx.project_essentials_permissions:ProjectEssentials-Permissions:1.15.2-1.0.1'
106+
implementation 'com.mairwunnx.project_essentials_cooldown:ProjectEssentials-Cooldown:1.15.2-1.0.1'
107+
108+
implementation(group: "com.mojang", name: "brigadier", version: brigadier_version)
109+
implementation(
80110
group: "org.jetbrains.kotlinx",
81111
name: "kotlinx-serialization-runtime",
82112
version: kotlinx_serialization_version
83113
)
84-
compile(
114+
implementation(
85115
group: "org.jetbrains.kotlin",
86116
name: "kotlin-stdlib-$kotlin_jdk_version_target",
87117
version: kotlin_version
88118
)
89-
compile(
90-
group: "com.github.projectessentials",
91-
name: "ProjectEssentials-Permissions",
92-
version: ess_perm_version
93-
)
94-
compile(
95-
group: "com.github.projectessentials",
96-
name: "ProjectEssentials-Core",
97-
version: ess_core_version
98-
)
99-
compile(
100-
group: "com.github.projectessentials",
101-
name: "ProjectEssentials-Cooldown",
102-
version: ess_cooldown_version
103-
)
104119
}
105120

106121
jar {

‎changelog.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,26 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
66

77
## [Unreleased]
88

9+
## [1.14.4-1.0.1] - 2020-03-18
10+
11+
### Added
12+
- Project Essentials dependencies added to `build.gradle`.
13+
- Processing localization added.
14+
- `Messaging.kt` implemented.
15+
- `WarpCommand.kt`: Compatibility with new messaging added.
16+
- `SetWarpCommand.kt`: Compatibility with new messaging added.
17+
- `DelWarpCommand.kt`: Compatibility with new messaging added.
18+
- `WarpCommand.kt`: compatibility with back command added.
19+
20+
### Changed
21+
- Kotlin version updated to `1.3.70`.
22+
- KotlinX Serialization version updated to `0.20.0`.
23+
- Forge API version updated to `28.2.0`.
24+
25+
### Removed
26+
- Essentials dependencies removed from `gradle.properties`.
27+
- `curseforge` maven repository removed from repositories in `build.gradle`.
28+
929
## [1.15.2-1.0.0] - 2020-02-08
1030

1131
### Added

‎gradle.properties

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,11 @@ forge_mappings_channel_version=20190719-1.14.3
1111
brigadier_version=1.0.17
1212
kotlin_jdk_version_target=jdk8
1313
project_jvm_version_target=1.8
14-
kotlin_version=1.3.61
15-
kotlinx_serialization_version=0.14.0
16-
ess_core_version=v1.15.2-1.+
17-
ess_perm_version=v1.15.2-1.+
18-
ess_cooldown_version=v1.15.2-1.+
19-
module_version=1.15.2-1.0.0
14+
kotlin_version=1.3.70
15+
kotlinx_serialization_version=0.20.0
16+
module_version=1.15.2-1.0.1
2017
module_name=Project Essentials Warps
2118
module_id=project_essentials_warps
2219
module_vendor=MairwunNx (Pavel Erokhin)
20+
package_public_token=ZDhjMjgyNjlhM2E0ZTQ0MmM2Mjk5ZWI4YmMyZjI0YzNjOTNkMDVkZA==
2321

‎readme.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<h2 align="center">Warp points controller provider for minecraft forge.</h2>
44

5-
<h4 align="center"><a href="https://github.com/ProjectEssentials/ProjectEssentials-Warps/releases/download/v1.15.2-1.0.0/Project.Essentials.Warps-1.15.2-1.0.0.jar">Download mod</a> · <a href="https://mairwunnx.gitbook.io/project-essentials/project-essentials-warps#commands-and-permissions">Commands</a> · <a href="https://mairwunnx.gitbook.io/project-essentials/project-essentials-warps#configuration">Configuration</a> · <a href="https://mairwunnx.gitbook.io/project-essentials/project-essentials-warps#how-to-install">How to install</a> · <a href="https://github.com/ProjectEssentials/ProjectEssentials-Warps/issues/new/choose">Troubleshooting</a> · <a href="https://t.me/minecraftforge">News & updates</a> · <a href="changelog.md">Change log</a></h4>
5+
<h4 align="center"><a href="https://github.com/ProjectEssentials/ProjectEssentials-Warps/releases/download/v1.15.2-1.0.1/Project.Essentials.Warps-1.15.2-1.0.1.jar">Download mod</a> · <a href="https://mairwunnx.gitbook.io/project-essentials/project-essentials-warps#commands-and-permissions">Commands</a> · <a href="https://mairwunnx.gitbook.io/project-essentials/project-essentials-warps#configuration">Configuration</a> · <a href="https://mairwunnx.gitbook.io/project-essentials/project-essentials-warps#how-to-install">How to install</a> · <a href="https://github.com/ProjectEssentials/ProjectEssentials-Warps/issues/new/choose">Troubleshooting</a> · <a href="https://t.me/minecraftforge">News & updates</a> · <a href="changelog.md">Change log</a></h4>
66

77
> Just allows players to create and share warps with each other.
88

‎src/main/kotlin/com/mairwunnx/projectessentials/warps/EntryPoint.kt

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package com.mairwunnx.projectessentials.warps
22

33
import com.mairwunnx.projectessentials.core.EssBase
4+
import com.mairwunnx.projectessentials.core.configuration.localization.LocalizationConfigurationUtils
5+
import com.mairwunnx.projectessentials.core.localization.processLocalizations
46
import com.mairwunnx.projectessentials.permissions.permissions.PermissionsAPI
57
import com.mairwunnx.projectessentials.warps.commands.DelWarpCommand
68
import com.mairwunnx.projectessentials.warps.commands.SetWarpCommand
@@ -23,16 +25,30 @@ class EntryPoint : EssBase() {
2325

2426
init {
2527
modInstance = this
26-
modVersion = "1.15.2-1.0.0"
28+
modVersion = "1.15.2-1.0.1"
2729
logBaseInfo()
2830
validateForgeVersion()
2931
MinecraftForge.EVENT_BUS.register(this)
3032
WarpModelUtils.loadData()
33+
loadLocalization()
34+
}
35+
36+
private fun loadLocalization() {
37+
if (LocalizationConfigurationUtils.getConfig().enabled) {
38+
processLocalizations(
39+
EntryPoint::class.java, listOf(
40+
"/assets/projectessentialswarps/lang/en_us.json",
41+
"/assets/projectessentialswarps/lang/ru_ru.json",
42+
"/assets/projectessentialswarps/lang/pt_br.json",
43+
"/assets/projectessentialswarps/lang/de_de.json"
44+
)
45+
)
46+
}
3147
}
3248

3349
@SubscribeEvent
3450
fun onServerStarting(event: FMLServerStartingEvent) {
35-
registerCommands(event.server.commandManager.dispatcher)
51+
registerCommands(event.commandDispatcher)
3652
}
3753

3854
private fun registerCommands(

‎src/main/kotlin/com/mairwunnx/projectessentials/warps/Messaging.kt

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
package com.mairwunnx.projectessentials.warps
2+
3+
import com.mairwunnx.projectessentials.core.configuration.localization.LocalizationConfigurationUtils
4+
import com.mairwunnx.projectessentials.core.extensions.sendMsg
5+
import com.mairwunnx.projectessentials.core.localization.sendMsgV2
6+
import net.minecraft.command.CommandSource
7+
8+
internal fun sendMessage(
9+
source: CommandSource,
10+
message: String,
11+
vararg args: String
12+
) {
13+
if (LocalizationConfigurationUtils.getConfig().enabled) {
14+
sendMsgV2(
15+
source.asPlayer(),
16+
"project_essentials_warps.warp.$message", *args
17+
)
18+
} else {
19+
sendMsg(
20+
"warps", source, "warp.$message", *args
21+
)
22+
}
23+
}

‎src/main/kotlin/com/mairwunnx/projectessentials/warps/commands/DelWarpCommand.kt

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ package com.mairwunnx.projectessentials.warps.commands
22

33
import com.mairwunnx.projectessentials.cooldown.essentials.CommandsAliases
44
import com.mairwunnx.projectessentials.core.extensions.isPlayerSender
5-
import com.mairwunnx.projectessentials.core.extensions.sendMsg
6-
import com.mairwunnx.projectessentials.core.helpers.ONLY_PLAYER_CAN
7-
import com.mairwunnx.projectessentials.core.helpers.PERMISSION_LEVEL
5+
import com.mairwunnx.projectessentials.core.helpers.throwOnlyPlayerCan
6+
import com.mairwunnx.projectessentials.core.helpers.throwPermissionLevel
87
import com.mairwunnx.projectessentials.warps.EntryPoint
98
import com.mairwunnx.projectessentials.warps.EntryPoint.Companion.hasPermission
109
import com.mairwunnx.projectessentials.warps.models.WarpModelUtils
10+
import com.mairwunnx.projectessentials.warps.sendMessage
1111
import com.mojang.brigadier.CommandDispatcher
1212
import com.mojang.brigadier.arguments.StringArgumentType
1313
import com.mojang.brigadier.builder.LiteralArgumentBuilder.literal
@@ -52,7 +52,7 @@ object DelWarpCommand {
5252
val warpName = StringArgumentType.getString(c, "warp name")
5353
WarpModelUtils.warpModel.warps.forEach {
5454
if (it.name == warpName && it.owner != player.name.string) {
55-
sendMsg("warps", c.source, "warp.remove_not_access")
55+
sendMessage(c.source, "remove_not_access")
5656
return 0
5757
}
5858
}
@@ -61,23 +61,19 @@ object DelWarpCommand {
6161
}
6262
WarpModelUtils.warpModel.warps.remove(warp).let { result ->
6363
if (result) {
64-
sendMsg("warps", c.source, "warp.remove.success", warpName)
64+
sendMessage(c.source, "remove.success", warpName)
6565
logger.info("Executed command \"/delwarp\" from ${player.name.string}")
6666
return 0
6767
} else {
68-
sendMsg("warps", c.source, "warp.not_found", warpName)
68+
sendMessage(c.source, "not_found", warpName)
6969
}
7070
}
7171
} else {
72-
sendMsg("warps", c.source, "warp.remove.restricted")
73-
logger.info(
74-
PERMISSION_LEVEL
75-
.replace("%0", player.name.string)
76-
.replace("%1", "delwarp")
77-
)
72+
sendMessage(c.source, "remove.restricted")
73+
throwPermissionLevel(player.name.string, "delwarp")
7874
}
7975
} else {
80-
logger.info(ONLY_PLAYER_CAN.replace("%0", "delwarp"))
76+
throwOnlyPlayerCan("delwarp")
8177
}
8278
return 0
8379
}

‎src/main/kotlin/com/mairwunnx/projectessentials/warps/commands/SetWarpCommand.kt

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ package com.mairwunnx.projectessentials.warps.commands
22

33
import com.mairwunnx.projectessentials.cooldown.essentials.CommandsAliases
44
import com.mairwunnx.projectessentials.core.extensions.isPlayerSender
5-
import com.mairwunnx.projectessentials.core.extensions.sendMsg
6-
import com.mairwunnx.projectessentials.core.helpers.ONLY_PLAYER_CAN
7-
import com.mairwunnx.projectessentials.core.helpers.PERMISSION_LEVEL
5+
import com.mairwunnx.projectessentials.core.helpers.throwOnlyPlayerCan
6+
import com.mairwunnx.projectessentials.core.helpers.throwPermissionLevel
87
import com.mairwunnx.projectessentials.warps.EntryPoint
98
import com.mairwunnx.projectessentials.warps.EntryPoint.Companion.hasPermission
109
import com.mairwunnx.projectessentials.warps.models.WarpModel
1110
import com.mairwunnx.projectessentials.warps.models.WarpModelUtils
11+
import com.mairwunnx.projectessentials.warps.sendMessage
1212
import com.mojang.brigadier.CommandDispatcher
1313
import com.mojang.brigadier.arguments.StringArgumentType
1414
import com.mojang.brigadier.builder.LiteralArgumentBuilder.literal
@@ -60,7 +60,7 @@ object SetWarpCommand {
6060
val pitch = player.rotationPitch
6161
WarpModelUtils.warpModel.warps.forEach {
6262
if (it.name == warpName) {
63-
sendMsg("warps", c.source, "warp.exist", warpName)
63+
sendMessage(c.source, "exist", warpName)
6464
return 0
6565
}
6666
}
@@ -70,18 +70,14 @@ object SetWarpCommand {
7070
xPos, yPos, zPos, yaw, pitch
7171
)
7272
)
73-
sendMsg("warps", c.source, "warp.set.success", warpName)
73+
sendMessage(c.source, "set.success", warpName)
7474
logger.info("Executed command \"/setwarp\" from ${player.name.string}")
7575
} else {
76-
sendMsg("warps", c.source, "warp.set.restricted")
77-
logger.info(
78-
PERMISSION_LEVEL
79-
.replace("%0", player.name.string)
80-
.replace("%1", "setwarp")
81-
)
76+
sendMessage(c.source, "set.restricted")
77+
throwPermissionLevel(player.name.string, "setwarp")
8278
}
8379
} else {
84-
logger.info(ONLY_PLAYER_CAN.replace("%0", "setwarp"))
80+
throwOnlyPlayerCan("setwarp")
8581
}
8682
return 0
8783
}

‎src/main/kotlin/com/mairwunnx/projectessentials/warps/commands/WarpCommand.kt

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
package com.mairwunnx.projectessentials.warps.commands
22

33
import com.mairwunnx.projectessentials.cooldown.essentials.CommandsAliases
4+
import com.mairwunnx.projectessentials.core.backlocation.BackLocationProvider
45
import com.mairwunnx.projectessentials.core.extensions.isPlayerSender
5-
import com.mairwunnx.projectessentials.core.extensions.sendMsg
6-
import com.mairwunnx.projectessentials.core.helpers.ONLY_PLAYER_CAN
7-
import com.mairwunnx.projectessentials.core.helpers.PERMISSION_LEVEL
6+
import com.mairwunnx.projectessentials.core.helpers.throwOnlyPlayerCan
7+
import com.mairwunnx.projectessentials.core.helpers.throwPermissionLevel
88
import com.mairwunnx.projectessentials.warps.EntryPoint
99
import com.mairwunnx.projectessentials.warps.EntryPoint.Companion.hasPermission
1010
import com.mairwunnx.projectessentials.warps.models.WarpModel
1111
import com.mairwunnx.projectessentials.warps.models.WarpModelUtils
12+
import com.mairwunnx.projectessentials.warps.sendMessage
1213
import com.mojang.brigadier.CommandDispatcher
1314
import com.mojang.brigadier.arguments.StringArgumentType
1415
import com.mojang.brigadier.builder.LiteralArgumentBuilder.literal
@@ -68,17 +69,13 @@ object WarpCommand {
6869
logger.info("Executed command \"/warp\" from ${player.name.string}")
6970
return 0
7071
}
71-
sendMsg("warps", c.source, "warp.not_found", warpName)
72+
sendMessage(c.source, "not_found", warpName)
7273
} else {
73-
sendMsg("warps", c.source, "warp.restricted")
74-
logger.info(
75-
PERMISSION_LEVEL
76-
.replace("%0", player.name.string)
77-
.replace("%1", "warp")
78-
)
74+
sendMessage(c.source, "restricted")
75+
throwPermissionLevel(player.name.string, "warp")
7976
}
8077
} else {
81-
logger.info(ONLY_PLAYER_CAN.replace("%0", "warp"))
78+
throwOnlyPlayerCan("warp")
8279
}
8380
return 0
8481
}
@@ -95,10 +92,11 @@ object WarpCommand {
9592
DimensionType.getById(dimId) ?: DimensionType.OVERWORLD
9693
)
9794
if (player.world.worldInfo.worldName == clientWorld) {
95+
BackLocationProvider.commit(player)
9896
player.teleport(targetWorld, xPos, yPos, zPos, yaw, pitch)
99-
sendMsg("warps", player.commandSource, "warp.success", warp.name)
97+
sendMessage(player.commandSource, "success", warp.name)
10098
} else {
101-
sendMsg("warps", player.commandSource, "warp.not_found", warp.name)
99+
sendMessage(player.commandSource, "not_found", warp.name)
102100
logger.info("Player ${player.name.string} try teleport to not exist warp ${warp.name}")
103101
}
104102
val effectEnabled = WarpModelUtils.warpModel.addResistanceEffect

‎src/main/resources/META-INF/mods.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ issueTrackerURL="https://github.com/ProjectEssentials/ProjectEssentials-Warps/is
44

55
[[mods]]
66
modId="project_essentials_warps"
7-
version="1.15.2-1.0.0"
7+
version="1.15.2-1.0.1"
88
displayName="Project Essentials Warps"
99
updateJSONURL="https://raw.githubusercontent.com/ProjectEssentials/ProjectEssentials-Warps/MC-1.15.2/update.json"
1010
displayURL="https://github.com/ProjectEssentials/ProjectEssentials-Warps"

‎update.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
{
22
"homepage": "https://github.com/ProjectEssentials/ProjectEssentials-Warps",
33
"1.15.2": {
4+
"1.15.2-1.0.1": "Changelog for 1.0.1 https://github.com/ProjectEssentials/ProjectEssentials-Warps/blob/MC-1.15.2/changelog.md#1152-101---2020-03-18",
45
"1.15.2-1.0.0": "Changelog for 1.0.0 https://github.com/ProjectEssentials/ProjectEssentials-Warps/blob/MC-1.15.2/changelog.md#1152-100---2020-02-08"
56
},
67
"promos": {
7-
"1.15.2-latest": "1.15.2-1.0.0",
8-
"1.15.2-recommended": "1.15.2-1.0.0"
8+
"1.15.2-latest": "1.15.2-1.0.1",
9+
"1.15.2-recommended": "1.15.2-1.0.1"
910
}
1011
}

0 commit comments

Comments
 (0)