Skip to content

Commit

Permalink
remove multiplayer
Browse files Browse the repository at this point in the history
  • Loading branch information
Tungstend committed Feb 8, 2024
1 parent ca4c621 commit 05f4488
Show file tree
Hide file tree
Showing 1,017 changed files with 46 additions and 266,267 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
*.iml
.gradle
/local.properties
/.idea
/.idea/caches
/.idea/libraries
/.idea/modules.xml
Expand Down
17 changes: 0 additions & 17 deletions .idea/deploymentTargetDropDown.xml

This file was deleted.

2 changes: 1 addition & 1 deletion .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions Boat/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ plugins {
}

android {
compileSdk 32
compileSdk 34

defaultConfig {
minSdk 26
targetSdk 32
targetSdk 34

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles "consumer-rules.pro"
Expand All @@ -32,10 +32,10 @@ android {

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'com.google.code.gson:gson:2.8.9'
implementation 'androidx.appcompat:appcompat:1.5.0'
implementation 'com.google.android.material:material:1.6.1'
implementation 'com.google.code.gson:gson:2.10.1'
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'com.google.android.material:material:1.11.0'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
}
12 changes: 6 additions & 6 deletions FilePicker/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ plugins {
}

android {
compileSdk 32
compileSdk 34

defaultConfig {
minSdk 21
targetSdk 32
targetSdk 34

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles "consumer-rules.pro"
Expand All @@ -26,13 +26,13 @@ android {
}

dependencies {
implementation 'androidx.appcompat:appcompat:1.5.0'
implementation 'com.google.android.material:material:1.6.1'
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'com.google.android.material:material:1.11.0'
implementation 'com.beardedhen:androidbootstrap:2.3.1'
implementation 'com.roughike:bottom-bar:2.3.1'
implementation 'com.simplecityapps:recyclerview-fastscroll:1.0.20'
implementation files('libs/commons-io-2.11.0.jar')
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
}
21 changes: 10 additions & 11 deletions HMCLPE/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ plugins {
}

android {
compileSdk 32
compileSdk 34
dexOptions {
javaMaxHeapSize "4g"
}
Expand All @@ -30,7 +30,7 @@ android {
defaultConfig {
applicationId "com.tungsten.hmclpe"
minSdk 26
targetSdk 32
targetSdk 34
versionCode 12
versionName "1.0.0"

Expand Down Expand Up @@ -69,28 +69,27 @@ dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation project(path: ':FilePicker')
implementation project(path: ':ZipTools')
implementation project(path: ':Hin2n')
implementation project(path: ':Boat')
implementation project(path: ':PojavLauncher')
implementation 'androidx.appcompat:appcompat:1.5.0'
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'com.github.naman14:app-theme-engine:0.5.2@aar'
implementation 'com.google.android.material:material:1.6.1'
implementation 'com.google.android.material:material:1.11.0'
implementation 'com.squareup.okhttp3:okhttp:4.9.3'
implementation 'org.nanohttpd:nanohttpd:2.3.1'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'cat.ereza:customactivityoncrash:2.3.0'
implementation 'com.google.code.gson:gson:2.8.9'
implementation 'com.google.code.gson:gson:2.10.1'
implementation 'com.moandjiezana.toml:toml4j:0.7.2'
implementation 'org.apache.commons:commons-compress:1.21'
implementation 'com.github.steveice10:opennbt:1.4'
implementation 'com.github.steveice10:opennbt:1.5'
implementation 'com.jaredrummler:colorpicker:1.1.0'
implementation 'com.jaredrummler:android-device-names:2.0.0'
implementation 'com.jaredrummler:android-device-names:2.1.0'
implementation 'org.jsoup:jsoup:1.14.3'
implementation 'org.apache.commons:commons-lang3:3.12.0'
implementation 'org.apache.commons:commons-lang3:3.13.0'
implementation 'org.jenkins-ci:constant-pool-scanner:1.2'
implementation 'com.github.gzu-liyujiang:Android_CN_OAID:4.2.4'
implementation 'com.github.nedimf:maildroid:v0.1.0-release'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
}
38 changes: 2 additions & 36 deletions HMCLPE/src/main/java/com/tungsten/hmclpe/control/MenuHelper.java
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
package com.tungsten.hmclpe.control;

import static android.app.Activity.RESULT_OK;

import android.annotation.SuppressLint;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.view.View;
import android.widget.AdapterView;
import android.widget.ArrayAdapter;
Expand All @@ -30,23 +27,18 @@
import com.tungsten.hmclpe.launcher.dialogs.control.AddViewDialog;
import com.tungsten.hmclpe.launcher.dialogs.control.ChildManagerDialog;
import com.tungsten.hmclpe.launcher.dialogs.control.EditControlPatternDialog;
import com.tungsten.hmclpe.launcher.dialogs.hin2n.Hin2nMenuDialog;
import com.tungsten.hmclpe.launcher.dialogs.hin2n.JoinCommunityDialog;
import com.tungsten.hmclpe.launcher.list.local.controller.ChildLayout;
import com.tungsten.hmclpe.launcher.list.local.controller.ControlPattern;
import com.tungsten.hmclpe.manifest.AppManifest;
import com.tungsten.hmclpe.launcher.setting.InitializeSetting;
import com.tungsten.hmclpe.launcher.setting.SettingUtils;
import com.tungsten.hmclpe.launcher.setting.game.GameMenuSetting;
import com.tungsten.hmclpe.multiplayer.Hin2nService;
import com.tungsten.hmclpe.utils.file.AssetsUtils;
import com.tungsten.hmclpe.utils.file.FileStringUtils;
import com.tungsten.hmclpe.utils.file.FileUtils;

import java.util.ArrayList;

import wang.switchy.hin2n.model.N2NSettingInfo;

public class MenuHelper implements CompoundButton.OnCheckedChangeListener, View.OnClickListener, AdapterView.OnItemSelectedListener, SeekBar.OnSeekBarChangeListener {

public Context context;
Expand Down Expand Up @@ -360,30 +352,7 @@ public void refreshChildSpinner(){
}

public void onActivityResult(int requestCode, int resultCode, Intent data) {
if (requestCode == Hin2nService.VPN_REQUEST_CODE_CREATE && resultCode == RESULT_OK) {
Intent intent = new Intent(context, Hin2nService.class);
Bundle bundle = new Bundle();
N2NSettingInfo n2NSettingInfo = new N2NSettingInfo(Hin2nService.getCreatorModel());
bundle.putParcelable("n2nSettingInfo", n2NSettingInfo);
intent.putExtra("Setting", bundle);
activity.startService(intent);
}
if (requestCode == Hin2nService.VPN_REQUEST_CODE_JOIN && resultCode == RESULT_OK) {
Intent intent = new Intent(context, Hin2nService.class);
Bundle bundle = new Bundle();
new Thread(() -> {
N2NSettingInfo n2NSettingInfo = new N2NSettingInfo(Hin2nService.getPlayerModel());
activity.runOnUiThread(() -> {
bundle.putParcelable("n2nSettingInfo", n2NSettingInfo);
intent.putExtra("Setting", bundle);
activity.startService(intent);
JoinCommunityDialog.getInstance().progressBar.setVisibility(View.GONE);
JoinCommunityDialog.getInstance().positive.setVisibility(View.VISIBLE);
JoinCommunityDialog.getInstance().negative.setEnabled(true);
JoinCommunityDialog.getInstance().dismiss();
});
}).start();
}

}

@Override
Expand Down Expand Up @@ -480,10 +449,7 @@ public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
@Override
public void onClick(View view) {
if (view == openHin2nMenu) {
if (launcher != 0) {
Hin2nMenuDialog dialog = new Hin2nMenuDialog(context, this);
dialog.show();
}

}
if (view == forceExit) {
AlertDialog.Builder builder = new AlertDialog.Builder(context);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,8 @@

import android.app.Application;
import android.content.Context;
import android.content.res.Configuration;

import com.github.gzuliyujiang.oaid.DeviceIdentifier;
import com.tungsten.hmclpe.utils.LocaleUtils;

import wang.switchy.hin2n.Hin2n;

public class HMCLPEApplication extends Application {

Expand All @@ -18,7 +14,6 @@ public void onCreate() {
super.onCreate();
DeviceIdentifier.register(this);
context = this.getApplicationContext();
Hin2n.getInstance().setup(context);
}

public static Context getContext(){
Expand Down

This file was deleted.

Loading

0 comments on commit 05f4488

Please sign in to comment.