Skip to content

Commit 2fc269c

Browse files
Diamondback88Diamondback88
committed
Switch NeoForge to Forge, config changes, add CC:C bridge and Resource Pack Overrides
1 parent 4331f47 commit 2fc269c

10 files changed

Lines changed: 109 additions & 38 deletions

‎config/fml.toml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
#Early window height
22
earlyWindowHeight = 720
3-
#Early window framebuffer scale
4-
earlyWindowFBScale = 1
53
#Enable forge global version checking
64
versionCheck = true
5+
#Should we control the window. Disabling this disables new GL features and can be bad for mods that rely on them.
6+
earlyWindowControl = true
7+
#Early window framebuffer scale
8+
earlyWindowFBScale = 1
79
#Early window provider
810
earlyWindowProvider = "fmlearlywindow"
911
#Early window width
@@ -16,10 +18,10 @@ defaultConfigPath = "defaultconfigs"
1618
disableOptimizedDFU = false
1719
#Skip specific GL versions, may help with buggy graphics card drivers
1820
earlyWindowSkipGLVersions = []
19-
#Should we control the window. Disabling this disables new GL features and can be bad for mods that rely on them.
20-
earlyWindowControl = true
2121
#Max threads for early initialization parallelism, -1 is based on processor count
2222
maxThreads = -1
2323
#Squir?
2424
earlyWindowSquir = false
25+
#Whether to show CPU usage stats in early window
26+
earlyWindowShowCPU = false
2527

‎config/forge-client.toml‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,24 @@
11

22
#Client only settings, mostly things related to rendering
33
[client]
4-
#Enable NeoForge to queue all chunk updates to the Chunk Update thread.
4+
#Enable Forge to queue all chunk updates to the Chunk Update thread.
55
#May increase FPS significantly, but may also cause weird rendering lag.
66
#Not recommended for computers without a significant number of cores available.
77
alwaysSetupTerrainOffThread = true
8-
#EXPERIMENTAL: Enable the NeoForge block rendering pipeline - fixes the lighting of custom models.
8+
#EXPERIMENTAL: Enable the Forge block rendering pipeline - fixes the lighting of custom models.
99
experimentalForgeLightPipelineEnabled = true
10-
#When enabled, NeoForge will show any warnings that occurred during loading.
10+
#When enabled, Forge will show any warnings that occurred during loading.
1111
showLoadWarnings = true
1212
#Set to true to use a combined DEPTH_STENCIL attachment instead of two separate ones.
1313
useCombinedDepthStencilAttachment = false
14-
#[Deprecated for Removal] IPv6 addresses will always be compressed
14+
#[DEPRECATED] Does nothing anymore, IPv6 addresses will be compressed always
1515
compressLanIPv6Addresses = true
16+
#During block model baking, manually calculates the normal for all faces.
17+
#This was the default behavior of forge between versions 31.0 and 47.1.
18+
#May result in differences between vanilla rendering and forge rendering.
19+
#Will only produce differences for blocks that contain non-axis aligned faces.
20+
#You will need to reload your resources to see results.
21+
calculateAllNormals = false
22+
#When enabled, a slightly biased Direction#getNearest calculation will be used to prevent normal fighting on 45 degree angle faces.
23+
stabilizeDirectionGetNearest = true
1624

‎config/resourcepackoverrides.json‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{
2+
"schema_version": 2,
3+
"default_packs": [
4+
"file/DetailedAnimationsReworkedXJustExpressions - 1.14 R.zip",
5+
"file/FreshAnimations_v1.9.2.zip",
6+
"file/Splendous Sniffers.zip",
7+
"file/lanostry_foxes.zip",
8+
"file/Updated_Engineering_v1.7.zip",
9+
"file/updated_aquaculture-1.0.zip",
10+
"file/Aether Regenerated v1.2.1.zip"
11+
],
12+
"default_overrides": {
13+
"force_compatible": true
14+
},
15+
"required_packs": [
16+
"file/Splendous Sniffers.zip",
17+
"file/lanostry_foxes.zip"
18+
],
19+
"$$required_packs": {
20+
"required": true
21+
}
22+
}

