Remove custom Iris build and downgrade sodium

This commit is contained in:
Maxscout
2026-06-07 13:08:01 -04:00
parent fbbf929a80
commit 8a4dba9bd4
14 changed files with 541 additions and 18 deletions

37
.gitignore vendored
View File

@@ -1,3 +1,38 @@
/server
/build
/mods
# Minecraft
local/
saves/
mods/
logs/
crash-reports/
backups/
resourcepacks/
shaderpacks/
server-resource-packs/
screenshots/
defaultconfigs/
schematics/
texturepacks/
coremods/
downloads/
modernfix/
fancymenu_data/
ESM/
journeymap/
.mixin.out/
modern_industrialization/
waypoints/
patchouli_data.json
icon.png
options.txt
rhino.local.properties
usercache.json
usernamecache.json
emi.json
command_history.txt
servers.dat
config/iris.properties

3
.gitmodules vendored
View File

@@ -6,3 +6,6 @@
path = custom_mods/Create-The_Factory_Must_Grow
url = https://git.maxscout.xyz/maxscout/Create-The_Factory_Must_Grow
branch = 1.21.1
[submodule "custom_mods/Connector"]
path = custom_mods/Connector
url = https://github.com/lap2ka/Connector

286
config/c2me.toml Normal file
View File

@@ -0,0 +1,286 @@
version = 3
# (Default:
# max(
# 1,
# min(
# if( is_windows,
# (cpus / 1.6),
# (cpus / 1.3)
# ) - if(is_client, 1, 0),
# ( ( mem_gb - (if(is_client, 1.0, 0.5)) ) / 0.6 )
# )
# )
# )
# The expression for the default value of global executor parallelism.
# This is used when the parallelism isn't overridden.
# Available variables: is_windows, is_j9vm, is_client, cpus, mem_gb
#
defaultGlobalExecutorParallelismExpression = "default"
# (Default: 4) Sets the thread priority for worker threads
#
# References:
# - https://docs.oracle.com/en/java/javase/21/docs/api/java.base/java/lang/Thread.html#setPriority(int)
#
threadPoolPriority = "default"
# (Default: 11) Configures the parallelism of global executor
globalExecutorParallelism = "default"
[fixes]
# (Default: true) Enforces safe world random access.
# This feature detects unsafe off-thread world random access, helping to find the causes
# of mysterious "Accessing LegacyRandomSource from multiple threads" crash.
# The default behavior is to fail hard when such bad things happens.
# Disabling this option will replace this behavior with a warning.
#
# It is generally not recommended to disable this settings unless you know what you are doing
#
#
enforceSafeWorldRandomAccess = "default"
# (Default: true)
# Whether to disable the shutdown hook of log4j2 on dedicated servers.
# Enabling this also makes the JVM exit when the dedicated server is considered fully shut down.
# This option have no effect on client-side.
# We has historically been doing this, and this config option allows you to disable this behavior.
#
disableLoggingShutdownHook = "default"
[vanillaWorldGenOptimizations]
# (Default: true) Whether to use density function compiler to accelerate world generation
#
# Density function: https://minecraft.wiki/w/Density_function
#
# This functionality compiles density functions from world generation
# datapacks (including vanilla generation) to JVM bytecode to increase
# performance by allowing JVM JIT to better optimize the code
#
# Currently, all functions provided by vanilla are implemented.
# Chunk upgrades from pre-1.18 versions are not implemented and will
# fall back to the unoptimized version of density functions.
#
useDensityFunctionCompiler = "default"
# (Default: true) Whether to enable aquifer optimizations to accelerate overworld worldgen
# (may cause incompatibility with other mods)
optimizeAquifer = "default"
# (Default: true) Whether to enable End Biome Cache to accelerate The End worldgen
# This is no longer included in lithium-fabric
# (may cause incompatibility with other mods)
#
useEndBiomeCache = "default"
# (Default: true) Whether to enable StructureWeightSampler optimizations to accelerate world generation
#
optimizeStructureWeightSampler = "default"
[vanillaWorldGenOptimizations.nativeAcceleration]
# (Default: false) Enable the use of AVX512 for native acceleration
#
# Currently, AVX512 implementation is generally slower than AVX2 implementations.
# If you ever decide to enable this, make sure you have verified that
# AVX512 implementations are faster on your machine.
#
allowAVX512 = "default"
# (Default: true) Enable the use of bundled native libraries to accelerate world generation
#
enabled = "default"
[clientSideConfig.modifyMaxVDConfig]
# (Default: true) Whether to modify maximum view distance
enabled = "default"
# (Default: 82) Max render distance allowed in game options
maxViewDistance = "default"
# (Default: true) Enable client-side support for extended render distance protocol (c2me:ext_render_distance_v1)
# This allows requesting render distances higher than 127 chunks from the server
#
# Requires Fabric API (currently available)
#
# Note: The server must advertise support this protocol for this to work
#
enableExtRenderDistanceProtocol = "default"
[ioSystem]
# (Default: true) Whether to use the optimized implementation of IO system
replaceImpl = "default"
# (Default: 8192) Soft limit for io worker nbt cache
chunkDataCacheSoftLimit = "default"
# (Default: 32678) Hard limit for io worker nbt cache
chunkDataCacheLimit = "default"
[chunkSystem]
# (Default: true) Whether to enable async serialization
#
asyncSerialization = "default"
# (Default: false) Whether to recover from errors when loading chunks
# This will cause errored chunk to be regenerated entirely, which may cause data loss
# Only applies when async chunk loading is enabled
#
recoverFromErrors = "default"
# (Default: true) Whether to allow POIs (Point of Interest) to be unloaded
# Unloaded POIs are reloaded on-demand or when the corresponding chunks are loaded again,
# which should not cause any behavior change
#
# Note:
# Vanilla never unloads POIs when chunks unload, causing small memory leaks
# These leaks adds up and eventually cause issues after generating millions of chunks
# in a single world instance
#
allowPOIUnloading = "default"
# (Default: true) This option workarounds MC-276863, a bug that makes mushrooms appear in non-postprocessed chunks
# This bug is amplified with notickvd as it exposes non-postprocessed chunks to players
#
# This should not affect other worldgen behavior and game mechanics in general
#
suppressGhostMushrooms = "default"
# (Default: true) Whether to synchronize the management of player tickets
#
# In vanilla Minecraft, player tickets are not always removed immediately when players leave an area.
# The delay in removal increases with the chunk systems throughput, but due to vanillas typically
# slow chunk loading, tickets are almost always removed immediately. However, some contraptions rely
# on this immediate removal behavior and tend to be broken with the increased chunk throughput.
# Enabling this option synchronizes player ticket handling, making it more predictable and
# thus improving compatibility with these contraptions.
#
syncPlayerTickets = "default"
# (Default: true) Whether to turn fluid postprocessing into scheduled tick
#
# Fluid post-processing is very expensive when loading in new chunks, and this can affect
# MSPT significantly. This option delays fluid post-processing to scheduled tick to hopefully
# mitigate this issue.
#
fluidPostProcessingToScheduledTick = "default"
# (Default: true) Whether to filter fluid post-processing on worldgen threads
#
# The worldgen processes creates a lot of unnecessary fluid post-processing tasks,
# which can overload the server thread and cause stutters.
# This applies a rough filter to filter out fluids that are definitely not going to flow
#
filterFluidPostProcessing = "default"
# (Default: false) Whether to use legacy scheduling for neighbor chunks
#
# Enabling this restores the behavior of always loading in neighbor chunks when a chunk is loaded.
#
# This is currently deprecated and will be removed in the future.
#
useLegacyScheduling = "default"
# (Default: false) Whether to enable low memory mode
#
# This option will attempt to aggressively unload unused chunks.
# Only applies when useLegacyScheduling is disabled.
#
lowMemoryMode = "default"
# (Default: false) Whether to delay full chunk events to after full chunk future have been completed
# This restores the buggy behavior in NeoForge that the ecosystem have been relying on
#
# Enabling this will almost certainly break vanilla behavior, disabled by default on fabric
# Do not change this unless you know what you are doing
#
delayFullChunkEvents = "default"
[openclAccel]
# (Default: true) Enable OpenCL acceleration for world generation.
#
enabled = "default"
# (Default: 32) Maximum number of concurrent tasks per device
# Increasing this may increase the performance and will increase the VRAM usage
#
maxConcurrentTasksPerDevice = "default"
# (Default: true) Whether to attempt to lower the priority of the command queues
# This may reduce the fps drop caused by the OpenCL acceleration
#
# Requires cl_khr_priority_hints and cl_khr_throttle_hints
#
lowPriorityQueues = "default"
# (Default: true) Whether to prefer fast compilation with noinline hints
#
preferFastCompilation = "default"
# (Default: false) Whether to allow the usage of CPU OpenCL devices
#
allowCPUDevices = "default"
# (Default: true) Whether to allow the usage of GPU OpenCL devices
#
allowGPUDevices = "default"
# (Default: true) Whether to allow the usage of Accelerator OpenCL devices
#
allowAcceleratorDevices = "default"
# (Default: false) Whether to allow falling back to non-OpenCL world generation if OpenCL initialization fails
#
allowIncompatibilityFallback = "default"
# (Default: false) Overrides the built-in blocklist and enables acceleration on unsupported configurations
#
disableBuiltinDeviceBlocklist = "default"
# (Default: true) Enables fast compilation options for intel GPUs
#
enableIntelFastCompilation = "default"
# (Default: true) Enables fast compilation options for nvidia GPUs
#
# This *will* decrease GPU-bound throughput by roughly 20%
#
enableNvidiaFastCompilation = "default"
# (Default: false) Whether to use smaller batches in worldgen
#
# Smaller batches helps older iGPUs to avoid tripping GPU timeouts,
# but it *will* reduce scheduling efficiency for modern GPUs
#
useSmallerBatches = "default"
# (Default: true) Whether to use the default device prioritization strategy
#
# For stability reasons:
# - Disable Intel GPUs if anything else is present on Windows
# - Disable Intel Gen9 iGPUs if anything else is present on Linux
# - Disable Nvidia GPUs if anything else is present on Linux
#
useDevicePrioritization = "default"
# (Default: ) A comma-separated list of device UUIDs to blacklist
# You can find the UUIDs in the log when the OpenCL devices are enumerated
# Example: "951e5ce5-ccec-4a37-9ece-d0a800662d8f,3e825b77-fa62-403e-9155-aed1c014b2a2"
#
deviceUUIDBlacklist = "default"
# (Default: ) A comma-separated list of device UUIDs to whitelist
# If non-empty, only the devices in this list will be used
# You can find the UUIDs in the log when the OpenCL devices are enumerated
# Example: "951e5ce5-ccec-4a37-9ece-d0a800662d8f,3e825b77-fa62-403e-9155-aed1c014b2a2"
#
deviceUUIDWhitelist = "default"
[generalOptimizations]
# (Default: 100000) The task interval of mid-tick chunk tasks in nanoseconds (-1 to disable)
# Mid-tick chunk tasks is to execute chunk tasks during server tick loop
# to speed up chunk loading and generation
# This helps chunks loading and generating under high MSPT but may raise
# MSPT when chunks are loading or generating
#
# It is generally not recommended to adjust this value unless you know
# what you are doing
#
# Incompatible with Dimensional Threading (dimthread)
#
midTickChunkTasksInterval = "default"
[generalOptimizations.autoSave]
# (Default: ENHANCED) Defines how auto save should be handled
# VANILLA: Use vanilla auto-save behavior (auto-save performed every tick during ticking)
# ENHANCED: Use C2ME enhanced auto-save (auto-save performed when the server have spare time after ticking)
# PERIODIC: Use pre-1.18 vanilla auto-save behavior (auto-save performed every 6000 ticks during ticking)
#
# Please preserve quotes so this config don't break
#
mode = "default"
[noTickViewDistance]
# (Default: 33) No-tick view distance max concurrent chunk loads
# Lower this for a better latency and higher this for a faster loading
maxConcurrentChunkLoads = "default"
# (Default: true) Enable server-side support for extended render distance protocol (c2me:ext_render_distance_v1)
# This allows requesting render distances higher than 127 chunks from the server
#
# Requires Fabric API (currently available)
#
enableExtRenderDistanceProtocol = "default"
# (Default: true) Whether to attempt to smooth out chunk sending rate
#
# Due to the nature of chunk loading and generation, chunks reach full status in bursts,
# which can cause frame time stability if the server also delivers chunks in a bursty way
# This config attempts to smooth out the bursty stream of chunks to help frame time stability
#
smoothChunkSendingRate = "default"
# (Default: false) Whether to ensure correct chunks within normal render distance
# This will send chunks twice increasing network load
ensureChunkCorrectness = "default"

