Merge branch 'dev' into janino-scripts

This commit is contained in:
bigguy345 committed 2026-01-10 00:19:14 +02:00
commit fb0332e5cf
53 files changed
+3017 -376

No files matched your search

@@ -223,6 +223,7 @@ import java.util.Random;
public class ClientProxy extends CommonProxy {
public static KeyBinding NPCButton;
public static KeyBinding SpecialKey;
public static final Random RAND = new Random();
public static FontContainer Font;
@@ -289,8 +290,10 @@ public class ClientProxy extends CommonProxy {
Minecraft mc = Minecraft.getMinecraft();
NPCButton = new KeyBinding("NPC Inventory", Keyboard.KEY_N, "key.categories.customnpc");
SpecialKey = new KeyBinding("key.customnpcs.special", Keyboard.KEY_C, "key.categories.customnpc");
ClientRegistry.registerKeyBinding(NPCButton);
ClientRegistry.registerKeyBinding(SpecialKey);
new PresetController(CustomNpcs.Dir);