diff --git a/forge-adventure/pom.xml b/adventure-editor/pom.xml similarity index 54% rename from forge-adventure/pom.xml rename to adventure-editor/pom.xml index 1d730d49b9f..755ee3ac8af 100644 --- a/forge-adventure/pom.xml +++ b/adventure-editor/pom.xml @@ -7,41 +7,21 @@ 4.0.0 - forge-adventure + adventure-editor jar - Forge Adventure - - - 4thline-repo - http://4thline.org/m2 - - false - - - - jitpack.io - https://jitpack.io - - + Map Editor + src/main/java ${project.basedir} - **/*.vert - **/*.frag - **/title_bg_lq.png - **/title_bg_lq_portrait.png - **/transition.png - **/adv_bg_texture.jpg - **/adv_bg_splash.png - **/bg_splash.png - **/bg_texture.jpg - **/font1.ttf + **/gear.gif + adventure-editor maven-compiler-plugin @@ -64,7 +44,7 @@ ${basedir}/${configSourceDirectory} - forge-adventure-editor.sh, forge-adventure-editor-mac.sh, forge-adventure-editor.command, forge-adventure-editor.cmd + adventure-editor.sh, adventure-editor.command, adventure-editor.cmd ${project.build.directory} . false @@ -89,6 +69,9 @@ forge.adventure.Main true + + splash/gear.gif + @@ -106,56 +89,6 @@ - - com.badlogicgames.gdx - gdx - 1.13.0 - compile - - - com.badlogicgames.gdx - gdx-platform - 1.13.0 - natives-desktop - - - com.badlogicgames.gdx - gdx-freetype - 1.13.0 - - - com.badlogicgames.gdx - gdx-backend-lwjgl - 1.13.0 - compile - - - com.badlogicgames.gdx - gdx-tools - 1.13.0 - compile - - - com.badlogicgames.gdx - gdx-freetype-platform - 1.13.0 - natives-desktop - - - forge - forge-core - ${project.version} - - - forge - forge-gui - ${project.version} - - - forge - forge-gui-mobile - ${project.version} - org.jetbrains annotations @@ -163,21 +96,22 @@ compile - com.badlogicgames.gdx-controllers - gdx-controllers-desktop - 2.2.3 - - - com.badlogicgames.gdx - gdx - - + forge + forge-gui + 2.0.00-SNAPSHOT + compile + + + forge + forge-gui-mobile + 2.0.00-SNAPSHOT + compile - 8 - 8 + 17 + 17 diff --git a/forge-adventure/sentry.properties b/adventure-editor/sentry.properties similarity index 100% rename from forge-adventure/sentry.properties rename to adventure-editor/sentry.properties diff --git a/adventure-editor/splash/gear.gif b/adventure-editor/splash/gear.gif new file mode 100644 index 00000000000..1180c8264fb Binary files /dev/null and b/adventure-editor/splash/gear.gif differ diff --git a/forge-adventure/src/main/config/forge-adventure-editor.cmd b/adventure-editor/src/main/config/adventure-editor.cmd similarity index 100% rename from forge-adventure/src/main/config/forge-adventure-editor.cmd rename to adventure-editor/src/main/config/adventure-editor.cmd diff --git a/forge-adventure/src/main/config/forge-adventure-editor.command b/adventure-editor/src/main/config/adventure-editor.command similarity index 100% rename from forge-adventure/src/main/config/forge-adventure-editor.command rename to adventure-editor/src/main/config/adventure-editor.command diff --git a/forge-adventure/src/main/config/forge-adventure-editor.sh b/adventure-editor/src/main/config/adventure-editor.sh similarity index 100% rename from forge-adventure/src/main/config/forge-adventure-editor.sh rename to adventure-editor/src/main/config/adventure-editor.sh diff --git a/forge-adventure/src/main/config/forge-adventure-editor.ico b/adventure-editor/src/main/config/forge-adventure-editor.ico similarity index 100% rename from forge-adventure/src/main/config/forge-adventure-editor.ico rename to adventure-editor/src/main/config/forge-adventure-editor.ico diff --git a/forge-adventure/src/main/config/forge-adventure.ico b/adventure-editor/src/main/config/forge-adventure.ico similarity index 100% rename from forge-adventure/src/main/config/forge-adventure.ico rename to adventure-editor/src/main/config/forge-adventure.ico diff --git a/forge-adventure/src/main/config/forge.ico b/adventure-editor/src/main/config/forge.ico similarity index 100% rename from forge-adventure/src/main/config/forge.ico rename to adventure-editor/src/main/config/forge.ico diff --git a/forge-adventure/src/main/java/forge/adventure/Main.java b/adventure-editor/src/main/java/forge/adventure/Main.java similarity index 88% rename from forge-adventure/src/main/java/forge/adventure/Main.java rename to adventure-editor/src/main/java/forge/adventure/Main.java index 55de46c1215..bec6ae5a4ca 100644 --- a/forge-adventure/src/main/java/forge/adventure/Main.java +++ b/adventure-editor/src/main/java/forge/adventure/Main.java @@ -16,7 +16,6 @@ public class Main { public static void main(String[] args) { GuiBase.setInterface(new GuiMobile(Files.exists(Paths.get("./res"))?"./":"../forge-gui/")); GuiBase.setDeviceInfo("", "", 0, 0); - Config.instance(); - new EditorMainWindow(); + new EditorMainWindow(Config.instance()); } } diff --git a/forge-adventure/src/main/java/forge/adventure/editor/BiomeEdit.java b/adventure-editor/src/main/java/forge/adventure/editor/BiomeEdit.java similarity index 100% rename from forge-adventure/src/main/java/forge/adventure/editor/BiomeEdit.java rename to adventure-editor/src/main/java/forge/adventure/editor/BiomeEdit.java diff --git a/forge-adventure/src/main/java/forge/adventure/editor/BiomeStructureDataMappingEditor.java b/adventure-editor/src/main/java/forge/adventure/editor/BiomeStructureDataMappingEditor.java similarity index 100% rename from forge-adventure/src/main/java/forge/adventure/editor/BiomeStructureDataMappingEditor.java rename to adventure-editor/src/main/java/forge/adventure/editor/BiomeStructureDataMappingEditor.java diff --git a/forge-adventure/src/main/java/forge/adventure/editor/BiomeStructureEdit.java b/adventure-editor/src/main/java/forge/adventure/editor/BiomeStructureEdit.java similarity index 100% rename from forge-adventure/src/main/java/forge/adventure/editor/BiomeStructureEdit.java rename to adventure-editor/src/main/java/forge/adventure/editor/BiomeStructureEdit.java diff --git a/forge-adventure/src/main/java/forge/adventure/editor/BiomeTerrainEdit.java b/adventure-editor/src/main/java/forge/adventure/editor/BiomeTerrainEdit.java similarity index 100% rename from forge-adventure/src/main/java/forge/adventure/editor/BiomeTerrainEdit.java rename to adventure-editor/src/main/java/forge/adventure/editor/BiomeTerrainEdit.java diff --git a/forge-adventure/src/main/java/forge/adventure/editor/DialogEdit.java b/adventure-editor/src/main/java/forge/adventure/editor/DialogEdit.java similarity index 100% rename from forge-adventure/src/main/java/forge/adventure/editor/DialogEdit.java rename to adventure-editor/src/main/java/forge/adventure/editor/DialogEdit.java diff --git a/forge-adventure/src/main/java/forge/adventure/editor/DialogEditor.java b/adventure-editor/src/main/java/forge/adventure/editor/DialogEditor.java similarity index 100% rename from forge-adventure/src/main/java/forge/adventure/editor/DialogEditor.java rename to adventure-editor/src/main/java/forge/adventure/editor/DialogEditor.java diff --git a/forge-adventure/src/main/java/forge/adventure/editor/DialogOptionEdit.java b/adventure-editor/src/main/java/forge/adventure/editor/DialogOptionEdit.java similarity index 100% rename from forge-adventure/src/main/java/forge/adventure/editor/DialogOptionEdit.java rename to adventure-editor/src/main/java/forge/adventure/editor/DialogOptionEdit.java diff --git a/forge-adventure/src/main/java/forge/adventure/editor/DialogOptionEditor.java b/adventure-editor/src/main/java/forge/adventure/editor/DialogOptionEditor.java similarity index 100% rename from forge-adventure/src/main/java/forge/adventure/editor/DialogOptionEditor.java rename to adventure-editor/src/main/java/forge/adventure/editor/DialogOptionEditor.java diff --git a/forge-adventure/src/main/java/forge/adventure/editor/DialogTree.java b/adventure-editor/src/main/java/forge/adventure/editor/DialogTree.java similarity index 100% rename from forge-adventure/src/main/java/forge/adventure/editor/DialogTree.java rename to adventure-editor/src/main/java/forge/adventure/editor/DialogTree.java diff --git a/forge-adventure/src/main/java/forge/adventure/editor/DocumentChangeListener.java b/adventure-editor/src/main/java/forge/adventure/editor/DocumentChangeListener.java similarity index 100% rename from forge-adventure/src/main/java/forge/adventure/editor/DocumentChangeListener.java rename to adventure-editor/src/main/java/forge/adventure/editor/DocumentChangeListener.java diff --git a/adventure-editor/src/main/java/forge/adventure/editor/EditorMainWindow.java b/adventure-editor/src/main/java/forge/adventure/editor/EditorMainWindow.java new file mode 100644 index 00000000000..faa8019eaf3 --- /dev/null +++ b/adventure-editor/src/main/java/forge/adventure/editor/EditorMainWindow.java @@ -0,0 +1,97 @@ +package forge.adventure.editor; + +import forge.adventure.util.Config; + +import javax.swing.JButton; +import javax.swing.JDialog; +import javax.swing.JFrame; +import javax.swing.JOptionPane; +import javax.swing.JTabbedPane; +import javax.swing.JToolBar; +import javax.swing.UIManager; +import java.awt.BorderLayout; +import java.awt.Desktop; +import java.awt.EventQueue; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; +import java.io.File; +import java.security.CodeSource; +import java.util.ArrayList; +import java.util.List; + +/** + * Editor class to edit configuration, maybe moved or removed + */ +public class EditorMainWindow extends JFrame { + public final static WorldEditor worldEditor = new WorldEditor(); + JTabbedPane tabs = new JTabbedPane(); + + public EditorMainWindow(Config config) { + UIManager.LookAndFeelInfo[] var1 = UIManager.getInstalledLookAndFeels(); + + for (UIManager.LookAndFeelInfo info : var1) { + if ("Nimbus".equals(info.getName())) { + try { + UIManager.setLookAndFeel(info.getClassName()); + } catch (Throwable ignored) { + } + break; + } + } + this.setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE); + this.addWindowListener(new WindowAdapter() { + @Override + public void windowClosing(WindowEvent e) { + setVisible(false); + System.exit(0); + } + }); + BorderLayout layout = new BorderLayout(); + JToolBar toolBar = new JToolBar("toolbar"); + JButton newButton = new JButton("GDX Particle Editor Tool"); + newButton.addActionListener(e -> EventQueue.invokeLater(() -> { + newButton.setEnabled(false); + try { + CodeSource codeSource = EditorMainWindow.class.getProtectionDomain().getCodeSource(); + File jarFile = new File(codeSource.getLocation().toURI().getPath()); + String jarDir = jarFile.getParentFile().getPath(); + Desktop.getDesktop().open(new File(jarDir + "/gdx-particle-editor.jar")); + } catch (Exception ex) { + new ErrorDialog("Error", ex.getMessage()); + newButton.setEnabled(true); + } + })); + JButton quit = new JButton("Quit"); + quit.addActionListener(e -> System.exit(0)); + toolBar.add(newButton); + toolBar.add(quit); + setLayout(layout); + toolBar.setFloatable(false); + add(toolBar, BorderLayout.NORTH); + add(tabs, BorderLayout.CENTER); + tabs.addTab("World", worldEditor); + tabs.addTab("POI", new PointOfInterestEditor()); + tabs.addTab("Items", new ItemsEditor()); + tabs.addTab("Enemies", new EnemyEditor()); + tabs.addTab("Quests", new QuestEditor()); + setSize(config.getSettingData().width, config.getSettingData().height); + setLocationRelativeTo(null); + setVisible(true); + } + + static class ErrorDialog { + public ErrorDialog(String title, String message) { + List options = new ArrayList<>(); + JButton ok = new JButton("OK"); + options.add(ok); + JOptionPane pane = new JOptionPane(message, JOptionPane.PLAIN_MESSAGE, JOptionPane.DEFAULT_OPTION, null, options.toArray()); + JDialog dlg = pane.createDialog(JOptionPane.getRootFrame(), title); + ok.addActionListener(e -> { + dlg.setVisible(false); + System.exit(0); + }); + dlg.setResizable(false); + dlg.setVisible(true); + } + } +} diff --git a/forge-adventure/src/main/java/forge/adventure/editor/EffectEditor.java b/adventure-editor/src/main/java/forge/adventure/editor/EffectEditor.java similarity index 100% rename from forge-adventure/src/main/java/forge/adventure/editor/EffectEditor.java rename to adventure-editor/src/main/java/forge/adventure/editor/EffectEditor.java diff --git a/forge-adventure/src/main/java/forge/adventure/editor/EnemyEdit.java b/adventure-editor/src/main/java/forge/adventure/editor/EnemyEdit.java similarity index 100% rename from forge-adventure/src/main/java/forge/adventure/editor/EnemyEdit.java rename to adventure-editor/src/main/java/forge/adventure/editor/EnemyEdit.java diff --git a/forge-adventure/src/main/java/forge/adventure/editor/EnemyEditor.java b/adventure-editor/src/main/java/forge/adventure/editor/EnemyEditor.java similarity index 100% rename from forge-adventure/src/main/java/forge/adventure/editor/EnemyEditor.java rename to adventure-editor/src/main/java/forge/adventure/editor/EnemyEditor.java diff --git a/forge-adventure/src/main/java/forge/adventure/editor/FilePicker.java b/adventure-editor/src/main/java/forge/adventure/editor/FilePicker.java similarity index 100% rename from forge-adventure/src/main/java/forge/adventure/editor/FilePicker.java rename to adventure-editor/src/main/java/forge/adventure/editor/FilePicker.java diff --git a/forge-adventure/src/main/java/forge/adventure/editor/FloatSpinner.java b/adventure-editor/src/main/java/forge/adventure/editor/FloatSpinner.java similarity index 100% rename from forge-adventure/src/main/java/forge/adventure/editor/FloatSpinner.java rename to adventure-editor/src/main/java/forge/adventure/editor/FloatSpinner.java diff --git a/forge-adventure/src/main/java/forge/adventure/editor/FormPanel.java b/adventure-editor/src/main/java/forge/adventure/editor/FormPanel.java similarity index 100% rename from forge-adventure/src/main/java/forge/adventure/editor/FormPanel.java rename to adventure-editor/src/main/java/forge/adventure/editor/FormPanel.java diff --git a/forge-adventure/src/main/java/forge/adventure/editor/IntSpinner.java b/adventure-editor/src/main/java/forge/adventure/editor/IntSpinner.java similarity index 100% rename from forge-adventure/src/main/java/forge/adventure/editor/IntSpinner.java rename to adventure-editor/src/main/java/forge/adventure/editor/IntSpinner.java diff --git a/forge-adventure/src/main/java/forge/adventure/editor/ItemEdit.java b/adventure-editor/src/main/java/forge/adventure/editor/ItemEdit.java similarity index 100% rename from forge-adventure/src/main/java/forge/adventure/editor/ItemEdit.java rename to adventure-editor/src/main/java/forge/adventure/editor/ItemEdit.java diff --git a/forge-adventure/src/main/java/forge/adventure/editor/ItemsEditor.java b/adventure-editor/src/main/java/forge/adventure/editor/ItemsEditor.java similarity index 100% rename from forge-adventure/src/main/java/forge/adventure/editor/ItemsEditor.java rename to adventure-editor/src/main/java/forge/adventure/editor/ItemsEditor.java diff --git a/forge-adventure/src/main/java/forge/adventure/editor/PointOfInterestEdit.java b/adventure-editor/src/main/java/forge/adventure/editor/PointOfInterestEdit.java similarity index 100% rename from forge-adventure/src/main/java/forge/adventure/editor/PointOfInterestEdit.java rename to adventure-editor/src/main/java/forge/adventure/editor/PointOfInterestEdit.java diff --git a/forge-adventure/src/main/java/forge/adventure/editor/PointOfInterestEditor.java b/adventure-editor/src/main/java/forge/adventure/editor/PointOfInterestEditor.java similarity index 100% rename from forge-adventure/src/main/java/forge/adventure/editor/PointOfInterestEditor.java rename to adventure-editor/src/main/java/forge/adventure/editor/PointOfInterestEditor.java diff --git a/forge-adventure/src/main/java/forge/adventure/editor/QuestController.java b/adventure-editor/src/main/java/forge/adventure/editor/QuestController.java similarity index 100% rename from forge-adventure/src/main/java/forge/adventure/editor/QuestController.java rename to adventure-editor/src/main/java/forge/adventure/editor/QuestController.java diff --git a/forge-adventure/src/main/java/forge/adventure/editor/QuestEditor.java b/adventure-editor/src/main/java/forge/adventure/editor/QuestEditor.java similarity index 100% rename from forge-adventure/src/main/java/forge/adventure/editor/QuestEditor.java rename to adventure-editor/src/main/java/forge/adventure/editor/QuestEditor.java diff --git a/forge-adventure/src/main/java/forge/adventure/editor/QuestStageEdit.java b/adventure-editor/src/main/java/forge/adventure/editor/QuestStageEdit.java similarity index 100% rename from forge-adventure/src/main/java/forge/adventure/editor/QuestStageEdit.java rename to adventure-editor/src/main/java/forge/adventure/editor/QuestStageEdit.java diff --git a/forge-adventure/src/main/java/forge/adventure/editor/QuestStageEditor.java b/adventure-editor/src/main/java/forge/adventure/editor/QuestStageEditor.java similarity index 100% rename from forge-adventure/src/main/java/forge/adventure/editor/QuestStageEditor.java rename to adventure-editor/src/main/java/forge/adventure/editor/QuestStageEditor.java diff --git a/forge-adventure/src/main/java/forge/adventure/editor/QuestTagSelector.java b/adventure-editor/src/main/java/forge/adventure/editor/QuestTagSelector.java similarity index 100% rename from forge-adventure/src/main/java/forge/adventure/editor/QuestTagSelector.java rename to adventure-editor/src/main/java/forge/adventure/editor/QuestTagSelector.java diff --git a/forge-adventure/src/main/java/forge/adventure/editor/RewardEdit.java b/adventure-editor/src/main/java/forge/adventure/editor/RewardEdit.java similarity index 100% rename from forge-adventure/src/main/java/forge/adventure/editor/RewardEdit.java rename to adventure-editor/src/main/java/forge/adventure/editor/RewardEdit.java diff --git a/forge-adventure/src/main/java/forge/adventure/editor/RewardsEditor.java b/adventure-editor/src/main/java/forge/adventure/editor/RewardsEditor.java similarity index 100% rename from forge-adventure/src/main/java/forge/adventure/editor/RewardsEditor.java rename to adventure-editor/src/main/java/forge/adventure/editor/RewardsEditor.java diff --git a/forge-adventure/src/main/java/forge/adventure/editor/StructureEditor.java b/adventure-editor/src/main/java/forge/adventure/editor/StructureEditor.java similarity index 100% rename from forge-adventure/src/main/java/forge/adventure/editor/StructureEditor.java rename to adventure-editor/src/main/java/forge/adventure/editor/StructureEditor.java diff --git a/forge-adventure/src/main/java/forge/adventure/editor/SwingAtlasPreview.java b/adventure-editor/src/main/java/forge/adventure/editor/SwingAtlasPreview.java similarity index 100% rename from forge-adventure/src/main/java/forge/adventure/editor/SwingAtlasPreview.java rename to adventure-editor/src/main/java/forge/adventure/editor/SwingAtlasPreview.java diff --git a/forge-adventure/src/main/java/forge/adventure/editor/TextListEdit.java b/adventure-editor/src/main/java/forge/adventure/editor/TextListEdit.java similarity index 100% rename from forge-adventure/src/main/java/forge/adventure/editor/TextListEdit.java rename to adventure-editor/src/main/java/forge/adventure/editor/TextListEdit.java diff --git a/forge-adventure/src/main/java/forge/adventure/editor/WorldEditor.java b/adventure-editor/src/main/java/forge/adventure/editor/WorldEditor.java similarity index 100% rename from forge-adventure/src/main/java/forge/adventure/editor/WorldEditor.java rename to adventure-editor/src/main/java/forge/adventure/editor/WorldEditor.java diff --git a/adventure-editor/tools/gdx-particle-editor.jar b/adventure-editor/tools/gdx-particle-editor.jar new file mode 100644 index 00000000000..edd61cb028f Binary files /dev/null and b/adventure-editor/tools/gdx-particle-editor.jar differ diff --git a/forge-adventure/fallback_skin/adv_bg_splash.png b/forge-adventure/fallback_skin/adv_bg_splash.png deleted file mode 100644 index d6da1088913..00000000000 Binary files a/forge-adventure/fallback_skin/adv_bg_splash.png and /dev/null differ diff --git a/forge-adventure/fallback_skin/adv_bg_texture.jpg b/forge-adventure/fallback_skin/adv_bg_texture.jpg deleted file mode 100644 index 5ea4ad54c16..00000000000 Binary files a/forge-adventure/fallback_skin/adv_bg_texture.jpg and /dev/null differ diff --git a/forge-adventure/fallback_skin/bg_splash.png b/forge-adventure/fallback_skin/bg_splash.png deleted file mode 100644 index 0bcba091a57..00000000000 Binary files a/forge-adventure/fallback_skin/bg_splash.png and /dev/null differ diff --git a/forge-adventure/fallback_skin/bg_texture.jpg b/forge-adventure/fallback_skin/bg_texture.jpg deleted file mode 100644 index 50f37309ff0..00000000000 Binary files a/forge-adventure/fallback_skin/bg_texture.jpg and /dev/null differ diff --git a/forge-adventure/fallback_skin/font1.ttf b/forge-adventure/fallback_skin/font1.ttf deleted file mode 100644 index 28cf43d7e7f..00000000000 Binary files a/forge-adventure/fallback_skin/font1.ttf and /dev/null differ diff --git a/forge-adventure/fallback_skin/title_bg_lq.png b/forge-adventure/fallback_skin/title_bg_lq.png deleted file mode 100644 index daeccff1431..00000000000 Binary files a/forge-adventure/fallback_skin/title_bg_lq.png and /dev/null differ diff --git a/forge-adventure/fallback_skin/title_bg_lq_portrait.png b/forge-adventure/fallback_skin/title_bg_lq_portrait.png deleted file mode 100644 index 658ecdf2c4a..00000000000 Binary files a/forge-adventure/fallback_skin/title_bg_lq_portrait.png and /dev/null differ diff --git a/forge-adventure/fallback_skin/transition.png b/forge-adventure/fallback_skin/transition.png deleted file mode 100644 index 2ba659b5ce2..00000000000 Binary files a/forge-adventure/fallback_skin/transition.png and /dev/null differ diff --git a/forge-adventure/libs/gdx-backend-lwjgl-natives.jar b/forge-adventure/libs/gdx-backend-lwjgl-natives.jar deleted file mode 100644 index c9dc62392d6..00000000000 Binary files a/forge-adventure/libs/gdx-backend-lwjgl-natives.jar and /dev/null differ diff --git a/forge-adventure/libs/gdx-backend-lwjgl-sources.jar b/forge-adventure/libs/gdx-backend-lwjgl-sources.jar deleted file mode 100644 index 8fbd0cb3813..00000000000 Binary files a/forge-adventure/libs/gdx-backend-lwjgl-sources.jar and /dev/null differ diff --git a/forge-adventure/libs/gdx-backend-lwjgl.jar b/forge-adventure/libs/gdx-backend-lwjgl.jar deleted file mode 100644 index f1422b30d71..00000000000 Binary files a/forge-adventure/libs/gdx-backend-lwjgl.jar and /dev/null differ diff --git a/forge-adventure/libs/gdx-freetype-natives.jar b/forge-adventure/libs/gdx-freetype-natives.jar deleted file mode 100644 index 87ceb2eb26e..00000000000 Binary files a/forge-adventure/libs/gdx-freetype-natives.jar and /dev/null differ diff --git a/forge-adventure/libs/gdx-natives.jar b/forge-adventure/libs/gdx-natives.jar deleted file mode 100644 index 10d0a113c8a..00000000000 Binary files a/forge-adventure/libs/gdx-natives.jar and /dev/null differ diff --git a/forge-adventure/shaders/grayscale.frag b/forge-adventure/shaders/grayscale.frag deleted file mode 100644 index 4d801c770a4..00000000000 --- a/forge-adventure/shaders/grayscale.frag +++ /dev/null @@ -1,16 +0,0 @@ -#ifdef GL_ES -precision mediump float; -#endif - -varying vec4 v_color; -varying vec2 v_texCoords; -uniform sampler2D u_texture; -uniform float u_grayness; -uniform float u_bias; - -void main() { - vec4 c = v_color * texture2D(u_texture, v_texCoords); - float grey = dot( c.rgb, vec3(0.22, 0.707, 0.071) ); - vec3 blendedColor = mix(c.rgb, vec3(grey), u_grayness); - gl_FragColor = mix(vec4(0.0, 0.0, 0.0, 1.0), vec4(blendedColor.rgb, c.a), u_bias); -} \ No newline at end of file diff --git a/forge-adventure/shaders/grayscale.vert b/forge-adventure/shaders/grayscale.vert deleted file mode 100644 index 17d96ca8dde..00000000000 --- a/forge-adventure/shaders/grayscale.vert +++ /dev/null @@ -1,14 +0,0 @@ -attribute vec4 a_position; -attribute vec4 a_color; -attribute vec2 a_texCoord0; - -uniform mat4 u_projTrans; - -varying vec4 v_color; -varying vec2 v_texCoords; - -void main() { - v_color = a_color; - v_texCoords = a_texCoord0; - gl_Position = u_projTrans * a_position; -} \ No newline at end of file diff --git a/forge-adventure/shaders/outline.frag b/forge-adventure/shaders/outline.frag deleted file mode 100644 index 738d23c1f71..00000000000 --- a/forge-adventure/shaders/outline.frag +++ /dev/null @@ -1,40 +0,0 @@ -#ifdef GL_ES -precision mediump float; -precision mediump int; -#endif - -uniform sampler2D u_texture; -uniform vec2 u_viewportInverse; -uniform vec3 u_color; -uniform float u_offset; -uniform float u_step; - -varying vec4 v_color; -varying vec2 v_texCoord; - -#define ALPHA_VALUE_BORDER 0.5 - -void main() { - vec2 T = v_texCoord.xy; - - float alpha = 0.0; - bool allin = true; - for( float ix = -u_offset; ix < u_offset; ix += u_step ) - { - for( float iy = -u_offset; iy < u_offset; iy += u_step ) - { - float newAlpha = texture2D(u_texture, T + vec2(ix, iy) * u_viewportInverse).a; - allin = allin && newAlpha > ALPHA_VALUE_BORDER; - if (newAlpha > ALPHA_VALUE_BORDER && newAlpha >= alpha) - { - alpha = newAlpha; - } - } - } - if (allin) - { - alpha = 0.0; - } - - gl_FragColor = vec4(u_color,alpha); -} \ No newline at end of file diff --git a/forge-adventure/shaders/outline.vert b/forge-adventure/shaders/outline.vert deleted file mode 100644 index 1b6e438116d..00000000000 --- a/forge-adventure/shaders/outline.vert +++ /dev/null @@ -1,16 +0,0 @@ -uniform mat4 u_projTrans; - -attribute vec4 a_position; -attribute vec2 a_texCoord0; -attribute vec4 a_color; - -varying vec4 v_color; -varying vec2 v_texCoord; - -uniform vec2 u_viewportInverse; - -void main() { - gl_Position = u_projTrans * a_position; - v_texCoord = a_texCoord0; - v_color = a_color; -} \ No newline at end of file diff --git a/forge-adventure/shaders/underwater.frag b/forge-adventure/shaders/underwater.frag deleted file mode 100644 index 6287a862c9c..00000000000 --- a/forge-adventure/shaders/underwater.frag +++ /dev/null @@ -1,26 +0,0 @@ -#ifdef GL_ES -#define PRECISION mediump -precision PRECISION float; -precision PRECISION int; -#else -#define PRECISION -#endif - -varying vec2 v_texCoords; -uniform sampler2D u_texture; -uniform float u_amount; -uniform float u_speed; -uniform float u_time; -uniform float u_bias; - -void main () { - vec2 uv = v_texCoords; - - uv.y += (cos((uv.y + (u_time * 0.04 * u_speed)) * 45.0) * 0.0019 * u_amount) + (cos((uv.y + (u_time * 0.1 * u_speed)) * 10.0) * 0.002 * u_amount); - - uv.x += (sin((uv.y + (u_time * 0.07 * u_speed)) * 15.0) * 0.0029 * u_amount) + (sin((uv.y + (u_time * 0.1 * u_speed)) * 15.0) * 0.002 * u_amount); - - vec4 texColor = texture2D(u_texture, uv); - - gl_FragColor = mix(vec4(0.0, 0.0, 0.0, 1.0), texColor, u_bias); -} \ No newline at end of file diff --git a/forge-adventure/shaders/warp.frag b/forge-adventure/shaders/warp.frag deleted file mode 100644 index f8a7022fa2c..00000000000 --- a/forge-adventure/shaders/warp.frag +++ /dev/null @@ -1,57 +0,0 @@ -#ifdef GL_ES -precision mediump float; -#endif - -varying vec2 v_texCoords; -uniform sampler2D u_texture; - -uniform float u_time; -uniform float u_speed; -uniform float u_amount; -uniform vec2 u_viewport; -uniform vec2 u_position; - -float random2d(vec2 n) { - return fract(sin(dot(n, vec2(12.9898, 4.1414))) * 43758.5453); -} - -float randomRange (in vec2 seed, in float min, in float max) { - return min + random2d(seed) * (max - min); -} - -float insideRange(float v, float bottom, float top) { - return step(bottom, v) - step(top, v); -} - -void main() -{ - float time = floor(u_time * u_speed * 60.0); - - vec3 outCol = texture2D(u_texture, v_texCoords).rgb; - - float maxOffset = u_amount/2.0; - for (float i = 0.0; i < 2.0; i += 1.0) { - float sliceY = random2d(vec2(time, 2345.0 + float(i))); - float sliceH = random2d(vec2(time, 9035.0 + float(i))) * 0.25; - float hOffset = randomRange(vec2(time, 9625.0 + float(i)), -maxOffset, maxOffset); - vec2 uvOff = v_texCoords; - uvOff.x += hOffset; - if (insideRange(v_texCoords.y, sliceY, fract(sliceY+sliceH)) == 1.0){ - outCol = texture2D(u_texture, uvOff).rgb; - } - } - - float maxColOffset = u_amount / 6.0; - float rnd = random2d(vec2(time , 9545.0)); - vec2 colOffset = vec2(randomRange(vec2(time , 9545.0), -maxColOffset, maxColOffset), - randomRange(vec2(time , 7205.0), -maxColOffset, maxColOffset)); - if (rnd < 0.33) { - outCol.r = texture2D(u_texture, v_texCoords + colOffset).r; - } else if (rnd < 0.66) { - outCol.g = texture2D(u_texture, v_texCoords + colOffset).g; - } else { - outCol.b = texture2D(u_texture, v_texCoords + colOffset).b; - } - - gl_FragColor = vec4(outCol, 1.0); -} \ No newline at end of file diff --git a/forge-adventure/src/main/config/forge-adventure-editor-mac.sh b/forge-adventure/src/main/config/forge-adventure-editor-mac.sh deleted file mode 100644 index eb3d4f9adb7..00000000000 --- a/forge-adventure/src/main/config/forge-adventure-editor-mac.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -cd $(dirname "${0}") -java -XstartOnFirstThread -Xmx4096m -Dfile.encoding=UTF-8 -jar $project.build.finalName$ diff --git a/forge-adventure/src/main/java/forge/adventure/editor/EditorMainWindow.java b/forge-adventure/src/main/java/forge/adventure/editor/EditorMainWindow.java deleted file mode 100644 index 5da877d49be..00000000000 --- a/forge-adventure/src/main/java/forge/adventure/editor/EditorMainWindow.java +++ /dev/null @@ -1,64 +0,0 @@ -package forge.adventure.editor; - -import forge.localinstance.properties.ForgeConstants; -import forge.localinstance.properties.ForgePreferences; -import forge.model.FModel; -import forge.util.Lang; -import forge.util.Localizer; - -import javax.swing.*; -import java.awt.*; - -/** - * Editor class to edit configuration, maybe moved or removed - */ -public class EditorMainWindow extends JFrame { - public final static WorldEditor worldEditor = new WorldEditor(); - JTabbedPane tabs =new JTabbedPane(); - - public EditorMainWindow() - { - UIManager.LookAndFeelInfo[] var1 = UIManager.getInstalledLookAndFeels(); - FModel.initialize(null, preferences -> { - preferences.setPref(ForgePreferences.FPref.LOAD_CARD_SCRIPTS_LAZILY, true); - return null; - }); - Lang.createInstance(FModel.getPreferences().getPref(ForgePreferences.FPref.UI_LANGUAGE)); - Localizer.getInstance().initialize(FModel.getPreferences().getPref(ForgePreferences.FPref.UI_LANGUAGE), ForgeConstants.LANG_DIR); - int var2 = var1.length; - - for (UIManager.LookAndFeelInfo info : var1) { - if ("Nimbus".equals(info.getName())) { - try { - UIManager.setLookAndFeel(info.getClassName()); - } catch (Throwable var6) { - } - break; - } - } - BorderLayout layout=new BorderLayout(); - JToolBar toolBar = new JToolBar("toolbar"); - // refer to removal of Swing Particle Editor: https://github.com/libgdx/libgdx/issues/7285 - //todo add New Particle Editor here (needs Java 11+): https://github.com/libgdx/gdx-particle-editor - //JButton newButton=new JButton("open ParticleEditor"); - //newButton.addActionListener(e -> EventQueue.invokeLater(ParticleEditor::new)); - JButton quit = new JButton("Quit"); - quit.addActionListener(e-> System.exit(0)); - //toolBar.add(newButton); - toolBar.add(quit); - setLayout(layout); - toolBar.setFloatable(false); - add(toolBar, BorderLayout.NORTH); - add(tabs, BorderLayout.CENTER); - tabs.addTab("World",worldEditor); - tabs.addTab("POI",new PointOfInterestEditor()); - tabs.addTab("Items",new ItemsEditor()); - tabs.addTab("Enemies",new EnemyEditor()); - tabs.addTab("Quests",new QuestEditor()); - - setVisible(true); - setSize(800,600); - GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice().setFullScreenWindow( this ); - - } -} diff --git a/forge-gui-desktop/pom.xml b/forge-gui-desktop/pom.xml index 6b707b65295..b8796e51531 100644 --- a/forge-gui-desktop/pom.xml +++ b/forge-gui-desktop/pom.xml @@ -616,12 +616,12 @@ - - - - - - + + + + + + @@ -639,10 +639,9 @@ - - - - + + + @@ -657,12 +656,12 @@ - - - - - - + + + + + + @@ -672,12 +671,12 @@ - - - - - - + + + + + + diff --git a/pom.xml b/pom.xml index 7cabbdbe7c0..63a5438d23f 100644 --- a/pom.xml +++ b/pom.xml @@ -70,8 +70,8 @@ forge-gui-mobile-dev forge-gui-desktop forge-gui-ios - forge-adventure forge-lda + adventure-editor forge-gui-android