aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/at/hannibal2/skyhanni/config/gui
diff options
context:
space:
mode:
authorLorenz <lo.scherf@gmail.com>2022-08-22 02:32:27 +0200
committerLorenz <lo.scherf@gmail.com>2022-08-22 02:32:27 +0200
commit1021280302d684071a9bde3cf274a16913eb48ec (patch)
tree43acec5e4ef3eab725ef11ee3ad39dfe673cf8a5 /src/main/java/at/hannibal2/skyhanni/config/gui
parentad946bccdb1dd666f2648434ed3653eaf0b137a1 (diff)
downloadskyhanni-1021280302d684071a9bde3cf274a16913eb48ec.tar.gz
skyhanni-1021280302d684071a9bde3cf274a16913eb48ec.tar.bz2
skyhanni-1021280302d684071a9bde3cf274a16913eb48ec.zip
removed /ii and created /copyitem
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/config/gui')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/gui/commands/Commands.java16
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/gui/utils/Utils.java71
2 files changed, 17 insertions, 70 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/config/gui/commands/Commands.java b/src/main/java/at/hannibal2/skyhanni/config/gui/commands/Commands.java
index cf2271eb9..17609296e 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/gui/commands/Commands.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/gui/commands/Commands.java
@@ -3,8 +3,9 @@ package at.hannibal2.skyhanni.config.gui.commands;
import at.hannibal2.skyhanni.SkyHanniMod;
import at.hannibal2.skyhanni.config.gui.config.ConfigEditor;
import at.hannibal2.skyhanni.config.gui.core.GuiScreenElementWrapper;
-import at.hannibal2.skyhanni.test.CopyNearbyEntitiesCommand;
import at.hannibal2.skyhanni.test.LorenzTest;
+import at.hannibal2.skyhanni.test.command.CopyItemCommand;
+import at.hannibal2.skyhanni.test.command.CopyNearbyEntitiesCommand;
import net.minecraft.command.ICommandSender;
import net.minecraftforge.client.ClientCommandHandler;
import org.apache.commons.lang3.StringUtils;
@@ -46,33 +47,32 @@ public class Commands {
}
)
);
-
ClientCommandHandler.instance.registerCommand(
new SimpleCommand(
- "ii",
+ "testhanni",
new SimpleCommand.ProcessCommandRunnable() {
public void processCommand(ICommandSender sender, String[] args) {
- LorenzTest.Companion.printLore();
+ LorenzTest.Companion.testCommand(args);
}
}
)
);
ClientCommandHandler.instance.registerCommand(
new SimpleCommand(
- "testhanni",
+ "copyentities",
new SimpleCommand.ProcessCommandRunnable() {
public void processCommand(ICommandSender sender, String[] args) {
- LorenzTest.Companion.testCommand(args);
+ CopyNearbyEntitiesCommand.INSTANCE.command(args);
}
}
)
);
ClientCommandHandler.instance.registerCommand(
new SimpleCommand(
- "copyentities",
+ "copyitem",
new SimpleCommand.ProcessCommandRunnable() {
public void processCommand(ICommandSender sender, String[] args) {
- CopyNearbyEntitiesCommand.INSTANCE.command(args);
+ CopyItemCommand.INSTANCE.command(args);
}
}
)
diff --git a/src/main/java/at/hannibal2/skyhanni/config/gui/utils/Utils.java b/src/main/java/at/hannibal2/skyhanni/config/gui/utils/Utils.java
index 6b5bb8097..51ffd0c8d 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/gui/utils/Utils.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/gui/utils/Utils.java
@@ -1,13 +1,5 @@
package at.hannibal2.skyhanni.config.gui.utils;
-import java.awt.*;
-import java.awt.datatransfer.StringSelection;
-import java.math.RoundingMode;
-import java.nio.FloatBuffer;
-import java.text.DecimalFormat;
-import java.text.DecimalFormatSymbols;
-import java.util.LinkedList;
-import java.util.Locale;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.FontRenderer;
import net.minecraft.client.gui.ScaledResolution;
@@ -26,6 +18,15 @@ import org.lwjgl.BufferUtils;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL14;
+import java.awt.*;
+import java.awt.datatransfer.StringSelection;
+import java.math.RoundingMode;
+import java.nio.FloatBuffer;
+import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
+import java.util.LinkedList;
+import java.util.Locale;
+
public class Utils {
private static final LinkedList<Integer> guiScales = new LinkedList<>();
@@ -70,60 +71,6 @@ public class Utils {
return tag != null && tag.hasKey("drill_fuel");
}
- public static int whatRomanNumeral(String roman) {
- switch (roman.toLowerCase()) {
- case "i":
- return 1;
- case "ii":
- return 2;
- case "iii":
- return 3;
- case "iv":
- return 4;
- case "v":
- return 5;
- case "vi":
- return 6;
- case "vii":
- return 7;
- case "viii":
- return 8;
- case "ix":
- return 9;
- case "x":
- return 10;
- default:
- return 0;
- }
- }
-
- public static String intToRomanNumeral(int i) {
- switch (i) {
- case 1:
- return "I";
- case 2:
- return "II";
- case 3:
- return "III";
- case 4:
- return "IV";
- case 5:
- return "V";
- case 6:
- return "VI";
- case 7:
- return "VII";
- case 8:
- return "VIII";
- case 9:
- return "IX";
- case 10:
- return "X";
- default:
- return "";
- }
- }
-
public static boolean overlayShouldRender(RenderGameOverlayEvent.ElementType type, boolean... booleans) {
return overlayShouldRender(false, type, RenderGameOverlayEvent.ElementType.HOTBAR, booleans);
}