Add hint for the lamps, and tweak a recipe

VazkiiMods · Aug 14, 2023 · 60dce00 · 60dce00
1 parent a1a910b
commit 60dce00
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/src/main/java/vazkii/quark/content/building/module/RainbowLampsModule.java b/src/main/java/vazkii/quark/content/building/module/RainbowLampsModule.java
@@ -1,12 +1,18 @@
 package vazkii.quark.content.building.module;
 
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.tags.BlockTags;
+import net.minecraft.tags.TagKey;
+import net.minecraft.world.level.block.Block;
+import vazkii.quark.base.Quark;
 import vazkii.quark.base.module.LoadModule;
 import vazkii.quark.base.module.ModuleCategory;
-import vazkii.quark.base.module.ModuleLoader;
 import vazkii.quark.base.module.QuarkModule;
 import vazkii.quark.base.module.config.Config;
+import vazkii.quark.base.module.hint.Hint;
 import vazkii.quark.base.util.CorundumColor;
 import vazkii.quark.content.building.block.RainbowLampBlock;
+import vazkii.quark.content.world.module.CorundumModule;
 
 @LoadModule(category = ModuleCategory.BUILDING)
 public class RainbowLampsModule extends QuarkModule {
@@ -17,8 +23,17 @@ public class RainbowLampsModule extends QuarkModule {
 	@Config(description = "Whether Rainbow Lamps should be made from and themed on Corundum if that module is enabled.", flag = "rainbow_lamp_corundum")
 	public static boolean useCorundum = true;
 
+	@Hint("crystal_lamp")
+	public static TagKey<Block> lampTag;
+
 	public static boolean isCorundum() {
-		return ModuleLoader.INSTANCE.isModuleEnabled(RainbowLampsModule.class) && useCorundum;
+		return CorundumModule.staticEnabled && useCorundum;
+	}
+
+	@Override
+	public void setup() {
+		super.setup();
+		lampTag = BlockTags.create(new ResourceLocation(Quark.MOD_ID, "crystal_lamp"));
 	}
 
 	@Override

diff --git a/src/main/resources/data/quark/recipes/building/crafting/lamps/blue_crystal_lamp.json b/src/main/resources/data/quark/recipes/building/crafting/lamps/blue_crystal_lamp.json
@@ -2,7 +2,7 @@
   "type": "minecraft:crafting_shaped",
   "key": {
     "D": {
-      "item": "minecraft:cyan_dye"
+      "item": "minecraft:light_blue_dye"
     },
     "R": {
       "item": "minecraft:redstone"