diff --git a/config/ad_astra.jsonc b/config/ad_astra.jsonc deleted file mode 100644 index df4457298..000000000 --- a/config/ad_astra.jsonc +++ /dev/null @@ -1,223 +0,0 @@ -{ - // If true, entities will be affected by gravity. - "doEntityGravity": true, - // Do gravity for mobs, players etc. - "doLivingEntityGravity": true, - "acidRainBurns": true, - "doOxygen": true, - // Do sound suppression in orbit dimensions. If it gets annoying, you can turn it off. - "doSpaceMuffler": true, - // Type: Long - "oxygenTankSize": 500, - // Type: Integer - "hammerDurability": 64, - "giveAstroduxAtSpawn": false, - // Type: Integer - "oxygenBarXOffset": 0, - // Type: Integer - "oxygenBarYOffset": 0, - // Type: Float - "oxygenBarScale": 1.0, - // Type: Integer - "energyBarXOffset": 0, - // Type: Integer - "energyBarYOffset": 0, - // Type: Float - "energyBarScale": 1.0, - // Type: Float - "orbitGravity": 3.26, - // Type: Integer - "oxygenDamage": 1, - // Type: Integer - "freezeDamage": 1, - // Type: Integer - "heatDamage": 2, - // Type: Integer - "acidRainDamage": 3, - "allowFlagImages": true, - // A list of planets that should be disabled. This is a comma-separated list of planet ids. - "disabledPlanets": "", - // Prevents stuff like gravity and oxygen checks in the overworld as that's normally not used in Ad Astra. enable if you're making an addon or something that transforms the overworld into some sort of planet. - "avoidOverworldChecks": true, - "spawning": { - "spawnCorruptedLunarians": true, - "spawnStarCrawlers": true, - "spawnMartianRaptors": true, - "spawnMoglers": true, - "spawnSulfurCreepers": true, - "spawnLunarianWanderingTrader": true - }, - "spaceSuit": { - // Type: Long - "spaceSuitTankSize": 1000, - // Type: Long - "netheriteSpaceSuitTankSize": 2000, - "netheriteSpaceSuitHasFireResistance": true, - /* - * The speed when flying forward. - * Type: Double - */ - "jetSuitSpeed": 0.8, - /* - * The speed when idle flying up. - * Type: Double - */ - "jetSuitUpwardsSpeed": 0.5, - // Type: Long - "jetSuitEnergyPerTick": 60, - // Type: Long - "jetSuitTankSize": 4000, - // Type: Long - "jetSuitMaxEnergy": 1000000, - "enableJetSuitFlight": true, - // Type: Integer - "jetSuitProtectionMultiplier": 1, - // Type: Integer - "jetSuitArmorToughness": 5, - "spawnJetSuitParticles": true - }, - "vehicles": { - /* - * The velocity to trigger a vehicle explosion while falling. - * Type: Double - */ - "fallingExplosionThreshold": -1.2, - /* - * How much the explosion should be multiplied by when the vehicle has fallen. - * Type: Float - */ - "fallingExplosionMultiplier": 0.7, - // Type: Double - "gravity": -2.0, - // Should the camera move in 3rd person in the rocket and lander for a better view? - "moveCameraInVehicle": true, - "lander": { - // Type: Double - "boosterThreshold": -0.1, - // Type: Double - "boosterSpeed": 0.1 - }, - "rover": { - "explodeRoverInLava": true, - // Type: Long - "fuelPerSecond": 10, - // Type: Float - "turnSpeed": 3.0, - // Type: Float - "maxTurnSpeed": 6.0, - // Type: Float - "deceleration": 0.9, - // Type: Float - "minSpeed": -0.2, - // Type: Float - "maxSpeed": 0.3, - // Type: Long - "tankSize": 3000 - }, - "rocket": { - // Type: Integer - "atmosphereLeave": 600, - // Type: Integer - "countDownTicks": 200, - // Type: Double - "acceleration": 0.005, - // Type: Double - "maxSpeed": 0.5, - "entitiesBurnUnderRocket": true, - // Type: Long - "tankSize": 3000, - // Type: Long - "fuelLaunchCost": 3000, - // Type: Long - "efficientFuelLaunchCost": 1000, - "takeDamageInRocket": true - } - }, - "coalGenerator": { - // Type: Long - "maxEnergy": 9000, - // Type: Long - "energyPerTick": 10 - }, - "compressor": { - // Type: Long - "maxEnergy": 9000, - // Type: Long - "energyPerTick": 10 - }, - "fuelRefinery": { - // Type: Long - "maxEnergy": 9000, - // Type: Long - "energyPerTick": 30, - // Type: Long - "tankSize": 3000 - }, - "oxygenLoader": { - // Type: Long - "maxEnergy": 9000, - // Type: Long - "energyPerTick": 10, - // Type: Long - "tankSize": 3000 - }, - "oxygenDistributor": { - // Type: Long - "maxEnergy": 20000, - // Type: Long - "fluidConversionEnergyPerTick": 5, - // Type: Long - "tankSize": 6000, - /* - * How many blocks the distributor can distribute oxygen in. Be careful increasing this number, as it can reduce server performance significantly. If you are adamant about increasing this value, consider increasing the Oxygen Loader refresh ticks so the server is not constantly checking thousands of blocks. - * Range: 1 - 50000 - */ - "maxBlockChecks": 3000, - /* - * How often the oxygen loader checks if the structure is sealed. Performing this operation too often can kill server TPS, so be wary. - * Range: 0 - 500 - */ - "refreshTicks": 60, - /* - * Increases the oxygen requirements as the distributor covers more blocks. - * Type: Double - */ - "oxygenMultiplier": 1.0, - /* - * Increases the energy requirements as the distributor covers more blocks. - * Type: Double - */ - "energyMultiplier": 3.0 - }, - "solarPanel": { - // Type: Long - "maxEnergy": 18000, - // Type: Double - "energyMultiplier": 1.0 - }, - "waterPump": { - // Type: Long - "maxEnergy": 9000, - // Type: Long - "energyPerTick": 10, - // Type: Long - "tankSize": 6000, - // Type: Long - "transferPerTick": 100, - "deleteWaterBelowWaterPump": true - }, - "energizer": { - // Type: Long - "maxEnergy": 2000000, - // Type: Long - "energyPerTick": 600 - }, - "cryoFreezer": { - // Type: Long - "maxEnergy": 30000, - // Type: Long - "energyPerTick": 18, - // Type: Long - "tankSize": 3000 - } -} \ No newline at end of file diff --git a/config/badoptimizations.txt b/config/badoptimizations.txt index 862272b46..a24d72d22 100644 --- a/config/badoptimizations.txt +++ b/config/badoptimizations.txt @@ -56,9 +56,24 @@ enable_remove_redundant_fov_calculations: true # Don't tick the tutorial if the game is not in demo mode. enable_remove_tutorial_if_not_demo: true +# +# Other +# + # Whether BadOptimizations should be added onto # the left text of the F3 menu. show_f3_text: true +# Some config options will be force-disabled if certain mods are present +# due to incompatibilities (e.g. entity rendering caching +# is disabled w/ Twilight Forest). +# However, if you still want to use the optimizations, you can override it +# by setting this to true. Beware of crashes. And Herobrine. +ignore_mod_incompatibilities: false + +# Whether to log the entire config into console when booting up. +# If you plan on reporting an issue, please keep this on. +log_config: true + # Do not change this -config_version: 1 +config_version: 2 diff --git a/config/canary.properties b/config/canary.properties deleted file mode 100644 index d974709af..000000000 --- a/config/canary.properties +++ /dev/null @@ -1,8 +0,0 @@ -# This is the configuration file for Canary. -# This file exists for debugging purposes and should not be configured otherwise. -# Before configuring anything, take a backup of the worlds that will be opened. -# -# You can find information on editing this file and all the available options here: -# https://github.com/AbdElAziz333/Canary/wiki/Configuration-File -# -# By default, this file will be empty except for this notice. diff --git a/config/compressiumblocks.json b/config/compressiumblocks.json deleted file mode 100644 index cca4c5164..000000000 --- a/config/compressiumblocks.json +++ /dev/null @@ -1,226 +0,0 @@ -[{ - "name": "cobblestone", - "nestedDepth": 4, - "isBlockOf": false, - "baseResourceLocation": "minecraft:cobblestone", - "particlePath": "minecraft:block/cobblestone", - "baseBlockModel": "minecraft:block/cobblestone", - "type": "block" - }, - { - "name": "stone", - "nestedDepth": 1, - "isBlockOf": false, - "baseResourceLocation": "minecraft:stone", - "particlePath": "minecraft:block/stone", - "baseBlockModel": "minecraft:block/stone", - "type": "block" - }, - { - "name": "sand", - "nestedDepth": 2, - "isBlockOf": false, - "baseResourceLocation": "minecraft:sand", - "particlePath": "minecraft:block/sand", - "baseBlockModel": "minecraft:block/sand", - "type": "falling" - }, - { - "name": "gravel", - "nestedDepth": 1, - "isBlockOf": false, - "baseResourceLocation": "minecraft:gravel", - "particlePath": "minecraft:block/gravel", - "baseBlockModel": "minecraft:block/gravel", - "type": "falling" - }, - { - "name": "netherrack", - "nestedDepth": 1, - "isBlockOf": false, - "baseResourceLocation": "minecraft:netherrack", - "particlePath": "minecraft:block/netherrack", - "baseBlockModel": "minecraft:block/netherrack", - "type": "nether_rack" - }, - { - "name": "snow", - "nestedDepth": 1, - "isBlockOf": true, - "baseResourceLocation": "minecraft:snow_block", - "particlePath": "minecraft:block/snow", - "baseBlockModel": "minecraft:block/snow_block", - "type": "powered" - }, - { - "name": "soulsand", - "nestedDepth": 1, - "isBlockOf": false, - "baseResourceLocation": "minecraft:soul_sand", - "particlePath": "minecraft:block/soul_sand", - "baseBlockModel": "minecraft:block/soul_sand", - "type": "soul_sand" - }, - { - "name": "iron", - "nestedDepth": 1, - "isBlockOf": false, - "baseResourceLocation": "minecraft:iron_block", - "particlePath": "minecraft:block/iron_block", - "baseBlockModel": "minecraft:block/iron_block", - "type": "block" - }, - { - "name": "gold", - "nestedDepth": 1, - "isBlockOf": false, - "baseResourceLocation": "minecraft:gold_block", - "particlePath": "minecraft:block/gold_block", - "baseBlockModel": "minecraft:block/gold_block", - "type": "block" - }, - { - "name": "diamond", - "nestedDepth": 1, - "isBlockOf": false, - "baseResourceLocation": "minecraft:diamond_block", - "particlePath": "minecraft:block/diamond_block", - "baseBlockModel": "minecraft:block/diamond_block", - "type": "block" - }, - { - "name": "emerald", - "nestedDepth": 1, - "isBlockOf": false, - "baseResourceLocation": "minecraft:emerald_block", - "particlePath": "minecraft:block/emerald_block", - "baseBlockModel": "minecraft:block/emerald_block", - "type": "block" - }, - { - "name": "clay", - "nestedDepth": 1, - "isBlockOf": false, - "baseResourceLocation": "minecraft:clay", - "particlePath": "minecraft:block/clay", - "baseBlockModel": "minecraft:block/clay", - "type": "block" - }, - { - "name": "netherite", - "nestedDepth": 1, - "isBlockOf": false, - "baseResourceLocation": "minecraft:netherite_block", - "particlePath": "minecraft:block/netherite_block", - "baseBlockModel": "minecraft:block/netherite_block", - "type": "block" - }, - { - "name": "dirt", - "nestedDepth": 1, - "isBlockOf": false, - "baseResourceLocation": "minecraft:dirt", - "particlePath": "minecraft:block/dirt", - "baseBlockModel": "minecraft:block/dirt", - "type": "block" - }, - { - "name": "coal", - "nestedDepth": 1, - "isBlockOf": true, - "baseResourceLocation": "minecraft:coal_block", - "particlePath": "minecraft:block/coal_block", - "baseBlockModel": "minecraft:block/coal_block", - "type": "block" - }, - { - "name": "redsand", - "nestedDepth": 2, - "isBlockOf": true, - "baseResourceLocation": "minecraft:red_sand", - "particlePath": "minecraft:block/red_sand", - "baseBlockModel": "minecraft:block/red_sand", - "type": "falling" - }, - { - "name": "endstone", - "nestedDepth": 1, - "isBlockOf": true, - "baseResourceLocation": "minecraft:end_stone", - "particlePath": "minecraft:block/end_stone", - "baseBlockModel": "minecraft:block/end_stone", - "type": "block" - }, - { - "name": "obsidian", - "nestedDepth": 1, - "isBlockOf": true, - "baseResourceLocation": "minecraft:obsidian", - "particlePath": "minecraft:block/obsidian", - "baseBlockModel": "minecraft:block/obsidian", - "type": "block" - }, - { - "name": "lapis", - "nestedDepth": 1, - "isBlockOf": true, - "baseResourceLocation": "minecraft:lapis_block", - "particlePath": "minecraft:block/lapis_block", - "baseBlockModel": "minecraft:block/lapis_block", - "type": "block" - }, - { - "name": "quartz", - "nestedDepth": 1, - "isBlockOf": true, - "baseResourceLocation": "minecraft:quartz_block", - "particlePath": "minecraft:block/quartz_block_side", - "baseBlockModel": "minecraft:block/quartz_block", - "type": "block" - }, - { - "name": "redstone", - "nestedDepth": 1, - "isBlockOf": true, - "baseResourceLocation": "minecraft:redstone_block", - "particlePath": "minecraft:block/redstone_block", - "baseBlockModel": "minecraft:block/redstone_block", - "type": "powered" - }, - { - "name": "andesite", - "nestedDepth": 1, - "isBlockOf": true, - "baseResourceLocation": "minecraft:andesite", - "particlePath": "minecraft:block/andesite", - "baseBlockModel": "minecraft:block/andesite", - "type": "block" - }, - { - "name": "diorite", - "nestedDepth": 1, - "isBlockOf": true, - "baseResourceLocation": "minecraft:diorite", - "particlePath": "minecraft:block/diorite", - "baseBlockModel": "minecraft:block/diorite", - "type": "block" - }, - { - "name": "copper", - "nestedDepth": 1, - "isBlockOf": false, - "baseResourceLocation": "minecraft:copper_block", - "particlePath": "minecraft:block/copper_block", - "baseBlockModel": "minecraft:block/copper_block", - "type": "block" - }, - { - "name": "granite", - "nestedDepth": 1, - "isBlockOf": true, - "baseResourceLocation": "minecraft:granite", - "particlePath": "minecraft:block/granite", - "baseBlockModel": "minecraft:block/granite", - "type": "block" - } -] \ No newline at end of file diff --git a/config/endercrop-common.toml b/config/endercrop-common.toml deleted file mode 100644 index 87d643d0f..000000000 --- a/config/endercrop-common.toml +++ /dev/null @@ -1,20 +0,0 @@ -#Crop growth multiplier on tilled soil, this value multiplies default vanilla growth rate -#e.g. 10.5 -> Ten and a half times the speed of vanilla crop. -#Range: 0.0 ~ 25.0 -tilledSoilMultiplier = 0.5 -#Crop growth multiplier on tilled end stone, this value multiplies default vanilla growth rate -#e.g. 10.5 -> Ten and a half times the speed of vanilla crop -#Range: 0.0 ~ 25.0 -tilledEndMultiplier = 1.0 -#Enable Tilled End Stone -tilledEndStone = true -#Chance to spawn endermite when harvesting an Ender Crop on Tilled End Stone (1 in ...) -#0 to disable -#Range: > 0 -miteChance = 50 -#Is a hoe enchanted with Unbreaking (I) needed to till endstone? -endstoneNeedsUnbreaking = true -#Minimum non-vanilla hoe tool (e.g. TiCo Kama) material level needed to till endstone -#Range: 0 ~ 20 -hoeToolHarvestLevelEndstone = 1 - diff --git a/config/gcys.yaml b/config/gcys.yaml deleted file mode 100644 index 7b8397911..000000000 --- a/config/gcys.yaml +++ /dev/null @@ -1,39 +0,0 @@ -satellites: - # Damage of the laser satellite to entities per tick. - # Default: 2.0 - laserSatelliteDamagePerTickStep: 2.0 - - # Time between laser satellite mining attempts. - # Default: 2 - laserSatelliteMiningTickStep: 2 - -server: - # Wether the oxygen mechanics are enabled. - # Default: true - enableOxygen: true - - # Damage to entities per tick without oxygen. - # Default: 1.0 - oxygenDamage: 1.0 - - # Damage to overheated entities per tick - # Default: 2.0 - heatDamage: 2.0 - - # Damage to freezing entities per tick. - # Default: 2.0 - freezeDamage: 2.0 - - # Maximum distance the oxygen spreader can spread oxygen in. - # Default: 128 - maxOxygenatedBlockChecks: 128 - - # The temperature in space. - # Default: -270.0 - spaceTemperature: -270.0 - -machine: - # Damage caused by standing in an active dyson system controller's beam. (per tick) - # Default: 5.0 - dysonControllerBeamDamage: 5.0 - diff --git a/config/immediatelyfast.json b/config/immediatelyfast.json index bed6bd40c..b5ec7e304 100644 --- a/config/immediatelyfast.json +++ b/config/immediatelyfast.json @@ -18,5 +18,6 @@ "debug_only_and_not_recommended_disable_universal_batching": false, "debug_only_and_not_recommended_disable_mod_conflict_handling": false, "debug_only_and_not_recommended_disable_hardware_conflict_handling": false, - "debug_only_print_additional_error_information": false + "debug_only_print_additional_error_information": false, + "debug_only_use_last_usage_for_batch_ordering": false } \ No newline at end of file diff --git a/config/indicatia.json b/config/indicatia.json deleted file mode 100644 index ecb17399f..000000000 --- a/config/indicatia.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "enableAlternateChatKey": true, - "timeOnVanillaPotionHUD": true, - "confirmationOnDisconnect": true, - "enableEnchantedRenderingOnSkull": true, - "reloadResourcesButton": true, - "savedLastSearchInRecipeBook": true -} \ No newline at end of file diff --git a/config/indium-renderer.properties b/config/indium-renderer.properties deleted file mode 100644 index f236cb08e..000000000 --- a/config/indium-renderer.properties +++ /dev/null @@ -1,4 +0,0 @@ -#Indium properties file -#Sun Apr 07 22:09:29 EEST 2024 -always-tesselate-blocks=auto -ambient-occlusion-mode=auto diff --git a/config/inventoryessentials-common.toml b/config/inventoryessentials-common.toml deleted file mode 100644 index 5cefdf35d..000000000 --- a/config/inventoryessentials-common.toml +++ /dev/null @@ -1,7 +0,0 @@ -#Use the client implementation even on servers that have the mod installed - only useful for development purposes. -forceClientImplementation = false -#Should space-clicking move all items even if an empty slot was clicked? -allowBulkTransferAllOnEmptySlot = false -#You can now go into your Controls and unbind the respective Inventory Essentials keys instead! -whereDidTheConfigsGo = true - diff --git a/config/jade/plugins.json b/config/jade/plugins.json index 87becc3a5..95b99bbf1 100644 --- a/config/jade/plugins.json +++ b/config/jade/plugins.json @@ -10,7 +10,6 @@ "furnace": true, "harvest_tool.show_unbreakable": false, "animal_owner": true, - "animal_owner.fetch_names": true, "harvest_tool.effective_tool": true, "item_storage": true, "item_storage.normal_amount": 9, @@ -63,10 +62,6 @@ "hud.status": true, "hud.contents": true }, - "endercrop": { - "endercrop": true, - "endstone": true - }, "gtceu": { "recipe_logic_provider": true, "workable_provider": true, @@ -88,6 +83,13 @@ "telepastries": { "bites": true }, + "monazite": { + "maintenance_info": true, + "auto_output_info": true, + "recipe_output_info": true, + "exhaust_vent_info": true, + "cable_info": true + }, "ae2": { "part_icon": true, "charger": true, @@ -120,6 +122,9 @@ "jadeaddons": { "equipment_requirement": "" }, + "hammerlib": { + "root": true + }, "shetiphiancore": { "hud.rgb16": true, "hud": true, diff --git a/config/kleeslabs-common.toml b/config/kleeslabs-common.toml deleted file mode 100644 index 5f357787d..000000000 --- a/config/kleeslabs-common.toml +++ /dev/null @@ -1,8 +0,0 @@ -#Control whether KleeSlabs should trigger ALWAYS, ONLY_WHEN_SNEAKING or ONLY_WHEN_NOT_SNEAKING -#Allowed Values: ALWAYS, ONLY_WHEN_SNEAKING, ONLY_WHEN_NOT_SNEAKING -mode = "ALWAYS" -#IDs of mods whose compatibility should be disabled. -disabledCompat = [] -#Set to true to have KleeSlabs dump a list of items containing the word 'slab' in their name upon world load -dumpSlabs = false - diff --git a/config/leaky.json b/config/leaky.json index ca13527da..7a0e68e80 100644 --- a/config/leaky.json +++ b/config/leaky.json @@ -1,22 +1,26 @@ { - "reportInterval": { - "desc:": "Set the amount of seconds between repeated notifications: default: 180", - "reportInterval": 180 - }, - "chatnotification": { - "desc:": "Set the chat notification type, one of these: PLAYER(closest player), EVERYONE(all players), NONE. default: PLAYER", - "chatnotification": "PLAYER" - }, - "highlightitems": { - "desc:": "Choose if leaking item entity should be glowing, default: true", - "highlightitems": true - }, - "reportThreshold": { - "desc:": "Set the min amount of stacked items being reported, default: 80", - "reportThreshold": 80 - }, - "autoremovethreshold": { - "desc:": "Set the amount of stacked items being automatically removed, default: 120", - "autoremovethreshold": 20000 - } + "improveItemPerformance": { + "desc:": "Improves item entiy performance, significantly reduing their overhead. default: true", + "improveItemPerformance": true + }, + "highlightitems": { + "desc:": "Choose if nearby reported stacked item entities should be glowing, default: true", + "highlightitems": true + }, + "reportThreshold": { + "desc:": "Set the min amount of stacked items being reported, default: 100", + "reportThreshold": 200 + }, + "autoremovethreshold": { + "desc:": "Set the amount of stacked items being automatically removed, default: 160", + "autoremovethreshold": 20000 + }, + "reportInterval": { + "desc:": "Set the amount of seconds between repeated notifications: default: 180", + "reportInterval": 180 + }, + "chatnotification": { + "desc:": "Set the chat notification type, one of these: PLAYER(closest player), EVERYONE(all players), NONE. default: PLAYER", + "chatnotification": "PLAYER" + } } \ No newline at end of file diff --git a/config/miniutilities-common.toml b/config/miniutilities-common.toml deleted file mode 100644 index 564a40fc4..000000000 --- a/config/miniutilities-common.toml +++ /dev/null @@ -1,71 +0,0 @@ - -["General Settings"] - #Should Cursed Earth be Obtainable? - "Obtain Cursed" = true - #Should Blessed Earth be Obtainable? - "Obtain Blessed" = true - #Should Blursed Earth be Obtainable? - "Obtain Blursed" = true - #What Should the Max Multiplier of Kikoku Enchant be? - #Range: 1 ~ 5000 - "Kikoku Max" = 2 - #What should the Unstable Ingot do when the time limit is reached? - #NO_DAMAGE: Slowness while holding - #DAMAGE: After 10 seconds, slowly ramps up the damage - #EXPLOSION: Explodes after 10 seconds - #Allowed Values: NO_DAMAGE, DAMAGE, EXPLOSION - "Reaction Type" = "DAMAGE" - #How much EXP should base experience pearls give? - #Range: 1 ~ 128 - "EXP Given from EXP Pearls" = 10 - #Should Ender Lilies Generate? - "Ender Lily Generation" = true - #Should Flame Lilies Generate? - "Flame Lily Generation" = true - #How much FE should the Solar Panel Generate? - #Range: 0 ~ 1000000 - "Solar Panel Generation" = 4 - #How much FE should the Lunar Panel Generate? - #Range: 0 ~ 1000000 - "Lunar Panel Generation" = 4 - #How many Panels should it take to increase the multiplier by 1? - #Range: 1 ~ 1000000 - "Panel Multiplier Amount" = 50 - -["World Generation"] - #Should Ender Ore Generate? - "Ender Ore Generation" = true - -["Blessed Earth Settings"] - #How long should it minimum wait before trying to spawn - #Range: 1 ~ 2000 - "Minimum Waiting Time" = 200 - #How big of an area should the block check for mobs, 2 would be 2x1x2 area - #Range: 1 ~ 5 - "Area Size for entity count" = 2 - #At what amount of entities in the area should mob spawning be halted - #Range: 1 ~ 10 - "Mob cap for Area" = 3 - -["Blursed Earth Settings"] - #How long should it minimum wait before trying to spawn - #Range: 1 ~ 2000 - "Minimum Waiting Time" = 200 - #How big of an area should the block check for mobs, 2 would be 2x1x2 area - #Range: 1 ~ 5 - "Area Size for entity count" = 2 - #At what amount of entities in the area should mob spawning be halted - #Range: 1 ~ 10 - "Mob cap for Area" = 3 - -["Cursed Earth Settings"] - #How long should it minimum wait before trying to spawn - #Range: 1 ~ 2000 - "Minimum Waiting Time" = 200 - #How big of an area should the block check for mobs, 2 would be 2x1x2 area - #Range: 1 ~ 5 - "Area Size for entity count" = 2 - #At what amount of entities in the area should mob spawning be halted - #Range: 1 ~ 10 - "Mob cap for Area" = 3 - diff --git a/config/miniutilitiescomplex/quantumquarryores.json b/config/miniutilitiescomplex/quantumquarryores.json deleted file mode 100644 index 90edb4d22..000000000 --- a/config/miniutilitiescomplex/quantumquarryores.json +++ /dev/null @@ -1,58 +0,0 @@ -[ - { - "name": "minecraft:coal_ore", - "weight": 4, - "dimensions": [ - "minecraft:overworld" - ], - "biomes": [] - }, - { - "name": "minecraft:iron_ore", - "weight": 3, - "dimensions": [ - "minecraft:overworld" - ], - "biomes": [] - }, - { - "name": "minecraft:gold_ore", - "weight": 1, - "dimensions": [ - "minecraft:overworld" - ], - "biomes": [] - }, - { - "name": "minecraft:diamond_ore", - "weight": 1, - "dimensions": [ - "minecraft:overworld" - ], - "biomes": [] - }, - { - "name": "minecraft:lapis_ore", - "weight": 2, - "dimensions": [ - "minecraft:overworld" - ], - "biomes": [] - }, - { - "name": "minecraft:redstone_ore", - "weight": 4, - "dimensions": [ - "minecraft:overworld" - ], - "biomes": [] - }, - { - "name": "minecraft:emerald_ore", - "weight": 1, - "dimensions": [ - "minecraft:overworld" - ], - "biomes": [] - } -] \ No newline at end of file diff --git a/config/monazite.yaml b/config/monazite.yaml new file mode 100644 index 000000000..5c66fb93c --- /dev/null +++ b/config/monazite.yaml @@ -0,0 +1,41 @@ +topInformation: + # If true, the outputs of the current recipe will be displayed. + # Default: true + displayRecipeOutputs: true + + # If true, only the name of item and fluid will be displayed. + # Default: false + conciseMode: false + + # Each line can have a maximum of several items, which only take effect when displayItemName is false. + # Default: 8 + itemsPerLine: 8 + + # If true, the maintenance information of the current machine will be displayed. + # Default: true + displayMaintenanceInfo: true + + # If true, the exhaust vent information of the current machine will be displayed. + # Default: true + displayExhaustVentInfo: true + + # If true, the auto output information of the current machine will be displayed. + # Default: true + displayAutoOutputInfo: true + + # If true, the voltage and amperage of the current cable will be displayed. + # Default: true + displayCableInfo: true + +oreVeinDisplay: + # If true, the ore vein display will be displayed using an NH-style dimension. + # Default: true + useNHDimensionDisplay: true + + # If true, the dimension display will show dimension tier. + # Default: false + showDimensionTier: false + + # To add custom display dimensions. + dimensions: + diff --git a/config/pal.properties b/config/pal.properties deleted file mode 100644 index 2ba579a72..000000000 --- a/config/pal.properties +++ /dev/null @@ -1,5 +0,0 @@ -#PlayerAbilityLib configuration file -# -#If alwaysLogTamperWarnings is set to false, external update messages will be logged only once per game session -#Fri Oct 06 20:43:31 CEST 2023 -alwaysLogTamperWarnings=true diff --git a/config/replaymod.json b/config/replaymod.json deleted file mode 100644 index 6cde77ead..000000000 --- a/config/replaymod.json +++ /dev/null @@ -1,63 +0,0 @@ -{ - "core": { - "notifications": true - }, - "advanced": { - "recordingPath": "./replay_recordings/", - "cachePath": "./.replay_cache/", - "renderPath": "./replay_videos/", - "skipPostRenderGui": false, - "askForOpenEye": true, - "skipPostScreenshotGui": false, - "fullBrightness": "replaymod.gui.settings.fullbrightness.gamma", - "fullBrightness_valid_values": [ - "replaymod.gui.settings.fullbrightness.gamma", - "replaymod.gui.settings.fullbrightness.nightvision", - "replaymod.gui.settings.fullbrightness.both" - ] - }, - "recording": { - "recordSingleplayer": true, - "recordServer": true, - "indicator": true, - "autoStartRecording": true, - "autoPostProcess": true, - "renameDialog": true - }, - "replay": { - "showChat": true, - "showServerIPs": true, - "camera": "replaymod.camera.classic", - "camera_valid_values": [], - "legacyMainMenuButton": false, - "mainMenuButton": "DEFAULT", - "mainMenuButton_valid_values": [ - "BIG", - "DEFAULT", - "TOP_LEFT", - "TOP_RIGHT", - "LEFT_OF_SINGLEPLAYER", - "RIGHT_OF_SINGLEPLAYER", - "LEFT_OF_MULTIPLAYER", - "RIGHT_OF_MULTIPLAYER", - "LEFT_OF_REALMS", - "RIGHT_OF_REALMS", - "LEFT_OF_MODS", - "RIGHT_OF_MODS" - ] - }, - "render": { - "frameTimeFromWorldTime": false - }, - "simplepathing": { - "pathpreview": true, - "autosync": true, - "timelineLength": 1800, - "interpolator": "replaymod.gui.editkeyframe.interpolator.catmullrom.name", - "interpolator_valid_values": [ - "replaymod.gui.editkeyframe.interpolator.catmullrom.name", - "replaymod.gui.editkeyframe.interpolator.cubic.name", - "replaymod.gui.editkeyframe.interpolator.linear.name" - ] - } -} \ No newline at end of file diff --git a/config/roughlyenoughitems/changelog.txt b/config/roughlyenoughitems/changelog.txt deleted file mode 100644 index 51d37475a..000000000 --- a/config/roughlyenoughitems/changelog.txt +++ /dev/null @@ -1 +0,0 @@ -2022.1 \ No newline at end of file diff --git a/config/saturn-common.toml b/config/saturn-common.toml deleted file mode 100644 index dd912bb58..000000000 --- a/config/saturn-common.toml +++ /dev/null @@ -1,17 +0,0 @@ - -#This is the config file of Saturn -#To get the best performance, i'd recommended to set all the options to true, -#until you got an issue or compatibility with other mod,\nIf you do, please report the issue in the issue tracker from the link linked below: -#https://github.com/AbdElAziz333/Saturn/issues -["Memory Leak Fixes"] - #Set this to true to enable biome temperature cache leak fix. - biomeTemperatureCacheLeakFix = true - -["Reduce Garbage Collection (GC) Heap Optimizations"] - #Avoid unnecessary object creation - avoidUnnecessaryObjectCreation = true - -[Miscellaneous] - #Disable threading detector lock duplication - disableThreadingDetectorLock = true - diff --git a/config/saturn-optimizations.toml b/config/saturn-optimizations.toml deleted file mode 100644 index 071ae1d77..000000000 --- a/config/saturn-optimizations.toml +++ /dev/null @@ -1,9 +0,0 @@ -#(default = true) Optimizes memory allocation by caching objects to static final references. -optimizeMemoryAllocations = true -#(default = true) Reduces garbage collection (GC) heap by avoid creating unnecessary objects. -reduceGCHeap = true -#(default = true) Fixes memory leaks which takes the memory continuously. -fixMemoryLeaks = true -#(default = true) Removes duplicated threading detector locks. -removeThreadingDetectorLocks = true - diff --git a/config/simple-teleporters-reloaded.toml b/config/simple-teleporters-reloaded.toml deleted file mode 100644 index 6cfd0c9dc..000000000 --- a/config/simple-teleporters-reloaded.toml +++ /dev/null @@ -1,8 +0,0 @@ - -["Simple Teleporters Reloaded Mod"] - #The amount of portal particles that will come out of the teleporter every display tick. - #Range: > 0 - Block = 5 - #After teleporting, the player will face the direction they were facing when linking the crystal - Teleportation = true - diff --git a/config/simplybackpacks-common.toml b/config/simplybackpacks-common.toml deleted file mode 100644 index bc7781006..000000000 --- a/config/simplybackpacks-common.toml +++ /dev/null @@ -1,8 +0,0 @@ - -#Anti-Nesting -[antinesting] - #List of Resource Locations for items to be blocked - itemBlacklist = [] - #List of Resource Locations for items to be allowed despite matching other blocking checks. - itemWhitelist = [] - diff --git a/config/skinlayers.json b/config/skinlayers.json deleted file mode 100644 index 1326d562e..000000000 --- a/config/skinlayers.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "enableHat": true, - "enableJacket": true, - "enableLeftSleeve": true, - "enableRightSleeve": true, - "enableLeftPants": true, - "enableRightPants": true, - "baseVoxelSize": 1.15, - "bodyVoxelWidthSize": 1.05, - "headVoxelSize": 1.18, - "renderDistanceLOD": 14, - "enableSkulls": true, - "enableSkullsItems": true, - "skullVoxelSize": 1.1, - "fastRender": true, - "firstPersonPixelScaling": 1.1 -} \ No newline at end of file diff --git a/config/solarflux/main.cfg b/config/solarflux/main.cfg index 749b13032..67455e08e 100644 --- a/config/solarflux/main.cfg +++ b/config/solarflux/main.cfg @@ -1,6 +1,9 @@ [CFG=1.0.0] C "Main"={ + /* Should HammerLib display tooltips on the solar panels if no tooltip engine providers exist? */ + B "Enable HammerLib Tooltips"=true + /* How much energy (percent) will get lost while picking up the solar panel? (Range: [0.0; 100.0]) */ D "Pickup Energy Loss"=5.0 diff --git a/config/sophisticatedcore-common.toml b/config/sophisticatedcore-common.toml index b25f39227..c1772581c 100644 --- a/config/sophisticatedcore-common.toml +++ b/config/sophisticatedcore-common.toml @@ -2,5 +2,5 @@ #Common Settings [common] #Disable / enable any items here (disables their recipes) - enabledItems = ["sophisticatedstorage:gold_to_netherite_tier_upgrade|true", "sophisticatedstorage:iron_barrel|true", "sophisticatedstorage:stack_upgrade_tier_1|true", "sophisticatedstorage:stack_upgrade_tier_2|true", "sophisticatedstorage:stack_upgrade_tier_3|true", "sophisticatedstorage:stack_upgrade_tier_4|true", "sophisticatedstorage:shulker_box|true", "sophisticatedbackpacks:compacting_upgrade|true", "sophisticatedbackpacks:advanced_restock_upgrade|true", "sophisticatedstorage:iron_chest|true", "sophisticatedstorage:barrel|true", "sophisticatedstorage:upgrade_base|true", "sophisticatedstorage:crafting_upgrade|true", "sophisticatedstorage:limited_gold_barrel_1|true", "sophisticatedstorage:limited_gold_barrel_2|true", "sophisticatedstorage:limited_gold_barrel_3|true", "sophisticatedstorage:limited_gold_barrel_4|true", "sophisticatedstorage:iron_to_diamond_tier_upgrade|true", "sophisticatedbackpacks:diamond_backpack|true", "sophisticatedstorage:auto_smoking_upgrade|true", "sophisticatedstorage:chest|true", "sophisticatedstorage:gold_barrel|true", "sophisticatedbackpacks:tank_upgrade|true", "sophisticatedstorage:limited_barrel_1|true", "sophisticatedstorage:limited_barrel_3|true", "sophisticatedstorage:limited_barrel_2|true", "sophisticatedstorage:limited_barrel_4|true", "sophisticatedbackpacks:auto_smoking_upgrade|true", "sophisticatedstorage:storage_link|true", "sophisticatedstorage:smoking_upgrade|true", "sophisticatedstorage:copper_barrel|true", "sophisticatedbackpacks:stack_upgrade_starter_tier|true", "sophisticatedstorage:gold_shulker_box|true", "sophisticatedstorage:gold_chest|true", "sophisticatedstorage:controller|true", "sophisticatedbackpacks:filter_upgrade|true", "sophisticatedstorage:netherite_barrel|true", "sophisticatedstorage:compacting_upgrade|true", "sophisticatedstorage:limited_iron_barrel_3|true", "sophisticatedstorage:basic_to_copper_tier_upgrade|true", "sophisticatedstorage:diamond_shulker_box|true", "sophisticatedstorage:advanced_compacting_upgrade|true", "sophisticatedbackpacks:advanced_compacting_upgrade|true", "sophisticatedstorage:advanced_hopper_upgrade|true", "sophisticatedbackpacks:feeding_upgrade|true", "sophisticatedstorage:diamond_to_netherite_tier_upgrade|true", "sophisticatedbackpacks:advanced_pickup_upgrade|true", "sophisticatedbackpacks:smoking_upgrade|true", "sophisticatedbackpacks:everlasting_upgrade|true", "sophisticatedstorage:iron_to_netherite_tier_upgrade|true", "sophisticatedbackpacks:advanced_feeding_upgrade|true", "sophisticatedbackpacks:crafting_upgrade|true", "sophisticatedstorage:copper_shulker_box|true", "sophisticatedstorage:basic_to_iron_tier_upgrade|true", "sophisticatedstorage:pickup_upgrade|true", "sophisticatedbackpacks:stack_upgrade_tier_4|true", "sophisticatedbackpacks:stack_upgrade_tier_2|true", "sophisticatedbackpacks:stack_upgrade_tier_3|true", "sophisticatedbackpacks:stack_upgrade_tier_1|true", "sophisticatedstorage:auto_smelting_upgrade|true", "sophisticatedbackpacks:advanced_pump_upgrade|true", "sophisticatedstorage:advanced_magnet_upgrade|true", "sophisticatedbackpacks:refill_upgrade|true", "sophisticatedbackpacks:auto_blasting_upgrade|true", "sophisticatedstorage:advanced_filter_upgrade|true", "sophisticatedstorage:basic_to_diamond_tier_upgrade|true", "sophisticatedstorage:blasting_upgrade|true", "sophisticatedstorage:advanced_void_upgrade|true", "sophisticatedstorage:iron_shulker_box|true", "sophisticatedstorage:copper_to_diamond_tier_upgrade|true", "sophisticatedstorage:limited_netherite_barrel_1|true", "sophisticatedstorage:limited_netherite_barrel_2|true", "sophisticatedstorage:limited_netherite_barrel_3|true", "sophisticatedstorage:limited_netherite_barrel_4|true", "sophisticatedbackpacks:void_upgrade|true", "sophisticatedbackpacks:advanced_refill_upgrade|true", "sophisticatedstorage:copper_to_iron_tier_upgrade|true", "sophisticatedstorage:limited_iron_barrel_2|true", "sophisticatedbackpacks:advanced_tool_swapper_upgrade|true", "sophisticatedstorage:advanced_feeding_upgrade|true", "sophisticatedstorage:stack_upgrade_tier_1_plus|true", "sophisticatedstorage:jukebox_upgrade|true", "sophisticatedstorage:iron_to_gold_tier_upgrade|true", "sophisticatedstorage:basic_to_netherite_tier_upgrade|true", "sophisticatedstorage:packing_tape|true", "sophisticatedstorage:smelting_upgrade|true", "sophisticatedstorage:auto_blasting_upgrade|true", "sophisticatedstorage:netherite_shulker_box|true", "sophisticatedbackpacks:smelting_upgrade|true", "sophisticatedbackpacks:battery_upgrade|true", "sophisticatedstorage:diamond_barrel|true", "sophisticatedstorage:limited_copper_barrel_1|true", "sophisticatedstorage:limited_copper_barrel_2|true", "sophisticatedstorage:limited_copper_barrel_3|true", "sophisticatedstorage:limited_copper_barrel_4|true", "sophisticatedbackpacks:magnet_upgrade|true", "sophisticatedstorage:hopper_upgrade|true", "sophisticatedbackpacks:advanced_magnet_upgrade|true", "sophisticatedbackpacks:blasting_upgrade|true", "sophisticatedbackpacks:deposit_upgrade|true", "sophisticatedbackpacks:iron_backpack|true", "sophisticatedstorage:stonecutter_upgrade|true", "sophisticatedstorage:gold_to_diamond_tier_upgrade|true", "sophisticatedbackpacks:stonecutter_upgrade|true", "sophisticatedstorage:netherite_chest|true", "sophisticatedstorage:limited_diamond_barrel_1|true", "sophisticatedstorage:limited_diamond_barrel_2|true", "sophisticatedstorage:limited_diamond_barrel_3|true", "sophisticatedstorage:limited_diamond_barrel_4|true", "sophisticatedbackpacks:backpack|true", "sophisticatedbackpacks:tool_swapper_upgrade|true", "sophisticatedstorage:feeding_upgrade|true", "sophisticatedstorage:compression_upgrade|true", "sophisticatedstorage:diamond_chest|true", "sophisticatedbackpacks:jukebox_upgrade|true", "sophisticatedstorage:magnet_upgrade|true", "sophisticatedstorage:filter_upgrade|true", "sophisticatedbackpacks:advanced_filter_upgrade|true", "sophisticatedstorage:limited_iron_barrel_4|true", "sophisticatedstorage:limited_iron_barrel_1|true", "sophisticatedbackpacks:inception_upgrade|true", "sophisticatedstorage:copper_to_gold_tier_upgrade|true", "sophisticatedbackpacks:anvil_upgrade|true", "sophisticatedbackpacks:xp_pump_upgrade|true", "sophisticatedbackpacks:auto_smelting_upgrade|true", "sophisticatedbackpacks:pickup_upgrade|true", "sophisticatedstorage:basic_tier_upgrade|true", "sophisticatedstorage:copper_to_netherite_tier_upgrade|true", "sophisticatedstorage:void_upgrade|true", "sophisticatedbackpacks:upgrade_base|true", "sophisticatedstorage:storage_tool|true", "sophisticatedstorage:basic_to_gold_tier_upgrade|true", "sophisticatedbackpacks:gold_backpack|true", "sophisticatedbackpacks:copper_backpack|true", "sophisticatedbackpacks:advanced_deposit_upgrade|true", "sophisticatedbackpacks:advanced_void_upgrade|true", "sophisticatedstorage:copper_chest|true", "sophisticatedbackpacks:restock_upgrade|true", "sophisticatedstorage:advanced_pickup_upgrade|true", "sophisticatedbackpacks:pump_upgrade|true", "sophisticatedbackpacks:netherite_backpack|true", "sophisticatedstorage:pump_upgrade|true", "sophisticatedstorage:advanced_pump_upgrade|true", "sophisticatedstorage:xp_pump_upgrade|true", "sophisticatedstorage:debug_tool|true", "sophisticatedstorage:storage_output|true", "sophisticatedstorage:storage_io|true", "sophisticatedstorage:storage_input|true", "sophisticatedbackpacks:chipped/tinkering_table_upgrade|true", "sophisticatedstorage:chipped/tinkering_table_upgrade|true", "sophisticatedstorage:chipped/botanist_workbench_upgrade|true", "sophisticatedbackpacks:chipped/glassblower_upgrade|true", "sophisticatedstorage:chipped/loom_table_upgrade|true", "sophisticatedstorage:chipped/mason_table_upgrade|true", "sophisticatedbackpacks:chipped/loom_table_upgrade|true", "sophisticatedbackpacks:chipped/mason_table_upgrade|true", "sophisticatedstorage:chipped/glassblower_upgrade|true", "sophisticatedbackpacks:chipped/botanist_workbench_upgrade|true", "sophisticatedbackpacks:chipped/carpenters_table_upgrade|true", "sophisticatedbackpacks:chipped/alchemy_bench_upgrade|true", "sophisticatedstorage:chipped/carpenters_table_upgrade|true", "sophisticatedstorage:chipped/alchemy_bench_upgrade|true"] + enabledItems = ["sophisticatedstorage:gold_to_netherite_tier_upgrade|true", "sophisticatedstorage:iron_barrel|true", "sophisticatedstorage:stack_upgrade_tier_1|true", "sophisticatedstorage:stack_upgrade_tier_2|true", "sophisticatedstorage:stack_upgrade_tier_3|true", "sophisticatedstorage:stack_upgrade_tier_4|true", "sophisticatedstorage:shulker_box|true", "sophisticatedbackpacks:compacting_upgrade|true", "sophisticatedbackpacks:advanced_restock_upgrade|true", "sophisticatedstorage:iron_chest|true", "sophisticatedstorage:barrel|true", "sophisticatedstorage:upgrade_base|true", "sophisticatedstorage:crafting_upgrade|true", "sophisticatedstorage:limited_gold_barrel_1|true", "sophisticatedstorage:limited_gold_barrel_2|true", "sophisticatedstorage:limited_gold_barrel_3|true", "sophisticatedstorage:limited_gold_barrel_4|true", "sophisticatedstorage:iron_to_diamond_tier_upgrade|true", "sophisticatedbackpacks:diamond_backpack|true", "sophisticatedstorage:auto_smoking_upgrade|true", "sophisticatedstorage:chest|true", "sophisticatedstorage:gold_barrel|true", "sophisticatedbackpacks:tank_upgrade|true", "sophisticatedstorage:limited_barrel_1|true", "sophisticatedstorage:limited_barrel_3|true", "sophisticatedstorage:limited_barrel_2|true", "sophisticatedstorage:limited_barrel_4|true", "sophisticatedbackpacks:auto_smoking_upgrade|true", "sophisticatedstorage:storage_link|true", "sophisticatedstorage:smoking_upgrade|true", "sophisticatedstorage:copper_barrel|true", "sophisticatedbackpacks:stack_upgrade_starter_tier|true", "sophisticatedstorage:gold_shulker_box|true", "sophisticatedstorage:gold_chest|true", "sophisticatedstorage:controller|true", "sophisticatedbackpacks:filter_upgrade|true", "sophisticatedstorage:netherite_barrel|true", "sophisticatedstorage:compacting_upgrade|true", "sophisticatedstorage:limited_iron_barrel_3|true", "sophisticatedstorage:basic_to_copper_tier_upgrade|true", "sophisticatedstorage:diamond_shulker_box|true", "sophisticatedstorage:advanced_compacting_upgrade|true", "sophisticatedbackpacks:advanced_compacting_upgrade|true", "sophisticatedstorage:advanced_hopper_upgrade|true", "sophisticatedbackpacks:feeding_upgrade|true", "sophisticatedstorage:diamond_to_netherite_tier_upgrade|true", "sophisticatedbackpacks:advanced_pickup_upgrade|true", "sophisticatedbackpacks:smoking_upgrade|true", "sophisticatedbackpacks:everlasting_upgrade|true", "sophisticatedstorage:iron_to_netherite_tier_upgrade|true", "sophisticatedbackpacks:advanced_feeding_upgrade|true", "sophisticatedbackpacks:crafting_upgrade|true", "sophisticatedstorage:copper_shulker_box|true", "sophisticatedstorage:basic_to_iron_tier_upgrade|true", "sophisticatedstorage:pickup_upgrade|true", "sophisticatedbackpacks:stack_upgrade_tier_4|true", "sophisticatedbackpacks:stack_upgrade_tier_2|true", "sophisticatedbackpacks:stack_upgrade_tier_3|true", "sophisticatedbackpacks:stack_upgrade_tier_1|true", "sophisticatedstorage:auto_smelting_upgrade|true", "sophisticatedbackpacks:advanced_pump_upgrade|true", "sophisticatedstorage:advanced_magnet_upgrade|true", "sophisticatedbackpacks:refill_upgrade|true", "sophisticatedbackpacks:auto_blasting_upgrade|true", "sophisticatedstorage:advanced_filter_upgrade|true", "sophisticatedstorage:basic_to_diamond_tier_upgrade|true", "sophisticatedstorage:blasting_upgrade|true", "sophisticatedstorage:advanced_void_upgrade|true", "sophisticatedstorage:iron_shulker_box|true", "sophisticatedstorage:copper_to_diamond_tier_upgrade|true", "sophisticatedstorage:limited_netherite_barrel_1|true", "sophisticatedstorage:limited_netherite_barrel_2|true", "sophisticatedstorage:limited_netherite_barrel_3|true", "sophisticatedstorage:limited_netherite_barrel_4|true", "sophisticatedbackpacks:void_upgrade|true", "sophisticatedbackpacks:advanced_refill_upgrade|true", "sophisticatedstorage:copper_to_iron_tier_upgrade|true", "sophisticatedstorage:limited_iron_barrel_2|true", "sophisticatedbackpacks:advanced_tool_swapper_upgrade|true", "sophisticatedstorage:advanced_feeding_upgrade|true", "sophisticatedstorage:stack_upgrade_tier_1_plus|true", "sophisticatedstorage:jukebox_upgrade|true", "sophisticatedstorage:iron_to_gold_tier_upgrade|true", "sophisticatedstorage:basic_to_netherite_tier_upgrade|true", "sophisticatedstorage:packing_tape|true", "sophisticatedstorage:smelting_upgrade|true", "sophisticatedstorage:auto_blasting_upgrade|true", "sophisticatedstorage:netherite_shulker_box|true", "sophisticatedbackpacks:smelting_upgrade|true", "sophisticatedbackpacks:battery_upgrade|true", "sophisticatedstorage:diamond_barrel|true", "sophisticatedstorage:limited_copper_barrel_1|true", "sophisticatedstorage:limited_copper_barrel_2|true", "sophisticatedstorage:limited_copper_barrel_3|true", "sophisticatedstorage:limited_copper_barrel_4|true", "sophisticatedbackpacks:magnet_upgrade|true", "sophisticatedstorage:hopper_upgrade|true", "sophisticatedbackpacks:advanced_magnet_upgrade|true", "sophisticatedbackpacks:blasting_upgrade|true", "sophisticatedbackpacks:deposit_upgrade|true", "sophisticatedbackpacks:iron_backpack|true", "sophisticatedstorage:stonecutter_upgrade|true", "sophisticatedstorage:gold_to_diamond_tier_upgrade|true", "sophisticatedbackpacks:stonecutter_upgrade|true", "sophisticatedstorage:netherite_chest|true", "sophisticatedstorage:limited_diamond_barrel_1|true", "sophisticatedstorage:limited_diamond_barrel_2|true", "sophisticatedstorage:limited_diamond_barrel_3|true", "sophisticatedstorage:limited_diamond_barrel_4|true", "sophisticatedbackpacks:backpack|true", "sophisticatedbackpacks:tool_swapper_upgrade|true", "sophisticatedstorage:feeding_upgrade|true", "sophisticatedstorage:compression_upgrade|true", "sophisticatedstorage:diamond_chest|true", "sophisticatedbackpacks:jukebox_upgrade|true", "sophisticatedstorage:magnet_upgrade|true", "sophisticatedstorage:filter_upgrade|true", "sophisticatedbackpacks:advanced_filter_upgrade|true", "sophisticatedstorage:limited_iron_barrel_4|true", "sophisticatedstorage:limited_iron_barrel_1|true", "sophisticatedbackpacks:inception_upgrade|true", "sophisticatedstorage:copper_to_gold_tier_upgrade|true", "sophisticatedbackpacks:anvil_upgrade|true", "sophisticatedbackpacks:xp_pump_upgrade|true", "sophisticatedbackpacks:auto_smelting_upgrade|true", "sophisticatedbackpacks:pickup_upgrade|true", "sophisticatedstorage:basic_tier_upgrade|true", "sophisticatedstorage:copper_to_netherite_tier_upgrade|true", "sophisticatedstorage:void_upgrade|true", "sophisticatedbackpacks:upgrade_base|true", "sophisticatedstorage:storage_tool|true", "sophisticatedstorage:basic_to_gold_tier_upgrade|true", "sophisticatedbackpacks:gold_backpack|true", "sophisticatedbackpacks:copper_backpack|true", "sophisticatedbackpacks:advanced_deposit_upgrade|true", "sophisticatedbackpacks:advanced_void_upgrade|true", "sophisticatedstorage:copper_chest|true", "sophisticatedbackpacks:restock_upgrade|true", "sophisticatedstorage:advanced_pickup_upgrade|true", "sophisticatedbackpacks:pump_upgrade|true", "sophisticatedbackpacks:netherite_backpack|true", "sophisticatedstorage:pump_upgrade|true", "sophisticatedstorage:advanced_pump_upgrade|true", "sophisticatedstorage:xp_pump_upgrade|true", "sophisticatedstorage:debug_tool|true", "sophisticatedstorage:storage_output|true", "sophisticatedstorage:storage_io|true", "sophisticatedstorage:storage_input|true", "sophisticatedbackpacks:chipped/tinkering_table_upgrade|true", "sophisticatedstorage:chipped/tinkering_table_upgrade|true", "sophisticatedstorage:chipped/botanist_workbench_upgrade|true", "sophisticatedbackpacks:chipped/glassblower_upgrade|true", "sophisticatedstorage:chipped/loom_table_upgrade|true", "sophisticatedstorage:chipped/mason_table_upgrade|true", "sophisticatedbackpacks:chipped/loom_table_upgrade|true", "sophisticatedbackpacks:chipped/mason_table_upgrade|true", "sophisticatedstorage:chipped/glassblower_upgrade|true", "sophisticatedbackpacks:chipped/botanist_workbench_upgrade|true", "sophisticatedbackpacks:chipped/carpenters_table_upgrade|true", "sophisticatedbackpacks:chipped/alchemy_bench_upgrade|true", "sophisticatedstorage:chipped/carpenters_table_upgrade|true", "sophisticatedstorage:chipped/alchemy_bench_upgrade|true", "sophisticatedstorage:stack_upgrade_tier_5|true"] diff --git a/config/watercondenser-common.toml b/config/watercollector-common.toml similarity index 66% rename from config/watercondenser-common.toml rename to config/watercollector-common.toml index 878605923..ef491380b 100644 --- a/config/watercondenser-common.toml +++ b/config/watercollector-common.toml @@ -1,7 +1,5 @@ -["Configs for WaterCondenser"] - #The fluid to generate. If not valid, will revert to minecraft:water. Existing worlds will retroactively change their fluid type on change (but keep the same amount). - "Output fluid" = "minecraft:water" +["Configs for WaterCollector"] #Tank capacity in mB "Condenser capacity" = 1000 #The length of a fill cycle, in ticks diff --git a/kubejs/client_scripts/JEI_modespecific.js b/kubejs/client_scripts/JEI_modespecific.js index 89a481cc3..2823637cb 100644 --- a/kubejs/client_scripts/JEI_modespecific.js +++ b/kubejs/client_scripts/JEI_modespecific.js @@ -11,7 +11,7 @@ JEIEvents.hideItems(event => { if (isExpertMode) { event.hide(/hostilenetworks/) -event.hide("watercondenser:watercondenser") +event.hide("watercollector:watercollector") } }) \ No newline at end of file diff --git a/kubejs/server_scripts/Remove_Recipes.js b/kubejs/server_scripts/Remove_Recipes.js index 4b0350340..ef7772bd4 100644 --- a/kubejs/server_scripts/Remove_Recipes.js +++ b/kubejs/server_scripts/Remove_Recipes.js @@ -1,6 +1,7 @@ ServerEvents.recipes(event => { event.remove({ output: ['ae2:vibration_chamber', 'hammerlib:gears/copper'] }) + event.remove('snad:snad') //Extended Crafting event.remove({ output: [Item.of('extendedcrafting:recipe_maker', '{Shapeless:0b,Type:"CraftTweaker"}'), Item.of('extendedcrafting:singularity', '{Id:"extendedcrafting:tin"}'), Item.of('extendedcrafting:singularity', '{Id:"extendedcrafting:copper"}'), Item.of('extendedcrafting:singularity', '{Id:"extendedcrafting:iron"}'), Item.of('extendedcrafting:singularity', '{Id:"extendedcrafting:coal"}'), Item.of('extendedcrafting:singularity', '{Id:"extendedcrafting:steel"}'), Item.of('extendedcrafting:singularity', '{Id:"extendedcrafting:invar"}'), Item.of('extendedcrafting:singularity', '{Id:"extendedcrafting:silver"}'), Item.of('extendedcrafting:singularity', '{Id:"extendedcrafting:platinum"}'), Item.of('extendedcrafting:singularity', '{Id:"extendedcrafting:lead"}'), Item.of('extendedcrafting:singularity', '{Id:"extendedcrafting:glowstone"}'), Item.of('extendedcrafting:singularity', '{Id:"extendedcrafting:lapis_lazuli"}'), Item.of('extendedcrafting:singularity', '{Id:"extendedcrafting:electrum"}'), Item.of('extendedcrafting:singularity', '{Id:"extendedcrafting:redstone"}'), Item.of('extendedcrafting:singularity', '{Id:"extendedcrafting:aluminum"}'), Item.of('extendedcrafting:singularity', '{Id:"extendedcrafting:diamond"}'), Item.of('extendedcrafting:singularity', '{Id:"extendedcrafting:nickel"}'), Item.of('extendedcrafting:singularity', '{Id:"extendedcrafting:gold"}'), Item.of('extendedcrafting:singularity', '{Id:"extendedcrafting:emerald"}'), Item.of('extendedcrafting:singularity', '{Id:"extendedcrafting:bronze"}')] }) diff --git a/kubejs/server_scripts/expert_mode/expert_mode.js b/kubejs/server_scripts/expert_mode/expert_mode.js index 365957014..2357c1d32 100644 --- a/kubejs/server_scripts/expert_mode/expert_mode.js +++ b/kubejs/server_scripts/expert_mode/expert_mode.js @@ -33,7 +33,7 @@ ServerEvents.recipes(event => { } - event.remove({ id: "watercondenser:watercondenser" }) + event.remove({ id: "watercollector:watercollector" }) event.remove({ id: /hostilenetworks/ }) const xpjuice = [ diff --git a/kubejs/server_scripts/mods/AE2.js b/kubejs/server_scripts/mods/AE2.js index 2accd2919..0a460fefc 100644 --- a/kubejs/server_scripts/mods/AE2.js +++ b/kubejs/server_scripts/mods/AE2.js @@ -834,4 +834,64 @@ ServerEvents.recipes(event => { 'ae2:certus_quartz_crystal', 'gtceu:certus_quartz_gem' ) + + const colors = ['black', 'blue', 'brown', 'cyan', 'gray', 'green', 'light_blue', 'light_gray', 'lime','magenta', 'orange', 'pink', 'purple', 'red', 'white', 'yellow'] + + function washToFluix(wash) { + event.shaped( + `8x ae2:fluix_${wash}_cable`, + [ + 'CCC', + 'CDC', + 'CCC' + ], { + C: `#ae2:${wash}_cable`, + D: '#ae2:can_remove_color' + } + ) + } + + function coloredCoveredCable(color) { + event.shapeless( + `ae2:${color}_covered_cable`, + [ + `ae2:${color}_glass_cable`, + `minecraft:${color}_wool` + ] + ) + } + + function coveredDenseCable(color) { + event.shaped( + `ae2:${color}_covered_dense_cable`, + [ + 'CC', + 'CC' + ], { + C: `ae2:${color}_covered_cable` + } + ) + } + + function smartDenseCable(color) { + event.shaped( + `ae2:${color}_smart_dense_cable`, + [ + 'CC', + 'CC' + ], { + C: `ae2:${color}_smart_cable` + } + ) + } + + washToFluix('covered') + washToFluix('covered_dense') + washToFluix('smart_dense') + washToFluix('glass') + washToFluix('smart') + + colors.forEach(coloredCoveredCable) + colors.forEach(coveredDenseCable) + colors.forEach(smartDenseCable) }) \ No newline at end of file diff --git a/kubejs/server_scripts/mods/Thermal_Series.js b/kubejs/server_scripts/mods/Thermal_Series.js index 03502a3eb..d8ebd6193 100644 --- a/kubejs/server_scripts/mods/Thermal_Series.js +++ b/kubejs/server_scripts/mods/Thermal_Series.js @@ -501,7 +501,7 @@ ServerEvents.recipes(event => { 'BBB' ], { B: "enderio:fused_quartz", - C: "watercondenser:watercondenser" + C: "watercollector:watercollector" } ).id('kubejs:device_water_gen'); diff --git a/kubejs/server_scripts/normal_mode.js b/kubejs/server_scripts/normal_mode.js index cbf6746fc..d9544ef92 100644 --- a/kubejs/server_scripts/normal_mode.js +++ b/kubejs/server_scripts/normal_mode.js @@ -131,9 +131,9 @@ ServerEvents.recipes(event => { } ) - event.remove({ id: "watercondenser:watercondenser" }) + event.remove({ id: "watercollector:watercollector" }) event.shaped( - "watercondenser:watercondenser", [ + "watercollector:watercollector", [ "AAA", "B B", "AAA" diff --git a/kubejs/startup_scripts/modify_blocks.js b/kubejs/startup_scripts/modify_blocks.js index 7b4f9913d..2f6a0ea76 100644 --- a/kubejs/startup_scripts/modify_blocks.js +++ b/kubejs/startup_scripts/modify_blocks.js @@ -1,5 +1,5 @@ BlockEvents.modification(e => { - e.modify('watercondenser:watercondenser', block => { + e.modify('watercollector:watercollector', block => { block.destroySpeed = 0.3 }) }) \ No newline at end of file diff --git a/manifest.json b/manifest.json index cbd064e13..d1279f059 100644 --- a/manifest.json +++ b/manifest.json @@ -20,6 +20,11 @@ "fileID": 5270039, "required": true }, + { + "projectID": 361276, + "fileID": 5221691, + "required": true + }, { "projectID": 938916, "fileID": 5126390, @@ -42,12 +47,12 @@ }, { "projectID": 949555, - "fileID": 5139167, + "fileID": 5289466, "required": true }, { "projectID": 228525, - "fileID": 5084135, + "fileID": 5250293, "required": true }, { @@ -62,7 +67,7 @@ }, { "projectID": 256717, - "fileID": 4614555, + "fileID": 5278538, "required": true }, { @@ -77,12 +82,12 @@ }, { "projectID": 257814, - "fileID": 5176624, + "fileID": 5284533, "required": true }, { "projectID": 272335, - "fileID": 4990314, + "fileID": 5228968, "required": true }, { @@ -107,7 +112,7 @@ }, { "projectID": 892005, - "fileID": 5232000, + "fileID": 5331925, "required": true }, { @@ -142,7 +147,7 @@ }, { "projectID": 441647, - "fileID": 5165696, + "fileID": 5277816, "required": true }, { @@ -152,7 +157,7 @@ }, { "projectID": 247401, - "fileID": 5043221, + "fileID": 5312985, "required": true }, { @@ -167,7 +172,7 @@ }, { "projectID": 686911, - "fileID": 5076080, + "fileID": 5317932, "required": true }, { @@ -182,7 +187,7 @@ }, { "projectID": 324717, - "fileID": 5072729, + "fileID": 5329131, "required": true }, { @@ -215,11 +220,6 @@ "fileID": 4580940, "required": true }, - { - "projectID": 282099, - "fileID": 4573544, - "required": true - }, { "projectID": 634062, "fileID": 4610474, @@ -232,7 +232,7 @@ }, { "projectID": 308380, - "fileID": 5181991, + "fileID": 5277692, "required": true }, { @@ -240,11 +240,6 @@ "fileID": 5182936, "required": true }, - { - "projectID": 306770, - "fileID": 4636277, - "required": true - }, { "projectID": 283644, "fileID": 5098182, @@ -252,7 +247,7 @@ }, { "projectID": 495476, - "fileID": 5112685, + "fileID": 5330447, "required": true }, { @@ -262,7 +257,7 @@ }, { "projectID": 858542, - "fileID": 4779110, + "fileID": 5284015, "required": true }, { @@ -272,12 +267,12 @@ }, { "projectID": 912282, - "fileID": 4749508, + "fileID": 5296285, "required": true }, { "projectID": 246974, - "fileID": 4959289, + "fileID": 5303143, "required": true }, { @@ -305,11 +300,6 @@ "fileID": 4680832, "required": true }, - { - "projectID": 907026, - "fileID": 4793808, - "required": true - }, { "projectID": 459929, "fileID": 5217955, @@ -317,7 +307,7 @@ }, { "projectID": 633823, - "fileID": 5190743, + "fileID": 5273070, "required": true }, { @@ -332,7 +322,7 @@ }, { "projectID": 223794, - "fileID": 5253401, + "fileID": 5330978, "required": true }, { @@ -345,11 +335,6 @@ "fileID": 5054541, "required": true }, - { - "projectID": 585454, - "fileID": 4901814, - "required": true - }, { "projectID": 841890, "fileID": 5176879, @@ -387,7 +372,7 @@ }, { "projectID": 231095, - "fileID": 5099760, + "fileID": 5203366, "required": true }, { @@ -417,7 +402,7 @@ }, { "projectID": 342584, - "fileID": 5177353, + "fileID": 5326510, "required": true }, { @@ -462,7 +447,7 @@ }, { "projectID": 309927, - "fileID": 5266541, + "fileID": 5296876, "required": true }, { @@ -482,7 +467,7 @@ }, { "projectID": 626676, - "fileID": 5274003, + "fileID": 5316054, "required": true }, { @@ -492,17 +477,17 @@ }, { "projectID": 908741, - "fileID": 5265338, + "fileID": 5321172, "required": true }, { "projectID": 931925, - "fileID": 5255016, + "fileID": 5322372, "required": true }, { "projectID": 580555, - "fileID": 5204261, + "fileID": 5311316, "required": true }, { @@ -515,19 +500,9 @@ "fileID": 4859168, "required": true }, - { - "projectID": 242269, - "fileID": 4703067, - "required": true - }, { "projectID": 59613, - "fileID": 4859169, - "required": true - }, - { - "projectID": 532169, - "fileID": 4813550, + "fileID": 5317849, "required": true }, { @@ -542,7 +517,7 @@ }, { "projectID": 367706, - "fileID": 5261465, + "fileID": 5325903, "required": true }, { @@ -582,7 +557,7 @@ }, { "projectID": 289412, - "fileID": 5282519, + "fileID": 5315015, "required": true }, { @@ -612,7 +587,7 @@ }, { "projectID": 388172, - "fileID": 5060416, + "fileID": 5188427, "required": true }, { @@ -632,7 +607,7 @@ }, { "projectID": 976858, - "fileID": 5122046, + "fileID": 5315928, "required": true }, { @@ -657,12 +632,7 @@ }, { "projectID": 32274, - "fileID": 5211253, - "required": true - }, - { - "projectID": 241895, - "fileID": 4583104, + "fileID": 5293067, "required": true }, { @@ -692,12 +662,7 @@ }, { "projectID": 856906, - "fileID": 4765805, - "required": true - }, - { - "projectID": 471136, - "fileID": 4640910, + "fileID": 5291546, "required": true }, { @@ -707,7 +672,7 @@ }, { "projectID": 269024, - "fileID": 5217242, + "fileID": 5266821, "required": true }, { @@ -727,12 +692,12 @@ }, { "projectID": 790626, - "fileID": 5267629, + "fileID": 5288164, "required": true }, { "projectID": 499980, - "fileID": 5180872, + "fileID": 5318429, "required": true }, { @@ -762,12 +727,7 @@ }, { "projectID": 581495, - "fileID": 5108615, - "required": true - }, - { - "projectID": 314002, - "fileID": 4631133, + "fileID": 5299671, "required": true }, { @@ -807,7 +767,7 @@ }, { "projectID": 570073, - "fileID": 5093329, + "fileID": 5210240, "required": true }, { @@ -815,14 +775,9 @@ "fileID": 4944325, "required": true }, - { - "projectID": 670986, - "fileID": 5093785, - "required": true - }, { "projectID": 71738, - "fileID": 4859167, + "fileID": 5302605, "required": true }, { @@ -830,11 +785,6 @@ "fileID": 5090810, "required": true }, - { - "projectID": 521480, - "fileID": 5021021, - "required": true - }, { "projectID": 633412, "fileID": 5016280, @@ -847,17 +797,17 @@ }, { "projectID": 422301, - "fileID": 5240479, + "fileID": 5296475, "required": true }, { "projectID": 618298, - "fileID": 5242817, + "fileID": 5326245, "required": true }, { "projectID": 619320, - "fileID": 5242858, + "fileID": 5327377, "required": true }, { @@ -865,11 +815,6 @@ "fileID": 4738952, "required": true }, - { - "projectID": 411813, - "fileID": 4963825, - "required": true - }, { "projectID": 990542, "fileID": 5203482, @@ -885,11 +830,6 @@ "fileID": 5102258, "required": true }, - { - "projectID": 910506, - "fileID": 5083995, - "required": true - }, { "projectID": 248055, "fileID": 5054515, @@ -942,27 +882,27 @@ }, { "projectID": 482265, - "fileID": 4683552, + "fileID": 5259004, "required": true }, { "projectID": 984851, - "fileID": 5170165, + "fileID": 5323766, "required": true }, { - "projectID": 663013, - "fileID": 5225678, + "projectID": 1016115, + "fileID": 5330778, "required": true }, { "projectID": 834607, - "fileID": 4904776, + "fileID": 5331668, "required": true }, { "projectID": 869524, - "fileID": 5226119, + "fileID": 5300799, "required": true }, { @@ -972,7 +912,7 @@ }, { "projectID": 510656, - "fileID": 4591907, + "fileID": 5294260, "required": true }, { @@ -992,7 +932,7 @@ }, { "projectID": 376351, - "fileID": 4777556, + "fileID": 5284254, "required": true }, { @@ -1017,7 +957,12 @@ }, { "projectID": 927564, - "fileID": 5266573, + "fileID": 5319768, + "required": true + }, + { + "projectID": 1015315, + "fileID": 5332118, "required": true } ]