Default pigment rework (#912)

Author: object-Object

Common/src/generated/resources/assets/hexcasting/models/item/ancient_colorizer.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "hexcasting:item/colorizer/ancient"
+  }
+}

Common/src/generated/resources/assets/hexcasting/models/item/default_colorizer.json

@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "hexcasting:item/colorizer/uuid"
+    "layer0": "hexcasting:item/colorizer/default"
   }
 }

Common/src/main/java/at/petrak/hexcasting/api/pigment/FrozenPigment.java

@@ -23,6 +23,9 @@ public record FrozenPigment(ItemStack item, UUID owner) {
     public static final Supplier<FrozenPigment> DEFAULT =
         () -> new FrozenPigment(new ItemStack(HexItems.DEFAULT_PIGMENT), Util.NIL_UUID);
 
+    public static final Supplier<FrozenPigment> ANCIENT =
+        () -> new FrozenPigment(new ItemStack(HexItems.ANCIENT_PIGMENT), Util.NIL_UUID);
+
     public CompoundTag serializeToNBT() {
         var out = new CompoundTag();
         out.put(TAG_STACK, this.item.save(new CompoundTag()));

Common/src/main/java/at/petrak/hexcasting/common/items/pigment/ItemAmethystPigment.java

@@ -0,0 +1,30 @@
+package at.petrak.hexcasting.common.items.pigment;
+
+import at.petrak.hexcasting.api.addldata.ADPigment;
+import at.petrak.hexcasting.api.item.PigmentItem;
+import at.petrak.hexcasting.api.pigment.ColorProvider;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.phys.Vec3;
+
+import java.util.UUID;
+
+public class ItemAmethystPigment extends Item implements PigmentItem {
+    public ItemAmethystPigment(Properties pProperties) {
+        super(pProperties);
+    }
+
+    @Override
+    public ColorProvider provideColor(ItemStack stack, UUID owner) {
+        return colorProvider;
+    }
+
+    protected MyColorProvider colorProvider = new MyColorProvider();
+
+    protected class MyColorProvider extends ColorProvider {
+        @Override
+        protected int getRawColor(float time, Vec3 position) {
+            return 0xff_ab65eb;
+        }
+    }
+}

Common/src/main/java/at/petrak/hexcasting/common/lib/HexItems.java

@@ -9,10 +9,7 @@
 import at.petrak.hexcasting.common.items.ItemLoreFragment;
 import at.petrak.hexcasting.common.items.ItemStaff;
 import at.petrak.hexcasting.common.items.magic.*;
-import at.petrak.hexcasting.common.items.pigment.ItemAmethystAndCopperPigment;
-import at.petrak.hexcasting.common.items.pigment.ItemDyePigment;
-import at.petrak.hexcasting.common.items.pigment.ItemPridePigment;
-import at.petrak.hexcasting.common.items.pigment.ItemUUIDPigment;
+import at.petrak.hexcasting.common.items.pigment.*;
 import at.petrak.hexcasting.common.items.storage.*;
 import at.petrak.hexcasting.xplat.IXplatAbstractions;
 import com.google.common.base.Suppliers;
@@ -136,6 +133,8 @@ public static void registerItemCreativeTab(CreativeModeTab.Output r, CreativeMod
 
     public static final Item UUID_PIGMENT = make("uuid_colorizer", new ItemUUIDPigment(unstackable()));
     public static final Item DEFAULT_PIGMENT = make("default_colorizer",
+        new ItemAmethystPigment(unstackable()));
+    public static final Item ANCIENT_PIGMENT = make("ancient_colorizer",
         new ItemAmethystAndCopperPigment(unstackable()));
 
     // BUFF SANDVICH

Common/src/main/java/at/petrak/hexcasting/common/loot/AddHexToAncientCypherFunc.java

@@ -8,11 +8,15 @@
 import at.petrak.hexcasting.api.utils.HexUtils;
 import at.petrak.hexcasting.api.item.VariantItem;
 import at.petrak.hexcasting.api.misc.MediaConstants;
+import at.petrak.hexcasting.api.pigment.FrozenPigment;
 import at.petrak.hexcasting.common.items.magic.ItemAncientCypher;
+import at.petrak.hexcasting.common.items.magic.ItemPackagedHex;
+import at.petrak.hexcasting.common.lib.HexItems;
 import at.petrak.hexcasting.common.lib.HexLootFunctions;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonSerializationContext;
+import net.minecraft.Util;
 import net.minecraft.util.RandomSource;
 import net.minecraft.nbt.ListTag;
 import net.minecraft.nbt.CompoundTag;
@@ -49,11 +53,14 @@ public static ItemStack doStatic(ItemStack stack, RandomSource rand) {
         }
 
         var tag = new CompoundTag();
+
         tag.putString(ItemAncientCypher.TAG_HEX_NAME, hex.getFirst());
+        tag.put(ItemAncientCypher.TAG_PATTERNS, patsTag);
+        tag.put(ItemPackagedHex.TAG_PIGMENT, FrozenPigment.ANCIENT.get().serializeToNBT());
         tag.putLong(ItemAncientCypher.TAG_MEDIA, 32*MediaConstants.SHARD_UNIT);
         tag.putLong(ItemAncientCypher.TAG_MAX_MEDIA, 32*MediaConstants.SHARD_UNIT);
         tag.putInt(VariantItem.TAG_VARIANT, rand.nextInt(8));
-        tag.put(ItemAncientCypher.TAG_PATTERNS, patsTag);
+        
         stack.getOrCreateTag().merge(tag);
 
         return stack;

Common/src/main/java/at/petrak/hexcasting/datagen/recipe/HexplatRecipes.java

@@ -207,7 +207,9 @@ public void buildRecipes(Consumer<FinishedRecipe> recipes) {
 
         ring(RecipeCategory.MISC, HexItems.UUID_PIGMENT, 1, HexItems.AMETHYST_DUST, Items.AMETHYST_SHARD)
             .unlockedBy("has_item", hasItem(HexItems.AMETHYST_DUST)).save(recipes);
-        ring(RecipeCategory.MISC, HexItems.DEFAULT_PIGMENT, 1, HexItems.AMETHYST_DUST, Items.COPPER_INGOT)
+        ringCornerless(RecipeCategory.MISC, HexItems.DEFAULT_PIGMENT, 1, HexItems.AMETHYST_DUST, Items.AMETHYST_SHARD)
+            .unlockedBy("has_item", hasItem(HexItems.AMETHYST_DUST)).save(recipes);
+        ringCornerless(RecipeCategory.MISC, HexItems.ANCIENT_PIGMENT, 1, HexItems.AMETHYST_DUST, Items.COPPER_INGOT)
             .unlockedBy("has_item", hasItem(HexItems.AMETHYST_DUST)).save(recipes);
 
         ShapedRecipeBuilder.shaped(RecipeCategory.DECORATIONS, HexItems.SCROLL_SMOL)

Common/src/main/resources/assets/hexcasting/lang/en_us.flatten.json5

@@ -103,6 +103,7 @@
 
     uuid_colorizer: "Soulglimmer Pigment",
     default_colorizer: "Vacant Pigment",
+    ancient_colorizer: "Ancient Pigment",
 
     creative_unlocker: {
       "": "The Media Cube",
@@ -1565,7 +1566,8 @@
 
       ancient_cyphers: {
         "1": "While adventuring, I've come across what appear to be $(l:items/hexcasting)$(item)Cyphers/$ created by the Hexcasters of the ancient past. These $(item)Ancient Cyphers/$ work just like the ones I can craft: they can't be recharged, and will break when their reserve of _Media runs out. However, unlike my own $(l:items/hexcasting)$(item)Cyphers/$, their decayed structure allows me to glimpse the _Hex stored within.",
-        "2": "These may be useful for learning new techniques - who better to teach me than ancient masters of the art?$(br2)Alternatively, I could erase the contents of one and store my own _Hex inside, creating a casting item that clearly displays its own function."
+        "2": "These may be useful for learning new techniques - who better to teach me than ancient masters of the art?$(br2)Alternatively, I could erase the contents of one and store my own _Hex inside, creating a casting item that clearly displays its own function.",
+        "3": "The $(l:items/pigments)$(item)Pigment/$ baked into these relics is a unique blend of purple and orange, matching their copper-and-amethyst appearance. I can replicate it using the above recipe.",
       },
 
       phials: {
@@ -1588,7 +1590,7 @@
         "colored.crafting.header": "Chromatic Pigments",
         "colored.crafting.desc": "Pigments in all the colors of the rainbow.",
 
-        special: "And finally, a pair of special pigments. $(item)Soulglimmer Pigment/$ shines with colors wholly unique to me, and $(item)Vacant Pigment/$ restores my original purplish-orange spread.$(br2)$(italic)And all the colors I am inside have not been invented yet./$",
+        special: "And finally, a pair of special pigments. $(item)Soulglimmer Pigment/$ shines with colors wholly unique to me, and $(item)Vacant Pigment/$ restores my original amethyst hue.$(br2)$(italic)And all the colors I am inside have not been invented yet./$",
       },
 
       edified: {

Common/src/main/resources/assets/hexcasting/patchouli_books/thehexbook/en_us/entries/items/ancient_cyphers.json

@@ -13,6 +13,11 @@
             "type": "patchouli:spotlight",
             "text": "hexcasting.page.ancient_cyphers.2",
             "item": "hexcasting:ancient_cypher{variant:0},hexcasting:ancient_cypher{variant:1},hexcasting:ancient_cypher{variant:2},hexcasting:ancient_cypher{variant:3},hexcasting:ancient_cypher{variant:4},hexcasting:ancient_cypher{variant:5},hexcasting:ancient_cypher{variant:6},hexcasting:ancient_cypher{variant:7}"
+        },
+        {
+            "type": "patchouli:crafting",
+            "recipe": "hexcasting:ancient_colorizer",
+            "text": "hexcasting.page.ancient_cyphers.3"
         }
     ]
   }