konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v2.3.0: adjusted use of calendars, and when surface scene shows night

Browse Source
This commit is contained in:
Evan Debenham
2023-11-22 14:09:00 -05:00
parent 1dae6f108f
commit 4537498afe
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/NewsScene.java
-3
View File
@@ -44,7 +44,6 @@ import com.watabou.noosa.NinePatch;
import com.watabou.noosa.ui.Component; import com.watabou.noosa.ui.Component;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Calendar;
public class NewsScene extends PixelScene { public class NewsScene extends PixelScene {
@@ -273,8 +272,6 @@ public class NewsScene extends PixelScene {
textColor(Window.SHPX_COLOR); textColor(Window.SHPX_COLOR);
} }
Calendar cal = Calendar.getInstance();
cal.setTime(article.date);
date = new BitmapText( News.parseArticleDate(article), pixelFont); date = new BitmapText( News.parseArticleDate(article), pixelFont);
date.scale.set(PixelScene.align(0.5f)); date.scale.set(PixelScene.align(0.5f));
date.hardlight( 0x888888 ); date.hardlight( 0x888888 );
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/SurfaceScene.java
+3 -1
View File
@@ -60,6 +60,7 @@ import com.watabou.utils.Random;
import java.nio.Buffer; import java.nio.Buffer;
import java.nio.FloatBuffer; import java.nio.FloatBuffer;
import java.util.Calendar; import java.util.Calendar;
import java.util.GregorianCalendar;
public class SurfaceScene extends PixelScene { public class SurfaceScene extends PixelScene {
@@ -111,7 +112,8 @@ public class SurfaceScene extends PixelScene {
window.camera = viewport; window.camera = viewport;
add( window ); 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 sky = new Sky( dayTime );
sky.scale.set( SKY_WIDTH, SKY_HEIGHT ); sky.scale.set( SKY_WIDTH, SKY_HEIGHT );
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/services/news/News.java
+2 -1
View File
@@ -32,6 +32,7 @@ import com.watabou.noosa.Image;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Calendar; import java.util.Calendar;
import java.util.Date; import java.util.Date;
import java.util.GregorianCalendar;
public class News { public class News {
@@ -122,7 +123,7 @@ public class News {
} }
public static String parseArticleDate(NewsArticle article){ public static String parseArticleDate(NewsArticle article){
Calendar cal = Calendar.getInstance(); Calendar cal = GregorianCalendar.getInstance();
cal.setTime(article.date); cal.setTime(article.date);
return cal.get(Calendar.YEAR) return cal.get(Calendar.YEAR)
+ "-" + String.format("%02d", cal.get(Calendar.MONTH)+1) + "-" + String.format("%02d", cal.get(Calendar.MONTH)+1)