Skip to content

Commit

Permalink
Merge pull request #62 from DuranDevelopment/revert-60-phones-feature
Browse files Browse the repository at this point in the history
Revert "Phones feature"
  • Loading branch information
duranaaron authored Jan 30, 2024
2 parents 5d27ff9 + 00c96d4 commit 0e86365
Show file tree
Hide file tree
Showing 44 changed files with 1,133 additions and 540 deletions.
8 changes: 4 additions & 4 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ repositories {
}

dependencies {
implementation("dev.hollowcube:minestom-ce:002dcc2745")
implementation("dev.hollowcube:minestom-ce:cf4a2d134e")
implementation("com.github.DuranDevelopment:instanceguard:1c50091bc9") {
exclude(group = "dev.hollowcube", module = "minestom-ce")
}
Expand All @@ -31,10 +31,10 @@ dependencies {
}
*/

implementation("com.zaxxer:HikariCP:5.1.0")
implementation("com.zaxxer:HikariCP:5.0.1")
implementation("com.github.simplix-softworks:simplixstorage:3.2.7")
implementation("net.kyori:adventure-text-minimessage:4.15.0")
implementation("com.github.Mindgamesnl:storm:e1f961b480")
implementation("net.kyori:adventure-text-minimessage:4.14.0")
implementation("com.github.Mindgamesnl:storm:prod125")
implementation("mysql:mysql-connector-java:8.0.33") /* Adding drivers for MySQL and SQLite */
implementation("org.xerial:sqlite-jdbc:3.45.0.0")
compileOnly("junit:junit:4.13.2")
Expand Down
7 changes: 0 additions & 7 deletions configuration/feather.toml
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,3 @@ starting_balance = 1000
days = 30
[plots.calculate]
price_formula = '<length * <width> * 32'

[phone]
default_credit = 0.0
message_costs = 2.0
items = [
'minecraft:blaze_powder'
]
47 changes: 47 additions & 0 deletions configuration/feather_de.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
messages = { }

[server]
max_players = 100
description = "A Feather Server"
host = "0.0.0.0"
port = 25_565
online_mode = true

[database]
type = "mysql"
username = "root"
password = ""
database = "feather"
host = "127.0.0.1"
port = 3_306

[spawn]
spawn_on_join = true
send_join_message = true
world = "demo"
x = "7.5"
y = -24
z = "-3.5"

[player.default]
prefix = "Wanderer"
prefix_color = "<gray>"
level = 1
city_color = "<gray>"
chat_color = "<gray>"

[chat]
format = "<levelcolor><level> <prefixcolor><prefix> <namecolor><player>: <chatcolor><message>"
enabled = true

[chat.radius]
enabled = true
radius = 100
MessageWhenNobodyInRange = false

[sidebar]
enabled = true
title = "<world>"

[economy]
starting_balance = 1_000
47 changes: 47 additions & 0 deletions configuration/feather_fr.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
messages = { }

[server]
max_players = 100
description = "A Feather Server"
host = "0.0.0.0"
port = 25_565
online_mode = true

[database]
type = "mysql"
username = "root"
password = ""
database = "feather"
host = "127.0.0.1"
port = 3_306

[spawn]
spawn_on_join = true
send_join_message = true
world = "demo"
x = "7.5"
y = -24
z = "-3.5"

[player.default]
prefix = "Wanderer"
prefix_color = "<gray>"
level = 1
city_color = "<gray>"
chat_color = "<gray>"

[chat]
format = "<levelcolor><level> <prefixcolor><prefix> <namecolor><player>: <chatcolor><message>"
enabled = true

[chat.radius]
enabled = true
radius = 100
MessageWhenNobodyInRange = false

[sidebar]
enabled = true
title = "<world>"

[economy]
starting_balance = 1_000
47 changes: 47 additions & 0 deletions configuration/feather_nl.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
messages = { }

[server]
max_players = 100
description = "A Feather Server"
host = "0.0.0.0"
port = 25_565
online_mode = true

[database]
type = "mysql"
username = "root"
password = ""
database = "feather"
host = "127.0.0.1"
port = 3_306

[spawn]
spawn_on_join = true
send_join_message = true
world = "demo"
x = "7.5"
y = -24
z = "-3.5"

[player.default]
prefix = "Wanderer"
prefix_color = "<gray>"
level = 1
city_color = "<gray>"
chat_color = "<gray>"

[chat]
format = "<levelcolor><level> <prefixcolor><prefix> <namecolor><player>: <chatcolor><message>"
enabled = true

[chat.radius]
enabled = true
radius = 100
MessageWhenNobodyInRange = false

[sidebar]
enabled = true
title = "<world>"

[economy]
starting_balance = 1_000
76 changes: 76 additions & 0 deletions configuration/messages_de.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
language = "en"
invalid_arguments = "<red>You provided invalid arguments for this command."
invalid_username = "<red>That username is invalid."
not_online = "<red>That player is not online."
no_permission = "<red>You don't have permission to use this command."
fly_on = "<green>Fly mode has been enabled!"
fly_off = "<red>Fly mode has been disabled!"

[join]
enabled = true
message = "<dark_aqua><player> <aqua>joined the game"

[leave]
enabled = true
message = "<dark_aqua><player> <aqua>left the game"

[join_title]
title = "<worldcolor>Welcome to"
subtitle = "<worldcolor><loadingname>"

[mtworldcmd.add]
success = "<dark_aqua>Succesfully <aqua>enabled<dark_aqua> Feather in this world!"

[banking]
frozen = "<red>This account is frozen, you can no longer withdraw or deposit money!"

[banking.selector]
title = "<dark_aqua>Select the account type:"

[banking.selector.account]
title = "<dark_aqua>Select the account:"
lore = "(ID: <ID>)"

[banking.selector.accounttype]
government = "<dark_green>Government"
savings = "<dark_red>Savings"
private = "<gold>Private"
business = "<dark_aqua>Business"
no_business_accounts = "<red>You <dark_red>don't have any <red>Business <dark_red>accounts!"
no_savings_accounts = "<red>You <dark_red>don't have any <red>Savings <dark_red>accounts!"

[banking.menu]
title = "<dark_aqua>Total value: <aqua>€ <amount>"
item_lore = "<dark_aqua>This piece of money has a %newline%<dark_aqua>value of <aqua>€ <amount><dark_aqua>."

[banking.money]
lore = "<red>Official Minetopia banknote!"
insufficient_balance = "<red>There is not enough money in this account"
is_fake_money = "<dark_red>You have counterfeit money with you! We are currently unable to accept money!"

[banking.money.withdraw]
inventory_full = "<red>You can't withdraw money when your inventory is full!"
private = "<dark_aqua>You have withdrawn <aqua>€ <amount> <dark_aqua>from <aqua><account>'s <dark_aqua>account"
savings = "<dark_aqua>You have withdrawn <aqua>€ <amount> <dark_aqua>from <aqua><account>'s <dark_aqua>savings account"
business = "<dark_aqua>You have withdrawn <aqua>€ <amount> <dark_aqua>from <aqua><account>'s <dark_aqua>business account"
government = "<dark_aqua>You have withdrawn <aqua>€ <amount> <dark_aqua>from <aqua><account>'s <dark_aqua>government account"

[banking.money.deposit]
private = "<dark_aqua>You have deposited <aqua>€ <amount> <dark_aqua>to <aqua><account>'s <dark_aqua>account"
savings = "<dark_aqua>You have deposited <aqua>€ <amount> <dark_aqua>to <aqua><account>'s <dark_aqua>savings account"
business = "<dark_aqua>You have deposited <aqua>€ <amount> <dark_aqua>to <aqua><account>'s <dark_aqua>business account"
government = "<dark_aqua>You have deposited <aqua>€ <amount> <dark_aqua>to <aqua><account>'s <dark_aqua>government account"

[banking.nobankingpermission]
deposit = "<dark_red>You only have withdrawal rights for the account <account>! Unfortunately you cannot deposit money."

[bankaccountcmd]
id_does_not_exist = "<red>There is no bankaccount with this ID."
invalid_bankpermission = "<dark_red>ERROR: <red>Invalid bankpermission, valid permissions are <permissions>."

[bankaccountcmd.adduser]
success = "<dark_aqua>Successfully added player <aqua><player> <dark_aqua>to this bankaccount."
already_added = "<red>The player <dark_red><player> <red>has already been added to this bankaccount."

[atm]
require_card = "<red>You need to hold <dark_red>a debit card <red>in your hand!"
76 changes: 76 additions & 0 deletions configuration/messages_de_de.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
language = "en"
invalid_arguments = "<red>You provided invalid arguments for this command."
invalid_username = "<red>That username is invalid."
not_online = "<red>That player is not online."
no_permission = "<red>You don't have permission to use this command."
fly_on = "<green>Fly mode has been enabled!"
fly_off = "<red>Fly mode has been disabled!"

[join]
enabled = true
message = "&7<player> joined the game"

[leave]
enabled = true
message = "&7<player> left the game"

[join_title]
title = "<worldcolor>Welcome to"
subtitle = "<worldcolor><loadingname>"

[mtworldcmd.add]
success = "<dark_aqua>Succesfully <aqua>enabled<dark_aqua> Feather in this world!"

[banking]
frozen = "<red>This account is frozen, you can no longer withdraw or deposit money!"

[banking.selector]
title = "<dark_aqua>Select the account type:"

[banking.selector.account]
title = "<dark_aqua>Select the account:"
lore = "(ID: <ID>)"

[banking.selector.accounttype]
government = "<dark_green>Government"
savings = "<dark_red>Savings"
private = "<gold>Private"
business = "<dark_aqua>Business"
no_business_accounts = "<red>You <dark_red>don't have any <red>Business <dark_red>accounts!"
no_savings_accounts = "<red>You <dark_red>don't have any <red>Savings <dark_red>accounts!"

[banking.menu]
title = "<dark_aqua>Total value: <aqua>€ <amount>"
item_lore = "<dark_aqua>This piece of money has a %newline%<dark_aqua>value of <aqua>€ <amount><dark_aqua>."

[banking.money]
lore = "<red>Official Minetopia banknote!"
insufficient_balance = "<red>There is not enough money in this account"
is_fake_money = "<dark_red>You have counterfeit money with you! We are currently unable to accept money!"

[banking.money.withdraw]
inventory_full = "<red>You can't withdraw money when your inventory is full!"
private = "<dark_aqua>You have withdrawn <aqua>€ <amount> <dark_aqua>from <aqua><account>'s <dark_aqua>account"
savings = "<dark_aqua>You have withdrawn <aqua>€ <amount> <dark_aqua>from <aqua><account>'s <dark_aqua>savings account"
business = "<dark_aqua>You have withdrawn <aqua>€ <amount> <dark_aqua>from <aqua><account>'s <dark_aqua>business account"
government = "<dark_aqua>You have withdrawn <aqua>€ <amount> <dark_aqua>from <aqua><account>'s <dark_aqua>government account"

[banking.money.deposit]
private = "<dark_aqua>You have deposited <aqua>€ <amount> <dark_aqua>to <aqua><account>'s <dark_aqua>account"
savings = "<dark_aqua>You have deposited <aqua>€ <amount> <dark_aqua>to <aqua><account>'s <dark_aqua>savings account"
business = "<dark_aqua>You have deposited <aqua>€ <amount> <dark_aqua>to <aqua><account>'s <dark_aqua>business account"
government = "<dark_aqua>You have deposited <aqua>€ <amount> <dark_aqua>to <aqua><account>'s <dark_aqua>government account"

[banking.nobankingpermission]
deposit = "<dark_red>You only have withdrawal rights for the account <account>! Unfortunately you cannot deposit money."

[bankaccountcmd]
id_does_not_exist = "<red>There is no bankaccount with this ID."
invalid_bankpermission = "<dark_red>ERROR: <red>Invalid bankpermission, valid permissions are <permissions>."

[bankaccountcmd.adduser]
success = "<dark_aqua>Successfully added player <aqua><player> <dark_aqua>to this bankaccount."
already_added = "<red>The player <dark_red><player> <red>has already been added to this bankaccount."

[atm]
require_card = "<red>You need to hold <dark_red>a debit card <red>in your hand!"
Loading

0 comments on commit 0e86365

Please sign in to comment.