Skip to content

Commit

Permalink
Fix HMLanguages integration
Browse files Browse the repository at this point in the history
  • Loading branch information
atampy25 committed Jul 26, 2024
1 parent 33c6488 commit 12e7d3a
Show file tree
Hide file tree
Showing 8 changed files with 149 additions and 95 deletions.
86 changes: 43 additions & 43 deletions src-tauri/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions src-tauri/src/editor_connection.rs
Original file line number Diff line number Diff line change
Expand Up @@ -405,6 +405,12 @@ impl EditorConnection {
);
}

// Ignore editor entities
SDKEditorEvent::EntityTransformUpdated { .. } => {}

// Ignore editor entities
SDKEditorEvent::EntityPropertyChanged { .. } => {}

_ => panic!("This event kind should not be debounced")
}
}
Expand Down
5 changes: 0 additions & 5 deletions src-tauri/src/entity.rs
Original file line number Diff line number Diff line change
Expand Up @@ -608,7 +608,6 @@ pub fn get_ref_decoration(
#[context("Couldn't get decoration for LINE {}", line)]
pub fn get_line_decoration(
game_files: &PartitionManager,
hash_list: &HashList,
game_version: GameVersion,
tonytools_hash_list: &tonytools::hashlist::HashList,
line: ResourceID
Expand Down Expand Up @@ -801,7 +800,6 @@ pub fn get_decorations(
res.to_owned(),
get_line_decoration(
game_files,
hash_list,
game_version,
tonytools_hash_list,
ResourceID::from_any(res)?
Expand Down Expand Up @@ -834,7 +832,6 @@ pub fn get_decorations(
res.to_owned(),
get_line_decoration(
game_files,
hash_list,
game_version,
tonytools_hash_list,
ResourceID::from_any(res)?
Expand Down Expand Up @@ -920,7 +917,6 @@ pub fn get_decorations(
res.to_owned(),
get_line_decoration(
game_files,
hash_list,
game_version,
tonytools_hash_list,
ResourceID::from_any(res)?
Expand Down Expand Up @@ -953,7 +949,6 @@ pub fn get_decorations(
res.to_owned(),
get_line_decoration(
game_files,
hash_list,
game_version,
tonytools_hash_list,
ResourceID::from_any(res)?
Expand Down
14 changes: 7 additions & 7 deletions src-tauri/src/event_handling/content_search.rs
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ pub fn start_content_search(
if use_qn_format {
let (temp_data, temp_meta) = (
partition.read_resource(resource_id).ok()?,
RpkgResourceMeta::try_from(*resource_info).ok()?
RpkgResourceMeta::from(*resource_info)
);

let factory = match game_version {
Expand Down Expand Up @@ -231,7 +231,7 @@ pub fn start_content_search(
"CLNG" => {
let s: Option<_> = try {
let (res_meta, res_data) = (
RpkgResourceMeta::try_from(*resource_info).ok()?,
RpkgResourceMeta::from(*resource_info),
partition.read_resource(resource_id).ok()?
);

Expand Down Expand Up @@ -282,7 +282,7 @@ pub fn start_content_search(
"DITL" => {
let s: Option<_> = try {
let (res_meta, res_data) = (
RpkgResourceMeta::try_from(*resource_info).ok()?,
RpkgResourceMeta::from(*resource_info),
partition.read_resource(resource_id).ok()?
);

Expand Down Expand Up @@ -313,7 +313,7 @@ pub fn start_content_search(
"DLGE" => {
let s: Option<_> = try {
let (res_meta, res_data) = (
RpkgResourceMeta::try_from(*resource_info).ok()?,
RpkgResourceMeta::from(*resource_info),
partition.read_resource(resource_id).ok()?
);

Expand Down Expand Up @@ -373,7 +373,7 @@ pub fn start_content_search(
"LOCR" => {
let s: Option<_> = try {
let (res_meta, res_data) = (
RpkgResourceMeta::try_from(*resource_info).ok()?,
RpkgResourceMeta::from(*resource_info),
partition.read_resource(resource_id).ok()?
);

Expand Down Expand Up @@ -432,7 +432,7 @@ pub fn start_content_search(
"RTLV" => {
let s: Option<_> = try {
let (res_meta, res_data) = (
RpkgResourceMeta::try_from(*resource_info).ok()?,
RpkgResourceMeta::from(*resource_info),
partition.read_resource(resource_id).ok()?
);

Expand Down Expand Up @@ -462,7 +462,7 @@ pub fn start_content_search(
"LINE" => {
let s: Option<_> = try {
let (res_meta, res_data) = (
RpkgResourceMeta::try_from(*resource_info).ok()?,
RpkgResourceMeta::from(*resource_info),
partition.read_resource(resource_id).ok()?
);

Expand Down
Loading

0 comments on commit 12e7d3a

Please sign in to comment.