diff --git a/bootstrap/build.gradle.kts b/bootstrap/build.gradle.kts new file mode 100644 index 0000000..0bacbc1 --- /dev/null +++ b/bootstrap/build.gradle.kts @@ -0,0 +1,20 @@ +plugins { + id("application") +} + +dependencies { + api(project(":converter")) +} + +application { + mainClass.set("org.geysermc.packconverter.boostrap.Main") +} + +tasks.withType { + from("src/main/java/resources") { + include("*") + } + + archiveFileName.set("PackConverter.jar") + archiveClassifier.set("") +} \ No newline at end of file diff --git a/src/main/java/org/geysermc/packconverter/bootstrap/Main.java b/bootstrap/src/main/java/org/geysermc/packconverter/bootstrap/Main.java similarity index 95% rename from src/main/java/org/geysermc/packconverter/bootstrap/Main.java rename to bootstrap/src/main/java/org/geysermc/packconverter/bootstrap/Main.java index 411b4a0..d84d41d 100644 --- a/src/main/java/org/geysermc/packconverter/bootstrap/Main.java +++ b/bootstrap/src/main/java/org/geysermc/packconverter/bootstrap/Main.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2023 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 @@ -26,7 +26,7 @@ package org.geysermc.packconverter.bootstrap; -import org.geysermc.packconverter.api.PackConverter; +import org.geysermc.packconverter.PackConverter; import java.io.FileNotFoundException; import java.io.IOException; diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..d2aaa60 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,46 @@ +plugins { + id("java") + id("java-library") + id("maven-publish") + id("com.github.johnrengelman.shadow") version "7.1.0" + id("io.freefair.lombok") version "6.3.0" apply false +} + +allprojects { + apply(plugin = "java") + apply(plugin = "java-library") + apply(plugin = "maven-publish") + apply(plugin = "com.github.johnrengelman.shadow") + apply(plugin = "io.freefair.lombok") + + repositories { + mavenLocal() + mavenCentral() + + gradlePluginPortal() + + // Geyser, Floodgate, Cumulus etc. + maven("https://repo.opencollab.dev/main") + maven("https://repo.opencollab.dev/maven-snapshots") + } + + group = "org.geysermc" + version = "3.0-SNAPSHOT" + + java.sourceCompatibility = JavaVersion.VERSION_17 + java.targetCompatibility = JavaVersion.VERSION_17 + + tasks.jar { + archiveClassifier.set("unshaded") + } + + tasks.named("build") { + dependsOn(tasks.shadowJar) + } + + publishing { + publications.create("library") { + artifact(tasks.shadowJar) + } + } +} \ No newline at end of file diff --git a/converter/build.gradle.kts b/converter/build.gradle.kts new file mode 100644 index 0000000..a02c21d --- /dev/null +++ b/converter/build.gradle.kts @@ -0,0 +1,8 @@ +dependencies { + implementation("com.fasterxml.jackson.core:jackson-databind:2.14.0") + implementation("com.twelvemonkeys.imageio:imageio-tga:3.5") + implementation("com.nukkitx.fastutil:fastutil-int-object-maps:8.5.3") + implementation("net.kyori:adventure-api:4.13.1") + implementation("net.kyori:adventure-text-serializer-gson:4.13.1") + implementation("net.kyori:adventure-text-serializer-legacy:4.13.1") +} \ No newline at end of file diff --git a/src/main/java/org/geysermc/packconverter/api/ConverterHandler.java b/converter/src/main/java/org/geysermc/packconverter/ConverterHandler.java similarity index 57% rename from src/main/java/org/geysermc/packconverter/api/ConverterHandler.java rename to converter/src/main/java/org/geysermc/packconverter/ConverterHandler.java index 2780e17..50d6f06 100644 --- a/src/main/java/org/geysermc/packconverter/api/ConverterHandler.java +++ b/converter/src/main/java/org/geysermc/packconverter/ConverterHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2023 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 @@ -24,9 +24,55 @@ * */ -package org.geysermc.packconverter.api; +package org.geysermc.packconverter; -import org.geysermc.packconverter.api.converters.*; +import org.geysermc.packconverter.converters.AbstractConverter; +import org.geysermc.packconverter.converters.AtlasConverter; +import org.geysermc.packconverter.converters.BannerPatternBlackConverter; +import org.geysermc.packconverter.converters.BannerPatternConverter; +import org.geysermc.packconverter.converters.BannerPatternPreviewMaxSizeConverter; +import org.geysermc.packconverter.converters.BarConverter; +import org.geysermc.packconverter.converters.BedConverter; +import org.geysermc.packconverter.converters.BeeConverter; +import org.geysermc.packconverter.converters.ChestFrontConverter; +import org.geysermc.packconverter.converters.ChestLeftRightDoubleConverter; +import org.geysermc.packconverter.converters.ChestNormalConverter; +import org.geysermc.packconverter.converters.ChestSideConverter; +import org.geysermc.packconverter.converters.ColorizeOverlayConverter; +import org.geysermc.packconverter.converters.CopyConverter; +import org.geysermc.packconverter.converters.CustomModelDataConverter; +import org.geysermc.packconverter.converters.DeleteConverter; +import org.geysermc.packconverter.converters.DespriteConverter; +import org.geysermc.packconverter.converters.DespriteExperimentalConverter; +import org.geysermc.packconverter.converters.DestroyStageConverter; +import org.geysermc.packconverter.converters.DolphinConverter; +import org.geysermc.packconverter.converters.DrownedConverter; +import org.geysermc.packconverter.converters.EnchantedItemGlintConverter; +import org.geysermc.packconverter.converters.FireworksConverter; +import org.geysermc.packconverter.converters.FishHookConverter; +import org.geysermc.packconverter.converters.FixWrongRootFolderConverter; +import org.geysermc.packconverter.converters.FoxConverter; +import org.geysermc.packconverter.converters.HorseConverter; +import org.geysermc.packconverter.converters.IconsConverter; +import org.geysermc.packconverter.converters.MapIconsConverter; +import org.geysermc.packconverter.converters.MetadataConverter; +import org.geysermc.packconverter.converters.NineSliceConverter; +import org.geysermc.packconverter.converters.OpaqueConverter; +import org.geysermc.packconverter.converters.OverlayToTranslateConverter; +import org.geysermc.packconverter.converters.Particles1_13Converter; +import org.geysermc.packconverter.converters.PistonArmConverter; +import org.geysermc.packconverter.converters.PlaceholderConverter; +import org.geysermc.packconverter.converters.PngToTgaConverter; +import org.geysermc.packconverter.converters.RedstoneDustConverter; +import org.geysermc.packconverter.converters.RenameConverter; +import org.geysermc.packconverter.converters.SheepConverter; +import org.geysermc.packconverter.converters.SideRotateConverter; +import org.geysermc.packconverter.converters.SpriteConverter; +import org.geysermc.packconverter.converters.TitleConverter; +import org.geysermc.packconverter.converters.TurtleConverter; +import org.geysermc.packconverter.converters.VillagerConverter; +import org.geysermc.packconverter.converters.WaterConverter; +import org.geysermc.packconverter.converters.WeatherConverter; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/org/geysermc/packconverter/api/PackConverter.java b/converter/src/main/java/org/geysermc/packconverter/PackConverter.java similarity index 94% rename from src/main/java/org/geysermc/packconverter/api/PackConverter.java rename to converter/src/main/java/org/geysermc/packconverter/PackConverter.java index a6f267b..64e9929 100644 --- a/src/main/java/org/geysermc/packconverter/api/PackConverter.java +++ b/converter/src/main/java/org/geysermc/packconverter/PackConverter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2023 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 @@ -24,14 +24,14 @@ * */ -package org.geysermc.packconverter.api; +package org.geysermc.packconverter; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import lombok.Getter; import lombok.Setter; -import org.geysermc.packconverter.api.utils.OnLogListener; -import org.geysermc.packconverter.api.utils.ZipUtils; -import org.geysermc.packconverter.api.converters.AbstractConverter; +import org.geysermc.packconverter.utils.OnLogListener; +import org.geysermc.packconverter.utils.ZipUtils; +import org.geysermc.packconverter.converters.AbstractConverter; import javax.imageio.ImageIO; import java.io.File; diff --git a/src/main/java/org/geysermc/packconverter/api/converters/AbstractConverter.java b/converter/src/main/java/org/geysermc/packconverter/converters/AbstractConverter.java similarity index 90% rename from src/main/java/org/geysermc/packconverter/api/converters/AbstractConverter.java rename to converter/src/main/java/org/geysermc/packconverter/converters/AbstractConverter.java index c5c374a..3f4c612 100644 --- a/src/main/java/org/geysermc/packconverter/api/converters/AbstractConverter.java +++ b/converter/src/main/java/org/geysermc/packconverter/converters/AbstractConverter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2023 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 @@ -24,10 +24,10 @@ * */ -package org.geysermc.packconverter.api.converters; +package org.geysermc.packconverter.converters; import lombok.AllArgsConstructor; -import org.geysermc.packconverter.api.PackConverter; +import org.geysermc.packconverter.PackConverter; import java.nio.file.Path; import java.util.ArrayList; diff --git a/src/main/java/org/geysermc/packconverter/api/converters/ArrowConverter.java b/converter/src/main/java/org/geysermc/packconverter/converters/ArrowConverter.java similarity index 94% rename from src/main/java/org/geysermc/packconverter/api/converters/ArrowConverter.java rename to converter/src/main/java/org/geysermc/packconverter/converters/ArrowConverter.java index 30958fd..31886c6 100644 --- a/src/main/java/org/geysermc/packconverter/api/converters/ArrowConverter.java +++ b/converter/src/main/java/org/geysermc/packconverter/converters/ArrowConverter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2023 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 @@ -24,11 +24,11 @@ * */ -package org.geysermc.packconverter.api.converters; +package org.geysermc.packconverter.converters; import lombok.Getter; -import org.geysermc.packconverter.api.PackConverter; -import org.geysermc.packconverter.api.utils.ImageUtils; +import org.geysermc.packconverter.PackConverter; +import org.geysermc.packconverter.utils.ImageUtils; import javax.imageio.ImageIO; import java.awt.*; diff --git a/src/main/java/org/geysermc/packconverter/api/converters/AtlasConverter.java b/converter/src/main/java/org/geysermc/packconverter/converters/AtlasConverter.java similarity index 93% rename from src/main/java/org/geysermc/packconverter/api/converters/AtlasConverter.java rename to converter/src/main/java/org/geysermc/packconverter/converters/AtlasConverter.java index dc4a8ab..99cbe31 100644 --- a/src/main/java/org/geysermc/packconverter/api/converters/AtlasConverter.java +++ b/converter/src/main/java/org/geysermc/packconverter/converters/AtlasConverter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2023 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 @@ -24,11 +24,11 @@ * */ -package org.geysermc.packconverter.api.converters; +package org.geysermc.packconverter.converters; import lombok.Getter; -import org.geysermc.packconverter.api.PackConverter; -import org.geysermc.packconverter.api.utils.ImageUtils; +import org.geysermc.packconverter.PackConverter; +import org.geysermc.packconverter.utils.ImageUtils; import javax.imageio.ImageIO; import java.awt.image.BufferedImage; diff --git a/src/main/java/org/geysermc/packconverter/api/converters/BannerPatternBlackConverter.java b/converter/src/main/java/org/geysermc/packconverter/converters/BannerPatternBlackConverter.java similarity index 96% rename from src/main/java/org/geysermc/packconverter/api/converters/BannerPatternBlackConverter.java rename to converter/src/main/java/org/geysermc/packconverter/converters/BannerPatternBlackConverter.java index d6b10f0..823296d 100644 --- a/src/main/java/org/geysermc/packconverter/api/converters/BannerPatternBlackConverter.java +++ b/converter/src/main/java/org/geysermc/packconverter/converters/BannerPatternBlackConverter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2023 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 @@ -24,11 +24,11 @@ * */ -package org.geysermc.packconverter.api.converters; +package org.geysermc.packconverter.converters; import lombok.Getter; -import org.geysermc.packconverter.api.PackConverter; -import org.geysermc.packconverter.api.utils.ImageUtils; +import org.geysermc.packconverter.PackConverter; +import org.geysermc.packconverter.utils.ImageUtils; import javax.imageio.ImageIO; import java.awt.*; diff --git a/src/main/java/org/geysermc/packconverter/api/converters/BannerPatternConverter.java b/converter/src/main/java/org/geysermc/packconverter/converters/BannerPatternConverter.java similarity index 95% rename from src/main/java/org/geysermc/packconverter/api/converters/BannerPatternConverter.java rename to converter/src/main/java/org/geysermc/packconverter/converters/BannerPatternConverter.java index bba47a6..e121725 100644 --- a/src/main/java/org/geysermc/packconverter/api/converters/BannerPatternConverter.java +++ b/converter/src/main/java/org/geysermc/packconverter/converters/BannerPatternConverter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2023 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 @@ -24,11 +24,11 @@ * */ -package org.geysermc.packconverter.api.converters; +package org.geysermc.packconverter.converters; import lombok.Getter; -import org.geysermc.packconverter.api.PackConverter; -import org.geysermc.packconverter.api.utils.ImageUtils; +import org.geysermc.packconverter.PackConverter; +import org.geysermc.packconverter.utils.ImageUtils; import javax.imageio.ImageIO; import java.awt.*; diff --git a/src/main/java/org/geysermc/packconverter/api/converters/BannerPatternPreviewMaxSizeConverter.java b/converter/src/main/java/org/geysermc/packconverter/converters/BannerPatternPreviewMaxSizeConverter.java similarity index 96% rename from src/main/java/org/geysermc/packconverter/api/converters/BannerPatternPreviewMaxSizeConverter.java rename to converter/src/main/java/org/geysermc/packconverter/converters/BannerPatternPreviewMaxSizeConverter.java index c85270c..a025ec7 100644 --- a/src/main/java/org/geysermc/packconverter/api/converters/BannerPatternPreviewMaxSizeConverter.java +++ b/converter/src/main/java/org/geysermc/packconverter/converters/BannerPatternPreviewMaxSizeConverter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2023 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 @@ -24,14 +24,13 @@ * */ -package org.geysermc.packconverter.api.converters; +package org.geysermc.packconverter.converters; import lombok.Getter; -import org.geysermc.packconverter.api.PackConverter; -import org.geysermc.packconverter.api.utils.ImageUtils; +import org.geysermc.packconverter.PackConverter; +import org.geysermc.packconverter.utils.ImageUtils; import javax.imageio.ImageIO; -import java.awt.*; import java.awt.image.BufferedImage; import java.io.File; import java.io.IOException; diff --git a/src/main/java/org/geysermc/packconverter/api/converters/BarConverter.java b/converter/src/main/java/org/geysermc/packconverter/converters/BarConverter.java similarity index 96% rename from src/main/java/org/geysermc/packconverter/api/converters/BarConverter.java rename to converter/src/main/java/org/geysermc/packconverter/converters/BarConverter.java index 4821c99..d380714 100644 --- a/src/main/java/org/geysermc/packconverter/api/converters/BarConverter.java +++ b/converter/src/main/java/org/geysermc/packconverter/converters/BarConverter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2023 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 @@ -24,14 +24,14 @@ * */ -package org.geysermc.packconverter.api.converters; +package org.geysermc.packconverter.converters; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import lombok.Getter; -import org.geysermc.packconverter.api.PackConverter; -import org.geysermc.packconverter.api.utils.ImageUtils; +import org.geysermc.packconverter.PackConverter; +import org.geysermc.packconverter.utils.ImageUtils; import javax.imageio.ImageIO; import java.awt.*; diff --git a/src/main/java/org/geysermc/packconverter/api/converters/BedConverter.java b/converter/src/main/java/org/geysermc/packconverter/converters/BedConverter.java similarity index 96% rename from src/main/java/org/geysermc/packconverter/api/converters/BedConverter.java rename to converter/src/main/java/org/geysermc/packconverter/converters/BedConverter.java index c505ca4..8e1f150 100644 --- a/src/main/java/org/geysermc/packconverter/api/converters/BedConverter.java +++ b/converter/src/main/java/org/geysermc/packconverter/converters/BedConverter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2023 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 @@ -24,11 +24,11 @@ * */ -package org.geysermc.packconverter.api.converters; +package org.geysermc.packconverter.converters; import lombok.Getter; -import org.geysermc.packconverter.api.PackConverter; -import org.geysermc.packconverter.api.utils.ImageUtils; +import org.geysermc.packconverter.PackConverter; +import org.geysermc.packconverter.utils.ImageUtils; import javax.imageio.ImageIO; import java.awt.*; diff --git a/src/main/java/org/geysermc/packconverter/api/converters/BeeConverter.java b/converter/src/main/java/org/geysermc/packconverter/converters/BeeConverter.java similarity index 93% rename from src/main/java/org/geysermc/packconverter/api/converters/BeeConverter.java rename to converter/src/main/java/org/geysermc/packconverter/converters/BeeConverter.java index 37b2c9d..e1b2850 100644 --- a/src/main/java/org/geysermc/packconverter/api/converters/BeeConverter.java +++ b/converter/src/main/java/org/geysermc/packconverter/converters/BeeConverter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2023 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 @@ -24,11 +24,11 @@ * */ -package org.geysermc.packconverter.api.converters; +package org.geysermc.packconverter.converters; import lombok.Getter; -import org.geysermc.packconverter.api.PackConverter; -import org.geysermc.packconverter.api.utils.ImageUtils; +import org.geysermc.packconverter.PackConverter; +import org.geysermc.packconverter.utils.ImageUtils; import javax.imageio.ImageIO; import java.awt.*; diff --git a/src/main/java/org/geysermc/packconverter/api/converters/ChestFrontConverter.java b/converter/src/main/java/org/geysermc/packconverter/converters/ChestFrontConverter.java similarity index 93% rename from src/main/java/org/geysermc/packconverter/api/converters/ChestFrontConverter.java rename to converter/src/main/java/org/geysermc/packconverter/converters/ChestFrontConverter.java index c9d4808..def71cc 100644 --- a/src/main/java/org/geysermc/packconverter/api/converters/ChestFrontConverter.java +++ b/converter/src/main/java/org/geysermc/packconverter/converters/ChestFrontConverter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2023 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 @@ -24,11 +24,11 @@ * */ -package org.geysermc.packconverter.api.converters; +package org.geysermc.packconverter.converters; import lombok.Getter; -import org.geysermc.packconverter.api.PackConverter; -import org.geysermc.packconverter.api.utils.ImageUtils; +import org.geysermc.packconverter.PackConverter; +import org.geysermc.packconverter.utils.ImageUtils; import javax.imageio.ImageIO; import java.awt.*; diff --git a/src/main/java/org/geysermc/packconverter/api/converters/ChestLeftRightDoubleConverter.java b/converter/src/main/java/org/geysermc/packconverter/converters/ChestLeftRightDoubleConverter.java similarity index 97% rename from src/main/java/org/geysermc/packconverter/api/converters/ChestLeftRightDoubleConverter.java rename to converter/src/main/java/org/geysermc/packconverter/converters/ChestLeftRightDoubleConverter.java index cca541d..d170c9a 100644 --- a/src/main/java/org/geysermc/packconverter/api/converters/ChestLeftRightDoubleConverter.java +++ b/converter/src/main/java/org/geysermc/packconverter/converters/ChestLeftRightDoubleConverter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2023 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 @@ -24,11 +24,11 @@ * */ -package org.geysermc.packconverter.api.converters; +package org.geysermc.packconverter.converters; import lombok.Getter; -import org.geysermc.packconverter.api.PackConverter; -import org.geysermc.packconverter.api.utils.ImageUtils; +import org.geysermc.packconverter.PackConverter; +import org.geysermc.packconverter.utils.ImageUtils; import javax.imageio.ImageIO; import java.awt.*; diff --git a/src/main/java/org/geysermc/packconverter/api/converters/ChestNormalConverter.java b/converter/src/main/java/org/geysermc/packconverter/converters/ChestNormalConverter.java similarity index 95% rename from src/main/java/org/geysermc/packconverter/api/converters/ChestNormalConverter.java rename to converter/src/main/java/org/geysermc/packconverter/converters/ChestNormalConverter.java index aee959d..f4a15a0 100644 --- a/src/main/java/org/geysermc/packconverter/api/converters/ChestNormalConverter.java +++ b/converter/src/main/java/org/geysermc/packconverter/converters/ChestNormalConverter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2023 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 @@ -24,11 +24,11 @@ * */ -package org.geysermc.packconverter.api.converters; +package org.geysermc.packconverter.converters; import lombok.Getter; -import org.geysermc.packconverter.api.PackConverter; -import org.geysermc.packconverter.api.utils.ImageUtils; +import org.geysermc.packconverter.PackConverter; +import org.geysermc.packconverter.utils.ImageUtils; import javax.imageio.ImageIO; import java.awt.*; diff --git a/src/main/java/org/geysermc/packconverter/api/converters/ChestSideConverter.java b/converter/src/main/java/org/geysermc/packconverter/converters/ChestSideConverter.java similarity index 93% rename from src/main/java/org/geysermc/packconverter/api/converters/ChestSideConverter.java rename to converter/src/main/java/org/geysermc/packconverter/converters/ChestSideConverter.java index c2cfe03..891b268 100644 --- a/src/main/java/org/geysermc/packconverter/api/converters/ChestSideConverter.java +++ b/converter/src/main/java/org/geysermc/packconverter/converters/ChestSideConverter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2023 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 @@ -24,11 +24,11 @@ * */ -package org.geysermc.packconverter.api.converters; +package org.geysermc.packconverter.converters; import lombok.Getter; -import org.geysermc.packconverter.api.PackConverter; -import org.geysermc.packconverter.api.utils.ImageUtils; +import org.geysermc.packconverter.PackConverter; +import org.geysermc.packconverter.utils.ImageUtils; import javax.imageio.ImageIO; import java.awt.*; diff --git a/src/main/java/org/geysermc/packconverter/api/converters/ColorizeOverlayConverter.java b/converter/src/main/java/org/geysermc/packconverter/converters/ColorizeOverlayConverter.java similarity index 99% rename from src/main/java/org/geysermc/packconverter/api/converters/ColorizeOverlayConverter.java rename to converter/src/main/java/org/geysermc/packconverter/converters/ColorizeOverlayConverter.java index e45e66f..4045599 100644 --- a/src/main/java/org/geysermc/packconverter/api/converters/ColorizeOverlayConverter.java +++ b/converter/src/main/java/org/geysermc/packconverter/converters/ColorizeOverlayConverter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2023 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 @@ -24,11 +24,11 @@ * */ -package org.geysermc.packconverter.api.converters; +package org.geysermc.packconverter.converters; import lombok.Getter; -import org.geysermc.packconverter.api.PackConverter; -import org.geysermc.packconverter.api.utils.ImageUtils; +import org.geysermc.packconverter.PackConverter; +import org.geysermc.packconverter.utils.ImageUtils; import javax.imageio.ImageIO; import java.awt.*; diff --git a/src/main/java/org/geysermc/packconverter/api/converters/CopyConverter.java b/converter/src/main/java/org/geysermc/packconverter/converters/CopyConverter.java similarity index 97% rename from src/main/java/org/geysermc/packconverter/api/converters/CopyConverter.java rename to converter/src/main/java/org/geysermc/packconverter/converters/CopyConverter.java index 93ac676..50be953 100644 --- a/src/main/java/org/geysermc/packconverter/api/converters/CopyConverter.java +++ b/converter/src/main/java/org/geysermc/packconverter/converters/CopyConverter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2023 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 @@ -24,10 +24,10 @@ * */ -package org.geysermc.packconverter.api.converters; +package org.geysermc.packconverter.converters; import lombok.Getter; -import org.geysermc.packconverter.api.PackConverter; +import org.geysermc.packconverter.PackConverter; import java.io.IOException; import java.nio.file.Files; diff --git a/src/main/java/org/geysermc/packconverter/api/converters/CustomModelDataConverter.java b/converter/src/main/java/org/geysermc/packconverter/converters/CustomModelDataConverter.java similarity index 95% rename from src/main/java/org/geysermc/packconverter/api/converters/CustomModelDataConverter.java rename to converter/src/main/java/org/geysermc/packconverter/converters/CustomModelDataConverter.java index 538d51d..9d8ea89 100644 --- a/src/main/java/org/geysermc/packconverter/api/converters/CustomModelDataConverter.java +++ b/converter/src/main/java/org/geysermc/packconverter/converters/CustomModelDataConverter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2023 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 @@ -24,18 +24,17 @@ * */ -package org.geysermc.packconverter.api.converters; +package org.geysermc.packconverter.converters; import com.fasterxml.jackson.core.util.DefaultPrettyPrinter; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; import lombok.Getter; -import org.geysermc.packconverter.api.PackConverter; -import org.geysermc.packconverter.api.utils.CustomModelDataHandler; +import org.geysermc.packconverter.PackConverter; +import org.geysermc.packconverter.utils.CustomModelDataHandler; import java.io.*; import java.nio.file.Files; diff --git a/src/main/java/org/geysermc/packconverter/api/converters/DeleteConverter.java b/converter/src/main/java/org/geysermc/packconverter/converters/DeleteConverter.java similarity index 93% rename from src/main/java/org/geysermc/packconverter/api/converters/DeleteConverter.java rename to converter/src/main/java/org/geysermc/packconverter/converters/DeleteConverter.java index 7879966..4772968 100644 --- a/src/main/java/org/geysermc/packconverter/api/converters/DeleteConverter.java +++ b/converter/src/main/java/org/geysermc/packconverter/converters/DeleteConverter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2023 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 @@ -24,13 +24,11 @@ * */ -package org.geysermc.packconverter.api.converters; +package org.geysermc.packconverter.converters; import lombok.Getter; -import org.geysermc.packconverter.api.PackConverter; +import org.geysermc.packconverter.PackConverter; -import javax.imageio.ImageIO; -import java.awt.image.BufferedImage; import java.io.File; import java.io.IOException; import java.nio.file.Files; diff --git a/src/main/java/org/geysermc/packconverter/api/converters/DespriteConverter.java b/converter/src/main/java/org/geysermc/packconverter/converters/DespriteConverter.java similarity index 96% rename from src/main/java/org/geysermc/packconverter/api/converters/DespriteConverter.java rename to converter/src/main/java/org/geysermc/packconverter/converters/DespriteConverter.java index 1aa3d0b..9376bbf 100644 --- a/src/main/java/org/geysermc/packconverter/api/converters/DespriteConverter.java +++ b/converter/src/main/java/org/geysermc/packconverter/converters/DespriteConverter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2023 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 @@ -24,11 +24,11 @@ * */ -package org.geysermc.packconverter.api.converters; +package org.geysermc.packconverter.converters; import lombok.Getter; -import org.geysermc.packconverter.api.PackConverter; -import org.geysermc.packconverter.api.utils.ImageUtils; +import org.geysermc.packconverter.PackConverter; +import org.geysermc.packconverter.utils.ImageUtils; import javax.imageio.ImageIO; import java.awt.*; diff --git a/src/main/java/org/geysermc/packconverter/api/converters/DespriteExperimentalConverter.java b/converter/src/main/java/org/geysermc/packconverter/converters/DespriteExperimentalConverter.java similarity index 98% rename from src/main/java/org/geysermc/packconverter/api/converters/DespriteExperimentalConverter.java rename to converter/src/main/java/org/geysermc/packconverter/converters/DespriteExperimentalConverter.java index f034ea5..eb7fecc 100644 --- a/src/main/java/org/geysermc/packconverter/api/converters/DespriteExperimentalConverter.java +++ b/converter/src/main/java/org/geysermc/packconverter/converters/DespriteExperimentalConverter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2023 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 @@ -24,11 +24,11 @@ * */ -package org.geysermc.packconverter.api.converters; +package org.geysermc.packconverter.converters; import lombok.Getter; -import org.geysermc.packconverter.api.PackConverter; -import org.geysermc.packconverter.api.utils.ImageUtils; +import org.geysermc.packconverter.PackConverter; +import org.geysermc.packconverter.utils.ImageUtils; import javax.imageio.ImageIO; import java.awt.*; diff --git a/src/main/java/org/geysermc/packconverter/api/converters/DestroyStageConverter.java b/converter/src/main/java/org/geysermc/packconverter/converters/DestroyStageConverter.java similarity index 94% rename from src/main/java/org/geysermc/packconverter/api/converters/DestroyStageConverter.java rename to converter/src/main/java/org/geysermc/packconverter/converters/DestroyStageConverter.java index ad40d65..df689ae 100644 --- a/src/main/java/org/geysermc/packconverter/api/converters/DestroyStageConverter.java +++ b/converter/src/main/java/org/geysermc/packconverter/converters/DestroyStageConverter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2023 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 @@ -24,11 +24,11 @@ * */ -package org.geysermc.packconverter.api.converters; +package org.geysermc.packconverter.converters; import lombok.Getter; -import org.geysermc.packconverter.api.PackConverter; -import org.geysermc.packconverter.api.utils.ImageUtils; +import org.geysermc.packconverter.PackConverter; +import org.geysermc.packconverter.utils.ImageUtils; import javax.imageio.ImageIO; import java.awt.*; diff --git a/src/main/java/org/geysermc/packconverter/api/converters/DialogConverter.java b/converter/src/main/java/org/geysermc/packconverter/converters/DialogConverter.java similarity index 96% rename from src/main/java/org/geysermc/packconverter/api/converters/DialogConverter.java rename to converter/src/main/java/org/geysermc/packconverter/converters/DialogConverter.java index 0f565fd..fc666f2 100644 --- a/src/main/java/org/geysermc/packconverter/api/converters/DialogConverter.java +++ b/converter/src/main/java/org/geysermc/packconverter/converters/DialogConverter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2023 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 @@ -24,14 +24,14 @@ * */ -package org.geysermc.packconverter.api.converters; +package org.geysermc.packconverter.converters; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import lombok.Getter; -import org.geysermc.packconverter.api.PackConverter; -import org.geysermc.packconverter.api.utils.ImageUtils; +import org.geysermc.packconverter.PackConverter; +import org.geysermc.packconverter.utils.ImageUtils; import javax.imageio.ImageIO; import java.awt.*; diff --git a/src/main/java/org/geysermc/packconverter/api/converters/DolphinConverter.java b/converter/src/main/java/org/geysermc/packconverter/converters/DolphinConverter.java similarity index 96% rename from src/main/java/org/geysermc/packconverter/api/converters/DolphinConverter.java rename to converter/src/main/java/org/geysermc/packconverter/converters/DolphinConverter.java index f31cb52..56010ea 100644 --- a/src/main/java/org/geysermc/packconverter/api/converters/DolphinConverter.java +++ b/converter/src/main/java/org/geysermc/packconverter/converters/DolphinConverter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2023 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 @@ -24,11 +24,11 @@ * */ -package org.geysermc.packconverter.api.converters; +package org.geysermc.packconverter.converters; import lombok.Getter; -import org.geysermc.packconverter.api.PackConverter; -import org.geysermc.packconverter.api.utils.ImageUtils; +import org.geysermc.packconverter.PackConverter; +import org.geysermc.packconverter.utils.ImageUtils; import javax.imageio.ImageIO; import java.awt.*; diff --git a/src/main/java/org/geysermc/packconverter/api/converters/DrownedConverter.java b/converter/src/main/java/org/geysermc/packconverter/converters/DrownedConverter.java similarity index 94% rename from src/main/java/org/geysermc/packconverter/api/converters/DrownedConverter.java rename to converter/src/main/java/org/geysermc/packconverter/converters/DrownedConverter.java index c347cbd..db166ab 100644 --- a/src/main/java/org/geysermc/packconverter/api/converters/DrownedConverter.java +++ b/converter/src/main/java/org/geysermc/packconverter/converters/DrownedConverter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2023 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 @@ -24,11 +24,11 @@ * */ -package org.geysermc.packconverter.api.converters; +package org.geysermc.packconverter.converters; import lombok.Getter; -import org.geysermc.packconverter.api.PackConverter; -import org.geysermc.packconverter.api.utils.ImageUtils; +import org.geysermc.packconverter.PackConverter; +import org.geysermc.packconverter.utils.ImageUtils; import javax.imageio.ImageIO; import java.awt.*; diff --git a/src/main/java/org/geysermc/packconverter/api/converters/EnchantedItemGlintConverter.java b/converter/src/main/java/org/geysermc/packconverter/converters/EnchantedItemGlintConverter.java similarity index 91% rename from src/main/java/org/geysermc/packconverter/api/converters/EnchantedItemGlintConverter.java rename to converter/src/main/java/org/geysermc/packconverter/converters/EnchantedItemGlintConverter.java index 782d3e5..948fc07 100644 --- a/src/main/java/org/geysermc/packconverter/api/converters/EnchantedItemGlintConverter.java +++ b/converter/src/main/java/org/geysermc/packconverter/converters/EnchantedItemGlintConverter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2023 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 @@ -24,11 +24,11 @@ * */ -package org.geysermc.packconverter.api.converters; +package org.geysermc.packconverter.converters; import lombok.Getter; -import org.geysermc.packconverter.api.PackConverter; -import org.geysermc.packconverter.api.utils.ImageUtils; +import org.geysermc.packconverter.PackConverter; +import org.geysermc.packconverter.utils.ImageUtils; import javax.imageio.ImageIO; import java.awt.image.BufferedImage; diff --git a/src/main/java/org/geysermc/packconverter/api/converters/FireworksConverter.java b/converter/src/main/java/org/geysermc/packconverter/converters/FireworksConverter.java similarity index 92% rename from src/main/java/org/geysermc/packconverter/api/converters/FireworksConverter.java rename to converter/src/main/java/org/geysermc/packconverter/converters/FireworksConverter.java index e9ae34b..245fa96 100644 --- a/src/main/java/org/geysermc/packconverter/api/converters/FireworksConverter.java +++ b/converter/src/main/java/org/geysermc/packconverter/converters/FireworksConverter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2023 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 @@ -24,11 +24,11 @@ * */ -package org.geysermc.packconverter.api.converters; +package org.geysermc.packconverter.converters; import lombok.Getter; -import org.geysermc.packconverter.api.PackConverter; -import org.geysermc.packconverter.api.utils.ImageUtils; +import org.geysermc.packconverter.PackConverter; +import org.geysermc.packconverter.utils.ImageUtils; import javax.imageio.ImageIO; import java.awt.*; diff --git a/src/main/java/org/geysermc/packconverter/api/converters/FishHookConverter.java b/converter/src/main/java/org/geysermc/packconverter/converters/FishHookConverter.java similarity index 96% rename from src/main/java/org/geysermc/packconverter/api/converters/FishHookConverter.java rename to converter/src/main/java/org/geysermc/packconverter/converters/FishHookConverter.java index 22586e3..9fe0286 100644 --- a/src/main/java/org/geysermc/packconverter/api/converters/FishHookConverter.java +++ b/converter/src/main/java/org/geysermc/packconverter/converters/FishHookConverter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2023 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 @@ -24,11 +24,11 @@ * */ -package org.geysermc.packconverter.api.converters; +package org.geysermc.packconverter.converters; import lombok.Getter; -import org.geysermc.packconverter.api.PackConverter; -import org.geysermc.packconverter.api.utils.ImageUtils; +import org.geysermc.packconverter.PackConverter; +import org.geysermc.packconverter.utils.ImageUtils; import javax.imageio.ImageIO; import java.awt.*; diff --git a/src/main/java/org/geysermc/packconverter/api/converters/FixWrongRootFolderConverter.java b/converter/src/main/java/org/geysermc/packconverter/converters/FixWrongRootFolderConverter.java similarity index 86% rename from src/main/java/org/geysermc/packconverter/api/converters/FixWrongRootFolderConverter.java rename to converter/src/main/java/org/geysermc/packconverter/converters/FixWrongRootFolderConverter.java index 253c736..4caafef 100644 --- a/src/main/java/org/geysermc/packconverter/api/converters/FixWrongRootFolderConverter.java +++ b/converter/src/main/java/org/geysermc/packconverter/converters/FixWrongRootFolderConverter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2023 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 @@ -24,22 +24,14 @@ * */ -package org.geysermc.packconverter.api.converters; +package org.geysermc.packconverter.converters; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.util.DefaultPrettyPrinter; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.ObjectWriter; import lombok.Getter; -import org.geysermc.packconverter.api.PackConverter; -import org.geysermc.packconverter.api.utils.ResourcePackManifest; +import org.geysermc.packconverter.PackConverter; -import java.io.FileNotFoundException; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; -import java.nio.file.Paths; import java.util.*; import java.util.stream.Collectors; diff --git a/src/main/java/org/geysermc/packconverter/api/converters/FoxConverter.java b/converter/src/main/java/org/geysermc/packconverter/converters/FoxConverter.java similarity index 95% rename from src/main/java/org/geysermc/packconverter/api/converters/FoxConverter.java rename to converter/src/main/java/org/geysermc/packconverter/converters/FoxConverter.java index e768407..951027f 100644 --- a/src/main/java/org/geysermc/packconverter/api/converters/FoxConverter.java +++ b/converter/src/main/java/org/geysermc/packconverter/converters/FoxConverter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2023 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 @@ -24,11 +24,11 @@ * */ -package org.geysermc.packconverter.api.converters; +package org.geysermc.packconverter.converters; import lombok.Getter; -import org.geysermc.packconverter.api.PackConverter; -import org.geysermc.packconverter.api.utils.ImageUtils; +import org.geysermc.packconverter.PackConverter; +import org.geysermc.packconverter.utils.ImageUtils; import javax.imageio.ImageIO; import java.awt.*; diff --git a/src/main/java/org/geysermc/packconverter/api/converters/HorseConverter.java b/converter/src/main/java/org/geysermc/packconverter/converters/HorseConverter.java similarity index 99% rename from src/main/java/org/geysermc/packconverter/api/converters/HorseConverter.java rename to converter/src/main/java/org/geysermc/packconverter/converters/HorseConverter.java index 2f676e6..d029d4b 100644 --- a/src/main/java/org/geysermc/packconverter/api/converters/HorseConverter.java +++ b/converter/src/main/java/org/geysermc/packconverter/converters/HorseConverter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2023 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 @@ -24,11 +24,11 @@ * */ -package org.geysermc.packconverter.api.converters; +package org.geysermc.packconverter.converters; import lombok.Getter; -import org.geysermc.packconverter.api.PackConverter; -import org.geysermc.packconverter.api.utils.ImageUtils; +import org.geysermc.packconverter.PackConverter; +import org.geysermc.packconverter.utils.ImageUtils; import javax.imageio.ImageIO; import java.awt.*; diff --git a/src/main/java/org/geysermc/packconverter/api/converters/IconsConverter.java b/converter/src/main/java/org/geysermc/packconverter/converters/IconsConverter.java similarity index 92% rename from src/main/java/org/geysermc/packconverter/api/converters/IconsConverter.java rename to converter/src/main/java/org/geysermc/packconverter/converters/IconsConverter.java index 17f564d..31fe6ac 100644 --- a/src/main/java/org/geysermc/packconverter/api/converters/IconsConverter.java +++ b/converter/src/main/java/org/geysermc/packconverter/converters/IconsConverter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2023 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 @@ -24,11 +24,11 @@ * */ -package org.geysermc.packconverter.api.converters; +package org.geysermc.packconverter.converters; import lombok.Getter; -import org.geysermc.packconverter.api.PackConverter; -import org.geysermc.packconverter.api.utils.ImageUtils; +import org.geysermc.packconverter.PackConverter; +import org.geysermc.packconverter.utils.ImageUtils; import javax.imageio.ImageIO; import java.awt.*; diff --git a/src/main/java/org/geysermc/packconverter/api/converters/MapIconsConverter.java b/converter/src/main/java/org/geysermc/packconverter/converters/MapIconsConverter.java similarity index 96% rename from src/main/java/org/geysermc/packconverter/api/converters/MapIconsConverter.java rename to converter/src/main/java/org/geysermc/packconverter/converters/MapIconsConverter.java index 9296665..8a163dc 100644 --- a/src/main/java/org/geysermc/packconverter/api/converters/MapIconsConverter.java +++ b/converter/src/main/java/org/geysermc/packconverter/converters/MapIconsConverter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2023 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 @@ -24,11 +24,11 @@ * */ -package org.geysermc.packconverter.api.converters; +package org.geysermc.packconverter.converters; import lombok.Getter; -import org.geysermc.packconverter.api.PackConverter; -import org.geysermc.packconverter.api.utils.ImageUtils; +import org.geysermc.packconverter.PackConverter; +import org.geysermc.packconverter.utils.ImageUtils; import javax.imageio.ImageIO; import java.awt.*; diff --git a/src/main/java/org/geysermc/packconverter/api/converters/MetadataConverter.java b/converter/src/main/java/org/geysermc/packconverter/converters/MetadataConverter.java similarity index 95% rename from src/main/java/org/geysermc/packconverter/api/converters/MetadataConverter.java rename to converter/src/main/java/org/geysermc/packconverter/converters/MetadataConverter.java index 55c1c92..cd7d138 100644 --- a/src/main/java/org/geysermc/packconverter/api/converters/MetadataConverter.java +++ b/converter/src/main/java/org/geysermc/packconverter/converters/MetadataConverter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2023 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 @@ -24,7 +24,7 @@ * */ -package org.geysermc.packconverter.api.converters; +package org.geysermc.packconverter.converters; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.util.DefaultPrettyPrinter; @@ -36,8 +36,8 @@ import lombok.Getter; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer; import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer; -import org.geysermc.packconverter.api.PackConverter; -import org.geysermc.packconverter.api.utils.ResourcePackManifest; +import org.geysermc.packconverter.PackConverter; +import org.geysermc.packconverter.utils.ResourcePackManifest; import java.io.FileNotFoundException; import java.io.IOException; diff --git a/src/main/java/org/geysermc/packconverter/api/converters/NineSliceConverter.java b/converter/src/main/java/org/geysermc/packconverter/converters/NineSliceConverter.java similarity index 98% rename from src/main/java/org/geysermc/packconverter/api/converters/NineSliceConverter.java rename to converter/src/main/java/org/geysermc/packconverter/converters/NineSliceConverter.java index 1d61684..098cbbc 100644 --- a/src/main/java/org/geysermc/packconverter/api/converters/NineSliceConverter.java +++ b/converter/src/main/java/org/geysermc/packconverter/converters/NineSliceConverter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2023 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 @@ -24,17 +24,16 @@ * */ -package org.geysermc.packconverter.api.converters; +package org.geysermc.packconverter.converters; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import lombok.Getter; -import org.geysermc.packconverter.api.PackConverter; -import org.geysermc.packconverter.api.utils.ImageUtils; +import org.geysermc.packconverter.PackConverter; +import org.geysermc.packconverter.utils.ImageUtils; import javax.imageio.ImageIO; -import java.awt.*; import java.awt.image.BufferedImage; import java.io.File; import java.io.IOException; diff --git a/src/main/java/org/geysermc/packconverter/api/converters/OpaqueConverter.java b/converter/src/main/java/org/geysermc/packconverter/converters/OpaqueConverter.java similarity index 94% rename from src/main/java/org/geysermc/packconverter/api/converters/OpaqueConverter.java rename to converter/src/main/java/org/geysermc/packconverter/converters/OpaqueConverter.java index faae6e0..45a27ea 100644 --- a/src/main/java/org/geysermc/packconverter/api/converters/OpaqueConverter.java +++ b/converter/src/main/java/org/geysermc/packconverter/converters/OpaqueConverter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2023 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 @@ -24,11 +24,11 @@ * */ -package org.geysermc.packconverter.api.converters; +package org.geysermc.packconverter.converters; import lombok.Getter; -import org.geysermc.packconverter.api.PackConverter; -import org.geysermc.packconverter.api.utils.ImageUtils; +import org.geysermc.packconverter.PackConverter; +import org.geysermc.packconverter.utils.ImageUtils; import javax.imageio.ImageIO; import java.awt.*; diff --git a/src/main/java/org/geysermc/packconverter/api/converters/OverlayToTranslateConverter.java b/converter/src/main/java/org/geysermc/packconverter/converters/OverlayToTranslateConverter.java similarity index 97% rename from src/main/java/org/geysermc/packconverter/api/converters/OverlayToTranslateConverter.java rename to converter/src/main/java/org/geysermc/packconverter/converters/OverlayToTranslateConverter.java index 87d9157..0ee871e 100644 --- a/src/main/java/org/geysermc/packconverter/api/converters/OverlayToTranslateConverter.java +++ b/converter/src/main/java/org/geysermc/packconverter/converters/OverlayToTranslateConverter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2023 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 @@ -24,11 +24,11 @@ * */ -package org.geysermc.packconverter.api.converters; +package org.geysermc.packconverter.converters; import lombok.Getter; -import org.geysermc.packconverter.api.PackConverter; -import org.geysermc.packconverter.api.utils.ImageUtils; +import org.geysermc.packconverter.PackConverter; +import org.geysermc.packconverter.utils.ImageUtils; import javax.imageio.ImageIO; import java.awt.*; diff --git a/src/main/java/org/geysermc/packconverter/api/converters/Particles1_13Converter.java b/converter/src/main/java/org/geysermc/packconverter/converters/Particles1_13Converter.java similarity index 92% rename from src/main/java/org/geysermc/packconverter/api/converters/Particles1_13Converter.java rename to converter/src/main/java/org/geysermc/packconverter/converters/Particles1_13Converter.java index 46c7606..f7a575e 100644 --- a/src/main/java/org/geysermc/packconverter/api/converters/Particles1_13Converter.java +++ b/converter/src/main/java/org/geysermc/packconverter/converters/Particles1_13Converter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2023 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 @@ -24,11 +24,11 @@ * */ -package org.geysermc.packconverter.api.converters; +package org.geysermc.packconverter.converters; import lombok.Getter; -import org.geysermc.packconverter.api.PackConverter; -import org.geysermc.packconverter.api.utils.ImageUtils; +import org.geysermc.packconverter.PackConverter; +import org.geysermc.packconverter.utils.ImageUtils; import javax.imageio.ImageIO; import java.awt.image.BufferedImage; diff --git a/src/main/java/org/geysermc/packconverter/api/converters/PistonArmConverter.java b/converter/src/main/java/org/geysermc/packconverter/converters/PistonArmConverter.java similarity index 97% rename from src/main/java/org/geysermc/packconverter/api/converters/PistonArmConverter.java rename to converter/src/main/java/org/geysermc/packconverter/converters/PistonArmConverter.java index dbd5c56..5d7f8f3 100644 --- a/src/main/java/org/geysermc/packconverter/api/converters/PistonArmConverter.java +++ b/converter/src/main/java/org/geysermc/packconverter/converters/PistonArmConverter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2023 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 @@ -24,11 +24,11 @@ * */ -package org.geysermc.packconverter.api.converters; +package org.geysermc.packconverter.converters; import lombok.Getter; -import org.geysermc.packconverter.api.PackConverter; -import org.geysermc.packconverter.api.utils.ImageUtils; +import org.geysermc.packconverter.PackConverter; +import org.geysermc.packconverter.utils.ImageUtils; import javax.imageio.ImageIO; import java.awt.*; diff --git a/src/main/java/org/geysermc/packconverter/api/converters/PlaceholderConverter.java b/converter/src/main/java/org/geysermc/packconverter/converters/PlaceholderConverter.java similarity index 98% rename from src/main/java/org/geysermc/packconverter/api/converters/PlaceholderConverter.java rename to converter/src/main/java/org/geysermc/packconverter/converters/PlaceholderConverter.java index 5a17060..3f2e346 100644 --- a/src/main/java/org/geysermc/packconverter/api/converters/PlaceholderConverter.java +++ b/converter/src/main/java/org/geysermc/packconverter/converters/PlaceholderConverter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2023 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 @@ -24,14 +24,13 @@ * */ -package org.geysermc.packconverter.api.converters; +package org.geysermc.packconverter.converters; import lombok.Getter; -import org.geysermc.packconverter.api.PackConverter; -import org.geysermc.packconverter.api.utils.ImageUtils; +import org.geysermc.packconverter.PackConverter; +import org.geysermc.packconverter.utils.ImageUtils; import javax.imageio.ImageIO; -import java.awt.*; import java.awt.image.BufferedImage; import java.io.File; import java.io.IOException; diff --git a/src/main/java/org/geysermc/packconverter/api/converters/PngToTgaConverter.java b/converter/src/main/java/org/geysermc/packconverter/converters/PngToTgaConverter.java similarity index 98% rename from src/main/java/org/geysermc/packconverter/api/converters/PngToTgaConverter.java rename to converter/src/main/java/org/geysermc/packconverter/converters/PngToTgaConverter.java index 1e77c6d..06825c9 100644 --- a/src/main/java/org/geysermc/packconverter/api/converters/PngToTgaConverter.java +++ b/converter/src/main/java/org/geysermc/packconverter/converters/PngToTgaConverter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2023 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 @@ -24,17 +24,16 @@ * */ -package org.geysermc.packconverter.api.converters; +package org.geysermc.packconverter.converters; import lombok.Getter; -import org.geysermc.packconverter.api.PackConverter; -import org.geysermc.packconverter.api.utils.ImageUtils; +import org.geysermc.packconverter.PackConverter; +import org.geysermc.packconverter.utils.ImageUtils; import javax.imageio.ImageIO; import java.awt.image.BufferedImage; import java.io.File; import java.io.IOException; -import java.nio.file.Files; import java.nio.file.Path; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/org/geysermc/packconverter/api/converters/RedstoneDustConverter.java b/converter/src/main/java/org/geysermc/packconverter/converters/RedstoneDustConverter.java similarity index 94% rename from src/main/java/org/geysermc/packconverter/api/converters/RedstoneDustConverter.java rename to converter/src/main/java/org/geysermc/packconverter/converters/RedstoneDustConverter.java index 7a8ba0b..ab6cfca 100644 --- a/src/main/java/org/geysermc/packconverter/api/converters/RedstoneDustConverter.java +++ b/converter/src/main/java/org/geysermc/packconverter/converters/RedstoneDustConverter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2023 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 @@ -24,14 +24,13 @@ * */ -package org.geysermc.packconverter.api.converters; +package org.geysermc.packconverter.converters; import lombok.Getter; -import org.geysermc.packconverter.api.PackConverter; -import org.geysermc.packconverter.api.utils.ImageUtils; +import org.geysermc.packconverter.PackConverter; +import org.geysermc.packconverter.utils.ImageUtils; import javax.imageio.ImageIO; -import java.awt.*; import java.awt.image.BufferedImage; import java.io.File; import java.io.IOException; diff --git a/src/main/java/org/geysermc/packconverter/api/converters/RenameConverter.java b/converter/src/main/java/org/geysermc/packconverter/converters/RenameConverter.java similarity index 99% rename from src/main/java/org/geysermc/packconverter/api/converters/RenameConverter.java rename to converter/src/main/java/org/geysermc/packconverter/converters/RenameConverter.java index 5ed767e..84c4e3f 100644 --- a/src/main/java/org/geysermc/packconverter/api/converters/RenameConverter.java +++ b/converter/src/main/java/org/geysermc/packconverter/converters/RenameConverter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2023 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 @@ -24,12 +24,11 @@ * */ -package org.geysermc.packconverter.api.converters; +package org.geysermc.packconverter.converters; import lombok.Getter; -import org.geysermc.packconverter.api.PackConverter; +import org.geysermc.packconverter.PackConverter; -import java.io.File; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; diff --git a/src/main/java/org/geysermc/packconverter/api/converters/SheepConverter.java b/converter/src/main/java/org/geysermc/packconverter/converters/SheepConverter.java similarity index 94% rename from src/main/java/org/geysermc/packconverter/api/converters/SheepConverter.java rename to converter/src/main/java/org/geysermc/packconverter/converters/SheepConverter.java index a82b0da..b71b7da 100644 --- a/src/main/java/org/geysermc/packconverter/api/converters/SheepConverter.java +++ b/converter/src/main/java/org/geysermc/packconverter/converters/SheepConverter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2023 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 @@ -24,11 +24,11 @@ * */ -package org.geysermc.packconverter.api.converters; +package org.geysermc.packconverter.converters; import lombok.Getter; -import org.geysermc.packconverter.api.PackConverter; -import org.geysermc.packconverter.api.utils.ImageUtils; +import org.geysermc.packconverter.PackConverter; +import org.geysermc.packconverter.utils.ImageUtils; import javax.imageio.ImageIO; import java.awt.*; diff --git a/src/main/java/org/geysermc/packconverter/api/converters/SideRotateConverter.java b/converter/src/main/java/org/geysermc/packconverter/converters/SideRotateConverter.java similarity index 92% rename from src/main/java/org/geysermc/packconverter/api/converters/SideRotateConverter.java rename to converter/src/main/java/org/geysermc/packconverter/converters/SideRotateConverter.java index 2a25521..40f971b 100644 --- a/src/main/java/org/geysermc/packconverter/api/converters/SideRotateConverter.java +++ b/converter/src/main/java/org/geysermc/packconverter/converters/SideRotateConverter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2023 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 @@ -24,14 +24,13 @@ * */ -package org.geysermc.packconverter.api.converters; +package org.geysermc.packconverter.converters; import lombok.Getter; -import org.geysermc.packconverter.api.PackConverter; -import org.geysermc.packconverter.api.utils.ImageUtils; +import org.geysermc.packconverter.PackConverter; +import org.geysermc.packconverter.utils.ImageUtils; import javax.imageio.ImageIO; -import java.awt.*; import java.awt.image.BufferedImage; import java.io.File; import java.io.IOException; diff --git a/src/main/java/org/geysermc/packconverter/api/converters/SpriteConverter.java b/converter/src/main/java/org/geysermc/packconverter/converters/SpriteConverter.java similarity index 98% rename from src/main/java/org/geysermc/packconverter/api/converters/SpriteConverter.java rename to converter/src/main/java/org/geysermc/packconverter/converters/SpriteConverter.java index 4eea633..c7a8406 100644 --- a/src/main/java/org/geysermc/packconverter/api/converters/SpriteConverter.java +++ b/converter/src/main/java/org/geysermc/packconverter/converters/SpriteConverter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2023 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 @@ -24,11 +24,11 @@ * */ -package org.geysermc.packconverter.api.converters; +package org.geysermc.packconverter.converters; import lombok.Getter; -import org.geysermc.packconverter.api.PackConverter; -import org.geysermc.packconverter.api.utils.ImageUtils; +import org.geysermc.packconverter.PackConverter; +import org.geysermc.packconverter.utils.ImageUtils; import javax.imageio.ImageIO; import java.awt.*; diff --git a/src/main/java/org/geysermc/packconverter/api/converters/TitleConverter.java b/converter/src/main/java/org/geysermc/packconverter/converters/TitleConverter.java similarity index 93% rename from src/main/java/org/geysermc/packconverter/api/converters/TitleConverter.java rename to converter/src/main/java/org/geysermc/packconverter/converters/TitleConverter.java index 62af45d..ffa388b 100644 --- a/src/main/java/org/geysermc/packconverter/api/converters/TitleConverter.java +++ b/converter/src/main/java/org/geysermc/packconverter/converters/TitleConverter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2023 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 @@ -24,11 +24,11 @@ * */ -package org.geysermc.packconverter.api.converters; +package org.geysermc.packconverter.converters; import lombok.Getter; -import org.geysermc.packconverter.api.PackConverter; -import org.geysermc.packconverter.api.utils.ImageUtils; +import org.geysermc.packconverter.PackConverter; +import org.geysermc.packconverter.utils.ImageUtils; import javax.imageio.ImageIO; import java.awt.*; diff --git a/src/main/java/org/geysermc/packconverter/api/converters/TurtleConverter.java b/converter/src/main/java/org/geysermc/packconverter/converters/TurtleConverter.java similarity index 92% rename from src/main/java/org/geysermc/packconverter/api/converters/TurtleConverter.java rename to converter/src/main/java/org/geysermc/packconverter/converters/TurtleConverter.java index a3db115..a38fc4d 100644 --- a/src/main/java/org/geysermc/packconverter/api/converters/TurtleConverter.java +++ b/converter/src/main/java/org/geysermc/packconverter/converters/TurtleConverter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2023 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 @@ -24,11 +24,11 @@ * */ -package org.geysermc.packconverter.api.converters; +package org.geysermc.packconverter.converters; import lombok.Getter; -import org.geysermc.packconverter.api.PackConverter; -import org.geysermc.packconverter.api.utils.ImageUtils; +import org.geysermc.packconverter.PackConverter; +import org.geysermc.packconverter.utils.ImageUtils; import javax.imageio.ImageIO; import java.awt.*; diff --git a/src/main/java/org/geysermc/packconverter/api/converters/VillagerConverter.java b/converter/src/main/java/org/geysermc/packconverter/converters/VillagerConverter.java similarity index 96% rename from src/main/java/org/geysermc/packconverter/api/converters/VillagerConverter.java rename to converter/src/main/java/org/geysermc/packconverter/converters/VillagerConverter.java index 80ad63e..e65a209 100644 --- a/src/main/java/org/geysermc/packconverter/api/converters/VillagerConverter.java +++ b/converter/src/main/java/org/geysermc/packconverter/converters/VillagerConverter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2023 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 @@ -24,11 +24,11 @@ * */ -package org.geysermc.packconverter.api.converters; +package org.geysermc.packconverter.converters; import lombok.Getter; -import org.geysermc.packconverter.api.PackConverter; -import org.geysermc.packconverter.api.utils.ImageUtils; +import org.geysermc.packconverter.PackConverter; +import org.geysermc.packconverter.utils.ImageUtils; import javax.imageio.ImageIO; import java.awt.*; diff --git a/src/main/java/org/geysermc/packconverter/api/converters/WaterConverter.java b/converter/src/main/java/org/geysermc/packconverter/converters/WaterConverter.java similarity index 93% rename from src/main/java/org/geysermc/packconverter/api/converters/WaterConverter.java rename to converter/src/main/java/org/geysermc/packconverter/converters/WaterConverter.java index d1654cf..c0f08c0 100644 --- a/src/main/java/org/geysermc/packconverter/api/converters/WaterConverter.java +++ b/converter/src/main/java/org/geysermc/packconverter/converters/WaterConverter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2023 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 @@ -24,14 +24,13 @@ * */ -package org.geysermc.packconverter.api.converters; +package org.geysermc.packconverter.converters; import lombok.Getter; -import org.geysermc.packconverter.api.PackConverter; -import org.geysermc.packconverter.api.utils.ImageUtils; +import org.geysermc.packconverter.PackConverter; +import org.geysermc.packconverter.utils.ImageUtils; import javax.imageio.ImageIO; -import java.awt.*; import java.awt.image.BufferedImage; import java.io.File; import java.io.IOException; diff --git a/src/main/java/org/geysermc/packconverter/api/converters/WeatherConverter.java b/converter/src/main/java/org/geysermc/packconverter/converters/WeatherConverter.java similarity index 94% rename from src/main/java/org/geysermc/packconverter/api/converters/WeatherConverter.java rename to converter/src/main/java/org/geysermc/packconverter/converters/WeatherConverter.java index 53c3e74..8379535 100644 --- a/src/main/java/org/geysermc/packconverter/api/converters/WeatherConverter.java +++ b/converter/src/main/java/org/geysermc/packconverter/converters/WeatherConverter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2023 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 @@ -24,11 +24,11 @@ * */ -package org.geysermc.packconverter.api.converters; +package org.geysermc.packconverter.converters; import lombok.Getter; -import org.geysermc.packconverter.api.PackConverter; -import org.geysermc.packconverter.api.utils.ImageUtils; +import org.geysermc.packconverter.PackConverter; +import org.geysermc.packconverter.utils.ImageUtils; import javax.imageio.ImageIO; import java.awt.*; diff --git a/src/main/java/org/geysermc/packconverter/api/utils/CustomModelDataHandler.java b/converter/src/main/java/org/geysermc/packconverter/utils/CustomModelDataHandler.java similarity index 98% rename from src/main/java/org/geysermc/packconverter/api/utils/CustomModelDataHandler.java rename to converter/src/main/java/org/geysermc/packconverter/utils/CustomModelDataHandler.java index 3266d8d..304e176 100644 --- a/src/main/java/org/geysermc/packconverter/api/utils/CustomModelDataHandler.java +++ b/converter/src/main/java/org/geysermc/packconverter/utils/CustomModelDataHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2023 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 @@ -24,7 +24,7 @@ * */ -package org.geysermc.packconverter.api.utils; +package org.geysermc.packconverter.utils; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/src/main/java/org/geysermc/packconverter/api/utils/ImageUtils.java b/converter/src/main/java/org/geysermc/packconverter/utils/ImageUtils.java similarity index 99% rename from src/main/java/org/geysermc/packconverter/api/utils/ImageUtils.java rename to converter/src/main/java/org/geysermc/packconverter/utils/ImageUtils.java index 4b4bd63..87a90cb 100644 --- a/src/main/java/org/geysermc/packconverter/api/utils/ImageUtils.java +++ b/converter/src/main/java/org/geysermc/packconverter/utils/ImageUtils.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2023 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 @@ -24,10 +24,9 @@ * */ -package org.geysermc.packconverter.api.utils; +package org.geysermc.packconverter.utils; import javax.imageio.ImageIO; -import javax.swing.*; import java.awt.*; import java.awt.geom.AffineTransform; import java.awt.image.*; diff --git a/src/main/java/org/geysermc/packconverter/api/utils/OnLogListener.java b/converter/src/main/java/org/geysermc/packconverter/utils/OnLogListener.java similarity index 92% rename from src/main/java/org/geysermc/packconverter/api/utils/OnLogListener.java rename to converter/src/main/java/org/geysermc/packconverter/utils/OnLogListener.java index 933ebe8..8bb40d3 100644 --- a/src/main/java/org/geysermc/packconverter/api/utils/OnLogListener.java +++ b/converter/src/main/java/org/geysermc/packconverter/utils/OnLogListener.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2023 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 @@ -24,7 +24,7 @@ * */ -package org.geysermc.packconverter.api.utils; +package org.geysermc.packconverter.utils; public interface OnLogListener { void onLog(); diff --git a/src/main/java/org/geysermc/packconverter/api/utils/ResourcePackManifest.java b/converter/src/main/java/org/geysermc/packconverter/utils/ResourcePackManifest.java similarity index 97% rename from src/main/java/org/geysermc/packconverter/api/utils/ResourcePackManifest.java rename to converter/src/main/java/org/geysermc/packconverter/utils/ResourcePackManifest.java index 16ee91d..a8650f6 100644 --- a/src/main/java/org/geysermc/packconverter/api/utils/ResourcePackManifest.java +++ b/converter/src/main/java/org/geysermc/packconverter/utils/ResourcePackManifest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2023 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 @@ -24,7 +24,7 @@ * */ -package org.geysermc.packconverter.api.utils; +package org.geysermc.packconverter.utils; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/org/geysermc/packconverter/api/utils/ZipUtils.java b/converter/src/main/java/org/geysermc/packconverter/utils/ZipUtils.java similarity index 96% rename from src/main/java/org/geysermc/packconverter/api/utils/ZipUtils.java rename to converter/src/main/java/org/geysermc/packconverter/utils/ZipUtils.java index d337db0..6a5e309 100644 --- a/src/main/java/org/geysermc/packconverter/api/utils/ZipUtils.java +++ b/converter/src/main/java/org/geysermc/packconverter/utils/ZipUtils.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2023 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 @@ -24,9 +24,9 @@ * */ -package org.geysermc.packconverter.api.utils; +package org.geysermc.packconverter.utils; -import org.geysermc.packconverter.api.PackConverter; +import org.geysermc.packconverter.PackConverter; import java.io.File; import java.io.FileInputStream; diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..ae04661 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..a69d9cb --- /dev/null +++ b/gradlew @@ -0,0 +1,240 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" +APP_BASE_NAME=${0##*/} + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..f127cfd --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,91 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..74ead33 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,3 @@ +rootProject.name = "packconverter-parent" + +include("converter", "bootstrap") \ No newline at end of file