From 561bea6297a336b4ee068fe29338705a1350c8d6 Mon Sep 17 00:00:00 2001 From: bijimio Date: Wed, 27 Nov 2024 15:10:02 +0100 Subject: [PATCH 1/2] Bijimio Experimental Fork V7.2.8 | Updated no_no and sv_se --- src/main/resources/assets/changed/lang/no_no.json | 9 ++++++++- src/main/resources/assets/changed/lang/sv_se.json | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/main/resources/assets/changed/lang/no_no.json b/src/main/resources/assets/changed/lang/no_no.json index 549cf8374..23f02e844 100644 --- a/src/main/resources/assets/changed/lang/no_no.json +++ b/src/main/resources/assets/changed/lang/no_no.json @@ -622,5 +622,12 @@ "changed.config.bpi.size": "Modellstørrelse", "changed.config.bpi.size.value": "Størrelse: %s%%", "changed.config.bpi.override_dl_iris": "Overstyre regnbuehinnefarge på mørk lateks varianter", - "changed.config.bpi.override_all_eye_styles": "Overstyre alle øyenstilen å matche" + "changed.config.bpi.override_all_eye_styles": "Overstyre alle øyenstilen å matche", + + "changed.stasis.open": "Åpne dør", + "changed.stasis.close": "Lukk dør", + "changed.stasis.run": "Utføre modifikasjoner", + "changed.stasis.capture_next": "Fange neste", + "changed.stasis.toggle_stasis": "Stase: %s", + "changed.stasis.modify": "Modifikasjoner" } \ No newline at end of file diff --git a/src/main/resources/assets/changed/lang/sv_se.json b/src/main/resources/assets/changed/lang/sv_se.json index 290c8d20f..09f895238 100644 --- a/src/main/resources/assets/changed/lang/sv_se.json +++ b/src/main/resources/assets/changed/lang/sv_se.json @@ -622,5 +622,12 @@ "changed.config.bpi.size": "Modellstorlek", "changed.config.bpi.size.value": "Storlek: %s%%", "changed.config.bpi.override_dl_iris": "Överskrida regnbågshinnefärg på mörk latex varianter", - "changed.config.bpi.override_all_eye_styles": "Överskrida alla ögonstilar att matcha" + "changed.config.bpi.override_all_eye_styles": "Överskrida alla ögonstilar att matcha", + + "changed.stasis.open": "Öppna dörr", + "changed.stasis.close": "Stäng dörr", + "changed.stasis.run": "Exekvera modifikationer", + "changed.stasis.capture_next": "Fångst nästa", + "changed.stasis.toggle_stasis": "Stas: %s", + "changed.stasis.modify": "Modifikationer" } \ No newline at end of file From 15441c0da6bfc8d16c1534417bb43ff857970ab6 Mon Sep 17 00:00:00 2001 From: bijimio Date: Mon, 2 Dec 2024 16:25:25 -0800 Subject: [PATCH 2/2] Bijimio Experimental Fork V7.2.9 | Created/Updated jsons for Pure WL Pup; Rextextured sports bra & created recipes --- .../resources/assets/changed/lang/no_no.json | 6 +- .../resources/assets/changed/lang/sv_se.json | 6 +- .../changed/textures/items/sports_bra.png | Bin 354 -> 365 bytes .../recipes/changed_items/sports_bra.json | 34 ++++++++++ .../chests/decayed_lab_origin.json | 5 ++ .../chests/decayed_lab_treatment.json | 5 ++ .../loot_tables/chests/high_tier_lab.json | 5 ++ .../entities/pure_white_latex_wolf_pup.json | 63 ++++++++++++++++++ .../data/changed/recipes/sports_bra.json | 24 +++++++ .../advancements/changed/kill_all_latex.json | 17 +++++ 10 files changed, 161 insertions(+), 4 deletions(-) create mode 100644 src/main/resources/data/changed/advancements/recipes/changed_items/sports_bra.json create mode 100644 src/main/resources/data/changed/loot_tables/entities/pure_white_latex_wolf_pup.json create mode 100644 src/main/resources/data/changed/recipes/sports_bra.json diff --git a/src/main/resources/assets/changed/lang/no_no.json b/src/main/resources/assets/changed/lang/no_no.json index 23f02e844..e01756cff 100644 --- a/src/main/resources/assets/changed/lang/no_no.json +++ b/src/main/resources/assets/changed/lang/no_no.json @@ -355,7 +355,7 @@ "entity.changed.dark_latex_wolf_male": "Mannlig mørk lateks ulv", "entity.changed.dark_latex_wolf_partial": "Delvis mørk lateks ulv", "entity.changed.dark_dragon": "Mørk drage", - "entity.changed.dark_latex_wolf_pup": "Mørk lateks ulveunge", + "entity.changed.dark_latex_wolf_pup": "Mørk lateks ulvevalp", "entity.changed.dark_latex_yufeng": "Mørk lateks yufeng", "entity.changed.dark_latex_double_yufeng": "Mørk lateks tohodet yufeng", "entity.changed.gas_particle": "Ulv transpelsgasspartikkel", @@ -415,6 +415,7 @@ "entity.changed.phage_latex_wolf_male": "Mannlig bakteriofag lateks ulv", "entity.changed.pooltoy_wolf": "Bassengleketøy ulv", "entity.changed.pure_white_latex_wolf": "Helt hvit lateks ulv", + "entity.changed.pure_white_latex_wolf_pup": "Helt hvit lateks ulvevalp", "entity.changed.roomba": "Feiende robot", "entity.changed.shark": "Hai", "entity.changed.sniper_dog": "Snikskytterhund", @@ -433,7 +434,7 @@ "item.changed.dark_dragon_spawn_egg": "Fremkallingsegg for mørk drage", "item.changed.dark_latex_wolf_female_spawn_egg": "Fremkallingsegg for kvinnelig mørk lateks ulv", "item.changed.dark_latex_wolf_male_spawn_egg": "Fremkallingsegg for mannlig mørk lateks ulv", - "item.changed.dark_latex_wolf_pup_spawn_egg": "Fremkallingsegg for mørk lateks ulveunge", + "item.changed.dark_latex_wolf_pup_spawn_egg": "Fremkallingsegg for mørk lateks ulvevalp", "item.changed.dark_latex_yufeng_spawn_egg": "Fremkallingsegg for mørk lateks yufeng", "item.changed.dark_latex_double_yufeng_spawn_egg": "Fremkallingsegg for mørk lateks tohodet yufeng", "item.changed.gas_wolf_spawn_egg": "Fremkallingsegg for gass ulv", @@ -491,6 +492,7 @@ "item.changed.phage_latex_wolf_male_spawn_egg": "Fremkallingsegg for mannlig bakteriofag lateks ulv", "item.changed.pooltoy_wolf_spawn_egg": "Fremkallingsegg for bassengleketøy ulv", "item.changed.pure_white_latex_wolf_spawn_egg": "Fremkallingsegg for helt hvit lateks ulv", + "item.changed.pure_white_latex_wolf_pup_spawn_egg": "Fremkallingsegg for helt hvit lateks ulvevalp", "item.changed.shark_spawn_egg": "Fremkallingsegg for hai", "item.changed.sniper_dog_spawn_egg": "Fremkallingsegg for snikskytterhund", "item.changed.white_latex_centaur_spawn_egg": "Fremkallingsegg for hvit lateks kentaur", diff --git a/src/main/resources/assets/changed/lang/sv_se.json b/src/main/resources/assets/changed/lang/sv_se.json index 09f895238..5febcea7d 100644 --- a/src/main/resources/assets/changed/lang/sv_se.json +++ b/src/main/resources/assets/changed/lang/sv_se.json @@ -355,7 +355,7 @@ "entity.changed.dark_latex_wolf_male": "Manlig mörk latexvarg", "entity.changed.dark_latex_wolf_partial": "Partiell mörk latexvarg", "entity.changed.dark_dragon": "Mörk drake", - "entity.changed.dark_latex_wolf_pup": "Mörk latex vargvalp", + "entity.changed.dark_latex_wolf_pup": "Mörk latexvargvalp", "entity.changed.dark_latex_yufeng": "Mörk latex yufeng", "entity.changed.dark_latex_double_yufeng": "Mörk latex tvåhövdade yufeng", "entity.changed.gas_particle": "Varg förpälsvandlagaspartikel", @@ -415,6 +415,7 @@ "entity.changed.phage_latex_wolf_male": "Manlig bakteriofag latexvarg", "entity.changed.pooltoy_wolf": "Bassängleksak varg", "entity.changed.pure_white_latex_wolf": "Helt vitt latexvarg", + "entity.changed.pure_white_latex_wolf_pup": "Helt vitt latexvargvalp", "entity.changed.roomba": "Svepande robot", "entity.changed.shark": "Haj", "entity.changed.sniper_dog": "Prickskytthund", @@ -433,7 +434,7 @@ "item.changed.dark_dragon_spawn_egg": "Skapelseägg för mörk drake", "item.changed.dark_latex_wolf_female_spawn_egg": "Skapelseägg för kvinnlig mörk latexvarg", "item.changed.dark_latex_wolf_male_spawn_egg": "Skapelseägg för manlig mörk latexvarg", - "item.changed.dark_latex_wolf_pup_spawn_egg": "Skapelseägg för mörk latex vargvalp", + "item.changed.dark_latex_wolf_pup_spawn_egg": "Skapelseägg för mörk latexvargvalp", "item.changed.dark_latex_yufeng_spawn_egg": "Skapelseägg för mörk latex yufeng", "item.changed.dark_latex_double_yufeng_spawn_egg": "Skapelseägg för mörk latex tvåhövdade yufeng", "item.changed.gas_wolf_spawn_egg": "Skapelseägg för gas varg", @@ -491,6 +492,7 @@ "item.changed.phage_latex_wolf_male_spawn_egg": "Skapelseägg för manlig bakteriofag latexvarg", "item.changed.pooltoy_wolf_spawn_egg": "Skapelseägg för bassängleksak varg", "item.changed.pure_white_latex_wolf_spawn_egg": "Skapelseägg för helt vitt latexvarg", + "item.changed.pure_white_latex_wolf_pup_spawn_egg": "Skapelseägg för helt vitt latexvargvalp", "item.changed.shark_spawn_egg": "Skapelseägg för haj", "item.changed.sniper_dog_spawn_egg": "Skapelseägg för prickskytthund", "item.changed.white_latex_centaur_spawn_egg": "Skapelseägg för vit latex kentaur", diff --git a/src/main/resources/assets/changed/textures/items/sports_bra.png b/src/main/resources/assets/changed/textures/items/sports_bra.png index 6ab7f3a02bcc4f1cae7d3a4c350d3fe6e797901f..bbb927007d37f7ea97f0a7c51504015cb6fe0fcb 100644 GIT binary patch delta 325 zcmV-L0lNO;0__5jF@GmXL_t(Ijir-6PQx%5#ea#AvL()dU_k;YCqOW_QV-CoC&-qI zN~G`~J!BPXv9zvMddNl#;e>sj8}% z_XByJo1!R8UwoAKSbn*f_j3jlBTT|ELW@S##3J1MxRdaX0a;MAl+(c32&I+Kl#xt;Oot~X@eRE4J zQq!m!trU%_T^BayjnH*$+ZHJ$S(Xutl#9zNv{Jn7_sHF=;~uo~J6LbFL6RiKR+3V> z&0E1iEBAhW***oHfpt!V0O0fE-Hp~2e1~Vy?ZS$+)`Mb(KGSSEF?J{G&34>J`YXNw XZ|J7u6xX`r00000NkvXXu0mjfI!v4F delta 314 zcmV-A0mc690^$OYF@GFML_t(Ijm4ACO2jY_#=k8>PTNVL*T5=)^{BF*TPTR0TKW=w zk-kKqN%1ZO5qb@5;-2;t57OACt`$6(Q!;;k^JOLh{(G%XIqIr(F;4&hj4^awcQSUC zSXZSB?M>6TwrywjS@KeW5E6|K)|f?wecw;c9#G_&BhD8A$A9AyMV@&TQ5Z0G{>B## z4zW4M&F&V&`Hv9B*d)d)kWwN|Q^Y*^7E)KGliN!OApii@+UXUPQqWpMN;!iRdFJl! zA0UK)Qfkudvw=ot52ch>Gwg@vYOSG^!n@hST8o1HGPhkhz*S8hIzc4_;AOP52Y}}go%>L)~0jyGySVUwoQUCw| M07*qoM6N<$g4!>VfdBvi diff --git a/src/main/resources/data/changed/advancements/recipes/changed_items/sports_bra.json b/src/main/resources/data/changed/advancements/recipes/changed_items/sports_bra.json new file mode 100644 index 000000000..84e3f76bd --- /dev/null +++ b/src/main/resources/data/changed/advancements/recipes/changed_items/sports_bra.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "changed:sports_bra" + ] + }, + "criteria": { + "has_leather": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:leather" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "changed:sports_bra" + } + } + }, + "requirements": [ + [ + "has_leather", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/changed/loot_tables/chests/decayed_lab_origin.json b/src/main/resources/data/changed/loot_tables/chests/decayed_lab_origin.json index d929326af..bfc3022ac 100644 --- a/src/main/resources/data/changed/loot_tables/chests/decayed_lab_origin.json +++ b/src/main/resources/data/changed/loot_tables/chests/decayed_lab_origin.json @@ -19,6 +19,11 @@ "weight": 15, "name": "changed:pink_pants" }, + { + "type": "minecraft:item", + "weight": 10, + "name": "changed:sports_bra" + }, { "type": "minecraft:item", "weight": 2, diff --git a/src/main/resources/data/changed/loot_tables/chests/decayed_lab_treatment.json b/src/main/resources/data/changed/loot_tables/chests/decayed_lab_treatment.json index c7041b4d4..6ca0817b8 100644 --- a/src/main/resources/data/changed/loot_tables/chests/decayed_lab_treatment.json +++ b/src/main/resources/data/changed/loot_tables/chests/decayed_lab_treatment.json @@ -19,6 +19,11 @@ "weight": 15, "name": "changed:pink_pants" }, + { + "type": "minecraft:item", + "weight": 10, + "name": "changed:sports_bra" + }, { "type": "minecraft:item", "weight": 5, diff --git a/src/main/resources/data/changed/loot_tables/chests/high_tier_lab.json b/src/main/resources/data/changed/loot_tables/chests/high_tier_lab.json index 8f832ac1b..b29415319 100644 --- a/src/main/resources/data/changed/loot_tables/chests/high_tier_lab.json +++ b/src/main/resources/data/changed/loot_tables/chests/high_tier_lab.json @@ -38,6 +38,11 @@ "weight": 10, "name": "changed:benign_pants" }, + { + "type": "minecraft:item", + "weight": 5, + "name": "changed:sports_bra" + }, { "type": "minecraft:item", "weight": 5, diff --git a/src/main/resources/data/changed/loot_tables/entities/pure_white_latex_wolf_pup.json b/src/main/resources/data/changed/loot_tables/entities/pure_white_latex_wolf_pup.json new file mode 100644 index 000000000..c938c0be8 --- /dev/null +++ b/src/main/resources/data/changed/loot_tables/entities/pure_white_latex_wolf_pup.json @@ -0,0 +1,63 @@ +{ + "type": "minecraft:entity", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "type": "minecraft:uniform", + "min": 0.0, + "max": 2.0 + }, + "add": false + }, + { + "function": "minecraft:looting_enchant", + "count": { + "type": "minecraft:uniform", + "min": 0.0, + "max": 1.0 + } + } + ], + "name": "changed:white_latex_goo" + } + ] + }, + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "type": "minecraft:uniform", + "min": 0.0, + "max": 1.0 + }, + "add": false + }, + { + "function": "minecraft:looting_enchant", + "count": { + "type": "minecraft:uniform", + "min": 0.0, + "max": 1.0 + } + } + ], + "name": "changed:orange" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/changed/recipes/sports_bra.json b/src/main/resources/data/changed/recipes/sports_bra.json new file mode 100644 index 000000000..17f54e9ff --- /dev/null +++ b/src/main/resources/data/changed/recipes/sports_bra.json @@ -0,0 +1,24 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "#D#", + "LBL" + ], + "key": { + "#": { + "item": "minecraft:string" + }, + "D": { + "item": "minecraft:black_dye" + }, + "L": { + "item": "minecraft:leather" + }, + "B": { + "item": "changed:latex_base" + } + }, + "result": { + "item": "changed:sports_bra" + } +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/advancements/changed/kill_all_latex.json b/src/main/resources/data/minecraft/advancements/changed/kill_all_latex.json index 4f89efd6a..83e3ad44b 100644 --- a/src/main/resources/data/minecraft/advancements/changed/kill_all_latex.json +++ b/src/main/resources/data/minecraft/advancements/changed/kill_all_latex.json @@ -1027,6 +1027,20 @@ ] } }, + "changed:pure_white_latex_wolf_pup": { + "trigger": "minecraft:player_killed_entity", + "conditions": { + "entity": [ + { + "condition": "minecraft:entity_properties", + "predicate": { + "type": "changed:pure_white_latex_wolf_pup" + }, + "entity": "this" + } + ] + } + }, "changed:white_wolf_female": { "trigger": "minecraft:player_killed_entity", "conditions": { @@ -1301,6 +1315,9 @@ [ "changed:pure_white_latex_wolf" ], + [ + "changed:pure_white_latex_wolf_pup" + ], [ "changed:white_wolf_female" ],