From e6a68f0e0a83f42455fa16a9cd8da65636835fd9 Mon Sep 17 00:00:00 2001 From: copygirl Date: Thu, 28 Jul 2022 08:38:54 +0200 Subject: [PATCH] Unify honey --- kubejs/client_scripts/hide/unification/honey.js | 10 ++++++++++ .../mantle/fluid_transfer/honey_bottle_empty.json | 6 ++++++ .../recipes/smeltery/entity_melting/bee.json | 6 ++++++ .../smeltery/melting/slime/honey_block.json | 7 +++++++ .../centrifuge/centrifuge_honey_bottle.json | 9 +++++++++ .../machines/centrifuge/centrifuge_honeycomb.json | 5 +++++ .../chiller/chiller_honey_to_honey_block.json | 6 ++++++ .../crucible/crucible_honey_block_to_honey.json | 6 ++++++ .../fixes/create_fluids_are_not_water.js | 15 ++++++++------- kubejs/server_scripts/unification/honey.js | 14 ++++++++++++++ 10 files changed, 77 insertions(+), 7 deletions(-) create mode 100644 kubejs/client_scripts/hide/unification/honey.js create mode 100644 kubejs/data/tconstruct/mantle/fluid_transfer/honey_bottle_empty.json create mode 100644 kubejs/data/tconstruct/recipes/smeltery/entity_melting/bee.json create mode 100644 kubejs/data/tconstruct/recipes/smeltery/melting/slime/honey_block.json create mode 100644 kubejs/data/thermal/recipes/machines/centrifuge/centrifuge_honey_bottle.json create mode 100644 kubejs/data/thermal/recipes/machines/centrifuge/centrifuge_honeycomb.json create mode 100644 kubejs/data/thermal/recipes/machines/chiller/chiller_honey_to_honey_block.json create mode 100644 kubejs/data/thermal/recipes/machines/crucible/crucible_honey_block_to_honey.json create mode 100644 kubejs/server_scripts/unification/honey.js diff --git a/kubejs/client_scripts/hide/unification/honey.js b/kubejs/client_scripts/hide/unification/honey.js new file mode 100644 index 0000000..ff987af --- /dev/null +++ b/kubejs/client_scripts/hide/unification/honey.js @@ -0,0 +1,10 @@ +// priority: 0 + +onEvent("jei.hide.items", event => { + event.hide("tconstruct:honey_bucket"); +}); + +onEvent("jei.hide.fluids", event => { + event.hide("tconstruct:honey"); + event.hide("cofh_core:honey"); +}); diff --git a/kubejs/data/tconstruct/mantle/fluid_transfer/honey_bottle_empty.json b/kubejs/data/tconstruct/mantle/fluid_transfer/honey_bottle_empty.json new file mode 100644 index 0000000..e8638ea --- /dev/null +++ b/kubejs/data/tconstruct/mantle/fluid_transfer/honey_bottle_empty.json @@ -0,0 +1,6 @@ +{ + "type": "mantle:empty_item", + "input": { "item": "minecraft:honey_bottle" }, + "filled": "minecraft:glass_bottle", + "fluid": { "fluid": "create:honey", "amount": 250 } +} diff --git a/kubejs/data/tconstruct/recipes/smeltery/entity_melting/bee.json b/kubejs/data/tconstruct/recipes/smeltery/entity_melting/bee.json new file mode 100644 index 0000000..d29efb6 --- /dev/null +++ b/kubejs/data/tconstruct/recipes/smeltery/entity_melting/bee.json @@ -0,0 +1,6 @@ +{ + "type": "tconstruct:entity_melting", + "entity": { "type": "minecraft:bee" }, + "result": { "fluid": "create:honey", "amount": 25 }, + "damage": 2 +} diff --git a/kubejs/data/tconstruct/recipes/smeltery/melting/slime/honey_block.json b/kubejs/data/tconstruct/recipes/smeltery/melting/slime/honey_block.json new file mode 100644 index 0000000..bc9e219 --- /dev/null +++ b/kubejs/data/tconstruct/recipes/smeltery/melting/slime/honey_block.json @@ -0,0 +1,7 @@ +{ + "type": "tconstruct:melting", + "ingredient": { "item": "minecraft:honey_block" }, + "result": { "fluid": "create:honey", "amount": 1000 }, + "temperature": 1, + "time": 94 +} diff --git a/kubejs/data/thermal/recipes/machines/centrifuge/centrifuge_honey_bottle.json b/kubejs/data/thermal/recipes/machines/centrifuge/centrifuge_honey_bottle.json new file mode 100644 index 0000000..fa978e1 --- /dev/null +++ b/kubejs/data/thermal/recipes/machines/centrifuge/centrifuge_honey_bottle.json @@ -0,0 +1,9 @@ +{ + "type": "thermal:centrifuge", + "ingredient": { "item": "minecraft:honey_bottle" }, + "result": [ + { "item": "minecraft:glass_bottle" }, + { "fluid": "create:honey", "amount": 250 } + ], + "energy": 400 +} diff --git a/kubejs/data/thermal/recipes/machines/centrifuge/centrifuge_honeycomb.json b/kubejs/data/thermal/recipes/machines/centrifuge/centrifuge_honeycomb.json new file mode 100644 index 0000000..a3aeb3a --- /dev/null +++ b/kubejs/data/thermal/recipes/machines/centrifuge/centrifuge_honeycomb.json @@ -0,0 +1,5 @@ +{ + "type": "thermal:centrifuge", + "ingredient": { "item": "minecraft:honeycomb" }, + "result": [{ "fluid": "create:honey", "amount": 100 }] +} diff --git a/kubejs/data/thermal/recipes/machines/chiller/chiller_honey_to_honey_block.json b/kubejs/data/thermal/recipes/machines/chiller/chiller_honey_to_honey_block.json new file mode 100644 index 0000000..f376daf --- /dev/null +++ b/kubejs/data/thermal/recipes/machines/chiller/chiller_honey_to_honey_block.json @@ -0,0 +1,6 @@ +{ + "type": "thermal:chiller", + "ingredient": { "fluid": "create:honey", "amount": 1000 }, + "result": [{ "item": "minecraft:honey_block" }], + "energy": 2000 +} diff --git a/kubejs/data/thermal/recipes/machines/crucible/crucible_honey_block_to_honey.json b/kubejs/data/thermal/recipes/machines/crucible/crucible_honey_block_to_honey.json new file mode 100644 index 0000000..ce3f753 --- /dev/null +++ b/kubejs/data/thermal/recipes/machines/crucible/crucible_honey_block_to_honey.json @@ -0,0 +1,6 @@ +{ + "type": "thermal:crucible", + "ingredient": { "item": "minecraft:honey_block" }, + "result": [{ "fluid": "create:honey", "amount": 1000 }], + "energy": 2000 +} diff --git a/kubejs/server_scripts/fixes/create_fluids_are_not_water.js b/kubejs/server_scripts/fixes/create_fluids_are_not_water.js index 7a77248..849668b 100644 --- a/kubejs/server_scripts/fixes/create_fluids_are_not_water.js +++ b/kubejs/server_scripts/fixes/create_fluids_are_not_water.js @@ -1,11 +1,12 @@ // priority: 0 onEvent("fluid.tags", event => { - event.remove("minecraft:water", "create:chocolate"); - event.remove("minecraft:water", "create:honey"); - event.remove("minecraft:water", "create_confectionery:black_chocolate"); - event.remove("minecraft:water", "create_confectionery:caramel"); - event.remove("minecraft:water", "create_confectionery:hot_chocolate"); - event.remove("minecraft:water", "create_confectionery:ruby_chocolate"); - event.remove("minecraft:water", "create_confectionery:white_chocolate"); + event.get("minecraft:water").remove( + "create:chocolate", "create:honey", + "create_confectionery:black_chocolate", + "create_confectionery:caramel", + "create_confectionery:hot_chocolate", + "create_confectionery:ruby_chocolate", + "create_confectionery:white_chocolate", + ); }); diff --git a/kubejs/server_scripts/unification/honey.js b/kubejs/server_scripts/unification/honey.js new file mode 100644 index 0000000..5c60598 --- /dev/null +++ b/kubejs/server_scripts/unification/honey.js @@ -0,0 +1,14 @@ +// priority: 0 + +// TODO: Not sure why, but this doesn't work :( +// onEvent("recipes", event => { +// for (let honey of [ "tconstruct:honey", "cofh_core:honey" ]) +// for (let amount of [ 25, 100, 250, 1000 ]) +// event.replaceOutput({ }, Fluid.of(honey, amount), Fluid.of("create:honey", amount)); +// }); + +onEvent("fluid.tags", event => { + event.removeAll("tconstruct:honey"); + event.removeAllTagsFrom("#tconstruct:honey"); + event.removeAllTagsFrom("cofh_core:honey"); +});