From 6afd56b8eada9c980c5f164274b658578e34650d Mon Sep 17 00:00:00 2001 From: Jared Date: Thu, 20 Oct 2016 17:16:38 +0200 Subject: [PATCH] Removed old java 8 remnants --- .../com/blamejared/ctgui/api/GuiBase.java | 3 ++ .../blamejared/ctgui/reference/Reference.java | 4 +- .../minetweaker/mc1102/MineTweakerMod.java | 18 ++++---- .../zenscript/annotations/Optional.java | 5 +-- .../stanhebben/zenscript/util/StringUtil.java | 45 +++++++++---------- 5 files changed, 36 insertions(+), 39 deletions(-) diff --git a/MineTweaker3-MC1102-Main/src/main/java/com/blamejared/ctgui/api/GuiBase.java b/MineTweaker3-MC1102-Main/src/main/java/com/blamejared/ctgui/api/GuiBase.java index 02fd9ed..37599bd 100644 --- a/MineTweaker3-MC1102-Main/src/main/java/com/blamejared/ctgui/api/GuiBase.java +++ b/MineTweaker3-MC1102-Main/src/main/java/com/blamejared/ctgui/api/GuiBase.java @@ -131,6 +131,7 @@ public abstract class GuiBase extends GuiContainer { if (rectangle.contains(mouseX, mouseY)) { switch (mouseButton) { case 0: + break; case 1: if (slot.getHasStack()) { clickedSlot[0] = true; @@ -146,6 +147,7 @@ public abstract class GuiBase extends GuiContainer { menu.getFromMap(slot.getPropertyMap(), slot.getProperties()); } } + break; case 2: clickedSlot[0] = true; selectedSlot = null; @@ -160,6 +162,7 @@ public abstract class GuiBase extends GuiContainer { } if (editingField != null) editingField.setText(""); + break; } } diff --git a/MineTweaker3-MC1102-Main/src/main/java/com/blamejared/ctgui/reference/Reference.java b/MineTweaker3-MC1102-Main/src/main/java/com/blamejared/ctgui/reference/Reference.java index fa8f5ac..3bf9fd1 100644 --- a/MineTweaker3-MC1102-Main/src/main/java/com/blamejared/ctgui/reference/Reference.java +++ b/MineTweaker3-MC1102-Main/src/main/java/com/blamejared/ctgui/reference/Reference.java @@ -2,8 +2,8 @@ package com.blamejared.ctgui.reference; public class Reference { - public static final String MOD_ID = "mtrecipe"; - public static final String MOD_NAME = "MTRecipe"; + public static final String MOD_ID = "ctgui"; + public static final String MOD_NAME = "CT-GUI"; public static final String VERSION = "1.0.0"; } diff --git a/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/MineTweakerMod.java b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/MineTweakerMod.java index dbf14c1..bda8252 100644 --- a/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/MineTweakerMod.java +++ b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/MineTweakerMod.java @@ -37,12 +37,10 @@ import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod.EventHandler; -import net.minecraftforge.fml.common.discovery.ASMDataTable; import net.minecraftforge.fml.common.event.*; import net.minecraftforge.fml.common.network.NetworkRegistry; import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper; import net.minecraftforge.fml.relauncher.Side; -import stanhebben.zenscript.annotations.ZenExpansion; import java.io.File; import java.lang.reflect.InvocationTargetException; @@ -113,14 +111,14 @@ public class MineTweakerMod { public void onLoad(FMLPreInitializationEvent ev) { MinecraftForge.EVENT_BUS.register(new ForgeEventHandler()); FMLCommonHandler.instance().bus().register(new FMLEventHandler()); - for (ASMDataTable.ASMData data : ev.getAsmData().getAll(ZenExpansion.class.getCanonicalName())) { - try { - Class asmClass = Class.forName(data.getClassName()); - MineTweakerAPI.registerClass(asmClass); - } catch (ClassNotFoundException e) { - e.printStackTrace(); - } - } +// for (ASMDataTable.ASMData data : ev.getAsmData().getAll(ZenExpansion.class.getCanonicalName())) { +// try { +// Class asmClass = Class.forName(data.getClassName()); +// MineTweakerAPI.registerClass(asmClass); +// } catch (ClassNotFoundException e) { +// e.printStackTrace(); +// } +// } } diff --git a/ZenScript/src/main/java/stanhebben/zenscript/annotations/Optional.java b/ZenScript/src/main/java/stanhebben/zenscript/annotations/Optional.java index 4d55501..f42c03a 100644 --- a/ZenScript/src/main/java/stanhebben/zenscript/annotations/Optional.java +++ b/ZenScript/src/main/java/stanhebben/zenscript/annotations/Optional.java @@ -1,9 +1,6 @@ package stanhebben.zenscript.annotations; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; +import java.lang.annotation.*; /** * Denotes that this parameter is optional. Inside the script, this parameter diff --git a/ZenScript/src/main/java/stanhebben/zenscript/util/StringUtil.java b/ZenScript/src/main/java/stanhebben/zenscript/util/StringUtil.java index d91be3a..8d7746f 100644 --- a/ZenScript/src/main/java/stanhebben/zenscript/util/StringUtil.java +++ b/ZenScript/src/main/java/stanhebben/zenscript/util/StringUtil.java @@ -13,7 +13,6 @@ import java.util.ArrayList; import java.util.List; /** - * * @author Stanneke */ public class StringUtil { @@ -52,7 +51,7 @@ public class StringUtil { * If a set of methods is available and none matches, this method creates a * suitable message. * - * @param methods matching methods + * @param methods matching methods * @param arguments calling arguments * @return return value */ @@ -85,7 +84,7 @@ public class StringUtil { /** * Splits a string in parts, given a specified delimiter. * - * @param value string to be split + * @param value string to be split * @param delimiter delimiter * @return */ @@ -95,7 +94,8 @@ public class StringUtil { ArrayList result = new ArrayList(); int start = 0; - outer: for (int i = 0; i < value.length(); i++) { + outer: + for (int i = 0; i < value.length(); i++) { if (value.charAt(i) == delimiter) { result.add(value.substring(start, i)); start = i + 1; @@ -140,50 +140,49 @@ public class StringUtil { // ######################## /** - * * unescape_perl_string() - * + *

* Tom Christiansen Sun Nov 28 12:55:24 MST 2010 - * + *

* It's completely ridiculous that there's no standard unescape_java_string * function. Since I have to do the damn thing myself, I might as well make * it halfway useful by supporting things Java was too stupid to consider in * strings: - * + *

* => "?" items are additions to Java string escapes but normal in Java * regexes - * + *

* => "!" items are also additions to Java regex escapes - * + *

* Standard singletons: ?\a ?\e \f \n \r \t - * + *

* NB: \b is unsupported as backspace so it can pass-through to the regex * translator untouched; I refuse to make anyone doublebackslash it as * doublebackslashing is a Java idiocy I desperately wish would die out. * There are plenty of other ways to write it: - * + *

* \cH, \12, \012, \x08 \x{8}, \u0008, \U00000008 - * + *

* Octal escapes: \0 \0N \0NN \N \NN \NNN Can range up to !\777 not \377 - * + *

* TODO: add !\o{NNNNN} last Unicode is 4177777 maxint is 37777777777 - * + *

* Control chars: ?\cX Means: ord(X) ^ ord('@') - * + *

* Old hex escapes: \xXX unbraced must be 2 xdigits - * + *

* Perl hex escapes: !\x{XXX} braced may be 1-8 xdigits NB: proper Unicode * never needs more than 6, as highest valid codepoint is 0x10FFFF, not * maxint 0xFFFFFFFF - * + *

* Lame Java escape: \[IDIOT JAVA PREPROCESSOR]uXXXX must be exactly 4 * xdigits; - * + *

* I can't write XXXX in this comment where it belongs because the damned * Java Preprocessor can't mind its own business. Idiots! - * + *

* Lame Python escape: !\UXXXXXXXX must be exactly 8 xdigits - * + *

* TODO: Perl translation escapes: \Q \U \L \E \[IDIOT JAVA PREPROCESSOR]u * \l These are not so important to cover if you're passing the result to * Pattern.compile(), since it handles them for you further downstream. Hm, @@ -202,7 +201,7 @@ public class StringUtil { oldstr = oldstr.substring(1, oldstr.length() - 1); /* - * In contrast to fixing Java's broken regex charclasses, this one need + * In contrast to fixing Java's broken regex charclasses, this one need * be no bigger, as unescaping shrinks the string here, where in the * other one, it grows it. */ @@ -266,7 +265,7 @@ public class StringUtil { break; /* switch */ /* - * A "control" character is what you get when you xor its + * A "control" character is what you get when you xor its * codepoint with '@'==64. This only makes sense for ASCII, and * may not yield a "control" character after all. *