kyperbelt · awardell · Apr 15, 2022
diff --git a/README.md b/README.md
@@ -26,7 +26,7 @@ GD Yarn is a [Godot](https://godotengine.org/) plugin that allows you to create
 
 GD Yarn is an implementation of [YarnSpinner](https://yarnspinner.dev) completely written in [GDScript](https://docs.godotengine.org/en/stable/getting_started/scripting/gdscript/gdscript_basics.html). The project aims to be as feature complete as possible compared to the c# version but may forgo certain things in lieu of similar alternatives that make it blend better with the Godot ecosystem.
 
-![Exmaple of Running a Dialogue](https://raw.githubusercontent.com/kyperbelt/GDYarn/main/images/yarn_running_dialogue.gif)
+![Exmaple of Running a Dialogue](gdyarn/images/yarn_running_dialogue.gif)
 
 <a id="Features"></a>
 

diff --git a/.tracked_yarn_files → addons/gdyarn/.tracked_yarn_files b/.tracked_yarn_files → addons/gdyarn/.tracked_yarn_files
@@ -1,5 +1,5 @@
 res://addons/gdyarn/examples/example1.yarn
 res://addons/gdyarn/examples/inline_expressions.yarn
 res://addons/gdyarn/examples/ricky.yarn
-res://exampleAssets/Example.yarn
-res://exampleAssets/inline_expressions.yarn
+res://gdyarn/exampleAssets/Example.yarn
+res://gdyarn/exampleAssets/inline_expressions.yarn
diff --git a/addons/gdyarn/core/program/program_utils.gd b/addons/gdyarn/core/program/program_utils.gd
@@ -28,8 +28,8 @@ const LineInfo    = preload("res://addons/gdyarn/core/program/yarn_line.gd")
 
 
 const STRINGS_EXTENSION := "tsv"
-const DEFAULT_STRINGS_FORMAT = "%s%s-strings.%s"
-const LOCALISED_STRINGS_FORMAT = "%s%s-%s-strings.%s"
+const DEFAULT_STRINGS_FORMAT = "%s-strings.%s"
+const LOCALISED_STRINGS_FORMAT = "%s-%s-strings.%s"
 
 func _init():
 	pass
@@ -39,7 +39,7 @@ func _init():
 static func export_program(program,filePath):
 	var file := File.new()
 
-	var stringsPath = DEFAULT_STRINGS_FORMAT % [filePath.get_base_dir().trim_prefix("res://"),filePath.get_basename(),STRINGS_EXTENSION]
+	var stringsPath = DEFAULT_STRINGS_FORMAT % [filePath.get_basename(),STRINGS_EXTENSION]
 	var lineInfos = program.yarnStrings
 	var result : PoolStringArray = _serialize_lines(lineInfos)
 	var strings : String = result.join("\n")  #
@@ -166,8 +166,8 @@ static func _serialize_all_operands(operands)->Array:
 static func _import_program(filePath)->YarnProgram:
 	var file := File.new()
 
-	var stringsPath = DEFAULT_STRINGS_FORMAT % [filePath.get_base_dir().trim_prefix("res://"),filePath.get_basename(),STRINGS_EXTENSION]
-	var localizedStringsPath = "%s%s-strings-%s.ots" % [filePath.get_base_dir().trim_prefix("res://"),filePath.get_basename(),TranslationServer.get_locale()]
+	var stringsPath = DEFAULT_STRINGS_FORMAT % [filePath.get_basename(),STRINGS_EXTENSION]
+	var localizedStringsPath = "%s-strings-%s.ots" % [filePath.get_basename(),TranslationServer.get_locale()]
 	var strings : PoolStringArray
 
 	if file.file_exists(localizedStringsPath):

diff --git a/addons/gdyarn/yarn_importer.gd b/addons/gdyarn/yarn_importer.gd
@@ -3,7 +3,7 @@ extends EditorImportPlugin
 
 class_name YarnImporter
 
-const YARN_TRACKER_PATH := "res://.tracked_yarn_files"
+const YARN_TRACKER_PATH := "res://addons/gdyarn/.tracked_yarn_files"
 
 # Called when the node enters the scene tree for the first time.
 func _ready():

diff --git a/exampleAssets/Example.yarn.import b/exampleAssets/Example.yarn.import
diff --git a/exampleAssets/inline_expressions.yarn.import b/exampleAssets/inline_expressions.yarn.import
diff --git a/StorageDisplay.gd → gdyarn/StorageDisplay.gd b/StorageDisplay.gd → gdyarn/StorageDisplay.gd
diff --git a/TextContainer.gd → gdyarn/TextContainer.gd b/TextContainer.gd → gdyarn/TextContainer.gd
diff --git a/TokenSpitter.gd → gdyarn/TokenSpitter.gd b/TokenSpitter.gd → gdyarn/TokenSpitter.gd
diff --git a/TokenSpitter.tscn → gdyarn/TokenSpitter.tscn b/TokenSpitter.tscn → gdyarn/TokenSpitter.tscn
@@ -1,6 +1,7 @@
 [gd_scene load_steps=2 format=2]
 
-[ext_resource path="res://TokenSpitter.gd" type="Script" id=1]
+[ext_resource path="res://gdyarn/TokenSpitter.gd" type="Script" id=1]
+
 
 [node name="Node" type="Node"]
 script = ExtResource( 1 )

diff --git a/compiledProgramResource.tres → gdyarn/compiledProgramResource.tres b/compiledProgramResource.tres → gdyarn/compiledProgramResource.tres
@@ -5,5 +5,5 @@
 [resource]
 script = ExtResource( 1 )
 _programName = "compiled_yarn_program"
-_directory = "res://"
-_yarnPrograms = [ "res://exampleAssets/inline_expressions.yarn" ]
+_directory = "res://gdyarn/"
+_yarnPrograms = [ "res://gdyarn/exampleAssets/inline_expressions.yarn" ]
diff --git a/compiled_yarn_program-strings.tsv → gdyarn/compiled_yarn_program-strings.tsv b/compiled_yarn_program-strings.tsv → gdyarn/compiled_yarn_program-strings.tsv
diff --git a/compiled_yarn_program.cyarn → gdyarn/compiled_yarn_program.cyarn b/compiled_yarn_program.cyarn → gdyarn/compiled_yarn_program.cyarn
diff --git a/exampleAssets/Cairo-Regular.ttf → gdyarn/exampleAssets/Cairo-Regular.ttf b/exampleAssets/Cairo-Regular.ttf → gdyarn/exampleAssets/Cairo-Regular.ttf
diff --git a/exampleAssets/Example.yarn → gdyarn/exampleAssets/Example.yarn b/exampleAssets/Example.yarn → gdyarn/exampleAssets/Example.yarn
diff --git a/gdyarn/exampleAssets/Example.yarn.import b/gdyarn/exampleAssets/Example.yarn.import
@@ -0,0 +1,13 @@
+[remap]
+
+importer="gdyarn.yarnFile"
+type="Resource"
+path="res://.import/Example.yarn-f4de8db1d86d31804828e7172deec006.tres"
+
+[deps]
+
+source_file="res://gdyarn/exampleAssets/Example.yarn"
+dest_files=[ "res://.import/Example.yarn-f4de8db1d86d31804828e7172deec006.tres" ]
+
+[params]
+
diff --git a/exampleAssets/Kenney Pixel.ttf → gdyarn/exampleAssets/Kenney Pixel.ttf b/exampleAssets/Kenney Pixel.ttf → gdyarn/exampleAssets/Kenney Pixel.ttf
diff --git a/exampleAssets/arrowBeige_right.png → gdyarn/exampleAssets/arrowBeige_right.png b/exampleAssets/arrowBeige_right.png → gdyarn/exampleAssets/arrowBeige_right.png
diff --git a/exampleAssets/arrowBeige_right.png.import → ...exampleAssets/arrowBeige_right.png.import b/exampleAssets/arrowBeige_right.png.import → ...exampleAssets/arrowBeige_right.png.import
@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/arrowBeige_right.png-a26b0e914f75ade1046d34348e2a449e.stex"
+path="res://.import/arrowBeige_right.png-e775eba6b5790c57abaea22835fa84fc.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://exampleAssets/arrowBeige_right.png"
-dest_files=[ "res://.import/arrowBeige_right.png-a26b0e914f75ade1046d34348e2a449e.stex" ]
+source_file="res://gdyarn/exampleAssets/arrowBeige_right.png"
+dest_files=[ "res://.import/arrowBeige_right.png-e775eba6b5790c57abaea22835fa84fc.stex" ]
 
 [params]
 
@@ -28,6 +28,7 @@ process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false
 process/invert_color=false
+process/normal_map_invert_y=false
 stream=false
 size_limit=0
 detect_3d=true

diff --git a/exampleAssets/buttonLong_brown.png → gdyarn/exampleAssets/buttonLong_brown.png b/exampleAssets/buttonLong_brown.png → gdyarn/exampleAssets/buttonLong_brown.png
diff --git a/exampleAssets/buttonLong_brown.png.import → ...exampleAssets/buttonLong_brown.png.import b/exampleAssets/buttonLong_brown.png.import → ...exampleAssets/buttonLong_brown.png.import
@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/buttonLong_brown.png-03ee633a76b63ff23b575202641bd453.stex"
+path="res://.import/buttonLong_brown.png-f643333d6d75937360cbf872e16c2432.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://exampleAssets/buttonLong_brown.png"
-dest_files=[ "res://.import/buttonLong_brown.png-03ee633a76b63ff23b575202641bd453.stex" ]
+source_file="res://gdyarn/exampleAssets/buttonLong_brown.png"
+dest_files=[ "res://.import/buttonLong_brown.png-f643333d6d75937360cbf872e16c2432.stex" ]
 
 [params]
 
@@ -28,6 +28,7 @@ process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false
 process/invert_color=false
+process/normal_map_invert_y=false
 stream=false
 size_limit=0
 detect_3d=true

diff --git a/exampleAssets/buttonLong_brown_pressed.png → ...xampleAssets/buttonLong_brown_pressed.png b/exampleAssets/buttonLong_brown_pressed.png → ...xampleAssets/buttonLong_brown_pressed.png
diff --git a/...ssets/buttonLong_brown_pressed.png.import → ...ssets/buttonLong_brown_pressed.png.import b/...ssets/buttonLong_brown_pressed.png.import → ...ssets/buttonLong_brown_pressed.png.import
@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/buttonLong_brown_pressed.png-73b3e58f28a2f86777c188531daf11c2.stex"
+path="res://.import/buttonLong_brown_pressed.png-d9f0f6058c3e69d03b808a9435ae4d49.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://exampleAssets/buttonLong_brown_pressed.png"
-dest_files=[ "res://.import/buttonLong_brown_pressed.png-73b3e58f28a2f86777c188531daf11c2.stex" ]
+source_file="res://gdyarn/exampleAssets/buttonLong_brown_pressed.png"
+dest_files=[ "res://.import/buttonLong_brown_pressed.png-d9f0f6058c3e69d03b808a9435ae4d49.stex" ]
 
 [params]
 
@@ -28,6 +28,7 @@ process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false
 process/invert_color=false
+process/normal_map_invert_y=false
 stream=false
 size_limit=0
 detect_3d=true

diff --git a/exampleAssets/credits → gdyarn/exampleAssets/credits b/exampleAssets/credits → gdyarn/exampleAssets/credits
diff --git a/exampleAssets/inline_expressions.yarn → gdyarn/exampleAssets/inline_expressions.yarn b/exampleAssets/inline_expressions.yarn → gdyarn/exampleAssets/inline_expressions.yarn
diff --git a/gdyarn/exampleAssets/inline_expressions.yarn.import b/gdyarn/exampleAssets/inline_expressions.yarn.import
@@ -0,0 +1,13 @@
+[remap]
+
+importer="gdyarn.yarnFile"
+type="Resource"
+path="res://.import/inline_expressions.yarn-09fcb6cc7fb21dbcf6b665c7627e6810.tres"
+
+[deps]
+
+source_file="res://gdyarn/exampleAssets/inline_expressions.yarn"
+dest_files=[ "res://.import/inline_expressions.yarn-09fcb6cc7fb21dbcf6b665c7627e6810.tres" ]
+
+[params]
+
diff --git a/exampleAssets/panelInset_brown.png → gdyarn/exampleAssets/panelInset_brown.png b/exampleAssets/panelInset_brown.png → gdyarn/exampleAssets/panelInset_brown.png
diff --git a/exampleAssets/panelInset_brown.png.import → ...exampleAssets/panelInset_brown.png.import b/exampleAssets/panelInset_brown.png.import → ...exampleAssets/panelInset_brown.png.import
@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/panelInset_brown.png-0eac78471b81ec5cd7e8b59d96bcb6fd.stex"
+path="res://.import/panelInset_brown.png-913008eb727c29011bd7f95102b66965.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://exampleAssets/panelInset_brown.png"
-dest_files=[ "res://.import/panelInset_brown.png-0eac78471b81ec5cd7e8b59d96bcb6fd.stex" ]
+source_file="res://gdyarn/exampleAssets/panelInset_brown.png"
+dest_files=[ "res://.import/panelInset_brown.png-913008eb727c29011bd7f95102b66965.stex" ]
 
 [params]
 
@@ -28,6 +28,7 @@ process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false
 process/invert_color=false
+process/normal_map_invert_y=false
 stream=false
 size_limit=0
 detect_3d=true

diff --git a/exampleAssets/panel_brown.png → gdyarn/exampleAssets/panel_brown.png b/exampleAssets/panel_brown.png → gdyarn/exampleAssets/panel_brown.png
diff --git a/exampleAssets/panel_brown.png.import → gdyarn/exampleAssets/panel_brown.png.import b/exampleAssets/panel_brown.png.import → gdyarn/exampleAssets/panel_brown.png.import
@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/panel_brown.png-737ae1e4bca5b9d18a84a2439902ffb0.stex"
+path="res://.import/panel_brown.png-dca7ecc7bff9a3788a0aed92606afeff.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://exampleAssets/panel_brown.png"
-dest_files=[ "res://.import/panel_brown.png-737ae1e4bca5b9d18a84a2439902ffb0.stex" ]
+source_file="res://gdyarn/exampleAssets/panel_brown.png"
+dest_files=[ "res://.import/panel_brown.png-dca7ecc7bff9a3788a0aed92606afeff.stex" ]
 
 [params]
 
@@ -28,6 +28,7 @@ process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false
 process/invert_color=false
+process/normal_map_invert_y=false
 stream=false
 size_limit=0
 detect_3d=true

diff --git a/icon.png → gdyarn/icon.png b/icon.png → gdyarn/icon.png
diff --git a/icon.png.import → gdyarn/icon.png.import b/icon.png.import → gdyarn/icon.png.import
@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex"
+path="res://.import/icon.png-ef90ac20d63c2ebd220a57712ecb8e3e.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://icon.png"
-dest_files=[ "res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" ]
+source_file="res://gdyarn/icon.png"
+dest_files=[ "res://.import/icon.png-ef90ac20d63c2ebd220a57712ecb8e3e.stex" ]
 
 [params]
 

diff --git a/images/.gdignore → gdyarn/images/.gdignore b/images/.gdignore → gdyarn/images/.gdignore
diff --git a/images/attribution.txt → gdyarn/images/attribution.txt b/images/attribution.txt → gdyarn/images/attribution.txt
diff --git a/images/cyp_resource.png → gdyarn/images/cyp_resource.png b/images/cyp_resource.png → gdyarn/images/cyp_resource.png
diff --git a/images/gdyarnDesign.png → gdyarn/images/gdyarnDesign.png b/images/gdyarnDesign.png → gdyarn/images/gdyarnDesign.png
diff --git a/images/gdyarnLogo2.png → gdyarn/images/gdyarnLogo2.png b/images/gdyarnLogo2.png → gdyarn/images/gdyarnLogo2.png
diff --git a/images/yarn_editor.gif → gdyarn/images/yarn_editor.gif b/images/yarn_editor.gif → gdyarn/images/yarn_editor.gif
diff --git a/images/yarn_running_dialogue.gif → gdyarn/images/yarn_running_dialogue.gif b/images/yarn_running_dialogue.gif → gdyarn/images/yarn_running_dialogue.gif
diff --git a/images/yarn_script_compilation.gif → gdyarn/images/yarn_script_compilation.gif b/images/yarn_script_compilation.gif → gdyarn/images/yarn_script_compilation.gif
diff --git a/new_theme.tres → gdyarn/new_theme.tres b/new_theme.tres → gdyarn/new_theme.tres
diff --git a/test.gd → gdyarn/test.gd b/test.gd → gdyarn/test.gd
diff --git a/test.tscn → gdyarn/test.tscn b/test.tscn → gdyarn/test.tscn
@@ -1,10 +1,10 @@
 [gd_scene load_steps=6 format=2]
 
-[ext_resource path="res://testdisplay.tscn" type="PackedScene" id=1]
+[ext_resource path="res://gdyarn/testdisplay.tscn" type="PackedScene" id=1]
 [ext_resource path="res://addons/gdyarn/yarn_runner.gd" type="Script" id=2]
 [ext_resource path="res://addons/gdyarn/core/variable_storage.gd" type="Script" id=3]
-[ext_resource path="res://StorageDisplay.gd" type="Script" id=4]
-[ext_resource path="res://compiledProgramResource.tres" type="Resource" id=5]
+[ext_resource path="res://gdyarn/StorageDisplay.gd" type="Script" id=4]
+[ext_resource path="res://gdyarn/compiledProgramResource.tres" type="Resource" id=5]
 
 [node name="Node2D" type="Node2D"]
 
@@ -31,6 +31,3 @@ margin_top = 6.0
 margin_right = 131.0
 margin_bottom = 206.0
 script = ExtResource( 4 )
-__meta__ = {
-"_edit_use_anchors_": false
-}
diff --git a/testdisplay.tscn → gdyarn/testdisplay.tscn b/testdisplay.tscn → gdyarn/testdisplay.tscn
@@ -1,14 +1,15 @@
 [gd_scene load_steps=17 format=2]
 
 [ext_resource path="res://addons/gdyarn/yarn_gui.gd" type="Script" id=1]
-[ext_resource path="res://exampleAssets/Cairo-Regular.ttf" type="DynamicFontData" id=2]
-[ext_resource path="res://exampleAssets/arrowBeige_right.png" type="Texture" id=3]
-[ext_resource path="res://exampleAssets/buttonLong_brown_pressed.png" type="Texture" id=4]
-[ext_resource path="res://exampleAssets/buttonLong_brown.png" type="Texture" id=5]
-[ext_resource path="res://exampleAssets/panel_brown.png" type="Texture" id=6]
-[ext_resource path="res://exampleAssets/Kenney Pixel.ttf" type="DynamicFontData" id=7]
-[ext_resource path="res://TextContainer.gd" type="Script" id=8]
-[ext_resource path="res://yarn_button.gd" type="Script" id=9]
+[ext_resource path="res://gdyarn/exampleAssets/Cairo-Regular.ttf" type="DynamicFontData" id=2]
+[ext_resource path="res://gdyarn/exampleAssets/arrowBeige_right.png" type="Texture" id=3]
+[ext_resource path="res://gdyarn/exampleAssets/buttonLong_brown_pressed.png" type="Texture" id=4]
+[ext_resource path="res://gdyarn/exampleAssets/buttonLong_brown.png" type="Texture" id=5]
+[ext_resource path="res://gdyarn/exampleAssets/panel_brown.png" type="Texture" id=6]
+[ext_resource path="res://gdyarn/exampleAssets/Kenney Pixel.ttf" type="DynamicFontData" id=7]
+[ext_resource path="res://gdyarn/TextContainer.gd" type="Script" id=8]
+[ext_resource path="res://gdyarn/yarn_button.gd" type="Script" id=9]
+
 
 [sub_resource type="DynamicFont" id=6]
 size = 24

diff --git a/yarn_button.gd → gdyarn/yarn_button.gd b/yarn_button.gd → gdyarn/yarn_button.gd
diff --git a/project.godot b/project.godot
@@ -57,8 +57,8 @@ _global_script_class_icons={
 [application]
 
 config/name="GDYarn"
-run/main_scene="res://test.tscn"
-config/icon="res://icon.png"
+run/main_scene="res://gdyarn/test.tscn"
+config/icon="res://gdyarn/icon.png"
 
 [autoload]