Skip to content

Commit 3ba1776

Browse files
ethanicusssethanicusss
authored
Merge pull request #488 from MikoTheBoi/Laskyyy-Astral-Experimental
AstralFoods final fix please :0pray:
2 parents f9603b4 + bda8b14 commit 3ba1776

27 files changed

+3792
-3558
lines changed

‎global_packs/required_data/zLaky Core/data/createastral/machines/distillery.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
},
99
"gui": [
1010
{
11-
"texture": "custommachinery:textures/gui/base_background.png",
11+
"texture": "resources/createastral/textures/gui/distillation_tower_gui.png",
1212
"x": 0,
1313
"y": 0,
1414
"type": "custommachinery:texture"
@@ -85,4 +85,4 @@
8585
"maxOutput": 0
8686
}
8787
]
88-
}
88+
}

‎global_packs/required_data/zLaky Core/data/createastral/machines/electrolyser.json

+70-70
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,72 @@
11
{
2-
"name": "custommachinery.createastral.electrolyser",
3-
"appearance": {
4-
"block": "createastral:electrolyser_dummy",
5-
"running": {
6-
"lightlevel": 15
7-
}
8-
},
9-
"gui": [
10-
{
11-
"texture": "custommachinery:textures/gui/base_background.png",
12-
"x": 0,
13-
"y": 0,
14-
"type": "custommachinery:texture"
2+
"name": "custommachinery.createastral.electrolyser",
3+
"appearance": {
4+
"block": "createastral:electrolyser_dummy",
5+
"running": {
6+
"lightlevel": 15
7+
}
158
},
16-
{
17-
"x": 47,
18-
"y": 80,
19-
"type": "custommachinery:player_inventory"
20-
},
21-
{
22-
"id": "watertank",
23-
"x": 90,
24-
"y": 30,
25-
"type": "custommachinery:fluid"
26-
},
27-
28-
{
29-
"id": "oxygentank",
30-
"x": 142,
31-
"y": 30,
32-
"type": "custommachinery:fluid"
33-
},
34-
35-
{
36-
"x": 116,
37-
"y": 30,
38-
"type": "custommachinery:progress"
39-
},
40-
{
41-
"x": 236,
42-
"y": 5,
43-
"type": "custommachinery:status"
44-
},
45-
{
46-
"text": "custommachinery.createastral.electrolyser.text",
47-
"x": 7,
48-
"y": 5,
49-
"type": "custommachinery:text"
50-
}
51-
],
52-
"components": [
53-
{
54-
"type": "custommachinery:fluid",
55-
"capacity": 810000,
56-
"id": "oxygentank",
57-
"maxInput": 0,
58-
"maxOutput": 1000,
59-
"filter": ["ad_astra:oxygen","kubejs:smite", "techreborn:electrolyzed_water"],
60-
"whitelist": true
61-
},
62-
{
63-
"type": "custommachinery:fluid",
64-
"capacity": 810000,
65-
"id": "watertank",
66-
"maxInput": 666,
67-
"maxOutput": 0,
68-
"filter": ["minecraft:water", "kubejs:hellfire", "kubejs:released_water_coolant"],
69-
"whitelist": true
70-
}
71-
]
72-
}
9+
"gui": [
10+
{
11+
"texture": "resources/createastral/textures/gui/electrolyzer_gui.png",
12+
"x": 0,
13+
"y": 0,
14+
"type": "custommachinery:texture"
15+
},
16+
{
17+
"x": 47,
18+
"y": 80,
19+
"type": "custommachinery:player_inventory"
20+
},
21+
{
22+
"id": "watertank",
23+
"x": 90,
24+
"y": 30,
25+
"type": "custommachinery:fluid"
26+
},
27+
28+
{
29+
"id": "oxygentank",
30+
"x": 142,
31+
"y": 30,
32+
"type": "custommachinery:fluid"
33+
},
34+
35+
{
36+
"x": 116,
37+
"y": 30,
38+
"type": "custommachinery:progress"
39+
},
40+
{
41+
"x": 236,
42+
"y": 5,
43+
"type": "custommachinery:status"
44+
},
45+
{
46+
"text": "custommachinery.createastral.electrolyser.text",
47+
"x": 7,
48+
"y": 5,
49+
"type": "custommachinery:text"
50+
}
51+
],
52+
"components": [
53+
{
54+
"type": "custommachinery:fluid",
55+
"capacity": 810000,
56+
"id": "oxygentank",
57+
"maxInput": 0,
58+
"maxOutput": 1000,
59+
"filter": ["ad_astra:oxygen", "kubejs:smite", "techreborn:electrolyzed_water"],
60+
"whitelist": true
61+
},
62+
{
63+
"type": "custommachinery:fluid",
64+
"capacity": 810000,
65+
"id": "watertank",
66+
"maxInput": 666,
67+
"maxOutput": 0,
68+
"filter": ["minecraft:water", "kubejs:hellfire", "kubejs:released_water_coolant"],
69+
"whitelist": true
70+
}
71+
]
72+
}

