default staff color stuff

Author: SamsTheNerd

common/src/main/java/com/samsthenerd/hexgloop/HexGloopClient.java

@@ -26,6 +26,7 @@
 import com.samsthenerd.hexgloop.items.ItemLibraryCard;
 import com.samsthenerd.hexgloop.items.ItemSlateLoader;
 import com.samsthenerd.hexgloop.keybinds.HexGloopKeybinds;
+import com.samsthenerd.hexgloop.misc.StaffColorLoader;
 import com.samsthenerd.hexgloop.misc.clientgreatbook.GreatBook;
 import com.samsthenerd.hexgloop.network.HexGloopNetwork;
 import com.samsthenerd.hexgloop.network.ServerSideCheckClient;
@@ -94,6 +95,7 @@ public static void onInitializeClient() {
         registerModelPredicates();
         registerColorProviders();
         registerScryingDisplayers();
+        StaffColorLoader.init();
         HexGloopKeybinds.registerKeybinds();
 
         ServerSideCheckClient.registerDisconnectUpdate();

common/src/main/java/com/samsthenerd/hexgloop/misc/StaffColorLoader.java

@@ -0,0 +1,62 @@
+package com.samsthenerd.hexgloop.misc;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonPrimitive;
+import com.samsthenerd.hexgloop.HexGloop;
+
+import dev.architectury.registry.ReloadListenerRegistry;
+import net.minecraft.resource.JsonDataLoader;
+import net.minecraft.resource.ResourceManager;
+import net.minecraft.resource.ResourceType;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.profiler.Profiler;
+
+public class StaffColorLoader extends JsonDataLoader{
+    private static final Gson GSON = new GsonBuilder().setPrettyPrinting().disableHtmlEscaping().create();
+
+    public static final Map<Identifier, Integer> STAFF_COLORS = new HashMap<>();
+
+    public StaffColorLoader() {
+        super(GSON, "staffcolors");
+    }
+
+    protected void apply(Map<Identifier, JsonElement> map, ResourceManager resourceManager, Profiler profiler) {
+        STAFF_COLORS.clear(); // maybe ?
+        for(Map.Entry<Identifier, JsonElement> entry : map.entrySet()){
+            Identifier id = entry.getKey();
+            JsonObject obj = entry.getValue().getAsJsonObject();
+            for(Map.Entry<String, JsonElement> staff_entry : obj.entrySet()){
+                JsonPrimitive colorVal = staff_entry.getValue().getAsJsonPrimitive();
+                int color = 0;
+                if(colorVal.isNumber()){
+                    color = colorVal.getAsInt();
+                } else if(colorVal.isString()) {
+                    String colorStr = colorVal.getAsString();
+                    colorStr = colorStr.replace("#", "");
+                    try {
+                        color = Integer.parseInt(colorStr, 16);
+                    } catch (NumberFormatException e) {
+                        HexGloop.LOGGER.error("Invalid color value for staff color: " + staff_entry.getKey() + " in " + id.toString());
+                        continue;
+                    }
+                } else {
+                    HexGloop.LOGGER.error("Invalid color value for staff color: " + staff_entry.getKey() + " in " + id.toString());
+                    continue;
+                }
+                
+                STAFF_COLORS.put(new Identifier(staff_entry.getKey()), color);
+            }
+        }
+    }
+
+    // register the event(s)
+    public static void init(){
+        ReloadListenerRegistry.register(ResourceType.CLIENT_RESOURCES, new StaffColorLoader());
+    }
+}

common/src/main/java/com/samsthenerd/hexgloop/mixins/dyeablestaffs/MixinInjectDyeableStaff.java

@@ -2,11 +2,15 @@
 
 import org.spongepowered.asm.mixin.Mixin;
 
+import com.samsthenerd.hexgloop.misc.StaffColorLoader;
+
 import at.petrak.hexcasting.common.items.ItemStaff;
 import net.minecraft.item.DyeableItem;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.nbt.NbtElement;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.registry.Registry;
 
 @Mixin(ItemStaff.class)
 public class MixinInjectDyeableStaff implements DyeableItem{
@@ -16,6 +20,11 @@ public int getColor(ItemStack stack) {
         if (nbtCompound != null && nbtCompound.contains(COLOR_KEY, NbtElement.NUMBER_TYPE)) {
             return nbtCompound.getInt(COLOR_KEY);
         }
+        Identifier stackId = Registry.ITEM.getId(stack.getItem());
+        Integer color = StaffColorLoader.STAFF_COLORS.get(stackId);
+        if(color != null){
+            return color;
+        }
         return 0xff7e4f;
     }
 }

devdocs/datapacks.md

@@ -0,0 +1 @@
+# Datapacks

devdocs/staves.md

@@ -52,4 +52,17 @@ Since addons/resource packs may want to support the dyeable staves when gloop is
         "layer1": "mymod:item/mystaff_dyepart_casting" // part of the texture to be dyed
     }
 }
+```
+
+## Default staff color
+
+In v0.2.1 and up you can define the default color for the dyeable bit of an undyed staff using resource packs. By default this is a leather-y color to match the original textures. 
+
+### .../mymod/staffcolors/whatever.json :
+
+```json
+{
+    "mymod:mystaff": "#69eb96", // hex code
+    "mymod:myotherstaff": 2523373 // raw integer value
+}
 ```