AstralTransRocketries/drasl
1
0
Fork 0
mirror of https://github.com/unmojang/drasl.git synced 2025-08-03 19:06:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

Allow textures in multiples of 64x32 (and 64x64 for skins)

Browse Source
This commit is contained in:
Evan Goode 2025-04-04 20:40:34 -04:00
parent 07f75ab62c
commit 052388c765
1 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
common.go
View File

@ -310,6 +310,10 @@ func (app *App) GetTextureReader(textureType string, reader io.Reader) (io.Reade
} }
} }
const BASE_SKIN_WIDTH = 64
const BASE_SKIN_HEIGHT = 64
const BASE_SKIN_HEIGHT_LEGACY = 32
func (app *App) GetSkinReader(reader io.Reader) (io.Reader, error) { func (app *App) GetSkinReader(reader io.Reader) (io.Reader, error) {
var header bytes.Buffer var header bytes.Buffer
config, err := png.DecodeConfig(io.TeeReader(reader, &header)) config, err := png.DecodeConfig(io.TeeReader(reader, &header))
@ -317,17 +321,26 @@ func (app *App) GetSkinReader(reader io.Reader) (io.Reader, error) {
return nil, err return nil, err
} }
if config.Width != config.Height { if app.Config.SkinSizeLimit > 0 && config.Width > app.Config.SkinSizeLimit {
return nil, errors.New("texture must be square") return nil, fmt.Errorf("skin must not be greater than %d pixels wide", app.Config.SkinSizeLimit)
} }
if app.Config.SkinSizeLimit > 0 && config.Width > app.Config.SkinSizeLimit { mustBeMultipleError := fmt.Errorf("skin size must be a multiple of %d pixels wide by %d or %d pixels high", BASE_SKIN_WIDTH, BASE_SKIN_HEIGHT, BASE_SKIN_HEIGHT_LEGACY)
return nil, fmt.Errorf("texture must not be greater than %d pixels wide", app.Config.SkinSizeLimit) if config.Width%BASE_SKIN_WIDTH != 0 {
return nil, mustBeMultipleError
}
scale := config.Width / BASE_SKIN_WIDTH
if config.Height != scale*BASE_SKIN_HEIGHT && config.Height != scale*BASE_SKIN_HEIGHT_LEGACY {
return nil, mustBeMultipleError
} }
return io.MultiReader(&header, reader), nil return io.MultiReader(&header, reader), nil
} }
const BASE_CAPE_WIDTH = 64
const BASE_CAPE_HEIGHT = 32
func (app *App) GetCapeReader(reader io.Reader) (io.Reader, error) { func (app *App) GetCapeReader(reader io.Reader) (io.Reader, error) {
var header bytes.Buffer var header bytes.Buffer
config, err := png.DecodeConfig(io.TeeReader(reader, &header)) config, err := png.DecodeConfig(io.TeeReader(reader, &header))
@ -335,12 +348,18 @@ func (app *App) GetCapeReader(reader io.Reader) (io.Reader, error) {
return nil, err return nil, err
} }
if config.Width != 2*config.Height { if app.Config.SkinSizeLimit > 0 && config.Width > app.Config.SkinSizeLimit {
return nil, errors.New("cape's width must be twice its height") return nil, fmt.Errorf("cape must not be greater than %d pixels wide", app.Config.SkinSizeLimit)
} }
if app.Config.SkinSizeLimit > 0 && config.Width > app.Config.SkinSizeLimit { mustBeMultipleError := fmt.Errorf("cape size must be a multiple of %d pixels wide by %d pixels high", BASE_CAPE_WIDTH, BASE_CAPE_HEIGHT)
return nil, fmt.Errorf("texture must not be greater than %d pixels wide", app.Config.SkinSizeLimit) if config.Width%BASE_CAPE_WIDTH != 0 {
return nil, mustBeMultipleError
}
scale := config.Width / BASE_CAPE_WIDTH
if config.Height != scale*BASE_CAPE_HEIGHT {
return nil, mustBeMultipleError
} }
return io.MultiReader(&header, reader), nil return io.MultiReader(&header, reader), nil