diff --git a/.github/runners/debug.py b/.github/runners/debug.py new file mode 100644 index 0000000..9e04128 --- /dev/null +++ b/.github/runners/debug.py @@ -0,0 +1,18 @@ +import json +import os + +# 定义JSON文件的路径 +config_file_path = os.path.join(os.environ['GITHUB_WORKSPACE'], 'kubejs', 'config', 'probe-settings.json') + +# 读取JSON文件 +with open(config_file_path, 'r') as file: + config_data = json.load(file) + +# 修改probejs.enabled为false +config_data['probejs.enabled'] = False + +# 写回修改后的JSON文件 +with open(config_file_path, 'w') as file: + json.dump(config_data, file, indent=4) + +print(f"Updated {config_file_path}: probejs.enabled is now set to false.") \ No newline at end of file diff --git a/.github/workflows/devBuilder.yaml b/.github/workflows/devBuilder.yaml index a447bd2..be76305 100644 --- a/.github/workflows/devBuilder.yaml +++ b/.github/workflows/devBuilder.yaml @@ -6,9 +6,25 @@ on: env: BUILD: The Lying World - VERSION: ALPHA-v0.0 + VERSION: ALPHA-v0.1 jobs: + CloseDebug: + runs-on: ubuntu-latest + + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + - name: Set up Python + uses: actions/setup-python@v4 + with: + python-version: '3.x' + + - name: Update probe settings + run: + python .github/runners/debug.py + CreateCursePack: runs-on: ubuntu-latest if: github.repository == 'MakeshitTeam/The-Lying-World' diff --git a/.gitignore b/.gitignore index 5a23039..1474d66 100644 --- a/.gitignore +++ b/.gitignore @@ -35,4 +35,6 @@ example.* /shaderpacks /resourcepacks config/oculus.properties -config/blockswap/known_states \ No newline at end of file +config/blockswap/known_states +config/embeddium +config/xaerominimap_entities.json diff --git a/config/anitexlib-client.toml b/config/anitexlib-client.toml index 8b3a2bd..4cc5000 100644 --- a/config/anitexlib-client.toml +++ b/config/anitexlib-client.toml @@ -4,6 +4,4 @@ to_show_example = false #Determine if particles must use advanced render system use_advanced_particle_renderer = true - #Determine if particles can be visible in gui - to_render_particles_in_gui = true diff --git a/config/embeddium++.toml b/config/embeddium++.toml deleted file mode 100644 index 37499ab..0000000 --- a/config/embeddium++.toml +++ /dev/null @@ -1,176 +0,0 @@ - -[embeddiumplus] - - [embeddiumplus.general] - #Configure FPS Display mode - #Complete mode gives you min FPS count and average count - #Allowed Values: OFF, SIMPLE, ADVANCED - fpsDisplay = "ADVANCED" - #Shows GPU and memory usage onto FPS display - #Allowed Values: OFF, ON, GPU, RAM - fpsDisplaySystem = "OFF" - #Set Fullscreen mode - #Borderless let you change between screens more faster and move your mouse across monitors - #Allowed Values: WINDOWED, BORDERLESS, FULLSCREEN - fullscreen = "WINDOWED" - #Configure FPS Display gravity - #Places counter on specified corner of your screen - #Allowed Values: LEFT, CENTER, RIGHT - fpsDisplayGravity = "LEFT" - #Toggle FPS Display shadow - #In case sometimes you can't see the text - fpsDisplayShadow = false - #Configure FPS Display margin - #Give some space between corner and text - #Range: 0 ~ 48 - fpsDisplayMargin = 12 - - [embeddiumplus.performance] - #Toggles JREI item rendering until searching - #Increases performance a little bit and cleans your screen when you don't want to use it - hideJREI = false - #Sets culling mode - #Reduces number of visible faces when the neighbor blocks are leaves - #Allowed Values: ALL, OFF - leavesCulling = "OFF" - #Toggles Minecraft Fonts shadows - #Depending of the case may increase performance - #Gives a flat style text - fontShadows = true - - [embeddiumplus.performance.distanceCulling] - - [embeddiumplus.performance.distanceCulling.entities] - #Configure horizontal max distance before cull entities - #Value is squared, default was 64^2 (or 64x64) - #Range: > 0 - cullingMaxDistanceX = 4096 - #Toggles distance culling for entities, doesn't affect monsters culling - #Check the options below - enable = true - #Configure vertical max distance before cull entities - #Value is raw - #Range: 0 ~ 512 - cullingMaxDistanceY = 32 - #List of all Entities to be ignored by distance culling - #Uses ResourceLocation to identify it - #Example 1: "minecraft:bat" - Ignores bats only - #Example 2: "alexsmobs:*" - ignores all entities for alexmobs mod - whitelist = ["minecraft:ghast", "minecraft:ender_dragon", "iceandfire:*", "create:*"] - - [embeddiumplus.performance.distanceCulling.entities.monsters] - #Configure horizontal max distance before cull monster entities - #Value is squared, default was 64^2 (or 64x64) - #Range: > 0 - cullingMaxDistanceX = 16384 - #Toggles distance culling for monsters (or hostile entities, whatever you want to call it), doesn't affect neutral/pacific entities - #Check the options above - enable = false - #Configure vertical max distance before cull monster entities - #Value is raw - #Range: 0 ~ 512 - cullingMaxDistanceY = 64 - #List of all monster entities to be ignored by distance culling - #Uses ResourceLocation to identify it - #Example 1: "minecraft:bat" - Ignores bats only - #Example 2: "alexsmobs:*" - ignores all entities for alexmobs mod - whitelist = ["minecraft:ghast", "minecraft:ender_dragon", "iceandfire:*", "create:*"] - - [embeddiumplus.performance.distanceCulling.tileEntities] - #Configure horizontal max distance before cull Block entities - #Value is squared, default was 64^2 (or 64x64) - #Range: > 0 - cullingMaxDistanceX = 4096 - #Toggles distance culling for Block Entities - #Maybe you use another mod for that :( - enable = true - #Configure vertical max distance before cull Block entities - #Value is raw - #Range: 0 ~ 512 - cullingMaxDistanceY = 32 - #List of all Block Entities to be ignored by distance culling - #Uses ResourceLocation to identify it - #Example 1: "minecraft:chest" - Ignores chests only - #Example 2: "ae2:*" - ignores all Block entities from Applied Energetics 2 - whitelist = ["waterframes:*"] - - [embeddiumplus.performance.fastModels] - #Toggles FastBeds feature - enableBeds = false - #Toggles FastChest feature - #Without flywheel installed or using any backend, it increases FPS significatly on chest rooms - enableChests = false - - [embeddiumplus.dynlights] - #Toggle if Block Entities should have dynamic lights - onTileEntities = true - #Configure how fast light whould be updated - #Allowed Values: OFF, SLOW, NORMAL, FAST, SUPERFAST, FASTESTS, REALTIME - updateSpeed = "REALTIME" - #Toggle if Entities should have dynamic lights - onEntities = true - updateOnlyOnPositionChange = true - - [embeddiumplus.others] - #Configure if borderless fullscreen option should be attached to F11 or replace vanilla fullscreen - #Allowed Values: ATTACH, REPLACE, OFF - borderlessAttachModeOnF11 = "ATTACH" - #Toggles fast language reload - #Embeddedt points it maybe cause troubles to JEI, so ¿why not add it as a toggleable option? - fastLanguageReload = true - - [embeddiumplus.quality] - #Chunks fade in speed - #This option doesn't affect performance, just changes speed - #Allowed Values: OFF, FAST, SLOW - chunkFadeSpeed = "SLOW" - #Clean my skies - #Blue band was a vanilla feature, toggle off will show sky color directly - blueBand = true - #Raise clouds - #Modify clouds height perfect for a adaptative world experience - #Range: 0 ~ 512 - cloudsHeight = 192 - #Do not show me your name - #disables nametag rendering for players and entities - disableNameTagRendering = false - #Toggle fog feature - #Fog was a vanilla feature - fog = true - - [embeddiumplus.quality.darkness] - #Configure fog brightness on nether when darkness is enabled - #Range: 0.0 ~ 1.0 - endFogBright = 0.5 - #Configure min moon brightness level with darkness - #Range: 0.0 ~ 1.0 - newMoonBright = 0.0 - #Toggle Darkness on End dimension - enableOnEnd = false - #Toggle Darkness default mode for modded dimensions - valueByDefault = false - #Configure Darkness Mode - #Each config changes what is considered 'true darkness' - #Allowed Values: TOTAL_DARKNESS, PITCH_BLACK, DARK, DIM, OFF - mode = "OFF" - #Toggles if moon phases affects darkness in the overworld - affectedByMoonPhase = true - #List of all dimensions to use True Darkness - #This option overrides 'valueByDefault' state - dimensionWhitelist = [] - #Configure max moon brightness level with darkness - #Range: 0.0 ~ 1.0 - fullMoonBright = 0.25 - #Configure fog brightness on nether when darkness is enabled - #Range: 0.0 ~ 1.0 - netherFogBright = 0.5 - #Toggle Darkness on Nether dimension - enableOnNether = false - #Toggle darkness when dimension has no SkyLight - enableOnNoSkyLight = false - #Disables all bright sources of darkness like moon or fog - #Only affects darkness effect - enableBlockLightOnly = false - #Toggle Darkness on Overworld dimension - enableOnOverworld = true - diff --git a/config/embeddium-fingerprint.json b/config/embeddium-fingerprint.json deleted file mode 100644 index 1313b61..0000000 --- a/config/embeddium-fingerprint.json +++ /dev/null @@ -1 +0,0 @@ -{"v":1,"s":"3beac842679858f1681f86087591646a041894e6aa96a58d9d2340dd4755bdff172addc6c79d36e2ac9d24ea02d28cd0d2a043610714909943fad63efda69db6","u":"3bdeff3c04e1e01e84f45259a1038de986b640d24b248255fa24c48bc8cb48d93ff123eeb071a822a3d48b4ffb523a9107c2aaf0c8699ee5423db4856f2e5e1b","p":"13905b9a1ea374707d1390c0d18bc2d68e59fab7ebc86bc4b04ee32fb9dbcdb09e9332a0d3057fdc2c4ded98aeafc4ed02ecc338ea449667a0a6869a3bd21d5f","t":1720867828} \ No newline at end of file diff --git a/config/embeddium-mixins.properties b/config/embeddium-mixins.properties deleted file mode 100644 index 4e10829..0000000 --- a/config/embeddium-mixins.properties +++ /dev/null @@ -1,6 +0,0 @@ -# This is the configuration file for Embeddium. -# -# You can find information on editing this file and all the available options here: -# https://github.com/jellysquid3/sodium-fabric/wiki/Configuration-File -# -# By default, this file will be empty except for this notice. diff --git a/config/embeddium-options.json b/config/embeddium-options.json deleted file mode 100644 index 270f5cf..0000000 --- a/config/embeddium-options.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "quality": { - "weather_quality": "DEFAULT", - "leaves_quality": "FANCY", - "enable_vignette": true - }, - "advanced": { - "enable_memory_tracing": false, - "use_advanced_staging_buffers": true, - "disable_incompatible_mod_warnings": false, - "cpu_render_ahead_limit": 3 - }, - "performance": { - "chunk_builder_threads": 0, - "always_defer_chunk_updates_v2": true, - "animate_only_visible_textures": true, - "use_entity_culling": true, - "use_fog_occlusion": true, - "use_block_face_culling": true, - "use_compact_vertex_format": true, - "use_translucent_face_sorting_v2": true, - "use_no_error_g_l_context": true - }, - "notifications": { - "force_disable_donation_prompts": false, - "has_cleared_donation_button": false, - "has_seen_donation_prompt": true - } -} \ No newline at end of file diff --git a/config/fallingtree.json b/config/fallingtree.json new file mode 100644 index 0000000..37853c8 --- /dev/null +++ b/config/fallingtree.json @@ -0,0 +1,50 @@ +{ + "trees": { + "allowedLogs": [], + "deniedLogs": [], + "allowedLeaves": [], + "allowedNonDecayLeaves": [], + "deniedLeaves": [], + "breakMode": "INSTANTANEOUS", + "detectionMode": "WHOLE_TREE", + "maxScanSize": 500, + "maxSize": 100, + "maxLeafDistanceFromLog": 15, + "maxSizeAction": "ABORT", + "breakOrder": "FURTHEST_FIRST", + "minimumLeavesAroundRequired": 1, + "includePersistentLeavesInRequiredCount": true, + "treeBreaking": true, + "leavesBreaking": true, + "leavesBreakingForceRadius": 0, + "allowMixedLogs": false, + "breakNetherTreeWarts": true, + "breakMangroveRoots": true, + "searchAreaRadius": -1, + "allowedAdjacentBlocks": [], + "adjacentStopMode": "STOP_ALL" + }, + "tools": { + "allowed": [], + "denied": [], + "preserve": false, + "ignoreTools": false, + "damageMultiplicand": 1.0, + "damageRounding": "ROUND_DOWN", + "speedMultiplicand": 0.0, + "forceToolUsage": false + }, + "player": { + "allowedTags": [] + }, + "enchantment": { + "registerEnchant": false, + "registerSpecificEnchant": false, + "hideEnchant": false, + "requireEnchantment": false + }, + "sneakMode": "SNEAK_DISABLE", + "breakInCreative": false, + "lootInCreative": true, + "notificationMode": "ACTION_BAR" +} \ No newline at end of file diff --git a/config/fasterladderclimbing-client.toml b/config/fasterladderclimbing-client.toml new file mode 100644 index 0000000..166875c --- /dev/null +++ b/config/fasterladderclimbing-client.toml @@ -0,0 +1,10 @@ + +[General] + #Allow going UP faster. If [false], then player can only climb up the ladder at normal speed. + allowQuickAscension = true + #Allow going DOWN faster. If [false], then player can only climb down the ladder at normal speed. + allowQuickDescension = true + #Speed modifier. 0 is Vanilla speed, 10 is lightning speed. + #Range: 0 ~ 10 + speedModifier = 4 + diff --git a/config/fluiddrawerslegacy-client.toml b/config/fluiddrawerslegacy-client.toml new file mode 100644 index 0000000..2fca767 --- /dev/null +++ b/config/fluiddrawerslegacy-client.toml @@ -0,0 +1,13 @@ + +#Client settings +[Renderer] + #Set the label renderer distance, -1 stands for unlimited distance. + #Range: -1 ~ 1024 + distance = -1 + +#Waila settings +[Display] + #Set the fluid show amounts limit with controller and slave. + #Range: 3 ~ 24 + showlimit = 9 + diff --git a/config/fluiddrawerslegacy-common.toml b/config/fluiddrawerslegacy-common.toml new file mode 100644 index 0000000..d0c795c --- /dev/null +++ b/config/fluiddrawerslegacy-common.toml @@ -0,0 +1,21 @@ + +#Debug settings +[debugMode] + #Set false to stop output log. + debugMode = false + +#General settings +[general] + #Set it to change volume. + #Range: 4000 ~ 96000 + volume = 32000 + #Whether the drawer retains fluid when destroyed. + retainFluid = true + +#Compat settings +[compat] + #Allow players to use potion bottles to deposit potions directly in survival mode. + createPotionInteraction = true + #Allow players to use caupona soup bowl to deposit soup directly in survival mode. + cauponaSoupBowlInteraction = true + diff --git a/config/jade/jade.json b/config/jade/jade.json index 7a5cee8..8c31424 100644 --- a/config/jade/jade.json +++ b/config/jade/jade.json @@ -5,7 +5,7 @@ "bossBarOverlapMode": "PUSH_DOWN", "builtinCamouflage": true, "ttsMode": "PRESS", - "fluidMode": "ANY", + "fluidMode": "NONE", "reachDistance": 0.0, "displayEntities": true, "displayBosses": true, @@ -15,7 +15,7 @@ "hideFromDebug": true, "hideFromTabList": true, "enableTextToSpeech": false, - "hintOverlayToggle": true, + "hintOverlayToggle": false, "hintNarratorToggle": true, "previewOverlay": true }, diff --git a/config/jade/plugins.json b/config/jade/plugins.json index c3dabcc..8c568df 100644 --- a/config/jade/plugins.json +++ b/config/jade/plugins.json @@ -64,6 +64,10 @@ "supplementaries": { "hat_stand": true }, + "fluiddrawerslegacy": { + "controller": true, + "fluiddrawer": true + }, "jade": { "coordinates.rel": false, "distance": false, @@ -71,5 +75,10 @@ "coordinates": false, "registry_name": "OFF", "mod_name": true + }, + "storagedrawers": { + "display.stacklimit": true, + "display.content": true, + "display.status": true } } \ No newline at end of file diff --git a/config/jade/sort-order.json b/config/jade/sort-order.json index eb181aa..eaa5f60 100644 --- a/config/jade/sort-order.json +++ b/config/jade/sort-order.json @@ -1,5 +1,7 @@ { "ars_nouveau:mob_jar": null, + "fluiddrawerslegacy:controller": null, + "fluiddrawerslegacy:fluiddrawer": null, "jade:block_face": null, "jade:distance": null, "jade:mod_name": null, diff --git a/config/quark-common.toml b/config/quark-common.toml index 7b83990..bbdc7b4 100644 --- a/config/quark-common.toml +++ b/config/quark-common.toml @@ -134,10 +134,10 @@ Stools = true "Sturdy Stone" = true Thatch = true - "Variant Bookshelves" = true - "Variant Chests" = true - "Variant Furnaces" = true - "Variant Ladders" = true + "Variant Bookshelves" = false + "Variant Chests" = false + "Variant Furnaces" = false + "Variant Ladders" = false "Vertical Planks" = true "Vertical Slabs" = true "Wooden Posts" = true @@ -197,8 +197,8 @@ [building.leaf_carpet] #This feature disables itself if any of the following mods are loaded: - # - immersive_weathering # - woodworks + # - immersive_weathering #This is done to prevent content overlap. #You can turn this on to force the feature to be loaded even if the above mods are also loaded. "Ignore Anti Overlap" = false @@ -237,8 +237,8 @@ #Allowed values: [0,1] "Fall Damage Multiplier" = 0.5 #This feature disables itself if any of the following mods are loaded: - # - environmental # - goated + # - environmental #This is done to prevent content overlap. #You can turn this on to force the feature to be loaded even if the above mods are also loaded. "Ignore Anti Overlap" = false @@ -246,15 +246,15 @@ [building.variant_bookshelves] "Change Names" = true #This feature disables itself if any of the following mods are loaded: - # - woodster # - woodworks + # - woodster #This is done to prevent content overlap. #You can turn this on to force the feature to be loaded even if the above mods are also loaded. "Ignore Anti Overlap" = false [building.variant_chests] - "Enable Reverting Wooden Chests" = true - "Replace Worldgen Chests" = true + "Enable Reverting Wooden Chests" = false + "Replace Worldgen Chests" = false #Chests to put in structures. It's preferred to use worldgen tags for this. The format per entry is "structure=chest", where "structure" is a structure ID, and "chest" is a block ID, which must correspond to a standard chest block. "Structure Chests" = [] #This feature disables itself if any of the following mods are loaded: @@ -266,8 +266,8 @@ [building.variant_ladders] "Change Names" = true #This feature disables itself if any of the following mods are loaded: - # - woodster # - woodworks + # - woodster #This is done to prevent content overlap. #You can turn this on to force the feature to be loaded even if the above mods are also loaded. "Ignore Anti Overlap" = false diff --git a/config/shouldersurfing-client.toml b/config/shouldersurfing-client.toml index 6118eb1..9c8c9a1 100644 --- a/config/shouldersurfing-client.toml +++ b/config/shouldersurfing-client.toml @@ -30,7 +30,7 @@ offset_y = 0.125 #Third person camera z-offset. #Range: -1.7976931348623157E308 ~ 1.7976931348623157E308 - offset_z = 2.8000000000000043 + offset_z = 2.7750000000000044 [camera.offset.min] #If x-offset is limited this is the minimum amount. @@ -66,37 +66,94 @@ [camera.offset.multiplier.passenger] #x-offset multiplier for when the player is a passenger. - #Range: 0.0 ~ 1.7976931348623157E308 + #Range: -1.7976931348623157E308 ~ 1.7976931348623157E308 multiplier_offset_x = 1.0 #y-offset multiplier for when the player is a passenger. - #Range: 0.0 ~ 1.7976931348623157E308 + #Range: -1.7976931348623157E308 ~ 1.7976931348623157E308 multiplier_offset_y = 1.0 #z-offset multiplier for when the player is a passenger. - #Range: 0.0 ~ 1.7976931348623157E308 + #Range: -1.7976931348623157E308 ~ 1.7976931348623157E308 multiplier_offset_z = 1.0 [camera.offset.multiplier.sprint] #x-offset multiplier for when the player is sprinting. - #Range: 0.0 ~ 1.7976931348623157E308 + #Range: -1.7976931348623157E308 ~ 1.7976931348623157E308 multiplier_offset_x = 1.0 #y-offset multiplier for when the player is sprinting. - #Range: 0.0 ~ 1.7976931348623157E308 + #Range: -1.7976931348623157E308 ~ 1.7976931348623157E308 multiplier_offset_y = 1.0 #z-offset multiplier for when the player is sprinting. - #Range: 0.0 ~ 1.7976931348623157E308 + #Range: -1.7976931348623157E308 ~ 1.7976931348623157E308 multiplier_offset_z = 1.0 [camera.offset.multiplier.aiming] #x-offset multiplier for when the player is aiming. - #Range: 0.0 ~ 1.7976931348623157E308 + #Range: -1.7976931348623157E308 ~ 1.7976931348623157E308 multiplier_offset_x = 1.0 #y-offset multiplier for when the player is aiming. - #Range: 0.0 ~ 1.7976931348623157E308 + #Range: -1.7976931348623157E308 ~ 1.7976931348623157E308 multiplier_offset_y = 1.0 #z-offset multiplier for when the player is aiming. - #Range: 0.0 ~ 1.7976931348623157E308 + #Range: -1.7976931348623157E308 ~ 1.7976931348623157E308 multiplier_offset_z = 1.0 + [camera.offset.multiplier.fall_flying] + #x-offset multiplier for when using Elytra. + #Range: -1.7976931348623157E308 ~ 1.7976931348623157E308 + modifier_offset_x = 1.0 + #y-offset multiplier for when using Elytra. + #Range: -1.7976931348623157E308 ~ 1.7976931348623157E308 + modifier_offset_y = 1.0 + #z-offset multiplier for when using Elytra. + #Range: -1.7976931348623157E308 ~ 1.7976931348623157E308 + modifier_offset_z = 1.0 + + [camera.offset.modifiers] + + [camera.offset.modifiers.passenger] + #x-offset modifier for when the player is a passenger. + #Range: -1.7976931348623157E308 ~ 1.7976931348623157E308 + modifier_offset_x = 0.0 + #y-offset modifier for when the player is a passenger. + #Range: -1.7976931348623157E308 ~ 1.7976931348623157E308 + modifier_offset_y = 0.0 + #z-offset modifier for when the player is a passenger. + #Range: -1.7976931348623157E308 ~ 1.7976931348623157E308 + modifier_offset_z = 0.0 + + [camera.offset.modifiers.sprint] + #x-offset modifier for when the player is sprinting. + #Range: -1.7976931348623157E308 ~ 1.7976931348623157E308 + modifier_offset_x = 0.0 + #y-offset modifier for when the player is sprinting. + #Range: -1.7976931348623157E308 ~ 1.7976931348623157E308 + modifier_offset_y = 0.0 + #z-offset modifier for when the player is sprinting. + #Range: -1.7976931348623157E308 ~ 1.7976931348623157E308 + modifier_offset_z = 0.0 + + [camera.offset.modifiers.aiming] + #x-offset modifier for when the player is aiming. + #Range: -1.7976931348623157E308 ~ 1.7976931348623157E308 + modifier_offset_x = 0.0 + #y-offset modifier for when the player is aiming. + #Range: -1.7976931348623157E308 ~ 1.7976931348623157E308 + modifier_offset_y = 0.0 + #z-offset modifier for when the player is aiming. + #Range: -1.7976931348623157E308 ~ 1.7976931348623157E308 + modifier_offset_z = 0.0 + + [camera.offset.modifiers.fall_flying] + #x-offset modifier for when using Elytra. + #Range: -1.7976931348623157E308 ~ 1.7976931348623157E308 + modifier_offset_x = 0.0 + #y-offset modifier for when using Elytra. + #Range: -1.7976931348623157E308 ~ 1.7976931348623157E308 + modifier_offset_y = 0.0 + #z-offset modifier for when using Elytra. + #Range: -1.7976931348623157E308 ~ 1.7976931348623157E308 + modifier_offset_z = 0.0 + [perspective] #The default perspective when you load the game. #Allowed Values: FIRST_PERSON, THIRD_PERSON_BACK, THIRD_PERSON_FRONT, SHOULDER_SURFING @@ -138,11 +195,6 @@ #Crosshair type to use for shoulder surfing. #Allowed Values: ADAPTIVE, DYNAMIC, STATIC, STATIC_WITH_1PP, DYNAMIC_WITH_1PP crosshair_type = "STATIC" - #The raytrace distance used for the dynamic crosshair. - #Range: 0.0 ~ 1.7976931348623157E308 - custom_raytrace_distance = 400.0 - #Whether or not to use the custom raytrace distance used for the dynamic crosshair. - use_custom_raytrace_distance = true #Items that when held, trigger the dynamic crosshair in adaptive mode. This config option supports regular expressions. Example: 'minecraft:.*sword' matches 'minecraft:wooden_sword' and 'minecraft:netherite_sword'. adaptive_crosshair_hold_items = ["minecraft:snowball", "minecraft:egg", "minecraft:experience_bottle", "minecraft:ender_pearl", "minecraft:splash_potion", "minecraft:fishing_rod", "minecraft:lingering_potion"] #Items that when used, trigger the dynamic crosshair in adaptive mode. This config option supports regular expressions. Example: 'minecraft:.*sword' matches 'minecraft:wooden_sword' and 'minecraft:netherite_sword'. @@ -170,3 +222,18 @@ #Whether to center sounds made by the player. center_player_sounds = false +[object_picker] + #The raytrace distance used for the dynamic crosshair. + #Range: 0.0 ~ 1.7976931348623157E308 + custom_raytrace_distance = 400.0 + #Whether or not to use the custom raytrace distance used for the dynamic crosshair. + use_custom_raytrace_distance = true + + [object_picker.pick_origin] + #The origin where the entity pick starts. + #Allowed Values: PLAYER, CAMERA + entity_pick_origin = "PLAYER" + #The origin where the block pick starts. + #Allowed Values: PLAYER, CAMERA + block_pick_origin = "PLAYER" + diff --git a/config/sophisticatedbackpacks-common.toml b/config/sophisticatedbackpacks-common.toml new file mode 100644 index 0000000..06712ea --- /dev/null +++ b/config/sophisticatedbackpacks-common.toml @@ -0,0 +1,6 @@ + +#Common Settings +[common] + #Turns on/off loot added to various vanilla chest loot tables + chestLootEnabled = true + diff --git a/config/sophisticatedcore-client.toml b/config/sophisticatedcore-client.toml new file mode 100644 index 0000000..7f5845d --- /dev/null +++ b/config/sophisticatedcore-client.toml @@ -0,0 +1,9 @@ + +#Client Settings +[client] + #Positions where sort buttons can display to help with conflicts with controls from other mods + #Allowed Values: TITLE_LINE_RIGHT, BELOW_UPGRADES, BELOW_UPGRADE_TABS, HIDDEN + sortButtonsPosition = "TITLE_LINE_RIGHT" + #Whether click sound should play when custom buttons are clicked in gui + playButtonSound = true + diff --git a/config/sophisticatedcore-common.toml b/config/sophisticatedcore-common.toml new file mode 100644 index 0000000..2303d30 --- /dev/null +++ b/config/sophisticatedcore-common.toml @@ -0,0 +1,6 @@ + +#Common Settings +[common] + #Disable / enable any items here (disables their recipes) + enabledItems = ["sophisticatedbackpacks:void_upgrade|true", "sophisticatedbackpacks:advanced_refill_upgrade|true", "sophisticatedbackpacks:advanced_pickup_upgrade|true", "sophisticatedbackpacks:jukebox_upgrade|true", "sophisticatedbackpacks:smoking_upgrade|true", "sophisticatedbackpacks:everlasting_upgrade|true", "sophisticatedbackpacks:compacting_upgrade|true", "sophisticatedbackpacks:advanced_restock_upgrade|true", "sophisticatedbackpacks:advanced_magnet_upgrade|true", "sophisticatedbackpacks:advanced_tool_swapper_upgrade|true", "sophisticatedbackpacks:advanced_filter_upgrade|true", "sophisticatedbackpacks:advanced_feeding_upgrade|true", "sophisticatedbackpacks:diamond_backpack|true", "sophisticatedbackpacks:inception_upgrade|true", "sophisticatedbackpacks:crafting_upgrade|true", "sophisticatedbackpacks:anvil_upgrade|true", "sophisticatedbackpacks:xp_pump_upgrade|true", "sophisticatedbackpacks:tank_upgrade|true", "sophisticatedbackpacks:auto_smelting_upgrade|true", "sophisticatedbackpacks:pickup_upgrade|true", "sophisticatedbackpacks:auto_smoking_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", "sophisticatedbackpacks:stack_upgrade_starter_tier|true", "sophisticatedbackpacks:auto_blasting_upgrade|true", "sophisticatedbackpacks:smelting_upgrade|true", "sophisticatedbackpacks:battery_upgrade|true", "sophisticatedbackpacks:advanced_pump_upgrade|true", "sophisticatedbackpacks:upgrade_base|true", "sophisticatedbackpacks:filter_upgrade|true", "sophisticatedbackpacks:magnet_upgrade|true", "sophisticatedbackpacks:blasting_upgrade|true", "sophisticatedbackpacks:refill_upgrade|true", "sophisticatedbackpacks:deposit_upgrade|true", "sophisticatedbackpacks:iron_backpack|true", "sophisticatedbackpacks:gold_backpack|true", "sophisticatedbackpacks:copper_backpack|true", "sophisticatedbackpacks:advanced_deposit_upgrade|true", "sophisticatedbackpacks:advanced_void_upgrade|true", "sophisticatedbackpacks:restock_upgrade|true", "sophisticatedbackpacks:stonecutter_upgrade|true", "sophisticatedbackpacks:advanced_compacting_upgrade|true", "sophisticatedbackpacks:backpack|true", "sophisticatedbackpacks:pump_upgrade|true", "sophisticatedbackpacks:tool_swapper_upgrade|true", "sophisticatedbackpacks:feeding_upgrade|true", "sophisticatedbackpacks:netherite_backpack|true"] + diff --git a/config/sound_physics_remastered/allowed_sounds.properties b/config/sound_physics_remastered/allowed_sounds.properties index 3361bab..6a9ffae 100644 --- a/config/sound_physics_remastered/allowed_sounds.properties +++ b/config/sound_physics_remastered/allowed_sounds.properties @@ -1191,6 +1191,7 @@ minecraft\:entity.guardian.attack=true biomemusic\:music.game=true minecraft\:entity.bee.loop_aggressive=true minecraft\:block.scaffolding.hit=true +biomemusic\:music.cave=true minecraft\:event.raid.horn=true wizards_reborn\:wisestone_tile_hit=true bosses_of_mass_destruction\:rage_prepare=true @@ -2777,6 +2778,7 @@ minecraft\:item.goat_horn.play=true minecraft\:entity.minecart.inside=true minecraft\:entity.wither.hurt=true cataclysm\:flamethrower=true +biomemusic\:music.water=true minecraft\:block.nylium.place=true minecraft\:entity.shulker.ambient=true botania\:temperance_stone_configure=true diff --git a/config/sound_physics_remastered/occlusion.properties b/config/sound_physics_remastered/occlusion.properties index e4532a9..7d61a05 100644 --- a/config/sound_physics_remastered/occlusion.properties +++ b/config/sound_physics_remastered/occlusion.properties @@ -9,208 +9,208 @@ # By block ID: # minecraft\:oak_log=1.0 -# Netherrack (Sound Type) -NETHERRACK=1.0 -# Slime Block (Sound Type) -SLIME_BLOCK=1.0 -# Bamboo Sapling (Sound Type) -BAMBOO_SAPLING=0.1 -# Fungus (Sound Type) -FUNGUS=0.0 +# Sculk Vein (Sound Type) +SCULK_VEIN=1.0 # Suspicious Gravel (Sound Type) SUSPICIOUS_GRAVEL=1.0 -# Weeping Vines (Sound Type) -WEEPING_VINES=0.0 +# Cherry Wood Hanging Sign (Sound Type) +CHERRY_WOOD_HANGING_SIGN=1.0 # Sweet Berry Bush (Sound Type) SWEET_BERRY_BUSH=0.0 -# Spore Blossom (Sound Type) -SPORE_BLOSSOM=0.0 +# Small Amethyst Bud (Sound Type) +SMALL_AMETHYST_BUD=0.0 +# Polished Deepslate (Sound Type) +POLISHED_DEEPSLATE=1.0 +# Hard Crop (Sound Type) +HARD_CROP=1.0 +# Basalt (Sound Type) +BASALT=1.0 +# Hanging Sign (Sound Type) +HANGING_SIGN=1.0 +# Metal (Sound Type) +METAL=1.0 +# Sculk Sensor (Sound Type) +SCULK_SENSOR=1.0 +# Nether Wood (Sound Type) +NETHER_WOOD=1.0 +# Cherry Sapling (Sound Type) +CHERRY_SAPLING=1.0 +# Copper (Sound Type) +COPPER=1.0 +# Glow Lichen (Sound Type) +GLOW_LICHEN=0.0 +# Lily Pad (Sound Type) +LILY_PAD=0.0 # Flowering Azalea (Sound Type) FLOWERING_AZALEA=1.0 -# Anvil (Sound Type) -ANVIL=1.0 -# Crop (Sound Type) -CROP=0.0 -# Deepslate (Sound Type) -DEEPSLATE=1.0 -# Mangrove Roots (Sound Type) -MANGROVE_ROOTS=1.0 -# Dripstone Block (Sound Type) -DRIPSTONE_BLOCK=1.0 -# Nether Bricks (Sound Type) -NETHER_BRICKS=1.0 -# Candle (Sound Type) -CANDLE=1.0 -# Coral Block (Sound Type) -CORAL_BLOCK=1.0 -# Snow (Sound Type) -SNOW=0.1 +# Rooted Dirt (Sound Type) +ROOTED_DIRT=1.0 +# Mud (Sound Type) +MUD=1.0 +# Hanging Roots (Sound Type) +HANGING_ROOTS=1.0 +# Nether Gold Ore (Sound Type) +NETHER_GOLD_ORE=1.0 +# Nether Sprouts (Sound Type) +NETHER_SPROUTS=1.0 +# Bone Block (Sound Type) +BONE_BLOCK=1.0 # Frogspawn (Sound Type) FROGSPAWN=1.0 -# Suspicious Sand (Sound Type) -SUSPICIOUS_SAND=1.0 -# Glass (Sound Type) -GLASS=0.1 -# Azalea Leaves (Sound Type) -AZALEA_LEAVES=1.0 -# Nether Wood (Sound Type) -NETHER_WOOD=1.0 -# Metal (Sound Type) -METAL=1.0 -# Froglight (Sound Type) -FROGLIGHT=1.0 -# Nether Wart (Sound Type) -NETHER_WART=1.0 -# Chiseled Bookshelf (Sound Type) -CHISELED_BOOKSHELF=1.0 -# Sand (Sound Type) -SAND=1.0 -# Polished Deepslate (Sound Type) -POLISHED_DEEPSLATE=1.0 -# Nether Wood Hanging Sign (Sound Type) -NETHER_WOOD_HANGING_SIGN=1.0 -# Mud Bricks (Sound Type) -MUD_BRICKS=1.0 -# Moss Carpet (Sound Type) -MOSS_CARPET=0.1 +# Roots (Sound Type) +ROOTS=0.0 # Stem (Sound Type) STEM=1.0 -# Sculk Sensor (Sound Type) -SCULK_SENSOR=1.0 -# Wool (Sound Type) -WOOL=1.5 -# Moss (Sound Type) -MOSS=0.75 # Gravel (Sound Type) GRAVEL=1.0 -# Honey Block (Sound Type) -HONEY_BLOCK=0.5 +# Bamboo (Sound Type) +BAMBOO=0.1 +# Sculk Catalyst (Sound Type) +SCULK_CATALYST=1.0 # Gilded Blackstone (Sound Type) GILDED_BLACKSTONE=1.0 -# Nether Gold Ore (Sound Type) -NETHER_GOLD_ORE=1.0 -# Small Amethyst Bud (Sound Type) -SMALL_AMETHYST_BUD=0.0 -# Grass (Sound Type) -GRASS=1.0 -# Ancient Debris (Sound Type) -ANCIENT_DEBRIS=1.0 -# Chain (Sound Type) -CHAIN=0.0 -# Mud (Sound Type) -MUD=1.0 -# Decorated Pot (Sound Type) -DECORATED_POT=1.0 -# Cherry Sapling (Sound Type) -CHERRY_SAPLING=1.0 -# Twisting Vines (Sound Type) -TWISTING_VINES=0.0 -# Large Amethyst Bud (Sound Type) -LARGE_AMETHYST_BUD=0.0 -# Lantern (Sound Type) -LANTERN=1.0 -# Nether Sprouts (Sound Type) -NETHER_SPROUTS=1.0 -# Big Dripleaf (Sound Type) -BIG_DRIPLEAF=1.0 -# Cherry Wood (Sound Type) -CHERRY_WOOD=1.0 -# Wart Block (Sound Type) -WART_BLOCK=1.0 -# Amethyst (Sound Type) -AMETHYST=1.0 -# Azalea (Sound Type) -AZALEA=1.0 # Bamboo Wood (Sound Type) BAMBOO_WOOD=1.0 -# Cherry Leaves (Sound Type) -CHERRY_LEAVES=1.0 -# Nylium (Sound Type) -NYLIUM=1.0 -# Decorated Pot Cracked (Sound Type) -DECORATED_POT_CRACKED=1.0 -# Sculk Catalyst (Sound Type) -SCULK_CATALYST=1.0 +# Large Amethyst Bud (Sound Type) +LARGE_AMETHYST_BUD=0.0 # Sculk Shrieker (Sound Type) SCULK_SHRIEKER=1.0 -# Deepslate Bricks (Sound Type) -DEEPSLATE_BRICKS=1.0 -# Tuff (Sound Type) -TUFF=1.0 -# Roots (Sound Type) -ROOTS=0.0 -# Lily Pad (Sound Type) -LILY_PAD=0.0 -# Hanging Roots (Sound Type) -HANGING_ROOTS=1.0 -# Pointed Dripstone (Sound Type) -POINTED_DRIPSTONE=0.0 -# Powder Snow (Sound Type) -POWDER_SNOW=0.1 -# Stone (Sound Type) -STONE=1.0 -# Hanging Sign (Sound Type) -HANGING_SIGN=1.0 -# Sculk (Sound Type) -SCULK=1.0 -# Packed Mud (Sound Type) -PACKED_MUD=1.0 -# Muddy Mangrove Roots (Sound Type) -MUDDY_MANGROVE_ROOTS=1.0 # Calcite (Sound Type) CALCITE=1.0 -# Vine (Sound Type) -VINE=0.0 +# Candle (Sound Type) +CANDLE=1.0 +# Wool (Sound Type) +WOOL=1.5 +# Snow (Sound Type) +SNOW=0.1 +# Muddy Mangrove Roots (Sound Type) +MUDDY_MANGROVE_ROOTS=1.0 +# Fungus (Sound Type) +FUNGUS=0.0 # Ladder (Sound Type) LADDER=0.0 -# Soul Sand (Sound Type) -SOUL_SAND=1.0 +# Deepslate Tiles (Sound Type) +DEEPSLATE_TILES=1.0 +# Anvil (Sound Type) +ANVIL=1.0 +# Crop (Sound Type) +CROP=0.0 +# Nether Bricks (Sound Type) +NETHER_BRICKS=1.0 +# Deepslate Bricks (Sound Type) +DEEPSLATE_BRICKS=1.0 +# Azalea (Sound Type) +AZALEA=1.0 # Small Dripleaf (Sound Type) SMALL_DRIPLEAF=0.0 -# Bamboo (Sound Type) -BAMBOO=0.1 +# Powder Snow (Sound Type) +POWDER_SNOW=0.1 +# Amethyst Cluster (Sound Type) +AMETHYST_CLUSTER=1.0 +# Mud Bricks (Sound Type) +MUD_BRICKS=1.0 # Bamboo Wood Hanging Sign (Sound Type) BAMBOO_WOOD_HANGING_SIGN=1.0 -# Wet Grass (Sound Type) -WET_GRASS=0.1 -# Hard Crop (Sound Type) -HARD_CROP=1.0 -# Glow Lichen (Sound Type) -GLOW_LICHEN=0.0 -# Deepslate Tiles (Sound Type) -DEEPSLATE_TILES=1.0 -# Medium Amethyst Bud (Sound Type) -MEDIUM_AMETHYST_BUD=0.0 -# Copper (Sound Type) -COPPER=1.0 -# Sculk Vein (Sound Type) -SCULK_VEIN=1.0 -# Bone Block (Sound Type) -BONE_BLOCK=1.0 -# Lodestone (Sound Type) -LODESTONE=1.0 -# Wood (Sound Type) -WOOD=1.0 -# Nether Ore (Sound Type) -NETHER_ORE=1.0 -# Netherite Block (Sound Type) -NETHERITE_BLOCK=1.0 +# Cherry Leaves (Sound Type) +CHERRY_LEAVES=1.0 +# Azalea Leaves (Sound Type) +AZALEA_LEAVES=1.0 +# Twisting Vines (Sound Type) +TWISTING_VINES=0.0 +# Wart Block (Sound Type) +WART_BLOCK=1.0 +# Shroomlight (Sound Type) +SHROOMLIGHT=1.0 # Soul Soil (Sound Type) SOUL_SOIL=1.0 -# Scaffolding (Sound Type) -SCAFFOLDING=0.0 -# Cherry Wood Hanging Sign (Sound Type) -CHERRY_WOOD_HANGING_SIGN=1.0 -# Amethyst Cluster (Sound Type) -AMETHYST_CLUSTER=1.0 -# Rooted Dirt (Sound Type) -ROOTED_DIRT=1.0 -# Basalt (Sound Type) -BASALT=1.0 +# Coral Block (Sound Type) +CORAL_BLOCK=1.0 +# Moss Carpet (Sound Type) +MOSS_CARPET=0.1 # Cave Vines (Sound Type) CAVE_VINES=1.0 -# Shroomlight (Sound Type) -SHROOMLIGHT=1.0 +# Grass (Sound Type) +GRASS=1.0 +# Scaffolding (Sound Type) +SCAFFOLDING=0.0 +# Glass (Sound Type) +GLASS=0.1 +# Soul Sand (Sound Type) +SOUL_SAND=1.0 +# Wet Grass (Sound Type) +WET_GRASS=0.1 +# Netherite Block (Sound Type) +NETHERITE_BLOCK=1.0 +# Nether Wood Hanging Sign (Sound Type) +NETHER_WOOD_HANGING_SIGN=1.0 +# Sand (Sound Type) +SAND=1.0 +# Big Dripleaf (Sound Type) +BIG_DRIPLEAF=1.0 +# Slime Block (Sound Type) +SLIME_BLOCK=1.0 +# Packed Mud (Sound Type) +PACKED_MUD=1.0 +# Nether Ore (Sound Type) +NETHER_ORE=1.0 +# Chiseled Bookshelf (Sound Type) +CHISELED_BOOKSHELF=1.0 +# Deepslate (Sound Type) +DEEPSLATE=1.0 +# Nylium (Sound Type) +NYLIUM=1.0 +# Froglight (Sound Type) +FROGLIGHT=1.0 +# Honey Block (Sound Type) +HONEY_BLOCK=0.5 +# Stone (Sound Type) +STONE=1.0 +# Weeping Vines (Sound Type) +WEEPING_VINES=0.0 +# Pointed Dripstone (Sound Type) +POINTED_DRIPSTONE=0.0 +# Moss (Sound Type) +MOSS=0.75 +# Tuff (Sound Type) +TUFF=1.0 +# Wood (Sound Type) +WOOD=1.0 +# Decorated Pot (Sound Type) +DECORATED_POT=1.0 +# Vine (Sound Type) +VINE=0.0 +# Lantern (Sound Type) +LANTERN=1.0 +# Decorated Pot Cracked (Sound Type) +DECORATED_POT_CRACKED=1.0 +# Cherry Wood (Sound Type) +CHERRY_WOOD=1.0 +# Suspicious Sand (Sound Type) +SUSPICIOUS_SAND=1.0 +# Bamboo Sapling (Sound Type) +BAMBOO_SAPLING=0.1 +# Lodestone (Sound Type) +LODESTONE=1.0 +# Mangrove Roots (Sound Type) +MANGROVE_ROOTS=1.0 +# Ancient Debris (Sound Type) +ANCIENT_DEBRIS=1.0 +# Dripstone Block (Sound Type) +DRIPSTONE_BLOCK=1.0 +# Sculk (Sound Type) +SCULK=1.0 +# Netherrack (Sound Type) +NETHERRACK=1.0 +# Nether Wart (Sound Type) +NETHER_WART=1.0 +# Amethyst (Sound Type) +AMETHYST=1.0 +# Spore Blossom (Sound Type) +SPORE_BLOSSOM=0.0 +# Medium Amethyst Bud (Sound Type) +MEDIUM_AMETHYST_BUD=0.0 +# Chain (Sound Type) +CHAIN=0.0 # Water (Block) minecraft\:water=0.25 # Lava (Block) diff --git a/config/sound_physics_remastered/reflectivity.properties b/config/sound_physics_remastered/reflectivity.properties index 33a514a..4e3a234 100644 --- a/config/sound_physics_remastered/reflectivity.properties +++ b/config/sound_physics_remastered/reflectivity.properties @@ -9,205 +9,205 @@ # By block ID: # minecraft\:oak_log=1.0 -# Netherrack (Sound Type) -NETHERRACK=1.1 -# Slime Block (Sound Type) -SLIME_BLOCK=0.5 -# Bamboo Sapling (Sound Type) -BAMBOO_SAPLING=0.5 -# Fungus (Sound Type) -FUNGUS=0.5 +# Sculk Vein (Sound Type) +SCULK_VEIN=0.5 # Suspicious Gravel (Sound Type) SUSPICIOUS_GRAVEL=0.5 -# Weeping Vines (Sound Type) -WEEPING_VINES=0.5 +# Cherry Wood Hanging Sign (Sound Type) +CHERRY_WOOD_HANGING_SIGN=0.5 # Sweet Berry Bush (Sound Type) SWEET_BERRY_BUSH=0.5 -# Spore Blossom (Sound Type) -SPORE_BLOSSOM=0.5 +# Small Amethyst Bud (Sound Type) +SMALL_AMETHYST_BUD=0.5 +# Polished Deepslate (Sound Type) +POLISHED_DEEPSLATE=1.5 +# Hard Crop (Sound Type) +HARD_CROP=0.5 +# Basalt (Sound Type) +BASALT=1.5 +# Hanging Sign (Sound Type) +HANGING_SIGN=0.5 +# Metal (Sound Type) +METAL=1.25 +# Sculk Sensor (Sound Type) +SCULK_SENSOR=0.5 +# Nether Wood (Sound Type) +NETHER_WOOD=0.5 +# Cherry Sapling (Sound Type) +CHERRY_SAPLING=0.5 +# Copper (Sound Type) +COPPER=1.25 +# Glow Lichen (Sound Type) +GLOW_LICHEN=0.5 +# Lily Pad (Sound Type) +LILY_PAD=0.5 # Flowering Azalea (Sound Type) FLOWERING_AZALEA=0.5 -# Anvil (Sound Type) -ANVIL=0.5 -# Crop (Sound Type) -CROP=0.5 -# Deepslate (Sound Type) -DEEPSLATE=1.5 -# Mangrove Roots (Sound Type) -MANGROVE_ROOTS=0.5 -# Dripstone Block (Sound Type) -DRIPSTONE_BLOCK=0.5 -# Nether Bricks (Sound Type) -NETHER_BRICKS=1.5 -# Candle (Sound Type) -CANDLE=0.5 -# Coral Block (Sound Type) -CORAL_BLOCK=0.2 -# Snow (Sound Type) -SNOW=0.15 +# Rooted Dirt (Sound Type) +ROOTED_DIRT=0.5 +# Mud (Sound Type) +MUD=0.5 +# Hanging Roots (Sound Type) +HANGING_ROOTS=0.5 +# Nether Gold Ore (Sound Type) +NETHER_GOLD_ORE=1.1 +# Nether Sprouts (Sound Type) +NETHER_SPROUTS=0.5 +# Bone Block (Sound Type) +BONE_BLOCK=1.5 # Frogspawn (Sound Type) FROGSPAWN=0.5 -# Suspicious Sand (Sound Type) -SUSPICIOUS_SAND=0.5 -# Glass (Sound Type) -GLASS=0.75 -# Azalea Leaves (Sound Type) -AZALEA_LEAVES=0.5 -# Nether Wood (Sound Type) -NETHER_WOOD=0.5 -# Metal (Sound Type) -METAL=1.25 -# Froglight (Sound Type) -FROGLIGHT=0.5 -# Nether Wart (Sound Type) -NETHER_WART=0.5 -# Chiseled Bookshelf (Sound Type) -CHISELED_BOOKSHELF=0.5 -# Sand (Sound Type) -SAND=0.2 -# Polished Deepslate (Sound Type) -POLISHED_DEEPSLATE=1.5 -# Nether Wood Hanging Sign (Sound Type) -NETHER_WOOD_HANGING_SIGN=0.5 -# Mud Bricks (Sound Type) -MUD_BRICKS=0.5 -# Moss Carpet (Sound Type) -MOSS_CARPET=0.5 +# Roots (Sound Type) +ROOTS=0.5 # Stem (Sound Type) STEM=0.4 -# Sculk Sensor (Sound Type) -SCULK_SENSOR=0.5 -# Wool (Sound Type) -WOOL=0.1 -# Moss (Sound Type) -MOSS=0.1 # Gravel (Sound Type) GRAVEL=0.3 -# Honey Block (Sound Type) -HONEY_BLOCK=0.1 +# Bamboo (Sound Type) +BAMBOO=0.5 +# Sculk Catalyst (Sound Type) +SCULK_CATALYST=0.5 # Gilded Blackstone (Sound Type) GILDED_BLACKSTONE=0.5 -# Nether Gold Ore (Sound Type) -NETHER_GOLD_ORE=1.1 -# Small Amethyst Bud (Sound Type) -SMALL_AMETHYST_BUD=0.5 -# Grass (Sound Type) -GRASS=0.3 -# Ancient Debris (Sound Type) -ANCIENT_DEBRIS=0.5 -# Chain (Sound Type) -CHAIN=0.5 -# Mud (Sound Type) -MUD=0.5 -# Decorated Pot (Sound Type) -DECORATED_POT=0.5 -# Cherry Sapling (Sound Type) -CHERRY_SAPLING=0.5 -# Twisting Vines (Sound Type) -TWISTING_VINES=0.5 -# Large Amethyst Bud (Sound Type) -LARGE_AMETHYST_BUD=0.5 -# Lantern (Sound Type) -LANTERN=0.5 -# Nether Sprouts (Sound Type) -NETHER_SPROUTS=0.5 -# Big Dripleaf (Sound Type) -BIG_DRIPLEAF=0.5 -# Cherry Wood (Sound Type) -CHERRY_WOOD=0.5 -# Wart Block (Sound Type) -WART_BLOCK=0.5 -# Amethyst (Sound Type) -AMETHYST=1.5 -# Azalea (Sound Type) -AZALEA=0.5 # Bamboo Wood (Sound Type) BAMBOO_WOOD=0.5 -# Cherry Leaves (Sound Type) -CHERRY_LEAVES=0.5 -# Nylium (Sound Type) -NYLIUM=0.5 -# Decorated Pot Cracked (Sound Type) -DECORATED_POT_CRACKED=0.5 -# Sculk Catalyst (Sound Type) -SCULK_CATALYST=0.5 +# Large Amethyst Bud (Sound Type) +LARGE_AMETHYST_BUD=0.5 # Sculk Shrieker (Sound Type) SCULK_SHRIEKER=0.5 -# Deepslate Bricks (Sound Type) -DEEPSLATE_BRICKS=1.5 -# Tuff (Sound Type) -TUFF=1.5 -# Roots (Sound Type) -ROOTS=0.5 -# Lily Pad (Sound Type) -LILY_PAD=0.5 -# Hanging Roots (Sound Type) -HANGING_ROOTS=0.5 -# Pointed Dripstone (Sound Type) -POINTED_DRIPSTONE=0.5 -# Powder Snow (Sound Type) -POWDER_SNOW=0.5 -# Stone (Sound Type) -STONE=1.5 -# Hanging Sign (Sound Type) -HANGING_SIGN=0.5 -# Sculk (Sound Type) -SCULK=0.5 -# Packed Mud (Sound Type) -PACKED_MUD=0.5 -# Muddy Mangrove Roots (Sound Type) -MUDDY_MANGROVE_ROOTS=0.5 # Calcite (Sound Type) CALCITE=1.5 -# Vine (Sound Type) -VINE=0.5 +# Candle (Sound Type) +CANDLE=0.5 +# Wool (Sound Type) +WOOL=0.1 +# Snow (Sound Type) +SNOW=0.15 +# Muddy Mangrove Roots (Sound Type) +MUDDY_MANGROVE_ROOTS=0.5 +# Fungus (Sound Type) +FUNGUS=0.5 # Ladder (Sound Type) LADDER=0.5 -# Soul Sand (Sound Type) -SOUL_SAND=0.2 +# Deepslate Tiles (Sound Type) +DEEPSLATE_TILES=1.5 +# Anvil (Sound Type) +ANVIL=0.5 +# Crop (Sound Type) +CROP=0.5 +# Nether Bricks (Sound Type) +NETHER_BRICKS=1.5 +# Deepslate Bricks (Sound Type) +DEEPSLATE_BRICKS=1.5 +# Azalea (Sound Type) +AZALEA=0.5 # Small Dripleaf (Sound Type) SMALL_DRIPLEAF=0.5 -# Bamboo (Sound Type) -BAMBOO=0.5 +# Powder Snow (Sound Type) +POWDER_SNOW=0.5 +# Amethyst Cluster (Sound Type) +AMETHYST_CLUSTER=0.5 +# Mud Bricks (Sound Type) +MUD_BRICKS=0.5 # Bamboo Wood Hanging Sign (Sound Type) BAMBOO_WOOD_HANGING_SIGN=0.5 -# Wet Grass (Sound Type) -WET_GRASS=0.5 -# Hard Crop (Sound Type) -HARD_CROP=0.5 -# Glow Lichen (Sound Type) -GLOW_LICHEN=0.5 -# Deepslate Tiles (Sound Type) -DEEPSLATE_TILES=1.5 -# Medium Amethyst Bud (Sound Type) -MEDIUM_AMETHYST_BUD=0.5 -# Copper (Sound Type) -COPPER=1.25 -# Sculk Vein (Sound Type) -SCULK_VEIN=0.5 -# Bone Block (Sound Type) -BONE_BLOCK=1.5 -# Lodestone (Sound Type) -LODESTONE=0.5 -# Wood (Sound Type) -WOOD=0.4 -# Nether Ore (Sound Type) -NETHER_ORE=1.1 -# Netherite Block (Sound Type) -NETHERITE_BLOCK=1.5 +# Cherry Leaves (Sound Type) +CHERRY_LEAVES=0.5 +# Azalea Leaves (Sound Type) +AZALEA_LEAVES=0.5 +# Twisting Vines (Sound Type) +TWISTING_VINES=0.5 +# Wart Block (Sound Type) +WART_BLOCK=0.5 +# Shroomlight (Sound Type) +SHROOMLIGHT=0.5 # Soul Soil (Sound Type) SOUL_SOIL=0.2 -# Scaffolding (Sound Type) -SCAFFOLDING=0.5 -# Cherry Wood Hanging Sign (Sound Type) -CHERRY_WOOD_HANGING_SIGN=0.5 -# Amethyst Cluster (Sound Type) -AMETHYST_CLUSTER=0.5 -# Rooted Dirt (Sound Type) -ROOTED_DIRT=0.5 -# Basalt (Sound Type) -BASALT=1.5 +# Coral Block (Sound Type) +CORAL_BLOCK=0.2 +# Moss Carpet (Sound Type) +MOSS_CARPET=0.5 # Cave Vines (Sound Type) CAVE_VINES=0.5 -# Shroomlight (Sound Type) -SHROOMLIGHT=0.5 +# Grass (Sound Type) +GRASS=0.3 +# Scaffolding (Sound Type) +SCAFFOLDING=0.5 +# Glass (Sound Type) +GLASS=0.75 +# Soul Sand (Sound Type) +SOUL_SAND=0.2 +# Wet Grass (Sound Type) +WET_GRASS=0.5 +# Netherite Block (Sound Type) +NETHERITE_BLOCK=1.5 +# Nether Wood Hanging Sign (Sound Type) +NETHER_WOOD_HANGING_SIGN=0.5 +# Sand (Sound Type) +SAND=0.2 +# Big Dripleaf (Sound Type) +BIG_DRIPLEAF=0.5 +# Slime Block (Sound Type) +SLIME_BLOCK=0.5 +# Packed Mud (Sound Type) +PACKED_MUD=0.5 +# Nether Ore (Sound Type) +NETHER_ORE=1.1 +# Chiseled Bookshelf (Sound Type) +CHISELED_BOOKSHELF=0.5 +# Deepslate (Sound Type) +DEEPSLATE=1.5 +# Nylium (Sound Type) +NYLIUM=0.5 +# Froglight (Sound Type) +FROGLIGHT=0.5 +# Honey Block (Sound Type) +HONEY_BLOCK=0.1 +# Stone (Sound Type) +STONE=1.5 +# Weeping Vines (Sound Type) +WEEPING_VINES=0.5 +# Pointed Dripstone (Sound Type) +POINTED_DRIPSTONE=0.5 +# Moss (Sound Type) +MOSS=0.1 +# Tuff (Sound Type) +TUFF=1.5 +# Wood (Sound Type) +WOOD=0.4 +# Decorated Pot (Sound Type) +DECORATED_POT=0.5 +# Vine (Sound Type) +VINE=0.5 +# Lantern (Sound Type) +LANTERN=0.5 +# Decorated Pot Cracked (Sound Type) +DECORATED_POT_CRACKED=0.5 +# Cherry Wood (Sound Type) +CHERRY_WOOD=0.5 +# Suspicious Sand (Sound Type) +SUSPICIOUS_SAND=0.5 +# Bamboo Sapling (Sound Type) +BAMBOO_SAPLING=0.5 +# Lodestone (Sound Type) +LODESTONE=0.5 +# Mangrove Roots (Sound Type) +MANGROVE_ROOTS=0.5 +# Ancient Debris (Sound Type) +ANCIENT_DEBRIS=0.5 +# Dripstone Block (Sound Type) +DRIPSTONE_BLOCK=0.5 +# Sculk (Sound Type) +SCULK=0.5 +# Netherrack (Sound Type) +NETHERRACK=1.1 +# Nether Wart (Sound Type) +NETHER_WART=0.5 +# Amethyst (Sound Type) +AMETHYST=1.5 +# Spore Blossom (Sound Type) +SPORE_BLOSSOM=0.5 +# Medium Amethyst Bud (Sound Type) +MEDIUM_AMETHYST_BUD=0.5 +# Chain (Sound Type) +CHAIN=0.5 diff --git a/config/sporeconfig.toml b/config/sporeconfig.toml index 37368bd..9a43d89 100644 --- a/config/sporeconfig.toml +++ b/config/sporeconfig.toml @@ -761,6 +761,9 @@ #Range: > 1 Damage = 9 + ["Weapons and Tools OwO"."Gas Masks"] + "Gas masks" = ["spore:gas_mask"] + ["Living Exoskeleton"] #Default 1 #Range: > 0 diff --git a/config/storagedrawers-client.toml b/config/storagedrawers-client.toml new file mode 100644 index 0000000..52196c7 --- /dev/null +++ b/config/storagedrawers-client.toml @@ -0,0 +1,21 @@ + +[General] + #Invert the behavior of the shift key for extracting items + invertShift = false + #Invert left and right click action on drawers + invertClick = false + +[Render] + #Distance in blocks before item labels stop rendering + labelRenderDistance = 25.0 + #Distance in blocks before quantity numbers stop rendering + quantityRenderDistance = 10.0 + #Distance in blocks before quantity numbers begin to fade out + quantityFadeDistance = 4.0 + +[Integration] + #Enable extended data display in WAILA if present + enableWaila = true + #Enable extended data display in The One Probe if present + enableTheOneProbe = true + diff --git a/config/storagedrawers-common.toml b/config/storagedrawers-common.toml new file mode 100644 index 0000000..3dacccf --- /dev/null +++ b/config/storagedrawers-common.toml @@ -0,0 +1,36 @@ + +[General] + #The number of item stacks held in a basic unit of storage. + #1x1 drawers hold 8 units, 1x2 drawers hold 4 units, 2x2 drawers hold 2 units. + #Half-depth drawers hold half those amounts. + baseStackStorage = 4 + #Controller range defines how far away a drawer can be connected + #on X, Y, or Z planes. The default value of 50 gives the controller a very + #large range, but not beyond the chunk load distance. + #Range: 1 ~ 75 + controllerRange = 50 + enableUI = true + enableSidedInput = true + enableSidedOutput = true + enableItemConversion = true + enableExtraCompactingRules = true + debugTrace = false + #List of rules in format "domain:item1, domain:item2, n". + #Creates a compacting drawer rule to convert 1 of item1 into n of item2. + compactingRules = ["minecraft:clay, minecraft:clay_ball, 4"] + +[StorageUpgrades] + #Storage upgrades multiply storage capacity by the given amount. + #When multiple storage upgrades are used together, their multipliers are added before being applied. + level1Mult = 2 + level2Mult = 4 + level3Mult = 8 + level4Mult = 16 + level5Mult = 32 + +[Integration] + #When true, shows quantity as NxS + R (by stack size) rather than count + wailaStackRemainder = true + #When true, does not show current quantities unless quantify key was used + wailaRespectQuantifyKey = false + diff --git a/kubejs/assets/verdantvibes/lang/zh_cn.json b/kubejs/assets/verdantvibes/lang/zh_cn.json index 88518d5..0b1f688 100644 --- a/kubejs/assets/verdantvibes/lang/zh_cn.json +++ b/kubejs/assets/verdantvibes/lang/zh_cn.json @@ -13,9 +13,9 @@ "block.verdantvibes.money_tree": "马拉巴栗", "block.verdantvibes.money_tree.info": "学名：Pachira aquatica\n（又名发财树）", "block.verdantvibes.potted_money_tree": "发财树盆栽", - "block.verdantvibes.lobelia": "大山梗菜", + "block.verdantvibes.lobelia": "大蓝半边莲", "block.verdantvibes.lobelia.info": "学名：Lobelia siphilitica", - "block.verdantvibes.potted_lobelia": "大山梗菜盆栽", + "block.verdantvibes.potted_lobelia": "大蓝半边莲盆栽", "block.verdantvibes.tall_dragon_tree": "高缘叶龙血树", "block.verdantvibes.dragon_tree": "缘叶龙血树", "block.verdantvibes.dragon_tree.info": "学名：Dracaena marginata", @@ -39,7 +39,7 @@ "verdantvibes.advancements.botanicalbeginnings.description": "让我们把它放在花盆里展示吧！", "verdantvibes.advancements.horticulturalhoarder.title": "园艺爱好者", "verdantvibes.advancements.horticulturalhoarder.description": "收集所有新的盆栽植物！", - "verdantvibes.advancements.potterspivot.title": "下一级盆栽", - "verdantvibes.advancements.potterspivot.description": "按住 Shift 键-右键单击即可转动植物！疯狂", + "verdantvibes.advancements.potterspivot.title": "进阶盆艺", + "verdantvibes.advancements.potterspivot.description": "按住Shift并右键即可转动植物！虽然听起来有点荒唐。", "MonianHelloTranslateUUID": "0ddd16d8-1f00-424f-9971-efdeefdf0a3f" } \ No newline at end of file diff --git a/kubejs/assets/via_romana/lang/zh_cn.json b/kubejs/assets/via_romana/lang/zh_cn.json new file mode 100644 index 0000000..05bdc59 --- /dev/null +++ b/kubejs/assets/via_romana/lang/zh_cn.json @@ -0,0 +1,21 @@ +{ + "too_close_node_message": "距离上一个节点太近了", + "path_invalid_maximum": "道路太长", + "invalid_dimension": "不被允许的维度", + "sign_unlinked_message": "道路未链接", + "effect.via_romana.travellers_fatigue": "旅行疲劳", + "advancements.a_strand_type_game.title": "标准类型的游戏", + "advancements.a_strand_type_game.descr": "条条大道通罗马！（使用路牌链接世界）", + "sign_already_linked": "路牌已链接", + "via_romana.landing": "Via Romana（罗马大道）引入了一套快速旅行系统。玩家可以通过链接道路上的路牌，从而在它们之间进行即时传送", + "low_quality_message": "道路的质量不足", + "cancel_path_message": "道路已经取消", + "key.via_romana.interact_key": "Via Romana - 互动", + "item.via_romana.guide": "罗马修路指南", + "cannot_warp_when_recording": "无法在链接路牌时进行传送", + "config.via_romana.config_server": "via_romana_config", + "path_invalid_minimum": "道路太短", + "too_far_from_node_message": "距离道路过远", + "entity_not_allowed": "不允许载具", + "advancements.a_strand_type_game.descr.": "条条大道通罗马！（使用路牌链接世界）" +} \ No newline at end of file diff --git a/kubejs/assets/via_romana/patchouli_books/guide/zh_cn/categories/default.json b/kubejs/assets/via_romana/patchouli_books/guide/zh_cn/categories/default.json new file mode 100644 index 0000000..6b71860 --- /dev/null +++ b/kubejs/assets/via_romana/patchouli_books/guide/zh_cn/categories/default.json @@ -0,0 +1,6 @@ +{ + "name": "Default Category", + "description": "Via Romana模组的使用介绍", + "icon": "minecraft:oak_sign", + "sortnum": 0 +} \ No newline at end of file diff --git a/kubejs/assets/via_romana/patchouli_books/guide/zh_cn/entries/via_romana.json b/kubejs/assets/via_romana/patchouli_books/guide/zh_cn/entries/via_romana.json new file mode 100644 index 0000000..4ded399 --- /dev/null +++ b/kubejs/assets/via_romana/patchouli_books/guide/zh_cn/entries/via_romana.json @@ -0,0 +1,31 @@ +{ + "name": "罗马修路指南", + "icon": "minecraft:oak_sign", + "sortnum": 2, + "priority": true, + "category": "via_romana:default", + "pages": [ + { + "type": "patchouli:text", + "text": "这本指南将教您如何构建道路，连接两个地点，并在它们之间进行传送。" + }, + { + "type": "patchouli:spotlight", + "item": "minecraft:dirt_path", + "text": "想要构建有效的道路，您的道路中必须拥有一定数量的 $(thing)基础设施方块$()。 如果道路中有太多的自然方块，它将会是无效的。" + }, + { + "type": "patchouli:spotlight", + "item": "minecraft:oak_sign", + "text": "你可以在任意距离上链接任意两个尚未链接的路牌，前提是它们间的道路是有效的。$(br2)想要链接路牌， $(thing)潜行并左击$() 你的起始点路牌, 然后 $(thing)潜行并左击$() 你的终点路牌" + }, + { + "type": "patchouli:text", + "text": "如果你的道路存在任何问题，将会有警告。如果你的道路是有效的，将能成功链接两个路牌。$(br2)要在两个已链接的路牌之间传送， $(thing)左击$() 一个已链接的路牌，你将会被传送到它所链接的路牌。" + }, + { + "type": "patchouli:text", + "text": "想要破坏已经链接的路牌，请先解除它们的链接，或潜行并左击破坏你想要破坏的路牌。如果你使用的路牌是锦致装饰模组中的“路标”，你需要在一个栅栏上放置两个路标并使得它们都为有效的，才能破坏这一整个“路标”方块并解除链接。因为部分链接时你是无法破坏它的。" + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/via_romana/patchouli_books/guide/zh_cn/templates/medium_image.json b/kubejs/assets/via_romana/patchouli_books/guide/zh_cn/templates/medium_image.json new file mode 100644 index 0000000..2bf15a6 --- /dev/null +++ b/kubejs/assets/via_romana/patchouli_books/guide/zh_cn/templates/medium_image.json @@ -0,0 +1,28 @@ +{ + "components": [ + { + "type": "patchouli:header", + "text": "#heading", + "x": -1, + "y": -1 + }, + { + "type": "patchouli:image", + "image": "#image", + "width": 200, + "height": 128, + "texture_width": 256, + "texture_height": 128, + "u": 0, + "v": 0, + "x": 7, + "y": 20, + "scale": 0.5 + }, + { + "type": "patchouli:text", + "text": "#text", + "y": 100 + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/via_romana/patchouli_books/guide/zh_cn/templates/short_image.json b/kubejs/assets/via_romana/patchouli_books/guide/zh_cn/templates/short_image.json new file mode 100644 index 0000000..176484c --- /dev/null +++ b/kubejs/assets/via_romana/patchouli_books/guide/zh_cn/templates/short_image.json @@ -0,0 +1,28 @@ +{ + "components": [ + { + "type": "patchouli:header", + "text": "#heading", + "x": -1, + "y": -1 + }, + { + "type": "patchouli:image", + "image": "#image", + "width": 200, + "height": 64, + "texture_width": 256, + "texture_height": 64, + "u": 0, + "v": 0, + "x": 7, + "y": 20, + "scale": 0.5 + }, + { + "type": "patchouli:text", + "text": "#text", + "y": 60 + } + ] +} \ No newline at end of file diff --git a/kubejs/config/probe-settings.json b/kubejs/config/probe-settings.json index 88ff58a..13ce5e5 100644 --- a/kubejs/config/probe-settings.json +++ b/kubejs/config/probe-settings.json @@ -1,4 +1,5 @@ { - "probejs.modHash": -2715452057364573900, - "probejs.registryHash": -2039914840885289964 + "probejs.modHash": 602651638497479554, + "probejs.registryHash": -2039914840885289964, + "probejs.enabled": true } \ No newline at end of file diff --git a/kubejs/server_scripts/src/proxy/recipesProxy.js b/kubejs/server_scripts/src/proxy/recipesProxy.js new file mode 100644 index 0000000..159953f --- /dev/null +++ b/kubejs/server_scripts/src/proxy/recipesProxy.js @@ -0,0 +1,10 @@ +// priority: -1 +const { CraftingTableCobblefordays } = require("../recipes/cobblefordays/craftingTable") +const { removeCobblefordays } = require("../recipes/cobblefordays/remove") +const { CraftingTableQuark } = require("../recipes/quark/craftingTable") + +ServerEvents.recipes(event => { + removeCobblefordays(event) + CraftingTableQuark(event) + CraftingTableCobblefordays(event) +}) \ No newline at end of file diff --git a/kubejs/server_scripts/src/recipes/cobblefordays/craftingTable.js b/kubejs/server_scripts/src/recipes/cobblefordays/craftingTable.js new file mode 100644 index 0000000..c15655c --- /dev/null +++ b/kubejs/server_scripts/src/recipes/cobblefordays/craftingTable.js @@ -0,0 +1,34 @@ +import { TireUpgrade } from "../../utils/tireUpgrade" + +/** + * + * @param {$RecipesEventJS_} event + */ +export function CraftingTableCobblefordays (event) { + const {kubejs} = event.recipes + + kubejs.shaped("cobblefordays:tier_1", [ + "ABA", + "CDE", + "AFA" + ],{ + "A": "#minecraft:logs", + "B": "embers:excavation_buckets", + "C": "minecraft:water_bucket", + "D": "#forge:glass", + "E": "minecraft:lava_bucket", + "F": "embers:ember_bore" + }).replaceIngredient("minecraft:lava_bucket", "minecraft:bucket") + .replaceIngredient("minecraft:water_bucket", "minecraft:bucket") + + new TireUpgrade(event, ["ABA","C#D","ABA"]) + .setBaseItem("cobblefordays:tier_1") + .addUpgrade(1, [["A", "#forge:cobblestone"], ["B", "#forge:storage_blocks/copper"]], "cobblefordays:tier_2") + .addUpgrade(2, [["A", "#forge:storage_blocks/iron"], ["B", "#forge:storage_blocks/silver"]], "cobblefordays:tier_3") + .addUpgrade(3, [["A", "#forge:storage_blocks/gold"], ["B", "#forge:storage_blocks/dawnstone"]], "cobblefordays:tier_4") + .addUpgrade(4, [["A", "#forge:storage_blocks/diamond"], ["B", "#forge:storage_blocks/netherite"]], "cobblefordays:tier_5") + .addItemMaps([["C", "minecraft:water_bucket"], ["D", "minecraft:lava_bucket"]]) + .addReplaceMap("minecraft:lava_bucket", "minecraft:bucket") + .addReplaceMap("minecraft:water_bucket", "minecraft:bucket") + .build() +} \ No newline at end of file diff --git a/kubejs/server_scripts/src/recipes/cobblefordays/remove.js b/kubejs/server_scripts/src/recipes/cobblefordays/remove.js new file mode 100644 index 0000000..f14d6ee --- /dev/null +++ b/kubejs/server_scripts/src/recipes/cobblefordays/remove.js @@ -0,0 +1,7 @@ +/** + * + * @param {$RecipesEventJS_} event + */ +export function removeCobblefordays (event) { + event.remove({mod : "cobblefordays"}) +} \ No newline at end of file diff --git a/kubejs/server_scripts/src/recipes/quark/craftingTable.js b/kubejs/server_scripts/src/recipes/quark/craftingTable.js new file mode 100644 index 0000000..20855ce --- /dev/null +++ b/kubejs/server_scripts/src/recipes/quark/craftingTable.js @@ -0,0 +1,14 @@ +/** + * + * @param {$RecipesEventJS_} event + */ +export function CraftingTableQuark (event) { + const {kubejs} = event.recipes + + kubejs.shaped("8x quark:pipe", [ + "ABA" + ], { + A: "embers:copper_plate", + B: "#forge:glass" + }) +} \ No newline at end of file diff --git a/kubejs/server_scripts/src/utils/tireUpgrade.js b/kubejs/server_scripts/src/utils/tireUpgrade.js new file mode 100644 index 0000000..62d7e54 --- /dev/null +++ b/kubejs/server_scripts/src/utils/tireUpgrade.js @@ -0,0 +1,94 @@ +// priority: 999 +/** + * + * @param {String[]} shape + * @param {$RecipesEventJS_} event + */ +export function TireUpgrade(event,shape) { + /** + * @type {Map} + */ + this.upgrade = new Map() + this.shape = shape + this.event = event + this.itemMap = {} + this.replaceMap = new Map() +} + +TireUpgrade.prototype = { + /** + * @description 设置升级物品的层级，升级材料，升级后的物品 + * @param {int} level + * @param {String[][]} tire + * @param {$ItemStack_} item + * @returns + */ + addUpgrade: function(level, tire, item) { + this.upgrade.set(level, [tire, item]) + return this + }, + /** + * @description 设置最基础的物品，层级为0 + * @param {$ItemStack_} item + * @returns + */ + setBaseItem: function(item) { + this.upgrade.set(0, ["", item]) + return this + }, + /** + * + * @param {String} T + * @param {$ItemStack_} item + * @returns + */ + addItemMap: function(T, item) { + this.itemMap[T] = item + return this + }, + /** + * + * @param {String[][]} map + */ + addItemMaps: function(map) { + map.forEach(entries => { + this.addItemMap(entries[0], entries[1]) + }) + return this + }, + addReplaceMap: function(origin, replaced) { + this.replaceMap.set(origin, replaced) + return this + }, + /** + * + * @param {String[][]} array + */ + addReplaceMaps: function(array) { + array.forEach(element => { + this.addReplaceMap(element[0], element[1]) + }); + return this + }, + build: function() { + this.upgrade.forEach((value, key)=>{ + if(key != 0){ + let recipe = this.event.recipes.kubejs.shaped(value[1], this.shape, + Object.assign({}, this.itemMap, fromEntries(value[0]), {"#": this.upgrade.get(key-=1)[1]})) + if (this.replaceMap.size > 0) { + this.replaceMap.forEach((replaced, origin) => { + recipe.replaceIngredient(origin, replaced) + }) + } + } + }) + } +} + +function fromEntries(array) { + var obj = {}; + array.forEach(function(entry) { + obj[entry[0]] = entry[1]; + }); + return obj; +}