diff --git a/.gitignore b/.gitignore index 43a31fe38..ced8fa48b 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,8 @@ config/oculus.properties config/smoothboot.json config/fml.toml config/forge-client.toml +config/chiselsandbits-client.toml +config/chiselsandbits-common.toml # .minecraft crash-reports/* diff --git a/config/chiselsandbits-client.toml b/config/chiselsandbits-client.toml deleted file mode 100644 index ae44140a4..000000000 --- a/config/chiselsandbits-client.toml +++ /dev/null @@ -1,114 +0,0 @@ - -[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 = 3500 - #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 = 3500 - #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 ~ 32 - 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 deleted file mode 100644 index d611b473f..000000000 --- a/config/chiselsandbits-common.toml +++ /dev/null @@ -1,22 +0,0 @@ - -[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 ~ 32 - thread-count = 10 - diff --git a/config/jade/sort-order.json b/config/jade/sort-order.json index db48d9a24..e9522eb84 100644 --- a/config/jade/sort-order.json +++ b/config/jade/sort-order.json @@ -157,10 +157,6 @@ "create:exact_block": null, "create:filter": null, "create:goggles": null, - "gtceu:electric_container_provider": null, - "gtceu:workable_provider": null, - "gtceu:controllable_provider": null, - "gtceu:recipe_logic_provider": null, "tfc:barrel": null, "tfc:bellows": null, "tfc:sapling": null, @@ -210,6 +206,10 @@ "tfc:ocelot": null, "tfc:rabbit": null, "tfc:fishing_hook": null, + "gtceu:electric_container_provider": null, + "gtceu:workable_provider": null, + "gtceu:controllable_provider": null, + "gtceu:recipe_logic_provider": null, "minecraft:brewing_stand": null, "minecraft:beehive": null, "minecraft:command_block": null, diff --git a/config/smallships-client.toml b/config/smallships-client.toml deleted file mode 100644 index 5ace4a541..000000000 --- a/config/smallships-client.toml +++ /dev/null @@ -1,28 +0,0 @@ -# This holds the schematic version for internal purposes. DO NOT TOUCH! -schematicVersion = 1 - -# This category holds configs that define ship behaviour. -[Ship] - - #This category holds configs that define general ship behaviour. - [Ship.General] - - #General camera settings for ships. - [Ship.General.Camera] - #Automatically enable third person camera when entering a ship. - shipGeneralCameraAutoThirdPerson = true - - #Zoom camera settings for third person view in ships. - [Ship.General.Camera.Zoom] - #Generally enable the zooming feature. - shipGeneralCameraZoomEnable = true - #Set maximum distance of zoom (value must be smaller than or equal to 50.0). - shipGeneralCameraZoomMax = 20.0 - #Set minimum distance of zoom (value must be bigger than or equal to 1.0). - shipGeneralCameraZoomMin = 5.0 - -# This category holds configs that define general mod settings. -[General] - #Enable smallships creative tab in the creative inventory (only takes effect after restart). - smallshipsItemGroupEnable = false - diff --git a/config/smallships-common.toml b/config/smallships-common.toml deleted file mode 100644 index 5be303c46..000000000 --- a/config/smallships-common.toml +++ /dev/null @@ -1,88 +0,0 @@ -# This holds the schematic version for internal purposes. DO NOT TOUCH! -schematicVersion = 2 - -# This category holds configs that define ship behaviour. -[Ship] - - #This category holds configs that define general ship behaviour. - [Ship.General] - shipGeneralSailCooldown = 30 - shipGeneralCollisionDamage = 7.5 - shipGeneralDoItemDrop = true - - #General speed modifier for ships. - [Ship.General.Modifier] - #Maximum speed penalty for a filled container in percent. - shipGeneralContainerModifier = 10.0 - #Speed bonus for a paddle ship while paddling in percent. - shipGeneralPaddlingModifier = 35.0 - - #This category holds configs that define behaviour of fleeing water animals. - [Ship.General."Fleeing Water Animals"] - waterAnimalFleeRadius = 15.0 - waterAnimalFleeSpeed = 1.5 - waterAnimalFleeDistance = 10.0 - - [Ship.Cog] - - #Default attributes for the Cog. Speed in km/h, Health in default mc health points - [Ship.Cog.Attributes] - shipAttributeCogMaxHealth = 300.0 - shipAttributeCogMaxSpeed = 30.0 - shipAttributeCogMaxReverseSpeed = 0.1 - shipAttributeCogMaxRotationSpeed = 4.5 - shipAttributeCogAcceleration = 0.015 - shipAttributeCogRotationAcceleration = 0.7 - - #Default configs for the container of the Cog. - [Ship.Cog.Container] - #Set container size for the Cog (value must be divisible by 9 and bigger than 0). - shipContainerCogContainerSize = 108 - - #Cog specific speed modifier. - [Ship.Cog.Modifier] - #-1 = none, 0 = cold, 1 = neutral or 2 = warm Biomes - shipModifierCogBiome = 0 - - [Ship.Brigg] - - #Default attributes for the Brigg. Speed in km/h, Health in default mc health points - [Ship.Brigg.Attributes] - shipAttributeBriggMaxHealth = 450.0 - shipAttributeBriggMaxSpeed = 35.0 - shipAttributeBriggMaxReverseSpeed = 0.1 - shipAttributeBriggMaxRotationSpeed = 4.0 - shipAttributeBriggAcceleration = 0.015 - shipAttributeBriggRotationAcceleration = 0.55 - - #Default configs for the container of the Brigg. - [Ship.Brigg.Container] - #Set container size for the Brigg (value must be divisible by 9 and bigger than 0). - shipContainerBriggContainerSize = 162 - - #Brigg specific speed modifier. - [Ship.Brigg.Modifier] - #-1 = none, 0 = cold, 1 = neutral or 2 = warm Biomes - shipModifierBriggBiome = 0 - - [Ship.Galley] - - #Default attributes for the Galley. Speed in km/h, Health in default mc health points - [Ship.Galley.Attributes] - shipAttributeGalleyMaxHealth = 200.0 - shipAttributeGalleyMaxSpeed = 30.0 - shipAttributeGalleyMaxReverseSpeed = 0.1 - shipAttributeGalleyMaxRotationSpeed = 5.0 - shipAttributeGalleyAcceleration = 0.015 - shipAttributeGalleyRotationAcceleration = 1.0 - - #Default configs for the container of the Galley. - [Ship.Galley.Container] - #Set container size for the Galley (value must be divisible by 9 and bigger than 0). - shipContainerGalleyContainerSize = 54 - - #Galley specific speed modifier. - [Ship.Galley.Modifier] - #-1 = none, 0 = cold, 1 = neutral or 2 = warm Biomes - shipModifierGalleyBiome = 2 -