From 4537498afe246625417bde67591f2d10cf3ff8a3 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Wed, 22 Nov 2023 14:09:00 -0500 Subject: [PATCH] v2.3.0: adjusted use of calendars, and when surface scene shows night --- .../shatteredpixeldungeon/scenes/NewsScene.java | 3 --- .../shatteredpixeldungeon/scenes/SurfaceScene.java | 6 ++++-- .../shatteredpixeldungeon/services/news/News.java | 3 ++- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/NewsScene.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/NewsScene.java index 25d9b5649..984a6fcad 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/NewsScene.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/NewsScene.java @@ -44,7 +44,6 @@ import com.watabou.noosa.NinePatch; import com.watabou.noosa.ui.Component; import java.util.ArrayList; -import java.util.Calendar; public class NewsScene extends PixelScene { @@ -273,8 +272,6 @@ public class NewsScene extends PixelScene { textColor(Window.SHPX_COLOR); } - Calendar cal = Calendar.getInstance(); - cal.setTime(article.date); date = new BitmapText( News.parseArticleDate(article), pixelFont); date.scale.set(PixelScene.align(0.5f)); date.hardlight( 0x888888 ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/SurfaceScene.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/SurfaceScene.java index d592add08..02f32a7a0 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/SurfaceScene.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/SurfaceScene.java @@ -60,6 +60,7 @@ import com.watabou.utils.Random; import java.nio.Buffer; import java.nio.FloatBuffer; import java.util.Calendar; +import java.util.GregorianCalendar; public class SurfaceScene extends PixelScene { @@ -110,8 +111,9 @@ public class SurfaceScene extends PixelScene { Group window = new Group(); window.camera = viewport; add( window ); - - boolean dayTime = Calendar.getInstance().get(Calendar.HOUR_OF_DAY) >= 7; + + Calendar cal = GregorianCalendar.getInstance(); + boolean dayTime = cal.get(Calendar.HOUR_OF_DAY) >= 7 && cal.get(Calendar.HOUR_OF_DAY) <= 20; Sky sky = new Sky( dayTime ); sky.scale.set( SKY_WIDTH, SKY_HEIGHT ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/services/news/News.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/services/news/News.java index fc1dc0da8..7f747ef23 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/services/news/News.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/services/news/News.java @@ -32,6 +32,7 @@ import com.watabou.noosa.Image; import java.util.ArrayList; import java.util.Calendar; import java.util.Date; +import java.util.GregorianCalendar; public class News { @@ -122,7 +123,7 @@ public class News { } public static String parseArticleDate(NewsArticle article){ - Calendar cal = Calendar.getInstance(); + Calendar cal = GregorianCalendar.getInstance(); cal.setTime(article.date); return cal.get(Calendar.YEAR) + "-" + String.format("%02d", cal.get(Calendar.MONTH)+1)