diff --git a/src/main/java/dev/isxander/controlify/bindings/ControlifyBindings.java b/src/main/java/dev/isxander/controlify/bindings/ControlifyBindings.java index 0c568a79..7b594ad5 100644 --- a/src/main/java/dev/isxander/controlify/bindings/ControlifyBindings.java +++ b/src/main/java/dev/isxander/controlify/bindings/ControlifyBindings.java @@ -409,7 +409,7 @@ public static void registerModdedBindings() { .name(Component.translatable(keyMapping.getName())) .description(Component.translatable("controlify.custom_binding.vanilla_description").withStyle(ChatFormatting.GRAY)) .category(/*? if >=1.21.9 {*/ keyMapping.getCategory().label() /*?} else {*/ /*Component.translatable(keyMapping.getCategory()) *//*?}*/) - .radialCandidate(RadialIcons.FABRIC_ICON) + .radialCandidate(RadialIcons.getModLoaderIcon()) .allowedContexts(BindContext.IN_GAME) .keyEmulation(keyMapping)); diff --git a/src/main/java/dev/isxander/controlify/bindings/RadialIcons.java b/src/main/java/dev/isxander/controlify/bindings/RadialIcons.java index c7af6f90..a7c8c956 100644 --- a/src/main/java/dev/isxander/controlify/bindings/RadialIcons.java +++ b/src/main/java/dev/isxander/controlify/bindings/RadialIcons.java @@ -15,6 +15,7 @@ import net.minecraft.world.effect.MobEffect; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; +import org.jetbrains.annotations.NotNull; import java.util.ArrayDeque; import java.util.Map; @@ -24,7 +25,13 @@ public final class RadialIcons { private static final Minecraft minecraft = Minecraft.getInstance(); public static final ResourceLocation EMPTY = CUtil.rl("empty"); - public static final ResourceLocation FABRIC_ICON = ResourceLocation.fromNamespaceAndPath("fabric-resource-loader-v0", "icon.png"); + private static final ResourceLocation _FABRIC_ICON = ResourceLocation.fromNamespaceAndPath("fabric-resource-loader-v0", "icon.png"); + /** + * @deprecated This icon is not available on NeoForge. + * Use {@link RadialIcons#getModLoaderIcon()} instead. + */ + @Deprecated(forRemoval = true) + public static final ResourceLocation FABRIC_ICON = _FABRIC_ICON; private static Map icons = null; private static Queue deferredRegistrations = new ArrayDeque<>(); @@ -101,13 +108,14 @@ private static void addPotionEffects(Map map) { private static Map registerIcons() { Map map = new Object2ObjectOpenHashMap<>(); + final ResourceLocation modLoaderIcon = getModLoaderIcon(); map.put(EMPTY, (graphics, x, y, tickDelta) -> {}); - map.put(FABRIC_ICON, (graphics, x, y, tickDelta) -> { + map.put(modLoaderIcon, (graphics, x, y, tickDelta) -> { var pose = CGuiPose.ofPush(graphics); pose.translate(x, y); pose.scale(0.5f, 0.5f); - Blit.tex(graphics, FABRIC_ICON, 0, 0, 0, 0, 32, 32, 32, 32); + Blit.tex(graphics, modLoaderIcon, 0, 0, 0, 0, 32, 32, 32, 32); pose.pop(); }); addItems(map); @@ -115,4 +123,12 @@ private static Map registerIcons() { return map; } + + public static @NotNull ResourceLocation getModLoaderIcon() { + //? if fabric { + return _FABRIC_ICON; + //?} else { + /*return getItem(net.minecraft.world.item.Items.BOOK); + *///?} + } }