diff --git a/.github/workflows/renovate.yml b/.github/workflows/renovate.yml deleted file mode 100644 index cdc505c..0000000 --- a/.github/workflows/renovate.yml +++ /dev/null @@ -1,21 +0,0 @@ -name: Renovate - -on: - schedule: - - cron: '0 * * * *' - -concurrency: - group: ${{github.workflow}}-${{github.ref}} - cancel-in-progress: true - -jobs: - renovate: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Self-hosted Renovate - uses: renovatebot/github-action@v43.0.17 - env: - RENOVATE_TOKEN: ${{secrets.GITHUB_TOKEN}} \ No newline at end of file diff --git a/geyser/src/main/java/re/imc/geysermodelenginepackgenerator/GeyserModelEnginePackGenerator.java b/geyser/src/main/java/re/imc/geysermodelengineextension/GeyserModelEngineExtension.java similarity index 84% rename from geyser/src/main/java/re/imc/geysermodelenginepackgenerator/GeyserModelEnginePackGenerator.java rename to geyser/src/main/java/re/imc/geysermodelengineextension/GeyserModelEngineExtension.java index a8c1a5a..f5a5b35 100644 --- a/geyser/src/main/java/re/imc/geysermodelenginepackgenerator/GeyserModelEnginePackGenerator.java +++ b/geyser/src/main/java/re/imc/geysermodelengineextension/GeyserModelEngineExtension.java @@ -1,4 +1,4 @@ -package re.imc.geysermodelenginepackgenerator; +package re.imc.geysermodelengineextension; import org.geysermc.event.subscribe.Subscribe; import org.geysermc.geyser.api.command.Command; @@ -9,12 +9,12 @@ import org.geysermc.geyser.api.event.lifecycle.GeyserPreInitializeEvent; import org.geysermc.geyser.api.extension.Extension; import org.geysermc.geyser.api.pack.PackCodec; import org.geysermc.geyser.api.pack.ResourcePack; -import re.imc.geysermodelenginepackgenerator.managers.ConfigManager; -import re.imc.geysermodelenginepackgenerator.managers.resourcepack.ResourcePackManager; +import re.imc.geysermodelengineextension.managers.ConfigManager; +import re.imc.geysermodelengineextension.managers.resourcepack.ResourcePackManager; -public class GeyserModelEnginePackGenerator implements Extension { +public class GeyserModelEngineExtension implements Extension { - private static GeyserModelEnginePackGenerator extension; + private static GeyserModelEngineExtension extension; private ConfigManager configManager; @@ -57,7 +57,7 @@ public class GeyserModelEnginePackGenerator implements Extension { this.resourcePackManager = new ResourcePackManager(this); } - public static GeyserModelEnginePackGenerator getExtension() { + public static GeyserModelEngineExtension getExtension() { return extension; } diff --git a/geyser/src/main/java/re/imc/geysermodelenginepackgenerator/managers/ConfigManager.java b/geyser/src/main/java/re/imc/geysermodelengineextension/managers/ConfigManager.java similarity index 77% rename from geyser/src/main/java/re/imc/geysermodelenginepackgenerator/managers/ConfigManager.java rename to geyser/src/main/java/re/imc/geysermodelengineextension/managers/ConfigManager.java index f494f48..4220a02 100644 --- a/geyser/src/main/java/re/imc/geysermodelenginepackgenerator/managers/ConfigManager.java +++ b/geyser/src/main/java/re/imc/geysermodelengineextension/managers/ConfigManager.java @@ -1,6 +1,6 @@ -package re.imc.geysermodelenginepackgenerator.managers; +package re.imc.geysermodelengineextension.managers; -import re.imc.geysermodelenginepackgenerator.util.FileConfiguration; +import re.imc.geysermodelengineextension.util.FileConfiguration; public class ConfigManager { diff --git a/geyser/src/main/java/re/imc/geysermodelenginepackgenerator/managers/resourcepack/ResourcePackManager.java b/geyser/src/main/java/re/imc/geysermodelengineextension/managers/resourcepack/ResourcePackManager.java similarity index 97% rename from geyser/src/main/java/re/imc/geysermodelenginepackgenerator/managers/resourcepack/ResourcePackManager.java rename to geyser/src/main/java/re/imc/geysermodelengineextension/managers/resourcepack/ResourcePackManager.java index 44ef4b7..2f5135d 100644 --- a/geyser/src/main/java/re/imc/geysermodelenginepackgenerator/managers/resourcepack/ResourcePackManager.java +++ b/geyser/src/main/java/re/imc/geysermodelengineextension/managers/resourcepack/ResourcePackManager.java @@ -1,12 +1,12 @@ -package re.imc.geysermodelenginepackgenerator.managers.resourcepack; +package re.imc.geysermodelengineextension.managers.resourcepack; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.JsonParser; -import re.imc.geysermodelenginepackgenerator.GeyserModelEnginePackGenerator; -import re.imc.geysermodelenginepackgenerator.managers.resourcepack.generator.*; -import re.imc.geysermodelenginepackgenerator.managers.resourcepack.generator.data.TextureData; -import re.imc.geysermodelenginepackgenerator.util.ZipUtil; +import re.imc.geysermodelengineextension.GeyserModelEngineExtension; +import re.imc.geysermodelengineextension.managers.resourcepack.generator.*; +import re.imc.geysermodelengineextension.managers.resourcepack.generator.data.TextureData; +import re.imc.geysermodelengineextension.util.ZipUtil; import java.io.*; import java.nio.charset.StandardCharsets; @@ -19,7 +19,7 @@ import java.util.zip.ZipOutputStream; public class ResourcePackManager { - private final GeyserModelEnginePackGenerator extension; + private final GeyserModelEngineExtension extension; private final File inputFolder; private final File generatedPack; @@ -33,7 +33,7 @@ public class ResourcePackManager { private final Gson GSON = new GsonBuilder().setPrettyPrinting().create(); - public ResourcePackManager(GeyserModelEnginePackGenerator extension) { + public ResourcePackManager(GeyserModelEngineExtension extension) { this.extension = extension; this.inputFolder = extension.dataFolder().resolve("input").toFile(); diff --git a/geyser/src/main/java/re/imc/geysermodelenginepackgenerator/managers/resourcepack/generator/Animation.java b/geyser/src/main/java/re/imc/geysermodelengineextension/managers/resourcepack/generator/Animation.java similarity index 94% rename from geyser/src/main/java/re/imc/geysermodelenginepackgenerator/managers/resourcepack/generator/Animation.java rename to geyser/src/main/java/re/imc/geysermodelengineextension/managers/resourcepack/generator/Animation.java index dac86ae..ff0945c 100644 --- a/geyser/src/main/java/re/imc/geysermodelenginepackgenerator/managers/resourcepack/generator/Animation.java +++ b/geyser/src/main/java/re/imc/geysermodelengineextension/managers/resourcepack/generator/Animation.java @@ -1,10 +1,10 @@ -package re.imc.geysermodelenginepackgenerator.managers.resourcepack.generator; +package re.imc.geysermodelengineextension.managers.resourcepack.generator; import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParser; -import re.imc.geysermodelenginepackgenerator.GeyserModelEnginePackGenerator; +import re.imc.geysermodelengineextension.GeyserModelEngineExtension; import java.util.HashSet; import java.util.Map; @@ -111,7 +111,7 @@ public class Animation { if (i == 0) return; - GeyserModelEnginePackGenerator.getExtension().getResourcePackManager().getEntityCache().get(modelId).setHasHeadAnimation(true); + GeyserModelEngineExtension.getExtension().getResourcePackManager().getEntityCache().get(modelId).setHasHeadAnimation(true); object.add("bones", bones); json.get("animations").getAsJsonObject().add("animation." + modelId + ".look_at_target", object); diff --git a/geyser/src/main/java/re/imc/geysermodelenginepackgenerator/managers/resourcepack/generator/AnimationController.java b/geyser/src/main/java/re/imc/geysermodelengineextension/managers/resourcepack/generator/AnimationController.java similarity index 91% rename from geyser/src/main/java/re/imc/geysermodelenginepackgenerator/managers/resourcepack/generator/AnimationController.java rename to geyser/src/main/java/re/imc/geysermodelengineextension/managers/resourcepack/generator/AnimationController.java index 605cca5..420a66f 100644 --- a/geyser/src/main/java/re/imc/geysermodelenginepackgenerator/managers/resourcepack/generator/AnimationController.java +++ b/geyser/src/main/java/re/imc/geysermodelengineextension/managers/resourcepack/generator/AnimationController.java @@ -1,9 +1,9 @@ -package re.imc.geysermodelenginepackgenerator.managers.resourcepack.generator; +package re.imc.geysermodelengineextension.managers.resourcepack.generator; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParser; -import re.imc.geysermodelenginepackgenerator.GeyserModelEnginePackGenerator; +import re.imc.geysermodelengineextension.GeyserModelEngineExtension; import java.util.ArrayList; import java.util.Collections; @@ -35,7 +35,7 @@ public class AnimationController { } """; - public void load(GeyserModelEnginePackGenerator extension, Animation animation, Entity entity) { + public void load(GeyserModelEngineExtension extension, Animation animation, Entity entity) { JsonObject root = new JsonObject(); json = root; root.addProperty("format_version", "1.10.0"); diff --git a/geyser/src/main/java/re/imc/geysermodelenginepackgenerator/managers/resourcepack/generator/Entity.java b/geyser/src/main/java/re/imc/geysermodelengineextension/managers/resourcepack/generator/Entity.java similarity index 97% rename from geyser/src/main/java/re/imc/geysermodelenginepackgenerator/managers/resourcepack/generator/Entity.java rename to geyser/src/main/java/re/imc/geysermodelengineextension/managers/resourcepack/generator/Entity.java index cb0d772..39d98d4 100644 --- a/geyser/src/main/java/re/imc/geysermodelenginepackgenerator/managers/resourcepack/generator/Entity.java +++ b/geyser/src/main/java/re/imc/geysermodelengineextension/managers/resourcepack/generator/Entity.java @@ -1,10 +1,10 @@ -package re.imc.geysermodelenginepackgenerator.managers.resourcepack.generator; +package re.imc.geysermodelengineextension.managers.resourcepack.generator; import com.google.gson.JsonArray; import com.google.gson.JsonObject; import com.google.gson.JsonParser; import me.zimzaza4.geyserutils.geyser.GeyserUtils; -import re.imc.geysermodelenginepackgenerator.managers.resourcepack.generator.data.TextureData; +import re.imc.geysermodelengineextension.managers.resourcepack.generator.data.TextureData; import java.util.*; diff --git a/geyser/src/main/java/re/imc/geysermodelenginepackgenerator/managers/resourcepack/generator/Geometry.java b/geyser/src/main/java/re/imc/geysermodelengineextension/managers/resourcepack/generator/Geometry.java similarity index 95% rename from geyser/src/main/java/re/imc/geysermodelenginepackgenerator/managers/resourcepack/generator/Geometry.java rename to geyser/src/main/java/re/imc/geysermodelengineextension/managers/resourcepack/generator/Geometry.java index 9f39330..90ecd30 100644 --- a/geyser/src/main/java/re/imc/geysermodelenginepackgenerator/managers/resourcepack/generator/Geometry.java +++ b/geyser/src/main/java/re/imc/geysermodelengineextension/managers/resourcepack/generator/Geometry.java @@ -1,7 +1,7 @@ -package re.imc.geysermodelenginepackgenerator.managers.resourcepack.generator; +package re.imc.geysermodelengineextension.managers.resourcepack.generator; import com.google.gson.*; -import re.imc.geysermodelenginepackgenerator.managers.resourcepack.generator.data.BoneData; +import re.imc.geysermodelengineextension.managers.resourcepack.generator.data.BoneData; import java.util.*; diff --git a/geyser/src/main/java/re/imc/geysermodelenginepackgenerator/managers/resourcepack/generator/Material.java b/geyser/src/main/java/re/imc/geysermodelengineextension/managers/resourcepack/generator/Material.java similarity index 95% rename from geyser/src/main/java/re/imc/geysermodelenginepackgenerator/managers/resourcepack/generator/Material.java rename to geyser/src/main/java/re/imc/geysermodelengineextension/managers/resourcepack/generator/Material.java index fa537da..8f56889 100644 --- a/geyser/src/main/java/re/imc/geysermodelenginepackgenerator/managers/resourcepack/generator/Material.java +++ b/geyser/src/main/java/re/imc/geysermodelengineextension/managers/resourcepack/generator/Material.java @@ -1,4 +1,4 @@ -package re.imc.geysermodelenginepackgenerator.managers.resourcepack.generator; +package re.imc.geysermodelengineextension.managers.resourcepack.generator; public class Material { diff --git a/geyser/src/main/java/re/imc/geysermodelenginepackgenerator/managers/resourcepack/generator/ModelConfig.java b/geyser/src/main/java/re/imc/geysermodelengineextension/managers/resourcepack/generator/ModelConfig.java similarity index 97% rename from geyser/src/main/java/re/imc/geysermodelenginepackgenerator/managers/resourcepack/generator/ModelConfig.java rename to geyser/src/main/java/re/imc/geysermodelengineextension/managers/resourcepack/generator/ModelConfig.java index f95ecb0..4fe60a1 100644 --- a/geyser/src/main/java/re/imc/geysermodelenginepackgenerator/managers/resourcepack/generator/ModelConfig.java +++ b/geyser/src/main/java/re/imc/geysermodelengineextension/managers/resourcepack/generator/ModelConfig.java @@ -1,4 +1,4 @@ -package re.imc.geysermodelenginepackgenerator.managers.resourcepack.generator; +package re.imc.geysermodelengineextension.managers.resourcepack.generator; import com.google.gson.annotations.SerializedName; import lombok.*; diff --git a/geyser/src/main/java/re/imc/geysermodelenginepackgenerator/managers/resourcepack/generator/PackManifest.java b/geyser/src/main/java/re/imc/geysermodelengineextension/managers/resourcepack/generator/PackManifest.java similarity index 91% rename from geyser/src/main/java/re/imc/geysermodelenginepackgenerator/managers/resourcepack/generator/PackManifest.java rename to geyser/src/main/java/re/imc/geysermodelengineextension/managers/resourcepack/generator/PackManifest.java index d8bd473..544c7af 100644 --- a/geyser/src/main/java/re/imc/geysermodelenginepackgenerator/managers/resourcepack/generator/PackManifest.java +++ b/geyser/src/main/java/re/imc/geysermodelengineextension/managers/resourcepack/generator/PackManifest.java @@ -1,4 +1,4 @@ -package re.imc.geysermodelenginepackgenerator.managers.resourcepack.generator; +package re.imc.geysermodelengineextension.managers.resourcepack.generator; import java.util.UUID; diff --git a/geyser/src/main/java/re/imc/geysermodelenginepackgenerator/managers/resourcepack/generator/RenderController.java b/geyser/src/main/java/re/imc/geysermodelengineextension/managers/resourcepack/generator/RenderController.java similarity index 97% rename from geyser/src/main/java/re/imc/geysermodelenginepackgenerator/managers/resourcepack/generator/RenderController.java rename to geyser/src/main/java/re/imc/geysermodelengineextension/managers/resourcepack/generator/RenderController.java index b763b73..92724fa 100644 --- a/geyser/src/main/java/re/imc/geysermodelenginepackgenerator/managers/resourcepack/generator/RenderController.java +++ b/geyser/src/main/java/re/imc/geysermodelengineextension/managers/resourcepack/generator/RenderController.java @@ -1,8 +1,8 @@ -package re.imc.geysermodelenginepackgenerator.managers.resourcepack.generator; +package re.imc.geysermodelengineextension.managers.resourcepack.generator; import com.google.gson.JsonArray; import com.google.gson.JsonObject; -import re.imc.geysermodelenginepackgenerator.managers.resourcepack.generator.data.BoneData; +import re.imc.geysermodelengineextension.managers.resourcepack.generator.data.BoneData; import java.util.*; diff --git a/geyser/src/main/java/re/imc/geysermodelenginepackgenerator/managers/resourcepack/generator/data/BoneData.java b/geyser/src/main/java/re/imc/geysermodelengineextension/managers/resourcepack/generator/data/BoneData.java similarity index 89% rename from geyser/src/main/java/re/imc/geysermodelenginepackgenerator/managers/resourcepack/generator/data/BoneData.java rename to geyser/src/main/java/re/imc/geysermodelengineextension/managers/resourcepack/generator/data/BoneData.java index 360f175..a8b1320 100644 --- a/geyser/src/main/java/re/imc/geysermodelenginepackgenerator/managers/resourcepack/generator/data/BoneData.java +++ b/geyser/src/main/java/re/imc/geysermodelengineextension/managers/resourcepack/generator/data/BoneData.java @@ -1,4 +1,4 @@ -package re.imc.geysermodelenginepackgenerator.managers.resourcepack.generator.data; +package re.imc.geysermodelengineextension.managers.resourcepack.generator.data; import java.util.Set; diff --git a/geyser/src/main/java/re/imc/geysermodelenginepackgenerator/managers/resourcepack/generator/data/TextureData.java b/geyser/src/main/java/re/imc/geysermodelengineextension/managers/resourcepack/generator/data/TextureData.java similarity index 89% rename from geyser/src/main/java/re/imc/geysermodelenginepackgenerator/managers/resourcepack/generator/data/TextureData.java rename to geyser/src/main/java/re/imc/geysermodelengineextension/managers/resourcepack/generator/data/TextureData.java index 0d6c824..f4e1b62 100644 --- a/geyser/src/main/java/re/imc/geysermodelenginepackgenerator/managers/resourcepack/generator/data/TextureData.java +++ b/geyser/src/main/java/re/imc/geysermodelengineextension/managers/resourcepack/generator/data/TextureData.java @@ -1,4 +1,4 @@ -package re.imc.geysermodelenginepackgenerator.managers.resourcepack.generator.data; +package re.imc.geysermodelengineextension.managers.resourcepack.generator.data; import java.util.Set; diff --git a/geyser/src/main/java/re/imc/geysermodelenginepackgenerator/util/BooleanPacker.java b/geyser/src/main/java/re/imc/geysermodelengineextension/util/BooleanPacker.java similarity index 94% rename from geyser/src/main/java/re/imc/geysermodelenginepackgenerator/util/BooleanPacker.java rename to geyser/src/main/java/re/imc/geysermodelengineextension/util/BooleanPacker.java index 19f4519..8461d6f 100644 --- a/geyser/src/main/java/re/imc/geysermodelenginepackgenerator/util/BooleanPacker.java +++ b/geyser/src/main/java/re/imc/geysermodelengineextension/util/BooleanPacker.java @@ -1,7 +1,6 @@ -package re.imc.geysermodelenginepackgenerator.util; +package re.imc.geysermodelengineextension.util; import java.util.*; -import java.util.concurrent.ThreadLocalRandom; public class BooleanPacker { diff --git a/geyser/src/main/java/re/imc/geysermodelenginepackgenerator/util/FileConfiguration.java b/geyser/src/main/java/re/imc/geysermodelengineextension/util/FileConfiguration.java similarity index 94% rename from geyser/src/main/java/re/imc/geysermodelenginepackgenerator/util/FileConfiguration.java rename to geyser/src/main/java/re/imc/geysermodelengineextension/util/FileConfiguration.java index 8198d83..5bbb0d0 100644 --- a/geyser/src/main/java/re/imc/geysermodelenginepackgenerator/util/FileConfiguration.java +++ b/geyser/src/main/java/re/imc/geysermodelengineextension/util/FileConfiguration.java @@ -1,20 +1,19 @@ -package re.imc.geysermodelenginepackgenerator.util; +package re.imc.geysermodelengineextension.util; import org.spongepowered.configurate.CommentedConfigurationNode; import org.spongepowered.configurate.serialize.SerializationException; import org.spongepowered.configurate.yaml.YamlConfigurationLoader; -import re.imc.geysermodelenginepackgenerator.GeyserModelEnginePackGenerator; +import re.imc.geysermodelengineextension.GeyserModelEngineExtension; import java.io.File; import java.io.IOException; -import java.io.InputStream; import java.nio.file.Files; import java.nio.file.Path; import java.util.List; public class FileConfiguration { - private final GeyserModelEnginePackGenerator extension = GeyserModelEnginePackGenerator.getExtension(); + private final GeyserModelEngineExtension extension = GeyserModelEngineExtension.getExtension(); private final Path dataDirectory = extension.dataFolder(); diff --git a/geyser/src/main/java/re/imc/geysermodelenginepackgenerator/util/FileUtils.java b/geyser/src/main/java/re/imc/geysermodelengineextension/util/FileUtils.java similarity index 87% rename from geyser/src/main/java/re/imc/geysermodelenginepackgenerator/util/FileUtils.java rename to geyser/src/main/java/re/imc/geysermodelengineextension/util/FileUtils.java index 025e557..c94bb5b 100644 --- a/geyser/src/main/java/re/imc/geysermodelenginepackgenerator/util/FileUtils.java +++ b/geyser/src/main/java/re/imc/geysermodelengineextension/util/FileUtils.java @@ -1,6 +1,6 @@ -package re.imc.geysermodelenginepackgenerator.util; +package re.imc.geysermodelengineextension.util; -import re.imc.geysermodelenginepackgenerator.GeyserModelEnginePackGenerator; +import re.imc.geysermodelengineextension.GeyserModelEngineExtension; import java.io.File; import java.io.IOException; @@ -27,7 +27,7 @@ public class FileUtils { return files; } - public static void createFiles(GeyserModelEnginePackGenerator extension, String fileName) { + public static void createFiles(GeyserModelEngineExtension extension, String fileName) { Path config = extension.dataFolder().resolve(fileName); if (Files.exists(config)) return; diff --git a/geyser/src/main/java/re/imc/geysermodelenginepackgenerator/util/ZipUtil.java b/geyser/src/main/java/re/imc/geysermodelengineextension/util/ZipUtil.java similarity index 96% rename from geyser/src/main/java/re/imc/geysermodelenginepackgenerator/util/ZipUtil.java rename to geyser/src/main/java/re/imc/geysermodelengineextension/util/ZipUtil.java index c6dc043..3be1cec 100644 --- a/geyser/src/main/java/re/imc/geysermodelenginepackgenerator/util/ZipUtil.java +++ b/geyser/src/main/java/re/imc/geysermodelengineextension/util/ZipUtil.java @@ -1,4 +1,4 @@ -package re.imc.geysermodelenginepackgenerator.util; +package re.imc.geysermodelengineextension.util; import java.io.File; import java.io.FileInputStream; diff --git a/renovate.json b/renovate.json deleted file mode 100644 index 32f78b0..0000000 --- a/renovate.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "$schema": "https://docs.renovatebot.com/renovate-schema.json", - "extends": [ - "config:recommended" - ], - "baseBranches": [ - "main" - ] -} \ No newline at end of file