diff --git a/CHANGELOG.md b/CHANGELOG.md index 20eeea688..e279eecaa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,10 @@ # Changelog - ## [Unreleased] ### Changes + +## [0.9.9] - 30.05.2025 +### Changes +- Added and changed many mods for optimization, please report any problems on github. @Xikaro - Disabled ability to sort items in the crucible and vessels, which let you stack things that shouldn't be stacked. (#1045) @esotericist - Other TFC waters also work for bulk washing now. (#1051) @Pyritie - Added machine recipes for compost and humus. (#1049) @Pyritie diff --git a/config/Advancedperipherals/peripherals.toml b/config/Advancedperipherals/peripherals.toml index 72728f1b2..010aa6dd0 100644 --- a/config/Advancedperipherals/peripherals.toml +++ b/config/Advancedperipherals/peripherals.toml @@ -168,7 +168,7 @@ scanEntitiesMaxCostRadius = 16 #Range: 0.1 ~ 1.7976931348623157E308 scanEntitiesExtraBlockCost = 0.17 - #Range: > 1000 + #Range: > 0 chatMessageCooldown = 1000 #Range: > 1000 accurePlaceCooldown = 1000 diff --git a/config/additionalplacements-client.toml b/config/additionalplacements-client.toml index d14c88b02..f608c6bde 100644 --- a/config/additionalplacements-client.toml +++ b/config/additionalplacements-client.toml @@ -24,186 +24,46 @@ #Slabs [client.types.additionalplacements.slab] - - #Options to control which blocks will rotate the textures of their original blocks. - [client.types.additionalplacements.slab.rotated_textures] - #Default state for blocks not matching any list. True is enabled, false is disabled. - default = true - #Whitelist for mods whose blocks will be enabled. - mod_whitelist = [] - #Blacklist for mods whose blocks will be disabled. Takes priority over the mod whitelist. - mod_blacklist = [] - #Whitelist for tags whose blocks will be enabled. Takes priority over the the mod blacklist and whitelist. - tag_whitelist = [] - #Blacklist for tags whose blocks will be disabled. Takes priority over the block whitelist and the mod blacklist and whitelist. - tag_blacklist = [] - #Whitelist for blocks that will be enabled. Takes priority over the the mod and tag blacklist and whitelist. - block_whitelist = [] - #Blacklist for blocks that will be disabled. Takes priority over the block whitelist and the mod and tag blacklist and whitelist. - block_blacklist = ["minecraft:smooth_stone_slab"] - - #Options to control which blocks will use "rotated models" of their original blocks. - [client.types.additionalplacements.slab.rotated_models] - #Default state for blocks not matching any list. True is enabled, false is disabled. - default = true - #Whitelist for mods whose blocks will be enabled. - mod_whitelist = [] - #Blacklist for mods whose blocks will be disabled. Takes priority over the mod whitelist. - mod_blacklist = [] - #Whitelist for tags whose blocks will be enabled. Takes priority over the the mod blacklist and whitelist. - tag_whitelist = [] - #Blacklist for tags whose blocks will be disabled. Takes priority over the block whitelist and the mod blacklist and whitelist. - tag_blacklist = [] - #Whitelist for blocks that will be enabled. Takes priority over the the mod and tag blacklist and whitelist. - block_whitelist = [] - #Blacklist for blocks that will be disabled. Takes priority over the block whitelist and the mod and tag blacklist and whitelist. - block_blacklist = ["minecraft:sandstone_slab", "minecraft:cut_sandstone_slab", "minecraft:red_sandstone_slab", "minecraft:cut_red_sandstone_slab"] + #Blocklist to control which blocks will rotate the textures of their original blocks. + #See https://github.com/FirEmerald/AdditionalPlacements/wiki/Blocklist-Format for blocklist format + rotated_textures = ["+*", "-minecraft:smooth_stone_slab"] + #Blocklist to control which blocks will use "rotated models" of their original blocks. + #See https://github.com/FirEmerald/AdditionalPlacements/wiki/Blocklist-Format for blocklist format + rotated_models = ["+*", "-minecraft:sandstone_slab", "-minecraft:cut_sandstone_slab", "-minecraft:red_sandstone_slab", "-minecraft:cut_red_sandstone_slab"] #Stairs [client.types.additionalplacements.stairs] - - #Options to control which blocks will rotate the textures of their original blocks. - [client.types.additionalplacements.stairs.rotated_textures] - #Default state for blocks not matching any list. True is enabled, false is disabled. - default = true - #Whitelist for mods whose blocks will be enabled. - mod_whitelist = [] - #Blacklist for mods whose blocks will be disabled. Takes priority over the mod whitelist. - mod_blacklist = [] - #Whitelist for tags whose blocks will be enabled. Takes priority over the the mod blacklist and whitelist. - tag_whitelist = [] - #Blacklist for tags whose blocks will be disabled. Takes priority over the block whitelist and the mod blacklist and whitelist. - tag_blacklist = [] - #Whitelist for blocks that will be enabled. Takes priority over the the mod and tag blacklist and whitelist. - block_whitelist = [] - #Blacklist for blocks that will be disabled. Takes priority over the block whitelist and the mod and tag blacklist and whitelist. - block_blacklist = [] - - #Options to control which blocks will use "rotated models" of their original blocks. - [client.types.additionalplacements.stairs.rotated_models] - #Default state for blocks not matching any list. True is enabled, false is disabled. - default = true - #Whitelist for mods whose blocks will be enabled. - mod_whitelist = [] - #Blacklist for mods whose blocks will be disabled. Takes priority over the mod whitelist. - mod_blacklist = [] - #Whitelist for tags whose blocks will be enabled. Takes priority over the the mod blacklist and whitelist. - tag_whitelist = [] - #Blacklist for tags whose blocks will be disabled. Takes priority over the block whitelist and the mod blacklist and whitelist. - tag_blacklist = [] - #Whitelist for blocks that will be enabled. Takes priority over the the mod and tag blacklist and whitelist. - block_whitelist = [] - #Blacklist for blocks that will be disabled. Takes priority over the block whitelist and the mod and tag blacklist and whitelist. - block_blacklist = ["minecraft:sandstone_stairs", "minecraft:red_sandstone_stairs"] + #Blocklist to control which blocks will rotate the textures of their original blocks. + #See https://github.com/FirEmerald/AdditionalPlacements/wiki/Blocklist-Format for blocklist format + rotated_textures = ["+*"] + #Blocklist to control which blocks will use "rotated models" of their original blocks. + #See https://github.com/FirEmerald/AdditionalPlacements/wiki/Blocklist-Format for blocklist format + rotated_models = ["+*", "-minecraft:sandstone_stairs", "-minecraft:red_sandstone_stairs"] #Carpets [client.types.additionalplacements.carpet] - - #Options to control which blocks will rotate the textures of their original blocks. - [client.types.additionalplacements.carpet.rotated_textures] - #Default state for blocks not matching any list. True is enabled, false is disabled. - default = true - #Whitelist for mods whose blocks will be enabled. - mod_whitelist = [] - #Blacklist for mods whose blocks will be disabled. Takes priority over the mod whitelist. - mod_blacklist = [] - #Whitelist for tags whose blocks will be enabled. Takes priority over the the mod blacklist and whitelist. - tag_whitelist = [] - #Blacklist for tags whose blocks will be disabled. Takes priority over the block whitelist and the mod blacklist and whitelist. - tag_blacklist = [] - #Whitelist for blocks that will be enabled. Takes priority over the the mod and tag blacklist and whitelist. - block_whitelist = [] - #Blacklist for blocks that will be disabled. Takes priority over the block whitelist and the mod and tag blacklist and whitelist. - block_blacklist = [] - - #Options to control which blocks will use "rotated models" of their original blocks. - [client.types.additionalplacements.carpet.rotated_models] - #Default state for blocks not matching any list. True is enabled, false is disabled. - default = true - #Whitelist for mods whose blocks will be enabled. - mod_whitelist = [] - #Blacklist for mods whose blocks will be disabled. Takes priority over the mod whitelist. - mod_blacklist = [] - #Whitelist for tags whose blocks will be enabled. Takes priority over the the mod blacklist and whitelist. - tag_whitelist = [] - #Blacklist for tags whose blocks will be disabled. Takes priority over the block whitelist and the mod blacklist and whitelist. - tag_blacklist = [] - #Whitelist for blocks that will be enabled. Takes priority over the the mod and tag blacklist and whitelist. - block_whitelist = [] - #Blacklist for blocks that will be disabled. Takes priority over the block whitelist and the mod and tag blacklist and whitelist. - block_blacklist = [] + #Blocklist to control which blocks will rotate the textures of their original blocks. + #See https://github.com/FirEmerald/AdditionalPlacements/wiki/Blocklist-Format for blocklist format + rotated_textures = ["+*"] + #Blocklist to control which blocks will use "rotated models" of their original blocks. + #See https://github.com/FirEmerald/AdditionalPlacements/wiki/Blocklist-Format for blocklist format + rotated_models = ["+*"] #Regular pressure plates [client.types.additionalplacements.pressure_plate] - - #Options to control which blocks will rotate the textures of their original blocks. - [client.types.additionalplacements.pressure_plate.rotated_textures] - #Default state for blocks not matching any list. True is enabled, false is disabled. - default = true - #Whitelist for mods whose blocks will be enabled. - mod_whitelist = [] - #Blacklist for mods whose blocks will be disabled. Takes priority over the mod whitelist. - mod_blacklist = [] - #Whitelist for tags whose blocks will be enabled. Takes priority over the the mod blacklist and whitelist. - tag_whitelist = [] - #Blacklist for tags whose blocks will be disabled. Takes priority over the block whitelist and the mod blacklist and whitelist. - tag_blacklist = [] - #Whitelist for blocks that will be enabled. Takes priority over the the mod and tag blacklist and whitelist. - block_whitelist = [] - #Blacklist for blocks that will be disabled. Takes priority over the block whitelist and the mod and tag blacklist and whitelist. - block_blacklist = [] - - #Options to control which blocks will use "rotated models" of their original blocks. - [client.types.additionalplacements.pressure_plate.rotated_models] - #Default state for blocks not matching any list. True is enabled, false is disabled. - default = true - #Whitelist for mods whose blocks will be enabled. - mod_whitelist = [] - #Blacklist for mods whose blocks will be disabled. Takes priority over the mod whitelist. - mod_blacklist = [] - #Whitelist for tags whose blocks will be enabled. Takes priority over the the mod blacklist and whitelist. - tag_whitelist = [] - #Blacklist for tags whose blocks will be disabled. Takes priority over the block whitelist and the mod blacklist and whitelist. - tag_blacklist = [] - #Whitelist for blocks that will be enabled. Takes priority over the the mod and tag blacklist and whitelist. - block_whitelist = [] - #Blacklist for blocks that will be disabled. Takes priority over the block whitelist and the mod and tag blacklist and whitelist. - block_blacklist = [] + #Blocklist to control which blocks will rotate the textures of their original blocks. + #See https://github.com/FirEmerald/AdditionalPlacements/wiki/Blocklist-Format for blocklist format + rotated_textures = ["+*"] + #Blocklist to control which blocks will use "rotated models" of their original blocks. + #See https://github.com/FirEmerald/AdditionalPlacements/wiki/Blocklist-Format for blocklist format + rotated_models = ["+*"] #Weighted pressure plates [client.types.additionalplacements.weighted_pressure_plate] - - #Options to control which blocks will rotate the textures of their original blocks. - [client.types.additionalplacements.weighted_pressure_plate.rotated_textures] - #Default state for blocks not matching any list. True is enabled, false is disabled. - default = true - #Whitelist for mods whose blocks will be enabled. - mod_whitelist = [] - #Blacklist for mods whose blocks will be disabled. Takes priority over the mod whitelist. - mod_blacklist = [] - #Whitelist for tags whose blocks will be enabled. Takes priority over the the mod blacklist and whitelist. - tag_whitelist = [] - #Blacklist for tags whose blocks will be disabled. Takes priority over the block whitelist and the mod blacklist and whitelist. - tag_blacklist = [] - #Whitelist for blocks that will be enabled. Takes priority over the the mod and tag blacklist and whitelist. - block_whitelist = [] - #Blacklist for blocks that will be disabled. Takes priority over the block whitelist and the mod and tag blacklist and whitelist. - block_blacklist = [] - - #Options to control which blocks will use "rotated models" of their original blocks. - [client.types.additionalplacements.weighted_pressure_plate.rotated_models] - #Default state for blocks not matching any list. True is enabled, false is disabled. - default = true - #Whitelist for mods whose blocks will be enabled. - mod_whitelist = [] - #Blacklist for mods whose blocks will be disabled. Takes priority over the mod whitelist. - mod_blacklist = [] - #Whitelist for tags whose blocks will be enabled. Takes priority over the the mod blacklist and whitelist. - tag_whitelist = [] - #Blacklist for tags whose blocks will be disabled. Takes priority over the block whitelist and the mod blacklist and whitelist. - tag_blacklist = [] - #Whitelist for blocks that will be enabled. Takes priority over the the mod and tag blacklist and whitelist. - block_whitelist = [] - #Blacklist for blocks that will be disabled. Takes priority over the block whitelist and the mod and tag blacklist and whitelist. - block_blacklist = [] + #Blocklist to control which blocks will rotate the textures of their original blocks. + #See https://github.com/FirEmerald/AdditionalPlacements/wiki/Blocklist-Format for blocklist format + rotated_textures = ["+*"] + #Blocklist to control which blocks will use "rotated models" of their original blocks. + #See https://github.com/FirEmerald/AdditionalPlacements/wiki/Blocklist-Format for blocklist format + rotated_models = ["+*"] diff --git a/config/additionalplacements-startup.toml b/config/additionalplacements-startup.toml index cfb88a20c..90d42c665 100644 --- a/config/additionalplacements-startup.toml +++ b/config/additionalplacements-startup.toml @@ -1,19 +1,9 @@ #Startup settings [startup] - - #Options for controlling which blocks can generate variants of a their type (if one exists). - [startup.enabled] - #Default state for blocks not matching any list. True is enabled, false is disabled. - default = true - #Whitelist for mods whose blocks will be enabled. - mod_whitelist = [] - #Blacklist for mods whose blocks will be disabled. Takes priority over the mod whitelist. - mod_blacklist = [] - #Whitelist for blocks that will be enabled. Takes priority over the the mod blacklist and whitelist. - block_whitelist = [] - #Blacklist for blocks that will be disabled. Takes priority over the block whitelist, the mod blacklist, and the mod whitelist. - block_blacklist = [] + #Blocklist for controlling which blocks can generate variants of a their type (if one exists). + #See https://github.com/FirEmerald/AdditionalPlacements/wiki/Blocklist-Format for blocklist format + enabled = ["+*"] #Options for registered block types for additional placement generation. [startup.types] @@ -22,111 +12,41 @@ #Slabs [startup.types.additionalplacements.slab] - - #Options for controlling which blocks (that are valid for this type) will generate variants of this type - [startup.types.additionalplacements.slab.enabled] - #Default state for blocks not matching any list. True is enabled, false is disabled. - default = true - #Whitelist for mods whose blocks will be enabled. - mod_whitelist = [] - #Blacklist for mods whose blocks will be disabled. Takes priority over the mod whitelist. - mod_blacklist = [] - #Whitelist for blocks that will be enabled. Takes priority over the the mod blacklist and whitelist. - block_whitelist = [] - #Blacklist for blocks that will be disabled. Takes priority over the block whitelist, the mod blacklist, and the mod whitelist. - block_blacklist = [] + #Blocklist for controlling which blocks (that are valid for this type) will generate variants of this type + #See https://github.com/FirEmerald/AdditionalPlacements/wiki/Blocklist-Format for blocklist format + enabled = ["+*"] #Stairs [startup.types.additionalplacements.stairs] - - #Options for controlling which blocks (that are valid for this type) will generate variants of this type - [startup.types.additionalplacements.stairs.enabled] - #Default state for blocks not matching any list. True is enabled, false is disabled. - default = true - #Whitelist for mods whose blocks will be enabled. - mod_whitelist = [] - #Blacklist for mods whose blocks will be disabled. Takes priority over the mod whitelist. - mod_blacklist = [] - #Whitelist for blocks that will be enabled. Takes priority over the the mod blacklist and whitelist. - block_whitelist = [] - #Blacklist for blocks that will be disabled. Takes priority over the block whitelist, the mod blacklist, and the mod whitelist. - block_blacklist = [] - - #Options to control which blocks will allow for vertical stair connections. + #Blocklist for controlling which blocks (that are valid for this type) will generate variants of this type + #See https://github.com/FirEmerald/AdditionalPlacements/wiki/Blocklist-Format for blocklist format + enabled = ["+*"] + #Blocklist to control which blocks will allow for vertical stair connections. #Keep in mind vertical is RELATIVE to the placement of the stair - "vertical" for a vertically placed stair will be one of the two horizontal directions. - [startup.types.additionalplacements.stairs.allow_vertical_connections] - #Default state for blocks not matching any list. True is enabled, false is disabled. - default = true - #Whitelist for mods whose blocks will be enabled. - mod_whitelist = [] - #Blacklist for mods whose blocks will be disabled. Takes priority over the mod whitelist. - mod_blacklist = [] - #Whitelist for blocks that will be enabled. Takes priority over the the mod blacklist and whitelist. - block_whitelist = [] - #Blacklist for blocks that will be disabled. Takes priority over the block whitelist, the mod blacklist, and the mod whitelist. - block_blacklist = [] - - #Options to control which blocks will allow for mixed stair connections. + #See https://github.com/FirEmerald/AdditionalPlacements/wiki/Blocklist-Format for blocklist format + allow_vertical_connections = ["+*"] + #Blocklist to control which blocks will allow for mixed stair connections. #These are any valid combination of horizontal and vertical connection - as such, a stair that cannot connect vertically cannot connect complexly. #This also controls connections between stairs who's facings don't necessarily match up - I.E. a stair facing UP_EAST and one facing EAST_UP. #Keep in mind horizontal and vertical are RELATIVE to the placement of the stair - "vertical" and "horizontal" for a vertically placed stair are both horizontal directions. - [startup.types.additionalplacements.stairs.allow_mixed_connections] - #Default state for blocks not matching any list. True is enabled, false is disabled. - default = true - #Whitelist for mods whose blocks will be enabled. - mod_whitelist = [] - #Blacklist for mods whose blocks will be disabled. Takes priority over the mod whitelist. - mod_blacklist = [] - #Whitelist for blocks that will be enabled. Takes priority over the the mod blacklist and whitelist. - block_whitelist = [] - #Blacklist for blocks that will be disabled. Takes priority over the block whitelist, the mod blacklist, and the mod whitelist. - block_blacklist = [] + #See https://github.com/FirEmerald/AdditionalPlacements/wiki/Blocklist-Format for blocklist format + allow_mixed_connections = ["+*"] #Carpets [startup.types.additionalplacements.carpet] - - #Options for controlling which blocks (that are valid for this type) will generate variants of this type - [startup.types.additionalplacements.carpet.enabled] - #Default state for blocks not matching any list. True is enabled, false is disabled. - default = true - #Whitelist for mods whose blocks will be enabled. - mod_whitelist = [] - #Blacklist for mods whose blocks will be disabled. Takes priority over the mod whitelist. - mod_blacklist = [] - #Whitelist for blocks that will be enabled. Takes priority over the the mod blacklist and whitelist. - block_whitelist = [] - #Blacklist for blocks that will be disabled. Takes priority over the block whitelist, the mod blacklist, and the mod whitelist. - block_blacklist = [] + #Blocklist for controlling which blocks (that are valid for this type) will generate variants of this type + #See https://github.com/FirEmerald/AdditionalPlacements/wiki/Blocklist-Format for blocklist format + enabled = ["+*"] #Regular pressure plates [startup.types.additionalplacements.pressure_plate] - - #Options for controlling which blocks (that are valid for this type) will generate variants of this type - [startup.types.additionalplacements.pressure_plate.enabled] - #Default state for blocks not matching any list. True is enabled, false is disabled. - default = true - #Whitelist for mods whose blocks will be enabled. - mod_whitelist = [] - #Blacklist for mods whose blocks will be disabled. Takes priority over the mod whitelist. - mod_blacklist = [] - #Whitelist for blocks that will be enabled. Takes priority over the the mod blacklist and whitelist. - block_whitelist = [] - #Blacklist for blocks that will be disabled. Takes priority over the block whitelist, the mod blacklist, and the mod whitelist. - block_blacklist = [] + #Blocklist for controlling which blocks (that are valid for this type) will generate variants of this type + #See https://github.com/FirEmerald/AdditionalPlacements/wiki/Blocklist-Format for blocklist format + enabled = ["+*"] #Weighted pressure plates [startup.types.additionalplacements.weighted_pressure_plate] - - #Options for controlling which blocks (that are valid for this type) will generate variants of this type - [startup.types.additionalplacements.weighted_pressure_plate.enabled] - #Default state for blocks not matching any list. True is enabled, false is disabled. - default = true - #Whitelist for mods whose blocks will be enabled. - mod_whitelist = [] - #Blacklist for mods whose blocks will be disabled. Takes priority over the mod whitelist. - mod_blacklist = [] - #Whitelist for blocks that will be enabled. Takes priority over the the mod blacklist and whitelist. - block_whitelist = [] - #Blacklist for blocks that will be disabled. Takes priority over the block whitelist, the mod blacklist, and the mod whitelist. - block_blacklist = [] + #Blocklist for controlling which blocks (that are valid for this type) will generate variants of this type + #See https://github.com/FirEmerald/AdditionalPlacements/wiki/Blocklist-Format for blocklist format + enabled = ["+*"] diff --git a/config/cerulean-client.toml b/config/cerulean-client.toml new file mode 100644 index 000000000..fa0f0507c --- /dev/null +++ b/config/cerulean-client.toml @@ -0,0 +1,8 @@ + +#. +#Client-only settings - If you're looking for general settings, look inside your world's serverconfig folder! +[client] + #. + #Example Boolean + example = true + diff --git a/config/cerulean-common.toml b/config/cerulean-common.toml new file mode 100644 index 000000000..efbef0487 --- /dev/null +++ b/config/cerulean-common.toml @@ -0,0 +1,4 @@ +#. +#Example Boolean!!!!!!!!!!! +example = true + diff --git a/config/cerulean.yml b/config/cerulean.yml new file mode 100644 index 000000000..a0bf88d04 --- /dev/null +++ b/config/cerulean.yml @@ -0,0 +1,40 @@ +# Report issues on Github ${issue_tracker} +# Discuss, get help or report issues on Discord ${discord} + +# Enables debug logs +# Will worsen your performance, please do not enable if you don't need it! +debug_mode: false + +# Makes advancement checks run less often +# Disable if you have issues with advancements not processing fast enough +enable_skip_ticks: true + +# Cancels advancement check when stack becomes empty (for example, when player throws out the whole stack). +# Injects into InventoryChangeTrigger. +# Disable if you have mixin conflict or some advancements became unobtainable (and also report on github/discord!). +ignore_triggers_for_emptied_stacks: true + +# Cancels advancement check when stack size decreases (for example, when player throws out one item from stack). +# Injects into InventoryChangeTrigger, ItemStack, AbstractContainerMenu. +# Disable if you have mixin conflict or some advancements became unobtainable (and also report on github/discord!). +ignore_triggers_for_decreased_stacks: true + +# Optimizes advancement check for advancements that require multiple items (for example, "Cover me in debris" requires full netherite armor set). +# Injects into InventoryChangeTriggerInstance. +# Disable if you have mixin conflict or some advancements became unobtainable (and also report on github/discord!). +optimize_multiple_predicate_trigger: true + +# Disables advancement check when you just open any container (for example, chest or backpack). +# Injects into AbstractContainerMenu. +# Disable if you have mixin conflict or problems with any container (and also report on github/discord!). +initialize_inventory_last_slots: true + +# Skips advancement check when you pick up or otherwise increase stack size if this change doesn't pass any advancement threshold. +# For example, dirt stack size increased from 52 to 53, but there's no advancement for getting 53 dirt in your modpack. +optimize_triggers_for_increased_stacks: true + +# When checking each item criterion, first check the count requirement and see if it was fulfilled before. +# For example, there is advancement for getting stone block, any amount. You have 52 dirt, and you pick up one more. There is +# no way you can the get stone advancement from this action, because it requires any amount of item, and you already had some. +# Another example: there is no way you can get the advancement for 64 emerald blocks if you don't have dirt and you pick up 5 dirt. +check_count_before_item_predicate_match: true \ No newline at end of file diff --git a/config/craftpresence.json b/config/craftpresence.json index 43a3c676b..5f50f1412 100644 --- a/config/craftpresence.json +++ b/config/craftpresence.json @@ -1,5 +1,5 @@ { - "_schemaVersion": 6, + "_schemaVersion": 7, "_lastMCVersionId": 763, "generalSettings": { "detectATLauncherInstance": false, @@ -101,8 +101,7 @@ "playerSkinEndpoint": "https://mc-heads.net/avatar/{getOrDefault(player.uuid.short, player.name)}", "allowDuplicatePackets": false, "maxConnectionAttempts": 10, - "enableClassGraph": false, - "useClassLoader": false + "enableClassGraph": false }, "accessibilitySettings": { "languageId": "en_us", @@ -126,18 +125,10 @@ "smallImageText": "{getOrDefault(server.message)} {getOrDefault(pack.name)}", "startTimestamp": "{data.general.time}", "endTimestamp": "", - "buttons": { - "default": { - "label": "Example Text", - "url": "https://google.com" - } - } - }, - "dynamicIcons": { - "default": "https://via.placeholder.com/256.png" + "buttons": {} }, + "dynamicIcons": {}, "dynamicVariables": { - "default": "Example Text", "mods": "{general.mods} Mod(s)", "player_info_coordinate": "At {player.position.x}, {player.position.z}", "players": "{server.players.current} / {server.players.max} Players", diff --git a/config/despawntweaks-common.toml b/config/despawntweaks-common.toml new file mode 100644 index 000000000..b3ff80cd2 --- /dev/null +++ b/config/despawntweaks-common.toml @@ -0,0 +1,16 @@ +#. +#Turn this off to disable the despawn of mobs spawned by spawners +allowMobsSpawnedBySpawnersToDespawn = true +#. +#Turn this off to disable the despawn optimizations. +enableLetMeDespawnOptimization = true +#. +#Turn this off to disable the equipments drop on mobs despawn +allowEquipmentDrops = true +#. +#If you add modIDs to this list, only mobs in the structures of the mods will be affected by DespawnTweaker. +StructuresMods = [] +#. +#If you add sturctures registry names to list, only mobs in the structures will be affected by DespawnTweaker. +Structures = [] + diff --git a/config/everycomp-hazardous.properties b/config/everycomp-hazardous.properties index 6e5bec6b4..99d879519 100644 --- a/config/everycomp-hazardous.properties +++ b/config/everycomp-hazardous.properties @@ -1,5 +1,5 @@ #Hard disable entire modules. Use at your own risk and don't ask for support if you use this. Write modid = false to disable modules -#Tue May 06 01:08:34 YEKT 2025 +#Fri May 30 02:48:49 YEKT 2025 a=false create=true storagedrawers=true diff --git a/config/expatternprovider-common.toml b/config/expatternprovider-common.toml index 42d355e50..435cb84f6 100644 --- a/config/expatternprovider-common.toml +++ b/config/expatternprovider-common.toml @@ -24,3 +24,7 @@ disableItemRender = false #Range: 3 ~ 16 assembler_matrix_max_size = 6 +[misc] + #Enable debug logging. + debug_mode = false + diff --git a/config/fabric/indigo-renderer.properties b/config/fabric/indigo-renderer.properties new file mode 100644 index 000000000..c8f9f99b1 --- /dev/null +++ b/config/fabric/indigo-renderer.properties @@ -0,0 +1,9 @@ +#Indigo properties file +#Fri May 30 02:48:47 YEKT 2025 +fix-mean-light-calculation=auto +debug-compare-lighting=auto +fix-exterior-vertex-lighting=auto +ambient-occlusion-mode=hybrid +always-tesselate-blocks=auto +fix-smooth-lighting-offset=auto +fix-luminous-block-ambient-occlusion=auto diff --git a/config/fastsuite.cfg b/config/fastsuite.cfg new file mode 100644 index 000000000..cf1c94b8d --- /dev/null +++ b/config/fastsuite.cfg @@ -0,0 +1,24 @@ +# File Specification: https://gist.github.com/Shadows-of-Fire/88ac714a758636c57a52e32ace5474c1 + +# FastSuite Configuration + +general { + # A list of recipe types which may only be looked up on the main thread. Add a recipe type to this list if errors start happening. + # Default: [ + S:"Single Threaded Recipe Types" < + > + + # The max time, in seconds, that a recipe lookup may take before aborting the lookup and logging an error. + # Default: 25; Range: [1 ~ 300] + I:"Max Recipe Lookup Time"=25 + + # If true, the stacks used as recipe inputs will be locked and throw an error if modified during parallel matching. Useful for debugging. + # Default: false + B:"Lock Crafting Input Stacks"=false + + # If true, FastSuite parallelize all recipes without validation. This can cause crashes if a recipe is not thread safe. + # Default: false + B:"Unsafe Mode"=false +} + + diff --git a/config/immersive_optimization.json b/config/immersive_optimization.json new file mode 100644 index 000000000..a204485ac --- /dev/null +++ b/config/immersive_optimization.json @@ -0,0 +1,31 @@ +{ + "_documentation": "https://github.com/Luke100000/ImmersiveOptimization/wiki", + "enableEntities": true, + "enableBlockEntities": true, + "enableDistanceCulling": true, + "enableTrackingCulling": true, + "enableViewportCulling": true, + "minDistance": 6, + "blocksPerLevel": 64, + "blocksPerLevelDistanceCulled": 10, + "blocksPerLevelTrackingCulled": 10, + "blocksPerLevelViewportCulled": 20, + "maxLevel": 20, + "blocksPerLevelBlockEntities": 32, + "entityTickBudget": 30.0, + "stressedThreshold": 45, + "dimensions": { + "minecraft:overworld": true, + "minecraft:the_nether": true, + "minecraft:the_end": true + }, + "entities": { + "fromanotherworld:starship": false, + "minecraft:player": false, + "minecraft:arrow": false, + "create": false, + "minecraft:ender_dragon": false + }, + "version": 2, + "name": "immersive_optimization" +} \ No newline at end of file diff --git a/config/jei/recipe-category-sort-order.ini b/config/jei/recipe-category-sort-order.ini index fc5e13a66..9ab3cfa56 100644 --- a/config/jei/recipe-category-sort-order.ini +++ b/config/jei/recipe-category-sort-order.ini @@ -1,10 +1,5 @@ -gtceu:multiblock_info -gtceu:ore_processing_diagram -gtceu:bedrock_fluid_diagram - minecraft:crafting create:mechanical_crafting - tfc:rock_knapping tfc:clay_knapping tfc:fire_clay_knapping @@ -12,7 +7,6 @@ tfc:leather_knapping tfc:goat_horn_knapping tfc:pumpkin_knapping tfc:raw_hide_knapping - tfc:heating tfc:quern tfc:casting @@ -25,7 +19,6 @@ tfc:sealed_barrel tfc:bloomery tfc:blast_furnace tfc:alloying - tfc:scraping tfc:loom tfc:glassworking @@ -41,121 +34,89 @@ tfc:jam_pot firmalife:bowl_pot firmalife:vat firmalife:stomping - create:deploying create:item_application create:sequenced_assembly - -gtceu:large_boiler -gtceu:steam_boiler -gtceu:coke_oven - -gtceu:combustion_generator -gtceu:gas_turbine -gtceu:plasma_generator -gtceu:steam_turbine - -minecraft:smelting -gtceu:air_scrubber -gtceu:alloy_smelter -gtceu:arc_furnace -gtceu:assembler -gtceu:autoclave createaddition:rolling vintageimprovements:pressurizing -gtceu:bender -gtceu:brewery -gtceu:canner vintageimprovements:centrifugation -gtceu:centrifuge -gtceu:chemical_bath -gtceu:chemical_reactor -gtceu:large_chemical_reactor -gtceu:circuit_assembler -gtceu:compressor greate:sawing -gtceu:cutter -gtceu:distillery -gtceu:distillation_tower -gtceu:electrolyzer -gtceu:electromagnetic_separator vintageimprovements:vacuumizing -gtceu:extractor vintageimprovements:curving -gtceu:extruder -gtceu:fermenter -gtceu:fluid_heater -gtceu:fluid_solidifier -gtceu:forge_hammer -gtceu:forming_press -gtceu:gas_collector vintageimprovements:laser_cutting -gtceu:laser_engraver vintageimprovements:turning -gtceu:lathe greate:milling greate:crushing -gtceu:macerator greate:mixing -gtceu:mixer -gtceu:packer -gtceu:polarizer -gtceu:rock_breaker -gtceu:scanner vintageimprovements:vibrating -gtceu:sifter -gtceu:thermal_centrifuge vintageimprovements:coiling -gtceu:wiremill - -gtceu:alloy_blast_smelter -gtceu:assembly_line -gtceu:cracker -gtceu:electric_blast_furnace -gtceu:end_dome -gtceu:evaporation -gtceu:fusion_reactor -gtceu:greenhouse -gtceu:implosion_compressor -gtceu:nether_dome -gtceu:pyrolyse_oven -gtceu:research_station -gtceu:steam_bloomery -gtceu:vacuum_freezer -gtceu:wire_coating - ae2:item_transformation -gtceu:ore_washer greate:fan_washing -gtceu:ore_crushing -gtceu:ore_forging -gtceu:ore_bathing - -gtceu:chem_dyes -gtceu:ingot_molding -gtceu:arc_furnace_recycling -gtceu:macerator_recycling -gtceu:extractor_recycling ae2:condenser - greate:packing - minecraft:smithing exposure:photograph_printing - rnr:block_mod rnr:mattock greate:block_cutting -framedblocks:framing_saw domum_ornamentum:architects_cutter - -gtceu:programmed_circuit ae2:attunement ae2:entropy create:draining create:spout_filling exposure:photograph_stacking ftbquests:quest - -emi:info -emi:tag \ No newline at end of file +minecraft:anvil +minecraft:blasting +minecraft:brewing +minecraft:campfire +minecraft:compostable +minecraft:fuel +minecraft:furnace +minecraft:smoking +minecraft:stonecutting +ae2:certus_growth +ae2:charger +ae2:inscriber +afc:tree_tap +create:automatic_brewing +create:automatic_packing +create:automatic_shaped +create:automatic_shapeless +create:block_cutting +create:crushing +create:fan_blasting +create:fan_haunting +create:fan_smoking +create:fan_washing +create:milling +create:mixing +create:mystery_conversion +create:packing +create:pressing +create:sandpaper_polishing +create:sawing +create:wood_cutting +createaddition:charging +createaddition:liquid_burning +expatternprovider:circuit_cutter +firmalife:press +firmalife:stinky_soup +ftbquests:loot_crate +greate:automatic_brewing +greate:automatic_packing +greate:automatic_shapeless +greate:fan_haunting +greate:pressing +greate:wood_cutting +jei:information +jumbofurnace:jumbo_furnace_upgrade +jumbofurnace:jumbo_smelting +morered:soldering +tfc:flint_knapping +vintageimprovements:auto_curving +vintageimprovements:auto_smithing +vintageimprovements:grinder_sandpaper_polishing +vintageimprovements:leaves_vibrating +vintageimprovements:polishing +vintageimprovements:unpacking diff --git a/config/modernfix-mixins.properties b/config/modernfix-mixins.properties index 68ed9a10d..d1ab3e7a7 100644 --- a/config/modernfix-mixins.properties +++ b/config/modernfix-mixins.properties @@ -26,6 +26,7 @@ # mixin.bugfix.packet_leak=false # (default) # mixin.bugfix.paper_chunk_patches=true # (default) # mixin.bugfix.recipe_book_type_desync=true # (default) +# mixin.bugfix.registry_ops_cme=true # (default) # mixin.bugfix.removed_dimensions=true # (default) # mixin.bugfix.restore_old_dragon_movement=false # (default) # mixin.bugfix.unsafe_modded_shape_caches=true # (default) @@ -38,6 +39,8 @@ # mixin.feature.direct_stack_trace=false # (default) # mixin.feature.disable_unihex_font=false # (default) # mixin.feature.integrated_server_watchdog=true # (default) +# mixin.feature.log_stdout_in_log_files=true # (default) +# mixin.feature.mcfunction_profiling=true # (default) # mixin.feature.measure_time=true # (default) # mixin.feature.registry_event_progress=false # (default) # mixin.feature.remove_chat_signing=false # (default) @@ -58,6 +61,7 @@ # mixin.perf.chunk_meshing=true # (default) # mixin.perf.clear_mixin_classinfo=false # (default) # mixin.perf.compact_bit_storage=true # (default) +# mixin.perf.compress_unihex_font=true # (default) # mixin.perf.datapack_reload_exceptions=true # (default) # mixin.perf.dedicated_reload_executor=true # (default) # mixin.perf.deduplicate_climate_parameters=false # (default) @@ -73,6 +77,7 @@ # mixin.perf.dynamic_structure_manager=true # (default) # mixin.perf.fast_forge_dummies=true # (default) # mixin.perf.fast_registry_validation=true # (default) +# mixin.perf.faster_ingredients=true # (default) # mixin.perf.faster_item_rendering=false # (default) # mixin.perf.faster_structure_location=true # (default) # mixin.perf.faster_texture_stitching=true # (default) @@ -81,6 +86,7 @@ # mixin.perf.forge_registry_alloc=true # (default) # mixin.perf.forge_registry_lambda=true # (default) # mixin.perf.kubejs=true # (default) +# mixin.perf.lazy_search_tree_registry=true # (default) # mixin.perf.memoize_creative_tab_build=true # (default) # mixin.perf.model_optimizations=true # (default) # mixin.perf.mojang_registry_size=true # (default) @@ -91,9 +97,10 @@ # mixin.perf.remove_biome_temperature_cache=true # (default) # mixin.perf.remove_spawn_chunks=false # (default) # mixin.perf.resourcepacks=true # (default) +# mixin.perf.smart_ingredient_sync=true # (default) # mixin.perf.state_definition_construct=true # (default) # mixin.perf.tag_id_caching=true # (default) -# mixin.perf.thread_priorities=true # (default) +# mixin.perf.thread_priorities=false # (overridden for mod compat) # mixin.perf.ticking_chunk_alloc=true # (default) # mixin.perf.worldgen_allocation=false # (default) # mixin.safety=true # (default) diff --git a/config/packetfixer.properties b/config/packetfixer.properties index e348f5f76..3145d4309 100644 --- a/config/packetfixer.properties +++ b/config/packetfixer.properties @@ -1,7 +1,7 @@ #Packet Fixer config file. #Default values (minecraft default): nbtMaxSize 2097152, packetSize 1048576, decoderSize 8388608 and varInt21Size 3. #Max values are 2147483647 for packetSize/decoderSize/varInt21 and 9223372036854775807 for nbtMaxSize. -#Tue May 06 01:08:22 YEKT 2025 +#Fri May 30 02:48:38 YEKT 2025 chunkPacketData=2097152 varLong=10 nbtMaxSize=209715200 diff --git a/config/sound_physics_remastered/occlusion.properties b/config/sound_physics_remastered/occlusion.properties index 5a5652d2c..b0f3a0daf 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 +# Slime Block (Sound Type) +SLIME_BLOCK=1.0 # Copper (Sound Type) COPPER=1.0 +# Cherry Sapling (Sound Type) +CHERRY_SAPLING=1.0 +# Roots (Sound Type) +ROOTS=0.0 +# Shroomlight (Sound Type) +SHROOMLIGHT=1.0 +# Froglight (Sound Type) +FROGLIGHT=1.0 +# Rooted Dirt (Sound Type) +ROOTED_DIRT=1.0 +# Nether Gold Ore (Sound Type) +NETHER_GOLD_ORE=1.0 +# Suspicious Gravel (Sound Type) +SUSPICIOUS_GRAVEL=1.0 # Flowering Azalea (Sound Type) FLOWERING_AZALEA=1.0 +# Anvil (Sound Type) +ANVIL=1.0 +# Decorated Pot Cracked (Sound Type) +DECORATED_POT_CRACKED=1.0 +# Powder Snow (Sound Type) +POWDER_SNOW=0.1 +# Spore Blossom (Sound Type) +SPORE_BLOSSOM=0.0 +# Soul Soil (Sound Type) +SOUL_SOIL=1.0 +# Wet Grass (Sound Type) +WET_GRASS=0.1 +# Deepslate Bricks (Sound Type) +DEEPSLATE_BRICKS=1.0 +# Crop (Sound Type) +CROP=0.0 +# Decorated Pot (Sound Type) +DECORATED_POT=1.0 +# Scaffolding (Sound Type) +SCAFFOLDING=0.0 +# Nether Bricks (Sound Type) +NETHER_BRICKS=1.0 +# Vine (Sound Type) +VINE=0.0 +# Medium Amethyst Bud (Sound Type) +MEDIUM_AMETHYST_BUD=0.0 +# Calcite (Sound Type) +CALCITE=1.0 +# Bamboo Wood Hanging Sign (Sound Type) +BAMBOO_WOOD_HANGING_SIGN=1.0 +# Gilded Blackstone (Sound Type) +GILDED_BLACKSTONE=1.0 +# Bamboo Wood (Sound Type) +BAMBOO_WOOD=1.0 +# Ancient Debris (Sound Type) +ANCIENT_DEBRIS=1.0 +# Bone Block (Sound Type) +BONE_BLOCK=1.0 +# Sculk (Sound Type) +SCULK=1.0 +# Wood (Sound Type) +WOOD=1.0 +# Netherite Block (Sound Type) +NETHERITE_BLOCK=1.0 +# Soul Sand (Sound Type) +SOUL_SAND=1.0 +# Sculk Vein (Sound Type) +SCULK_VEIN=1.0 +# Twisting Vines (Sound Type) +TWISTING_VINES=0.0 +# Small Amethyst Bud (Sound Type) +SMALL_AMETHYST_BUD=0.0 +# Basalt (Sound Type) +BASALT=1.0 +# Bamboo Sapling (Sound Type) +BAMBOO_SAPLING=0.1 +# Nether Wart (Sound Type) +NETHER_WART=1.0 +# Nether Wood Hanging Sign (Sound Type) +NETHER_WOOD_HANGING_SIGN=1.0 +# Sand (Sound Type) +SAND=1.0 +# Deepslate Tiles (Sound Type) +DEEPSLATE_TILES=1.0 +# Dripstone Block (Sound Type) +DRIPSTONE_BLOCK=1.0 +# Mud (Sound Type) +MUD=1.0 +# Weeping Vines (Sound Type) +WEEPING_VINES=0.0 +# Wart Block (Sound Type) +WART_BLOCK=1.0 +# Amethyst (Sound Type) +AMETHYST=1.0 +# Hanging Sign (Sound Type) +HANGING_SIGN=1.0 +# Glow Lichen (Sound Type) +GLOW_LICHEN=0.0 +# Large Amethyst Bud (Sound Type) +LARGE_AMETHYST_BUD=0.0 +# Sculk Sensor (Sound Type) +SCULK_SENSOR=1.0 +# Azalea (Sound Type) +AZALEA=1.0 +# Stone (Sound Type) +STONE=1.0 +# Fungus (Sound Type) +FUNGUS=0.0 +# Small Dripleaf (Sound Type) +SMALL_DRIPLEAF=0.0 +# Lantern (Sound Type) +LANTERN=1.0 +# Lodestone (Sound Type) +LODESTONE=1.0 +# Pointed Dripstone (Sound Type) +POINTED_DRIPSTONE=0.0 +# Big Dripleaf (Sound Type) +BIG_DRIPLEAF=1.0 +# Chiseled Bookshelf (Sound Type) +CHISELED_BOOKSHELF=1.0 +# Candle (Sound Type) +CANDLE=1.0 +# Bamboo (Sound Type) +BAMBOO=0.1 +# Nether Ore (Sound Type) +NETHER_ORE=1.0 +# Cave Vines (Sound Type) +CAVE_VINES=1.0 +# Glass (Sound Type) +GLASS=0.1 +# Ladder (Sound Type) +LADDER=0.0 +# Stem (Sound Type) +STEM=1.0 +# Hard Crop (Sound Type) +HARD_CROP=1.0 +# Chain (Sound Type) +CHAIN=0.0 +# Nether Sprouts (Sound Type) +NETHER_SPROUTS=1.0 +# Wool (Sound Type) +WOOL=1.5 +# Moss Carpet (Sound Type) +MOSS_CARPET=0.1 +# Cherry Leaves (Sound Type) +CHERRY_LEAVES=1.0 +# Nylium (Sound Type) +NYLIUM=1.0 +# Packed Mud (Sound Type) +PACKED_MUD=1.0 +# Metal (Sound Type) +METAL=1.0 +# Frogspawn (Sound Type) +FROGSPAWN=1.0 +# Sweet Berry Bush (Sound Type) +SWEET_BERRY_BUSH=0.0 +# Sculk Shrieker (Sound Type) +SCULK_SHRIEKER=1.0 +# Nether Wood (Sound Type) +NETHER_WOOD=1.0 +# Amethyst Cluster (Sound Type) +AMETHYST_CLUSTER=1.0 +# Moss (Sound Type) +MOSS=0.75 # Sculk Catalyst (Sound Type) SCULK_CATALYST=1.0 # Muddy Mangrove Roots (Sound Type) MUDDY_MANGROVE_ROOTS=1.0 -# Soul Sand (Sound Type) -SOUL_SAND=1.0 -# Hard Crop (Sound Type) -HARD_CROP=1.0 -# Chiseled Bookshelf (Sound Type) -CHISELED_BOOKSHELF=1.0 -# Decorated Pot (Sound Type) -DECORATED_POT=1.0 -# Suspicious Sand (Sound Type) -SUSPICIOUS_SAND=1.0 -# Lodestone (Sound Type) -LODESTONE=1.0 -# Deepslate Tiles (Sound Type) -DEEPSLATE_TILES=1.0 -# Polished Deepslate (Sound Type) -POLISHED_DEEPSLATE=1.0 -# Azalea (Sound Type) -AZALEA=1.0 -# Nether Sprouts (Sound Type) -NETHER_SPROUTS=1.0 -# Mud (Sound Type) -MUD=1.0 -# Suspicious Gravel (Sound Type) -SUSPICIOUS_GRAVEL=1.0 -# Coral Block (Sound Type) -CORAL_BLOCK=1.0 -# Vine (Sound Type) -VINE=0.0 -# Calcite (Sound Type) -CALCITE=1.0 -# Cave Vines (Sound Type) -CAVE_VINES=1.0 -# Rooted Dirt (Sound Type) -ROOTED_DIRT=1.0 -# Cherry Sapling (Sound Type) -CHERRY_SAPLING=1.0 -# Decorated Pot Cracked (Sound Type) -DECORATED_POT_CRACKED=1.0 -# Chain (Sound Type) -CHAIN=0.0 -# Powder Snow (Sound Type) -POWDER_SNOW=0.1 -# Amethyst (Sound Type) -AMETHYST=1.0 -# Mangrove Roots (Sound Type) -MANGROVE_ROOTS=1.0 -# Hanging Sign (Sound Type) -HANGING_SIGN=1.0 -# Ancient Debris (Sound Type) -ANCIENT_DEBRIS=1.0 -# Shroomlight (Sound Type) -SHROOMLIGHT=1.0 -# Sand (Sound Type) -SAND=1.0 -# Nether Ore (Sound Type) -NETHER_ORE=1.0 -# Anvil (Sound Type) -ANVIL=1.0 -# Nether Wood Hanging Sign (Sound Type) -NETHER_WOOD_HANGING_SIGN=1.0 -# Crop (Sound Type) -CROP=0.0 -# Snow (Sound Type) -SNOW=0.1 -# Twisting Vines (Sound Type) -TWISTING_VINES=0.0 -# Small Dripleaf (Sound Type) -SMALL_DRIPLEAF=0.0 -# Tuff (Sound Type) -TUFF=1.0 -# Wool (Sound Type) -WOOL=1.5 -# Deepslate Bricks (Sound Type) -DEEPSLATE_BRICKS=1.0 -# Amethyst Cluster (Sound Type) -AMETHYST_CLUSTER=1.0 -# Sculk Sensor (Sound Type) -SCULK_SENSOR=1.0 -# Bone Block (Sound Type) -BONE_BLOCK=1.0 -# Small Amethyst Bud (Sound Type) -SMALL_AMETHYST_BUD=0.0 -# Sweet Berry Bush (Sound Type) -SWEET_BERRY_BUSH=0.0 -# Cherry Wood Hanging Sign (Sound Type) -CHERRY_WOOD_HANGING_SIGN=1.0 -# Slime Block (Sound Type) -SLIME_BLOCK=1.0 -# Lily Pad (Sound Type) -LILY_PAD=0.0 -# Bamboo Wood (Sound Type) -BAMBOO_WOOD=1.0 -# Nether Gold Ore (Sound Type) -NETHER_GOLD_ORE=1.0 -# Stone (Sound Type) -STONE=1.0 # Deepslate (Sound Type) DEEPSLATE=1.0 -# Pointed Dripstone (Sound Type) -POINTED_DRIPSTONE=0.0 -# Azalea Leaves (Sound Type) -AZALEA_LEAVES=1.0 -# Fungus (Sound Type) -FUNGUS=0.0 -# Sculk Vein (Sound Type) -SCULK_VEIN=1.0 -# Bamboo Sapling (Sound Type) -BAMBOO_SAPLING=0.1 -# Soul Soil (Sound Type) -SOUL_SOIL=1.0 -# Basalt (Sound Type) -BASALT=1.0 -# Roots (Sound Type) -ROOTS=0.0 -# Honey Block (Sound Type) -HONEY_BLOCK=0.5 +# Snow (Sound Type) +SNOW=0.1 +# Coral Block (Sound Type) +CORAL_BLOCK=1.0 # Hanging Roots (Sound Type) HANGING_ROOTS=1.0 -# Sculk (Sound Type) -SCULK=1.0 -# Moss Carpet (Sound Type) -MOSS_CARPET=0.1 -# Scaffolding (Sound Type) -SCAFFOLDING=0.0 -# Metal (Sound Type) -METAL=1.0 -# Glass (Sound Type) -GLASS=0.1 -# Candle (Sound Type) -CANDLE=1.0 -# Large Amethyst Bud (Sound Type) -LARGE_AMETHYST_BUD=0.0 -# Netherite Block (Sound Type) -NETHERITE_BLOCK=1.0 -# Cherry Wood (Sound Type) -CHERRY_WOOD=1.0 -# Gilded Blackstone (Sound Type) -GILDED_BLACKSTONE=1.0 +# Mangrove Roots (Sound Type) +MANGROVE_ROOTS=1.0 # Mud Bricks (Sound Type) MUD_BRICKS=1.0 -# Lantern (Sound Type) -LANTERN=1.0 -# Wood (Sound Type) -WOOD=1.0 -# Dripstone Block (Sound Type) -DRIPSTONE_BLOCK=1.0 -# Netherrack (Sound Type) -NETHERRACK=1.0 -# Wart Block (Sound Type) -WART_BLOCK=1.0 -# Moss (Sound Type) -MOSS=0.75 -# Froglight (Sound Type) -FROGLIGHT=1.0 -# Frogspawn (Sound Type) -FROGSPAWN=1.0 -# Nylium (Sound Type) -NYLIUM=1.0 -# Cherry Leaves (Sound Type) -CHERRY_LEAVES=1.0 -# Nether Wood (Sound Type) -NETHER_WOOD=1.0 -# Nether Wart (Sound Type) -NETHER_WART=1.0 -# Big Dripleaf (Sound Type) -BIG_DRIPLEAF=1.0 -# Gravel (Sound Type) -GRAVEL=1.0 +# Cherry Wood Hanging Sign (Sound Type) +CHERRY_WOOD_HANGING_SIGN=1.0 +# Polished Deepslate (Sound Type) +POLISHED_DEEPSLATE=1.0 # Grass (Sound Type) GRASS=1.0 -# Packed Mud (Sound Type) -PACKED_MUD=1.0 -# Bamboo (Sound Type) -BAMBOO=0.1 -# Spore Blossom (Sound Type) -SPORE_BLOSSOM=0.0 -# Ladder (Sound Type) -LADDER=0.0 -# Wet Grass (Sound Type) -WET_GRASS=0.1 -# Stem (Sound Type) -STEM=1.0 -# Weeping Vines (Sound Type) -WEEPING_VINES=0.0 -# Nether Bricks (Sound Type) -NETHER_BRICKS=1.0 -# Sculk Shrieker (Sound Type) -SCULK_SHRIEKER=1.0 -# Medium Amethyst Bud (Sound Type) -MEDIUM_AMETHYST_BUD=0.0 -# Glow Lichen (Sound Type) -GLOW_LICHEN=0.0 -# Bamboo Wood Hanging Sign (Sound Type) -BAMBOO_WOOD_HANGING_SIGN=1.0 +# Gravel (Sound Type) +GRAVEL=1.0 +# Honey Block (Sound Type) +HONEY_BLOCK=0.5 +# Azalea Leaves (Sound Type) +AZALEA_LEAVES=1.0 +# Cherry Wood (Sound Type) +CHERRY_WOOD=1.0 +# Tuff (Sound Type) +TUFF=1.0 +# Lily Pad (Sound Type) +LILY_PAD=0.0 +# Netherrack (Sound Type) +NETHERRACK=1.0 +# Suspicious Sand (Sound Type) +SUSPICIOUS_SAND=1.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 4a52e1397..f6471f930 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 +# Slime Block (Sound Type) +SLIME_BLOCK=0.5 # Copper (Sound Type) COPPER=1.25 +# Cherry Sapling (Sound Type) +CHERRY_SAPLING=0.5 +# Roots (Sound Type) +ROOTS=0.5 +# Shroomlight (Sound Type) +SHROOMLIGHT=0.5 +# Froglight (Sound Type) +FROGLIGHT=0.5 +# Rooted Dirt (Sound Type) +ROOTED_DIRT=0.5 +# Nether Gold Ore (Sound Type) +NETHER_GOLD_ORE=1.1 +# Suspicious Gravel (Sound Type) +SUSPICIOUS_GRAVEL=0.5 # Flowering Azalea (Sound Type) FLOWERING_AZALEA=0.5 +# Anvil (Sound Type) +ANVIL=0.5 +# Decorated Pot Cracked (Sound Type) +DECORATED_POT_CRACKED=0.5 +# Powder Snow (Sound Type) +POWDER_SNOW=0.5 +# Spore Blossom (Sound Type) +SPORE_BLOSSOM=0.5 +# Soul Soil (Sound Type) +SOUL_SOIL=0.2 +# Wet Grass (Sound Type) +WET_GRASS=0.5 +# Deepslate Bricks (Sound Type) +DEEPSLATE_BRICKS=1.5 +# Crop (Sound Type) +CROP=0.5 +# Decorated Pot (Sound Type) +DECORATED_POT=0.5 +# Scaffolding (Sound Type) +SCAFFOLDING=0.5 +# Nether Bricks (Sound Type) +NETHER_BRICKS=1.5 +# Vine (Sound Type) +VINE=0.5 +# Medium Amethyst Bud (Sound Type) +MEDIUM_AMETHYST_BUD=0.5 +# Calcite (Sound Type) +CALCITE=1.5 +# Bamboo Wood Hanging Sign (Sound Type) +BAMBOO_WOOD_HANGING_SIGN=0.5 +# Gilded Blackstone (Sound Type) +GILDED_BLACKSTONE=0.5 +# Bamboo Wood (Sound Type) +BAMBOO_WOOD=0.5 +# Ancient Debris (Sound Type) +ANCIENT_DEBRIS=0.5 +# Bone Block (Sound Type) +BONE_BLOCK=1.5 +# Sculk (Sound Type) +SCULK=0.5 +# Wood (Sound Type) +WOOD=0.4 +# Netherite Block (Sound Type) +NETHERITE_BLOCK=1.5 +# Soul Sand (Sound Type) +SOUL_SAND=0.2 +# Sculk Vein (Sound Type) +SCULK_VEIN=0.5 +# Twisting Vines (Sound Type) +TWISTING_VINES=0.5 +# Small Amethyst Bud (Sound Type) +SMALL_AMETHYST_BUD=0.5 +# Basalt (Sound Type) +BASALT=1.5 +# Bamboo Sapling (Sound Type) +BAMBOO_SAPLING=0.5 +# Nether Wart (Sound Type) +NETHER_WART=0.5 +# Nether Wood Hanging Sign (Sound Type) +NETHER_WOOD_HANGING_SIGN=0.5 +# Sand (Sound Type) +SAND=0.2 +# Deepslate Tiles (Sound Type) +DEEPSLATE_TILES=1.5 +# Dripstone Block (Sound Type) +DRIPSTONE_BLOCK=0.5 +# Mud (Sound Type) +MUD=0.5 +# Weeping Vines (Sound Type) +WEEPING_VINES=0.5 +# Wart Block (Sound Type) +WART_BLOCK=0.5 +# Amethyst (Sound Type) +AMETHYST=1.5 +# Hanging Sign (Sound Type) +HANGING_SIGN=0.5 +# Glow Lichen (Sound Type) +GLOW_LICHEN=0.5 +# Large Amethyst Bud (Sound Type) +LARGE_AMETHYST_BUD=0.5 +# Sculk Sensor (Sound Type) +SCULK_SENSOR=0.5 +# Azalea (Sound Type) +AZALEA=0.5 +# Stone (Sound Type) +STONE=1.5 +# Fungus (Sound Type) +FUNGUS=0.5 +# Small Dripleaf (Sound Type) +SMALL_DRIPLEAF=0.5 +# Lantern (Sound Type) +LANTERN=0.5 +# Lodestone (Sound Type) +LODESTONE=0.5 +# Pointed Dripstone (Sound Type) +POINTED_DRIPSTONE=0.5 +# Big Dripleaf (Sound Type) +BIG_DRIPLEAF=0.5 +# Chiseled Bookshelf (Sound Type) +CHISELED_BOOKSHELF=0.5 +# Candle (Sound Type) +CANDLE=0.5 +# Bamboo (Sound Type) +BAMBOO=0.5 +# Nether Ore (Sound Type) +NETHER_ORE=1.1 +# Cave Vines (Sound Type) +CAVE_VINES=0.5 +# Glass (Sound Type) +GLASS=0.75 +# Ladder (Sound Type) +LADDER=0.5 +# Stem (Sound Type) +STEM=0.4 +# Hard Crop (Sound Type) +HARD_CROP=0.5 +# Chain (Sound Type) +CHAIN=0.5 +# Nether Sprouts (Sound Type) +NETHER_SPROUTS=0.5 +# Wool (Sound Type) +WOOL=0.1 +# Moss Carpet (Sound Type) +MOSS_CARPET=0.5 +# Cherry Leaves (Sound Type) +CHERRY_LEAVES=0.5 +# Nylium (Sound Type) +NYLIUM=0.5 +# Packed Mud (Sound Type) +PACKED_MUD=0.5 +# Metal (Sound Type) +METAL=1.25 +# Frogspawn (Sound Type) +FROGSPAWN=0.5 +# Sweet Berry Bush (Sound Type) +SWEET_BERRY_BUSH=0.5 +# Sculk Shrieker (Sound Type) +SCULK_SHRIEKER=0.5 +# Nether Wood (Sound Type) +NETHER_WOOD=0.5 +# Amethyst Cluster (Sound Type) +AMETHYST_CLUSTER=0.5 +# Moss (Sound Type) +MOSS=0.1 # Sculk Catalyst (Sound Type) SCULK_CATALYST=0.5 # Muddy Mangrove Roots (Sound Type) MUDDY_MANGROVE_ROOTS=0.5 -# Soul Sand (Sound Type) -SOUL_SAND=0.2 -# Hard Crop (Sound Type) -HARD_CROP=0.5 -# Chiseled Bookshelf (Sound Type) -CHISELED_BOOKSHELF=0.5 -# Decorated Pot (Sound Type) -DECORATED_POT=0.5 -# Suspicious Sand (Sound Type) -SUSPICIOUS_SAND=0.5 -# Lodestone (Sound Type) -LODESTONE=0.5 -# Deepslate Tiles (Sound Type) -DEEPSLATE_TILES=1.5 -# Polished Deepslate (Sound Type) -POLISHED_DEEPSLATE=1.5 -# Azalea (Sound Type) -AZALEA=0.5 -# Nether Sprouts (Sound Type) -NETHER_SPROUTS=0.5 -# Mud (Sound Type) -MUD=0.5 -# Suspicious Gravel (Sound Type) -SUSPICIOUS_GRAVEL=0.5 -# Coral Block (Sound Type) -CORAL_BLOCK=0.2 -# Vine (Sound Type) -VINE=0.5 -# Calcite (Sound Type) -CALCITE=1.5 -# Cave Vines (Sound Type) -CAVE_VINES=0.5 -# Rooted Dirt (Sound Type) -ROOTED_DIRT=0.5 -# Cherry Sapling (Sound Type) -CHERRY_SAPLING=0.5 -# Decorated Pot Cracked (Sound Type) -DECORATED_POT_CRACKED=0.5 -# Chain (Sound Type) -CHAIN=0.5 -# Powder Snow (Sound Type) -POWDER_SNOW=0.5 -# Amethyst (Sound Type) -AMETHYST=1.5 -# Mangrove Roots (Sound Type) -MANGROVE_ROOTS=0.5 -# Hanging Sign (Sound Type) -HANGING_SIGN=0.5 -# Ancient Debris (Sound Type) -ANCIENT_DEBRIS=0.5 -# Shroomlight (Sound Type) -SHROOMLIGHT=0.5 -# Sand (Sound Type) -SAND=0.2 -# Nether Ore (Sound Type) -NETHER_ORE=1.1 -# Anvil (Sound Type) -ANVIL=0.5 -# Nether Wood Hanging Sign (Sound Type) -NETHER_WOOD_HANGING_SIGN=0.5 -# Crop (Sound Type) -CROP=0.5 -# Snow (Sound Type) -SNOW=0.15 -# Twisting Vines (Sound Type) -TWISTING_VINES=0.5 -# Small Dripleaf (Sound Type) -SMALL_DRIPLEAF=0.5 -# Tuff (Sound Type) -TUFF=1.5 -# Wool (Sound Type) -WOOL=0.1 -# Deepslate Bricks (Sound Type) -DEEPSLATE_BRICKS=1.5 -# Amethyst Cluster (Sound Type) -AMETHYST_CLUSTER=0.5 -# Sculk Sensor (Sound Type) -SCULK_SENSOR=0.5 -# Bone Block (Sound Type) -BONE_BLOCK=1.5 -# Small Amethyst Bud (Sound Type) -SMALL_AMETHYST_BUD=0.5 -# Sweet Berry Bush (Sound Type) -SWEET_BERRY_BUSH=0.5 -# Cherry Wood Hanging Sign (Sound Type) -CHERRY_WOOD_HANGING_SIGN=0.5 -# Slime Block (Sound Type) -SLIME_BLOCK=0.5 -# Lily Pad (Sound Type) -LILY_PAD=0.5 -# Bamboo Wood (Sound Type) -BAMBOO_WOOD=0.5 -# Nether Gold Ore (Sound Type) -NETHER_GOLD_ORE=1.1 -# Stone (Sound Type) -STONE=1.5 # Deepslate (Sound Type) DEEPSLATE=1.5 -# Pointed Dripstone (Sound Type) -POINTED_DRIPSTONE=0.5 -# Azalea Leaves (Sound Type) -AZALEA_LEAVES=0.5 -# Fungus (Sound Type) -FUNGUS=0.5 -# Sculk Vein (Sound Type) -SCULK_VEIN=0.5 -# Bamboo Sapling (Sound Type) -BAMBOO_SAPLING=0.5 -# Soul Soil (Sound Type) -SOUL_SOIL=0.2 -# Basalt (Sound Type) -BASALT=1.5 -# Roots (Sound Type) -ROOTS=0.5 -# Honey Block (Sound Type) -HONEY_BLOCK=0.1 +# Snow (Sound Type) +SNOW=0.15 +# Coral Block (Sound Type) +CORAL_BLOCK=0.2 # Hanging Roots (Sound Type) HANGING_ROOTS=0.5 -# Sculk (Sound Type) -SCULK=0.5 -# Moss Carpet (Sound Type) -MOSS_CARPET=0.5 -# Scaffolding (Sound Type) -SCAFFOLDING=0.5 -# Metal (Sound Type) -METAL=1.25 -# Glass (Sound Type) -GLASS=0.75 -# Candle (Sound Type) -CANDLE=0.5 -# Large Amethyst Bud (Sound Type) -LARGE_AMETHYST_BUD=0.5 -# Netherite Block (Sound Type) -NETHERITE_BLOCK=1.5 -# Cherry Wood (Sound Type) -CHERRY_WOOD=0.5 -# Gilded Blackstone (Sound Type) -GILDED_BLACKSTONE=0.5 +# Mangrove Roots (Sound Type) +MANGROVE_ROOTS=0.5 # Mud Bricks (Sound Type) MUD_BRICKS=0.5 -# Lantern (Sound Type) -LANTERN=0.5 -# Wood (Sound Type) -WOOD=0.4 -# Dripstone Block (Sound Type) -DRIPSTONE_BLOCK=0.5 -# Netherrack (Sound Type) -NETHERRACK=1.1 -# Wart Block (Sound Type) -WART_BLOCK=0.5 -# Moss (Sound Type) -MOSS=0.1 -# Froglight (Sound Type) -FROGLIGHT=0.5 -# Frogspawn (Sound Type) -FROGSPAWN=0.5 -# Nylium (Sound Type) -NYLIUM=0.5 -# Cherry Leaves (Sound Type) -CHERRY_LEAVES=0.5 -# Nether Wood (Sound Type) -NETHER_WOOD=0.5 -# Nether Wart (Sound Type) -NETHER_WART=0.5 -# Big Dripleaf (Sound Type) -BIG_DRIPLEAF=0.5 -# Gravel (Sound Type) -GRAVEL=0.3 +# Cherry Wood Hanging Sign (Sound Type) +CHERRY_WOOD_HANGING_SIGN=0.5 +# Polished Deepslate (Sound Type) +POLISHED_DEEPSLATE=1.5 # Grass (Sound Type) GRASS=0.3 -# Packed Mud (Sound Type) -PACKED_MUD=0.5 -# Bamboo (Sound Type) -BAMBOO=0.5 -# Spore Blossom (Sound Type) -SPORE_BLOSSOM=0.5 -# Ladder (Sound Type) -LADDER=0.5 -# Wet Grass (Sound Type) -WET_GRASS=0.5 -# Stem (Sound Type) -STEM=0.4 -# Weeping Vines (Sound Type) -WEEPING_VINES=0.5 -# Nether Bricks (Sound Type) -NETHER_BRICKS=1.5 -# Sculk Shrieker (Sound Type) -SCULK_SHRIEKER=0.5 -# Medium Amethyst Bud (Sound Type) -MEDIUM_AMETHYST_BUD=0.5 -# Glow Lichen (Sound Type) -GLOW_LICHEN=0.5 -# Bamboo Wood Hanging Sign (Sound Type) -BAMBOO_WOOD_HANGING_SIGN=0.5 +# Gravel (Sound Type) +GRAVEL=0.3 +# Honey Block (Sound Type) +HONEY_BLOCK=0.1 +# Azalea Leaves (Sound Type) +AZALEA_LEAVES=0.5 +# Cherry Wood (Sound Type) +CHERRY_WOOD=0.5 +# Tuff (Sound Type) +TUFF=1.5 +# Lily Pad (Sound Type) +LILY_PAD=0.5 +# Netherrack (Sound Type) +NETHERRACK=1.1 +# Suspicious Sand (Sound Type) +SUSPICIOUS_SAND=0.5 diff --git a/config/xaerominimap_entities.json b/config/xaerominimap_entities.json index 53b820c78..db393cd4d 100644 --- a/config/xaerominimap_entities.json +++ b/config/xaerominimap_entities.json @@ -22,8 +22,8 @@ "startFadingAt": 0.0, "renderOverMinimapFrame": 1.0, "icons": 1.0, - "names": 0.0, "heightLimit": 20.0, + "names": 0.0, "iconScale": 1.0 }, "subCategories": [ diff --git a/data/fabricDefaultResourcePacks.dat b/data/fabricDefaultResourcePacks.dat new file mode 100644 index 000000000..9f907f832 Binary files /dev/null and b/data/fabricDefaultResourcePacks.dat differ diff --git a/defaultconfigs/additionalplacements-server.toml b/defaultconfigs/additionalplacements-server.toml index ce710eb36..7e117fe4e 100644 --- a/defaultconfigs/additionalplacements-server.toml +++ b/defaultconfigs/additionalplacements-server.toml @@ -15,101 +15,31 @@ #Slabs [server.types.additionalplacements.slab] - - #Options to control which blocks will use "rotated logic" of their original blocks. Mainly affects bounding boxes. - [server.types.additionalplacements.slab.rotated_logic] - #Default state for blocks not matching any list. True is enabled, false is disabled. - default = true - #Whitelist for mods whose blocks will be enabled. - mod_whitelist = [] - #Blacklist for mods whose blocks will be disabled. Takes priority over the mod whitelist. - mod_blacklist = [] - #Whitelist for tags whose blocks will be enabled. Takes priority over the the mod blacklist and whitelist. - tag_whitelist = [] - #Blacklist for tags whose blocks will be disabled. Takes priority over the block whitelist and the mod blacklist and whitelist. - tag_blacklist = [] - #Whitelist for blocks that will be enabled. Takes priority over the the mod and tag blacklist and whitelist. - block_whitelist = [] - #Blacklist for blocks that will be disabled. Takes priority over the block whitelist and the mod and tag blacklist and whitelist. - block_blacklist = [] + #Blocklist to control which blocks will use "rotated logic" of their original blocks. Mainly affects bounding boxes. + #See https://github.com/FirEmerald/AdditionalPlacements/wiki/Blocklist-Format for blocklist format + rotated_logic = ["+*"] #Stairs [server.types.additionalplacements.stairs] - - #Options to control which blocks will use "rotated logic" of their original blocks. Mainly affects bounding boxes. - [server.types.additionalplacements.stairs.rotated_logic] - #Default state for blocks not matching any list. True is enabled, false is disabled. - default = true - #Whitelist for mods whose blocks will be enabled. - mod_whitelist = [] - #Blacklist for mods whose blocks will be disabled. Takes priority over the mod whitelist. - mod_blacklist = [] - #Whitelist for tags whose blocks will be enabled. Takes priority over the the mod blacklist and whitelist. - tag_whitelist = [] - #Blacklist for tags whose blocks will be disabled. Takes priority over the block whitelist and the mod blacklist and whitelist. - tag_blacklist = [] - #Whitelist for blocks that will be enabled. Takes priority over the the mod and tag blacklist and whitelist. - block_whitelist = [] - #Blacklist for blocks that will be disabled. Takes priority over the block whitelist and the mod and tag blacklist and whitelist. - block_blacklist = [] + #Blocklist to control which blocks will use "rotated logic" of their original blocks. Mainly affects bounding boxes. + #See https://github.com/FirEmerald/AdditionalPlacements/wiki/Blocklist-Format for blocklist format + rotated_logic = ["+*"] #Carpets [server.types.additionalplacements.carpet] - - #Options to control which blocks will use "rotated logic" of their original blocks. Mainly affects bounding boxes. - [server.types.additionalplacements.carpet.rotated_logic] - #Default state for blocks not matching any list. True is enabled, false is disabled. - default = true - #Whitelist for mods whose blocks will be enabled. - mod_whitelist = [] - #Blacklist for mods whose blocks will be disabled. Takes priority over the mod whitelist. - mod_blacklist = [] - #Whitelist for tags whose blocks will be enabled. Takes priority over the the mod blacklist and whitelist. - tag_whitelist = [] - #Blacklist for tags whose blocks will be disabled. Takes priority over the block whitelist and the mod blacklist and whitelist. - tag_blacklist = [] - #Whitelist for blocks that will be enabled. Takes priority over the the mod and tag blacklist and whitelist. - block_whitelist = [] - #Blacklist for blocks that will be disabled. Takes priority over the block whitelist and the mod and tag blacklist and whitelist. - block_blacklist = [] + #Blocklist to control which blocks will use "rotated logic" of their original blocks. Mainly affects bounding boxes. + #See https://github.com/FirEmerald/AdditionalPlacements/wiki/Blocklist-Format for blocklist format + rotated_logic = ["+*"] #Regular pressure plates [server.types.additionalplacements.pressure_plate] - - #Options to control which blocks will use "rotated logic" of their original blocks. Mainly affects bounding boxes. - [server.types.additionalplacements.pressure_plate.rotated_logic] - #Default state for blocks not matching any list. True is enabled, false is disabled. - default = true - #Whitelist for mods whose blocks will be enabled. - mod_whitelist = [] - #Blacklist for mods whose blocks will be disabled. Takes priority over the mod whitelist. - mod_blacklist = [] - #Whitelist for tags whose blocks will be enabled. Takes priority over the the mod blacklist and whitelist. - tag_whitelist = [] - #Blacklist for tags whose blocks will be disabled. Takes priority over the block whitelist and the mod blacklist and whitelist. - tag_blacklist = [] - #Whitelist for blocks that will be enabled. Takes priority over the the mod and tag blacklist and whitelist. - block_whitelist = [] - #Blacklist for blocks that will be disabled. Takes priority over the block whitelist and the mod and tag blacklist and whitelist. - block_blacklist = [] + #Blocklist to control which blocks will use "rotated logic" of their original blocks. Mainly affects bounding boxes. + #See https://github.com/FirEmerald/AdditionalPlacements/wiki/Blocklist-Format for blocklist format + rotated_logic = ["+*"] #Weighted pressure plates [server.types.additionalplacements.weighted_pressure_plate] - - #Options to control which blocks will use "rotated logic" of their original blocks. Mainly affects bounding boxes. - [server.types.additionalplacements.weighted_pressure_plate.rotated_logic] - #Default state for blocks not matching any list. True is enabled, false is disabled. - default = true - #Whitelist for mods whose blocks will be enabled. - mod_whitelist = [] - #Blacklist for mods whose blocks will be disabled. Takes priority over the mod whitelist. - mod_blacklist = [] - #Whitelist for tags whose blocks will be enabled. Takes priority over the the mod blacklist and whitelist. - tag_whitelist = [] - #Blacklist for tags whose blocks will be disabled. Takes priority over the block whitelist and the mod blacklist and whitelist. - tag_blacklist = [] - #Whitelist for blocks that will be enabled. Takes priority over the the mod and tag blacklist and whitelist. - block_whitelist = [] - #Blacklist for blocks that will be disabled. Takes priority over the block whitelist and the mod and tag blacklist and whitelist. - block_blacklist = [] + #Blocklist to control which blocks will use "rotated logic" of their original blocks. Mainly affects bounding boxes. + #See https://github.com/FirEmerald/AdditionalPlacements/wiki/Blocklist-Format for blocklist format + rotated_logic = ["+*"] diff --git a/defaultconfigs/cerulean-server.toml b/defaultconfigs/cerulean-server.toml new file mode 100644 index 000000000..da90082e6 --- /dev/null +++ b/defaultconfigs/cerulean-server.toml @@ -0,0 +1,4 @@ +#. +#Example Boolean!!!!!! +example = true + diff --git a/defaultconfigs/ftbqoptimizer.snbt b/defaultconfigs/ftbqoptimizer.snbt new file mode 100644 index 000000000..b5327ff6a --- /dev/null +++ b/defaultconfigs/ftbqoptimizer.snbt @@ -0,0 +1,3 @@ +# Default config file that will be copied to instance's config/ftbqoptimizer.snbt location + +{ } diff --git a/pakku-lock.json b/pakku-lock.json index accc4eab1..9baf07791 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -1261,6 +1261,48 @@ } ] }, + { + "pakku_id": "xA6GfdWh9gq3ssA0", + "pakku_links": [ + "k6zIGpPrxPxbod8z" + ], + "type": "MOD", + "slug": { + "curseforge": "cerulean" + }, + "name": { + "curseforge": "Cerulean" + }, + "id": { + "curseforge": "1204890" + }, + "files": [ + { + "type": "curseforge", + "file_name": "cerulean-forge-1.0.0-1.20.1.jar", + "mc_versions": [ + "1.20.1", + "1.20" + ], + "loaders": [ + "forge" + ], + "release_type": "release", + "url": "https://edge.forgecdn.net/files/6489/710/cerulean-forge-1.0.0-1.20.1.jar", + "id": "6489710", + "parent_id": "1204890", + "hashes": { + "sha1": "57697d040d21348173b4c06cb8fcb8536746525b", + "md5": "6e75d09000fa3a6a81b12b8450c61cb2" + }, + "required_dependencies": [ + "1104882" + ], + "size": 524370, + "date_published": "2025-05-03T02:24:36.207Z" + } + ] + }, { "pakku_id": "wA5vGyxrH9IEtbiT", "type": "MOD", @@ -2406,10 +2448,52 @@ } ] }, + { + "pakku_id": "1aI12OSr5TFwL3Wo", + "pakku_links": [ + "k6zIGpPrxPxbod8z" + ], + "type": "MOD", + "slug": { + "curseforge": "despawn-tweaks" + }, + "name": { + "curseforge": "Despawn Tweaks" + }, + "id": { + "curseforge": "1191080" + }, + "files": [ + { + "type": "curseforge", + "file_name": "despawntweaks-forge-1.0.0-1.20.1.jar", + "mc_versions": [ + "1.20.1", + "1.20" + ], + "loaders": [ + "forge" + ], + "release_type": "release", + "url": "https://edge.forgecdn.net/files/6145/371/despawntweaks-forge-1.0.0-1.20.1.jar", + "id": "6145371", + "parent_id": "1191080", + "hashes": { + "sha1": "2a46154c5b58aa803aca4eb0a0e9682557e4422f", + "md5": "b59223abe43c841fab3c53102b5f677d" + }, + "required_dependencies": [ + "1104882" + ], + "size": 640699, + "date_published": "2025-02-01T09:40:55.137Z" + } + ] + }, { "pakku_id": "SG15bUHPcW2KqNGd", "type": "MOD", - "side": "CLIENT", + "side": "BOTH", "slug": { "curseforge": "detected-setblock-be-gone" }, @@ -3301,6 +3385,42 @@ } ] }, + { + "pakku_id": "oMcIAiCt9qNIFN4G", + "type": "MOD", + "slug": { + "curseforge": "ftb-quests-optimizer" + }, + "name": { + "curseforge": "FTB Quests Optimizer" + }, + "id": { + "curseforge": "912469" + }, + "files": [ + { + "type": "curseforge", + "file_name": "FTBQuestsOptimizer-forge-2.0.5-1.20.1.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "forge" + ], + "release_type": "release", + "url": "https://edge.forgecdn.net/files/6083/498/FTBQuestsOptimizer-forge-2.0.5-1.20.1.jar", + "id": "6083498", + "parent_id": "912469", + "hashes": { + "sha1": "18458645cbc3436142332eeab910e679f13a76b9", + "md5": "f6decadcb493728713782fe4d95bed8f" + }, + "required_dependencies": [], + "size": 14007, + "date_published": "2025-01-13T14:18:12.917Z" + } + ] + }, { "pakku_id": "f6XvOldUCm8jt51o", "pakku_links": [ @@ -3595,6 +3715,48 @@ } ] }, + { + "pakku_id": "UHbTbqy6h2Euzjqq", + "pakku_links": [ + "65w2fJEd83KAQpHz" + ], + "type": "MOD", + "slug": { + "curseforge": "fastsuite" + }, + "name": { + "curseforge": "FastSuite" + }, + "id": { + "curseforge": "475117" + }, + "files": [ + { + "type": "curseforge", + "file_name": "FastSuite-1.20.1-5.1.0.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "neoforge", + "forge" + ], + "release_type": "release", + "url": "https://edge.forgecdn.net/files/6318/54/FastSuite-1.20.1-5.1.0.jar", + "id": "6318054", + "parent_id": "475117", + "hashes": { + "sha1": "3a759dce0ddc91e299027faa800c0ee40ab90de8", + "md5": "5308931eb0df44e4f39c06a7696f42ce" + }, + "required_dependencies": [ + "283644" + ], + "size": 25305, + "date_published": "2025-03-18T05:27:07.867Z" + } + ] + }, { "pakku_id": "Wfcwfq7wQnUwhGve", "type": "MOD", @@ -3951,6 +4113,44 @@ } ] }, + { + "pakku_id": "cZDchVvr7YweLPXR", + "type": "MOD", + "slug": { + "curseforge": "fullstack-watchdog" + }, + "name": { + "curseforge": "FullStack Watchdog" + }, + "id": { + "curseforge": "849817" + }, + "files": [ + { + "type": "curseforge", + "file_name": "fullstackwatchdog-1.0.1+1.19.2-forge.jar", + "mc_versions": [ + "1.20.1", + "1.20" + ], + "loaders": [ + "neoforge", + "forge" + ], + "release_type": "release", + "url": "https://edge.forgecdn.net/files/4488/549/fullstackwatchdog-1.0.1+1.19.2-forge.jar", + "id": "4488549", + "parent_id": "849817", + "hashes": { + "sha1": "6f1e3a25c4a0258c2592fefb837f95a24eb3bfa0", + "md5": "9c117ca1df5923fd20941d6c1e4301a6" + }, + "required_dependencies": [], + "size": 14539, + "date_published": "2023-04-13T14:20:50.590Z" + } + ] + }, { "pakku_id": "lzhyE6qnNX8vJ50C", "type": "MOD", @@ -4201,21 +4401,21 @@ "files": [ { "type": "curseforge", - "file_name": "GregTech Revival 32x 1.19.2-1.20.1-1.21 ver 0.18.zip", + "file_name": "GregTech Revival 32x 1.19.2-1.20.1-1.21 ver 0.19.zip", "mc_versions": [ "1.20.1" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/6498/92/GregTech Revival 32x 1.19.2-1.20.1-1.21 ver 0.18.zip", - "id": "6498092", + "url": "https://edge.forgecdn.net/files/6546/954/GregTech Revival 32x 1.19.2-1.20.1-1.21 ver 0.19.zip", + "id": "6546954", "parent_id": "964322", "hashes": { - "sha1": "8042b552366952abccf06c17eb9d9d693c8397b4", - "md5": "0b4380cf6ad1a10af9cd70c35578c1c5" + "sha1": "b0e072c301f713e7e1c2cc21a75646e7d64051f6", + "md5": "d2a57f619ac14ffd8705596b56a6e599" }, "required_dependencies": [], - "size": 7977338, - "date_published": "2025-05-05T09:09:38.573Z" + "size": 8116393, + "date_published": "2025-05-19T12:40:51.413Z" } ] }, @@ -4344,66 +4544,28 @@ "files": [ { "type": "curseforge", - "file_name": "ILAORE's_TFC_32x_ver_0.15_1.20.1.zip", + "file_name": "ILAORE's_TFC_32x_ver_0.16_1.20.1.zip", "mc_versions": [ "1.20.1" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/6063/608/ILAORE's_TFC_32x_ver_0.15_1.20.1.zip", - "id": "6063608", + "url": "https://edge.forgecdn.net/files/6546/962/ILAORE's_TFC_32x_ver_0.16_1.20.1.zip", + "id": "6546962", "parent_id": "952112", "hashes": { - "sha1": "67f277d47406a7adc6b36a7429fed62c123bc347", - "md5": "794b3c80f1f59ee34d50c274a59f4a18" + "sha1": "52b2078da9933aead7b2ed180defa873998c07d1", + "md5": "2a599d6c64fa22fec49c7515519e8d00" }, "required_dependencies": [], - "size": 41173821, - "date_published": "2025-01-07T19:50:06.780Z" - } - ] - }, - { - "pakku_id": "Gf7UqnkHto1XGQZa", - "type": "MOD", - "slug": { - "curseforge": "icterine" - }, - "name": { - "curseforge": "Icterine" - }, - "id": { - "curseforge": "974774" - }, - "files": [ - { - "type": "curseforge", - "file_name": "Icterine-forge-1.20.0-1-1.3.0.jar", - "mc_versions": [ - "1.20.1", - "1.20", - "1.20-Snapshot" - ], - "loaders": [ - "neoforge", - "forge" - ], - "release_type": "release", - "url": "https://edge.forgecdn.net/files/5108/244/Icterine-forge-1.20.0-1-1.3.0.jar", - "id": "5108244", - "parent_id": "974774", - "hashes": { - "sha1": "55fde23d7602924ba4772d441fb5a78d562be238", - "md5": "d7442dfca7ccad12c119871e5f08ee81" - }, - "required_dependencies": [], - "size": 38848, - "date_published": "2024-02-14T19:57:38.397Z" + "size": 41182882, + "date_published": "2025-05-19T12:45:18.673Z" } ] }, { "pakku_id": "NVUIYx999yATkZmQ", "type": "MOD", + "side": "CLIENT", "slug": { "curseforge": "immediatelyfast" }, @@ -4477,6 +4639,42 @@ } ] }, + { + "pakku_id": "bf1bmcGv2DvmfjYs", + "type": "MOD", + "slug": { + "curseforge": "immersive-optimization" + }, + "name": { + "curseforge": "Immersive Optimization" + }, + "id": { + "curseforge": "1163206" + }, + "files": [ + { + "type": "curseforge", + "file_name": "immersive_optimization-forge-1.20.1-0.0.4.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "forge" + ], + "release_type": "release", + "url": "https://edge.forgecdn.net/files/6490/666/immersive_optimization-forge-1.20.1-0.0.4.jar", + "id": "6490666", + "parent_id": "1163206", + "hashes": { + "sha1": "3de7b2a3b58741e0790f4ba94fbd941c3608a06f", + "md5": "a48b58613083015908f96296c3e81f4b" + }, + "required_dependencies": [], + "size": 43276, + "date_published": "2025-05-03T11:05:27.870Z" + } + ] + }, { "pakku_id": "koOe6mK4eoXZNeOE", "type": "RESOURCE_PACK", @@ -4901,51 +5099,39 @@ ] }, { - "pakku_id": "ER1SSAElNjQ9ToDP", + "pakku_id": "oZ0Gttnl2q3cjZJI", "type": "MOD", "slug": { - "curseforge": "ksyxis" + "curseforge": "krypton-reforged" }, "name": { - "curseforge": "Ksyxis" + "curseforge": "Krypton Reforged" }, "id": { - "curseforge": "537533" + "curseforge": "549394" }, "files": [ { "type": "curseforge", - "file_name": "Ksyxis-1.3.3.jar", + "file_name": "KryptonReforged-0.2.3.jar", "mc_versions": [ - "1.20.2", - "1.20.5", - "1.20.2-Snapshot", - "1.20.5-Snapshot", - "1.20.3-Snapshot", - "1.20.3", "1.20.1", - "1.20", - "1.20.6", - "1.20.4", - "1.20-Snapshot" + "1.20" ], "loaders": [ - "fabric", - "neoforge", - "forge", - "quilt" + "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/6174/567/Ksyxis-1.3.3.jar", - "id": "6174567", - "parent_id": "537533", + "url": "https://edge.forgecdn.net/files/4606/534/KryptonReforged-0.2.3.jar", + "id": "4606534", + "parent_id": "549394", "hashes": { - "sha1": "988bf589b25a9c48c23bccec0326271cf2602c88", - "md5": "9c007fc4d85b75dc5ab910cd1f18f509" + "sha1": "92690482dad46a8c9cf28e4b6b26e49f4dc67095", + "md5": "5b6b46d86a9a3858c766182a4cb9c3f1" }, "required_dependencies": [], - "size": 28483, - "date_published": "2025-02-09T12:02:32.110Z" + "size": 206758, + "date_published": "2023-06-24T02:52:47.757Z" } ] }, @@ -6381,6 +6567,7 @@ "id": { "curseforge": "585406" }, + "export": false, "files": [ { "type": "curseforge", @@ -6521,6 +6708,48 @@ } ] }, + { + "pakku_id": "13vvLchOfWqOWYDp", + "pakku_links": [ + "k6zIGpPrxPxbod8z" + ], + "type": "MOD", + "slug": { + "curseforge": "redirected" + }, + "name": { + "curseforge": "Redirected" + }, + "id": { + "curseforge": "1191845" + }, + "files": [ + { + "type": "curseforge", + "file_name": "redirected-forge-1.0.0-1.20.1.jar", + "mc_versions": [ + "1.20.1", + "1.20" + ], + "loaders": [ + "forge" + ], + "release_type": "release", + "url": "https://edge.forgecdn.net/files/6148/844/redirected-forge-1.0.0-1.20.1.jar", + "id": "6148844", + "parent_id": "1191845", + "hashes": { + "sha1": "804cb20635bec6d708617fb22e6bd62bed27a7a7", + "md5": "bcbc01aea3042d92c03ac5b8e1453dce" + }, + "required_dependencies": [ + "1104882" + ], + "size": 416660, + "date_published": "2025-02-02T07:04:31.300Z" + } + ] + }, { "pakku_id": "QXBpbwRXpmbaHixl", "type": "MOD", @@ -6816,6 +7045,42 @@ } ] }, + { + "pakku_id": "tnG5bwpqSIEbERqX", + "type": "MOD", + "slug": { + "curseforge": "smooth-boot-reloaded" + }, + "name": { + "curseforge": "Smooth Boot (Reloaded)" + }, + "id": { + "curseforge": "633412" + }, + "files": [ + { + "type": "curseforge", + "file_name": "smoothboot(reloaded)-mc1.20.1-0.0.4.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "forge" + ], + "release_type": "release", + "url": "https://edge.forgecdn.net/files/5016/280/smoothboot(reloaded)-mc1.20.1-0.0.4.jar", + "id": "5016280", + "parent_id": "633412", + "hashes": { + "sha1": "3fd79132dba444bd109b5de4ad75dee06a48e130", + "md5": "c8cd5ae14d99796fd92c95a353e96211" + }, + "required_dependencies": [], + "size": 41044, + "date_published": "2024-01-08T01:30:52.480Z" + } + ] + }, { "pakku_id": "zUgGWEg2vl35sipH", "pakku_links": [ @@ -7491,49 +7756,6 @@ } ] }, - { - "pakku_id": "mZwfKcex878w6k9d", - "pakku_links": [ - "F6H99cZ4H6jZRpEK", - "fMkiGcRPRv1DdRC1" - ], - "type": "MOD", - "slug": { - "curseforge": "tfc-punishment-for-death" - }, - "name": { - "curseforge": "TFC Punishment for Death" - }, - "id": { - "curseforge": "1258250" - }, - "files": [ - { - "type": "curseforge", - "file_name": "TFC_punishment_for_death-1.20.1-1.0.0.14.jar", - "mc_versions": [ - "1.20.1" - ], - "loaders": [ - "neoforge", - "forge" - ], - "release_type": "beta", - "url": "https://edge.forgecdn.net/files/6520/14/TFC_punishment_for_death-1.20.1-1.0.0.14.jar", - "id": "6520014", - "parent_id": "1258250", - "hashes": { - "sha1": "6f9d58aba27208b4aeb33bc1d1b6f801f9dc6369", - "md5": "d99aad026d88904741f69582ada22f1e" - }, - "required_dependencies": [ - "302973" - ], - "size": 36474, - "date_published": "2025-05-11T16:48:31.577Z" - } - ] - }, { "pakku_id": "WbVOj6kmY9jCiHED", "type": "MOD", @@ -8031,6 +8253,43 @@ } ] }, + { + "pakku_id": "k6zIGpPrxPxbod8z", + "type": "MOD", + "slug": { + "curseforge": "txnilib" + }, + "name": { + "curseforge": "TxniLib" + }, + "id": { + "curseforge": "1104882" + }, + "files": [ + { + "type": "curseforge", + "file_name": "txnilib-forge-1.0.24-1.20.1.jar", + "mc_versions": [ + "1.20.1", + "1.20" + ], + "loaders": [ + "forge" + ], + "release_type": "release", + "url": "https://edge.forgecdn.net/files/6533/724/txnilib-forge-1.0.24-1.20.1.jar", + "id": "6533724", + "parent_id": "1104882", + "hashes": { + "sha1": "a1e16b7d61f0f16a162d429ee1eab9b4e3eeb9ef", + "md5": "31823d0999fda413af6dc226481e404a" + }, + "required_dependencies": [], + "size": 3743339, + "date_published": "2025-05-15T21:54:10.010Z" + } + ] + }, { "pakku_id": "pNlef6pOJARiH2WV", "type": "MOD", @@ -8070,6 +8329,7 @@ { "pakku_id": "dvvP2ZxrASA5e2dq", "type": "MOD", + "side": "CLIENT", "slug": { "curseforge": "unilib" }, @@ -8331,6 +8591,7 @@ { "pakku_id": "JbXSFRnjhIMDzF7c", "type": "MOD", + "side": "CLIENT", "slug": { "curseforge": "fix-gpu-memory-leak" }, @@ -8365,6 +8626,43 @@ "date_published": "2023-11-20T20:55:45.500Z" } ] + }, + { + "pakku_id": "3odYFxvo4asU0ho7", + "type": "MOD", + "slug": { + "curseforge": "spark" + }, + "name": { + "curseforge": "spark" + }, + "id": { + "curseforge": "361579" + }, + "files": [ + { + "type": "curseforge", + "file_name": "spark-1.10.53-forge.jar", + "mc_versions": [ + "1.20.1", + "1.20" + ], + "loaders": [ + "forge" + ], + "release_type": "release", + "url": "https://edge.forgecdn.net/files/4738/952/spark-1.10.53-forge.jar", + "id": "4738952", + "parent_id": "361579", + "hashes": { + "sha1": "231fb325368c0660954f47bfb03493f5246fa4d1", + "md5": "95dcd3b5400cc5eb5d0478a744e6ef98" + }, + "required_dependencies": [], + "size": 3114590, + "date_published": "2023-09-05T08:02:20.050Z" + } + ] } ], "lockfile_version": 1 diff --git a/pakku.json b/pakku.json index 33066bf48..88adb5085 100644 --- a/pakku.json +++ b/pakku.json @@ -1,6 +1,6 @@ { "name": "TerraFirmaGreg-Modern", - "version": "0.9.8", + "version": "0.9.9", "description": "An innovative modpack that contains GregTech and TerraFirmaCraft on 1.20.x.", "author": "Exception, Xikaro", "overrides": [ @@ -194,6 +194,15 @@ "rainboows": { "side": "CLIENT" }, + "fix-gpu-memory-leak": { + "side": "CLIENT" + }, + "immediatelyfast": { + "side": "CLIENT" + }, + "unilib": { + "side": "CLIENT" + }, "resourceful-config": { "side": "BOTH" }, @@ -232,6 +241,9 @@ }, "detected-setblock-be-gone": { "side": "BOTH" + }, + "probejs": { + "export": false } } } \ No newline at end of file