move stuff around

RemixedDungeon/src/googlePlay/java/com/nyrds/pixeldungeon/support/AdsUtils.java

@@ -8,7 +8,6 @@
 import com.appodeal.ads.BannerView;
 import com.google.android.gms.ads.AdView;
 import com.google.android.gms.ads.initialization.InitializationStatus;
-import com.nyrds.platform.EventCollector;
 import com.nyrds.pixeldungeon.game.GamePreferences;
 import com.nyrds.pixeldungeon.ml.R;
 import com.nyrds.platform.EventCollector;

RemixedDungeon/src/main/java/com/nyrds/util/Util.java

@@ -2,10 +2,8 @@
 
 import com.nyrds.pixeldungeon.ml.BuildConfig;
 import com.nyrds.platform.game.RemixedDungeon;
-import com.nyrds.platform.util.PUtil;
 import com.watabou.utils.Callback;
 
-import org.hjson.HjsonOptions;
 import org.hjson.JsonValue;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

RemixedDungeon/src/main/java/com/watabou/pixeldungeon/scenes/AboutScene.java

@@ -20,6 +20,7 @@
 import com.watabou.pixeldungeon.ui.ExitButton;
 import com.watabou.pixeldungeon.ui.Icons;
 import com.watabou.pixeldungeon.ui.Window;
+import com.watabou.pixeldungeon.utils.Utils;
 
 public class AboutScene extends PixelScene {
 
@@ -90,8 +91,6 @@ public void create() {
 
 		Text text = createText(getTXT(), null );
 
-		text.camera = uiCamera;
-
 		text.setX(align( (Camera.main.width - text.width()) / 2 ));
 		text.setY(align( (Camera.main.height - text.height()) / 3 ));
 
@@ -139,20 +138,21 @@ protected void onClick( Touch touch ) {
 
 		new Flare( 7, 64 ).color( 0x332211, true ).show( nyrdie, 0 ).angularSpeed = -20;
 
-		ItemSprite sprite = new ItemSprite(new ArmorKit());
-		sprite.alpha(0.1f);
-		sprite.setX(align( text.getX() + (text.width() - sprite.width()) / 2 ));
-		sprite.setY(nyrdie.getY() - sprite.height() - 8);
-		add(sprite);
-
-		TouchArea area2 = new TouchArea( sprite )  {
-			@Override
-			protected void onClick( Touch touch ) {
-				Game.toast("Entering dev mode, pick directory");
-				AndroidSAF.pickDirectoryForModInstall();
-			}
-		};
-
+		if(Utils.isAndroid()) {
+			ItemSprite sprite = new ItemSprite(new ArmorKit());
+			sprite.alpha(0.1f);
+			sprite.setX(align(text.getX() + (text.width() - sprite.width()) / 2));
+			sprite.setY(nyrdie.getY() - sprite.height() - 8);
+			add(sprite);
+
+			TouchArea area2 = new TouchArea(sprite) {
+				@Override
+				protected void onClick(Touch touch) {
+					Game.toast("Entering dev mode, pick directory");
+					AndroidSAF.pickDirectoryForModInstall();
+				}
+			};
+		}
 		Archs archs = new Archs();
 		archs.setSize( Camera.main.width, Camera.main.height );
         sendToBack(archs);

RemixedDungeon/src/main/java/com/watabou/pixeldungeon/scenes/WelcomeScene.java

@@ -3,7 +3,6 @@
 import com.nyrds.pixeldungeon.game.GameLoop;
 import com.nyrds.pixeldungeon.game.GamePreferences;
 import com.nyrds.pixeldungeon.ml.R;
-import com.nyrds.platform.game.Game;
 import com.nyrds.platform.storage.Preferences;
 import com.nyrds.platform.util.StringsManager;
 import com.nyrds.util.GuiProperties;

RemixedDungeon/src/main/java/com/watabou/pixeldungeon/windows/WndModInstall.java

@@ -5,7 +5,6 @@
 import com.nyrds.pixeldungeon.windows.HBox;
 import com.nyrds.pixeldungeon.windows.VBox;
 import com.nyrds.platform.game.Game;
-import com.nyrds.platform.game.InstallMod;
 import com.nyrds.platform.input.Touchscreen;
 import com.nyrds.platform.util.StringsManager;
 import com.nyrds.util.GuiProperties;

RemixedDungeonDesktop/make_r.py

@@ -1,9 +1,8 @@
 #!/usr/bin/env python3
-import re
 from lxml import etree as ElementTree
 
 def makeRJava(strings, arrays):
-    rJava = open("src/market_none/java/com/nyrds/pixeldungeon/ml/R.java", "w", encoding='utf8')
+    rJava = open("src/libgdx/java/com/nyrds/pixeldungeon/ml/R.java", "w", encoding='utf8')
     rJava.write('''
     package com.nyrds.pixeldungeon.ml;
 

RemixedDungeonDesktop/src/market_none/java/com/nyrds/platform/EventCollector.java → RemixedDungeonDesktop/src/libgdx/java/com/nyrds/platform/EventCollector.java

@@ -1,7 +1,6 @@
 package com.nyrds.platform;
 
 import com.nyrds.platform.storage.Preferences;
-import com.nyrds.util.Util;
 import com.watabou.pixeldungeon.utils.GLog;
 
 import java.io.ByteArrayOutputStream;

RemixedDungeonDesktop/src/market_none/java/com/nyrds/platform/storage/AndroidSAF.java → RemixedDungeonDesktop/src/libgdx/java/com/nyrds/platform/storage/AndroidSAF.java

@@ -1,10 +1,7 @@
 package com.nyrds.platform.storage;
 
-import com.nyrds.pixeldungeon.windows.WndInstallingMod;
 import com.nyrds.platform.game.Game;
 
-import org.lwjgl.system.CallbackI;
-
 import java.io.OutputStream;
 
 public class AndroidSAF {

RemixedDungeonDesktop/src/libgdx/java/com/nyrds/platform/util/StringsManager.java

@@ -3,7 +3,6 @@
 
 import com.nyrds.pixeldungeon.ml.R;
 import com.nyrds.util.ModdingMode;
-import com.nyrds.util.Util;
 import com.watabou.pixeldungeon.utils.Utils;
 import com.watabou.pixeldungeon.windows.WndSettings;
 

RemixedDungeonDesktop/src/market_none/java/com/nyrds/market/MarketOptions.java

@@ -6,10 +6,10 @@
  */
 public class MarketOptions {
 	public static boolean haveHats() {
-		return true;
+		return false;
 	}
 
 	public static boolean haveDonations() {
-		return true;
+		return false;
 	}
 }