diff --git a/CHANGELOG.md b/CHANGELOG.md index aa9e456c6..703cd387f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,8 @@ - Changed the ambient sounds in the Beneath, added some to the moon and mars @Pyritie - Tweaked the ambient sounds in the overworld @Pyritie - Apatite, Tricalcium phosphate, rock salt, potassium sulfate, and ammonium chloride dusts now count as crop fertiliser (#2501) @Xtrial-01 +- Added quern recipes for gems into dust @Pyritie +- Added recipes for smoke bombs, pet treats, and disguise kits, and added swapper pearls to the loot tables of various endermen @Pyritie ### Bug fixes - Fix for food stacking everywhere! @Mqrius - Fixed the grappling hook crashing and sending you to the void if you use it while travelling between dimensions (#2514) @Mqrius @@ -26,6 +28,8 @@ - Fixed loot tables for ore indicator buds @Pyritie - Fixed the new gas fuels being usable on other planets (#2515) @TomPlop - Fixed hot ingots melting packed ice into water sources @Mqrius +- Fixed inconsistent recipes for metal bars, now they all use the anvil or stonecutter. Also added recycling for them all @Pyritie +- Various quest fixes and improvements @thederpysockdude123 ### Translation updates - Chinese (simplified) @jmecn - Ukranian @MetEnBouldry diff --git a/kubejs/assets/species/lang/en_us.json b/kubejs/assets/species/lang/en_us.json index dbc5806c7..abec0bba2 100644 --- a/kubejs/assets/species/lang/en_us.json +++ b/kubejs/assets/species/lang/en_us.json @@ -1,5 +1,8 @@ { "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", "block.species.alphacene_moss_block": "Glacian Cap", - "block.species.petrified_egg": "Goober Egg" + "block.species.petrified_egg": "Goober Egg", + "item.species.wicked_mask": "Disguise Kit", + "item.species.wicked_swapper": "Swapper Pearl", + "item.species.wicked_treat": "Pet Treat" } \ No newline at end of file diff --git a/kubejs/assets/species/textures/item/smoke_bomb.png b/kubejs/assets/species/textures/item/smoke_bomb.png new file mode 100644 index 000000000..9607a8258 Binary files /dev/null and b/kubejs/assets/species/textures/item/smoke_bomb.png differ diff --git a/kubejs/assets/species/textures/item/wicked_mask.png b/kubejs/assets/species/textures/item/wicked_mask.png new file mode 100644 index 000000000..acae21bfb Binary files /dev/null and b/kubejs/assets/species/textures/item/wicked_mask.png differ diff --git a/kubejs/assets/species/textures/item/wicked_mask_worn.png b/kubejs/assets/species/textures/item/wicked_mask_worn.png new file mode 100644 index 000000000..03540ca7d Binary files /dev/null and b/kubejs/assets/species/textures/item/wicked_mask_worn.png differ diff --git a/kubejs/assets/species/textures/item/wicked_swapper.png b/kubejs/assets/species/textures/item/wicked_swapper.png new file mode 100644 index 000000000..cff5af54b Binary files /dev/null and b/kubejs/assets/species/textures/item/wicked_swapper.png differ diff --git a/kubejs/assets/species/textures/item/wicked_treat.png b/kubejs/assets/species/textures/item/wicked_treat.png new file mode 100644 index 000000000..452eafc9b Binary files /dev/null and b/kubejs/assets/species/textures/item/wicked_treat.png differ diff --git a/kubejs/data/endermanoverhaul/loot_tables/entities/badlands_enderman.json b/kubejs/data/endermanoverhaul/loot_tables/entities/badlands_enderman.json index d1af92e13..8a87d96d0 100644 --- a/kubejs/data/endermanoverhaul/loot_tables/entities/badlands_enderman.json +++ b/kubejs/data/endermanoverhaul/loot_tables/entities/badlands_enderman.json @@ -15,6 +15,10 @@ { "type": "minecraft:item", "name": "endermanoverhaul:summoner_pearl" + }, + { + "type": "minecraft:item", + "name": "species:wicked_swapper" } ], "rolls": 1.0 @@ -28,7 +32,7 @@ "conditions": [ { "condition": "minecraft:random_chance", - "chance": 0.1 + "chance": 0.25 } ] } diff --git a/kubejs/data/endermanoverhaul/loot_tables/entities/dark_oak_enderman.json b/kubejs/data/endermanoverhaul/loot_tables/entities/dark_oak_enderman.json index cc34d0b65..3219968e4 100644 --- a/kubejs/data/endermanoverhaul/loot_tables/entities/dark_oak_enderman.json +++ b/kubejs/data/endermanoverhaul/loot_tables/entities/dark_oak_enderman.json @@ -11,6 +11,10 @@ { "type": "minecraft:item", "name": "endermanoverhaul:corrupted_pearl" + }, + { + "type": "minecraft:item", + "name": "species:wicked_swapper" } ], "rolls": 1.0 diff --git a/kubejs/data/endermanoverhaul/loot_tables/entities/desert_enderman.json b/kubejs/data/endermanoverhaul/loot_tables/entities/desert_enderman.json new file mode 100644 index 000000000..f02596ad6 --- /dev/null +++ b/kubejs/data/endermanoverhaul/loot_tables/entities/desert_enderman.json @@ -0,0 +1,48 @@ +{ + "type": "minecraft:entity", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "endermanoverhaul:ancient_pearl" + }, + { + "type": "minecraft:item", + "name": "endermanoverhaul:soul_pearl" + }, + { + "type": "minecraft:item", + "name": "endermanoverhaul:summoner_pearl" + }, + { + "type": "minecraft:item", + "name": "species:wicked_swapper" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 4.0, + "min": 2.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "minecraft:chorus_fruit" + } + ], + "rolls": 2.0 + } + ] +} \ No newline at end of file diff --git a/kubejs/data/endermanoverhaul/loot_tables/entities/end_islands_enderman.json b/kubejs/data/endermanoverhaul/loot_tables/entities/end_islands_enderman.json index e96369c51..a5f5bd957 100644 --- a/kubejs/data/endermanoverhaul/loot_tables/entities/end_islands_enderman.json +++ b/kubejs/data/endermanoverhaul/loot_tables/entities/end_islands_enderman.json @@ -25,6 +25,10 @@ { "type": "minecraft:item", "name": "endermanoverhaul:soul_pearl" + }, + { + "type": "minecraft:item", + "name": "species:wicked_swapper" } ], "rolls": 1.0 diff --git a/kubejs/data/endermanoverhaul/loot_tables/entities/mushroom_fields_enderman.json b/kubejs/data/endermanoverhaul/loot_tables/entities/mushroom_fields_enderman.json index 4384f76eb..57709f5ec 100644 --- a/kubejs/data/endermanoverhaul/loot_tables/entities/mushroom_fields_enderman.json +++ b/kubejs/data/endermanoverhaul/loot_tables/entities/mushroom_fields_enderman.json @@ -11,6 +11,10 @@ { "type": "minecraft:item", "name": "endermanoverhaul:summoner_pearl" + }, + { + "type": "minecraft:item", + "name": "species:wicked_swapper" } ], "rolls": 1.0 diff --git a/kubejs/data/endermanoverhaul/loot_tables/entities/nether_wastes_enderman.json b/kubejs/data/endermanoverhaul/loot_tables/entities/nether_wastes_enderman.json index 85dbdff07..63f867c9f 100644 --- a/kubejs/data/endermanoverhaul/loot_tables/entities/nether_wastes_enderman.json +++ b/kubejs/data/endermanoverhaul/loot_tables/entities/nether_wastes_enderman.json @@ -11,6 +11,10 @@ { "type": "minecraft:item", "name": "endermanoverhaul:summoner_pearl" + }, + { + "type": "minecraft:item", + "name": "species:wicked_swapper" } ], "rolls": 1.0 diff --git a/kubejs/data/endermanoverhaul/loot_tables/entities/savanna_enderman.json b/kubejs/data/endermanoverhaul/loot_tables/entities/savanna_enderman.json new file mode 100644 index 000000000..99a3543f1 --- /dev/null +++ b/kubejs/data/endermanoverhaul/loot_tables/entities/savanna_enderman.json @@ -0,0 +1,63 @@ +{ + "type": "minecraft:entity", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "endermanoverhaul:ancient_pearl" + }, + { + "type": "minecraft:item", + "name": "endermanoverhaul:soul_pearl" + }, + { + "type": "minecraft:item", + "name": "endermanoverhaul:summoner_pearl" + }, + { + "type": "minecraft:item", + "name": "species:wicked_swapper" + } + ], + "rolls": 1.0 + }, + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "endermanoverhaul:savanna_hood", + "conditions": [ + { + "condition": "minecraft:random_chance", + "chance": 0.25 + } + ] + } + ] + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 4.0, + "min": 2.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "minecraft:chorus_fruit" + } + ], + "rolls": 2.0 + } + ] +} \ No newline at end of file diff --git a/kubejs/data/endermanoverhaul/loot_tables/entities/swamp_enderman.json b/kubejs/data/endermanoverhaul/loot_tables/entities/swamp_enderman.json index 3e4695d51..1914c81b6 100644 --- a/kubejs/data/endermanoverhaul/loot_tables/entities/swamp_enderman.json +++ b/kubejs/data/endermanoverhaul/loot_tables/entities/swamp_enderman.json @@ -11,6 +11,10 @@ { "type": "minecraft:item", "name": "endermanoverhaul:summoner_pearl" + }, + { + "type": "minecraft:item", + "name": "species:wicked_swapper" } ], "rolls": 1.0 diff --git a/kubejs/data/endermanoverhaul/loot_tables/entities/windswept_hills_enderman.json b/kubejs/data/endermanoverhaul/loot_tables/entities/windswept_hills_enderman.json index a0cd24e24..86db5f0f8 100644 --- a/kubejs/data/endermanoverhaul/loot_tables/entities/windswept_hills_enderman.json +++ b/kubejs/data/endermanoverhaul/loot_tables/entities/windswept_hills_enderman.json @@ -11,6 +11,10 @@ { "type": "minecraft:item", "name": "endermanoverhaul:summoner_pearl" + }, + { + "type": "minecraft:item", + "name": "species:wicked_swapper" } ], "rolls": 1.0 diff --git a/kubejs/server_scripts/endermanoverhaul/tags.js b/kubejs/server_scripts/endermanoverhaul/tags.js index 8b31e5a38..8185fce25 100644 --- a/kubejs/server_scripts/endermanoverhaul/tags.js +++ b/kubejs/server_scripts/endermanoverhaul/tags.js @@ -5,9 +5,6 @@ const registerEndermanOverhaulItemTags = (event) => { const DISABLED_ITEMS = [ 'endermanoverhaul:corrupted_blade', - 'endermanoverhaul:savanna_hood', - 'endermanoverhaul:snowy_hood', - 'endermanoverhaul:bubble_pearl', 'endermanoverhaul:icy_pearl' ] diff --git a/kubejs/server_scripts/species/recipes.js b/kubejs/server_scripts/species/recipes.js index 2c7fe4c09..787f23665 100644 --- a/kubejs/server_scripts/species/recipes.js +++ b/kubejs/server_scripts/species/recipes.js @@ -99,4 +99,59 @@ function registerSpeciesRecipes(event) { B: 'species:kinetic_core', C: 'tacz:target' }).id('tfg:shaped/deflector_dummy') + + event.recipes.tfc.sewing('species:wicked_mask', + [ + 1, 0, 0, 1, 0, 0, 1, + 1, 0, 0, 1, 0, 0, 1, + 1, 0, 0, 1, 0, 0, 1, + 0, 0, 0, 1, 0, 0, 1, + 0, 0, 0, 1, 0, 0, 1 + ], + [ + 1, 1, 1, 1, 0, 0, 0, 0, + 1, -1, -1, 1, 0, -1, -1, 0, + 1, 1, 1, 1, 0, 0, 0, 0, + 1, 1, -1, -1, -1, -1, 0, 0 + ]).id('tfg:sewing/wicked_mask') + + event.recipes.gtceu.assembler('tfg:wicked_mask') + .itemInputs('2x #tfc:sewing_light_cloth', '2x #tfc:sewing_dark_cloth', '3x #forge:string') + .itemOutputs('species:wicked_mask') + .EUt(GTValues.VA[GTValues.ULV]) + .duration(200) + + event.recipes.firmalife.mixing_bowl() + .outputItem('2x species:wicked_treat') + .itemIngredients(['#tfg:medicine', 'minecraft:bone_meal', 'minecraft:bone_meal']) + .id('tfg:mixing_bowl/wicked_treat') + + event.recipes.gtceu.mixer('tfg:wicked_treat') + .itemInputs('#tfg:medicine', '2x minecraft:bone_meal') + .itemOutputs('2x species:wicked_treat') + .EUt(GTValues.VA[GTValues.ULV]) + .duration(200) + + event.shaped('species:smoke_bomb', [ + ' A ', + 'BCB', + 'EDE' + ], { + A: '#forge:string', + B: 'minecraft:paper', + C: '#tfg:invisibility_ingredients', + D: 'gtceu:sticky_resin', + E: '#tfc:powders' + }).id('tfg:shaped/smoke_bomb') + + event.shaped('2x species:smoke_bomb', [ + ' B ', + 'BCB', + ' D ' + ], { + A: '#forge:string', + B: 'minecraft:paper', + C: '#tfg:invisibility_ingredients', + D: 'tfg:dry_ice', + }).id('tfg:shaped/smoke_bomb_dry_ice') } \ No newline at end of file diff --git a/kubejs/server_scripts/species/tags.js b/kubejs/server_scripts/species/tags.js index 651d2a748..0b0cce993 100644 --- a/kubejs/server_scripts/species/tags.js +++ b/kubejs/server_scripts/species/tags.js @@ -35,4 +35,6 @@ const registerSpeciesItemTags = (event) => { event.add('minecraft:wart_blocks', 'species:alphacene_mushroom_block') event.add('species:stackatick_tempt_items', 'tfc:sweetener') + + event.add('forge:ender_pearls', 'species:wicked_swapper') } diff --git a/kubejs/server_scripts/tfg/food/recipes.meal_bags.js b/kubejs/server_scripts/tfg/food/recipes.meal_bags.js index 6eef4f4da..f1d7cd128 100644 --- a/kubejs/server_scripts/tfg/food/recipes.meal_bags.js +++ b/kubejs/server_scripts/tfg/food/recipes.meal_bags.js @@ -14,7 +14,7 @@ function registerTFGMealBagRecipes(event) { .notConsumable('gtceu:block_casting_mold') .itemOutputs('2x tfg:dry_ice') .duration(100) - .EUt(GTValues.VA[GTValues.MV]) + .EUt(GTValues.VA[GTValues.LV]) event.recipes.gtceu.vacuum_freezer('tfg:vacuum_freezer/liq_co2') .inputFluids(Fluid.of('gtceu:carbon_dioxide', 1000)) diff --git a/kubejs/startup_scripts/species/constants.js b/kubejs/startup_scripts/species/constants.js index b3cd81106..ec40a9568 100644 --- a/kubejs/startup_scripts/species/constants.js +++ b/kubejs/startup_scripts/species/constants.js @@ -22,13 +22,9 @@ global.SPECIES_DISABLED_ITEMS = [ 'species:bewereager_head', 'species:quake_head', 'species:ghoul_head', - 'species:wicked_mask', - 'species:wicked_swapper', 'species:spectralibur', - 'species:smoke_bomb', 'species:wicked_dope', 'species:monster_meal', - 'species:wicked_treat', 'species:ghoul_tongue', 'species:broken_links', 'species:werefang',