From 1346bd3fc0a163d5e2d5e5a2d88b0159fc2d3a9d Mon Sep 17 00:00:00 2001 From: mob41 Date: Wed, 27 Dec 2017 19:03:57 +0800 Subject: [PATCH] Edit README.md, fix continuous "Not logged in" in search beatmap panel --- README.md | 4 +-- pom.xml | 2 +- .../java/com/github/mob41/osumer/Osumer.java | 2 +- .../com/github/mob41/osumer/ui/UIFrame.java | 31 ++++++++----------- 4 files changed, 17 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index ad4402f..f68ffc2 100644 --- a/README.md +++ b/README.md @@ -7,14 +7,14 @@ Put a star if you like this software! I would be happy to continue developing th ## v2 has released -Experimental Builds of osumer v2 has been released at https://github.com/mob41/mob41/releases/latest . And to all osumer clients with updater functionality. Please do not hesitate trying it with new features! +Experimental Builds of osumer v2 has been released at https://github.com/mob41/osumer/releases/latest . And to all osumer clients with updater functionality. Please do not hesitate trying it with new features! Tutorials (still building) can be found at https://github.com/mob41/osumer/wiki/osumer-tutorial . ## Disclaimer This software does not contain malicious code that will send username and password to another server other than osu!'s login server. You can feel free to look through the code. If you still feel uncomfortable with this software, you can simply stop using it. Thank you! -The application only sends the ```username``` and ```password``` parameters to ```https://osu.ppy.sh/forum/ucp.php?mode=login``` in [Osu.java](https://github.com/mob41/osumer/blob/master/src/main/java/com/github/mob41/osumer/io/Osu.java) for logging in to osu! forum. And saves the username and password specified in the user interface to local configuration in [Config.java](https://github.com/mob41/osumer/blob/master/src/main/java/com/github/mob41/osumer/Config.java). Unless the data are sniffed by a hacker or your friends want to play tricks on you, the data is not sent to anywhere other than osu! login server. (alright also sent to, proxies, firewalls, routers, switches, DNS servers, etc.) +The application only sends the ```username``` and ```password``` parameters to ```https://osu.ppy.sh/forum/ucp.php?mode=login``` in [Osu.java](https://github.com/mob41/osums-api/blob/master/src/main/java/com/github/mob41/osums/io/beatmap/Osums.java) for logging in to osu! forum. And saves the username and password specified in the user interface to local configuration in [Config.java](https://github.com/mob41/osumer/blob/master/src/main/java/com/github/mob41/osumer/Config.java). Unless the data are sniffed by a hacker or your friends want to play tricks on you, the data is not sent to anywhere other than osu! login server. (alright also sent to, proxies, firewalls, routers, switches, DNS servers, etc.) By using this software, I take no responsibility here. Use in your own risk. diff --git a/pom.xml b/pom.xml index c12956b..a917dd0 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ 4.0.0 com.github.mob41.osumer OsuMer - 1.0.5-SNAPSHOT + 2.0.0-SNAPSHOT OsuMer Osu! beatmap downloader diff --git a/src/main/java/com/github/mob41/osumer/Osumer.java b/src/main/java/com/github/mob41/osumer/Osumer.java index 243fbaf..f67b946 100644 --- a/src/main/java/com/github/mob41/osumer/Osumer.java +++ b/src/main/java/com/github/mob41/osumer/Osumer.java @@ -39,7 +39,7 @@ public class Osumer { public static final String OSUMER_BRANCH = "snapshot"; - public static final int OSUMER_BUILD_NUM = 1; + public static final int OSUMER_BUILD_NUM = 2; private Osumer() { diff --git a/src/main/java/com/github/mob41/osumer/ui/UIFrame.java b/src/main/java/com/github/mob41/osumer/ui/UIFrame.java index d311519..6444ddb 100644 --- a/src/main/java/com/github/mob41/osumer/ui/UIFrame.java +++ b/src/main/java/com/github/mob41/osumer/ui/UIFrame.java @@ -414,13 +414,8 @@ public void actionPerformed(ActionEvent e) { lblSpecifyYourDesired.setFont(new Font("Tahoma", Font.PLAIN, 12)); JLabel lblNewWebpageUrls = new JLabel( - "New webpage URLs (e.g. http://new.ppy.sh/) are currently not supported."); + "New web links with more than 6 digits (e.g. https://osu.ppy.sh/b/1483372) are currently not supported."); lblNewWebpageUrls.setFont(new Font("Tahoma", Font.PLAIN, 12)); - - JLabel lblYouWillBe = new JLabel( - "WARNING: You haven't setup an osu! account for beatmap downloading. Go to \"Preferences\" to configure."); - lblYouWillBe.setForeground(Color.RED); - lblYouWillBe.setFont(new Font("Tahoma", Font.BOLD, 12)); ButtonGroup dwnSelectionBtnGp = new ButtonGroup(); @@ -458,27 +453,29 @@ public void actionPerformed(ActionEvent e) { .addGroup(gl_panel.createSequentialGroup() .addContainerGap() .addGroup(gl_panel.createParallelGroup(Alignment.LEADING) - .addComponent(panel_1, GroupLayout.DEFAULT_SIZE, 800, Short.MAX_VALUE) - .addGroup(gl_panel.createSequentialGroup() - .addComponent(chckbxShowBeatmapPreview, GroupLayout.DEFAULT_SIZE, 794, Short.MAX_VALUE) - .addContainerGap()) .addGroup(Alignment.TRAILING, gl_panel.createSequentialGroup() .addGroup(gl_panel.createParallelGroup(Alignment.TRAILING) - .addComponent(lblSpecifyYourDesired, GroupLayout.DEFAULT_SIZE, 790, Short.MAX_VALUE) + .addComponent(lblSpecifyYourDesired, GroupLayout.DEFAULT_SIZE, 822, Short.MAX_VALUE) .addGroup(gl_panel.createSequentialGroup() .addComponent(lblBeatmapUrl) .addPreferredGap(ComponentPlacement.RELATED) - .addComponent(beatmapField, GroupLayout.DEFAULT_SIZE, 495, Short.MAX_VALUE) + .addComponent(beatmapField, GroupLayout.DEFAULT_SIZE, 527, Short.MAX_VALUE) .addPreferredGap(ComponentPlacement.RELATED) .addComponent(btnAddToQueue, GroupLayout.PREFERRED_SIZE, 151, GroupLayout.PREFERRED_SIZE)) - .addComponent(lblNewWebpageUrls, GroupLayout.DEFAULT_SIZE, 790, Short.MAX_VALUE) - .addComponent(lblYouWillBe, GroupLayout.DEFAULT_SIZE, 790, Short.MAX_VALUE)) + .addComponent(lblNewWebpageUrls, GroupLayout.DEFAULT_SIZE, 822, Short.MAX_VALUE)) .addContainerGap()) .addGroup(Alignment.TRAILING, gl_panel.createSequentialGroup() .addGroup(gl_panel.createParallelGroup(Alignment.TRAILING) .addComponent(btnDownloadAList, Alignment.LEADING, GroupLayout.DEFAULT_SIZE, 822, Short.MAX_VALUE) .addComponent(btnOsumerPreferences, GroupLayout.DEFAULT_SIZE, 822, Short.MAX_VALUE)) + .addContainerGap()) + .addGroup(gl_panel.createSequentialGroup() + .addComponent(panel_1, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addContainerGap()))) + .addGroup(Alignment.TRAILING, gl_panel.createSequentialGroup() + .addGap(10) + .addComponent(chckbxShowBeatmapPreview, GroupLayout.DEFAULT_SIZE, 826, Short.MAX_VALUE) + .addContainerGap()) ); gl_panel.setVerticalGroup( gl_panel.createParallelGroup(Alignment.LEADING) @@ -493,12 +490,10 @@ public void actionPerformed(ActionEvent e) { .addPreferredGap(ComponentPlacement.RELATED) .addComponent(lblNewWebpageUrls) .addPreferredGap(ComponentPlacement.RELATED) - .addComponent(lblYouWillBe) - .addPreferredGap(ComponentPlacement.RELATED) .addComponent(panel_1, GroupLayout.PREFERRED_SIZE, 145, GroupLayout.PREFERRED_SIZE) - .addPreferredGap(ComponentPlacement.UNRELATED) + .addPreferredGap(ComponentPlacement.RELATED) .addComponent(chckbxShowBeatmapPreview) - .addPreferredGap(ComponentPlacement.UNRELATED) + .addGap(33) .addComponent(btnOsumerPreferences) .addPreferredGap(ComponentPlacement.RELATED) .addComponent(btnDownloadAList, GroupLayout.PREFERRED_SIZE, 31, GroupLayout.PREFERRED_SIZE)