Skip to content

Commit

Permalink
Revert "Merge pull request Laskyyy#397 from MikoTheBoi/Astral-Experim…
Browse files Browse the repository at this point in the history
…ental"

This reverts commit a3306f6, reversing
changes made to ec0cf50.
  • Loading branch information
Laskyyy committed Oct 21, 2024
1 parent 9d17bd5 commit a000c20
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 29 deletions.
Binary file removed kubejs/assets/astralfoods/textures/item/bulbas_tea.png
Binary file not shown.
23 changes: 7 additions & 16 deletions kubejs/server_scripts/create.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ function millingRecipes(event) {
["minecraft:fire_coral_block", "2x minecraft:red_dye", 1],
["minecraft:horn_coral_block", "2x minecraft:yellow_dye", 1],
["minecraft:glow_berries", "naturalist:glow_goop", 1],
["naturalist:glow_goop", "minecraft:yellow_dye", 1],
["naturalist:glow_goop", "minecraft:yellow_dye", 1],
["minecraft:twisting_vines", "minecraft:blue_dye", 1],
["minecraft:weeping_vines", "minecraft:red_dye", 1],
["minecraft:sweet_berries", "minecraft:red_dye", 1],
Expand Down Expand Up @@ -75,7 +75,7 @@ function crushingRecipes(event) {
input: "minecraft:calcite",
outputs: [["4x techreborn:calcite_dust", 1]],
},
{
{
input: "minecraft:dead_tube_coral_block",
outputs: [["1x techreborn:calcite_dust", 1]],
},
Expand Down Expand Up @@ -1278,19 +1278,19 @@ function sequencedAssemblyRecipes(event) {
// input
event.recipes.createFilling("createbigcannons:nethersteel_screw_breech", [
"createbigcannons:nethersteel_screw_breech",
{ fluid: "kubejs:shimmer", amount: 9000 },
{ fluid: "kubejs:shimmer", amount: 9000 },
]),
event.recipes.createDeploying("createbigcannons:nethersteel_screw_breech", [
"createbigcannons:nethersteel_screw_breech",
"kubejs:fire_resistant_fragile_sheet_block",
]),
event.recipes.createFilling("createbigcannons:nethersteel_screw_breech", [
"createbigcannons:nethersteel_screw_breech",
{ fluid: "techreborn:lithium", amount: 3000 },
{ fluid: "techreborn:lithium", amount: 3000 },
]),
event.recipes.createFilling("createbigcannons:nethersteel_screw_breech", [
"createbigcannons:nethersteel_screw_breech",
{ fluid: "techreborn:silicon", amount: 3000 },
{ fluid: "techreborn:silicon", amount: 3000 },
]),
]
)
Expand Down Expand Up @@ -2538,15 +2538,6 @@ function mixingRecipes(event) {
])
.superheated()
.processingTime(1000);

event.recipes
.createMixing("astralfoods:bulbas_tea", [
"astraladditions:bulba_root",
{ fluid: "minecraft:water", amount: 333 * mB },
{ fluid: "milk:still_milk", amount: 333 * mB },
])
.heated()
.processingTime(45);
}

function cuttingRecipes(event) {
Expand Down Expand Up @@ -2626,7 +2617,7 @@ function splashingRecipes(event) {
input: "minecraft:calcite",
outputs: [["minecraft:dripstone_block", 1]],
},
{
{
input: "minecraft:sponge",
outputs: [["minecraft:wet_sponge", 1]],
},
Expand Down Expand Up @@ -3361,7 +3352,7 @@ function compactingRecipes(event) {
output: "minecraft:andesite",
inputs: ["4x techreborn:andesite_dust"],
},
{
{
output: "minecraft:granite",
inputs: ["4x techreborn:granite_dust"],
},
Expand Down
12 changes: 0 additions & 12 deletions kubejs/startup_scripts/item_registry.js
Original file line number Diff line number Diff line change
Expand Up @@ -118,18 +118,6 @@ onEvent("item.registry", (event) => {
.alwaysEdible();
});

event
.create("astralfoods:bulbas_tea")
.displayName("Bulba's Tea")
.food((food) => {
food.hunger(2)
.saturation(1.2)
.effect("night_vision", 4800, 1, 1)
.effect("haste", 4800, 1, 1)
.maxStackSize(16)
.alwaysEdible();
});

event.create("createastral:golden_bowl").displayName("Golden Bowl");
event
.create("createastral:filled_golden_bowl", "create:sequenced_assembly")
Expand Down
2 changes: 1 addition & 1 deletion kubejs/startup_scripts/item_tooltip.js
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ onEvent("item.tooltip", (e) => {
},
{
item: "astralfoods:astral_sauce",
tooltip: "The bowl comes from the recipe :blehh:",
tooltip: "Where did the bowl come? The singularity can fabricate them of course!",
},
{
item: "createbigcannons:steel_screw_breech",
Expand Down

0 comments on commit a000c20

Please sign in to comment.