9
config/connector.json Normal file
View File

@@ -0,0 +1,9 @@
{
"version": 1,
"hiddenMods": [],
"globalModAliases": {
"cloth_config": "cloth-config2",
"playeranimator": "player-animator"
},
"enableMixinSafeguard": true
}

View File

@@ -0,0 +1,9 @@
#Indigo properties file
#Sun Jun 07 12:59:27 EDT 2026
always-tesselate-blocks=auto
ambient-occlusion-mode=hybrid
debug-compare-lighting=auto
fix-exterior-vertex-lighting=auto
fix-luminous-block-ambient-occlusion=auto
fix-mean-light-calculation=auto
fix-smooth-lighting-offset=auto

View File

@@ -1,9 +0,0 @@
#This file stores configuration options for Iris, such as the currently active shaderpack
#Fri Jun 05 00:43:15 EDT 2026
allowUnknownShaders=false
colorSpace=SRGB
disableUpdateMessage=false
enableDebugOptions=false
enableShaders=true
maxShadowRenderDistance=32
shaderPack=

View File

@@ -0,0 +1,31 @@
{
"load_resource_packs": {
"//": "Determines if OpenLoader should load resource packs.",
"//default": true,
"value": true
},
"load_data_packs": {
"//": "Determines if OpenLoader should load data packs.",
"//default": true,
"value": true
},
"additional_locations": {
"//": [
"A list of additional locations to load packs from. These can be folders or ",
"direct paths to specific files. By default all file paths will be relative to ",
"the root of your game instance folder. Other locations can be specified using ",
"absolute paths. "
],
"//default": [],
"value": []
},
"load_datapacks_dir": {
"//": [
"Some launchers like CurseForge install data packs to the datapacks folder ",
"(.minecraft/datapacks). When enabled, OpenLoader will always check that folder ",
"for pack files. "
],
"//default": true,
"value": true
}
}

