Skip to content

Commit

Permalink
Thermal Expansion compatability on 1.20.1
Browse files Browse the repository at this point in the history
  • Loading branch information
luxtracon committed Jan 15, 2024
1 parent c13b0f8 commit 1baa0cb
Show file tree
Hide file tree
Showing 133 changed files with 3,096 additions and 7 deletions.
8 changes: 8 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,21 @@ buildscript {

dependencies {
annotationProcessor 'org.spongepowered:mixin:0.8.5:processor'
implementation fg.deobf("curse.maven:cofh-core-69162:${cofhcore}")
implementation fg.deobf("curse.maven:create-328085:${create}")
implementation fg.deobf("curse.maven:immersive-engineering-231951:${immersiveengineering}")
implementation fg.deobf("curse.maven:industrial-foregoing-266515:${industrialforegoing}")
implementation fg.deobf("curse.maven:jei-238222:${jei}")
implementation fg.deobf("curse.maven:mekanism-268560:${mekanism}")
implementation fg.deobf("curse.maven:patchouli-306770:${patchouli}")
implementation fg.deobf("curse.maven:the-one-probe-245211:${top}")
implementation fg.deobf("curse.maven:thermal-cultivation-271835:${thermalcultivation}")
implementation fg.deobf("curse.maven:thermal-dynamics-227443:${thermaldynamics}")
implementation fg.deobf("curse.maven:thermal-expansion-69163:${thermalexpansion}")
implementation fg.deobf("curse.maven:thermal-foundation-222880:${thermalfoundation}")
implementation fg.deobf("curse.maven:thermal-innovation-291737:${thermalinnovation}")
implementation fg.deobf("curse.maven:thermal-integration-626708:${thermalintegration}")
implementation fg.deobf("curse.maven:thermal-locomotion-406959:${thermallocomotion}")
implementation fg.deobf("curse.maven:titanium-287342:${titanium}")
minecraft "net.minecraftforge:forge:${minecraft}-${forge}"
}
Expand Down
22 changes: 15 additions & 7 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,16 +1,24 @@
org.gradle.jvmargs=-Xmx4G
org.gradle.daemon=false

floralis=10.4.0
forge=47.2.1
floralis=10.5.0
forge=47.2.20
minecraft=1.20.1
parchment=2023.09.03

create=4762216
cofhcore=4970669
create=4835191
immersiveengineering=4782978
industrialforegoing=4709710
industrialforegoing=4990583
jei=4712868
mekanism=4807067
patchouli=4636277
titanium=4786634
mekanism=4866575
patchouli=4966125
thermalcultivation=4970697
thermaldynamics=4970699
thermalexpansion=4970700
thermalfoundation=4979840
thermalinnovation=4970704
thermalintegration=4970705
thermallocomotion=4970706
titanium=4984333
top=4629624
17 changes: 17 additions & 0 deletions src/main/resources/data/thermal/recipes/catalyst/plant_fibers.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"type": "thermal:insolator_catalyst",
"conditions": [
{
"type": "forge:mod_loaded",
"modid": "thermal"
}
],
"ingredient": {
"item": "floralis:plant_fibers"
},
"primary_mod": 1.5,
"secondary_mod": 1.5,
"energy_mod": 0.8,
"min_chance": 0.1,
"use_chance": 0.5
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"type": "thermal:insolator",
"conditions": [
{
"type": "forge:mod_loaded",
"modid": "thermal"
}
],
"ingredient": {
"item": "floralis:black_cactus"
},
"result": [
{
"item": "floralis:black_cactus",
"chance": 2.0
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"type": "thermal:insolator",
"conditions": [
{
"type": "forge:mod_loaded",
"modid": "thermal"
}
],
"ingredient": {
"item": "floralis:black_cactus_seeds"
},
"result": [
{
"item": "floralis:black_cactus_seeds",
"chance": 1.0
},
{
"item": "floralis:black_petals",
"chance": 1.0
},
{
"item": "floralis:plant_fibers",
"chance": 1.0
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"type": "thermal:insolator",
"conditions": [
{
"type": "forge:mod_loaded",
"modid": "thermal"
}
],
"ingredient": {
"item": "floralis:black_flower"
},
"result": [
{
"item": "floralis:black_flower",
"chance": 2.0
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"type": "thermal:insolator",
"conditions": [
{
"type": "forge:mod_loaded",
"modid": "thermal"
}
],
"ingredient": {
"item": "floralis:black_flower_seeds"
},
"result": [
{
"item": "floralis:black_flower_seeds",
"chance": 1.0
},
{
"item": "floralis:black_petals",
"chance": 1.0
},
{
"item": "floralis:plant_fibers",
"chance": 1.0
}
]
}
18 changes: 18 additions & 0 deletions src/main/resources/data/thermal/recipes/insolator/blue_cactus.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"type": "thermal:insolator",
"conditions": [
{
"type": "forge:mod_loaded",
"modid": "thermal"
}
],
"ingredient": {
"item": "floralis:blue_cactus"
},
"result": [
{
"item": "floralis:blue_cactus",
"chance": 2.0
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"type": "thermal:insolator",
"conditions": [
{
"type": "forge:mod_loaded",
"modid": "thermal"
}
],
"ingredient": {
"item": "floralis:blue_cactus_seeds"
},
"result": [
{
"item": "floralis:blue_cactus_seeds",
"chance": 1.0
},
{
"item": "floralis:blue_petals",
"chance": 1.0
},
{
"item": "floralis:plant_fibers",
"chance": 1.0
}
]
}
18 changes: 18 additions & 0 deletions src/main/resources/data/thermal/recipes/insolator/blue_flower.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"type": "thermal:insolator",
"conditions": [
{
"type": "forge:mod_loaded",
"modid": "thermal"
}
],
"ingredient": {
"item": "floralis:blue_flower"
},
"result": [
{
"item": "floralis:blue_flower",
"chance": 2.0
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"type": "thermal:insolator",
"conditions": [
{
"type": "forge:mod_loaded",
"modid": "thermal"
}
],
"ingredient": {
"item": "floralis:blue_flower_seeds"
},
"result": [
{
"item": "floralis:blue_flower_seeds",
"chance": 1.0
},
{
"item": "floralis:blue_petals",
"chance": 1.0
},
{
"item": "floralis:plant_fibers",
"chance": 1.0
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"type": "thermal:insolator",
"conditions": [
{
"type": "forge:mod_loaded",
"modid": "thermal"
}
],
"ingredient": {
"item": "floralis:brown_cactus"
},
"result": [
{
"item": "floralis:brown_cactus",
"chance": 2.0
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"type": "thermal:insolator",
"conditions": [
{
"type": "forge:mod_loaded",
"modid": "thermal"
}
],
"ingredient": {
"item": "floralis:brown_cactus_seeds"
},
"result": [
{
"item": "floralis:brown_cactus_seeds",
"chance": 1.0
},
{
"item": "floralis:brown_petals",
"chance": 1.0
},
{
"item": "floralis:plant_fibers",
"chance": 1.0
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"type": "thermal:insolator",
"conditions": [
{
"type": "forge:mod_loaded",
"modid": "thermal"
}
],
"ingredient": {
"item": "floralis:brown_flower"
},
"result": [
{
"item": "floralis:brown_flower",
"chance": 2.0
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"type": "thermal:insolator",
"conditions": [
{
"type": "forge:mod_loaded",
"modid": "thermal"
}
],
"ingredient": {
"item": "floralis:brown_flower_seeds"
},
"result": [
{
"item": "floralis:brown_flower_seeds",
"chance": 1.0
},
{
"item": "floralis:brown_petals",
"chance": 1.0
},
{
"item": "floralis:plant_fibers",
"chance": 1.0
}
]
}
18 changes: 18 additions & 0 deletions src/main/resources/data/thermal/recipes/insolator/cyan_cactus.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"type": "thermal:insolator",
"conditions": [
{
"type": "forge:mod_loaded",
"modid": "thermal"
}
],
"ingredient": {
"item": "floralis:cyan_cactus"
},
"result": [
{
"item": "floralis:cyan_cactus",
"chance": 2.0
}
]
}
Loading

0 comments on commit 1baa0cb

Please sign in to comment.