Skip to content

Commit

Permalink
i am dying
Browse files Browse the repository at this point in the history
  • Loading branch information
notmyidea committed May 21, 2024
1 parent 2fa8d3b commit 5358848
Show file tree
Hide file tree
Showing 92 changed files with 1,940 additions and 453 deletions.
24 changes: 23 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<name>Core</name>

<!-- Change to the appropriate plugin's version, starting at 1.0.0. -->
<version>0.2.4</version>
<version>0.3.5</version>

<!-- DO NOT EDIT. -->
<packaging>jar</packaging>
Expand Down Expand Up @@ -57,6 +57,16 @@
<id>papermc</id>
<url>https://repo.papermc.io/repository/maven-public/</url>
</repository>
<!-- CodeMC -->
<repository>
<id>codemc-repo</id>
<url>https://repo.codemc.io/repository/maven-public/</url>
<layout>default</layout>
</repository>
<repository>
<id>placeholderapi</id>
<url>https://repo.extendedclip.com/content/repositories/placeholderapi/</url>
</repository>
</repositories>

<dependencies>
Expand Down Expand Up @@ -91,6 +101,18 @@
<artifactId>Foundation</artifactId>
<version>${foundation.version}</version>
</dependency>
<dependency>
<groupId>de.tr7zw</groupId>
<artifactId>item-nbt-api-plugin</artifactId>
<version>2.12.4</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>me.clip</groupId>
<artifactId>placeholderapi</artifactId>
<version>2.11.5</version>
<scope>provided</scope>
</dependency>
</dependencies>

<!-- DO NOT EDIT unless instructed to do so or you know what you're doing. -->
Expand Down
12 changes: 12 additions & 0 deletions server/ops.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,20 @@
[
{
"uuid": "14c58c0b-33d9-31f6-9c25-1fa9242b8eb9",
"name": "dwdwdadq2112dwda",
"level": 4,
"bypassesPlayerLimit": false
},
{
"uuid": "29490773-9700-4b31-a14e-5599137e0af3",
"name": "pi16",
"level": 4,
"bypassesPlayerLimit": false
},
{
"uuid": "4294c6e3-68c4-39d6-9bb2-8ddb81e83692",
"name": "pi16",
"level": 4,
"bypassesPlayerLimit": false
}
]
Binary file modified server/plugins/Core.jar
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,29 @@
#
# Nation

nationName: test
owner: 29490773-9700-4b31-a14e-5599137e0af3
nationName: Nation
owner: 4294c6e3-68c4-39d6-9bb2-8ddb81e83692
nationDescription: '&7THIS IS YOUR NATION DESCRIPTION.'
TAG: TEST
TAG: NATI
vaultBalance: 0.0
UEConWood: 0.0
UEConStone: 0.0
UEConBrick: 0.0
UEConDarkstone: 0.0
UEConObsidian: 0.0
taxRate: 0.0
taxRate: 10
population: 0
drills: None
allyBuilding: false
max_territory: 100
min_territory: 9
territory:
- world,-20,-7
- world,-21,-7
- world,-17,-7
- world,-16,-6
- world,-16,-7
allyPermissions: false
archive_messages:
- Creation on 05/21/2024 by §7pi16 §fwith the name of §7Nation§f.
allied_nations: []
pending_allied_nations: []
enemy_nations: []
warscore: 0
warswon: 0
warslost: 0
troops: 0
89 changes: 0 additions & 89 deletions server/plugins/Core/error.log

This file was deleted.

2 changes: 2 additions & 0 deletions server/plugins/Core/localization/messages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,5 @@ Nation:
disabled: "&fClaiming territory is disabled."
success: "&fYou have claimed this chunk for your Nation."
unclaim_success: "&fYou have unclaimed this chunk for your Nation."
you_are_not_allowed_to_do_x_here: "&fYou are not allowed to do that here."

28 changes: 0 additions & 28 deletions server/plugins/Core/settings/behavior.yml

This file was deleted.

