Skip to content

Commit 3aacc4b

Browse files
committed
Update mcVersionAtLeast logic #9
1 parent f05a992 commit 3aacc4b

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

lib/common/util/MojangUtils.ts

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,18 @@ export function isLibraryCompatible(rules?: Rule[], natives?: Natives): boolean
5050
export function mcVersionAtLeast(desired: string, actual: string): boolean {
5151
const des = desired.split('.')
5252
const act = actual.split('.')
53+
if(act.length < des.length) {
54+
for(let i=act.length; i<des.length; i++) {
55+
act[i] = '0'
56+
}
57+
}
5358

54-
for(let i=0; i<des.length; i++){
55-
if(!(parseInt(act[i]) >= parseInt(des[i]))){
59+
for(let i=0; i<des.length; i++) {
60+
const parsedDesired = parseInt(des[i])
61+
const parsedActual = parseInt(act[i])
62+
if(parsedActual > parsedDesired){
63+
return true
64+
} else if(parsedActual < parsedDesired) {
5665
return false
5766
}
5867
}

test/common/util/MojangUtilTest.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ describe('MojangUtil', () => {
1010
expect(mcVersionAtLeast('1.20.5', '1.20.5')).to.be.true
1111
expect(mcVersionAtLeast('1.20.5', '1.20.6')).to.be.true
1212
expect(mcVersionAtLeast('1.20.5', '1.20')).to.be.false
13+
expect(mcVersionAtLeast('1.20.5', '1.21')).to.be.true
1314
expect(mcVersionAtLeast('1.20', '1.20.5')).to.be.true
1415

1516
expect(mcVersionAtLeast('1.12', '1.20.5')).to.be.true

0 commit comments

Comments
 (0)