Skip to content

Commit 0f72608

Browse files
AmronosAmronos
committed
Add and fix compat for cdg
- Fixed biofuel from C:C&A not super heating - Ad Astra fuels and Create: Garnished peanut oil now work in diesel generators - Gradle cleanup
1 parent 325c719 commit 0f72608

10 files changed

Lines changed: 157 additions & 64 deletions

File tree

‎build.gradle‎

Lines changed: 41 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,14 @@ minecraft {
7575
sourceSets.main.resources { srcDir 'src/generated/resources' }
7676

7777
repositories {
78+
maven {
79+
name = 'Create Mod Maven'
80+
url = 'https://maven.createmod.net'
81+
}
82+
maven {
83+
name = 'Fuzss Maven'
84+
url = 'https://raw.githubusercontent.com/Fuzss/modresources/main/maven/'
85+
}
7886
maven {
7987
name = 'tterrag maven'
8088
url = 'https://maven.tterrag.com/'
@@ -93,26 +101,36 @@ repositories {
93101
name = "Modrinth Maven"
94102
url = "https://api.modrinth.com/maven"
95103
}
104+
maven {
105+
name = "Curseforge Maven"
106+
url = "https://cursemaven.com"
107+
}
96108
}
97109

98110
dependencies {
99111
minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
100112

101113
annotationProcessor 'org.spongepowered:mixin:0.8.5:processor'
102114

103-
implementation fg.deobf("com.simibubi.create:create-${create_minecraft_version}:${create_version}:slim") { transitive = false }
104-
implementation fg.deobf("com.jozufozu.flywheel:flywheel-forge-${flywheel_minecraft_version}:${flywheel_version}")
105-
implementation fg.deobf("com.tterrag.registrate:Registrate:${registrate_version}")
115+
implementation(fg.deobf("com.simibubi.create:create-${minecraft_version}:${create_version}:slim") { transitive = false })
116+
implementation(fg.deobf("net.createmod.ponder:Ponder-Forge-${minecraft_version}:${ponder_version}"))
117+
compileOnly(fg.deobf("dev.engine-room.flywheel:flywheel-forge-api-${minecraft_version}:${flywheel_version}"))
118+
runtimeOnly(fg.deobf("dev.engine-room.flywheel:flywheel-forge-${minecraft_version}:${flywheel_version}"))
119+
implementation(fg.deobf("com.tterrag.registrate:Registrate:${registrate_version}"))
120+
121+
compileOnly(annotationProcessor("io.github.llamalad7:mixinextras-common:0.4.1"))
122+
implementation("io.github.llamalad7:mixinextras-forge:0.4.1")
106123

107124
// compile against the JEI API but do not include it at runtime
108-
compileOnly(fg.deobf("mezz.jei:jei-${mc_version}-common-api:${jei_version}"))
109-
compileOnly(fg.deobf("mezz.jei:jei-${mc_version}-forge-api:${jei_version}"))
125+
compileOnly(fg.deobf("mezz.jei:jei-${minecraft_version}-common-api:${jei_version}"))
126+
compileOnly(fg.deobf("mezz.jei:jei-${minecraft_version}-forge-api:${jei_version}"))
110127
// at runtime, use the full JEI jar for Forge
111-
runtimeOnly(fg.deobf("mezz.jei:jei-${mc_version}-forge:${jei_version}"))
128+
runtimeOnly(fg.deobf("mezz.jei:jei-${minecraft_version}-forge:${jei_version}"))
112129

113130
implementation fg.deobf("com.almostreliable.mods:almostunified-forge:${almostunified_version}")
114131

115-
implementation fg.deobf("maven.modrinth:create-tfmg:0.9.3-1.20.1")
132+
implementation fg.deobf("maven.modrinth:create-diesel-generators:${createdieselgenerators_version}")
133+
implementation fg.deobf("curse.maven:create-industry-693815:6255138")
116134
}
117135

118136

@@ -123,11 +141,23 @@ dependencies {
123141
// See https://docs.gradle.org/current/dsl/org.gradle.language.jvm.tasks.ProcessResources.html
124142
tasks.named('processResources', ProcessResources).configure {
125143
var replaceProperties = [
126-
minecraft_version: minecraft_version, minecraft_version_range: minecraft_version_range,
127-
forge_version: forge_version, forge_version_range: forge_version_range,
144+
minecraft_version: minecraft_version,
145+
minecraft_version_range: minecraft_version_range,
146+
forge_version: forge_version,
147+
forge_version_range: forge_version_range,
128148
loader_version_range: loader_version_range,
129-
mod_id: mod_id, mod_name: mod_name, mod_license: mod_license, mod_version: mod_version,
130-
mod_authors: mod_authors, mod_description: mod_description,
149+
mod_id: mod_id,
150+
mod_name: mod_name,
151+
mod_license: mod_license,
152+
mod_version: mod_version,
153+
mod_authors: mod_authors,
154+
mod_description: mod_description,
155+
create_version: create_version,
156+
create_version_range: create_version_range,
157+
jei_version: jei_version,
158+
almostunified_version: almostunified_version,
159+
createdieselgenerators_version: createdieselgenerators_version,
160+
tfmg_version: tfmg_version
131161
]
132162
inputs.properties replaceProperties
133163

‎gradle.properties‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,12 @@ mod_authors=Amronos
2626
mod_description=Adds compatibility for and between different create addons.
2727

2828

29-
create_minecraft_version = 1.20.1
30-
flywheel_minecraft_version = 1.20.1
31-
create_version = 0.5.1.h-48
32-
flywheel_version = 0.6.11-13
29+
create_version = 6.0.3-71
30+
create_version_range = [6.0.3,)
31+
ponder_version = 1.0.51
32+
flywheel_version = 1.0.1
3333
registrate_version = MC1.20-1.3.3
34-
mc_version=1.20.1
35-
jei_version=15.3.0.8
36-
jei_version_range=[15.3.0.8, )
34+
jei_version=15.20.0.106
3735
almostunified_version=1.20.1-0.9.3
38-
39-
githubUser = amronos
40-
githubRepo = createaddoncompatibility
36+
createdieselgenerators_version = 1.20.1-1.3.1
37+
tfmg_version = 0.9.3-1.20.1

‎src/generated/resources/data/forge/tags/fluids/ethanol.json‎

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

‎src/main/java/com/amronos/createaddoncompatibility/data/datagen/ModFluidTagGenerator.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,6 @@ protected void addTags(HolderLookup.Provider pProvider) {
2525
.addOptional(new ResourceLocation("pneumaticcraft", "oil"))
2626
.addOptional(new ResourceLocation("pneumaticcraft", "flowing_oil"))
2727
;
28-
this.tag(ForgeTags.Fluids.ETHANOL)
29-
.addOptional(new ResourceLocation("createaddition", "bioethanol"))
30-
.addOptional(new ResourceLocation("createaddition", "flowing_bioethanol"))
31-
;
3228
this.tag(ForgeTags.Fluids.LIQUID_PLASTIC)
3329
.addOptional(new ResourceLocation("pneumaticcraft", "plastic"))
3430
.addOptional(new ResourceLocation("pneumaticcraft", "flowing_plastic"))

‎src/main/java/com/amronos/createaddoncompatibility/data/tags/ForgeTags.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ public class ForgeTags {
1111

1212
public static class Fluids {
1313
public static final TagKey<Fluid> CRUDE_OIL = tag("crude_oil");
14-
public static final TagKey<Fluid> ETHANOL = tag("ethanol");
1514
public static final TagKey<Fluid> LIQUID_PLASTIC = tag("liquid_plastic");
1615
public static final TagKey<Fluid> LUBRICANT = tag("lubricant");
1716

‎src/main/resources/META-INF/mods.toml‎

Lines changed: 33 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,145 +1,152 @@
11
modLoader="javafml"
2-
loaderVersion= "[47,)"
2+
loaderVersion= "${loader_version_range}"
33

44
license="GNU Lesser General Public License v3.0"
5-
issueTrackerURL="https://github.com/Amronos/create-addon-compatibility/issues"
5+
issueTrackerURL="https://github.com/Amronos/${mod_id}/issues"
66
showAsResourcePack=false
77

88
[[mods]]
9-
modId="createaddoncompatibility"
9+
modId="${mod_id}"
1010
version="${mod_version}"
1111
displayName="Create: Addon Compatibility"
1212
updateJSONURL="https://api.modrinth.com/updates/QgrK9rtJ/forge_updates.json"
13-
displayURL="https://modrinth.com/mod/create-addon-compatibility"
13+
displayURL="https://modrinth.com/mod/${mod_id}"
1414
logoFile="logo.png"
1515
#credits=""
1616
authors="Amronos"
1717
description="Adds compatibility for and between different create addons."
1818

1919

2020
[dependencies]
21-
[[dependencies.createaddoncompatibility]]
21+
[[dependencies.${mod_id}]]
2222
modId="minecraft"
2323
mandatory=true
24-
versionRange="[1.20.1]"
24+
versionRange="${minecraft_version_range}"
2525
ordering="NONE"
2626
side="BOTH"
2727

28-
[[dependencies.createaddoncompatibility]]
28+
[[dependencies.${mod_id}]]
2929
modId="forge"
3030
mandatory=true
31-
versionRange="[47,)"
31+
versionRange="${forge_version_range}"
3232
ordering="NONE"
3333
side="BOTH"
3434

35-
[[dependencies.createaddoncompatibility]]
35+
[[dependencies.${mod_id}]]
3636
modId="almostunified"
3737
mandatory=true
38-
versionRange="[1.20.1-0.9.3,)"
38+
versionRange="[${almostunified_version},)"
3939
ordering="AFTER"
4040
side="BOTH"
4141
referralUrl="https://modrinth.com/mod/almost-unified"
4242

43-
[[dependencies.createaddoncompatibility]]
43+
[[dependencies.${mod_id}]]
4444
modId="ad_astra"
4545
mandatory=false
4646
versionRange="[1.15.18,)"
4747
ordering="AFTER"
4848
side="BOTH"
4949
referralUrl="https://modrinth.com/mod/ad-astra"
5050

51-
[[dependencies.createaddoncompatibility]]
51+
[[dependencies.${mod_id}]]
5252
modId="copycats"
5353
mandatory=false
5454
versionRange="[1.3.8+mc.1.20.1-forge,)"
5555
ordering="AFTER"
5656
side="BOTH"
5757
referralUrl="https://modrinth.com/mod/copycats"
5858

59-
[[dependencies.createaddoncompatibility]]
59+
[[dependencies.${mod_id}]]
6060
modId="create"
6161
mandatory=true
62-
versionRange="[0.5.1.e,)"
62+
versionRange="${create_version_range}"
6363
ordering="AFTER"
6464
side="BOTH"
6565
referralUrl="https://modrinth.com/mod/create"
6666

67-
[[dependencies.createaddoncompatibility]]
67+
[[dependencies.${mod_id}]]
6868
modId="createaddition"
6969
mandatory=false
7070
versionRange="[1.20.1-1.2.2,)"
7171
ordering="AFTER"
7272
side="BOTH"
7373
referralUrl="https://modrinth.com/mod/createaddition"
7474

75-
[[dependencies.createaddoncompatibility]]
75+
[[dependencies.${mod_id}]]
7676
modId="create_connected"
7777
mandatory=false
7878
versionRange="[0.8.2-mc1.20.1,)"
7979
ordering="AFTER"
8080
side="BOTH"
8181
referralUrl="https://modrinth.com/mod/create-connected"
8282

83-
[[dependencies.createaddoncompatibility]]
83+
[[dependencies.${mod_id}]]
8484
modId="create_dd"
8585
mandatory=false
8686
versionRange="[0.1a.Release-Early-Dev,)"
8787
ordering="AFTER"
8888
side="BOTH"
8989
referralUrl="https://modrinth.com/mod/create-dreams-and-desires"
9090

91-
[[dependencies.createaddoncompatibility]]
91+
[[dependencies.${mod_id}]]
9292
modId="createdieselgenerators"
9393
mandatory=false
94-
versionRange="[1.20.1-1.2h,)"
94+
versionRange="[${createdieselgenerators_version},)"
9595
ordering="AFTER"
9696
side="BOTH"
9797
referralUrl="https://modrinth.com/mod/create-diesel-generators"
9898

99-
[[dependencies.createaddoncompatibility]]
99+
[[dependencies.${mod_id}]]
100100
modId="createutilities"
101101
mandatory=false
102102
versionRange="[0.3.0,)"
103103
ordering="AFTER"
104104
side="BOTH"
105105
referralUrl="https://modrinth.com/mod/create-utilities"
106106

107-
[[dependencies.createaddoncompatibility]]
107+
[[dependencies.${mod_id}]]
108108
modId="destroy"
109109
mandatory=false
110110
versionRange="[0.1.0-snapshot-6,)"
111111
ordering="AFTER"
112112
side="BOTH"
113113
referralUrl="https://modrinth.com/mod/destroy"
114114

115-
[[dependencies.createaddoncompatibility]]
115+
[[dependencies.${mod_id}]]
116116
modId="garnished"
117117
mandatory=false
118118
versionRange="[1.8.3,)"
119119
ordering="AFTER"
120120
side="BOTH"
121121
referralUrl="https://modrinth.com/mod/create-garnished"
122122

123-
[[dependencies.createaddoncompatibility]]
123+
[[dependencies.${mod_id}]]
124+
modId="jei"
125+
mandatory=false
126+
versionRange="[${jei_version},)"
127+
ordering="AFTER"
128+
side="CLIENT"
129+
130+
[[dependencies.${mod_id}]]
124131
modId="pneumaticcraft"
125132
mandatory=false
126133
versionRange="[6.0.14,)"
127134
ordering="AFTER"
128135
side="BOTH"
129136
referralUrl="https://modrinth.com/mod/pneumaticcraft-repressurized"
130137

131-
[[dependencies.createaddoncompatibility]]
138+
[[dependencies.${mod_id}]]
132139
modId="railways"
133140
mandatory=false
134141
versionRange="[1.6.3,)"
135142
ordering="AFTER"
136143
side="BOTH"
137144
referralUrl="https://modrinth.com/mod/create-steam-n-rails"
138145

139-
[[dependencies.createaddoncompatibility]]
146+
[[dependencies.${mod_id}]]
140147
modId="tfmg"
141148
mandatory=false
142-
versionRange="[0.8.0b,)"
149+
versionRange="[${tfmg_version},)"
143150
ordering="AFTER"
144151
side="BOTH"
145152
referralUrl="https://modrinth.com/mod/create-tfmg"

‎src/main/resources/data/createaddoncompatibility/diesel_engine_fuel_type/ad_astra-cryo_fuel.json‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"fluid": "ad_astra:cryo_fuel",
3+
"sound_speed": 1,
4+
"normal": {
5+
"speed": 96.0,
6+
"strength": 2048.0,
7+
"burn_rate": 2
8+
},
9+
"modular": {
10+
"speed": 96.0,
11+
"strength": 3072.0,
12+
"burn_rate": 2
13+
},
14+
"huge": {
15+
"speed": 128.0,
16+
"strength": 4096.0,
17+
"burn_rate": 2
18+
}
19+
}

‎src/main/resources/data/createaddoncompatibility/diesel_engine_fuel_type/ad_astra-fuel.json‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"fluid": "ad_astra:fuel",
3+
"sound_speed": 1,
4+
"normal": {
5+
"speed": 96.0,
6+
"strength": 2048.0,
7+
"burn_rate": 2
8+
},
9+
"modular": {
10+
"speed": 96.0,
11+
"strength": 3072.0,
12+
"burn_rate": 2
13+
},
14+
"huge": {
15+
"speed": 128.0,
16+
"strength": 4096.0,
17+
"burn_rate": 2
18+
}
19+
}

‎src/main/resources/data/createaddoncompatibility/diesel_engine_fuel_type/createaddition-bioethanol.json‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"fluid": "createaddition:bioethanol",
3+
"sound_speed": 1,
4+
"normal": {
5+
"speed": 96.0,
6+
"strength": 2048.0,
7+
"burn_rate": 1
8+
},
9+
"modular": {
10+
"speed": 96.0,
11+
"strength": 2048.0,
12+
"burn_rate": 1
13+
},
14+
"huge": {
15+
"speed": 128.0,
16+
"strength": 8192.0,
17+
"burn_rate": 1
18+
}
19+
}

0 commit comments

Comments
 (0)