From 967d6467dbd44baa5774113b034bbfc07a26a00e Mon Sep 17 00:00:00 2001 From: NormalFery Date: Tue, 3 Jun 2025 13:58:09 +0100 Subject: [PATCH] feat(rpo)!: Add ETF Axolotl support --- assets/minecraft/lang/en_us.json | 4 ++++ .../random/entity/axolotl/axolotl_cyan2.png.rpo | 3 +++ .../random/entity/axolotl/axolotl_gold2.png.rpo | 3 +++ .../random/entity/axolotl/axolotl_lucy2.png.rpo | 3 +++ .../random/entity/axolotl/axolotl_wild2.png.rpo | 3 +++ assets/minecraft/sounds.json.rpo | 3 --- .../textures/entity/axolotl/axolotl_blue.png.rpo | 2 +- .../textures/entity/axolotl/axolotl_cyan.png.rpo | 2 +- .../textures/entity/axolotl/axolotl_gold.png.rpo | 2 +- .../textures/entity/axolotl/axolotl_lucy.png.rpo | 2 +- .../textures/entity/axolotl/axolotl_wild.png.rpo | 2 +- assets/respackopts/conf.json | 13 +++++++------ respackopts.json5 | 6 +++++- 13 files changed, 33 insertions(+), 15 deletions(-) create mode 100644 assets/minecraft/optifine/random/entity/axolotl/axolotl_cyan2.png.rpo create mode 100644 assets/minecraft/optifine/random/entity/axolotl/axolotl_gold2.png.rpo create mode 100644 assets/minecraft/optifine/random/entity/axolotl/axolotl_lucy2.png.rpo create mode 100644 assets/minecraft/optifine/random/entity/axolotl/axolotl_wild2.png.rpo delete mode 100644 assets/minecraft/sounds.json.rpo diff --git a/assets/minecraft/lang/en_us.json b/assets/minecraft/lang/en_us.json index e1dff75..87fc7ef 100644 --- a/assets/minecraft/lang/en_us.json +++ b/assets/minecraft/lang/en_us.json @@ -174,6 +174,10 @@ "rpo.pridepack.entities.enableBiis": "Enable Biis", "rpo.pridepack.entities.enablePrideAxolotls": "Enable Pridexolotls (Pride Axolotls)", + "rpo.pridepack.entities.enablePrideAxolotls.all": "Enable All", + "rpo.pridepack.entities.enablePrideAxolotls.default": "Only Default", + "rpo.pridepack.entities.enablePrideAxolotls.none": "Disable", + "rpo.pridepack.entities.enableExtraPrideAxolotls": "Enable Extra Pridexolotls", "rpo.pridepack.entities.enableFoxSocks": "Enable Fox Thigh Highs", "rpo.pridepack.entities.enablePrideHarness": "Enable Happy Ghast Pride Harness", diff --git a/assets/minecraft/optifine/random/entity/axolotl/axolotl_cyan2.png.rpo b/assets/minecraft/optifine/random/entity/axolotl/axolotl_cyan2.png.rpo new file mode 100644 index 0000000..3a60375 --- /dev/null +++ b/assets/minecraft/optifine/random/entity/axolotl/axolotl_cyan2.png.rpo @@ -0,0 +1,3 @@ +{ + "condition": "entities.enablePrideAxolotls.all" +} \ No newline at end of file diff --git a/assets/minecraft/optifine/random/entity/axolotl/axolotl_gold2.png.rpo b/assets/minecraft/optifine/random/entity/axolotl/axolotl_gold2.png.rpo new file mode 100644 index 0000000..3a60375 --- /dev/null +++ b/assets/minecraft/optifine/random/entity/axolotl/axolotl_gold2.png.rpo @@ -0,0 +1,3 @@ +{ + "condition": "entities.enablePrideAxolotls.all" +} \ No newline at end of file diff --git a/assets/minecraft/optifine/random/entity/axolotl/axolotl_lucy2.png.rpo b/assets/minecraft/optifine/random/entity/axolotl/axolotl_lucy2.png.rpo new file mode 100644 index 0000000..3a60375 --- /dev/null +++ b/assets/minecraft/optifine/random/entity/axolotl/axolotl_lucy2.png.rpo @@ -0,0 +1,3 @@ +{ + "condition": "entities.enablePrideAxolotls.all" +} \ No newline at end of file diff --git a/assets/minecraft/optifine/random/entity/axolotl/axolotl_wild2.png.rpo b/assets/minecraft/optifine/random/entity/axolotl/axolotl_wild2.png.rpo new file mode 100644 index 0000000..3a60375 --- /dev/null +++ b/assets/minecraft/optifine/random/entity/axolotl/axolotl_wild2.png.rpo @@ -0,0 +1,3 @@ +{ + "condition": "entities.enablePrideAxolotls.all" +} \ No newline at end of file diff --git a/assets/minecraft/sounds.json.rpo b/assets/minecraft/sounds.json.rpo deleted file mode 100644 index 3102d13..0000000 --- a/assets/minecraft/sounds.json.rpo +++ /dev/null @@ -1,3 +0,0 @@ -{ - "condition": "other.enableMusic" -} \ No newline at end of file diff --git a/assets/minecraft/textures/entity/axolotl/axolotl_blue.png.rpo b/assets/minecraft/textures/entity/axolotl/axolotl_blue.png.rpo index 76505e3..de26579 100644 --- a/assets/minecraft/textures/entity/axolotl/axolotl_blue.png.rpo +++ b/assets/minecraft/textures/entity/axolotl/axolotl_blue.png.rpo @@ -1,3 +1,3 @@ { - "condition": "entities.enablePrideAxolotls" + "condition": "entities.enablePrideAxolotls.default | entities.enablePrideAxolotls.all" } \ No newline at end of file diff --git a/assets/minecraft/textures/entity/axolotl/axolotl_cyan.png.rpo b/assets/minecraft/textures/entity/axolotl/axolotl_cyan.png.rpo index 76505e3..de26579 100644 --- a/assets/minecraft/textures/entity/axolotl/axolotl_cyan.png.rpo +++ b/assets/minecraft/textures/entity/axolotl/axolotl_cyan.png.rpo @@ -1,3 +1,3 @@ { - "condition": "entities.enablePrideAxolotls" + "condition": "entities.enablePrideAxolotls.default | entities.enablePrideAxolotls.all" } \ No newline at end of file diff --git a/assets/minecraft/textures/entity/axolotl/axolotl_gold.png.rpo b/assets/minecraft/textures/entity/axolotl/axolotl_gold.png.rpo index 76505e3..de26579 100644 --- a/assets/minecraft/textures/entity/axolotl/axolotl_gold.png.rpo +++ b/assets/minecraft/textures/entity/axolotl/axolotl_gold.png.rpo @@ -1,3 +1,3 @@ { - "condition": "entities.enablePrideAxolotls" + "condition": "entities.enablePrideAxolotls.default | entities.enablePrideAxolotls.all" } \ No newline at end of file diff --git a/assets/minecraft/textures/entity/axolotl/axolotl_lucy.png.rpo b/assets/minecraft/textures/entity/axolotl/axolotl_lucy.png.rpo index 76505e3..de26579 100644 --- a/assets/minecraft/textures/entity/axolotl/axolotl_lucy.png.rpo +++ b/assets/minecraft/textures/entity/axolotl/axolotl_lucy.png.rpo @@ -1,3 +1,3 @@ { - "condition": "entities.enablePrideAxolotls" + "condition": "entities.enablePrideAxolotls.default | entities.enablePrideAxolotls.all" } \ No newline at end of file diff --git a/assets/minecraft/textures/entity/axolotl/axolotl_wild.png.rpo b/assets/minecraft/textures/entity/axolotl/axolotl_wild.png.rpo index 76505e3..de26579 100644 --- a/assets/minecraft/textures/entity/axolotl/axolotl_wild.png.rpo +++ b/assets/minecraft/textures/entity/axolotl/axolotl_wild.png.rpo @@ -1,3 +1,3 @@ { - "condition": "entities.enablePrideAxolotls" + "condition": "entities.enablePrideAxolotls.default | entities.enablePrideAxolotls.all" } \ No newline at end of file diff --git a/assets/respackopts/conf.json b/assets/respackopts/conf.json index aa7d5c5..2cd2a64 100644 --- a/assets/respackopts/conf.json +++ b/assets/respackopts/conf.json @@ -1,11 +1,15 @@ { id: "pridepack", - version: 7, + version: 8, capabilities: ["FileFilter", "DirFilter"], conf: { entities: { - enableBiis: true, - enablePrideAxolotls: true, + enableBiis: true, + enablePrideAxolotls: { + type: "enum", + default: "all", + values: ["all", "default", "none"] + }, enableFoxSocks: true, enablePrideHarness: true }, @@ -29,9 +33,6 @@ enablePanorama: true, enableSplashes: true, enableTranslations: true - }, - other: { - enableMusic: true } } } \ No newline at end of file diff --git a/respackopts.json5 b/respackopts.json5 index 3920c64..14c3229 100644 --- a/respackopts.json5 +++ b/respackopts.json5 @@ -8,7 +8,11 @@ conf: { entities: { enableBiis: true, - enablePrideAxolotls: true, + enablePrideAxolotls: { + type: "enum", + default: "all", + values: ["all", "default", "none"] + }, enableFoxSocks: true, enablePrideHarness: true },