diff options
author | My-Name-Is-Jeff <37018278+My-Name-Is-Jeff@users.noreply.github.com> | 2021-05-03 21:53:00 -0400 |
---|---|---|
committer | My-Name-Is-Jeff <37018278+My-Name-Is-Jeff@users.noreply.github.com> | 2021-05-03 21:53:00 -0400 |
commit | 70785f7afa63a1fe682f6e9f3d03b72ecc24b803 (patch) | |
tree | a61891a6711887777c3f47e5f4e75486fdbb8119 /src/main/java/kr/syeyoung/dungeonsguide/roomedit | |
parent | cc03ece233023c57118e9acfeca8103b3bb587e1 (diff) | |
download | Skyblock-Dungeons-Guide-70785f7afa63a1fe682f6e9f3d03b72ecc24b803.tar.gz Skyblock-Dungeons-Guide-70785f7afa63a1fe682f6e9f3d03b72ecc24b803.tar.bz2 Skyblock-Dungeons-Guide-70785f7afa63a1fe682f6e9f3d03b72ecc24b803.zip |
IntelliJ's Code Clean Up
Diffstat (limited to 'src/main/java/kr/syeyoung/dungeonsguide/roomedit')
32 files changed, 138 insertions, 136 deletions
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/EditingContext.java b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/EditingContext.java index ac4521c8..76f42430 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/EditingContext.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/EditingContext.java @@ -35,10 +35,10 @@ public class EditingContext { } @Getter - private DungeonRoom room; + private final DungeonRoom room; @Getter - private Stack<GuiScreen> guiStack = new Stack<GuiScreen>(); + private final Stack<GuiScreen> guiStack = new Stack<GuiScreen>(); public boolean isEditingSecrets() { return guiDungeonRoomEdit.isEditingSelected(); 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 da08a330..dd5cce49 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/gui/GuiDungeonAddSet.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/gui/GuiDungeonAddSet.java @@ -22,18 +22,18 @@ import java.util.List; public class GuiDungeonAddSet extends GuiScreen { - private MPanel mainPanel = new MPanel(); + private final MPanel mainPanel = new MPanel(); - private ValueEditOffsetPointSet valueEditOffsetPointSet; + private final ValueEditOffsetPointSet valueEditOffsetPointSet; - private MButton add; - private MButton back; + private final MButton add; + private final MButton back; @Getter - private OffsetPoint start; + private final OffsetPoint start; @Getter - private OffsetPoint end; + private final OffsetPoint end; public void onWorldRender(float partialTicks) { for (OffsetPoint pos:getBlockPoses()) { 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 9857b509..f54a0128 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/gui/GuiDungeonParameterEdit.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/gui/GuiDungeonParameterEdit.java @@ -22,17 +22,17 @@ import java.io.IOException; public class GuiDungeonParameterEdit extends GuiScreen { - private MPanel mainPanel = new MPanel(); + private final MPanel mainPanel = new MPanel(); - private Parameter parameter; - private DungeonRoom dungeonRoom; + private final Parameter parameter; + private final DungeonRoom dungeonRoom; private String classSelection; - private MPanel currentValueEdit; + private final MPanel currentValueEdit; - private MButton save; - private MButton delete; + private final MButton save; + private final MButton delete; @Getter private ValueEdit valueEdit; 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 f7638fc7..8989ab59 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/gui/GuiDungeonRoomEdit.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/gui/GuiDungeonRoomEdit.java @@ -17,13 +17,13 @@ import java.io.IOException; public class GuiDungeonRoomEdit extends GuiScreen { - private MPanel mainPanel = new MPanel(); + private final MPanel mainPanel = new MPanel(); - private DungeonRoom room; + private final DungeonRoom room; - private MTabbedPane tabbedPane; + private final MTabbedPane tabbedPane; @Getter - private SecretEditPane sep; + private final SecretEditPane sep; public GuiDungeonRoomEdit(DungeonRoom room) { this.room = room; 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 8601275c..e7565def 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/gui/GuiDungeonValueEdit.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/gui/GuiDungeonValueEdit.java @@ -22,7 +22,7 @@ import java.io.IOException; public class GuiDungeonValueEdit extends GuiScreen { - private MPanel mainPanel = new MPanel() { + private final MPanel mainPanel = new MPanel() { @Override public void onBoundsUpdate() { for (int i = 0; i < addons.size(); i++) { 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 3644f425..63449f91 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/mechanicedit/ValueEditBreakableWall.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/mechanicedit/ValueEditBreakableWall.java @@ -24,13 +24,13 @@ public class ValueEditBreakableWall extends MPanel implements ValueEdit<DungeonB // scroll pane // just create // add set - private DungeonBreakableWall dungeonBreakableWall; + private final DungeonBreakableWall dungeonBreakableWall; - private MLabel label; - private MValue<OffsetPointSet> value; - private MTextField preRequisite; - private MLabelAndElement preRequisite2; - private MButton updateOnlyAir; + private final MLabel label; + private final MValue<OffsetPointSet> value; + private final MTextField preRequisite; + private final MLabelAndElement preRequisite2; + private final MButton updateOnlyAir; public ValueEditBreakableWall(final Parameter parameter2) { this.parameter = parameter2; 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 aa9684ba..85f9353a 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/mechanicedit/ValueEditDoor.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/mechanicedit/ValueEditDoor.java @@ -24,15 +24,15 @@ public class ValueEditDoor extends MPanel implements ValueEdit<DungeonDoor> { // scroll pane // just create // add set - private DungeonDoor dungeonDoor; - - private MLabel label; - private MValue<OffsetPointSet> value; - private MTextField preRequisite; - private MLabelAndElement preRequisite_par; - private MTextField preRequisite2; - private MLabelAndElement preRequisite2_par; - private MButton updateOnlyAir; + private final DungeonDoor dungeonDoor; + + private final MLabel label; + private final MValue<OffsetPointSet> value; + private final MTextField preRequisite; + private final MLabelAndElement preRequisite_par; + private final MTextField preRequisite2; + private final MLabelAndElement preRequisite2_par; + private final MButton updateOnlyAir; public ValueEditDoor(final Parameter parameter2) { this.parameter = parameter2; diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/mechanicedit/ValueEditDummy.java b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/mechanicedit/ValueEditDummy.java index 73c3df8b..8ef3858e 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/mechanicedit/ValueEditDummy.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/mechanicedit/ValueEditDummy.java @@ -24,12 +24,12 @@ public class ValueEditDummy extends MPanel implements ValueEdit<DungeonDummy> { // scroll pane // just create // add set - private DungeonDummy dungeonSecret; + private final DungeonDummy dungeonSecret; - private MLabel label; - private MValue<OffsetPoint> value; - private MTextField preRequisite; - private MLabelAndElement preRequisite2; + private final MLabel label; + private final MValue<OffsetPoint> value; + private final MTextField preRequisite; + private final MLabelAndElement preRequisite2; public ValueEditDummy(final Parameter parameter2) { this.parameter = parameter2; diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/mechanicedit/ValueEditFairySoul.java b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/mechanicedit/ValueEditFairySoul.java index d16fb5bc..d4d5ecf5 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/mechanicedit/ValueEditFairySoul.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/mechanicedit/ValueEditFairySoul.java @@ -21,12 +21,12 @@ public class ValueEditFairySoul extends MPanel implements ValueEdit<DungeonFairy // scroll pane // just create // add set - private DungeonFairySoul dungeonSecret; + private final DungeonFairySoul dungeonSecret; - private MLabel label; - private MValue<OffsetPoint> value; - private MTextField preRequisite; - private MLabelAndElement preRequisite2; + private final MLabel label; + private final MValue<OffsetPoint> value; + private final MTextField preRequisite; + private final MLabelAndElement preRequisite2; public ValueEditFairySoul(final Parameter parameter2) { this.parameter = parameter2; diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/mechanicedit/ValueEditJournal.java b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/mechanicedit/ValueEditJournal.java index cc94278f..3440f0a7 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/mechanicedit/ValueEditJournal.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/mechanicedit/ValueEditJournal.java @@ -25,12 +25,12 @@ public class ValueEditJournal extends MPanel implements ValueEdit<DungeonJournal // scroll pane // just create // add set - private DungeonJournal dungeonSecret; + private final DungeonJournal dungeonSecret; - private MLabel label; - private MValue<OffsetPoint> value; - private MTextField preRequisite; - private MLabelAndElement preRequisite2; + private final MLabel label; + private final MValue<OffsetPoint> value; + private final MTextField preRequisite; + private final MLabelAndElement preRequisite2; public ValueEditJournal(final Parameter parameter2) { this.parameter = parameter2; 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 f9c0e91a..fdc3fde1 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/mechanicedit/ValueEditLever.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/mechanicedit/ValueEditLever.java @@ -20,14 +20,14 @@ public class ValueEditLever extends MPanel implements ValueEdit<DungeonLever> { // scroll pane // just create // add set - private DungeonLever dungeonLever; - - private MLabel label; - private MValue<OffsetPoint> value; - private MTextField preRequisite; - private MLabelAndElement preRequisite2; - private MTextField target; - private MLabelAndElement target2; + private final DungeonLever dungeonLever; + + private final MLabel label; + private final MValue<OffsetPoint> value; + private final MTextField preRequisite; + private final MLabelAndElement preRequisite2; + private final MTextField target; + private final MLabelAndElement target2; public ValueEditLever(final Parameter parameter2) { this.parameter = parameter2; diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/mechanicedit/ValueEditNPC.java b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/mechanicedit/ValueEditNPC.java index 49f45932..cad11f33 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/mechanicedit/ValueEditNPC.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/mechanicedit/ValueEditNPC.java @@ -25,12 +25,12 @@ public class ValueEditNPC extends MPanel implements ValueEdit<DungeonNPC> { // scroll pane // just create // add set - private DungeonNPC dungeonSecret; + private final DungeonNPC dungeonSecret; - private MLabel label; - private MValue<OffsetPoint> value; - private MTextField preRequisite; - private MLabelAndElement preRequisite2; + private final MLabel label; + private final MValue<OffsetPoint> value; + private final MTextField preRequisite; + private final MLabelAndElement preRequisite2; public ValueEditNPC(final Parameter parameter2) { this.parameter = parameter2; 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 7629360e..4e5dbb48 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/mechanicedit/ValueEditOnewayDoor.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/mechanicedit/ValueEditOnewayDoor.java @@ -24,13 +24,13 @@ public class ValueEditOnewayDoor extends MPanel implements ValueEdit<DungeonOnew // scroll pane // just create // add set - private DungeonOnewayDoor dungeonDoor; + private final DungeonOnewayDoor dungeonDoor; - private MLabel label; - private MValue<OffsetPointSet> value; - private MTextField preRequisite; - private MLabelAndElement preRequisite2; - private MButton updateOnlyAir; + private final MLabel label; + private final MValue<OffsetPointSet> value; + private final MTextField preRequisite; + private final MLabelAndElement preRequisite2; + private final MButton updateOnlyAir; public ValueEditOnewayDoor(final Parameter parameter2) { this.parameter = parameter2; 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 ec1702e5..67beb1df 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/mechanicedit/ValueEditOnewayLever.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/mechanicedit/ValueEditOnewayLever.java @@ -23,14 +23,14 @@ public class ValueEditOnewayLever extends MPanel implements ValueEdit<DungeonOne // scroll pane // just create // add set - private DungeonOnewayLever dungeonLever; - - private MLabel label; - private MValue<OffsetPoint> value; - private MTextField preRequisite; - private MLabelAndElement preRequisite2; - private MTextField target; - private MLabelAndElement target2; + private final DungeonOnewayLever dungeonLever; + + private final MLabel label; + private final MValue<OffsetPoint> value; + private final MTextField preRequisite; + private final MLabelAndElement preRequisite2; + private final MTextField target; + private final MLabelAndElement target2; public ValueEditOnewayLever(final Parameter parameter2) { 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 f52c8b69..4581b2e7 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/mechanicedit/ValueEditPressurePlate.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/mechanicedit/ValueEditPressurePlate.java @@ -22,14 +22,14 @@ public class ValueEditPressurePlate extends MPanel implements ValueEdit<DungeonP // scroll pane // just create // add set - private DungeonPressurePlate dungeonPressureplate; - - private MLabel label; - private MValue<OffsetPoint> value; - private MTextField preRequisite; - private MLabelAndElement preRequisite2; - private MTextField target; - private MLabelAndElement target2; + private final DungeonPressurePlate dungeonPressureplate; + + private final MLabel label; + private final MValue<OffsetPoint> value; + private final MTextField preRequisite; + private final MLabelAndElement preRequisite2; + private final MTextField target; + private final MLabelAndElement target2; public ValueEditPressurePlate(final Parameter parameter2) { 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 ceda3e6d..bbe4f81a 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/mechanicedit/ValueEditSecret.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/mechanicedit/ValueEditSecret.java @@ -20,13 +20,13 @@ public class ValueEditSecret extends MPanel implements ValueEdit<DungeonSecret> // scroll pane // just create // add set - private DungeonSecret dungeonSecret; + private final DungeonSecret dungeonSecret; - private MLabel label; - private MValue<OffsetPoint> value; - private MStringSelectionButton selectionButton; - private MTextField preRequisite; - private MLabelAndElement preRequisite2; + private final MLabel label; + private final MValue<OffsetPoint> value; + private final MStringSelectionButton selectionButton; + private final MTextField preRequisite; + private final MLabelAndElement preRequisite2; public ValueEditSecret(final Parameter parameter2) { this.parameter = parameter2; @@ -41,7 +41,7 @@ public class ValueEditSecret extends MPanel implements ValueEdit<DungeonSecret> value = new MValue(dungeonSecret.getSecretPoint(), Collections.emptyList()); add(value); - selectionButton = new MStringSelectionButton(Arrays.asList(new String[] {"CHEST", "BAT", "ITEM_DROP", "ESSENCE"}), dungeonSecret.getSecretType().name()); + selectionButton = new MStringSelectionButton(Arrays.asList("CHEST", "BAT", "ITEM_DROP", "ESSENCE"), dungeonSecret.getSecretType().name()); selectionButton.setOnUpdate(new Runnable() { @Override public void run() { 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 205c5431..5bd7e0b1 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/mechanicedit/ValueEditTomb.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/mechanicedit/ValueEditTomb.java @@ -20,12 +20,12 @@ public class ValueEditTomb extends MPanel implements ValueEdit<DungeonTomb> { // scroll pane // just create // add set - private DungeonTomb dungeonTomb; + private final DungeonTomb dungeonTomb; - private MLabel label; - private MValue<OffsetPointSet> value; - private MTextField preRequisite; - private MLabelAndElement preRequisite2; + private final MLabel label; + private final MValue<OffsetPointSet> value; + private final MTextField preRequisite; + private final MLabelAndElement preRequisite2; public ValueEditTomb(final Parameter parameter2) { this.parameter = parameter2; diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/panes/ActionDisplayPane.java b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/panes/ActionDisplayPane.java index 60e4995a..82716d2e 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/panes/ActionDisplayPane.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/panes/ActionDisplayPane.java @@ -9,12 +9,12 @@ import kr.syeyoung.dungeonsguide.gui.elements.*; import java.awt.*; public class ActionDisplayPane extends MPanel { - private DungeonRoom dungeonRoom; + private final DungeonRoom dungeonRoom; private ActionTreeDisplayPane displayPane; - private MTextField textField; - private MButton calculate; + private final MTextField textField; + private final MButton calculate; public ActionDisplayPane(final DungeonRoom dungeonRoom) { this.dungeonRoom = dungeonRoom; diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/panes/ActionTreeDisplayPane.java b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/panes/ActionTreeDisplayPane.java index a4f95e07..17256899 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/panes/ActionTreeDisplayPane.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/panes/ActionTreeDisplayPane.java @@ -24,8 +24,8 @@ public class ActionTreeDisplayPane extends MPanel { private float scale; - private DungeonRoom dungeonRoom; - private ActionTree tree; + private final DungeonRoom dungeonRoom; + private final ActionTree tree; private List<Action> linearified; public ActionTreeDisplayPane(DungeonRoom dungeonRoom, ActionTree tree) { this.dungeonRoom = dungeonRoom; diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/panes/GeneralEditPane.java b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/panes/GeneralEditPane.java index c23d7c0d..e424ed2c 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/panes/GeneralEditPane.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/panes/GeneralEditPane.java @@ -25,21 +25,21 @@ import java.util.UUID; import java.util.zip.GZIPOutputStream; public class GeneralEditPane extends MPanel { - private DungeonRoom dungeonRoom; + private final DungeonRoom dungeonRoom; - private MLabelAndElement uuid; - private MLabelAndElement name; - private MLabelAndElement secrets; + private final MLabelAndElement uuid; + private final MLabelAndElement name; + private final MLabelAndElement secrets; - private MLabelAndElement shape; - private MLabelAndElement rotation; - private MLabelAndElement shape2; + private final MLabelAndElement shape; + private final MLabelAndElement rotation; + private final MLabelAndElement shape2; private MButton save; - private MButton end; - private MButton schematic; + private final MButton end; + private final MButton schematic; - private MLabelAndElement roomProcessor; + private final MLabelAndElement roomProcessor; public GeneralEditPane(final DungeonRoom dungeonRoom) { this.dungeonRoom = dungeonRoom; diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/panes/ProcessorParameterEditPane.java b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/panes/ProcessorParameterEditPane.java index 9ea8cf79..d9ea3cd7 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/panes/ProcessorParameterEditPane.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/panes/ProcessorParameterEditPane.java @@ -16,11 +16,11 @@ import java.util.Map; import java.util.UUID; public class ProcessorParameterEditPane extends MPanel implements DynamicEditor { - private DungeonRoom dungeonRoom; + private final DungeonRoom dungeonRoom; private MButton save; private MButton create; - private List<MParameter> parameters = new ArrayList<MParameter>(); + private final List<MParameter> parameters = new ArrayList<MParameter>(); public ProcessorParameterEditPane(DungeonRoom dungeonRoom) { this.dungeonRoom = dungeonRoom; diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/panes/RoomDataDisplayPane.java b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/panes/RoomDataDisplayPane.java index ac2c55b2..47c0ac35 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/panes/RoomDataDisplayPane.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/panes/RoomDataDisplayPane.java @@ -21,7 +21,7 @@ public class RoomDataDisplayPane extends MPanel { private int selectedX = -1; private int selectedY = -1; - private DungeonRoom dungeonRoom; + private final DungeonRoom dungeonRoom; public RoomDataDisplayPane(DungeonRoom dungeonRoom) { this.dungeonRoom = dungeonRoom; } diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/panes/RoomMatchDisplayPane.java b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/panes/RoomMatchDisplayPane.java index d8463ad9..025e3631 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/panes/RoomMatchDisplayPane.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/panes/RoomMatchDisplayPane.java @@ -23,9 +23,10 @@ public class RoomMatchDisplayPane extends MPanel { private int offsetX = 0; private int offsetY = 0; - private DungeonRoom dungeonRoom; + private final DungeonRoom dungeonRoom; - private int[][] currentBlocks, targetBlocks; + private final int[][] currentBlocks; + private int[][] targetBlocks; public RoomMatchDisplayPane(DungeonRoom dungeonRoom, UUID uid, int rotation) { this.dungeonRoom = dungeonRoom; @@ -84,7 +85,7 @@ public class RoomMatchDisplayPane extends MPanel { fr.drawString("N", x *16 +10 + offsetX, z *16 +10 + offsetY,0xFFFF0000); } if (z == hoverY && x == hoverX) { - RenderUtils.drawHoveringText(Arrays.asList(new String[] {"Expected "+data2 +" But found "+data1}), relMousex0, relMousey0, fr); + RenderUtils.drawHoveringText(Arrays.asList("Expected "+data2 +" But found "+data1), relMousex0, relMousey0, fr); } } } diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/panes/RoommatchingPane.java b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/panes/RoommatchingPane.java index 1bb143ef..3f7da488 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/panes/RoommatchingPane.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/panes/RoommatchingPane.java @@ -9,12 +9,12 @@ import java.awt.*; import java.util.UUID; public class RoommatchingPane extends MPanel { - private DungeonRoom dungeonRoom; + private final DungeonRoom dungeonRoom; private RoomMatchDisplayPane displayPane; - private MTextField textField; - private MButton calculate; + private final MTextField textField; + private final MButton calculate; public RoommatchingPane(final DungeonRoom dungeonRoom) { this.dungeonRoom = dungeonRoom; diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/panes/SecretEditPane.java b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/panes/SecretEditPane.java index 6225f133..5240eb41 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/panes/SecretEditPane.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/panes/SecretEditPane.java @@ -17,13 +17,13 @@ import java.util.Map; import java.util.UUID; public class SecretEditPane extends MPanel implements DynamicEditor { - private DungeonRoom dungeonRoom; + private final DungeonRoom dungeonRoom; private MButton save; private MButton create; - private List<MParameter> parameters = new ArrayList<MParameter>(); + private final List<MParameter> parameters = new ArrayList<MParameter>(); - private List<String> allowedClasses = new ArrayList<String>(); + private final List<String> allowedClasses = new ArrayList<String>(); public SecretEditPane(DungeonRoom dungeonRoom) { this.dungeonRoom = dungeonRoom; diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/valueedit/ValueEdit.java b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/valueedit/ValueEdit.java index 5025132d..bd939f2d 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/valueedit/ValueEdit.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/valueedit/ValueEdit.java @@ -3,7 +3,7 @@ package kr.syeyoung.dungeonsguide.roomedit.valueedit; import kr.syeyoung.dungeonsguide.roomedit.Parameter; public interface ValueEdit<T extends Object> { - public void setParameter(Parameter parameter); + void setParameter(Parameter parameter); - public void renderWorld(float partialTicks); + void renderWorld(float partialTicks); } diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/valueedit/ValueEditAColor.java b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/valueedit/ValueEditAColor.java index fe711ad7..d0b4839c 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/valueedit/ValueEditAColor.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/valueedit/ValueEditAColor.java @@ -110,7 +110,7 @@ public class ValueEditAColor extends MPanel implements ValueEdit<AColor> { } } - private float[] hsv = new float[3]; + private final float[] hsv = new float[3]; private float alpha = 0; public void update() { @@ -139,7 +139,7 @@ public class ValueEditAColor extends MPanel implements ValueEdit<AColor> { GlStateManager.enableBlend(); GlStateManager.disableDepth(); GlStateManager.disableTexture2D(); - GlStateManager.disableCull();; + GlStateManager.disableCull(); GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); // worldrenderer.begin(GL11.GL_TRIANGLES, DefaultVertexFormats.POSITION_COLOR); 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 b485986c..bfb8b1c8 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/valueedit/ValueEditBoolean.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/valueedit/ValueEditBoolean.java @@ -28,7 +28,7 @@ public class ValueEditBoolean extends MPanel implements ValueEdit<Boolean> { } { boolean newData = (Boolean) parameter.getNewData(); - final MStringSelectionButton textField = new MStringSelectionButton(Arrays.asList(new String[] {"true", "false"}), Boolean.toString(newData)); + final MStringSelectionButton textField = new MStringSelectionButton(Arrays.asList("true", "false"), Boolean.toString(newData)); textField.setOnUpdate(new Runnable() { @Override public void run() { diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/valueedit/ValueEditColor.java b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/valueedit/ValueEditColor.java index c39c2179..23a4ac7d 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/valueedit/ValueEditColor.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/valueedit/ValueEditColor.java @@ -92,7 +92,7 @@ public class ValueEditColor extends MPanel implements ValueEdit<Color> { } } - private float[] hsv = new float[3]; + private final float[] hsv = new float[3]; public void update() { if (hsv[2] > 1) hsv[2] = 1; diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/valueedit/ValueEditCreator.java b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/valueedit/ValueEditCreator.java index 2991e03e..4f3a78d9 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/valueedit/ValueEditCreator.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/valueedit/ValueEditCreator.java @@ -3,9 +3,9 @@ package kr.syeyoung.dungeonsguide.roomedit.valueedit; import kr.syeyoung.dungeonsguide.roomedit.Parameter; public interface ValueEditCreator<T extends ValueEdit> { - public T createValueEdit(Parameter parameter); + T createValueEdit(Parameter parameter); - public Object createDefaultValue(Parameter parameter); + Object createDefaultValue(Parameter parameter); - public Object cloneObj(Object object); + Object cloneObj(Object object); } diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/valueedit/ValueEditOffsetPointSet.java b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/valueedit/ValueEditOffsetPointSet.java index bf26c3ea..1d071a83 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/valueedit/ValueEditOffsetPointSet.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/valueedit/ValueEditOffsetPointSet.java @@ -24,11 +24,12 @@ public class ValueEditOffsetPointSet extends MPanel implements ValueEdit<OffsetP // just create // add set - private MPanel scroll; + private final MPanel scroll; @Getter - private List<MPanel> MParameters = new ArrayList<MPanel>(); + private final List<MPanel> MParameters = new ArrayList<MPanel>(); - private MButton add, addSet; + private final MButton add; + private final MButton addSet; public void delete(OffsetPoint offsetPoint) { ((OffsetPointSet)parameter.getNewData()).getOffsetPointList().remove(offsetPoint); diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/valueedit/ValueEditRegistry.java b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/valueedit/ValueEditRegistry.java index 4437088e..eca46ec9 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/valueedit/ValueEditRegistry.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/valueedit/ValueEditRegistry.java @@ -13,7 +13,7 @@ import java.util.List; import java.util.Map; public class ValueEditRegistry { - private static Map<String, ValueEditCreator> valueEditMap = new HashMap<String, ValueEditCreator>(); + private static final Map<String, ValueEditCreator> valueEditMap = new HashMap<String, ValueEditCreator>(); public static ValueEditCreator getValueEditMap(String className) { return valueEditMap.get(className); |