diff --git a/src/client/java/gay/pridecraft/joy/JoyClient.java b/src/client/java/gay/pridecraft/joy/JoyClient.java index 5af59c0..9573e9f 100644 --- a/src/client/java/gay/pridecraft/joy/JoyClient.java +++ b/src/client/java/gay/pridecraft/joy/JoyClient.java @@ -43,9 +43,8 @@ public class JoyClient implements ClientModInitializer { ParticleFactoryRegistry.getInstance().register(JoyParticles.TOTEM_OF_PRIDE_PARTICLE, TotemOfPrideParticle.Factory::new); - final ModContainer self = FabricLoader.getInstance().getModContainer(Joy.MOD_ID).orElseThrow(); - - ResourceManagerHelper.registerBuiltinResourcePack(JoyUtil.id("menu"), self, Text.of("Joy's Main Menu & HUD"), ResourcePackActivationType.DEFAULT_ENABLED); + JoyUtil.registerEnabledPack("menu", Text.of("Joy's Main Menu & HUD")); + JoyUtil.registerEnabledPack("glint", Text.of("Joy's Enchantment Glint")); } private static void registerBedBlockRenderLayers() { diff --git a/src/main/java/gay/pridecraft/joy/JoyUtil.java b/src/main/java/gay/pridecraft/joy/JoyUtil.java index a7ff455..580382c 100644 --- a/src/main/java/gay/pridecraft/joy/JoyUtil.java +++ b/src/main/java/gay/pridecraft/joy/JoyUtil.java @@ -1,5 +1,10 @@ package gay.pridecraft.joy; +import net.fabricmc.fabric.api.resource.ResourceManagerHelper; +import net.fabricmc.fabric.api.resource.ResourcePackActivationType; +import net.fabricmc.loader.api.FabricLoader; +import net.fabricmc.loader.api.ModContainer; +import net.minecraft.text.Text; import net.minecraft.util.Identifier; /** @@ -7,7 +12,22 @@ import net.minecraft.util.Identifier; * @since 1.0.0 **/ public final class JoyUtil { + public static final ModContainer joyContainer = + FabricLoader.getInstance().getModContainer(Joy.MOD_ID).orElseThrow(); + public static Identifier id(String name) { return Identifier.of(Joy.MOD_ID, name); } + + public static void registerEnabledPack(String name, Text text) { + registerPack(name, text, ResourcePackActivationType.DEFAULT_ENABLED); + } + + public static void registerPack(String name, Text text) { + registerPack(name, text, ResourcePackActivationType.NORMAL); + } + + public static void registerPack(String name, Text text, ResourcePackActivationType type) { + ResourceManagerHelper.registerBuiltinResourcePack(JoyUtil.id(name), joyContainer, text, type); + } } diff --git a/src/main/resources/resourcepacks/glint/assets/minecraft/textures/misc/enchanted_glint_entity.png b/src/main/resources/resourcepacks/glint/assets/minecraft/textures/misc/enchanted_glint_entity.png new file mode 100644 index 0000000..6d82e18 Binary files /dev/null and b/src/main/resources/resourcepacks/glint/assets/minecraft/textures/misc/enchanted_glint_entity.png differ diff --git a/src/main/resources/resourcepacks/glint/assets/minecraft/textures/misc/enchanted_glint_item.png b/src/main/resources/resourcepacks/glint/assets/minecraft/textures/misc/enchanted_glint_item.png new file mode 100644 index 0000000..6d82e18 Binary files /dev/null and b/src/main/resources/resourcepacks/glint/assets/minecraft/textures/misc/enchanted_glint_item.png differ diff --git a/src/main/resources/resourcepacks/glint/pack.mcmeta b/src/main/resources/resourcepacks/glint/pack.mcmeta new file mode 100644 index 0000000..cbdbed8 --- /dev/null +++ b/src/main/resources/resourcepacks/glint/pack.mcmeta @@ -0,0 +1,6 @@ +{ + "pack": { + "pack_format": 34, + "description": "From §cPr§6id§eep§2ac§9k 7§5.0§r" + } +} diff --git a/src/main/resources/resourcepacks/glint/pack.png b/src/main/resources/resourcepacks/glint/pack.png new file mode 100644 index 0000000..62beac9 Binary files /dev/null and b/src/main/resources/resourcepacks/glint/pack.png differ