mirror of
https://gitlab.com/cable-mc/cobblemon.git
synced 2026-10-27 12:36:24 -04:00
Merge remote-tracking branch 'origin/implement_pokemon' into implement_pokemon
This commit is contained in:
+8
@@ -1,3 +1,11 @@
|
||||
/*
|
||||
* Copyright (C) 2023 Cobblemon Contributors
|
||||
*
|
||||
* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
|
||||
*/
|
||||
|
||||
package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen2
|
||||
|
||||
import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
|
||||
|
||||
+5
-3
@@ -81,13 +81,15 @@ internal class ValidateAnimations {
|
||||
val ignore = AtomicBoolean(false)
|
||||
source = reader.lines()
|
||||
.filter {
|
||||
var result: Boolean = ignore.get()
|
||||
if(it.trim().startsWith("/*")) {
|
||||
ignore.set(true)
|
||||
result = true
|
||||
} else if(it.trim().contains("*/")) {
|
||||
ignore.set(false)
|
||||
result = ignore.getAndSet(false)
|
||||
}
|
||||
|
||||
!ignore.get()
|
||||
!result
|
||||
}
|
||||
.reduce { a, b -> a.plus('\n').plus(b) }
|
||||
.get()
|
||||
@@ -120,7 +122,7 @@ internal class ValidateAnimations {
|
||||
}
|
||||
}
|
||||
|
||||
assertEquals(0, options.size)
|
||||
assertEquals(0, options.size, "Invalid animations found for pokemon: ${entry.key} $options")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user