mirrors/riiablo
1
0
Fork 0
mirror of https://github.com/collinsmith/riiablo.git synced 2024-12-22 16:14:07 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Migrated libgdx 1.9.13 -> 1.9.14

Browse Source 
Migrated libgdx 1.9.13 -> 1.9.14
Removed gdx-jnigen dependency (waterfalled from within gdx-video correctly now)
Separated gdx-controllers version 1.9.14 -> 2.2.0
Changed HeadlessApplicationConfiguration#renderInterval to #updatedPerSecond
This commit is contained in:
Collin Smith 2021-05-28 15:30:15 -07:00
parent 894e94ea05
commit 0eea5e2793
18 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/build.gradle
View File

@ -48,7 +48,7 @@ dependencies {
natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-arm64-v8a"
natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-x86"
natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-x86_64"
implementation "com.badlogicgames.gdx:gdx-controllers-android:$gdxVersion"
implementation "com.badlogicgames.gdx-controllers:gdx-controllers-android:$gdxControllersVersion"
}
dependencies {

2
android/proguard-rules.pro vendored
View File

@ -28,7 +28,7 @@
-dontwarn com.badlogic.gdx.jnigen.BuildTarget*
-dontwarn com.badlogic.gdx.graphics.g2d.freetype.FreetypeBuild
-keep class com.badlogic.gdx.controllers.android.AndroidControllers
-keep class com.badlogic.gdx.controllers.android.AndroidControllers { *; }
-keepclassmembers class com.badlogic.gdx.backends.android.AndroidInput* {
<init>(com.badlogic.gdx.Application, android.content.Context, java.lang.Object, com.badlogic.gdx.backends.android.AndroidApplicationConfiguration);

2
core/build.gradle
View File

@ -31,7 +31,7 @@ dependencies {
api "com.badlogicgames.gdx:gdx:$gdxVersion"
api "com.badlogicgames.gdx:gdx-backend-lwjgl:$gdxVersion"
api "com.badlogicgames.gdx:gdx-ai:$gdxAiVersion"
api "com.badlogicgames.gdx:gdx-controllers:$gdxVersion"
api "com.badlogicgames.gdx-controllers:gdx-controllers-core:$gdxControllersVersion"
}
// Libraries

12
core/src/main/java/com/riiablo/screen/MenuScreen.java
View File

@ -8,8 +8,6 @@ import com.badlogic.gdx.controllers.Controller;
import com.badlogic.gdx.controllers.ControllerAdapter;
import com.badlogic.gdx.controllers.ControllerListener;
import com.badlogic.gdx.controllers.Controllers;
import com.badlogic.gdx.controllers.PovDirection;
import com.badlogic.gdx.controllers.mappings.Xbox;
import com.badlogic.gdx.graphics.g2d.TextureRegion;
import com.badlogic.gdx.math.Vector2;
import com.badlogic.gdx.scenes.scene2d.Actor;
@ -178,10 +176,10 @@ public class MenuScreen extends ScreenAdapter {
@Override
public boolean buttonDown(Controller controller, int buttonIndex) {
System.out.println(buttonIndex);
if (buttonIndex == Xbox.A) {
if (buttonIndex == controller.getMapping().buttonA) {
EventUtils.click((Button) focus);
return true;
} else if (buttonIndex == Xbox.B) {
} else if (buttonIndex == controller.getMapping().buttonB) {
EventUtils.click(btnExitDiablo);
return true;
}
@ -189,6 +187,11 @@ public class MenuScreen extends ScreenAdapter {
return false;
}
/*
* This API changed and no longer exists.
* Functionality need to migrate into #buttonDown I think
*/
/*
@Override
public boolean povMoved(Controller controller, int povIndex, PovDirection value) {
System.out.println(povIndex + " " + value);
@ -213,6 +216,7 @@ public class MenuScreen extends ScreenAdapter {
return false;
}
*/
@Override
public boolean axisMoved(Controller controller, int axisIndex, float value) {

3
desktop/build.gradle
View File

@ -11,8 +11,7 @@ dependencies {
implementation project(':core')
implementation "com.badlogicgames.gdx:gdx-backend-lwjgl:$gdxVersion"
implementation "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"
implementation "com.badlogicgames.gdx:gdx-controllers-desktop:$gdxVersion"
implementation "com.badlogicgames.gdx:gdx-controllers-platform:$gdxVersion:natives-desktop"
implementation "com.badlogicgames.gdx-controllers:gdx-controllers-desktop:$gdxControllersVersion"
implementation "com.badlogicgames.gdx:gdx-box2d-platform:$gdxVersion:natives-desktop"
implementation "commons-cli:commons-cli:$cliVersion"

3
gradle.properties
View File

@ -4,7 +4,8 @@ org.gradle.configureondemand=false
androidBuildToolsPluginVersion=4.1.1
flatbuffersPluginVersion=1.0.7
gdxVersion=1.9.13
gdxVersion=1.9.14
gdxControllersVersion=2.2.0
artemisOdbVersion=2.3.0
artemisContribVersion=2.4.0
gdxAiVersion=1.8.2

2
server/d2gs/src/main/java/com/riiablo/server/d2gs/D2GS.java
View File

@ -160,7 +160,7 @@ public class D2GS extends ApplicationAdapter {
}
HeadlessApplicationConfiguration config = new HeadlessApplicationConfiguration();
config.renderInterval = Animation.FRAME_DURATION;
config.updatesPerSecond = (int) Animation.FRAMES_PER_SECOND;
new HeadlessApplication(new D2GS(home, seed, diff), config);
}

2
server/netty/src/main/java/com/riiablo/onet/reliable/TestClient.java
View File

@ -35,7 +35,7 @@ public class TestClient extends ApplicationAdapter implements PacketProcessor {
public static void main(String[] args) throws Exception {
Thread.sleep(1000);
HeadlessApplicationConfiguration config = new HeadlessApplicationConfiguration();
config.renderInterval = Animation.FRAME_DURATION;
config.updatesPerSecond = (int) Animation.FRAMES_PER_SECOND;
new HeadlessApplication(new TestClient(), config);
}

2
server/netty/src/main/java/com/riiablo/onet/reliable/TestServer.java
View File

@ -35,7 +35,7 @@ public class TestServer extends ApplicationAdapter implements PacketProcessor {
public static void main(String[] args) {
HeadlessApplicationConfiguration config = new HeadlessApplicationConfiguration();
config.renderInterval = Animation.FRAME_DURATION;
config.updatesPerSecond = (int) Animation.FRAMES_PER_SECOND;
new HeadlessApplication(new TestServer(), config);
}

2
server/netty/src/main/java/com/riiablo/onet/tcp/TestClient.java
View File

@ -36,7 +36,7 @@ public class TestClient extends ApplicationAdapter implements PacketProcessor {
public static void main(String[] args) throws Exception {
Thread.sleep(1000);
HeadlessApplicationConfiguration config = new HeadlessApplicationConfiguration();
config.renderInterval = Animation.FRAME_DURATION;
config.updatesPerSecond = (int) Animation.FRAMES_PER_SECOND;
new HeadlessApplication(new TestClient(), config);
}

2
server/netty/src/main/java/com/riiablo/onet/tcp/TestServer.java
View File

@ -31,7 +31,7 @@ public class TestServer extends ApplicationAdapter implements PacketProcessor {
public static void main(String[] args) throws Exception {
HeadlessApplicationConfiguration config = new HeadlessApplicationConfiguration();
config.renderInterval = Animation.FRAME_DURATION;
config.updatesPerSecond = (int) Animation.FRAMES_PER_SECOND;
new HeadlessApplication(new TestServer(), config);
}

2
server/netty/src/main/java/com/riiablo/server/d2gs/Main.java
View File

@ -118,7 +118,7 @@ public class Main extends ApplicationAdapter {
}
HeadlessApplicationConfiguration config = new HeadlessApplicationConfiguration();
config.renderInterval = Animation.FRAME_DURATION;
config.updatesPerSecond = (int) Animation.FRAMES_PER_SECOND;
new HeadlessApplication(new Main(home, seed, diff), config);
}

2
server/netty/src/main/java/com/riiablo/server/d2gs_netty/Main.java
View File

@ -118,7 +118,7 @@ public class Main extends ApplicationAdapter {
}
HeadlessApplicationConfiguration config = new HeadlessApplicationConfiguration();
config.renderInterval = Animation.FRAME_DURATION;
config.updatesPerSecond = (int) Animation.FRAMES_PER_SECOND;
new HeadlessApplication(new Main(home, seed, diff), config);
}

2
server/netty/src/main/java/com/riiablo/server/d2gs_test/Main.java
View File

@ -46,7 +46,7 @@ public class Main extends ApplicationAdapter implements PacketProcessor {
public static void main(String[] args) {
HeadlessApplicationConfiguration config = new HeadlessApplicationConfiguration();
config.renderInterval = Animation.FRAME_DURATION;
config.updatesPerSecond = (int) Animation.FRAMES_PER_SECOND;
new HeadlessApplication(new Main(), config);
}

2
server/netty/src/main/java/com/riiablo/server/d2gs_test/TestClient.java
View File

@ -38,7 +38,7 @@ public class TestClient extends ApplicationAdapter implements PacketProcessor {
public static void main(String[] args) throws Exception {
Thread.sleep(1000);
HeadlessApplicationConfiguration config = new HeadlessApplicationConfiguration();
config.renderInterval = Animation.FRAME_DURATION;
config.updatesPerSecond = (int) Animation.FRAMES_PER_SECOND;
new HeadlessApplication(new TestClient(), config);
}

2
server/netty/src/main/java/com/riiablo/server/netty/Client.java
View File

@ -32,7 +32,7 @@ public class Client extends ApplicationAdapter {
public static void main(String[] args) throws Exception {
Thread.sleep(1000);
HeadlessApplicationConfiguration config = new HeadlessApplicationConfiguration();
config.renderInterval = Animation.FRAME_DURATION;
config.updatesPerSecond = (int) Animation.FRAMES_PER_SECOND;
new HeadlessApplication(new Client(), config);
}

2
server/netty/src/main/java/com/riiablo/server/netty/Main.java
View File

@ -53,7 +53,7 @@ public class Main extends ApplicationAdapter {
// TODO: process args and setup server
HeadlessApplicationConfiguration config = new HeadlessApplicationConfiguration();
config.renderInterval = Animation.FRAME_DURATION;
config.updatesPerSecond = (int) Animation.FRAMES_PER_SECOND;
new HeadlessApplication(new Main(), config);
}

1
tools/video-player/build.gradle
View File

@ -2,7 +2,6 @@ description = 'Play videos from MPQ archives.'
application.mainClass = 'com.riiablo.video.VideoPlayerTool'
dependencies {
implementation "com.badlogicgames.gdx:gdx-jnigen:$gdxVersion"
implementation "com.badlogicgames.gdx-video:gdx-video:1.3.2-SNAPSHOT"
implementation "com.badlogicgames.gdx-video:gdx-video-lwjgl:1.3.2-SNAPSHOT"
}