diff options
author | IRONM00N <64110067+IRONM00N@users.noreply.github.com> | 2021-07-23 15:16:29 -0400 |
---|---|---|
committer | IRONM00N <64110067+IRONM00N@users.noreply.github.com> | 2021-07-23 15:16:29 -0400 |
commit | 1720abf26bfb9d42a242f9b7d273997c1497d845 (patch) | |
tree | fe35a0558d80da4e56c470e8acaa39e6a3196f3a /src/main | |
parent | 8fb547095b567bf010d4decfdb4491215257f79c (diff) | |
download | NotEnoughUpdates-1720abf26bfb9d42a242f9b7d273997c1497d845.tar.gz NotEnoughUpdates-1720abf26bfb9d42a242f9b7d273997c1497d845.tar.bz2 NotEnoughUpdates-1720abf26bfb9d42a242f9b7d273997c1497d845.zip |
chore: add ironmoon easter egg and update ironmoon cape
Diffstat (limited to 'src/main')
-rw-r--r-- | src/main/java/io/github/moulberry/notenoughupdates/CustomItems.java | 7 | ||||
-rw-r--r-- | src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java | 4 | ||||
-rw-r--r-- | src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java | 9 | ||||
-rw-r--r-- | src/main/resources/assets/notenoughupdates/capes/ironmoon.png | bin | 125436 -> 142131 bytes | |||
-rw-r--r-- | src/main/resources/assets/notenoughupdates/capes/ironmoon_preview.png | bin | 62509 -> 92492 bytes |
5 files changed, 18 insertions, 2 deletions
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/CustomItems.java b/src/main/java/io/github/moulberry/notenoughupdates/CustomItems.java index 47b6401d..c16cb7d0 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/CustomItems.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/CustomItems.java @@ -63,6 +63,13 @@ public class CustomItems { "", "get flexed"); public static JsonObject CREDITS = Constants.MISC.getAsJsonObject("credits"); + public static JsonObject IRONM00N = create( + "IRONM00N", + "end_stone", + "IRONM00N", + "Your life has been a lie,", + "the moon is made out of iron." + ); /** * SHAAAAAAAAAAAAAAAAAAME diff --git a/src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java b/src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java index ffee4c2b..bf85a6a6 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java @@ -1277,6 +1277,10 @@ public class NEUOverlay extends Gui { case "who made this mod": searchedItems.add(CustomItems.CREDITS); break; + case "ironmoon": + case "ironm00n": + searchedItems.add(CustomItems.IRONM00N); + break; } this.searchedItems = searchedItems; diff --git a/src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java b/src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java index 5fb296d1..15c86aaa 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java @@ -734,11 +734,11 @@ public class NotEnoughUpdates { "\u00a7dFrom \u00a7c[ADMIN] Minikloon\u00a77: If you use that command again, I'll have to ban you", "", "Ok, this is actually the last message, use the command again and you'll crash I promise"}; private int devFailIndex = 0; + private static final List<String> devTestUsers = new ArrayList<>(Arrays.asList("moulberry", "lucycoconut", "ironm00n")); SimpleCommand devTestCommand = new SimpleCommand("neudevtest", new SimpleCommand.ProcessCommandRunnable() { @Override public void processCommand(ICommandSender sender, String[] args) { - if(!Minecraft.getMinecraft().thePlayer.getName().equalsIgnoreCase("Moulberry") && - !Minecraft.getMinecraft().thePlayer.getName().equalsIgnoreCase("LucyCoconut")) { + if(!devTestUsers.contains(Minecraft.getMinecraft().thePlayer.getName().toLowerCase())) { if(devFailIndex >= devFailStrings.length) { throw new Error("L") { @Override @@ -830,6 +830,11 @@ public class NotEnoughUpdates { return; } + + /* if(args.length == 1 && args[0].equalsIgnoreCase("update")) { + NEUEventListener.displayUpdateMessageIfOutOfDate(); + } */ + Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText(EnumChatFormatting.GREEN+"Executing dubious code")); /*Minecraft.getMinecraft().thePlayer.rotationYaw = 0; Minecraft.getMinecraft().thePlayer.rotationPitch = 0; diff --git a/src/main/resources/assets/notenoughupdates/capes/ironmoon.png b/src/main/resources/assets/notenoughupdates/capes/ironmoon.png Binary files differindex 9cf49a6f..b25221d9 100644 --- a/src/main/resources/assets/notenoughupdates/capes/ironmoon.png +++ b/src/main/resources/assets/notenoughupdates/capes/ironmoon.png diff --git a/src/main/resources/assets/notenoughupdates/capes/ironmoon_preview.png b/src/main/resources/assets/notenoughupdates/capes/ironmoon_preview.png Binary files differindex 252ebbb3..c233128a 100644 --- a/src/main/resources/assets/notenoughupdates/capes/ironmoon_preview.png +++ b/src/main/resources/assets/notenoughupdates/capes/ironmoon_preview.png |