external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 20:58:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

crash fix using textratypist on Android

Browse Source
This commit is contained in:
Anthony Calosa
2022-08-18 15:39:51 +08:00
parent 0349f45a9b
commit 89319f95ab
4 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
forge-gui-android/proguard.cfg
View File

@@ -64,6 +64,7 @@
-keep class io.sentry.android.core.SentryInitProvider -keep class io.sentry.android.core.SentryInitProvider
-keep class io.sentry.android.core.SentryPerformanceProvider -keep class io.sentry.android.core.SentryPerformanceProvider
-keep class com.github.tommyettinger.textra.** { *; }
-keep class io.sentry.android.ndk.SentryNdk -keep class io.sentry.android.ndk.SentryNdk
-keep class io.sentry.Sentry -keep class io.sentry.Sentry

5
forge-gui-mobile/pom.xml
View File

@@ -45,11 +45,6 @@
<artifactId>forge-gui</artifactId> <artifactId>forge-gui</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency>
<groupId>com.github.tommyettinger</groupId>
<artifactId>textratypist</artifactId>
<version>0.7.0</version>
</dependency>
<dependency> <dependency>
<groupId>com.badlogicgames.gdx</groupId> <groupId>com.badlogicgames.gdx</groupId>
<artifactId>gdx</artifactId> <artifactId>gdx</artifactId>

12
forge-gui-mobile/src/forge/adventure/stage/WorldStage.java
View File

@@ -263,6 +263,12 @@ public class WorldStage extends GameStage implements SaveFileContent {
background.setPlayerPos(player.getX(), player.getY()); background.setPlayerPos(player.getX(), player.getY());
//spriteGroup.setCullingArea(new Rectangle(player.getX()-getViewport().getWorldHeight()/2,player.getY()-getViewport().getWorldHeight()/2,getViewport().getWorldHeight(),getViewport().getWorldHeight())); //spriteGroup.setCullingArea(new Rectangle(player.getX()-getViewport().getWorldHeight()/2,player.getY()-getViewport().getWorldHeight()/2,getViewport().getWorldHeight(),getViewport().getWorldHeight()));
super.draw(); super.draw();
if (WorldSave.getCurrentSave().getPlayer().hasAnnounceFantasy()) {
MapStage.getInstance().showDeckAwardDialog("{BLINK=WHITE;RED}Chaos Mode!{ENDBLINK}\n"+ WorldSave.getCurrentSave().getPlayer().getName()+ "'s Deck: "+
WorldSave.getCurrentSave().getPlayer().getSelectedDeck().getName()+
"\nEnemy will use Preconstructed or Random Generated Decks. Genetic AI Decks will be available to some enemies on Hard difficulty.", WorldSave.getCurrentSave().getPlayer().getSelectedDeck());
WorldSave.getCurrentSave().getPlayer().clearAnnounceFantasy();
}
} }
@Override @Override
@@ -280,12 +286,6 @@ public class WorldStage extends GameStage implements SaveFileContent {
} }
setBounds(WorldSave.getCurrentSave().getWorld().getWidthInPixels(), WorldSave.getCurrentSave().getWorld().getHeightInPixels()); setBounds(WorldSave.getCurrentSave().getWorld().getWidthInPixels(), WorldSave.getCurrentSave().getWorld().getHeightInPixels());
if (WorldSave.getCurrentSave().getPlayer().hasAnnounceFantasy()) {
MapStage.getInstance().showDeckAwardDialog("{BLINK=WHITE;RED}Chaos Mode!{ENDBLINK}\n"+ WorldSave.getCurrentSave().getPlayer().getName()+ "'s Deck: "+
WorldSave.getCurrentSave().getPlayer().getSelectedDeck().getName()+
"\nEnemy will use Preconstructed or Random Generated Decks. Genetic AI Decks will be available to some enemies on Hard difficulty.", WorldSave.getCurrentSave().getPlayer().getSelectedDeck());
WorldSave.getCurrentSave().getPlayer().clearAnnounceFantasy();
}
} }
@Override @Override

10
forge-gui/pom.xml
View File

@@ -40,6 +40,16 @@
<artifactId>forge-ai</artifactId> <artifactId>forge-ai</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency>
<groupId>com.github.tommyettinger</groupId>
<artifactId>textratypist</artifactId>
<version>2f773002a8</version>
</dependency>
<dependency>
<groupId>com.github.tommyettinger</groupId>
<artifactId>regexodus</artifactId>
<version>0.1.13</version>
</dependency>
<dependency> <dependency>
<groupId>com.thoughtworks.xstream</groupId> <groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId> <artifactId>xstream</artifactId>