Forge catchup

src/main/generated/assets/spectrum/blockstates/fox_head_BACKUP_795786.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "spectrum:block/mob_head"
+    }
+  }
+}

src/main/generated/assets/spectrum/blockstates/fox_head_LOCAL_795786.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "spectrum:block/mob_head"
+    }
+  }
+}

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);
 	}
 

src/main/java/de/dafuqs/spectrum/blocks/mob_head/client/SpectrumSkullBlockEntityRenderer.java

@@ -63,7 +63,7 @@ public static Map<SkullBlock.Type, List<Tuple<SpectrumSkullModel, ResourceLocati
 		));
 		builder.put(SpectrumSkullType.ENDERMITE, List.of(new Tuple<>(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<SkullBlock.Type, List<Tuple<SpectrumSkullModel, ResourceLocati
 		builder.put(SpectrumSkullType.MULE, List.of(new Tuple<>(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"))));

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<GlassArrowVariant> 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<? extends GlassArrowEntity> entityType, Level world) {
 		super(entityType, world);

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<Component> 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));
 		}

src/main/java/de/dafuqs/spectrum/recipe/titration_barrel/TitrationBarrelRecipe.java

@@ -163,6 +163,7 @@ public static ItemStack getFermentedStack(Optional<FermentationData> 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<FermentationData> fermentatio
 			}
 		}
 
-		inputStack.set(SpectrumDataComponentTypes.BEVERAGE, new BeverageComponent((long) ageIngameDays, (int) alcPercent, thickness));
 		return inputStack;
 	}
 
@@ -285,4 +285,4 @@ public StreamCodec<RegistryFriendlyByteBuf, TitrationBarrelRecipe> streamCodec()
 
 	}
 
-}
+}

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));
 	}
 
-}
+}

src/main/resources/assets/spectrum/blockstates/fox_red_head.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "spectrum:block/mob_head"
+    }
+  }
+}

src/main/resources/assets/spectrum/blockstates/fox_red_wall_head.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "spectrum:block/mob_head"
+    }
+  }
+}

src/main/resources/assets/spectrum/blockstates/parrot_red_blue_head.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "spectrum:block/mob_head"
+    }
+  }
+}

src/main/resources/assets/spectrum/blockstates/parrot_red_blue_wall_head.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "spectrum:block/mob_head"
+    }
+  }
+}

src/main/resources/assets/spectrum/blockstates/parrot_yellow_blue_head.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "spectrum:block/mob_head"
+    }
+  }
+}

src/main/resources/assets/spectrum/blockstates/parrot_yellow_blue_wall_head.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "spectrum:block/mob_head"
+    }
+  }
+}

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",

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",
@@ -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",

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",