From 67de084a61db9d581fbb96a27513edb4958e5893 Mon Sep 17 00:00:00 2001 From: fgnm Date: Wed, 8 Dec 2021 21:59:24 +0100 Subject: [PATCH] Fix bad typo in Spine extension package :p --- h2d-libgdx-spine-extension | 2 +- hyperlap2d-runtime-libgdx | 2 +- .../editor/plugin/tiled/manager/ResourcesManager.java | 2 +- .../plugin/tiled/tools/drawStrategy/SpineDrawStrategy.java | 2 +- .../controller/commands/component/ReplaceSpineCommand.java | 2 +- .../commands/component/UpdateSpineDataCommand.java | 2 +- .../java/games/rednblack/editor/live/LivePreviewScreen.java | 2 +- .../games/rednblack/editor/utils/asset/impl/SpineAsset.java | 2 +- src/main/java/games/rednblack/editor/view/stage/Sandbox.java | 5 +---- .../view/ui/box/resourcespanel/UIAnimationsTabMediator.java | 2 +- .../rednblack/editor/view/ui/followers/SpineFollower.java | 2 +- .../panels/UISpineAnimationItemPropertiesMediator.java | 2 +- .../rednblack/editor/view/ui/widget/actors/SpineActor.java | 2 +- 13 files changed, 13 insertions(+), 16 deletions(-) diff --git a/h2d-libgdx-spine-extension b/h2d-libgdx-spine-extension index 0e02ca8a..83c24a9a 160000 --- a/h2d-libgdx-spine-extension +++ b/h2d-libgdx-spine-extension @@ -1 +1 @@ -Subproject commit 0e02ca8a6b893a661b0daf8dad2bb0be56a7ac07 +Subproject commit 83c24a9afc3a808ef545c82f273540e55a6d3735 diff --git a/hyperlap2d-runtime-libgdx b/hyperlap2d-runtime-libgdx index 583a8778..19786cdf 160000 --- a/hyperlap2d-runtime-libgdx +++ b/hyperlap2d-runtime-libgdx @@ -1 +1 @@ -Subproject commit 583a8778070f5779e3274ed45d1d9f3e1c42c0b8 +Subproject commit 19786cdf619fddd71ce30fb2b16756391762ee6b diff --git a/plugin-tiled/src/main/java/games/rednblack/editor/plugin/tiled/manager/ResourcesManager.java b/plugin-tiled/src/main/java/games/rednblack/editor/plugin/tiled/manager/ResourcesManager.java index bf5d7aa6..7731319f 100644 --- a/plugin-tiled/src/main/java/games/rednblack/editor/plugin/tiled/manager/ResourcesManager.java +++ b/plugin-tiled/src/main/java/games/rednblack/editor/plugin/tiled/manager/ResourcesManager.java @@ -14,7 +14,7 @@ import com.google.common.io.ByteStreams; import games.rednblack.editor.plugin.tiled.TiledPlugin; import games.rednblack.editor.plugin.tiled.view.SpineDrawable; import games.rednblack.editor.renderer.factory.EntityFactory; -import games.rednblack.h2d.extention.spine.ResourceRetrieverAttachmentLoader; +import games.rednblack.h2d.extension.spine.ResourceRetrieverAttachmentLoader; import java.io.File; import java.io.FileOutputStream; diff --git a/plugin-tiled/src/main/java/games/rednblack/editor/plugin/tiled/tools/drawStrategy/SpineDrawStrategy.java b/plugin-tiled/src/main/java/games/rednblack/editor/plugin/tiled/tools/drawStrategy/SpineDrawStrategy.java index f4db4045..cfac5566 100644 --- a/plugin-tiled/src/main/java/games/rednblack/editor/plugin/tiled/tools/drawStrategy/SpineDrawStrategy.java +++ b/plugin-tiled/src/main/java/games/rednblack/editor/plugin/tiled/tools/drawStrategy/SpineDrawStrategy.java @@ -8,7 +8,7 @@ import games.rednblack.editor.renderer.components.SpineDataComponent; import games.rednblack.editor.renderer.utils.ComponentRetriever; import games.rednblack.h2d.common.command.ReplaceSpineCommandBuilder; import games.rednblack.h2d.common.factory.IFactory; -import games.rednblack.h2d.extention.spine.ResourceRetrieverAttachmentLoader; +import games.rednblack.h2d.extension.spine.ResourceRetrieverAttachmentLoader; public class SpineDrawStrategy extends BasicDrawStrategy { diff --git a/src/main/java/games/rednblack/editor/controller/commands/component/ReplaceSpineCommand.java b/src/main/java/games/rednblack/editor/controller/commands/component/ReplaceSpineCommand.java index 536d56b9..d1e22769 100644 --- a/src/main/java/games/rednblack/editor/controller/commands/component/ReplaceSpineCommand.java +++ b/src/main/java/games/rednblack/editor/controller/commands/component/ReplaceSpineCommand.java @@ -9,7 +9,7 @@ import games.rednblack.editor.renderer.components.TransformComponent; import games.rednblack.editor.utils.runtime.EntityUtils; import games.rednblack.editor.utils.runtime.SandboxComponentRetriever; import games.rednblack.h2d.common.MsgAPI; -import games.rednblack.h2d.extention.spine.SpineObjectComponent; +import games.rednblack.h2d.extension.spine.SpineObjectComponent; public class ReplaceSpineCommand extends EntityModifyRevertibleCommand { diff --git a/src/main/java/games/rednblack/editor/controller/commands/component/UpdateSpineDataCommand.java b/src/main/java/games/rednblack/editor/controller/commands/component/UpdateSpineDataCommand.java index 2724bc35..343c593e 100644 --- a/src/main/java/games/rednblack/editor/controller/commands/component/UpdateSpineDataCommand.java +++ b/src/main/java/games/rednblack/editor/controller/commands/component/UpdateSpineDataCommand.java @@ -7,7 +7,7 @@ import games.rednblack.editor.renderer.data.SpineVO; import games.rednblack.editor.utils.runtime.EntityUtils; import games.rednblack.editor.utils.runtime.SandboxComponentRetriever; import games.rednblack.h2d.common.MsgAPI; -import games.rednblack.h2d.extention.spine.SpineObjectComponent; +import games.rednblack.h2d.extension.spine.SpineObjectComponent; public class UpdateSpineDataCommand extends EntityModifyRevertibleCommand { diff --git a/src/main/java/games/rednblack/editor/live/LivePreviewScreen.java b/src/main/java/games/rednblack/editor/live/LivePreviewScreen.java index d1313f82..7aeac149 100644 --- a/src/main/java/games/rednblack/editor/live/LivePreviewScreen.java +++ b/src/main/java/games/rednblack/editor/live/LivePreviewScreen.java @@ -21,7 +21,7 @@ import games.rednblack.editor.renderer.components.additional.ButtonComponent; import games.rednblack.editor.view.stage.Sandbox; import games.rednblack.h2d.extension.talos.TalosItemType; import games.rednblack.h2d.extension.typinglabel.TypingLabelItemType; -import games.rednblack.h2d.extention.spine.SpineItemType; +import games.rednblack.h2d.extension.spine.SpineItemType; import org.puremvc.java.interfaces.IFacade; public class LivePreviewScreen extends ScreenAdapter implements GestureDetector.GestureListener { diff --git a/src/main/java/games/rednblack/editor/utils/asset/impl/SpineAsset.java b/src/main/java/games/rednblack/editor/utils/asset/impl/SpineAsset.java index b0196b8a..22cf5b69 100644 --- a/src/main/java/games/rednblack/editor/utils/asset/impl/SpineAsset.java +++ b/src/main/java/games/rednblack/editor/utils/asset/impl/SpineAsset.java @@ -19,7 +19,7 @@ import games.rednblack.editor.utils.runtime.EntityUtils; import games.rednblack.editor.utils.runtime.SandboxComponentRetriever; import games.rednblack.editor.view.stage.Sandbox; import games.rednblack.h2d.common.ProgressHandler; -import games.rednblack.h2d.extention.spine.SpineItemType; +import games.rednblack.h2d.extension.spine.SpineItemType; import org.apache.commons.io.FileUtils; import org.apache.commons.io.FilenameUtils; diff --git a/src/main/java/games/rednblack/editor/view/stage/Sandbox.java b/src/main/java/games/rednblack/editor/view/stage/Sandbox.java index cf87ee36..0e5a13fb 100644 --- a/src/main/java/games/rednblack/editor/view/stage/Sandbox.java +++ b/src/main/java/games/rednblack/editor/view/stage/Sandbox.java @@ -18,9 +18,7 @@ package games.rednblack.editor.view.stage; -import com.artemis.Aspect; import com.artemis.io.JsonArtemisSerializer; -import com.artemis.io.SaveFileFormat; import com.artemis.managers.WorldSerializationManager; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.backends.lwjgl3.Lwjgl3Application; @@ -62,9 +60,8 @@ import games.rednblack.h2d.common.vo.SceneConfigVO; import games.rednblack.h2d.extension.talos.TalosItemType; import games.rednblack.h2d.extension.talos.TalosSystem; import games.rednblack.h2d.extension.typinglabel.TypingLabelItemType; -import games.rednblack.h2d.extention.spine.SpineItemType; +import games.rednblack.h2d.extension.spine.SpineItemType; -import java.io.*; import java.util.HashMap; /** diff --git a/src/main/java/games/rednblack/editor/view/ui/box/resourcespanel/UIAnimationsTabMediator.java b/src/main/java/games/rednblack/editor/view/ui/box/resourcespanel/UIAnimationsTabMediator.java index 1ed6730c..063ecc8f 100644 --- a/src/main/java/games/rednblack/editor/view/ui/box/resourcespanel/UIAnimationsTabMediator.java +++ b/src/main/java/games/rednblack/editor/view/ui/box/resourcespanel/UIAnimationsTabMediator.java @@ -29,7 +29,7 @@ import games.rednblack.editor.view.ui.box.resourcespanel.draggable.DraggableReso import games.rednblack.editor.view.ui.box.resourcespanel.draggable.box.BoxItemResource; import games.rednblack.editor.view.ui.box.resourcespanel.draggable.box.SpineResource; import games.rednblack.editor.view.ui.box.resourcespanel.draggable.box.SpriteResource; -import games.rednblack.h2d.extention.spine.SpineItemType; +import games.rednblack.h2d.extension.spine.SpineItemType; import org.apache.commons.lang3.ArrayUtils; import org.puremvc.java.interfaces.INotification; diff --git a/src/main/java/games/rednblack/editor/view/ui/followers/SpineFollower.java b/src/main/java/games/rednblack/editor/view/ui/followers/SpineFollower.java index 91776143..0eece3b5 100644 --- a/src/main/java/games/rednblack/editor/view/ui/followers/SpineFollower.java +++ b/src/main/java/games/rednblack/editor/view/ui/followers/SpineFollower.java @@ -7,7 +7,7 @@ import com.badlogic.gdx.math.Matrix4; import com.esotericsoftware.spine.SkeletonRendererDebug; import games.rednblack.editor.utils.runtime.SandboxComponentRetriever; import games.rednblack.editor.view.stage.Sandbox; -import games.rednblack.h2d.extention.spine.SpineObjectComponent; +import games.rednblack.h2d.extension.spine.SpineObjectComponent; public class SpineFollower extends NormalSelectionFollower { private final SpineObjectComponent spineObjectComponent; diff --git a/src/main/java/games/rednblack/editor/view/ui/properties/panels/UISpineAnimationItemPropertiesMediator.java b/src/main/java/games/rednblack/editor/view/ui/properties/panels/UISpineAnimationItemPropertiesMediator.java index 6a6f9eb0..b1b40eff 100644 --- a/src/main/java/games/rednblack/editor/view/ui/properties/panels/UISpineAnimationItemPropertiesMediator.java +++ b/src/main/java/games/rednblack/editor/view/ui/properties/panels/UISpineAnimationItemPropertiesMediator.java @@ -26,7 +26,7 @@ import games.rednblack.editor.renderer.data.SpineVO; import games.rednblack.editor.utils.runtime.SandboxComponentRetriever; import games.rednblack.editor.view.ui.properties.UIItemPropertiesMediator; import games.rednblack.h2d.common.MsgAPI; -import games.rednblack.h2d.extention.spine.SpineObjectComponent; +import games.rednblack.h2d.extension.spine.SpineObjectComponent; public class UISpineAnimationItemPropertiesMediator extends UIItemPropertiesMediator { private static final String TAG = UISpineAnimationItemPropertiesMediator.class.getCanonicalName(); diff --git a/src/main/java/games/rednblack/editor/view/ui/widget/actors/SpineActor.java b/src/main/java/games/rednblack/editor/view/ui/widget/actors/SpineActor.java index 133e3db3..11204640 100644 --- a/src/main/java/games/rednblack/editor/view/ui/widget/actors/SpineActor.java +++ b/src/main/java/games/rednblack/editor/view/ui/widget/actors/SpineActor.java @@ -12,7 +12,7 @@ import com.esotericsoftware.spine.attachments.Attachment; import com.esotericsoftware.spine.attachments.MeshAttachment; import com.esotericsoftware.spine.attachments.RegionAttachment; import games.rednblack.editor.renderer.resources.IResourceRetriever; -import games.rednblack.h2d.extention.spine.ResourceRetrieverAttachmentLoader; +import games.rednblack.h2d.extension.spine.ResourceRetrieverAttachmentLoader; public class SpineActor extends Actor {