Cleanup for Workshop release

DatedGore · Jan 1, 2024 · 4713c25 · 4713c25
1 parent 96cb817
commit 4713c25
Show file tree

Hide file tree

Showing 27 changed files with 46 additions and 4,980 deletions.
diff --git a/annotations/classes.lua → .annotations/classes.lua b/annotations/classes.lua → .annotations/classes.lua
diff --git a/annotations/enums.lua → .annotations/enums.lua b/annotations/enums.lua → .annotations/enums.lua
diff --git a/annotations/global-functions.lua → .annotations/global-functions.lua b/annotations/global-functions.lua → .annotations/global-functions.lua
diff --git a/annotations/interfaces/ann_element_2d.lua → .annotations/interfaces/ann_element_2d.lua b/annotations/interfaces/ann_element_2d.lua → .annotations/interfaces/ann_element_2d.lua
diff --git a/annotations/interfaces/ann_element_bone.lua → .annotations/interfaces/ann_element_bone.lua b/annotations/interfaces/ann_element_bone.lua → .annotations/interfaces/ann_element_bone.lua
diff --git a/...ations/interfaces/ann_element_dynamic.lua → ...ations/interfaces/ann_element_dynamic.lua b/...ations/interfaces/ann_element_dynamic.lua → ...ations/interfaces/ann_element_dynamic.lua
diff --git a/annotations/interfaces/ann_element_mesh.lua → .annotations/interfaces/ann_element_mesh.lua b/annotations/interfaces/ann_element_mesh.lua → .annotations/interfaces/ann_element_mesh.lua
diff --git a/...ions/interfaces/ann_element_projected.lua → ...ions/interfaces/ann_element_projected.lua b/...ions/interfaces/ann_element_projected.lua → ...ions/interfaces/ann_element_projected.lua
diff --git a/...tions/interfaces/ann_element_sequence.lua → ...tions/interfaces/ann_element_sequence.lua b/...tions/interfaces/ann_element_sequence.lua → ...tions/interfaces/ann_element_sequence.lua
diff --git a/annotations/interfaces/ann_element_sound.lua → ...otations/interfaces/ann_element_sound.lua b/annotations/interfaces/ann_element_sound.lua → ...otations/interfaces/ann_element_sound.lua
diff --git a/annotations/interfaces/ann_element_sub.lua → .annotations/interfaces/ann_element_sub.lua b/annotations/interfaces/ann_element_sub.lua → .annotations/interfaces/ann_element_sub.lua
diff --git a/...ations/interfaces/ann_element_virtual.lua → ...ations/interfaces/ann_element_virtual.lua b/...ations/interfaces/ann_element_virtual.lua → ...ations/interfaces/ann_element_virtual.lua
diff --git a/...ns/interfaces/ann_input_configuration.lua → ...ns/interfaces/ann_input_configuration.lua b/...ns/interfaces/ann_input_configuration.lua → ...ns/interfaces/ann_input_configuration.lua
diff --git a/annotations/libraries.lua → .annotations/libraries.lua b/annotations/libraries.lua → .annotations/libraries.lua
diff --git a/annotations/photon-v2.lua → .annotations/photon-v2.lua b/annotations/photon-v2.lua → .annotations/photon-v2.lua
diff --git a/annotations/structs.lua → .annotations/structs.lua b/annotations/structs.lua → .annotations/structs.lua
diff --git a/data_static/photon_v2/library/input_configurations/default.json b/data_static/photon_v2/library/input_configurations/default.json
diff --git a/data_static/photon_v2/misc/mdi_7_3_67.json b/data_static/photon_v2/misc/mdi_7_3_67.json
diff --git a/data_static/photon_v2/misc/mdi_test.json b/data_static/photon_v2/misc/mdi_test.json
diff --git a/lua/entities/photon_controller/shared.lua b/lua/entities/photon_controller/shared.lua
@@ -304,10 +304,10 @@ function ENT:QueryModeFromInputSchema( channel, query, param )
 		end
 	elseif ( query == "LAST_MINUS" ) then
 		param = tonumber( param ) or 0
-		result = schema[math.clamp( #schema - param, 1, #schema )]
+		result = schema[math.Clamp( #schema - param, 1, #schema )]
 	elseif ( query == "FIRST_PLUS" ) then
 		param = tonumber( param ) or 0
-		result = schema[math.clamp( 1 + param, 1, #schema )]
+		result = schema[math.Clamp( 1 + param, 1, #schema )]
 	end
 	return result.Mode
 end

diff --git a/lua/photon-v2/exlib/ui/cl_functions.lua b/lua/photon-v2/exlib/ui/cl_functions.lua
@@ -102,7 +102,8 @@ exui.IconSizes = { 16, 24, 32, 48, 56, 60, 64, 96 }
 exui.materialIconSizes = exui.materialIconSizes or {}
 
 function exui.LoadMaterialIconsIndex()
-	exui.MaterialIconsIndex = util.JSONToTable(file.Read("lua/photon-v2/exlib/ui/mdi-index.json", "GAME"))
+	exui.MaterialIconsIndex = util.JSONToTable( EXUI_MDI_MAP_JSON )
+	-- exui.MaterialIconsIndex = util.JSONToTable(file.Read("lua/photon-v2/exlib/ui/mdi-index.json", "GAME"))
 end
 
 function exui.GetMDIFont( size )

diff --git a/lua/photon-v2/exlib/ui/mdi-index.json → lua/photon-v2/exlib/ui/cl_mdi_index.lua b/lua/photon-v2/exlib/ui/mdi-index.json → lua/photon-v2/exlib/ui/cl_mdi_index.lua
@@ -1,3 +1,5 @@
+EXUI_MDI_MAP_JSON = 
+[[
 {
 	"replay": "歷",
 	"calendar-sync-outline": "",
@@ -5554,4 +5556,5 @@
 	"network-outline": "",
 	"plus-minus-box": "",
 	"poker-chip": ""
-}
+}
+]]