Skip to content

Commit 1f3a22e

Browse files
tier940tier940
authored
Update dep (#329)
1 parent 01ec878 commit 1f3a22e

File tree

4 files changed

+92
-73
lines changed

4 files changed

+92
-73
lines changed

‎dependencies.gradle‎

Lines changed: 70 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,22 @@
44
* Add your dependencies here. Supported configurations:
55
* - api("group:name:version:classifier"): if you use the types from this dependency in the public API of this mod
66
* Available at runtime and compiletime for mods depending on this mod
7-
* - api("g:n:v:c"): if you need this for internal api details of the mod, but none of it is visible via the public API
7+
* - implementation("g:n:v:c"): if you need this for internal implementation details of the mod, but none of it is visible via the public API
88
* Available at runtime but not compiletime for mods depending on this mod
99
* - compileOnly("g:n:v:c"): if the mod you're building doesn't need this dependency during runtime at all, e.g. for optional mods
1010
* Not available at all for mods depending on this mod, only visible at compiletime for this mod
11-
* - compileOnly("g:n:v:c"): like compileOnly, but also visible at compiletime for mods depending on this mod
11+
* - compileOnlyApi("g:n:v:c"): like compileOnly, but also visible at compiletime for mods depending on this mod
1212
* Available at compiletime but not runtime for mods depending on this mod
13-
* - runtimeOnlyNonPublishableNonPublishable("g:n:v:c"): if you want to include a mod in this mod's runClient/runServer runs, but not publish it as a dependency
13+
* - runtimeOnlyNonPublishable("g:n:v:c"): if you want to include a mod in this mod's runClient/runServer runs, but not publish it as a dependency
1414
* Not available at all for mods depending on this mod, only visible at runtime for this mod
15-
* - devOnlyNonPublishable("g:n:v:c"): a combination of runtimeOnlyNonPublishableNonPublishable and compileOnly for dependencies present at both compiletime and runtime,
15+
* - devOnlyNonPublishable("g:n:v:c"): a combination of runtimeOnlyNonPublishable and compileOnly for dependencies present at both compiletime and runtime,
1616
* but not published as Maven dependencies - useful for RFG-deobfuscated dependencies or local testing
17-
* - runtimeOnlyNonPublishable("g:n:v:c"): if you don't need this at compile time, but want it to be present at runtime
17+
* - runtimeOnly("g:n:v:c"): if you don't need this at compile time, but want it to be present at runtime
1818
* Available at runtime for mods depending on this mod
1919
* - annotationProcessor("g:n:v:c"): mostly for java compiler plugins, if you know you need this, use it, otherwise don't worry
2020
* - testCONFIG("g:n:v:c") - replace CONFIG by one of the above (except api), same as above but for the test sources instead of main
2121
*
22-
* - shadowapi("g:n:v:c"): effectively the same as API, but the dependency is included in your jar under a renamed package name
22+
* - shadowImplementation("g:n:v:c"): effectively the same as API, but the dependency is included in your jar under a renamed package name
2323
* Requires you to enable usesShadowedDependencies in gradle.properties
2424
* For more info, see https://github.com/GTModpackTeam/Buildscripts/blob/master/docs/shadow.md
2525
*
@@ -32,61 +32,74 @@
3232
* To add a mod with CurseMaven, replace '("g:n:v:c")' in the above with 'rfg.deobf("curse.maven:project_slug-project_id:file_id")'
3333
* Example: devOnlyNonPublishable(rfg.deobf("curse.maven:top-245211:2667280"))
3434
*
35-
* Gradle names for some of the configuration can be misleading, compileOnly and runtimeOnlyNonPublishable both get published as dependencies in Maven, but compileOnly does not.
36-
* The buildscript adds runtimeOnlyNonPublishableNonPublishable to also have a runtime dependency that's not published.
35+
* Gradle names for some of the configuration can be misleading, compileOnlyApi and runtimeOnly both get published as dependencies in Maven, but compileOnly does not.
36+
* The buildscript adds runtimeOnlyNonPublishable to also have a runtime dependency that's not published.
3737
*
3838
* For more details, see https://docs.gradle.org/8.4/userguide/java_library_plugin.html#sec:java_library_configurations_graph
3939
*/
4040
dependencies {
41-
// Published dependencies
42-
api("codechicken:codechickenlib:3.2.3.358") // CCL 3.2.3.358
43-
api("com.cleanroommc:modularui:2.4.3") { transitive = false } // MUI 2.4.3
44-
api("com.cleanroommc:groovyscript:1.1.1") { transitive = false } // GrS 1.1.1
45-
api("CraftTweaker2:CraftTweaker2-MC1120-Main:1.12-4.1.20.700") // CrT 4.1.20.700
46-
api rfg.deobf("curse.maven:ctm-267602:2915363") // CTM 1.0.2.31
47-
4841
// Hard Dependencies
49-
devOnlyNonPublishable(rfg.deobf("curse.maven:gregtech-ce-unofficial-557242:5519022")) // CEu 2.8.10
50-
//devOnlyNonPublishable(rfg.deobf(project.files("libs/gregtech-1.12.2-2.8.9-beta-dev.jar"))) // CEu pr 2.8.10
51-
devOnlyNonPublishable(rfg.deobf("curse.maven:gregicality-multiblocks-564858:5508050")) // GCYM 1.2.10
52-
devOnlyNonPublishable(rfg.deobf("curse.maven:forgelin-continuous-456403:6142081")) // Forgelin-Continuous 2.1.10.0
53-
devOnlyNonPublishable(rfg.deobf("curse.maven:ae2-extended-life-570458:5378163")) // AE2UEL 0.56.5
42+
implementation ("codechicken:codechickenlib:3.2.3.358") {
43+
transitive = false
44+
} // CCL 3.2.3.358
45+
46+
implementation (rfg.deobf("gregtech:gregtech:2.8.10-beta")) {
47+
transitive = false
48+
} // CEu 2.8.10
49+
implementation (rfg.deobf("gregicality:GregicalityMultiblocks:1.2.11")) {
50+
transitive = false
51+
} // Version 1.2.11
52+
// runtimeOnly files("libs/gregtech-1.12.2-2.8.9-beta-dev.jar") // CEu pr 2.9.0
53+
implementation ("com.cleanroommc:groovyscript:1.1.3") {
54+
transitive = false
55+
} // Version 1.1.3
56+
implementation rfg.deobf("curse.maven:ae2-extended-life-570458:5378163") // AE2UEL 0.56.5
57+
58+
compileOnly "curse.maven:forgelin-continuous-456403:6359253" // Forgelin-Continuous 2.1.20.0
59+
compileOnly "CraftTweaker2:CraftTweaker2-MC1120-Main:1.12-4.1.20.700" // CrT 4.1.20.700
60+
compileOnly "curse.maven:ctm-267602:2915363" // CTM 1.0.2.31
61+
runtimeOnly "com.cleanroommc:modularui:2.4.3" // MUI 2.4.3
5462

55-
// Debug GTWoodProcessing
63+
// Debug GTWoodProcessing: 1.2.4
5664
if (project.debug_all.toBoolean() || project.debug_gtwp.toBoolean()) {
57-
runtimeOnlyNonPublishable rfg.deobf("curse.maven:gtwoodprocessing-1093753:5731776")
65+
runtimeOnly "curse.maven:gtwoodprocessing-1093753:6334967"
5866
}
5967

60-
// Debug ImplosionNoBomb
61-
compileOnly rfg.deobf("curse.maven:implosionnobomb-1094386:5731331") // ImplosionNoBomb 1.1.0
68+
// Debug ImplosionNoBomb: 1.1.0
69+
compileOnly rfg.deobf("curse.maven:implosionnobomb-1094386:5731331")
6270
if (project.debug_all.toBoolean() || project.debug_inb.toBoolean()) {
63-
runtimeOnlyNonPublishable rfg.deobf("curse.maven:implosionnobomb-1094386:5731331")
71+
runtimeOnly "curse.maven:implosionnobomb-1094386:5731331"
6472
}
6573

66-
// Debug ExtraCells2 Additions
74+
// Debug ExtraCells2 Additions: 1.3.8
6775
if (project.debug_all.toBoolean() || project.debug_aea.toBoolean()) {
68-
runtimeOnlyNonPublishable rfg.deobf("curse.maven:ae-additions-extra-cells-2-fork-493962:3814371") // AEAdditions 1.3.8
76+
runtimeOnly "curse.maven:ae-additions-extra-cells-2-fork-493962:3814371"
6977
}
7078

71-
// Debug NAE2
79+
// Debug NAE2: 1.6.4
7280
if (project.debug_all.toBoolean() || project.debug_nae2.toBoolean()) {
73-
runtimeOnlyNonPublishable rfg.deobf("curse.maven:nae2-884359:5380800") // NAE2 1.6.4
81+
runtimeOnly "curse.maven:nae2-884359:5380800"
82+
}
83+
84+
// Debug AE2FC: 2.6.6-r
85+
if (project.debug_all.toBoolean() || project.debug_ae2fc.toBoolean()) {
86+
runtimeOnly "curse.maven:ae2-fluid-crafting-rework-623955:5751930"
7487
}
7588

76-
// Debug ExtraCPUs
89+
// Debug ExtraCPUs: 1.2.1
7790
if (project.debug_all.toBoolean() || project.debug_extracpus.toBoolean()) {
78-
runtimeOnlyNonPublishable rfg.deobf("curse.maven:extracpus-408089:3479639") // ExtraCPUs 1.2.1
91+
runtimeOnly "curse.maven:extracpus-408089:3479639"
7992
}
8093

8194
// Debug Thaumcraft
8295
if (project.debug_all.toBoolean() || project.debug_thaumcraft.toBoolean()) {
83-
runtimeOnlyNonPublishable rfg.deobf("curse.maven:baubles-227083:2518667") // Baubles 1.5.2
84-
runtimeOnlyNonPublishable rfg.deobf("curse.maven:thaumcraft-223628:2629023") // Thaumcraft 6.1.BETA26
85-
runtimeOnlyNonPublishable rfg.deobf("curse.maven:thaumic-jei-285492:2705304") // Thaumic JEI
96+
runtimeOnly "curse.maven:baubles-227083:2518667" // Baubles 1.5.2
97+
runtimeOnly "curse.maven:thaumcraft-223628:2629023" // Thaumcraft 6.1.BETA26
98+
runtimeOnly "curse.maven:thaumic-jei-285492:2705304" // Thaumic JEI
8699

87-
// Debug Thaumic Energistics Extended Life Fork
100+
// Debug Thaumic Energistics Extended Life Fork: 2.4.4
88101
if (project.debug_all.toBoolean() || project.debug_thaumenergy.toBoolean()) {
89-
runtimeOnlyNonPublishable rfg.deobf("curse.maven:thaumic-energistics-extended-life-fork-983976:5423183") // TEEL Fork 2.4.4
102+
runtimeOnly "curse.maven:thaumic-energistics-extended-life-fork-983976:5423183"
90103
}
91104
}
92105

@@ -100,14 +113,14 @@ dependencies {
100113
compileOnly rfg.deobf("curse.maven:ender-io-conduits-297197:4674233") // EIOC 5.3.72
101114
compileOnly rfg.deobf("curse.maven:ender-io-ae2-conduits-297199:4674234") // EIOCA 5.3.72
102115
if (project.debug_all.toBoolean() || project.debug_eio.toBoolean()) {
103-
runtimeOnlyNonPublishable "info.loenwind.autoconfig:AutoConfig:1.12.2-1.0.2" // AutoConfig 1.0.2
104-
runtimeOnlyNonPublishable "info.loenwind.autosave:AutoSave:1.12.2-1.0.11" // AutoSave 1.0.11
105-
runtimeOnlyNonPublishable rfg.deobf("curse.maven:endercore-231868:4671384") // EnderCore 0.5.78
106-
runtimeOnlyNonPublishable rfg.deobf("curse.maven:ender-io-base-297193:4674231") // EIO 5.3.72
107-
runtimeOnlyNonPublishable rfg.deobf("curse.maven:ender-io-endergy-304346:4674241") // EIOE 5.3.72
108-
runtimeOnlyNonPublishable rfg.deobf("curse.maven:ender-io-machines-297196:4674232") // EIOM 5.3.72
109-
runtimeOnlyNonPublishable rfg.deobf("curse.maven:ender-io-conduits-297197:4674233") // EIOC 5.3.72
110-
runtimeOnlyNonPublishable rfg.deobf("curse.maven:ender-io-ae2-conduits-297199:4674234") // EIOCA 5.3.72
116+
runtimeOnly "info.loenwind.autoconfig:AutoConfig:1.12.2-1.0.2" // AutoConfig 1.0.2
117+
runtimeOnly "info.loenwind.autosave:AutoSave:1.12.2-1.0.11" // AutoSave 1.0.11
118+
runtimeOnly rfg.deobf("curse.maven:endercore-231868:4671384") // EnderCore 0.5.78
119+
runtimeOnly rfg.deobf("curse.maven:ender-io-base-297193:4674231") // EIO 5.3.72
120+
runtimeOnly rfg.deobf("curse.maven:ender-io-endergy-304346:4674241") // EIOE 5.3.72
121+
runtimeOnly rfg.deobf("curse.maven:ender-io-machines-297196:4674232") // EIOM 5.3.72
122+
runtimeOnly rfg.deobf("curse.maven:ender-io-conduits-297197:4674233") // EIOC 5.3.72
123+
runtimeOnly rfg.deobf("curse.maven:ender-io-ae2-conduits-297199:4674234") // EIOCA 5.3.72
111124
}
112125

113126
// Debug Draconic Evolution/Additions
@@ -117,31 +130,31 @@ dependencies {
117130
compileOnly rfg.deobf("curse.maven:draconic-evolution-223565:3431261") // DraconicEvolution 2.3.28.354
118131
compileOnly rfg.deobf("curse.maven:draconicadditions-314515:3514704") // DraconicAdditions 1.17.0.45
119132
if (project.debug_all.toBoolean() || project.debug_deda.toBoolean()) {
120-
runtimeOnlyNonPublishable rfg.deobf("curse.maven:baubles-227083:2518667")
121-
runtimeOnlyNonPublishable rfg.deobf("curse.maven:redstone-flux-270789:2920436")
122-
runtimeOnlyNonPublishable rfg.deobf("curse.maven:brandons-core-231382:3408276")
123-
runtimeOnlyNonPublishable rfg.deobf("curse.maven:draconic-evolution-223565:3431261")
124-
runtimeOnlyNonPublishable rfg.deobf("curse.maven:draconicadditions-314515:3514704")
133+
runtimeOnly rfg.deobf("curse.maven:baubles-227083:2518667")
134+
runtimeOnly rfg.deobf("curse.maven:redstone-flux-270789:2920436")
135+
runtimeOnly rfg.deobf("curse.maven:brandons-core-231382:3408276")
136+
runtimeOnly rfg.deobf("curse.maven:draconic-evolution-223565:3431261")
137+
runtimeOnly rfg.deobf("curse.maven:draconicadditions-314515:3514704")
125138
}
126139

127-
// Debug Avaritia
140+
// Debug Avaritia: 3.3.0.46-hotfix3
128141
if (project.debug_all.toBoolean() || project.debug_avaritia.toBoolean()) {
129-
runtimeOnlyNonPublishable rfg.deobf("curse.maven:avaritia-1-1x-unofficial-1165010:6092956") // Avaritia UEL 3.3.0.41
142+
runtimeOnly rfg.deobf("curse.maven:avaritia-1-1x-unofficial-1165010:6542330")
130143
}
131144

132-
// Debug Chisel
133-
compileOnly rfg.deobf("curse.maven:chisel-235279:2915375") // Chisel 1.0.2.45
145+
// Debug Chisel: 1.0.2.45
146+
compileOnly rfg.deobf("curse.maven:chisel-235279:2915375")
134147
if (project.debug_all.toBoolean() || project.debug_chisel.toBoolean()) {
135-
runtimeOnlyNonPublishable rfg.deobf("curse.maven:chisel-235279:2915375")
148+
runtimeOnly rfg.deobf("curse.maven:chisel-235279:2915375")
136149
}
137150

138-
// Debug GTFO
151+
// Debug GTFO: 1.12.5
139152
if (project.debug_all.toBoolean() || project.debug_gtfo.toBoolean()) {
140-
runtimeOnlyNonPublishable rfg.deobf("curse.maven:gregtech-food-option-477021:6147619") // GTFO 1.12.4
153+
runtimeOnly rfg.deobf("curse.maven:gregtech-food-option-477021:6472136")
141154
}
142155

143156
// Boot error fix
144157
if (project.debug_all.toBoolean() || project.debug_eio.toBoolean()) {
145-
runtimeOnlyNonPublishable (files("libs/EnderCore-1.12.2-0.5.78-core.jar"))
158+
runtimeOnly files("libs/EnderCore-1.12.2-0.5.78-core.jar")
146159
}
147160
}

‎gradle.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ debug_gtwp = false
2626
debug_inb = false
2727
debug_aea = false
2828
debug_nae2 = false
29+
debug_ae2fc = false
2930
debug_extracpus = false
3031
debug_thaumcraft = false
3132
debug_thaumenergy = false

‎repositories.gradle‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,8 @@ repositories {
55
name 'Mod Maven'
66
url 'https://modmaven.dev'
77
}
8+
maven {
9+
name 'GTCEu Maven'
10+
url 'https://maven.gtceu.com'
11+
}
812
}

‎src/main/java/com/github/gtexpert/core/mixins/GTEMixinLoader.java‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
package com.github.gtexpert.core.mixins;
22

3-
import java.util.AbstractMap;
43
import java.util.List;
54
import java.util.Map;
65
import java.util.Objects;
76
import java.util.stream.Collectors;
8-
import java.util.stream.Stream;
97

108
import net.minecraftforge.fml.common.Loader;
119

10+
import com.google.common.collect.ImmutableMap;
11+
1212
import com.github.gtexpert.core.api.GTEValues;
1313
import com.github.gtexpert.core.api.util.GTELog;
1414
import com.github.gtexpert.core.api.util.Mods;
1515

1616
import zone.rong.mixinbooter.ILateMixinLoader;
1717

18+
@SuppressWarnings("unused")
1819
public class GTEMixinLoader implements ILateMixinLoader {
1920

20-
public static final Map<String, Boolean> modMixinsConfig = Stream.of(
21-
new AbstractMap.SimpleImmutableEntry<>(Mods.Names.DRACONIC_ADDITIONS,
22-
Mods.DraconicAdditions.isModLoaded()),
23-
new AbstractMap.SimpleImmutableEntry<>(Mods.Names.GREGTECH,
24-
Mods.GregTech.isModLoaded()))
25-
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
21+
public static final Map<String, Boolean> modMixinsConfig = new ImmutableMap.Builder<String, Boolean>()
22+
.put(Mods.Names.DRACONIC_ADDITIONS, true)
23+
.put(Mods.Names.GREGTECH, true)
24+
.build();
2625

26+
@SuppressWarnings("SimplifyStreamApiCallChains")
2727
@Override
2828
public List<String> getMixinConfigs() {
2929
return modMixinsConfig.keySet().stream().map(mod -> "mixins." + GTEValues.MODID + "." + mod + ".json")
@@ -34,28 +34,29 @@ public List<String> getMixinConfigs() {
3434
public boolean shouldMixinConfigQueue(String mixinConfig) {
3535
String[] parts = mixinConfig.split("\\.");
3636

37-
if (parts.length != 4) {
37+
if (parts.length != 4 && parts.length != 5) {
3838
GTELog.logger.fatal("Mixin Config Check Failed! Invalid Length.");
39-
GTELog.logger.fatal("Mixin Config: " + mixinConfig);
39+
GTELog.logger.fatal("Mixin Config: {}", mixinConfig);
4040
return true;
4141
}
4242

4343
if (!Objects.equals(parts[1], GTEValues.MODID)) {
4444
GTELog.logger.error("Non GTExpertCore Mixin Found in Mixin Queue. This is probably an error. Skipping...");
45-
GTELog.logger.error("Mixin Config: " + mixinConfig);
45+
GTELog.logger.error("Mixin Config: {}", mixinConfig);
4646
return true;
4747
}
4848

4949
if (!Loader.isModLoaded(parts[2])) {
50-
GTELog.logger.error("Mod '" + parts[2] +
51-
"' is not loaded. If this is a normal GTExpertCore instance, this is probably an error.");
52-
GTELog.logger.error("Not Loading Mixin Config " + mixinConfig);
50+
GTELog.logger.error(
51+
"Mod '{}' is not loaded. If this is a normal GTExpertCore instance, this is probably an error.",
52+
parts[2]);
53+
GTELog.logger.error("Not Loading Mixin Config {}", mixinConfig);
5354
return false;
5455
}
5556

5657
if (!modMixinsConfig.containsKey(parts[2]) || !modMixinsConfig.get(parts[2])) {
57-
GTELog.logger.info("Integration for Mod '" + parts[2] + "' is not enabled, or does not exist.");
58-
GTELog.logger.info("Not Loading Mixin Config " + mixinConfig);
58+
GTELog.logger.info("Integration for Mod '{}' is not enabled, or does not exist.", parts[2]);
59+
GTELog.logger.info("Not Loading Mixin Config {}", mixinConfig);
5960
return false;
6061
}
6162

0 commit comments

Comments
 (0)