‎config/yosby/config/options.txt‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎config/yosby/config/personality-client.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
[keybindings]
77
#If true, crawling will be toggled on or off instead of the keybinding being held down
8-
toggleCrawl = false
8+
toggleCrawl = true
99
#If true, sitting will be toggled on or off instead of the keybinding being held down
10-
toggleSitting = false
10+
toggleSitting = true
1111

‎config/yosby/options.txt‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
operatorItemsTab:true
2+
enableVsync:false
3+
realmsNotifications:false
4+
guiScale:3
5+
tutorialStep:none
6+
skipMultiplayerWarning:true
7+
joinedFirstServer:true
8+
onboardAccessibility:false
9+
soundCategory_master:0.5
10+
soundCategory_music:0.25
11+
soundCategory_record:1.0
12+
soundCategory_weather:0.5
13+
soundCategory_block:1.0
14+
soundCategory_hostile:1.0
15+
soundCategory_neutral:1.0
16+
soundCategory_player:1.0
17+
soundCategory_ambient:0.5
18+
soundCategory_voice:1.0

‎index.toml‎

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,11 @@ hash = "950cdae0262dff23a0397cb7896eff04f3f9d665271386776ece980e69c2350e"
6262

6363
[[files]]
6464
file = "config/fml.toml"
65-
hash = "0f9288c07c2b5f5f1664f39e58ccda1a6267c08620ffb4dd5427b2dd6877d273"
65+
hash = "845926b0fad854b5dfccc8005e6a65fbf183fc465fd0ba8060101fe56c558ad8"
6666

6767
[[files]]
6868
file = "config/forge-client.toml"
69-
hash = "a3fd6f887e4321019fbb99cbafd2eb5e14e3cb5c5b8ebd8cd3faa68c7572f92a"
69+
hash = "613d60015c3671d95f59f4ce70c0b9956c377a3050219560d0b824cd1e9648b7"
7070

7171
[[files]]
7272
file = "config/forgery/features.ini"
@@ -96,6 +96,10 @@ hash = "29fcdd3b18a2a318be06aa0c26aeec8e7dd1ba8cd578d729fd50f8f66e655a4b"
9696
file = "config/rats-common.toml"
9797
hash = "f0144087d7c3b42e05097109d47d220900c4cef865ad8afe75d37cbc2b70ec00"
9898

99+
[[files]]
100+
file = "config/resourcepackoverrides.json"
101+
hash = "4ebbf740c0ff67642f253023f867c2640454574b8ed0ed77688e49e983f1169b"
102+
99103
[[files]]
100104
file = "config/ribbits-forge-1_20_1.toml"
101105
hash = "da9f6fa4546936b77dcc501513153ce1d97efa827c7b87ab87378a05a59e58c6"
@@ -180,13 +184,9 @@ hash = "b88592f33fa32917368809ba01020b51da089c9354fcf379de2cac07faf69f18"
180184
file = "config/yosby/config/oculus.properties"
181185
hash = "a9a6c0ecd319c9417e35b3b17f91de37075001803296dc6fab2a52f888a342c8"
182186

183-
[[files]]
184-
file = "config/yosby/config/options.txt"
185-
hash = "522170be22f840571a2726d56c4b026036a51f4199b960cb0fc93ed589838788"
186-
187187
[[files]]
188188
file = "config/yosby/config/personality-client.toml"
189-
hash = "4e3e4811274abac110ee67e89e12b8e3925ff45cf81f60b688b5dba0e3a0b496"
189+
hash = "975b7803479989f2f158917a542ffd5e0d7b7ce7c0ca8116e801086710cbd82b"
190190

