From 9cbbda40de8684d534581867fc42f119a186a53a Mon Sep 17 00:00:00 2001 From: Saphire Lattice Date: Sat, 4 Jul 2026 18:03:45 +0600 Subject: [PATCH 1/6] Port glass arrow buff From 1.21.1-neoforge - effbb983a38294fce5aaca5179a0fa243141bb0a --- .../de/dafuqs/spectrum/entity/entity/GlassArrowEntity.java | 2 +- .../java/de/dafuqs/spectrum/items/tools/GlassArrowItem.java | 1 - src/main/resources/assets/spectrum/lang/en_us.json | 3 +-- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/de/dafuqs/spectrum/entity/entity/GlassArrowEntity.java b/src/main/java/de/dafuqs/spectrum/entity/entity/GlassArrowEntity.java index 89948fa009..d705ead4b0 100644 --- a/src/main/java/de/dafuqs/spectrum/entity/entity/GlassArrowEntity.java +++ b/src/main/java/de/dafuqs/spectrum/entity/entity/GlassArrowEntity.java @@ -24,7 +24,7 @@ public class GlassArrowEntity extends AbstractArrow { private static final String VARIANT_STRING = "variant"; private static final EntityDataAccessor VARIANT = SynchedEntityData.defineId(GlassArrowEntity.class, SpectrumTrackedDataHandlerRegistry.GLASS_ARROW_VARIANT); - public static final float DAMAGE_MODIFIER = 1.25F; + public static final float DAMAGE_MODIFIER = 1.5F; public GlassArrowEntity(EntityType entityType, Level world) { super(entityType, world); diff --git a/src/main/java/de/dafuqs/spectrum/items/tools/GlassArrowItem.java b/src/main/java/de/dafuqs/spectrum/items/tools/GlassArrowItem.java index b29e510cb8..d478869403 100644 --- a/src/main/java/de/dafuqs/spectrum/items/tools/GlassArrowItem.java +++ b/src/main/java/de/dafuqs/spectrum/items/tools/GlassArrowItem.java @@ -42,7 +42,6 @@ public AbstractArrow asProjectile(Level world, Position pos, ItemStack stack, Di public void appendHoverText(ItemStack stack, TooltipContext context, List tooltip, TooltipFlag type) { super.appendHoverText(stack, context, tooltip, type); tooltip.add(Component.translatable("item.spectrum.glass_arrow.tooltip").withStyle(ChatFormatting.GRAY)); - tooltip.add(Component.translatable("item.spectrum.glass_arrow.tooltip2").withStyle(ChatFormatting.GRAY)); if (variant != GlassArrowVariant.MALACHITE) { tooltip.add(Component.translatable(getDescriptionId() + ".tooltip").withStyle(ChatFormatting.GRAY)); } diff --git a/src/main/resources/assets/spectrum/lang/en_us.json b/src/main/resources/assets/spectrum/lang/en_us.json index 6b376c582a..5577343dc2 100644 --- a/src/main/resources/assets/spectrum/lang/en_us.json +++ b/src/main/resources/assets/spectrum/lang/en_us.json @@ -4642,8 +4642,7 @@ "item.spectrum.gilded_book.tooltip.copy_enchantments": "Use in the Enchanter to copy Enchantments", "item.spectrum.gilded_book.tooltip.copy_enchantments2": "from any desired item onto this book", "item.spectrum.gilded_book.tooltip.enchantability": "High Enchantability", - "item.spectrum.glass_arrow.tooltip": "Able to be shot underwater, pierces", - "item.spectrum.glass_arrow.tooltip2": "translucent blocks & deals increased damage", + "item.spectrum.glass_arrow.tooltip": "Highly damaging & able to be shot underwater", "item.spectrum.glass_crest_crossbow": "Glass Crest Crossbow", "item.spectrum.glass_crest_crossbow.message.charge": "%d%% Overcharge active", "item.spectrum.glass_crest_crossbow.tooltip.how_to_overcharge": "§7Use while loaded and sneaking to §fOVERCHARGE", From cfa789d5f10e9c6ffdc408b2c54e7c361cdcad97 Mon Sep 17 00:00:00 2001 From: Saphire Lattice Date: Sat, 4 Jul 2026 18:49:39 +0600 Subject: [PATCH 2/6] Fix recipes and tags From 1.21.1-neoforge - fd62f559c5d79802170e0abbf64762f44da8a81a --- .../data/c/tags/item/{foods => drinks}/milk.json | 0 .../ae2/anvil_crushing/certus_quartz_dust.json | 2 +- .../ae2/crystallarieum/certus_quartz_crystal.json | 4 ++-- .../create/anvil_crushing/zinc_ore_crushing.json | 2 +- .../recipe/pedestal/tier1/food/ashen_tart.json | 2 +- .../recipe/pedestal/tier1/food/jaramel_tart.json | 2 +- .../recipe/pedestal/tier1/food/lucky_roll.json | 2 +- .../pedestal/tier1/food/myceylon_apple_pie.json | 2 +- .../pedestal/tier1/food/myceylon_pumpkin_pie.json | 2 +- .../recipe/pedestal/tier1/food/puff_tart.json | 2 +- .../pedestal/tier1/food/salted_jaramel_tart.json | 2 +- .../recipe/pedestal/tier1/food/weeping_tart.json | 2 +- .../recipe/pedestal/tier1/food/whispy_tart.json | 2 +- .../potion_workshop_crafting/azalea_tea_milk.json | 2 +- .../potion_workshop_crafting/demon_tea_milk.json | 2 +- .../glistering_jelly_tea_milk.json | 2 +- .../golden_bristle_tea_milk.json | 2 +- .../potion_workshop_crafting/hot_chocolate.json | 2 +- .../restoration_tea_milk.json | 2 +- .../recipe/titration_barrel/clotted_cream_fluid.json | 2 +- .../recipe/titration_barrel/surstromming.json | 2 +- .../data/spectrum/tags/block/mob_heads.json | 12 ++++++------ 22 files changed, 27 insertions(+), 27 deletions(-) rename src/main/resources/data/c/tags/item/{foods => drinks}/milk.json (100%) diff --git a/src/main/resources/data/c/tags/item/foods/milk.json b/src/main/resources/data/c/tags/item/drinks/milk.json similarity index 100% rename from src/main/resources/data/c/tags/item/foods/milk.json rename to src/main/resources/data/c/tags/item/drinks/milk.json diff --git a/src/main/resources/data/spectrum/recipe/mod_integration/ae2/anvil_crushing/certus_quartz_dust.json b/src/main/resources/data/spectrum/recipe/mod_integration/ae2/anvil_crushing/certus_quartz_dust.json index 6877c43af5..378fb7f5cf 100644 --- a/src/main/resources/data/spectrum/recipe/mod_integration/ae2/anvil_crushing/certus_quartz_dust.json +++ b/src/main/resources/data/spectrum/recipe/mod_integration/ae2/anvil_crushing/certus_quartz_dust.json @@ -2,7 +2,7 @@ "type": "spectrum:anvil_crushing", "ingredient": [ { - "tag": "c:certus_quartz" + "tag": "c:gems/certus_quartz" } ], "crushedItemsPerPointOfDamage": 1, diff --git a/src/main/resources/data/spectrum/recipe/mod_integration/ae2/crystallarieum/certus_quartz_crystal.json b/src/main/resources/data/spectrum/recipe/mod_integration/ae2/crystallarieum/certus_quartz_crystal.json index 0f5768fa0e..b19ed74fd2 100644 --- a/src/main/resources/data/spectrum/recipe/mod_integration/ae2/crystallarieum/certus_quartz_crystal.json +++ b/src/main/resources/data/spectrum/recipe/mod_integration/ae2/crystallarieum/certus_quartz_crystal.json @@ -1,7 +1,7 @@ { "type": "spectrum:crystallarieum_growing", "ingredient": { - "item": "ae2:certus_quartz_crystal" + "item": "ae2:certus_quartz_dust" }, "growth_stage_states": [ { @@ -61,7 +61,7 @@ ], "additional_recipe_manager_results": [ { - "id": "spectrum:pure_bloodstone" + "id": "spectrum:pure_certus_quartz" } ], "fabric:load_conditions": [ diff --git a/src/main/resources/data/spectrum/recipe/mod_integration/create/anvil_crushing/zinc_ore_crushing.json b/src/main/resources/data/spectrum/recipe/mod_integration/create/anvil_crushing/zinc_ore_crushing.json index dc62b97ca9..af2822a758 100644 --- a/src/main/resources/data/spectrum/recipe/mod_integration/create/anvil_crushing/zinc_ore_crushing.json +++ b/src/main/resources/data/spectrum/recipe/mod_integration/create/anvil_crushing/zinc_ore_crushing.json @@ -2,7 +2,7 @@ "type": "spectrum:anvil_crushing", "ingredient": [ { - "tag": "c:zinc_ores" + "tag": "c:ores/zinc" } ], "crushedItemsPerPointOfDamage": 0.75, diff --git a/src/main/resources/data/spectrum/recipe/pedestal/tier1/food/ashen_tart.json b/src/main/resources/data/spectrum/recipe/pedestal/tier1/food/ashen_tart.json index 1aa0601579..4fc746efed 100644 --- a/src/main/resources/data/spectrum/recipe/pedestal/tier1/food/ashen_tart.json +++ b/src/main/resources/data/spectrum/recipe/pedestal/tier1/food/ashen_tart.json @@ -19,7 +19,7 @@ "A": "spectrum:amaranth_grains", "J": "spectrum:jaramel", "E": "#c:eggs", - "M": "#c:foods/milk", + "M": "#c:drinks/milk", "B": "minecraft:sweet_berries" }, "result": { diff --git a/src/main/resources/data/spectrum/recipe/pedestal/tier1/food/jaramel_tart.json b/src/main/resources/data/spectrum/recipe/pedestal/tier1/food/jaramel_tart.json index 8005013402..028b8a436f 100644 --- a/src/main/resources/data/spectrum/recipe/pedestal/tier1/food/jaramel_tart.json +++ b/src/main/resources/data/spectrum/recipe/pedestal/tier1/food/jaramel_tart.json @@ -19,7 +19,7 @@ "A": "spectrum:amaranth_grains", "J": "spectrum:jaramel", "E": "#c:eggs", - "M": "#c:foods/milk" + "M": "#c:drinks/milk" }, "result": { "id": "spectrum:jaramel_tart", diff --git a/src/main/resources/data/spectrum/recipe/pedestal/tier1/food/lucky_roll.json b/src/main/resources/data/spectrum/recipe/pedestal/tier1/food/lucky_roll.json index fa1c4eea9e..dfa37c8c1c 100644 --- a/src/main/resources/data/spectrum/recipe/pedestal/tier1/food/lucky_roll.json +++ b/src/main/resources/data/spectrum/recipe/pedestal/tier1/food/lucky_roll.json @@ -18,7 +18,7 @@ "key": { "A": "spectrum:amaranth_grains", "C": "spectrum:four_leaf_clover", - "M": "#c:foods/milk", + "M": "#c:drinks/milk", "S": "minecraft:sugar" }, "result": { diff --git a/src/main/resources/data/spectrum/recipe/pedestal/tier1/food/myceylon_apple_pie.json b/src/main/resources/data/spectrum/recipe/pedestal/tier1/food/myceylon_apple_pie.json index 07a03d4ed4..3dc08e21f1 100644 --- a/src/main/resources/data/spectrum/recipe/pedestal/tier1/food/myceylon_apple_pie.json +++ b/src/main/resources/data/spectrum/recipe/pedestal/tier1/food/myceylon_apple_pie.json @@ -17,7 +17,7 @@ ], "key": { "Y": "spectrum:myceylon", - "M": "#c:foods/milk", + "M": "#c:drinks/milk", "S": "minecraft:sugar", "P": "minecraft:pumpkin", "A": "spectrum:amaranth_grains" diff --git a/src/main/resources/data/spectrum/recipe/pedestal/tier1/food/myceylon_pumpkin_pie.json b/src/main/resources/data/spectrum/recipe/pedestal/tier1/food/myceylon_pumpkin_pie.json index 389f5d0f2b..ea8a2fe48a 100644 --- a/src/main/resources/data/spectrum/recipe/pedestal/tier1/food/myceylon_pumpkin_pie.json +++ b/src/main/resources/data/spectrum/recipe/pedestal/tier1/food/myceylon_pumpkin_pie.json @@ -17,7 +17,7 @@ ], "key": { "Y": "spectrum:myceylon", - "M": "#c:foods/milk", + "M": "#c:drinks/milk", "S": "minecraft:sugar", "P": "minecraft:apple", "A": "spectrum:amaranth_grains" diff --git a/src/main/resources/data/spectrum/recipe/pedestal/tier1/food/puff_tart.json b/src/main/resources/data/spectrum/recipe/pedestal/tier1/food/puff_tart.json index 87350dbe92..0a9ec19182 100644 --- a/src/main/resources/data/spectrum/recipe/pedestal/tier1/food/puff_tart.json +++ b/src/main/resources/data/spectrum/recipe/pedestal/tier1/food/puff_tart.json @@ -19,7 +19,7 @@ "A": "spectrum:amaranth_grains", "J": "spectrum:jaramel", "E": "#c:eggs", - "M": "#c:foods/milk", + "M": "#c:drinks/milk", "D": "minecraft:dragon_breath" }, "result": { diff --git a/src/main/resources/data/spectrum/recipe/pedestal/tier1/food/salted_jaramel_tart.json b/src/main/resources/data/spectrum/recipe/pedestal/tier1/food/salted_jaramel_tart.json index 5991e05a1b..88b6df6258 100644 --- a/src/main/resources/data/spectrum/recipe/pedestal/tier1/food/salted_jaramel_tart.json +++ b/src/main/resources/data/spectrum/recipe/pedestal/tier1/food/salted_jaramel_tart.json @@ -20,7 +20,7 @@ "A": "spectrum:amaranth_grains", "J": "spectrum:jaramel", "E": "#c:eggs", - "M": "#c:foods/milk", + "M": "#c:drinks/milk", "G": "minecraft:ghast_tear" }, "result": { diff --git a/src/main/resources/data/spectrum/recipe/pedestal/tier1/food/weeping_tart.json b/src/main/resources/data/spectrum/recipe/pedestal/tier1/food/weeping_tart.json index 8654466e2e..c6290b4c61 100644 --- a/src/main/resources/data/spectrum/recipe/pedestal/tier1/food/weeping_tart.json +++ b/src/main/resources/data/spectrum/recipe/pedestal/tier1/food/weeping_tart.json @@ -19,7 +19,7 @@ "A": "spectrum:amaranth_grains", "J": "spectrum:jaramel", "E": "#c:eggs", - "M": "#c:foods/milk", + "M": "#c:drinks/milk", "K": "minecraft:kelp" }, "result": { diff --git a/src/main/resources/data/spectrum/recipe/pedestal/tier1/food/whispy_tart.json b/src/main/resources/data/spectrum/recipe/pedestal/tier1/food/whispy_tart.json index b5efd2e0a0..18fe114171 100644 --- a/src/main/resources/data/spectrum/recipe/pedestal/tier1/food/whispy_tart.json +++ b/src/main/resources/data/spectrum/recipe/pedestal/tier1/food/whispy_tart.json @@ -19,7 +19,7 @@ "A": "spectrum:amaranth_grains", "J": "spectrum:jaramel", "E": "#c:eggs", - "M": "#c:foods/milk", + "M": "#c:drinks/milk", "G": "spectrum:nightdew_sprout" }, "result": { diff --git a/src/main/resources/data/spectrum/recipe/potion_workshop_crafting/azalea_tea_milk.json b/src/main/resources/data/spectrum/recipe/potion_workshop_crafting/azalea_tea_milk.json index a6ea2661f6..32c28287b0 100644 --- a/src/main/resources/data/spectrum/recipe/potion_workshop_crafting/azalea_tea_milk.json +++ b/src/main/resources/data/spectrum/recipe/potion_workshop_crafting/azalea_tea_milk.json @@ -7,7 +7,7 @@ "color": 9997393, "ingredient1": "minecraft:flowering_azalea", "ingredient2": "spectrum:nightdew_sprout", - "ingredient3": "#c:foods/milk", + "ingredient3": "#c:drinks/milk", "result": { "id": "spectrum:azalea_tea", "components": { diff --git a/src/main/resources/data/spectrum/recipe/potion_workshop_crafting/demon_tea_milk.json b/src/main/resources/data/spectrum/recipe/potion_workshop_crafting/demon_tea_milk.json index d06db72670..0d3564dc85 100644 --- a/src/main/resources/data/spectrum/recipe/potion_workshop_crafting/demon_tea_milk.json +++ b/src/main/resources/data/spectrum/recipe/potion_workshop_crafting/demon_tea_milk.json @@ -7,7 +7,7 @@ "color": 10027008, "ingredient1": "spectrum:jade_vine_petals", "ingredient2": "spectrum:bloodboil_syrup", - "ingredient3": "#c:foods/milk", + "ingredient3": "#c:drinks/milk", "result": { "id": "spectrum:demon_tea", "components": { diff --git a/src/main/resources/data/spectrum/recipe/potion_workshop_crafting/glistering_jelly_tea_milk.json b/src/main/resources/data/spectrum/recipe/potion_workshop_crafting/glistering_jelly_tea_milk.json index 9c6c382260..d5ff42c664 100644 --- a/src/main/resources/data/spectrum/recipe/potion_workshop_crafting/glistering_jelly_tea_milk.json +++ b/src/main/resources/data/spectrum/recipe/potion_workshop_crafting/glistering_jelly_tea_milk.json @@ -7,7 +7,7 @@ "color": 13803816, "ingredient1": "spectrum:jade_jelly", "ingredient2": "minecraft:glistering_melon_slice", - "ingredient3": "#c:foods/milk", + "ingredient3": "#c:drinks/milk", "result": { "id": "spectrum:glistering_jelly_tea", "components": { diff --git a/src/main/resources/data/spectrum/recipe/potion_workshop_crafting/golden_bristle_tea_milk.json b/src/main/resources/data/spectrum/recipe/potion_workshop_crafting/golden_bristle_tea_milk.json index d04b5faabe..57dcc61857 100644 --- a/src/main/resources/data/spectrum/recipe/potion_workshop_crafting/golden_bristle_tea_milk.json +++ b/src/main/resources/data/spectrum/recipe/potion_workshop_crafting/golden_bristle_tea_milk.json @@ -7,7 +7,7 @@ "color": 15853164, "ingredient1": "spectrum:sawblade_holly_berry", "ingredient2": "minecraft:honey_bottle", - "ingredient3": "#c:foods/milk", + "ingredient3": "#c:drinks/milk", "result": { "id": "spectrum:golden_bristle_tea", "components": { diff --git a/src/main/resources/data/spectrum/recipe/potion_workshop_crafting/hot_chocolate.json b/src/main/resources/data/spectrum/recipe/potion_workshop_crafting/hot_chocolate.json index fad777b907..0195d5b67f 100644 --- a/src/main/resources/data/spectrum/recipe/potion_workshop_crafting/hot_chocolate.json +++ b/src/main/resources/data/spectrum/recipe/potion_workshop_crafting/hot_chocolate.json @@ -3,7 +3,7 @@ "base_ingredient": "minecraft:glass_bottle", "use_up_base_ingredient": true, "color": 9128969, - "ingredient1": "#c:foods/milk", + "ingredient1": "#c:drinks/milk", "ingredient2": "spectrum:fresh_chocolate", "result": { "id": "spectrum:hot_chocolate" diff --git a/src/main/resources/data/spectrum/recipe/potion_workshop_crafting/restoration_tea_milk.json b/src/main/resources/data/spectrum/recipe/potion_workshop_crafting/restoration_tea_milk.json index 27fb159ece..864551a223 100644 --- a/src/main/resources/data/spectrum/recipe/potion_workshop_crafting/restoration_tea_milk.json +++ b/src/main/resources/data/spectrum/recipe/potion_workshop_crafting/restoration_tea_milk.json @@ -7,7 +7,7 @@ "color": 5807774, "ingredient1": "spectrum:jade_vine_petals", "ingredient2": "minecraft:cocoa_beans", - "ingredient3": "#c:foods/milk", + "ingredient3": "#c:drinks/milk", "result": { "id": "spectrum:restoration_tea", "components": { diff --git a/src/main/resources/data/spectrum/recipe/titration_barrel/clotted_cream_fluid.json b/src/main/resources/data/spectrum/recipe/titration_barrel/clotted_cream_fluid.json index cec7e1742a..911c422ab9 100644 --- a/src/main/resources/data/spectrum/recipe/titration_barrel/clotted_cream_fluid.json +++ b/src/main/resources/data/spectrum/recipe/titration_barrel/clotted_cream_fluid.json @@ -6,7 +6,7 @@ "count": 4 } ], - "fluid": "#c:foods/milk", + "fluid": "#c:milk", "min_fermentation_time_hours": 1, "result": { "id": "spectrum:clotted_cream", diff --git a/src/main/resources/data/spectrum/recipe/titration_barrel/surstromming.json b/src/main/resources/data/spectrum/recipe/titration_barrel/surstromming.json index 148b587530..e9fadfb5f8 100644 --- a/src/main/resources/data/spectrum/recipe/titration_barrel/surstromming.json +++ b/src/main/resources/data/spectrum/recipe/titration_barrel/surstromming.json @@ -2,7 +2,7 @@ "type": "spectrum:titration_barrel", "ingredients": [ { - "tag": "c:foods/raw_fishes", + "tag": "c:foods/raw_fish", "count": 8 }, { diff --git a/src/main/resources/data/spectrum/tags/block/mob_heads.json b/src/main/resources/data/spectrum/tags/block/mob_heads.json index 3366f1ee4b..9b56575423 100644 --- a/src/main/resources/data/spectrum/tags/block/mob_heads.json +++ b/src/main/resources/data/spectrum/tags/block/mob_heads.json @@ -62,7 +62,7 @@ "spectrum:enderman_head", "spectrum:endermite_head", "spectrum:evoker_head", - "spectrum:fox_head", + "spectrum:fox_red_head", "spectrum:fox_arctic_head", "spectrum:ghast_head", "spectrum:glow_squid_head", @@ -81,10 +81,10 @@ "spectrum:ocelot_head", "spectrum:panda_head", "spectrum:parrot_blue_head", - "spectrum:parrot_cyan_head", "spectrum:parrot_gray_head", "spectrum:parrot_green_head", - "spectrum:parrot_red_head", + "spectrum:parrot_red_blue_head", + "spectrum:parrot_yellow_blue_head", "spectrum:phantom_head", "spectrum:pig_head", "spectrum:polar_bear_head", @@ -163,7 +163,7 @@ "spectrum:enderman_wall_head", "spectrum:endermite_wall_head", "spectrum:evoker_wall_head", - "spectrum:fox_wall_head", + "spectrum:fox_red_wall_head", "spectrum:fox_arctic_wall_head", "spectrum:ghast_wall_head", "spectrum:glow_squid_wall_head", @@ -182,10 +182,10 @@ "spectrum:ocelot_wall_head", "spectrum:panda_wall_head", "spectrum:parrot_blue_wall_head", - "spectrum:parrot_cyan_wall_head", "spectrum:parrot_gray_wall_head", "spectrum:parrot_green_wall_head", - "spectrum:parrot_red_wall_head", + "spectrum:parrot_red_blue_wall_head", + "spectrum:parrot_yellow_blue_wall_head", "spectrum:phantom_wall_head", "spectrum:pig_wall_head", "spectrum:polar_bear_wall_head", From 0c423552987321e75c409e01668550f6cf36f74b Mon Sep 17 00:00:00 2001 From: Saphire Lattice Date: Sat, 4 Jul 2026 18:55:25 +0600 Subject: [PATCH 3/6] Port the fix of not setting the titration beverage data From 1.21.1/neoforge - cad4539a361e793211dc26d933bf429074e528b0 - "only set beverage data if a recipe had fermentation data" --- .../recipe/titration_barrel/TitrationBarrelRecipe.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/de/dafuqs/spectrum/recipe/titration_barrel/TitrationBarrelRecipe.java b/src/main/java/de/dafuqs/spectrum/recipe/titration_barrel/TitrationBarrelRecipe.java index fc28c77abe..45de1a09a8 100644 --- a/src/main/java/de/dafuqs/spectrum/recipe/titration_barrel/TitrationBarrelRecipe.java +++ b/src/main/java/de/dafuqs/spectrum/recipe/titration_barrel/TitrationBarrelRecipe.java @@ -163,6 +163,7 @@ public static ItemStack getFermentedStack(Optional fermentatio if (alcPercent >= 100 && inputStack.getItem() instanceof FermentedItem) { return SpectrumItems.PURE_ALCOHOL.getDefaultInstance(); } + inputStack.set(SpectrumDataComponentTypes.BEVERAGE, new BeverageComponent((long) ageIngameDays, (int) alcPercent, thickness)); } if (fermentationData.isPresent() && !fermentationData.get().statusEffectEntries().isEmpty()) { @@ -187,7 +188,6 @@ public static ItemStack getFermentedStack(Optional fermentatio } } - inputStack.set(SpectrumDataComponentTypes.BEVERAGE, new BeverageComponent((long) ageIngameDays, (int) alcPercent, thickness)); return inputStack; } @@ -285,4 +285,4 @@ public StreamCodec streamCodec() } -} +} \ No newline at end of file From 23d855f2c3461551c6ff6ebfa53d9cc5697993c8 Mon Sep 17 00:00:00 2001 From: DaFuqs Date: Sat, 14 Feb 2026 10:47:15 +0100 Subject: [PATCH 4/6] rename fox & parrot head ids to match internal Cherry-pick from neoforge - d080cdf269f78da08e16f4f7248506470ee6558a --- .../blockstates/fox_head_BACKUP_795786.json | 7 +++++++ .../blockstates/fox_head_BASE_795786.json | 0 .../blockstates/fox_head_LOCAL_795786.json | 7 +++++++ .../blockstates/fox_head_REMOTE_795786.json | 0 .../blocks/mob_head/SpectrumSkullType.java | 9 +++++---- .../SpectrumSkullBlockEntityRenderer.java | 8 ++++---- .../client/SpectrumModelLayers.java | 20 +++++++++---------- .../spectrum/blockstates/fox_red_head.json | 7 +++++++ .../blockstates/fox_red_wall_head.json | 7 +++++++ .../blockstates/parrot_red_blue_head.json | 7 +++++++ .../parrot_red_blue_wall_head.json | 7 +++++++ .../blockstates/parrot_yellow_blue_head.json | 7 +++++++ .../parrot_yellow_blue_wall_head.json | 7 +++++++ .../resources/assets/spectrum/lang/de_de.json | 6 +++--- .../resources/assets/spectrum/lang/en_us.json | 6 +++--- .../resources/assets/spectrum/lang/pt_br.json | 4 ++-- .../resources/assets/spectrum/lang/ru_ru.json | 8 ++++---- .../resources/assets/spectrum/lang/zh_cn.json | 6 +++--- .../spectrum/models/item/fox_red_head.json | 3 +++ .../models/item/parrot_red_blue_head.json | 3 +++ .../models/item/parrot_yellow_blue_head.json | 3 +++ .../midgame/collect_all_mob_heads.json | 12 +++++------ .../{fox_head.json => fox_red_head.json} | 2 +- ...an_head.json => parrot_red_blue_head.json} | 2 +- ...head.json => parrot_yellow_blue_head.json} | 2 +- .../entries/creating_life/mob_heads.json | 6 +++--- .../head_fusion/variant_changing/fox_red.json | 2 +- .../variant_changing/parrot_cyan.json | 2 +- .../variant_changing/parrot_red.json | 2 +- .../memories/{fox.json => fox_red.json} | 2 +- .../memories/parrot_cyan.json | 2 +- .../spirit_instiller/memories/parrot_red.json | 2 +- .../data/spectrum/tags/block/mob_heads.json | 4 ++-- .../data/spectrum/tags/item/mob_heads.json | 4 ++-- .../tags/item/mob_heads/fox_heads.json | 2 +- .../tags/item/mob_heads/parrot_heads.json | 4 ++-- 36 files changed, 124 insertions(+), 58 deletions(-) create mode 100644 src/main/generated/assets/spectrum/blockstates/fox_head_BACKUP_795786.json create mode 100644 src/main/generated/assets/spectrum/blockstates/fox_head_BASE_795786.json create mode 100644 src/main/generated/assets/spectrum/blockstates/fox_head_LOCAL_795786.json create mode 100644 src/main/generated/assets/spectrum/blockstates/fox_head_REMOTE_795786.json create mode 100644 src/main/resources/assets/spectrum/blockstates/fox_red_head.json create mode 100644 src/main/resources/assets/spectrum/blockstates/fox_red_wall_head.json create mode 100644 src/main/resources/assets/spectrum/blockstates/parrot_red_blue_head.json create mode 100644 src/main/resources/assets/spectrum/blockstates/parrot_red_blue_wall_head.json create mode 100644 src/main/resources/assets/spectrum/blockstates/parrot_yellow_blue_head.json create mode 100644 src/main/resources/assets/spectrum/blockstates/parrot_yellow_blue_wall_head.json create mode 100644 src/main/resources/assets/spectrum/models/item/fox_red_head.json create mode 100644 src/main/resources/assets/spectrum/models/item/parrot_red_blue_head.json create mode 100644 src/main/resources/assets/spectrum/models/item/parrot_yellow_blue_head.json rename src/main/resources/data/spectrum/loot_table/blocks/{fox_head.json => fox_red_head.json} (87%) rename src/main/resources/data/spectrum/loot_table/blocks/{parrot_cyan_head.json => parrot_red_blue_head.json} (85%) rename src/main/resources/data/spectrum/loot_table/blocks/{parrot_red_head.json => parrot_yellow_blue_head.json} (84%) rename src/main/resources/data/spectrum/recipe/spirit_instiller/memories/{fox.json => fox_red.json} (92%) diff --git a/src/main/generated/assets/spectrum/blockstates/fox_head_BACKUP_795786.json b/src/main/generated/assets/spectrum/blockstates/fox_head_BACKUP_795786.json new file mode 100644 index 0000000000..b14e57e155 --- /dev/null +++ b/src/main/generated/assets/spectrum/blockstates/fox_head_BACKUP_795786.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "spectrum:block/mob_head" + } + } +} \ No newline at end of file diff --git a/src/main/generated/assets/spectrum/blockstates/fox_head_BASE_795786.json b/src/main/generated/assets/spectrum/blockstates/fox_head_BASE_795786.json new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/main/generated/assets/spectrum/blockstates/fox_head_LOCAL_795786.json b/src/main/generated/assets/spectrum/blockstates/fox_head_LOCAL_795786.json new file mode 100644 index 0000000000..b14e57e155 --- /dev/null +++ b/src/main/generated/assets/spectrum/blockstates/fox_head_LOCAL_795786.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "spectrum:block/mob_head" + } + } +} \ No newline at end of file diff --git a/src/main/generated/assets/spectrum/blockstates/fox_head_REMOTE_795786.json b/src/main/generated/assets/spectrum/blockstates/fox_head_REMOTE_795786.json new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/main/java/de/dafuqs/spectrum/blocks/mob_head/SpectrumSkullType.java b/src/main/java/de/dafuqs/spectrum/blocks/mob_head/SpectrumSkullType.java index 10d230b82b..69b1345cf6 100644 --- a/src/main/java/de/dafuqs/spectrum/blocks/mob_head/SpectrumSkullType.java +++ b/src/main/java/de/dafuqs/spectrum/blocks/mob_head/SpectrumSkullType.java @@ -8,6 +8,7 @@ import net.minecraft.util.*; import net.minecraft.world.entity.*; import net.minecraft.world.level.block.*; +import org.jetbrains.annotations.*; import java.util.*; @@ -36,7 +37,7 @@ public enum SpectrumSkullType implements SkullBlock.Type { ENDERMAN(EntityType.ENDERMAN, SoundEvents.ENDERMAN_AMBIENT.getLocation()), ENDERMITE(EntityType.ENDERMITE, SoundEvents.ENDERMITE_AMBIENT.getLocation()), EVOKER(EntityType.EVOKER, SoundEvents.EVOKER_AMBIENT.getLocation()), - FOX(EntityType.FOX, SoundEvents.FOX_AMBIENT.getLocation()), + FOX_RED(EntityType.FOX, SoundEvents.FOX_AMBIENT.getLocation()), FOX_ARCTIC(EntityType.FOX, SoundEvents.FOX_AMBIENT.getLocation()), FROG_COLD(EntityType.FROG, SoundEvents.FROG_AMBIENT.getLocation()), FROG_TEMPERATE(EntityType.FROG, SoundEvents.FROG_AMBIENT.getLocation()), @@ -58,10 +59,10 @@ public enum SpectrumSkullType implements SkullBlock.Type { OCELOT(EntityType.OCELOT, SoundEvents.OCELOT_AMBIENT.getLocation()), PANDA(EntityType.PANDA, SoundEvents.PANDA_AMBIENT.getLocation()), PARROT_BLUE(EntityType.PARROT, SoundEvents.PARROT_AMBIENT.getLocation()), - PARROT_CYAN(EntityType.PARROT, SoundEvents.PARROT_AMBIENT.getLocation()), + PARROT_YELLOW_BLUE(EntityType.PARROT, SoundEvents.PARROT_AMBIENT.getLocation()), PARROT_GRAY(EntityType.PARROT, SoundEvents.PARROT_AMBIENT.getLocation()), PARROT_GREEN(EntityType.PARROT, SoundEvents.PARROT_AMBIENT.getLocation()), - PARROT_RED(EntityType.PARROT, SoundEvents.PARROT_AMBIENT.getLocation()), + PARROT_RED_BLUE(EntityType.PARROT, SoundEvents.PARROT_AMBIENT.getLocation()), PHANTOM(EntityType.PHANTOM, SoundEvents.PHANTOM_AMBIENT.getLocation()), PIG(EntityType.PIG, SoundEvents.PIG_AMBIENT.getLocation()), PILLAGER(EntityType.PILLAGER, SoundEvents.PILLAGER_AMBIENT.getLocation()), @@ -161,7 +162,7 @@ public ResourceLocation getNoteBlockSound() { } @Override - public String getSerializedName() { + public @NotNull String getSerializedName() { return name().toLowerCase(Locale.ROOT); } diff --git a/src/main/java/de/dafuqs/spectrum/blocks/mob_head/client/SpectrumSkullBlockEntityRenderer.java b/src/main/java/de/dafuqs/spectrum/blocks/mob_head/client/SpectrumSkullBlockEntityRenderer.java index 1df704dc8b..16be251e9f 100644 --- a/src/main/java/de/dafuqs/spectrum/blocks/mob_head/client/SpectrumSkullBlockEntityRenderer.java +++ b/src/main/java/de/dafuqs/spectrum/blocks/mob_head/client/SpectrumSkullBlockEntityRenderer.java @@ -63,7 +63,7 @@ public static Map(new EndermiteHeadModel(modelLoader.bakeLayer(SpectrumModelLayers.ENDERMITE_HEAD)), ResourceLocation.parse("textures/entity/endermite.png")))); builder.put(SpectrumSkullType.EVOKER, List.of(new Tuple<>(new IllagerHeadModel(modelLoader.bakeLayer(SpectrumModelLayers.EVOKER_HEAD)), ResourceLocation.parse("textures/entity/illager/evoker.png")))); - builder.put(SpectrumSkullType.FOX, List.of(new Tuple<>(new FoxHeadModel(modelLoader.bakeLayer(SpectrumModelLayers.FOX_HEAD)), ResourceLocation.parse("textures/entity/fox/fox.png")))); + builder.put(SpectrumSkullType.FOX_RED, List.of(new Tuple<>(new FoxHeadModel(modelLoader.bakeLayer(SpectrumModelLayers.FOX_RED_HEAD)), ResourceLocation.parse("textures/entity/fox/fox.png")))); builder.put(SpectrumSkullType.FOX_ARCTIC, List.of(new Tuple<>(new FoxHeadModel(modelLoader.bakeLayer(SpectrumModelLayers.FOX_ARCTIC_HEAD)), ResourceLocation.parse("textures/entity/fox/snow_fox.png")))); builder.put(SpectrumSkullType.FROG_COLD, List.of(new Tuple<>(new FrogHeadModel(modelLoader.bakeLayer(SpectrumModelLayers.FROG_COLD_HEAD)), ResourceLocation.parse("textures/entity/frog/cold_frog.png")))); builder.put(SpectrumSkullType.FROG_TEMPERATE, List.of(new Tuple<>(new FrogHeadModel(modelLoader.bakeLayer(SpectrumModelLayers.FROG_TEMPERATE_HEAD)), ResourceLocation.parse("textures/entity/frog/temperate_frog.png")))); @@ -84,11 +84,11 @@ public static Map(new HorseHeadModel(modelLoader.bakeLayer(SpectrumModelLayers.MULE_HEAD)), ResourceLocation.parse("textures/entity/horse/mule.png")))); builder.put(SpectrumSkullType.OCELOT, List.of(new Tuple<>(new CatHeadModel(modelLoader.bakeLayer(SpectrumModelLayers.OCELOT_HEAD)), ResourceLocation.parse("textures/entity/cat/ocelot.png")))); builder.put(SpectrumSkullType.PANDA, List.of(new Tuple<>(new PandaHeadModel(modelLoader.bakeLayer(SpectrumModelLayers.PANDA_HEAD)), ResourceLocation.parse("textures/entity/panda/panda.png")))); // pandas have variants + builder.put(SpectrumSkullType.PARROT_RED_BLUE, List.of(new Tuple<>(new ParrotHeadModel(modelLoader.bakeLayer(SpectrumModelLayers.PARROT_RED_BLUE_HEAD)), ResourceLocation.parse("textures/entity/parrot/parrot_red_blue.png")))); builder.put(SpectrumSkullType.PARROT_BLUE, List.of(new Tuple<>(new ParrotHeadModel(modelLoader.bakeLayer(SpectrumModelLayers.PARROT_BLUE_HEAD)), ResourceLocation.parse("textures/entity/parrot/parrot_blue.png")))); - builder.put(SpectrumSkullType.PARROT_CYAN, List.of(new Tuple<>(new ParrotHeadModel(modelLoader.bakeLayer(SpectrumModelLayers.PARROT_CYAN_HEAD)), ResourceLocation.parse("textures/entity/parrot/parrot_yellow_blue.png")))); // cyan vs. yellow_blue - builder.put(SpectrumSkullType.PARROT_GRAY, List.of(new Tuple<>(new ParrotHeadModel(modelLoader.bakeLayer(SpectrumModelLayers.PARROT_GRAY_HEAD)), ResourceLocation.parse("textures/entity/parrot/parrot_grey.png")))); // gray vs.grey builder.put(SpectrumSkullType.PARROT_GREEN, List.of(new Tuple<>(new ParrotHeadModel(modelLoader.bakeLayer(SpectrumModelLayers.PARROT_GREEN_HEAD)), ResourceLocation.parse("textures/entity/parrot/parrot_green.png")))); - builder.put(SpectrumSkullType.PARROT_RED, List.of(new Tuple<>(new ParrotHeadModel(modelLoader.bakeLayer(SpectrumModelLayers.PARROT_RED_HEAD)), ResourceLocation.parse("textures/entity/parrot/parrot_red_blue.png")))); // red vs. red_blue + builder.put(SpectrumSkullType.PARROT_YELLOW_BLUE, List.of(new Tuple<>(new ParrotHeadModel(modelLoader.bakeLayer(SpectrumModelLayers.PARROT_YELLOW_BLUE_HEAD)), ResourceLocation.parse("textures/entity/parrot/parrot_yellow_blue.png")))); + builder.put(SpectrumSkullType.PARROT_GRAY, List.of(new Tuple<>(new ParrotHeadModel(modelLoader.bakeLayer(SpectrumModelLayers.PARROT_GRAY_HEAD)), ResourceLocation.parse("textures/entity/parrot/parrot_grey.png")))); // gray vs.grey builder.put(SpectrumSkullType.PHANTOM, List.of(new Tuple<>(new PhantomHeadModel(modelLoader.bakeLayer(SpectrumModelLayers.PHANTOM_HEAD)), ResourceLocation.parse("textures/entity/phantom.png")))); builder.put(SpectrumSkullType.PIG, List.of(new Tuple<>(new PigHeadModel(modelLoader.bakeLayer(SpectrumModelLayers.PIG_HEAD)), ResourceLocation.parse("textures/entity/pig/pig.png")))); builder.put(SpectrumSkullType.PILLAGER, List.of(new Tuple<>(new IllagerHeadModel(modelLoader.bakeLayer(SpectrumModelLayers.PILLAGER_HEAD)), ResourceLocation.parse("textures/entity/illager/pillager.png")))); diff --git a/src/main/java/de/dafuqs/spectrum/registries/client/SpectrumModelLayers.java b/src/main/java/de/dafuqs/spectrum/registries/client/SpectrumModelLayers.java index dd4e20ca2d..e5950bdca9 100644 --- a/src/main/java/de/dafuqs/spectrum/registries/client/SpectrumModelLayers.java +++ b/src/main/java/de/dafuqs/spectrum/registries/client/SpectrumModelLayers.java @@ -66,7 +66,7 @@ public class SpectrumModelLayers { public static final ModelLayerLocation ENDERMITE_HEAD = new ModelLayerLocation(SpectrumCommon.locate("endermite_head"), "main"); public static final ModelLayerLocation EVOKER_HEAD = new ModelLayerLocation(SpectrumCommon.locate("evoker_head"), "main"); public static final ModelLayerLocation FOX_ARCTIC_HEAD = new ModelLayerLocation(SpectrumCommon.locate("fox_arctic_head"), "main"); - public static final ModelLayerLocation FOX_HEAD = new ModelLayerLocation(SpectrumCommon.locate("fox_head"), "main"); + public static final ModelLayerLocation FOX_RED_HEAD = new ModelLayerLocation(SpectrumCommon.locate("fox_red_head"), "main"); public static final ModelLayerLocation FROG_COLD_HEAD = new ModelLayerLocation(SpectrumCommon.locate("frog_cold_head"), "main"); public static final ModelLayerLocation FROG_TEMPERATE_HEAD = new ModelLayerLocation(SpectrumCommon.locate("frog_temperate_head"), "main"); public static final ModelLayerLocation FROG_WARM_HEAD = new ModelLayerLocation(SpectrumCommon.locate("frog_warm_head"), "main"); @@ -86,11 +86,11 @@ public class SpectrumModelLayers { public static final ModelLayerLocation MULE_HEAD = new ModelLayerLocation(SpectrumCommon.locate("mule_head"), "main"); public static final ModelLayerLocation OCELOT_HEAD = new ModelLayerLocation(SpectrumCommon.locate("ocelot_head"), "main"); public static final ModelLayerLocation PANDA_HEAD = new ModelLayerLocation(SpectrumCommon.locate("panda_head"), "main"); + public static final ModelLayerLocation PARROT_RED_BLUE_HEAD = new ModelLayerLocation(SpectrumCommon.locate("parrot_red_blue_head"), "main"); public static final ModelLayerLocation PARROT_BLUE_HEAD = new ModelLayerLocation(SpectrumCommon.locate("parrot_blue_head"), "main"); - public static final ModelLayerLocation PARROT_CYAN_HEAD = new ModelLayerLocation(SpectrumCommon.locate("parrot_cyan_head"), "main"); - public static final ModelLayerLocation PARROT_GRAY_HEAD = new ModelLayerLocation(SpectrumCommon.locate("parrot_gray_head"), "main"); public static final ModelLayerLocation PARROT_GREEN_HEAD = new ModelLayerLocation(SpectrumCommon.locate("parrot_green_head"), "main"); - public static final ModelLayerLocation PARROT_RED_HEAD = new ModelLayerLocation(SpectrumCommon.locate("parrot_red_head"), "main"); + public static final ModelLayerLocation PARROT_YELLOW_BLUE_HEAD = new ModelLayerLocation(SpectrumCommon.locate("parrot_yellow_blue_head"), "main"); + public static final ModelLayerLocation PARROT_GRAY_HEAD = new ModelLayerLocation(SpectrumCommon.locate("parrot_gray_head"), "main"); public static final ModelLayerLocation PHANTOM_HEAD = new ModelLayerLocation(SpectrumCommon.locate("phantom_head"), "main"); public static final ModelLayerLocation PIG_HEAD = new ModelLayerLocation(SpectrumCommon.locate("pig_head"), "main"); public static final ModelLayerLocation PILLAGER_HEAD = new ModelLayerLocation(SpectrumCommon.locate("pillager_head"), "main"); @@ -184,12 +184,12 @@ public static void register() { EntityModelLayerRegistry.registerModelLayer(KINDLING_ARMOR, KindlingEntityModel::getTexturedModelData); EntityModelLayerRegistry.registerModelLayer(KINDLING_COUGH, KindlingCoughEntityModel::getTexturedModelData); EntityModelLayerRegistry.registerModelLayer(ERASER, EraserEntityModel::getTexturedModelData); - + EntityModelLayerRegistry.registerModelLayer(MARROW, SkeletonModel::createBodyLayer); EntityModelLayerRegistry.registerModelLayer(MARROW_INNER_ARMOR, SkeletonModel::createBodyLayer); EntityModelLayerRegistry.registerModelLayer(MARROW_OUTER_ARMOR, SkeletonModel::createBodyLayer); EntityModelLayerRegistry.registerModelLayer(MARROW_OUTER_LAYER, SkeletonModel::createBodyLayer); - + EntityModelLayerRegistry.registerModelLayer(ALLAY_HEAD, AllayHeadModel::getTexturedModelData); EntityModelLayerRegistry.registerModelLayer(AXOLOTL_BLUE_HEAD, AxolotlHeadModel::getTexturedModelData); EntityModelLayerRegistry.registerModelLayer(AXOLOTL_CYAN_HEAD, AxolotlHeadModel::getTexturedModelData); @@ -214,7 +214,7 @@ public static void register() { EntityModelLayerRegistry.registerModelLayer(ENDERMAN_HEAD_OVERLAY, EndermanHeadModel::getTexturedModelData); EntityModelLayerRegistry.registerModelLayer(ENDERMITE_HEAD, EndermiteHeadModel::getTexturedModelData); EntityModelLayerRegistry.registerModelLayer(EVOKER_HEAD, IllagerHeadModel::getTexturedModelData); - EntityModelLayerRegistry.registerModelLayer(FOX_HEAD, FoxHeadModel::getTexturedModelData); + EntityModelLayerRegistry.registerModelLayer(FOX_RED_HEAD, FoxHeadModel::getTexturedModelData); EntityModelLayerRegistry.registerModelLayer(FOX_ARCTIC_HEAD, FoxHeadModel::getTexturedModelData); EntityModelLayerRegistry.registerModelLayer(FROG_COLD_HEAD, FrogHeadModel::getTexturedModelData); EntityModelLayerRegistry.registerModelLayer(FROG_TEMPERATE_HEAD, FrogHeadModel::getTexturedModelData); @@ -236,10 +236,10 @@ public static void register() { EntityModelLayerRegistry.registerModelLayer(OCELOT_HEAD, CatHeadModel::getTexturedModelData); EntityModelLayerRegistry.registerModelLayer(PANDA_HEAD, PandaHeadModel::getTexturedModelData); EntityModelLayerRegistry.registerModelLayer(PARROT_BLUE_HEAD, ParrotHeadModel::getTexturedModelData); - EntityModelLayerRegistry.registerModelLayer(PARROT_CYAN_HEAD, ParrotHeadModel::getTexturedModelData); + EntityModelLayerRegistry.registerModelLayer(PARROT_YELLOW_BLUE_HEAD, ParrotHeadModel::getTexturedModelData); EntityModelLayerRegistry.registerModelLayer(PARROT_GRAY_HEAD, ParrotHeadModel::getTexturedModelData); EntityModelLayerRegistry.registerModelLayer(PARROT_GREEN_HEAD, ParrotHeadModel::getTexturedModelData); - EntityModelLayerRegistry.registerModelLayer(PARROT_RED_HEAD, ParrotHeadModel::getTexturedModelData); + EntityModelLayerRegistry.registerModelLayer(PARROT_RED_BLUE_HEAD, ParrotHeadModel::getTexturedModelData); EntityModelLayerRegistry.registerModelLayer(PHANTOM_HEAD, PhantomHeadModel::getTexturedModelData); EntityModelLayerRegistry.registerModelLayer(PIG_HEAD, PigHeadModel::getTexturedModelData); EntityModelLayerRegistry.registerModelLayer(POLAR_BEAR_HEAD, BearHeadModel::getTexturedModelData); @@ -317,4 +317,4 @@ public static void register() { EntityModelLayerRegistry.registerModelLayer(BEDROCK_LAYER, () -> LayerDefinition.create(BedrockArmorModel.getMeshDefinition(), 128, 128)); } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/blockstates/fox_red_head.json b/src/main/resources/assets/spectrum/blockstates/fox_red_head.json new file mode 100644 index 0000000000..b14e57e155 --- /dev/null +++ b/src/main/resources/assets/spectrum/blockstates/fox_red_head.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "spectrum:block/mob_head" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/blockstates/fox_red_wall_head.json b/src/main/resources/assets/spectrum/blockstates/fox_red_wall_head.json new file mode 100644 index 0000000000..b14e57e155 --- /dev/null +++ b/src/main/resources/assets/spectrum/blockstates/fox_red_wall_head.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "spectrum:block/mob_head" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/blockstates/parrot_red_blue_head.json b/src/main/resources/assets/spectrum/blockstates/parrot_red_blue_head.json new file mode 100644 index 0000000000..b14e57e155 --- /dev/null +++ b/src/main/resources/assets/spectrum/blockstates/parrot_red_blue_head.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "spectrum:block/mob_head" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/blockstates/parrot_red_blue_wall_head.json b/src/main/resources/assets/spectrum/blockstates/parrot_red_blue_wall_head.json new file mode 100644 index 0000000000..b14e57e155 --- /dev/null +++ b/src/main/resources/assets/spectrum/blockstates/parrot_red_blue_wall_head.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "spectrum:block/mob_head" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/blockstates/parrot_yellow_blue_head.json b/src/main/resources/assets/spectrum/blockstates/parrot_yellow_blue_head.json new file mode 100644 index 0000000000..b14e57e155 --- /dev/null +++ b/src/main/resources/assets/spectrum/blockstates/parrot_yellow_blue_head.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "spectrum:block/mob_head" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/blockstates/parrot_yellow_blue_wall_head.json b/src/main/resources/assets/spectrum/blockstates/parrot_yellow_blue_wall_head.json new file mode 100644 index 0000000000..b14e57e155 --- /dev/null +++ b/src/main/resources/assets/spectrum/blockstates/parrot_yellow_blue_wall_head.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "spectrum:block/mob_head" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/lang/de_de.json b/src/main/resources/assets/spectrum/lang/de_de.json index f31a0ed02c..3421f272a2 100644 --- a/src/main/resources/assets/spectrum/lang/de_de.json +++ b/src/main/resources/assets/spectrum/lang/de_de.json @@ -657,7 +657,7 @@ "block.spectrum.enderman_head": "Enderman Kopf", "block.spectrum.endermite_head": "Endermite Kopf", "block.spectrum.evoker_head": "Evoker Kopf", - "block.spectrum.fox_head": "Fuchs Kopf", + "block.spectrum.fox_red_head": "Fuchs Kopf", "block.spectrum.fox_arctic_head": "Arktischer Fuchs Kopf", "block.spectrum.ghast_head": "Ghast Kopf", "block.spectrum.guardian_head": "Wächter Kopf", @@ -672,10 +672,10 @@ "block.spectrum.ocelot_head": "Ozelot Kopf", "block.spectrum.panda_head": "Panda Kopf", "block.spectrum.parrot_blue_head": "Blauer Papageien Kopf", - "block.spectrum.parrot_cyan_head": "Türkiser Papageien Kopf", + "block.spectrum.parrot_yellow_blue_head": "Türkiser Papageien Kopf", "block.spectrum.parrot_gray_head": "Grauer Papageien Kopf", "block.spectrum.parrot_green_head": "Grüner Papageien Kopf", - "block.spectrum.parrot_red_head": "Roter Papageien Kopf", + "block.spectrum.parrot_red_blue_head": "Roter Papageien Kopf", "block.spectrum.phantom_head": "Phantom Kopf", "block.spectrum.pig_head": "Schweine Kopf", "block.spectrum.polar_bear_head": "Eisbären Kopf", diff --git a/src/main/resources/assets/spectrum/lang/en_us.json b/src/main/resources/assets/spectrum/lang/en_us.json index 5577343dc2..4e33d94e2a 100644 --- a/src/main/resources/assets/spectrum/lang/en_us.json +++ b/src/main/resources/assets/spectrum/lang/en_us.json @@ -1261,7 +1261,7 @@ "block.spectrum.forfeiture": "Forfeiture", "block.spectrum.four_leaf_clover": "Four-Leaved Clover", "block.spectrum.fox_arctic_head": "Arctic Fox Head", - "block.spectrum.fox_head": "Fox Head", + "block.spectrum.fox_red_head": "Fox Head", "block.spectrum.fox_idol": "Cunning Idol", "block.spectrum.freezing_idol.tooltip": "§7Freezes blocks around it", "block.spectrum.frog_cold_head": "Cold Frog Head", @@ -1585,11 +1585,11 @@ "block.spectrum.parametric_mining_device": "Parametric Mining Device", "block.spectrum.parametric_mining_device.tooltip": "Explodes when thrown or attached to a wall", "block.spectrum.parrot_blue_head": "Blue Parrot Head", - "block.spectrum.parrot_cyan_head": "Cyan Parrot Head", + "block.spectrum.parrot_yellow_blue_head": "Cyan Parrot Head", "block.spectrum.parrot_gray_head": "Gray Parrot Head", "block.spectrum.parrot_green_head": "Green Parrot Head", "block.spectrum.parrot_idol": "Studious Idol", - "block.spectrum.parrot_red_head": "Red Parrot Head", + "block.spectrum.parrot_red_blue_head": "Red Parrot Head", "block.spectrum.particle_spawner": "Particle Spawner", "block.spectrum.particle_spawner.color_c": "C", "block.spectrum.particle_spawner.color_m": "M", diff --git a/src/main/resources/assets/spectrum/lang/pt_br.json b/src/main/resources/assets/spectrum/lang/pt_br.json index e25fd2d7e1..5a82544878 100644 --- a/src/main/resources/assets/spectrum/lang/pt_br.json +++ b/src/main/resources/assets/spectrum/lang/pt_br.json @@ -838,10 +838,10 @@ "block.spectrum.ocelot_head": "Cabeça de Jaguatirica", "block.spectrum.panda_head": "Cabeça de Panda", "block.spectrum.parrot_blue_head": "Cabeça de Papagaio Azul", - "block.spectrum.parrot_cyan_head": "Cabeça de Papagaio Ciano", + "block.spectrum.parrot_yellow_blue_head": "Cabeça de Papagaio Ciano", "block.spectrum.parrot_gray_head": "Cabeça de Papagaio Cinza", "block.spectrum.parrot_green_head": "Cabeça de Papagaio Verde", - "block.spectrum.parrot_red_head": "Cabeça de Papagaio Vermelho", + "block.spectrum.parrot_red_blue_head": "Cabeça de Papagaio Vermelho", "block.spectrum.phantom_head": "Cabeça de Phantom", "block.spectrum.pig_head": "Cabeça de Porco", "block.spectrum.polar_bear_head": "Cabeça de Urso Polar", diff --git a/src/main/resources/assets/spectrum/lang/ru_ru.json b/src/main/resources/assets/spectrum/lang/ru_ru.json index a54e2222bd..64d9db7f1a 100644 --- a/src/main/resources/assets/spectrum/lang/ru_ru.json +++ b/src/main/resources/assets/spectrum/lang/ru_ru.json @@ -1261,7 +1261,7 @@ "block.spectrum.forfeiture": "Потеря", "block.spectrum.four_leaf_clover": "Четырёхлистный клевер", "block.spectrum.fox_arctic_head": "Голова арктической лисы", - "block.spectrum.fox_head": "Голова лисы", + "block.spectrum.fox_red_head": "Голова лисы", "block.spectrum.fox_idol": "Спешащий идол", "block.spectrum.freezing_idol.tooltip": "§7Замораживает блоки вокруг себя", "block.spectrum.frog_cold_head": "Голова снежной лягушки", @@ -1587,11 +1587,11 @@ "block.spectrum.parametric_mining_device": "Параметрическое добывающее устройство", "block.spectrum.parametric_mining_device.tooltip": "Взрывается, когда брошено или прикреплено к поверхности", "block.spectrum.parrot_blue_head": "Голова синего попугая", - "block.spectrum.parrot_cyan_head": "Голова бирюзового попугая", + "block.spectrum.parrot_yellow_blue_head": "Голова бирюзового попугая", "block.spectrum.parrot_gray_head": "Голова серого попугая", "block.spectrum.parrot_green_head": "Голова зелёного попугая", "block.spectrum.parrot_idol": "Поглащающий идол", - "block.spectrum.parrot_red_head": "Голова красного попугая", + "block.spectrum.parrot_red_blue_head": "Голова красного попугая", "block.spectrum.particle_spawner": "Генератор частиц", "block.spectrum.particle_spawner.color_c": "C", "block.spectrum.particle_spawner.color_m": "M", @@ -6111,4 +6111,4 @@ "book.spectrum.guidebook.mysterious_locket.page4.text": "Внутри также была небольшая записка... кому она могла принадлежать?", "book.spectrum.guidebook.mysterious_locket.page5.text": "Теперь, когда я понимаю язык Дрейтонов, мне будет легко расшифровать надпись на обратной стороне:\\\n\\\n*Не будь глупышкой, Астерас – Луна не может светиться, она может только отражать свет Солнца.*", "book.spectrum.guidebook.mysterious_locket.page5.title": "Неопознанная записка" -} +} \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/lang/zh_cn.json b/src/main/resources/assets/spectrum/lang/zh_cn.json index f81ff5e930..167c652234 100644 --- a/src/main/resources/assets/spectrum/lang/zh_cn.json +++ b/src/main/resources/assets/spectrum/lang/zh_cn.json @@ -1855,7 +1855,7 @@ "block.spectrum.enderman_head": "末影人的头", "block.spectrum.endermite_head": "末影螨的头", "block.spectrum.evoker_head": "唤魔者的头", - "block.spectrum.fox_head": "狐狸的头", + "block.spectrum.fox_red_head": "狐狸的头", "block.spectrum.fox_arctic_head": "北极狐的头", "block.spectrum.ghast_head": "恶魂的头", "block.spectrum.guardian_head": "守卫者的头", @@ -1872,10 +1872,10 @@ "block.spectrum.ocelot_head": "豹猫的头", "block.spectrum.panda_head": "熊猫的头", "block.spectrum.parrot_blue_head": "蓝色鹦鹉的头", - "block.spectrum.parrot_cyan_head": "青色鹦鹉的头", + "block.spectrum.parrot_yellow_blue_head": "青色鹦鹉的头", "block.spectrum.parrot_gray_head": "灰色鹦鹉的头", "block.spectrum.parrot_green_head": "绿色鹦鹉的头", - "block.spectrum.parrot_red_head": "红色鹦鹉的头", + "block.spectrum.parrot_red_blue_head": "红色鹦鹉的头", "block.spectrum.phantom_head": "幻翼的头", "block.spectrum.pig_head": "猪的头", "block.spectrum.pillager_head": "掠夺者的头", diff --git a/src/main/resources/assets/spectrum/models/item/fox_red_head.json b/src/main/resources/assets/spectrum/models/item/fox_red_head.json new file mode 100644 index 0000000000..364b6e65fb --- /dev/null +++ b/src/main/resources/assets/spectrum/models/item/fox_red_head.json @@ -0,0 +1,3 @@ +{ + "parent": "minecraft:item/template_skull" +} \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/models/item/parrot_red_blue_head.json b/src/main/resources/assets/spectrum/models/item/parrot_red_blue_head.json new file mode 100644 index 0000000000..364b6e65fb --- /dev/null +++ b/src/main/resources/assets/spectrum/models/item/parrot_red_blue_head.json @@ -0,0 +1,3 @@ +{ + "parent": "minecraft:item/template_skull" +} \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/models/item/parrot_yellow_blue_head.json b/src/main/resources/assets/spectrum/models/item/parrot_yellow_blue_head.json new file mode 100644 index 0000000000..364b6e65fb --- /dev/null +++ b/src/main/resources/assets/spectrum/models/item/parrot_yellow_blue_head.json @@ -0,0 +1,3 @@ +{ + "parent": "minecraft:item/template_skull" +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/advancement/midgame/collect_all_mob_heads.json b/src/main/resources/data/spectrum/advancement/midgame/collect_all_mob_heads.json index 1b5a030a43..81ce50dc3a 100644 --- a/src/main/resources/data/spectrum/advancement/midgame/collect_all_mob_heads.json +++ b/src/main/resources/data/spectrum/advancement/midgame/collect_all_mob_heads.json @@ -274,12 +274,12 @@ ] } }, - "has_fox_head": { + "has_fox_red_head": { "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { - "items": "spectrum:fox_head" + "items": "spectrum:fox_red_head" } ] } @@ -464,12 +464,12 @@ ] } }, - "has_parrot_cyan_head": { + "has_parrot_yellow_blue_head": { "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { - "items": "spectrum:parrot_cyan_head" + "items": "spectrum:parrot_yellow_blue_head" } ] } @@ -494,12 +494,12 @@ ] } }, - "has_parrot_red_head": { + "has_parrot_red_blue_head": { "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { - "items": "spectrum:parrot_red_head" + "items": "spectrum:parrot_red_blue_head" } ] } diff --git a/src/main/resources/data/spectrum/loot_table/blocks/fox_head.json b/src/main/resources/data/spectrum/loot_table/blocks/fox_red_head.json similarity index 87% rename from src/main/resources/data/spectrum/loot_table/blocks/fox_head.json rename to src/main/resources/data/spectrum/loot_table/blocks/fox_red_head.json index 76435eb668..0bc0879bd5 100644 --- a/src/main/resources/data/spectrum/loot_table/blocks/fox_head.json +++ b/src/main/resources/data/spectrum/loot_table/blocks/fox_red_head.json @@ -7,7 +7,7 @@ "entries": [ { "type": "minecraft:item", - "name": "spectrum:fox_head" + "name": "spectrum:fox_red_head" } ], "conditions": [ diff --git a/src/main/resources/data/spectrum/loot_table/blocks/parrot_cyan_head.json b/src/main/resources/data/spectrum/loot_table/blocks/parrot_red_blue_head.json similarity index 85% rename from src/main/resources/data/spectrum/loot_table/blocks/parrot_cyan_head.json rename to src/main/resources/data/spectrum/loot_table/blocks/parrot_red_blue_head.json index 09ba0922b1..dda87a8c43 100644 --- a/src/main/resources/data/spectrum/loot_table/blocks/parrot_cyan_head.json +++ b/src/main/resources/data/spectrum/loot_table/blocks/parrot_red_blue_head.json @@ -7,7 +7,7 @@ "entries": [ { "type": "minecraft:item", - "name": "spectrum:parrot_cyan_head" + "name": "spectrum:parrot_red_blue_head" } ], "conditions": [ diff --git a/src/main/resources/data/spectrum/loot_table/blocks/parrot_red_head.json b/src/main/resources/data/spectrum/loot_table/blocks/parrot_yellow_blue_head.json similarity index 84% rename from src/main/resources/data/spectrum/loot_table/blocks/parrot_red_head.json rename to src/main/resources/data/spectrum/loot_table/blocks/parrot_yellow_blue_head.json index 7a5d59ef6c..ab36c8524a 100644 --- a/src/main/resources/data/spectrum/loot_table/blocks/parrot_red_head.json +++ b/src/main/resources/data/spectrum/loot_table/blocks/parrot_yellow_blue_head.json @@ -7,7 +7,7 @@ "entries": [ { "type": "minecraft:item", - "name": "spectrum:parrot_red_head" + "name": "spectrum:parrot_yellow_blue_head" } ], "conditions": [ diff --git a/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/creating_life/mob_heads.json b/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/creating_life/mob_heads.json index 1df5eef2c2..e9b751e074 100644 --- a/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/creating_life/mob_heads.json +++ b/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/creating_life/mob_heads.json @@ -90,7 +90,7 @@ "id": "spectrum:evoker_head" }, { - "id": "spectrum:fox_head" + "id": "spectrum:fox_red_head" }, { "id": "spectrum:fox_arctic_head" @@ -156,7 +156,7 @@ "id": "spectrum:parrot_blue_head" }, { - "id": "spectrum:parrot_cyan_head" + "id": "spectrum:parrot_yellow_blue_head" }, { "id": "spectrum:parrot_gray_head" @@ -165,7 +165,7 @@ "id": "spectrum:parrot_green_head" }, { - "id": "spectrum:parrot_red_head" + "id": "spectrum:parrot_red_blue_head" } ] }, diff --git a/src/main/resources/data/spectrum/recipe/spirit_instiller/head_fusion/variant_changing/fox_red.json b/src/main/resources/data/spectrum/recipe/spirit_instiller/head_fusion/variant_changing/fox_red.json index ad7a05773b..879c1ede71 100644 --- a/src/main/resources/data/spectrum/recipe/spirit_instiller/head_fusion/variant_changing/fox_red.json +++ b/src/main/resources/data/spectrum/recipe/spirit_instiller/head_fusion/variant_changing/fox_red.json @@ -13,7 +13,7 @@ "count": 4 }, "result": { - "id": "spectrum:fox_head" + "id": "spectrum:fox_red_head" }, "required_advancement": "spectrum:unlocks/head_fusion/incandescent_recipes" } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipe/spirit_instiller/head_fusion/variant_changing/parrot_cyan.json b/src/main/resources/data/spectrum/recipe/spirit_instiller/head_fusion/variant_changing/parrot_cyan.json index ef7fdafd4f..39de17a551 100644 --- a/src/main/resources/data/spectrum/recipe/spirit_instiller/head_fusion/variant_changing/parrot_cyan.json +++ b/src/main/resources/data/spectrum/recipe/spirit_instiller/head_fusion/variant_changing/parrot_cyan.json @@ -15,7 +15,7 @@ "count": 1 }, "result": { - "id": "spectrum:parrot_cyan_head" + "id": "spectrum:parrot_yellow_blue_head" }, "required_advancement": "spectrum:unlocks/head_fusion/basic_recipes" } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipe/spirit_instiller/head_fusion/variant_changing/parrot_red.json b/src/main/resources/data/spectrum/recipe/spirit_instiller/head_fusion/variant_changing/parrot_red.json index dfd0b353d1..206f9f5b1d 100644 --- a/src/main/resources/data/spectrum/recipe/spirit_instiller/head_fusion/variant_changing/parrot_red.json +++ b/src/main/resources/data/spectrum/recipe/spirit_instiller/head_fusion/variant_changing/parrot_red.json @@ -15,7 +15,7 @@ "count": 1 }, "result": { - "id": "spectrum:parrot_red_head" + "id": "spectrum:parrot_red_blue_head" }, "required_advancement": "spectrum:unlocks/head_fusion/basic_recipes" } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipe/spirit_instiller/memories/fox.json b/src/main/resources/data/spectrum/recipe/spirit_instiller/memories/fox_red.json similarity index 92% rename from src/main/resources/data/spectrum/recipe/spirit_instiller/memories/fox.json rename to src/main/resources/data/spectrum/recipe/spirit_instiller/memories/fox_red.json index c008adca9d..3b9b3cf464 100644 --- a/src/main/resources/data/spectrum/recipe/spirit_instiller/memories/fox.json +++ b/src/main/resources/data/spectrum/recipe/spirit_instiller/memories/fox_red.json @@ -3,7 +3,7 @@ "group": "memories", "time": 800, "experience": 4.0, - "ingredient1": "spectrum:fox_head", + "ingredient1": "spectrum:fox_red_head", "ingredient2": "#minecraft:fox_food", "center_ingredient": { "tag": "spectrum:memory_bonding_agents", diff --git a/src/main/resources/data/spectrum/recipe/spirit_instiller/memories/parrot_cyan.json b/src/main/resources/data/spectrum/recipe/spirit_instiller/memories/parrot_cyan.json index d0e9f096a5..8e7f1eb780 100644 --- a/src/main/resources/data/spectrum/recipe/spirit_instiller/memories/parrot_cyan.json +++ b/src/main/resources/data/spectrum/recipe/spirit_instiller/memories/parrot_cyan.json @@ -3,7 +3,7 @@ "group": "memories", "time": 800, "experience": 4.0, - "ingredient1": "spectrum:parrot_cyan_head", + "ingredient1": "spectrum:parrot_yellow_blue_head", "ingredient2": "minecraft:wheat_seeds", "center_ingredient": { "tag": "spectrum:memory_bonding_agents", diff --git a/src/main/resources/data/spectrum/recipe/spirit_instiller/memories/parrot_red.json b/src/main/resources/data/spectrum/recipe/spirit_instiller/memories/parrot_red.json index 3d08b946a2..bde3680f77 100644 --- a/src/main/resources/data/spectrum/recipe/spirit_instiller/memories/parrot_red.json +++ b/src/main/resources/data/spectrum/recipe/spirit_instiller/memories/parrot_red.json @@ -3,7 +3,7 @@ "group": "memories", "time": 800, "experience": 4.0, - "ingredient1": "spectrum:parrot_red_head", + "ingredient1": "spectrum:parrot_red_blue_head", "ingredient2": "minecraft:wheat_seeds", "center_ingredient": { "tag": "spectrum:memory_bonding_agents", diff --git a/src/main/resources/data/spectrum/tags/block/mob_heads.json b/src/main/resources/data/spectrum/tags/block/mob_heads.json index 9b56575423..eb94754f0d 100644 --- a/src/main/resources/data/spectrum/tags/block/mob_heads.json +++ b/src/main/resources/data/spectrum/tags/block/mob_heads.json @@ -81,10 +81,10 @@ "spectrum:ocelot_head", "spectrum:panda_head", "spectrum:parrot_blue_head", + "spectrum:parrot_yellow_blue_head", "spectrum:parrot_gray_head", "spectrum:parrot_green_head", "spectrum:parrot_red_blue_head", - "spectrum:parrot_yellow_blue_head", "spectrum:phantom_head", "spectrum:pig_head", "spectrum:polar_bear_head", @@ -182,10 +182,10 @@ "spectrum:ocelot_wall_head", "spectrum:panda_wall_head", "spectrum:parrot_blue_wall_head", + "spectrum:parrot_yellow_blue_wall_head", "spectrum:parrot_gray_wall_head", "spectrum:parrot_green_wall_head", "spectrum:parrot_red_blue_wall_head", - "spectrum:parrot_yellow_blue_wall_head", "spectrum:phantom_wall_head", "spectrum:pig_wall_head", "spectrum:polar_bear_wall_head", diff --git a/src/main/resources/data/spectrum/tags/item/mob_heads.json b/src/main/resources/data/spectrum/tags/item/mob_heads.json index 76f5408ec9..d684601708 100644 --- a/src/main/resources/data/spectrum/tags/item/mob_heads.json +++ b/src/main/resources/data/spectrum/tags/item/mob_heads.json @@ -41,7 +41,7 @@ "spectrum:enderman_head", "spectrum:endermite_head", "spectrum:evoker_head", - "spectrum:fox_head", + "spectrum:fox_red_head", "spectrum:fox_arctic_head", "spectrum:ghast_head", "spectrum:glow_squid_head", @@ -63,7 +63,7 @@ "spectrum:parrot_cyan_head", "spectrum:parrot_gray_head", "spectrum:parrot_green_head", - "spectrum:parrot_red_head", + "spectrum:parrot_red_blue_head", "spectrum:phantom_head", "spectrum:pig_head", "spectrum:polar_bear_head", diff --git a/src/main/resources/data/spectrum/tags/item/mob_heads/fox_heads.json b/src/main/resources/data/spectrum/tags/item/mob_heads/fox_heads.json index 315d021334..acf8daee14 100644 --- a/src/main/resources/data/spectrum/tags/item/mob_heads/fox_heads.json +++ b/src/main/resources/data/spectrum/tags/item/mob_heads/fox_heads.json @@ -1,6 +1,6 @@ { "values": [ - "spectrum:fox_head", + "spectrum:fox_red_head", "spectrum:fox_arctic_head" ] } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/tags/item/mob_heads/parrot_heads.json b/src/main/resources/data/spectrum/tags/item/mob_heads/parrot_heads.json index 6798ab0500..7500878df9 100644 --- a/src/main/resources/data/spectrum/tags/item/mob_heads/parrot_heads.json +++ b/src/main/resources/data/spectrum/tags/item/mob_heads/parrot_heads.json @@ -1,9 +1,9 @@ { "values": [ "spectrum:parrot_blue_head", - "spectrum:parrot_cyan_head", + "spectrum:parrot_yellow_blue_head", "spectrum:parrot_gray_head", "spectrum:parrot_green_head", - "spectrum:parrot_red_head" + "spectrum:parrot_red_blue_head" ] } \ No newline at end of file From c093a2373704a80d7e2c84c3be3fd535c34d7a50 Mon Sep 17 00:00:00 2001 From: Saphire Lattice Date: Sat, 4 Jul 2026 21:05:37 +0600 Subject: [PATCH 5/6] Fix fox ID From neoforge - 1f36162ad13bd852e4aa52dbc7abb69cc259a56c --- .../books/guidebook/entries/creating_life/memories.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/creating_life/memories.json b/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/creating_life/memories.json index 9e8a626ee1..c835ba70c2 100644 --- a/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/creating_life/memories.json +++ b/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/creating_life/memories.json @@ -4,7 +4,7 @@ "id": "spectrum:memory", "components": { "entity_data": { - "id": "minecraft:fox" + "id": "minecraft:fox_red" }, "spectrum:memory": { "ticks_to_manifest": 20 From 2272d599a90b53eaafdc4ee4f6a6c1df34a55486 Mon Sep 17 00:00:00 2001 From: DaFuqs Date: Tue, 24 Feb 2026 21:52:49 +0100 Subject: [PATCH 6/6] cotton cloud boots requires liquid crystal unlocked --- .../advancement/unlocks/trinkets/cotton_cloud_boots.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/resources/data/spectrum/advancement/unlocks/trinkets/cotton_cloud_boots.json b/src/main/resources/data/spectrum/advancement/unlocks/trinkets/cotton_cloud_boots.json index 7ae65d159a..0d1b900323 100644 --- a/src/main/resources/data/spectrum/advancement/unlocks/trinkets/cotton_cloud_boots.json +++ b/src/main/resources/data/spectrum/advancement/unlocks/trinkets/cotton_cloud_boots.json @@ -1,5 +1,11 @@ { "criteria": { + "unlocked_liquid_crystal": { + "trigger": "revelationary:advancement_gotten", + "conditions": { + "advancement_identifier": "spectrum:unlocks/blocks/liquid_crystal" + } + }, "collected_stardust": { "trigger": "revelationary:advancement_gotten", "conditions": {