21 changes: 20 additions & 1 deletion server/plugins/Core/settings/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ Nations:
# Maximum amount of characters for Nation names
max_characters: 20
# Minimum amount of characters for a Nation names
min_characters: 3
# Minimum amount is 4 to prevent empty tags
min_characters: 4
# Blacklisted names for Nations, can be multiple separated by commas
blacklist: "admin,moderator,owner,staff,helper,dev,developer,admin,mod,moderator,owner,staff,helper,dev,developer,"
Tags:
Expand Down Expand Up @@ -80,6 +81,24 @@ Nations:
max: 100
# Minimum amount of Chunks a Nation can claim, will prevent the Nation from claiming 0
min: 9
Building:
# Allow fighting on Nation territory
allow_fighting: true
# Allow alliances to do x on each other's territory
Alliances:
allow_building: true
allow_usage: true
allow_destroy: true
# Allow neutral nations to do x on each other's territory
Neutral:
allow_building: false
allow_usage: false
allow_destroy: false
# Allow nations to do x on each other's territory
War:
allow_building: false
allow_usage: false
allow_destroy: false

#
#
Expand Down
7 changes: 7 additions & 0 deletions server/plugins/NBTAPI/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
nbtInjector:
enabled: false
bStats:
enabled: true
updateCheck:
enabled: true
silentquickstart: false
Binary file added server/plugins/PlaceholderAPI-2.11.6.jar
Binary file not shown.
18 changes: 18 additions & 0 deletions server/plugins/PlaceholderAPI/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# PlaceholderAPI
# Version: 2.11.6
# Created by: extended_clip
# Contributors: https://github.com/PlaceholderAPI/PlaceholderAPI/graphs/contributors
# Issues: https://github.com/PlaceholderAPI/PlaceholderAPI/issues
# Expansions: https://placeholderapi.com/ecloud
# Wiki: https://wiki.placeholderapi.com/
# Discord: https://helpch.at/discord
# No placeholders are provided with this plugin by default.
# Download placeholders: /papi ecloud
check_updates: true
cloud_enabled: true
cloud_sorting: "name"
boolean:
'true': 'yes'
'false': 'no'
date_format: MM/dd/yy HH:mm:ss
debug: false
2 changes: 1 addition & 1 deletion server/plugins/bStats/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
# Check out https://bStats.org/ to learn more :)

enabled: true
serverUuid: 38d6710b-ec3e-4086-8b45-5a6b8b92a8fe
serverUuid: dff078f9-98fa-4174-8477-982149654716
logFailedRequests: false
Binary file added server/plugins/item-nbt-api-plugin-2.12.4.jar
Binary file not shown.
6 changes: 3 additions & 3 deletions server/server.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#Minecraft server properties
#Mon May 13 23:57:17 CEST 2024
#Tue May 21 16:19:21 CEST 2024
allow-flight=false
allow-nether=true
broadcast-console-to-ops=true
Expand Down Expand Up @@ -31,9 +31,9 @@ max-chained-neighbor-updates=1000000
max-players=20
max-tick-time=60000
max-world-size=29999984
motd=A Minecraft Server
motd=PopBob's Minecraft Server
network-compression-threshold=256
online-mode=true
online-mode=false
op-permission-level=4
player-idle-timeout=0
prevent-proxy-connections=false
Expand Down
2 changes: 1 addition & 1 deletion server/usercache.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[{"name":"pi16","uuid":"29490773-9700-4b31-a14e-5599137e0af3","expiresOn":"2024-06-13 23:57:25 +0200"}]
[{"name":"pi16","uuid":"4294c6e3-68c4-39d6-9bb2-8ddb81e83692","expiresOn":"2024-06-21 16:19:31 +0200"},{"name":"dwdwdadq2112dwda","uuid":"14c58c0b-33d9-31f6-9c25-1fa9242b8eb9","expiresOn":"2024-06-21 02:38:58 +0200"},{"name":"pi16","uuid":"29490773-9700-4b31-a14e-5599137e0af3","expiresOn":"2024-06-20 22:07:30 +0200"}]
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"minecraft:recipes/decorations/crafting_table": {
"criteria": {
"unlock_right_away": "2024-05-21 00:16:04 +0200"
},
"done": true
},
"minecraft:adventure/adventuring_time": {
"criteria": {
"minecraft:plains": "2024-05-21 00:16:05 +0200"
},
"done": false
},
"DataVersion": 3700
}
Loading

0 comments on commit 5358848

Please sign in to comment.