From ec76162b0017cbfb546038e4d55a1f062d99412a Mon Sep 17 00:00:00 2001 From: syeyoung Date: Mon, 4 Jan 2021 11:15:45 +0900 Subject: will it fix it!? --- .../dungeonsguide/config/guiconfig/GuiConfig.java | 2 ++ .../config/guiconfig/GuiGuiLocationConfig.java | 2 ++ .../config/guiconfig/GuiParameterConfig.java | 2 ++ .../config/guiconfig/GuiParameterValueEdit.java | 2 ++ .../dungeonsguide/config/guiconfig/MFeature.java | 2 +- .../dungeonsguide/config/guiconfig/MParameter.java | 4 --- .../features/impl/FeatureCooldownCounter.java | 1 - .../features/impl/FeatureInstaCloseChest.java | 39 +++++++++++++++++----- .../dungeonsguide/roomedit/elements/MValue.java | 1 - .../roomedit/gui/GuiDungeonAddSet.java | 2 ++ .../roomedit/gui/GuiDungeonParameterEdit.java | 2 ++ .../roomedit/gui/GuiDungeonRoomEdit.java | 2 ++ .../roomedit/gui/GuiDungeonValueEdit.java | 2 ++ .../mechanicedit/ValueEditBreakableWall.java | 2 +- .../roomedit/mechanicedit/ValueEditDoor.java | 2 +- .../roomedit/mechanicedit/ValueEditLever.java | 2 +- .../roomedit/mechanicedit/ValueEditOnewayDoor.java | 2 +- .../mechanicedit/ValueEditOnewayLever.java | 2 +- .../mechanicedit/ValueEditPressurePlate.java | 3 +- .../roomedit/mechanicedit/ValueEditSecret.java | 4 +-- .../roomedit/mechanicedit/ValueEditTomb.java | 2 +- .../roomedit/valueedit/ValueEditBoolean.java | 3 +- .../roomedit/valueedit/ValueEditOffsetPoint.java | 2 -- 23 files changed, 56 insertions(+), 31 deletions(-) (limited to 'src/main') diff --git a/src/main/java/kr/syeyoung/dungeonsguide/config/guiconfig/GuiConfig.java b/src/main/java/kr/syeyoung/dungeonsguide/config/guiconfig/GuiConfig.java index 32921db5..ba662bbf 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/config/guiconfig/GuiConfig.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/config/guiconfig/GuiConfig.java @@ -47,6 +47,8 @@ public class GuiConfig extends GuiScreen { public void drawScreen(int mouseX, int mouseY, float partialTicks) { ScaledResolution scaledResolution = new ScaledResolution(Minecraft.getMinecraft()); GL11.glPushMatrix(); + GlStateManager.disableLighting(); + GlStateManager.disableFog(); GlStateManager.color(1,1,1,1); GL11.glDisable(GL11.GL_DEPTH_TEST); mainPanel.render0(scaledResolution, new Point(0,0), new Rectangle(0,0,scaledResolution.getScaledWidth(),scaledResolution.getScaledHeight()), mouseX, mouseY, mouseX, mouseY, partialTicks); diff --git a/src/main/java/kr/syeyoung/dungeonsguide/config/guiconfig/GuiGuiLocationConfig.java b/src/main/java/kr/syeyoung/dungeonsguide/config/guiconfig/GuiGuiLocationConfig.java index 2080c9dc..9705351d 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/config/guiconfig/GuiGuiLocationConfig.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/config/guiconfig/GuiGuiLocationConfig.java @@ -58,6 +58,8 @@ public class GuiGuiLocationConfig extends GuiScreen { public void drawScreen(int mouseX, int mouseY, float partialTicks) { ScaledResolution scaledResolution = new ScaledResolution(Minecraft.getMinecraft()); GL11.glPushMatrix(); + GlStateManager.disableLighting(); + GlStateManager.disableFog(); GlStateManager.color(1,1,1,1); GL11.glDisable(GL11.GL_DEPTH_TEST); mainPanel.render0(scaledResolution, new Point(0,0), new Rectangle(0,0,scaledResolution.getScaledWidth(),scaledResolution.getScaledHeight()), mouseX, mouseY, mouseX, mouseY, partialTicks); diff --git a/src/main/java/kr/syeyoung/dungeonsguide/config/guiconfig/GuiParameterConfig.java b/src/main/java/kr/syeyoung/dungeonsguide/config/guiconfig/GuiParameterConfig.java index bf2f811a..20fe8fa0 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/config/guiconfig/GuiParameterConfig.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/config/guiconfig/GuiParameterConfig.java @@ -61,6 +61,8 @@ public class GuiParameterConfig extends GuiScreen { public void drawScreen(int mouseX, int mouseY, float partialTicks) { ScaledResolution scaledResolution = new ScaledResolution(Minecraft.getMinecraft()); GL11.glPushMatrix(); + GlStateManager.disableLighting(); + GlStateManager.disableFog(); GlStateManager.color(1,1,1,1); GL11.glDisable(GL11.GL_DEPTH_TEST); int heights = 0; diff --git a/src/main/java/kr/syeyoung/dungeonsguide/config/guiconfig/GuiParameterValueEdit.java b/src/main/java/kr/syeyoung/dungeonsguide/config/guiconfig/GuiParameterValueEdit.java index c3f18103..348c101e 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/config/guiconfig/GuiParameterValueEdit.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/config/guiconfig/GuiParameterValueEdit.java @@ -119,6 +119,8 @@ public class GuiParameterValueEdit extends GuiScreen { try { ScaledResolution scaledResolution = new ScaledResolution(Minecraft.getMinecraft()); GL11.glPushMatrix(); + GlStateManager.disableLighting(); + GlStateManager.disableFog(); GlStateManager.color(1,1,1,1); mainPanel.render0(scaledResolution, new Point(0, 0), new Rectangle(0, 0, scaledResolution.getScaledWidth(), scaledResolution.getScaledHeight()), mouseX, mouseY, mouseX, mouseY, partialTicks); GL11.glPopMatrix(); diff --git a/src/main/java/kr/syeyoung/dungeonsguide/config/guiconfig/MFeature.java b/src/main/java/kr/syeyoung/dungeonsguide/config/guiconfig/MFeature.java index fcbfdc11..509dc3b6 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/config/guiconfig/MFeature.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/config/guiconfig/MFeature.java @@ -12,9 +12,9 @@ import lombok.Getter; import lombok.Setter; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Gui; -import scala.actors.threadpool.Arrays; import java.awt.*; +import java.util.Arrays; import java.util.List; import java.util.ArrayList; diff --git a/src/main/java/kr/syeyoung/dungeonsguide/config/guiconfig/MParameter.java b/src/main/java/kr/syeyoung/dungeonsguide/config/guiconfig/MParameter.java index 5f6f736b..62d478cf 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/config/guiconfig/MParameter.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/config/guiconfig/MParameter.java @@ -11,14 +11,10 @@ import kr.syeyoung.dungeonsguide.roomedit.MPanel; import kr.syeyoung.dungeonsguide.roomedit.Parameter; import kr.syeyoung.dungeonsguide.roomedit.elements.MButton; import kr.syeyoung.dungeonsguide.roomedit.elements.MLabel; -import kr.syeyoung.dungeonsguide.roomedit.elements.MStringSelectionButton; -import kr.syeyoung.dungeonsguide.roomedit.gui.GuiDungeonValueEdit; -import kr.syeyoung.dungeonsguide.roomedit.valueedit.ValueEdit; import lombok.Getter; import lombok.Setter; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Gui; -import scala.actors.threadpool.Arrays; import java.awt.*; import java.util.ArrayList; diff --git a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/FeatureCooldownCounter.java b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/FeatureCooldownCounter.java index 6b79487d..dcf46281 100644 --- a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/FeatureCooldownCounter.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/FeatureCooldownCounter.java @@ -43,7 +43,6 @@ public class FeatureCooldownCounter extends GuiFeature implements TickListener { if (skyblockStatus.isOnSkyblock()) leftDungeonTime = System.currentTimeMillis(); else return; - System.out.println("think he left"); } wasInDungeon = skyblockStatus.isOnDungeon(); } diff --git a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/FeatureInstaCloseChest.java b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/FeatureInstaCloseChest.java index 79fbfce6..33d2c9eb 100644 --- a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/FeatureInstaCloseChest.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/FeatureInstaCloseChest.java @@ -11,7 +11,9 @@ import kr.syeyoung.dungeonsguide.utils.AhUtils; import kr.syeyoung.dungeonsguide.utils.TextUtils; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.inventory.GuiChest; +import net.minecraft.inventory.ContainerChest; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.client.event.GuiOpenEvent; @@ -22,26 +24,24 @@ import java.util.Comparator; import java.util.Set; import java.util.TreeSet; -public class FeatureInstaCloseChest extends SimpleFeature implements GuiOpenListener { +public class FeatureInstaCloseChest extends SimpleFeature implements GuiOpenListener, TickListener { public FeatureInstaCloseChest() { super("QoL", "Auto-Close Secret Chest", "Automatically closes Secret Chest as soon as you open it\nCan put item price threshold by clicking edit", "qol.autoclose", false); parameters.put("threshold", new FeatureParameter("threshold", "Price Threshold", "The maximum price of item for chest to be closed. Default 1m", 1000000, "integer")); } SkyblockStatus skyblockStatus = e.getDungeonsGuide().getSkyblockStatus(); + private boolean check; @Override public void onGuiOpen(GuiOpenEvent event) { + if (!this.isEnabled()) return; + if (!skyblockStatus.isOnDungeon()) return; if (!(event.gui instanceof GuiChest)) return; - int threshold = this.getParameter("threshold").getValue(); - - int priceSum = 0; - for (ItemStack inventoryItemStack : ((GuiChest) event.gui).inventorySlots.inventoryItemStacks) { - priceSum += getPrice(inventoryItemStack); - } - - if (priceSum < threshold) Minecraft.getMinecraft().thePlayer.closeScreen(); + ContainerChest ch = (ContainerChest) ((GuiChest)event.gui).inventorySlots; + if (!"container.chest".equals(ch.getLowerChestInventory().getName())) return; + check = true; } public int getPrice(ItemStack itemStack) { @@ -93,4 +93,25 @@ public class FeatureInstaCloseChest extends SimpleFeature implements GuiOpenList } } } + + @Override + public void onTick() { + if (!this.isEnabled()) return; + if (check) { + check = false; + + GuiScreen screen = Minecraft.getMinecraft().currentScreen; + if (screen instanceof GuiChest){ + int priceSum = 0; + for (ItemStack inventoryItemStack : ((GuiChest) screen).inventorySlots.inventoryItemStacks) { + priceSum += getPrice(inventoryItemStack); + } + + int threshold = this.getParameter("threshold").getValue(); + if (priceSum < threshold) { + Minecraft.getMinecraft().thePlayer.closeScreen(); + } + } + } + } } diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/elements/MValue.java b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/elements/MValue.java index a7b910c5..ab568e1c 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/elements/MValue.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/elements/MValue.java @@ -8,7 +8,6 @@ import kr.syeyoung.dungeonsguide.roomedit.valueedit.ValueEditOffsetPointSet; import lombok.Getter; import lombok.Setter; import net.minecraft.client.gui.Gui; -import scala.actors.threadpool.Arrays; import java.awt.*; import java.util.ArrayList; diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/gui/GuiDungeonAddSet.java b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/gui/GuiDungeonAddSet.java index 95ec38fb..9d9f3b5c 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/gui/GuiDungeonAddSet.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/gui/GuiDungeonAddSet.java @@ -126,6 +126,8 @@ public class GuiDungeonAddSet extends GuiScreen { public void drawScreen(int mouseX, int mouseY, float partialTicks) { ScaledResolution scaledResolution = new ScaledResolution(Minecraft.getMinecraft()); GL11.glPushMatrix(); + GlStateManager.disableLighting(); + GlStateManager.disableFog(); GlStateManager.color(1,1,1,1); GlStateManager.pushAttrib(); mainPanel.render0(scaledResolution, new Point(0,0), new Rectangle(0,0,scaledResolution.getScaledWidth(),scaledResolution.getScaledHeight()), mouseX, mouseY, mouseX, mouseY, partialTicks); diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/gui/GuiDungeonParameterEdit.java b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/gui/GuiDungeonParameterEdit.java index ada2e486..e704129c 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/gui/GuiDungeonParameterEdit.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/gui/GuiDungeonParameterEdit.java @@ -165,6 +165,8 @@ public class GuiDungeonParameterEdit extends GuiScreen { public void drawScreen(int mouseX, int mouseY, float partialTicks) { ScaledResolution scaledResolution = new ScaledResolution(Minecraft.getMinecraft()); GL11.glPushMatrix(); + GlStateManager.disableLighting(); + GlStateManager.disableFog(); GlStateManager.color(1,1,1,1); GlStateManager.pushAttrib(); mainPanel.render0(scaledResolution, new Point(0,0), new Rectangle(0,0,scaledResolution.getScaledWidth(),scaledResolution.getScaledHeight()), mouseX, mouseY, mouseX, mouseY, partialTicks); diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/gui/GuiDungeonRoomEdit.java b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/gui/GuiDungeonRoomEdit.java index 4160dbd5..4eaeedae 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/gui/GuiDungeonRoomEdit.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/gui/GuiDungeonRoomEdit.java @@ -60,6 +60,8 @@ public class GuiDungeonRoomEdit extends GuiScreen { public void drawScreen(int mouseX, int mouseY, float partialTicks) { ScaledResolution scaledResolution = new ScaledResolution(Minecraft.getMinecraft()); GL11.glPushMatrix(); + GlStateManager.disableLighting(); + GlStateManager.disableFog(); GlStateManager.color(1,1,1,1); GlStateManager.pushAttrib(); mainPanel.render0(scaledResolution, new Point(0,0), new Rectangle(0,0,scaledResolution.getScaledWidth(),scaledResolution.getScaledHeight()), mouseX, mouseY, mouseX, mouseY, partialTicks); diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/gui/GuiDungeonValueEdit.java b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/gui/GuiDungeonValueEdit.java index 0e679265..e9e5a60d 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/gui/GuiDungeonValueEdit.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/gui/GuiDungeonValueEdit.java @@ -123,6 +123,8 @@ public class GuiDungeonValueEdit extends GuiScreen { try { ScaledResolution scaledResolution = new ScaledResolution(Minecraft.getMinecraft()); GL11.glPushMatrix(); + GlStateManager.disableLighting(); + GlStateManager.disableFog(); GlStateManager.color(1,1,1,1); GlStateManager.pushAttrib(); mainPanel.render0(scaledResolution, new Point(0, 0), new Rectangle(0, 0, scaledResolution.getScaledWidth(), scaledResolution.getScaledHeight()), mouseX, mouseY, mouseX, mouseY, partialTicks); diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/mechanicedit/ValueEditBreakableWall.java b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/mechanicedit/ValueEditBreakableWall.java index b8ac9d9c..f20709b9 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/mechanicedit/ValueEditBreakableWall.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/mechanicedit/ValueEditBreakableWall.java @@ -13,10 +13,10 @@ import kr.syeyoung.dungeonsguide.roomedit.valueedit.ValueEditCreator; import kr.syeyoung.dungeonsguide.utils.RenderUtils; import kr.syeyoung.dungeonsguide.utils.TextUtils; import net.minecraft.init.Blocks; -import scala.actors.threadpool.Arrays; import java.awt.*; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.Collections; diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/mechanicedit/ValueEditDoor.java b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/mechanicedit/ValueEditDoor.java index 3fa11dda..506b7e8a 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/mechanicedit/ValueEditDoor.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/mechanicedit/ValueEditDoor.java @@ -11,10 +11,10 @@ import kr.syeyoung.dungeonsguide.roomedit.valueedit.ValueEdit; import kr.syeyoung.dungeonsguide.roomedit.valueedit.ValueEditCreator; import kr.syeyoung.dungeonsguide.utils.TextUtils; import net.minecraft.init.Blocks; -import scala.actors.threadpool.Arrays; import java.awt.*; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; import java.util.List; diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/mechanicedit/ValueEditLever.java b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/mechanicedit/ValueEditLever.java index 499faf50..4c208068 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/mechanicedit/ValueEditLever.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/mechanicedit/ValueEditLever.java @@ -10,9 +10,9 @@ import kr.syeyoung.dungeonsguide.roomedit.elements.*; import kr.syeyoung.dungeonsguide.roomedit.valueedit.ValueEdit; import kr.syeyoung.dungeonsguide.roomedit.valueedit.ValueEditCreator; import kr.syeyoung.dungeonsguide.utils.TextUtils; -import scala.actors.threadpool.Arrays; import java.awt.*; +import java.util.Arrays; import java.util.Collections; public class ValueEditLever extends MPanel implements ValueEdit { diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/mechanicedit/ValueEditOnewayDoor.java b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/mechanicedit/ValueEditOnewayDoor.java index b1407a6e..31b2c6b5 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/mechanicedit/ValueEditOnewayDoor.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/mechanicedit/ValueEditOnewayDoor.java @@ -12,10 +12,10 @@ import kr.syeyoung.dungeonsguide.roomedit.valueedit.ValueEdit; import kr.syeyoung.dungeonsguide.roomedit.valueedit.ValueEditCreator; import kr.syeyoung.dungeonsguide.utils.TextUtils; import net.minecraft.init.Blocks; -import scala.actors.threadpool.Arrays; import java.awt.*; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; import java.util.List; diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/mechanicedit/ValueEditOnewayLever.java b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/mechanicedit/ValueEditOnewayLever.java index cda0df58..84bba521 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/mechanicedit/ValueEditOnewayLever.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/mechanicedit/ValueEditOnewayLever.java @@ -12,9 +12,9 @@ import kr.syeyoung.dungeonsguide.roomedit.elements.MValue; import kr.syeyoung.dungeonsguide.roomedit.valueedit.ValueEdit; import kr.syeyoung.dungeonsguide.roomedit.valueedit.ValueEditCreator; import kr.syeyoung.dungeonsguide.utils.TextUtils; -import scala.actors.threadpool.Arrays; import java.awt.*; +import java.util.Arrays; import java.util.Collections; public class ValueEditOnewayLever extends MPanel implements ValueEdit { diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/mechanicedit/ValueEditPressurePlate.java b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/mechanicedit/ValueEditPressurePlate.java index d9bf1971..03c2ae73 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/mechanicedit/ValueEditPressurePlate.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/mechanicedit/ValueEditPressurePlate.java @@ -12,9 +12,8 @@ import kr.syeyoung.dungeonsguide.roomedit.elements.MValue; import kr.syeyoung.dungeonsguide.roomedit.valueedit.ValueEdit; import kr.syeyoung.dungeonsguide.roomedit.valueedit.ValueEditCreator; import kr.syeyoung.dungeonsguide.utils.TextUtils; -import scala.actors.threadpool.Arrays; - import java.awt.*; +import java.util.Arrays; import java.util.Collections; public class ValueEditPressurePlate extends MPanel implements ValueEdit { diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/mechanicedit/ValueEditSecret.java b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/mechanicedit/ValueEditSecret.java index e2947bb8..bc153f10 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/mechanicedit/ValueEditSecret.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/mechanicedit/ValueEditSecret.java @@ -8,12 +8,10 @@ import kr.syeyoung.dungeonsguide.roomedit.Parameter; import kr.syeyoung.dungeonsguide.roomedit.elements.*; import kr.syeyoung.dungeonsguide.roomedit.valueedit.ValueEdit; import kr.syeyoung.dungeonsguide.roomedit.valueedit.ValueEditCreator; -import kr.syeyoung.dungeonsguide.utils.RenderUtils; import kr.syeyoung.dungeonsguide.utils.TextUtils; -import net.minecraft.util.BlockPos; -import scala.actors.threadpool.Arrays; import java.awt.*; +import java.util.Arrays; import java.util.Collections; public class ValueEditSecret extends MPanel implements ValueEdit { diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/mechanicedit/ValueEditTomb.java b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/mechanicedit/ValueEditTomb.java index 7fa63156..5f4f52fc 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/mechanicedit/ValueEditTomb.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/mechanicedit/ValueEditTomb.java @@ -13,9 +13,9 @@ import kr.syeyoung.dungeonsguide.roomedit.valueedit.ValueEditCreator; import kr.syeyoung.dungeonsguide.utils.RenderUtils; import kr.syeyoung.dungeonsguide.utils.TextUtils; import net.minecraft.util.BlockPos; -import scala.actors.threadpool.Arrays; import java.awt.*; +import java.util.Arrays; import java.util.Collections; public class ValueEditTomb extends MPanel implements ValueEdit { diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/valueedit/ValueEditBoolean.java b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/valueedit/ValueEditBoolean.java index d29ba49a..5954d857 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/valueedit/ValueEditBoolean.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/valueedit/ValueEditBoolean.java @@ -5,10 +5,9 @@ import kr.syeyoung.dungeonsguide.roomedit.Parameter; import kr.syeyoung.dungeonsguide.roomedit.elements.MLabel; import kr.syeyoung.dungeonsguide.roomedit.elements.MLabelAndElement; import kr.syeyoung.dungeonsguide.roomedit.elements.MStringSelectionButton; -import kr.syeyoung.dungeonsguide.roomedit.elements.MTextField; -import scala.actors.threadpool.Arrays; import java.awt.*; +import java.util.Arrays; public class ValueEditBoolean extends MPanel implements ValueEdit { private Parameter parameter; diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/valueedit/ValueEditOffsetPoint.java b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/valueedit/ValueEditOffsetPoint.java index ad11813e..19b90527 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/valueedit/ValueEditOffsetPoint.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/valueedit/ValueEditOffsetPoint.java @@ -10,8 +10,6 @@ import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.BlockPos; -import scala.actors.threadpool.Arrays; - import java.awt.*; public class ValueEditOffsetPoint extends MPanel implements ValueEdit { -- cgit