From 50c18389fce11822dab402173b9fb02f114e6d15 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Sun, 21 Jan 2024 17:17:26 +0700 Subject: [PATCH] a lot of shit --- config/InventoryHUD/curios.json | 101 +-------------- config/attributefix.json | 213 ++++++++++++++++++++++++++++++++ config/chat_heads.json5 | 7 ++ config/craftpresence.json | 2 +- config/firstperson.json | 8 +- config/ftbxmodcompat.snbt | 13 ++ config/jade/sort-order.json | 42 ++++++- mods | 2 +- 8 files changed, 279 insertions(+), 109 deletions(-) create mode 100644 config/attributefix.json create mode 100644 config/chat_heads.json5 create mode 100644 config/ftbxmodcompat.snbt diff --git a/config/InventoryHUD/curios.json b/config/InventoryHUD/curios.json index 8c5a8c9f9..2ae8170cd 100644 --- a/config/InventoryHUD/curios.json +++ b/config/InventoryHUD/curios.json @@ -1,100 +1 @@ -{ - "clothes_hat": { - "x": 20, - "y": 98, - "enabled": true, - "halign": "LEFT", - "valign": "BOTTOM" - }, - "hands": { - "x": 2, - "y": 80, - "enabled": true, - "halign": "LEFT", - "valign": "TOP" - }, - "belt": { - "x": 2, - "y": 62, - "enabled": true, - "halign": "LEFT", - "valign": "BOTTOM" - }, - "ring": { - "x": 2, - "y": 117, - "enabled": true, - "halign": "LEFT", - "valign": "TOP" - }, - "back": { - "x": 2, - "y": 80, - "enabled": true, - "halign": "LEFT", - "valign": "BOTTOM" - }, - "bracelet": { - "x": 2, - "y": -3, - "enabled": true, - "halign": "LEFT", - "valign": "CENTER" - }, - "necklace": { - "x": 2, - "y": 146, - "enabled": true, - "halign": "LEFT", - "valign": "BOTTOM" - }, - "body": { - "x": 2, - "y": 126, - "enabled": true, - "halign": "LEFT", - "valign": "BOTTOM" - }, - "clothes_torso": { - "x": 20, - "y": 80, - "enabled": true, - "halign": "LEFT", - "valign": "BOTTOM" - }, - "curio": { - "x": 2, - "y": 136, - "enabled": true, - "halign": "LEFT", - "valign": "TOP" - }, - "head": { - "x": 2, - "y": 98, - "enabled": true, - "halign": "LEFT", - "valign": "BOTTOM" - }, - "charm": { - "x": 2, - "y": 99, - "enabled": true, - "halign": "LEFT", - "valign": "TOP" - }, - "clothes_pants": { - "x": 20, - "y": 62, - "enabled": true, - "halign": "LEFT", - "valign": "BOTTOM" - }, - "clothes_socks": { - "x": 20, - "y": 44, - "enabled": true, - "halign": "LEFT", - "valign": "BOTTOM" - } -} +{"clothes_hat":{"x":20,"y":98,"enabled":true,"halign":"LEFT","valign":"BOTTOM"},"hands":{"x":2,"y":80,"enabled":true,"halign":"LEFT","valign":"TOP"},"belt":{"x":2,"y":62,"enabled":true,"halign":"LEFT","valign":"BOTTOM"},"ring":{"x":2,"y":117,"enabled":true,"halign":"LEFT","valign":"TOP"},"back":{"x":2,"y":80,"enabled":true,"halign":"LEFT","valign":"BOTTOM"},"bracelet":{"x":2,"y":-3,"enabled":true,"halign":"LEFT","valign":"CENTER"},"necklace":{"x":2,"y":146,"enabled":true,"halign":"LEFT","valign":"BOTTOM"},"body":{"x":2,"y":126,"enabled":true,"halign":"LEFT","valign":"BOTTOM"},"clothes_torso":{"x":20,"y":80,"enabled":true,"halign":"LEFT","valign":"BOTTOM"},"curio":{"x":2,"y":136,"enabled":true,"halign":"LEFT","valign":"TOP"},"head":{"x":2,"y":98,"enabled":true,"halign":"LEFT","valign":"BOTTOM"},"charm":{"x":2,"y":99,"enabled":true,"halign":"LEFT","valign":"TOP"},"clothes_pants":{"x":20,"y":62,"enabled":true,"halign":"LEFT","valign":"BOTTOM"},"clothes_socks":{"x":20,"y":44,"enabled":true,"halign":"LEFT","valign":"BOTTOM"}} \ No newline at end of file diff --git a/config/attributefix.json b/config/attributefix.json new file mode 100644 index 000000000..0861b66a8 --- /dev/null +++ b/config/attributefix.json @@ -0,0 +1,213 @@ +{ + "attributes": { + "forge:step_height_addition": { + "enabled": false, + "min": { + "default": -512, + "value": -512 + }, + "max": { + "default": 512, + "value": 512 + } + }, + "minecraft:generic.follow_range": { + "enabled": true, + "min": { + "default": 0, + "value": 0 + }, + "max": { + "default": 2048, + "value": 2048 + } + }, + "minecraft:generic.flying_speed": { + "enabled": true, + "min": { + "default": 0, + "value": 0 + }, + "max": { + "default": 1024, + "value": 1024 + } + }, + "forge:nametag_distance": { + "enabled": false, + "min": { + "default": 0, + "value": 0 + }, + "max": { + "default": 64, + "value": 64 + } + }, + "minecraft:generic.movement_speed": { + "enabled": true, + "min": { + "default": 0, + "value": 0 + }, + "max": { + "default": 1024, + "value": 1024 + } + }, + "forge:entity_gravity": { + "enabled": false, + "min": { + "default": -8, + "value": -8 + }, + "max": { + "default": 8, + "value": 8 + } + }, + "forge:block_reach": { + "enabled": false, + "min": { + "default": 0, + "value": 0 + }, + "max": { + "default": 1024, + "value": 1024 + } + }, + "minecraft:generic.max_health": { + "enabled": true, + "min": { + "default": 1, + "value": 1 + }, + "max": { + "default": 1024, + "value": 1000000 + } + }, + "minecraft:generic.attack_speed": { + "enabled": true, + "min": { + "default": 0, + "value": 0 + }, + "max": { + "default": 1024, + "value": 1024 + } + }, + "minecraft:generic.attack_damage": { + "enabled": true, + "min": { + "default": 0, + "value": 0 + }, + "max": { + "default": 2048, + "value": 1000000 + } + }, + "minecraft:generic.luck": { + "enabled": true, + "min": { + "default": -1024, + "value": -1024 + }, + "max": { + "default": 1024, + "value": 1024 + } + }, + "minecraft:zombie.spawn_reinforcements": { + "enabled": true, + "min": { + "default": 0, + "value": 0 + }, + "max": { + "default": 1, + "value": 1 + } + }, + "minecraft:horse.jump_strength": { + "enabled": true, + "min": { + "default": 0, + "value": 0 + }, + "max": { + "default": 2, + "value": 2 + } + }, + "minecraft:generic.attack_knockback": { + "enabled": true, + "min": { + "default": 0, + "value": 0 + }, + "max": { + "default": 5, + "value": 1000000 + } + }, + "minecraft:generic.armor": { + "enabled": true, + "min": { + "default": 0, + "value": 0 + }, + "max": { + "default": 30, + "value": 1000000 + } + }, + "forge:swim_speed": { + "enabled": false, + "min": { + "default": 0, + "value": 0 + }, + "max": { + "default": 1024, + "value": 1024 + } + }, + "minecraft:generic.knockback_resistance": { + "enabled": true, + "min": { + "default": 0, + "value": 0 + }, + "max": { + "default": 1, + "value": 1 + } + }, + "minecraft:generic.armor_toughness": { + "enabled": true, + "min": { + "default": 0, + "value": 0 + }, + "max": { + "default": 20, + "value": 1000000 + } + }, + "forge:entity_reach": { + "enabled": false, + "min": { + "default": 0, + "value": 0 + }, + "max": { + "default": 1024, + "value": 1024 + } + } + } +} \ No newline at end of file diff --git a/config/chat_heads.json5 b/config/chat_heads.json5 new file mode 100644 index 000000000..0f74fb24e --- /dev/null +++ b/config/chat_heads.json5 @@ -0,0 +1,7 @@ +{ + "offsetNonPlayerText": true, + "senderDetection": "UUID_AND_HEURISTIC", + "smartHeuristics": true, + "handleSystemMessages": true, + "nameAliases": { } +} \ No newline at end of file diff --git a/config/craftpresence.json b/config/craftpresence.json index 147ae52ba..5c2bb7973 100644 --- a/config/craftpresence.json +++ b/config/craftpresence.json @@ -150,7 +150,7 @@ "stripTranslationColors": false, "stripExtraGuiElements": false, "renderTooltips": true, - "configKeyCode": -1 + "configKeyCode": 0 }, "displaySettings": { "presenceData": { diff --git a/config/firstperson.json b/config/firstperson.json index 564cb54c1..ace2fd0b4 100644 --- a/config/firstperson.json +++ b/config/firstperson.json @@ -1,4 +1,5 @@ { + "configVersion": 1, "enabledByDefault": false, "xOffset": 0, "sneakXOffset": 0, @@ -7,10 +8,5 @@ "vanillaHands": false, "doubleHands": false, "forceActive": false, - "autoVanillaHands": [ - "twilightforest:filled_ore_map", - "twilightforest:filled_magic_map", - "twilightforest:filled_maze_map", - "antiqueatlas:antique_atlas" - ] + "autoVanillaHands": [] } \ No newline at end of file diff --git a/config/ftbxmodcompat.snbt b/config/ftbxmodcompat.snbt new file mode 100644 index 000000000..08a06e500 --- /dev/null +++ b/config/ftbxmodcompat.snbt @@ -0,0 +1,13 @@ +{ + # Select the permissions implementation to use + # DEFAULT: use FTB Ranks then Luckperms in preference order, depending on mod availability + # Default: "default" + # Valid values: "default", "ftb_ranks", "luckperms" + permission_selector: "ftb_ranks" + + # Select the game stages implementation to use + # DEFAULT: use KubeJS, Game Stages, vanilla in preference order, depending on mod availability + # Default: "default" + # Valid values: "default", "vanilla", "kubejs", "gamestages" + stage_selector: "kubejs" +} diff --git a/config/jade/sort-order.json b/config/jade/sort-order.json index 4789d9a65..57218dc27 100644 --- a/config/jade/sort-order.json +++ b/config/jade/sort-order.json @@ -147,6 +147,21 @@ "tfc:windmill": null, "minecraft:campfire": null, "tfc:mold_table": null, + "corpse:corpse": null, + "create:blaze_burner": null, + "create:backtank_capacity": null, + "create:contraption_inv": null, + "lootr:inventory": null, + "create:hide_boiler_tanks": null, + "create:crafting_blueprint": null, + "create:placard": null, + "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, @@ -240,5 +255,30 @@ "jade:registry_name": null, "jade:mod_name": null, "jade:distance": null, - "jade:block_face": null + "jade:block_face": null, + "ae2:server_data": null, + "ae2:charger": null, + "ae2:crafting_monitor": null, + "ae2:pattern_provider": null, + "ae2:power_storage": null, + "ae2:grid_node_state": null, + "ae2:debug": null, + "ae2:part_name": null, + "ae2:part_icon": null, + "ae2:part_tooltip": null, + "ae2:part_mod_name": null, + "treetap:tap": null, + "firmalife:drying_mat": null, + "firmalife:solar_drier": null, + "firmalife:string": null, + "firmalife:cheese": null, + "firmalife:oven_bottom": null, + "firmalife:oven_top": null, + "firmalife:shelf": null, + "firmalife:hanger": null, + "firmalife:vat": null, + "firmalife:tumbler": null, + "firmalife:fruit_tree_sapling": null, + "firmalife:jarbnet": null, + "tfc:mold_table": null } \ No newline at end of file diff --git a/mods b/mods index f598d0665..c29603e16 160000 --- a/mods +++ b/mods @@ -1 +1 @@ -Subproject commit f598d0665cc77fcdefdce1616f1c11625ab08ba3 +Subproject commit c29603e166d114b9f60a857367881a9cc5e9acad