diff --git a/chiselsandbits/clipboard.dat b/chiselsandbits/clipboard.dat new file mode 100644 index 000000000..b307f6158 Binary files /dev/null and b/chiselsandbits/clipboard.dat differ diff --git a/config/additionalplacements-common.toml b/config/additionalplacements-common.toml new file mode 100644 index 000000000..b8f432bcf --- /dev/null +++ b/config/additionalplacements-common.toml @@ -0,0 +1,41 @@ + +#Common settings +[common] + #Automatically generate vertical slabs + automatic_slabs = true + #Automatically generate vertical stairs + automatic_stairs = true + #Automatically generate wall and ceiling carpets + automatic_carpets = true + #Automatically generate wall and ceiling pressure plates + automatic_pressure_plates = true + #Automatically generate wall and ceiling weighted pressure plates + automatic_weighted_pressure_plates = true + #Disable automatic vertical slab placement. Use if a mod E.G. DoubleSlabs is conflicting. + disable_slab_placement = false + #Disable automatic vertical stair placement. Use if a mod is conflicting. + disable_stair_placement = false + #Disable automatic wall and ceiling carpet placement. Use if a mod is conflicting. + disable_carpet_placement = false + #Disable automatic wall and ceiling pressure plate placement. Use if a mod is conflicting. + disable_pressure_plate_placement = false + #Disable automatic wall and ceiling weighted pressure plate placement. Use if a mod is conflicting. + disable_weighted_pressure_plate_placement = false + #Show tooltip when a block has additional placements + tooltip = true + #Check for and notify of mismatching tags. Only works when the same option in the server/world config is true. + check_tags = true + #Automatically rebuild and reload the generated tags datapack when a tagging mismatch is detected. Only works when the same option in the server/world config is true. + auto_rebuild_tags = true + #Log missing or additional tags on generated blocks. + log_tag_mismatch = false + #The thread priority of the mismatched tag checker. 1 is lowest, 10 is highest, 5 is normal. + #Range: 1 ~ 10 + checker_priority = 1 + #Blacklist for blocks to not have generated placement variants + blacklist = [] + #Blacklist for mods to not have generated placement variants + mod_blacklist = [] + #Whitelist for blocks from blacklisted mods to still have generated placement variants + mod_block_whitelist = [] + diff --git a/config/chiselsandbits-client.toml b/config/chiselsandbits-client.toml new file mode 100644 index 000000000..b98948dee --- /dev/null +++ b/config/chiselsandbits-client.toml @@ -0,0 +1,114 @@ + +[settings] + #mod.scena.config.settings.invert-pick-block-behaviour.comment + invert-pick-block-behaviour = false + + [settings.bit-bag] + #mod.scena.config.settings.bit-bag.invert-durability-bar-indication.comment + invert-durability-bar-indication = false + + [settings.placement] + + [settings.placement.render-mode] + #mod.scena.config.settings.placement.render-mode.success.comment + #Allowed Values: GHOST_BLOCK_MODEL, GHOST_BLOCK_MODEL_SOLID_COLOR, WIREFRAME + success = "GHOST_BLOCK_MODEL" + #mod.scena.config.settings.placement.render-mode.failed.comment + #Allowed Values: GHOST_BLOCK_MODEL, GHOST_BLOCK_MODEL_SOLID_COLOR, WIREFRAME + failed = "GHOST_BLOCK_MODEL_SOLID_COLOR" + + [settings.placement.color] + #mod.scena.config.settings.placement.color.success.comment + success = [0.1882352977991104, 0.47058823704719543, 0.7882353067398071, 0.7058823704719543] + #mod.scena.config.settings.placement.color.not-fitting.comment + not-fitting = [0.7176470756530762, 0.2549019753932953, 0.054901961237192154, 0.7058823704719543] + #mod.scena.config.settings.placement.color.missing-bits-or-space.comment + missing-bits-or-space = [1.0, 0.8588235378265381, 0.3450980484485626, 0.7058823704719543] + + [settings.chiseling-previews] + #mod.scena.config.settings.chiseling-previews.renderer.comment + renderer = "chiselsandbits:default" + + [settings.chiseling-previews.default] + + [settings.chiseling-previews.default.colors] + #mod.scena.config.settings.chiseling-previews.default.colors.chiseling.comment + chiseling = [0.8500000238418579, 0.0, 0.0, 0.6499999761581421] + #mod.scena.config.settings.chiseling-previews.default.colors.placement.comment + placement = [0.0, 0.8500000238418579, 0.0, 0.6499999761581421] + + [settings.chiseling-previews.debug] + #mod.scena.config.settings.chiseling-previews.debug.enabled.comment + enabled = false + + [settings.chiseling-previews.debug.mutator] + + [settings.chiseling-previews.debug.mutator.colors] + #mod.scena.config.settings.chiseling-previews.debug.mutator.colors.chiseling.comment + chiseling = [0.0, 0.0, 0.8500000238418579, 0.6499999761581421] + #mod.scena.config.settings.chiseling-previews.debug.mutator.colors.placement.comment + placement = [0.8500000238418579, 0.8500000238418579, 0.0, 0.6499999761581421] + + [settings.selected-tool-mode-icons] + #mod.scena.config.settings.selected-tool-mode-icons.renderer.comment + renderer = "chiselsandbits:group" + + [settings.clipboard] + #mod.scena.config.settings.clipboard.size.comment + #Range: 0 ~ 64 + size = 64 + #mod.scena.config.settings.clipboard.add-broken-blocks.comment + add-broken-blocks = true + #mod.scena.config.settings.clipboard.add-picked-blocks.comment + add-picked-blocks = true + + [settings.patterns] + #mod.scena.config.settings.patterns.export-path.comment + export-path = "./chiselsandbits/patterns" + + [settings.warnings] + #mod.scena.config.settings.warnings.show-cool-down-error.comment + show-cool-down-error = false + + [settings.interactions] + #mod.scena.config.settings.interactions.scrolling-changes-mode.comment + scrolling-changes-mode = true + +[performance] + + [performance.caches] + + [performance.caches.sizes] + #mod.scena.config.performance.caches.sizes.bit-storage-content-models.comment + #Range: 0 ~ 9223372036854775807 + bit-storage-content-models = 100 + #mod.scena.config.performance.caches.sizes.block-models.comment + #Range: 3500 ~ 20000 + block-models = 1000 + #mod.scena.config.performance.caches.sizes.block-faces.comment + #Range: 350000 ~ 2000000 + block-faces = 1000000 + #mod.scena.config.performance.caches.sizes.cull-testing.comment + #Range: 3500 ~ 200000 + cull-testing = 1000 + #mod.scena.config.performance.caches.sizes.stack-models.comment + #Range: 0 ~ 9223372036854775807 + stack-models = 100 + + [performance.lighting] + #mod.scena.config.performance.lighting.extract-lighting-values-from-faces.comment + extract-lighting-values-from-faces = true + #mod.scena.config.performance.lighting.extract-lighting-values-from-blockstates.comment + extract-lighting-values-from-blockstates = false + + [performance.model-building] + #mod.scena.config.performance.model-building.thread-count.comment + #Range: 1 ~ 20 + thread-count = 10 + +[gui] + + [gui.radial-menu] + #mod.scena.config.gui.radial-menu.display-mouse-indicator.comment + display-mouse-indicator = false + diff --git a/config/chiselsandbits-common.toml b/config/chiselsandbits-common.toml new file mode 100644 index 000000000..296682013 --- /dev/null +++ b/config/chiselsandbits-common.toml @@ -0,0 +1,22 @@ + +[help] + #mod.scena.config.help.enabled-in-tooltips.comment + enabled-in-tooltips = true + +[performance] + + [performance.caches] + + [performance.caches.sizes] + #mod.scena.config.performance.caches.sizes.collision-boxes.comment + #Range: 0 ~ 9223372036854775807 + collision-boxes = 10000 + #mod.scena.config.performance.caches.sizes.class-metadata.comment + #Range: 0 ~ 9223372036854775807 + class-metadata = 10000 + + [performance.saving] + #mod.scena.config.performance.saving.thread-count.comment + #Range: 1 ~ 20 + thread-count = 10 + diff --git a/config/chiselsandbits.launchproperties b/config/chiselsandbits.launchproperties new file mode 100644 index 000000000..94aba8700 --- /dev/null +++ b/config/chiselsandbits.launchproperties @@ -0,0 +1 @@ +plugins.experimental=false diff --git a/config/enhancedvisuals-client.json b/config/enhancedvisuals-client.json new file mode 100644 index 000000000..02178b3b8 --- /dev/null +++ b/config/enhancedvisuals-client.json @@ -0,0 +1,368 @@ +{ + "general": { + "doEffectsInCreative": false, + "waterSubstractFactor": 10, + "enableDamageDebug": false + }, + "handlers": { + "explosion": { + "enabled": true, + "opacity": 1.0, + "dust": { + "disabled": false, + "opacity": 1.0, + "animationSpeed": 0, + "scale": { + "min": 0.2, + "max": 1 + } + }, + "dustDuration": { + "min": 500, + "max": 1000 + }, + "dustAmount": { + "min": 0, + "minValue": 0, + "max": 20, + "maxValue": 30 + }, + "maxExplosionVolume": 0.5, + "explosionSoundTime": { + "min": 0, + "minValue": 50, + "max": 20, + "maxValue": 200 + }, + "blur": { + "disabled": false, + "opacity": 1.0 + }, + "maxBlur": { + "min": 0, + "minValue": 50, + "max": 10, + "maxValue": 100 + }, + "explosionBlurTime": { + "min": 0, + "minValue": 10, + "max": 20, + "maxValue": 20 + } + }, + "potion": { + "enabled": true, + "opacity": 1.0, + "duration": { + "min": 30, + "max": 60 + }, + "potion": { + "disabled": false, + "opacity": 1.0, + "animationSpeed": 0 + } + }, + "sand": { + "enabled": true, + "opacity": 1.0, + "duration": { + "min": 100, + "max": 100 + }, + "sprintModifier": 1.5, + "sand": { + "disabled": false, + "opacity": 1.0, + "animationSpeed": 0, + "scale": { + "min": 0.1, + "max": 0.5 + } + } + }, + "splash": { + "enabled": true, + "opacity": 1.0, + "duration": { + "min": 10, + "max": 10 + }, + "intensity": { + "min": 5, + "max": 10 + }, + "blur": { + "disabled": false, + "opacity": 1.0 + } + }, + "damage": { + "enabled": true, + "opacity": 1.0, + "damaged": { + "disabled": false, + "opacity": 1.0, + "animationSpeed": 0 + }, + "hitEffectIntensity": 0.0, + "hitDuration": { + "min": 1, + "max": 10 + }, + "splatter": { + "disabled": false, + "opacity": 1.0, + "animationSpeed": 0, + "scale": { + "min": 0.2, + "max": 1 + } + }, + "impact": { + "disabled": false, + "opacity": 1.0, + "animationSpeed": 0, + "scale": { + "min": 0.2, + "max": 1 + } + }, + "slash": { + "disabled": false, + "opacity": 1.0, + "animationSpeed": 0, + "scale": { + "min": 0.2, + "max": 1 + } + }, + "pierce": { + "disabled": false, + "opacity": 1.0, + "animationSpeed": 0, + "scale": { + "min": 0.2, + "max": 1 + } + }, + "bloodDuration": { + "min": 500, + "max": 1500 + }, + "fire": { + "disabled": false, + "opacity": 1.0, + "animationSpeed": 0, + "scale": { + "min": 0.2, + "max": 1 + } + }, + "fireSplashes": 1, + "fireDuration": { + "min": 100, + "max": 1000 + }, + "drownSplashes": 4, + "drownDuration": { + "min": 10, + "max": 15 + }, + "waterDrown": { + "disabled": false, + "opacity": 1.0, + "animationSpeed": 0, + "scale": { + "min": 0.2, + "max": 1 + }, + "red": 0, + "green": 0, + "blue": 255, + "alpha": 255 + }, + "lightningSplashes": 10, + "lightningDuration": { + "min": 10, + "max": 15 + }, + "lightning": { + "disabled": false, + "opacity": 1.0, + "animationSpeed": 0, + "scale": { + "min": 0.2, + "max": 1 + }, + "red": 120, + "green": 120, + "blue": 255, + "alpha": 255 + }, + "freezeSplashes": 4, + "freezeDuration": { + "min": 10, + "max": 15 + }, + "freeze": { + "disabled": false, + "opacity": 1.0, + "animationSpeed": 0, + "scale": { + "min": 0.2, + "max": 1 + }, + "red": 200, + "green": 255, + "blue": 255, + "alpha": 255 + }, + "flyIntoWallSplashes": 4, + "flyIntoWallDuration": { + "min": 10, + "max": 15 + }, + "flyIntoWall": { + "disabled": false, + "opacity": 1.0, + "animationSpeed": 0, + "scale": { + "min": 0.2, + "max": 1 + }, + "red": 255, + "green": 255, + "blue": 255, + "alpha": 255 + }, + "heatSplashes": 4, + "heatDuration": { + "min": 10, + "max": 15 + }, + "heat": { + "disabled": false, + "opacity": 1.0, + "animationSpeed": 0, + "scale": { + "min": 0.2, + "max": 1 + }, + "red": 255, + "green": 255, + "blue": 255, + "alpha": 255 + }, + "effectSplashes": 4, + "effectDuration": { + "min": 10, + "max": 15 + }, + "parasites": { + "disabled": false, + "opacity": 1.0, + "animationSpeed": 0, + "scale": { + "min": 0.2, + "max": 1 + }, + "red": 0, + "green": 126, + "blue": 0, + "alpha": 255 + }, + "wither": { + "disabled": false, + "opacity": 1.0, + "animationSpeed": 0, + "scale": { + "min": 1.5, + "max": 2.5 + }, + "red": 0, + "green": 0, + "blue": 0, + "alpha": 255 + }, + "tunnelDuration": { + "min": 10, + "max": 15 + }, + "tunnel": { + "disabled": false, + "opacity": 1.0, + "animationSpeed": 0 + }, + "healthScaler": { + "min": 0, + "minValue": 3, + "max": 12, + "maxValue": 1.5 + }, + "damageScale": 1.0, + "damageBlackList": [] + }, + "slender": { + "enabled": true, + "opacity": 1.0, + "defaultIntensity": 0, + "maxIntensity": 0.3, + "distanceFactor": 0.25, + "slender": { + "disabled": false, + "opacity": 1.0, + "animationSpeed": 50 + } + }, + "saturation": { + "enabled": true, + "opacity": 1.0, + "fadeFactor": 0.0005, + "saturation": { + "min": 2, + "minValue": 0, + "max": 8, + "maxValue": 1 + }, + "desaturate": { + "disabled": false, + "opacity": 1.0 + } + }, + "heartbeat": { + "enabled": true, + "opacity": 1.0, + "useHealthPercentage": false, + "maxHealth": 6, + "maxHealthPercentage": 0.15, + "heartbeatOverlayIntensity": 0.5, + "heartbeatOverlayDuration": 20, + "heartbeatBlurIntensity": 50.0, + "heartbeatBlurDuration": 5, + "minHeartbeatLength": 15, + "heartbeatTimeFactor": 100.0, + "heartbeatVolume": 1.0, + "lowhealth": { + "disabled": false, + "opacity": 1.0, + "animationSpeed": 0 + }, + "blur": { + "disabled": false, + "opacity": 1.0 + } + }, + "underwater": { + "enabled": false, + "opacity": 1.0, + "intensity": 5, + "fadeFactor": 0.5, + "blur": { + "disabled": false, + "opacity": 1.0 + } + } + } +} \ No newline at end of file diff --git a/config/enhancedvisuals.json b/config/enhancedvisuals.json new file mode 100644 index 000000000..83fdff9ab --- /dev/null +++ b/config/enhancedvisuals.json @@ -0,0 +1,16 @@ +{ + "messages": { + "deathMessages": [ + "Do you really want to respawn? think of it again.", + "Life is hard. Deal with it!", + "You are dead ... wait you already know that.", + "Did I let the stove on...?", + "Should have shot back first...", + "Yep, that\u0027s messed up...", + "Rage incomming!", + "I think you dropped something.", + "Time for a break?" + ], + "enabled": true + } +} \ No newline at end of file diff --git a/config/playerrevive-client.json b/config/playerrevive-client.json new file mode 100644 index 000000000..69906fed5 --- /dev/null +++ b/config/playerrevive-client.json @@ -0,0 +1,8 @@ +{ + "disableMusic": true, + "bleedingMusicVolume": 1.0, + "countdownMusicVolume": 1.0, + "bleeding": { + "giveUpSeconds": 5 + } +} \ No newline at end of file diff --git a/config/playerrevive.json b/config/playerrevive.json new file mode 100644 index 000000000..4e60a3936 --- /dev/null +++ b/config/playerrevive.json @@ -0,0 +1,66 @@ +{ + "banPlayerAfterDeath": false, + "bleeding": { + "bleedTime": 1200, + "triggerForCreative": true, + "bleedingMessage": true, + "bleedingMessageTrackingOnly": true, + "shouldGlow": false, + "bleedingEffects": [ + { + "effect": "minecraft:slowness", + "amplifier": 2, + "duration": 10 + } + ], + "affectHunger": true, + "remainingHunger": 6, + "initialDamageCooldown": 10, + "bleedingHealth": 10, + "disableMobDamage": true, + "disablePlayerDamage": false, + "disableOtherDamage": false, + "hasShaderEffect": true, + "changePermissionLevel": false, + "permissionLevel": 0 + }, + "revive": { + "requiredReviveProgress": 100.0, + "progressPerPlayer": 1.0, + "exhaustion": 0.5, + "haltBleedTime": true, + "abortOnDamage": false, + "resetProgress": false, + "revivedEffects": [ + { + "effect": "minecraft:slowness", + "amplifier": 2, + "duration": 1 + } + ], + "reviveItem": "{id:\"item\",item:\"minecraft:paper\"}", + "needReviveItem": false, + "consumeReviveItem": false, + "maxDistance": 3, + "healthAfter": 2 + }, + "sounds": { + "death": { + "sound": "playerrevive:death", + "volume": 1.0, + "pitch": 1.0 + }, + "revived": { + "sound": "playerrevive:revived", + "volume": 1.0, + "pitch": 1.0 + } + }, + "bypassDamageSources": [ + "gorgon", + "death.attack.sgcraft:transient", + "death.attack.sgcraft:iris", + "vampirism_dbno" + ], + "bleedInSingleplayer": false +} \ No newline at end of file diff --git a/kubejs/client_scripts/mods/minecraft.js b/kubejs/client_scripts/mods/minecraft.js index 7b54d5ec2..deba6d1b0 100644 --- a/kubejs/client_scripts/mods/minecraft.js +++ b/kubejs/client_scripts/mods/minecraft.js @@ -10,6 +10,7 @@ const registerMinecraftCategories = (event) => { event.remove('minecraft:plugins/campfire') event.remove('minecraft:plugins/blasting') event.remove('minecraft:plugins/smoking') + event.remove('minecraft:plugins/brewing') event.remove('minecraft:plugins/composting') // TODO: Сделать с вариантами TFC event.remove('minecraft:plugins/stripping') // TODO: Сделать с вариантами TFC event.remove('minecraft:plugins/pathing') // TODO: Сделать с вариантами TFC diff --git a/kubejs/server_scripts/minecraft/recipes.js b/kubejs/server_scripts/minecraft/recipes.js index 0fd7679d6..135a9f038 100644 --- a/kubejs/server_scripts/minecraft/recipes.js +++ b/kubejs/server_scripts/minecraft/recipes.js @@ -2567,6 +2567,12 @@ const registerMinecraftRecipes = (event) => { //#endregion + //#region Выход: Варочная стойка + + event.remove({ id: 'minecraft:brewing_stand' }) + + //#endregion + //#region Исправление дерьма с медью (Однажды разраб GTCEu вспомнит, лучше бы забыл) event.smelting('tfc:metal/ingot/copper', 'minecraft:raw_copper') diff --git a/kubejs/startup_scripts/minecraft/constants.js b/kubejs/startup_scripts/minecraft/constants.js index cd261de3d..eff6bf267 100644 --- a/kubejs/startup_scripts/minecraft/constants.js +++ b/kubejs/startup_scripts/minecraft/constants.js @@ -595,8 +595,8 @@ global.MINECRAFT_DISABLED_ITEMS = [ 'minecraft:crafting_table', 'minecraft:chest', 'minecraft:trapped_chest', - 'minecraft:scute', 'minecraft:fishing_rod', + 'minecraft:brewing_stand', 'minecraft:warped_fungus_on_a_stick', 'minecraft:carrot_on_a_stick', 'minecraft:carrot', diff --git a/mods b/mods index 733826a76..09930c03e 160000 --- a/mods +++ b/mods @@ -1 +1 @@ -Subproject commit 733826a76f112d3bd7c5245e46cc8bda6f50127b +Subproject commit 09930c03e3d5161175eb33a6d7b6e74f1b434234