ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

http service: remove unused sprite endpoint

Browse Source
This commit is contained in:
Adam
2021-03-07 12:07:30 -05:00
parent c96c8b979e
commit 15a8c6f3ab
2 changed files with 0 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
http-service/src/main/java/net/runelite/http/service/sprite/SpriteController.java
View File

@@ -1,73 +0,0 @@
/*
* Copyright (c) 2018, Adam <Adam@sigterm.info>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package net.runelite.http.service.sprite;
import com.google.common.cache.CacheBuilder;
import com.google.common.cache.CacheLoader;
import com.google.common.cache.LoadingCache;
import java.io.IOException;
import java.util.concurrent.TimeUnit;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping("/sprite")
public class SpriteController
{
@Autowired
private SpriteService spriteService;
private final LoadingCache<Integer, byte[]> spriteCache = CacheBuilder.newBuilder()
.maximumSize(1024L)
.expireAfterWrite(10, TimeUnit.MINUTES)
.build(new CacheLoader<Integer, byte[]>()
{
@Override
public byte[] load(Integer key) throws Exception
{
byte[] data = spriteService.getImagePng(key >>> 16, key & 0xffff);
return data != null ? data : new byte[0];
}
});
@GetMapping(produces = "image/png")
public ResponseEntity<byte[]> getSprite(
@RequestParam int spriteId,
@RequestParam(defaultValue = "0") int frameId
) throws IOException
{
byte[] data = spriteCache.getUnchecked(spriteId << 16 | frameId);
if (data == null || data.length == 0)
{
return ResponseEntity.notFound().build();
}
return ResponseEntity.ok(data);
}
}

117
http-service/src/main/java/net/runelite/http/service/sprite/SpriteService.java
View File

@@ -1,117 +0,0 @@
/*
* Copyright (c) 2018, Adam <Adam@sigterm.info>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package net.runelite.http.service.sprite;
import java.awt.image.BufferedImage;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import javax.imageio.ImageIO;
import net.runelite.cache.IndexType;
import net.runelite.cache.definitions.SpriteDefinition;
import net.runelite.cache.definitions.loaders.SpriteLoader;
import net.runelite.cache.fs.ArchiveFiles;
import net.runelite.cache.fs.FSFile;
import net.runelite.http.service.cache.CacheService;
import net.runelite.http.service.cache.beans.ArchiveEntry;
import net.runelite.http.service.cache.beans.CacheEntry;
import net.runelite.http.service.cache.beans.IndexEntry;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@Service
public class SpriteService
{
@Autowired
private CacheService cacheService;
public SpriteDefinition getSprite(int spriteId, int frameId) throws IOException
{
CacheEntry cache = cacheService.findMostRecent();
if (cache == null)
{
return null;
}
IndexEntry index = cacheService.findIndexForCache(cache, IndexType.SPRITES.getNumber());
if (index == null)
{
return null;
}
ArchiveEntry archive = cacheService.findArchiveForIndex(index, spriteId);
if (archive == null)
{
return null;
}
ArchiveFiles files = cacheService.getArchiveFiles(archive);
if (files == null)
{
return null;
}
FSFile file = files.getFiles().get(0);
byte[] contents = file.getContents();
SpriteDefinition[] sprite = new SpriteLoader().load(archive.getArchiveId(), contents);
if (frameId < 0 || frameId >= sprite.length)
{
return null;
}
return sprite[frameId];
}
public BufferedImage getImage(int spriteId, int frameId) throws IOException
{
SpriteDefinition sprite = getSprite(spriteId, frameId);
if (sprite == null)
{
return null;
}
BufferedImage bufferedImage = getSpriteImage(sprite);
return bufferedImage;
}
public byte[] getImagePng(int spriteId, int frameId) throws IOException
{
BufferedImage image = getImage(spriteId, frameId);
if (image == null)
{
return null;
}
ByteArrayOutputStream bao = new ByteArrayOutputStream();
ImageIO.write(image, "png", bao);
return bao.toByteArray();
}
private BufferedImage getSpriteImage(SpriteDefinition sprite)
{
BufferedImage image = new BufferedImage(sprite.getWidth(), sprite.getHeight(), BufferedImage.TYPE_INT_ARGB);
image.setRGB(0, 0, sprite.getWidth(), sprite.getHeight(), sprite.getPixels(), 0, sprite.getWidth());
return image;
}
}