mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-18 19:29:31 +00:00
Merge pull request #2997 from Hubry/bruh
Set up advancement locking, mildly rearrange advancements
This commit is contained in:
242 files changed
+318
-203
No files matched your search
@@ -14,14 +14,18 @@ import com.google.common.base.CaseFormat;
|
||||
import com.google.common.collect.ImmutableMap;
|
||||
import com.google.gson.Gson;
|
||||
import com.google.gson.GsonBuilder;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.crafting.IRecipe;
|
||||
import net.minecraft.item.crafting.Ingredient;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraft.util.text.TextFormatting;
|
||||
import net.minecraftforge.api.distmarker.Dist;
|
||||
import net.minecraftforge.api.distmarker.OnlyIn;
|
||||
import vazkii.botania.api.BotaniaAPI;
|
||||
import vazkii.botania.api.recipe.IModRecipe;
|
||||
import vazkii.botania.api.recipe.RecipeManaInfusion;
|
||||
import vazkii.botania.common.item.ModItems;
|
||||
import vazkii.botania.common.lexicon.AlfheimLexiconEntry;
|
||||
import vazkii.botania.common.lexicon.CompatLexiconEntry;
|
||||
import vazkii.botania.common.lexicon.RelicLexiconEntry;
|
||||
@@ -38,6 +42,7 @@ import vazkii.botania.common.lexicon.page.PagePetalRecipe;
|
||||
import vazkii.botania.common.lexicon.page.PageTerrasteel;
|
||||
import vazkii.botania.common.lexicon.page.PageText;
|
||||
import vazkii.botania.common.lib.LibLexicon;
|
||||
import vazkii.botania.common.lib.ModTags;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
import java.io.BufferedOutputStream;
|
||||
@@ -53,7 +58,11 @@ import java.util.LinkedHashMap;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
import java.util.Map;
|
||||
import java.util.function.Predicate;
|
||||
import java.util.stream.Collectors;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
import static vazkii.botania.common.lib.ResourceLocationHelper.prefix;
|
||||
|
||||
public class LexiconEntry implements Comparable<LexiconEntry> {
|
||||
|
||||
@@ -124,14 +133,37 @@ public class LexiconEntry implements Comparable<LexiconEntry> {
|
||||
public boolean isVisible() {
|
||||
return true;
|
||||
}
|
||||
|
||||
private static Map<String, String> multiblocks = ImmutableMap.<String, String>builder()
|
||||
.put("botania.page.terrasteel4", "botania:terra_plate")
|
||||
.put("botania.page.manaEnchanting2", "botania:enchanter")
|
||||
.put("botania.page.aIntro4", "botania:alfheim_portal")
|
||||
.put("botania.page.gaiaRitual2", "botania:gaia_ritual").build();
|
||||
|
||||
// Basic mapping of input -> advancement, requires manually checking first
|
||||
private static Map<Predicate<Item>, ResourceLocation> inputsToAdvancements = ImmutableMap.<Predicate<Item>, ResourceLocation>builder()
|
||||
.put(or(ModTags.Items.INGOTS_TERRASTEEL::contains, ModTags.Items.NUGGETS_TERRASTEEL::contains),
|
||||
prefix("main/terrasteel_pickup"))
|
||||
.put(ModTags.Items.RUNES::contains, prefix("main/runic_altar_pickup"))
|
||||
.put(oneOf(ModItems.manaDiamond, ModItems.manaPearl, ModItems.manaSteel, ModItems.manaPowder, ModItems.manaString),
|
||||
prefix("main/mana_pool_pickup"))
|
||||
.put(or(ModTags.Items.LIVINGWOOD::contains, ModTags.Items.LIVINGWOOD::contains), prefix("main/pure_daisy_pickup"))
|
||||
.put(ModTags.Items.PETALS::contains, prefix("main/flower_pickup"))
|
||||
.build();
|
||||
|
||||
private static <T> Predicate<T> or(Predicate<T> first, Predicate<T> second) {
|
||||
return first.or(second);
|
||||
}
|
||||
|
||||
private static Predicate<Item> oneOf(Item... items) {
|
||||
return item -> {
|
||||
for(Item i : items)
|
||||
if(i == item) return true;
|
||||
return false;
|
||||
};
|
||||
}
|
||||
|
||||
public void dump() {
|
||||
Map<String, String> multiblocks = ImmutableMap.<String, String>builder()
|
||||
.put("botania.page.terrasteel4", "botania:terra_plate")
|
||||
.put("botania.page.manaEnchanting2", "botania:enchanter")
|
||||
.put("botania.page.aIntro4", "botania:alfheim_portal")
|
||||
.put("botania.page.gaiaRitual2", "botania:gaia_ritual").build();
|
||||
|
||||
File dir = Paths.get(".", "entries", fixCamelCase(category.getUnlocalizedName().substring(LibLexicon.CATEGORY_PREFIX.length()))).toFile();
|
||||
if(!dir.exists())
|
||||
dir.mkdirs();
|
||||
@@ -150,9 +182,6 @@ public class LexiconEntry implements Comparable<LexiconEntry> {
|
||||
}
|
||||
if (isPriority()) {
|
||||
entry.put("priority", true);
|
||||
} else if (!(this instanceof RelicLexiconEntry || this.getUnlocalizedName().contains("terrasteel")
|
||||
|| this.getUnlocalizedName().contains("relics") || this.getUnlocalizedName().contains("gaia_ritual"))) {
|
||||
entry.put("read_by_default", true);
|
||||
}
|
||||
if (this instanceof WelcomeLexiconEntry)
|
||||
entry.put("sortnum", -10);
|
||||
@@ -165,6 +194,15 @@ public class LexiconEntry implements Comparable<LexiconEntry> {
|
||||
} else if(this instanceof CompatLexiconEntry) {
|
||||
entry.put("flag", "|debug,mod:" + ((CompatLexiconEntry) this).mod.toLowerCase(Locale.ROOT));
|
||||
}
|
||||
|
||||
if(!entry.containsKey("advancement")) {
|
||||
for(Map.Entry<Predicate<Item>, ResourceLocation> thing : inputsToAdvancements.entrySet()) {
|
||||
if(pages.stream().flatMap(this::getRecipeInputs).map(ItemStack::getItem).anyMatch(thing.getKey())) {
|
||||
entry.put("advancement", thing.getValue().toString());
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
List<Object> pages = new ArrayList<>();
|
||||
for (int i = 0; i < this.pages.size(); i++) {
|
||||
@@ -237,6 +275,24 @@ public class LexiconEntry implements Comparable<LexiconEntry> {
|
||||
}
|
||||
}
|
||||
|
||||
public Stream<ItemStack> getRecipeInputs(LexiconPage page) {
|
||||
Stream<Ingredient> stream;
|
||||
if(page instanceof PageModRecipe) {
|
||||
stream = ((PageModRecipe<? extends IModRecipe>) page).getRecipes().stream().flatMap(o -> o.getInputs().stream());
|
||||
} else if(page instanceof PageCraftingRecipe) {
|
||||
stream = ((PageCraftingRecipe) page).getRecipes().stream().flatMap(o -> o.getIngredients().stream());
|
||||
} else if(page instanceof PageManaInfusionRecipe) {
|
||||
stream = ((PageManaInfusionRecipe) page).getRecipes().stream().map(RecipeManaInfusion::getInput);
|
||||
} else if(page instanceof PageElvenRecipe) {
|
||||
stream = ((PageElvenRecipe) page).getRecipes().stream().flatMap(o -> o.getInputs().stream());
|
||||
} else if(page instanceof PageBrew) {
|
||||
stream = ((PageBrew) page).recipe.getInputs().stream();
|
||||
} else {
|
||||
stream = Stream.empty();
|
||||
}
|
||||
return stream.flatMap(ingr -> Stream.of(ingr.getMatchingStacks()));
|
||||
}
|
||||
|
||||
private static String fixCamelCase(String s) {
|
||||
if(LibLexicon.CATEGORY_FUNCTIONAL_FLOWERS.equals(s)) {
|
||||
return "functional_flowers";
|
||||
|
||||
@@ -546,6 +546,8 @@
|
||||
"advancement.botania:pinkinator": "Decorator",
|
||||
"advancement.botania:pinkinator.desc": "Put to use The Pinkinator",
|
||||
|
||||
"advancement.botania:gaiaGuardianHardmode": "At the Mercy of a Dream",
|
||||
"advancement.botania:gaiaGuardianHardmode.desc": "Summon and slay an empowered Gaia Guardian in a Ritual of Gaia II",
|
||||
"advancement.botania:infiniteFruit": "Innocentia",
|
||||
"advancement.botania:infiniteFruit.desc": "Be rewarded The Fruit of Grisaia for a heroic feat",
|
||||
"advancement.botania:kingKey": "A Fake, Fake Psychotropic",
|
||||
@@ -596,11 +598,11 @@
|
||||
"botania.challenge.orechid.desc": "Create a system that allows for the Orechid flower to be fully automated. Bonus points if the output is smelted and sorted.",
|
||||
|
||||
"botania.challenge.mobTower": "Spawning Tower",
|
||||
"botania.challenge.mobTower.desc": "Create a tower style mob farm. Mobs must be sorted and put into specific chambers at the end. Spawners can be used. Bonus points if the farm functions at 100% efficiency without a player's interaction.",
|
||||
"botania.challenge.mobTower.desc": "Create a tower style mob farm. Mobs must be sorted and put into specific chambers at the end. Spawners can be used. Bonus points if the farm functions at 100%% efficiency without a player's interaction.",
|
||||
"botania.challenge.entropinnyumSetup": "Entropinnyum Setup",
|
||||
"botania.challenge.entropinnyumSetup.desc": "Create a system that automatically crafts TNT and safely feeds it to an Entropinnyum flower, creating mana. Bonus points if the sand and gunpowder required for the TNT don't need to be put in manually.",
|
||||
"botania.challenge.spectrolusSetup": "Spectrolus Setup",
|
||||
"botania.challenge.spectrolusSetup.desc": "Create a system that feeds a Spectrolus, generating mana. Aside from raw mana, no items may be input from outside the system. Bonus points if it operates at 100% efficiency, never wasting any wool.",
|
||||
"botania.challenge.spectrolusSetup.desc": "Create a system that feeds a Spectrolus, generating mana. Aside from raw mana, no items may be input from outside the system. Bonus points if it operates at 100%% efficiency, never wasting any wool.",
|
||||
"botania.challenge.shulkMeNotSetup": "Shulk Me Not Setup",
|
||||
"botania.challenge.shulkMeNotSetup.desc": "Create a system that allows for a Shulk Me Not to produce mana automatically, without any mana, items or entities coming from outside the system. Bonus points if no unnecessary mob infighting happens.",
|
||||
"botania.challenge.potionBrewer": "Automated Brewing",
|
||||
@@ -1193,7 +1195,7 @@
|
||||
"item.botania.lime_petal": "Mystical Lime Petal",
|
||||
"item.botania.pink_petal": "Mystical Pink Petal",
|
||||
"item.botania.gray_petal": "Mystical Gray Petal",
|
||||
"item.botania.silver_petal": "Mystical Light Gray Petal",
|
||||
"item.botania.light_gray_petal": "Mystical Light Gray Petal",
|
||||
"item.botania.cyan_petal": "Mystical Cyan Petal",
|
||||
"item.botania.purple_petal": "Mystical Purple Petal",
|
||||
"item.botania.blue_petal": "Mystical Blue Petal",
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
},
|
||||
"frame": "challenge"
|
||||
},
|
||||
"parent": "botania:challenge/root",
|
||||
"parent": "botania:challenge/gaia_guardian_hardmode",
|
||||
"criteria": {
|
||||
"eye": {
|
||||
"trigger": "botania:relic_bind",
|
||||
|
||||
@@ -0,0 +1,25 @@
|
||||
{
|
||||
"display": {
|
||||
"icon": {
|
||||
"item": "botania:life_essence"
|
||||
},
|
||||
"title": {
|
||||
"translate": "advancement.botania:gaiaGuardianHardmode"
|
||||
},
|
||||
"description": {
|
||||
"translate": "advancement.botania:gaiaGuardianHardmode.desc"
|
||||
},
|
||||
"frame": "challenge"
|
||||
},
|
||||
"parent": "botania:challenge/root",
|
||||
"criteria": {
|
||||
"dice": {
|
||||
"trigger": "botania:relic_bind",
|
||||
"conditions": {
|
||||
"relic": {
|
||||
"item": "botania:dice"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -11,7 +11,7 @@
|
||||
},
|
||||
"frame": "challenge"
|
||||
},
|
||||
"parent": "botania:challenge/root",
|
||||
"parent": "botania:challenge/gaia_guardian_hardmode",
|
||||
"criteria": {
|
||||
"fruit": {
|
||||
"trigger": "botania:relic_bind",
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
},
|
||||
"frame": "challenge"
|
||||
},
|
||||
"parent": "botania:challenge/root",
|
||||
"parent": "botania:challenge/gaia_guardian_hardmode",
|
||||
"criteria": {
|
||||
"key": {
|
||||
"trigger": "botania:relic_bind",
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
},
|
||||
"frame": "challenge"
|
||||
},
|
||||
"parent": "botania:challenge/root",
|
||||
"parent": "botania:challenge/gaia_guardian_hardmode",
|
||||
"criteria": {
|
||||
"ring": {
|
||||
"trigger": "botania:relic_bind",
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
},
|
||||
"frame": "challenge"
|
||||
},
|
||||
"parent": "botania:challenge/root",
|
||||
"parent": "botania:challenge/gaia_guardian_hardmode",
|
||||
"criteria": {
|
||||
"ring": {
|
||||
"trigger": "botania:relic_bind",
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
},
|
||||
"frame": "challenge"
|
||||
},
|
||||
"parent": "botania:challenge/root",
|
||||
"parent": "botania:challenge/gaia_guardian_hardmode",
|
||||
"criteria": {
|
||||
"use_pinkinator": {
|
||||
"trigger": "botania:use_item_success",
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
},
|
||||
"frame": "challenge"
|
||||
},
|
||||
"parent": "botania:challenge/root",
|
||||
"parent": "botania:challenge/gaia_guardian_hardmode",
|
||||
"criteria": {
|
||||
"ring": {
|
||||
"trigger": "botania:relic_bind",
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
{
|
||||
"parent": "botania:main/flower_pickup",
|
||||
"criteria": {
|
||||
"lexicon": {
|
||||
"trigger": "minecraft:inventory_changed",
|
||||
"conditions": {
|
||||
"items": [
|
||||
{
|
||||
"item": "botania:apothecary_default"
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -10,7 +10,7 @@
|
||||
"translate": "advancement.botania:generatingFlower.desc"
|
||||
}
|
||||
},
|
||||
"parent": "botania:main/lexicon_use",
|
||||
"parent": "botania:main/flower_pickup",
|
||||
"criteria": {
|
||||
"flower": {
|
||||
"trigger": "minecraft:inventory_changed",
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
"translate": "advancement.botania:manaPoolPickup.desc"
|
||||
}
|
||||
},
|
||||
"parent": "botania:main/generating_flower",
|
||||
"parent": "botania:main/flower_pickup",
|
||||
"criteria": {
|
||||
"default": {
|
||||
"trigger": "minecraft:inventory_changed",
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
{
|
||||
"parent": "botania:main/flower_pickup",
|
||||
"criteria": {
|
||||
"lexicon": {
|
||||
"trigger": "minecraft:inventory_changed",
|
||||
"conditions": {
|
||||
"items": [
|
||||
{
|
||||
"item": "botania:pure_daisy"
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
{
|
||||
"parent": "botania:main/flower_pickup",
|
||||
"criteria": {
|
||||
"lexicon": {
|
||||
"trigger": "minecraft:inventory_changed",
|
||||
"conditions": {
|
||||
"items": [
|
||||
{
|
||||
"item": "botania:runic_altar"
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
-1
@@ -3,7 +3,6 @@
|
||||
"category": "alfhomancy",
|
||||
"icon": "minecraft:writable_book",
|
||||
"entry_color": "aa00",
|
||||
"read_by_default": true,
|
||||
"advancement": "botania:main/elf_lexicon_pickup",
|
||||
"pages": [
|
||||
{
|
||||
|
||||
+1
@@ -4,6 +4,7 @@
|
||||
"icon": "botania:life_essence",
|
||||
"entry_color": "aa00",
|
||||
"advancement": "botania:main/elf_lexicon_pickup",
|
||||
"turnin": "botania:main/gaia_guardian_kill",
|
||||
"pages": [
|
||||
{
|
||||
"type": "text",
|
||||
|
||||
+2
-1
@@ -3,7 +3,8 @@
|
||||
"category": "alfhomancy",
|
||||
"icon": "botania:gaia_ingot",
|
||||
"entry_color": "aa00",
|
||||
"advancement": "botania:main/elf_lexicon_pickup",
|
||||
"advancement": "botania:main/gaia_guardian_kill",
|
||||
"turnin": "botania:challenge/gaia_guardian_hardmode",
|
||||
"pages": [
|
||||
{
|
||||
"type": "text",
|
||||
|
||||
+2
@@ -3,6 +3,8 @@
|
||||
"category": "alfhomancy",
|
||||
"icon": "botania:lexicon",
|
||||
"priority": true,
|
||||
"advancement": "botania:main/terrasteel_pickup",
|
||||
"turnin": "botania:main/elf_lexicon_pickup",
|
||||
"pages": [
|
||||
{
|
||||
"type": "text",
|
||||
|
||||
+1
@@ -3,6 +3,7 @@
|
||||
"category": "alfhomancy",
|
||||
"icon": "botania:dice",
|
||||
"entry_color": "aa00aa",
|
||||
"advancement": "botania:challenge/gaia_guardian_hardmode",
|
||||
"pages": [
|
||||
{
|
||||
"type": "text",
|
||||
|
||||
+2
@@ -3,6 +3,8 @@
|
||||
"category": "basics",
|
||||
"icon": "botania:apothecary_default",
|
||||
"priority": true,
|
||||
"advancement": "botania:main/flower_pickup",
|
||||
"turnin": "botania:main/apothecary_pickup",
|
||||
"pages": [
|
||||
{
|
||||
"type": "text",
|
||||
|
||||
-1
@@ -2,7 +2,6 @@
|
||||
"name": "botania.entry.blackLotus",
|
||||
"category": "basics",
|
||||
"icon": "botania:black_lotus",
|
||||
"read_by_default": true,
|
||||
"pages": [
|
||||
{
|
||||
"type": "text",
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
"name": "botania.entry.flowerBag",
|
||||
"category": "basics",
|
||||
"icon": "botania:flower_bag",
|
||||
"read_by_default": true,
|
||||
"advancement": "botania:main/flower_pickup",
|
||||
"pages": [
|
||||
{
|
||||
"type": "text",
|
||||
|
||||
+1
@@ -3,6 +3,7 @@
|
||||
"category": "basics",
|
||||
"icon": "botania:pink_mystical_flower",
|
||||
"priority": true,
|
||||
"turnin": "botania:main/flower_pickup",
|
||||
"pages": [
|
||||
{
|
||||
"type": "text",
|
||||
|
||||
+2
@@ -3,6 +3,8 @@
|
||||
"category": "basics",
|
||||
"icon": "botania:pure_daisy",
|
||||
"priority": true,
|
||||
"advancement": "botania:main/flower_pickup",
|
||||
"turnin": "botania:main/pure_daisy_pickup",
|
||||
"pages": [
|
||||
{
|
||||
"type": "text",
|
||||
|
||||
+2
@@ -3,6 +3,8 @@
|
||||
"category": "basics",
|
||||
"icon": "botania:runic_altar",
|
||||
"priority": true,
|
||||
"advancement": "botania:main/mana_pool_pickup",
|
||||
"turnin": "botania:main/runic_altar_pickup",
|
||||
"pages": [
|
||||
{
|
||||
"type": "text",
|
||||
|
||||
+2
@@ -3,6 +3,8 @@
|
||||
"category": "basics",
|
||||
"icon": "botania:terrasteel_ingot",
|
||||
"priority": true,
|
||||
"advancement": "botania:main/runic_altar_pickup",
|
||||
"turnin": "botania:main/terrasteel_pickup",
|
||||
"pages": [
|
||||
{
|
||||
"type": "text",
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
"category": "basics",
|
||||
"icon": "botania:twig_wand",
|
||||
"priority": true,
|
||||
"advancement": "botania:main/pure_daisy_pickup",
|
||||
"pages": [
|
||||
{
|
||||
"type": "text",
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
"name": "botania.entry.wrap",
|
||||
"category": "basics",
|
||||
"icon": "minecraft:air",
|
||||
"read_by_default": true,
|
||||
"flag": "|debug,mod:thaumcraft",
|
||||
"pages": [
|
||||
{
|
||||
|
||||
+3
-2
@@ -2,7 +2,7 @@
|
||||
"name": "botania.entry.auraRing",
|
||||
"category": "baubles",
|
||||
"icon": "botania:aura_ring",
|
||||
"read_by_default": true,
|
||||
"advancement": "botania:main/runic_altar_pickup",
|
||||
"pages": [
|
||||
{
|
||||
"type": "text",
|
||||
@@ -16,7 +16,8 @@
|
||||
{
|
||||
"type": "crafting",
|
||||
"text": "botania.page.auraRing2",
|
||||
"recipe": "botania:aura_ring_greater"
|
||||
"recipe": "botania:aura_ring_greater",
|
||||
"advancement": "botania:main/terrasteel_pickup"
|
||||
}
|
||||
]
|
||||
}
|
||||
+1
@@ -3,6 +3,7 @@
|
||||
"category": "baubles",
|
||||
"icon": "botania:bauble_box",
|
||||
"priority": true,
|
||||
"advancement": "botania:main/mana_pool_pickup",
|
||||
"pages": [
|
||||
{
|
||||
"type": "text",
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
"name": "botania.entry.bloodPendant",
|
||||
"category": "baubles",
|
||||
"icon": "botania:blood_pendant",
|
||||
"read_by_default": true,
|
||||
"advancement": "botania:main/mana_pool_pickup",
|
||||
"pages": [
|
||||
{
|
||||
"type": "text",
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
"name": "botania.entry.cloudPendant",
|
||||
"category": "baubles",
|
||||
"icon": "botania:cloud_pendant",
|
||||
"read_by_default": true,
|
||||
"advancement": "botania:main/mana_pool_pickup",
|
||||
"pages": [
|
||||
{
|
||||
"type": "text",
|
||||
|
||||
+1
@@ -3,6 +3,7 @@
|
||||
"category": "baubles",
|
||||
"icon": "botania:cosmetic_black_bowtie",
|
||||
"priority": true,
|
||||
"advancement": "botania:main/flower_pickup",
|
||||
"pages": [
|
||||
{
|
||||
"type": "text",
|
||||
|
||||
-1
@@ -3,7 +3,6 @@
|
||||
"category": "baubles",
|
||||
"icon": "botania:diva_charm",
|
||||
"entry_color": "aa00",
|
||||
"read_by_default": true,
|
||||
"advancement": "botania:main/elf_lexicon_pickup",
|
||||
"pages": [
|
||||
{
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
"name": "botania.entry.dodgeRing",
|
||||
"category": "baubles",
|
||||
"icon": "botania:dodge_ring",
|
||||
"read_by_default": true,
|
||||
"advancement": "botania:main/mana_pool_pickup",
|
||||
"pages": [
|
||||
{
|
||||
"type": "text",
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
"name": "botania.entry.goddessCharm",
|
||||
"category": "baubles",
|
||||
"icon": "botania:goddess_charm",
|
||||
"read_by_default": true,
|
||||
"advancement": "botania:main/runic_altar_pickup",
|
||||
"pages": [
|
||||
{
|
||||
"type": "text",
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
"name": "botania.entry.icePendant",
|
||||
"category": "baubles",
|
||||
"icon": "botania:ice_pendant",
|
||||
"read_by_default": true,
|
||||
"advancement": "botania:main/mana_pool_pickup",
|
||||
"pages": [
|
||||
{
|
||||
"type": "text",
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
"name": "botania.entry.invisibilityCloak",
|
||||
"category": "baubles",
|
||||
"icon": "botania:invisibility_cloak",
|
||||
"read_by_default": true,
|
||||
"advancement": "botania:main/mana_pool_pickup",
|
||||
"pages": [
|
||||
{
|
||||
"type": "text",
|
||||
|
||||
-1
@@ -2,7 +2,6 @@
|
||||
"name": "botania.entry.itemFinder",
|
||||
"category": "baubles",
|
||||
"icon": "botania:itemfinder",
|
||||
"read_by_default": true,
|
||||
"pages": [
|
||||
{
|
||||
"type": "text",
|
||||
|
||||
-1
@@ -3,7 +3,6 @@
|
||||
"category": "baubles",
|
||||
"icon": "botania:holy_cloak",
|
||||
"entry_color": "aa00",
|
||||
"read_by_default": true,
|
||||
"advancement": "botania:main/elf_lexicon_pickup",
|
||||
"pages": [
|
||||
{
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
"name": "botania.entry.knockbackBelt",
|
||||
"category": "baubles",
|
||||
"icon": "botania:knockback_belt",
|
||||
"read_by_default": true,
|
||||
"advancement": "botania:main/mana_pool_pickup",
|
||||
"pages": [
|
||||
{
|
||||
"type": "text",
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
"name": "botania.entry.lavaPendant",
|
||||
"category": "baubles",
|
||||
"icon": "botania:lava_pendant",
|
||||
"read_by_default": true,
|
||||
"advancement": "botania:main/mana_pool_pickup",
|
||||
"pages": [
|
||||
{
|
||||
"type": "text",
|
||||
|
||||
+3
-2
@@ -2,7 +2,7 @@
|
||||
"name": "botania.entry.magnetRing",
|
||||
"category": "baubles",
|
||||
"icon": "botania:magnet_ring",
|
||||
"read_by_default": true,
|
||||
"advancement": "botania:main/mana_pool_pickup",
|
||||
"pages": [
|
||||
{
|
||||
"type": "text",
|
||||
@@ -16,7 +16,8 @@
|
||||
{
|
||||
"type": "crafting",
|
||||
"text": "botania.page.magnetRing2",
|
||||
"recipe": "botania:magnet_ring_greater"
|
||||
"recipe": "botania:magnet_ring_greater",
|
||||
"advancement": "botania:main/terrasteel_pickup"
|
||||
}
|
||||
]
|
||||
}
|
||||
+3
-2
@@ -2,7 +2,7 @@
|
||||
"name": "botania.entry.manaRing",
|
||||
"category": "baubles",
|
||||
"icon": "botania:mana_ring",
|
||||
"read_by_default": true,
|
||||
"advancement": "botania:main/mana_pool_pickup",
|
||||
"pages": [
|
||||
{
|
||||
"type": "text",
|
||||
@@ -16,7 +16,8 @@
|
||||
{
|
||||
"type": "crafting",
|
||||
"text": "botania.page.manaRing2",
|
||||
"recipe": "botania:mana_ring_greater"
|
||||
"recipe": "botania:mana_ring_greater",
|
||||
"advancement": "botania:main/terrasteel_pickup"
|
||||
}
|
||||
]
|
||||
}
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
"name": "botania.entry.miningRing",
|
||||
"category": "baubles",
|
||||
"icon": "botania:mining_ring",
|
||||
"read_by_default": true,
|
||||
"advancement": "botania:main/mana_pool_pickup",
|
||||
"pages": [
|
||||
{
|
||||
"type": "text",
|
||||
|
||||
+1
@@ -3,6 +3,7 @@
|
||||
"category": "baubles",
|
||||
"icon": "botania:monocle",
|
||||
"priority": true,
|
||||
"advancement": "botania:main/mana_pool_pickup",
|
||||
"pages": [
|
||||
{
|
||||
"type": "text",
|
||||
|
||||
-1
@@ -3,7 +3,6 @@
|
||||
"category": "baubles",
|
||||
"icon": "botania:pixie_ring",
|
||||
"entry_color": "aa00",
|
||||
"read_by_default": true,
|
||||
"advancement": "botania:main/elf_lexicon_pickup",
|
||||
"pages": [
|
||||
{
|
||||
|
||||
-1
@@ -3,7 +3,6 @@
|
||||
"category": "baubles",
|
||||
"icon": "botania:reach_ring",
|
||||
"entry_color": "aa00",
|
||||
"read_by_default": true,
|
||||
"advancement": "botania:main/elf_lexicon_pickup",
|
||||
"pages": [
|
||||
{
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
"name": "botania.entry.speedUpBelt",
|
||||
"category": "baubles",
|
||||
"icon": "botania:speed_up_belt",
|
||||
"read_by_default": true,
|
||||
"advancement": "botania:main/mana_pool_pickup",
|
||||
"pages": [
|
||||
{
|
||||
"type": "text",
|
||||
|
||||
-1
@@ -3,7 +3,6 @@
|
||||
"category": "baubles",
|
||||
"icon": "botania:super_cloud_pendant",
|
||||
"entry_color": "aa00",
|
||||
"read_by_default": true,
|
||||
"advancement": "botania:main/elf_lexicon_pickup",
|
||||
"pages": [
|
||||
{
|
||||
|
||||
-1
@@ -3,7 +3,6 @@
|
||||
"category": "baubles",
|
||||
"icon": "botania:super_lava_pendant",
|
||||
"entry_color": "aa00",
|
||||
"read_by_default": true,
|
||||
"advancement": "botania:main/elf_lexicon_pickup",
|
||||
"pages": [
|
||||
{
|
||||
|
||||
-1
@@ -3,7 +3,6 @@
|
||||
"category": "baubles",
|
||||
"icon": "botania:super_travel_belt",
|
||||
"entry_color": "aa00",
|
||||
"read_by_default": true,
|
||||
"advancement": "botania:main/elf_lexicon_pickup",
|
||||
"pages": [
|
||||
{
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
"name": "botania.entry.swapRing",
|
||||
"category": "baubles",
|
||||
"icon": "botania:swap_ring",
|
||||
"read_by_default": true,
|
||||
"advancement": "botania:main/mana_pool_pickup",
|
||||
"pages": [
|
||||
{
|
||||
"type": "text",
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
"name": "botania.entry.thirdEye",
|
||||
"category": "baubles",
|
||||
"icon": "botania:third_eye",
|
||||
"read_by_default": true,
|
||||
"advancement": "botania:main/mana_pool_pickup",
|
||||
"pages": [
|
||||
{
|
||||
"type": "text",
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
"name": "botania.entry.tinyPlanet",
|
||||
"category": "baubles",
|
||||
"icon": "botania:tiny_planet",
|
||||
"read_by_default": true,
|
||||
"advancement": "botania:main/mana_pool_pickup",
|
||||
"pages": [
|
||||
{
|
||||
"type": "text",
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
"name": "botania.entry.travelBelt",
|
||||
"category": "baubles",
|
||||
"icon": "botania:travel_belt",
|
||||
"read_by_default": true,
|
||||
"advancement": "botania:main/mana_pool_pickup",
|
||||
"pages": [
|
||||
{
|
||||
"type": "text",
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
"name": "botania.entry.waterRing",
|
||||
"category": "baubles",
|
||||
"icon": "botania:water_ring",
|
||||
"read_by_default": true,
|
||||
"advancement": "botania:main/mana_pool_pickup",
|
||||
"pages": [
|
||||
{
|
||||
"type": "text",
|
||||
|
||||
+1
@@ -3,6 +3,7 @@
|
||||
"category": "challenges",
|
||||
"icon": "minecraft:leather",
|
||||
"read_by_default": true,
|
||||
"advancement": "botania:main/mana_pool_pickup",
|
||||
"entry_color": "ffaa00",
|
||||
"sortnum": 3,
|
||||
"pages": [
|
||||
|
||||
+1
@@ -3,6 +3,7 @@
|
||||
"category": "challenges",
|
||||
"icon": "botania:apothecary_default",
|
||||
"read_by_default": true,
|
||||
"advancement": "botania:main/mana_pool_pickup",
|
||||
"entry_color": "ffaa00",
|
||||
"sortnum": 3,
|
||||
"pages": [
|
||||
|
||||
+1
@@ -3,6 +3,7 @@
|
||||
"category": "challenges",
|
||||
"icon": "minecraft:diamond_pickaxe",
|
||||
"read_by_default": true,
|
||||
"advancement": "botania:main/mana_pool_pickup",
|
||||
"entry_color": "aa00aa",
|
||||
"sortnum": 7,
|
||||
"pages": [
|
||||
|
||||
+1
@@ -3,6 +3,7 @@
|
||||
"category": "challenges",
|
||||
"icon": "botania:mana_pool",
|
||||
"read_by_default": true,
|
||||
"advancement": "botania:main/mana_pool_pickup",
|
||||
"sortnum": 1,
|
||||
"pages": [
|
||||
{
|
||||
|
||||
+1
@@ -3,6 +3,7 @@
|
||||
"category": "challenges",
|
||||
"icon": "minecraft:bone_meal",
|
||||
"read_by_default": true,
|
||||
"advancement": "botania:main/mana_pool_pickup",
|
||||
"entry_color": "ffaa00",
|
||||
"sortnum": 3,
|
||||
"pages": [
|
||||
|
||||
+1
@@ -3,6 +3,7 @@
|
||||
"category": "challenges",
|
||||
"icon": "minecraft:cobblestone",
|
||||
"read_by_default": true,
|
||||
"advancement": "botania:main/mana_pool_pickup",
|
||||
"sortnum": 1,
|
||||
"pages": [
|
||||
{
|
||||
|
||||
+1
@@ -3,6 +3,7 @@
|
||||
"category": "challenges",
|
||||
"icon": "botania:entropinnyum",
|
||||
"read_by_default": true,
|
||||
"advancement": "botania:main/mana_pool_pickup",
|
||||
"entry_color": "aa0000",
|
||||
"sortnum": 5,
|
||||
"pages": [
|
||||
|
||||
+1
@@ -3,6 +3,7 @@
|
||||
"category": "challenges",
|
||||
"icon": "botania:pink_mystical_flower",
|
||||
"read_by_default": true,
|
||||
"advancement": "botania:main/mana_pool_pickup",
|
||||
"sortnum": 1,
|
||||
"pages": [
|
||||
{
|
||||
|
||||
+1
@@ -3,6 +3,7 @@
|
||||
"category": "challenges",
|
||||
"icon": "minecraft:wheat_seeds",
|
||||
"read_by_default": true,
|
||||
"advancement": "botania:main/mana_pool_pickup",
|
||||
"entry_color": "ffaa00",
|
||||
"sortnum": 3,
|
||||
"pages": [
|
||||
|
||||
+1
@@ -3,6 +3,7 @@
|
||||
"category": "challenges",
|
||||
"icon": "botania:kekimurus",
|
||||
"read_by_default": true,
|
||||
"advancement": "botania:main/mana_pool_pickup",
|
||||
"entry_color": "aa00aa",
|
||||
"sortnum": 7,
|
||||
"pages": [
|
||||
|
||||
+1
@@ -3,6 +3,7 @@
|
||||
"category": "challenges",
|
||||
"icon": "minecraft:bone",
|
||||
"read_by_default": true,
|
||||
"advancement": "botania:main/mana_pool_pickup",
|
||||
"entry_color": "aa0000",
|
||||
"sortnum": 5,
|
||||
"pages": [
|
||||
|
||||
+1
@@ -3,6 +3,7 @@
|
||||
"category": "challenges",
|
||||
"icon": "botania:orechid",
|
||||
"read_by_default": true,
|
||||
"advancement": "botania:main/mana_pool_pickup",
|
||||
"entry_color": "ffaa00",
|
||||
"sortnum": 3,
|
||||
"pages": [
|
||||
|
||||
+1
@@ -3,6 +3,7 @@
|
||||
"category": "challenges",
|
||||
"icon": "botania:brewery",
|
||||
"read_by_default": true,
|
||||
"advancement": "botania:main/mana_pool_pickup",
|
||||
"entry_color": "aa0000",
|
||||
"sortnum": 5,
|
||||
"pages": [
|
||||
|
||||
+1
@@ -3,6 +3,7 @@
|
||||
"category": "challenges",
|
||||
"icon": "botania:pure_daisy",
|
||||
"read_by_default": true,
|
||||
"advancement": "botania:main/mana_pool_pickup",
|
||||
"sortnum": 1,
|
||||
"pages": [
|
||||
{
|
||||
|
||||
+1
@@ -3,6 +3,7 @@
|
||||
"category": "challenges",
|
||||
"icon": "minecraft:music_disc_13",
|
||||
"read_by_default": true,
|
||||
"advancement": "botania:main/mana_pool_pickup",
|
||||
"sortnum": 1,
|
||||
"pages": [
|
||||
{
|
||||
|
||||
+1
@@ -3,6 +3,7 @@
|
||||
"category": "challenges",
|
||||
"icon": "minecraft:sugar_cane",
|
||||
"read_by_default": true,
|
||||
"advancement": "botania:main/mana_pool_pickup",
|
||||
"sortnum": 1,
|
||||
"pages": [
|
||||
{
|
||||
|
||||
+1
@@ -3,6 +3,7 @@
|
||||
"category": "challenges",
|
||||
"icon": "botania:rune_water",
|
||||
"read_by_default": true,
|
||||
"advancement": "botania:main/mana_pool_pickup",
|
||||
"entry_color": "aa00aa",
|
||||
"sortnum": 7,
|
||||
"pages": [
|
||||
|
||||
+1
@@ -3,6 +3,7 @@
|
||||
"category": "challenges",
|
||||
"icon": "botania:shulk_me_not",
|
||||
"read_by_default": true,
|
||||
"advancement": "botania:main/mana_pool_pickup",
|
||||
"entry_color": "aa0000",
|
||||
"sortnum": 5,
|
||||
"pages": [
|
||||
|
||||
+1
@@ -3,6 +3,7 @@
|
||||
"category": "challenges",
|
||||
"icon": "botania:spectrolus",
|
||||
"read_by_default": true,
|
||||
"advancement": "botania:main/mana_pool_pickup",
|
||||
"entry_color": "aa0000",
|
||||
"sortnum": 5,
|
||||
"pages": [
|
||||
|
||||
+1
@@ -3,6 +3,7 @@
|
||||
"category": "challenges",
|
||||
"icon": "minecraft:oak_sapling",
|
||||
"read_by_default": true,
|
||||
"advancement": "botania:main/mana_pool_pickup",
|
||||
"entry_color": "ffaa00",
|
||||
"sortnum": 3,
|
||||
"pages": [
|
||||
|
||||
+1
@@ -3,6 +3,7 @@
|
||||
"category": "challenges",
|
||||
"icon": "botania:cosmetic_questgiver_mark",
|
||||
"priority": true,
|
||||
"advancement": "botania:main/mana_pool_pickup",
|
||||
"pages": [
|
||||
{
|
||||
"type": "text",
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
"name": "botania.entry.animatedTorch",
|
||||
"category": "devices",
|
||||
"icon": "botania:animated_torch",
|
||||
"read_by_default": true,
|
||||
"advancement": "botania:main/mana_pool_pickup",
|
||||
"pages": [
|
||||
{
|
||||
"type": "text",
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
"name": "botania.entry.avatar",
|
||||
"category": "devices",
|
||||
"icon": "botania:avatar",
|
||||
"read_by_default": true,
|
||||
"advancement": "botania:main/mana_pool_pickup",
|
||||
"pages": [
|
||||
{
|
||||
"type": "text",
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
"name": "botania.entry.brewery",
|
||||
"category": "devices",
|
||||
"icon": "botania:brewery",
|
||||
"read_by_default": true,
|
||||
"advancement": "botania:main/runic_altar_pickup",
|
||||
"pages": [
|
||||
{
|
||||
"type": "text",
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
"name": "botania.entry.canopyDrum",
|
||||
"category": "devices",
|
||||
"icon": "botania:drum_canopy",
|
||||
"read_by_default": true,
|
||||
"advancement": "botania:main/mana_pool_pickup",
|
||||
"pages": [
|
||||
{
|
||||
"type": "text",
|
||||
|
||||
-1
@@ -3,7 +3,6 @@
|
||||
"category": "devices",
|
||||
"icon": "botania:cocoon",
|
||||
"entry_color": "aa00",
|
||||
"read_by_default": true,
|
||||
"advancement": "botania:main/elf_lexicon_pickup",
|
||||
"pages": [
|
||||
{
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
"name": "botania.entry.complexBrews",
|
||||
"category": "devices",
|
||||
"icon": "botania:brew_vial",
|
||||
"read_by_default": true,
|
||||
"advancement": "botania:main/mana_pool_pickup",
|
||||
"pages": [
|
||||
{
|
||||
"type": "text",
|
||||
|
||||
-1
@@ -3,7 +3,6 @@
|
||||
"category": "devices",
|
||||
"icon": "botania:crafty_crate",
|
||||
"entry_color": "aa00",
|
||||
"read_by_default": true,
|
||||
"advancement": "botania:main/elf_lexicon_pickup",
|
||||
"pages": [
|
||||
{
|
||||
|
||||
-1
@@ -2,7 +2,6 @@
|
||||
"name": "botania.entry.felPumpkin",
|
||||
"category": "devices",
|
||||
"icon": "botania:fel_pumpkin",
|
||||
"read_by_default": true,
|
||||
"pages": [
|
||||
{
|
||||
"type": "text",
|
||||
|
||||
-1
@@ -3,7 +3,6 @@
|
||||
"category": "devices",
|
||||
"icon": "botania:flask",
|
||||
"entry_color": "aa00",
|
||||
"read_by_default": true,
|
||||
"advancement": "botania:main/elf_lexicon_pickup",
|
||||
"pages": [
|
||||
{
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
"name": "botania.entry.forestDrum",
|
||||
"category": "devices",
|
||||
"icon": "botania:drum_wild",
|
||||
"read_by_default": true,
|
||||
"advancement": "botania:main/mana_pool_pickup",
|
||||
"pages": [
|
||||
{
|
||||
"type": "text",
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
"name": "botania.entry.forestEye",
|
||||
"category": "devices",
|
||||
"icon": "botania:forest_eye",
|
||||
"read_by_default": true,
|
||||
"advancement": "botania:main/mana_pool_pickup",
|
||||
"pages": [
|
||||
{
|
||||
"type": "text",
|
||||
|
||||
-1
@@ -3,7 +3,6 @@
|
||||
"category": "devices",
|
||||
"icon": "botania:drum_gathering",
|
||||
"entry_color": "aa00",
|
||||
"read_by_default": true,
|
||||
"advancement": "botania:main/elf_lexicon_pickup",
|
||||
"pages": [
|
||||
{
|
||||
|
||||
-1
@@ -3,7 +3,6 @@
|
||||
"category": "devices",
|
||||
"icon": "botania:ghost_rail",
|
||||
"entry_color": "aa00",
|
||||
"read_by_default": true,
|
||||
"advancement": "botania:main/elf_lexicon_pickup",
|
||||
"pages": [
|
||||
{
|
||||
|
||||
+1
@@ -3,6 +3,7 @@
|
||||
"category": "devices",
|
||||
"icon": "botania:hourglass",
|
||||
"priority": true,
|
||||
"advancement": "botania:main/mana_pool_pickup",
|
||||
"pages": [
|
||||
{
|
||||
"type": "text",
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
"name": "botania.entry.incense",
|
||||
"category": "devices",
|
||||
"icon": "botania:incense_stick",
|
||||
"read_by_default": true,
|
||||
"advancement": "botania:main/mana_pool_pickup",
|
||||
"pages": [
|
||||
{
|
||||
"type": "text",
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
"name": "botania.entry.manaAlchemy",
|
||||
"category": "devices",
|
||||
"icon": "botania:alchemy_catalyst",
|
||||
"read_by_default": true,
|
||||
"advancement": "botania:main/mana_pool_pickup",
|
||||
"pages": [
|
||||
{
|
||||
"type": "text",
|
||||
|
||||
-1
@@ -3,7 +3,6 @@
|
||||
"category": "devices",
|
||||
"icon": "botania:mana_bomb",
|
||||
"entry_color": "aa00",
|
||||
"read_by_default": true,
|
||||
"advancement": "botania:main/elf_lexicon_pickup",
|
||||
"pages": [
|
||||
{
|
||||
|
||||
-1
@@ -3,7 +3,6 @@
|
||||
"category": "devices",
|
||||
"icon": "botania:conjuration_catalyst",
|
||||
"entry_color": "aa00",
|
||||
"read_by_default": true,
|
||||
"advancement": "botania:main/elf_lexicon_pickup",
|
||||
"pages": [
|
||||
{
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
"name": "botania.entry.manaEnchanting",
|
||||
"category": "devices",
|
||||
"icon": "botania:enchanter",
|
||||
"read_by_default": true,
|
||||
"advancement": "botania:main/mana_pool_pickup",
|
||||
"pages": [
|
||||
{
|
||||
"type": "text",
|
||||
|
||||
+1
@@ -2,6 +2,7 @@
|
||||
"name": "botania.entry.openCrate",
|
||||
"category": "devices",
|
||||
"icon": "botania:open_crate",
|
||||
"advancement": "botania:main/pure_daisy_pickup",
|
||||
"priority": true,
|
||||
"pages": [
|
||||
{
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
"name": "botania.entry.platform",
|
||||
"category": "devices",
|
||||
"icon": "botania:abstruse_platform",
|
||||
"read_by_default": true,
|
||||
"advancement": "botania:main/mana_pool_pickup",
|
||||
"pages": [
|
||||
{
|
||||
"type": "text",
|
||||
|
||||
Loaded 100 of 242 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user