diff --git a/world/datapacks/lem.base/data/lem.base/advancements/root.json b/world/datapacks/lem.base/data/lem.base/advancements/root.json index 76e1a8d28..d27cc576a 100644 --- a/world/datapacks/lem.base/data/lem.base/advancements/root.json +++ b/world/datapacks/lem.base/data/lem.base/advancements/root.json @@ -4,7 +4,7 @@ "icon": { "id": "minecraft:ghast_spawn_egg", "components": { - "minecraft:custom_model_data": 2 + "minecraft:custom_model_data": 31 } }, "title": { diff --git a/world/datapacks/lem.base/data/lem.base/functions/game/end/run.mcfunction b/world/datapacks/lem.base/data/lem.base/functions/game/end/run.mcfunction index b7be380e2..06c7ef41e 100644 --- a/world/datapacks/lem.base/data/lem.base/functions/game/end/run.mcfunction +++ b/world/datapacks/lem.base/data/lem.base/functions/game/end/run.mcfunction @@ -26,8 +26,8 @@ execute unless entity @a[tag=ingame,tag=host] run scoreboard players set #Store #Start check execute unless entity @a[tag=ingame,tag=host] run function lem.base:host/check/run -##Stop Music -function lem.base:game/music/stop +##Stop Music \\ TODO: Look into if we need this still +#function lem.base:game/music/stop ##Mark mapload functions as needing to run again scoreboard players set #Store lem.mapinit.mapload 0 diff --git a/world/datapacks/lem.base/data/lem.base/functions/game/music/block.mcfunction b/world/datapacks/lem.base/data/lem.base/functions/game/music/block.mcfunction deleted file mode 100644 index a2212a0c3..000000000 --- a/world/datapacks/lem.base/data/lem.base/functions/game/music/block.mcfunction +++ /dev/null @@ -1,27 +0,0 @@ -##Stop Default music -stopsound @a[tag=ingame] music minecraft:music.game -stopsound @a[tag=ingame] music minecraft:music.creative -stopsound @a[tag=ingame] music minecraft:music.nether.nether_wastes -stopsound @a[tag=ingame] music minecraft:music.nether.basalt_deltas -stopsound @a[tag=ingame] music minecraft:music.nether.crimson_forest -stopsound @a[tag=ingame] music minecraft:music.nether.soul_sand_valley -stopsound @a[tag=ingame] music minecraft:music.nether.warped_forest -stopsound @a[tag=ingame] music minecraft:music.overworld.badlands -stopsound @a[tag=ingame] music minecraft:music.overworld.bamboo_jungle -stopsound @a[tag=ingame] music minecraft:music.overworld.cherry_grove -stopsound @a[tag=ingame] music minecraft:music.overworld.deep_dark -stopsound @a[tag=ingame] music minecraft:music.overworld.desert -stopsound @a[tag=ingame] music minecraft:music.overworld.dripstone_caves -stopsound @a[tag=ingame] music minecraft:music.overworld.flower_forest -stopsound @a[tag=ingame] music minecraft:music.overworld.forest -stopsound @a[tag=ingame] music minecraft:music.overworld.frozen_peaks -stopsound @a[tag=ingame] music minecraft:music.overworld.grove -stopsound @a[tag=ingame] music minecraft:music.overworld.jagged_peaks -stopsound @a[tag=ingame] music minecraft:music.overworld.jungle -stopsound @a[tag=ingame] music minecraft:music.overworld.lush_caves -stopsound @a[tag=ingame] music minecraft:music.overworld.meadow -stopsound @a[tag=ingame] music minecraft:music.overworld.old_growth_taiga -stopsound @a[tag=ingame] music minecraft:music.overworld.snowy_slopes -stopsound @a[tag=ingame] music minecraft:music.overworld.sparse_jungle -stopsound @a[tag=ingame] music minecraft:music.overworld.stony_peaks -stopsound @a[tag=ingame] music minecraft:music.overworld.swamp diff --git a/world/datapacks/lem.base/data/lem.base/functions/game/music/loadpack.mcfunction b/world/datapacks/lem.base/data/lem.base/functions/game/music/loadpack.mcfunction deleted file mode 100644 index 48d285c35..000000000 --- a/world/datapacks/lem.base/data/lem.base/functions/game/music/loadpack.mcfunction +++ /dev/null @@ -1,5 +0,0 @@ -##Copy ID from the server -scoreboard players operation @s lem.muspack = #Store lem.muspack - -##Run functions for addons -function #lem.base:game/music/loadpack diff --git a/world/datapacks/lem.base/data/lem.base/functions/game/music/pick.mcfunction b/world/datapacks/lem.base/data/lem.base/functions/game/music/pick.mcfunction deleted file mode 100644 index f7ddc850d..000000000 --- a/world/datapacks/lem.base/data/lem.base/functions/game/music/pick.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -##Load music pack -function lem.base:game/music/loadpack - -##Pick Song -function #lem.base:game/music/pick - -##Add a second of delay between songs -scoreboard players add @s lem.mustimer 1 - -##Debug Info -tellraw @a[tag=debug] ["",{"text":"[Debug] ","bold":true,"color":"red"},{"text":"Picking song for ","color":"gold"},{"selector":"@s","color":"yellow"}] diff --git a/world/datapacks/lem.base/data/lem.base/functions/game/music/runner.mcfunction b/world/datapacks/lem.base/data/lem.base/functions/game/music/runner.mcfunction deleted file mode 100644 index f75c84707..000000000 --- a/world/datapacks/lem.base/data/lem.base/functions/game/music/runner.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -##Play music when timer runs out -execute as @a[tag=ingame,scores={lem.mustimer=..0}] at @s run function lem.base:game/music/pick - -##Decrease timer -scoreboard players remove @a lem.mustimer 1 - -##Block vanilla music -function lem.base:game/music/block - -##Loop -schedule function lem.base:game/music/runner 1s diff --git a/world/datapacks/lem.base/data/lem.base/functions/game/music/start.mcfunction b/world/datapacks/lem.base/data/lem.base/functions/game/music/start.mcfunction deleted file mode 100644 index ea365e889..000000000 --- a/world/datapacks/lem.base/data/lem.base/functions/game/music/start.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -##Load pack to use -function #lem.base:game/music/id - -##Start Music -#Set MusTimer -scoreboard players set @a[tag=ingame] lem.mustimer 0 -#Function -function lem.base:game/music/runner diff --git a/world/datapacks/lem.base/data/lem.base/functions/game/music/stop.mcfunction b/world/datapacks/lem.base/data/lem.base/functions/game/music/stop.mcfunction deleted file mode 100644 index 0831b048d..000000000 --- a/world/datapacks/lem.base/data/lem.base/functions/game/music/stop.mcfunction +++ /dev/null @@ -1,5 +0,0 @@ -##Stop loop -schedule clear lem.base:game/music/runner - -##Stop NBS music -stopnbs ALL diff --git a/world/datapacks/lem.base/data/lem.base/functions/game/start/run.mcfunction b/world/datapacks/lem.base/data/lem.base/functions/game/start/run.mcfunction index ddec49f98..a0aefd0a1 100644 --- a/world/datapacks/lem.base/data/lem.base/functions/game/start/run.mcfunction +++ b/world/datapacks/lem.base/data/lem.base/functions/game/start/run.mcfunction @@ -75,7 +75,7 @@ execute as @a[tag=ingame] at @s run spawnpoint @s ~ ~ ~ kill @e[type=item] ##Start Music -execute unless score #Store lem.recon matches 1 if score #Store lem.initialgame matches 1 run function lem.base:game/music/start +execute unless score #Store lem.recon matches 1 if score #Store lem.initialgame matches 1 run custommaploader battle triggerMusic lem.base:arena ##Run functions for addons function #lem.base:game/start/run diff --git a/world/datapacks/lem.base/data/lem.base/servertranslator/en_us.json b/world/datapacks/lem.base/data/lem.base/servertranslator/en_us.json index 4d0c75173..83336130a 100644 --- a/world/datapacks/lem.base/data/lem.base/servertranslator/en_us.json +++ b/world/datapacks/lem.base/data/lem.base/servertranslator/en_us.json @@ -1,4 +1,4 @@ -{ +{ "lem.advancement.config.root.name": "Client Options", "lem.battle.advancement.config.armorbar.desc": "Don't show armor you are wearing\n\n§6Can be toggled with /trigger armorbar", "lem.battle.advancement.config.armorbar.name": "Disable ArmorBar", @@ -19,6 +19,12 @@ "lem.battle.advancement.config.spawnenchanted.desc": "Allow auto equip to swap armor even if its enchanted\n\n§6Can be toggled with /trigger swapenchanted", "lem.battle.advancement.config.spawnenchanted.name": "Swap Enchanted Armor", "lem.advancement.root.name": "Mini Game Achievements", + "lem.advancement.secret.root.name": "Secret Achievements", + "lem.advancement.secret.ghost.desc": "Disable both the Halloween lobby and Halloween battle map during a Halloween event.", + "lem.advancement.secret.ghost.name": "Ghost Buster", + "lem.advancement.secret.mean.desc": "Disable both the Festive lobby and Festive battle map during a Festive event.", + "lem.advancement.secret.mean.name": "You're a mean one...", + "lem.battle.advancement.root.name": "Battle", "lem.battle.advancement.cupid.desc": "Kill 2 players in a round of a battle mini game using a bow and arrow.", "lem.battle.advancement.cupid.name": "Cupid", "lem.battle.advancement.hunger.desc": "Kill a player while you are starving in a Battle mini game.", @@ -31,6 +37,8 @@ "lem.battle.advancement.scratch.name": "'Tis but a scratch", "lem.battle.advancement.student.desc": "Win a battle mini game.", "lem.battle.advancement.student.name": "The student...", + "lem.tumble.advancement.root.name": "Tumble", + "lem.glide.advancement.root.name": "Glide", "lem.battle.config.armorbar.disable": "§cDisabled Armor Bar!", "lem.battle.config.armorbar.enable": "§aEnabled Armor Bar!", "lem.config.custompack.disable": "§cCustom Pack disabled!", @@ -135,6 +143,19 @@ "lem.mapdecider.menu.hosts": "Hosts Only", "lem.mapdecider.menu.gameoptions": "Game Options", "lem.mapdecider.menu.transferhost": "Transfer Host", + "lem.mapdecider.menu.missing": "404\nPage not found", + "lem.mapdecider.menu.voting.typelist": "Available types: %s", + "lem.mapdecider.menu.voting.pack": "Texture pack: %s", + "lem.mapdecider.menu.mapsettings" : "Map Settings", + "lem.mapdecider.menu.requiredpacks" : "Required Packs", + "lem.mapdecider.menu.optionalpacks" : "Optional Packs", + "lem.mapdecider.menu.optionalpacks.overwriteglobal" : "Overwrite Global: %s", + "lem.mapdecider.menu.optionalpacks.enableoverwrite" : "Enable overwrite to modify", + "lem.mapdecider.menu.packpolicy.global" : "Global Pack Policy", + "lem.mapdecider.menu.packpolicy.promptpolicy" : "Prompt Policy", + "lem.mapdecider.menu.packpolicy.optionalpacks" : "Optional Packs: %s", + "lem.mapdecider.menu.packpolicy.reset" : "Reset All Packs", + "lem.mapdecider.menu.clicktoggle" : "Click to toggle", "lem.battle.mapdecider.menu.voting.mappack0": "Map Pack 0", "lem.battle.mapdecider.menu.voting.mappack1": "Map Pack 1", "lem.battle.mapdecider.menu.voting.mappack2": "Map Pack 2", @@ -189,6 +210,10 @@ "lem.menu.host.start": "You have not started your game for 2 minutes! It will now automatically start to prevent abuse.", "lem.menu.host.config.cantchangemaps": "You cannot change enabled maps when the game is already started!", "lem.menu.host.config.maps.enabled.header": "Enabled maps", + "lem.menu.host.config.maps.enabled.tooltip": "Select the maps that you want to play with", + "lem.menu.host.config.maps.enabled.toggle": "Click to enable/disable", + "lem.battle.menu.host.config.maps.option.selectedsize" : "Selected Map Size:", + "lem.battle.menu.host.config.maps.option.selectedsize.tooltip" : "Choose between Small and Large maps or let the system decide automatically.\n\nLarge+ maps are like Large maps but come with an extra helping of chests!\n\nNote: Playing on a Small or Large map with more than 8 players will automatically disable the Central Spawn option!", "lem.battle.menu.host.config.maps.option.auto": "Auto", "lem.battle.menu.host.config.maps.option.small": "Small", "lem.battle.menu.host.config.maps.option.large": "Large", @@ -221,11 +246,16 @@ "lem.menu.host.config.update.lives": "Lives", "lem.menu.host.config.update.lives.infinite": "Infinite", "lem.menu.host.config.update.lobby": "the Lobby", - "lem.menu.host.config.update.lobby.old": "Old", - "lem.menu.host.config.update.lobby.new": "New", - "lem.menu.host.config.update.lobby.anniversary": "Anniversary", - "lem.menu.host.config.update.lobby.halloween": "Halloween", - "lem.menu.host.config.update.lobby.festive": "Festive", + "lem.menu.host.config.update.lobby.lobby_old": "Old", + "lem.menu.host.config.update.lobby.lobby_new": "New", + "lem.menu.host.config.update.lobby.lobby_anniversary": "Anniversary", + "lem.menu.host.config.update.lobby.lobby_halloween": "Halloween", + "lem.menu.host.config.update.lobby.lobby_festive": "Festive", + "lem.menu.host.config.update.lobby.desc.lobby_old": "The classic lobby from 2016", + "lem.menu.host.config.update.lobby.desc.lobby_new": "The updated 2017 lobby with music discs", + "lem.menu.host.config.update.lobby.desc.lobby_anniversary": "Fanmade lobby to celebrate Xbox 360 Edition's 10th anniversary.\n\nThis lobby was created by Ethelous!", + "lem.menu.host.config.update.lobby.desc.lobby_halloween": "Fanmade lobby for the Halloween event.\n\nThis lobby was created by pastelbranches & Min3Mast3r!", + "lem.menu.host.config.update.lobby.desc.lobby_festive": "Fanmade lobby for Festive.\n\nThis lobby was created by S_N00B!", "lem.battle.menu.host.config.update.map": "Map Type", "lem.battle.menu.host.config.update.regen": "Natural Regeneration", "lem.menu.host.config.update.bug": "Bug Fix: %s", @@ -306,9 +336,22 @@ "lem.relog.join.discord.hover": "Click to open", "lem.relog.join.patreon": "Please consider supporting the server on %s", "lem.relog.join.forge": "You have logged on using Forge, due to issues with forge that are outside of our control, some features may not be available. Hover above this message to see missing features", + "lem.resource.vanilla.name" : "Vanilla", + "lem.resource.plastic.name" : "Plastic", + "lem.resource.fantasy.name" : "Fantasy", + "lem.resource.city.name" : "City", + "lem.resource.greek.name" : "Greek Mythology", + "lem.resource.steampunk.name" : "Steampunk", + "lem.resource.chinese.name" : "Chinese Mythology", + "lem.resource.halloween.name" : "Halloween", + "lem.resource.festive.name" : "Festive", + "lem.resource.fallout.name" : "Fallout", + "lem.resource.natural.name" : "Natural", + "lem.resource.cartoon.name" : "Cartoon", "lem.generic.join": "%s joined the game", "lem.generic.join.alive": "%s joined the game as an alive player", "lem.generic.join.spectator": "%s is now spetating", + "lem.generic.more": "More", "lem.generic.goback": "Go Back", "lem.generic.options": "Options", "lem.generic.warning": "Warning",