From 1eeddef3774eccfc65d0c511eed991b7a94c302b Mon Sep 17 00:00:00 2001 From: fgnm Date: Sat, 2 Jan 2021 17:08:32 +0100 Subject: [PATCH] * Update libGDX to 1.9.13 * Fix deprecated methods --- gradle.properties | 2 +- .../data/migrations/migrators/VersionMigTo005.java | 4 ++-- .../data/migrations/migrators/VersionMigTo009.java | 4 ++-- .../games/rednblack/editor/proxy/ProjectManager.java | 2 +- .../java/games/rednblack/editor/utils/ImportUtils.java | 2 +- .../editor/utils/runtime/ComponentCloner.java | 10 +++++----- .../editor/view/stage/tools/TransformTool.java | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/gradle.properties b/gradle.properties index aa5fd289..590ace2f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -gdxVersion = 1.9.13-SNAPSHOT +gdxVersion = 1.9.13 gdxVersionBeta = 1.9.13-SNAPSHOT box2dlightsVersion = 1.6-SNAPSHOT ashleyVersion = 1.7.3 diff --git a/src/main/java/games/rednblack/editor/data/migrations/migrators/VersionMigTo005.java b/src/main/java/games/rednblack/editor/data/migrations/migrators/VersionMigTo005.java index 888536e2..52c7ea19 100644 --- a/src/main/java/games/rednblack/editor/data/migrations/migrators/VersionMigTo005.java +++ b/src/main/java/games/rednblack/editor/data/migrations/migrators/VersionMigTo005.java @@ -70,7 +70,7 @@ public class VersionMigTo005 implements IVersionMigrator { FileHandle projectInfoFile = Gdx.files.internal(prjInfoFilePath); String projectInfoContents = null; try { - projectInfoContents = FileUtils.readFileToString(projectInfoFile.file()); + projectInfoContents = FileUtils.readFileToString(projectInfoFile.file(), "utf-8"); ProjectInfoVO currentProjectInfoVO = json.fromJson(ProjectInfoVO.class, projectInfoContents); projectManager.currentProjectInfoVO = currentProjectInfoVO; @@ -88,7 +88,7 @@ public class VersionMigTo005 implements IVersionMigrator { for (File entry : scenesDir.listFiles()) { if (!entry.isDirectory()) { try { - String content = FileUtils.readFileToString(new FileHandle(entry).file()); + String content = FileUtils.readFileToString(new FileHandle(entry).file(), "utf-8"); content = content.replaceAll("\"slights\":", "\"sLights\":"); FileUtils.writeStringToFile(new File(entry.getAbsolutePath()), content, "utf-8"); } catch (IOException e) { diff --git a/src/main/java/games/rednblack/editor/data/migrations/migrators/VersionMigTo009.java b/src/main/java/games/rednblack/editor/data/migrations/migrators/VersionMigTo009.java index ce25f6ff..31c48216 100644 --- a/src/main/java/games/rednblack/editor/data/migrations/migrators/VersionMigTo009.java +++ b/src/main/java/games/rednblack/editor/data/migrations/migrators/VersionMigTo009.java @@ -65,7 +65,7 @@ public class VersionMigTo009 implements IVersionMigrator { for (File entry : scenesDir.listFiles()) { if (!entry.isDirectory()) { try { - String content = FileUtils.readFileToString(new FileHandle(entry).file()); + String content = FileUtils.readFileToString(new FileHandle(entry).file(), "utf-8"); JsonValue value = jsonReader.parse(content); fixAnimations(value.get("composite")); if(value.get("libraryItems") != null) { @@ -105,7 +105,7 @@ public class VersionMigTo009 implements IVersionMigrator { String prjInfoFilePath = projectPath + "/project.dt"; FileHandle projectInfoFile = Gdx.files.internal(prjInfoFilePath); try { - String projectInfoContents = FileUtils.readFileToString(projectInfoFile.file()); + String projectInfoContents = FileUtils.readFileToString(projectInfoFile.file(), "utf-8"); JsonValue value = jsonReader.parse(projectInfoContents); JsonValue newVal = jsonReader.parse(libraryArrayJsonString); newVal.name = "libraryItems"; diff --git a/src/main/java/games/rednblack/editor/proxy/ProjectManager.java b/src/main/java/games/rednblack/editor/proxy/ProjectManager.java index 792a2e50..af2b71c2 100755 --- a/src/main/java/games/rednblack/editor/proxy/ProjectManager.java +++ b/src/main/java/games/rednblack/editor/proxy/ProjectManager.java @@ -1259,7 +1259,7 @@ public class ProjectManager extends Proxy { Json json = new Json(); String projectInfoContents = null; try { - projectInfoContents = FileUtils.readFileToString(handle.file()); + projectInfoContents = FileUtils.readFileToString(handle.file(), "utf-8"); } catch (IOException e) { e.printStackTrace(); } diff --git a/src/main/java/games/rednblack/editor/utils/ImportUtils.java b/src/main/java/games/rednblack/editor/utils/ImportUtils.java index 24955242..193ceaa8 100644 --- a/src/main/java/games/rednblack/editor/utils/ImportUtils.java +++ b/src/main/java/games/rednblack/editor/utils/ImportUtils.java @@ -173,7 +173,7 @@ public class ImportUtils { int type = TYPE_UNKNOWN; try { - String contents = FileUtils.readFileToString(file); + String contents = FileUtils.readFileToString(file, "utf-8"); // checking for atlas file if (contents.contains("format: ") && contents.contains("filter: ") && contents.contains("xy: ")) { diff --git a/src/main/java/games/rednblack/editor/utils/runtime/ComponentCloner.java b/src/main/java/games/rednblack/editor/utils/runtime/ComponentCloner.java index 6c973fad..a59928ee 100644 --- a/src/main/java/games/rednblack/editor/utils/runtime/ComponentCloner.java +++ b/src/main/java/games/rednblack/editor/utils/runtime/ComponentCloner.java @@ -24,6 +24,8 @@ import java.util.ArrayList; import java.util.Collection; import com.badlogic.ashley.core.Component; +import com.badlogic.gdx.utils.reflect.ClassReflection; +import com.badlogic.gdx.utils.reflect.ReflectionException; /** * Created by azakhary on 6/3/2015. @@ -34,7 +36,7 @@ public class ComponentCloner { Class eClass = source.getClass(); E target = null; try { - target = (E) eClass.newInstance(); + target = (E) ClassReflection.newInstance(eClass); Field[] sourceFields = source.getClass().getDeclaredFields(); Field[] targetFields = target.getClass().getDeclaredFields(); for(int i = 0; i < targetFields.length; i++) { @@ -42,10 +44,8 @@ public class ComponentCloner { targetFields[i].set(target, sourceFields[i].get(source)); } } - } catch (InstantiationException e) { - //e.printStackTrace(); - } catch (IllegalAccessException e) { - //e.printStackTrace(); + } catch (IllegalAccessException | ReflectionException e) { + e.printStackTrace(); } return target; diff --git a/src/main/java/games/rednblack/editor/view/stage/tools/TransformTool.java b/src/main/java/games/rednblack/editor/view/stage/tools/TransformTool.java index a72594b7..ddd54074 100644 --- a/src/main/java/games/rednblack/editor/view/stage/tools/TransformTool.java +++ b/src/main/java/games/rednblack/editor/view/stage/tools/TransformTool.java @@ -188,7 +188,7 @@ public class TransformTool extends SelectionTool implements FollowerTransformati Vector2 originPoint = new Vector2(transformComponent.x + transformComponent.originX, transformComponent.y + transformComponent.originY); mousePoint.sub(originPoint); //origin related - lastTransformAngle = mousePoint.angle(); + lastTransformAngle = mousePoint.angleDeg(); lastEntityAngle = transformComponent.rotation; } }