forked from StrafesNET/strafe-project
drop lazy_regex dep
This commit is contained in:
11
Cargo.lock
generated
11
Cargo.lock
generated
@@ -1874,9 +1874,9 @@ checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "lazy-regex"
|
name = "lazy-regex"
|
||||||
version = "3.4.1"
|
version = "3.4.2"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "60c7310b93682b36b98fa7ea4de998d3463ccbebd94d935d6b48ba5b6ffa7126"
|
checksum = "191898e17ddee19e60bccb3945aa02339e81edd4a8c50e21fd4d48cdecda7b29"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"lazy-regex-proc_macros",
|
"lazy-regex-proc_macros",
|
||||||
"once_cell",
|
"once_cell",
|
||||||
@@ -1885,9 +1885,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "lazy-regex-proc_macros"
|
name = "lazy-regex-proc_macros"
|
||||||
version = "3.4.1"
|
version = "3.4.2"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "4ba01db5ef81e17eb10a5e0f2109d1b3a3e29bac3070fdbd7d156bf7dbd206a1"
|
checksum = "c35dc8b0da83d1a9507e12122c80dea71a9c7c613014347392483a83ea593e04"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
"quote",
|
"quote",
|
||||||
@@ -2097,7 +2097,6 @@ dependencies = [
|
|||||||
"futures",
|
"futures",
|
||||||
"image",
|
"image",
|
||||||
"image_dds",
|
"image_dds",
|
||||||
"lazy-regex",
|
|
||||||
"rbx_asset",
|
"rbx_asset",
|
||||||
"rbx_binary",
|
"rbx_binary",
|
||||||
"rbx_dom_weak",
|
"rbx_dom_weak",
|
||||||
@@ -3915,7 +3914,6 @@ version = "0.7.0"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"bytemuck",
|
"bytemuck",
|
||||||
"glam",
|
"glam",
|
||||||
"lazy-regex",
|
|
||||||
"rbx_binary",
|
"rbx_binary",
|
||||||
"rbx_dom_weak",
|
"rbx_dom_weak",
|
||||||
"rbx_mesh",
|
"rbx_mesh",
|
||||||
@@ -3923,6 +3921,7 @@ dependencies = [
|
|||||||
"rbx_reflection_database",
|
"rbx_reflection_database",
|
||||||
"rbx_xml",
|
"rbx_xml",
|
||||||
"rbxassetid 0.1.0",
|
"rbxassetid 0.1.0",
|
||||||
|
"regex",
|
||||||
"roblox_emulator",
|
"roblox_emulator",
|
||||||
"strafesnet_common",
|
"strafesnet_common",
|
||||||
"strafesnet_deferred_loader",
|
"strafesnet_deferred_loader",
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ authors = ["Rhys Lloyd <krakow20@gmail.com>"]
|
|||||||
[dependencies]
|
[dependencies]
|
||||||
bytemuck = "1.14.3"
|
bytemuck = "1.14.3"
|
||||||
glam = "0.30.0"
|
glam = "0.30.0"
|
||||||
lazy-regex = "3.1.0"
|
regex = { version = "1.11.3", default-features = false }
|
||||||
rbx_binary = { version = "1.0.1-sn5", registry = "strafesnet" }
|
rbx_binary = { version = "1.0.1-sn5", registry = "strafesnet" }
|
||||||
rbx_dom_weak = { version = "3.0.1-sn5", registry = "strafesnet" }
|
rbx_dom_weak = { version = "3.0.1-sn5", registry = "strafesnet" }
|
||||||
rbx_mesh = "0.5.0"
|
rbx_mesh = "0.5.0"
|
||||||
|
|||||||
@@ -18,6 +18,15 @@ fn static_ustr(s:&'static str)->rbx_dom_weak::Ustr{
|
|||||||
rbx_dom_weak::ustr(s)
|
rbx_dom_weak::ustr(s)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
macro_rules! lazy_regex{
|
||||||
|
($r:literal)=>{{
|
||||||
|
use regex::Regex;
|
||||||
|
use std::sync::LazyLock;
|
||||||
|
static RE:LazyLock<Regex>=LazyLock::new(||Regex::new($r).unwrap());
|
||||||
|
&RE
|
||||||
|
}};
|
||||||
|
}
|
||||||
|
|
||||||
fn planar64_affine3_from_roblox(cf:&rbx_dom_weak::types::CFrame,size:&rbx_dom_weak::types::Vector3)->Result<Planar64Affine3,Planar64TryFromFloatError>{
|
fn planar64_affine3_from_roblox(cf:&rbx_dom_weak::types::CFrame,size:&rbx_dom_weak::types::Vector3)->Result<Planar64Affine3,Planar64TryFromFloatError>{
|
||||||
Ok(Planar64Affine3::new(
|
Ok(Planar64Affine3::new(
|
||||||
Planar64Mat3::from_cols([
|
Planar64Mat3::from_cols([
|
||||||
@@ -118,7 +127,7 @@ fn get_attributes(name:&str,can_collide:bool,velocity:Planar64Vec3,model_id:mode
|
|||||||
);
|
);
|
||||||
},
|
},
|
||||||
other=>{
|
other=>{
|
||||||
let regman=lazy_regex::regex!(r"^(BonusStart|WormholeOut)(\d+)$");
|
let regman=lazy_regex!(r"^(BonusStart|WormholeOut)(\d+)$");
|
||||||
if let Some(captures)=regman.captures(other){
|
if let Some(captures)=regman.captures(other){
|
||||||
match &captures[1]{
|
match &captures[1]{
|
||||||
"BonusStart"=>{
|
"BonusStart"=>{
|
||||||
@@ -144,7 +153,7 @@ fn get_attributes(name:&str,can_collide:bool,velocity:Planar64Vec3,model_id:mode
|
|||||||
},
|
},
|
||||||
_=>(),
|
_=>(),
|
||||||
}
|
}
|
||||||
}else if let Some(captures)=lazy_regex::regex!(r"^(Force)?(Spawn|SpawnAt|Trigger|Teleport|Platform)(\d+)$")
|
}else if let Some(captures)=lazy_regex!(r"^(Force)?(Spawn|SpawnAt|Trigger|Teleport|Platform)(\d+)$")
|
||||||
.captures(other){
|
.captures(other){
|
||||||
force_intersecting=true;
|
force_intersecting=true;
|
||||||
let stage_id=StageId::new(ParseIntContext::parse(&captures[3]).map_err(GetAttributesError::StageIdParseInt)?);
|
let stage_id=StageId::new(ParseIntContext::parse(&captures[3]).map_err(GetAttributesError::StageIdParseInt)?);
|
||||||
@@ -185,7 +194,7 @@ fn get_attributes(name:&str,can_collide:bool,velocity:Planar64Vec3,model_id:mode
|
|||||||
stage_element,
|
stage_element,
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
}else if let Some(captures)=lazy_regex::regex!(r"^(Jump|WormholeIn)(\d+)$")
|
}else if let Some(captures)=lazy_regex!(r"^(Jump|WormholeIn)(\d+)$")
|
||||||
.captures(other){
|
.captures(other){
|
||||||
match &captures[1]{
|
match &captures[1]{
|
||||||
"Jump"=>modes_builder.push_mode_update(
|
"Jump"=>modes_builder.push_mode_update(
|
||||||
@@ -210,7 +219,7 @@ fn get_attributes(name:&str,can_collide:bool,velocity:Planar64Vec3,model_id:mode
|
|||||||
},
|
},
|
||||||
_=>unreachable!("regex2[1] messed up bad"),
|
_=>unreachable!("regex2[1] messed up bad"),
|
||||||
}
|
}
|
||||||
}else if let Some(captures)=lazy_regex::regex!(r"^Bonus(Finish|Anticheat)(\d+)$")
|
}else if let Some(captures)=lazy_regex!(r"^Bonus(Finish|Anticheat)(\d+)$")
|
||||||
.captures(other){
|
.captures(other){
|
||||||
force_can_collide=false;
|
force_can_collide=false;
|
||||||
force_intersecting=true;
|
force_intersecting=true;
|
||||||
|
|||||||
@@ -12,7 +12,6 @@ flate2 = "1.0.27"
|
|||||||
futures = "0.3.31"
|
futures = "0.3.31"
|
||||||
image = "0.25.2"
|
image = "0.25.2"
|
||||||
image_dds = "0.7.1"
|
image_dds = "0.7.1"
|
||||||
lazy-regex = "3.1.0"
|
|
||||||
rbx_asset = { version = "0.5.0", registry = "strafesnet" }
|
rbx_asset = { version = "0.5.0", registry = "strafesnet" }
|
||||||
rbx_binary = { version = "1.0.1-sn5", registry = "strafesnet" }
|
rbx_binary = { version = "1.0.1-sn5", registry = "strafesnet" }
|
||||||
rbx_dom_weak = { version = "3.0.1-sn5", registry = "strafesnet" }
|
rbx_dom_weak = { version = "3.0.1-sn5", registry = "strafesnet" }
|
||||||
|
|||||||
Reference in New Issue
Block a user