mirror of
https://github.com/GTNewHorizons/NotEnoughItems.git
synced 2026-11-20 20:22:17 +00:00
Intellij suggested changes
This commit is contained in:
1 parent
e3462ac9c9
commit
05b5fa7baf
80 files changed
+479
-487
No files matched your search
@@ -15,10 +15,10 @@ import static codechicken.lib.gui.GuiDraw.drawString;
|
||||
|
||||
public abstract class OptionStringSet extends Option
|
||||
{
|
||||
public LinkedList<String> options = new LinkedList<String>();
|
||||
public Multimap<String, String> dependants = ArrayListMultimap.create();
|
||||
public Map<String, String> dependancies = new HashMap<String, String>();
|
||||
public Multimap<String, String> groups = ArrayListMultimap.create();
|
||||
public final LinkedList<String> options = new LinkedList<>();
|
||||
public final Multimap<String, String> dependants = ArrayListMultimap.create();
|
||||
public final Map<String, String> dependancies = new HashMap<>();
|
||||
public final Multimap<String, String> groups = ArrayListMultimap.create();
|
||||
|
||||
public OptionStringSet(String name) {
|
||||
super(name);
|
||||
@@ -76,14 +76,13 @@ public abstract class OptionStringSet extends Option
|
||||
List<String> values = values();
|
||||
for (String option : options) {
|
||||
if (new Rectangle4i(x, 0, 20, 20).contains(mousex, mousey)) {
|
||||
String s = option;
|
||||
boolean set = values.contains(s);
|
||||
boolean set = values.contains(option);
|
||||
if (button == 0 && !set) {
|
||||
setValue(s);
|
||||
setValue(option);
|
||||
return true;
|
||||
}
|
||||
if (button == 1 && set) {
|
||||
remValue(s);
|
||||
remValue(option);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
@@ -105,7 +104,7 @@ public abstract class OptionStringSet extends Option
|
||||
for (String grp : groups.get(s))
|
||||
setValue(grp);
|
||||
} else {
|
||||
List<String> setUtils = new LinkedList<String>(values());
|
||||
List<String> setUtils = new LinkedList<>(values());
|
||||
setUtils.add(s);
|
||||
setValues(setUtils);
|
||||
}
|
||||
@@ -119,7 +118,7 @@ public abstract class OptionStringSet extends Option
|
||||
for (String grp : groups.get(s))
|
||||
remValue(grp);
|
||||
} else {
|
||||
List<String> values = new LinkedList<String>(values());
|
||||
List<String> values = new LinkedList<>(values());
|
||||
values.remove(s);
|
||||
setValues(values);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user