Skip to content

Commit 7107d77

Browse files
GhostipediaGhostipedia
committed
:)
1 parent b357c0b commit 7107d77

File tree

10 files changed

+345
-3
lines changed

10 files changed

+345
-3
lines changed

‎dependencies.gradle‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,11 @@ dependencies {
4444
modImplementation(forge.curios)
4545

4646
// AE2
47-
modCompileOnly(forge.ae2)
47+
jarJar(modImplementation(forge.ae2.get()))
48+
modImplementation(forge.guideme)
49+
50+
51+
4852
modCompileOnly(forge.modernAe2Additions)
4953
modCompileOnly(forge.modernAe2Additions)
5054
modCompileOnly(forge.modernAe2Additions)

‎gradle/forge.versions.toml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ mixinExtras = "0.2.0"
66

77
jei = "15.20.0.105"
88
emi = "1.1.13+1.20.1"
9-
ae2 = "15.3.3"
9+
ae2 = "15.4.7-cosmolite.1"
10+
guideme = "20.1.11"
1011
kubejs = "2001.6.5-build.16"
1112
rhino = "2001.2.3-build.10"
1213
architectury = "9.2.14"
@@ -66,6 +67,7 @@ jei-forge-impl = { module = "mezz.jei:jei-1.20.1-forge", version.ref
6667
emi = { module = "dev.emi:emi-forge", version.ref = "emi" }
6768

6869
ae2 = { module = "appeng:appliedenergistics2-forge", version.ref = "ae2" }
70+
guideme = { module = "org.appliedenergistics:guideme", version.ref = "guideme" }
6971
kubejs = { module = "dev.latvian.mods:kubejs-forge", version.ref = "kubejs" }
7072
rhino = { module = "dev.latvian.mods:rhino-forge", version.ref = "rhino" }
7173
architectury = { module = "dev.architectury:architectury-forge", version.ref = "architectury" }

‎gradle/scripts/repositories.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ repositories {
1313
url = 'https://maven.gtceu.com'
1414
content {
1515
includeGroup 'com.gregtechceu.gtceu'
16+
includeGroup 'appeng'
1617
}
1718
}
1819
maven { // Curse Forge File

‎src/generated/resources/assets/cosmiccore/blockstates/celest_bore_new.json‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
{
2+
"variants": {
3+
"facing=east,upwards_facing=east": {
4+
"gtceu:z": 270,
5+
"model": "cosmiccore:block/machine/celest_bore_new",
6+
"y": 90
7+
},
8+
"facing=east,upwards_facing=north": {
9+
"model": "cosmiccore:block/machine/celest_bore_new",
10+
"y": 90
11+
},
12+
"facing=east,upwards_facing=south": {
13+
"gtceu:z": 180,
14+
"model": "cosmiccore:block/machine/celest_bore_new",
15+
"y": 90
16+
},
17+
"facing=east,upwards_facing=west": {
18+
"gtceu:z": 90,
19+
"model": "cosmiccore:block/machine/celest_bore_new",
20+
"y": 90
21+
},
22+
"facing=north,upwards_facing=east": {
23+
"gtceu:z": 270,
24+
"model": "cosmiccore:block/machine/celest_bore_new"
25+
},
26+
"facing=north,upwards_facing=north": {
27+
"model": "cosmiccore:block/machine/celest_bore_new"
28+
},
29+
"facing=north,upwards_facing=south": {
30+
"gtceu:z": 180,
31+
"model": "cosmiccore:block/machine/celest_bore_new"
32+
},
33+
"facing=north,upwards_facing=west": {
34+
"gtceu:z": 90,
35+
"model": "cosmiccore:block/machine/celest_bore_new"
36+
},
37+
"facing=south,upwards_facing=east": {
38+
"gtceu:z": 270,
39+
"model": "cosmiccore:block/machine/celest_bore_new",
40+
"y": 180
41+
},
42+
"facing=south,upwards_facing=north": {
43+
"model": "cosmiccore:block/machine/celest_bore_new",
44+
"y": 180
45+
},
46+
"facing=south,upwards_facing=south": {
47+
"gtceu:z": 180,
48+
"model": "cosmiccore:block/machine/celest_bore_new",
49+
"y": 180
50+
},
51+
"facing=south,upwards_facing=west": {
52+
"gtceu:z": 90,
53+
"model": "cosmiccore:block/machine/celest_bore_new",
54+
"y": 180
55+
},
56+
"facing=west,upwards_facing=east": {
57+
"gtceu:z": 270,
58+
"model": "cosmiccore:block/machine/celest_bore_new",
59+
"y": 270
60+
},
61+
"facing=west,upwards_facing=north": {
62+
"model": "cosmiccore:block/machine/celest_bore_new",
63+
"y": 270
64+
},
65+
"facing=west,upwards_facing=south": {
66+
"gtceu:z": 180,
67+
"model": "cosmiccore:block/machine/celest_bore_new",
68+
"y": 270
69+
},
70+
"facing=west,upwards_facing=west": {
71+
"gtceu:z": 90,
72+
"model": "cosmiccore:block/machine/celest_bore_new",
73+
"y": 270
74+
}
75+
}
76+
}

‎src/generated/resources/assets/cosmiccore/blockstates/large_laminator.json‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
{
2+
"variants": {
3+
"facing=east,upwards_facing=east": {
4+
"gtceu:z": 270,
5+
"model": "cosmiccore:block/machine/large_laminator",
6+
"y": 90
7+
},
8+
"facing=east,upwards_facing=north": {
9+
"model": "cosmiccore:block/machine/large_laminator",
10+
"y": 90
11+
},
12+
"facing=east,upwards_facing=south": {
13+
"gtceu:z": 180,
14+
"model": "cosmiccore:block/machine/large_laminator",
15+
"y": 90
16+
},
17+
"facing=east,upwards_facing=west": {
18+
"gtceu:z": 90,
19+
"model": "cosmiccore:block/machine/large_laminator",
20+
"y": 90
21+
},
22+
"facing=north,upwards_facing=east": {
23+
"gtceu:z": 270,
24+
"model": "cosmiccore:block/machine/large_laminator"
25+
},
26+
"facing=north,upwards_facing=north": {
27+
"model": "cosmiccore:block/machine/large_laminator"
28+
},
29+
"facing=north,upwards_facing=south": {
30+
"gtceu:z": 180,
31+
"model": "cosmiccore:block/machine/large_laminator"
32+
},
33+
"facing=north,upwards_facing=west": {
34+
"gtceu:z": 90,
35+
"model": "cosmiccore:block/machine/large_laminator"
36+
},
37+
"facing=south,upwards_facing=east": {
38+
"gtceu:z": 270,
39+
"model": "cosmiccore:block/machine/large_laminator",
40+
"y": 180
41+
},
42+
"facing=south,upwards_facing=north": {
43+
"model": "cosmiccore:block/machine/large_laminator",
44+
"y": 180
45+
},
46+
"facing=south,upwards_facing=south": {
47+
"gtceu:z": 180,
48+
"model": "cosmiccore:block/machine/large_laminator",
49+
"y": 180
50+
},
51+
"facing=south,upwards_facing=west": {
52+
"gtceu:z": 90,
53+
"model": "cosmiccore:block/machine/large_laminator",
54+
"y": 180
55+
},
56+
"facing=west,upwards_facing=east": {
57+
"gtceu:z": 270,
58+
"model": "cosmiccore:block/machine/large_laminator",
59+
"y": 270
60+
},
61+
"facing=west,upwards_facing=north": {
62+
"model": "cosmiccore:block/machine/large_laminator",
63+
"y": 270
64+
},
65+
"facing=west,upwards_facing=south": {
66+
"gtceu:z": 180,
67+
"model": "cosmiccore:block/machine/large_laminator",
68+
"y": 270
69+
},
70+
"facing=west,upwards_facing=west": {
71+
"gtceu:z": 90,
72+
"model": "cosmiccore:block/machine/large_laminator",
73+
"y": 270
74+
}
75+
}
76+
}

‎src/generated/resources/assets/cosmiccore/models/block/machine/celest_bore_new.json‎

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
{
2+
"parent": "minecraft:block/block",
3+
"loader": "gtceu:machine",
4+
"machine": "cosmiccore:celest_bore_new",
5+
"texture_overrides": {
6+
"all": "cosmiccore:block/casings/solid/reinforced_naquadria_casing"
7+
},
8+
"variants": {
9+
"is_formed=false,recipe_logic_status=idle": {
10+
"model": {
11+
"parent": "gtceu:block/machine/template/cube_all/sided",
12+
"textures": {
13+
"all": "cosmiccore:block/casings/solid/reinforced_naquadria_casing",
14+
"overlay_front": "gtceu:block/multiblock/generator/large_gas_turbine/overlay_front",
15+
"overlay_front_emissive": "gtceu:block/multiblock/generator/large_gas_turbine/overlay_front_emissive"
16+
}
17+
}
18+
},
19+
"is_formed=false,recipe_logic_status=suspend": {
20+
"model": {
21+
"parent": "gtceu:block/machine/template/cube_all/sided",
22+
"textures": {
23+
"all": "cosmiccore:block/casings/solid/reinforced_naquadria_casing",
24+
"overlay_front": "gtceu:block/multiblock/generator/large_gas_turbine/overlay_front_paused",
25+
"overlay_front_emissive": "gtceu:block/multiblock/generator/large_gas_turbine/overlay_front_paused_emissive"
26+
}
27+
}
28+
},
29+
"is_formed=false,recipe_logic_status=waiting": {
30+
"model": {
31+
"parent": "gtceu:block/machine/template/cube_all/sided",
32+
"textures": {
33+
"all": "cosmiccore:block/casings/solid/reinforced_naquadria_casing",
34+
"overlay_front": "gtceu:block/multiblock/generator/large_gas_turbine/overlay_front_active",
35+
"overlay_front_emissive": "gtceu:block/multiblock/generator/large_gas_turbine/overlay_front_active_emissive"
36+
}
37+
}
38+
},
39+
"is_formed=false,recipe_logic_status=working": {
40+
"model": {
41+
"parent": "gtceu:block/machine/template/cube_all/sided",
42+
"textures": {
43+
"all": "cosmiccore:block/casings/solid/reinforced_naquadria_casing",
44+
"overlay_front": "gtceu:block/multiblock/generator/large_gas_turbine/overlay_front_active",
45+
"overlay_front_emissive": "gtceu:block/multiblock/generator/large_gas_turbine/overlay_front_active_emissive"
46+
}
47+
}
48+
},
49+
"is_formed=true,recipe_logic_status=idle": {
50+
"model": {
51+
"parent": "gtceu:block/machine/template/cube_all/sided",
52+
"textures": {
53+
"all": "cosmiccore:block/casings/solid/reinforced_naquadria_casing",
54+
"overlay_front": "gtceu:block/multiblock/generator/large_gas_turbine/overlay_front",
55+
"overlay_front_emissive": "gtceu:block/multiblock/generator/large_gas_turbine/overlay_front_emissive"
56+
}
57+
}
58+
},
59+
"is_formed=true,recipe_logic_status=suspend": {
60+
"model": {
61+
"parent": "gtceu:block/machine/template/cube_all/sided",
62+
"textures": {
63+
"all": "cosmiccore:block/casings/solid/reinforced_naquadria_casing",
64+
"overlay_front": "gtceu:block/multiblock/generator/large_gas_turbine/overlay_front_paused",
65+
"overlay_front_emissive": "gtceu:block/multiblock/generator/large_gas_turbine/overlay_front_paused_emissive"
66+
}
67+
}
68+
},
69+
"is_formed=true,recipe_logic_status=waiting": {
70+
"model": {
71+
"parent": "gtceu:block/machine/template/cube_all/sided",
72+
"textures": {
73+
"all": "cosmiccore:block/casings/solid/reinforced_naquadria_casing",
74+
"overlay_front": "gtceu:block/multiblock/generator/large_gas_turbine/overlay_front_active",
75+
"overlay_front_emissive": "gtceu:block/multiblock/generator/large_gas_turbine/overlay_front_active_emissive"
76+
}
77+
}
78+
},
79+
"is_formed=true,recipe_logic_status=working": {
80+
"model": {
81+
"parent": "gtceu:block/machine/template/cube_all/sided",
82+
"textures": {
83+
"all": "cosmiccore:block/casings/solid/reinforced_naquadria_casing",
84+
"overlay_front": "gtceu:block/multiblock/generator/large_gas_turbine/overlay_front_active",
85+
"overlay_front_emissive": "gtceu:block/multiblock/generator/large_gas_turbine/overlay_front_active_emissive"
86+
}
87+
}
88+
}
89+
}
90+
}

‎src/generated/resources/assets/cosmiccore/models/block/machine/large_laminator.json‎

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
{
2+
"parent": "minecraft:block/block",
3+
"loader": "gtceu:machine",
4+
"machine": "cosmiccore:large_laminator",
5+
"texture_overrides": {
6+
"all": "cosmiccore:block/casings/solid/vomahine_certified_chemically_resistant_casing"
7+
},
8+
"variants": {
9+
"is_formed=false,recipe_logic_status=idle": {
10+
"model": {
11+
"parent": "gtceu:block/machine/template/cube_all/sided",
12+
"textures": {
13+
"all": "cosmiccore:block/casings/solid/vomahine_certified_chemically_resistant_casing",
14+
"overlay_front": "gtceu:block/multiblock/power_substation/overlay_front"
15+
}
16+
}
17+
},
18+
"is_formed=false,recipe_logic_status=suspend": {
19+
"model": {
20+
"parent": "gtceu:block/machine/template/cube_all/sided",
21+
"textures": {
22+
"all": "cosmiccore:block/casings/solid/vomahine_certified_chemically_resistant_casing",
23+
"overlay_front": "gtceu:block/multiblock/power_substation/overlay_front"
24+
}
25+
}
26+
},
27+
"is_formed=false,recipe_logic_status=waiting": {
28+
"model": {
29+
"parent": "gtceu:block/machine/template/cube_all/sided",
30+
"textures": {
31+
"all": "cosmiccore:block/casings/solid/vomahine_certified_chemically_resistant_casing",
32+
"overlay_front": "gtceu:block/multiblock/power_substation/overlay_front_active",
33+
"overlay_front_emissive": "gtceu:block/multiblock/power_substation/overlay_front_active_emissive"
34+
}
35+
}
36+
},
37+
"is_formed=false,recipe_logic_status=working": {
38+
"model": {
39+
"parent": "gtceu:block/machine/template/cube_all/sided",
40+
"textures": {
41+
"all": "cosmiccore:block/casings/solid/vomahine_certified_chemically_resistant_casing",
42+
"overlay_front": "gtceu:block/multiblock/power_substation/overlay_front_active",
43+
"overlay_front_emissive": "gtceu:block/multiblock/power_substation/overlay_front_active_emissive"
44+
}
45+
}
46+
},
47+
"is_formed=true,recipe_logic_status=idle": {
48+
"model": {
49+
"parent": "gtceu:block/machine/template/cube_all/sided",
50+
"textures": {
51+
"all": "cosmiccore:block/casings/solid/vomahine_certified_chemically_resistant_casing",
52+
"overlay_front": "gtceu:block/multiblock/power_substation/overlay_front"
53+
}
54+
}
55+
},
56+
"is_formed=true,recipe_logic_status=suspend": {
57+
"model": {
58+
"parent": "gtceu:block/machine/template/cube_all/sided",
59+
"textures": {
60+
"all": "cosmiccore:block/casings/solid/vomahine_certified_chemically_resistant_casing",
61+
"overlay_front": "gtceu:block/multiblock/power_substation/overlay_front"
62+
}
63+
}
64+
},
65+
"is_formed=true,recipe_logic_status=waiting": {
66+
"model": {
67+
"parent": "gtceu:block/machine/template/cube_all/sided",
68+
"textures": {
69+
"all": "cosmiccore:block/casings/solid/vomahine_certified_chemically_resistant_casing",
70+
"overlay_front": "gtceu:block/multiblock/power_substation/overlay_front_active",
71+
"overlay_front_emissive": "gtceu:block/multiblock/power_substation/overlay_front_active_emissive"
72+
}
73+
}
74+
},
75+
"is_formed=true,recipe_logic_status=working": {
76+
"model": {
77+
"parent": "gtceu:block/machine/template/cube_all/sided",
78+
"textures": {
79+
"all": "cosmiccore:block/casings/solid/vomahine_certified_chemically_resistant_casing",
80+
"overlay_front": "gtceu:block/multiblock/power_substation/overlay_front_active",
81+
"overlay_front_emissive": "gtceu:block/multiblock/power_substation/overlay_front_active_emissive"
82+
}
83+
}
84+
}
85+
}
86+
}

‎src/generated/resources/assets/cosmiccore/models/item/celest_bore_new.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"parent": "cosmiccore:block/machine/celest_bore_new"
3+
}

‎src/generated/resources/assets/cosmiccore/models/item/large_laminator.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"parent": "cosmiccore:block/machine/large_laminator"
3+
}

‎src/main/java/com/ghostipedia/cosmiccore/common/machine/multiblock/multi/IndustChemVat.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ public class IndustChemVat {
3131
.multiblock("industrial_chemical_vat", WorkableElectricMultiblockMachine::new)
3232
.rotationState(RotationState.ALL)
3333
.recipeTypes(CosmicRecipeTypes.INDUSTRIAL_CHEMVAT, GTRecipeTypes.CRACKING_RECIPES)
34-
.recipeModifiers(CosmicRecipeModifiers::chemicalVatLogic, PARALLEL_HATCH, ELECTRIC_OVERCLOCK.apply(OverclockingLogic.PERFECT_OVERCLOCK_SUBTICK),
34+
.recipeModifiers(CosmicRecipeModifiers::chemicalVatLogic, PARALLEL_HATCH,
35+
ELECTRIC_OVERCLOCK.apply(OverclockingLogic.PERFECT_OVERCLOCK_SUBTICK),
3536
BATCH_MODE)
3637
.appearanceBlock(CYCLOZINE_CHEMICALLY_REPELLING_CASING)
3738
// spotless:off

0 commit comments

Comments
 (0)