Skip to content

Commit eff0bea

Browse files
committed
Fixed any number of disabled tips sometimes causing no tip to be displayed. #61
1 parent ec5053b commit eff0bea

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

Common/src/main/java/net/darkhax/tipsmod/api/TipsAPI.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,14 @@
1818
import net.minecraft.network.chat.Component;
1919
import net.minecraft.resources.ResourceLocation;
2020

21-
import java.util.ArrayList;
2221
import java.util.HashMap;
2322
import java.util.List;
2423
import java.util.Map;
2524
import java.util.Optional;
26-
import java.util.stream.Collectors;
2725

2826
public class TipsAPI {
2927

3028
public static final ResourceLocation DEFAULT_SERIALIZER = new ResourceLocation("tips", "simple_tip");
31-
public static int DEFAULT_CYCLE_TIME = 5000;
3229
public static final Component DEFAULT_TITLE = Component.translatable("tipsmod.title.default").withStyle(ChatFormatting.BOLD, ChatFormatting.UNDERLINE, ChatFormatting.YELLOW);
3330
public static final ITip EMPTY = new SimpleTip(new ResourceLocation(Constants.MOD_ID, "empty"), DEFAULT_TITLE, Component.literal("No tips loaded. Please review your config options!"), Optional.of(999999));
3431
private static Map<ResourceLocation, ITipSerializer<?>> SERIALIZERS = new HashMap<>();
@@ -49,7 +46,12 @@ public static ITip getRandomTip() {
4946

5047
if (!displayableTips.isEmpty()) {
5148

52-
return displayableTips.get(Constants.RANDOM.nextInt(displayableTips.size()));
49+
final List<ITip> filteredTips = getLoadedTips().stream().filter(TipsAPI::canDisplayTip).toList();
50+
51+
if (!filteredTips.isEmpty()) {
52+
53+
return filteredTips.get(Constants.RANDOM.nextInt(filteredTips.size()));
54+
}
5355
}
5456

5557
return EMPTY;

0 commit comments

Comments
 (0)