diff --git a/config/embeddium++.toml b/config/embeddium++.toml index e10f92917..f44262f05 100644 --- a/config/embeddium++.toml +++ b/config/embeddium++.toml @@ -30,7 +30,7 @@ #Allowed Values: OFF, FAST, FANCY ChunkFadeInQuality = "FANCY" #Allowed Values: WINDOWED, BORDERLESS, FULLSCREEN - BorderlessFullscreen = "FULLSCREEN" + BorderlessFullscreen = "WINDOWED" ExtendedServerViewDistance = true #Configure max Entity distance diff --git a/config/emi.css b/config/emi.css new file mode 100644 index 000000000..b920fe744 --- /dev/null +++ b/config/emi.css @@ -0,0 +1,462 @@ +/** EMI Config */ + +#general { + /** + * Whether EMI is enabled and visible. + */ + enabled: true; + + /** + * Whether cheating in items is enabled. + */ + cheat-mode: true; + + /** + * How much EMI should use tooltips and popups to show controls and information. + */ + help-level: normal; + + /** + * Where EMI should pull stacks from to populate the index. + */ + index-source: creative; + + /** + * Whether normal search queries should include the tooltip. + */ + search-tooltip-by-default: true; + + /** + * Whether normal search queries should include the mod name. + */ + search-mod-name-by-default: false; + + /** + * Whether normal search queries should include the stack's tags. + */ + search-tags-by-default: false; +} + +#ui { + /** + * Which action should be performed when clicking the recipe book. + */ + recipe-book-action: toggle-craftables; + + /** + * Where to display status effects in the inventory. + */ + effect-location: top; + + /** + * Whether to display a gray overlay when hovering over a stack. + */ + show-hover-overlay: true; + + /** + * Whether to add mod name to tooltips + */ + append-mod-id: true; + + /** + * Whether to add mod name to item tooltips, in case another mod provides behavior + */ + append-item-mod-id: true; + + /** + * Prevents recipes being quick crafted from shifting around under the cursor. + */ + miscraft-prevention: true; + + /** + * The unit to display fluids as. + */ + fluid-unit: millibuckets; + + /** + * Whether to use the batched render system. Batching is faster, but may have + * incompatibilities with shaders or other mods. + */ + use-batched-renderer: true; + + /** + * Whether to have the search bar in the center of the screen, instead of to the + * side. + */ + center-search-bar: true; + + /** + * Which sidebar type to switch to when searching. + */ + search-sidebar-focus: index; + + /** + * Which sidebar type to focus when the search is empty. + */ + empty-search-sidebar-focus: none; + + /** + * The amount of vertical margin to give in the recipe screen. + */ + vertical-margin: 20; + + /** + * The minimum width of the recipe screen in pixels. Controls how many tabs there + * can be, and where the page switching buttons go. The default is 176, the width + * of most screens. + */ + minimum-recipe-screen-width: 176; + + /** + * Where to show workstations in the recipe screen + */ + workstation-location: bottom; + + /** + * Display cost per batch when hovering a recipe output + */ + show-cost-per-batch: true; + + /** + * Whether recipes should have a button to set as default. + */ + recipe-default-button: true; + + /** + * Whether recipes should have a button to show the recipe tree. + */ + recipe-tree-button: true; + + /** + * Whether recipes should have a button to fill the ingredients in a handler. + */ + recipe-fill-button: true; + + /** + * Whether recipes should have a button to take a screenshot of the recipe. + */ + recipe-screenshot-button: false; + + /** + * The GUI scale at which recipe screenshots are saved. Use 0 to use the current + * GUI scale. + */ + recipe-screenshot-scale: 0; + + /** + * The pages in the left sidebar + */ + left-sidebar-pages: favorites; + + /** + * The subpanels in the left sidebar + */ + left-sidebar-subpanels: none; + + /** + * How many columns and rows of ingredients to limit the left sidebar to + */ + left-sidebar-size: 12, 100; + + /** + * How much space to maintain between the left sidebar and obstructions, in pixels + */ + left-sidebar-margins: 2, 2, 2, 2; + + /** + * Where to position the left sidebar + */ + left-sidebar-align: left, top; + + /** + * Whether to render the header buttons and page count for the left sidebar + */ + left-sidebar-header: visible; + + /** + * Which theme to use for the left sidebar + */ + left-sidebar-theme: transparent; + + /** + * The pages in the right sidebar + */ + right-sidebar-pages: index, craftables; + + /** + * The subpanels in the right sidebar + */ + right-sidebar-subpanels: none; + + /** + * How many columns and rows of ingredients to limit the right sidebar to + */ + right-sidebar-size: 12, 100; + + /** + * How much space to maintain between the right sidebar and obstructions, in pixels + */ + right-sidebar-margins: 2, 2, 2, 2; + + /** + * Where to position the right sidebar + */ + right-sidebar-align: right, top; + + /** + * Whether to render the header buttons and page count for the right sidebar + */ + right-sidebar-header: visible; + + /** + * Which theme to use for the right sidebar + */ + right-sidebar-theme: transparent; + + /** + * The pages in the top sidebar + */ + top-sidebar-pages: none; + + /** + * The subpanels in the top sidebar + */ + top-sidebar-subpanels: none; + + /** + * How many columns and rows of ingredients to limit the top sidebar to + */ + top-sidebar-size: 9, 9; + + /** + * How much space to maintain between the top sidebar and obstructions, in pixels + */ + top-sidebar-margins: 2, 2, 2, 2; + + /** + * Where to position the top sidebar + */ + top-sidebar-align: center, center; + + /** + * Whether to render the header buttons and page count for the top sidebar + */ + top-sidebar-header: visible; + + /** + * Which theme to use for the top sidebar + */ + top-sidebar-theme: transparent; + + /** + * The pages in the bottom sidebar + */ + bottom-sidebar-pages: none; + + /** + * The subpanels in the bottom sidebar + */ + bottom-sidebar-subpanels: none; + + /** + * How many columns and rows of ingredients to limit the bottom sidebar to + */ + bottom-sidebar-size: 9, 9; + + /** + * How much space to maintain between the bottom sidebar and obstructions, in + * pixels + */ + bottom-sidebar-margins: 2, 2, 2, 2; + + /** + * Where to position the bottom sidebar + */ + bottom-sidebar-align: center, center; + + /** + * Whether to render the header buttons and page count for the bottom sidebar + */ + bottom-sidebar-header: visible; + + /** + * Which theme to use for the bottom sidebar + */ + bottom-sidebar-theme: transparent; +} + +#binds { + /** + * Toggle the visibility of EMI. + */ + toggle-visibility: "ctrl key.keyboard.o"; + + /** + * Focuse the search bar. + */ + focus-search: "ctrl key.keyboard.f"; + + /** + * Clears the search bar. + */ + clear-search: "key.keyboard.unknown"; + + /** + * Display the recipes for creating a stack. + */ + view-recipes: "key.keyboard.r"; + view-recipes: "key.mouse.left"; + + /** + * Display the recipes that can be created using a stack. + */ + view-uses: "key.keyboard.u"; + view-uses: "key.mouse.right"; + + /** + * Favorite the item to display on the side of the screen opposite of recipies for + * quick access. + */ + favorite: "key.keyboard.a"; + + /** + * Set the default recipe for a given stack in the output of a recipe to that + * recipe. + */ + default-stack: "ctrl key.mouse.left"; + + /** + * Display the recipe tree for a given stack. + */ + view-stack-tree: "key.keyboard.unknown"; + + /** + * Display the recipe tree. + */ + view-tree: "key.keyboard.unknown"; + + /** + * Return to the previous page in EMI. + */ + back: "key.keyboard.backspace"; + + /** + * Return to the next page in EMI after going back. + */ + forward: "key.keyboard.unknown"; + + /** + * When on a stack with an associated recipe: + * Move ingredients for a single result. + */ + craft-one: "key.mouse.left"; + + /** + * When on a stack with an associated recipe: + * Move ingredients for as many results as possible. + */ + craft-all: "shift key.mouse.left"; + + /** + * When on a stack with an associated recipe: + * Move ingredients for a single result and put in inventory if possible. + */ + craft-one-to-inventory: "key.keyboard.unknown"; + + /** + * When on a stack with an associated recipe: + * Move ingredients for as many results as possible and put in inventory if + * possible. + */ + craft-all-to-inventory: "key.keyboard.unknown"; + + /** + * When on a stack with an associated recipe: + * Move ingredients for a single result and put in cursor if possible. + */ + craft-one-to-cursor: "ctrl key.mouse.left"; + + /** + * Display the recipe that will be used to craft on a stack with no recipe context. + */ + show-craft: "key.keyboard.left.shift"; + + /** + * Cheat in one of an item into the inventory. + */ + cheat-one-to-inventory: "ctrl key.mouse.right"; + + /** + * Cheat in a stack of an item into the inventory. + */ + cheat-stack-to-inventory: "ctrl key.mouse.left"; + + /** + * Cheat in one of an item into the cursor. + */ + cheat-one-to-cursor: "ctrl key.mouse.middle"; + + /** + * Cheat in a stack of an item into the cursor. + */ + cheat-stack-to-cursor: "key.keyboard.unknown"; + + /** + * Delete the stack in the cursor when hovering the index + */ + delete-cursor-stack: "key.mouse.left"; + + /** + * Copies the hovered recipe's ID to the clipboard + */ + copy-recipe-id: "key.keyboard.unknown"; + + /** + * In edit mode, hide the hovered stack + */ + hide-stack: "ctrl key.mouse.left"; + + /** + * In edit mode, hide stacks with the hovered stack's id + */ + hide-stack-by-id: "ctrl shift key.mouse.left"; +} + +#dev { + /** + * Whether development functions should be enabled. Not recommended for general + * play. + */ + dev-mode: false; + + /** + * Whether editing the index is enabled + */ + edit-mode: false; + + /** + * Whether to log untranslated tags as warnings. + */ + log-untranslated-tags: false; + + /** + * Whether to log ingredients that don't have a representative tag as warnings. + */ + log-non-tag-ingredients: false; + + /** + * Whether hovering the output of a recipe should show the recipe's EMI ID. + */ + show-recipe-ids: true; + + /** + * Whether stacks in the index should display a highlight if they have a recipe + * default. + */ + highlight-defaulted: false; + + /** + * Whether to display exclusion areas + */ + highlight-exclusion-areas: false; +} diff --git a/config/ftbquests/quests/chapters/primitive_age.snbt b/config/ftbquests/quests/chapters/primitive_age.snbt index 5b04ef6c5..97dee2c68 100644 --- a/config/ftbquests/quests/chapters/primitive_age.snbt +++ b/config/ftbquests/quests/chapters/primitive_age.snbt @@ -1059,6 +1059,9 @@ id: "gtceu:stone_axe" tag: { Damage: 0 + GT.Tool: { + Damage: 0 + } } } type: "item" @@ -1078,6 +1081,9 @@ id: "gtceu:stone_hoe" tag: { Damage: 0 + GT.Tool: { + Damage: 0 + } } } type: "item" @@ -1116,6 +1122,9 @@ id: "gtceu:stone_shovel" tag: { Damage: 0 + GT.Tool: { + Damage: 0 + } } } type: "item" @@ -1136,6 +1145,9 @@ id: "gtceu:stone_hammer" tag: { Damage: 0 + GT.Tool: { + Damage: 0 + } } } type: "item" @@ -1246,6 +1258,9 @@ id: "gtceu:stone_knife" tag: { Damage: 0 + GT.Tool: { + Damage: 0 + } } } type: "item" diff --git a/config/gtceu.yaml b/config/gtceu.yaml index f743e30c4..45b1e9beb 100644 --- a/config/gtceu.yaml +++ b/config/gtceu.yaml @@ -138,6 +138,10 @@ machines: # Default: false doTerrainExplosion: true + # Energy use multiplier for electric items. + # Default: 100 + energyUsageMultiplier: 100 + # Whether machines or boilers damage the terrain when they explode. # Note machines and boilers always explode when overloaded with power or met with special conditions, regardless of this config. # Default: true @@ -215,6 +219,14 @@ client: # Default: true machinesEmissiveTextures: true + # Whether or not sounds should be played when using tools outside of crafting. + # Default: true + toolUseSounds: true + + # Whether or not sounds should be played when crafting with tools. + # Default: true + toolCraftingSounds: true + # The default color to overlay onto machines. # #FFFFFF is no coloring (default). # #D2DCFF is the classic blue from GT5. @@ -225,6 +237,12 @@ client: # Default: true useVBO: true +# Config options for Tools and Armor +tools: + # Random chance for electric tools to take actual damage + # Default: 10% + rngDamageElectricTools: 10 + # Config options for Mod Compatibility compat: # Config options regarding GTEU compatibility with other energy systems diff --git a/config/jade/sort-order.json b/config/jade/sort-order.json index e9522eb84..db48d9a24 100644 --- a/config/jade/sort-order.json +++ b/config/jade/sort-order.json @@ -157,6 +157,10 @@ "create:exact_block": null, "create:filter": null, "create:goggles": null, + "gtceu:electric_container_provider": null, + "gtceu:workable_provider": null, + "gtceu:controllable_provider": null, + "gtceu:recipe_logic_provider": null, "tfc:barrel": null, "tfc:bellows": null, "tfc:sapling": null, @@ -206,10 +210,6 @@ "tfc:ocelot": null, "tfc:rabbit": null, "tfc:fishing_hook": null, - "gtceu:electric_container_provider": null, - "gtceu:workable_provider": null, - "gtceu:controllable_provider": null, - "gtceu:recipe_logic_provider": null, "minecraft:brewing_stand": null, "minecraft:beehive": null, "minecraft:command_block": null, diff --git a/config/jei/blacklist.cfg b/config/jei/blacklist.cfg new file mode 100644 index 000000000..e69de29bb diff --git a/config/jei/jei-client.ini b/config/jei/jei-client.ini new file mode 100644 index 000000000..2146509c9 --- /dev/null +++ b/config/jei/jei-client.ini @@ -0,0 +1,141 @@ +[advanced] + # Description: Display search bar in the center + # Valid Values: [true, false] + # Default Value: false + CenterSearch = false + + # Description: Set low-memory mode (makes search very slow, but uses less RAM) + # Valid Values: [true, false] + # Default Value: false + LowMemorySlowSearchEnabled = false + + # Description: Enable cheating items into the hotbar by using the shift+number keys. + # Valid Values: [true, false] + # Default Value: false + CheatToHotbarUsingHotkeysEnabled = false + + # Description: Enable adding new bookmarks to the front of the bookmark list. + # Valid Values: [true, false] + # Default Value: true + AddBookmarksToFrontEnabled = true + + # Description: When looking up recipes with items that contain fluids, also look up recipes for the fluids. + # Valid Values: [true, false] + # Default Value: false + LookupFluidContents = false + + # Description: How items should be handed to you + # Valid Values: [INVENTORY, MOUSE_PICKUP] + # Default Value: MOUSE_PICKUP + GiveMode = MOUSE_PICKUP + + # Description: Max. recipe gui height + # Valid Values: Any integer greater than or equal to 175 + # Default Value: 350 + RecipeGuiHeight = 350 + + +[sorting] + # Description: Sorting order for the ingredient list + # Valid Values: A comma-separated list containing values of: + # [MOD_NAME, INGREDIENT_TYPE, ALPHABETICAL, CREATIVE_MENU, TAG, ARMOR, MAX_DURABILITY] + # Default Value: MOD_NAME, INGREDIENT_TYPE, CREATIVE_MENU + IngredientSortStages = MOD_NAME, INGREDIENT_TYPE, CREATIVE_MENU + + +[search] + # Description: Search mode for Mod Names (prefix: @) + # Valid Values: [ENABLED, REQUIRE_PREFIX, DISABLED] + # Default Value: REQUIRE_PREFIX + ModNameSearchMode = REQUIRE_PREFIX + + # Description: Search mode for Tooltips (prefix: #) + # Valid Values: [ENABLED, REQUIRE_PREFIX, DISABLED] + # Default Value: ENABLED + TooltipSearchMode = ENABLED + + # Description: Search mode for Tag Names (prefix: $) + # Valid Values: [ENABLED, REQUIRE_PREFIX, DISABLED] + # Default Value: REQUIRE_PREFIX + TagSearchMode = REQUIRE_PREFIX + + # Description: Search mode for Colors (prefix: ^) + # Valid Values: [ENABLED, REQUIRE_PREFIX, DISABLED] + # Default Value: DISABLED + ColorSearchMode = DISABLED + + # Description: Search mode for resources locations (prefix: &) + # Valid Values: [ENABLED, REQUIRE_PREFIX, DISABLED] + # Default Value: DISABLED + ResourceLocationSearchMode = DISABLED + + # Description: Search advanced tooltips (visible with F3+H) + # Valid Values: [true, false] + # Default Value: false + SearchAdvancedTooltips = false + + +[IngredientList] + # Description: Max number of rows shown + # Valid Values: An integer in the range [1, 100] (inclusive) + # Default Value: 16 + MaxRows = 16 + + # Description: Max number of columns shown + # Valid Values: An integer in the range [4, 100] (inclusive) + # Default Value: 9 + MaxColumns = 9 + + # Description: Horizontal alignment of the ingredient grid inside the available area + # Valid Values: [LEFT, CENTER, RIGHT] + # Default Value: RIGHT + HorizontalAlignment = RIGHT + + # Description: Vertical alignment of the ingredient grid inside the available area + # Valid Values: [TOP, CENTER, BOTTOM] + # Default Value: TOP + VerticalAlignment = TOP + + # Description: Visibility of the top page buttons. Use AUTO_HIDE to only show it when there are multiple pages. + # Valid Values: [ENABLED, AUTO_HIDE, DISABLED] + # Default Value: ENABLED + ButtonNavigationVisibility = ENABLED + + # Description: Set to true to draw a background texture behind the gui. + # Valid Values: [true, false] + # Default Value: false + DrawBackground = false + + +[BookmarkList] + # Description: Max number of rows shown + # Valid Values: An integer in the range [1, 100] (inclusive) + # Default Value: 16 + MaxRows = 16 + + # Description: Max number of columns shown + # Valid Values: An integer in the range [4, 100] (inclusive) + # Default Value: 9 + MaxColumns = 9 + + # Description: Horizontal alignment of the ingredient grid inside the available area + # Valid Values: [LEFT, CENTER, RIGHT] + # Default Value: LEFT + HorizontalAlignment = LEFT + + # Description: Vertical alignment of the ingredient grid inside the available area + # Valid Values: [TOP, CENTER, BOTTOM] + # Default Value: TOP + VerticalAlignment = TOP + + # Description: Visibility of the top page buttons. Use AUTO_HIDE to only show it when there are multiple pages. + # Valid Values: [ENABLED, AUTO_HIDE, DISABLED] + # Default Value: ENABLED + ButtonNavigationVisibility = ENABLED + + # Description: Set to true to draw a background texture behind the gui. + # Valid Values: [true, false] + # Default Value: false + DrawBackground = false + + diff --git a/config/jei/jei-colors.ini b/config/jei/jei-colors.ini new file mode 100644 index 000000000..1fc7da4ea --- /dev/null +++ b/config/jei/jei-colors.ini @@ -0,0 +1,8 @@ +[colors] + # Description: Color values to search for + # Valid Values: A comma-separated list containing values of: + # Any color name and an RGB hex color, separated by a ':' + # Default Value: White:EEEEEE, LightBlue:7492CC, Cyan:00EEEE, Blue:2222DD, LapisBlue:25418B, Teal:008080, Yellow:CACB58, GoldenYellow:EED700, Orange:D97634, Pink:D1899D, HotPink:FC0FC0, Magenta:B24BBB, Purple:813EB9, EvilPurple:2E1649, Lavender:B57EDC, Indigo:480082, Sand:DBD3A0, Tan:BB9B63, LightBrown:A0522D, Brown:634B33, DarkBrown:3A2D13, LimeGreen:43B239, SlimeGreen:83CB73, Green:008000, DarkGreen:224D22, GrassGreen:548049, Red:963430, BrickRed:B0604B, NetherBrick:2A1516, Redstone:CE3E36, Black:181515, CharcoalGray:464646, IronGray:646464, Gray:808080, Silver:C0C0C0 + SearchColors = White:EEEEEE, LightBlue:7492CC, Cyan:00EEEE, Blue:2222DD, LapisBlue:25418B, Teal:008080, Yellow:CACB58, GoldenYellow:EED700, Orange:D97634, Pink:D1899D, HotPink:FC0FC0, Magenta:B24BBB, Purple:813EB9, EvilPurple:2E1649, Lavender:B57EDC, Indigo:480082, Sand:DBD3A0, Tan:BB9B63, LightBrown:A0522D, Brown:634B33, DarkBrown:3A2D13, LimeGreen:43B239, SlimeGreen:83CB73, Green:008000, DarkGreen:224D22, GrassGreen:548049, Red:963430, BrickRed:B0604B, NetherBrick:2A1516, Redstone:CE3E36, Black:181515, CharcoalGray:464646, IronGray:646464, Gray:808080, Silver:C0C0C0 + + diff --git a/config/jei/jei-debug.ini b/config/jei/jei-debug.ini new file mode 100644 index 000000000..89c6b8f5f --- /dev/null +++ b/config/jei/jei-debug.ini @@ -0,0 +1,12 @@ +[debug] + # Description: Debug mode enabled + # Valid Values: [true, false] + # Default Value: false + DebugMode = false + + # Description: Debug inputs enabled + # Valid Values: [true, false] + # Default Value: false + DebugInputs = false + + diff --git a/config/jei/jei-mod-id-format.ini b/config/jei/jei-mod-id-format.ini new file mode 100644 index 000000000..05234a802 --- /dev/null +++ b/config/jei/jei-mod-id-format.ini @@ -0,0 +1,11 @@ +[modname] + # Description: Formatting for mod name tooltip + # Valid Values: A chat formatting string. + # Use these formatting colors: + # black dark_blue dark_green dark_aqua dark_red dark_purple gold gray dark_gray blue green aqua red light_purple yellow white + # With these formatting options: + # obfuscated bold strikethrough underline italic + # Default Value: blue italic + ModNameFormat = blue italic + + diff --git a/config/jei/recipe-category-sort-order.ini b/config/jei/recipe-category-sort-order.ini new file mode 100644 index 000000000..08cc437f2 --- /dev/null +++ b/config/jei/recipe-category-sort-order.ini @@ -0,0 +1,83 @@ +minecraft:crafting +minecraft:anvil +minecraft:blasting +minecraft:brewing +minecraft:campfire +minecraft:compostable +minecraft:fuel +minecraft:furnace +minecraft:smithing +minecraft:smoking +minecraft:stonecutting +ae2:attunement +ae2:certus_growth +ae2:charger +ae2:condenser +ae2:entropy +ae2:inscriber +ae2:item_transformation +create:automatic_brewing +create:automatic_packing +create:automatic_shaped +create:automatic_shapeless +create:block_cutting +create:crushing +create:deploying +create:draining +create:fan_blasting +create:fan_haunting +create:fan_smoking +create:fan_washing +create:item_application +create:mechanical_crafting +create:milling +create:mixing +create:mystery_conversion +create:packing +create:pressing +create:sandpaper_polishing +create:sawing +create:sequenced_assembly +create:spout_filling +create:wood_cutting +createaddition:charging +createaddition:liquid_burning +createaddition:rolling +exposure:photograph_printing +exposure:photograph_stacking +firmalife:drying +firmalife:mixing_bowl +firmalife:oven +firmalife:smoking +firmalife:vat +ftbquests:loot_crate +ftbquests:quest +jei:information +jumbofurnace:jumbo_furnace_upgrade +jumbofurnace:jumbo_smelting +morered:soldering +tfc:alloying +tfc:anvil +tfc:blast_furnace +tfc:bloomery +tfc:casting +tfc:chisel +tfc:clay_knapping +tfc:fire_clay_knapping +tfc:glassworking +tfc:goat_horn_knapping +tfc:heating +tfc:instant_barrel +tfc:instant_fluid_barrel +tfc:jam_pot +tfc:leather_knapping +tfc:loom +tfc:pumpkin_knapping +tfc:quern +tfc:rock_knapping +tfc:scraping +tfc:sealed_barrel +tfc:simple_pot +tfc:soup_pot +tfc:welding +treetap:tap_extract