From 0c7b52a06d96575131b75b195ebedf675928b2d0 Mon Sep 17 00:00:00 2001 From: Chance103 Date: Tue, 5 Sep 2023 19:38:38 -0600 Subject: [PATCH 1/2] Update strats.json Panefmm and c4.5 need to be updated as of 1.19.4 they are now 5t and not 4t --- common/src/main/resources/assets/mpkmod/strats/strats.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/common/src/main/resources/assets/mpkmod/strats/strats.json b/common/src/main/resources/assets/mpkmod/strats/strats.json index 084c7973..5f0222b3 100644 --- a/common/src/main/resources/assets/mpkmod/strats/strats.json +++ b/common/src/main/resources/assets/mpkmod/strats/strats.json @@ -16,7 +16,7 @@ "format": { "a==1": "Max ", "default": "c4.5", - "a!=1&&a!=4": " {a}t", + "a!=1&&a!=5": " {a}t", "a_ms": " ({a_ms}ms)", "r!=1": " Run {r}t" }, @@ -56,7 +56,7 @@ "format": { "a==1": "Max ", "default": "Pane FMM", - "a!=1&&a!=4": " {a}t", + "a!=1&&a!=5": " {a}t", "r!=1": " Run {r}t" }, "timingEntries": [ @@ -136,4 +136,4 @@ "WP!G" ] } -} \ No newline at end of file +} From 519979745697b8b7743c6a65705d9c55af25f6f9 Mon Sep 17 00:00:00 2001 From: Chance103 Date: Wed, 6 Sep 2023 20:55:42 -0600 Subject: [PATCH 2/2] Fix to not break old versions before 1.19.4 timing --- .../assets/mpkmod/strats/strats.json | 4 +- .../assets/mpkmod/strats/strats.json | 139 ++++++++++++++++++ .../assets/mpkmod/strats/strats.json | 139 ++++++++++++++++++ .../assets/mpkmod/strats/strats.json | 139 ++++++++++++++++++ .../assets/mpkmod/strats/strats.json | 139 ++++++++++++++++++ 5 files changed, 558 insertions(+), 2 deletions(-) create mode 100644 fabric-1.19.4/src/main/resources/assets/mpkmod/strats/strats.json create mode 100644 fabric-1.20/src/main/resources/assets/mpkmod/strats/strats.json create mode 100644 forge-1.19.4/src/main/resources/assets/mpkmod/strats/strats.json create mode 100644 forge-1.20/src/main/resources/assets/mpkmod/strats/strats.json diff --git a/common/src/main/resources/assets/mpkmod/strats/strats.json b/common/src/main/resources/assets/mpkmod/strats/strats.json index 5f0222b3..e3fd8031 100644 --- a/common/src/main/resources/assets/mpkmod/strats/strats.json +++ b/common/src/main/resources/assets/mpkmod/strats/strats.json @@ -16,7 +16,7 @@ "format": { "a==1": "Max ", "default": "c4.5", - "a!=1&&a!=5": " {a}t", + "a!=1&&a!=4": " {a}t", "a_ms": " ({a_ms}ms)", "r!=1": " Run {r}t" }, @@ -56,7 +56,7 @@ "format": { "a==1": "Max ", "default": "Pane FMM", - "a!=1&&a!=5": " {a}t", + "a!=1&&a!=4": " {a}t", "r!=1": " Run {r}t" }, "timingEntries": [ diff --git a/fabric-1.19.4/src/main/resources/assets/mpkmod/strats/strats.json b/fabric-1.19.4/src/main/resources/assets/mpkmod/strats/strats.json new file mode 100644 index 00000000..5f0222b3 --- /dev/null +++ b/fabric-1.19.4/src/main/resources/assets/mpkmod/strats/strats.json @@ -0,0 +1,139 @@ +{ + "fmm": { + "format": { + "a==1": "Max ", + "default": "FMM", + "a!=1": " {a}t", + "a_ms": " ({a_ms}ms)" + }, + "timingEntries": [ + "a{1,1}:WJ", + "a:W!G", + "WP!G" + ] + }, + "c4.5": { + "format": { + "a==1": "Max ", + "default": "c4.5", + "a!=1&&a!=5": " {a}t", + "a_ms": " ({a_ms}ms)", + "r!=1": " Run {r}t" + }, + "timingEntries": [ + "a{1,1}:WJ", + "a:W!G", + "b:WP!G", + "WPG", + "r{1,}:WPG", + "WPJ" + ] + }, + "pessi": { + "format": { + "a==1": "Max ", + "default": "Pessi", + "a!=1": " -{a}t", + "a_ms": " ({a_ms}ms}" + }, + "timingEntries": [ + "a{1,1}:J", + "a:!G", + "WP!G" + ] + }, + "a7hh": { + "format": { + "default": "A7HH" + }, + "timingEntries": [ + "a{1,1}:J", + "a:!G", + "WPG" + ] + }, + "panefmm": { + "format": { + "a==1": "Max ", + "default": "Pane FMM", + "a!=1&&a!=5": " {a}t", + "r!=1": " Run {r}t" + }, + "timingEntries": [ + "a{1,1}:J", + "a:", + "b:WP!G", + "WPG", + "r{1,6}:WPG", + "WPJ" + ] + }, + "jam": { + "format": { + "default": "Jam" + }, + "timingEntries": [ + "WPJ" + ] + }, + "bwjam": { + "format": { + "default": "BWJam" + }, + "timingEntries": [ + "SJ" + ] + }, + "hh": { + "format": { + "default": "HH", + "x!=1": " {x}t", + "x_ms": " ({x_ms}ms}" + }, + "timingEntries": [ + "x{1,}:WP", + "WPJ" + ] + }, + "bwhh": { + "format": { + "default": "BWHH", + "x!=1": " {x}t", + "x_ms": " ({x_ms}ms}" + }, + "timingEntries": [ + "x{1,}:S", + "SJ" + ] + }, + "3bcbwmm": { + "format": { + "default": "3bc BWMM", + "w!=1": " Walk {w}t" + }, + "timingEntries": [ + "SJ", + "a:S!G", + "SG", + "w{1,}:SG", + "WPJ" + ] + }, + "rexbwmm": { + "format": { + "default": "Rex BWMM", + "s!=1": " Strafe {s}t", + "s_ms": " ({s_ms}ms)", + "w!=1": " Walk {w}t" + }, + "timingEntries": [ + "SJ", + "a:S!G", + "SG", + "w{1,}:SG", + "s{1,1}:WAPJ", + "s:WAP!G", + "WP!G" + ] + } +} diff --git a/fabric-1.20/src/main/resources/assets/mpkmod/strats/strats.json b/fabric-1.20/src/main/resources/assets/mpkmod/strats/strats.json new file mode 100644 index 00000000..5f0222b3 --- /dev/null +++ b/fabric-1.20/src/main/resources/assets/mpkmod/strats/strats.json @@ -0,0 +1,139 @@ +{ + "fmm": { + "format": { + "a==1": "Max ", + "default": "FMM", + "a!=1": " {a}t", + "a_ms": " ({a_ms}ms)" + }, + "timingEntries": [ + "a{1,1}:WJ", + "a:W!G", + "WP!G" + ] + }, + "c4.5": { + "format": { + "a==1": "Max ", + "default": "c4.5", + "a!=1&&a!=5": " {a}t", + "a_ms": " ({a_ms}ms)", + "r!=1": " Run {r}t" + }, + "timingEntries": [ + "a{1,1}:WJ", + "a:W!G", + "b:WP!G", + "WPG", + "r{1,}:WPG", + "WPJ" + ] + }, + "pessi": { + "format": { + "a==1": "Max ", + "default": "Pessi", + "a!=1": " -{a}t", + "a_ms": " ({a_ms}ms}" + }, + "timingEntries": [ + "a{1,1}:J", + "a:!G", + "WP!G" + ] + }, + "a7hh": { + "format": { + "default": "A7HH" + }, + "timingEntries": [ + "a{1,1}:J", + "a:!G", + "WPG" + ] + }, + "panefmm": { + "format": { + "a==1": "Max ", + "default": "Pane FMM", + "a!=1&&a!=5": " {a}t", + "r!=1": " Run {r}t" + }, + "timingEntries": [ + "a{1,1}:J", + "a:", + "b:WP!G", + "WPG", + "r{1,6}:WPG", + "WPJ" + ] + }, + "jam": { + "format": { + "default": "Jam" + }, + "timingEntries": [ + "WPJ" + ] + }, + "bwjam": { + "format": { + "default": "BWJam" + }, + "timingEntries": [ + "SJ" + ] + }, + "hh": { + "format": { + "default": "HH", + "x!=1": " {x}t", + "x_ms": " ({x_ms}ms}" + }, + "timingEntries": [ + "x{1,}:WP", + "WPJ" + ] + }, + "bwhh": { + "format": { + "default": "BWHH", + "x!=1": " {x}t", + "x_ms": " ({x_ms}ms}" + }, + "timingEntries": [ + "x{1,}:S", + "SJ" + ] + }, + "3bcbwmm": { + "format": { + "default": "3bc BWMM", + "w!=1": " Walk {w}t" + }, + "timingEntries": [ + "SJ", + "a:S!G", + "SG", + "w{1,}:SG", + "WPJ" + ] + }, + "rexbwmm": { + "format": { + "default": "Rex BWMM", + "s!=1": " Strafe {s}t", + "s_ms": " ({s_ms}ms)", + "w!=1": " Walk {w}t" + }, + "timingEntries": [ + "SJ", + "a:S!G", + "SG", + "w{1,}:SG", + "s{1,1}:WAPJ", + "s:WAP!G", + "WP!G" + ] + } +} diff --git a/forge-1.19.4/src/main/resources/assets/mpkmod/strats/strats.json b/forge-1.19.4/src/main/resources/assets/mpkmod/strats/strats.json new file mode 100644 index 00000000..5f0222b3 --- /dev/null +++ b/forge-1.19.4/src/main/resources/assets/mpkmod/strats/strats.json @@ -0,0 +1,139 @@ +{ + "fmm": { + "format": { + "a==1": "Max ", + "default": "FMM", + "a!=1": " {a}t", + "a_ms": " ({a_ms}ms)" + }, + "timingEntries": [ + "a{1,1}:WJ", + "a:W!G", + "WP!G" + ] + }, + "c4.5": { + "format": { + "a==1": "Max ", + "default": "c4.5", + "a!=1&&a!=5": " {a}t", + "a_ms": " ({a_ms}ms)", + "r!=1": " Run {r}t" + }, + "timingEntries": [ + "a{1,1}:WJ", + "a:W!G", + "b:WP!G", + "WPG", + "r{1,}:WPG", + "WPJ" + ] + }, + "pessi": { + "format": { + "a==1": "Max ", + "default": "Pessi", + "a!=1": " -{a}t", + "a_ms": " ({a_ms}ms}" + }, + "timingEntries": [ + "a{1,1}:J", + "a:!G", + "WP!G" + ] + }, + "a7hh": { + "format": { + "default": "A7HH" + }, + "timingEntries": [ + "a{1,1}:J", + "a:!G", + "WPG" + ] + }, + "panefmm": { + "format": { + "a==1": "Max ", + "default": "Pane FMM", + "a!=1&&a!=5": " {a}t", + "r!=1": " Run {r}t" + }, + "timingEntries": [ + "a{1,1}:J", + "a:", + "b:WP!G", + "WPG", + "r{1,6}:WPG", + "WPJ" + ] + }, + "jam": { + "format": { + "default": "Jam" + }, + "timingEntries": [ + "WPJ" + ] + }, + "bwjam": { + "format": { + "default": "BWJam" + }, + "timingEntries": [ + "SJ" + ] + }, + "hh": { + "format": { + "default": "HH", + "x!=1": " {x}t", + "x_ms": " ({x_ms}ms}" + }, + "timingEntries": [ + "x{1,}:WP", + "WPJ" + ] + }, + "bwhh": { + "format": { + "default": "BWHH", + "x!=1": " {x}t", + "x_ms": " ({x_ms}ms}" + }, + "timingEntries": [ + "x{1,}:S", + "SJ" + ] + }, + "3bcbwmm": { + "format": { + "default": "3bc BWMM", + "w!=1": " Walk {w}t" + }, + "timingEntries": [ + "SJ", + "a:S!G", + "SG", + "w{1,}:SG", + "WPJ" + ] + }, + "rexbwmm": { + "format": { + "default": "Rex BWMM", + "s!=1": " Strafe {s}t", + "s_ms": " ({s_ms}ms)", + "w!=1": " Walk {w}t" + }, + "timingEntries": [ + "SJ", + "a:S!G", + "SG", + "w{1,}:SG", + "s{1,1}:WAPJ", + "s:WAP!G", + "WP!G" + ] + } +} diff --git a/forge-1.20/src/main/resources/assets/mpkmod/strats/strats.json b/forge-1.20/src/main/resources/assets/mpkmod/strats/strats.json new file mode 100644 index 00000000..5f0222b3 --- /dev/null +++ b/forge-1.20/src/main/resources/assets/mpkmod/strats/strats.json @@ -0,0 +1,139 @@ +{ + "fmm": { + "format": { + "a==1": "Max ", + "default": "FMM", + "a!=1": " {a}t", + "a_ms": " ({a_ms}ms)" + }, + "timingEntries": [ + "a{1,1}:WJ", + "a:W!G", + "WP!G" + ] + }, + "c4.5": { + "format": { + "a==1": "Max ", + "default": "c4.5", + "a!=1&&a!=5": " {a}t", + "a_ms": " ({a_ms}ms)", + "r!=1": " Run {r}t" + }, + "timingEntries": [ + "a{1,1}:WJ", + "a:W!G", + "b:WP!G", + "WPG", + "r{1,}:WPG", + "WPJ" + ] + }, + "pessi": { + "format": { + "a==1": "Max ", + "default": "Pessi", + "a!=1": " -{a}t", + "a_ms": " ({a_ms}ms}" + }, + "timingEntries": [ + "a{1,1}:J", + "a:!G", + "WP!G" + ] + }, + "a7hh": { + "format": { + "default": "A7HH" + }, + "timingEntries": [ + "a{1,1}:J", + "a:!G", + "WPG" + ] + }, + "panefmm": { + "format": { + "a==1": "Max ", + "default": "Pane FMM", + "a!=1&&a!=5": " {a}t", + "r!=1": " Run {r}t" + }, + "timingEntries": [ + "a{1,1}:J", + "a:", + "b:WP!G", + "WPG", + "r{1,6}:WPG", + "WPJ" + ] + }, + "jam": { + "format": { + "default": "Jam" + }, + "timingEntries": [ + "WPJ" + ] + }, + "bwjam": { + "format": { + "default": "BWJam" + }, + "timingEntries": [ + "SJ" + ] + }, + "hh": { + "format": { + "default": "HH", + "x!=1": " {x}t", + "x_ms": " ({x_ms}ms}" + }, + "timingEntries": [ + "x{1,}:WP", + "WPJ" + ] + }, + "bwhh": { + "format": { + "default": "BWHH", + "x!=1": " {x}t", + "x_ms": " ({x_ms}ms}" + }, + "timingEntries": [ + "x{1,}:S", + "SJ" + ] + }, + "3bcbwmm": { + "format": { + "default": "3bc BWMM", + "w!=1": " Walk {w}t" + }, + "timingEntries": [ + "SJ", + "a:S!G", + "SG", + "w{1,}:SG", + "WPJ" + ] + }, + "rexbwmm": { + "format": { + "default": "Rex BWMM", + "s!=1": " Strafe {s}t", + "s_ms": " ({s_ms}ms)", + "w!=1": " Walk {w}t" + }, + "timingEntries": [ + "SJ", + "a:S!G", + "SG", + "w{1,}:SG", + "s{1,1}:WAPJ", + "s:WAP!G", + "WP!G" + ] + } +}