From 6d95f87218ba3dbc283228cffacad4c36b862cc5 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 25 Dec 2025 11:19:33 +0000 Subject: [PATCH] add some more species things --- CHANGELOG.md | 4 ++ kubejs/assets/species/lang/en_us.json | 5 +- .../species/textures/item/smoke_bomb.png | Bin 0 -> 422 bytes .../species/textures/item/wicked_mask.png | Bin 0 -> 460 bytes .../textures/item/wicked_mask_worn.png | Bin 0 -> 382 bytes .../species/textures/item/wicked_swapper.png | Bin 0 -> 387 bytes .../species/textures/item/wicked_treat.png | Bin 0 -> 464 bytes .../entities/badlands_enderman.json | 6 +- .../entities/dark_oak_enderman.json | 4 ++ .../loot_tables/entities/desert_enderman.json | 48 +++++++++++++ .../entities/end_islands_enderman.json | 4 ++ .../entities/mushroom_fields_enderman.json | 4 ++ .../entities/nether_wastes_enderman.json | 4 ++ .../entities/savanna_enderman.json | 63 ++++++++++++++++++ .../loot_tables/entities/swamp_enderman.json | 4 ++ .../entities/windswept_hills_enderman.json | 4 ++ .../server_scripts/endermanoverhaul/tags.js | 3 - kubejs/server_scripts/species/recipes.js | 55 +++++++++++++++ kubejs/server_scripts/species/tags.js | 2 + .../tfg/food/recipes.meal_bags.js | 2 +- kubejs/startup_scripts/species/constants.js | 4 -- 21 files changed, 206 insertions(+), 10 deletions(-) create mode 100644 kubejs/assets/species/textures/item/smoke_bomb.png create mode 100644 kubejs/assets/species/textures/item/wicked_mask.png create mode 100644 kubejs/assets/species/textures/item/wicked_mask_worn.png create mode 100644 kubejs/assets/species/textures/item/wicked_swapper.png create mode 100644 kubejs/assets/species/textures/item/wicked_treat.png create mode 100644 kubejs/data/endermanoverhaul/loot_tables/entities/desert_enderman.json create mode 100644 kubejs/data/endermanoverhaul/loot_tables/entities/savanna_enderman.json 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 0000000000000000000000000000000000000000..9607a825863df47a3a5bcc18d6280c04dc8a686c GIT binary patch literal 422 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0WWg+Z8+Vb&Z8 z1_s6mPZ!4!i{7=9Y&{MKh_vo^cqx)GZHtrJL@SThOO}fiLL5t`HQZzoJhHPn_}RIO zOP$5t#iuv1%9dt$x3>kw)MUK4Cht(c|v^JmVf z6a%NLCF{QBefZS0yW2SDxa&57?Gg`v{1U5OeCEq>=L%acRp!vkf^q$I%e&w1@MNDo z^=-?68ndZ|3sVGsG+i%~Hk9$U6OYuN?Y_x_$BrSu)K-ycL-me+iM~vmy&6FZ|DyMN zw_u9b`Sj;K%l;B>!ItaZ+ootuW14)BV{y=F8$0v&#&as`Htl0hPS3t->`>IZER``O zPvHaWUq5jL!vj6d2gF6Z+GH|Jc7#q~+V)sWmm_iGDw9QbkJtNe5oj;2ny~X!$;15* a#ku8s#eEf)zhhuvVDNPHb6Mw<&;$TELbQzl literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..acae21bfb2e9bfb916d5c6a4e75b5fb8f660f50d GIT binary patch literal 460 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0WWg+Z8+Vb&Z8 z1_s7DPZ!4!i{7P^71zBs5ODRMcaKTOb!udXae{3r^-SL8MTH&8O9xV^E?AZg4b-%-F@Lt zU6=oI;n`=~zW+XJz{3zcYuP2?vx@>hX|gR6cyAjy?cv_#nNkc+91_Vde$U&MJK2?q z;knGUs3}1*{qB3dckeQE`@m55>}aBd3s1q$m=l|NKL7MN^5XYA0jBlWvvURfW3OK+ z)s=|Kmg{d@4nEmdT-bqT5T;Q@>*zXt#S literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..03540ca7d8fed4aa7f5748ade0b72cb1274d14e5 GIT binary patch literal 382 zcmeAS@N?(olHy`uVBq!ia0y~yU{GLSU=ZM7V_;w?XQ+*2U|`@Z@Q5sCVBi)8VMc~o zb0ioT7!5pK978-h-%d8{Yc>#Yy}z!AnfoV4X7FW&RWS`seRe@oe1~L%ly)#ob#rmxLy7pK@YT&KDbghU0|{FMi7{71{TmdBGH>yx@(Tx*v13 zFGLBqDc0V9Y{9qh{o*NAFTbqUkqYoyxK+(ls7c{Ljop3qgxk%!Z~Bfu{_*F=HeCka z%K|Kn423fHKbOXCzW?6vm_kc}1RG!bVU4AC@)CrimCqMHvT)1hZFs#aB(!ykkm8Z< zkG^c{uD@P?`th!JIYyq77`DGt7w*^jn|ydzOM&!$0VYM3Ag?7;LPA>&pS`V(usPiM n^35U*rUykk_o)6j!~fu3{mH%RkNp`K7#KWV{an^LB{Ts5j%1%C literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..cff5af54bdfada0c61cee4f3b5c093f5e258a1fa GIT binary patch literal 387 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0WWg+Z8+Vb&Z8 z1_nk`PZ!4!i{7IXH~Jk45NX?Q#-k$?!@+FBpr>b0R`4R>jOj0qb$u#ALWfeOxClK; zlBs3k?F~+rk&t<@O5dS9&tyYM#tP@#-rVA9!v2?@eEah6{?GrxKi*&ZRx2~TDzM5f z{*LB*t=TIBY-*44S|6!0p0Ysqz>X{3o1D%IGK9<)W0)I0`QfJZnv6j??H~S}$ohBa zcOYj&*jgRONDoIzJHc}4sio(?CJQieY*S8IzW!bROEax4uaC|tb>?0&`=U<5jyKs= zTr*r;8Eo7=ZeLx-nxHrEdTG_n-gn{azuIe5BS)cTUaU z4`H9O8Vet6Ju7=&@}cQW3HE7Uc)y>^`>w34%^+}9`qg_=2BC`z)7>Q#&G%VaR8Kf& zv||7D7h7~vTvex;bf^~cw5~r`Yo;5bdyl<5N^Jf9pMRRzYMWeOOncK6B``-eRk~5(>a@D zzVGin{v#|7>k_ { 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',