Skip to content

Commit 193616c

Browse files
committed
Get rid of warning on forge
1 parent 4d081cc commit 193616c

File tree

4 files changed

+34
-20
lines changed

4 files changed

+34
-20
lines changed

common/src/main/java/io/github/discusser/toomanyentities/TooManyEntities.java

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,19 @@
44
import dev.architectury.event.events.client.ClientTickEvent;
55
import dev.architectury.injectables.annotations.ExpectPlatform;
66
import dev.architectury.registry.client.keymappings.KeyMappingRegistry;
7+
import io.github.discusser.toomanyentities.client.TooManyEntitiesKeys;
78
import io.github.discusser.toomanyentities.config.MapGuiProvider;
89
import io.github.discusser.toomanyentities.config.TooManyEntitiesConfig;
910
import me.shedaniel.autoconfig.AutoConfig;
1011
import me.shedaniel.autoconfig.gui.registry.GuiRegistry;
1112
import me.shedaniel.autoconfig.serializer.GsonConfigSerializer;
1213
import net.minecraft.client.option.KeyBinding;
1314
import net.minecraft.client.util.InputUtil;
15+
import net.minecraft.text.Style;
1416
import net.minecraft.text.Text;
17+
import net.minecraft.text.TextColor;
18+
import net.minecraft.util.Colors;
19+
import net.minecraft.util.Formatting;
1520
import org.slf4j.Logger;
1621
import org.slf4j.LoggerFactory;
1722

@@ -28,32 +33,23 @@ public final class TooManyEntities {
2833
public static void init() {
2934
}
3035

31-
public static void registerKeyBindings() {
32-
KeyBinding KEY_TOGGLE_MOD = new KeyBinding(
33-
"key.too_many_entities.toggle_mod",
34-
InputUtil.Type.KEYSYM,
35-
InputUtil.GLFW_KEY_O,
36-
"category.too_many_entities.too_many_entities"
37-
);
38-
KeyMappingRegistry.register(KEY_TOGGLE_MOD);
36+
public static void initClient() {
37+
AutoConfig.register(TooManyEntitiesConfig.class, GsonConfigSerializer::new);
38+
GuiRegistry registry = AutoConfig.getGuiRegistry(TooManyEntitiesConfig.class);
39+
registry.registerPredicateProvider(new MapGuiProvider(), field -> Map.class.isAssignableFrom(field.getType()));
40+
TooManyEntitiesConfig.instance = AutoConfig.getConfigHolder(TooManyEntitiesConfig.class).getConfig();
41+
3942
ClientTickEvent.CLIENT_POST.register(minecraft -> {
40-
while (KEY_TOGGLE_MOD.wasPressed()) {
43+
while (TooManyEntitiesKeys.KEY_TOGGLE_MOD.wasPressed()) {
4144
modEnabled = !modEnabled;
4245
if (minecraft.player != null) {
4346
String key = "text.too_many_entities.mod_" + (modEnabled ? "enabled" : "disabled");
44-
minecraft.player.sendMessage(Text.translatable(key));
47+
minecraft.player.sendMessage(Text.translatable(key).setStyle(Style.EMPTY.withColor(modEnabled ? Formatting.GREEN : Formatting.RED)));
4548
}
4649
}
4750
});
4851
}
4952

50-
public static void initClient() {
51-
AutoConfig.register(TooManyEntitiesConfig.class, GsonConfigSerializer::new);
52-
GuiRegistry registry = AutoConfig.getGuiRegistry(TooManyEntitiesConfig.class);
53-
registry.registerPredicateProvider(new MapGuiProvider(), field -> Map.class.isAssignableFrom(field.getType()));
54-
TooManyEntitiesConfig.instance = AutoConfig.getConfigHolder(TooManyEntitiesConfig.class).getConfig();
55-
}
56-
5753
@ExpectPlatform
5854
public static boolean isModPresent(String modid) {
5955
throw new AssertionError();
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package io.github.discusser.toomanyentities.client;
2+
3+
import net.minecraft.client.option.KeyBinding;
4+
import net.minecraft.client.util.InputUtil;
5+
6+
public class TooManyEntitiesKeys {
7+
public TooManyEntitiesKeys() {}
8+
9+
public static final KeyBinding KEY_TOGGLE_MOD = new KeyBinding(
10+
"key.too_many_entities.toggle_mod",
11+
InputUtil.Type.KEYSYM,
12+
InputUtil.GLFW_KEY_O,
13+
"category.too_many_entities.too_many_entities"
14+
);
15+
}
Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
package io.github.discusser.toomanyentities.fabric;
22

33
import io.github.discusser.toomanyentities.TooManyEntities;
4+
import io.github.discusser.toomanyentities.client.TooManyEntitiesKeys;
45
import net.fabricmc.api.ClientModInitializer;
6+
import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
57

68
public final class TooManyEntitiesClientFabric implements ClientModInitializer {
79
@Override
810
public void onInitializeClient() {
911
TooManyEntities.initClient();
10-
TooManyEntities.registerKeyBindings();
12+
13+
KeyBindingHelper.registerKeyBinding(TooManyEntitiesKeys.KEY_TOGGLE_MOD);
1114
}
1215
}

forge/src/main/java/io/github/discusser/toomanyentities/forge/TooManyEntitiesForge.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import dev.architectury.platform.forge.EventBuses;
44
import io.github.discusser.toomanyentities.TooManyEntities;
5+
import io.github.discusser.toomanyentities.client.TooManyEntitiesKeys;
56
import io.github.discusser.toomanyentities.config.TooManyEntitiesConfig;
67
import me.shedaniel.autoconfig.AutoConfig;
78
import net.minecraftforge.api.distmarker.Dist;
@@ -32,8 +33,7 @@ private void clientSetup(FMLClientSetupEvent ignoredEvent) {
3233
TooManyEntities.initClient();
3334
}
3435

35-
@SubscribeEvent(priority = EventPriority.HIGHEST)
3636
public static void registerBindings(RegisterKeyMappingsEvent event) {
37-
TooManyEntities.registerKeyBindings();
37+
event.register(TooManyEntitiesKeys.KEY_TOGGLE_MOD);
3838
}
3939
}

0 commit comments

Comments
 (0)