From 91eb9058375740b1f55748c26692da51af0c5ff1 Mon Sep 17 00:00:00 2001 From: MCTian-mi <35869948+MCTian-mi@users.noreply.github.com> Date: Sun, 11 Aug 2024 11:18:42 +0800 Subject: [PATCH 01/14] remove B.A.S.E --- config/acronym/base/General.cfg | 39 ------------------------------ config/acronym/material_system.cfg | 8 ------ manifest.json | 5 ---- 3 files changed, 52 deletions(-) delete mode 100644 config/acronym/base/General.cfg delete mode 100644 config/acronym/material_system.cfg diff --git a/config/acronym/base/General.cfg b/config/acronym/base/General.cfg deleted file mode 100644 index 7b6adbd84..000000000 --- a/config/acronym/base/General.cfg +++ /dev/null @@ -1,39 +0,0 @@ -# Configuration file - -general { - # Config entry for adding other items to count as tools. Format is "modid:item_name:meta" * is for any meta - S:"Other Tools" < - [immersiveengineering:tool:0 - thermalfoundation:wrench:* - techreborn:wrench:* - actuallyadditions:item_laser_wrench:* - hammercore:wrench:* - hammercore:iwrench:* - mekanism:configurator:* - calculator:wrench:* - ic2:wrench:* - appliedenergistics2:certus_quartz_wrench:* - appliedenergistics2:nether_quartz_wrench:* - enderio:item_yeta_wrench:* - botania:twigwand:* - essentials:wrench:* - factorytech:wrench:*] - > -} - - -materials { - # List for Prioritizing OreDict returns by modid - S:preferredOreDictIds < - contenttweaker - base - > -} - - -module { - B:"JourneyMap enabled"=true - B:"Tool enabled"=true -} - - diff --git a/config/acronym/material_system.cfg b/config/acronym/material_system.cfg deleted file mode 100644 index d35e79b3a..000000000 --- a/config/acronym/material_system.cfg +++ /dev/null @@ -1,8 +0,0 @@ -# Configuration file - -item { - # 0 - All Item Parts on a Single MC Item, 1 - All Item Parts have their own MC Item, > 1 - That many Parts per item - I:size=0 -} - - diff --git a/manifest.json b/manifest.json index 25a4c9e84..fc681cf38 100644 --- a/manifest.json +++ b/manifest.json @@ -781,11 +781,6 @@ "fileID": 5403908, "required": true }, - { - "projectID": 246996, - "fileID": 3440963, - "required": true - }, { "projectID": 304493, "fileID": 2666560, From b0b2651a1e311adbba9078d625f8c67c31067a31 Mon Sep 17 00:00:00 2001 From: MCTian-mi <35869948+MCTian-mi@users.noreply.github.com> Date: Sun, 11 Aug 2024 11:20:24 +0800 Subject: [PATCH 02/14] remove Dropt --- config/dropt.module.Dropt.cfg | 15 --------------- manifest.json | 5 ----- 2 files changed, 20 deletions(-) delete mode 100644 config/dropt.module.Dropt.cfg diff --git a/config/dropt.module.Dropt.cfg b/config/dropt.module.Dropt.cfg deleted file mode 100644 index e68990264..000000000 --- a/config/dropt.module.Dropt.cfg +++ /dev/null @@ -1,15 +0,0 @@ -# Configuration file - -general { - # Set to true to enable profiling output to the log file. - B:ENABLE_PROFILE_LOG_OUTPUT=false - - # Set to true to inject about 100,000 unique rules to assist in profiling. - # Used in development to test performance. - B:INJECT_PROFILING_RULES=false - - # Set to false to ignore unknown fields when deserializing JSON. - B:JSON_STRICT_MODE=true -} - - diff --git a/manifest.json b/manifest.json index fc681cf38..5f11b18f0 100644 --- a/manifest.json +++ b/manifest.json @@ -365,11 +365,6 @@ "fileID": 5290565, "required": true }, - { - "projectID": 284973, - "fileID": 5405050, - "required": true - }, { "projectID": 229084, "fileID": 2684033, From b41c829090ec1abf8d2934153b5be7a207eb69b2 Mon Sep 17 00:00:00 2001 From: MCTian-mi <35869948+MCTian-mi@users.noreply.github.com> Date: Sun, 11 Aug 2024 11:21:56 +0800 Subject: [PATCH 03/14] remove Mobs Properties Randomness --- .../MobsPropertiesRandomness.cfg | 26 ------------------- manifest.json | 5 ---- 2 files changed, 31 deletions(-) delete mode 100644 config/MobsPropertiesRandomness/MobsPropertiesRandomness.cfg diff --git a/config/MobsPropertiesRandomness/MobsPropertiesRandomness.cfg b/config/MobsPropertiesRandomness/MobsPropertiesRandomness.cfg deleted file mode 100644 index cbc510f68..000000000 --- a/config/MobsPropertiesRandomness/MobsPropertiesRandomness.cfg +++ /dev/null @@ -1,26 +0,0 @@ -# Configuration file - -config { - # Enable debug info in log file, useful when configuring the mod by adding and modifying JSONs - B:Debug=true - - ########################################################################################################## - # difficulty - #--------------------------------------------------------------------------------------------------------# - # Change all the difficulty multiplier settings here - ########################################################################################################## - - difficulty { - # Values affected by difficulty will be multiplied by this value in Easy Difficulty - D:"Easy Multiplier"=0.5 - - # Values affected by difficulty will be multiplied by this value in Hard Difficulty - D:"Hard Multiplier"=2.0 - - # Values affected by difficulty will be multiplied by this value in Normal Difficulty - D:"Normal Multiplier"=1.0 - } - -} - - diff --git a/manifest.json b/manifest.json index 5f11b18f0..a2ab681c7 100644 --- a/manifest.json +++ b/manifest.json @@ -325,11 +325,6 @@ "fileID": 3558882, "required": true }, - { - "projectID": 285012, - "fileID": 2823889, - "required": true - }, { "projectID": 237307, "fileID": 2937869, From 443167ed9993d9bdb7328d1b1801ffbc901700e6 Mon Sep 17 00:00:00 2001 From: MCTian-mi <35869948+MCTian-mi@users.noreply.github.com> Date: Sun, 11 Aug 2024 11:23:48 +0800 Subject: [PATCH 04/14] remove Overloaded --- config/overloaded/compressed.json | 65 ------------------------------- manifest.json | 5 --- 2 files changed, 70 deletions(-) delete mode 100644 config/overloaded/compressed.json diff --git a/config/overloaded/compressed.json b/config/overloaded/compressed.json deleted file mode 100644 index 9b11dbca7..000000000 --- a/config/overloaded/compressed.json +++ /dev/null @@ -1,65 +0,0 @@ -[ - { - "baseRegistryName": "minecraft:cobblestone", - "compressedPathRegistryName": "compressed_cobblestone", - "meta": 0, - "texturePath": "minecraft:textures/blocks/cobblestone.png", - "depth": 4, - "hardnessMultiplier": 9.0, - "recipeEnabled": true - }, - { - "baseRegistryName": "minecraft:sand", - "compressedPathRegistryName": "compressed_sand", - "meta": 0, - "texturePath": "minecraft:textures/blocks/sand.png", - "depth": 4, - "hardnessMultiplier": 9.0, - "recipeEnabled": true - }, - { - "baseRegistryName": "minecraft:stone", - "compressedPathRegistryName": "compressed_stone", - "meta": 0, - "texturePath": "minecraft:textures/blocks/stone.png", - "depth": 4, - "hardnessMultiplier": 9.0, - "recipeEnabled": true - }, - { - "baseRegistryName": "minecraft:obsidian", - "compressedPathRegistryName": "compressed_obsidian", - "meta": 0, - "texturePath": "minecraft:textures/blocks/obsidian.png", - "depth": 4, - "hardnessMultiplier": 9.0, - "recipeEnabled": true - }, - { - "baseRegistryName": "minecraft:netherrack", - "compressedPathRegistryName": "compressed_netherrack", - "meta": 0, - "texturePath": "minecraft:textures/blocks/netherrack.png", - "depth": 4, - "hardnessMultiplier": 9.0, - "recipeEnabled": true - }, - { - "baseRegistryName": "minecraft:dirt", - "compressedPathRegistryName": "compressed_dirt", - "meta": 0, - "texturePath": "minecraft:textures/blocks/dirt.png", - "depth": 4, - "hardnessMultiplier": 9.0, - "recipeEnabled": true - }, - { - "baseRegistryName": "minecraft:gravel", - "compressedPathRegistryName": "compressed_gravel", - "meta": 0, - "texturePath": "minecraft:textures/blocks/gravel.png", - "depth": 4, - "hardnessMultiplier": 9.0, - "recipeEnabled": true - } -] \ No newline at end of file diff --git a/manifest.json b/manifest.json index a2ab681c7..149e01b34 100644 --- a/manifest.json +++ b/manifest.json @@ -75,11 +75,6 @@ "fileID": 2682824, "required": true }, - { - "projectID": 264601, - "fileID": 2875265, - "required": true - }, { "projectID": 60089, "fileID": 3359843, From 9efc11881a415d6e74e6afca039fa5558d031717 Mon Sep 17 00:00:00 2001 From: MCTian-mi <35869948+MCTian-mi@users.noreply.github.com> Date: Sun, 11 Aug 2024 11:25:44 +0800 Subject: [PATCH 05/14] remove Infinitylib --- config/infinitylib.cfg | 8 -------- manifest.json | 5 ----- 2 files changed, 13 deletions(-) delete mode 100644 config/infinitylib.cfg diff --git a/config/infinitylib.cfg b/config/infinitylib.cfg deleted file mode 100644 index a452a5ae7..000000000 --- a/config/infinitylib.cfg +++ /dev/null @@ -1,8 +0,0 @@ -# Configuration file - -debug { - # Set to true if you wish to enable debug mode - B:debug=false -} - - diff --git a/manifest.json b/manifest.json index 149e01b34..839d4e2a4 100644 --- a/manifest.json +++ b/manifest.json @@ -620,11 +620,6 @@ "fileID": 3907346, "required": true }, - { - "projectID": 251396, - "fileID": 3317119, - "required": true - }, { "projectID": 229060, "fileID": 2801262, From 283a62d05c8b746b1bc6c71d9ffb60746c1a808b Mon Sep 17 00:00:00 2001 From: MCTian-mi <35869948+MCTian-mi@users.noreply.github.com> Date: Sun, 11 Aug 2024 11:31:48 +0800 Subject: [PATCH 06/14] remove DrawerFPS, change render distance to 16 --- .../Universal Tweaks - Mod Integration.cfg | 431 ++++++++++++++++++ config/DrawerFPS.cfg | 8 - manifest.json | 5 - 3 files changed, 431 insertions(+), 13 deletions(-) create mode 100644 buildOut/client-cleanroom/.minecraft/config/Universal Tweaks - Mod Integration.cfg delete mode 100644 config/DrawerFPS.cfg diff --git a/buildOut/client-cleanroom/.minecraft/config/Universal Tweaks - Mod Integration.cfg b/buildOut/client-cleanroom/.minecraft/config/Universal Tweaks - Mod Integration.cfg new file mode 100644 index 000000000..9643548ef --- /dev/null +++ b/buildOut/client-cleanroom/.minecraft/config/Universal Tweaks - Mod Integration.cfg @@ -0,0 +1,431 @@ +# Configuration file + +general { + + abyssalcraft { + # Optimizes AbyssalCraft's item transport system to reduce tick overhead + B:"Optimized Item Transport"=true + } + + "actually additions" { + # Fixes various duplication exploits + B:"Duplication Fixes"=true + } + + "arcane archives" { + # Fixes various duplication exploits + B:"Duplication Fixes"=true + } + + "advent of ascension" { + # Improves AoA player ticking by only sending inventory changes when necessary + B:"Improved Player Tick"=true + B:"Inventory-less GUI Compatibility"=false + } + + "biomes o' plenty" { + # Fixes rapid inflection of regeneration effects in hot spring water + B:"Hot Spring Water"=true + } + + "blood magic" { + # Fixes various duplication exploits + B:"Duplication Fixes"=true + + # Optimizes the Hellfire/Soul Forge to reduce tick time + B:"Optimized Hellfire Forge"=true + + # Fixes memory leak when unloading worlds/switching dimensions + B:"World Unload Memory Leak Fix"=true + } + + botania { + # Fixes various duplication exploits + B:"Duplication Fixes"=true + + # Enables the Botania Garden of Glass skybox for custom dimensions + # Abides by Botania's 'enableFancySkybox' config option + # Example: 43 + I:"Fancy Skybox" < + > + } + + chisel { + # Fixes various duplication exploits + B:"Duplication Fixes"=true + } + + "chocolate quest repoured" { + # Restores the golden feather behavior from the original Better Dungeons mod + B:"Legacy Golden Feather"=true + } + + "cofh core" { + # Sets the damage multiplier of the Vorpal enchantment + D:"Vorpal Enchantment Damage"=10.0 + } + + "elementary staffs" { + # Reintroduces the 1.5 electric staff behavior along with some subtle particles + B:"Electric Staff Port"=true + } + + "elenai dodge 2" { + # Chance per dodge to extinguish the player when burning + D:"Extinguishing Dodges"=0.0 + + # Fixes server-sided crashes when the Feathers Helper API is utilized + B:"Feathers Helper API Fix"=true + + # Sets the amount of consumed half-feathers per interval when the player is sprinting + I:"Sprinting Feather Consumption"=0 + + # Sets the rate feathers are consumed in ticks when the player is sprinting + I:"Sprinting Feather Interval"=20 + + # Sets the amount of half-feathers required to start sprinting + I:"Sprinting Feather Requirement"=6 + } + + "epic siege mod" { + # Disables leftover debug logging inside the digger AI of the beta builds + B:"Disable Digger AI Debug"=true + } + + "the erebus" { + # Prevents HWYLA/TOP crashes with preserved blocks + B:"Preserved Blocks Fix"=true + } + + "extra utilities 2" { + # Fixes various duplication exploits + B:"Duplication Fixes"=true + } + + forestry { + # Adds custom emerald to germling trades to the arborist villager + # Syntax: level;emeralds_min;emeralds_max;germlings_min;germlings_max;type;complexity_min;complexity_max + # level Level when this trade becomes available (how much trading needs to be done) + # emeralds_min Lower random limit for emeralds + # emeralds_max Upper random limit for emeralds + # germlings_min Lower random limit for germlings + # germlings_max Upper random limit for germlings + # type Type of germling, can be either pollen or sapling + # complexity_min Lower limit of allele complexity + # complexity_max Upper limit of allele complexity + # + # Example for a level 5 trade for a single sapling with a complexity between 6 and 10, costing between 10 to 40 emeralds: + # 5;10;40;1;1;sapling;6;10 + S:"Arborist Villager Trades" < + > + + # Disables damage caused by bees bypassing player armor + B:"Disable Bee Damage Armor Bypass"=true + + # Fixes various duplication exploits + B:"Duplication Fixes"=true + + # Allows Forestry farms to pick up ExtraTrees fruit + B:"Extra Trees: Gather Windfall"=true + + # Allows Forestry farms to automatically replant cocoa beans + B:"Replanting Cocoa Beans"=true + } + + "industrialcraft 2" { + # Fixes various duplication exploits + B:"Duplication Fixes"=true + } + + "industrial foregoing" { + # Fixes various duplication exploits + B:"Duplication Fixes"=true + } + + "infernal mobs" { + # Enables compatibility between Infernal Mobs' Sticky effect and Reliquary's Pedestal + B:"Sticky Pedestal Compatibility"=true + + # Enables compatibility between Infernal Mobs' Sticky effect and Capsule's Recall enchantment + B:"Sticky Recall Compatibility"=true + } + + "iron backpacks" { + # Fixes various duplication exploits + B:"Duplication Fixes"=true + } + + "item stages" { + # Changes item matching code to CraftTweaker's ingredient matching system, fixes item NBT issues + B:"Ingredient Matching"=true + } + + mekanism { + # Fixes various duplication exploits + B:"Duplication Fixes"=true + } + + "mob stages" { + # Fixes mob replacement ignoring entity spawning rules + B:"Spawning Rules Fixes"=true + } + + "nether chest" { + # Fixes various duplication exploits + B:"Duplication Fixes"=true + } + + netherrocks { + # Prevents crashing with mods implementing right click crop harvesting + B:"Right Click Harvesting Fix"=true + } + + nuclearcraft { + # Changes the data table of the radiation environment handler to improve tick time + # CONCURRENT_HASHMAP: NuclearCraft default + # CONCURRENT_LINKED_HASHMAP: Keeps order of radiation environment info to improve iteration - Better performance + # CONCURRENT_LINKED_QUEUE: Uses a queue to avoid iteration - Best performance + # Valid values: + # CONCURRENT_HASHMAP + # CONCURRENT_LINKED_HASHMAP + # CONCURRENT_LINKED_QUEUE + S:"Radiation Environment Map"=CONCURRENT_LINKED_QUEUE + } + + projectred { + # Fixes various duplication exploits + B:"Duplication Fixes"=true + } + + quark { + # Fixes various duplication exploits + B:"Duplication Fixes"=true + } + + roost { + # Improves load time by registering ContentTweaker chickens early for Roost to detect them + # Note: If you would like to use ContentTweaker's MaterialSystem Parts for the layed item, in your script you must: + # 1) Use '#loader finalize_contenttweaker', not '#loader contenttweaker' + # 2) Use the Material Part Bracket Handler to reference the item + B:"ContentTweaker: Early Register CT Chickens"=false + S:"Custom Chickens" < + > + } + + "simple difficulty" { + # Fixes the interaction of iron canteens with rain collectors + B:"Iron Canteen Interaction Fix"=true + } + + "simply jetpacks" { + # Fixes a client-side memory leak associated with EntityPlayer + B:"Memory Leak Fix"=true + } + + "spice of life" { + # Fixes various duplication exploits + B:"Duplication Fixes"=true + } + + "storage drawers" { + # Approximate range in blocks at which drawers render contained items + # 0 for default unlimited range + I:"Render Range"=16 + } + + "tardis mod" { + # Fixes a client-side memory leak associated with EntityPlayer + B:"Memory Leak Fix"=true + } + + "tech reborn" { + # Optimizes the Rolling Machine to reduce tick time + B:"Optimized Rolling Machine"=true + } + + thaumcraft { + # Fixes various duplication exploits + B:"Duplication Fixes"=true + + # Fixes the bounding box always being at the center in both cinderpearls and shimmerleafs + B:"Flower Bounding Box"=true + + # Stops the thaumometer from bobbing rapidly when using it to scan objects + B:"Stable Thaumometer"=true + } + + "thaumcraft: entities" { + # Adds particles to firebats similar to legacy versions + B:"Firebat Particles"=true + + # Rotates dead eldritch crabs all the way like endermites, silverfish, and spiders + B:"Spiderlike Eldritch Crabs"=true + + # Increases particle size of wisps similar to legacy versions + B:"Wisp Particles"=true + } + + "thaumcraft: foci" { + + "focus effects" { + # Overhauls the break focus effect cast sound + B:"[01] Break: Cast Sound Revamp"=true + + # Adds an impact sound to the break focus effect + B:"[02] Break: Impact Sound"=true + + # Overhauls the earth focus effect cast sound + B:"[03] Earth: Cast Sound Revamp"=true + + # Adds an impact sound to the earth focus effect + B:"[04] Earth: Impact Sound"=true + + # Adds an impact sound to the fire focus effect + B:"[05] Fire: Impact Sound"=true + + # Adds an impact sound to the flux focus effect + B:"[06] Flux: Impact Sound"=true + + # Overhauls the frost focus effect cast sound to make it a lot less plangent + B:"[07] Frost: Cast Sound Revamp"=true + + # Adds an impact sound to the frost focus effect + B:"[08] Frost: Impact Sound"=true + + # Overhauls the heal focus effect cast sound + B:"[09] Heal: Cast Sound Revamp"=true + + # Adds an impact sound to the heal focus effect + B:"[10] Heal: Impact Sound"=true + + # Overhauls the rift focus effect cast sound + B:"[11] Rift: Cast Sound Revamp"=true + + # Adds an impact sound to the rift focus effect + B:"[12] Rift: Impact Sound"=true + } + + "focus mediums" { + # Plays an additional cast sound when using any bolt focus medium to add an extra layer of pow + B:"[1] Bolt: Cast Sound"=true + + # Plays an additional cast sound when using any cloud focus medium + B:"[2] Cloud: Cast Sound"=true + + # Adds additional cast, despawn, and setup sounds when using any mine focus medium + B:"[3] Mine: Sound Overhaul"=true + + # Plays an additional cast sound when summoning any type of spellbat + B:"[4] Spellbat: Cast Sound"=true + } + + } + + "thaumic wonders" { + # Fixes various duplication exploits + B:"Duplication Fixes"=true + + # Fixes a client-side memory leak when wearing Void Fortress armor + B:"Memory Leak Fix"=true + } + + "the farlanders" { + # Fixes various duplication exploits + B:"Duplication Fixes"=true + } + + "thermal expansion" { + # Fixes various duplication exploits + B:"Duplication Fixes"=true + + # Adds Monoculture Cycle integration to desired phytogenic insolator recipes added by ModTweaker + # Register the recipe with Insolator.addRecipeMonoculture() instead of Insolator.addRecipe() in .zs files + # (and Insolator.addRecipeMonocultureSaplingInfuser() instead of Insolator.addRecipeSaplingInfuser()) + # Note: Make sure the 'fertilizer' is specified as the secondaryInput arg in the function + B:"Insolator Custom Monoculture"=true + } + + "tinkers' construct" { + # Fixes various duplication exploits + B:"Duplication Fixes"=true + + # Excludes gaseous fluids from being transferable via faucets + B:"Gaseous Fluids"=false + + # Hides tool/bow materials in the 'Materials and You' book + # Syntax: material + # Enabling debug logging prints all materials on game launch + S:"Material Blacklist" < + > + + # Suppresses special abilities of long swords and rapiers when shurikens are wielded in the offhand + B:"Offhand Shuriken"=true + + # Caches all ore dictionary smelting recipes to speed up game loading + B:"Ore Dictionary Cache"=true + + # Despawns unbreakable projectiles faster to improve framerates + B:"Projectile Despawning"=true + + # Enables usage of tweaks in below category to customize Tinkers' tools stats + B:"Tool Customization"=true + + "tool customization" { + # Sets the rate at which a tool's attack damage incrementally decays depending on its damage cutoff + # Default value: 0.9 + # Range: 0.0 - 1.0 + # Note: A rate of 1.0 means there is no damage decay + # Note: The damage curve will cap the maximum value to (tool's damage cutoff)/(1 - decay rate) + S:"Attack Damage Decay Rate"=0.9 + + # Sets the attack damage cutoff at which diminishing returns start for the cleaver + # Default value: 25.0 + D:"Cleaver Attack Damage Cutoff"=25.0 + + # Sets the attack damage cutoff at which diminishing returns start for any Tinkers' tool not listed here + # Default value: 15.0 + D:"General Attack Damage Cutoff"=15.0 + + # Sets the attack damage cutoff at which diminishing returns start for the longsword + # Default value: 18.0 + D:"Longsword Attack Damage Cutoff"=18.0 + + # Sets the attack damage cutoff at which diminishing returns start for the PlusTiC katana + # Default value: 22.0 + D:"PlusTiC: Katana Attack Damage Cutoff"=22.0 + + # Sets the attack damage cutoff at which diminishing returns start for the rapier + # Default value: 13.0 + D:"Rapier Attack Damage Cutoff"=13.0 + } + + } + + "tiny progressions" { + # Fixes various duplication exploits + B:"Duplication Fixes"=true + } + + "cb multipart/forge multipart cbe" { + # Fixes a memory leak associated with EntityPlayer + B:"Memory Leak Fix"=true + } + + "compact machines" { + # Fixes some compact machine walls being invisible if Nothirium 0.2.x (and up) or Vintagium is installed + B:"Invisible Wall Render Fix"=true + } + + "effortless building" { + # Fixes Effortless Building ignoring Metadata when checking for items in inventory + B:"Block Transmutation Fix"=true + } + + mrtjpcore { + # Fixes a memory leak associated with EntityPlayer + B:"Memory Leak Fix"=true + } + +} + + diff --git a/config/DrawerFPS.cfg b/config/DrawerFPS.cfg deleted file mode 100644 index 350f74186..000000000 --- a/config/DrawerFPS.cfg +++ /dev/null @@ -1,8 +0,0 @@ -# Configuration file - -general { - # Range at which drawers should render their items. Default = 10 blocks - I:"Render Range"=5 -} - - diff --git a/manifest.json b/manifest.json index 839d4e2a4..0a2a8a42c 100644 --- a/manifest.json +++ b/manifest.json @@ -610,11 +610,6 @@ "fileID": 4655859, "required": true }, - { - "projectID": 614513, - "fileID": 3756455, - "required": true - }, { "projectID": 296686, "fileID": 3907346, From 2905b776f3c705a6d78cb81d8fe15d4bec424be8 Mon Sep 17 00:00:00 2001 From: MCTian-mi <35869948+MCTian-mi@users.noreply.github.com> Date: Sun, 11 Aug 2024 11:40:22 +0800 Subject: [PATCH 07/14] remove BiomeTweaker --- config/BiomeTweaker/BiomeTweaker.cfg | 18 ------------------ config/BiomeTweaker/scripts/MoonLight.cfg | 20 -------------------- config/BiomeTweaker/scripts/Titan.cfg | 19 ------------------- config/BiomeTweaker/scripts/Titania.cfg | 21 --------------------- manifest.json | 5 ----- 5 files changed, 83 deletions(-) delete mode 100644 config/BiomeTweaker/BiomeTweaker.cfg delete mode 100644 config/BiomeTweaker/scripts/MoonLight.cfg delete mode 100644 config/BiomeTweaker/scripts/Titan.cfg delete mode 100644 config/BiomeTweaker/scripts/Titania.cfg diff --git a/config/BiomeTweaker/BiomeTweaker.cfg b/config/BiomeTweaker/BiomeTweaker.cfg deleted file mode 100644 index a3f517725..000000000 --- a/config/BiomeTweaker/BiomeTweaker.cfg +++ /dev/null @@ -1,18 +0,0 @@ -# Configuration file - -"output files" { - # If true, BiomeTweaker will not generate any output files. [default: false] - B:"Disable Output Files"=false - - # If true, BiomeTweaker will generate separate files for each item when creating the status report. [default: true] - B:"Output Seperate Files"=true -} - - -scripting { - # A list of script files to include that are not in the scripts folder. An example script file is created along with this configuration file. [default: ] - S:"Script Files" < - > -} - - diff --git a/config/BiomeTweaker/scripts/MoonLight.cfg b/config/BiomeTweaker/scripts/MoonLight.cfg deleted file mode 100644 index 611c7d423..000000000 --- a/config/BiomeTweaker/scripts/MoonLight.cfg +++ /dev/null @@ -1,20 +0,0 @@ -Tweaker.setStage("BIOME_REGISTRY") -Tweaker.createBiome("moon_light", "minecraft:plains") -moon_light = forBiomes("biometweaker:moon_light") -moon_light.set("name", "moon_light") -moon_light.set("topBlock", "advancedrocketry:moonturf") -moon_light.set("fillerBlock", "advancedrocketry:moonturf") -moon_light.set("height", 1.2) -moon_light.set("heightVariation", 0.1) -moon_light.set("genVillages", false) -moon_light.set("genStrongholds", false) -moon_light.addActualFillerBlock("minecraft:stone") -moon_light.removeDecoration("CLAY") -moon_light.removeDecoration("LAKE_LAVA") -moon_light.removeDecoration("LAKE_WATER") -moon_light.removeDecoration("PUMPKIN") -moon_light.removeDecoration("FLOWER") -moon_light.removeFeature("LAKE") -moon_light.removeFeature("LAVA") -moon_light.removeAllSpawns("CREATURE") -moon_light.removeAllSpawns("MONSTER") \ No newline at end of file diff --git a/config/BiomeTweaker/scripts/Titan.cfg b/config/BiomeTweaker/scripts/Titan.cfg deleted file mode 100644 index e60b4bd84..000000000 --- a/config/BiomeTweaker/scripts/Titan.cfg +++ /dev/null @@ -1,19 +0,0 @@ -Tweaker.setStage("BIOME_REGISTRY") -Tweaker.createBiome("titan_surface", "minecraft:plains") -titan = forBiomes("biometweaker:titan_surface") -titan.set("name", "Titan") -titan.set("topBlock", "contenttweaker:titandust") -titan.set("fillerBlock", "contenttweaker:titandust") -titan.set("height", 0.5) -titan.set("heightVariation", 0.5) -titan.set("genVillages", false) -titan.set("genStrongholds", false) -titan.set("skyColor", 16737792) -titan.set("fogColor", 16737792) -titan.addActualFillerBlock("minecraft:stone") -titan.removeDecoration("CLAY") -titan.removeDecoration("LAKE_LAVA") -titan.removeDecoration("PUMPKIN") -titan.removeDecoration("FLOWER") -titan.removeAllSpawns("CREATURE") -titan.removeAllSpawns("MONSTER") diff --git a/config/BiomeTweaker/scripts/Titania.cfg b/config/BiomeTweaker/scripts/Titania.cfg deleted file mode 100644 index 31eec98e2..000000000 --- a/config/BiomeTweaker/scripts/Titania.cfg +++ /dev/null @@ -1,21 +0,0 @@ -Tweaker.setStage("BIOME_REGISTRY") -Tweaker.createBiome("titania_surface", "minecraft:plains") -titania = forBiomes("biometweaker:titania_surface") -titania.set("name", "Titania") -titania.set("topBlock", "contenttweaker:titaniadust") -titania.set("fillerBlock", "contenttweaker:titaniadust") -titania.set("height", 0.5) -titania.set("heightVariation", 0.5) -titania.set("genVillages", false) -titania.set("genStrongholds", false) -titania.addActualFillerBlock("contenttweaker:titaniastone") -titania.removeDecoration("CLAY") -titania.removeDecoration("LAKE_LAVA") -titania.removeDecoration("LAKE_WATER") -titania.removeDecoration("PUMPKIN") -titania.removeDecoration("FLOWER") -titania.removeFeature("LAKE") -titania.removeFeature("LAVA") -titania.removeAllSpawns("CREATURE") -titania.removeAllSpawns("MONSTER") -titania.registerGenBlockRep("minecraft:stone", "contenttweaker:titaniastone") \ No newline at end of file diff --git a/manifest.json b/manifest.json index 0a2a8a42c..757c57d19 100644 --- a/manifest.json +++ b/manifest.json @@ -560,11 +560,6 @@ "fileID": 3085585, "required": true }, - { - "projectID": 228895, - "fileID": 3112142, - "required": true - }, { "projectID": 232131, "fileID": 2624732, From 5380123fe47a4bbb273be4ff0c7c7b0892ec314a Mon Sep 17 00:00:00 2001 From: MCTian-mi <35869948+MCTian-mi@users.noreply.github.com> Date: Sun, 11 Aug 2024 11:45:13 +0800 Subject: [PATCH 08/14] remove Just Enough Dimensions --- config/justenoughdimensions/dimensions.json | 105 ---------------- .../justenoughdimensions.cfg | 115 ------------------ manifest.json | 5 - 3 files changed, 225 deletions(-) delete mode 100644 config/justenoughdimensions/dimensions.json delete mode 100644 config/justenoughdimensions/justenoughdimensions.cfg diff --git a/config/justenoughdimensions/dimensions.json b/config/justenoughdimensions/dimensions.json deleted file mode 100644 index fb13039c7..000000000 --- a/config/justenoughdimensions/dimensions.json +++ /dev/null @@ -1,105 +0,0 @@ -{ - "dimensions": [ - { - "dim": -1, - "override": true, - "dimensiontype": - { - "id": -1, - "name": "Nether", - "keeploaded": false, - "worldprovider": "WorldProviderHellJED", - "require_exact_match": true - }, - "jed": { - "MovementFactor": 0.125 - } - }, - { - "dim": 8, - "dimensiontype": { - "id": 8, - "name": "Luna", - "suffix": "_dim8", - "keeploaded": false, - "require_exact_match": true, - "worldprovider": "WorldProviderSurfaceJEI" - }, - "jed": { - "SkyRenderer": "zmaster587.advancedRocketry.client.render.planet.RenderPlanetarySky", - "__or_perhaps:": "zmaster587.advancedRocketry.client.render.planet.RenderSpaceSky", - "CustomDayCycle": true, - "DayLength": 360000, - "NightLength": 360000 - }, - "worldinfo_onetime": { - "generatorName": "lostcities", - "generatorOptions": "{ \"profile\": \"moon\" }", - "RandomSeed": "" - } - }, - { - "dim": 32, - "biome": "advancedRocketry:hotdryrock", - "dimensiontype": { - "id": 32, - "name": "Mars", - "suffix": "_dim32", - "keeploaded": false, - "require_exact_match": true, - "worldprovider": "WorldProviderSurfaceJEI" - }, - "jed": { - "SkyRenderer": "zmaster587.advancedRocketry.client.render.planet.RenderPlanetarySky", - "__or_perhaps:": "zmaster587.advancedRocketry.client.render.planet.RenderSpaceSky" - }, - "worldinfo_onetime": { - "generatorName": "default", - "generatorOptions": "{\"seaLevel\":1,\"useWaterLakes\":false},\"useLavaLakes\":false}", - "RandomSeed": "" - } - }, - { - "dim": 35, - "biome": "biometweaker:titan_surface", - "dimensiontype": { - "id": 35, - "name": "Titan", - "suffix": "_dim35", - "keeploaded": false, - "require_exact_match": true, - "worldprovider": "WorldProviderSurfaceJED" - }, - "jed": { - "SkyRenderer": "zmaster587.advancedRocketry.client.render.planet.RenderPlanetarySky", - "__or_perhaps:": "zmaster587.advancedRocketry.client.render.planet.RenderSpaceSky" - }, - "worldinfo_onetime": { - "generatorName": "default", - "generatorOptions": "{\"useWaterLakes\":false}", - "RandomSeed": "" - } - }, - { - "dim": 39, - "biome": "biometweaker:titania_surface", - "dimensiontype": { - "id": 39, - "name": "Titania", - "suffix": "_dim39", - "keeploaded": false, - "require_exact_match": true, - "worldprovider": "WorldProviderSurfaceJED" - }, - "jed": { - "SkyRenderer": "zmaster587.advancedRocketry.client.render.planet.RenderPlanetarySky", - "__or_perhaps:": "zmaster587.advancedRocketry.client.render.planet.RenderSpaceSky" - }, - "worldinfo_onetime": { - "generatorName": "default", - "generatorOptions": "{\"seaLevel\":20,\"useWaterLakes\":false}", - "RandomSeed": "" - } - } - ] -} \ No newline at end of file diff --git a/config/justenoughdimensions/justenoughdimensions.cfg b/config/justenoughdimensions/justenoughdimensions.cfg deleted file mode 100644 index 2e1420167..000000000 --- a/config/justenoughdimensions/justenoughdimensions.cfg +++ /dev/null @@ -1,115 +0,0 @@ -# Configuration file - -Client { - # Enables the Grass/Foliage/Water color customizations. This controls whether or not the event handlers get registered. - B:enableColorOverrides=true -} - - -ConfigHandling { - # If enabled, then the dimension config ('dimensions.json') - # will be copied to each save and used from there, to avoid changes in the - # global/pack config from breaking the saves due to possibly differing settings between worlds. - # NOTE: This option ONLY affects whether or not the config is automatically _copied to_ each world. - B:copyDimensionConfigToWorld=true - - # If enabled, then the "main config" ('justenoughdimensions.cfg') - # will be copied to each save and used from there, to avoid changes in the - # global/pack config from breaking the saves due to possibly differing settings between worlds. - # NOTE: This option ONLY affects whether or not the config is automatically _copied to_ each world. - B:copyMainConfigToWorld=true - - # If enabled, then the dimension config ('dimensions.json') - # will read from within each world/save, if it exists there. - # Also see the option 'copyDimensionConfigToWorld' to enable automatically copying it there. - B:usePerWorldDimensionConfig=false - - # If enabled, then the "main config" ('justenoughdimensions.cfg') - # will read from within each world/save, if it exists there. - # Also see the option 'copyMainConfigToWorld' to enable automatically copying it there. - B:usePerWorldMainConfig=false -} - - -Generic { - # Enables redirecting the vanilla /time, /weather etc. commands to the JED variants in WorldInfo-overridden dimensions - B:enableCommandRedirecting=true - - # Enables switching players' gamemode when they enter a dimension which has the ForceGameMode option set to true - B:enableForcedGameModes=false - - # Enables overriding the initial spawning dimension to something other than dim 0 (overworld). - B:enableInitialSpawnDimensionOverride=false - - # Enables a bunch of extra logging on the INFO level for registrations etc. - B:enableLoggingInfo=false - - # If enabled, then a '"biome": "registrynameofbiome"' value in the dimensions.json config will override the - # BiomeProvider of that dimension with BiomeProviderSingle, using the biome given as the value. - # This means that the entire dimension will use only that one biome set in the config. - # To get the registry names of biomes, you can use the TellMe mod (the command '/tellme dump biomes'). - B:enableOverrideBiomeProvider=true - - # If enabled, then a '"WorldProviderOverride": "class name"' value in JED options in the dimensions.json config - # will override the WorldProvider of that dimension with one created by the provided class name. - # NOTE: This is normally not recommended!!! - # This is provided for certain mod compatibility cases, - # where the other mod is checking the DimensionType against one of the vanilla values, and thus - # you have to use an "existing_dimensiontype" key in the "dimensiontype" object, instead of - # registering/defining a new custom entry as you would do normally. - B:enableOverrideWorldProvider=false - - # Enables "player inventory groups". - # These groups can be used to separate the player inventories in some dimensions - # or groups of dimensions. Whenever a player switches dimensions, if the groups - # in the from and to dimensions are different, then the player inventories will be - # stored and swapped. The groups can be set in "jed": { "PlayerInventoryGroup": "FooBar" }. - # You can use an empty string value to automatically set it to "dim_". - # The default group name for dimensions that don't define anything for it is "__default". - B:enablePlayerInventoryGroups=false - - # If enabled, then an 'override: true' boolean value for the dimension in - # the dimensions.json config can be used to override an existing dimension. - B:enableReplacingRegisteredDimensions=false - - # If enabled, adds custom WorldBorder syncing and removes default linking from other dimensions to the overworld border. - B:enableSeparateWorldBorders=false - - # If enabled, all dimensions that exist in dimensions.json and have either a"worldinfo" or a "worldinfo_onetime" value present (an empty object is enough), - # will use separate WorldInfo instances (separate time, weather, world border, gamerules etc.). - # This works even if the dimension in question isn't registered by this mod - # (so vanilla, or other mod dimensions can have it too). - B:enableSeparateWorldInfo=true - - # If enabled, then an 'unregister: true' boolean value for the dimension in - # the dimensions.json config can be used to unregister existing dimension. - B:enableUnregisteringDimensions=false - - # If enabled with the enableInitialSpawnDimensionOverride option, this will be used as the initial spawn dimension ID - I:initialSpawnDimensionId=0 - - # If the players first join into a ForceGameMode dimension, then this option sets the "normal" - # game mode they should get when they leave that dimension for a non-ForceGameMode dimension. - # Valid values are: adventure, creative, spectator and survival - S:normalGameMode=survival -} - - -Version { - # For the config file copying/replacement to happen, this id - # in the old per-world config must match the id in the current global/common config, - # for the automatic config upgrade/override from the global config to the per-world config to happen. - S:configId=__default - - # Config version tracking. - # If you are a mod pack developer and need to force a config change - # for users (when using the per-world configs option), increase the version number here - # to tell the mod to copy this config version over an existing, older, per-world config. - # Also note that the 'configId' value should be set to something mod pack specific, - # basically to tie the per-world configs to the pack in question, - # and not overwrite the per-world config with one from a different pack. - # (Although it probably would be extremely rare for anyone to try to load the same world in a different pack...) - I:version=0 -} - - diff --git a/manifest.json b/manifest.json index 757c57d19..764f2cbbf 100644 --- a/manifest.json +++ b/manifest.json @@ -445,11 +445,6 @@ "fileID": 3143467, "required": true }, - { - "projectID": 254317, - "fileID": 3840727, - "required": true - }, { "projectID": 238747, "fileID": 2739582, From 9ae54e44d64681269258814d61f7dac91f0d8f3a Mon Sep 17 00:00:00 2001 From: MCTian-mi <35869948+MCTian-mi@users.noreply.github.com> Date: Sun, 11 Aug 2024 11:47:19 +0800 Subject: [PATCH 09/14] changing drawer render distance to 32 --- .../.minecraft/config/Universal Tweaks - Mod Integration.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildOut/client-cleanroom/.minecraft/config/Universal Tweaks - Mod Integration.cfg b/buildOut/client-cleanroom/.minecraft/config/Universal Tweaks - Mod Integration.cfg index 9643548ef..3d99be354 100644 --- a/buildOut/client-cleanroom/.minecraft/config/Universal Tweaks - Mod Integration.cfg +++ b/buildOut/client-cleanroom/.minecraft/config/Universal Tweaks - Mod Integration.cfg @@ -230,7 +230,7 @@ general { "storage drawers" { # Approximate range in blocks at which drawers render contained items # 0 for default unlimited range - I:"Render Range"=16 + I:"Render Range"=32 } "tardis mod" { From 01d55dda9f1e5435a80744dcc51e94ba38e11180 Mon Sep 17 00:00:00 2001 From: MCTian-mi <35869948+MCTian-mi@users.noreply.github.com> Date: Sun, 11 Aug 2024 11:58:17 +0800 Subject: [PATCH 10/14] delete BiomeTweakerCore.cfg --- config/BiomeTweakerCore/BiomeTweakerCore.cfg | 42 -------------------- 1 file changed, 42 deletions(-) delete mode 100644 config/BiomeTweakerCore/BiomeTweakerCore.cfg diff --git a/config/BiomeTweakerCore/BiomeTweakerCore.cfg b/config/BiomeTweakerCore/BiomeTweakerCore.cfg deleted file mode 100644 index 857849578..000000000 --- a/config/BiomeTweakerCore/BiomeTweakerCore.cfg +++ /dev/null @@ -1,42 +0,0 @@ -# Configuration file - -asm { - # This can be used to specify biome classes BiomeTweaker should not touch with ASM. You can find the class for a biome in the output files. You should only be using this if you understand what ASM is, and you know the issue it is causing. [default: ] - S:"ASM Blacklist" < - > -} - - -"asm tweaks" { - # Enables the 'addActualFillerBlock' command. [default: false] - B:"Actual Filler Blocks"=false - - # Enables 'fogColor' in the set command. [default: false] - B:"Fog Color"=false - - # Enables 'foliageColor' in the set command. [default: false] - B:"Foliage Color"=false - - # Enables 'grassColor' in the set command. [default: false] - B:"Grass Color"=false - - # Enables 'genInitialSnow' in the set command. [default: false] - B:"Initial Snow Gen"=false - - # Enables 'oceanFillerBlock' in the set command. [default: false] - B:"Ocean Filler Block"=false - - # Enables 'oceanTopBlock' in the set command. [default: false] - B:"Ocean Top Block"=false - - # Enable this if you want BiomeTweaker to force topBlock and fillerBlock overrides in most biomes. This is done by using ASM to strip some assignments that happen in the 'genTerrainBlocks' method. This will not work for all biomes. This WILL cause issues where some biomes will have incorrect top and filler blocks if you do not override them (Extreme Hills (M), Mutated Savannah, Taiga). light ASM must be disabled for this to have any effect. [default: false] - B:"Remove Late Block Assignments"=false - - # Enables 'skyColor' in the set command. [default: false] - B:"Sky Color"=false - - # Enables 'waterColor' in the set command. [default: false] - B:"Water Color"=false -} - - From 14bc8d039bf4e7bcd997a03bc34a18089dd3e3e7 Mon Sep 17 00:00:00 2001 From: MCTian-mi <35869948+MCTian-mi@users.noreply.github.com> Date: Sun, 11 Aug 2024 12:00:26 +0800 Subject: [PATCH 11/14] remove Water Control Extreme, allow infinite water when y <= 63 in river/ocean biomes using UT --- config/Universal Tweaks - Tweaks.cfg | 2 +- config/watercontrolextreme.cfg | 35 ---------------------------- manifest.json | 5 ---- 3 files changed, 1 insertion(+), 41 deletions(-) delete mode 100644 config/watercontrolextreme.cfg diff --git a/config/Universal Tweaks - Tweaks.cfg b/config/Universal Tweaks - Tweaks.cfg index c342a4196..b5f591561 100644 --- a/config/Universal Tweaks - Tweaks.cfg +++ b/config/Universal Tweaks - Tweaks.cfg @@ -88,7 +88,7 @@ general { "finite water" { # Prevents creation of infinite water sources - B:"[1] Finite Water Toggle"=false + B:"[1] Finite Water Toggle"=true # Allows creation of infinite water sources in ocean and river biomes B:"[2] Allow Water Biomes"=true diff --git a/config/watercontrolextreme.cfg b/config/watercontrolextreme.cfg deleted file mode 100644 index a1c6d0338..000000000 --- a/config/watercontrolextreme.cfg +++ /dev/null @@ -1,35 +0,0 @@ -# Configuration file - -general { - # Block registry names for fluids that should be made finite - S:finiteFluids < - water - > - - # Biomes in which these fluids should be infinite - S:infiniteBiomes < - minecraft:ocean - minecraft:deep_ocean - minecraft:beach - minecraft:stone_beach - minecraft:cold_beach - minecraft:beaches - minecraft:river - > - - # Dimensions in which these fluids should be infinite - I:infiniteDimensions < - > - - # Minimum y-level in which fluids can form new source blocks. - # Min: 0 - # Max: 255 - I:maxHeight=255 - - # Maximum y-level in which fluids can form new source blocks. - # Min: 0 - # Max: 255 - I:minHeight=0 -} - - diff --git a/manifest.json b/manifest.json index 764f2cbbf..61ff54569 100644 --- a/manifest.json +++ b/manifest.json @@ -205,11 +205,6 @@ "fileID": 2744766, "required": true }, - { - "projectID": 277890, - "fileID": 2555574, - "required": true - }, { "projectID": 230497, "fileID": 2450900, From fdfc63f3e49126f50f7b063b6a4940c806553dba Mon Sep 17 00:00:00 2001 From: MCTian-mi <35869948+MCTian-mi@users.noreply.github.com> Date: Sun, 11 Aug 2024 12:07:37 +0800 Subject: [PATCH 12/14] replace SoundFilters with Sound Physics Remixin --- config/soundfilters.cfg | 88 ----------------------------------------- manifest.json | 4 +- 2 files changed, 2 insertions(+), 90 deletions(-) delete mode 100644 config/soundfilters.cfg diff --git a/config/soundfilters.cfg b/config/soundfilters.cfg deleted file mode 100644 index 57d7a86a9..000000000 --- a/config/soundfilters.cfg +++ /dev/null @@ -1,88 +0,0 @@ -# Configuration file - -debug { - # Set to true to write simple debug info to the console. [default: false] - B:Debug=false - - # You probably don't want to set this to true - # unless you actually want to debug the mod. - # It writes quite a lot in the console. [default: false] - B:"High Output Debug"=false -} - - -low_pass { - # The amount of low pass that will be applied in lava. Lower is stronger. [range: 0.0 ~ 1.0, default: 0.2] - S:"Lava Low Pass Amount"=0.2 - - # The multiplier for volume when you are in lava. Lower is quieter. [range: 0.0 ~ 1.0, default: 0.6] - S:"Lava Low Pass Volume"=0.6 - - # Set to false to disable low pass filter in water and lava. [default: true] - B:"Use Low Pass?"=true - - # The amount of low pass that will be applied in water. Lower is stronger. [range: 0.0 ~ 1.0, default: 0.4] - S:"Water Low Pass Amount"=0.4 - - # The multiplier for volume when you are in water. Lower is quieter. [range: 0.0 ~ 1.0, default: 1.0] - S:"Water Low Pass Volume"=1.0 -} - - -occlusion { - # The percentage of occlusion you can get. You can lower this if you find - # the occlusion to be too much or raise it for a more noticeable - # effect. [range: 0.0 ~ Infinity, default: 1.0] - S:"Occlusion Percent"=1.0 - - # Add new entries (each on a new line) in the format - # -- to customize how much sound - # they should absorb when they are between you and the sound source. - # For the metadata, 16 means any metadata value. The amount is a - # double, with 0.0 absorbing no sound (like air), and 1.0 being the normal - # amount, and 2.0 being twice the normal amount. By default, wool has - # entry wool-16-2.0 which is twice the normal sound absorbtion. [default: [wool-16-2.0]] - S:"Specific block occlusion:" < - wool-16-2.0 - > - - # Set to false to disable low pass filter for sounds behind solid walls. - # If you are getting lag, disabling this might help. [default: true] - B:"Use Occluded Sounds (muting sounds behind solid walls)?"=true -} - - -reverb { - # If this is true, when you're in an area that can see the sky, then - # there will be less reverb. This is for aboveground areas with - # lots of stone and such like extreme hills biomes. There still might - # be some, but less then when the sky isn't visible. [default: true] - B:"Do sky checks:"=true - - # If you are getting lag, set this number lower. The higher it is, - # the more realistic the reverb will be. [range: 0 ~ 2147483647, default: 1024] - I:"Number of blocks reverb will check through:"=512 - - # The percentage of reverb you can get. You can lower this if you find - # the reverb to be too much (or raise it if you really want an - # echo). [range: 0.0 ~ 2.0, default: 1.0] - S:"Reverb Percent"=1.0 - - # Add values to this list (each on a new line) in the format - # --, to change how the block - # with that metadata absorbs or creates reverb. If the - # metadata is 16, that means it will apply to any metadata value. - # By default things like wool, snow, carpets, and plants absorb reverb - # (value 0.0), things like wood and dirt are neutral (value 1.0), - # and things like stone, metal, ice, and glass create reverb (value 2.0). - # So if, say, you wanted to add pumpkins of any metadata to the blocks - # that create reverb, you would put pumpkin-16-2.0 on a new line. [default: [soul_sand-16-2.0]] - S:"Specific block reverb:" < - soul_sand-16-2.0 - > - - # Set to false to disable reverb. [default: true] - B:"Use Reverb?"=true -} - - diff --git a/manifest.json b/manifest.json index 61ff54569..4f8848a0d 100644 --- a/manifest.json +++ b/manifest.json @@ -466,8 +466,8 @@ "required": true }, { - "projectID": 222789, - "fileID": 3025806, + "projectID": 951159, + "fileID": 5461056, "required": true }, { From ca04ade873f1d87bf6341f5afb808118946eda01 Mon Sep 17 00:00:00 2001 From: MCTian-mi <35869948+MCTian-mi@users.noreply.github.com> Date: Sun, 11 Aug 2024 16:26:43 +0800 Subject: [PATCH 13/14] Revert "remove B.A.S.E" This reverts commit 91eb9058375740b1f55748c26692da51af0c5ff1. --- config/acronym/base/General.cfg | 39 ++++++++++++++++++++++++++++++ config/acronym/material_system.cfg | 8 ++++++ manifest.json | 5 ++++ 3 files changed, 52 insertions(+) create mode 100644 config/acronym/base/General.cfg create mode 100644 config/acronym/material_system.cfg diff --git a/config/acronym/base/General.cfg b/config/acronym/base/General.cfg new file mode 100644 index 000000000..7b6adbd84 --- /dev/null +++ b/config/acronym/base/General.cfg @@ -0,0 +1,39 @@ +# Configuration file + +general { + # Config entry for adding other items to count as tools. Format is "modid:item_name:meta" * is for any meta + S:"Other Tools" < + [immersiveengineering:tool:0 + thermalfoundation:wrench:* + techreborn:wrench:* + actuallyadditions:item_laser_wrench:* + hammercore:wrench:* + hammercore:iwrench:* + mekanism:configurator:* + calculator:wrench:* + ic2:wrench:* + appliedenergistics2:certus_quartz_wrench:* + appliedenergistics2:nether_quartz_wrench:* + enderio:item_yeta_wrench:* + botania:twigwand:* + essentials:wrench:* + factorytech:wrench:*] + > +} + + +materials { + # List for Prioritizing OreDict returns by modid + S:preferredOreDictIds < + contenttweaker + base + > +} + + +module { + B:"JourneyMap enabled"=true + B:"Tool enabled"=true +} + + diff --git a/config/acronym/material_system.cfg b/config/acronym/material_system.cfg new file mode 100644 index 000000000..d35e79b3a --- /dev/null +++ b/config/acronym/material_system.cfg @@ -0,0 +1,8 @@ +# Configuration file + +item { + # 0 - All Item Parts on a Single MC Item, 1 - All Item Parts have their own MC Item, > 1 - That many Parts per item + I:size=0 +} + + diff --git a/manifest.json b/manifest.json index 4f8848a0d..2bd5ced70 100644 --- a/manifest.json +++ b/manifest.json @@ -741,6 +741,11 @@ "fileID": 5403908, "required": true }, + { + "projectID": 246996, + "fileID": 3440963, + "required": true + }, { "projectID": 304493, "fileID": 2666560, From 0045953f1583d2086b3c40732ba807c158967e9c Mon Sep 17 00:00:00 2001 From: bruberu <80226372+bruberu@users.noreply.github.com> Date: Tue, 13 Aug 2024 17:42:20 -0500 Subject: [PATCH 14/14] Minor buildOut problem --- .../Universal Tweaks - Mod Integration.cfg | 431 ------------------ 1 file changed, 431 deletions(-) delete mode 100644 buildOut/client-cleanroom/.minecraft/config/Universal Tweaks - Mod Integration.cfg diff --git a/buildOut/client-cleanroom/.minecraft/config/Universal Tweaks - Mod Integration.cfg b/buildOut/client-cleanroom/.minecraft/config/Universal Tweaks - Mod Integration.cfg deleted file mode 100644 index 3d99be354..000000000 --- a/buildOut/client-cleanroom/.minecraft/config/Universal Tweaks - Mod Integration.cfg +++ /dev/null @@ -1,431 +0,0 @@ -# Configuration file - -general { - - abyssalcraft { - # Optimizes AbyssalCraft's item transport system to reduce tick overhead - B:"Optimized Item Transport"=true - } - - "actually additions" { - # Fixes various duplication exploits - B:"Duplication Fixes"=true - } - - "arcane archives" { - # Fixes various duplication exploits - B:"Duplication Fixes"=true - } - - "advent of ascension" { - # Improves AoA player ticking by only sending inventory changes when necessary - B:"Improved Player Tick"=true - B:"Inventory-less GUI Compatibility"=false - } - - "biomes o' plenty" { - # Fixes rapid inflection of regeneration effects in hot spring water - B:"Hot Spring Water"=true - } - - "blood magic" { - # Fixes various duplication exploits - B:"Duplication Fixes"=true - - # Optimizes the Hellfire/Soul Forge to reduce tick time - B:"Optimized Hellfire Forge"=true - - # Fixes memory leak when unloading worlds/switching dimensions - B:"World Unload Memory Leak Fix"=true - } - - botania { - # Fixes various duplication exploits - B:"Duplication Fixes"=true - - # Enables the Botania Garden of Glass skybox for custom dimensions - # Abides by Botania's 'enableFancySkybox' config option - # Example: 43 - I:"Fancy Skybox" < - > - } - - chisel { - # Fixes various duplication exploits - B:"Duplication Fixes"=true - } - - "chocolate quest repoured" { - # Restores the golden feather behavior from the original Better Dungeons mod - B:"Legacy Golden Feather"=true - } - - "cofh core" { - # Sets the damage multiplier of the Vorpal enchantment - D:"Vorpal Enchantment Damage"=10.0 - } - - "elementary staffs" { - # Reintroduces the 1.5 electric staff behavior along with some subtle particles - B:"Electric Staff Port"=true - } - - "elenai dodge 2" { - # Chance per dodge to extinguish the player when burning - D:"Extinguishing Dodges"=0.0 - - # Fixes server-sided crashes when the Feathers Helper API is utilized - B:"Feathers Helper API Fix"=true - - # Sets the amount of consumed half-feathers per interval when the player is sprinting - I:"Sprinting Feather Consumption"=0 - - # Sets the rate feathers are consumed in ticks when the player is sprinting - I:"Sprinting Feather Interval"=20 - - # Sets the amount of half-feathers required to start sprinting - I:"Sprinting Feather Requirement"=6 - } - - "epic siege mod" { - # Disables leftover debug logging inside the digger AI of the beta builds - B:"Disable Digger AI Debug"=true - } - - "the erebus" { - # Prevents HWYLA/TOP crashes with preserved blocks - B:"Preserved Blocks Fix"=true - } - - "extra utilities 2" { - # Fixes various duplication exploits - B:"Duplication Fixes"=true - } - - forestry { - # Adds custom emerald to germling trades to the arborist villager - # Syntax: level;emeralds_min;emeralds_max;germlings_min;germlings_max;type;complexity_min;complexity_max - # level Level when this trade becomes available (how much trading needs to be done) - # emeralds_min Lower random limit for emeralds - # emeralds_max Upper random limit for emeralds - # germlings_min Lower random limit for germlings - # germlings_max Upper random limit for germlings - # type Type of germling, can be either pollen or sapling - # complexity_min Lower limit of allele complexity - # complexity_max Upper limit of allele complexity - # - # Example for a level 5 trade for a single sapling with a complexity between 6 and 10, costing between 10 to 40 emeralds: - # 5;10;40;1;1;sapling;6;10 - S:"Arborist Villager Trades" < - > - - # Disables damage caused by bees bypassing player armor - B:"Disable Bee Damage Armor Bypass"=true - - # Fixes various duplication exploits - B:"Duplication Fixes"=true - - # Allows Forestry farms to pick up ExtraTrees fruit - B:"Extra Trees: Gather Windfall"=true - - # Allows Forestry farms to automatically replant cocoa beans - B:"Replanting Cocoa Beans"=true - } - - "industrialcraft 2" { - # Fixes various duplication exploits - B:"Duplication Fixes"=true - } - - "industrial foregoing" { - # Fixes various duplication exploits - B:"Duplication Fixes"=true - } - - "infernal mobs" { - # Enables compatibility between Infernal Mobs' Sticky effect and Reliquary's Pedestal - B:"Sticky Pedestal Compatibility"=true - - # Enables compatibility between Infernal Mobs' Sticky effect and Capsule's Recall enchantment - B:"Sticky Recall Compatibility"=true - } - - "iron backpacks" { - # Fixes various duplication exploits - B:"Duplication Fixes"=true - } - - "item stages" { - # Changes item matching code to CraftTweaker's ingredient matching system, fixes item NBT issues - B:"Ingredient Matching"=true - } - - mekanism { - # Fixes various duplication exploits - B:"Duplication Fixes"=true - } - - "mob stages" { - # Fixes mob replacement ignoring entity spawning rules - B:"Spawning Rules Fixes"=true - } - - "nether chest" { - # Fixes various duplication exploits - B:"Duplication Fixes"=true - } - - netherrocks { - # Prevents crashing with mods implementing right click crop harvesting - B:"Right Click Harvesting Fix"=true - } - - nuclearcraft { - # Changes the data table of the radiation environment handler to improve tick time - # CONCURRENT_HASHMAP: NuclearCraft default - # CONCURRENT_LINKED_HASHMAP: Keeps order of radiation environment info to improve iteration - Better performance - # CONCURRENT_LINKED_QUEUE: Uses a queue to avoid iteration - Best performance - # Valid values: - # CONCURRENT_HASHMAP - # CONCURRENT_LINKED_HASHMAP - # CONCURRENT_LINKED_QUEUE - S:"Radiation Environment Map"=CONCURRENT_LINKED_QUEUE - } - - projectred { - # Fixes various duplication exploits - B:"Duplication Fixes"=true - } - - quark { - # Fixes various duplication exploits - B:"Duplication Fixes"=true - } - - roost { - # Improves load time by registering ContentTweaker chickens early for Roost to detect them - # Note: If you would like to use ContentTweaker's MaterialSystem Parts for the layed item, in your script you must: - # 1) Use '#loader finalize_contenttweaker', not '#loader contenttweaker' - # 2) Use the Material Part Bracket Handler to reference the item - B:"ContentTweaker: Early Register CT Chickens"=false - S:"Custom Chickens" < - > - } - - "simple difficulty" { - # Fixes the interaction of iron canteens with rain collectors - B:"Iron Canteen Interaction Fix"=true - } - - "simply jetpacks" { - # Fixes a client-side memory leak associated with EntityPlayer - B:"Memory Leak Fix"=true - } - - "spice of life" { - # Fixes various duplication exploits - B:"Duplication Fixes"=true - } - - "storage drawers" { - # Approximate range in blocks at which drawers render contained items - # 0 for default unlimited range - I:"Render Range"=32 - } - - "tardis mod" { - # Fixes a client-side memory leak associated with EntityPlayer - B:"Memory Leak Fix"=true - } - - "tech reborn" { - # Optimizes the Rolling Machine to reduce tick time - B:"Optimized Rolling Machine"=true - } - - thaumcraft { - # Fixes various duplication exploits - B:"Duplication Fixes"=true - - # Fixes the bounding box always being at the center in both cinderpearls and shimmerleafs - B:"Flower Bounding Box"=true - - # Stops the thaumometer from bobbing rapidly when using it to scan objects - B:"Stable Thaumometer"=true - } - - "thaumcraft: entities" { - # Adds particles to firebats similar to legacy versions - B:"Firebat Particles"=true - - # Rotates dead eldritch crabs all the way like endermites, silverfish, and spiders - B:"Spiderlike Eldritch Crabs"=true - - # Increases particle size of wisps similar to legacy versions - B:"Wisp Particles"=true - } - - "thaumcraft: foci" { - - "focus effects" { - # Overhauls the break focus effect cast sound - B:"[01] Break: Cast Sound Revamp"=true - - # Adds an impact sound to the break focus effect - B:"[02] Break: Impact Sound"=true - - # Overhauls the earth focus effect cast sound - B:"[03] Earth: Cast Sound Revamp"=true - - # Adds an impact sound to the earth focus effect - B:"[04] Earth: Impact Sound"=true - - # Adds an impact sound to the fire focus effect - B:"[05] Fire: Impact Sound"=true - - # Adds an impact sound to the flux focus effect - B:"[06] Flux: Impact Sound"=true - - # Overhauls the frost focus effect cast sound to make it a lot less plangent - B:"[07] Frost: Cast Sound Revamp"=true - - # Adds an impact sound to the frost focus effect - B:"[08] Frost: Impact Sound"=true - - # Overhauls the heal focus effect cast sound - B:"[09] Heal: Cast Sound Revamp"=true - - # Adds an impact sound to the heal focus effect - B:"[10] Heal: Impact Sound"=true - - # Overhauls the rift focus effect cast sound - B:"[11] Rift: Cast Sound Revamp"=true - - # Adds an impact sound to the rift focus effect - B:"[12] Rift: Impact Sound"=true - } - - "focus mediums" { - # Plays an additional cast sound when using any bolt focus medium to add an extra layer of pow - B:"[1] Bolt: Cast Sound"=true - - # Plays an additional cast sound when using any cloud focus medium - B:"[2] Cloud: Cast Sound"=true - - # Adds additional cast, despawn, and setup sounds when using any mine focus medium - B:"[3] Mine: Sound Overhaul"=true - - # Plays an additional cast sound when summoning any type of spellbat - B:"[4] Spellbat: Cast Sound"=true - } - - } - - "thaumic wonders" { - # Fixes various duplication exploits - B:"Duplication Fixes"=true - - # Fixes a client-side memory leak when wearing Void Fortress armor - B:"Memory Leak Fix"=true - } - - "the farlanders" { - # Fixes various duplication exploits - B:"Duplication Fixes"=true - } - - "thermal expansion" { - # Fixes various duplication exploits - B:"Duplication Fixes"=true - - # Adds Monoculture Cycle integration to desired phytogenic insolator recipes added by ModTweaker - # Register the recipe with Insolator.addRecipeMonoculture() instead of Insolator.addRecipe() in .zs files - # (and Insolator.addRecipeMonocultureSaplingInfuser() instead of Insolator.addRecipeSaplingInfuser()) - # Note: Make sure the 'fertilizer' is specified as the secondaryInput arg in the function - B:"Insolator Custom Monoculture"=true - } - - "tinkers' construct" { - # Fixes various duplication exploits - B:"Duplication Fixes"=true - - # Excludes gaseous fluids from being transferable via faucets - B:"Gaseous Fluids"=false - - # Hides tool/bow materials in the 'Materials and You' book - # Syntax: material - # Enabling debug logging prints all materials on game launch - S:"Material Blacklist" < - > - - # Suppresses special abilities of long swords and rapiers when shurikens are wielded in the offhand - B:"Offhand Shuriken"=true - - # Caches all ore dictionary smelting recipes to speed up game loading - B:"Ore Dictionary Cache"=true - - # Despawns unbreakable projectiles faster to improve framerates - B:"Projectile Despawning"=true - - # Enables usage of tweaks in below category to customize Tinkers' tools stats - B:"Tool Customization"=true - - "tool customization" { - # Sets the rate at which a tool's attack damage incrementally decays depending on its damage cutoff - # Default value: 0.9 - # Range: 0.0 - 1.0 - # Note: A rate of 1.0 means there is no damage decay - # Note: The damage curve will cap the maximum value to (tool's damage cutoff)/(1 - decay rate) - S:"Attack Damage Decay Rate"=0.9 - - # Sets the attack damage cutoff at which diminishing returns start for the cleaver - # Default value: 25.0 - D:"Cleaver Attack Damage Cutoff"=25.0 - - # Sets the attack damage cutoff at which diminishing returns start for any Tinkers' tool not listed here - # Default value: 15.0 - D:"General Attack Damage Cutoff"=15.0 - - # Sets the attack damage cutoff at which diminishing returns start for the longsword - # Default value: 18.0 - D:"Longsword Attack Damage Cutoff"=18.0 - - # Sets the attack damage cutoff at which diminishing returns start for the PlusTiC katana - # Default value: 22.0 - D:"PlusTiC: Katana Attack Damage Cutoff"=22.0 - - # Sets the attack damage cutoff at which diminishing returns start for the rapier - # Default value: 13.0 - D:"Rapier Attack Damage Cutoff"=13.0 - } - - } - - "tiny progressions" { - # Fixes various duplication exploits - B:"Duplication Fixes"=true - } - - "cb multipart/forge multipart cbe" { - # Fixes a memory leak associated with EntityPlayer - B:"Memory Leak Fix"=true - } - - "compact machines" { - # Fixes some compact machine walls being invisible if Nothirium 0.2.x (and up) or Vintagium is installed - B:"Invisible Wall Render Fix"=true - } - - "effortless building" { - # Fixes Effortless Building ignoring Metadata when checking for items in inventory - B:"Block Transmutation Fix"=true - } - - mrtjpcore { - # Fixes a memory leak associated with EntityPlayer - B:"Memory Leak Fix"=true - } - -} - -