From c984bfaabf9410d915cd2fc54727007350802774 Mon Sep 17 00:00:00 2001 From: Petschko Date: Sun, 14 Feb 2021 20:36:28 +0100 Subject: [PATCH] Didn't use sun annotations anymore --- src/org/petschko/lib/File.java | 4 ++-- src/org/petschko/lib/Functions.java | 5 ++--- src/org/petschko/lib/UserPref.java | 5 ++--- src/org/petschko/lib/gui/GUI_About.java | 4 ++-- src/org/petschko/lib/gui/JImageLabel.java | 2 +- src/org/petschko/lib/gui/JLabelExtra.java | 2 +- src/org/petschko/lib/gui/notification/ErrorWindow.java | 4 ++-- src/org/petschko/lib/gui/notification/InfoWindow.java | 4 ++-- .../petschko/lib/gui/notification/NotificationWindow.java | 4 ++-- src/org/petschko/rpgmakermv/decrypt/Config.java | 7 ++++--- src/org/petschko/rpgmakermv/decrypt/Decrypter.java | 5 ++++- src/org/petschko/rpgmakermv/decrypt/Finder.java | 4 ++-- src/org/petschko/rpgmakermv/decrypt/GUI.java | 2 +- src/org/petschko/rpgmakermv/decrypt/GUI_About.java | 4 ++-- .../petschko/rpgmakermv/decrypt/GUI_ActionListener.java | 2 +- src/org/petschko/rpgmakermv/decrypt/Preferences.java | 2 +- src/org/petschko/rpgmakermv/decrypt/RPGProject.java | 2 +- 17 files changed, 32 insertions(+), 30 deletions(-) diff --git a/src/org/petschko/lib/File.java b/src/org/petschko/lib/File.java index 333ebd5..b7cf7f2 100644 --- a/src/org/petschko/lib/File.java +++ b/src/org/petschko/lib/File.java @@ -1,7 +1,7 @@ package org.petschko.lib; -import com.sun.istack.internal.NotNull; -import com.sun.istack.internal.Nullable; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.FileOutputStream; diff --git a/src/org/petschko/lib/Functions.java b/src/org/petschko/lib/Functions.java index 5b52c94..3539e30 100644 --- a/src/org/petschko/lib/Functions.java +++ b/src/org/petschko/lib/Functions.java @@ -1,8 +1,7 @@ package org.petschko.lib; -import com.sun.istack.internal.NotNull; -import com.sun.istack.internal.Nullable; - +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import javax.swing.AbstractButton; import java.awt.Desktop; import java.awt.event.ActionListener; diff --git a/src/org/petschko/lib/UserPref.java b/src/org/petschko/lib/UserPref.java index 863a078..850d301 100644 --- a/src/org/petschko/lib/UserPref.java +++ b/src/org/petschko/lib/UserPref.java @@ -1,8 +1,7 @@ package org.petschko.lib; -import com.sun.istack.internal.NotNull; -import com.sun.istack.internal.Nullable; - +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; diff --git a/src/org/petschko/lib/gui/GUI_About.java b/src/org/petschko/lib/gui/GUI_About.java index 3914f87..c40f78f 100644 --- a/src/org/petschko/lib/gui/GUI_About.java +++ b/src/org/petschko/lib/gui/GUI_About.java @@ -1,7 +1,7 @@ package org.petschko.lib.gui; -import com.sun.istack.internal.NotNull; -import com.sun.istack.internal.Nullable; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import javax.swing.JButton; import javax.swing.JComponent; diff --git a/src/org/petschko/lib/gui/JImageLabel.java b/src/org/petschko/lib/gui/JImageLabel.java index 30e62c6..2af8440 100644 --- a/src/org/petschko/lib/gui/JImageLabel.java +++ b/src/org/petschko/lib/gui/JImageLabel.java @@ -1,6 +1,6 @@ package org.petschko.lib.gui; -import com.sun.istack.internal.NotNull; +import org.jetbrains.annotations.NotNull; import org.petschko.lib.Image; import javax.imageio.ImageIO; diff --git a/src/org/petschko/lib/gui/JLabelExtra.java b/src/org/petschko/lib/gui/JLabelExtra.java index 1041c0f..dff5c0e 100644 --- a/src/org/petschko/lib/gui/JLabelExtra.java +++ b/src/org/petschko/lib/gui/JLabelExtra.java @@ -1,6 +1,6 @@ package org.petschko.lib.gui; -import com.sun.istack.internal.Nullable; +import org.jetbrains.annotations.Nullable; import javax.swing.JLabel; import java.awt.Color; diff --git a/src/org/petschko/lib/gui/notification/ErrorWindow.java b/src/org/petschko/lib/gui/notification/ErrorWindow.java index 1362d02..2e5c4b5 100644 --- a/src/org/petschko/lib/gui/notification/ErrorWindow.java +++ b/src/org/petschko/lib/gui/notification/ErrorWindow.java @@ -1,7 +1,7 @@ package org.petschko.lib.gui.notification; -import com.sun.istack.internal.NotNull; -import com.sun.istack.internal.Nullable; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * Author: Peter Dragicevic [peter@petschko.org] diff --git a/src/org/petschko/lib/gui/notification/InfoWindow.java b/src/org/petschko/lib/gui/notification/InfoWindow.java index a87c39f..fe342de 100644 --- a/src/org/petschko/lib/gui/notification/InfoWindow.java +++ b/src/org/petschko/lib/gui/notification/InfoWindow.java @@ -1,7 +1,7 @@ package org.petschko.lib.gui.notification; -import com.sun.istack.internal.NotNull; -import com.sun.istack.internal.Nullable; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * Author: Peter Dragicevic [peter@petschko.org] diff --git a/src/org/petschko/lib/gui/notification/NotificationWindow.java b/src/org/petschko/lib/gui/notification/NotificationWindow.java index fe40613..7c243b8 100644 --- a/src/org/petschko/lib/gui/notification/NotificationWindow.java +++ b/src/org/petschko/lib/gui/notification/NotificationWindow.java @@ -1,7 +1,7 @@ package org.petschko.lib.gui.notification; -import com.sun.istack.internal.NotNull; -import com.sun.istack.internal.Nullable; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import javax.swing.JOptionPane; import java.awt.Component; diff --git a/src/org/petschko/rpgmakermv/decrypt/Config.java b/src/org/petschko/rpgmakermv/decrypt/Config.java index cf59610..852873a 100644 --- a/src/org/petschko/rpgmakermv/decrypt/Config.java +++ b/src/org/petschko/rpgmakermv/decrypt/Config.java @@ -5,14 +5,15 @@ * Authors-Website: http://petschko.org/ * Date: 11.12.2016 * Time: 21:24 - * Update: - - * Version: 0.1.0 + * Update: 04.05.2019 + * Version: 0.1.1 * * Notes: Config class */ class Config { // Program Info - static final String version = "v0.1.3.1 (Hotfix) Alpha"; + static final String versionNumber = "0.1.4.0"; + static final String version = "v" + versionNumber + " Alpha"; static final String programName = "RPG-Maker MV Decrypter"; static final String projectPageURL = "https://github.com/Petschko/Java-RPG-Maker-MV-Decrypter"; static final String projectBugReportURL = "https://github.com/Petschko/Java-RPG-Maker-MV-Decrypter/issues"; diff --git a/src/org/petschko/rpgmakermv/decrypt/Decrypter.java b/src/org/petschko/rpgmakermv/decrypt/Decrypter.java index 6268a08..5800f5f 100644 --- a/src/org/petschko/rpgmakermv/decrypt/Decrypter.java +++ b/src/org/petschko/rpgmakermv/decrypt/Decrypter.java @@ -1,6 +1,6 @@ package org.petschko.rpgmakermv.decrypt; -import com.sun.istack.internal.NotNull; +import org.jetbrains.annotations.NotNull; import org.json.JSONException; import org.json.JSONObject; import org.petschko.lib.File; @@ -359,10 +359,13 @@ private static byte[] getByteArray(byte[] byteArray, int startPos) { private static String realExtByFakeExt(@NotNull String fakeExt) { switch(fakeExt.toLowerCase()) { case "rpgmvp": + case "png_": return "png"; case "rpgmvm": + case "m4a_": return "m4a"; case "rpgmvo": + case "ogg_": return "ogg"; default: return "unknown"; diff --git a/src/org/petschko/rpgmakermv/decrypt/Finder.java b/src/org/petschko/rpgmakermv/decrypt/Finder.java index cf2f3ac..f7871d7 100644 --- a/src/org/petschko/rpgmakermv/decrypt/Finder.java +++ b/src/org/petschko/rpgmakermv/decrypt/Finder.java @@ -1,7 +1,7 @@ package org.petschko.rpgmakermv.decrypt; -import com.sun.istack.internal.NotNull; -import com.sun.istack.internal.Nullable; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.petschko.lib.Const; import org.petschko.lib.File; diff --git a/src/org/petschko/rpgmakermv/decrypt/GUI.java b/src/org/petschko/rpgmakermv/decrypt/GUI.java index 1aee2c6..5224232 100644 --- a/src/org/petschko/rpgmakermv/decrypt/GUI.java +++ b/src/org/petschko/rpgmakermv/decrypt/GUI.java @@ -1,6 +1,6 @@ package org.petschko.rpgmakermv.decrypt; -import com.sun.istack.internal.NotNull; +import org.jetbrains.annotations.NotNull; import org.json.JSONException; import org.petschko.lib.Const; import org.petschko.lib.File; diff --git a/src/org/petschko/rpgmakermv/decrypt/GUI_About.java b/src/org/petschko/rpgmakermv/decrypt/GUI_About.java index db33dd2..d1b36ff 100644 --- a/src/org/petschko/rpgmakermv/decrypt/GUI_About.java +++ b/src/org/petschko/rpgmakermv/decrypt/GUI_About.java @@ -1,7 +1,7 @@ package org.petschko.rpgmakermv.decrypt; -import com.sun.istack.internal.NotNull; -import com.sun.istack.internal.Nullable; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.petschko.lib.Const; import org.petschko.lib.gui.JImageLabel; import org.petschko.lib.gui.JLabelExtra; diff --git a/src/org/petschko/rpgmakermv/decrypt/GUI_ActionListener.java b/src/org/petschko/rpgmakermv/decrypt/GUI_ActionListener.java index 530d172..190985e 100644 --- a/src/org/petschko/rpgmakermv/decrypt/GUI_ActionListener.java +++ b/src/org/petschko/rpgmakermv/decrypt/GUI_ActionListener.java @@ -1,6 +1,6 @@ package org.petschko.rpgmakermv.decrypt; -import com.sun.istack.internal.NotNull; +import org.jetbrains.annotations.NotNull; import org.petschko.lib.File; import org.petschko.lib.Functions; import org.petschko.lib.gui.notification.ErrorWindow; diff --git a/src/org/petschko/rpgmakermv/decrypt/Preferences.java b/src/org/petschko/rpgmakermv/decrypt/Preferences.java index 74975b1..102cdc6 100644 --- a/src/org/petschko/rpgmakermv/decrypt/Preferences.java +++ b/src/org/petschko/rpgmakermv/decrypt/Preferences.java @@ -1,6 +1,6 @@ package org.petschko.rpgmakermv.decrypt; -import com.sun.istack.internal.Nullable; +import org.jetbrains.annotations.Nullable; import org.petschko.lib.UserPref; import java.util.Properties; diff --git a/src/org/petschko/rpgmakermv/decrypt/RPGProject.java b/src/org/petschko/rpgmakermv/decrypt/RPGProject.java index 44c833e..aa264d3 100644 --- a/src/org/petschko/rpgmakermv/decrypt/RPGProject.java +++ b/src/org/petschko/rpgmakermv/decrypt/RPGProject.java @@ -1,6 +1,6 @@ package org.petschko.rpgmakermv.decrypt; -import com.sun.istack.internal.NotNull; +import org.jetbrains.annotations.NotNull; import org.json.JSONException; import org.petschko.lib.File; import org.petschko.lib.exceptions.PathException;