Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revamp the Navigator #76

Merged
merged 27 commits into from
Sep 10, 2023
Merged
Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
7cede6c
Make navigator translatable
Hugman76 Aug 13, 2023
b398a25
Split navigator menus into game categories
Hugman76 Aug 13, 2023
2b7247e
Remove unused stuff
Hugman76 Aug 13, 2023
fa15035
Fix lang files
Hugman76 Aug 13, 2023
3eaa1a4
Make all games with random configs use quick entries
Hugman76 Aug 15, 2023
4a08558
Fix #74 and #78
Hugman76 Aug 15, 2023
e9b6e85
Fix #77
Hugman76 Aug 15, 2023
d6c2ec3
Murder Mystery quick portal
Hugman76 Aug 15, 2023
dd30c6b
Creative Party quick portal (unused though)
Hugman76 Aug 15, 2023
7203e5c
Add missing party games in random config and move some out
Hugman76 Aug 15, 2023
6a00165
Add custom right click messages and misc category
Hugman76 Aug 16, 2023
679b228
Add right clicking to loopdeloop
Hugman76 Aug 16, 2023
82d5f3a
Remove unused fields and add Creative Party to misc category
Hugman76 Aug 16, 2023
6e3af65
Fix #51
Hugman76 Aug 16, 2023
2c8903a
Move farmy feud
Hugman76 Aug 16, 2023
2443205
Update color swap entry
Hugman76 Aug 16, 2023
a561eb2
Update main menu layout
Hugman76 Aug 16, 2023
33c92a0
Update data/nucleoid/lang/en_us.json
Hugman76 Aug 17, 2023
78e1179
Update data/nucleoid/game_portals/loopdeloop/flappy/root.json
Hugman76 Aug 17, 2023
436dd4e
Update en_us.json
Hugman76 Aug 17, 2023
76c8c65
Fix #81
Hugman76 Aug 17, 2023
6da5fee
Make Dé à Coudre maps selectable
Hugman76 Aug 17, 2023
0ce475a
Add cursed games to the navigator
Hugman76 Aug 17, 2023
4ab5ffb
Make Death Run maps randomizable
Hugman76 Aug 17, 2023
a4fede0
Make Siege maps selectable
Hugman76 Aug 17, 2023
6f5b24c
Let The Towers define game portals
Hugman76 Aug 22, 2023
86c657f
Update data/nucleoid/game_portals/top_level/categories/party.json
Hugman76 Sep 2, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions data/nucleoid/game_portals/anvil_drop/random.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"type": "plasmid:concurrent_game",
"game": "nucleoid:anvil_drop/random"
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@
"type": "nucleoid_extras:styled/simple_menu",
"icon": "minecraft:anvil",
"games": [
"nucleoid:anvil_drop/random",

"anvildrop:standard_anvil_drop",
"anvildrop:standard_breaking_anvil_drop"
],
"name": {
"translate": "gameType.anvildrop.anvildrop"
}
}
}
4 changes: 4 additions & 0 deletions data/nucleoid/game_portals/ascension/random.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"type": "plasmid:concurrent_game",
"game": "nucleoid:ascension/random"
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@
"type": "nucleoid_extras:styled/simple_menu",
"icon": "minecraft:rabbit_foot",
"games": [
"nucleoid:ascension/random",

"ascension:standard_ascension",
"nucleoid:ascension/cave"
Copy link
Contributor

@haykam821 haykam821 Aug 28, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think only the standard configuration makes sense to include here, since Cave Ascension has the potential to be unplayable. Do you think that Cave Ascension could be moved to the cursed games?

],
"name": {
"translate": "gameType.ascension.ascension"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"type": "plasmid:concurrent_game",
"game": "nucleoid:beacon_breakers/random_keep_inventory"
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,7 @@
}
]
},
"games": [
"nucleoid:beacon_breakers/random_keep_inventory",

"games": [
"beaconbreakers:amplified_beacon_breakers_keep_inventory",
"beaconbreakers:caves_beacon_breakers_keep_inventory",
"beaconbreakers:end_beacon_breakers_keep_inventory",
Expand All @@ -23,4 +21,4 @@
"name": {
"translate": "game.nucleoid.keep_inventory"
}
}
}
33 changes: 33 additions & 0 deletions data/nucleoid/game_portals/beacon_breakers/root.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
"type": "nucleoid_extras:styled/advanced_menu",
"name": {
"translate": "gameType.beaconbreakers.beacon_breakers"
},
"icon": "minecraft:beacon",
"entries": [
{
"type": "nucleoid_extras:quick_portal",
"portal": "nucleoid:beaconbreakers/standard/root",
"quick_portal": "nucleoid:beaconbreakers/standard/random",
"message": {
"translate": "text.nucleoid_extras.ui.action.maps"
}
},
{
"type": "nucleoid_extras:quick_portal",
"portal": "nucleoid:beaconbreakers/keep_inventory/root",
"quick_portal": "nucleoid:beaconbreakers/keep_inventory/random",
"message": {
"translate": "text.nucleoid_extras.ui.action.maps"
}
},
{
"type": "nucleoid_extras:quick_portal",
"portal": "nucleoid:beaconbreakers/tiny/root",
"quick_portal": "nucleoid:beaconbreakers/tiny/random",
"message": {
"translate": "text.nucleoid_extras.ui.action.maps"
}
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"type": "plasmid:concurrent_game",
"game": "nucleoid:beacon_breakers/random"
}
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
{
"type": "nucleoid_extras:styled/simple_menu",
"icon": "minecraft:beacon",
"games": [
"nucleoid:beacon_breakers/random",

"games": [
"beaconbreakers:amplified_beacon_breakers",
"beaconbreakers:caves_beacon_breakers",
"beaconbreakers:end_beacon_breakers",
Expand All @@ -14,4 +12,4 @@
"name": {
"translate": "game.nucleoid.standard"
}
}
}
4 changes: 4 additions & 0 deletions data/nucleoid/game_portals/beacon_breakers/tiny/random.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"type": "plasmid:concurrent_game",
"game": "nucleoid:beacon_breakers/random_tiny"
}
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
{
"type": "nucleoid_extras:styled/simple_menu",
"icon": "minecraft:nether_star",
"games": [
"nucleoid:beacon_breakers/random_tiny",

"games": [
"beaconbreakers:amplified_beacon_breakers_tiny",
"beaconbreakers:caves_beacon_breakers_tiny",
"beaconbreakers:end_beacon_breakers_tiny",
Expand All @@ -14,4 +12,4 @@
"name": {
"translate": "game.nucleoid.tiny"
}
}
}
4 changes: 4 additions & 0 deletions data/nucleoid/game_portals/bedwars/eight_teams/random.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"type": "plasmid:concurrent_game",
"game": "nucleoid:bedwars/random_eight_teams"
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,9 @@
"Count": 8
},
"games": [
"nucleoid:bedwars/random_eight_teams",

"bedwars:eight_teams/beach"
],
"name": {
"translate": "game.nucleoid.eight_teams"
}
}
}
4 changes: 4 additions & 0 deletions data/nucleoid/game_portals/bedwars/four_teams/random.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"type": "plasmid:concurrent_game",
"game": "nucleoid:bedwars/random_four_teams"
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
"Count": 4
},
"games": [
"nucleoid:bedwars/random_four_teams",

"bedwars:four_teams/aspen_forest",
"bedwars:four_teams/desert",
"bedwars:four_teams/forest",
Expand All @@ -24,4 +22,4 @@
"name": {
"translate": "game.nucleoid.four_teams"
}
}
}
33 changes: 33 additions & 0 deletions data/nucleoid/game_portals/bedwars/root.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
"type": "nucleoid_extras:styled/advanced_menu",
"name": {
"translate": "gameType.bedwars.bed_wars"
},
"icon": "minecraft:red_bed",
"entries": [
{
"type": "nucleoid_extras:quick_portal",
"portal": "nucleoid:bedwars/two_teams/root",
"quick_portal": "nucleoid:bedwars/two_teams/random",
"message": {
"translate": "text.nucleoid_extras.ui.action.maps"
}
},
{
"type": "nucleoid_extras:quick_portal",
"portal": "nucleoid:bedwars/four_teams/root",
"quick_portal": "nucleoid:bedwars/four_teams/random",
"message": {
"translate": "text.nucleoid_extras.ui.action.maps"
}
},
{
"type": "nucleoid_extras:quick_portal",
"portal": "nucleoid:bedwars/eight_teams/root",
"quick_portal": "nucleoid:bedwars/eight_teams/random",
"message": {
"translate": "text.nucleoid_extras.ui.action.maps"
}
}
]
}
4 changes: 4 additions & 0 deletions data/nucleoid/game_portals/bedwars/two_teams/random.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"type": "plasmid:concurrent_game",
"game": "nucleoid:bedwars/random_two_teams"
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
"Count": 2
},
"games": [
"nucleoid:bedwars/random_four_teams",

"bedwars:two_teams/aspen_forest",
"bedwars:two_teams/desert",
"bedwars:two_teams/forest",
Expand All @@ -18,4 +16,4 @@
"name": {
"translate": "game.nucleoid.two_teams"
}
}
}
4 changes: 4 additions & 0 deletions data/nucleoid/game_portals/block_lobbers.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"type": "plasmid:concurrent_game",
"game": "blocklobbers:construction_block_lobbers"
}
4 changes: 4 additions & 0 deletions data/nucleoid/game_portals/bow_battle/random.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"type": "plasmid:concurrent_game",
"game": "nucleoid:bow_battle/random"
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@
"type": "nucleoid_extras:styled/simple_menu",
"icon": "minecraft:bow",
"games": [
"nucleoid:bow_battle/random",

"bowbattle:standard",
"bowbattle:nether"
],
"name": {
"translate": "gameType.bowbattle.bowbattle"
}
}
}
10 changes: 3 additions & 7 deletions data/nucleoid/game_portals/cabinfever.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
{
"type": "plasmid:on_demand",
"icon": "minecraft:coal_block",
"game": "cabinfever:standard_cabin_fever",
"name": {
"translate": "gameType.cabinfever.cabin_fever"
}
}
"type": "plasmid:concurrent_game",
"game": "cabinfever:standard_cabin_fever"
}
4 changes: 4 additions & 0 deletions data/nucleoid/game_portals/cake_wars/four_teams/random.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"type": "plasmid:concurrent_game",
"game": "nucleoid:cake_wars/random_four_teams"
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,10 @@
"Count": 4
},
"games": [
"nucleoid:cake_wars/random_four_teams",

"cakewars:laboratory_cake_wars",
"cakewars:meow_mountain_cake_wars"
],
"name": {
"translate": "game.nucleoid.four_teams"
}
}
}
25 changes: 25 additions & 0 deletions data/nucleoid/game_portals/cake_wars/root.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"type": "nucleoid_extras:styled/advanced_menu",
"name": {
"translate": "gameType.cakewars.cake_wars"
},
"icon": "minecraft:cake",
"entries": [
{
"type": "nucleoid_extras:quick_portal",
"portal": "nucleoid:cake_wars/two_teams/root",
"quick_portal": "nucleoid:cake_wars/two_teams/random",
"message": {
"translate": "text.nucleoid_extras.ui.action.maps"
}
},
{
"type": "nucleoid_extras:quick_portal",
"portal": "nucleoid:cake_wars/four_teams/root",
"quick_portal": "nucleoid:cake_wars/four_teams/random",
"message": {
"translate": "text.nucleoid_extras.ui.action.maps"
}
}
]
}
4 changes: 4 additions & 0 deletions data/nucleoid/game_portals/cake_wars/two_teams/random.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"type": "plasmid:concurrent_game",
"game": "nucleoid:cake_wars/random_two_teams"
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,10 @@
"Count": 2
},
"games": [
"nucleoid:cake_wars/random_two_teams",

"cakewars:beehive_cake_wars",
"cakewars:skylands_cake_wars"
],
"name": {
"translate": "game.nucleoid.two_teams"
}
}
}
10 changes: 3 additions & 7 deletions data/nucleoid/game_portals/castle_wars.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
{
"type": "plasmid:on_demand",
"icon": "minecraft:cobblestone",
"game": "castle_wars:castlewars_with_pvp",
"name": {
"translate": "gameType.castle_wars.castle_wars"
}
}
"type": "plasmid:concurrent_game",
"game": "castle_wars:castlewars_with_pvp"
}
10 changes: 3 additions & 7 deletions data/nucleoid/game_portals/cavern_crawler.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
{
"type": "plasmid:on_demand",
"icon": "minecraft:diamond_pickaxe",
"game": "caverncrawler:standard",
"name": {
"translate": "gameType.caverncrawler.cavern_crawler"
}
}
"type": "plasmid:concurrent_game",
"game": "caverncrawler:standard"
}
10 changes: 3 additions & 7 deletions data/nucleoid/game_portals/clutch_bridge.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
{
"type": "plasmid:on_demand",
"icon": "minecraft:magenta_glazed_terracotta",
"game": "clutchbridge:standard_clutch_bridge",
"name": {
"translate": "gameType.clutchbridge.clutch_bridge"
}
}
"type": "plasmid:concurrent_game",
"game": "clutchbridge:standard_clutch_bridge"
}
8 changes: 2 additions & 6 deletions data/nucleoid/game_portals/clutch_practice.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
{
"type": "plasmid:on_demand",
"icon": "minecraft:ladder",
"game": "clutchpractice:clutch_practice",
"name": {
"translate": "gameType.clutchpractice.clutch_practice"
}
"type": "plasmid:concurrent_game",
"game": "clutchpractice:clutch_practice"
}
4 changes: 4 additions & 0 deletions data/nucleoid/game_portals/color_swap/random.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"type": "plasmid:concurrent_game",
"game": "nucleoid:color_swap/random"
}
Loading
Loading