diff --git a/overrides/config/EmiLootConfig_v1.json b/overrides/config/EmiLootConfig_v1.json index 5880249f..be1f2132 100644 --- a/overrides/config/EmiLootConfig_v1.json +++ b/overrides/config/EmiLootConfig_v1.json @@ -1,7 +1,7 @@ { "debugMode": false, "parseChestLoot": true, - "parseBlockLoot": true, + "parseBlockLoot": false, "parseMobLoot": true, "parseGameplayLoot": true, "chestLootCompact": true, diff --git a/overrides/config/apotheosis/names.cfg b/overrides/config/apotheosis/names.cfg index 255890a2..bccf6b8d 100644 --- a/overrides/config/apotheosis/names.cfg +++ b/overrides/config/apotheosis/names.cfg @@ -691,7 +691,7 @@ tools { > # A list of material-based prefix names for this material group. May be empty. - # Items in this group: undergarden:froststeel_sword, undergarden:froststeel_pickaxe, undergarden:froststeel_axe, undergarden:froststeel_shovel, undergarden:froststeel_hoe + # Items in this group: delightful:froststeel_knife # # Default: [ S:FROSTSTEEL < @@ -801,7 +801,7 @@ tools { > # A list of material-based prefix names for this material group. May be empty. - # Items in this group: aether:holystone_pickaxe, aether:holystone_axe, aether:holystone_shovel, aether:holystone_hoe, aether:holystone_sword + # Items in this group: delightful:holystone_knife # # Default: [ S:HOLYSTONE < @@ -894,7 +894,7 @@ tools { > # A list of material-based prefix names for this material group. May be empty. - # Items in this group: undergarden:cloggrum_battleaxe, undergarden:cloggrum_sword, undergarden:cloggrum_pickaxe, undergarden:cloggrum_axe, undergarden:cloggrum_shovel, undergarden:cloggrum_hoe + # Items in this group: delightful:cloggrum_knife # # Default: [ S:CLOGGRUM < @@ -1162,7 +1162,7 @@ tools { > # A list of material-based prefix names for this material group. May be empty. - # Items in this group: aether:zanite_pickaxe, aether:zanite_axe, aether:zanite_shovel, aether:zanite_hoe, aether:zanite_sword + # Items in this group: delightful:zanite_knife # # Default: [ S:ZANITE < @@ -1277,7 +1277,7 @@ tools { > # A list of material-based prefix names for this material group. May be empty. - # Items in this group: aether:gravitite_pickaxe, aether:gravitite_axe, aether:gravitite_shovel, aether:gravitite_hoe, aether:gravitite_sword + # Items in this group: delightful:gravitite_knife # # Default: [ S:GRAVITITE < @@ -2178,11 +2178,6 @@ armors { # Default: [ S:endermanoverhaul_badlands_hood < > - - # A list of material-based prefix names for this material group. May be empty. - # Items in this group: kubejs:rebreather - # - # Default: [ S:kubejs_rebreather < > S:STRAY_CLOTH < @@ -2191,6 +2186,13 @@ armors { > S:draconicadditions_infused_potato_helm < > + + # A list of material-based prefix names for this material group. May be empty. + # Items in this group: kubejs:reinforced_respirator + # + # Default: [ + S:kubejs_reinforced_respirator < + > } diff --git a/overrides/config/betterfpsdist.json b/overrides/config/betterfpsdist.json index 3043467a..3982da09 100644 --- a/overrides/config/betterfpsdist.json +++ b/overrides/config/betterfpsdist.json @@ -1,6 +1,6 @@ { "stretch": { "desc:": "The amount by which the chunk render distance sphere is stretched in Y direction. default:2.0, min 0.5, max 10", - "stretch": 2.0 + "stretch": 0.9 } } \ No newline at end of file diff --git a/overrides/config/brute_force_rendering_culling-client.toml b/overrides/config/brute_force_rendering_culling-client.toml new file mode 100644 index 00000000..29875445 --- /dev/null +++ b/overrides/config/brute_force_rendering_culling-client.toml @@ -0,0 +1,33 @@ + +["Sampling multiple"] + #Range: 0.0 ~ 1.0 + multiple = 0.5 + +["Culling Map update delay"] + #Range: 0 ~ 10 + "delay frame" = 1 + +["Cull entity"] + enabled = true + +["Cull block entity"] + enabled = true + +["Cull chunk"] + enabled = true + +["Async chunk rebuild"] + enabled = true + +#Entity skip CULLING +["Entity ResourceLocation"] + #Entity that skip CULLING, example: + #["minecraft:creeper", "minecraft:zombie"] + list = ["create:stationary_contraption"] + +#Block Entity skip CULLING +["Block Entity ResourceLocation"] + #Block Entity that skip CULLING, example: + #["minecraft:chest", "minecraft:mob_spawner"] + list = ["minecraft:beacon"] + diff --git a/overrides/config/coldsweat/world_settings.toml b/overrides/config/coldsweat/world_settings.toml index c0048c8d..3e63391d 100644 --- a/overrides/config/coldsweat/world_settings.toml +++ b/overrides/config/coldsweat/world_settings.toml @@ -31,7 +31,7 @@ #max effect: the maximum temperature change this block can cause to a player (even with multiple blocks) #predicates: the state that the block has to be in for the temperature to be applied (lit=true for a campfire, for example). #Multiple predicates can be used by separating them with commas (i.e: "lit=true,waterlogged=false") - "Block Temperatures" = [["minecraft:soul_fire", -0.476, 7, true, 0.8], ["minecraft:fire", 0.476, 7, true, 0.8], ["minecraft:magma_block", 0.5, 3, true, 0.6], ["minecraft:soul_campfire", -0.476, 7, true, 0.6, "lit=true"], ["minecraft:ice", -0.15, 4, true, 0.5], ["minecraft:packed_ice", -0.25, 4, true, 1.0], ["minecraft:blue_ice", -0.35, 4, true, 1.0], ["minecraft:lava_cauldron", 0.5, 7, true, 1.5]] + "Block Temperatures" = [["farmersdelight:stove", 0.676, 7, true, 0.7], ["minecraft:soul_fire", -0.476, 7, true, 0.8], ["minecraft:fire", 0.476, 7, true, 0.8], ["minecraft:magma_block", 0.5, 3, true, 0.6], ["minecraft:soul_campfire", -0.476, 3, true, 0.6, "lit=true"], ["minecraft:ice", -0.15, 4, true, 0.5], ["minecraft:packed_ice", -0.25, 4, true, 1.0], ["minecraft:blue_ice", -0.35, 4, true, 1.0], ["gtceu:cupronickel_coil_block", 5, 4, true, 40.0, "active=true"], ["gtceu:kanthal_coil_block", 8, 4, true, 64.0, "active=true"], ["gtceu:nichrome_coil_block", 12, 4, true, 96.0, "active=true"]] #The maximum range of blocks' area of effect #Note: This will not change anything unless blocks are configured to utilize the expanded range #This value is capped at 16 for performance reasons diff --git a/overrides/config/embeddium++.toml b/overrides/config/embeddium++.toml index 018841bd..e6725dbf 100644 --- a/overrides/config/embeddium++.toml +++ b/overrides/config/embeddium++.toml @@ -5,7 +5,7 @@ #Configure FPS Display mode #Complete mode gives you min FPS count and average count #Allowed Values: OFF, SIMPLE, ADVANCED - fpsDisplay = "OFF" + fpsDisplay = "SIMPLE" #Shows GPU and memory usage onto FPS display #Allowed Values: OFF, ON, GPU, RAM fpsDisplaySystem = "OFF" diff --git a/overrides/config/embeddium-options.json b/overrides/config/embeddium-options.json index 5d80ab67..ae65e502 100644 --- a/overrides/config/embeddium-options.json +++ b/overrides/config/embeddium-options.json @@ -2,29 +2,29 @@ "quality": { "weather_quality": "DEFAULT", "leaves_quality": "DEFAULT", - "enable_vignette": true, + "enable_vignette": false, "use_quad_normals_for_shading": false }, "advanced": { "enable_memory_tracing": false, "use_advanced_staging_buffers": true, "disable_incompatible_mod_warnings": false, - "cpu_render_ahead_limit": 3 + "cpu_render_ahead_limit": 4 }, "performance": { - "chunk_builder_threads": 0, + "chunk_builder_threads": 20, "always_defer_chunk_updates_v2": true, "animate_only_visible_textures": true, "use_entity_culling": true, "use_fog_occlusion": true, "use_block_face_culling": true, "use_compact_vertex_format": true, - "use_translucent_face_sorting_v2": true, + "use_translucent_face_sorting_v2": false, "use_no_error_g_l_context": true }, "notifications": { "force_disable_donation_prompts": false, "has_cleared_donation_button": false, - "has_seen_donation_prompt": false + "has_seen_donation_prompt": true } } \ No newline at end of file diff --git a/overrides/config/enigmaticgraves-common.toml b/overrides/config/enigmaticgraves-common.toml new file mode 100644 index 00000000..76cb2d25 --- /dev/null +++ b/overrides/config/enigmaticgraves-common.toml @@ -0,0 +1,39 @@ + +#Misc Options +[misc] + #Should you get a grave finder item after you respawn? + spawnGraveFinder = true + #Set to false to disable retrieval by sneaking on top of the grave. + sneakRetrieval = true + +#How the grave data is handled +[data] + #Defines how the experience should be handled when the player dies. + #DROP: Drops the xp as normal. + #REMOVE: Doesn't drop or restore the xp. Effectively removes it on death. + #KEEP_VANILLA: Stores the same amount of xp that would've been dropped normally into the grave. + #KEEP_ALL: Stores all the players xp in the graves to restore it. + #Allowed Values: DROP, REMOVE, KEEP_VANILLA, KEEP_ALL + experienceHandling = "DROP" + #Defines the amount of entries per player that can be stored to retrieve using commands. + #Once the entry count overflows, the oldest entries will be removed. + #Range: 1 ~ 99 + graveEntryCount = 10 + +#Grave Spawn Place Handling +#The grave will first scan down from the death position until it finds a solid block to place the grave on. +#If there is no solid block below the death position, it will attempt to scan from the 'scanHeight' value +#It will scan up to +-'scanRange' in attempt to find a solid block with 2 air blocks above it to spawn the grave on. +#If it fails to find a place, it will then either: +# - Place a block at y=1 with the grave on top, if the 'scanHeight' were filled with block +# - Place a block at y='scanHeight' with the grave on top, if the 'scanHeight' were filled with air +[position] + #The scanning start position for a valid place to spawn + #Range: -64 ~ 319 + scanHeight = 60 + #The vertical range (up/down) from the initial position to scan for a valid spot to place a grave + #Range: -64 ~ 319 + scanRange = 10 + #The block that should spawn below the grave if there is none + floorBlock = "minecraft:dirt" + diff --git a/overrides/config/flywheel-client.toml b/overrides/config/flywheel-client.toml index e41e2022..9dc17f4d 100644 --- a/overrides/config/flywheel-client.toml +++ b/overrides/config/flywheel-client.toml @@ -1,6 +1,6 @@ #Select the backend to use. #Allowed Values: OFF, BATCHING, INSTANCING -backend = "INSTANCING" +backend = "OFF" #Enable or disable a debug overlay that colors pixels by their normal. debugNormals = false #Enable or disable instance update limiting with distance. diff --git a/overrides/config/ftbquests/quests/chapters/exoplanet_03s9__earth.snbt b/overrides/config/ftbquests/quests/chapters/exoplanet_03s9__earth.snbt index a9db5521..6bf48f13 100644 --- a/overrides/config/ftbquests/quests/chapters/exoplanet_03s9__earth.snbt +++ b/overrides/config/ftbquests/quests/chapters/exoplanet_03s9__earth.snbt @@ -756,6 +756,11 @@ description: [ "This respirator can be crafted late into steam and repaired with steel. " "It has &l14 Times the Durability of the respirator" + "" + "Currently the armor model isn't done so expect a massive pink cube on your skull." + "lmao." + "" + "God I hate coding this game." ] id: "1F5442CB5217C1B1" shape: "gear" @@ -769,12 +774,9 @@ Insulation: [ ] } } - id: "kubejs:rebreather" + id: "kubejs:reinforced_respirator" tag: { Damage: 0 - affix_data: { - sockets: 0 - } } } type: "item" @@ -847,6 +849,29 @@ x: 6.5d y: -2.0d } + { + description: [ + "Redid mods. Some food mods and other contents mods got the axe" + "" + "Make sure to regen your aether dim if you had it generated." + "" + "Fixed a variety of bugs in QB/Recipes/Progression Locks" + "" + "LuV Progression is slowly being made. " + "" + "" + "NOTICE : THE QUESTBOOK WILL START ITS OVERHAUL SOON " + "" + "EXPECT FINALIZED VERSIONS OF QUESTS BETWEEN 0.5.1->0.7.0! ! !" + "" + "THIS NOTICE WILL PERSIST UNTIL COMPLETION OF THE FIRST HALF OF THE QB CLEANUP!" + ] + icon: "minecraft:writable_book" + id: "001ABD786A9CF26D" + subtitle: "Changelog 0.5.0 -> 0.5.1" + x: 8.0d + y: -3.5d + } ] subtitle: ["It all starts here"] title: "&fFirst Steps and Important Info" diff --git a/overrides/config/ftbquests/quests/chapters/forged_in_galefury.snbt b/overrides/config/ftbquests/quests/chapters/forged_in_galefury.snbt index 433c51d0..2261e0b9 100644 --- a/overrides/config/ftbquests/quests/chapters/forged_in_galefury.snbt +++ b/overrides/config/ftbquests/quests/chapters/forged_in_galefury.snbt @@ -252,6 +252,11 @@ "With Ethersteel and Stainless Steel, you can produce Hulls of expanded Arcane Prowess as well as Voltage." "" "&l&bWelcome to HV&r" + "" + "" + "Heads up, Quests beyond this point are &opretty bad at having descriptions&r" + "" + "Come 0.7.0 All quest Tabs Below UV should be cleaned up and dealt with!" ] id: "2823B3BAEF820B50" shape: "hexagon" diff --git a/overrides/config/ftbquests/quests/chapters/fpower_and_you.snbt b/overrides/config/ftbquests/quests/chapters/fpower_and_you.snbt index 4c9b46d1..a6b1ef0e 100644 --- a/overrides/config/ftbquests/quests/chapters/fpower_and_you.snbt +++ b/overrides/config/ftbquests/quests/chapters/fpower_and_you.snbt @@ -34,10 +34,19 @@ } { dependencies: ["6146E12078CCA5D3"] + description: [ + "Steam is mostly viable for the start of the game." + "" + "I would strongly recommend moving away from it **entirely** by LV. Go make the ethanol power loop or suck down a few oil wells." + "" + "I am not responsible for sanity loss from using steam beyond this point." + "Kthx" + ] icon: "gtceu:steam_bucket" id: "31D607A0E640C8D8" shape: "hexagon" size: 1.5d + subtitle: "Steam." tasks: [{ id: "2BF4D34170B88166" type: "checkmark" @@ -54,7 +63,7 @@ item: "gtceu:lp_steam_solar_boiler" type: "item" }] - x: -3.0d + x: -3.5d y: -1.5d } { @@ -65,8 +74,8 @@ item: "gtceu:lp_steam_solid_boiler" type: "item" }] - x: -3.0d - y: -3.0d + x: -4.0d + y: -2.5d } { dependencies: ["31D607A0E640C8D8"] @@ -76,22 +85,22 @@ item: "gtceu:lp_steam_liquid_boiler" type: "item" }] - x: -3.0d - y: -4.5d + x: -4.5d + y: -3.5d } { - dependencies: ["3B12EDE4D85AF194"] + dependencies: ["31D607A0E640C8D8"] id: "7786A4BDC9C62461" tasks: [{ id: "0E0D152491235E72" item: "gtceu:hp_steam_solid_boiler" type: "item" }] - x: -1.5d - y: -3.0d + x: -2.0d + y: -2.5d } { - dependencies: ["4863B9E3983A5463"] + dependencies: ["31D607A0E640C8D8"] id: "59BA549EAC602E63" tasks: [{ id: "1091FDF0B76C8264" @@ -99,17 +108,17 @@ type: "item" }] x: -1.5d - y: -4.5d + y: -3.5d } { - dependencies: ["0BB1B009E21A8D73"] + dependencies: ["31D607A0E640C8D8"] id: "7666C59B2C2A9C54" tasks: [{ id: "14947C012D3A9AF2" item: "gtceu:hp_steam_solar_boiler" type: "item" }] - x: -1.5d + x: -2.5d y: -1.5d } { @@ -193,6 +202,11 @@ "4ECB7E470EED0932" "7250EED57A87F0AF" ] + description: [ + "Better than Actual Diesel for the extra Effort." + "" + "Oh but disel is still pretty good!" + ] id: "020B8BDB99E667FC" shape: "hexagon" size: 1.25d @@ -222,6 +236,7 @@ dependencies: ["5F977625E0059F00"] icon: "createdeco:decal_fluid" id: "4ECB7E470EED0932" + subtitle: "Any Fuel Above this Icon is valid for MV" title: "Liquid Fuels" x: -6.5d y: -1.5d @@ -457,6 +472,153 @@ x: -11.5d y: 4.5d } + { + dependencies: ["4ECB7E470EED0932"] + id: "00E22C38E03E6739" + shape: "hexagon" + size: 1.25d + tasks: [{ + id: "5CD32696AAF42C2D" + item: "gtceu:diesel_bucket" + type: "item" + }] + x: -6.5d + y: -4.5d + } + { + dependencies: ["23AEF543AA92119E"] + id: "493D3AD6435FA70F" + shape: "hexagon" + size: 1.5d + tasks: [{ + id: "2DDC3B237CE5481B" + item: "gtceu:iv_machine_hull" + type: "item" + }] + x: -13.0d + y: 0.0d + } + { + dependencies: ["493D3AD6435FA70F"] + id: "349CA7E4388B5E1A" + shape: "hexagon" + size: 1.25d + tasks: [{ + id: "7573375A8DB91A7D" + item: "gtceu:extreme_combustion_engine" + type: "item" + }] + x: -12.5d + y: 1.5d + } + { + dependencies: ["493D3AD6435FA70F"] + id: "4C5594EAE0D1F1C8" + shape: "hexagon" + size: 1.5d + subtitle: "The Age of Fusio- Wait no...?" + tasks: [{ + id: "2ECF137DAE81F679" + item: "gtceu:luv_machine_hull" + type: "item" + }] + x: -15.0d + y: 0.0d + } + { + dependencies: ["4C5594EAE0D1F1C8"] + description: [ + "Oh boy, Naquahine Power." + "" + "This Generator is not only POWERFUL. (16A LuV Per Reactor) It's also portable (Smaller Micro Reactors) This fuel makes outpost establishment even easier as your options for remote power expand. " + "" + "It's pretty hungry on ITNT though so I recommend a passive supply of ITNT somewhere in your base." + ] + id: "1345EB5C8CE6EA96" + subtitle: "The Queen of Power" + tasks: [{ + id: "2A771952C790173B" + item: "cosmiccore:naquahine_pressure_reactor" + type: "item" + }] + x: -15.0d + y: 1.5d + } + { + dependencies: [ + "4C5594EAE0D1F1C8" + "1345EB5C8CE6EA96" + ] + description: [ + "You can't really make any better tier of micro reactor atm. as they're not very viable to produce due to high material cost." + "" + "Did you think miniturized fusion explosion containers would be CHEAP?!" + ] + id: "31EA8F5E9A474DDC" + rewards: [{ + id: "61F55C4523DE7C56" + item: "kubejs:memory_shard" + type: "item" + }] + subtitle: "Well then" + tasks: [{ + id: "6E70B654A4C359DB" + item: "gtceu:iv_naquahine_mini_reactor" + type: "item" + }] + x: -15.0d + y: 3.0d + } + { + dependencies: ["4C5594EAE0D1F1C8"] + id: "7C04FB1E15ACCE47" + shape: "hexagon" + size: 1.5d + subtitle: "TODO" + tasks: [{ + id: "2B0BB2E1016867CA" + item: "gtceu:zpm_machine_hull" + type: "item" + }] + x: -17.0d + y: 0.0d + } + { + dependencies: ["4C5594EAE0D1F1C8"] + description: [ + "I removed &cplasma power&r via &mlarge fluid alloy smelter&r fusion production. " + "" + "Currently your main power in LuV is &eNaquahine&r, as well as bolstering any other power methods you had before. Make sure you account for the increase fuel consumption directly caused by producing Naquahine ful as well." + "" + "Make sure you have a decent &aNaquadah&r setup!" + ] + id: "04DC79601BAC37A1" + shape: "hexagon" + size: 1.5d + subtitle: "&fFusion Spam is lame." + tasks: [{ + id: "20BD2F2B03B80149" + item: "gtceu:naquahine_superfuel_mk_one_bucket" + type: "item" + }] + x: -15.0d + y: -2.0d + } + { + dependencies: ["23AEF543AA92119E"] + description: ["You're already making thundering mana for circuits soon, why not upgrade your power with it?"] + id: "2CD74038E57C8D1C" + shape: "hexagon" + size: 1.25d + subtitle: "A Nice Upgrade" + tasks: [{ + id: "2FD9052DBEF33249" + item: "gtceu:thunder_boosted_source_diesel_bucket" + type: "item" + }] + x: -11.0d + y: -2.0d + } ] title: "&fPower and Multiblocks" } diff --git a/overrides/config/ftbquests/quests/chapters/navigation_online.snbt b/overrides/config/ftbquests/quests/chapters/navigation_online.snbt index 1eb014d0..caf62dc2 100644 --- a/overrides/config/ftbquests/quests/chapters/navigation_online.snbt +++ b/overrides/config/ftbquests/quests/chapters/navigation_online.snbt @@ -150,6 +150,22 @@ dependencies: ["757767FEB0FB7630"] id: "67E7189D598C3682" shape: "hexagon" + tasks: [{ + id: "06224DD7A1849509" + item: { + Count: 1 + id: "cosmicrocketry:tier_5_rocket" + tag: { + BotariumData: { + StoredFluids: [{ + Amount: 3000L + Fluid: "ad_astra:fuel" + }] + } + } + } + type: "item" + }] title: "Tier 5 Rocket [NYI]" x: 0.0d y: -8.0d @@ -158,6 +174,22 @@ dependencies: ["67E7189D598C3682"] id: "1F44845794A4973D" shape: "hexagon" + tasks: [{ + id: "344E565B88D4C841" + item: { + Count: 1 + id: "cosmicrocketry:tier_6_rocket" + tag: { + BotariumData: { + StoredFluids: [{ + Amount: 3000L + Fluid: "ad_astra:fuel" + }] + } + } + } + type: "item" + }] title: "Tier 6 Rocket [NYI]" x: 0.0d y: -10.0d @@ -166,6 +198,22 @@ dependencies: ["1F44845794A4973D"] id: "1003501BBAC8D6C0" shape: "hexagon" + tasks: [{ + id: "49046E0699CD4EC5" + item: { + Count: 1 + id: "cosmicrocketry:tier_7_rocket" + tag: { + BotariumData: { + StoredFluids: [{ + Amount: 3000L + Fluid: "ad_astra:fuel" + }] + } + } + } + type: "item" + }] title: "Tier 7 Rocket [NYI]" x: 0.0d y: -12.0d diff --git a/overrides/config/ftbquests/quests/chapters/rising_pressure_steam.snbt b/overrides/config/ftbquests/quests/chapters/rising_pressure_steam.snbt index 1f1b41da..0b7d8042 100644 --- a/overrides/config/ftbquests/quests/chapters/rising_pressure_steam.snbt +++ b/overrides/config/ftbquests/quests/chapters/rising_pressure_steam.snbt @@ -811,39 +811,25 @@ shape: "gear" size: 2.0d subtitle: "Danger!" - tasks: [ - { - id: "0BA52B59AF9207C1" - item: { - Count: 1 - ForgeCaps: { - "cold_sweat:item_insulation": { - Insulation: [ ] - } - } - id: "gtceu:rubber_gloves" - tag: { - Damage: 0 - affix_data: { - sockets: 0 - } + tasks: [{ + id: "0BA52B59AF9207C1" + item: { + Count: 1 + ForgeCaps: { + "cold_sweat:item_insulation": { + Insulation: [ ] } } - type: "item" - } - { - id: "78BAF54B0A798EEF" - item: { - Count: 1 - id: "ftbfiltersystem:smart_filter" - tag: { - "ftbfiltersystem:filter": "or(item(gtceu:face_mask)item(thinair:respirator)item(kubejs:rebreather)item(kubejs:nano_respirator))" + id: "gtceu:rubber_gloves" + tag: { + Damage: 0 + affix_data: { + sockets: 0 } } - title: "Any Facemask" - type: "item" } - ] + type: "item" + }] title: "Hazards and you!" x: -2.0d y: -2.0d diff --git a/overrides/config/ftbquests/quests/chapters/the_elements_of_frontiers.snbt b/overrides/config/ftbquests/quests/chapters/the_elements_of_frontiers.snbt index 5c3d4874..2e1e8dc5 100644 --- a/overrides/config/ftbquests/quests/chapters/the_elements_of_frontiers.snbt +++ b/overrides/config/ftbquests/quests/chapters/the_elements_of_frontiers.snbt @@ -4,7 +4,7 @@ default_quest_shape: "" filename: "the_elements_of_frontiers" group: "49DCE46B3EB22AEA" - icon: "aquamirae:ship_graveyard_echo" + icon: "kubejs:memory_shard" id: "78A238438B986DB5" images: [{ height: 5.0d diff --git a/overrides/config/ftbquests/quests/chapters/turn_on_the_lights__lv.snbt b/overrides/config/ftbquests/quests/chapters/turn_on_the_lights__lv.snbt index e1ee6fd0..47179378 100644 --- a/overrides/config/ftbquests/quests/chapters/turn_on_the_lights__lv.snbt +++ b/overrides/config/ftbquests/quests/chapters/turn_on_the_lights__lv.snbt @@ -471,6 +471,7 @@ } { dependencies: ["6622E68A73AAD137"] + description: ["Before you wonder, the hand crafting recipe is removed, go make FeCl3 or Persulfate."] id: "1ECE5150F6B08544" tasks: [{ id: "5550A0559EA6F96D" @@ -518,6 +519,7 @@ { id: "5B2AD96F3B3F1136" item: "gtceu:hydrochloric_acid_bucket" + optional_task: true type: "item" } { @@ -816,6 +818,14 @@ } { dependencies: ["4A81DCCC6A0C6BA6"] + description: [ + "Oh woe is me? a create block in my my gt progression!?" + "Look it was either this or a chemical bath and then make the mana method end up being worse." + "" + "Pick your poisions." + "" + "\"смешной редстоун :)\" -Ghostipedia in some GTNH Chat. (I barely understand russian)" + ] id: "713E576BAB70EF4F" tasks: [{ id: "6EE98DE70E4B016D" diff --git a/overrides/config/ftbquests/quests/chapters/worth_every_ingot.snbt b/overrides/config/ftbquests/quests/chapters/worth_every_ingot.snbt index 74733c97..26bb62ef 100644 --- a/overrides/config/ftbquests/quests/chapters/worth_every_ingot.snbt +++ b/overrides/config/ftbquests/quests/chapters/worth_every_ingot.snbt @@ -26,7 +26,14 @@ y: 0.0d } { - dependencies: ["635C885360A8A8A9"] + dependencies: [ + "635C885360A8A8A9" + "45AE9844B1C84454" + "34E7B99E411B3E44" + "6BA55FE3C9856E84" + "688DD6F7473A121E" + "0F68C0E627CE724F" + ] description: ["Welcome to bloodmagic! Only the key points are mentioned in the LUV quests here to guide you down the right path. There are many fun side recipes to help you along, explore, and integrate life essence into your factory!"] id: "32789BABC2728C07" rewards: [{ @@ -601,6 +608,7 @@ { id: "51033A10CCFA32B0" item: "gtceu:acidic_naquadria_solution_bucket" + optional_task: true type: "item" } { @@ -1145,7 +1153,6 @@ y: 5.0d } { - dependencies: ["076D910F19A6E439"] description: [ "Welcome to Crystal CPU's, a much harder CPU core than Nano or Quantum. And require a multi-dimensional setup to fully automate. Some pointers before you start." "" @@ -1170,10 +1177,10 @@ type: "item" }] x: -7.0d - y: -8.0d + y: -14.0d } { - dependencies: ["45AE9844B1C84454"] + dependencies: ["076D910F19A6E439"] description: [ "The process for asembling your crystal circuits will require an adventure to the orbit of earth." "" @@ -1189,8 +1196,8 @@ type: "item" }] title: "Things are getting tricky" - x: -7.0d - y: -10.0d + x: -6.0d + y: -8.5d } { dependencies: ["2A0A206B6487F7C8"] @@ -1442,6 +1449,180 @@ x: 0.0d y: -11.0d } + { + dependencies: ["14100610FD579908"] + description: [ + "The important stuff from this process is the insane amount of lake water you get, as well as silt slurry." + "" + "You might also want to consider automating Nutrient Solution, it's not required atm but it will be needed from ZPM. It's up to you if you wanna just stockpile it or benefit from the much stronger greenhouse recipes now" + ] + id: "3706DAF22D0DE870" + subtitle: "Uh.... Water.. Line?" + tasks: [{ + id: "2EC67062B8069F63" + item: "gtceu:swamp_sediment_bucket" + type: "item" + }] + x: -10.0d + y: -8.5d + } + { + dependencies: [ + "1B8A508AB2E1E572" + "52AD639AE0BC4241" + "7631222987D9363E" + ] + description: ["This Quest will Open up the ZPM Tab, which may prove of some usefulness even if you do not have Crystal Circuits. As non-major gates can be build from ZPM without UV Circuitry."] + id: "3F5E81046FD4215B" + shape: "octagon" + size: 2.0d + subtitle: "Only half the climb" + tasks: [{ + id: "1261D80D48384705" + item: "gtceu:zpm_machine_hull" + type: "item" + }] + x: 0.0d + y: -13.0d + } + { + dependencies: ["27C17BA22F91CDA0"] + hide_dependency_lines: true + id: "52AD639AE0BC4241" + shape: "hexagon" + tasks: [{ + id: "13A1E56318285544" + item: "cosmiccore:naquadric_superalloy_ingot" + type: "item" + }] + x: -1.5d + y: -12.0d + } + { + dependencies: ["33EAB75E7D2CAFDA"] + hide_dependency_lines: true + id: "7631222987D9363E" + shape: "hexagon" + tasks: [{ + id: "04360723AE047581" + item: "cosmiccore:trinavine_ingot" + type: "item" + }] + x: 1.5d + y: -12.0d + } + { + id: "34E7B99E411B3E44" + tasks: [{ + id: "7F6C109A2A311280" + item: "gtceu:crystal_processor" + type: "item" + }] + x: -8.0d + y: -15.0d + } + { + id: "688DD6F7473A121E" + tasks: [{ + id: "630C399C5CBC4448" + item: "gtceu:crystal_processor_assembly" + type: "item" + }] + x: -4.5d + y: -15.0d + } + { + id: "0F68C0E627CE724F" + tasks: [{ + id: "0A3F09A307D13EF3" + item: "gtceu:crystal_processor_computer" + type: "item" + }] + x: -2.0d + y: -15.0d + } + { + description: [ + "&bCrystal Mainframes&r at last! It only took you constructing a thriving &espace industry&r!" + "" + "These powerful mainframes allow you to crack through major roadblocks that come in ZPM." + "" + "&aIf you've made these, it's pretty safe to say you either rushed LuV or have automated everything you can.&r" + "" + "If you haven't noticed, Frontiers from LuV and beyond will no longer hold punches on how absurd chains will become. It is safe to assume the normalcy of most GregTech Chains will diverge massively here. I look forward to making you suffer, and bringing you even more unique processing and automation challenges." + "" + "&aI wish you luck, Have a huge payload of Memory Shards on the house. Go cash out yourself something nice.&r" + "~Ghost" + ] + id: "6BA55FE3C9856E84" + rewards: [ + { + count: 256 + id: "3C52A17D8D3B1A7D" + item: "ad_astra:ice_shard" + type: "item" + } + { + count: 128 + id: "51F4BF5DD992B0AF" + item: "kubejs:memory_shard" + type: "item" + } + ] + subtitle: "The Pinnacle of Your Suffering" + tasks: [{ + id: "51FB63A84940A52C" + item: "gtceu:crystal_processor_mainframe" + type: "item" + }] + x: 0.0d + y: -15.0d + } + { + dependencies: ["076D910F19A6E439"] + description: [ + "The process for asembling your crystal circuits will require an adventure to the orbit of earth." + "" + "No other field of microgravity will work, please make sure you set this up in the orbit of earth." + ] + icon: "undergarden:goo_ball" + id: "14100610FD579908" + shape: "hexagon" + size: 2.0d + subtitle: "To Orbit!" + tasks: [{ + id: "752BCF58D95740DC" + item: "undergarden:goo_ball" + type: "item" + }] + title: "Returning to the Gardens" + x: -8.0d + y: -8.5d + } + { + dependencies: ["3706DAF22D0DE870"] + icon: "gtceu:silt_slurry_bucket" + id: "2B37981D5212AB24" + tasks: [{ + id: "379D40C6CF948033" + item: "gtceu:silt_slurry_bucket" + type: "item" + }] + x: -11.0d + y: -9.5d + } + { + dependencies: ["3706DAF22D0DE870"] + icon: "gtceu:lake_water_bucket" + id: "6354D6CB595585EA" + tasks: [{ + id: "24B25F3F5F952D03" + item: "gtceu:lake_water_bucket" + type: "item" + }] + x: -11.0d + y: -7.5d + } ] title: "A Factory Soaked In Blood [&dLuV&r]" } diff --git a/overrides/config/gtceu.yaml b/overrides/config/gtceu.yaml index 73606360..9210ab11 100644 --- a/overrides/config/gtceu.yaml +++ b/overrides/config/gtceu.yaml @@ -267,10 +267,10 @@ machines: # Default: false orderedAssemblyLineFluids: true - # Let Buffer has more ability. - # When enabled it, Buffer will can used to assemble line and so on. + # Let Dual Hatch has more ability. + # When enabled it, Dual Hatch will can used to assemble line and so on. # Need restart Minecraft to apply. - enableMoreBufferAbility: false + enableMoreDualHatchAbility: false # Small Steam Boiler Options smallBoilers: diff --git a/overrides/config/immediatelyfast.json b/overrides/config/immediatelyfast.json index b5ec7e30..192abfe8 100644 --- a/overrides/config/immediatelyfast.json +++ b/overrides/config/immediatelyfast.json @@ -13,7 +13,7 @@ "experimental_disable_error_checking": false, "experimental_disable_resource_pack_conflict_handling": false, "experimental_sign_text_buffering": false, - "experimental_screen_batching": false, + "experimental_screen_batching": true, "DEBUG_INFO": "----- Debug only config values below (Do not touch) -----", "debug_only_and_not_recommended_disable_universal_batching": false, "debug_only_and_not_recommended_disable_mod_conflict_handling": false, diff --git a/overrides/config/jade/plugins.json b/overrides/config/jade/plugins.json index 5d4215ad..77868998 100644 --- a/overrides/config/jade/plugins.json +++ b/overrides/config/jade/plugins.json @@ -62,13 +62,18 @@ "hud.status": true, "hud.contents": true }, + "enigmaticgraves": { + "grave": true + }, "gtceu": { "primitive_pump": true, "auto_output_info": true, "workable_provider": true, "transformer": true, "controllable_provider": true, + "me_pattern_buffer": true, "exhaust_vent_info": true, + "me_pattern_buffer_proxy": true, "multiblock_structure": true, "recipe_logic_provider": true, "maintenance_info": true, @@ -92,9 +97,6 @@ "jade_chamber": true, "jade_wireless": true }, - "gregiceng": { - "crafting_io_buffer": true - }, "apotheosis": { "adventure": true, "ench": true, diff --git a/overrides/config/jade/sort-order.json b/overrides/config/jade/sort-order.json index f2bf7820..7a11c618 100644 --- a/overrides/config/jade/sort-order.json +++ b/overrides/config/jade/sort-order.json @@ -29,6 +29,7 @@ "delightful:pie_icons": null, "enderchests:hud": null, "endertanks:hud": null, + "enigmaticgraves:grave": null, "entangled:entangled_block_component": null, "expatternprovider:jade_chamber": null, "expatternprovider:jade_wireless": null, @@ -57,6 +58,8 @@ "gtceu:hazard_cleaner_provider": null, "gtceu:machine_mode": null, "gtceu:maintenance_info": null, + "gtceu:me_pattern_buffer": null, + "gtceu:me_pattern_buffer_proxy": null, "gtceu:multiblock_structure": null, "gtceu:parallel_info": null, "gtceu:primitive_pump": null, diff --git a/overrides/config/jei/jei-client.ini b/overrides/config/jei/jei-client.ini index 2f445048..dfb253e1 100644 --- a/overrides/config/jei/jei-client.ini +++ b/overrides/config/jei/jei-client.ini @@ -71,6 +71,11 @@ # Default Value: true lookupBlockTagsEnabled = true + # Description: Show recipes for ingredient tags, like Item Tags and Block Tags + # Valid Values: [true, false] + # Default Value: false + showTagRecipesEnabled = false + [input] # Description: Number of milliseconds before a long mouse click is considered to become a drag operation diff --git a/overrides/config/jei/jei-debug.ini b/overrides/config/jei/jei-debug.ini index 09896839..30ff2591 100644 --- a/overrides/config/jei/jei-debug.ini +++ b/overrides/config/jei/jei-debug.ini @@ -14,10 +14,10 @@ # Default Value: false DebugInputs = false - # Description: Debug ingredients enabled + # Description: Add debug information to ingredient tooltips when advanced tooltips are enabled # Valid Values: [true, false] # Default Value: false - DebugIngredients = false + debugInfoTooltipsEnabled = false # Description: Adds ingredients to JEI that intentionally crash, to help debug JEI. # Valid Values: [true, false] diff --git a/overrides/config/jei/recipe-category-sort-order.ini b/overrides/config/jei/recipe-category-sort-order.ini index 061d140f..8b7a37e8 100644 --- a/overrides/config/jei/recipe-category-sort-order.ini +++ b/overrides/config/jei/recipe-category-sort-order.ini @@ -96,6 +96,3 @@ rechiseled:chiseling vintagedelight:fermenting waystones:warp_plate molecular_metamorphosis:experienceobelisk -minecraft:block -minecraft:fluid -minecraft:item diff --git a/overrides/config/modernfix-mixins.properties b/overrides/config/modernfix-mixins.properties index 0313eb9b..deda0c96 100644 --- a/overrides/config/modernfix-mixins.properties +++ b/overrides/config/modernfix-mixins.properties @@ -95,3 +95,6 @@ # mixin.safety=true # (default) # # User overrides go here. +mixin.feature.warn_missing_perf_mods=false +mixin.perf.dynamic_resources=true +mixin.perf.faster_item_rendering=true diff --git a/overrides/config/naturescompass-client.toml b/overrides/config/naturescompass-client.toml new file mode 100644 index 00000000..a60cb991 --- /dev/null +++ b/overrides/config/naturescompass-client.toml @@ -0,0 +1,13 @@ + +[Client] + #Displays Nature's Compass information even while chat is open. + displayWithChatOpen = true + #Fixes biome names by adding missing spaces. Ex: ForestHills becomes Forest Hills + fixBiomeNames = true + #The line offset for information rendered on the HUD. + #Range: 0 ~ 50 + overlayLineOffset = 1 + #The side for information rendered on the HUD. Ex: LEFT, RIGHT + #Allowed Values: LEFT, RIGHT + overlaySide = "LEFT" + diff --git a/overrides/config/naturescompass-common.toml b/overrides/config/naturescompass-common.toml new file mode 100644 index 00000000..3dbe6633 --- /dev/null +++ b/overrides/config/naturescompass-common.toml @@ -0,0 +1,18 @@ + +[General] + #Allows a player to teleport to a located biome when in creative mode, opped, or in cheat mode. + allowTeleport = true + #Allows players to view the precise coordinates and distance of a located structure on the HUD, rather than relying on the direction the compass is pointing. + displayCoordinates = true + #biomeSize * radiusModifier = maxSearchRadius. Raising this value will increase search accuracy but will potentially make the process more resource . + #Range: 0 ~ 1000000 + radiusModifier = 2500 + #biomeSize * sampleSpaceModifier = sampleSpace. Lowering this value will increase search accuracy but will make the process more resource intensive. + #Range: 0 ~ 1000000 + sampleSpaceModifier = 16 + #A list of biomes that the compass will not be able to search for, specified by resource location. The wildcard character * can be used to match any number of characters, and ? can be used to match one character. Ex: ["minecraft:savanna", "minecraft:desert", "minecraft:*ocean*"] + biomeBlacklist = [] + #The maximum number of samples to be taken when searching for a biome. + #Range: 0 ~ 1000000 + maxSamples = 50000 + diff --git a/overrides/config/oculus.properties b/overrides/config/oculus.properties index 1e55a510..78d56b5f 100644 --- a/overrides/config/oculus.properties +++ b/overrides/config/oculus.properties @@ -1,8 +1,8 @@ #This file stores configuration options for Iris, such as the currently active shaderpack -#Tue Aug 13 23:14:25 EDT 2024 +#Fri Aug 23 18:00:51 EDT 2024 colorSpace=SRGB disableUpdateMessage=false enableDebugOptions=false -enableShaders=false -maxShadowRenderDistance=32 +maxShadowRenderDistance=8 shaderPack=BlissEdit5 +enableShaders=false diff --git a/overrides/config/sdrp-common.json b/overrides/config/sdrp-common.json index 14a68477..1bc3011f 100644 --- a/overrides/config/sdrp-common.json +++ b/overrides/config/sdrp-common.json @@ -1,5 +1,5 @@ { - "clientId": 608012526537408579, + "clientId": 1189371753173098497, "enabled": true, "screenEvent": true, "clientJoinEvent": true, diff --git a/overrides/config/solonion-client.json b/overrides/config/solonion-client.json new file mode 100644 index 00000000..d748d3af --- /dev/null +++ b/overrides/config/solonion-client.json @@ -0,0 +1,6 @@ +{ + "isFoodTooltipEnabled": true, + "showDiversityChangeInTooltip": true, + "showDisabledTooltip": true, + "shouldShowInactiveBenefits": true +} \ No newline at end of file diff --git a/overrides/config/solonion.json b/overrides/config/solonion.json new file mode 100644 index 00000000..6e20f9cd --- /dev/null +++ b/overrides/config/solonion.json @@ -0,0 +1,61 @@ +{ + "foodItems": { + "entries": [], + "isWhitelist": false + }, + "trackCount": 64, + "resetOnDeath": false, + "limitProgressionToSurvival": false, + "minFoodsToActivate": 0, + "benefits": [ + { + "threshold": 3, + "benefit": { + "attribute": "minecraft:generic.max_health", + "value": 2 + } + }, + { + "threshold": 10, + "benefit": { + "effect": "cold_sweat:insulated", + "value": 1 + } + }, + { + "threshold": 20, + "benefit": { + "effect": "cold_sweat:insulated", + "value": 3 + } + }, + { + "threshold": 30, + "benefit": { + "effect": "cold_sweat:insulated", + "value": 5 + } + }, + { + "threshold": 40, + "benefit": { + "attribute": "minecraft:generic.max_health", + "value": 7 + } + }, + { + "threshold": 50, + "benefit": { + "effect": "cold_sweat:insulated", + "value": 9 + } + } + ], + "shouldExcludedCount": true, + "complexityStandardNutrition": 5, + "complexityStandardSaturation": 0.6, + "complexityBenefitEffectModifier": 0.2, + "complexityNeutralEffectModifier": 0, + "complexityHarmEffectModifier": -0.2, + "foodDiversity": [] +} \ No newline at end of file diff --git a/overrides/defaultconfigs/ftbultimine/ftbultimine-server.snbt b/overrides/defaultconfigs/ftbultimine/ftbultimine-server.snbt index 4cded6ce..a5e66bf7 100644 --- a/overrides/defaultconfigs/ftbultimine/ftbultimine-server.snbt +++ b/overrides/defaultconfigs/ftbultimine/ftbultimine-server.snbt @@ -23,7 +23,6 @@ "minecraft:base_stone_overworld" "c:*_ores" "forge:ores/*" - "integrateddynamics:menril_logs" ] # These tags will be considered the same block when checking for blocks to Ultimine in shaped mining modes diff --git a/overrides/kubejs/assets/cosmiccore/textures/block/antiblock_dark_green.png b/overrides/kubejs/assets/cosmiccore/textures/block/antiblock_dark_green.png new file mode 100644 index 00000000..07573d7a Binary files /dev/null and b/overrides/kubejs/assets/cosmiccore/textures/block/antiblock_dark_green.png differ diff --git a/overrides/kubejs/assets/kubejs/textures/item/reinforced_respirator.png b/overrides/kubejs/assets/kubejs/textures/item/reinforced_respirator.png new file mode 100644 index 00000000..be1c7b68 Binary files /dev/null and b/overrides/kubejs/assets/kubejs/textures/item/reinforced_respirator.png differ diff --git a/overrides/kubejs/server_scripts/Recipes/Cosmic_Frontiers.js b/overrides/kubejs/server_scripts/Recipes/Cosmic_Frontiers.js index c1fa57d1..25eb10cd 100644 --- a/overrides/kubejs/server_scripts/Recipes/Cosmic_Frontiers.js +++ b/overrides/kubejs/server_scripts/Recipes/Cosmic_Frontiers.js @@ -184,14 +184,14 @@ ServerEvents.recipes(event => { ], { C: 'minecraft:charcoal' }) - - event.recipes.gtceu.assembler('ug_catalyst') - .itemInputs(['minecraft:heart_of_the_sea','aether:bronze_dungeon_key','aether:silver_dungeon_key','aether:gold_dungeon_key','#gtceu:circuits/hv',]) - .inputFluids('gtceu:source_oils 12000') - .itemOutputs('undergarden:catalyst') - .circuit(2) - .duration(160) - .EUt(GTValues.VA[GTValues.EV]); + + event.recipes.gtceu.assembler('ug_catalyst') + .itemInputs(['minecraft:heart_of_the_sea', 'aether:bronze_dungeon_key', 'aether:silver_dungeon_key', 'aether:gold_dungeon_key', '#gtceu:circuits/hv',]) + .inputFluids('gtceu:source_oils 12000') + .itemOutputs('undergarden:catalyst') + .circuit(2) + .duration(160) + .EUt(GTValues.VA[GTValues.EV]); event.recipes.gtceu.forge_hammer('shatter_the_seal') .itemInputs('nether_remastered:seal_of_the_underworld_item') .itemOutputs('8x kubejs:seal_shards') @@ -218,6 +218,16 @@ ServerEvents.recipes(event => { .chancedOutput(Item.of('biomesoplenty:blackstone_bulb', 1), 5000, 500) .duration(160) .EUt(GTValues.VA[GTValues.LV] / 2); + event.recipes.gtceu.cutter('stone_slab_to_pressureplate') + .itemInputs('minecraft:stone_slab') + .itemOutputs('4x minecraft:stone_pressure_plate') + .duration(160) + .EUt(GTValues.VA[GTValues.LV] / 2); + event.recipes.gtceu.cutter('stone_plate_to_button') + .itemInputs('minecraft:stone_pressure_plate') + .itemOutputs('4x minecraft:stone_button') + .duration(160) + .EUt(GTValues.VA[GTValues.LV] / 2); event.recipes.gtceu.mixer('cosmiccore:sediment_sludge_mixing') .itemInputs('3x biomesoplenty:blackstone_bulb') .inputFluids(Fluid.of('biomesoplenty:blood', 1000)) diff --git a/overrides/kubejs/server_scripts/Recipes/Gregtech/GregtechWoodOverhaul.js b/overrides/kubejs/server_scripts/Recipes/Gregtech/GregtechWoodOverhaul.js index 75b7f546..cb0ffd58 100644 --- a/overrides/kubejs/server_scripts/Recipes/Gregtech/GregtechWoodOverhaul.js +++ b/overrides/kubejs/server_scripts/Recipes/Gregtech/GregtechWoodOverhaul.js @@ -19,13 +19,32 @@ ServerEvents.recipes(event => { //Remove Boats event.remove({ id: /^(?!gtceu:)([^:]+):(.*)_boat$/ }) - event.remove({id: 'gtceu:shapeless/rubber_wood_planks'}) + event.remove({ id: 'gtceu:shapeless/rubber_wood_planks' }) - + //Holy Shit Aether piss off already. + + event.remove({ id: 'aether:skyroot_cartography_table' }) + event.remove({ id: 'aether:skyroot_fletching_table' }) + event.remove({ id: 'aether:skyroot_smithing_table' }) + event.remove({ id: 'aether:skyroot_grindstone' }) + event.remove({ id: 'aether:skyroot_grindstone_holystone_slab' }) + event.remove({ id: 'aether:skyroot_loom' }) + event.remove({ id: 'aether:skyroot_note_block' }) + event.remove({ id: 'aether:skyroot_beehive' }) + event.remove({ id: 'aether:skyroot_barrel' }) + event.remove({ id: 'aether:skyroot_tripwire_hook' }) + event.remove({ id: 'aether:skyroot_iron_vanilla_shield' }) + event.remove({ id: 'aether:skyroot_zanite_vanilla_shield' }) + event.remove({ id: 'aether:skyroot_stairs' }) + event.remove({ id: 'aether:skyroot_slab' }) + event.remove({ id: 'minecraft:kjs/aether_skyroot_fence' }) + event.remove({ id: 'aether:skyroot_bed' }) + event.remove({ id: 'aether:skyroot_stick' }) //DANGEROUS : WOOD PLANK REMOVALS - BY RECIPE - if something is broken attempt to check it against this matcher first event.remove({ id: /^(?!gtceu:)([^:]+):(.*)_planks$/ }) + //It is too destructive to remove Slabs/stairs en-mass. and TBH we should be removing the recipes in the loop god this file FUCKING SUCKS. //forgive me for the sins im about to commit let woodType = [ 'fir',//index 0 @@ -60,6 +79,31 @@ ServerEvents.recipes(event => { 'rubber', //index 23 //architect pallets 'twisted', //index 25 + //BiomesWeve Gone Index 26-49 + 'aspen', + 'baobab', + 'blue_enchanted', + 'cika', + 'cypress', + 'ebony', + 'fir', + 'florus', + 'green_enchanted', + 'holly', + 'ironwood', + 'jacaranda', + 'mahogany', + 'maple', + 'palm', + 'pine', + 'rainbow_eucalyptus', + 'redwood', + 'sakura', + 'skyris', + 'white_mangrove', + 'willow', + 'witch_hazel', + 'zelkova' ] let mcWood = [ @@ -272,7 +316,10 @@ ServerEvents.recipes(event => { modID = 'gtceu' } else if (index === 24) { modID = 'architects_palette' + } else if (index >= 25) { + modID = 'biomeswevegone' } + if (Item.exists(`${modID}:${woodType}_log`)) { event.recipes.gtceu.cutter(`${modID}:${woodType}_cutting`) .itemInputs(`${modID}:${woodType}_log`) @@ -367,6 +414,44 @@ ServerEvents.recipes(event => { P: `${modID}:${woodType}_wood` }) } + //Slabs - This makes me want to drop myself down a flight of stairs. + // I hate this entire file with a burning passion but hey it's better than like 5000 manual recipes... + if (Item.exists(`${modID}:${woodType}_slab`)) { + event.remove({ output: `${modID}:${woodType}_slab` }) + event.shaped(`2x ${modID}:${woodType}_slab`, [ + ' ', + ' ', + 'TP ' + ], + { + T: '#forge:tools/saws', + P: `${modID}:${woodType}_planks` + }) + event.recipes.gtceu.cutter(`${modID}:${woodType}_slab_slicy`) + .itemInputs(`${modID}:${woodType}_planks`) + .itemOutputs(`2x ${modID}:${woodType}_slab`) + .duration(100) + .EUt(4); + } + //Stairs + if (Item.exists(`${modID}:${woodType}_stairs`)) { + event.remove({ output: `${modID}:${woodType}_stairs` }) + event.shaped(`4x ${modID}:${woodType}_stairs`, [ + 'W ', + 'WW ', + 'WWW' + ], + { + W: `${modID}:${woodType}_planks` + }) + event.recipes.gtceu.assembler(`${modID}:${woodType}_stairs_put_together`) + .itemInputs(`6x ${modID}:${woodType}_planks`) + .itemOutputs(`4x ${modID}:${woodType}_stairs`) + .circuit(7) + .duration(100) + .EUt(4); + } + //Stripped Wood -> Planks if (Item.exists(`${modID}:stripped_${woodType}_wood`)) { event.shaped(`4x ${modID}:${woodType}_planks`, [ @@ -524,6 +609,7 @@ ServerEvents.recipes(event => { S: `#forge:tools/saws` }) } + // //BOAT if (Item.exists(`${modID}:${woodType}_boat`)) { event.recipes.gtceu.assembler(`${modID}:${woodType}_planks`) @@ -926,15 +1012,15 @@ ServerEvents.recipes(event => { .itemOutputs('gtceu:wood_dust') .duration(100) .EUt(2); - event.remove({ output:'framedblocks:framed_chest' }) - event.shaped( 'framedblocks:framed_chest', [ - 'LFL', - 'FSF', - 'LFL' - ], { - L: '#minecraft:logs', - F: 'framedblocks:framed_cube', - S: 'minecraft:flint' - }) + event.remove({ output: 'framedblocks:framed_chest' }) + event.shaped('framedblocks:framed_chest', [ + 'LFL', + 'FSF', + 'LFL' + ], { + L: '#minecraft:logs', + F: 'framedblocks:framed_cube', + S: 'minecraft:flint' + }) } }) \ No newline at end of file diff --git a/overrides/kubejs/server_scripts/Recipes/NetherRemastered.js b/overrides/kubejs/server_scripts/Recipes/NetherRemastered.js index 06ab3d08..3c297fb9 100644 --- a/overrides/kubejs/server_scripts/Recipes/NetherRemastered.js +++ b/overrides/kubejs/server_scripts/Recipes/NetherRemastered.js @@ -15,7 +15,7 @@ ServerEvents.recipes(event => { .duration(800) .EUt(8); event.recipes.gtceu.extractor('gtceu:shard_fragment_3') - .itemInputs('embers:ancient_motive_core') + .itemInputs('minecraft:decorated_pot_sherds') .itemOutputs('nether_remastered:seal_piece_3') .duration(800) .EUt(8);