Merge pull request #210 from DoKM/master

DoKM fork merge

40 files changed, 7687 insertions, 7032 deletions

diff --git a/src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java b/src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java
index d55bad48..2a6160f1 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java
@@ -1186,11 +1186,11 @@ public class NEUOverlay extends Gui {
             return internalname.matches(petRegex) && item.get("displayname").getAsString().contains("[");
         } else if(getSortMode() == SORT_MODE_TOOL) {
             return checkItemType(item.get("lore").getAsJsonArray(),
-                    "SWORD", "BOW", "AXE", "PICKAXE", "FISHING ROD", "WAND", "SHOVEL", "HOE") >= 0;
+                    "SWORD", "BOW", "AXE", "PICKAXE", "FISHING ROD", "WAND", "SHOVEL", "HOE", "DUNGEON SWORD", "DUNGEON BOW") >= 0;
         } else if(getSortMode() == SORT_MODE_ARMOR) {
-            return checkItemType(item.get("lore").getAsJsonArray(), "HELMET", "CHESTPLATE", "LEGGINGS", "BOOTS") >= 0;
+            return checkItemType(item.get("lore").getAsJsonArray(), "HELMET", "CHESTPLATE", "LEGGINGS", "BOOTS", "DUNGEON HELMET", "DUNGEON CHESTPLATE", "DUNGEON LEGGINGS", "DUNGEON BOOTS") >= 0;
         } else if(getSortMode() == SORT_MODE_ACCESSORY) {
-            return checkItemType(item.get("lore").getAsJsonArray(), "ACCESSORY") >= 0;
+            return checkItemType(item.get("lore").getAsJsonArray(), "ACCESSORY", "HATCCESSORY", "DUNGEON ACCESSORY") >= 0;
         }
         return true;
     }
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/dungeons/GuiDungeonMapEditor.java b/src/main/java/io/github/moulberry/notenoughupdates/dungeons/GuiDungeonMapEditor.java
index b0e46e00..ea2631df 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/dungeons/GuiDungeonMapEditor.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/dungeons/GuiDungeonMapEditor.java
@@ -1,714 +1,715 @@
-package io.github.moulberry.notenoughupdates.dungeons;
-
-import io.github.moulberry.notenoughupdates.core.config.gui.GuiPositionEditor;
-import io.github.moulberry.notenoughupdates.core.util.render.RenderUtils;
-import io.github.moulberry.notenoughupdates.core.util.render.TextRenderUtils;
-import io.github.moulberry.notenoughupdates.options.NEUConfig;
-import io.github.moulberry.notenoughupdates.NotEnoughUpdates;
-import io.github.moulberry.notenoughupdates.core.GuiElementColour;
-import io.github.moulberry.notenoughupdates.core.config.annotations.ConfigEditorSlider;
-import io.github.moulberry.notenoughupdates.core.config.annotations.ConfigOption;
-import io.github.moulberry.notenoughupdates.itemeditor.GuiElementTextField;
-import io.github.moulberry.notenoughupdates.util.SpecialColour;
-import io.github.moulberry.notenoughupdates.util.Utils;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiScreen;
-import net.minecraft.client.gui.ScaledResolution;
-import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.client.renderer.OpenGlHelper;
-import net.minecraft.client.shader.Framebuffer;
-import net.minecraft.client.shader.Shader;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.util.Matrix4f;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.Vec4b;
-import org.lwjgl.input.Keyboard;
-import org.lwjgl.input.Mouse;
-import org.lwjgl.opengl.GL11;
-
-import java.awt.*;
-import java.io.IOException;
-import java.lang.reflect.Field;
-import java.util.*;
-import java.util.List;
-import static io.github.moulberry.notenoughupdates.util.GuiTextures.*;
-
-public class GuiDungeonMapEditor extends GuiScreen {
-
-    public static final ResourceLocation BACKGROUND = new ResourceLocation("notenoughupdates:dungeon_map/editor/background.png");
-    public static final ResourceLocation BUTTON = new ResourceLocation("notenoughupdates:button.png");
-    private static final DungeonMap demoMap = new DungeonMap();
-
-    private int sizeX;
-    private int sizeY;
-    private int guiLeft;
-    private int guiTop;
-
-    private List<Button> buttons = new ArrayList<>();
-
-    private GuiElementTextField blurField = new GuiElementTextField("", GuiElementTextField.NUM_ONLY | GuiElementTextField.NO_SPACE);
-    private GuiElementColour activeColourEditor = null;
-
-    private Field clickedSlider;
-
-    class Button {
-        private int id;
-        private int x;
-        private int y;
-        private String text;
-        private Color colour = new Color(-1, true);
-        private Field option;
-        private String displayName;
-        private String desc;
-
-        public Button(int id, int x, int y, String text) {
-            this(id, x, y, text, null);
-        }
-
-        public Button(int id, int x, int y, String text, Field option) {
-            this.id = id;
-            this.x = x;
-            this.y = y;
-            this.text = text;
-            this.option = option;
-
-            if(option != null) {
-                ConfigOption optionAnnotation = option.getAnnotation(ConfigOption.class);
-                displayName = optionAnnotation.name();
-                desc = optionAnnotation.desc();
-            }
-        }
-
-        public List<String> getTooltip() {
-            if(option == null) {
-                return null;
-            }
-
-            List<String> tooltip = new ArrayList<>();
-            tooltip.add(EnumChatFormatting.YELLOW+displayName);
-            for(String line : desc.split("\n")) {
-                tooltip.add(EnumChatFormatting.AQUA+line);
-            }
-            return tooltip;
-        }
-
-        public void render() {
-            if(text == null) return;
-
-            Minecraft.getMinecraft().getTextureManager().bindTexture(BUTTON);
-            if(isButtonPressed(id)) {
-                GlStateManager.color(colour.getRed()*0.85f/255f, colour.getGreen()*0.85f/255f,
-                        colour.getBlue()*0.85f/255f, 1);
-                Utils.drawTexturedRect(guiLeft+x, guiTop+y, 48, 16, 1, 0, 1, 0, GL11.GL_NEAREST);
-            } else {
-                GlStateManager.color(colour.getRed()/255f, colour.getGreen()/255f, colour.getBlue()/255f, 1);
-                Utils.drawTexturedRect(guiLeft+x, guiTop+y, 48, 16, GL11.GL_NEAREST);
-            }
-
-            if(text.length() > 0) {
-                Utils.drawStringCenteredScaledMaxWidth(text, Minecraft.getMinecraft().fontRendererObj , guiLeft+x+24, guiTop+y+8, false, 39, 0xFF000000);
-            }
-        }
-
-    }
-
-    public GuiDungeonMapEditor() {
-        NEUConfig.DungeonMap options = NotEnoughUpdates.INSTANCE.config.dungeonMap;
-        //Map Border Size
-        //buttons.add(new Button(0, 6, 37, "Small", options.dmBorderSize));
-        //buttons.add(new Button(1, 52, 37, "Medium", options.dmBorderSize));
-        //buttons.add(new Button(2, 98, 37, "Large", options.dmBorderSize));
-
-        //Map Rooms Size
-        //buttons.add(new Button(3, 6, 67+19, "Small", options.dmRoomSize));
-        //buttons.add(new Button(4, 52, 67+19, "Medium", options.dmRoomSize));
-        //buttons.add(new Button(5, 98, 67+19, "Large", options.dmRoomSize));
-
-        //Map Border Styles
-        buttons.add(new Button(6, 6, 97+30, "None"));
-        buttons.add(new Button(7, 52, 97+30, "Custom"));
-        buttons.add(new Button(8, 98, 97+30, "Stone"));
-        buttons.add(new Button(9, 6, 116+30, "Wood"));
-        buttons.add(new Button(10, 52, 116+30, "Rustic(S)"));
-        buttons.add(new Button(11, 98, 116+30, "Rustic(C)"));
-        buttons.add(new Button(12, 6, 135+30, "Fade"));
-        buttons.add(new Button(13, 52, 135+30, "Ribbons"));
-        buttons.add(new Button(14, 98, 135+30, "Paper"));
-        buttons.add(new Button(15, 6, 154+30, "Crimson"));
-        buttons.add(new Button(16, 52, 154+30, "Ornate"));
-        buttons.add(new Button(17, 98, 154+30, "Dragon"));
-
-        try {
-            //Dungeon Map
-            buttons.add(new Button(18, 20+139, 36, "Yes/No", NEUConfig.DungeonMap.class.getDeclaredField("dmEnable")));
-            //Center
-            buttons.add(new Button(19, 84+139, 36, "Player/Map", NEUConfig.DungeonMap.class.getDeclaredField("dmCenterPlayer")));
-            //Rotate
-            buttons.add(new Button(20, 20+139, 65, "Player/No Rotate", NEUConfig.DungeonMap.class.getDeclaredField("dmRotatePlayer")));
-            //Icon Style
-            buttons.add(new Button(21, 84+139, 65, "Default/Heads", NEUConfig.DungeonMap.class.getDeclaredField("dmPlayerHeads")));
-            //Check Orient
-            buttons.add(new Button(22, 20+139, 94, "Normal/Reorient", NEUConfig.DungeonMap.class.getDeclaredField("dmOrientCheck")));
-            //Check Center
-            buttons.add(new Button(23, 84+139, 94, "Yes/No", NEUConfig.DungeonMap.class.getDeclaredField("dmCenterCheck")));
-            //Interpolation
-            buttons.add(new Button(24, 20+139, 123, "Yes/No", NEUConfig.DungeonMap.class.getDeclaredField("dmPlayerInterp")));
-            //Compatibility
-            buttons.add(new Button(25, 84+139, 123, "Normal/No SHD/No FB/SHD", NEUConfig.DungeonMap.class.getDeclaredField("dmCompat")));
-
-            //Background
-            buttons.add(new Button(26, 20+139, 152, "", NEUConfig.DungeonMap.class.getDeclaredField("dmBackgroundColour")));
-            //Border
-            buttons.add(new Button(27, 84+139, 152, "", NEUConfig.DungeonMap.class.getDeclaredField("dmBorderColour")));
-
-            //Chroma Mode
-            buttons.add(new Button(28, 84+139, 181, "Normal/Scroll", NEUConfig.DungeonMap.class.getDeclaredField("dmChromaBorder")));
-        } catch(Exception e) {
-            e.printStackTrace();
-        }
-
-        //buttons.add(new Button(29, 52, 86+19, "XLarge", options.dmRoomSize));
-        //buttons.add(new Button(30, 52, 56, "XLarge", options.dmBorderSize));
-
-        {
-            double val = NotEnoughUpdates.INSTANCE.config.dungeonMap.dmBackgroundBlur;
-            String strVal;
-            if(val % 1 == 0) {
-                strVal = Integer.toString((int)val);
-            } else {
-                strVal = Double.toString(val);
-                strVal = strVal.replaceAll("(\\.\\d\\d\\d)(?:\\d)+", "$1");
-                strVal = strVal.replaceAll("0+$", "");
-            }
-            blurField.setText(strVal);
-        }
-    }
-
-    @Override
-    public void drawScreen(int mouseX, int mouseY, float partialTicks) {
-        ScaledResolution scaledResolution = Utils.pushGuiScale(2);
-        this.width = scaledResolution.getScaledWidth();
-        this.height = scaledResolution.getScaledHeight();
-
-        mouseX = Mouse.getEventX() * this.width / this.mc.displayWidth;
-        mouseY = this.height - Mouse.getEventY() * this.height / this.mc.displayHeight - 1;
-
-        List<String> tooltipToDisplay = null;
-        for(Button button : buttons) {
-            if(mouseX >= guiLeft+button.x && mouseX <= guiLeft+button.x+48 &&
-                    mouseY >= guiTop+button.y-13 && mouseY <= guiTop+button.y+16) {
-                if(button.id >= 6 && button.id <= 17) {
-                    String mapDesc = null;
-                    String mapCredit = null;
-                    int id = button.id;
-                    switch(id) {
-                        case 6:
-                            mapDesc = "No Border"; break;
-                        case 7:
-                            mapDesc = "Used by custom Resource Packs"; break;
-                        case 8:
-                            mapDesc = "Simple gray border"; mapCredit = "TomEngMaster"; break;
-                        case 9:
-                            mapDesc = "Viney wood border"; mapCredit = "iDevil4Hell"; break;
-                        case 10:
-                            mapDesc = "Steampunk-inspired square border"; mapCredit = "ThatGravyBoat"; break;
-                        case 11:
-                            mapDesc = "Steampunk-inspired circular border"; mapCredit = "ThatGravyBoat"; break;
-                        case 12:
-                            mapDesc = "Light fade border"; mapCredit = "Qwiken"; break;
-                        case 13:
-                            mapDesc = "Simple gray border with red ribbons"; mapCredit = "Sai"; break;
-                        case 14:
-                            mapDesc = "Paper border"; mapCredit = "KingJames02st"; break;
-                        case 15:
-                            mapDesc = "Nether-inspired border"; mapCredit = "DTRW191"; break;
-                        case 16:
-                            mapDesc = "Golden ornate border"; mapCredit = "iDevil4Hell"; break;
-                        case 17:
-                            mapDesc = "Stone dragon border"; mapCredit = "ImperiaL"; break;
-                    }
-
-                    ArrayList<String> tooltip = new ArrayList<>();
-                    tooltip.add(EnumChatFormatting.YELLOW+"Border Style");
-                    tooltip.add(EnumChatFormatting.AQUA+"Customize the look of the dungeon border");
-                    tooltip.add("");
-                    if(mapDesc != null) tooltip.add(EnumChatFormatting.YELLOW+"Set to: "+EnumChatFormatting.AQUA+mapDesc);
-                    if(mapCredit != null) tooltip.add(EnumChatFormatting.YELLOW+"Artist: "+EnumChatFormatting.GOLD+mapCredit);
-                    tooltipToDisplay = tooltip;
-                } else {
-                    tooltipToDisplay = button.getTooltip();
-                }
-                break;
-            }
-        }
-
-        this.sizeX = 431;
-        this.sizeY = 237;
-        this.guiLeft = (this.width - this.sizeX) / 2;
-        this.guiTop = (this.height-this.sizeY)/2;
-
-        super.drawScreen(mouseX, mouseY, partialTicks);
-        drawDefaultBackground();
-
-        blurBackground();
-        renderBlurredBackground(width, height, guiLeft+2, guiTop+2, sizeX-4, sizeY-4);
-
-        Minecraft.getMinecraft().getTextureManager().bindTexture(BACKGROUND);
-        GlStateManager.color(1, 1, 1, 1);
-        Utils.drawTexturedRect(guiLeft, guiTop, sizeX, sizeY, GL11.GL_NEAREST);
-
-        Minecraft.getMinecraft().fontRendererObj.drawString("NEU Dungeon Map Editor", guiLeft+8, guiTop+6, 0xFFB4B4B4);
-
-        Utils.drawStringCenteredScaledMaxWidth("Border Size", Minecraft.getMinecraft().fontRendererObj,
-                guiLeft+76, guiTop+30, false, 137, 0xFFB4B4B4);
-        Utils.drawStringCenteredScaledMaxWidth("Rooms Size", Minecraft.getMinecraft().fontRendererObj,
-                guiLeft+76, guiTop+60, false, 137, 0xFFB4B4B4);
-        Utils.drawStringCenteredScaledMaxWidth("Icon Scale", Minecraft.getMinecraft().fontRendererObj,
-                guiLeft+76, guiTop+90, false, 137, 0xFFB4B4B4);
-        Utils.drawStringCenteredScaledMaxWidth("Border Style", Minecraft.getMinecraft().fontRendererObj,
-                guiLeft+76, guiTop+120, false, 137, 0xFFB4B4B4);
-
-        Utils.drawStringCenteredScaledMaxWidth("Dungeon Map", Minecraft.getMinecraft().fontRendererObj,
-                guiLeft+44+139, guiTop+30, false, 60, 0xFFB4B4B4);
-        Utils.drawStringCenteredScaledMaxWidth("Center", Minecraft.getMinecraft().fontRendererObj,
-                guiLeft+108+139, guiTop+30, false, 60, 0xFFB4B4B4);
-
-        Utils.drawStringCenteredScaledMaxWidth("Rotate", Minecraft.getMinecraft().fontRendererObj,
-                guiLeft+44+139, guiTop+59, false, 60, 0xFFB4B4B4);
-        Utils.drawStringCenteredScaledMaxWidth("Icon Style", Minecraft.getMinecraft().fontRendererObj,
-                guiLeft+108+139, guiTop+59, false, 60, 0xFFB4B4B4);
-
-        Utils.drawStringCenteredScaledMaxWidth("Check Orient", Minecraft.getMinecraft().fontRendererObj,
-                guiLeft+44+139, guiTop+88, false, 60, 0xFFB4B4B4);
-        Utils.drawStringCenteredScaledMaxWidth("Check Center", Minecraft.getMinecraft().fontRendererObj,
-                guiLeft+108+139, guiTop+88, false, 60, 0xFFB4B4B4);
-
-        Utils.drawStringCenteredScaledMaxWidth("Interpolation", Minecraft.getMinecraft().fontRendererObj,
-                guiLeft+44+139, guiTop+117, false, 60, 0xFFB4B4B4);
-        Utils.drawStringCenteredScaledMaxWidth("Compatibility", Minecraft.getMinecraft().fontRendererObj,
-                guiLeft+108+139, guiTop+117, false, 60, 0xFFB4B4B4);
-
-        Utils.drawStringCenteredScaledMaxWidth("Background", Minecraft.getMinecraft().fontRendererObj,
-                guiLeft+44+139, guiTop+146, false, 60, 0xFFB4B4B4);
-        Utils.drawStringCenteredScaledMaxWidth("Border", Minecraft.getMinecraft().fontRendererObj,
-                guiLeft+108+139, guiTop+146, false, 60, 0xFFB4B4B4);
-
-        Utils.drawStringCenteredScaledMaxWidth("BG Blur", Minecraft.getMinecraft().fontRendererObj,
-                guiLeft+44+139, guiTop+175, false, 60, 0xFFB4B4B4);
-        Utils.drawStringCenteredScaledMaxWidth("Chroma Type", Minecraft.getMinecraft().fontRendererObj,
-                guiLeft+108+139, guiTop+175, false, 60, 0xFFB4B4B4);
-
-        Utils.drawStringCenteredScaledMaxWidth("Edit Map Position", Minecraft.getMinecraft().fontRendererObj,
-                guiLeft+76, guiTop+209, false, 200, 0xFFB4B4B4);
-
-        try {
-            drawSlider(NEUConfig.DungeonMap.class.getDeclaredField("dmBorderSize"), guiLeft+76, guiTop+45);
-            drawSlider(NEUConfig.DungeonMap.class.getDeclaredField("dmRoomSize"), guiLeft+76, guiTop+75);
-            drawSlider(NEUConfig.DungeonMap.class.getDeclaredField("dmIconScale"), guiLeft+76, guiTop+105);
-        } catch(Exception e) {
-            e.printStackTrace();
-        }
-
-        NEUConfig.DungeonMap options = NotEnoughUpdates.INSTANCE.config.dungeonMap;
-        buttons.get(18-6).text = options.dmEnable ? "Enabled" : "Disabled";
-        buttons.get(19-6).text = options.dmCenterPlayer ? "Player" : "Map";
-        buttons.get(20-6).text = options.dmRotatePlayer ? "Player" : "Vertical";
-        buttons.get(21-6).text = options.dmPlayerHeads <= 0 ? "Default" : options.dmPlayerHeads == 1 ? "Heads" : "Heads w/ Border";
-        buttons.get(22-6).text = options.dmOrientCheck ? "Orient" : "Off";
-        buttons.get(23-6).text = options.dmCenterCheck ? "Center" : "Off";
-        buttons.get(24-6).text = options.dmPlayerInterp ? "Interp" : "No Interp";
-        buttons.get(25-6).text = options.dmCompat <= 0 ? "Normal" : options.dmCompat >= 2 ? "No FB/SHD" : "No SHD";
-
-        buttons.get(26-6).colour = new Color(SpecialColour.specialToChromaRGB(options.dmBackgroundColour));
-        buttons.get(27-6).colour = new Color(SpecialColour.specialToChromaRGB(options.dmBorderColour));
-
-        buttons.get(28-6).text = options.dmChromaBorder ? "Scroll" : "Normal";
-
-        blurField.setSize(48, 16);
-        blurField.render(guiLeft+20+139, guiTop+181);
-
-        GlStateManager.color(1, 1, 1, 1);
-        Minecraft.getMinecraft().getTextureManager().bindTexture(button_tex);
-        RenderUtils.drawTexturedRect(guiLeft+52, guiTop+215, 48, 16);
-        TextRenderUtils.drawStringCenteredScaledMaxWidth("Edit", fontRendererObj, guiLeft+76, guiTop+223,
-                false, 48, 0xFF303030);
-
-        Map<String, Vec4b> decorations = new HashMap<>();
-        Vec4b vec4b = new Vec4b((byte)3, (byte)(((50)-64)*2), (byte)(((40)-64)*2), (byte)((60)*16/360));
-        decorations.put(Minecraft.getMinecraft().thePlayer.getName(), vec4b);
-
-        HashSet<String> players = new HashSet<>();
-        players.add(Minecraft.getMinecraft().thePlayer.getName());
-        GlStateManager.color(1, 1, 1, 1);
-
-        demoMap.renderMap(guiLeft+357, guiTop+125, NotEnoughUpdates.INSTANCE.colourMap, decorations, 0,
-                players, false, partialTicks);
-
-        for(Button button : buttons) {
-            button.render();
-        }
-
-        //List<String> textLines, final int mouseX, final int mouseY, final int screenWidth, final int screenHeight, final int maxTextWidth, FontRenderer font
-        if(tooltipToDisplay != null) {
-            Utils.drawHoveringText(tooltipToDisplay, mouseX, mouseY, width, height, 200, Minecraft.getMinecraft().fontRendererObj);
-        }
-
-        Utils.pushGuiScale(-1);
-
-        if(activeColourEditor != null) {
-            activeColourEditor.render();
-        }
-    }
-
-    public void drawSlider(Field option, int centerX, int centerY) {
-        float value;
-        float minValue;
-        float maxValue;
-        try {
-            value = ((Number)option.get(NotEnoughUpdates.INSTANCE.config.dungeonMap)).floatValue();
-
-            ConfigEditorSlider sliderAnnotation = option.getAnnotation(ConfigEditorSlider.class);
-            minValue = sliderAnnotation.minValue();
-            maxValue = sliderAnnotation.maxValue();
-        } catch(Exception e) {
-            e.printStackTrace();
-            return;
-        }
-
-        float sliderAmount = Math.max(0, Math.min(1, (value-minValue)/(maxValue-minValue)));
-        int sliderAmountI = (int)(96*sliderAmount);
-
-        GlStateManager.color(1f, 1f, 1f, 1f);</