Submodule custom_mods/Iris deleted from f0087e78b3

Binary file not shown.

3
fabricloader.log Normal file
View File

@@ -0,0 +1,3 @@
[12:59:21] [WARN] [FabricLoader/Resolution]: Warnings were found!
- §Emod 'Concurrent Chunk Management Engine (Optimizations/Acceleration/OpenCL)' (c2me_opts_accel_opencl)§r 0.3.7+alpha.0.6+1.21.1+oclaccel recommends any version of §6scalablelux§r, which is missing!
- You should install any version of §6scalablelux§r for the optimal experience.

BIN
icon.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

View File

@@ -7,6 +7,43 @@
"neoforge": "21.1.233"
},
"projects": [
{
"pakku_id": "QJOqYuLbh7G3zi2j",
"type": "MOD",
"side": "BOTH",
"slug": {
"modrinth": "bookshelf-lib"
},
"name": {
"modrinth": "Bookshelf"
},
"id": {
"modrinth": "uy4Cnpcm"
},
"files": [
{
"type": "modrinth",
"file_name": "bookshelf-neoforge-1.21.1-21.1.81.jar",
"mc_versions": [
"1.21.1"
],
"loaders": [
"neoforge"
],
"release_type": "release",
"url": "https://cdn.modrinth.com/data/uy4Cnpcm/versions/1sdJl7J1/bookshelf-neoforge-1.21.1-21.1.81.jar",
"id": "1sdJl7J1",
"parent_id": "uy4Cnpcm",
"hashes": {
"sha512": "78d4577a8e8fbb241216968475dd73f5b9e5efeb7da802b18a4e6c290e49af6cb4a5676e9855d0d8ff3613f967812e4bd363bbb9196c17c954d19454f84b2214",
"sha1": "efc4cda6da4dd879f24d057ed0a6413764c9ba40"
},
"required_dependencies": [],
"size": 328813,
"date_published": "2026-02-10T22:44:22.165059Z"
}
]
},
{
"pakku_id": "MONLYpi1nOefj9UR",
"type": "MOD",
@@ -81,6 +118,43 @@
}
]
},
{
"pakku_id": "zts8OBQ00ePU2WuM",
"type": "MOD",
"side": "BOTH",
"slug": {
"modrinth": "forgified-fabric-api"
},
"name": {
"modrinth": "Forgified Fabric API"
},
"id": {
"modrinth": "Aqlf1Shp"
},
"files": [
{
"type": "modrinth",
"file_name": "forgified-fabric-api-0.116.7+2.2.4+1.21.1.jar",
"mc_versions": [
"1.21.1"
],
"loaders": [
"neoforge"
],
"release_type": "release",
"url": "https://cdn.modrinth.com/data/Aqlf1Shp/versions/7nHK7hMg/forgified-fabric-api-0.116.7+2.2.4+1.21.1.jar",
"id": "7nHK7hMg",
"parent_id": "Aqlf1Shp",
"hashes": {
"sha512": "858acb32a79e7ed1f37472bd7c50e3d2f47c7d7f6e734a8cece3800eb30d565a09580c261778ea73a0ae25e10e9eb9b16866012fe61d24f671b0ffe3ae2377dd",
"sha1": "459b5f4c7297b2f7649d43137f3e5a069b69b707"
},
"required_dependencies": [],
"size": 5569793,
"date_published": "2026-02-21T15:38:44.113972Z"
}
]
},
{
"pakku_id": "Jhc7MRVgXO3n8vzC",
"pakku_links": [
@@ -125,7 +199,7 @@
},
{
"pakku_id": "uKXTOfpauX6ptoyC",
"type": "MOD",
"type": "DATA_PACK",
"side": "SERVER",
"slug": {
"modrinth": "jjthunder-to-the-max"
@@ -241,6 +315,86 @@
}
]
},
{
"pakku_id": "X53bLfKMMOaGTwsZ",
"pakku_links": [
"Iv9mT43QSZ57UjnZ"
],
"type": "MOD",
"side": "BOTH",
"slug": {
"modrinth": "open-loader"
},
"name": {
"modrinth": "Open Loader"
},
"id": {
"modrinth": "KwWsINvD"
},
"files": [
{
"type": "modrinth",
"file_name": "OpenLoader-neoforge-1.21.1-21.1.5.jar",
"mc_versions": [
"1.21.1"
],
"loaders": [
"neoforge"
],
"release_type": "release",
"url": "https://cdn.modrinth.com/data/KwWsINvD/versions/Szobbnyh/OpenLoader-neoforge-1.21.1-21.1.5.jar",
"id": "Szobbnyh",
"parent_id": "KwWsINvD",
"hashes": {
"sha512": "3a4b0b6605f30b98a9d26954f8e211e6422f1f6402d400a9f9eb32a5af065da808dd3648a839dd60e47e50c8075b6a71624e142e50fb61273a6ba505bf6b1d09",
"sha1": "b4b49fa0bbefcecd41aaba60aca38c3658ac2c46"
},
"required_dependencies": [
"aaRl8GiW",
"uy4Cnpcm"
],
"size": 35602,
"date_published": "2025-05-19T08:08:51.453473Z"
}
]
},
{
"pakku_id": "Iv9mT43QSZ57UjnZ",
"type": "MOD",
"side": "BOTH",
"slug": {
"modrinth": "prickle"
},
"name": {
"modrinth": "Prickle"
},
"id": {
"modrinth": "aaRl8GiW"
},
"files": [
{
"type": "modrinth",
"file_name": "prickle-neoforge-1.21.1-21.1.11.jar",
"mc_versions": [
"1.21.1"
],
"loaders": [
"neoforge"
],
"release_type": "release",
"url": "https://cdn.modrinth.com/data/aaRl8GiW/versions/EE1FHDyD/prickle-neoforge-1.21.1-21.1.11.jar",
"id": "EE1FHDyD",
"parent_id": "aaRl8GiW",
"hashes": {
"sha512": "154d42795ccf1f3e07714775cdb82fd5db17574319286ced13d86b0456b64e4cf5bb89ffbcbfcefce67b73ed0b83e4e2944e493d79d9a385ff9de23006ee7bf5",
"sha1": "5174059ecf97340a0de5ef211b938de26c4eaa36"
},
"required_dependencies": [],
"size": 84812,
"date_published": "2025-09-04T03:19:44.476257Z"
}
]
},
{
"pakku_id": "BmExlxO9hTQWl2Pm",
"type": "MOD",

View File

@@ -1,7 +1,10 @@
{
"name": "Creative Industrialization",
"version": "0.0.1",
"overrides": [
"config"
]
"name": "Creative Industrialization",
"version": "0.0.1",
"overrides": ["config", "datapacks"],
"projects": {
"1NnAVIR5": {
"type": "DATA_PACK"
}
}
}