diff --git a/src/main/java/org/geysermc/packconverter/api/ConverterHandler.java b/src/main/java/org/geysermc/packconverter/api/ConverterHandler.java index 77a4098..72dec86 100644 --- a/src/main/java/org/geysermc/packconverter/api/ConverterHandler.java +++ b/src/main/java/org/geysermc/packconverter/api/ConverterHandler.java @@ -49,12 +49,17 @@ public class ConverterHandler { converterList.add(ChestSideConverter.class); converterList.add(DrownedConverter.class); converterList.add(DolphinConverter.class); - + converterList.add(FireworksConverter.class); + converterList.add(FishHookConverter.class); + converterList.add(FoxConverter.class); + converterList.add(HorseConverter.class); converterList.add(IconsConverter.class); converterList.add(MapIconsConverter.class); - + converterList.add(PistonArmConverter.class); converterList.add(RedstoneDustConverter.class); - + converterList.add(SheepConverter.class); + converterList.add(VillagerConverter.class); + converterList.add(TurtleConverter.class); converterList.add(WeatherConverter.class); converterList.add(OpaqueConverter.class); converterList.add(WaterConverter.class); diff --git a/src/main/java/org/geysermc/packconverter/api/converters/DolphinConverter.java b/src/main/java/org/geysermc/packconverter/api/converters/DolphinConverter.java index d7f279e..d1114bd 100644 --- a/src/main/java/org/geysermc/packconverter/api/converters/DolphinConverter.java +++ b/src/main/java/org/geysermc/packconverter/api/converters/DolphinConverter.java @@ -75,45 +75,45 @@ public class DolphinConverter extends AbstractConverter { Graphics g = newImage.getGraphics(); // Nose - g.drawImage(ImageUtils.crop(fromImage,0, (13 * factor), (12 * factor), (6 * factor)), 0, (13 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, 0, (13 * factor), (12 * factor), (6 * factor)), 0, (13 * factor), null); // Head - g.drawImage(ImageUtils.crop(fromImage,0, 0, (28 * factor), (13 * factor)), 0, 0, null); + g.drawImage(ImageUtils.crop(fromImage, 0, 0, (28 * factor), (13 * factor)), 0, 0, null); // Body - g.drawImage(ImageUtils.crop(fromImage,(35 * factor), 0, (16 * factor), (13 * factor)), (13 * factor), (13 * factor), null); - g.drawImage(ImageUtils.crop(fromImage,(22 * factor), (13 * factor), (42 * factor), (7 * factor)), 0, (26 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, (35 * factor), 0, (16 * factor), (13 * factor)), (13 * factor), (13 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, (22 * factor), (13 * factor), (42 * factor), (7 * factor)), 0, (26 * factor), null); // Tail 1 - g.drawImage(ImageUtils.crop(fromImage,(11 * factor), (19 * factor), (8 * factor), (11 * factor)), (11 * factor), (33 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, (11 * factor), (19 * factor), (8 * factor), (11 * factor)), (11 * factor), (33 * factor), null); g.drawImage(ImageUtils.crop(fromImage,0, (30 * factor), (30 * factor), (5 * factor)), 0, (44 * factor), null); // Tail 2 - g.drawImage(ImageUtils.crop(fromImage,(19 * factor), (20 * factor), (32 * factor), (7 * factor)), 0, (49 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, (19 * factor), (20 * factor), (32 * factor), (7 * factor)), 0, (49 * factor), null); // Top - g.drawImage(ImageUtils.crop(fromImage,(62 * factor), (5 * factor), factor, (4 * factor)), (33 * factor), 0, null); - g.drawImage(ImageUtils.crop(fromImage,(56 * factor), (5 * factor), factor, (4 * factor)), (34 * factor), 0, null); - g.drawImage(ImageUtils.rotate(ImageUtils.crop(fromImage,(51 * factor), (5 * factor), (5 * factor), (4 * factor)),-90), (29 * factor), (4 * factor), null); - g.drawImage(ImageUtils.crop(fromImage,(56 * factor), 0, factor, (5 * factor)), (33 * factor), (4 * factor), null); - g.drawImage(ImageUtils.rotate(ImageUtils.crop(fromImage,(57 * factor), (5 * factor), (5 * factor), (4 * factor)),90), (34 * factor), (4 * factor), null); - g.drawImage(ImageUtils.crop(fromImage,(57 * factor), 0, factor, (5 * factor)), (38 * factor), (4 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, (62 * factor), (5 * factor), factor, (4 * factor)), (33 * factor), 0, null); + g.drawImage(ImageUtils.crop(fromImage, (56 * factor), (5 * factor), factor, (4 * factor)), (34 * factor), 0, null); + g.drawImage(ImageUtils.rotate(ImageUtils.crop(fromImage, (51 * factor), (5 * factor), (5 * factor), (4 * factor)),-90), (29 * factor), (4 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, (56 * factor), 0, factor, (5 * factor)), (33 * factor), (4 * factor), null); + g.drawImage(ImageUtils.rotate(ImageUtils.crop(fromImage, (57 * factor), (5 * factor), (5 * factor), (4 * factor)),90), (34 * factor), (4 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, (57 * factor), 0, factor, (5 * factor)), (38 * factor), (4 * factor), null); // Right - g.drawImage(ImageUtils.crop(fromImage,(56 * factor), (27 * factor), (8 * factor), (4 * factor)), (44 * factor), 0, null); - g.drawImage(ImageUtils.flip(ImageUtils.crop(fromImage,(48 * factor), (27 * factor), (8 * factor), (4 * factor)), true, false), (52 * factor), 0, null); - g.drawImage(ImageUtils.rotate(ImageUtils.crop(fromImage,(55 * factor), (20 * factor), factor, (7 * factor)),90), (40 * factor), (4 * factor), null); - g.drawImage(ImageUtils.rotate(ImageUtils.crop(fromImage,(55 * factor), (20 * factor), factor, (5 * factor)),90), (47 * factor), (4 * factor), null); - g.drawImage(ImageUtils.rotate(ImageUtils.crop(fromImage,(56 * factor), (20 * factor), factor, (7 * factor)),90), (52 * factor), (4 * factor), null); - g.drawImage(ImageUtils.rotate(ImageUtils.crop(fromImage,(56 * factor), (20 * factor), factor, (5 * factor)),90), (59 * factor), (4 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, (56 * factor), (27 * factor), (8 * factor), (4 * factor)), (44 * factor), 0, null); + g.drawImage(ImageUtils.flip(ImageUtils.crop(fromImage, (48 * factor), (27 * factor), (8 * factor), (4 * factor)), true, false), (52 * factor), 0, null); + g.drawImage(ImageUtils.rotate(ImageUtils.crop(fromImage, (55 * factor), (20 * factor), factor, (7 * factor)),90), (40 * factor), (4 * factor), null); + g.drawImage(ImageUtils.rotate(ImageUtils.crop(fromImage, (55 * factor), (20 * factor), factor, (5 * factor)),90), (47 * factor), (4 * factor), null); + g.drawImage(ImageUtils.rotate(ImageUtils.crop(fromImage, (56 * factor), (20 * factor), factor, (7 * factor)),90), (52 * factor), (4 * factor), null); + g.drawImage(ImageUtils.rotate(ImageUtils.crop(fromImage, (56 * factor), (20 * factor), factor, (5 * factor)),90), (59 * factor), (4 * factor), null); // Left - g.drawImage(ImageUtils.flip(ImageUtils.crop(fromImage,(56 * factor), (27 * factor), (8 * factor), (4 * factor)), true, false), (44 * factor), (6 * factor), null); - g.drawImage(ImageUtils.crop(fromImage,(48 * factor), (27 * factor), (8 * factor), (4 * factor)), (52 * factor), (6 * factor), null); - g.drawImage(ImageUtils.rotate(ImageUtils.crop(fromImage,(55 * factor), (20 * factor), factor, (7 * factor)),90), (40 * factor), (10 * factor), null); - g.drawImage(ImageUtils.rotate(ImageUtils.crop(fromImage,(55 * factor), (20 * factor), factor, (5 * factor)),90), (47 * factor), (10 * factor), null); - g.drawImage(ImageUtils.rotate(ImageUtils.crop(fromImage,(56 * factor), (20 * factor), factor, (7 * factor)),90), (52 * factor), (10 * factor), null); - g.drawImage(ImageUtils.rotate(ImageUtils.crop(fromImage,(56 * factor), (20 * factor), factor, (5 * factor)),90), (59 * factor), (10 * factor), null); + g.drawImage(ImageUtils.flip(ImageUtils.crop(fromImage, (56 * factor), (27 * factor), (8 * factor), (4 * factor)), true, false), (44 * factor), (6 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, (48 * factor), (27 * factor), (8 * factor), (4 * factor)), (52 * factor), (6 * factor), null); + g.drawImage(ImageUtils.rotate(ImageUtils.crop(fromImage, (55 * factor), (20 * factor), factor, (7 * factor)),90), (40 * factor), (10 * factor), null); + g.drawImage(ImageUtils.rotate(ImageUtils.crop(fromImage, (55 * factor), (20 * factor), factor, (5 * factor)),90), (47 * factor), (10 * factor), null); + g.drawImage(ImageUtils.rotate(ImageUtils.crop(fromImage, (56 * factor), (20 * factor), factor, (7 * factor)),90), (52 * factor), (10 * factor), null); + g.drawImage(ImageUtils.rotate(ImageUtils.crop(fromImage, (56 * factor), (20 * factor), factor, (5 * factor)),90), (59 * factor), (10 * factor), null); ImageUtils.write(newImage, "png", fromFile); diff --git a/src/main/java/org/geysermc/packconverter/api/converters/FireworksConverter.java b/src/main/java/org/geysermc/packconverter/api/converters/FireworksConverter.java new file mode 100644 index 0000000..f71ce4a --- /dev/null +++ b/src/main/java/org/geysermc/packconverter/api/converters/FireworksConverter.java @@ -0,0 +1,85 @@ +/* + * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + * @author GeyserMC + * @link https://github.com/GeyserMC/PackConverter + * + */ + +package org.geysermc.packconverter.api.converters; + +import lombok.Getter; +import org.geysermc.packconverter.api.PackConverter; +import org.geysermc.packconverter.api.utils.ImageUtils; + +import javax.imageio.ImageIO; +import java.awt.*; +import java.awt.image.BufferedImage; +import java.io.File; +import java.io.IOException; +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.List; + +public class FireworksConverter extends AbstractConverter { + + @Getter + public static final List defaultData = new ArrayList<>(); + + static { + defaultData.add(new Object[] {"textures/items/fireworks.png", "textures/entity/fireworks.png"}); + } + + public FireworksConverter(PackConverter packConverter, Path storage, Object[] data) { + super(packConverter, storage, data); + } + + @Override + public List convert() { + List delete = new ArrayList<>(); + + try { + String from = (String) this.data[0]; + String to = (String) this.data[1]; + + File fromFile = storage.resolve(from).toFile(); + + if (!fromFile.exists()) { + return delete; + } + + BufferedImage fromImage = ImageIO.read(fromFile); + + int factor = fromImage.getWidth() / 16; + + BufferedImage newImage = new BufferedImage((32 * factor), (32 * factor), BufferedImage.TYPE_INT_ARGB); + Graphics g = newImage.getGraphics(); + + g.drawImage(ImageUtils.rotate(fromImage, -90), 0, 0, null); + + ImageUtils.write(newImage, "png", storage.resolve(to).toFile()); + + System.out.println("Convert fireworks"); + } catch (IOException e) { } + + return delete; + } +} diff --git a/src/main/java/org/geysermc/packconverter/api/converters/FishHookConverter.java b/src/main/java/org/geysermc/packconverter/api/converters/FishHookConverter.java new file mode 100644 index 0000000..e2236b1 --- /dev/null +++ b/src/main/java/org/geysermc/packconverter/api/converters/FishHookConverter.java @@ -0,0 +1,111 @@ +/* + * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + * @author GeyserMC + * @link https://github.com/GeyserMC/PackConverter + * + */ + +package org.geysermc.packconverter.api.converters; + +import lombok.Getter; +import org.geysermc.packconverter.api.PackConverter; +import org.geysermc.packconverter.api.utils.ImageUtils; + +import javax.imageio.ImageIO; +import java.awt.*; +import java.awt.image.BufferedImage; +import java.io.File; +import java.io.IOException; +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.List; + +public class FishHookConverter extends AbstractConverter { + + @Getter + public static final List defaultData = new ArrayList<>(); + + static { + defaultData.add(new Object[] {"textures/entity/fishhook.png", "textures/entity/fishhook.png"}); + } + + public FishHookConverter(PackConverter packConverter, Path storage, Object[] data) { + super(packConverter, storage, data); + } + + @Override + public List convert() { + List delete = new ArrayList<>(); + + try { + String from = (String) this.data[0]; + String to = (String) this.data[1]; + + File fromFile = storage.resolve(from).toFile(); + + if (!fromFile.exists()) { + return delete; + } + + BufferedImage fromImage = ImageIO.read(fromFile); + + int factor = fromImage.getWidth() / 8; + + BufferedImage newImage = new BufferedImage((24 * factor), (3 * factor), BufferedImage.TYPE_INT_ARGB); + Graphics g = newImage.getGraphics(); + + g.drawImage(ImageUtils.crop(fromImage, (3 * factor), factor, factor, factor), 0, 0, null); + g.drawImage(ImageUtils.crop(fromImage, (3 * factor), factor, factor, factor), (2 * factor), 0, null); + g.drawImage(ImageUtils.crop(fromImage, (3 * factor), factor, factor, factor), (2 * factor), (2 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, (3 * factor), factor, factor, factor), 0, (2 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, (4 * factor), factor, factor, factor), factor, 0, null); + g.drawImage(ImageUtils.crop(fromImage, (4 * factor), factor, factor, factor), (2 * factor), factor, null); + g.drawImage(ImageUtils.crop(fromImage, (4 * factor), factor, factor, factor), factor, (2 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, (4 * factor), factor, factor, factor), 0, factor, null); + g.drawImage(ImageUtils.crop(fromImage, (4 * factor), (4 * factor), factor, factor), factor, factor, null); + + g.drawImage(ImageUtils.crop(fromImage, (5 * factor), (3 * factor), factor, factor), (3 * factor), 0, null); + g.drawImage(ImageUtils.crop(fromImage, (5 * factor), (3 * factor), factor, factor), (5 * factor), 0, null); + g.drawImage(ImageUtils.crop(fromImage, (5 * factor), (3 * factor), factor, factor), (5 * factor), (2 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, (5 * factor), (3 * factor), factor, factor), (3 * factor), (2 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, (4 * factor), (3 * factor), factor, factor), (4 * factor), 0, null); + g.drawImage(ImageUtils.crop(fromImage, (4 * factor), (3 * factor), factor, factor), (5 * factor), factor, null); + g.drawImage(ImageUtils.crop(fromImage, (4 * factor), (3 * factor), factor, factor), (4 * factor), (2 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, (4 * factor), (3 * factor), factor, factor), (3 * factor), factor, null); + g.drawImage(ImageUtils.crop(fromImage, (4 * factor), (4 * factor), factor, factor), (4 * factor), factor, null); + + g.drawImage(ImageUtils.crop(fromImage, (3 * factor), factor, (3 * factor), (3 * factor)), (6 * factor), 0, null); + g.drawImage(ImageUtils.crop(fromImage, (3 * factor), factor, (3 * factor), (3 * factor)), (9 * factor), 0, null); + g.drawImage(ImageUtils.crop(fromImage, (3 * factor), factor, (3 * factor), (3 * factor)), (12 * factor), 0, null); + g.drawImage(ImageUtils.crop(fromImage, (3 * factor), factor, (3 * factor), (3 * factor)), (15 * factor), 0, null); + + g.drawImage(ImageUtils.crop(fromImage, (2 * factor), (5 * factor), (3 * factor), (3 * factor)), (18 * factor), 0, null); + g.drawImage(ImageUtils.crop(fromImage, (4 * factor), (4 * factor), factor, factor), (22 * factor), (2 * factor), null); + + ImageUtils.write(newImage, "png", storage.resolve(to).toFile()); + + System.out.println("Convert fishhook"); + } catch (IOException e) { } + + return delete; + } +} diff --git a/src/main/java/org/geysermc/packconverter/api/converters/FoxConverter.java b/src/main/java/org/geysermc/packconverter/api/converters/FoxConverter.java new file mode 100644 index 0000000..850981c --- /dev/null +++ b/src/main/java/org/geysermc/packconverter/api/converters/FoxConverter.java @@ -0,0 +1,111 @@ +/* + * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + * @author GeyserMC + * @link https://github.com/GeyserMC/PackConverter + * + */ + +package org.geysermc.packconverter.api.converters; + +import lombok.Getter; +import org.geysermc.packconverter.api.PackConverter; +import org.geysermc.packconverter.api.utils.ImageUtils; + +import javax.imageio.ImageIO; +import java.awt.*; +import java.awt.image.BufferedImage; +import java.io.File; +import java.io.IOException; +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.List; + +public class FoxConverter extends AbstractConverter { + + @Getter + public static final List defaultData = new ArrayList<>(); + + static { + defaultData.add(new Object[] {"textures/entity/fox/fox.png", "textures/entity/fox/fox_sleep.png", "textures/entity/fox/fox.png"}); + defaultData.add(new Object[] {"textures/entity/fox/arctic_fox.png", "textures/entity/fox/arctic_fox_sleep.png", "textures/entity/fox/arctic_fox.png"}); + } + + public FoxConverter(PackConverter packConverter, Path storage, Object[] data) { + super(packConverter, storage, data); + } + + @Override + public List convert() { + List delete = new ArrayList<>(); + + try { + String from = (String) this.data[0]; + String fromSleep = (String) this.data[1]; + String to = (String) this.data[2]; + + File fromFile = storage.resolve(from).toFile(); + File fromSleepFile = storage.resolve(fromSleep).toFile(); + + if (!fromFile.exists() || !fromSleepFile.exists()) { + return delete; + } + + BufferedImage fromImage = ImageIO.read(fromFile); + BufferedImage fromSleepImage = ImageIO.read(fromSleepFile); + + int factor = fromImage.getWidth() / 48; + + BufferedImage newImage = new BufferedImage((64 * factor), (32 * factor), BufferedImage.TYPE_INT_ARGB); + Graphics g = newImage.getGraphics(); + + // Ears + g.drawImage(ImageUtils.crop(fromImage, (8 * factor), factor, (6 * factor), (3 * factor)), 0, 0, null); + g.drawImage(ImageUtils.crop(fromImage, (15 * factor), factor, (6 * factor), (3 * factor)), (22 * factor), 0, null); + + // Head normal + g.drawImage(ImageUtils.crop(fromImage, factor, (5 * factor), (28 * factor), (12 * factor)), 0, 0, null); + + // Head sleep + g.drawImage(ImageUtils.crop(fromSleepImage, factor, (5 * factor), (28 * factor), (12 * factor)), 0, (12 * factor), null); + + // Mount + g.drawImage(ImageUtils.crop(fromImage, (6 * factor), (18 * factor), (14 * factor), (5 * factor)), 0, (24 * factor), null); + + // Body + g.drawImage(ImageUtils.crop(fromImage, (24 * factor), (21 * factor), (6 * factor), (11 * factor)), (30 * factor), (21 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, (30 * factor), (15 * factor), (18 * factor), (17 * factor)), (36 * factor), (15 * factor), null); + + // Tail + g.drawImage(ImageUtils.crop(fromImage, (30 * factor), 0, (18 * factor), (14 * factor)), (28 * factor), 0, null); + + // Legs + g.drawImage(ImageUtils.crop(fromImage, (4 * factor), (24 * factor), (8 * factor), (8 * factor)), (14 * factor), (24 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, (4 * factor), (24 * factor), (8 * factor), (8 * factor)), (22 * factor), (24 * factor), null); + + ImageUtils.write(newImage, "png", storage.resolve(to).toFile()); + + System.out.println(String.format("Convert fox %s", to)); + } catch (IOException e) { } + + return delete; + } +} diff --git a/src/main/java/org/geysermc/packconverter/api/converters/HorseConverter.java b/src/main/java/org/geysermc/packconverter/api/converters/HorseConverter.java new file mode 100644 index 0000000..f33756c --- /dev/null +++ b/src/main/java/org/geysermc/packconverter/api/converters/HorseConverter.java @@ -0,0 +1,261 @@ +/* + * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + * @author GeyserMC + * @link https://github.com/GeyserMC/PackConverter + * + */ + +package org.geysermc.packconverter.api.converters; + +import lombok.Getter; +import org.geysermc.packconverter.api.PackConverter; +import org.geysermc.packconverter.api.utils.ImageUtils; + +import javax.imageio.ImageIO; +import java.awt.*; +import java.awt.image.BufferedImage; +import java.io.File; +import java.io.IOException; +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.List; + +public class HorseConverter extends AbstractConverter { + + @Getter + public static final List defaultData = new ArrayList<>(); + + static { + defaultData.add(new Object[] {"textures/entity/horse2/donkey.png", "textures/entity/horse/donkey.png"}); + defaultData.add(new Object[] {"textures/entity/horse2/horse_black.png", "textures/entity/horse/horse_black.png"}); + defaultData.add(new Object[] {"textures/entity/horse2/horse_brown.png", "textures/entity/horse/horse_brown.png"}); + defaultData.add(new Object[] {"textures/entity/horse2/horse_chestnut.png", "textures/entity/horse/horse_chestnut.png"}); + defaultData.add(new Object[] {"textures/entity/horse2/horse_creamy.png", "textures/entity/horse/horse_creamy.png"}); + defaultData.add(new Object[] {"textures/entity/horse2/horse_darkbrown.png", "textures/entity/horse/horse_darkbrown.png"}); + defaultData.add(new Object[] {"textures/entity/horse2/horse_gray.png", "textures/entity/horse/horse_gray.png"}); + defaultData.add(new Object[] {"textures/entity/horse2/horse_skeleton.png", "textures/entity/horse/horse_skeleton.png"}); + defaultData.add(new Object[] {"textures/entity/horse2/horse_white.png", "textures/entity/horse/horse_white.png"}); + defaultData.add(new Object[] {"textures/entity/horse2/horse_zombie.png", "textures/entity/horse/horse_zombie.png"}); + defaultData.add(new Object[] {"textures/entity/horse2/mule.png", "textures/entity/horse/mule.png"}); + defaultData.add(new Object[] {"textures/entity/horse2/horse_markings_blackdots.png", "textures/entity/horse/horse_markings_blackdots.png"}); + defaultData.add(new Object[] {"textures/entity/horse2/horse_markings_white.png", "textures/entity/horse/horse_markings_white.png"}); + defaultData.add(new Object[] {"textures/entity/horse2/horse_markings_whitedots.png", "textures/entity/horse/horse_markings_whitedots.png"}); + defaultData.add(new Object[] {"textures/entity/horse2/horse_markings_whitefield.png", "textures/entity/horse/horse_markings_whitefield.png"}); + defaultData.add(new Object[] {"textures/entity/horse2/armor/horse_armor_diamond.png", "textures/entity/horse/armor/horse_armor_diamond.png"}); + defaultData.add(new Object[] {"textures/entity/horse2/armor/horse_armor_gold.png", "textures/entity/horse/armor/horse_armor_gold.png"}); + defaultData.add(new Object[] {"textures/entity/horse2/armor/horse_armor_iron.png", "textures/entity/horse/armor/horse_armor_iron.png"}); + defaultData.add(new Object[] {"textures/entity/horse2/armor/horse_armor_leather.png", "textures/entity/horse/armor/horse_armor_leather.png"}); + } + + public HorseConverter(PackConverter packConverter, Path storage, Object[] data) { + super(packConverter, storage, data); + } + + @Override + public List convert() { + List delete = new ArrayList<>(); + + try { + String from = (String) this.data[0]; + String to = (String) this.data[1]; + + File fromFile = storage.resolve(from).toFile(); + + if (!fromFile.exists()) { + return delete; + } + + BufferedImage fromImage = ImageIO.read(fromFile); + + int factor = fromImage.getWidth() / 64; + + BufferedImage newImage = new BufferedImage((fromImage.getWidth() * 2), (fromImage.getWidth() * 2), BufferedImage.TYPE_INT_ARGB); + Graphics g = newImage.getGraphics(); + + // Chest + g.drawImage(ImageUtils.crop(fromImage, (26 * factor), (21 * factor), (22 * factor), (11 * factor)), 0, (34 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, (26 * factor), (21 * factor), (22 * factor), (11 * factor)), 0, (47 * factor), null); + + // Saddle (Gray part) + g.drawImage(ImageUtils.crop(fromImage, (29 * factor), (5 * factor), (6 * factor), (4 * factor)), (74 * factor), 0, null); + g.drawImage(ImageUtils.crop(fromImage, (29 * factor), (5 * factor), (6 * factor), (4 * factor)), (74 * factor), (4 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, (29 * factor), (5 * factor), (6 * factor), (4 * factor)), (74 * factor), (13 * factor), null); + + g.drawImage(ImageUtils.crop(fromImage, (31 * factor), (5 * factor), factor, factor), (81 * factor), (26 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, (31 * factor), (5 * factor), factor, factor), (87 * factor), (26 * factor), null); + + g.drawImage(ImageUtils.crop(fromImage, (31 * factor), (5 * factor), factor, factor), (101 * factor), (26 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, (31 * factor), (5 * factor), factor, factor), (107 * factor), (26 * factor), null); + + // Saddle (Color part) + g.drawImage(ImageUtils.crop(fromImage, (35 * factor), 0, (10 * factor), (9 * factor)), (88 * factor), 0, null); + g.drawImage(ImageUtils.crop(fromImage, (35 * factor), 0, (10 * factor), (9 * factor)), (98 * factor), 0, null); + + g.drawImage(ImageUtils.crop(fromImage, (26 * factor), (9 * factor), (9 * factor), (2 * factor)), (82 * factor), (9 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, (26 * factor), (9 * factor), (7 * factor), (2 * factor)), (91 * factor), (9 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, (26 * factor), (9 * factor), (6 * factor), (2 * factor)), (108 * factor), (9 * factor), null); + + g.drawImage(ImageUtils.crop(fromImage, (26 * factor), (9 * factor), (8 * factor), factor), (80 * factor), (8 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, (26 * factor), (9 * factor), (8 * factor), factor), (108 * factor), (8 * factor), null); + + g.drawImage(ImageUtils.crop(fromImage, (26 * factor), (9 * factor), (9 * factor), factor), (80 * factor), (11 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, (26 * factor), (9 * factor), (9 * factor), factor), (89 * factor), (11 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, (26 * factor), (9 * factor), (2 * factor), factor), (98 * factor), (11 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, (26 * factor), (9 * factor), (9 * factor), factor), (106 * factor), (11 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, (26 * factor), (9 * factor), factor, factor), (115 * factor), (11 * factor), null); + + g.drawImage(ImageUtils.crop(fromImage, (26 * factor), (9 * factor), (9 * factor), factor), (92 * factor), (13 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, (26 * factor), (9 * factor), factor, factor), (101 * factor), (13 * factor), null); + + g.drawImage(ImageUtils.crop(fromImage, (26 * factor), (9 * factor), (9 * factor), factor), (92 * factor), (19 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, (26 * factor), (9 * factor), factor, factor), (101 * factor), (19 * factor), null); + + g.drawImage(ImageUtils.crop(fromImage, (26 * factor), (9 * factor), (2 * factor), factor), (71 * factor), 0, null); + g.drawImage(ImageUtils.crop(fromImage, (35 * factor), 0, (4 * factor), (6 * factor)), (70 * factor), factor, null); + + g.drawImage(ImageUtils.crop(fromImage, (26 * factor), (9 * factor), (2 * factor), factor), (81 * factor), 0, null); + g.drawImage(ImageUtils.crop(fromImage, (35 * factor), 0, (4 * factor), (6 * factor)), (80 * factor), factor, null); + + g.drawImage(ImageUtils.crop(fromImage, (26 * factor), (9 * factor), (3 * factor), factor), (60 * factor), (22 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, (26 * factor), (9 * factor), (8 * factor), factor), (63 * factor), (23 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, (26 * factor), (9 * factor), (3 * factor), factor), (71 * factor), (22 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, (26 * factor), (9 * factor), (2 * factor), factor), (74 * factor), (21 * factor), null); + + g.drawImage(ImageUtils.crop(fromImage, (26 * factor), (9 * factor), (3 * factor), factor), (60 * factor), (27 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, (26 * factor), (9 * factor), (8 * factor), factor), (63 * factor), (28 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, (26 * factor), (9 * factor), (3 * factor), factor), (71 * factor), (27 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, (26 * factor), (9 * factor), (2 * factor), factor), (74 * factor), (26 * factor), null); + + g.drawImage(ImageUtils.crop(fromImage, (26 * factor), (9 * factor), factor, (2 * factor)), (81 * factor), (24 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, (26 * factor), (9 * factor), factor, (2 * factor)), (81 * factor), (27 * factor), null); + + g.drawImage(ImageUtils.crop(fromImage, (26 * factor), (9 * factor), (5 * factor), factor), (82 * factor), (26 * factor), null); + + g.drawImage(ImageUtils.crop(fromImage, (26 * factor), (9 * factor), factor, (2 * factor)), (87 * factor), (24 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, (26 * factor), (9 * factor), factor, (2 * factor)), (87 * factor), (27 * factor), null); + + g.drawImage(ImageUtils.crop(fromImage, (26 * factor), (9 * factor), factor, (2 * factor)), (101 * factor), (24 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, (26 * factor), (9 * factor), factor, (2 * factor)), (101 * factor), (27 * factor), null); + + g.drawImage(ImageUtils.crop(fromImage, (26 * factor), (9 * factor), (5 * factor), factor), (102 * factor), (26 * factor), null); + + g.drawImage(ImageUtils.crop(fromImage, (26 * factor), (9 * factor), factor, (2 * factor)), (107 * factor), (24 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, (26 * factor), (9 * factor), factor, (2 * factor)), (107 * factor), (27 * factor), null); + + // Horse + g.drawImage(ImageUtils.crop(fromImage, 0, (54 * factor), factor, (10 * factor)), 0, (58 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, 0, (54 * factor), factor, (10 * factor)), factor, (58 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, 0, (54 * factor), (64 * factor), (10 * factor)), (2 * factor), (58 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, (62 * factor), (54 * factor), factor, (10 * factor)), (66 * factor), (58 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, (62 * factor), (54 * factor), factor, (10 * factor)), (67 * factor), (58 * factor), null); + + g.drawImage(ImageUtils.crop(fromImage, (22 * factor), (32 * factor), (20 * factor), factor), (24 * factor), (34 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, (22 * factor), (32 * factor), (20 * factor), (22 * factor)), (24 * factor), (35 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, (22 * factor), (53 * factor), (20 * factor), factor), (24 * factor), (57 * factor), null); + + g.drawImage(ImageUtils.crop(fromImage, 0, (35 * factor), (22 * factor), factor), factor, (12 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, 0, (35 * factor), (22 * factor), factor), factor, (13 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, 0, (35 * factor), (22 * factor), (19 * factor)), factor, (14 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, (15 * factor), (42 * factor), (7 * factor), factor), (16 * factor), (20 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, 0, (42 * factor), (7 * factor), factor), factor, (20 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, 0, (53 * factor), (22 * factor), factor), factor, (33 * factor), null); + g.drawImage(ImageUtils.crop(newImage, factor, (20 * factor), factor, (14 * factor)), 0, (20 * factor), null); + g.drawImage(ImageUtils.crop(newImage, (22 * factor), (20 * factor), factor, (14 * factor)), (23 * factor), (20 * factor), null); + + g.drawImage(ImageUtils.crop(fromImage, (48 * factor), (25 * factor), (14 * factor), (8 * factor)), (44 * factor), (33 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, (48 * factor), (25 * factor), (14 * factor), (8 * factor)), (60 * factor), (33 * factor), null); + + g.drawImage(ImageUtils.crop(fromImage, (48 * factor), (25 * factor), (16 * factor), (8 * factor)), (79 * factor), (34 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, (48 * factor), (32 * factor), (16 * factor), factor), (79 * factor), (42 * factor), null); + g.drawImage(ImageUtils.crop(newImage, (79 * factor), (34 * factor), factor, (9 * factor)), (78 * factor), (34 * factor), null); + g.drawImage(ImageUtils.crop(newImage, (94 * factor), (34 * factor), factor, (9 * factor)), (95 * factor), (34 * factor), null); + g.drawImage(ImageUtils.crop(newImage, (78 * factor), (34 * factor), (18 * factor), (9 * factor)), (96 * factor), (34 * factor), null); + + g.drawImage(ImageUtils.crop(fromImage, (52 * factor), (21 * factor), (8 * factor), (4 * factor)), (48 * factor), (51 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, (52 * factor), (21 * factor), (8 * factor), (4 * factor)), (64 * factor), (51 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, (52 * factor), (21 * factor), (8 * factor), (4 * factor)), (82 * factor), (51 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, (52 * factor), (21 * factor), (8 * factor), (4 * factor)), (100 * factor), (51 * factor), null); + + g.drawImage(ImageUtils.crop(fromImage, (48 * factor), (33 * factor), (16 * factor), (3 * factor)), (44 * factor), (55 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, (48 * factor), (33 * factor), (16 * factor), (3 * factor)), (60 * factor), (55 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, (48 * factor), (33 * factor), (16 * factor), (3 * factor)), (78 * factor), (55 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, (48 * factor), (33 * factor), (16 * factor), (3 * factor)), (96 * factor), (55 * factor), null); + + g.drawImage(ImageUtils.crop(fromImage, 0, (12 * factor), (6 * factor), (8 * factor)), 0, (12 * factor), null); + + g.drawImage(ImageUtils.crop(fromImage, (7 * factor), (13 * factor), (10 * factor), (8 * factor)), (7 * factor), 0, null); + g.drawImage(ImageUtils.crop(fromImage, 0, (20 * factor), (9 * factor), (5 * factor)), 0, (7 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, (10 * factor), (20 * factor), (14 * factor), (5 * factor)), (9 * factor), (7 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, (25 * factor), (20 * factor), factor, (5 * factor)), (23 * factor), (7 * factor), null); + + g.drawImage(ImageUtils.crop(fromImage, 0, (25 * factor), (18 * factor), factor), (25 * factor), (18 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, 0, (25 * factor), (18 * factor), (8 * factor)), (25 * factor), (19 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, 0, (25 * factor), factor, (8 * factor)), (24 * factor), (19 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, 0, (25 * factor), factor, (8 * factor)), (43 * factor), (19 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, 0, (25 * factor), (18 * factor), (5 * factor)), (24 * factor), (27 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, 0, (33 * factor), (18 * factor), (2 * factor)), (24 * factor), (32 * factor), null); + + g.drawImage(ImageUtils.crop(fromImage, (48 * factor), (25 * factor), (6 * factor), (4 * factor)), (48 * factor), (29 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, (48 * factor), (25 * factor), (6 * factor), (4 * factor)), (64 * factor), (29 * factor), null); + g.drawImage(ImageUtils.crop(newImage, (78 * factor), (34 * factor), (8 * factor), (5 * factor)), (83 * factor), (29 * factor), null); + g.drawImage(ImageUtils.crop(newImage, (78 * factor), (34 * factor), (8 * factor), (5 * factor)), (101 * factor), (29 * factor), null); + + g.drawImage(ImageUtils.crop(fromImage, (48 * factor), (25 * factor), (6 * factor), (3 * factor)), (47 * factor), (41 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, (48 * factor), (25 * factor), (6 * factor), (3 * factor)), (63 * factor), (41 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, (48 * factor), (25 * factor), (6 * factor), (3 * factor)), (81 * factor), (43 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, (48 * factor), (25 * factor), (6 * factor), (3 * factor)), (99 * factor), (43 * factor), null); + + g.drawImage(ImageUtils.crop(fromImage, (48 * factor), (25 * factor), (6 * factor), (5 * factor)), (44 * factor), (44 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, (48 * factor), (25 * factor), (6 * factor), (5 * factor)), (50 * factor), (44 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, (48 * factor), (25 * factor), (6 * factor), (5 * factor)), (60 * factor), (44 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, (48 * factor), (25 * factor), (6 * factor), (5 * factor)), (66 * factor), (44 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, (48 * factor), (25 * factor), (6 * factor), (5 * factor)), (78 * factor), (46 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, (48 * factor), (25 * factor), (6 * factor), (5 * factor)), (84 * factor), (46 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, (48 * factor), (25 * factor), (6 * factor), (5 * factor)), (96 * factor), (46 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, (48 * factor), (25 * factor), (6 * factor), (5 * factor)), (102 * factor), (46 * factor), null); + + g.drawImage(ImageUtils.crop(fromImage, (48 * factor), (25 * factor), (4 * factor), (3 * factor)), (47 * factor), 0, null); + g.drawImage(ImageUtils.crop(newImage, (78 * factor), (34 * factor), factor, (2 * factor)), (44 * factor), (3 * factor), null); + g.drawImage(ImageUtils.crop(newImage, (78 * factor), (34 * factor), (8 * factor), (2 * factor)), (45 * factor), (3 * factor), null); + g.drawImage(ImageUtils.crop(newImage, (85 * factor), (34 * factor), factor, (2 * factor)), (53 * factor), (3 * factor), null); + + g.drawImage(ImageUtils.crop(fromImage, (42 * factor), (40 * factor), (6 * factor), (7 * factor)), (45 * factor), (7 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, (42 * factor), (40 * factor), (10 * factor), (4 * factor)), (38 * factor), (14 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, (42 * factor), (40 * factor), (10 * factor), (4 * factor)), (48 * factor), (14 * factor), null); + + g.drawImage(ImageUtils.crop(fromImage, (42 * factor), (40 * factor), (6 * factor), (5 * factor)), (31 * factor), (5 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, (42 * factor), (40 * factor), (13 * factor), (4 * factor)), (26 * factor), (10 * factor), null); + g.drawImage(ImageUtils.crop(fromImage, (43 * factor), (52 * factor), (2 * factor), (2 * factor)), (39 * factor), (11 * factor), null); + g.drawImage(ImageUtils.flip(ImageUtils.crop(fromImage, (43 * factor), (52 * factor), (2 * factor), (2 * factor)), true, false), (24 * factor), (11 * factor), null); + g.drawImage(ImageUtils.flip(ImageUtils.flip(ImageUtils.crop(fromImage, (43 * factor), (52 * factor), (2 * factor), (2 * factor)), true, false), false, true), (31 * factor), (3 * factor), null); + g.drawImage(ImageUtils.flip(ImageUtils.flip(ImageUtils.crop(fromImage, (43 * factor), (52 * factor), (2 * factor), (2 * factor)), true, false), false, true), (34 * factor), (3 * factor), null); + + g.drawImage(ImageUtils.crop(fromImage, (19 * factor), (16 * factor), (6 * factor), (4 * factor)), 0, 0, null); + + ImageUtils.write(newImage, "png", storage.resolve(to).toFile()); + + System.out.println(String.format("Convert horse %s", to)); + } catch (IOException e) { } + + return delete; + } +} diff --git a/src/main/java/org/geysermc/packconverter/api/converters/PistonArmConverter.java b/src/main/java/org/geysermc/packconverter/api/converters/PistonArmConverter.java new file mode 100644 index 0000000..14fa552 --- /dev/null +++ b/src/main/java/org/geysermc/packconverter/api/converters/PistonArmConverter.java @@ -0,0 +1,163 @@ +/* + * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + * @author GeyserMC + * @link https://github.com/GeyserMC/PackConverter + * + */ + +package org.geysermc.packconverter.api.converters; + +import lombok.Getter; +import org.geysermc.packconverter.api.PackConverter; +import org.geysermc.packconverter.api.utils.ImageUtils; + +import javax.imageio.ImageIO; +import java.awt.*; +import java.awt.image.BufferedImage; +import java.io.File; +import java.io.IOException; +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.List; + +public class PistonArmConverter extends AbstractConverter { + + @Getter + public static final List defaultData = new ArrayList<>(); + + static { + defaultData.add(new Object[] {"textures/blocks/piston_top_normal.png", "textures/blocks/piston_top_normal.png", "textures/blocks/piston_side.png", "textures/entity/pistonarm/pistonArm.png"}); + defaultData.add(new Object[] {"textures/blocks/piston_top_sticky.png", "textures/blocks/piston_top_normal.png", "textures/blocks/piston_side.png", "textures/entity/pistonarm/pistonArmSticky.png"}); + } + + public PistonArmConverter(PackConverter packConverter, Path storage, Object[] data) { + super(packConverter, storage, data); + } + + @Override + public List convert() { + List delete = new ArrayList<>(); + + try { + String top1 = (String) this.data[0]; + String top2 = (String) this.data[1]; + String side = (String) this.data[2]; + String to = (String) this.data[3]; + + File top1File = storage.resolve(top1).toFile(); + File top2File = storage.resolve(top2).toFile(); + File sideFile = storage.resolve(side).toFile(); + + if (!top1File.exists() || !top2File.exists() || !sideFile.exists()) { + return delete; + } + + BufferedImage top1Image = ImageIO.read(top1File); + BufferedImage top2Image = ImageIO.read(top2File); + BufferedImage sideImage = ImageIO.read(sideFile); + + top1Image = ImageUtils.ensureMinWidth(top1Image, 16); + top2Image = ImageUtils.ensureMinWidth(top2Image, 16); + sideImage = ImageUtils.ensureMinWidth(sideImage, 16); + + int factor = top1Image.getWidth() / 16; + + BufferedImage newImage = new BufferedImage((128 * factor), (32 * factor), BufferedImage.TYPE_INT_ARGB); + Graphics g = newImage.getGraphics(); + + g.drawImage(top1Image, (16 * factor), 0, null); + g.drawImage(top2Image, (32 * factor), 0, null); + + sideImage = ImageUtils.crop(sideImage, 0, 0, sideImage.getWidth(), (4 * factor)); + g.drawImage(sideImage, 0, (16 * factor), null); + g.drawImage(sideImage, (16 * factor), (16 * factor), null); + g.drawImage(sideImage, (32 * factor), (16 * factor), null); + g.drawImage(sideImage, (48 * factor), (16 * factor), null); + + // Arm top + BufferedImage side2Image = ImageUtils.rotate(ImageUtils.crop(sideImage, 0, 0, (8 * factor), (4 * factor)), -90); + + g.drawImage(side2Image, (64 * factor), (4 * factor), null); + g.drawImage(side2Image, (68 * factor), (4 * factor), null); + g.drawImage(side2Image, (72 * factor), (4 * factor), null); + g.drawImage(side2Image, (76 * factor), (4 * factor), null); + + // Arm bottom top + BufferedImage side3Image = ImageUtils.crop(side2Image, 0, (side2Image.getHeight() - factor), side2Image.getWidth(), factor); + BufferedImage side4Image = ImageUtils.crop(sideImage, (7 * factor), 0, factor, sideImage.getHeight()); + BufferedImage side5Image = ImageUtils.crop(side2Image, 0, (2 * factor), side2Image.getWidth(), (4 * factor)); + + g.drawImage(side3Image, (70 * factor), (18 * factor), null); + g.drawImage(side3Image, (74 * factor), (18 * factor), null); + g.drawImage(side3Image, (78 * factor), (18 * factor), null); + + g.drawImage(side4Image, (70 * factor), (19 * factor), null); + g.drawImage(side4Image, (75 * factor), (19 * factor), null); + g.drawImage(side4Image, (76 * factor), (19 * factor), null); + g.drawImage(side4Image, (81 * factor), (19 * factor), null); + + g.drawImage(side3Image, (70 * factor), (23 * factor), null); + g.drawImage(side3Image, (74 * factor), (23 * factor), null); + g.drawImage(side3Image, (78 * factor), (23 * factor), null); + + // Arm bottom + g.drawImage(side3Image, (64 * factor), (24 * factor), null); + g.drawImage(side3Image, (68 * factor), (24 * factor), null); + g.drawImage(side3Image, (72 * factor), (24 * factor), null); + g.drawImage(side3Image, (76 * factor), (24 * factor), null); + g.drawImage(side3Image, (80 * factor), (24 * factor), null); + g.drawImage(side3Image, (84 * factor), (24 * factor), null); + + g.drawImage(side4Image, (64 * factor), (25 * factor), null); + g.drawImage(side4Image, (64 * factor), (29 * factor), null); + g.drawImage(side4Image, (69 * factor), (25 * factor), null); + g.drawImage(side4Image, (69 * factor), (29 * factor), null); + g.drawImage(side4Image, (70 * factor), (25 * factor), null); + g.drawImage(side4Image, (70 * factor), (29 * factor), null); + g.drawImage(side4Image, (75 * factor), (25 * factor), null); + g.drawImage(side4Image, (75 * factor), (29 * factor), null); + g.drawImage(side4Image, (76 * factor), (25 * factor), null); + g.drawImage(side4Image, (76 * factor), (29 * factor), null); + g.drawImage(side4Image, (81 * factor), (25 * factor), null); + g.drawImage(side4Image, (81 * factor), (29 * factor), null); + g.drawImage(side4Image, (82 * factor), (25 * factor), null); + g.drawImage(side4Image, (82 * factor), (29 * factor), null); + g.drawImage(side4Image, (87 * factor), (25 * factor), null); + g.drawImage(side4Image, (87 * factor), (29 * factor), null); + + g.drawImage(side5Image, (65 * factor), (25 * factor), null); + g.drawImage(side5Image, (65 * factor), (29 * factor), null); + g.drawImage(side5Image, (71 * factor), (25 * factor), null); + g.drawImage(side5Image, (71 * factor), (29 * factor), null); + g.drawImage(side5Image, (77 * factor), (25 * factor), null); + g.drawImage(side5Image, (77 * factor), (29 * factor), null); + g.drawImage(side5Image, (83 * factor), (25 * factor), null); + g.drawImage(side5Image, (83 * factor), (29 * factor), null); + + ImageUtils.write(newImage, "png", storage.resolve(to).toFile()); + + System.out.println(String.format("Create piston arm %s", to)); + } catch (IOException e) { } + + return delete; + } +} diff --git a/src/main/java/org/geysermc/packconverter/api/converters/SheepConverter.java b/src/main/java/org/geysermc/packconverter/api/converters/SheepConverter.java new file mode 100644 index 0000000..b941bf5 --- /dev/null +++ b/src/main/java/org/geysermc/packconverter/api/converters/SheepConverter.java @@ -0,0 +1,103 @@ +/* + * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + * @author GeyserMC + * @link https://github.com/GeyserMC/PackConverter + * + */ + +package org.geysermc.packconverter.api.converters; + +import lombok.Getter; +import org.geysermc.packconverter.api.PackConverter; +import org.geysermc.packconverter.api.utils.ImageUtils; + +import javax.imageio.ImageIO; +import java.awt.*; +import java.awt.image.BufferedImage; +import java.io.File; +import java.io.IOException; +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.List; + +public class SheepConverter extends AbstractConverter { + + @Getter + public static final List defaultData = new ArrayList<>(); + + static { + defaultData.add(new Object[] {"textures/entity/sheep/sheep.png", "textures/entity/sheep/sheep_fur.png"}); + } + + public SheepConverter(PackConverter packConverter, Path storage, Object[] data) { + super(packConverter, storage, data); + } + + @Override + public List convert() { + List delete = new ArrayList<>(); + + try { + String sheep = (String) this.data[0]; + String sheepFur = (String) this.data[1]; + + File sheepFile = storage.resolve(sheep).toFile(); + File sheepFurFile = storage.resolve(sheepFur).toFile(); + + if (!sheepFile.exists() || !sheepFurFile.exists()) { + return delete; + } + + BufferedImage sheepImage = ImageIO.read(sheepFile); + BufferedImage sheepFurImage = ImageIO.read(sheepFurFile); + + int width = Math.max(sheepImage.getWidth(), sheepFurImage.getWidth()); + sheepImage = ImageUtils.ensureMinWidth(sheepImage, width); + sheepFurImage = ImageUtils.ensureMinWidth(sheepFurImage, width); + + BufferedImage newImage = new BufferedImage(sheepImage.getWidth(), sheepImage.getHeight() + sheepFurImage.getHeight(), BufferedImage.TYPE_INT_ARGB); + Graphics g = newImage.getGraphics(); + + g.drawImage(sheepImage, 0, 0, null); + + g.drawImage(sheepFurImage, 0, sheepImage.getHeight(), null); + + for (int x = 0; x < newImage.getWidth(); x++) { + for (int y = 0; y < sheepImage.getHeight(); y++) { + Color c = new Color(newImage.getRGB(x, y), true); + if (c.getAlpha() == 255) { + Color tmpCol = new Color(c.getRed(), c.getGreen(), c.getBlue(), 1); + newImage.setRGB(x, y, tmpCol.getRGB()); + } + } + } + + ImageUtils.write(newImage, "png", sheepFile); + + delete.add(new DeleteConverter(packConverter, storage, new Object[] {sheepFur})); + + System.out.println("Convert sheep"); + } catch (IOException e) { } + + return delete; + } +} diff --git a/src/main/java/org/geysermc/packconverter/api/converters/TurtleConverter.java b/src/main/java/org/geysermc/packconverter/api/converters/TurtleConverter.java new file mode 100644 index 0000000..4e3e909 --- /dev/null +++ b/src/main/java/org/geysermc/packconverter/api/converters/TurtleConverter.java @@ -0,0 +1,82 @@ +/* + * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + * @author GeyserMC + * @link https://github.com/GeyserMC/PackConverter + * + */ + +package org.geysermc.packconverter.api.converters; + +import lombok.Getter; +import org.geysermc.packconverter.api.PackConverter; +import org.geysermc.packconverter.api.utils.ImageUtils; + +import javax.imageio.ImageIO; +import java.awt.*; +import java.awt.image.BufferedImage; +import java.io.File; +import java.io.IOException; +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.List; + +public class TurtleConverter extends AbstractConverter { + + @Getter + public static final List defaultData = new ArrayList<>(); + + static { + defaultData.add(new Object[] {"textures/entity/sea_turtle.png"}); + } + + public TurtleConverter(PackConverter packConverter, Path storage, Object[] data) { + super(packConverter, storage, data); + } + + @Override + public List convert() { + try { + String from = (String) this.data[0]; + + File fromFile = storage.resolve(from).toFile(); + + if (!fromFile.exists()) { + return new ArrayList<>(); + } + + BufferedImage fromImage = ImageIO.read(fromFile); + + int factor = fromImage.getWidth() / 128; + + BufferedImage newImage = new BufferedImage(fromImage.getWidth(), fromImage.getHeight(), BufferedImage.TYPE_INT_ARGB); + Graphics g = newImage.getGraphics(); + + g.drawImage(ImageUtils.crop(fromImage, factor, 0, (fromImage.getWidth() - factor), fromImage.getHeight()), 0, 0, null); + + ImageUtils.write(newImage, "png", fromFile); + + System.out.println(String.format("Convert turtle %s", from)); + } catch (IOException e) { } + + return new ArrayList<>(); + } +} diff --git a/src/main/java/org/geysermc/packconverter/api/converters/VillagerConverter.java b/src/main/java/org/geysermc/packconverter/api/converters/VillagerConverter.java new file mode 100644 index 0000000..61ec8af --- /dev/null +++ b/src/main/java/org/geysermc/packconverter/api/converters/VillagerConverter.java @@ -0,0 +1,118 @@ +/* + * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + * @author GeyserMC + * @link https://github.com/GeyserMC/PackConverter + * + */ + +package org.geysermc.packconverter.api.converters; + +import lombok.Getter; +import org.geysermc.packconverter.api.PackConverter; +import org.geysermc.packconverter.api.utils.ImageUtils; + +import javax.imageio.ImageIO; +import java.awt.*; +import java.awt.image.BufferedImage; +import java.io.File; +import java.io.IOException; +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.List; + +public class VillagerConverter extends AbstractConverter { + + @Getter + public static final List defaultData = new ArrayList<>(); + + static { + defaultData.add(new Object[] {"textures/entity/villager2/professions/armorer.png"}); + defaultData.add(new Object[] {"textures/entity/villager2/professions/butcher.png"}); + defaultData.add(new Object[] {"textures/entity/villager2/professions/cartographer.png"}); + defaultData.add(new Object[] {"textures/entity/villager2/professions/cleric.png"}); + defaultData.add(new Object[] {"textures/entity/villager2/professions/farmer.png"}); + defaultData.add(new Object[] {"textures/entity/villager2/professions/fisherman.png"}); + defaultData.add(new Object[] {"textures/entity/villager2/professions/fletcher.png"}); + defaultData.add(new Object[] {"textures/entity/villager2/professions/leatherworker.png"}); + defaultData.add(new Object[] {"textures/entity/villager2/professions/librarian.png"}); + defaultData.add(new Object[] {"textures/entity/villager2/professions/nitwit.png"}); + defaultData.add(new Object[] {"textures/entity/villager2/professions/shepherd.png"}); + defaultData.add(new Object[] {"textures/entity/villager2/professions/stonemason.png"}); + defaultData.add(new Object[] {"textures/entity/villager2/professions/toolsmith.png"}); + defaultData.add(new Object[] {"textures/entity/villager2/professions/unskilled.png"}); + defaultData.add(new Object[] {"textures/entity/villager2/professions/weaponsmith.png"}); + defaultData.add(new Object[] {"textures/entity/zombie_villager2/professions/armorer.png"}); + defaultData.add(new Object[] {"textures/entity/zombie_villager2/professions/butcher.png"}); + defaultData.add(new Object[] {"textures/entity/zombie_villager2/professions/cartographer.png"}); + defaultData.add(new Object[] {"textures/entity/zombie_villager2/professions/cleric.png"}); + defaultData.add(new Object[] {"textures/entity/zombie_villager2/professions/farmer.png"}); + defaultData.add(new Object[] {"textures/entity/zombie_villager2/professions/fisherman.png"}); + defaultData.add(new Object[] {"textures/entity/zombie_villager2/professions/fletcher.png"}); + defaultData.add(new Object[] {"textures/entity/zombie_villager2/professions/leatherworker.png"}); + defaultData.add(new Object[] {"textures/entity/zombie_villager2/professions/librarian.png"}); + defaultData.add(new Object[] {"textures/entity/zombie_villager2/professions/nitwit.png"}); + defaultData.add(new Object[] {"textures/entity/zombie_villager2/professions/shepherd.png"}); + defaultData.add(new Object[] {"textures/entity/zombie_villager2/professions/stonemason.png"}); + defaultData.add(new Object[] {"textures/entity/zombie_villager2/professions/toolsmith.png"}); + defaultData.add(new Object[] {"textures/entity/zombie_villager2/professions/weaponsmith.png"}); + } + + public VillagerConverter(PackConverter packConverter, Path storage, Object[] data) { + super(packConverter, storage, data); + } + + @Override + public List convert() { + try { + String from = (String) this.data[0]; + + File fromFile = storage.resolve(from).toFile(); + + if (!fromFile.exists()) { + return new ArrayList<>(); + } + + BufferedImage fromImage = ImageIO.read(fromFile); + + BufferedImage newImage = new BufferedImage(fromImage.getWidth(), fromImage.getHeight(), BufferedImage.TYPE_INT_ARGB); + Graphics g = newImage.getGraphics(); + + Color blank = new Color(255, 255, 255, 0); + for (int x = 0; x < newImage.getWidth(); x++) { + for (int y = 0; y < newImage.getHeight(); y++) { + Color c = new Color(fromImage.getRGB(x, y), true); + if (c.getAlpha() == 0) { + newImage.setRGB(x, y, blank.getRGB()); + } else { + newImage.setRGB(x, y, c.getRGB()); + } + } + } + + ImageUtils.write(newImage, "png", fromFile); + + System.out.println(String.format("Convert villager %s", from)); + } catch (IOException e) { } + + return new ArrayList<>(); + } +}