From 0b1229cbf7863096a3928b818504848c902fa237 Mon Sep 17 00:00:00 2001 From: ZareMate <0.zaremate@gmail.com> Date: Thu, 9 Jan 2025 12:08:38 +0100 Subject: [PATCH 1/2] Add new configuration files for Create and Dragonlib features --- config/create_connected-common.toml | 63 ++++++++++++++++++++++ config/createrailwaysnavigator-common.toml | 43 +++++++++++++++ config/dragonlib-common-1.toml.bak | 18 +++++++ config/dragonlib-common-2.toml.bak | 18 +++++++ config/dragonlib-common-3.toml.bak | 18 +++++++ config/dragonlib-common.toml | 18 +++++++ config/libraryferret_1.properties | 2 +- config/merequester-common.toml | 11 ++++ 8 files changed, 190 insertions(+), 1 deletion(-) create mode 100644 config/create_connected-common.toml create mode 100644 config/createrailwaysnavigator-common.toml create mode 100644 config/dragonlib-common-1.toml.bak create mode 100644 config/dragonlib-common-2.toml.bak create mode 100644 config/dragonlib-common-3.toml.bak create mode 100644 config/dragonlib-common.toml create mode 100644 config/merequester-common.toml diff --git a/config/create_connected-common.toml b/config/create_connected-common.toml new file mode 100644 index 0000000..4bc26b7 --- /dev/null +++ b/config/create_connected-common.toml @@ -0,0 +1,63 @@ +#. +#Migrate copycats to Create: Copycats+ when they receive a block update +migrateCopycatsOnBlockUpdate = true +#. +#Migrate copycats to Create: Copycats+ when their block entities are initialized +migrateCopycatsOnInitialize = true + +#. +#Enable/disable features. Values on server override clients +[features] + #. + fluid_vessel = true + bamboo_window = true + item_silo = true + inverted_clutch = true + empty_fan_catalyst = true + parallel_gearbox = true + inventory_access_port = true + cherry_window = true + centrifugal_clutch = true + copycat_slab = true + overstress_clutch = true + brake = true + copycat_block = true + copycat_fence_gate = true + copycat_stairs = true + large_crank_wheel = true + brass_gearbox = true + copycat_vertical_step = true + copycat_wall = true + six_way_gearbox = true + crank_wheel = true + encased_chain_cogwheel = true + sequenced_pulse_generator = true + freewheel_clutch = true + shear_pin = true + inverted_gearshift = true + linked_transmitter = true + copycat_beam = true + copycat_board = true + inventory_bridge = true + copycat_fence = true + +#. +#Enable/disable categories of features. Disabling a category hides all related features. Values on server override clients +[feature_categories] + #. + #. + #All kinetic components, such as gearboxes and crank wheels + kinetic = true + #. + #All redstone components, such as linked transmitter and sequenced pulse generator + redstone = true + #. + #All components related to item and fluid transport + logistics = true + #. + #All copycats (Install Create: Copycats+ to upgrade) + copycats = true + #. + #All building palette blocks + palette = true + diff --git a/config/createrailwaysnavigator-common.toml b/config/createrailwaysnavigator-common.toml new file mode 100644 index 0000000..0bbe9de --- /dev/null +++ b/config/createrailwaysnavigator-common.toml @@ -0,0 +1,43 @@ + +[createrailwaysnavigator_common_config] + + [createrailwaysnavigator_common_config.permissions] + #Minimum permission level required to edit the global navigator settings. 0 allows everyone to edit these settings. (Default: 0) + #Range: 0 ~ 4 + global_settings_permission_level = 0 + + [createrailwaysnavigator_common_config.navigation] + #If activated, used trains are excluded from the route search for all following route parts. This prevents the same train from being suggested multiple times in the same route and forces the navigator to use other trains instead. Normally, however, there are no problems, so this option can be left off if in doubt. (Default: OFF) + exclude_trains = false + #How much transfers should be avoided. Higher values try to use fewer transfers, even if this increases the travel time. (Default: 5000) + #Range: > 1000 + transfer_cost = 10000 + + [createrailwaysnavigator_common_config.train_data_calculation] + #When activated, CRN calculates the transit times of the trains and does not use the calculations from Create. CRN is much more accurate, while Create calculates an average. (Default: ON) + custom_transit_time_calculation = true + #When activated, CRN uses the transit times provided by Create (if available) when initializing. When turned off, the initialization may take longer. (Default: ON) + use_create_transit_times_on_init = true + #[in Cycles] + #How often the calculated time for a route section between two stations must deviate from the current reference value before the reference value is updated. (Default: 3) + #Range: 1 ~ 16 + total_duration_deviation_buffer_size = 3 + #[in Ticks] + #Deviations of the calculated time for a route section between two stations from the reference value that are smaller than the threshold value are not taken into account. (Default: 50) + #Range: 0 ~ 1000 + total_duration_deviation_threshold = 50 + #[in Ticks] + #How many ticks the real-time can deviate from the scheduled time before the train is considered delayed. (Default: 500) + #Range: 100 ~ 24000 + schedule_deviation_threshold = 500 + #[In Cycles] + #(ONLY WORKS FOR TRAINS WITH DYNAMIC DELAYS! Trains without dynamic delays do this every new schedule section by default.) + # + #Every X cycles the scheduled times are updated to the current real-time data. (Default: 2; Disabled: 0) + #Range: > 0 + auto_reset_timings = 2 + + [createrailwaysnavigator_common_config.debug] + #Prints more details to the console to better observe the behavior of CRN. Only relevant for debugging. + advanced_logging = false + diff --git a/config/dragonlib-common-1.toml.bak b/config/dragonlib-common-1.toml.bak new file mode 100644 index 0000000..95ad5ea --- /dev/null +++ b/config/dragonlib-common-1.toml.bak @@ -0,0 +1,18 @@ + +[dragonlib_common_config] + + [dragonlib_common_config.time] + #The number of ticks for one Minecraft day. If in doubt, leave it unchanged! (Default: 24000) + #Range: > 0 + ticks_per_day = 24000 + #The scale of the tick length. 1 means that a tick has normal duration (0.05 seconds). 20 would therefore result in a length of 1 second per tick. If in doubt, leave it unchanged! (Default: 1) + #Range: 0.0 ~ 1.7976931348623157E308 + time_multiplier = 1.0 + #The number of ticks by which the time of day is shifted to match the real daytime. By default, 0 ticks is 6 AM, but 0 ticks should represent 12 AM (midnight). If in doubt, leave it unchanged! (Default: 6000) + #Range: > 0 + daytime_shift = 6000 + + [dragonlib_common_config.caching] + #Specifies how aggressively data should be cached. The lower the value, the less data will be cached, which can reduce RAM usage. However, depending on the situation, less caching can lead to increased CPU usage and cause lag. Only works with mods that actively use the feature! If in doubt, leave unchanged. (Default: NORMAL, OFF = only the most important data will be cached) + mode = "NORMAL" + diff --git a/config/dragonlib-common-2.toml.bak b/config/dragonlib-common-2.toml.bak new file mode 100644 index 0000000..95ad5ea --- /dev/null +++ b/config/dragonlib-common-2.toml.bak @@ -0,0 +1,18 @@ + +[dragonlib_common_config] + + [dragonlib_common_config.time] + #The number of ticks for one Minecraft day. If in doubt, leave it unchanged! (Default: 24000) + #Range: > 0 + ticks_per_day = 24000 + #The scale of the tick length. 1 means that a tick has normal duration (0.05 seconds). 20 would therefore result in a length of 1 second per tick. If in doubt, leave it unchanged! (Default: 1) + #Range: 0.0 ~ 1.7976931348623157E308 + time_multiplier = 1.0 + #The number of ticks by which the time of day is shifted to match the real daytime. By default, 0 ticks is 6 AM, but 0 ticks should represent 12 AM (midnight). If in doubt, leave it unchanged! (Default: 6000) + #Range: > 0 + daytime_shift = 6000 + + [dragonlib_common_config.caching] + #Specifies how aggressively data should be cached. The lower the value, the less data will be cached, which can reduce RAM usage. However, depending on the situation, less caching can lead to increased CPU usage and cause lag. Only works with mods that actively use the feature! If in doubt, leave unchanged. (Default: NORMAL, OFF = only the most important data will be cached) + mode = "NORMAL" + diff --git a/config/dragonlib-common-3.toml.bak b/config/dragonlib-common-3.toml.bak new file mode 100644 index 0000000..95ad5ea --- /dev/null +++ b/config/dragonlib-common-3.toml.bak @@ -0,0 +1,18 @@ + +[dragonlib_common_config] + + [dragonlib_common_config.time] + #The number of ticks for one Minecraft day. If in doubt, leave it unchanged! (Default: 24000) + #Range: > 0 + ticks_per_day = 24000 + #The scale of the tick length. 1 means that a tick has normal duration (0.05 seconds). 20 would therefore result in a length of 1 second per tick. If in doubt, leave it unchanged! (Default: 1) + #Range: 0.0 ~ 1.7976931348623157E308 + time_multiplier = 1.0 + #The number of ticks by which the time of day is shifted to match the real daytime. By default, 0 ticks is 6 AM, but 0 ticks should represent 12 AM (midnight). If in doubt, leave it unchanged! (Default: 6000) + #Range: > 0 + daytime_shift = 6000 + + [dragonlib_common_config.caching] + #Specifies how aggressively data should be cached. The lower the value, the less data will be cached, which can reduce RAM usage. However, depending on the situation, less caching can lead to increased CPU usage and cause lag. Only works with mods that actively use the feature! If in doubt, leave unchanged. (Default: NORMAL, OFF = only the most important data will be cached) + mode = "NORMAL" + diff --git a/config/dragonlib-common.toml b/config/dragonlib-common.toml new file mode 100644 index 0000000..95ad5ea --- /dev/null +++ b/config/dragonlib-common.toml @@ -0,0 +1,18 @@ + +[dragonlib_common_config] + + [dragonlib_common_config.time] + #The number of ticks for one Minecraft day. If in doubt, leave it unchanged! (Default: 24000) + #Range: > 0 + ticks_per_day = 24000 + #The scale of the tick length. 1 means that a tick has normal duration (0.05 seconds). 20 would therefore result in a length of 1 second per tick. If in doubt, leave it unchanged! (Default: 1) + #Range: 0.0 ~ 1.7976931348623157E308 + time_multiplier = 1.0 + #The number of ticks by which the time of day is shifted to match the real daytime. By default, 0 ticks is 6 AM, but 0 ticks should represent 12 AM (midnight). If in doubt, leave it unchanged! (Default: 6000) + #Range: > 0 + daytime_shift = 6000 + + [dragonlib_common_config.caching] + #Specifies how aggressively data should be cached. The lower the value, the less data will be cached, which can reduce RAM usage. However, depending on the situation, less caching can lead to increased CPU usage and cause lag. Only works with mods that actively use the feature! If in doubt, leave unchanged. (Default: NORMAL, OFF = only the most important data will be cached) + mode = "NORMAL" + diff --git a/config/libraryferret_1.properties b/config/libraryferret_1.properties index b8ecf1e..02e6a87 100644 --- a/config/libraryferret_1.properties +++ b/config/libraryferret_1.properties @@ -1,3 +1,3 @@ #Need help? Ask on Discord or Github/Gitlab <3 (ps: it is possible that this file contains nothing it's normal) -#Tue Jan 07 10:26:41 UTC 2025 +#Thu Jan 09 11:02:00 UTC 2025 boolean.creative.enable_item_group_ferret=false diff --git a/config/merequester-common.toml b/config/merequester-common.toml new file mode 100644 index 0000000..280ea44 --- /dev/null +++ b/config/merequester-common.toml @@ -0,0 +1,11 @@ + +[requester] + #The amount of requests a single ME Requester can hold. + #Range: 1 ~ 64 + requests = 5 + #The amount of energy (in AE) the ME Requester drains from the ME network when idle. + #Range: 0.0 ~ 1.7976931348623157E308 + idle_energy = 5.0 + #Whether the ME Requester requires an ME network channel to function. + require_channel = true + From 88f4438a4b85c501f2439a2ae7b06992d5643c14 Mon Sep 17 00:00:00 2001 From: ZareMate <0.zaremate@gmail.com> Date: Thu, 9 Jan 2025 12:10:30 +0100 Subject: [PATCH 2/2] Update .gitignore to exclude additional temporary files --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index b6ac759..b0de82e 100644 --- a/.gitignore +++ b/.gitignore @@ -21,4 +21,5 @@ /unix_args.txt /unix_jvm_args.txt /user_jvm_args.txt -/world \ No newline at end of file +/world +/_2X68Q~8/ \ No newline at end of file