Update #48 - Added some features from OptiFine

sources/main/java/jdk_internal/bidi/Bidi.java

@@ -35,7 +35,7 @@
 
 package jdk_internal.bidi;
 
-import jdk_internal.bidi.icu.text.BidiBase;
+import jdk_internal.icu.text.BidiBase;
 
 /**
  * This class implements the Unicode Bidirectional Algorithm.

sources/main/java/jdk_internal/bidi/Normalizer.java

@@ -37,7 +37,7 @@
 
 package jdk_internal.bidi;
 
-import jdk_internal.bidi.icu.text.NormalizerBase;
+import jdk_internal.icu.text.NormalizerBase;
 
 /**
  * This class provides the method {@code normalize} which transforms Unicode

sources/main/java/jdk_internal/bidi/SunNormalizer.java

@@ -25,8 +25,8 @@
 
 package jdk_internal.bidi;
 
-import jdk_internal.bidi.icu.lang.UCharacter;
-import jdk_internal.bidi.icu.text.NormalizerBase;
+import jdk_internal.icu.lang.UCharacter;
+import jdk_internal.icu.text.NormalizerBase;
 
 /**
  * This Normalizer is for Unicode 3.2 support for IDNA only. Developers should

sources/main/java/jdk_internal/icu/impl/BMPSet.java

@@ -32,10 +32,10 @@
  ******************************************************************************
  */
 
-package jdk_internal.bidi.icu.impl;
+package jdk_internal.icu.impl;
 
-import jdk_internal.bidi.icu.text.UnicodeSet.SpanCondition;
-import jdk_internal.bidi.icu.util.OutputInt;
+import jdk_internal.icu.text.UnicodeSet.SpanCondition;
+import jdk_internal.icu.util.OutputInt;
 
 /**
  * Helper class for frozen UnicodeSets, implements contains() and span()

sources/main/java/jdk_internal/icu/impl/CharTrie.java

@@ -30,12 +30,12 @@
  ******************************************************************************
  */
 
-package jdk_internal.bidi.icu.impl;
+package jdk_internal.icu.impl;
 
 import java.io.DataInputStream;
 import java.io.InputStream;
 
-import jdk_internal.bidi.icu.text.UTF16;
+import jdk_internal.icu.text.UTF16;
 
 import java.io.IOException;
 

sources/main/java/jdk_internal/icu/impl/CharacterIteratorWrapper.java

@@ -35,10 +35,10 @@
  *******************************************************************************
  */
 
-package jdk_internal.bidi.icu.impl;
+package jdk_internal.icu.impl;
 
 import jdk_internal.bidi.CharacterIterator;
-import jdk_internal.bidi.icu.text.UCharacterIterator;
+import jdk_internal.icu.text.UCharacterIterator;
 
 /**
  * This class is a wrapper around CharacterIterator and implements the

sources/main/java/jdk_internal/icu/impl/ICUBinary.java

@@ -30,7 +30,7 @@
  *******************************************************************************
  */
 
-package jdk_internal.bidi.icu.impl;
+package jdk_internal.icu.impl;
 
 import java.io.DataInputStream;
 import java.io.InputStream;
@@ -40,7 +40,7 @@ import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.util.Arrays;
 