‎global_packs/required_data/zLaky Core/data/createastral/machines/stone_growth_chamber.json

+41-41
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,43 @@
11
{
2-
"name": "custommachinery.createastral.stone_growth_chamber",
3-
"appearance": {
4-
"block": "createastral:stone_growth_chamber_dummy",
5-
"running": {
6-
"lightlevel": 15
7-
}
8-
},
9-
"gui": [
10-
{
11-
"texture": "custommachinery:textures/gui/base_background.png",
12-
"x": 0,
13-
"y": 0,
14-
"type": "custommachinery:texture"
2+
"name": "custommachinery.createastral.stone_growth_chamber",
3+
"appearance": {
4+
"block": "createastral:stone_growth_chamber_dummy",
5+
"running": {
6+
"lightlevel": 15
7+
}
158
},
16-
{
17-
"x": 47,
18-
"y": 80,
19-
"type": "custommachinery:player_inventory"
20-
},
21-
{
22-
"id": "stoneslot",
23-
"x": 119,
24-
"y": 38,
25-
"type": "custommachinery:slot"
26-
},
27-
{
28-
"text": "custommachinery.createastral.stone_growth_chamber.text",
29-
"x": 7,
30-
"y": 5,
31-
"type": "custommachinery:text"
32-
}
33-
],
34-
"components": [
35-
{
36-
"type": "custommachinery:item",
37-
"variant": "custommachinery:default",
38-
"capacity": 64,
39-
"id": "stoneslot",
40-
"mode": "both"
41-
}
42-
]
43-
}
9+
"gui": [
10+
{
11+
"texture": "resources/createastral/textures/gui/sgc_gui.png",
12+
"x": 0,
13+
"y": 0,
14+
"type": "custommachinery:texture"
15+
},
16+
{
17+
"x": 47,
18+
"y": 80,
19+
"type": "custommachinery:player_inventory"
20+
},
21+
{
22+
"id": "stoneslot",
23+
"x": 119,
24+
"y": 38,
25+
"type": "custommachinery:slot"
26+
},
27+
{
28+
"text": "custommachinery.createastral.stone_growth_chamber.text",
29+
"x": 7,
30+
"y": 5,
31+
"type": "custommachinery:text"
32+
}
33+
],
34+
"components": [
35+
{
36+
"type": "custommachinery:item",
37+
"variant": "custommachinery:default",
38+
"capacity": 64,
39+
"id": "stoneslot",
40+
"mode": "both"
41+
}
42+
]
43+
}

‎kubejs/assets/astralfoods/textures/fluid/cream_flow.png

17.6 KB
Loading

‎kubejs/assets/astralfoods/textures/fluid/cream_flow.png.mcmeta

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"animation": {
3+
"frametime": 2
4+
}
5+
}

‎kubejs/assets/astralfoods/textures/fluid/cream_still.png

6.08 KB
Loading

‎kubejs/assets/astralfoods/textures/fluid/cream_still.png.mcmeta

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"animation": {
3+
"frametime": 1
4+
}
5+
}

‎kubejs/assets/astralfoods/textures/item/ambrosia.png

522 Bytes
Loading

‎kubejs/assets/astralfoods/textures/item/blaze_fries.png

421 Bytes
Loading

‎kubejs/assets/astralfoods/textures/item/blaze_fries_and_cod.png

489 Bytes
Loading

‎kubejs/assets/astralfoods/textures/item/blaze_rods.png

420 Bytes
Loading

‎kubejs/assets/astralfoods/textures/item/chocolate_ice_cream.png

410 Bytes
Loading

‎kubejs/assets/astralfoods/textures/item/cod_n_blaze.png

634 Bytes
Loading

‎kubejs/assets/astralfoods/textures/item/fried_cod.png

460 Bytes
Loading

‎kubejs/assets/astralfoods/textures/item/gamers_delight.png

535 Bytes
Loading

