Merge tiny1 and tiny2 packages

FabricMC · May 6, 2023 · 73f257b · 73f257b
1 parent c229484
commit 73f257b
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 10 deletions.
diff --git a/src/main/java/net/fabricmc/mappingio/MappingReader.java b/src/main/java/net/fabricmc/mappingio/MappingReader.java
@@ -31,8 +31,8 @@
 import net.fabricmc.mappingio.format.enigma.EnigmaFileReader;
 import net.fabricmc.mappingio.format.proguard.ProGuardFileReader;
 import net.fabricmc.mappingio.format.srg.SrgFileReader;
-import net.fabricmc.mappingio.format.tiny1.Tiny1FileReader;
-import net.fabricmc.mappingio.format.tiny2.Tiny2FileReader;
+import net.fabricmc.mappingio.format.tiny.Tiny1FileReader;
+import net.fabricmc.mappingio.format.tiny.Tiny2FileReader;
 import net.fabricmc.mappingio.format.tsrg.TsrgFileReader;
 
 public final class MappingReader {

diff --git a/src/main/java/net/fabricmc/mappingio/MappingWriter.java b/src/main/java/net/fabricmc/mappingio/MappingWriter.java
@@ -26,8 +26,8 @@
 import net.fabricmc.mappingio.format.enigma.EnigmaDirWriter;
 import net.fabricmc.mappingio.format.enigma.EnigmaFileWriter;
 import net.fabricmc.mappingio.format.proguard.ProGuardFileWriter;
-import net.fabricmc.mappingio.format.tiny1.Tiny1FileWriter;
-import net.fabricmc.mappingio.format.tiny2.Tiny2FileWriter;
+import net.fabricmc.mappingio.format.tiny.Tiny1FileWriter;
+import net.fabricmc.mappingio.format.tiny.Tiny2FileWriter;
 
 public interface MappingWriter extends Closeable, MappingVisitor {
 	static MappingWriter create(Path file, MappingFormat format) throws IOException {

diff --git a/src/main/java/net/fabricmc/mappingio/format/ColumnFileReader.java b/src/main/java/net/fabricmc/mappingio/format/ColumnFileReader.java
@@ -23,7 +23,7 @@
 
 import org.jetbrains.annotations.ApiStatus;
 
-import net.fabricmc.mappingio.format.tiny2.Tiny2Util;
+import net.fabricmc.mappingio.format.tiny.Tiny2Util;
 
 @ApiStatus.Internal
 public final class ColumnFileReader implements Closeable {

diff --git a/...ppingio/format/tiny1/Tiny1FileReader.java → ...appingio/format/tiny/Tiny1FileReader.java b/...ppingio/format/tiny1/Tiny1FileReader.java → ...appingio/format/tiny/Tiny1FileReader.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.mappingio.format.tiny1;
+package net.fabricmc.mappingio.format.tiny;
 
 import java.io.IOException;
 import java.io.Reader;

diff --git a/...ppingio/format/tiny1/Tiny1FileWriter.java → ...appingio/format/tiny/Tiny1FileWriter.java b/...ppingio/format/tiny1/Tiny1FileWriter.java → ...appingio/format/tiny/Tiny1FileWriter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.mappingio.format.tiny1;
+package net.fabricmc.mappingio.format.tiny;
 
 import java.io.IOException;
 import java.io.Writer;

diff --git a/...ppingio/format/tiny2/Tiny2FileReader.java → ...appingio/format/tiny/Tiny2FileReader.java b/...ppingio/format/tiny2/Tiny2FileReader.java → ...appingio/format/tiny/Tiny2FileReader.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.mappingio.format.tiny2;
+package net.fabricmc.mappingio.format.tiny;
 
 import java.io.IOException;
 import java.io.Reader;

diff --git a/...ppingio/format/tiny2/Tiny2FileWriter.java → ...appingio/format/tiny/Tiny2FileWriter.java b/...ppingio/format/tiny2/Tiny2FileWriter.java → ...appingio/format/tiny/Tiny2FileWriter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.mappingio.format.tiny2;
+package net.fabricmc.mappingio.format.tiny;
 
 import java.io.IOException;
 import java.io.Writer;

diff --git a/...cmc/mappingio/format/tiny2/Tiny2Util.java → ...icmc/mappingio/format/tiny/Tiny2Util.java b/...cmc/mappingio/format/tiny2/Tiny2Util.java → ...icmc/mappingio/format/tiny/Tiny2Util.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.mappingio.format.tiny2;
+package net.fabricmc.mappingio.format.tiny;
 
 import java.io.IOException;
 import java.io.Writer;