191191
[[files]]
192192
file = "config/yosby/config/shulkerboxtooltip.json5"
@@ -224,6 +224,10 @@ hash = "f50e212d10dd3b23aa0bbebaaa7a8108a630e6b7e1f33e4b1e53b115344903e2"
224224
file = "config/yosby/config/zume.json5"
225225
hash = "6e478dd748af2e6d1ea234dec8af16776bea72ec9dcf51b2562852cdd4a4c950"
226226

227+
[[files]]
228+
file = "config/yosby/options.txt"
229+
hash = "96d1c3df0593ccc4a450ad233dcb14943978477882f00c75b24a76e722483b57"
230+
227231
[[files]]
228232
file = "defaultconfigs/cofh_core-server.toml"
229233
hash = "168489963efe113d834d422045ae105622bf4e0d6361bdfe674fda6c6d0c496d"
@@ -522,6 +526,11 @@ file = "mods/cc-tweaked.pw.toml"
522526
hash = "b7b5d139282c441057c253e1d01d8333ed22b377a75242edac5c78bb26907ab2"
523527
metafile = true
524528

529+
[[files]]
530+
file = "mods/cccbridge.pw.toml"
531+
hash = "2ecf09fed9ee5d417e3c748b9274989b37bd5555ddfea9626e53628b60285189"
532+
metafile = true
533+
525534
[[files]]
526535
file = "mods/cerbons-api.pw.toml"
527536
hash = "da9026c48b5c6bc9eab17bca48f4b1fd8540fcae23365d63c9d7c4e5c7eb0a30"
@@ -1412,6 +1421,11 @@ file = "mods/replanting-crops.pw.toml"
14121421
hash = "53e37bfb8b489847eaf10f0303046c4bb098ade9e3bb8b8ef262dad31a98bd8e"
14131422
metafile = true
14141423

1424+
[[files]]
1425+
file = "mods/resource-pack-overrides.pw.toml"
1426+
hash = "e6958cb835e0e110d78eee6efa68f2c3cd0fde36161d5a705556964b93a6f959"
1427+
metafile = true
1428+
14151429
[[files]]
14161430
file = "mods/resourceful-config.pw.toml"
14171431
hash = "692ed5c4b3794053fbfb08107a2b0b0f90eec49b005a13be6ca86321e80df7ba"

‎mods/cccbridge.pw.toml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
name = "CC:C Bridge"
2+
filename = "cccbridge-mc1.20.1-forge-1.6.3.jar"
3+
side = "both"
4+
5+
[download]
6+
hash-format = "sha1"
7+
hash = "78a03348b3c1f26170cd1171b3a8ca8fbb34a272"
8+
mode = "metadata:curseforge"
9+
10+
[update]
11+
[update.curseforge]
12+
file-id = 4864664
13+
project-id = 656214

‎mods/resource-pack-overrides.pw.toml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
name = "Resource Pack Overrides [Forge & Fabric]"
2+
filename = "ResourcePackOverrides-v8.0.3-1.20.1-Forge.jar"
3+
side = "both"
4+
5+
[download]
6+
hash-format = "sha1"
7+
hash = "fa3d92461bceb63439d33ab634e894d4b342599c"
8+
mode = "metadata:curseforge"
9+
10+
[update]
11+
[update.curseforge]
12+
file-id = 5101541
13+
project-id = 832644

‎pack.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ pack-format = "packwiz:1.1.0"
66
[index]
77
file = "index.toml"
88
hash-format = "sha256"
9-
hash = "aca2613a1c4bae561f54d833dd09667a9aab758e715dcbb4d2a92e46ca06cc4e"
9+
hash = "5983a9fee3371b6fd38bbccfa708e0ae808d01225c593cb76f07e682e7a9a1dc"
1010

1111
[versions]
1212
"" = ""
13+
forge = "1.20.1-47.3.0"
1314
minecraft = "1.20.1"
14-
neoforge = "1.20.1-47.1.106"

0 commit comments

Comments
 (0)