‎kubejs/assets/astralfoods/textures/item/ice_cream_sandwich.png

526 Bytes
Loading

‎kubejs/assets/astralfoods/textures/item/recovery_orb.png

613 Bytes
Loading

‎kubejs/server_scripts/create.js

+64-5
Original file line numberDiff line numberDiff line change
@@ -1881,7 +1881,7 @@ function sequencedAssemblyRecipes(event) {
18811881

18821882
function fillingRecipes(event) {
18831883
[
1884-
{
1884+
{
18851885
input: "minecraft:glass_bottle",
18861886
output: "astraladditions:shimmer_bottle",
18871887
fluid: "kubejs:shimmer",
@@ -2013,6 +2013,12 @@ function fillingRecipes(event) {
20132013
fluid: "tconstruct:molten_gold",
20142014
amount: INGOT,
20152015
},
2016+
{
2017+
input: "minecraft:cookie",
2018+
output: "astralfoods:ice_cream_sandwich",
2019+
fluid: "astralfoods:cream",
2020+
amount: 250 * mB,
2021+
},
20162022
{
20172023
input: "minecraft:bowl",
20182024
output: "farmersdelight:squid_ink_pasta",
@@ -2041,7 +2047,7 @@ function fillingRecipes(event) {
20412047
input: "drinkbeer:empty_beer_mug",
20422048
output: "drinkbeer:beer_mug_blaze_milk_stout",
20432049
fluid: "kubejs:blaze_milk_stout_fluid",
2044-
amount: 250 * mB
2050+
amount: 250 * mB,
20452051
},
20462052
{
20472053
input: "drinkbeer:empty_beer_mug",
@@ -2191,7 +2197,7 @@ function mixingRecipes(event) {
21912197
heat: "",
21922198
time: 180,
21932199
},
2194-
{
2200+
{
21952201
output: [
21962202
{
21972203
fluid: "kubejs:shimmer",
@@ -3405,8 +3411,45 @@ function mixingRecipes(event) {
34053411
input: ["astralfoods:astral_sauce", "2x astralfoods:quantum_bites", "farmersdelight:raw_pasta"],
34063412
heat: "heated",
34073413
time: 250,
3408-
},
3409-
{
3414+
},
3415+
{
3416+
output: [{ fluid: "astralfoods:cream", amount: BUCKET }],
3417+
input: [
3418+
"3x minecraft:sugar",
3419+
{
3420+
fluid: "milk:still_milk",
3421+
amount: BUCKET,
3422+
},
3423+
],
3424+
heat: "heated",
3425+
time: 100,
3426+
},
3427+
{
3428+
output: ["astralfoods:chocolate_ice_cream"],
3429+
input: [
3430+
"create:bar_of_chocolate",
3431+
{
3432+
fluid: "astralfoods:cream",
3433+
amount: BUCKET / 4,
3434+
},
3435+
],
3436+
heat: "heated",
3437+
time: 60,
3438+
},
3439+
{
3440+
output: ["astralfoods:gamers_delight"],
3441+
input: [
3442+
"techreborn:compressed_plantball",
3443+
"farmersdelight:pie_crust",
3444+
{
3445+
fluid: "techreborn:lithium",
3446+
amount: BUCKET,
3447+
},
3448+
],
3449+
heat: "heated",
3450+
time: 80,
3451+
},
3452+
{
34103453
output: "yttr:ruined_cobblestone",
34113454
input: ["minecraft:cobblestone", "yttr:rubble", {
34123455
fluid: "tconstruct:magma",
@@ -4940,6 +4983,22 @@ function compactingRecipes(event) {
49404983
.superheated()
49414984
.processingTime(200);
49424985

4986+
event.recipes
4987+
.createCompacting("astralfoods:blaze_fries", [
4988+
"astralfoods:blaze_rods",
4989+
{ fluid: "createaddition:seed_oil", amount: 100 * mB },
4990+
])
4991+
.heated()
4992+
.processingTime(40);
4993+
4994+
event.recipes
4995+
.createCompacting("astralfoods:fried_cod", [
4996+
"minecraft:cod",
4997+
{ fluid: "createaddition:seed_oil", amount: 100 * mB },
4998+
])
4999+
.heated()
5000+
.processingTime(60);
5001+
49435002
event.recipes.createCompacting("4x minecraft:purpur_block", [
49445003
"4x ad_astra:strophar_cap",
49455004
{ fluid: "minecraft:water", amount: 100 * mB },

0 commit comments

Comments
 (0)