From 7424f136cb7c6f82048efdfd21eda8dd986f1d54 Mon Sep 17 00:00:00 2001 From: Tom Wojciechowski Date: Thu, 31 Aug 2023 16:31:08 +0100 Subject: [PATCH] supplier only in one place --- .../talos/editor/addons/scene/SceneEditorWorkspace.java | 2 +- .../src/com/talosvfx/talos/editor/addons/scene/SceneUtils.java | 2 +- .../editor/addons/scene/apps/routines/ScenePreviewStage.java | 2 +- .../addons/scene/apps/routines/ui/types/CustomAssetWidget.java | 2 +- .../addons/scene/apps/tiledpalette/PaletteEditorWorkspace.java | 2 +- .../talos/editor/addons/scene/assets/AssetRepository.java | 2 +- .../talos/editor/addons/scene/dialogs/SettingsDialog.java | 2 +- .../talos/editor/addons/scene/logic/MultiPropertyHolder.java | 2 +- .../scene/logic/componentwrappers/CurveComponentProvider.java | 2 +- .../componentwrappers/EdgeCollider2DComponentProvider.java | 2 +- .../logic/componentwrappers/GameObjectPropertyProvider.java | 2 +- .../scene/logic/componentwrappers/MapComponentProvider.java | 2 +- .../logic/componentwrappers/PaintSurfaceComponentProvider.java | 2 +- .../logic/componentwrappers/ParticleComponentProvider.java | 2 +- .../logic/componentwrappers/PathRendererComponentProvider.java | 2 +- .../logic/componentwrappers/RendererComponentProvider.java | 2 +- .../logic/componentwrappers/RoutineRenderComponentProvider.java | 2 +- .../scene/logic/componentwrappers/ScenePropertyProvider.java | 2 +- .../scene/logic/componentwrappers/ScriptComponentProvider.java | 2 +- .../scene/logic/componentwrappers/SpineComponentProvider.java | 2 +- .../componentwrappers/SpriteRendererComponentProvider.java | 2 +- .../addons/scene/logic/metawrappers/SpineMetaDataProvider.java | 2 +- .../talos/editor/addons/scene/utils/FilePropertyProvider.java | 2 +- .../editor/addons/scene/utils/importers/AssetImporter.java | 2 +- .../editor/addons/scene/widgets/ProjectExplorerWidget.java | 2 +- .../addons/scene/widgets/directoryview/DirectoryViewWidget.java | 2 +- .../talos/editor/addons/scene/widgets/gizmos/Gizmo.java | 2 +- .../addons/scene/widgets/property/GameObjectSelectWidget.java | 2 +- .../widgets/property/PropertyPanelAssetSelectionWidget.java | 2 +- editor/src/com/talosvfx/talos/editor/nodes/NodeWidget.java | 2 +- .../talosvfx/talos/editor/nodes/widgets/GameAssetWidget.java | 2 +- .../project2/vfxui/GenericStageWrappedViewportWidget.java | 2 +- .../editor/widgets/propertyWidgets/AttachmentPointWidget.java | 2 +- .../editor/widgets/propertyWidgets/ButtonPropertyWidget.java | 2 +- .../talos/editor/widgets/propertyWidgets/CheckboxWidget.java | 2 +- .../editor/widgets/propertyWidgets/ColorPropertyWidget.java | 2 +- .../editor/widgets/propertyWidgets/DynamicItemListWidget.java | 2 +- .../editor/widgets/propertyWidgets/EditableLabelWidget.java | 2 +- .../editor/widgets/propertyWidgets/FloatPropertyWidget.java | 2 +- .../editor/widgets/propertyWidgets/GlobalValuePointsWidget.java | 2 +- .../talos/editor/widgets/propertyWidgets/IntPropertyWidget.java | 2 +- .../talos/editor/widgets/propertyWidgets/LabelWidget.java | 2 +- .../talos/editor/widgets/propertyWidgets/PropertyWidget.java | 2 +- .../talos/editor/widgets/propertyWidgets/SelectBoxWidget.java | 2 +- .../widgets/propertyWidgets/TalosLayerPropertiesWidget.java | 2 +- .../editor/widgets/propertyWidgets/Vector2PropertyWidget.java | 2 +- .../talos/editor/widgets/propertyWidgets/WidgetFactory.java | 2 +- editor/src/com/talosvfx/talos/editor/widgets/ui/Preview3D.java | 2 +- .../src/com/talosvfx/talos/editor/widgets/ui/PreviewWidget.java | 2 +- .../talosvfx/talos/editor/widgets/ui/ViewportViewSettings.java | 2 +- .../com/talosvfx/talos/editor/widgets/ui/ViewportWidget.java | 2 +- 51 files changed, 51 insertions(+), 51 deletions(-) diff --git a/editor/src/com/talosvfx/talos/editor/addons/scene/SceneEditorWorkspace.java b/editor/src/com/talosvfx/talos/editor/addons/scene/SceneEditorWorkspace.java index b5c83deb8..0c875a72f 100644 --- a/editor/src/com/talosvfx/talos/editor/addons/scene/SceneEditorWorkspace.java +++ b/editor/src/com/talosvfx/talos/editor/addons/scene/SceneEditorWorkspace.java @@ -80,7 +80,7 @@ import java.io.File; import java.io.IOException; import java.util.Random; -import java.util.function.Supplier; +import com.talosvfx.talos.runtime.utils.Supplier; import static com.talosvfx.talos.editor.utils.InputUtils.ctrlPressed; diff --git a/editor/src/com/talosvfx/talos/editor/addons/scene/SceneUtils.java b/editor/src/com/talosvfx/talos/editor/addons/scene/SceneUtils.java index 6675aa5ce..dc72d8309 100644 --- a/editor/src/com/talosvfx/talos/editor/addons/scene/SceneUtils.java +++ b/editor/src/com/talosvfx/talos/editor/addons/scene/SceneUtils.java @@ -46,7 +46,7 @@ import java.util.Arrays; import java.util.List; import java.util.UUID; -import java.util.function.Supplier; +import com.talosvfx.talos.runtime.utils.Supplier; import java.util.stream.Collectors; import static com.talosvfx.talos.editor.addons.scene.utils.importers.AssetImporter.fromDirectoryView; diff --git a/editor/src/com/talosvfx/talos/editor/addons/scene/apps/routines/ScenePreviewStage.java b/editor/src/com/talosvfx/talos/editor/addons/scene/apps/routines/ScenePreviewStage.java index ba43aa965..16cb5d2c4 100644 --- a/editor/src/com/talosvfx/talos/editor/addons/scene/apps/routines/ScenePreviewStage.java +++ b/editor/src/com/talosvfx/talos/editor/addons/scene/apps/routines/ScenePreviewStage.java @@ -27,7 +27,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.function.Supplier; +import com.talosvfx.talos.runtime.utils.Supplier; public class ScenePreviewStage extends ViewportWidget implements Observer { diff --git a/editor/src/com/talosvfx/talos/editor/addons/scene/apps/routines/ui/types/CustomAssetWidget.java b/editor/src/com/talosvfx/talos/editor/addons/scene/apps/routines/ui/types/CustomAssetWidget.java index 91d92b6dd..e3402986f 100644 --- a/editor/src/com/talosvfx/talos/editor/addons/scene/apps/routines/ui/types/CustomAssetWidget.java +++ b/editor/src/com/talosvfx/talos/editor/addons/scene/apps/routines/ui/types/CustomAssetWidget.java @@ -14,7 +14,7 @@ import com.talosvfx.talos.runtime.scene.utils.propertyWrappers.PropertyWrapper; import com.talosvfx.talos.editor.widgets.ui.common.zoomWidgets.LabelWithZoom; -import java.util.function.Supplier; +import com.talosvfx.talos.runtime.utils.Supplier; public class CustomAssetWidget extends ATypeWidget> { private GenericAssetSelectionWidget assetWidget; diff --git a/editor/src/com/talosvfx/talos/editor/addons/scene/apps/tiledpalette/PaletteEditorWorkspace.java b/editor/src/com/talosvfx/talos/editor/addons/scene/apps/tiledpalette/PaletteEditorWorkspace.java index 39b455a2e..37896ad39 100644 --- a/editor/src/com/talosvfx/talos/editor/addons/scene/apps/tiledpalette/PaletteEditorWorkspace.java +++ b/editor/src/com/talosvfx/talos/editor/addons/scene/apps/tiledpalette/PaletteEditorWorkspace.java @@ -43,7 +43,7 @@ import org.slf4j.Logger; import java.util.Comparator; -import java.util.function.Supplier; +import com.talosvfx.talos.runtime.utils.Supplier; import static com.talosvfx.talos.editor.utils.InputUtils.ctrlPressed; diff --git a/editor/src/com/talosvfx/talos/editor/addons/scene/assets/AssetRepository.java b/editor/src/com/talosvfx/talos/editor/addons/scene/assets/AssetRepository.java index 9682dcd3f..9aca68aa5 100644 --- a/editor/src/com/talosvfx/talos/editor/addons/scene/assets/AssetRepository.java +++ b/editor/src/com/talosvfx/talos/editor/addons/scene/assets/AssetRepository.java @@ -59,6 +59,7 @@ import com.talosvfx.talos.runtime.scene.Scene; import com.talosvfx.talos.runtime.scene.components.MapComponent; import com.talosvfx.talos.runtime.scene.components.ScriptComponent; +import com.talosvfx.talos.runtime.utils.Supplier; import com.talosvfx.talos.runtime.utils.TempHackUtil; import com.talosvfx.talos.runtime.vfx.ParticleEffectDescriptor; import com.talosvfx.talos.runtime.vfx.serialization.ExportData; @@ -75,7 +76,6 @@ import java.util.Objects; import java.util.UUID; import java.util.function.Function; -import java.util.function.Supplier; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/editor/src/com/talosvfx/talos/editor/addons/scene/dialogs/SettingsDialog.java b/editor/src/com/talosvfx/talos/editor/addons/scene/dialogs/SettingsDialog.java index c95fd8a05..96180a811 100644 --- a/editor/src/com/talosvfx/talos/editor/addons/scene/dialogs/SettingsDialog.java +++ b/editor/src/com/talosvfx/talos/editor/addons/scene/dialogs/SettingsDialog.java @@ -20,7 +20,7 @@ import java.io.File; import java.net.Socket; -import java.util.function.Supplier; +import com.talosvfx.talos.runtime.utils.Supplier; public class SettingsDialog extends VisWindow { diff --git a/editor/src/com/talosvfx/talos/editor/addons/scene/logic/MultiPropertyHolder.java b/editor/src/com/talosvfx/talos/editor/addons/scene/logic/MultiPropertyHolder.java index 46fcbb94c..1dfbbaba7 100644 --- a/editor/src/com/talosvfx/talos/editor/addons/scene/logic/MultiPropertyHolder.java +++ b/editor/src/com/talosvfx/talos/editor/addons/scene/logic/MultiPropertyHolder.java @@ -7,7 +7,7 @@ import com.talosvfx.talos.editor.widgets.propertyWidgets.IPropertyProvider; import com.talosvfx.talos.editor.widgets.propertyWidgets.PropertyWidget; -import java.util.function.Supplier; +import com.talosvfx.talos.runtime.utils.Supplier; public class MultiPropertyHolder implements IPropertyHolder { diff --git a/editor/src/com/talosvfx/talos/editor/addons/scene/logic/componentwrappers/CurveComponentProvider.java b/editor/src/com/talosvfx/talos/editor/addons/scene/logic/componentwrappers/CurveComponentProvider.java index ccb211004..9b9e9558c 100644 --- a/editor/src/com/talosvfx/talos/editor/addons/scene/logic/componentwrappers/CurveComponentProvider.java +++ b/editor/src/com/talosvfx/talos/editor/addons/scene/logic/componentwrappers/CurveComponentProvider.java @@ -7,7 +7,7 @@ import com.talosvfx.talos.editor.widgets.propertyWidgets.PropertyWidget; import com.talosvfx.talos.runtime.scene.components.CurveComponent; -import java.util.function.Supplier; +import com.talosvfx.talos.runtime.utils.Supplier; public class CurveComponentProvider extends AComponentProvider { diff --git a/editor/src/com/talosvfx/talos/editor/addons/scene/logic/componentwrappers/EdgeCollider2DComponentProvider.java b/editor/src/com/talosvfx/talos/editor/addons/scene/logic/componentwrappers/EdgeCollider2DComponentProvider.java index 201849920..2abace010 100644 --- a/editor/src/com/talosvfx/talos/editor/addons/scene/logic/componentwrappers/EdgeCollider2DComponentProvider.java +++ b/editor/src/com/talosvfx/talos/editor/addons/scene/logic/componentwrappers/EdgeCollider2DComponentProvider.java @@ -4,7 +4,7 @@ import com.talosvfx.talos.editor.widgets.propertyWidgets.*; import com.talosvfx.talos.runtime.scene.components.EdgeCollider2DComponent; -import java.util.function.Supplier; +import com.talosvfx.talos.runtime.utils.Supplier; public class EdgeCollider2DComponentProvider extends AComponentProvider { diff --git a/editor/src/com/talosvfx/talos/editor/addons/scene/logic/componentwrappers/GameObjectPropertyProvider.java b/editor/src/com/talosvfx/talos/editor/addons/scene/logic/componentwrappers/GameObjectPropertyProvider.java index 1f97d4c46..847f3f50b 100644 --- a/editor/src/com/talosvfx/talos/editor/addons/scene/logic/componentwrappers/GameObjectPropertyProvider.java +++ b/editor/src/com/talosvfx/talos/editor/addons/scene/logic/componentwrappers/GameObjectPropertyProvider.java @@ -13,7 +13,7 @@ import com.talosvfx.talos.editor.widgets.propertyWidgets.WidgetFactory; import com.talosvfx.talos.runtime.scene.GameObject; -import java.util.function.Supplier; +import com.talosvfx.talos.runtime.utils.Supplier; public class GameObjectPropertyProvider implements IPropertyProvider { diff --git a/editor/src/com/talosvfx/talos/editor/addons/scene/logic/componentwrappers/MapComponentProvider.java b/editor/src/com/talosvfx/talos/editor/addons/scene/logic/componentwrappers/MapComponentProvider.java index 6ac5c7de2..580711173 100644 --- a/editor/src/com/talosvfx/talos/editor/addons/scene/logic/componentwrappers/MapComponentProvider.java +++ b/editor/src/com/talosvfx/talos/editor/addons/scene/logic/componentwrappers/MapComponentProvider.java @@ -12,7 +12,7 @@ import com.talosvfx.talos.runtime.maps.TalosLayer; import com.talosvfx.talos.runtime.scene.components.MapComponent; -import java.util.function.Supplier; +import com.talosvfx.talos.runtime.utils.Supplier; public class MapComponentProvider extends RendererComponentProvider { diff --git a/editor/src/com/talosvfx/talos/editor/addons/scene/logic/componentwrappers/PaintSurfaceComponentProvider.java b/editor/src/com/talosvfx/talos/editor/addons/scene/logic/componentwrappers/PaintSurfaceComponentProvider.java index e2b86581b..24ead00af 100644 --- a/editor/src/com/talosvfx/talos/editor/addons/scene/logic/componentwrappers/PaintSurfaceComponentProvider.java +++ b/editor/src/com/talosvfx/talos/editor/addons/scene/logic/componentwrappers/PaintSurfaceComponentProvider.java @@ -18,7 +18,7 @@ import com.talosvfx.talos.runtime.scene.GameObjectContainer; import com.talosvfx.talos.runtime.scene.components.PaintSurfaceComponent; -import java.util.function.Supplier; +import com.talosvfx.talos.runtime.utils.Supplier; public class PaintSurfaceComponentProvider extends AComponentProvider { diff --git a/editor/src/com/talosvfx/talos/editor/addons/scene/logic/componentwrappers/ParticleComponentProvider.java b/editor/src/com/talosvfx/talos/editor/addons/scene/logic/componentwrappers/ParticleComponentProvider.java index 378f648d9..07af137df 100644 --- a/editor/src/com/talosvfx/talos/editor/addons/scene/logic/componentwrappers/ParticleComponentProvider.java +++ b/editor/src/com/talosvfx/talos/editor/addons/scene/logic/componentwrappers/ParticleComponentProvider.java @@ -15,7 +15,7 @@ import com.talosvfx.talos.runtime.scene.components.ParticleComponent; import com.talosvfx.talos.runtime.vfx.serialization.BaseVFXProjectData; -import java.util.function.Supplier; +import com.talosvfx.talos.runtime.utils.Supplier; public class ParticleComponentProvider extends RendererComponentProvider> { diff --git a/editor/src/com/talosvfx/talos/editor/addons/scene/logic/componentwrappers/PathRendererComponentProvider.java b/editor/src/com/talosvfx/talos/editor/addons/scene/logic/componentwrappers/PathRendererComponentProvider.java index b7f4168ff..ca2ebc040 100644 --- a/editor/src/com/talosvfx/talos/editor/addons/scene/logic/componentwrappers/PathRendererComponentProvider.java +++ b/editor/src/com/talosvfx/talos/editor/addons/scene/logic/componentwrappers/PathRendererComponentProvider.java @@ -12,7 +12,7 @@ import com.talosvfx.talos.runtime.scene.GameObject; import com.talosvfx.talos.runtime.scene.components.PathRendererComponent; -import java.util.function.Supplier; +import com.talosvfx.talos.runtime.utils.Supplier; public class PathRendererComponentProvider extends RendererComponentProvider { public PathRendererComponentProvider(PathRendererComponent component) { diff --git a/editor/src/com/talosvfx/talos/editor/addons/scene/logic/componentwrappers/RendererComponentProvider.java b/editor/src/com/talosvfx/talos/editor/addons/scene/logic/componentwrappers/RendererComponentProvider.java index fa274f045..fe7395431 100644 --- a/editor/src/com/talosvfx/talos/editor/addons/scene/logic/componentwrappers/RendererComponentProvider.java +++ b/editor/src/com/talosvfx/talos/editor/addons/scene/logic/componentwrappers/RendererComponentProvider.java @@ -11,7 +11,7 @@ import com.talosvfx.talos.runtime.scene.SceneLayer; import com.talosvfx.talos.runtime.scene.components.RendererComponent; -import java.util.function.Supplier; +import com.talosvfx.talos.runtime.utils.Supplier; public abstract class RendererComponentProvider extends AComponentProvider { diff --git a/editor/src/com/talosvfx/talos/editor/addons/scene/logic/componentwrappers/RoutineRenderComponentProvider.java b/editor/src/com/talosvfx/talos/editor/addons/scene/logic/componentwrappers/RoutineRenderComponentProvider.java index 373256e2f..38885b9f6 100644 --- a/editor/src/com/talosvfx/talos/editor/addons/scene/logic/componentwrappers/RoutineRenderComponentProvider.java +++ b/editor/src/com/talosvfx/talos/editor/addons/scene/logic/componentwrappers/RoutineRenderComponentProvider.java @@ -15,7 +15,7 @@ import com.talosvfx.talos.runtime.scene.components.RoutineRendererComponent; import com.talosvfx.talos.runtime.scene.utils.propertyWrappers.PropertyWrapper; -import java.util.function.Supplier; +import com.talosvfx.talos.runtime.utils.Supplier; public class RoutineRenderComponentProvider extends RendererComponentProvider { diff --git a/editor/src/com/talosvfx/talos/editor/addons/scene/logic/componentwrappers/ScenePropertyProvider.java b/editor/src/com/talosvfx/talos/editor/addons/scene/logic/componentwrappers/ScenePropertyProvider.java index 97995db1f..ae74094f7 100644 --- a/editor/src/com/talosvfx/talos/editor/addons/scene/logic/componentwrappers/ScenePropertyProvider.java +++ b/editor/src/com/talosvfx/talos/editor/addons/scene/logic/componentwrappers/ScenePropertyProvider.java @@ -18,7 +18,7 @@ import com.talosvfx.talos.runtime.scene.SceneLayer; import com.talosvfx.talos.runtime.scene.render.RenderStrategy; -import java.util.function.Supplier; +import com.talosvfx.talos.runtime.utils.Supplier; public class ScenePropertyProvider implements IPropertyProvider { diff --git a/editor/src/com/talosvfx/talos/editor/addons/scene/logic/componentwrappers/ScriptComponentProvider.java b/editor/src/com/talosvfx/talos/editor/addons/scene/logic/componentwrappers/ScriptComponentProvider.java index ee6150659..7eaadf6c8 100644 --- a/editor/src/com/talosvfx/talos/editor/addons/scene/logic/componentwrappers/ScriptComponentProvider.java +++ b/editor/src/com/talosvfx/talos/editor/addons/scene/logic/componentwrappers/ScriptComponentProvider.java @@ -9,7 +9,7 @@ import com.talosvfx.talos.runtime.scene.components.ScriptComponent; import com.talosvfx.talos.runtime.scene.utils.propertyWrappers.PropertyWrapper; -import java.util.function.Supplier; +import com.talosvfx.talos.runtime.utils.Supplier; public class ScriptComponentProvider extends AComponentProvider { diff --git a/editor/src/com/talosvfx/talos/editor/addons/scene/logic/componentwrappers/SpineComponentProvider.java b/editor/src/com/talosvfx/talos/editor/addons/scene/logic/componentwrappers/SpineComponentProvider.java index 5952117e6..ebbae41d7 100644 --- a/editor/src/com/talosvfx/talos/editor/addons/scene/logic/componentwrappers/SpineComponentProvider.java +++ b/editor/src/com/talosvfx/talos/editor/addons/scene/logic/componentwrappers/SpineComponentProvider.java @@ -20,7 +20,7 @@ import com.talosvfx.talos.runtime.scene.GameObjectContainer; import com.talosvfx.talos.runtime.scene.components.SpineRendererComponent; -import java.util.function.Supplier; +import com.talosvfx.talos.runtime.utils.Supplier; public class SpineComponentProvider extends RendererComponentProvider { diff --git a/editor/src/com/talosvfx/talos/editor/addons/scene/logic/componentwrappers/SpriteRendererComponentProvider.java b/editor/src/com/talosvfx/talos/editor/addons/scene/logic/componentwrappers/SpriteRendererComponentProvider.java index b34967a7c..92e95b87d 100644 --- a/editor/src/com/talosvfx/talos/editor/addons/scene/logic/componentwrappers/SpriteRendererComponentProvider.java +++ b/editor/src/com/talosvfx/talos/editor/addons/scene/logic/componentwrappers/SpriteRendererComponentProvider.java @@ -18,7 +18,7 @@ import com.talosvfx.talos.runtime.scene.GameObject; import com.talosvfx.talos.runtime.scene.components.SpriteRendererComponent; -import java.util.function.Supplier; +import com.talosvfx.talos.runtime.utils.Supplier; public final class SpriteRendererComponentProvider extends RendererComponentProvider { diff --git a/editor/src/com/talosvfx/talos/editor/addons/scene/logic/metawrappers/SpineMetaDataProvider.java b/editor/src/com/talosvfx/talos/editor/addons/scene/logic/metawrappers/SpineMetaDataProvider.java index 6bccf5cd7..4d5a87768 100644 --- a/editor/src/com/talosvfx/talos/editor/addons/scene/logic/metawrappers/SpineMetaDataProvider.java +++ b/editor/src/com/talosvfx/talos/editor/addons/scene/logic/metawrappers/SpineMetaDataProvider.java @@ -10,7 +10,7 @@ import com.talosvfx.talos.runtime.assets.GameAssetType; import com.talosvfx.talos.runtime.assets.meta.SpineMetadata; -import java.util.function.Supplier; +import com.talosvfx.talos.runtime.utils.Supplier; public class SpineMetaDataProvider extends AMetaDataProvider { diff --git a/editor/src/com/talosvfx/talos/editor/addons/scene/utils/FilePropertyProvider.java b/editor/src/com/talosvfx/talos/editor/addons/scene/utils/FilePropertyProvider.java index 90f287876..4535e9e12 100644 --- a/editor/src/com/talosvfx/talos/editor/addons/scene/utils/FilePropertyProvider.java +++ b/editor/src/com/talosvfx/talos/editor/addons/scene/utils/FilePropertyProvider.java @@ -9,7 +9,7 @@ import com.talosvfx.talos.editor.widgets.propertyWidgets.LabelWidget; import com.talosvfx.talos.editor.widgets.propertyWidgets.PropertyWidget; -import java.util.function.Supplier; +import com.talosvfx.talos.runtime.utils.Supplier; import java.util.regex.Pattern; public class FilePropertyProvider implements IPropertyProvider { diff --git a/editor/src/com/talosvfx/talos/editor/addons/scene/utils/importers/AssetImporter.java b/editor/src/com/talosvfx/talos/editor/addons/scene/utils/importers/AssetImporter.java index 1ecb01409..7f1e598a2 100644 --- a/editor/src/com/talosvfx/talos/editor/addons/scene/utils/importers/AssetImporter.java +++ b/editor/src/com/talosvfx/talos/editor/addons/scene/utils/importers/AssetImporter.java @@ -20,6 +20,7 @@ import com.talosvfx.talos.editor.project.FileTracker; import com.talosvfx.talos.editor.project2.SharedResources; import com.talosvfx.talos.runtime.utils.NamingUtils; +import com.talosvfx.talos.runtime.utils.Supplier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -30,7 +31,6 @@ import java.security.MessageDigest; import java.util.ArrayList; import java.util.Collection; -import java.util.function.Supplier; public class AssetImporter { diff --git a/editor/src/com/talosvfx/talos/editor/addons/scene/widgets/ProjectExplorerWidget.java b/editor/src/com/talosvfx/talos/editor/addons/scene/widgets/ProjectExplorerWidget.java index c09cc9b20..ba0885aab 100644 --- a/editor/src/com/talosvfx/talos/editor/addons/scene/widgets/ProjectExplorerWidget.java +++ b/editor/src/com/talosvfx/talos/editor/addons/scene/widgets/ProjectExplorerWidget.java @@ -46,7 +46,7 @@ import java.io.FileFilter; import java.util.ArrayList; import java.util.Collection; -import java.util.function.Supplier; +import com.talosvfx.talos.runtime.utils.Supplier; import static com.talosvfx.talos.editor.utils.InputUtils.ctrlPressed; diff --git a/editor/src/com/talosvfx/talos/editor/addons/scene/widgets/directoryview/DirectoryViewWidget.java b/editor/src/com/talosvfx/talos/editor/addons/scene/widgets/directoryview/DirectoryViewWidget.java index aaab1a785..11e92944b 100644 --- a/editor/src/com/talosvfx/talos/editor/addons/scene/widgets/directoryview/DirectoryViewWidget.java +++ b/editor/src/com/talosvfx/talos/editor/addons/scene/widgets/directoryview/DirectoryViewWidget.java @@ -37,7 +37,7 @@ import java.util.Arrays; import java.util.Collection; import java.util.Comparator; -import java.util.function.Supplier; +import com.talosvfx.talos.runtime.utils.Supplier; import static com.talosvfx.talos.editor.utils.InputUtils.ctrlPressed; diff --git a/editor/src/com/talosvfx/talos/editor/addons/scene/widgets/gizmos/Gizmo.java b/editor/src/com/talosvfx/talos/editor/addons/scene/widgets/gizmos/Gizmo.java index 2328bdcd0..5ec8dfe41 100644 --- a/editor/src/com/talosvfx/talos/editor/addons/scene/widgets/gizmos/Gizmo.java +++ b/editor/src/com/talosvfx/talos/editor/addons/scene/widgets/gizmos/Gizmo.java @@ -23,7 +23,7 @@ import com.talosvfx.talos.runtime.scene.components.TransformComponent; import com.talosvfx.talos.runtime.scene.utils.TransformSettings; -import java.util.function.Supplier; +import com.talosvfx.talos.runtime.utils.Supplier; public abstract class Gizmo extends Actor implements Pool.Poolable { diff --git a/editor/src/com/talosvfx/talos/editor/addons/scene/widgets/property/GameObjectSelectWidget.java b/editor/src/com/talosvfx/talos/editor/addons/scene/widgets/property/GameObjectSelectWidget.java index d86dd13c1..b03f27dca 100644 --- a/editor/src/com/talosvfx/talos/editor/addons/scene/widgets/property/GameObjectSelectWidget.java +++ b/editor/src/com/talosvfx/talos/editor/addons/scene/widgets/property/GameObjectSelectWidget.java @@ -21,7 +21,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.function.Supplier; +import com.talosvfx.talos.runtime.utils.Supplier; public class GameObjectSelectWidget extends PropertyWidget { diff --git a/editor/src/com/talosvfx/talos/editor/addons/scene/widgets/property/PropertyPanelAssetSelectionWidget.java b/editor/src/com/talosvfx/talos/editor/addons/scene/widgets/property/PropertyPanelAssetSelectionWidget.java index ab4da3337..565c99e68 100644 --- a/editor/src/com/talosvfx/talos/editor/addons/scene/widgets/property/PropertyPanelAssetSelectionWidget.java +++ b/editor/src/com/talosvfx/talos/editor/addons/scene/widgets/property/PropertyPanelAssetSelectionWidget.java @@ -19,7 +19,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.function.Supplier; +import com.talosvfx.talos.runtime.utils.Supplier; public class PropertyPanelAssetSelectionWidget extends PropertyWidget> { diff --git a/editor/src/com/talosvfx/talos/editor/nodes/NodeWidget.java b/editor/src/com/talosvfx/talos/editor/nodes/NodeWidget.java index 5fcfb6048..ee419d2f5 100644 --- a/editor/src/com/talosvfx/talos/editor/nodes/NodeWidget.java +++ b/editor/src/com/talosvfx/talos/editor/nodes/NodeWidget.java @@ -21,7 +21,7 @@ import com.talosvfx.talos.editor.widgets.ui.EditableLabel; import com.talosvfx.talos.editor.widgets.ui.common.ColorLibrary; -import java.util.function.Supplier; +import com.talosvfx.talos.runtime.utils.Supplier; public abstract class NodeWidget extends EmptyWindow implements Json.Serializable, IPropertyProvider { diff --git a/editor/src/com/talosvfx/talos/editor/nodes/widgets/GameAssetWidget.java b/editor/src/com/talosvfx/talos/editor/nodes/widgets/GameAssetWidget.java index 4213118ca..662ed631c 100644 --- a/editor/src/com/talosvfx/talos/editor/nodes/widgets/GameAssetWidget.java +++ b/editor/src/com/talosvfx/talos/editor/nodes/widgets/GameAssetWidget.java @@ -21,7 +21,7 @@ import lombok.Getter; import java.util.UUID; -import java.util.function.Supplier; +import com.talosvfx.talos.runtime.utils.Supplier; public class GameAssetWidget extends AbstractWidget> implements Observer { diff --git a/editor/src/com/talosvfx/talos/editor/project2/vfxui/GenericStageWrappedViewportWidget.java b/editor/src/com/talosvfx/talos/editor/project2/vfxui/GenericStageWrappedViewportWidget.java index 529bed586..3b0e66ec5 100644 --- a/editor/src/com/talosvfx/talos/editor/project2/vfxui/GenericStageWrappedViewportWidget.java +++ b/editor/src/com/talosvfx/talos/editor/project2/vfxui/GenericStageWrappedViewportWidget.java @@ -18,7 +18,7 @@ import com.talosvfx.talos.editor.widgets.ui.ViewportWidget; import lombok.Getter; -import java.util.function.Supplier; +import com.talosvfx.talos.runtime.utils.Supplier; public class GenericStageWrappedViewportWidget extends ViewportWidget { diff --git a/editor/src/com/talosvfx/talos/editor/widgets/propertyWidgets/AttachmentPointWidget.java b/editor/src/com/talosvfx/talos/editor/widgets/propertyWidgets/AttachmentPointWidget.java index ad47e2c0d..c40f655bb 100644 --- a/editor/src/com/talosvfx/talos/editor/widgets/propertyWidgets/AttachmentPointWidget.java +++ b/editor/src/com/talosvfx/talos/editor/widgets/propertyWidgets/AttachmentPointWidget.java @@ -7,7 +7,7 @@ import com.talosvfx.talos.editor.addons.bvb.AttachmentPoint; import com.talosvfx.talos.editor.project2.SharedResources; -import java.util.function.Supplier; +import com.talosvfx.talos.runtime.utils.Supplier; public class AttachmentPointWidget extends PropertyWidget { diff --git a/editor/src/com/talosvfx/talos/editor/widgets/propertyWidgets/ButtonPropertyWidget.java b/editor/src/com/talosvfx/talos/editor/widgets/propertyWidgets/ButtonPropertyWidget.java index 4f61bdabf..ea4801f90 100644 --- a/editor/src/com/talosvfx/talos/editor/widgets/propertyWidgets/ButtonPropertyWidget.java +++ b/editor/src/com/talosvfx/talos/editor/widgets/propertyWidgets/ButtonPropertyWidget.java @@ -11,7 +11,7 @@ import com.talosvfx.talos.editor.widgets.ui.common.SquareButton; import lombok.Setter; -import java.util.function.Supplier; +import com.talosvfx.talos.runtime.utils.Supplier; public class ButtonPropertyWidget extends PropertyWidget { diff --git a/editor/src/com/talosvfx/talos/editor/widgets/propertyWidgets/CheckboxWidget.java b/editor/src/com/talosvfx/talos/editor/widgets/propertyWidgets/CheckboxWidget.java index cb4db9661..8d5c5c59b 100644 --- a/editor/src/com/talosvfx/talos/editor/widgets/propertyWidgets/CheckboxWidget.java +++ b/editor/src/com/talosvfx/talos/editor/widgets/propertyWidgets/CheckboxWidget.java @@ -7,7 +7,7 @@ import com.talosvfx.talos.editor.project2.SharedResources; import com.talosvfx.talos.editor.widgets.ui.common.zoomWidgets.CheckboxWithZoom; -import java.util.function.Supplier; +import com.talosvfx.talos.runtime.utils.Supplier; public class CheckboxWidget extends PropertyWidget { diff --git a/editor/src/com/talosvfx/talos/editor/widgets/propertyWidgets/ColorPropertyWidget.java b/editor/src/com/talosvfx/talos/editor/widgets/propertyWidgets/ColorPropertyWidget.java index 31dd901ef..7c09abac9 100644 --- a/editor/src/com/talosvfx/talos/editor/widgets/propertyWidgets/ColorPropertyWidget.java +++ b/editor/src/com/talosvfx/talos/editor/widgets/propertyWidgets/ColorPropertyWidget.java @@ -13,7 +13,7 @@ import com.talosvfx.talos.editor.project2.SharedResources; import com.talosvfx.talos.editor.widgets.ui.common.ColorLibrary; -import java.util.function.Supplier; +import com.talosvfx.talos.runtime.utils.Supplier; public class ColorPropertyWidget extends PropertyWidget { diff --git a/editor/src/com/talosvfx/talos/editor/widgets/propertyWidgets/DynamicItemListWidget.java b/editor/src/com/talosvfx/talos/editor/widgets/propertyWidgets/DynamicItemListWidget.java index 9b1d48086..0529a4be6 100644 --- a/editor/src/com/talosvfx/talos/editor/widgets/propertyWidgets/DynamicItemListWidget.java +++ b/editor/src/com/talosvfx/talos/editor/widgets/propertyWidgets/DynamicItemListWidget.java @@ -17,7 +17,7 @@ import com.talosvfx.talos.editor.widgets.ui.common.ColorLibrary; import com.talosvfx.talos.editor.widgets.ui.common.SquareButton; -import java.util.function.Supplier; +import com.talosvfx.talos.runtime.utils.Supplier; public class DynamicItemListWidget extends PropertyWidget> { diff --git a/editor/src/com/talosvfx/talos/editor/widgets/propertyWidgets/EditableLabelWidget.java b/editor/src/com/talosvfx/talos/editor/widgets/propertyWidgets/EditableLabelWidget.java index 86197ee92..978e20d38 100644 --- a/editor/src/com/talosvfx/talos/editor/widgets/propertyWidgets/EditableLabelWidget.java +++ b/editor/src/com/talosvfx/talos/editor/widgets/propertyWidgets/EditableLabelWidget.java @@ -8,7 +8,7 @@ import com.talosvfx.talos.editor.project2.SharedResources; import com.talosvfx.talos.editor.widgets.ui.EditableLabel; -import java.util.function.Supplier; +import com.talosvfx.talos.runtime.utils.Supplier; public class EditableLabelWidget extends PropertyWidget { diff --git a/editor/src/com/talosvfx/talos/editor/widgets/propertyWidgets/FloatPropertyWidget.java b/editor/src/com/talosvfx/talos/editor/widgets/propertyWidgets/FloatPropertyWidget.java index 764b863ca..705f3d02d 100644 --- a/editor/src/com/talosvfx/talos/editor/widgets/propertyWidgets/FloatPropertyWidget.java +++ b/editor/src/com/talosvfx/talos/editor/widgets/propertyWidgets/FloatPropertyWidget.java @@ -9,7 +9,7 @@ import com.talosvfx.talos.editor.widgets.ui.common.zoomWidgets.LabelWithZoom; import com.talosvfx.talos.runtime.scene.ValueProperty; -import java.util.function.Supplier; +import com.talosvfx.talos.runtime.utils.Supplier; public class FloatPropertyWidget extends PropertyWidget { diff --git a/editor/src/com/talosvfx/talos/editor/widgets/propertyWidgets/GlobalValuePointsWidget.java b/editor/src/com/talosvfx/talos/editor/widgets/propertyWidgets/GlobalValuePointsWidget.java index 5cd3c5b8a..5cc0540d1 100644 --- a/editor/src/com/talosvfx/talos/editor/widgets/propertyWidgets/GlobalValuePointsWidget.java +++ b/editor/src/com/talosvfx/talos/editor/widgets/propertyWidgets/GlobalValuePointsWidget.java @@ -7,7 +7,7 @@ import com.talosvfx.talos.editor.addons.bvb.AttachmentPoint; import com.talosvfx.talos.editor.project2.SharedResources; -import java.util.function.Supplier; +import com.talosvfx.talos.runtime.utils.Supplier; public class GlobalValuePointsWidget extends PropertyWidget> { diff --git a/editor/src/com/talosvfx/talos/editor/widgets/propertyWidgets/IntPropertyWidget.java b/editor/src/com/talosvfx/talos/editor/widgets/propertyWidgets/IntPropertyWidget.java index 8d304f211..1b637e7d1 100644 --- a/editor/src/com/talosvfx/talos/editor/widgets/propertyWidgets/IntPropertyWidget.java +++ b/editor/src/com/talosvfx/talos/editor/widgets/propertyWidgets/IntPropertyWidget.java @@ -7,7 +7,7 @@ import com.talosvfx.talos.editor.project2.SharedResources; import com.talosvfx.talos.editor.widgets.ui.common.zoomWidgets.TextFieldWithZoom; -import java.util.function.Supplier; +import com.talosvfx.talos.runtime.utils.Supplier; public class IntPropertyWidget extends PropertyWidget { diff --git a/editor/src/com/talosvfx/talos/editor/widgets/propertyWidgets/LabelWidget.java b/editor/src/com/talosvfx/talos/editor/widgets/propertyWidgets/LabelWidget.java index 5df74c776..46d9518f4 100644 --- a/editor/src/com/talosvfx/talos/editor/widgets/propertyWidgets/LabelWidget.java +++ b/editor/src/com/talosvfx/talos/editor/widgets/propertyWidgets/LabelWidget.java @@ -5,7 +5,7 @@ import com.talosvfx.talos.editor.project2.SharedResources; import com.talosvfx.talos.editor.widgets.ui.common.zoomWidgets.LabelWithZoom; -import java.util.function.Supplier; +import com.talosvfx.talos.runtime.utils.Supplier; public class LabelWidget extends PropertyWidget { diff --git a/editor/src/com/talosvfx/talos/editor/widgets/propertyWidgets/PropertyWidget.java b/editor/src/com/talosvfx/talos/editor/widgets/propertyWidgets/PropertyWidget.java index 0f3cf6a1f..bbcd9b4ec 100644 --- a/editor/src/com/talosvfx/talos/editor/widgets/propertyWidgets/PropertyWidget.java +++ b/editor/src/com/talosvfx/talos/editor/widgets/propertyWidgets/PropertyWidget.java @@ -28,7 +28,7 @@ import lombok.Setter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.function.Supplier; +import com.talosvfx.talos.runtime.utils.Supplier; public abstract class PropertyWidget extends Table { diff --git a/editor/src/com/talosvfx/talos/editor/widgets/propertyWidgets/SelectBoxWidget.java b/editor/src/com/talosvfx/talos/editor/widgets/propertyWidgets/SelectBoxWidget.java index e4a487921..73c9e699f 100644 --- a/editor/src/com/talosvfx/talos/editor/widgets/propertyWidgets/SelectBoxWidget.java +++ b/editor/src/com/talosvfx/talos/editor/widgets/propertyWidgets/SelectBoxWidget.java @@ -10,7 +10,7 @@ import com.talosvfx.talos.editor.widgets.ui.common.zoomWidgets.LabelWithZoom; import com.talosvfx.talos.editor.widgets.ui.common.zoomWidgets.SelectBoxWithZoom; -import java.util.function.Supplier; +import com.talosvfx.talos.runtime.utils.Supplier; public class SelectBoxWidget extends PropertyWidget { diff --git a/editor/src/com/talosvfx/talos/editor/widgets/propertyWidgets/TalosLayerPropertiesWidget.java b/editor/src/com/talosvfx/talos/editor/widgets/propertyWidgets/TalosLayerPropertiesWidget.java index 20d35f1e7..d988431dc 100644 --- a/editor/src/com/talosvfx/talos/editor/widgets/propertyWidgets/TalosLayerPropertiesWidget.java +++ b/editor/src/com/talosvfx/talos/editor/widgets/propertyWidgets/TalosLayerPropertiesWidget.java @@ -12,7 +12,7 @@ import com.talosvfx.talos.editor.addons.scene.widgets.property.PropertyPanelAssetSelectionWidget; import com.talosvfx.talos.runtime.maps.TilePaletteData; -import java.util.function.Supplier; +import com.talosvfx.talos.runtime.utils.Supplier; public class TalosLayerPropertiesWidget extends PropertyWidget { diff --git a/editor/src/com/talosvfx/talos/editor/widgets/propertyWidgets/Vector2PropertyWidget.java b/editor/src/com/talosvfx/talos/editor/widgets/propertyWidgets/Vector2PropertyWidget.java index bd8d6435d..7bd652ddc 100644 --- a/editor/src/com/talosvfx/talos/editor/widgets/propertyWidgets/Vector2PropertyWidget.java +++ b/editor/src/com/talosvfx/talos/editor/widgets/propertyWidgets/Vector2PropertyWidget.java @@ -13,7 +13,7 @@ import com.talosvfx.talos.editor.project2.SharedResources; import com.talosvfx.talos.runtime.scene.ValueProperty; -import java.util.function.Supplier; +import com.talosvfx.talos.runtime.utils.Supplier; public class Vector2PropertyWidget extends PropertyWidget { diff --git a/editor/src/com/talosvfx/talos/editor/widgets/propertyWidgets/WidgetFactory.java b/editor/src/com/talosvfx/talos/editor/widgets/propertyWidgets/WidgetFactory.java index d5c600435..d72989de6 100644 --- a/editor/src/com/talosvfx/talos/editor/widgets/propertyWidgets/WidgetFactory.java +++ b/editor/src/com/talosvfx/talos/editor/widgets/propertyWidgets/WidgetFactory.java @@ -24,7 +24,7 @@ import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import java.util.function.Supplier; +import com.talosvfx.talos.runtime.utils.Supplier; public class WidgetFactory { diff --git a/editor/src/com/talosvfx/talos/editor/widgets/ui/Preview3D.java b/editor/src/com/talosvfx/talos/editor/widgets/ui/Preview3D.java index 403d6a84a..6c325faaa 100644 --- a/editor/src/com/talosvfx/talos/editor/widgets/ui/Preview3D.java +++ b/editor/src/com/talosvfx/talos/editor/widgets/ui/Preview3D.java @@ -17,7 +17,7 @@ import com.talosvfx.talos.editor.wrappers.IDragPointProvider; import lombok.Getter; -import java.util.function.Supplier; +import com.talosvfx.talos.runtime.utils.Supplier; public class Preview3D extends PreviewWidget { diff --git a/editor/src/com/talosvfx/talos/editor/widgets/ui/PreviewWidget.java b/editor/src/com/talosvfx/talos/editor/widgets/ui/PreviewWidget.java index 85d12095d..ab4713043 100644 --- a/editor/src/com/talosvfx/talos/editor/widgets/ui/PreviewWidget.java +++ b/editor/src/com/talosvfx/talos/editor/widgets/ui/PreviewWidget.java @@ -47,7 +47,7 @@ import org.slf4j.LoggerFactory; import java.util.Locale; -import java.util.function.Supplier; +import com.talosvfx.talos.runtime.utils.Supplier; public abstract class PreviewWidget extends ViewportWidget { diff --git a/editor/src/com/talosvfx/talos/editor/widgets/ui/ViewportViewSettings.java b/editor/src/com/talosvfx/talos/editor/widgets/ui/ViewportViewSettings.java index 73d699dec..36433ebac 100644 --- a/editor/src/com/talosvfx/talos/editor/widgets/ui/ViewportViewSettings.java +++ b/editor/src/com/talosvfx/talos/editor/widgets/ui/ViewportViewSettings.java @@ -14,7 +14,7 @@ import lombok.Data; import lombok.Getter; -import java.util.function.Supplier; +import com.talosvfx.talos.runtime.utils.Supplier; @Data public class ViewportViewSettings { diff --git a/editor/src/com/talosvfx/talos/editor/widgets/ui/ViewportWidget.java b/editor/src/com/talosvfx/talos/editor/widgets/ui/ViewportWidget.java index e3109ed66..9cf4164b9 100644 --- a/editor/src/com/talosvfx/talos/editor/widgets/ui/ViewportWidget.java +++ b/editor/src/com/talosvfx/talos/editor/widgets/ui/ViewportWidget.java @@ -80,7 +80,7 @@ import org.slf4j.LoggerFactory; import java.util.Comparator; -import java.util.function.Supplier; +import com.talosvfx.talos.runtime.utils.Supplier; import static com.talosvfx.talos.editor.addons.scene.utils.importers.AssetImporter.fromDirectoryView; import static com.talosvfx.talos.editor.utils.InputUtils.ctrlPressed;