-import jdk_internal.bidi.icu.util.VersionInfo;
+import jdk_internal.icu.util.VersionInfo;
 import net.lax1dude.eaglercraft.v1_8.EagRuntime;
 
 public final class ICUBinary {

sources/main/java/jdk_internal/icu/impl/Norm2AllModes.java

@@ -30,11 +30,11 @@
  *******************************************************************************
  */
 
-package jdk_internal.bidi.icu.impl;
+package jdk_internal.icu.impl;
 
 import java.io.IOException;
 
-import jdk_internal.bidi.icu.text.Normalizer2;
+import jdk_internal.icu.text.Normalizer2;
 
 public final class Norm2AllModes {
 	// Public API dispatch via Normalizer2 subclasses -------------------------- ***

sources/main/java/jdk_internal/icu/impl/NormalizerImpl.java

@@ -29,16 +29,16 @@
  *   Corporation and others.  All Rights Reserved.
  *******************************************************************************
  */
-package jdk_internal.bidi.icu.impl;
+package jdk_internal.icu.impl;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
 
-import jdk_internal.bidi.icu.lang.UCharacter;
-import jdk_internal.bidi.icu.text.Normalizer2;
-import jdk_internal.bidi.icu.text.UTF16;
-import jdk_internal.bidi.icu.util.CodePointTrie;
-import jdk_internal.bidi.icu.util.VersionInfo;
+import jdk_internal.icu.lang.UCharacter;
+import jdk_internal.icu.text.Normalizer2;
+import jdk_internal.icu.text.UTF16;
+import jdk_internal.icu.util.CodePointTrie;
+import jdk_internal.icu.util.VersionInfo;
 
 // Original filename in ICU4J: Normalizer2Impl.java
 public final class NormalizerImpl {

sources/main/java/jdk_internal/icu/impl/Punycode.java

@@ -37,12 +37,12 @@
 //      2007-08-14 Martin Buchholz
 //          - remove redundant casts
 //
-package jdk_internal.bidi.icu.impl;
+package jdk_internal.icu.impl;
 
 import java.text.ParseException;
 
-import jdk_internal.bidi.icu.lang.UCharacter;
-import jdk_internal.bidi.icu.text.UTF16;
+import jdk_internal.icu.lang.UCharacter;
+import jdk_internal.icu.text.UTF16;
 
 /**
  * Ported code from ICU punycode.c

sources/main/java/jdk_internal/icu/impl/ReplaceableUCharacterIterator.java

@@ -35,11 +35,11 @@
  *******************************************************************************
  */
 
-package jdk_internal.bidi.icu.impl;
+package jdk_internal.icu.impl;
 
-import jdk_internal.bidi.icu.text.Replaceable;
-import jdk_internal.bidi.icu.text.ReplaceableString;
-import jdk_internal.bidi.icu.text.UCharacterIterator;
+import jdk_internal.icu.text.Replaceable;
+import jdk_internal.icu.text.ReplaceableString;
+import jdk_internal.icu.text.UCharacterIterator;
 
 /**
  * DLF docs must define behavior when Replaceable is mutated underneath the

sources/main/java/jdk_internal/icu/impl/StringPrepDataReader.java

@@ -39,7 +39,7 @@
 //          - copy this file from icu4jsrc_3_2/src/com/ibm/icu/impl/StringPrepDataReader.java
 //          - move from package com.ibm.icu.impl to package sun.net.idn
 //
-package jdk_internal.bidi.icu.impl;
+package jdk_internal.icu.impl;
 
 import java.io.DataInputStream;
 import java.io.IOException;

sources/main/java/jdk_internal/icu/impl/Trie.java

@@ -30,13 +30,13 @@
  ******************************************************************************
  */
 
-package jdk_internal.bidi.icu.impl;
+package jdk_internal.icu.impl;
 
 import java.io.DataInputStream;
 import java.io.InputStream;
 
-import jdk_internal.bidi.icu.lang.UCharacter;
-import jdk_internal.bidi.icu.text.UTF16;
+import jdk_internal.icu.lang.UCharacter;
+import jdk_internal.icu.text.UTF16;
 
 import java.io.IOException;
 

sources/main/java/jdk_internal/icu/impl/Trie2.java

@@ -30,7 +30,7 @@
  *******************************************************************************
  */
 
-package jdk_internal.bidi.icu.impl;
+package jdk_internal.icu.impl;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;

sources/main/java/jdk_internal/icu/impl/Trie2_16.java

@@ -30,7 +30,7 @@
  *******************************************************************************
  */
 
-package jdk_internal.bidi.icu.impl;
+package jdk_internal.icu.impl;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;

sources/main/java/jdk_internal/icu/impl/UBiDiProps.java

@@ -41,11 +41,12 @@
  *   Java port of ubidi_props.h/.c.
  */
 
-package jdk_internal.bidi.icu.impl;
+package jdk_internal.icu.impl;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
-import jdk_internal.bidi.icu.lang.UCharacter;
+
+import jdk_internal.icu.lang.UCharacter;
 
 public final class UBiDiProps {
 	// constructors etc. --------------------------------------------------- ***

sources/main/java/jdk_internal/icu/impl/UCharacterProperty.java

@@ -29,17 +29,17 @@
  *******************************************************************************
  */
 
-package jdk_internal.bidi.icu.impl;
+package jdk_internal.icu.impl;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.Iterator;
 
-import jdk_internal.bidi.icu.lang.UCharacter.HangulSyllableType;
-import jdk_internal.bidi.icu.lang.UCharacter.NumericType;
-import jdk_internal.bidi.icu.text.UTF16;
-import jdk_internal.bidi.icu.text.UnicodeSet;
-import jdk_internal.bidi.icu.util.VersionInfo;
+import jdk_internal.icu.lang.UCharacter.HangulSyllableType;
+import jdk_internal.icu.lang.UCharacter.NumericType;
+import jdk_internal.icu.text.UTF16;
+import jdk_internal.icu.text.UnicodeSet;
+import jdk_internal.icu.util.VersionInfo;
 
 /**
  * <p>

sources/main/java/jdk_internal/icu/impl/UnicodeSetStringSpan.java

@@ -32,14 +32,14 @@
  ******************************************************************************
  */
 
-package jdk_internal.bidi.icu.impl;
+package jdk_internal.icu.impl;
 
 import java.util.ArrayList;
 
-import jdk_internal.bidi.icu.text.UTF16;
-import jdk_internal.bidi.icu.text.UnicodeSet;
-import jdk_internal.bidi.icu.text.UnicodeSet.SpanCondition;
-import jdk_internal.bidi.icu.util.OutputInt;
+import jdk_internal.icu.text.UTF16;
+import jdk_internal.icu.text.UnicodeSet;
+import jdk_internal.icu.text.UnicodeSet.SpanCondition;
+import jdk_internal.icu.util.OutputInt;
 
 /*
  * Implement span() etc. for a set with strings.

sources/main/java/jdk_internal/icu/impl/Utility.java

@@ -29,13 +29,13 @@
  *******************************************************************************
  */
 
-package jdk_internal.bidi.icu.impl;
+package jdk_internal.icu.impl;
 
 import java.io.IOException;
 import java.util.Locale;
 
-import jdk_internal.bidi.icu.lang.UCharacter;
-import jdk_internal.bidi.icu.text.UTF16;
+import jdk_internal.icu.lang.UCharacter;
+import jdk_internal.icu.text.UTF16;
 
 public final class Utility {
 

sources/main/java/jdk_internal/icu/lang/UCharacter.java

@@ -30,13 +30,13 @@
 *******************************************************************************
 */
 
-package jdk_internal.bidi.icu.lang;
+package jdk_internal.icu.lang;
 
-import jdk_internal.bidi.icu.impl.UBiDiProps;
-import jdk_internal.bidi.icu.impl.UCharacterProperty;
-import jdk_internal.bidi.icu.text.Normalizer2;
-import jdk_internal.bidi.icu.text.UTF16;
-import jdk_internal.bidi.icu.util.VersionInfo;
+import jdk_internal.icu.impl.UBiDiProps;
+import jdk_internal.icu.impl.UCharacterProperty;
+import jdk_internal.icu.text.Normalizer2;
+import jdk_internal.icu.text.UTF16;
+import jdk_internal.icu.util.VersionInfo;
 
 /**
  * <p>

sources/main/java/jdk_internal/icu/lang/UCharacterDirection.java

@@ -35,7 +35,7 @@
 //          - move from package com.ibm.icu.lang to package sun.net.idn
 //
 
-package jdk_internal.bidi.icu.lang;
+package jdk_internal.icu.lang;
 
 /**
  * Enumerated Unicode character linguistic direction constants. Used as return

sources/main/java/jdk_internal/icu/lang/UCharacterEnums.java

@@ -51,7 +51,7 @@
 //              DIRECTIONALITY_BOUNDARY_NEUTRAL, DIRECTIONALITY_UNDEFINED
 //
 
-package jdk_internal.bidi.icu.lang;
+package jdk_internal.icu.lang;
 
 /**
  * A container for the different 'enumerated types' used by UCharacter.

sources/main/java/jdk_internal/icu/text/BidiBase.java

@@ -46,7 +46,7 @@
  * fallbacks for unsupported combinations.
  */
 
-package jdk_internal.bidi.icu.text;
+package jdk_internal.icu.text;
 
 import java.lang.reflect.Array;
 import java.util.Arrays;
@@ -55,8 +55,8 @@ import jdk_internal.bidi.AttributedCharacterIterator;
 import jdk_internal.bidi.Bidi;
 import jdk_internal.bidi.NumericShaper;
 import jdk_internal.bidi.TextAttribute;
-import jdk_internal.bidi.icu.impl.UBiDiProps;
-import jdk_internal.bidi.icu.lang.UCharacter;
+import jdk_internal.icu.impl.UBiDiProps;
+import jdk_internal.icu.lang.UCharacter;
 
 /**
  *

sources/main/java/jdk_internal/icu/text/BidiLine.java

@@ -33,7 +33,7 @@
  * (ported from C code written by Markus W. Scherer)
  */
 
-package jdk_internal.bidi.icu.text;
+package jdk_internal.icu.text;
 
 import java.util.Arrays;
 

sources/main/java/jdk_internal/icu/text/BidiRun.java

@@ -37,7 +37,7 @@
  * (ported from C code written by Markus W. Scherer)
  */
 
-package jdk_internal.bidi.icu.text;
+package jdk_internal.icu.text;
 
 /**
  * A BidiRun represents a sequence of characters at the same embedding level.

sources/main/java/jdk_internal/icu/text/BidiWriter.java

@@ -33,9 +33,9 @@
  * (ported from C code written by Markus W. Scherer)
  */
 
-package jdk_internal.bidi.icu.text;
+package jdk_internal.icu.text;
 
-import jdk_internal.bidi.icu.lang.UCharacter;
+import jdk_internal.icu.lang.UCharacter;
 
 final class BidiWriter {
 

sources/main/java/jdk_internal/icu/text/FilteredNormalizer2.java

@@ -29,7 +29,7 @@
 *   Corporation and others.  All Rights Reserved.
 *******************************************************************************
 */
-package jdk_internal.bidi.icu.text;
+package jdk_internal.icu.text;
 
 import java.io.IOException;
 

sources/main/java/jdk_internal/icu/text/Normalizer2.java

@@ -30,9 +30,9 @@
  *******************************************************************************
  */
 
-package jdk_internal.bidi.icu.text;
+package jdk_internal.icu.text;
 
-import jdk_internal.bidi.icu.impl.Norm2AllModes;
+import jdk_internal.icu.impl.Norm2AllModes;
 
 /**
  * Unicode normalization functionality for standard Unicode normalization or for

sources/main/java/jdk_internal/icu/text/NormalizerBase.java

@@ -29,11 +29,11 @@
  * others. All Rights Reserved.
  *******************************************************************************
  */
-package jdk_internal.bidi.icu.text;
+package jdk_internal.icu.text;
 
 import jdk_internal.bidi.CharacterIterator;
 import jdk_internal.bidi.Normalizer;
-import jdk_internal.bidi.icu.impl.Norm2AllModes;
+import jdk_internal.icu.impl.Norm2AllModes;
 
 /**
  * Unicode Normalization

sources/main/java/jdk_internal/icu/text/Replaceable.java

@@ -35,7 +35,7 @@
  *******************************************************************************
  */
 
-package jdk_internal.bidi.icu.text;
+package jdk_internal.icu.text;
 
 /**
  * <code>Replaceable</code> is an interface representing a string of characters

sources/main/java/jdk_internal/icu/text/ReplaceableString.java

@@ -30,7 +30,7 @@
  *******************************************************************************
  */
 
-package jdk_internal.bidi.icu.text;
+package jdk_internal.icu.text;
 
 /**
  * <code>ReplaceableString</code> is an adapter class that implements the

sources/main/java/jdk_internal/icu/text/StringPrep.java

@@ -40,7 +40,7 @@
 //      2007-08-14 Martin Buchholz
 //          - remove redundant casts
 //
-package jdk_internal.bidi.icu.text;
+package jdk_internal.icu.text;
 
 import java.io.BufferedInputStream;
 import java.io.ByteArrayInputStream;
@@ -50,12 +50,12 @@ import java.io.InputStream;
 import jdk_internal.bidi.Normalizer;
 import jdk_internal.bidi.ParseException;
 import jdk_internal.bidi.SunNormalizer;
-import jdk_internal.bidi.icu.impl.CharTrie;
-import jdk_internal.bidi.icu.impl.StringPrepDataReader;
-import jdk_internal.bidi.icu.impl.Trie;
-import jdk_internal.bidi.icu.lang.UCharacter;
-import jdk_internal.bidi.icu.lang.UCharacterDirection;
-import jdk_internal.bidi.icu.util.VersionInfo;
+import jdk_internal.icu.impl.CharTrie;
+import jdk_internal.icu.impl.StringPrepDataReader;
+import jdk_internal.icu.impl.Trie;
+import jdk_internal.icu.lang.UCharacter;
+import jdk_internal.icu.lang.UCharacterDirection;
+import jdk_internal.icu.util.VersionInfo;
 
 /**
  * StringPrep API implements the StingPrep framework as described by

sources/main/java/jdk_internal/icu/text/UCharacterIterator.java

@@ -30,12 +30,12 @@
  *******************************************************************************
  */
 
-package jdk_internal.bidi.icu.text;
+package jdk_internal.icu.text;
 
 import jdk_internal.bidi.CharacterIterator;
-import jdk_internal.bidi.icu.impl.CharacterIteratorWrapper;
-import jdk_internal.bidi.icu.impl.ReplaceableUCharacterIterator;
-import jdk_internal.bidi.icu.impl.UCharacterProperty;
+import jdk_internal.icu.impl.CharacterIteratorWrapper;
+import jdk_internal.icu.impl.ReplaceableUCharacterIterator;
+import jdk_internal.icu.impl.UCharacterProperty;
 
 /**
  * Abstract class that defines an API for iteration on text objects.This is an

sources/main/java/jdk_internal/icu/text/UTF16.java

@@ -29,9 +29,9 @@
  *******************************************************************************
  */
 
-package jdk_internal.bidi.icu.text;
+package jdk_internal.icu.text;
 
-import jdk_internal.bidi.icu.impl.UCharacterProperty;
+import jdk_internal.icu.impl.UCharacterProperty;
 
 /**
  * <p>

sources/main/java/jdk_internal/icu/text/UnicodeSet.java

@@ -29,19 +29,19 @@
  * others. All Rights Reserved.
  *******************************************************************************
  */
-package jdk_internal.bidi.icu.text;
+package jdk_internal.icu.text;
 
 import java.text.ParsePosition;
 import java.util.ArrayList;
 import java.util.TreeSet;
 
-import jdk_internal.bidi.icu.impl.BMPSet;
-import jdk_internal.bidi.icu.impl.UCharacterProperty;
-import jdk_internal.bidi.icu.impl.UnicodeSetStringSpan;
-import jdk_internal.bidi.icu.impl.Utility;
-import jdk_internal.bidi.icu.lang.UCharacter;
-import jdk_internal.bidi.icu.util.OutputInt;
-import jdk_internal.bidi.icu.util.VersionInfo;
+import jdk_internal.icu.impl.BMPSet;
+import jdk_internal.icu.impl.UCharacterProperty;
+import jdk_internal.icu.impl.UnicodeSetStringSpan;
+import jdk_internal.icu.impl.Utility;
+import jdk_internal.icu.lang.UCharacter;
+import jdk_internal.icu.util.OutputInt;
+import jdk_internal.icu.util.VersionInfo;
 
 /**
  * A mutable set of Unicode characters and multicharacter strings. Objects of

sources/main/java/jdk_internal/icu/util/CodePointMap.java

@@ -27,7 +27,7 @@
 
 // created: 2018may10 Markus W. Scherer
 
-package jdk_internal.bidi.icu.util;
+package jdk_internal.icu.util;
 
 import java.util.Iterator;
 import java.util.NoSuchElementException;

sources/main/java/jdk_internal/icu/util/CodePointTrie.java

@@ -27,9 +27,9 @@
 
 // created: 2018may04 Markus W. Scherer
 
-package jdk_internal.bidi.icu.util;
+package jdk_internal.icu.util;
 
-import static jdk_internal.bidi.icu.impl.NormalizerImpl.UTF16Plus;
+import static jdk_internal.icu.impl.NormalizerImpl.UTF16Plus;
 
 import java.io.DataOutputStream;
 import java.io.IOException;
@@ -38,7 +38,7 @@ import java.io.OutputStream;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 
-import jdk_internal.bidi.icu.impl.ICUBinary;
+import jdk_internal.icu.impl.ICUBinary;
 
 /**
  * Immutable Unicode code point trie. Fast, reasonably compact, map from Unicode

sources/main/java/jdk_internal/icu/util/OutputInt.java

@@ -29,7 +29,7 @@
  * others. All Rights Reserved.
  *******************************************************************************
  */
-package jdk_internal.bidi.icu.util;
+package jdk_internal.icu.util;
 
 /**
  * Simple struct-like class for int output parameters. Like

sources/main/java/jdk_internal/icu/util/VersionInfo.java

@@ -34,7 +34,7 @@
  *******************************************************************************
  */
 
-package jdk_internal.bidi.icu.util;
+package jdk_internal.icu.util;
 
 import java.util.HashMap;