fix eol
This commit is contained in:
lucasdpt
@@ -1,12 +1,12 @@
|
||||
ServerEvents.generateData('after_mods', allthemods => {
|
||||
|
||||
let ids = JsonIO.read("kubejs/server_scripts/Tweaks/disable_biome_modifier_ids.json").ids
|
||||
|
||||
for (let id of ids) {
|
||||
allthemods.json(`${id}.json`,
|
||||
{
|
||||
"type": "neoforge:none"
|
||||
}
|
||||
)
|
||||
}
|
||||
ServerEvents.generateData('after_mods', allthemods => {
|
||||
|
||||
let ids = JsonIO.read("kubejs/server_scripts/Tweaks/disable_biome_modifier_ids.json").ids
|
||||
|
||||
for (let id of ids) {
|
||||
allthemods.json(`${id}.json`,
|
||||
{
|
||||
"type": "neoforge:none"
|
||||
}
|
||||
)
|
||||
}
|
||||
})
|
||||
@@ -1,5 +1,5 @@
|
||||
{
|
||||
"ids": [
|
||||
"create:neoforge/biome_modifier/zinc_ore"
|
||||
]
|
||||
{
|
||||
"ids": [
|
||||
"create:neoforge/biome_modifier/zinc_ore"
|
||||
]
|
||||
}
|
||||
@@ -1,16 +1,16 @@
|
||||
ServerEvents.generateData('after_mods', allthemods => {
|
||||
|
||||
let ids = JsonIO.read("kubejs/server_scripts/Tweaks/disable_loot_table_ids.json").ids
|
||||
|
||||
for (let id of ids) {
|
||||
allthemods.json(`${id}.json`,
|
||||
{
|
||||
"neoforge:conditions": [
|
||||
{
|
||||
"type": "neoforge:false"
|
||||
}
|
||||
]
|
||||
}
|
||||
)
|
||||
}
|
||||
ServerEvents.generateData('after_mods', allthemods => {
|
||||
|
||||
let ids = JsonIO.read("kubejs/server_scripts/Tweaks/disable_loot_table_ids.json").ids
|
||||
|
||||
for (let id of ids) {
|
||||
allthemods.json(`${id}.json`,
|
||||
{
|
||||
"neoforge:conditions": [
|
||||
{
|
||||
"type": "neoforge:false"
|
||||
}
|
||||
]
|
||||
}
|
||||
)
|
||||
}
|
||||
})
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,4 +1,4 @@
|
||||
PlayerEvents.loggedIn(event => {
|
||||
if (event.player.getHealth().toString() == "NaN") event.player.setHealth(event.player.getMaxHealth())
|
||||
if (event.player.getAbsorptionAmount().toString() == "NaN") event.player.setAbsorptionAmount(0)
|
||||
PlayerEvents.loggedIn(event => {
|
||||
if (event.player.getHealth().toString() == "NaN") event.player.setHealth(event.player.getMaxHealth())
|
||||
if (event.player.getAbsorptionAmount().toString() == "NaN") event.player.setAbsorptionAmount(0)
|
||||
})
|
||||
@@ -1,133 +1,133 @@
|
||||
// This File has been authored by AllTheMods Staff, or a Community contributor for use in AllTheMods - AllTheMods 10.
|
||||
// As all AllTheMods packs are licensed under All Rights Reserved, this file is not allowed to be used in any public packs not released by the AllTheMods Team, without explicit permission.
|
||||
|
||||
ServerEvents.recipes(allthemods => {
|
||||
allthemods.shaped(
|
||||
`8x minecraft:item_frame[entity_data={Invisible:1b,id:"minecraft:item_frame"},custom_name='"Invisible Item Frame"']`,
|
||||
[
|
||||
'iii',
|
||||
'ipi',
|
||||
'iii'
|
||||
],
|
||||
{
|
||||
i: 'minecraft:item_frame',
|
||||
p: 'minecraft:potion[potion_contents={potion:"minecraft:invisibility"}]'
|
||||
}
|
||||
)
|
||||
|
||||
allthemods.shaped(
|
||||
`8x minecraft:glow_item_frame[entity_data={Invisible:1b,id:"minecraft:item_frame"},custom_name='"Invisible Glow Item Frame"']`,
|
||||
[
|
||||
'iii',
|
||||
'ipi',
|
||||
'iii'
|
||||
],
|
||||
{
|
||||
i: 'minecraft:glow_item_frame',
|
||||
p: 'minecraft:potion[potion_contents={potion:"minecraft:invisibility"}]'
|
||||
}
|
||||
)
|
||||
|
||||
allthemods.replaceInput({ mod: "railcraft"}, "railcraft:steel_shovel", "mekanismtools:steel_shovel")
|
||||
|
||||
// Concrete from Concrete Powder using Water Buckets
|
||||
const colors = [
|
||||
'white', 'yellow', 'orange', 'red', 'pink', 'magenta', 'purple', 'light_blue', 'cyan', 'blue', 'lime', 'green', 'brown', 'light_gray', 'gray', 'black'
|
||||
];
|
||||
|
||||
colors.forEach(color => {
|
||||
allthemods.shaped(
|
||||
Item.of(`minecraft:${color}_concrete`, 8),
|
||||
['CCC','CBC','CCC'],
|
||||
{
|
||||
C: `minecraft:${color}_concrete_powder`,
|
||||
B: 'minecraft:water_bucket'
|
||||
}
|
||||
)
|
||||
});
|
||||
|
||||
// Remove Raw Redstone Block Recipe
|
||||
allthemods.remove({id: 'regions_unexplored:raw_redstone_block'});
|
||||
|
||||
// Dense Uraninite Ore Energizing Recipes
|
||||
allthemods.remove({ id: 'powah:energizing/uraninite_from_ore' })
|
||||
allthemods.custom({
|
||||
"type": "powah:energizing",
|
||||
"energy": 50000,
|
||||
"ingredients": [
|
||||
{
|
||||
"tag": "c:ores/uraninite_regular"
|
||||
}
|
||||
],
|
||||
"result": {
|
||||
"count": 5,
|
||||
"id": "powah:uraninite"
|
||||
}
|
||||
}).id('powah:energizing/uraninite_from_ore')
|
||||
|
||||
allthemods.shapeless(
|
||||
Item.of('minecraft:potion[potion_contents={potion:"minecraft:water"}]', 1),
|
||||
[
|
||||
'minecraft:glass_bottle',
|
||||
'mysticalagriculture:water_essence'
|
||||
]
|
||||
)
|
||||
|
||||
allthemods.shapeless(
|
||||
Item.of('minecraft:honey_block'),
|
||||
[
|
||||
'9x mysticalagriculture:honey_essence'
|
||||
]
|
||||
)
|
||||
allthemods.shaped("minecraft:crafting_table", ['XX','XX'], {X: "#minecraft:planks"}).id("minecraft:crafting_table")
|
||||
|
||||
//soy sauce from unified tag
|
||||
allthemods.custom({
|
||||
type: "sushigocrafting:fermenting_barrel",
|
||||
fluid: {
|
||||
amount: 250,
|
||||
id: "minecraft:water"
|
||||
},
|
||||
input: {
|
||||
tag: "c:crops/soybean"
|
||||
},
|
||||
output: {
|
||||
count: 1,
|
||||
id: "sushigocrafting:soy_sauce"
|
||||
}
|
||||
})
|
||||
|
||||
allthemods.replaceInput({output: 'crafting_on_a_stick:crafting_table'}, 'minecraft:crafting_table', '#c:player_workstations/crafting_tables')
|
||||
|
||||
allthemods.shapeless(
|
||||
Item.of('minecraft:crafting_table'),
|
||||
[
|
||||
'#c:player_workstations/crafting_tables'
|
||||
]
|
||||
)
|
||||
// Example Firework Star recipe to help people in JEI (as it's not shown there)
|
||||
allthemods.shapeless(
|
||||
Item.of('minecraft:firework_star[firework_explosion={colors:[I;15790320],shape:"small_ball"}]'),
|
||||
[
|
||||
'minecraft:gunpowder',
|
||||
'minecraft:white_dye'
|
||||
]
|
||||
).id("allthemods:example_firework_star")
|
||||
// Saltpeter Block Recipes
|
||||
allthemods.shaped(
|
||||
Item.of(`kubejs:saltpeter_block`),
|
||||
['CCC','CCC','CCC'],
|
||||
{
|
||||
C: `#c:dusts/saltpeter`
|
||||
}
|
||||
).id("allthemods:saltpeter_block")
|
||||
allthemods.shapeless(
|
||||
Item.of('railcraft:saltpeter_dust', 9),
|
||||
[
|
||||
'kubejs:saltpeter_block'
|
||||
]
|
||||
).id("allthemods:saltpeter_dust_from_block")
|
||||
})
|
||||
|
||||
// This File has been authored by AllTheMods Staff, or a Community contributor for use in AllTheMods - AllTheMods 10.
|
||||
// As all AllTheMods packs are licensed under All Rights Reserved, this file is not allowed to be used in any public packs not released by the AllTheMods Team, without explicit permission.
|
||||
// This File has been authored by AllTheMods Staff, or a Community contributor for use in AllTheMods - AllTheMods 10.
|
||||
// As all AllTheMods packs are licensed under All Rights Reserved, this file is not allowed to be used in any public packs not released by the AllTheMods Team, without explicit permission.
|
||||
|
||||
ServerEvents.recipes(allthemods => {
|
||||
allthemods.shaped(
|
||||
`8x minecraft:item_frame[entity_data={Invisible:1b,id:"minecraft:item_frame"},custom_name='"Invisible Item Frame"']`,
|
||||
[
|
||||
'iii',
|
||||
'ipi',
|
||||
'iii'
|
||||
],
|
||||
{
|
||||
i: 'minecraft:item_frame',
|
||||
p: 'minecraft:potion[potion_contents={potion:"minecraft:invisibility"}]'
|
||||
}
|
||||
)
|
||||
|
||||
allthemods.shaped(
|
||||
`8x minecraft:glow_item_frame[entity_data={Invisible:1b,id:"minecraft:item_frame"},custom_name='"Invisible Glow Item Frame"']`,
|
||||
[
|
||||
'iii',
|
||||
'ipi',
|
||||
'iii'
|
||||
],
|
||||
{
|
||||
i: 'minecraft:glow_item_frame',
|
||||
p: 'minecraft:potion[potion_contents={potion:"minecraft:invisibility"}]'
|
||||
}
|
||||
)
|
||||
|
||||
allthemods.replaceInput({ mod: "railcraft"}, "railcraft:steel_shovel", "mekanismtools:steel_shovel")
|
||||
|
||||
// Concrete from Concrete Powder using Water Buckets
|
||||
const colors = [
|
||||
'white', 'yellow', 'orange', 'red', 'pink', 'magenta', 'purple', 'light_blue', 'cyan', 'blue', 'lime', 'green', 'brown', 'light_gray', 'gray', 'black'
|
||||
];
|
||||
|
||||
colors.forEach(color => {
|
||||
allthemods.shaped(
|
||||
Item.of(`minecraft:${color}_concrete`, 8),
|
||||
['CCC','CBC','CCC'],
|
||||
{
|
||||
C: `minecraft:${color}_concrete_powder`,
|
||||
B: 'minecraft:water_bucket'
|
||||
}
|
||||
)
|
||||
});
|
||||
|
||||
// Remove Raw Redstone Block Recipe
|
||||
allthemods.remove({id: 'regions_unexplored:raw_redstone_block'});
|
||||
|
||||
// Dense Uraninite Ore Energizing Recipes
|
||||
allthemods.remove({ id: 'powah:energizing/uraninite_from_ore' })
|
||||
allthemods.custom({
|
||||
"type": "powah:energizing",
|
||||
"energy": 50000,
|
||||
"ingredients": [
|
||||
{
|
||||
"tag": "c:ores/uraninite_regular"
|
||||
}
|
||||
],
|
||||
"result": {
|
||||
"count": 5,
|
||||
"id": "powah:uraninite"
|
||||
}
|
||||
}).id('powah:energizing/uraninite_from_ore')
|
||||
|
||||
allthemods.shapeless(
|
||||
Item.of('minecraft:potion[potion_contents={potion:"minecraft:water"}]', 1),
|
||||
[
|
||||
'minecraft:glass_bottle',
|
||||
'mysticalagriculture:water_essence'
|
||||
]
|
||||
)
|
||||
|
||||
allthemods.shapeless(
|
||||
Item.of('minecraft:honey_block'),
|
||||
[
|
||||
'9x mysticalagriculture:honey_essence'
|
||||
]
|
||||
)
|
||||
allthemods.shaped("minecraft:crafting_table", ['XX','XX'], {X: "#minecraft:planks"}).id("minecraft:crafting_table")
|
||||
|
||||
//soy sauce from unified tag
|
||||
allthemods.custom({
|
||||
type: "sushigocrafting:fermenting_barrel",
|
||||
fluid: {
|
||||
amount: 250,
|
||||
id: "minecraft:water"
|
||||
},
|
||||
input: {
|
||||
tag: "c:crops/soybean"
|
||||
},
|
||||
output: {
|
||||
count: 1,
|
||||
id: "sushigocrafting:soy_sauce"
|
||||
}
|
||||
})
|
||||
|
||||
allthemods.replaceInput({output: 'crafting_on_a_stick:crafting_table'}, 'minecraft:crafting_table', '#c:player_workstations/crafting_tables')
|
||||
|
||||
allthemods.shapeless(
|
||||
Item.of('minecraft:crafting_table'),
|
||||
[
|
||||
'#c:player_workstations/crafting_tables'
|
||||
]
|
||||
)
|
||||
// Example Firework Star recipe to help people in JEI (as it's not shown there)
|
||||
allthemods.shapeless(
|
||||
Item.of('minecraft:firework_star[firework_explosion={colors:[I;15790320],shape:"small_ball"}]'),
|
||||
[
|
||||
'minecraft:gunpowder',
|
||||
'minecraft:white_dye'
|
||||
]
|
||||
).id("allthemods:example_firework_star")
|
||||
// Saltpeter Block Recipes
|
||||
allthemods.shaped(
|
||||
Item.of(`kubejs:saltpeter_block`),
|
||||
['CCC','CCC','CCC'],
|
||||
{
|
||||
C: `#c:dusts/saltpeter`
|
||||
}
|
||||
).id("allthemods:saltpeter_block")
|
||||
allthemods.shapeless(
|
||||
Item.of('railcraft:saltpeter_dust', 9),
|
||||
[
|
||||
'kubejs:saltpeter_block'
|
||||
]
|
||||
).id("allthemods:saltpeter_dust_from_block")
|
||||
})
|
||||
|
||||
// This File has been authored by AllTheMods Staff, or a Community contributor for use in AllTheMods - AllTheMods 10.
|
||||
// As all AllTheMods packs are licensed under All Rights Reserved, this file is not allowed to be used in any public packs not released by the AllTheMods Team, without explicit permission.
|
||||
|
||||
@@ -1,241 +1,241 @@
|
||||
let $Stopwatch = Java.loadClass("com.google.common.base.Stopwatch")
|
||||
|
||||
KubeJSTweaks.beforeRecipes(event => {
|
||||
let timer = $Stopwatch.createStarted();
|
||||
|
||||
event.dumpErroringRecipes()
|
||||
|
||||
// Upgrade from forge to neoforge conditions
|
||||
event.fixCondition([
|
||||
"irons_spellbooks:patchouli_book",
|
||||
"apotheosis:book",
|
||||
"treetap:id_menril",
|
||||
"treetap:id_menril_tfc",
|
||||
/^silentgear:woodcutting\//,
|
||||
"silentgear:sapling/netherwood"
|
||||
])
|
||||
|
||||
// Fix "item" -> "id"
|
||||
event.fixItemAtKey([/^create:crushing\/gloomslate_/, /^create:crushing\/sculk_stone_/, /^create:cutting\/.*echo_/], "results")
|
||||
|
||||
event.fixItemAtKey("treetap:id_menril", "result")
|
||||
|
||||
// Fix farmer delight tool type that was renamed on 1.21.1
|
||||
// sound changed
|
||||
// and their result is now an array of a custom codec that have now "item" as a key
|
||||
event.getEntry([/^farmersdelight:cutting\/echo_/, "farmersdelight:integration/silentgear/cutting/netherwood"])
|
||||
.forEach(entry => {
|
||||
entry.replaceValueAtKey("tool", "type", "farmersdelight:tool_action", "farmersdelight:item_ability")
|
||||
|
||||
entry.fromPath("sound").ifPresent(result => {
|
||||
result.first.add("sound", { sound_id: result.second })
|
||||
})
|
||||
if (entry.id() == "farmersdelight:integration/silentgear/cutting/netherwood") {
|
||||
let resultArray = entry.json().get("result")
|
||||
if (resultArray == null) return
|
||||
for (let item of resultArray) {
|
||||
if (!item.has("item")) continue
|
||||
item.add("item", {
|
||||
"id": item.get("item")
|
||||
})
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
// Simple key renaming to match current changes
|
||||
event.getEntry(/^createaddition:compat\/immersiveengineering\/rolling\//)
|
||||
.forEach(entry => {
|
||||
entry.renameKey("result", "results", true)
|
||||
entry.renameKey("input", "ingredients", true)
|
||||
})
|
||||
|
||||
// Simple key renaming to match current changes
|
||||
event.getEntry("createaddition:compat/ae2/charged_certus_quartz")
|
||||
.forEach(entry => {
|
||||
entry.renameKey("result", "results", true)
|
||||
entry.renameKey("ingredient", "ingredients", true)
|
||||
})
|
||||
|
||||
// this is the way now with biome_predicates
|
||||
event.getEntry("createaddition:compat/immersiveengineering/sphalerite")
|
||||
.forEach(entry => {
|
||||
entry.json().add("biome_predicates", [
|
||||
["minecraft:is_overworld"]
|
||||
])
|
||||
})
|
||||
|
||||
// Scans items on result and add them back as conditions, izi fix
|
||||
event.getEntry(/^farmingforblockheads:market\//)
|
||||
.forEach(entry => {
|
||||
entry.addConditionsFromKey("result")
|
||||
})
|
||||
|
||||
// Scans items/tags on ingredients and add them back as conditions
|
||||
event.getEntry("create:crafting/tree_fertilizer")
|
||||
.forEach(entry => {
|
||||
entry.addConditionsFromKey("ingredients")
|
||||
})
|
||||
|
||||
event.getEntry(["merrymaking:aged_pine_mantel", "merrymaking:exposed_pine_mantel", "merrymaking:pine_mantel", "merrymaking:weathered_pine_mantel"])
|
||||
.forEach(entry => {
|
||||
entry.addConditionsFromKey("key")
|
||||
})
|
||||
|
||||
|
||||
// Fix a typo, they missed a `s`
|
||||
event.getEntry([
|
||||
"mekanism:compat/biomeswevegone/enriching/dacite/conversion_dacite_tile",
|
||||
"mekanism:compat/biomeswevegone/crushing/dacite/conversion_dacite_cobblestone",
|
||||
"mekanism:compat/biomeswevegone/enriching/dacite/conversion_dacite_bricks",
|
||||
"mekanism:compat/biomeswevegone/crushing/dacite/conversion_dacite_tile"
|
||||
]).forEach(entry => {
|
||||
entry.replaceValueAtKey("input", "item", "biomeswevegone:dacite_tile", "biomeswevegone:dacite_tiles")
|
||||
entry.replaceValueAtKey("output", "id", "biomeswevegone:dacite_tile", "biomeswevegone:dacite_tiles")
|
||||
})
|
||||
|
||||
// Another typo, a wild `'` at the name of the item
|
||||
event.getEntry("mekmm:compat/ars_nouveau/planting/magebloom").forEach(entry => {
|
||||
entry.fromPath("secondary_output.id").ifPresent(result => {
|
||||
result.first.add("id", result.second.getAsString().replace("'", ""))
|
||||
})
|
||||
})
|
||||
|
||||
// RIP Jonn, forgot `s`
|
||||
event.getEntry(/^dyenamicsandfriends:.*_hammock$/).forEach(entry => {
|
||||
entry.fixCondition()
|
||||
entry.replaceValueAtKey("key", "tag", "c:string", "c:strings")
|
||||
})
|
||||
|
||||
// RIP Jonn2, forgot another `s`
|
||||
event.getEntry("productivetrees:crates/coffee_bean_crate").forEach(entry => {
|
||||
entry.replaceValueAtKey("key", "tag", "c:coffee_bean", "c:coffee_beans")
|
||||
})
|
||||
|
||||
// RIP Jonn2, looks like it was changed to `_blocks` now
|
||||
event.getEntry("productivetrees:time_traveller_display").forEach(entry => {
|
||||
entry.replaceValueAtKey("key", "tag", "c:glass/colorless", "c:glass_blocks/colorless")
|
||||
})
|
||||
|
||||
// Ignore warnings because silent gear ingredients
|
||||
// that contains "silentgear:material" are not ready
|
||||
// yet, but are valid in a later stage
|
||||
event.getEntry("@silentgear")
|
||||
.forEach(entry => {
|
||||
let ings = entry.json().get("ingredients")
|
||||
let keys = entry.json().get("key")
|
||||
|
||||
if (ings != null) {
|
||||
for (let ing of ings) {
|
||||
let type = ing.get("type")
|
||||
if (type != null) {
|
||||
if (type.getAsString() == "silentgear:material") {
|
||||
entry.ignoreWarning()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (keys != null) {
|
||||
for (let key of keys.asMap().values()) {
|
||||
let type = key.get("type")
|
||||
if (type != null) {
|
||||
if (type.getAsString() == "silentgear:material") {
|
||||
entry.ignoreWarning()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
// Ignore warnings because while this recipe
|
||||
// is not really valid, it still works
|
||||
event.getEntry(/^deeperdarker:.*_smithing$/)
|
||||
.forEach(entry => {
|
||||
entry.fromPath("template", "[]").ifPresent(result => entry.ignoreWarning())
|
||||
})
|
||||
|
||||
// Adds mod condition check
|
||||
event.getEntry("productivebees:elementalcraft/pureinfusion/pure_crystal_bee")
|
||||
.forEach(entry => entry.addModConditionFromType())
|
||||
|
||||
// old recipe
|
||||
event.disable("factory_blocks:mason_table_old")
|
||||
|
||||
event.disable("supplementaries:botany_flax")
|
||||
|
||||
event.getEntry(["mekmm:compat/immersiveengineering/lathe/aluminum_stick", "mekmm:compat/immersiveengineering/lathe/steel_stick"])
|
||||
.forEach(entry => {
|
||||
entry.renameKey("main_input", "input", false)
|
||||
})
|
||||
|
||||
event.getEntry(/^create:.*\/compat\/(biomeswevegone|silentgems)\//)
|
||||
.forEach(entry => {
|
||||
entry.addConditionsFromKey("ingredients")
|
||||
})
|
||||
|
||||
event.getEntry("farmersdelight:integration/create/filling/chocolate_pie")
|
||||
.forEach(entry => {
|
||||
entry.replaceValueAtKey("ingredients", "fluid_tag", "c:chocolates", "c:chocolate")
|
||||
})
|
||||
|
||||
event.getEntry("mekmm:compat/mysticalagradditions/planting/awakened_draconium")
|
||||
.forEach(entry => {
|
||||
entry.fixItemAtKey("main_output")
|
||||
let ci = entry.json().get("chemical_input")
|
||||
if (ci.has("gas")) {
|
||||
ci.add("chemical", ci.remove("gas"))
|
||||
}
|
||||
})
|
||||
|
||||
event.getEntry("botanypots:allthemodium/crop/ancient_soulberries")
|
||||
.forEach(entry => {
|
||||
entry.addConditionsFromKey("input")
|
||||
})
|
||||
|
||||
event.getEntry("bellsandwhistles:metro/metro_window").forEach(entry => {
|
||||
entry.replaceValueAtKey("ingredients", "tag", "c:glass", "c:glass_blocks/colorless")
|
||||
})
|
||||
|
||||
event.getEntry("regions_unexplored:prismaglass").forEach(entry => {
|
||||
entry.replaceValueAtKey("key", "tag", "c:glass", "c:glass_blocks/colorless")
|
||||
})
|
||||
|
||||
event.getEntry(/^regions_unexplored:.*_snowbelle$/)
|
||||
.forEach(entry => {
|
||||
let ings = entry.json().get("ingredients")
|
||||
if (ings != null) {
|
||||
for (let ing of ings) {
|
||||
let tag = ing.get("tag")
|
||||
if (tag != null) {
|
||||
if (tag.getAsString().endsWith("_dyes")) {
|
||||
let color = tag.getAsString().replace("c:","").replace("_dyes","")
|
||||
ing["addProperty(java.lang.String,java.lang.String)"]("tag", "c:dyes/" + color)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
event.getEntry(/^regions_unexplored:.*_painted_planks$/)
|
||||
.forEach(entry => {
|
||||
let keys = entry.json().get("key")
|
||||
if (keys != null) {
|
||||
for (let key of keys.asMap().values()) {
|
||||
let tag = key.get("tag")
|
||||
if (tag != null) {
|
||||
if (tag.getAsString().endsWith("_dyes")) {
|
||||
let color = tag.getAsString().replace("c:","").replace("_dyes","")
|
||||
key["addProperty(java.lang.String,java.lang.String)"]("tag", "c:dyes/" + color)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
event.getEntry(["pneumaticcraft:block_heat_properties/createlowheated/basic_burner_empowered","pneumaticcraft:block_heat_properties/createlowheated/basic_burner_lit"])
|
||||
.forEach(entry => {
|
||||
entry.json().add("neoforge:conditions", [{ "type": "neoforge:mod_loaded", "modid": "createlowheated"}])
|
||||
})
|
||||
|
||||
console.log(`Fixing recipes took ${timer.stop().elapsed("milliseconds")} ms...`)
|
||||
let $Stopwatch = Java.loadClass("com.google.common.base.Stopwatch")
|
||||
|
||||
KubeJSTweaks.beforeRecipes(event => {
|
||||
let timer = $Stopwatch.createStarted();
|
||||
|
||||
event.dumpErroringRecipes()
|
||||
|
||||
// Upgrade from forge to neoforge conditions
|
||||
event.fixCondition([
|
||||
"irons_spellbooks:patchouli_book",
|
||||
"apotheosis:book",
|
||||
"treetap:id_menril",
|
||||
"treetap:id_menril_tfc",
|
||||
/^silentgear:woodcutting\//,
|
||||
"silentgear:sapling/netherwood"
|
||||
])
|
||||
|
||||
// Fix "item" -> "id"
|
||||
event.fixItemAtKey([/^create:crushing\/gloomslate_/, /^create:crushing\/sculk_stone_/, /^create:cutting\/.*echo_/], "results")
|
||||
|
||||
event.fixItemAtKey("treetap:id_menril", "result")
|
||||
|
||||
// Fix farmer delight tool type that was renamed on 1.21.1
|
||||
// sound changed
|
||||
// and their result is now an array of a custom codec that have now "item" as a key
|
||||
event.getEntry([/^farmersdelight:cutting\/echo_/, "farmersdelight:integration/silentgear/cutting/netherwood"])
|
||||
.forEach(entry => {
|
||||
entry.replaceValueAtKey("tool", "type", "farmersdelight:tool_action", "farmersdelight:item_ability")
|
||||
|
||||
entry.fromPath("sound").ifPresent(result => {
|
||||
result.first.add("sound", { sound_id: result.second })
|
||||
})
|
||||
if (entry.id() == "farmersdelight:integration/silentgear/cutting/netherwood") {
|
||||
let resultArray = entry.json().get("result")
|
||||
if (resultArray == null) return
|
||||
for (let item of resultArray) {
|
||||
if (!item.has("item")) continue
|
||||
item.add("item", {
|
||||
"id": item.get("item")
|
||||
})
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
// Simple key renaming to match current changes
|
||||
event.getEntry(/^createaddition:compat\/immersiveengineering\/rolling\//)
|
||||
.forEach(entry => {
|
||||
entry.renameKey("result", "results", true)
|
||||
entry.renameKey("input", "ingredients", true)
|
||||
})
|
||||
|
||||
// Simple key renaming to match current changes
|
||||
event.getEntry("createaddition:compat/ae2/charged_certus_quartz")
|
||||
.forEach(entry => {
|
||||
entry.renameKey("result", "results", true)
|
||||
entry.renameKey("ingredient", "ingredients", true)
|
||||
})
|
||||
|
||||
// this is the way now with biome_predicates
|
||||
event.getEntry("createaddition:compat/immersiveengineering/sphalerite")
|
||||
.forEach(entry => {
|
||||
entry.json().add("biome_predicates", [
|
||||
["minecraft:is_overworld"]
|
||||
])
|
||||
})
|
||||
|
||||
// Scans items on result and add them back as conditions, izi fix
|
||||
event.getEntry(/^farmingforblockheads:market\//)
|
||||
.forEach(entry => {
|
||||
entry.addConditionsFromKey("result")
|
||||
})
|
||||
|
||||
// Scans items/tags on ingredients and add them back as conditions
|
||||
event.getEntry("create:crafting/tree_fertilizer")
|
||||
.forEach(entry => {
|
||||
entry.addConditionsFromKey("ingredients")
|
||||
})
|
||||
|
||||
event.getEntry(["merrymaking:aged_pine_mantel", "merrymaking:exposed_pine_mantel", "merrymaking:pine_mantel", "merrymaking:weathered_pine_mantel"])
|
||||
.forEach(entry => {
|
||||
entry.addConditionsFromKey("key")
|
||||
})
|
||||
|
||||
|
||||
// Fix a typo, they missed a `s`
|
||||
event.getEntry([
|
||||
"mekanism:compat/biomeswevegone/enriching/dacite/conversion_dacite_tile",
|
||||
"mekanism:compat/biomeswevegone/crushing/dacite/conversion_dacite_cobblestone",
|
||||
"mekanism:compat/biomeswevegone/enriching/dacite/conversion_dacite_bricks",
|
||||
"mekanism:compat/biomeswevegone/crushing/dacite/conversion_dacite_tile"
|
||||
]).forEach(entry => {
|
||||
entry.replaceValueAtKey("input", "item", "biomeswevegone:dacite_tile", "biomeswevegone:dacite_tiles")
|
||||
entry.replaceValueAtKey("output", "id", "biomeswevegone:dacite_tile", "biomeswevegone:dacite_tiles")
|
||||
})
|
||||
|
||||
// Another typo, a wild `'` at the name of the item
|
||||
event.getEntry("mekmm:compat/ars_nouveau/planting/magebloom").forEach(entry => {
|
||||
entry.fromPath("secondary_output.id").ifPresent(result => {
|
||||
result.first.add("id", result.second.getAsString().replace("'", ""))
|
||||
})
|
||||
})
|
||||
|
||||
// RIP Jonn, forgot `s`
|
||||
event.getEntry(/^dyenamicsandfriends:.*_hammock$/).forEach(entry => {
|
||||
entry.fixCondition()
|
||||
entry.replaceValueAtKey("key", "tag", "c:string", "c:strings")
|
||||
})
|
||||
|
||||
// RIP Jonn2, forgot another `s`
|
||||
event.getEntry("productivetrees:crates/coffee_bean_crate").forEach(entry => {
|
||||
entry.replaceValueAtKey("key", "tag", "c:coffee_bean", "c:coffee_beans")
|
||||
})
|
||||
|
||||
// RIP Jonn2, looks like it was changed to `_blocks` now
|
||||
event.getEntry("productivetrees:time_traveller_display").forEach(entry => {
|
||||
entry.replaceValueAtKey("key", "tag", "c:glass/colorless", "c:glass_blocks/colorless")
|
||||
})
|
||||
|
||||
// Ignore warnings because silent gear ingredients
|
||||
// that contains "silentgear:material" are not ready
|
||||
// yet, but are valid in a later stage
|
||||
event.getEntry("@silentgear")
|
||||
.forEach(entry => {
|
||||
let ings = entry.json().get("ingredients")
|
||||
let keys = entry.json().get("key")
|
||||
|
||||
if (ings != null) {
|
||||
for (let ing of ings) {
|
||||
let type = ing.get("type")
|
||||
if (type != null) {
|
||||
if (type.getAsString() == "silentgear:material") {
|
||||
entry.ignoreWarning()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (keys != null) {
|
||||
for (let key of keys.asMap().values()) {
|
||||
let type = key.get("type")
|
||||
if (type != null) {
|
||||
if (type.getAsString() == "silentgear:material") {
|
||||
entry.ignoreWarning()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
// Ignore warnings because while this recipe
|
||||
// is not really valid, it still works
|
||||
event.getEntry(/^deeperdarker:.*_smithing$/)
|
||||
.forEach(entry => {
|
||||
entry.fromPath("template", "[]").ifPresent(result => entry.ignoreWarning())
|
||||
})
|
||||
|
||||
// Adds mod condition check
|
||||
event.getEntry("productivebees:elementalcraft/pureinfusion/pure_crystal_bee")
|
||||
.forEach(entry => entry.addModConditionFromType())
|
||||
|
||||
// old recipe
|
||||
event.disable("factory_blocks:mason_table_old")
|
||||
|
||||
event.disable("supplementaries:botany_flax")
|
||||
|
||||
event.getEntry(["mekmm:compat/immersiveengineering/lathe/aluminum_stick", "mekmm:compat/immersiveengineering/lathe/steel_stick"])
|
||||
.forEach(entry => {
|
||||
entry.renameKey("main_input", "input", false)
|
||||
})
|
||||
|
||||
event.getEntry(/^create:.*\/compat\/(biomeswevegone|silentgems)\//)
|
||||
.forEach(entry => {
|
||||
entry.addConditionsFromKey("ingredients")
|
||||
})
|
||||
|
||||
event.getEntry("farmersdelight:integration/create/filling/chocolate_pie")
|
||||
.forEach(entry => {
|
||||
entry.replaceValueAtKey("ingredients", "fluid_tag", "c:chocolates", "c:chocolate")
|
||||
})
|
||||
|
||||
event.getEntry("mekmm:compat/mysticalagradditions/planting/awakened_draconium")
|
||||
.forEach(entry => {
|
||||
entry.fixItemAtKey("main_output")
|
||||
let ci = entry.json().get("chemical_input")
|
||||
if (ci.has("gas")) {
|
||||
ci.add("chemical", ci.remove("gas"))
|
||||
}
|
||||
})
|
||||
|
||||
event.getEntry("botanypots:allthemodium/crop/ancient_soulberries")
|
||||
.forEach(entry => {
|
||||
entry.addConditionsFromKey("input")
|
||||
})
|
||||
|
||||
event.getEntry("bellsandwhistles:metro/metro_window").forEach(entry => {
|
||||
entry.replaceValueAtKey("ingredients", "tag", "c:glass", "c:glass_blocks/colorless")
|
||||
})
|
||||
|
||||
event.getEntry("regions_unexplored:prismaglass").forEach(entry => {
|
||||
entry.replaceValueAtKey("key", "tag", "c:glass", "c:glass_blocks/colorless")
|
||||
})
|
||||
|
||||
event.getEntry(/^regions_unexplored:.*_snowbelle$/)
|
||||
.forEach(entry => {
|
||||
let ings = entry.json().get("ingredients")
|
||||
if (ings != null) {
|
||||
for (let ing of ings) {
|
||||
let tag = ing.get("tag")
|
||||
if (tag != null) {
|
||||
if (tag.getAsString().endsWith("_dyes")) {
|
||||
let color = tag.getAsString().replace("c:","").replace("_dyes","")
|
||||
ing["addProperty(java.lang.String,java.lang.String)"]("tag", "c:dyes/" + color)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
event.getEntry(/^regions_unexplored:.*_painted_planks$/)
|
||||
.forEach(entry => {
|
||||
let keys = entry.json().get("key")
|
||||
if (keys != null) {
|
||||
for (let key of keys.asMap().values()) {
|
||||
let tag = key.get("tag")
|
||||
if (tag != null) {
|
||||
if (tag.getAsString().endsWith("_dyes")) {
|
||||
let color = tag.getAsString().replace("c:","").replace("_dyes","")
|
||||
key["addProperty(java.lang.String,java.lang.String)"]("tag", "c:dyes/" + color)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
event.getEntry(["pneumaticcraft:block_heat_properties/createlowheated/basic_burner_empowered","pneumaticcraft:block_heat_properties/createlowheated/basic_burner_lit"])
|
||||
.forEach(entry => {
|
||||
entry.json().add("neoforge:conditions", [{ "type": "neoforge:mod_loaded", "modid": "createlowheated"}])
|
||||
})
|
||||
|
||||
console.log(`Fixing recipes took ${timer.stop().elapsed("milliseconds")} ms...`)
|
||||
})
|
||||
@@ -1,12 +1,12 @@
|
||||
// This File has been authored by AllTheMods Staff, or a Community contributor for use in AllTheMods - AllTheMods 10.
|
||||
// As all AllTheMods packs are licensed under All Rights Reserved, this file is not allowed to be used in any public packs not released by the AllTheMods Team, without explicit permission.
|
||||
|
||||
ServerEvents.loaded(event => {
|
||||
let $Registries = Java.loadClass("net.minecraft.core.registries.Registries")
|
||||
event.server.registryAccess().registryOrThrow($Registries.BIOME).addAlias("biomeswevegone:skyrise_vale", "biomeswevegone:skyris_vale")
|
||||
})
|
||||
|
||||
// This File has been authored by AllTheMods Staff, or a Community contributor for use in AllTheMods - AllTheMods 10.
|
||||
// As all AllTheMods packs are licensed under All Rights Reserved, this file is not allowed to be used in any public packs not released by the AllTheMods Team, without explicit permission.
|
||||
|
||||
|
||||
// This File has been authored by AllTheMods Staff, or a Community contributor for use in AllTheMods - AllTheMods 10.
|
||||
// As all AllTheMods packs are licensed under All Rights Reserved, this file is not allowed to be used in any public packs not released by the AllTheMods Team, without explicit permission.
|
||||
|
||||
ServerEvents.loaded(event => {
|
||||
let $Registries = Java.loadClass("net.minecraft.core.registries.Registries")
|
||||
event.server.registryAccess().registryOrThrow($Registries.BIOME).addAlias("biomeswevegone:skyrise_vale", "biomeswevegone:skyris_vale")
|
||||
})
|
||||
|
||||
// This File has been authored by AllTheMods Staff, or a Community contributor for use in AllTheMods - AllTheMods 10.
|
||||
// As all AllTheMods packs are licensed under All Rights Reserved, this file is not allowed to be used in any public packs not released by the AllTheMods Team, without explicit permission.
|
||||
|
||||
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
// priority 10
|
||||
|
||||
if (config) {
|
||||
let recipesToRemove = config?.server.remove_recipes_by
|
||||
|
||||
if (recipesToRemove instanceof $ArrayList && !recipesToRemove.isEmpty()) {
|
||||
ServerEvents.recipes(event => {
|
||||
recipesToRemove.forEach(item => {
|
||||
event.remove(item)
|
||||
})
|
||||
})
|
||||
}
|
||||
}
|
||||
// priority 10
|
||||
|
||||
if (config) {
|
||||
let recipesToRemove = config?.server.remove_recipes_by
|
||||
|
||||
if (recipesToRemove instanceof $ArrayList && !recipesToRemove.isEmpty()) {
|
||||
ServerEvents.recipes(event => {
|
||||
recipesToRemove.forEach(item => {
|
||||
event.remove(item)
|
||||
})
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user