Skip to content

Commit af6a42e

Browse files
MrTJPMrTJP
committed
feat: port to 1.20.4
1 parent 6210eca commit af6a42e

File tree

803 files changed

+3329
-2383
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

803 files changed

+3329
-2383
lines changed

‎.github/workflows/publish.yaml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,7 @@ jobs:
135135
-k $API_TOKEN \
136136
-rt $RELEASE_TYPE \
137137
-v 'Java 17' \
138-
-v 1.20.1 \
139-
-v Forge \
138+
-v 1.20.4 \
140139
-v NeoForge \
141140
-c ./CHANGELOG.md \
142141
--required-dep codechicken-lib-1-8 \
@@ -178,9 +177,8 @@ jobs:
178177
create-version \
179178
-v "$MOD_VERSION" \
180179
-c ./CHANGELOG.md \
181-
-gv 1.20.1 \
180+
-gv 1.20.4 \
182181
-vt $RELEASE_TYPE \
183-
-l forge \
184182
-l neoforge \
185183
--required-dep codechicken-lib \
186184
--required-dep cb-multipart \

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ A Minecraft Forge mod all about Redstone circuity.
66
## Latest Versions
77
| MC Version | Branch | Latest Release | Latest Beta | Status |
88
|:----------:|----------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------|
9+
| 1.20.4 | `main` | ![badge](https://img.shields.io/endpoint?logo=.&url=https://gist.githubusercontent.com/MrTJP/3ef501bc64c896a86fd706dfea8ba367/raw/projectred-badge-1.20.4-release.json) | ![badge](https://img.shields.io/endpoint?logo=.&url=https://gist.githubusercontent.com/MrTJP/3ef501bc64c896a86fd706dfea8ba367/raw/projectred-badge-1.20.4-beta.json) | Active |
910
| 1.20.1 | `1.20.1` | ![badge](https://img.shields.io/endpoint?logo=.&url=https://gist.githubusercontent.com/MrTJP/3ef501bc64c896a86fd706dfea8ba367/raw/projectred-badge-1.20.1-release.json) | ![badge](https://img.shields.io/endpoint?logo=.&url=https://gist.githubusercontent.com/MrTJP/3ef501bc64c896a86fd706dfea8ba367/raw/projectred-badge-1.20.1-beta.json) | Active |
1011
| 1.19.2 | `1.19.x` | ![badge](https://img.shields.io/endpoint?logo=.&url=https://gist.githubusercontent.com/MrTJP/3ef501bc64c896a86fd706dfea8ba367/raw/projectred-badge-1.19-release.json) | ![badge](https://img.shields.io/endpoint?logo=.&url=https://gist.githubusercontent.com/MrTJP/3ef501bc64c896a86fd706dfea8ba367/raw/projectred-badge-1.19-beta.json) | Maintenance |
1112
| 1.18.2 | `1.18.x` | ![badge](https://img.shields.io/endpoint?logo=.&url=https://gist.githubusercontent.com/MrTJP/3ef501bc64c896a86fd706dfea8ba367/raw/projectred-badge-1.18-release.json) | ![badge](https://img.shields.io/endpoint?logo=.&url=https://gist.githubusercontent.com/MrTJP/3ef501bc64c896a86fd706dfea8ba367/raw/projectred-badge-1.18-beta.json) | Maintenance |

‎api/build.gradle‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
11
plugins {
2-
id 'net.neoforged.gradle'
3-
}
4-
5-
minecraft {
6-
mappings channel: mcp_mappings, version: mcp_mappings_version
7-
// accessTransformer = file("../core/src/main/resources/META-INF/accesstransformer.cfg")
2+
id 'net.neoforged.gradle.userdev'
83
}
94

105
dependencies {
11-
minecraft "net.neoforged:forge:${mc_version}-${forge_version}"
6+
implementation "net.neoforged:neoforge:${forge_version}"
127
}
13-

‎api/src/main/java/mrtjp/projectred/api/IExpansionAPI.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
package mrtjp.projectred.api;
22

33
import net.minecraft.core.BlockPos;
4+
import net.minecraft.resources.ResourceLocation;
45
import net.minecraft.world.level.Level;
56
import net.minecraft.world.level.block.Block;
6-
import net.minecraftforge.common.capabilities.Capability;
7-
import net.minecraftforge.common.capabilities.CapabilityManager;
8-
import net.minecraftforge.common.capabilities.CapabilityToken;
7+
import net.neoforged.neoforge.capabilities.BlockCapability;
98

109
import java.util.Set;
1110

@@ -14,12 +13,12 @@ public interface IExpansionAPI {
1413
/**
1514
* The capability instance for {@link Frame}
1615
*/
17-
Capability<Frame> FRAME_CAPABILITY = CapabilityManager.get(new CapabilityToken<>() { });
16+
BlockCapability<Frame, Void> FRAME_CAPABILITY = BlockCapability.createVoid(new ResourceLocation(ProjectRedAPI.EXPANSION_MOD_ID, "frame"), Frame.class);
1817

1918
/**
2019
* The capability instance for {@link MovementController}
2120
*/
22-
Capability<MovementController> MOVEMENT_CONTROLLER_CAPABILITY = CapabilityManager.get(new CapabilityToken<>() { });
21+
BlockCapability<MovementController, Void> MOVEMENT_CONTROLLER_CAPABILITY = BlockCapability.createVoid(new ResourceLocation(ProjectRedAPI.EXPANSION_MOD_ID, "movement_controller"), MovementController.class);
2322

2423
/**
2524
* Used to register a {@link BlockMover} to a specific block. This BlockMover will be engaged every time

‎build.gradle‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ group = 'mrtjp'
1111
version = "${mc_version}-${mod_version}"
1212

1313
println "Starting build of ${name}, Version: ${mod_version}"
14-
println "Using Forge: ${forge_version}, for Minecraft: ${mc_version}, with Mappings: ${mcp_mappings}"
14+
println "Using NeoForge: ${forge_version}, for Minecraft: ${mc_version}"
1515

1616
// Common submodule configurations
1717
subprojects { p ->
@@ -28,7 +28,9 @@ subprojects { p ->
2828
version = rootProject.version
2929

3030
// ForgeGradle version settings
31-
archivesBaseName = rootProject.name
31+
base {
32+
archivesName = rootProject.name
33+
}
3234

3335
// Jar settings
3436
jar {

‎core/build.gradle‎

Lines changed: 22 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id 'net.neoforged.gradle'
2+
id 'net.neoforged.gradle.userdev'
33
}
44

55
String mod_id = 'projectred_core'
@@ -8,40 +8,37 @@ String mod_id = 'projectred_core'
88
sourceSets.main.java.srcDirs += ['../api/src/main/java']
99

1010
minecraft {
11-
mappings channel: mcp_mappings, version: mcp_mappings_version
12-
accessTransformer = file("src/main/resources/META-INF/accesstransformer.cfg")
13-
runs {
14-
data {
15-
property 'mixin.env.remapRefMap', 'true'
16-
property 'mixin.env.refMapRemappingFile', "${buildDir}/createSrgToMcp/output.srg"
17-
18-
ideaModule "${rootProject.name}.${project.name}.main"
19-
20-
workingDirectory file('run')
21-
args '--mod', mod_id, '--all', '--output', file("src/main/generated"), '--existing', file("src/main/resources")
22-
mods {
23-
'${mod_id}' { source sourceSets.main }
24-
}
25-
}
11+
accessTransformers.file file("src/main/resources/META-INF/accesstransformer.cfg")
12+
}
13+
14+
runs {
15+
data {
16+
systemProperty 'mixin.env.remapRefMap', 'true'
17+
systemProperty 'mixin.env.refMapRemappingFile', "${buildDir}/createSrgToMcp/output.srg"
18+
19+
workingDirectory file('run')
20+
programArguments.addAll '--mod', mod_id, '--all', '--output', file("src/main/generated"), '--existing', file("src/main/resources")
21+
modSource sourceSets.main
2622
}
2723
}
2824

2925
dependencies {
30-
minecraft "net.neoforged:forge:${mc_version}-${forge_version}"
26+
implementation "net.neoforged:neoforge:${forge_version}"
3127

32-
implementation fg.deobf("io.codechicken:CodeChickenLib:${mc_version}-${ccl_version}:universal")
33-
implementation fg.deobf("io.codechicken:CBMultipart:${mc_version}-${cbm_version}:universal")
28+
implementation "io.codechicken:CodeChickenLib:${mc_version}-${ccl_version}"
29+
implementation "io.codechicken:CBMultipart:${mc_version}-${cbm_version}"
3430

3531
// JEI
36-
compileOnly(fg.deobf("mezz.jei:jei-${mc_version}-common-api:${jei_version}"))
37-
compileOnly(fg.deobf("mezz.jei:jei-${mc_version}-forge-api:${jei_version}"))
38-
runtimeOnly(fg.deobf("mezz.jei:jei-${mc_version}-forge:${jei_version}"))
32+
compileOnly("mezz.jei:jei-${mc_version}-common-api:${jei_version}")
33+
compileOnly("mezz.jei:jei-${mc_version}-neoforge-api:${jei_version}")
34+
runtimeOnly("mezz.jei:jei-${mc_version}-neoforge:${jei_version}")
3935

4036
// CCTweaked
41-
compileOnly("cc.tweaked:cc-tweaked-${mc_version}-core-api:${cct_version}")
42-
compileOnly(fg.deobf("cc.tweaked:cc-tweaked-${mc_version}-forge-api:${cct_version}"))
43-
runtimeOnly(fg.deobf("cc.tweaked:cc-tweaked-${mc_version}-forge:${cct_version}"))
37+
// compileOnly("cc.tweaked:cc-tweaked-${mc_version}-core-api:${cct_version}")
38+
// compileOnly(fg.deobf("cc.tweaked:cc-tweaked-${mc_version}-forge-api:${cct_version}"))
39+
// runtimeOnly(fg.deobf("cc.tweaked:cc-tweaked-${mc_version}-forge:${cct_version}"))
4440

4541
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
4642
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
4743
}
44+

‎core/src/main/generated/.cache/31c38579459bc2822e8b63fab8c1617bc12855ad‎

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

‎core/src/main/generated/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
// 1.20.4 2024-11-23T19:52:38.925742 Loot Tables
2+
a0514a25061c79be8aebe827aaf7dbc833bc142c data/projectred_core/loot_tables/blocks/electrotine_generator.json

‎core/src/main/generated/.cache/60c196ec329f374e76e48683e89ad3aaa6e8aa32‎

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,48 @@
1-
// 1.20.1 2024-05-02T16:36:18.636221 projectred_core Recipes.
2-
6df9318cfe3b74a47229e918565717ef412c448a data/projectred_core/recipes/anode.json
3-
f250ff3d3454f55fadea66dc89afea26c601ae4d data/projectred_core/recipes/black_illumar.json
4-
236725b2b0282de7ba2f80261320dcde31ed3df8 data/projectred_core/recipes/blue_illumar.json
5-
ef26b7f8cee8d13086cc152c80aadb88412e76b0 data/projectred_core/recipes/boule.json
6-
624a1650e739812451427764837f54ec793562d6 data/projectred_core/recipes/brown_illumar.json
7-
1c00dbe36fa928f982af65ccd758443fef3e5411 data/projectred_core/recipes/cathode.json
8-
0c868aa79b0124f54fbded7ba06d3e579f0e6f36 data/projectred_core/recipes/conductive_plate.json
9-
d553bff3c0c854010e483f8be0f5822eb8fc1532 data/projectred_core/recipes/copper_coil.json
10-
e6b2efe2ad3e708518d3702c1213dccdd709eb5c data/projectred_core/recipes/cyan_illumar.json
11-
41f3d0f835b83252d31d8a8d0f1a3bf462ea1a8c data/projectred_core/recipes/draw_plate.json
12-
08b470f09db0e5f339fd333dbe95e4e122e90b35 data/projectred_core/recipes/electrotine_generator.json
13-
25a5fd9c78c2f2f16cf44f6afb780fb5912e722d data/projectred_core/recipes/electrotine_ingot.json
14-
bec3ba19234c79bdecabede578f5ae639d873cfd data/projectred_core/recipes/electrotine_iron_comp.json
15-
38b8c13a1c850643a44fb185c4350c3c5a69f6b5 data/projectred_core/recipes/electrotine_silicon.json
16-
3487f3d43581e73981bb0d8cb55ee71150c0c161 data/projectred_core/recipes/electrotine_silicon_comp.json
17-
38a97587cca400f22c53da1c62f3b115584a1e64 data/projectred_core/recipes/energized_silicon.json
18-
4fb85e506d25bc14424c1a4f1f6d4bbb61671037 data/projectred_core/recipes/energized_silicon_chip.json
19-
68c48c4a6daf1586a02211c27537e5ee0a5ddcb4 data/projectred_core/recipes/glow_silicon_comp.json
20-
0da34869cb89f0d154d3293f78be840d9c8db80e data/projectred_core/recipes/gold_coil.json
21-
9a6cf93b7dc4e2c3e6b4473f8e84a14bd64e2687 data/projectred_core/recipes/gray_illumar.json
22-
35c8a676a2546b845983f8c635797eb1611cde7e data/projectred_core/recipes/green_illumar.json
23-
a65beaefdcabb72c8965f26c8bc393672a1f5278 data/projectred_core/recipes/infused_silicon.json
24-
be7349135660f14f1395a32ff8be936922b642fb data/projectred_core/recipes/iron_coil.json
25-
06ca89557ab83f51bdcfb8fa0404bd51afac2f8a data/projectred_core/recipes/light_blue_illumar.json
26-
da35c8a29094c40897d9d0bc2a14e997a85e7480 data/projectred_core/recipes/light_gray_illumar.json
27-
6858c14e8b178982d1f03c68e258b169f01d288b data/projectred_core/recipes/lime_illumar.json
28-
15f9f006d24ecb238cc283093fb0bf5313fc4f55 data/projectred_core/recipes/magenta_illumar.json
29-
bcd31892d44d481bfa3af6655d7d1333efa0740d data/projectred_core/recipes/motor.json
30-
4b5b579b7bb5b66c7a42ae0d1a6e8db35d97416f data/projectred_core/recipes/multimeter.json
31-
b680b9bf38af0a45c4751e5a25865a1fc563b87f data/projectred_core/recipes/orange_illumar.json
32-
25b435c2d32bf284ea8683943d968ecaa516f1ed data/projectred_core/recipes/pink_illumar.json
33-
d9de5d90fde04c7d5978f8ff692ad4fedeb92bf2 data/projectred_core/recipes/plate.json
34-
f97023d8b2284d76247dc3c34451438d4329924a data/projectred_core/recipes/platformed_plate.json
35-
b6b878dbd1b6316e303c7c931260d4b4f4282044 data/projectred_core/recipes/pointer.json
36-
c3d1e963e8b5ac9d73759b9932306c2933c411a9 data/projectred_core/recipes/purple_illumar.json
37-
d3eff17e454afbdddc5fd3445ff51ebeaa790bea data/projectred_core/recipes/red_illumar.json
38-
47033e063761a2bf687d5c4b7b83d156eeaec939 data/projectred_core/recipes/red_ingot.json
39-
9fee17214ce2c53ced6f273280dd905619eea04e data/projectred_core/recipes/red_iron_comp.json
40-
50e44357d146ff4c1f33201ef0138260bf22f138 data/projectred_core/recipes/red_silicon_comp.json
41-
45a075d35f8a9d5b0ae4a24f4f42f2078836f310 data/projectred_core/recipes/sail.json
42-
3f0f9cce1cb8ea18b403f30d0f6e034eb919d2a3 data/projectred_core/recipes/sand_coal_comp.json
43-
18b38eb30f4e5a001325f8545881fa7bccfc2c56 data/projectred_core/recipes/screwdriver.json
44-
74eecc551491b0f4df62107b5f72eb652a37e50c data/projectred_core/recipes/silicon.json
45-
f24d99e4721fcc8efc4aa43dfc56c936d535aa2a data/projectred_core/recipes/silicon_chip.json
46-
35fbd73b8dc5bb510e1d878666e5bc2d504b4340 data/projectred_core/recipes/white_illumar.json
47-
722b3cc591ad2fe503e8f5678541add99d1baf8d data/projectred_core/recipes/woven_cloth.json
48-
826271d08c8e38b1c677d90b8844aafca3871141 data/projectred_core/recipes/yellow_illumar.json
1+
// 1.20.4 2024-11-23T19:52:38.912607 projectred_core Recipes.
2+
011ec1d6efa6439752346f0a5ab4eb0b353c8346 data/projectred_core/recipes/anode.json
3+
05f64bb226148d7af439a1f4faa65cf0115d124f data/projectred_core/recipes/black_illumar.json
4+
9771cf39e5870cc76fef4b3ea2753810adcf9285 data/projectred_core/recipes/blue_illumar.json
5+
e87407cfa99e294173ac074e839c314851d5109d data/projectred_core/recipes/boule.json
6+
e80ebcaf6f249ade7afafce5df4422ddd8b50014 data/projectred_core/recipes/brown_illumar.json
7+
ae1180243acd8a6ad39a0cdcb7e5ae130936e59e data/projectred_core/recipes/cathode.json
8+
8820431a6b0df0f1faabbd6ad7a5fa376f56b599 data/projectred_core/recipes/conductive_plate.json
9+
9b565853c0d85f672827bda4488f2344dd598a0e data/projectred_core/recipes/copper_coil.json
10+
a4f7b6d6e777f8cccaefd5ce49216c7a4c5c0892 data/projectred_core/recipes/cyan_illumar.json
11+
12ec8a18c14fd7dac6a5cdebf78d306e521d2ee0 data/projectred_core/recipes/draw_plate.json
12+
968917206f5278b9b7ff114ebbfb0cd822807973 data/projectred_core/recipes/electrotine_generator.json
13+
3596f7a764960ae334fc7ba5b872b044d4e8cbd1 data/projectred_core/recipes/electrotine_ingot.json
14+
b97d06f8048b50a6ee10119ae499979ed4ef32e1 data/projectred_core/recipes/electrotine_iron_comp.json
15+
66606b4fd7c45c07037e6b582084b94afc23c2ed data/projectred_core/recipes/electrotine_silicon.json
16+
8367bd21c399c00a71c43ee42c4ccf4ccb4a5d9a data/projectred_core/recipes/electrotine_silicon_comp.json
17+
8208f70f6374845f674c0002137c7e7443e32ea7 data/projectred_core/recipes/energized_silicon.json
18+
a5b433cb7b4b0391d459ce976c9c20e6a0191a47 data/projectred_core/recipes/energized_silicon_chip.json
19+
1694b4904fd0b20e385c949b6d3dd387d20394b4 data/projectred_core/recipes/glow_silicon_comp.json
20+
48388da33f0762e9fb923888dcb422d0895bceae data/projectred_core/recipes/gold_coil.json
21+
1ba6974bd28b7390e8294e96a481a92c4fe0a957 data/projectred_core/recipes/gray_illumar.json
22+
d99ce49de1c687518a97b683e274ab7dbc1a49bf data/projectred_core/recipes/green_illumar.json
23+
c146f539ea48b6c76621e5a942ec052cd4b95bb7 data/projectred_core/recipes/infused_silicon.json
24+
c0c5515557d878557336db021d8069d68d4660c1 data/projectred_core/recipes/iron_coil.json
25+
7c0907930a5f10a77de29c5088c61434b7b02e10 data/projectred_core/recipes/light_blue_illumar.json
26+
eb42398b582a29dc25e35d7eb436ed5717a367b6 data/projectred_core/recipes/light_gray_illumar.json
27+
abbcdbe736ad5bb18955911a8bf037953cba7efc data/projectred_core/recipes/lime_illumar.json
28+
b11cea454867a56544d3466c51415f23bc63a03c data/projectred_core/recipes/magenta_illumar.json
29+
4c588b2521cc1b758d4636fb1e5a6655acda56e9 data/projectred_core/recipes/motor.json
30+
4f23a84c739ed9e55ce0ea9c8ce8ee5367114f20 data/projectred_core/recipes/multimeter.json
31+
0bdbf57249aba68bead95b7bf8cce2f76d0dc611 data/projectred_core/recipes/orange_illumar.json
32+
10b5e98df6622205a5fe07b7e503d64f2f2d902d data/projectred_core/recipes/pink_illumar.json
33+
9b8bd9a802ae07342ee59ca2ed3db893fa1be6b2 data/projectred_core/recipes/plate.json
34+
311e066ba0fd702d304238d7de9c755bade58da5 data/projectred_core/recipes/platformed_plate.json
35+
11197fd21b759f43cf776f9cd43507007e8b909d data/projectred_core/recipes/pointer.json
36+
691710cd3f52407100a366abcfde5a5e1c29e487 data/projectred_core/recipes/purple_illumar.json
37+
59b62d0fe4787a47f5a62daf9dd26c582424ebf3 data/projectred_core/recipes/red_illumar.json
38+
fbfeb163faa41d0fbc78153ac570bd66a4e82f5e data/projectred_core/recipes/red_ingot.json
39+
478b595cdff72d2f61383319a33db29225e118a4 data/projectred_core/recipes/red_iron_comp.json
40+
7ec16e660f73113b359f5068094ace5efc0126fe data/projectred_core/recipes/red_silicon_comp.json
41+
aa3d8ba178651351e749ff032ccf7100d353e394 data/projectred_core/recipes/sail.json
42+
3ef15ccd51ab7f496518845f2f5202a4e853c66c data/projectred_core/recipes/sand_coal_comp.json
43+
b140cda6443a74f01ce48daed21b5ff5168aaa9e data/projectred_core/recipes/screwdriver.json
44+
ac91f0e8b466962cbac8148400e0ba000559f4ce data/projectred_core/recipes/silicon.json
45+
97d16c8ca7079aa64b3a609582af03a8f0dbb1e6 data/projectred_core/recipes/silicon_chip.json
46+
61f6e4eb5fe3b30ad290ef860dc23ce5041240e4 data/projectred_core/recipes/white_illumar.json
47+
ae8534cad1bcaa59bbfec215947594ba24ffbd48 data/projectred_core/recipes/woven_cloth.json
48+
0cee2cc2f570a96c7a9c70e452dbb7a1d3237953 data/projectred_core/recipes/yellow_illumar.json

‎core/src/main/generated/.cache/99a5d1555286bf25041b61b612844755348b72f5‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.20.1 2024-05-02T16:36:18.646512 Tags for minecraft:item mod id projectred_core
1+
// 1.20.4 2024-11-23T19:52:38.926176 Tags for minecraft:item mod id projectred_core
22
92105d826828321073ede0ce0ecce9d84a8df0db data/forge/tags/items/dusts.json
33
6a3de78381bcb92b0a8f9953c598cf7fc42cb3c6 data/forge/tags/items/dusts/electrotine.json
44
9bb828e78355e586e44d0350583fbdf5610a36f6 data/forge/tags/items/gems.json

0 commit comments

Comments
 (0)