diff --git a/config/conjuring.json5 b/config/conjuring.json5 index e53bf6d..03a5239 100644 --- a/config/conjuring.json5 +++ b/config/conjuring.json5 @@ -13,7 +13,6 @@ "alaskanativecraft:moose", "alaskanativecraft:ptarmigan", "alaskanativecraft:seal", - "aqupd:caracal", "artifacts:mimic", "battletowers:tower_guardian", "betterend:spawn_egg_cubozoa", diff --git a/kubejs/assets/bambootweaks/blockstates/bamboo_wall_torch.json b/kubejs/assets/bambootweaks/blockstates/bamboo_wall_torch.json new file mode 100644 index 0000000..04ce1d4 --- /dev/null +++ b/kubejs/assets/bambootweaks/blockstates/bamboo_wall_torch.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "bambootweaks:block/bamboo_torch_wall" + }, + "facing=south": { + "model": "bambootweaks:block/bamboo_torch_wall", + "y": 90 + }, + "facing=west": { + "model": "bambootweaks:block/bamboo_torch_wall", + "y": 180 + }, + "facing=north": { + "model": "bambootweaks:block/bamboo_torch_wall", + "y": 270 + } + } +} diff --git a/kubejs/assets/bambootweaks/blockstates/dry_bamboo_wall_torch.json b/kubejs/assets/bambootweaks/blockstates/dry_bamboo_wall_torch.json new file mode 100644 index 0000000..0ba488d --- /dev/null +++ b/kubejs/assets/bambootweaks/blockstates/dry_bamboo_wall_torch.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "bambootweaks:block/dry_bamboo_torch_wall" + }, + "facing=south": { + "model": "bambootweaks:block/dry_bamboo_torch_wall", + "y": 90 + }, + "facing=west": { + "model": "bambootweaks:block/dry_bamboo_torch_wall", + "y": 180 + }, + "facing=north": { + "model": "bambootweaks:block/dry_bamboo_torch_wall", + "y": 270 + } + } +} diff --git a/kubejs/assets/carrier/lang/en_us.json b/kubejs/assets/carrier/lang/en_us.json new file mode 100644 index 0000000..3deeee3 --- /dev/null +++ b/kubejs/assets/carrier/lang/en_us.json @@ -0,0 +1,4 @@ +{ + "category.carrier":"Carrier", + "carrier.key":"Toggle Carrier" +} \ No newline at end of file diff --git a/kubejs/assets/drinkbeer/textures/block/beer_mug_night_howl_kvass_paw.png b/kubejs/assets/drinkbeer/textures/block/beer_mug_night_howl_kvass_paw.png new file mode 100644 index 0000000..8724c40 Binary files /dev/null and b/kubejs/assets/drinkbeer/textures/block/beer_mug_night_howl_kvass_paw.png differ diff --git a/kubejs/assets/drinkbeer/textures/block/beer_mug_night_howl_kvass_pow.png b/kubejs/assets/drinkbeer/textures/block/beer_mug_night_howl_kvass_pow.png new file mode 100644 index 0000000..8724c40 Binary files /dev/null and b/kubejs/assets/drinkbeer/textures/block/beer_mug_night_howl_kvass_pow.png differ diff --git a/kubejs/assets/golemsgalore/lang/en_us.json b/kubejs/assets/golemsgalore/lang/en_us.json index 202c950..5f957ed 100644 --- a/kubejs/assets/golemsgalore/lang/en_us.json +++ b/kubejs/assets/golemsgalore/lang/en_us.json @@ -1,8 +1,5 @@ { "entity.golemsgalore.obsdian_golem":"Obsidian Golem", "entity.golemsgalore.hay_golem":"Hay Golem", - "entity.golemsgalore.diamond_laser_golem":"Diamond Laser Golem", - "golemsgalore.diamond_laser_golem_banner":"Diamond Laser Golem", - "golemsgalore.hay_golem_banner":"Hay Golem", - "golemsgalore.obsdian_golem":"Obsidian Golem" + "entity.golemsgalore.diamond_laser_golem":"Diamond Laser Golem" } \ No newline at end of file diff --git a/kubejs/assets/iron-jetpacks/lang/en_us.json b/kubejs/assets/iron-jetpacks/lang/en_us.json index 565d264..13bf9c1 100644 --- a/kubejs/assets/iron-jetpacks/lang/en_us.json +++ b/kubejs/assets/iron-jetpacks/lang/en_us.json @@ -1,4 +1,5 @@ { - "keybind.iron-jetpacks.engine":"Toggle Engine", - "keybind.iron-jetpacks.hover":"Toggle Hover Mode" + "key.iron-jetpacks.engine":"Toggle Engine", + "key.iron-jetpacks.hover":"Toggle Hover Mode", + "key.iron-jetpacks.descend":"Toggle Descend" } \ No newline at end of file diff --git a/kubejs/assets/iron-jetpacks/pack.mcmeta b/kubejs/assets/iron-jetpacks/pack.mcmeta deleted file mode 100644 index 5a4dd34..0000000 --- a/kubejs/assets/iron-jetpacks/pack.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "pack": { - "pack_format": 6, - "description": "Language" - } -} diff --git a/kubejs/assets/mocolors/lang/en_us.json b/kubejs/assets/mocolors/lang/en_us.json index 97783e8..b46040d 100644 --- a/kubejs/assets/mocolors/lang/en_us.json +++ b/kubejs/assets/mocolors/lang/en_us.json @@ -2,5 +2,6 @@ "block.mocolors.colored_bricks_stairs":"Colored Bricks Stairs", "block.mocolors.colored_bricks_slab":"Colored Bricks Slab", "block.mocolors.colored_bricks":"Colored Bricks", - "block.mocolors.colored_glass":"Colored Glass" + "block.mocolors.colored_glass":"Colored Glass", + "block.mocolors.colored_slime":"Colored Slime Block" } \ No newline at end of file diff --git a/kubejs/assets/mocolors/lang/pl_pl.json b/kubejs/assets/mocolors/lang/pl_pl.json index 42156f9..97d7c49 100644 --- a/kubejs/assets/mocolors/lang/pl_pl.json +++ b/kubejs/assets/mocolors/lang/pl_pl.json @@ -2,5 +2,6 @@ "block.mocolors.colored_bricks_stairs":"Kolorowe Schody", "block.mocolors.colored_bricks_slab":"Kolorowe Półpłytki", "block.mocolors.colored_bricks":"Kolorowe Cegły", - "block.mocolors.colored_glass":"Kolorowe Szkło" + "block.mocolors.colored_glass":"Kolorowe Szkło", + "block.mocolors.colored_slime":"Kolorowy Blok Szlamu" } \ No newline at end of file diff --git a/kubejs/assets/mocolors/pack.mcmeta b/kubejs/assets/mocolors/pack.mcmeta deleted file mode 100644 index 5a4dd34..0000000 --- a/kubejs/assets/mocolors/pack.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "pack": { - "pack_format": 6, - "description": "Language" - } -} diff --git a/kubejs/assets/winged/lang/en_us.json b/kubejs/assets/winged/lang/en_us.json index 9b3f33e..28668dd 100644 --- a/kubejs/assets/winged/lang/en_us.json +++ b/kubejs/assets/winged/lang/en_us.json @@ -1,3 +1,3 @@ { - "tooltip.winged.heart_of_the_sky":"§fWings ingredient" + "tooltip.winged.heart_of_the_sky":"" } \ No newline at end of file diff --git a/kubejs/assets/winged/pack.mcmeta b/kubejs/assets/winged/pack.mcmeta deleted file mode 100644 index 5a4dd34..0000000 --- a/kubejs/assets/winged/pack.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "pack": { - "pack_format": 6, - "description": "Language" - } -} diff --git a/kubejs/server_scripts/appliedenergistic2/missings.js b/kubejs/server_scripts/appliedenergistic2/missings.js index b606c38..be705a5 100644 --- a/kubejs/server_scripts/appliedenergistic2/missings.js +++ b/kubejs/server_scripts/appliedenergistic2/missings.js @@ -1,13 +1,5 @@ -//╔════════════════════════════════════════╗ -//║ GNU Free Documentation License ║ -//╚════════════════════════════════════════╝ - events.listen("recipes", function (event) { -//╔════════════════════════════════════════╗ -//║ AE2 MISSING SLABS ║ -//╚════════════════════════════════════════╝ - // Smooth slab event.remove({ output: "appliedenergistics2:smooth_sky_stone_slab" }); event.shaped(item.of("appliedenergistics2:smooth_sky_stone_slab", 6), [ @@ -55,11 +47,7 @@ events.listen("recipes", function (event) { event.shaped(item.of("appliedenergistics2:chiseled_quartz_slab", 6), [ ["appliedenergistics2:chiseled_quartz_block", "appliedenergistics2:chiseled_quartz_block", "appliedenergistics2:chiseled_quartz_block"], ]); - -//╔════════════════════════════════════════╗ -//║ AE2 MISSING STAIRS ║ -//╚════════════════════════════════════════╝ - + // Smooth Stairs event.remove({ output: "appliedenergistics2:smooth_sky_stone_stairs" }); event.shaped(item.of("appliedenergistics2:smooth_sky_stone_stairs", 6), [ diff --git a/kubejs/server_scripts/balancing.js b/kubejs/server_scripts/balancing.js index 8cbbdee..0dc3be5 100644 --- a/kubejs/server_scripts/balancing.js +++ b/kubejs/server_scripts/balancing.js @@ -20,13 +20,13 @@ events.listen("recipes", function (event) { ['minecraft:end_crystal', 'minecraft:nether_star', 'minecraft:dragon_breath'], ]); - // Master Infusion Crystal - event.remove({ output: "mysticalagriculture:master_infusion_crystal" }); - event.shaped(item.of("mysticalagriculture:master_infusion_crystal"), [ - ['mysticalagriculture:supremium_ingot', 'mysticalagriculture:infusion_crystal', 'mysticalagriculture:supremium_ingot'], - ['mysticalagriculture:infusion_crystal', 'mysticalagriculture:supremium_gemstone_block', 'mysticalagriculture:infusion_crystal'], - ['mysticalagriculture:supremium_ingot', 'mysticalagriculture:infusion_crystal', 'mysticalagriculture:supremium_ingot'], - ]); + // Master Infusion Crystal + event.remove({ output: "mysticalagriculture:master_infusion_crystal" }); + event.shaped(item.of("mysticalagriculture:master_infusion_crystal"), [ + ['mysticalagriculture:supremium_ingot', 'mysticalagriculture:infusion_crystal', 'mysticalagriculture:supremium_ingot'], + ['mysticalagriculture:infusion_crystal', 'mysticalagriculture:supremium_gemstone_block', 'mysticalagriculture:infusion_crystal'], + ['mysticalagriculture:supremium_ingot', 'mysticalagriculture:infusion_crystal', 'mysticalagriculture:supremium_ingot'], + ]); // Quantum Suit @@ -65,15 +65,15 @@ events.listen("recipes", function (event) { event.remove({ id: "vanilla-hammers:obsidian_hammer" }); event.remove({ id: "vanilla-excavators:obsidian_excavator" }); - // Light Ring - event.remove({ output: "kibe:light_ring" }); - event.shaped(item.of("kibe:light_ring"), [ - ["iron-jetpacks:diamond_capacitor", "modern_industrialization:tank_stainless_steel", "iron-jetpacks:diamond_capacitor"], - ["modern_industrialization:bucket_light_fuel", "kibe:diamond_ring", "modern_industrialization:bucket_light_fuel"], - ["iron-jetpacks:diamond_capacitor", "modern_industrialization:tank_stainless_steel", "iron-jetpacks:diamond_capacitor"], - ]); + // Light Ring + event.remove({ output: "kibe:light_ring" }); + event.shaped(item.of("kibe:light_ring"), [ + ["iron-jetpacks:diamond_capacitor", "modern_industrialization:tank_stainless_steel", "iron-jetpacks:diamond_capacitor"], + ["modern_industrialization:bucket_light_fuel", "kibe:diamond_ring", "modern_industrialization:bucket_light_fuel"], + ["iron-jetpacks:diamond_capacitor", "modern_industrialization:tank_stainless_steel", "iron-jetpacks:diamond_capacitor"], + ]); - //Gem Tools & Gear + //Gem Tools & Gear var gems = [ "ruby", "sapphire", @@ -88,12 +88,12 @@ events.listen("recipes", function (event) { event.remove({ output: "techreborn:" + item + "_sword"}); }); - // Minecart in Rolling Machine - event.remove({ id: "techreborn:rolling_machine/minecart" }); + // Minecart in Rolling Machine + event.remove({ id: "techreborn:rolling_machine/minecart" }); - // MRE + // MRE event.remove({ output: "campanion:mre" }); - // Remove boss key + // Remove Boss Key event.remove({ output: "battletowers:boss_key" }); }); diff --git a/kubejs/server_scripts/drinkbeer/shaped.js b/kubejs/server_scripts/drinkbeer/shaped.js deleted file mode 100644 index 8a73b40..0000000 --- a/kubejs/server_scripts/drinkbeer/shaped.js +++ /dev/null @@ -1,31 +0,0 @@ -//╔════════════════════════════════════════╗ -//║ GNU Free Documentation License ║ -//╚════════════════════════════════════════╝ - -events.listen("recipes", function (event) { - -//╔════════════════════════════════════════╗ -//║ DRINK BEER ║ -//╚════════════════════════════════════════╝ - - event.remove({ output: "drinkbeer:iron_call_bell" }); - event.shaped(item.of("indrev:cooler_cell"), [ - ["#c:iron_nuggets", "null", "null"], - ["#c:iron_ingots" , "null", "null"], - ["#minecraft:planks", "null", "null"], - ]); - - event.remove({ output: "drinkbeer:gold_call_bell" }); - event.shaped(item.of("indrev:cooler_cell"), [ - ["minecraft:gold_nugget", "null", "null"], - ["minecraft:gold_ingot" , "null", "null"], - ["#minecraft:planks", "null", "null"], - ]); - - event.remove({ output: "drinkbeer:lekas_call_bell" }); - event.shaped(item.of("indrev:cooler_cell"), [ - ["techreborn:copper_nugget", "null", "null"], - ["techreborn:copper_ingot" , "null", "null"], - ["#minecraft:planks", "null", "null"], - ]); -}); \ No newline at end of file diff --git a/kubejs/server_scripts/expandedstorage/shapeless.js b/kubejs/server_scripts/expandedstorage/shapeless.js index a2eaad0..ff0972a 100644 --- a/kubejs/server_scripts/expandedstorage/shapeless.js +++ b/kubejs/server_scripts/expandedstorage/shapeless.js @@ -1,13 +1,5 @@ -//╔════════════════════════════════════════╗ -//║ GNU Free Documentation License ║ -//╚════════════════════════════════════════╝ - events.listen("recipes", function (event) { -//╔════════════════════════════════════════╗ -//║ EXPANDEDSTORAGE/CHESTS ║ -//╚════════════════════════════════════════╝ - event.shapeless('expandedstorage:old_wood_chest', ['expandedstorage:wood_chest']) event.shapeless('expandedstorage:wood_chest', ['expandedstorage:old_wood_chest']); }); \ No newline at end of file diff --git a/kubejs/server_scripts/kibe/shaped.js b/kubejs/server_scripts/kibe/shaped.js index 9dfa1c6..027cc67 100644 --- a/kubejs/server_scripts/kibe/shaped.js +++ b/kubejs/server_scripts/kibe/shaped.js @@ -1,12 +1,5 @@ -//╔════════════════════════════════════════╗ -//║ GNU Free Documentation License ║ -//╚════════════════════════════════════════╝ events.listen("recipes", function (event) { -//╔════════════════════════════════════════╗ -//║ KIBE/LASSO ║ -//╚════════════════════════════════════════╝ - // Cursed Lasso event.remove({ output: "kibe:cursed_lasso" }); event.shaped(item.of("kibe:cursed_lasso"), [ @@ -31,42 +24,11 @@ events.listen("recipes", function (event) { ["mysticalagriculture:chicken_essence" , "mysticalagriculture:ghast_essence", "mysticalagriculture:chicken_essence"], ]); -//╔════════════════════════════════════════╗ -//║ KIBE/RINGS ║ -//╚════════════════════════════════════════╝ -// -// // Angel Ring -// event.remove({ output: "kibe:angel_ring" }); -// event.shaped(item.of("kibe:angel_ring"), [ -// ["winged:angel_feather", "minecraft:elytra" , "winged:angel_feather"], -// ["modern_industrialization:iron_gear" , "modern_industrialization:air_intake", "modern_industrialization:iron_gear" ], -// ["kibe:diamond_ring" , "indrev:module_feather_falling" , "kibe:diamond_ring" ], -// ]); -// -// // Light Ring -// event.remove({ output: "kibe:light_ring" }); -// event.shaped(item.of("kibe:light_ring"), [ -// ["modern_industrialization:gold_curved_plate", "kibe:diamond_ring", "modern_industrialization:gold_curved_plate"], -// ["kibe:golden_lasso", "modern_industrialization:bucket_light_fuel", "kibe:golden_lasso" ], -// ["minecraft:gold_ingot", "modern_industrialization:lv_circuit_board" , "minecraft:gold_ingot"], -// ]); -// -// // Diamond Ring -// event.remove({ output: "kibe:diamond_ring" }); -// event.shaped(item.of("kibe:diamond_ring"), [ -// ["minecraft:diamond", "modern_industrialization:gold_crushed_dust", "minecraft:diamond"], -// ["modern_industrialization:gold_crushed_dust", "mysticalagriculture:gold_essence","modern_industrialization:gold_crushed_dust"], -// ["minecraft:diamond", "modern_industrialization:gold_crushed_dust", "minecraft:diamond"], -// ]); -// -//╔════════════════════════════════════════╗ -//║ KIBE/MAGNET ║ -//╚════════════════════════════════════════╝ - - event.remove({ output: "kibe:magnet" }); - event.shaped(item.of("kibe:magnet"), [ - ["minecraft:red_dye" , "#minecraft:beacon_payment_items", "#minecraft:beacon_payment_items"], - ["#minecraft:beacon_payment_items", "minecraft:ender_eye" , "null" ], - ["minecraft:red_dye" , "#minecraft:beacon_payment_items", "#minecraft:beacon_payment_items"], - ]); + // Kibe Magnet + event.remove({ output: "kibe:magnet" }); + event.shaped(item.of("kibe:magnet"), [ + ["minecraft:red_dye" , "#minecraft:beacon_payment_items", "#minecraft:beacon_payment_items"], + ["#minecraft:beacon_payment_items", "minecraft:ender_eye" , "null" ], + ["minecraft:red_dye" , "#minecraft:beacon_payment_items", "#minecraft:beacon_payment_items"], + ]); }) \ No newline at end of file diff --git a/kubejs/server_scripts/minecraft/blasting/materials.js b/kubejs/server_scripts/minecraft/blasting/materials.js index 5d4dcde..9b629af 100644 --- a/kubejs/server_scripts/minecraft/blasting/materials.js +++ b/kubejs/server_scripts/minecraft/blasting/materials.js @@ -1,9 +1,6 @@ events.listen("recipes", function (event) { -//╔════════════════════════════════════════╗ -//║ ROTTEN FLESH ║ -//╚════════════════════════════════════════╝ - + // Rotten Flesh event.recipes.minecraft.blasting(item.of('minecraft:leather'), 'minecraft:rotten_flesh') }) diff --git a/kubejs/server_scripts/minecraft/shaped.js b/kubejs/server_scripts/minecraft/examples similarity index 98% rename from kubejs/server_scripts/minecraft/shaped.js rename to kubejs/server_scripts/minecraft/examples index 770ff27..d7a5456 100644 --- a/kubejs/server_scripts/minecraft/shaped.js +++ b/kubejs/server_scripts/minecraft/examples @@ -1,23 +1,8 @@ -//priority: 888 -settings.logAddedRecipes = true -settings.logRemovedRecipes = true -settings.logSkippedRecipes = false -settings.logErroringRecipes = true - -//╔════════════════════════════════════════╗ -//║ GNU Free Documentation License ║ -//╚════════════════════════════════════════╝ events.listen("recipes", function (event) { - -//╔════════════════════════════════════════╗ -//║ SPAWN EGGS ║ -//╚════════════════════════════════════════╝ -//╔════════════════════════════════════════╗ -//║ SPAWNER ║ -//╚════════════════════════════════════════╝ - +// Spawners + event.remove({ output: "minecraft:spawner" }); event.shaped(item.of("minecraft:spawner", 2), [ ["minecraft:netherite_ingot", "minecraft:netherite_ingot", "minecraft:netherite_ingot"], @@ -32,9 +17,9 @@ events.listen("recipes", function (event) { ["minecraft:netherite_block", "minecraft:netherite_block", "minecraft:netherite_block"], ]); -//╔════════════════════════════════════════╗ -//║ SPAWN EGGS RECIPES ║ -//╚════════════════════════════════════════╝ + +// Spawn Eggs + // zombie_spawn_egg // diff --git a/kubejs/server_scripts/minecraft/smelting/materials.js b/kubejs/server_scripts/minecraft/smelting/materials.js index 1badd44..e197beb 100644 --- a/kubejs/server_scripts/minecraft/smelting/materials.js +++ b/kubejs/server_scripts/minecraft/smelting/materials.js @@ -1,9 +1,6 @@ events.listen("recipes", function (event) { - -//╔════════════════════════════════════════╗ -//║ ROTTEN FLESH ║ -//╚════════════════════════════════════════╝ - + + // Rotten Flesh event.smelting('minecraft:leather', 'minecraft:rotten_flesh').xp(0.1); }) diff --git a/kubejs/server_scripts/woodenhoopers/shaped.js b/kubejs/server_scripts/woodenhoopers/shaped.js index b5bdfc3..93752de 100644 --- a/kubejs/server_scripts/woodenhoopers/shaped.js +++ b/kubejs/server_scripts/woodenhoopers/shaped.js @@ -1,12 +1,12 @@ -//╔════════════════════════════════════════╗ -//║ GNU Free Documentation License ║ -//╚════════════════════════════════════════╝ events.listen("recipes", function (event) { //╔════════════════════════════════════════╗ //║ WOODEN HOPPERS ║ //╚════════════════════════════════════════╝ +// event.replaceInput( +// { id: "woodenhoppers:oak_hopper" }, + // Oak Hopper event.remove({ output: "woodenhoppers:oak_hopper" }); event.shaped(item.of("woodenhoppers:oak_hopper"), [ @@ -70,4 +70,28 @@ events.listen("recipes", function (event) { ["minecraft:warped_planks", "#minecraft:beacon_payment_items", "minecraft:warped_planks"], ["null" , "minecraft:warped_planks" , "null" ], ]); + + // Bamboo Hopper + event.remove({ output: "blockus:bamboo_hopper" }); + event.shaped(item.of("blockus:bamboo_hopper"), [ + ["blockus:bamboo_planks", "#minecraft:beacon_payment_items", "blockus:bamboo_planks"], + ["blockus:bamboo_planks", "#minecraft:beacon_payment_items", "blockus:bamboo_planks"], + ["null" , "blockus:bamboo_planks" , "null" ], + ]); + + // Charred Hopper + event.remove({ output: "blockus:charred_hopper" }); + event.shaped(item.of("blockus:charred_hopper"), [ + ["blockus:charred_planks", "#minecraft:beacon_payment_items", "blockus:charred_planks"], + ["blockus:charred_planks", "#minecraft:beacon_payment_items", "blockus:charred_planks"], + ["null" , "blockus:charred_planks" , "null" ], + ]); + + // White Oak Hopper + event.remove({ output: "blockus:white_oak_hopper" }); + event.shaped(item.of("blockus:white_oak_hopper"), [ + ["blockus:white_oak_planks", "#minecraft:beacon_payment_items", "blockus:white_oak_planks"], + ["blockus:white_oak_planks", "#minecraft:beacon_payment_items", "blockus:white_oak_planks"], + ["null" , "blockus:white_oak_planks" , "null" ], + ]); }); \ No newline at end of file