diff --git a/converter/build.gradle.kts b/converter/build.gradle.kts index 546faec..6c00818 100644 --- a/converter/build.gradle.kts +++ b/converter/build.gradle.kts @@ -1,6 +1,7 @@ dependencies { api(project(":pack-schema-api")) - implementation("com.fasterxml.jackson.core:jackson-databind:2.14.2") + implementation("com.google.code.gson:gson:2.10.1") + implementation("commons-io:commons-io:2.11.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") diff --git a/converter/src/main/java/org/geysermc/pack/converter/Constants.java b/converter/src/main/java/org/geysermc/pack/converter/Constants.java new file mode 100644 index 0000000..8f4b342 --- /dev/null +++ b/converter/src/main/java/org/geysermc/pack/converter/Constants.java @@ -0,0 +1,31 @@ +/* + * 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 + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + * @author GeyserMC + * @link https://github.com/GeyserMC/PackConverter + * + */ + +package org.geysermc.pack.converter; + +public class Constants { + public static final String JAVA_PACK_LOCATION = "assets/%s"; +} diff --git a/converter/src/main/java/org/geysermc/pack/converter/PackConversionContext.java b/converter/src/main/java/org/geysermc/pack/converter/PackConversionContext.java index 984f150..df2f79d 100644 --- a/converter/src/main/java/org/geysermc/pack/converter/PackConversionContext.java +++ b/converter/src/main/java/org/geysermc/pack/converter/PackConversionContext.java @@ -27,8 +27,8 @@ package org.geysermc.pack.converter; import org.geysermc.pack.bedrock.resource.BedrockResourcePack; -import org.geysermc.pack.converter.utils.LogListener; import org.geysermc.pack.converter.data.ConversionData; +import org.geysermc.pack.converter.util.LogListener; import org.jetbrains.annotations.NotNull; import team.unnamed.creative.ResourcePack; @@ -42,26 +42,26 @@ public record PackConversionContext( @NotNull LogListener logListener) { public Path inputDirectory() { - return data.inputDirectory(); + return this.data.inputDirectory(); } public Path outputDirectory() { - return data.outputDirectory(); + return this.data.outputDirectory(); } public void info(@NotNull String message) { - logListener.info(message); + this.logListener.info(message); } public void warn(@NotNull String message) { - logListener.warn(message); + this.logListener.warn(message); } public void error(@NotNull String message) { - logListener.error(message); + this.logListener.error(message); } public void error(@NotNull String message, @NotNull Throwable exception) { - logListener.error(message, exception); + this.logListener.error(message, exception); } } diff --git a/converter/src/main/java/org/geysermc/pack/converter/PackConverter.java b/converter/src/main/java/org/geysermc/pack/converter/PackConverter.java index a081d77..75337c7 100644 --- a/converter/src/main/java/org/geysermc/pack/converter/PackConverter.java +++ b/converter/src/main/java/org/geysermc/pack/converter/PackConverter.java @@ -32,18 +32,21 @@ import lombok.Setter; import org.geysermc.pack.bedrock.resource.BedrockResourcePack; import org.geysermc.pack.converter.converters.Converter; import org.geysermc.pack.converter.data.ConversionData; -import org.geysermc.pack.converter.utils.DefaultLogListener; -import org.geysermc.pack.converter.utils.LogListener; -import org.geysermc.pack.converter.utils.ZipUtils; +import org.geysermc.pack.converter.util.DefaultLogListener; +import org.geysermc.pack.converter.util.LogListener; +import org.geysermc.pack.converter.util.ZipUtils; import org.jetbrains.annotations.NotNull; import team.unnamed.creative.ResourcePack; import team.unnamed.creative.serialize.minecraft.MinecraftResourcePackReader; import javax.imageio.ImageIO; import java.io.IOException; +import java.nio.file.FileSystem; +import java.nio.file.FileSystems; import java.nio.file.Files; import java.nio.file.Path; import java.util.ArrayList; +import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -102,38 +105,42 @@ public class PackConverter { // Load any image plugins ImageIO.scanForPlugins(); - this.tmpDir = this.input.toAbsolutePath().getParent().resolve(this.output.getFileName() + "_mcpack/"); + try (FileSystem compressedFileSystem = FileSystems.newFileSystem(this.input, Collections.emptyMap())) { + Path input = compressedFileSystem.getPath("/"); - if (this.converters.isEmpty()) { - throw new IllegalStateException("No converters have been added"); - } + this.tmpDir = this.input.toAbsolutePath().getParent().resolve(this.output.getFileName() + "_mcpack/"); - ResourcePack javaResourcePack = MinecraftResourcePackReader.minecraft().readFromZipFile(this.input); - BedrockResourcePack bedrockResourcePack = new BedrockResourcePack(this.tmpDir); - - int errors = 0; - for (Converter converter : this.converters) { - ConversionData data = converter.createConversionData(this, this.input, this.output); - PackConversionContext context = new PackConversionContext<>(data, this, javaResourcePack, bedrockResourcePack, this.logListener); - - try { - converter.convert(context); - } catch (Throwable t) { - this.logListener.error("Error converting pack!", t); - errors++; + if (this.converters.isEmpty()) { + throw new IllegalStateException("No converters have been added"); } + + ResourcePack javaResourcePack = MinecraftResourcePackReader.minecraft().readFromZipFile(this.input); + BedrockResourcePack bedrockResourcePack = new BedrockResourcePack(this.tmpDir); + + int errors = 0; + for (Converter converter : this.converters) { + ConversionData data = converter.createConversionData(this, input, this.tmpDir); + PackConversionContext context = new PackConversionContext<>(data, this, javaResourcePack, bedrockResourcePack, this.logListener); + + try { + converter.convert(context); + } catch (Throwable t) { + this.logListener.error("Error converting pack!", t); + errors++; + } + } + + bedrockResourcePack.export(); + + if (errors > 0) { + this.logListener.warn("Pack conversion completed with " + errors + " errors!"); + } else { + this.logListener.info("Pack conversion completed successfully!"); + } + + this.pack(); + this.cleanup(); } - - bedrockResourcePack.export(); - - if (errors > 0) { - this.logListener.warn("Pack conversion completed with " + errors + " errors!"); - } else { - this.logListener.info("Pack conversion completed successfully!"); - } - - this.pack(); - this.cleanup(); } /** diff --git a/converter/src/main/java/org/geysermc/pack/converter/converters/base/PackIconConverter.java b/converter/src/main/java/org/geysermc/pack/converter/converters/base/PackIconConverter.java new file mode 100644 index 0000000..ef99124 --- /dev/null +++ b/converter/src/main/java/org/geysermc/pack/converter/converters/base/PackIconConverter.java @@ -0,0 +1,47 @@ +/* + * 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 + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + * @author GeyserMC + * @link https://github.com/GeyserMC/PackConverter + * + */ + +package org.geysermc.pack.converter.converters.base; + +import com.google.auto.service.AutoService; +import org.geysermc.pack.converter.PackConversionContext; +import org.geysermc.pack.converter.converters.BaseConverter; +import org.geysermc.pack.converter.converters.Converter; +import org.geysermc.pack.converter.data.BaseConversionData; +import org.jetbrains.annotations.NotNull; +import team.unnamed.creative.base.Writable; + +@AutoService(Converter.class) +public class PackIconConverter extends BaseConverter { + + @Override + public void convert(@NotNull PackConversionContext context) throws Exception { + Writable packIcon = context.javaResourcePack().icon(); + if (packIcon != null) { + context.bedrockResourcePack().icon(packIcon.toByteArray()); + } + } +} diff --git a/converter/src/main/java/org/geysermc/pack/converter/converters/base/PackManifestConverter.java b/converter/src/main/java/org/geysermc/pack/converter/converters/base/PackManifestConverter.java index 0a6b86a..42ea177 100644 --- a/converter/src/main/java/org/geysermc/pack/converter/converters/base/PackManifestConverter.java +++ b/converter/src/main/java/org/geysermc/pack/converter/converters/base/PackManifestConverter.java @@ -53,7 +53,7 @@ public class PackManifestConverter extends BaseConverter { Header header = new Header(); header.description(javaPack.description()); - header.name(context.inputDirectory().getFileName().toString().split("\\.")[0]); + header.name(context.outputDirectory().getFileName().toString()); header.version(new float[] { 1, 0, 0 }); header.minEngineVersion(new float[] { 1, 16, 0 }); header.uuid(UUID.randomUUID().toString()); diff --git a/converter/src/main/java/org/geysermc/pack/converter/converters/sound/SoundConverter.java b/converter/src/main/java/org/geysermc/pack/converter/converters/sound/SoundConverter.java new file mode 100644 index 0000000..091ff64 --- /dev/null +++ b/converter/src/main/java/org/geysermc/pack/converter/converters/sound/SoundConverter.java @@ -0,0 +1,95 @@ +/* + * 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 + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + * @author GeyserMC + * @link https://github.com/GeyserMC/PackConverter + * + */ + +package org.geysermc.pack.converter.converters.sound; + +import com.google.auto.service.AutoService; +import org.apache.commons.io.FileUtils; +import org.apache.commons.io.file.PathUtils; +import org.geysermc.pack.bedrock.resource.sounds.sounddefinitions.SoundDefinitions; +import org.geysermc.pack.bedrock.resource.sounds.sounddefinitions.Sounds; +import org.geysermc.pack.converter.Constants; +import org.geysermc.pack.converter.PackConversionContext; +import org.geysermc.pack.converter.converters.BaseConverter; +import org.geysermc.pack.converter.converters.Converter; +import org.geysermc.pack.converter.data.BaseConversionData; +import org.geysermc.pack.util.FileUtil; +import org.jetbrains.annotations.NotNull; +import team.unnamed.creative.sound.Sound; +import team.unnamed.creative.sound.SoundEvent; +import team.unnamed.creative.sound.SoundRegistry; + +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.StandardCopyOption; +import java.util.Collection; +import java.util.Map; + +@AutoService(Converter.class) +public class SoundConverter extends BaseConverter { + private static final String JAVA_SOUNDS_LOCATION = Constants.JAVA_PACK_LOCATION + "/sounds"; + private static final String BEDROCK_SOUNDS_LOCATION = "sounds"; + + @Override + public void convert(@NotNull PackConversionContext context) throws Exception { + Collection registry = context.javaResourcePack().soundRegistries(); + for (SoundRegistry soundRegistry : registry) { + Map sounds = soundRegistry.sounds(); + + for (Map.Entry entry : sounds.entrySet()) { + String key = entry.getKey(); + SoundEvent value = entry.getValue(); + + SoundDefinitions definition = new SoundDefinitions(); + definition.useLegacyMaxDistance(true); // TODO: Needed? + definition.maxDistance(64); // ??? + for (Sound sound : value.sounds()) { + Sounds bedrockSound = new Sounds(); + bedrockSound.name(BEDROCK_SOUNDS_LOCATION + "/" + sound.key().value()); + bedrockSound.stream(sound.stream()); + bedrockSound.loadOnLowMemory(true); + bedrockSound.volume(sound.volume()); + bedrockSound.pitch(sound.pitch()); + bedrockSound.weight(sound.weight()); + + definition.sounds().add(bedrockSound); + } + + context.bedrockResourcePack().addSoundDefinition(key, definition); + } + + // Relocate sound files + Path input = context.inputDirectory().resolve(String.format(JAVA_SOUNDS_LOCATION, soundRegistry.namespace())); + Path output = context.outputDirectory().resolve(BEDROCK_SOUNDS_LOCATION); + + if (Files.notExists(output)) { + Files.createDirectories(output); + } + + PathUtils.copyDirectory(input, output, StandardCopyOption.REPLACE_EXISTING); + } + } +} diff --git a/converter/src/main/java/org/geysermc/pack/converter/utils/DefaultLogListener.java b/converter/src/main/java/org/geysermc/pack/converter/util/DefaultLogListener.java similarity index 97% rename from converter/src/main/java/org/geysermc/pack/converter/utils/DefaultLogListener.java rename to converter/src/main/java/org/geysermc/pack/converter/util/DefaultLogListener.java index 00c3aa4..79345e7 100644 --- a/converter/src/main/java/org/geysermc/pack/converter/utils/DefaultLogListener.java +++ b/converter/src/main/java/org/geysermc/pack/converter/util/DefaultLogListener.java @@ -24,7 +24,7 @@ * */ -package org.geysermc.pack.converter.utils; +package org.geysermc.pack.converter.util; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/converter/src/main/java/org/geysermc/pack/converter/utils/ImageUtils.java b/converter/src/main/java/org/geysermc/pack/converter/util/ImageUtil.java similarity index 99% rename from converter/src/main/java/org/geysermc/pack/converter/utils/ImageUtils.java rename to converter/src/main/java/org/geysermc/pack/converter/util/ImageUtil.java index d067365..d39c434 100644 --- a/converter/src/main/java/org/geysermc/pack/converter/utils/ImageUtils.java +++ b/converter/src/main/java/org/geysermc/pack/converter/util/ImageUtil.java @@ -24,7 +24,7 @@ * */ -package org.geysermc.pack.converter.utils; +package org.geysermc.pack.converter.util; import javax.imageio.ImageIO; import java.awt.*; @@ -33,10 +33,10 @@ import java.awt.image.*; import java.io.File; import java.io.IOException; -public class ImageUtils { +public class ImageUtil { /** - * @see ImageUtils#crop(BufferedImage, int, int, int, int) + * @see ImageUtil#crop(BufferedImage, int, int, int, int) */ public static BufferedImage crop(BufferedImage img, int width, int height) { return crop(img, 0, 0, width, height); diff --git a/converter/src/main/java/org/geysermc/pack/converter/utils/LogListener.java b/converter/src/main/java/org/geysermc/pack/converter/util/LogListener.java similarity index 97% rename from converter/src/main/java/org/geysermc/pack/converter/utils/LogListener.java rename to converter/src/main/java/org/geysermc/pack/converter/util/LogListener.java index 26bec01..68ac705 100644 --- a/converter/src/main/java/org/geysermc/pack/converter/utils/LogListener.java +++ b/converter/src/main/java/org/geysermc/pack/converter/util/LogListener.java @@ -24,7 +24,7 @@ * */ -package org.geysermc.pack.converter.utils; +package org.geysermc.pack.converter.util; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/converter/src/main/java/org/geysermc/pack/converter/utils/ZipUtils.java b/converter/src/main/java/org/geysermc/pack/converter/util/ZipUtils.java similarity index 98% rename from converter/src/main/java/org/geysermc/pack/converter/utils/ZipUtils.java rename to converter/src/main/java/org/geysermc/pack/converter/util/ZipUtils.java index e8d61b1..5513a76 100644 --- a/converter/src/main/java/org/geysermc/pack/converter/utils/ZipUtils.java +++ b/converter/src/main/java/org/geysermc/pack/converter/util/ZipUtils.java @@ -24,7 +24,7 @@ * */ -package org.geysermc.pack.converter.utils; +package org.geysermc.pack.converter.util; import org.geysermc.pack.converter.PackConverter; diff --git a/converter/src/main/java/org/geysermc/pack/converter/utils/ResourcePackManifest.java b/converter/src/main/java/org/geysermc/pack/converter/utils/ResourcePackManifest.java deleted file mode 100644 index d994bc2..0000000 --- a/converter/src/main/java/org/geysermc/pack/converter/utils/ResourcePackManifest.java +++ /dev/null @@ -1,119 +0,0 @@ -/* - * 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 - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - * - * @author GeyserMC - * @link https://github.com/GeyserMC/PackConverter - * - */ - -package org.geysermc.pack.converter.utils; - -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.*; - -import java.util.Collection; -import java.util.Collections; -import java.util.UUID; - -/** - * author: NukkitX - * Nukkit Project - */ -@Setter -@Getter -@EqualsAndHashCode -@JsonInclude(JsonInclude.Include.NON_NULL) -public class ResourcePackManifest { - @JsonProperty("format_version") - private Integer formatVersion; - private Header header; - private Collection modules; - protected Collection dependencies; - - public Collection getModules() { - return Collections.unmodifiableCollection(modules); - } - - @Setter - @Getter - @ToString - @JsonInclude(JsonInclude.Include.NON_NULL) - public static class Header { - private String description; - private String name; - private UUID uuid; - private int[] version; - @JsonProperty("min_engine_version") - private int[] minimumSupportedMinecraftVersion; - } - - @Setter - @Getter - @ToString - @JsonInclude(JsonInclude.Include.NON_NULL) - public static class Module { - private String description; - private String type; - private UUID uuid; - private int[] version; - } - - @Setter - @Getter - @ToString - @JsonInclude(JsonInclude.Include.NON_NULL) - public static class Dependency { - private UUID uuid; - private int[] version; - } - - @Value - public static class Version { - private final int major; - private final int minor; - private final int patch; - - public static Version fromString(String ver) { - String[] split = ver.replace(']', ' ') - .replace('[', ' ') - .replaceAll(" ", "").split(","); - - return new Version(Integer.parseInt(split[0]), Integer.parseInt(split[1]), Integer.parseInt(split[2])); - } - - public static Version fromArray(int[] ver) { - return new Version(ver[0], ver[1], ver[2]); - } - - private Version(int major, int minor, int patch) { - this.major = major; - this.minor = minor; - this.patch = patch; - } - - - @Override - public String toString() { - return major + "." + minor + "." + patch; - } - } -} diff --git a/converter/src/main/java/org/geysermc/pack/converter/utils/CustomModelDataHandler.java b/legacy/custom/CustomModelDataHandler.java similarity index 99% rename from converter/src/main/java/org/geysermc/pack/converter/utils/CustomModelDataHandler.java rename to legacy/custom/CustomModelDataHandler.java index cfce62d..3ca772d 100644 --- a/converter/src/main/java/org/geysermc/pack/converter/utils/CustomModelDataHandler.java +++ b/legacy/custom/CustomModelDataHandler.java @@ -24,7 +24,7 @@ * */ -package org.geysermc.pack.converter.utils; +package org.geysermc.pack.converter.util; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/pack-schema/api/build.gradle.kts b/pack-schema/api/build.gradle.kts index cfab846..eb465fb 100644 --- a/pack-schema/api/build.gradle.kts +++ b/pack-schema/api/build.gradle.kts @@ -1,5 +1,5 @@ dependencies { api(project(":bedrock-pack-schema")) - implementation("com.fasterxml.jackson.core:jackson-databind:2.14.2") + implementation("com.google.code.gson:gson:2.10.1") implementation("org.jetbrains:annotations:24.0.1") } \ No newline at end of file diff --git a/pack-schema/api/src/main/java/org/geysermc/pack/bedrock/resource/BedrockResourcePack.java b/pack-schema/api/src/main/java/org/geysermc/pack/bedrock/resource/BedrockResourcePack.java index 5fbf732..6d793c9 100644 --- a/pack-schema/api/src/main/java/org/geysermc/pack/bedrock/resource/BedrockResourcePack.java +++ b/pack-schema/api/src/main/java/org/geysermc/pack/bedrock/resource/BedrockResourcePack.java @@ -26,39 +26,45 @@ package org.geysermc.pack.bedrock.resource; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.SerializationFeature; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; import org.geysermc.pack.bedrock.resource.attachables.Attachables; +import org.geysermc.pack.bedrock.resource.sounds.SoundDefinitions; +import org.geysermc.pack.bedrock.resource.sounds.sounddefinitions.Sounds; import org.geysermc.pack.bedrock.resource.textures.ItemTexture; import org.geysermc.pack.bedrock.resource.textures.TerrainTexture; import org.geysermc.pack.bedrock.resource.textures.itemtexture.TextureData; import org.geysermc.pack.bedrock.resource.textures.terraintexture.texturedata.Textures; +import org.geysermc.pack.util.gson.EmptyArrayAdapterFactory; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.io.IOException; +import java.nio.file.Files; import java.nio.file.Path; import java.util.HashMap; import java.util.Map; -import static org.geysermc.pack.bedrock.resource.util.FileUtil.exportJson; +import static org.geysermc.pack.util.FileUtil.exportJson; /** * Represents a Bedrock resource pack. */ public class BedrockResourcePack { - private static final ObjectMapper MAPPER = new ObjectMapper() - .enable(SerializationFeature.INDENT_OUTPUT) - .setSerializationInclusion(JsonInclude.Include.NON_NULL) - .setSerializationInclusion(JsonInclude.Include.NON_EMPTY); + private static final Gson GSON = new GsonBuilder() + .disableHtmlEscaping() + .setPrettyPrinting() + .registerTypeAdapterFactory(new EmptyArrayAdapterFactory()) + .create(); private final Path directory; private Manifest manifest; + private byte[] icon; private ItemTexture itemTexture; private TerrainTexture terrainTexture; private Map attachables; + private SoundDefinitions soundDefinitions; public BedrockResourcePack(@NotNull Path directory) { this(directory, null, null, null); @@ -76,11 +82,29 @@ public class BedrockResourcePack { * * @return the manifest of the resource pack */ - @NotNull + @Nullable public Manifest manifest() { return this.manifest; } + /** + * Get the icon of the resource pack. + * + * @return the icon of the resource pack + */ + public byte @Nullable[] icon() { + return this.icon; + } + + /** + * Set the icon of the resource pack. + * + * @param icon the icon of the resource pack + */ + public void icon(byte @Nullable[] icon) { + this.icon = icon; + } + /** * Set the manifest of the resource pack. * @@ -147,6 +171,25 @@ public class BedrockResourcePack { this.attachables = attachables; } + /** + * Get the sound definitions of the resource pack. + * + * @return the sound definitions of the resource pack + */ + @Nullable + public SoundDefinitions soundDefinitions() { + return this.soundDefinitions; + } + + /** + * Set the sound definitions of the resource pack. + * + * @param soundDefinitions the sound definitions of the resource pack + */ + public void soundDefinitions(@Nullable SoundDefinitions soundDefinitions) { + this.soundDefinitions = soundDefinitions; + } + /** * Add an item to the resource pack. * @@ -203,6 +246,47 @@ public class BedrockResourcePack { this.attachables.put(location, armorAttachable); } + /** + * Add a sound to the resource pack with the default options set. + * + * @param id the id of the sound + * @param soundLocation the location of the sound + */ + public void addDefaultSound(@NotNull String id, @NotNull String soundLocation) { + if (this.soundDefinitions == null) { + this.soundDefinitions = new SoundDefinitions(); + this.soundDefinitions.formatVersion("1.14.0"); + } + + Sounds sounds = new Sounds(); + sounds.name(soundLocation); + sounds.loadOnLowMemory(true); + sounds.stream(true); + sounds.volume(1); + sounds.is3D(true); + sounds.pitch(1); + + org.geysermc.pack.bedrock.resource.sounds.sounddefinitions.SoundDefinitions data = new org.geysermc.pack.bedrock.resource.sounds.sounddefinitions.SoundDefinitions(); + data.sounds().add(sounds); + data.maxDistance(64); + + this.soundDefinitions.soundDefinitions().put(id, data); + } + + /** + * Add a sound to the resource pack. + * + * @param id the id of the sound + * @param soundDefinition the sound definition + */ + public void addSoundDefinition(@NotNull String id, @NotNull org.geysermc.pack.bedrock.resource.sounds.sounddefinitions.SoundDefinitions soundDefinition) { + if (this.soundDefinitions == null) { + this.soundDefinitions = new SoundDefinitions(); + this.soundDefinitions.formatVersion("1.14.0"); + } + + this.soundDefinitions.soundDefinitions().put(id, soundDefinition); + } /** * Exports the resource pack to the specified directory. @@ -214,14 +298,27 @@ public class BedrockResourcePack { throw new NullPointerException("Pack manifest cannot be null"); } - exportJson(MAPPER, this.directory.resolve("manifest.json"), this.manifest); + exportJson(GSON, this.directory.resolve("manifest.json"), this.manifest); + if (this.icon != null) { + Files.write(this.directory.resolve("pack_icon.png"), this.icon); + } if (this.itemTexture != null) { - exportJson(MAPPER, this.directory.resolve("textures/item_texture.json"), this.itemTexture); + exportJson(GSON, this.directory.resolve("textures/item_texture.json"), this.itemTexture); } if (this.terrainTexture != null) { - exportJson(MAPPER, this.directory.resolve("textures/terrain_texture.json"), this.terrainTexture); + exportJson(GSON, this.directory.resolve("textures/terrain_texture.json"), this.terrainTexture); + } + + if (this.attachables != null) { + for (Map.Entry attachable : this.attachables.entrySet()) { + exportJson(GSON, this.directory.resolve(attachable.getKey()), attachable.getValue()); + } + } + + if (this.soundDefinitions != null) { + exportJson(GSON, this.directory.resolve("sounds/sound_definitions.json"), this.soundDefinitions); } } } diff --git a/pack-schema/api/src/main/java/org/geysermc/pack/bedrock/resource/util/FileUtil.java b/pack-schema/api/src/main/java/org/geysermc/pack/util/FileUtil.java similarity index 85% rename from pack-schema/api/src/main/java/org/geysermc/pack/bedrock/resource/util/FileUtil.java rename to pack-schema/api/src/main/java/org/geysermc/pack/util/FileUtil.java index 35b018b..24d84ff 100644 --- a/pack-schema/api/src/main/java/org/geysermc/pack/bedrock/resource/util/FileUtil.java +++ b/pack-schema/api/src/main/java/org/geysermc/pack/util/FileUtil.java @@ -24,9 +24,9 @@ * */ -package org.geysermc.pack.bedrock.resource.util; +package org.geysermc.pack.util; -import com.fasterxml.jackson.databind.ObjectMapper; +import com.google.gson.Gson; import org.jetbrains.annotations.NotNull; import java.io.BufferedWriter; @@ -42,12 +42,12 @@ public class FileUtil { /** * Exports the specified object to the given location as JSON. * - * @param mapper the object mapper to use + * @param gson the GSON instance to use * @param location the location to export the object to * @param object the object to export * @throws IOException if an I/O error occurs */ - public static void exportJson(@NotNull ObjectMapper mapper, @NotNull Path location, @NotNull Object object) throws IOException { + public static void exportJson(@NotNull Gson gson, @NotNull Path location, @NotNull Object object) throws IOException { if (Files.notExists(location.getParent())) { Files.createDirectories(location.getParent()); } @@ -57,7 +57,7 @@ public class FileUtil { } try (BufferedWriter writer = Files.newBufferedWriter(location)) { - mapper.writeValue(writer, object); + gson.toJson(object, writer); } } } diff --git a/pack-schema/api/src/main/java/org/geysermc/pack/util/gson/EmptyArrayAdapterFactory.java b/pack-schema/api/src/main/java/org/geysermc/pack/util/gson/EmptyArrayAdapterFactory.java new file mode 100644 index 0000000..19ec5e3 --- /dev/null +++ b/pack-schema/api/src/main/java/org/geysermc/pack/util/gson/EmptyArrayAdapterFactory.java @@ -0,0 +1,64 @@ +/* + * 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 + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + * @author GeyserMC + * @link https://github.com/GeyserMC/PackConverter + * + */ + +package org.geysermc.pack.util.gson; + +import com.google.gson.Gson; +import com.google.gson.TypeAdapter; +import com.google.gson.TypeAdapterFactory; +import com.google.gson.reflect.TypeToken; +import com.google.gson.stream.JsonReader; +import com.google.gson.stream.JsonWriter; + +import java.io.IOException; +import java.util.Collection; +import java.util.List; + +public class EmptyArrayAdapterFactory implements TypeAdapterFactory { + + @Override + public TypeAdapter create(Gson gson, TypeToken type) { + Class rawType = type.getRawType(); + if (!List.class.isAssignableFrom(rawType)) { + return null; + } + + TypeAdapter delegate = gson.getDelegateAdapter(this, type); + + return new TypeAdapter() { + + @Override + public T read(JsonReader in) throws IOException { + return delegate.read(in); + } + + @Override + public void write(JsonWriter out, T value) throws IOException { + delegate.write(out, (value == null || value instanceof Collection collection && collection.isEmpty()) ? null : value); + } + }; + } +} \ No newline at end of file diff --git a/pack-schema/bedrock/build.gradle.kts b/pack-schema/bedrock/build.gradle.kts index 507e170..9b4b4d6 100644 --- a/pack-schema/bedrock/build.gradle.kts +++ b/pack-schema/bedrock/build.gradle.kts @@ -1,3 +1,3 @@ dependencies { - implementation("com.fasterxml.jackson.core:jackson-databind:2.14.2") + implementation("com.google.code.gson:gson:2.10.1") } \ No newline at end of file diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/Blocks.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/Blocks.java index 8acb8e0..25643ca 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/Blocks.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/Blocks.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; import org.geysermc.pack.bedrock.resource.blocks.CarriedTextures; import org.geysermc.pack.bedrock.resource.blocks.Isotropic; @@ -12,13 +12,13 @@ import org.geysermc.pack.bedrock.resource.blocks.Textures; * The minecraft block definition file. */ public class Blocks { - @JsonProperty("format_version") + @SerializedName("format_version") public String formatVersion; - @JsonProperty("brightness_gamma") + @SerializedName("brightness_gamma") public float brightnessGamma; - @JsonProperty("carried_textures") + @SerializedName("carried_textures") public CarriedTextures carriedTextures; public Isotropic isotropic; diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/Manifest.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/Manifest.java index 9b0aac4..63811ad 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/Manifest.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/Manifest.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.util.ArrayList; import java.util.List; import org.geysermc.pack.bedrock.resource.manifest.Capabilities; @@ -16,7 +16,7 @@ import org.geysermc.pack.bedrock.resource.manifest.Subpacks; * The manifest file contains all the basic information about the pack that Minecraft needs to identify it. The tables below contain all the components of the manifest, their individual properties, and what they mean. */ public class Manifest { - @JsonProperty("format_version") + @SerializedName("format_version") public float formatVersion; public Capabilities capabilities; diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/Sounds.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/Sounds.java index 9971e98..bd6f177 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/Sounds.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/Sounds.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; import java.util.HashMap; import java.util.Map; @@ -15,16 +15,16 @@ import org.geysermc.pack.bedrock.resource.sounds.InteractiveSounds; * Sound definitions. */ public class Sounds { - @JsonProperty("block_sounds") + @SerializedName("block_sounds") private Map blockSounds = new HashMap<>(); - @JsonProperty("entity_sounds") + @SerializedName("entity_sounds") public EntitySounds entitySounds; - @JsonProperty("individual_event_sounds") + @SerializedName("individual_event_sounds") public IndividualEventSounds individualEventSounds; - @JsonProperty("interactive_sounds") + @SerializedName("interactive_sounds") public InteractiveSounds interactiveSounds; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/animation_controllers/AnimationController.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/animation_controllers/AnimationController.java index 6d437ce..e029ab0 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/animation_controllers/AnimationController.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/animation_controllers/AnimationController.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.animation_controllers; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; import java.util.HashMap; import java.util.Map; @@ -10,10 +10,10 @@ import org.geysermc.pack.bedrock.resource.animation_controllers.animationcontrol * Animation Controller */ public class AnimationController { - @JsonProperty("format_version") + @SerializedName("format_version") public String formatVersion; - @JsonProperty("animation_controllers") + @SerializedName("animation_controllers") private Map animationControllers = new HashMap<>(); /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/animation_controllers/animationcontroller/AnimationControllers.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/animation_controllers/animationcontroller/AnimationControllers.java index ad6a913..b49e038 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/animation_controllers/animationcontroller/AnimationControllers.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/animation_controllers/animationcontroller/AnimationControllers.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.animation_controllers.animationcontroller; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; import java.util.HashMap; import java.util.Map; @@ -14,7 +14,7 @@ import org.geysermc.pack.bedrock.resource.animation_controllers.animationcontrol public class AnimationControllers { private Map states = new HashMap<>(); - @JsonProperty("initial_state") + @SerializedName("initial_state") public String initialState; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/animation_controllers/animationcontroller/animationcontrollers/States.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/animation_controllers/animationcontroller/animationcontrollers/States.java index d5b9ec5..036f119 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/animation_controllers/animationcontroller/animationcontrollers/States.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/animation_controllers/animationcontroller/animationcontrollers/States.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.animation_controllers.animationcontroller.animationcontrollers; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; import java.util.ArrayList; import java.util.HashMap; @@ -15,21 +15,21 @@ import org.geysermc.pack.bedrock.resource.animation_controllers.animationcontrol * The states of this animation controller. */ public class States { - @JsonProperty("blend_transition") + @SerializedName("blend_transition") public float blendTransition; - @JsonProperty("blend_via_shortest_path") + @SerializedName("blend_via_shortest_path") public boolean blendViaShortestPath; - @JsonProperty("sound_effects") + @SerializedName("sound_effects") public List soundEffects = new ArrayList<>(); private Map variables = new HashMap<>(); - @JsonProperty("on_entry") + @SerializedName("on_entry") public String[] onEntry; - @JsonProperty("on_exit") + @SerializedName("on_exit") public String[] onExit; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/animation_controllers/animationcontroller/animationcontrollers/states/Variables.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/animation_controllers/animationcontroller/animationcontrollers/states/Variables.java index d01a37d..925c7da 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/animation_controllers/animationcontroller/animationcontrollers/states/Variables.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/animation_controllers/animationcontroller/animationcontrollers/states/Variables.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.animation_controllers.animationcontroller.animationcontrollers.states; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.Float; import java.lang.String; import java.util.HashMap; @@ -9,7 +9,7 @@ import java.util.Map; public class Variables { public String input; - @JsonProperty("remap_curve") + @SerializedName("remap_curve") private Map remapCurve = new HashMap<>(); public String input() { diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/animations/ActorAnimation.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/animations/ActorAnimation.java index 33c403e..dd43b14 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/animations/ActorAnimation.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/animations/ActorAnimation.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.animations; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; import java.util.HashMap; import java.util.Map; @@ -12,7 +12,7 @@ import org.geysermc.pack.bedrock.resource.animations.actoranimation.Animations; * The RP animation that changes an actors models, or molang data. */ public class ActorAnimation { - @JsonProperty("format_version") + @SerializedName("format_version") public String formatVersion; private Map animations = new HashMap<>(); diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/animations/actoranimation/Animations.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/animations/actoranimation/Animations.java index f9a1f6c..7146b7d 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/animations/actoranimation/Animations.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/animations/actoranimation/Animations.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.animations.actoranimation; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; import java.util.HashMap; import java.util.Map; @@ -14,32 +14,32 @@ import org.geysermc.pack.bedrock.resource.animations.actoranimation.animations.S * The animation specification. */ public class Animations { - @JsonProperty("anim_time_update") + @SerializedName("anim_time_update") public String animTimeUpdate; - @JsonProperty("animation_length") + @SerializedName("animation_length") public float animationLength; - @JsonProperty("blend_weight") + @SerializedName("blend_weight") public String blendWeight; private Map bones = new HashMap<>(); public String loop; - @JsonProperty("loop_delay") + @SerializedName("loop_delay") public String loopDelay; - @JsonProperty("override_previous_animation") + @SerializedName("override_previous_animation") public boolean overridePreviousAnimation; - @JsonProperty("particle_effects") + @SerializedName("particle_effects") private Map particleEffects = new HashMap<>(); - @JsonProperty("start_delay") + @SerializedName("start_delay") public String startDelay; - @JsonProperty("sound_effects") + @SerializedName("sound_effects") private Map soundEffects = new HashMap<>(); private Map timeline = new HashMap<>(); diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/animations/actoranimation/animations/Bones.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/animations/actoranimation/animations/Bones.java index 76a3fd5..5643921 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/animations/actoranimation/animations/Bones.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/animations/actoranimation/animations/Bones.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.animations.actoranimation.animations; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; import java.util.HashMap; import java.util.Map; @@ -19,7 +19,7 @@ public class Bones { private Map rotation = new HashMap<>(); - @JsonProperty("relative_to") + @SerializedName("relative_to") public RelativeTo relativeTo; private Map scale = new HashMap<>(); diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/animations/actoranimation/animations/bones/Position.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/animations/actoranimation/animations/bones/Position.java index a662c4b..6969b2f 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/animations/actoranimation/animations/bones/Position.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/animations/actoranimation/animations/bones/Position.java @@ -1,10 +1,10 @@ package org.geysermc.pack.bedrock.resource.animations.actoranimation.animations.bones; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; public class Position { - @JsonProperty("lerp_mode") + @SerializedName("lerp_mode") public String lerpMode; public String[] pre; diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/animations/actoranimation/animations/bones/Rotation.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/animations/actoranimation/animations/bones/Rotation.java index 45d766b..63065c0 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/animations/actoranimation/animations/bones/Rotation.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/animations/actoranimation/animations/bones/Rotation.java @@ -1,10 +1,10 @@ package org.geysermc.pack.bedrock.resource.animations.actoranimation.animations.bones; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; public class Rotation { - @JsonProperty("lerp_mode") + @SerializedName("lerp_mode") public String lerpMode; public String[] pre; diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/animations/actoranimation/animations/bones/Scale.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/animations/actoranimation/animations/bones/Scale.java index ef7a3ba..96caece 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/animations/actoranimation/animations/bones/Scale.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/animations/actoranimation/animations/bones/Scale.java @@ -1,10 +1,10 @@ package org.geysermc.pack.bedrock.resource.animations.actoranimation.animations.bones; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; public class Scale { - @JsonProperty("lerp_mode") + @SerializedName("lerp_mode") public String lerpMode; public String[] pre; diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/attachables/Attachables.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/attachables/Attachables.java index 9600f63..17e03fa 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/attachables/Attachables.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/attachables/Attachables.java @@ -1,16 +1,16 @@ package org.geysermc.pack.bedrock.resource.attachables; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** * Actor Animation 1.10.0 */ public class Attachables { - @JsonProperty("format_version") + @SerializedName("format_version") public String formatVersion; - @JsonProperty("minecraft:attachable") + @SerializedName("minecraft:attachable") public Attachable attachable; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/attachables/attachable/Description.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/attachables/attachable/Description.java index 70e1505..58fa8fa 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/attachables/attachable/Description.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/attachables/attachable/Description.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.attachables.attachable; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; import java.util.HashMap; import java.util.Map; @@ -13,10 +13,10 @@ import org.geysermc.pack.bedrock.resource.attachables.attachable.description.Spa public class Description { private Map animations = new HashMap<>(); - @JsonProperty("animation_controllers") + @SerializedName("animation_controllers") public String[] animationControllers; - @JsonProperty("enable_attachables") + @SerializedName("enable_attachables") public boolean enableAttachables; private Map geometry = new HashMap<>(); @@ -27,24 +27,24 @@ public class Description { private Map materials = new HashMap<>(); - @JsonProperty("min_engine_version") + @SerializedName("min_engine_version") public String minEngineVersion; - @JsonProperty("particle_effects") + @SerializedName("particle_effects") private Map particleEffects = new HashMap<>(); - @JsonProperty("particle_emitters") + @SerializedName("particle_emitters") private Map particleEmitters = new HashMap<>(); - @JsonProperty("render_controllers") + @SerializedName("render_controllers") public String[] renderControllers; public Scripts scripts; - @JsonProperty("sound_effects") + @SerializedName("sound_effects") public String[] soundEffects; - @JsonProperty("spawn_egg") + @SerializedName("spawn_egg") public SpawnEgg spawnEgg; private Map textures = new HashMap<>(); diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/attachables/attachable/description/Scripts.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/attachables/attachable/description/Scripts.java index 1827c44..51f4c90 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/attachables/attachable/description/Scripts.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/attachables/attachable/description/Scripts.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.attachables.attachable.description; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; import java.util.HashMap; import java.util.Map; @@ -11,7 +11,7 @@ import java.util.Map; public class Scripts { private Map animate = new HashMap<>(); - @JsonProperty("parent_setup") + @SerializedName("parent_setup") public String parentSetup; public String scale; diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/attachables/attachable/description/SpawnEgg.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/attachables/attachable/description/SpawnEgg.java index 5ea3e92..3c00492 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/attachables/attachable/description/SpawnEgg.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/attachables/attachable/description/SpawnEgg.java @@ -1,21 +1,21 @@ package org.geysermc.pack.bedrock.resource.attachables.attachable.description; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** * Spawn Egg */ public class SpawnEgg { - @JsonProperty("base_colour") + @SerializedName("base_colour") public String baseColour; - @JsonProperty("overlay_color") + @SerializedName("overlay_color") public String overlayColor; public String texture; - @JsonProperty("texture_index") + @SerializedName("texture_index") public int textureIndex; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/Biomes.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/Biomes.java index e319b02..091f065 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/Biomes.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/Biomes.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.biomesclient; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import org.geysermc.pack.bedrock.resource.biomesclient.biomes.BambooJungle; import org.geysermc.pack.bedrock.resource.biomesclient.biomes.BambooJungleHills; import org.geysermc.pack.bedrock.resource.biomesclient.biomes.BasaltDeltas; @@ -78,154 +78,154 @@ import org.geysermc.pack.bedrock.resource.biomesclient.biomes.WarpedForest; * A collection of predefined biomes. */ public class Biomes { - @JsonProperty("bamboo_jungle_hills") + @SerializedName("bamboo_jungle_hills") public BambooJungleHills bambooJungleHills; - @JsonProperty("bamboo_jungle") + @SerializedName("bamboo_jungle") public BambooJungle bambooJungle; - @JsonProperty("basalt_deltas") + @SerializedName("basalt_deltas") public BasaltDeltas basaltDeltas; public Beach beach; - @JsonProperty("birch_forest_hills") + @SerializedName("birch_forest_hills") public BirchForestHills birchForestHills; - @JsonProperty("birch_forest") + @SerializedName("birch_forest") public BirchForest birchForest; - @JsonProperty("cold_beach") + @SerializedName("cold_beach") public ColdBeach coldBeach; - @JsonProperty("cold_ocean") + @SerializedName("cold_ocean") public ColdOcean coldOcean; - @JsonProperty("cold_taiga_hills") + @SerializedName("cold_taiga_hills") public ColdTaigaHills coldTaigaHills; - @JsonProperty("cold_taiga_mutated") + @SerializedName("cold_taiga_mutated") public ColdTaigaMutated coldTaigaMutated; - @JsonProperty("cold_taiga") + @SerializedName("cold_taiga") public ColdTaiga coldTaiga; - @JsonProperty("crimson_forest") + @SerializedName("crimson_forest") public CrimsonForest crimsonForest; - @JsonProperty("deep_cold_ocean") + @SerializedName("deep_cold_ocean") public DeepColdOcean deepColdOcean; - @JsonProperty("deep_frozen_ocean") + @SerializedName("deep_frozen_ocean") public DeepFrozenOcean deepFrozenOcean; - @JsonProperty("deep_lukewarm_ocean") + @SerializedName("deep_lukewarm_ocean") public DeepLukewarmOcean deepLukewarmOcean; - @JsonProperty("deep_ocean") + @SerializedName("deep_ocean") public DeepOcean deepOcean; - @JsonProperty("deep_warm_ocean") + @SerializedName("deep_warm_ocean") public DeepWarmOcean deepWarmOcean; - @JsonProperty("default") + @SerializedName("default") public DefaultValue defaultValue; - @JsonProperty("desert_hills") + @SerializedName("desert_hills") public DesertHills desertHills; public Desert desert; - @JsonProperty("extreme_hills_edge") + @SerializedName("extreme_hills_edge") public ExtremeHillsEdge extremeHillsEdge; - @JsonProperty("extreme_hills_mutated") + @SerializedName("extreme_hills_mutated") public ExtremeHillsMutated extremeHillsMutated; - @JsonProperty("extreme_hills_plus_trees_mutated") + @SerializedName("extreme_hills_plus_trees_mutated") public ExtremeHillsPlusTreesMutated extremeHillsPlusTreesMutated; - @JsonProperty("extreme_hills_plus_trees") + @SerializedName("extreme_hills_plus_trees") public ExtremeHillsPlusTrees extremeHillsPlusTrees; - @JsonProperty("extreme_hills") + @SerializedName("extreme_hills") public ExtremeHills extremeHills; - @JsonProperty("flower_forest") + @SerializedName("flower_forest") public FlowerForest flowerForest; - @JsonProperty("forest_hills") + @SerializedName("forest_hills") public ForestHills forestHills; public Forest forest; - @JsonProperty("frozen_ocean") + @SerializedName("frozen_ocean") public FrozenOcean frozenOcean; - @JsonProperty("frozen_river") + @SerializedName("frozen_river") public FrozenRiver frozenRiver; public Hell hell; - @JsonProperty("ice_mountains") + @SerializedName("ice_mountains") public IceMountains iceMountains; - @JsonProperty("ice_plains_spikes") + @SerializedName("ice_plains_spikes") public IcePlainsSpikes icePlainsSpikes; - @JsonProperty("ice_plains") + @SerializedName("ice_plains") public IcePlains icePlains; - @JsonProperty("jungle_edge") + @SerializedName("jungle_edge") public JungleEdge jungleEdge; - @JsonProperty("jungle_hills") + @SerializedName("jungle_hills") public JungleHills jungleHills; - @JsonProperty("jungle_mutated") + @SerializedName("jungle_mutated") public JungleMutated jungleMutated; public Jungle jungle; - @JsonProperty("lukewarm_ocean") + @SerializedName("lukewarm_ocean") public LukewarmOcean lukewarmOcean; - @JsonProperty("mangrove_swamp") + @SerializedName("mangrove_swamp") public MangroveSwamp mangroveSwamp; - @JsonProperty("mega_spruce_taiga_mutated") + @SerializedName("mega_spruce_taiga_mutated") public MegaSpruceTaigaMutated megaSpruceTaigaMutated; - @JsonProperty("mega_spruce_taiga") + @SerializedName("mega_spruce_taiga") public MegaSpruceTaiga megaSpruceTaiga; - @JsonProperty("mega_taiga_hills") + @SerializedName("mega_taiga_hills") public MegaTaigaHills megaTaigaHills; - @JsonProperty("mega_taiga_mutated") + @SerializedName("mega_taiga_mutated") public MegaTaigaMutated megaTaigaMutated; - @JsonProperty("mega_taiga") + @SerializedName("mega_taiga") public MegaTaiga megaTaiga; - @JsonProperty("mesa_bryce") + @SerializedName("mesa_bryce") public MesaBryce mesaBryce; - @JsonProperty("mesa_mutated") + @SerializedName("mesa_mutated") public MesaMutated mesaMutated; - @JsonProperty("mesa_plateau_stone") + @SerializedName("mesa_plateau_stone") public MesaPlateauStone mesaPlateauStone; - @JsonProperty("mesa_plateau") + @SerializedName("mesa_plateau") public MesaPlateau mesaPlateau; public Mesa mesa; - @JsonProperty("mushroom_island_shore") + @SerializedName("mushroom_island_shore") public MushroomIslandShore mushroomIslandShore; - @JsonProperty("mushroom_island") + @SerializedName("mushroom_island") public MushroomIsland mushroomIsland; public Ocean ocean; @@ -234,46 +234,46 @@ public class Biomes { public River river; - @JsonProperty("roofed_forest") + @SerializedName("roofed_forest") public RoofedForest roofedForest; - @JsonProperty("savanna_mutated") + @SerializedName("savanna_mutated") public SavannaMutated savannaMutated; - @JsonProperty("savanna_plateau") + @SerializedName("savanna_plateau") public SavannaPlateau savannaPlateau; public Savanna savanna; - @JsonProperty("soulsand_valley") + @SerializedName("soulsand_valley") public SoulsandValley soulsandValley; - @JsonProperty("stone_beach") + @SerializedName("stone_beach") public StoneBeach stoneBeach; - @JsonProperty("sunflower_plains") + @SerializedName("sunflower_plains") public SunflowerPlains sunflowerPlains; - @JsonProperty("swampland_mutated") + @SerializedName("swampland_mutated") public SwamplandMutated swamplandMutated; public Swampland swampland; - @JsonProperty("taiga_hills") + @SerializedName("taiga_hills") public TaigaHills taigaHills; - @JsonProperty("taiga_mutated") + @SerializedName("taiga_mutated") public TaigaMutated taigaMutated; public Taiga taiga; - @JsonProperty("the_end") + @SerializedName("the_end") public TheEnd theEnd; - @JsonProperty("warm_ocean") + @SerializedName("warm_ocean") public WarmOcean warmOcean; - @JsonProperty("warped_forest") + @SerializedName("warped_forest") public WarpedForest warpedForest; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/BambooJungle.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/BambooJungle.java index 1d61328..ee279d4 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/BambooJungle.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/BambooJungle.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.biomesclient.biomes; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,22 +9,22 @@ import java.lang.String; * The specification of colors in a given biome. */ public class BambooJungle { - @JsonProperty("fog_identifier") + @SerializedName("fog_identifier") public String fogIdentifier; - @JsonProperty("fog_ids_to_merge") + @SerializedName("fog_ids_to_merge") public String[] fogIdsToMerge; - @JsonProperty("inherit_from_prior_fog") + @SerializedName("inherit_from_prior_fog") public boolean inheritFromPriorFog; - @JsonProperty("remove_all_prior_fog") + @SerializedName("remove_all_prior_fog") public boolean removeAllPriorFog; - @JsonProperty("water_fog_distance") + @SerializedName("water_fog_distance") public int waterFogDistance; - @JsonProperty("water_surface_transparency") + @SerializedName("water_surface_transparency") public float waterSurfaceTransparency; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/BambooJungleHills.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/BambooJungleHills.java index b9be9a4..7b6d2c3 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/BambooJungleHills.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/BambooJungleHills.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.biomesclient.biomes; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,22 +9,22 @@ import java.lang.String; * The specification of colors in a given biome. */ public class BambooJungleHills { - @JsonProperty("fog_identifier") + @SerializedName("fog_identifier") public String fogIdentifier; - @JsonProperty("fog_ids_to_merge") + @SerializedName("fog_ids_to_merge") public String[] fogIdsToMerge; - @JsonProperty("inherit_from_prior_fog") + @SerializedName("inherit_from_prior_fog") public boolean inheritFromPriorFog; - @JsonProperty("remove_all_prior_fog") + @SerializedName("remove_all_prior_fog") public boolean removeAllPriorFog; - @JsonProperty("water_fog_distance") + @SerializedName("water_fog_distance") public int waterFogDistance; - @JsonProperty("water_surface_transparency") + @SerializedName("water_surface_transparency") public float waterSurfaceTransparency; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/BasaltDeltas.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/BasaltDeltas.java index 7a19bbe..ddb14c3 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/BasaltDeltas.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/BasaltDeltas.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.biomesclient.biomes; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,22 +9,22 @@ import java.lang.String; * The specification of colors in a given biome. */ public class BasaltDeltas { - @JsonProperty("fog_identifier") + @SerializedName("fog_identifier") public String fogIdentifier; - @JsonProperty("fog_ids_to_merge") + @SerializedName("fog_ids_to_merge") public String[] fogIdsToMerge; - @JsonProperty("inherit_from_prior_fog") + @SerializedName("inherit_from_prior_fog") public boolean inheritFromPriorFog; - @JsonProperty("remove_all_prior_fog") + @SerializedName("remove_all_prior_fog") public boolean removeAllPriorFog; - @JsonProperty("water_fog_distance") + @SerializedName("water_fog_distance") public int waterFogDistance; - @JsonProperty("water_surface_transparency") + @SerializedName("water_surface_transparency") public float waterSurfaceTransparency; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/Beach.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/Beach.java index fb99f93..e8af3a2 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/Beach.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/Beach.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.biomesclient.biomes; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,22 +9,22 @@ import java.lang.String; * The specification of colors in a given biome. */ public class Beach { - @JsonProperty("fog_identifier") + @SerializedName("fog_identifier") public String fogIdentifier; - @JsonProperty("fog_ids_to_merge") + @SerializedName("fog_ids_to_merge") public String[] fogIdsToMerge; - @JsonProperty("inherit_from_prior_fog") + @SerializedName("inherit_from_prior_fog") public boolean inheritFromPriorFog; - @JsonProperty("remove_all_prior_fog") + @SerializedName("remove_all_prior_fog") public boolean removeAllPriorFog; - @JsonProperty("water_fog_distance") + @SerializedName("water_fog_distance") public int waterFogDistance; - @JsonProperty("water_surface_transparency") + @SerializedName("water_surface_transparency") public float waterSurfaceTransparency; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/BirchForest.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/BirchForest.java index 8eb1aca..1bf08b3 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/BirchForest.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/BirchForest.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.biomesclient.biomes; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,22 +9,22 @@ import java.lang.String; * The specification of colors in a given biome. */ public class BirchForest { - @JsonProperty("fog_identifier") + @SerializedName("fog_identifier") public String fogIdentifier; - @JsonProperty("fog_ids_to_merge") + @SerializedName("fog_ids_to_merge") public String[] fogIdsToMerge; - @JsonProperty("inherit_from_prior_fog") + @SerializedName("inherit_from_prior_fog") public boolean inheritFromPriorFog; - @JsonProperty("remove_all_prior_fog") + @SerializedName("remove_all_prior_fog") public boolean removeAllPriorFog; - @JsonProperty("water_fog_distance") + @SerializedName("water_fog_distance") public int waterFogDistance; - @JsonProperty("water_surface_transparency") + @SerializedName("water_surface_transparency") public float waterSurfaceTransparency; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/BirchForestHills.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/BirchForestHills.java index 22f8ac5..967d22a 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/BirchForestHills.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/BirchForestHills.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.biomesclient.biomes; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,22 +9,22 @@ import java.lang.String; * The specification of colors in a given biome. */ public class BirchForestHills { - @JsonProperty("fog_identifier") + @SerializedName("fog_identifier") public String fogIdentifier; - @JsonProperty("fog_ids_to_merge") + @SerializedName("fog_ids_to_merge") public String[] fogIdsToMerge; - @JsonProperty("inherit_from_prior_fog") + @SerializedName("inherit_from_prior_fog") public boolean inheritFromPriorFog; - @JsonProperty("remove_all_prior_fog") + @SerializedName("remove_all_prior_fog") public boolean removeAllPriorFog; - @JsonProperty("water_fog_distance") + @SerializedName("water_fog_distance") public int waterFogDistance; - @JsonProperty("water_surface_transparency") + @SerializedName("water_surface_transparency") public float waterSurfaceTransparency; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/ColdBeach.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/ColdBeach.java index d3f9fee..e04b090 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/ColdBeach.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/ColdBeach.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.biomesclient.biomes; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,22 +9,22 @@ import java.lang.String; * The specification of colors in a given biome. */ public class ColdBeach { - @JsonProperty("fog_identifier") + @SerializedName("fog_identifier") public String fogIdentifier; - @JsonProperty("fog_ids_to_merge") + @SerializedName("fog_ids_to_merge") public String[] fogIdsToMerge; - @JsonProperty("inherit_from_prior_fog") + @SerializedName("inherit_from_prior_fog") public boolean inheritFromPriorFog; - @JsonProperty("remove_all_prior_fog") + @SerializedName("remove_all_prior_fog") public boolean removeAllPriorFog; - @JsonProperty("water_fog_distance") + @SerializedName("water_fog_distance") public int waterFogDistance; - @JsonProperty("water_surface_transparency") + @SerializedName("water_surface_transparency") public float waterSurfaceTransparency; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/ColdOcean.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/ColdOcean.java index 23c9b1b..bd429e4 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/ColdOcean.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/ColdOcean.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.biomesclient.biomes; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,22 +9,22 @@ import java.lang.String; * The specification of colors in a given biome. */ public class ColdOcean { - @JsonProperty("fog_identifier") + @SerializedName("fog_identifier") public String fogIdentifier; - @JsonProperty("fog_ids_to_merge") + @SerializedName("fog_ids_to_merge") public String[] fogIdsToMerge; - @JsonProperty("inherit_from_prior_fog") + @SerializedName("inherit_from_prior_fog") public boolean inheritFromPriorFog; - @JsonProperty("remove_all_prior_fog") + @SerializedName("remove_all_prior_fog") public boolean removeAllPriorFog; - @JsonProperty("water_fog_distance") + @SerializedName("water_fog_distance") public int waterFogDistance; - @JsonProperty("water_surface_transparency") + @SerializedName("water_surface_transparency") public float waterSurfaceTransparency; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/ColdTaiga.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/ColdTaiga.java index 83a68fd..87fdcd7 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/ColdTaiga.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/ColdTaiga.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.biomesclient.biomes; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,22 +9,22 @@ import java.lang.String; * The specification of colors in a given biome. */ public class ColdTaiga { - @JsonProperty("fog_identifier") + @SerializedName("fog_identifier") public String fogIdentifier; - @JsonProperty("fog_ids_to_merge") + @SerializedName("fog_ids_to_merge") public String[] fogIdsToMerge; - @JsonProperty("inherit_from_prior_fog") + @SerializedName("inherit_from_prior_fog") public boolean inheritFromPriorFog; - @JsonProperty("remove_all_prior_fog") + @SerializedName("remove_all_prior_fog") public boolean removeAllPriorFog; - @JsonProperty("water_fog_distance") + @SerializedName("water_fog_distance") public int waterFogDistance; - @JsonProperty("water_surface_transparency") + @SerializedName("water_surface_transparency") public float waterSurfaceTransparency; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/ColdTaigaHills.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/ColdTaigaHills.java index da396c5..d245370 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/ColdTaigaHills.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/ColdTaigaHills.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.biomesclient.biomes; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,22 +9,22 @@ import java.lang.String; * The specification of colors in a given biome. */ public class ColdTaigaHills { - @JsonProperty("fog_identifier") + @SerializedName("fog_identifier") public String fogIdentifier; - @JsonProperty("fog_ids_to_merge") + @SerializedName("fog_ids_to_merge") public String[] fogIdsToMerge; - @JsonProperty("inherit_from_prior_fog") + @SerializedName("inherit_from_prior_fog") public boolean inheritFromPriorFog; - @JsonProperty("remove_all_prior_fog") + @SerializedName("remove_all_prior_fog") public boolean removeAllPriorFog; - @JsonProperty("water_fog_distance") + @SerializedName("water_fog_distance") public int waterFogDistance; - @JsonProperty("water_surface_transparency") + @SerializedName("water_surface_transparency") public float waterSurfaceTransparency; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/ColdTaigaMutated.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/ColdTaigaMutated.java index 9d2d975..9d9f1e2 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/ColdTaigaMutated.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/ColdTaigaMutated.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.biomesclient.biomes; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,22 +9,22 @@ import java.lang.String; * The specification of colors in a given biome. */ public class ColdTaigaMutated { - @JsonProperty("fog_identifier") + @SerializedName("fog_identifier") public String fogIdentifier; - @JsonProperty("fog_ids_to_merge") + @SerializedName("fog_ids_to_merge") public String[] fogIdsToMerge; - @JsonProperty("inherit_from_prior_fog") + @SerializedName("inherit_from_prior_fog") public boolean inheritFromPriorFog; - @JsonProperty("remove_all_prior_fog") + @SerializedName("remove_all_prior_fog") public boolean removeAllPriorFog; - @JsonProperty("water_fog_distance") + @SerializedName("water_fog_distance") public int waterFogDistance; - @JsonProperty("water_surface_transparency") + @SerializedName("water_surface_transparency") public float waterSurfaceTransparency; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/CrimsonForest.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/CrimsonForest.java index 03a7612..8eb9547 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/CrimsonForest.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/CrimsonForest.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.biomesclient.biomes; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,22 +9,22 @@ import java.lang.String; * The specification of colors in a given biome. */ public class CrimsonForest { - @JsonProperty("fog_identifier") + @SerializedName("fog_identifier") public String fogIdentifier; - @JsonProperty("fog_ids_to_merge") + @SerializedName("fog_ids_to_merge") public String[] fogIdsToMerge; - @JsonProperty("inherit_from_prior_fog") + @SerializedName("inherit_from_prior_fog") public boolean inheritFromPriorFog; - @JsonProperty("remove_all_prior_fog") + @SerializedName("remove_all_prior_fog") public boolean removeAllPriorFog; - @JsonProperty("water_fog_distance") + @SerializedName("water_fog_distance") public int waterFogDistance; - @JsonProperty("water_surface_transparency") + @SerializedName("water_surface_transparency") public float waterSurfaceTransparency; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/DeepColdOcean.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/DeepColdOcean.java index 2c24daa..4d933e5 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/DeepColdOcean.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/DeepColdOcean.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.biomesclient.biomes; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,22 +9,22 @@ import java.lang.String; * The specification of colors in a given biome. */ public class DeepColdOcean { - @JsonProperty("fog_identifier") + @SerializedName("fog_identifier") public String fogIdentifier; - @JsonProperty("fog_ids_to_merge") + @SerializedName("fog_ids_to_merge") public String[] fogIdsToMerge; - @JsonProperty("inherit_from_prior_fog") + @SerializedName("inherit_from_prior_fog") public boolean inheritFromPriorFog; - @JsonProperty("remove_all_prior_fog") + @SerializedName("remove_all_prior_fog") public boolean removeAllPriorFog; - @JsonProperty("water_fog_distance") + @SerializedName("water_fog_distance") public int waterFogDistance; - @JsonProperty("water_surface_transparency") + @SerializedName("water_surface_transparency") public float waterSurfaceTransparency; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/DeepFrozenOcean.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/DeepFrozenOcean.java index 10235ce..7231c20 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/DeepFrozenOcean.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/DeepFrozenOcean.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.biomesclient.biomes; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,22 +9,22 @@ import java.lang.String; * The specification of colors in a given biome. */ public class DeepFrozenOcean { - @JsonProperty("fog_identifier") + @SerializedName("fog_identifier") public String fogIdentifier; - @JsonProperty("fog_ids_to_merge") + @SerializedName("fog_ids_to_merge") public String[] fogIdsToMerge; - @JsonProperty("inherit_from_prior_fog") + @SerializedName("inherit_from_prior_fog") public boolean inheritFromPriorFog; - @JsonProperty("remove_all_prior_fog") + @SerializedName("remove_all_prior_fog") public boolean removeAllPriorFog; - @JsonProperty("water_fog_distance") + @SerializedName("water_fog_distance") public int waterFogDistance; - @JsonProperty("water_surface_transparency") + @SerializedName("water_surface_transparency") public float waterSurfaceTransparency; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/DeepLukewarmOcean.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/DeepLukewarmOcean.java index b7d9d19..7936db7 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/DeepLukewarmOcean.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/DeepLukewarmOcean.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.biomesclient.biomes; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,22 +9,22 @@ import java.lang.String; * The specification of colors in a given biome. */ public class DeepLukewarmOcean { - @JsonProperty("fog_identifier") + @SerializedName("fog_identifier") public String fogIdentifier; - @JsonProperty("fog_ids_to_merge") + @SerializedName("fog_ids_to_merge") public String[] fogIdsToMerge; - @JsonProperty("inherit_from_prior_fog") + @SerializedName("inherit_from_prior_fog") public boolean inheritFromPriorFog; - @JsonProperty("remove_all_prior_fog") + @SerializedName("remove_all_prior_fog") public boolean removeAllPriorFog; - @JsonProperty("water_fog_distance") + @SerializedName("water_fog_distance") public int waterFogDistance; - @JsonProperty("water_surface_transparency") + @SerializedName("water_surface_transparency") public float waterSurfaceTransparency; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/DeepOcean.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/DeepOcean.java index e361f9e..2b7b87a 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/DeepOcean.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/DeepOcean.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.biomesclient.biomes; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,22 +9,22 @@ import java.lang.String; * The specification of colors in a given biome. */ public class DeepOcean { - @JsonProperty("fog_identifier") + @SerializedName("fog_identifier") public String fogIdentifier; - @JsonProperty("fog_ids_to_merge") + @SerializedName("fog_ids_to_merge") public String[] fogIdsToMerge; - @JsonProperty("inherit_from_prior_fog") + @SerializedName("inherit_from_prior_fog") public boolean inheritFromPriorFog; - @JsonProperty("remove_all_prior_fog") + @SerializedName("remove_all_prior_fog") public boolean removeAllPriorFog; - @JsonProperty("water_fog_distance") + @SerializedName("water_fog_distance") public int waterFogDistance; - @JsonProperty("water_surface_transparency") + @SerializedName("water_surface_transparency") public float waterSurfaceTransparency; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/DeepWarmOcean.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/DeepWarmOcean.java index 0bf2cdd..7338d8d 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/DeepWarmOcean.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/DeepWarmOcean.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.biomesclient.biomes; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,22 +9,22 @@ import java.lang.String; * The specification of colors in a given biome. */ public class DeepWarmOcean { - @JsonProperty("fog_identifier") + @SerializedName("fog_identifier") public String fogIdentifier; - @JsonProperty("fog_ids_to_merge") + @SerializedName("fog_ids_to_merge") public String[] fogIdsToMerge; - @JsonProperty("inherit_from_prior_fog") + @SerializedName("inherit_from_prior_fog") public boolean inheritFromPriorFog; - @JsonProperty("remove_all_prior_fog") + @SerializedName("remove_all_prior_fog") public boolean removeAllPriorFog; - @JsonProperty("water_fog_distance") + @SerializedName("water_fog_distance") public int waterFogDistance; - @JsonProperty("water_surface_transparency") + @SerializedName("water_surface_transparency") public float waterSurfaceTransparency; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/DefaultValue.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/DefaultValue.java index 01c7db4..234b9ac 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/DefaultValue.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/DefaultValue.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.biomesclient.biomes; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,22 +9,22 @@ import java.lang.String; * The specification of colors in a given biome. */ public class DefaultValue { - @JsonProperty("fog_identifier") + @SerializedName("fog_identifier") public String fogIdentifier; - @JsonProperty("fog_ids_to_merge") + @SerializedName("fog_ids_to_merge") public String[] fogIdsToMerge; - @JsonProperty("inherit_from_prior_fog") + @SerializedName("inherit_from_prior_fog") public boolean inheritFromPriorFog; - @JsonProperty("remove_all_prior_fog") + @SerializedName("remove_all_prior_fog") public boolean removeAllPriorFog; - @JsonProperty("water_fog_distance") + @SerializedName("water_fog_distance") public int waterFogDistance; - @JsonProperty("water_surface_transparency") + @SerializedName("water_surface_transparency") public float waterSurfaceTransparency; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/Desert.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/Desert.java index fa45a72..50d763c 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/Desert.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/Desert.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.biomesclient.biomes; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,22 +9,22 @@ import java.lang.String; * The specification of colors in a given biome. */ public class Desert { - @JsonProperty("fog_identifier") + @SerializedName("fog_identifier") public String fogIdentifier; - @JsonProperty("fog_ids_to_merge") + @SerializedName("fog_ids_to_merge") public String[] fogIdsToMerge; - @JsonProperty("inherit_from_prior_fog") + @SerializedName("inherit_from_prior_fog") public boolean inheritFromPriorFog; - @JsonProperty("remove_all_prior_fog") + @SerializedName("remove_all_prior_fog") public boolean removeAllPriorFog; - @JsonProperty("water_fog_distance") + @SerializedName("water_fog_distance") public int waterFogDistance; - @JsonProperty("water_surface_transparency") + @SerializedName("water_surface_transparency") public float waterSurfaceTransparency; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/DesertHills.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/DesertHills.java index 48bd642..9b48c4f 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/DesertHills.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/DesertHills.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.biomesclient.biomes; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,22 +9,22 @@ import java.lang.String; * The specification of colors in a given biome. */ public class DesertHills { - @JsonProperty("fog_identifier") + @SerializedName("fog_identifier") public String fogIdentifier; - @JsonProperty("fog_ids_to_merge") + @SerializedName("fog_ids_to_merge") public String[] fogIdsToMerge; - @JsonProperty("inherit_from_prior_fog") + @SerializedName("inherit_from_prior_fog") public boolean inheritFromPriorFog; - @JsonProperty("remove_all_prior_fog") + @SerializedName("remove_all_prior_fog") public boolean removeAllPriorFog; - @JsonProperty("water_fog_distance") + @SerializedName("water_fog_distance") public int waterFogDistance; - @JsonProperty("water_surface_transparency") + @SerializedName("water_surface_transparency") public float waterSurfaceTransparency; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/ExtremeHills.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/ExtremeHills.java index 9bdb179..8f5510e 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/ExtremeHills.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/ExtremeHills.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.biomesclient.biomes; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,22 +9,22 @@ import java.lang.String; * The specification of colors in a given biome. */ public class ExtremeHills { - @JsonProperty("fog_identifier") + @SerializedName("fog_identifier") public String fogIdentifier; - @JsonProperty("fog_ids_to_merge") + @SerializedName("fog_ids_to_merge") public String[] fogIdsToMerge; - @JsonProperty("inherit_from_prior_fog") + @SerializedName("inherit_from_prior_fog") public boolean inheritFromPriorFog; - @JsonProperty("remove_all_prior_fog") + @SerializedName("remove_all_prior_fog") public boolean removeAllPriorFog; - @JsonProperty("water_fog_distance") + @SerializedName("water_fog_distance") public int waterFogDistance; - @JsonProperty("water_surface_transparency") + @SerializedName("water_surface_transparency") public float waterSurfaceTransparency; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/ExtremeHillsEdge.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/ExtremeHillsEdge.java index d8742c1..bb7a3d8 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/ExtremeHillsEdge.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/ExtremeHillsEdge.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.biomesclient.biomes; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,22 +9,22 @@ import java.lang.String; * The specification of colors in a given biome. */ public class ExtremeHillsEdge { - @JsonProperty("fog_identifier") + @SerializedName("fog_identifier") public String fogIdentifier; - @JsonProperty("fog_ids_to_merge") + @SerializedName("fog_ids_to_merge") public String[] fogIdsToMerge; - @JsonProperty("inherit_from_prior_fog") + @SerializedName("inherit_from_prior_fog") public boolean inheritFromPriorFog; - @JsonProperty("remove_all_prior_fog") + @SerializedName("remove_all_prior_fog") public boolean removeAllPriorFog; - @JsonProperty("water_fog_distance") + @SerializedName("water_fog_distance") public int waterFogDistance; - @JsonProperty("water_surface_transparency") + @SerializedName("water_surface_transparency") public float waterSurfaceTransparency; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/ExtremeHillsMutated.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/ExtremeHillsMutated.java index 957a578..4987bb4 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/ExtremeHillsMutated.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/ExtremeHillsMutated.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.biomesclient.biomes; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,22 +9,22 @@ import java.lang.String; * The specification of colors in a given biome. */ public class ExtremeHillsMutated { - @JsonProperty("fog_identifier") + @SerializedName("fog_identifier") public String fogIdentifier; - @JsonProperty("fog_ids_to_merge") + @SerializedName("fog_ids_to_merge") public String[] fogIdsToMerge; - @JsonProperty("inherit_from_prior_fog") + @SerializedName("inherit_from_prior_fog") public boolean inheritFromPriorFog; - @JsonProperty("remove_all_prior_fog") + @SerializedName("remove_all_prior_fog") public boolean removeAllPriorFog; - @JsonProperty("water_fog_distance") + @SerializedName("water_fog_distance") public int waterFogDistance; - @JsonProperty("water_surface_transparency") + @SerializedName("water_surface_transparency") public float waterSurfaceTransparency; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/ExtremeHillsPlusTrees.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/ExtremeHillsPlusTrees.java index ff10e51..1fc948e 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/ExtremeHillsPlusTrees.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/ExtremeHillsPlusTrees.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.biomesclient.biomes; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,22 +9,22 @@ import java.lang.String; * The specification of colors in a given biome. */ public class ExtremeHillsPlusTrees { - @JsonProperty("fog_identifier") + @SerializedName("fog_identifier") public String fogIdentifier; - @JsonProperty("fog_ids_to_merge") + @SerializedName("fog_ids_to_merge") public String[] fogIdsToMerge; - @JsonProperty("inherit_from_prior_fog") + @SerializedName("inherit_from_prior_fog") public boolean inheritFromPriorFog; - @JsonProperty("remove_all_prior_fog") + @SerializedName("remove_all_prior_fog") public boolean removeAllPriorFog; - @JsonProperty("water_fog_distance") + @SerializedName("water_fog_distance") public int waterFogDistance; - @JsonProperty("water_surface_transparency") + @SerializedName("water_surface_transparency") public float waterSurfaceTransparency; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/ExtremeHillsPlusTreesMutated.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/ExtremeHillsPlusTreesMutated.java index 2d6e63d..e04280d 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/ExtremeHillsPlusTreesMutated.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/ExtremeHillsPlusTreesMutated.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.biomesclient.biomes; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,22 +9,22 @@ import java.lang.String; * The specification of colors in a given biome. */ public class ExtremeHillsPlusTreesMutated { - @JsonProperty("fog_identifier") + @SerializedName("fog_identifier") public String fogIdentifier; - @JsonProperty("fog_ids_to_merge") + @SerializedName("fog_ids_to_merge") public String[] fogIdsToMerge; - @JsonProperty("inherit_from_prior_fog") + @SerializedName("inherit_from_prior_fog") public boolean inheritFromPriorFog; - @JsonProperty("remove_all_prior_fog") + @SerializedName("remove_all_prior_fog") public boolean removeAllPriorFog; - @JsonProperty("water_fog_distance") + @SerializedName("water_fog_distance") public int waterFogDistance; - @JsonProperty("water_surface_transparency") + @SerializedName("water_surface_transparency") public float waterSurfaceTransparency; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/FlowerForest.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/FlowerForest.java index be53037..bcaef2d 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/FlowerForest.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/FlowerForest.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.biomesclient.biomes; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,22 +9,22 @@ import java.lang.String; * The specification of colors in a given biome. */ public class FlowerForest { - @JsonProperty("fog_identifier") + @SerializedName("fog_identifier") public String fogIdentifier; - @JsonProperty("fog_ids_to_merge") + @SerializedName("fog_ids_to_merge") public String[] fogIdsToMerge; - @JsonProperty("inherit_from_prior_fog") + @SerializedName("inherit_from_prior_fog") public boolean inheritFromPriorFog; - @JsonProperty("remove_all_prior_fog") + @SerializedName("remove_all_prior_fog") public boolean removeAllPriorFog; - @JsonProperty("water_fog_distance") + @SerializedName("water_fog_distance") public int waterFogDistance; - @JsonProperty("water_surface_transparency") + @SerializedName("water_surface_transparency") public float waterSurfaceTransparency; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/Forest.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/Forest.java index 1fa1581..e4fae55 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/Forest.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/Forest.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.biomesclient.biomes; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,22 +9,22 @@ import java.lang.String; * The specification of colors in a given biome. */ public class Forest { - @JsonProperty("fog_identifier") + @SerializedName("fog_identifier") public String fogIdentifier; - @JsonProperty("fog_ids_to_merge") + @SerializedName("fog_ids_to_merge") public String[] fogIdsToMerge; - @JsonProperty("inherit_from_prior_fog") + @SerializedName("inherit_from_prior_fog") public boolean inheritFromPriorFog; - @JsonProperty("remove_all_prior_fog") + @SerializedName("remove_all_prior_fog") public boolean removeAllPriorFog; - @JsonProperty("water_fog_distance") + @SerializedName("water_fog_distance") public int waterFogDistance; - @JsonProperty("water_surface_transparency") + @SerializedName("water_surface_transparency") public float waterSurfaceTransparency; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/ForestHills.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/ForestHills.java index 2f1e70a..bc73f84 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/ForestHills.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/ForestHills.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.biomesclient.biomes; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,22 +9,22 @@ import java.lang.String; * The specification of colors in a given biome. */ public class ForestHills { - @JsonProperty("fog_identifier") + @SerializedName("fog_identifier") public String fogIdentifier; - @JsonProperty("fog_ids_to_merge") + @SerializedName("fog_ids_to_merge") public String[] fogIdsToMerge; - @JsonProperty("inherit_from_prior_fog") + @SerializedName("inherit_from_prior_fog") public boolean inheritFromPriorFog; - @JsonProperty("remove_all_prior_fog") + @SerializedName("remove_all_prior_fog") public boolean removeAllPriorFog; - @JsonProperty("water_fog_distance") + @SerializedName("water_fog_distance") public int waterFogDistance; - @JsonProperty("water_surface_transparency") + @SerializedName("water_surface_transparency") public float waterSurfaceTransparency; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/FrozenOcean.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/FrozenOcean.java index 8a2a676..bcefb8f 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/FrozenOcean.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/FrozenOcean.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.biomesclient.biomes; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,22 +9,22 @@ import java.lang.String; * The specification of colors in a given biome. */ public class FrozenOcean { - @JsonProperty("fog_identifier") + @SerializedName("fog_identifier") public String fogIdentifier; - @JsonProperty("fog_ids_to_merge") + @SerializedName("fog_ids_to_merge") public String[] fogIdsToMerge; - @JsonProperty("inherit_from_prior_fog") + @SerializedName("inherit_from_prior_fog") public boolean inheritFromPriorFog; - @JsonProperty("remove_all_prior_fog") + @SerializedName("remove_all_prior_fog") public boolean removeAllPriorFog; - @JsonProperty("water_fog_distance") + @SerializedName("water_fog_distance") public int waterFogDistance; - @JsonProperty("water_surface_transparency") + @SerializedName("water_surface_transparency") public float waterSurfaceTransparency; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/FrozenRiver.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/FrozenRiver.java index b7e2fb1..4dc295b 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/FrozenRiver.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/FrozenRiver.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.biomesclient.biomes; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,22 +9,22 @@ import java.lang.String; * The specification of colors in a given biome. */ public class FrozenRiver { - @JsonProperty("fog_identifier") + @SerializedName("fog_identifier") public String fogIdentifier; - @JsonProperty("fog_ids_to_merge") + @SerializedName("fog_ids_to_merge") public String[] fogIdsToMerge; - @JsonProperty("inherit_from_prior_fog") + @SerializedName("inherit_from_prior_fog") public boolean inheritFromPriorFog; - @JsonProperty("remove_all_prior_fog") + @SerializedName("remove_all_prior_fog") public boolean removeAllPriorFog; - @JsonProperty("water_fog_distance") + @SerializedName("water_fog_distance") public int waterFogDistance; - @JsonProperty("water_surface_transparency") + @SerializedName("water_surface_transparency") public float waterSurfaceTransparency; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/Hell.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/Hell.java index 4af4d54..7979d35 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/Hell.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/Hell.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.biomesclient.biomes; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,22 +9,22 @@ import java.lang.String; * The specification of colors in a given biome. */ public class Hell { - @JsonProperty("fog_identifier") + @SerializedName("fog_identifier") public String fogIdentifier; - @JsonProperty("fog_ids_to_merge") + @SerializedName("fog_ids_to_merge") public String[] fogIdsToMerge; - @JsonProperty("inherit_from_prior_fog") + @SerializedName("inherit_from_prior_fog") public boolean inheritFromPriorFog; - @JsonProperty("remove_all_prior_fog") + @SerializedName("remove_all_prior_fog") public boolean removeAllPriorFog; - @JsonProperty("water_fog_distance") + @SerializedName("water_fog_distance") public int waterFogDistance; - @JsonProperty("water_surface_transparency") + @SerializedName("water_surface_transparency") public float waterSurfaceTransparency; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/IceMountains.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/IceMountains.java index 2bf1790..1bb84c3 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/IceMountains.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/IceMountains.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.biomesclient.biomes; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,22 +9,22 @@ import java.lang.String; * The specification of colors in a given biome. */ public class IceMountains { - @JsonProperty("fog_identifier") + @SerializedName("fog_identifier") public String fogIdentifier; - @JsonProperty("fog_ids_to_merge") + @SerializedName("fog_ids_to_merge") public String[] fogIdsToMerge; - @JsonProperty("inherit_from_prior_fog") + @SerializedName("inherit_from_prior_fog") public boolean inheritFromPriorFog; - @JsonProperty("remove_all_prior_fog") + @SerializedName("remove_all_prior_fog") public boolean removeAllPriorFog; - @JsonProperty("water_fog_distance") + @SerializedName("water_fog_distance") public int waterFogDistance; - @JsonProperty("water_surface_transparency") + @SerializedName("water_surface_transparency") public float waterSurfaceTransparency; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/IcePlains.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/IcePlains.java index 28f1c7e..a2ec7ab 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/IcePlains.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/IcePlains.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.biomesclient.biomes; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,22 +9,22 @@ import java.lang.String; * The specification of colors in a given biome. */ public class IcePlains { - @JsonProperty("fog_identifier") + @SerializedName("fog_identifier") public String fogIdentifier; - @JsonProperty("fog_ids_to_merge") + @SerializedName("fog_ids_to_merge") public String[] fogIdsToMerge; - @JsonProperty("inherit_from_prior_fog") + @SerializedName("inherit_from_prior_fog") public boolean inheritFromPriorFog; - @JsonProperty("remove_all_prior_fog") + @SerializedName("remove_all_prior_fog") public boolean removeAllPriorFog; - @JsonProperty("water_fog_distance") + @SerializedName("water_fog_distance") public int waterFogDistance; - @JsonProperty("water_surface_transparency") + @SerializedName("water_surface_transparency") public float waterSurfaceTransparency; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/IcePlainsSpikes.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/IcePlainsSpikes.java index d5c2571..052e6b3 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/IcePlainsSpikes.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/IcePlainsSpikes.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.biomesclient.biomes; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,22 +9,22 @@ import java.lang.String; * The specification of colors in a given biome. */ public class IcePlainsSpikes { - @JsonProperty("fog_identifier") + @SerializedName("fog_identifier") public String fogIdentifier; - @JsonProperty("fog_ids_to_merge") + @SerializedName("fog_ids_to_merge") public String[] fogIdsToMerge; - @JsonProperty("inherit_from_prior_fog") + @SerializedName("inherit_from_prior_fog") public boolean inheritFromPriorFog; - @JsonProperty("remove_all_prior_fog") + @SerializedName("remove_all_prior_fog") public boolean removeAllPriorFog; - @JsonProperty("water_fog_distance") + @SerializedName("water_fog_distance") public int waterFogDistance; - @JsonProperty("water_surface_transparency") + @SerializedName("water_surface_transparency") public float waterSurfaceTransparency; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/Jungle.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/Jungle.java index c50edc4..0f5b91a 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/Jungle.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/Jungle.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.biomesclient.biomes; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,22 +9,22 @@ import java.lang.String; * The specification of colors in a given biome. */ public class Jungle { - @JsonProperty("fog_identifier") + @SerializedName("fog_identifier") public String fogIdentifier; - @JsonProperty("fog_ids_to_merge") + @SerializedName("fog_ids_to_merge") public String[] fogIdsToMerge; - @JsonProperty("inherit_from_prior_fog") + @SerializedName("inherit_from_prior_fog") public boolean inheritFromPriorFog; - @JsonProperty("remove_all_prior_fog") + @SerializedName("remove_all_prior_fog") public boolean removeAllPriorFog; - @JsonProperty("water_fog_distance") + @SerializedName("water_fog_distance") public int waterFogDistance; - @JsonProperty("water_surface_transparency") + @SerializedName("water_surface_transparency") public float waterSurfaceTransparency; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/JungleEdge.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/JungleEdge.java index e706100..5c9eb8a 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/JungleEdge.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/JungleEdge.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.biomesclient.biomes; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,22 +9,22 @@ import java.lang.String; * The specification of colors in a given biome. */ public class JungleEdge { - @JsonProperty("fog_identifier") + @SerializedName("fog_identifier") public String fogIdentifier; - @JsonProperty("fog_ids_to_merge") + @SerializedName("fog_ids_to_merge") public String[] fogIdsToMerge; - @JsonProperty("inherit_from_prior_fog") + @SerializedName("inherit_from_prior_fog") public boolean inheritFromPriorFog; - @JsonProperty("remove_all_prior_fog") + @SerializedName("remove_all_prior_fog") public boolean removeAllPriorFog; - @JsonProperty("water_fog_distance") + @SerializedName("water_fog_distance") public int waterFogDistance; - @JsonProperty("water_surface_transparency") + @SerializedName("water_surface_transparency") public float waterSurfaceTransparency; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/JungleHills.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/JungleHills.java index 9180ad4..4da9ede 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/JungleHills.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/JungleHills.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.biomesclient.biomes; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,22 +9,22 @@ import java.lang.String; * The specification of colors in a given biome. */ public class JungleHills { - @JsonProperty("fog_identifier") + @SerializedName("fog_identifier") public String fogIdentifier; - @JsonProperty("fog_ids_to_merge") + @SerializedName("fog_ids_to_merge") public String[] fogIdsToMerge; - @JsonProperty("inherit_from_prior_fog") + @SerializedName("inherit_from_prior_fog") public boolean inheritFromPriorFog; - @JsonProperty("remove_all_prior_fog") + @SerializedName("remove_all_prior_fog") public boolean removeAllPriorFog; - @JsonProperty("water_fog_distance") + @SerializedName("water_fog_distance") public int waterFogDistance; - @JsonProperty("water_surface_transparency") + @SerializedName("water_surface_transparency") public float waterSurfaceTransparency; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/JungleMutated.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/JungleMutated.java index fa75690..f17396a 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/JungleMutated.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/JungleMutated.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.biomesclient.biomes; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,22 +9,22 @@ import java.lang.String; * The specification of colors in a given biome. */ public class JungleMutated { - @JsonProperty("fog_identifier") + @SerializedName("fog_identifier") public String fogIdentifier; - @JsonProperty("fog_ids_to_merge") + @SerializedName("fog_ids_to_merge") public String[] fogIdsToMerge; - @JsonProperty("inherit_from_prior_fog") + @SerializedName("inherit_from_prior_fog") public boolean inheritFromPriorFog; - @JsonProperty("remove_all_prior_fog") + @SerializedName("remove_all_prior_fog") public boolean removeAllPriorFog; - @JsonProperty("water_fog_distance") + @SerializedName("water_fog_distance") public int waterFogDistance; - @JsonProperty("water_surface_transparency") + @SerializedName("water_surface_transparency") public float waterSurfaceTransparency; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/LukewarmOcean.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/LukewarmOcean.java index 1ab9860..6c66663 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/LukewarmOcean.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/LukewarmOcean.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.biomesclient.biomes; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,22 +9,22 @@ import java.lang.String; * The specification of colors in a given biome. */ public class LukewarmOcean { - @JsonProperty("fog_identifier") + @SerializedName("fog_identifier") public String fogIdentifier; - @JsonProperty("fog_ids_to_merge") + @SerializedName("fog_ids_to_merge") public String[] fogIdsToMerge; - @JsonProperty("inherit_from_prior_fog") + @SerializedName("inherit_from_prior_fog") public boolean inheritFromPriorFog; - @JsonProperty("remove_all_prior_fog") + @SerializedName("remove_all_prior_fog") public boolean removeAllPriorFog; - @JsonProperty("water_fog_distance") + @SerializedName("water_fog_distance") public int waterFogDistance; - @JsonProperty("water_surface_transparency") + @SerializedName("water_surface_transparency") public float waterSurfaceTransparency; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/MangroveSwamp.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/MangroveSwamp.java index a87d6f1..8507de6 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/MangroveSwamp.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/MangroveSwamp.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.biomesclient.biomes; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,22 +9,22 @@ import java.lang.String; * The specification of colors in a given biome. */ public class MangroveSwamp { - @JsonProperty("fog_identifier") + @SerializedName("fog_identifier") public String fogIdentifier; - @JsonProperty("fog_ids_to_merge") + @SerializedName("fog_ids_to_merge") public String[] fogIdsToMerge; - @JsonProperty("inherit_from_prior_fog") + @SerializedName("inherit_from_prior_fog") public boolean inheritFromPriorFog; - @JsonProperty("remove_all_prior_fog") + @SerializedName("remove_all_prior_fog") public boolean removeAllPriorFog; - @JsonProperty("water_fog_distance") + @SerializedName("water_fog_distance") public int waterFogDistance; - @JsonProperty("water_surface_transparency") + @SerializedName("water_surface_transparency") public float waterSurfaceTransparency; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/MegaSpruceTaiga.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/MegaSpruceTaiga.java index 365f3b9..78ce8bd 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/MegaSpruceTaiga.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/MegaSpruceTaiga.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.biomesclient.biomes; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,22 +9,22 @@ import java.lang.String; * The specification of colors in a given biome. */ public class MegaSpruceTaiga { - @JsonProperty("fog_identifier") + @SerializedName("fog_identifier") public String fogIdentifier; - @JsonProperty("fog_ids_to_merge") + @SerializedName("fog_ids_to_merge") public String[] fogIdsToMerge; - @JsonProperty("inherit_from_prior_fog") + @SerializedName("inherit_from_prior_fog") public boolean inheritFromPriorFog; - @JsonProperty("remove_all_prior_fog") + @SerializedName("remove_all_prior_fog") public boolean removeAllPriorFog; - @JsonProperty("water_fog_distance") + @SerializedName("water_fog_distance") public int waterFogDistance; - @JsonProperty("water_surface_transparency") + @SerializedName("water_surface_transparency") public float waterSurfaceTransparency; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/MegaSpruceTaigaMutated.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/MegaSpruceTaigaMutated.java index 5c217ab..176fae0 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/MegaSpruceTaigaMutated.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/MegaSpruceTaigaMutated.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.biomesclient.biomes; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,22 +9,22 @@ import java.lang.String; * The specification of colors in a given biome. */ public class MegaSpruceTaigaMutated { - @JsonProperty("fog_identifier") + @SerializedName("fog_identifier") public String fogIdentifier; - @JsonProperty("fog_ids_to_merge") + @SerializedName("fog_ids_to_merge") public String[] fogIdsToMerge; - @JsonProperty("inherit_from_prior_fog") + @SerializedName("inherit_from_prior_fog") public boolean inheritFromPriorFog; - @JsonProperty("remove_all_prior_fog") + @SerializedName("remove_all_prior_fog") public boolean removeAllPriorFog; - @JsonProperty("water_fog_distance") + @SerializedName("water_fog_distance") public int waterFogDistance; - @JsonProperty("water_surface_transparency") + @SerializedName("water_surface_transparency") public float waterSurfaceTransparency; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/MegaTaiga.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/MegaTaiga.java index b6c0019..574bc4f 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/MegaTaiga.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/MegaTaiga.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.biomesclient.biomes; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,22 +9,22 @@ import java.lang.String; * The specification of colors in a given biome. */ public class MegaTaiga { - @JsonProperty("fog_identifier") + @SerializedName("fog_identifier") public String fogIdentifier; - @JsonProperty("fog_ids_to_merge") + @SerializedName("fog_ids_to_merge") public String[] fogIdsToMerge; - @JsonProperty("inherit_from_prior_fog") + @SerializedName("inherit_from_prior_fog") public boolean inheritFromPriorFog; - @JsonProperty("remove_all_prior_fog") + @SerializedName("remove_all_prior_fog") public boolean removeAllPriorFog; - @JsonProperty("water_fog_distance") + @SerializedName("water_fog_distance") public int waterFogDistance; - @JsonProperty("water_surface_transparency") + @SerializedName("water_surface_transparency") public float waterSurfaceTransparency; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/MegaTaigaHills.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/MegaTaigaHills.java index 1f57044..1574b30 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/MegaTaigaHills.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/MegaTaigaHills.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.biomesclient.biomes; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,22 +9,22 @@ import java.lang.String; * The specification of colors in a given biome. */ public class MegaTaigaHills { - @JsonProperty("fog_identifier") + @SerializedName("fog_identifier") public String fogIdentifier; - @JsonProperty("fog_ids_to_merge") + @SerializedName("fog_ids_to_merge") public String[] fogIdsToMerge; - @JsonProperty("inherit_from_prior_fog") + @SerializedName("inherit_from_prior_fog") public boolean inheritFromPriorFog; - @JsonProperty("remove_all_prior_fog") + @SerializedName("remove_all_prior_fog") public boolean removeAllPriorFog; - @JsonProperty("water_fog_distance") + @SerializedName("water_fog_distance") public int waterFogDistance; - @JsonProperty("water_surface_transparency") + @SerializedName("water_surface_transparency") public float waterSurfaceTransparency; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/MegaTaigaMutated.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/MegaTaigaMutated.java index da7250d..0fff400 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/MegaTaigaMutated.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/MegaTaigaMutated.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.biomesclient.biomes; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,22 +9,22 @@ import java.lang.String; * The specification of colors in a given biome. */ public class MegaTaigaMutated { - @JsonProperty("fog_identifier") + @SerializedName("fog_identifier") public String fogIdentifier; - @JsonProperty("fog_ids_to_merge") + @SerializedName("fog_ids_to_merge") public String[] fogIdsToMerge; - @JsonProperty("inherit_from_prior_fog") + @SerializedName("inherit_from_prior_fog") public boolean inheritFromPriorFog; - @JsonProperty("remove_all_prior_fog") + @SerializedName("remove_all_prior_fog") public boolean removeAllPriorFog; - @JsonProperty("water_fog_distance") + @SerializedName("water_fog_distance") public int waterFogDistance; - @JsonProperty("water_surface_transparency") + @SerializedName("water_surface_transparency") public float waterSurfaceTransparency; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/Mesa.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/Mesa.java index 09dbdb5..24a38c8 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/Mesa.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/Mesa.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.biomesclient.biomes; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,22 +9,22 @@ import java.lang.String; * The specification of colors in a given biome. */ public class Mesa { - @JsonProperty("fog_identifier") + @SerializedName("fog_identifier") public String fogIdentifier; - @JsonProperty("fog_ids_to_merge") + @SerializedName("fog_ids_to_merge") public String[] fogIdsToMerge; - @JsonProperty("inherit_from_prior_fog") + @SerializedName("inherit_from_prior_fog") public boolean inheritFromPriorFog; - @JsonProperty("remove_all_prior_fog") + @SerializedName("remove_all_prior_fog") public boolean removeAllPriorFog; - @JsonProperty("water_fog_distance") + @SerializedName("water_fog_distance") public int waterFogDistance; - @JsonProperty("water_surface_transparency") + @SerializedName("water_surface_transparency") public float waterSurfaceTransparency; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/MesaBryce.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/MesaBryce.java index 82e6b56..e0f4e44 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/MesaBryce.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/MesaBryce.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.biomesclient.biomes; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,22 +9,22 @@ import java.lang.String; * The specification of colors in a given biome. */ public class MesaBryce { - @JsonProperty("fog_identifier") + @SerializedName("fog_identifier") public String fogIdentifier; - @JsonProperty("fog_ids_to_merge") + @SerializedName("fog_ids_to_merge") public String[] fogIdsToMerge; - @JsonProperty("inherit_from_prior_fog") + @SerializedName("inherit_from_prior_fog") public boolean inheritFromPriorFog; - @JsonProperty("remove_all_prior_fog") + @SerializedName("remove_all_prior_fog") public boolean removeAllPriorFog; - @JsonProperty("water_fog_distance") + @SerializedName("water_fog_distance") public int waterFogDistance; - @JsonProperty("water_surface_transparency") + @SerializedName("water_surface_transparency") public float waterSurfaceTransparency; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/MesaMutated.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/MesaMutated.java index 5719b0f..c71b171 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/MesaMutated.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/MesaMutated.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.biomesclient.biomes; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,22 +9,22 @@ import java.lang.String; * The specification of colors in a given biome. */ public class MesaMutated { - @JsonProperty("fog_identifier") + @SerializedName("fog_identifier") public String fogIdentifier; - @JsonProperty("fog_ids_to_merge") + @SerializedName("fog_ids_to_merge") public String[] fogIdsToMerge; - @JsonProperty("inherit_from_prior_fog") + @SerializedName("inherit_from_prior_fog") public boolean inheritFromPriorFog; - @JsonProperty("remove_all_prior_fog") + @SerializedName("remove_all_prior_fog") public boolean removeAllPriorFog; - @JsonProperty("water_fog_distance") + @SerializedName("water_fog_distance") public int waterFogDistance; - @JsonProperty("water_surface_transparency") + @SerializedName("water_surface_transparency") public float waterSurfaceTransparency; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/MesaPlateau.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/MesaPlateau.java index cf7aef0..2c47b3f 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/MesaPlateau.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/MesaPlateau.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.biomesclient.biomes; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,22 +9,22 @@ import java.lang.String; * The specification of colors in a given biome. */ public class MesaPlateau { - @JsonProperty("fog_identifier") + @SerializedName("fog_identifier") public String fogIdentifier; - @JsonProperty("fog_ids_to_merge") + @SerializedName("fog_ids_to_merge") public String[] fogIdsToMerge; - @JsonProperty("inherit_from_prior_fog") + @SerializedName("inherit_from_prior_fog") public boolean inheritFromPriorFog; - @JsonProperty("remove_all_prior_fog") + @SerializedName("remove_all_prior_fog") public boolean removeAllPriorFog; - @JsonProperty("water_fog_distance") + @SerializedName("water_fog_distance") public int waterFogDistance; - @JsonProperty("water_surface_transparency") + @SerializedName("water_surface_transparency") public float waterSurfaceTransparency; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/MesaPlateauStone.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/MesaPlateauStone.java index 99aa72b..4cb756f 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/MesaPlateauStone.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/MesaPlateauStone.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.biomesclient.biomes; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,22 +9,22 @@ import java.lang.String; * The specification of colors in a given biome. */ public class MesaPlateauStone { - @JsonProperty("fog_identifier") + @SerializedName("fog_identifier") public String fogIdentifier; - @JsonProperty("fog_ids_to_merge") + @SerializedName("fog_ids_to_merge") public String[] fogIdsToMerge; - @JsonProperty("inherit_from_prior_fog") + @SerializedName("inherit_from_prior_fog") public boolean inheritFromPriorFog; - @JsonProperty("remove_all_prior_fog") + @SerializedName("remove_all_prior_fog") public boolean removeAllPriorFog; - @JsonProperty("water_fog_distance") + @SerializedName("water_fog_distance") public int waterFogDistance; - @JsonProperty("water_surface_transparency") + @SerializedName("water_surface_transparency") public float waterSurfaceTransparency; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/MushroomIsland.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/MushroomIsland.java index 3492b4a..40c9902 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/MushroomIsland.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/MushroomIsland.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.biomesclient.biomes; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,22 +9,22 @@ import java.lang.String; * The specification of colors in a given biome. */ public class MushroomIsland { - @JsonProperty("fog_identifier") + @SerializedName("fog_identifier") public String fogIdentifier; - @JsonProperty("fog_ids_to_merge") + @SerializedName("fog_ids_to_merge") public String[] fogIdsToMerge; - @JsonProperty("inherit_from_prior_fog") + @SerializedName("inherit_from_prior_fog") public boolean inheritFromPriorFog; - @JsonProperty("remove_all_prior_fog") + @SerializedName("remove_all_prior_fog") public boolean removeAllPriorFog; - @JsonProperty("water_fog_distance") + @SerializedName("water_fog_distance") public int waterFogDistance; - @JsonProperty("water_surface_transparency") + @SerializedName("water_surface_transparency") public float waterSurfaceTransparency; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/MushroomIslandShore.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/MushroomIslandShore.java index 111e265..9b49356 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/MushroomIslandShore.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/MushroomIslandShore.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.biomesclient.biomes; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,22 +9,22 @@ import java.lang.String; * The specification of colors in a given biome. */ public class MushroomIslandShore { - @JsonProperty("fog_identifier") + @SerializedName("fog_identifier") public String fogIdentifier; - @JsonProperty("fog_ids_to_merge") + @SerializedName("fog_ids_to_merge") public String[] fogIdsToMerge; - @JsonProperty("inherit_from_prior_fog") + @SerializedName("inherit_from_prior_fog") public boolean inheritFromPriorFog; - @JsonProperty("remove_all_prior_fog") + @SerializedName("remove_all_prior_fog") public boolean removeAllPriorFog; - @JsonProperty("water_fog_distance") + @SerializedName("water_fog_distance") public int waterFogDistance; - @JsonProperty("water_surface_transparency") + @SerializedName("water_surface_transparency") public float waterSurfaceTransparency; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/Ocean.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/Ocean.java index fb90e51..586d854 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/Ocean.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/Ocean.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.biomesclient.biomes; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,22 +9,22 @@ import java.lang.String; * The specification of colors in a given biome. */ public class Ocean { - @JsonProperty("fog_identifier") + @SerializedName("fog_identifier") public String fogIdentifier; - @JsonProperty("fog_ids_to_merge") + @SerializedName("fog_ids_to_merge") public String[] fogIdsToMerge; - @JsonProperty("inherit_from_prior_fog") + @SerializedName("inherit_from_prior_fog") public boolean inheritFromPriorFog; - @JsonProperty("remove_all_prior_fog") + @SerializedName("remove_all_prior_fog") public boolean removeAllPriorFog; - @JsonProperty("water_fog_distance") + @SerializedName("water_fog_distance") public int waterFogDistance; - @JsonProperty("water_surface_transparency") + @SerializedName("water_surface_transparency") public float waterSurfaceTransparency; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/Plains.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/Plains.java index f5be322..0920610 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/Plains.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/Plains.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.biomesclient.biomes; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,22 +9,22 @@ import java.lang.String; * The specification of colors in a given biome. */ public class Plains { - @JsonProperty("fog_identifier") + @SerializedName("fog_identifier") public String fogIdentifier; - @JsonProperty("fog_ids_to_merge") + @SerializedName("fog_ids_to_merge") public String[] fogIdsToMerge; - @JsonProperty("inherit_from_prior_fog") + @SerializedName("inherit_from_prior_fog") public boolean inheritFromPriorFog; - @JsonProperty("remove_all_prior_fog") + @SerializedName("remove_all_prior_fog") public boolean removeAllPriorFog; - @JsonProperty("water_fog_distance") + @SerializedName("water_fog_distance") public int waterFogDistance; - @JsonProperty("water_surface_transparency") + @SerializedName("water_surface_transparency") public float waterSurfaceTransparency; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/River.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/River.java index e321a85..5f4de2a 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/River.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/River.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.biomesclient.biomes; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,22 +9,22 @@ import java.lang.String; * The specification of colors in a given biome. */ public class River { - @JsonProperty("fog_identifier") + @SerializedName("fog_identifier") public String fogIdentifier; - @JsonProperty("fog_ids_to_merge") + @SerializedName("fog_ids_to_merge") public String[] fogIdsToMerge; - @JsonProperty("inherit_from_prior_fog") + @SerializedName("inherit_from_prior_fog") public boolean inheritFromPriorFog; - @JsonProperty("remove_all_prior_fog") + @SerializedName("remove_all_prior_fog") public boolean removeAllPriorFog; - @JsonProperty("water_fog_distance") + @SerializedName("water_fog_distance") public int waterFogDistance; - @JsonProperty("water_surface_transparency") + @SerializedName("water_surface_transparency") public float waterSurfaceTransparency; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/RoofedForest.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/RoofedForest.java index 060749b..cee10a8 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/RoofedForest.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/RoofedForest.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.biomesclient.biomes; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,22 +9,22 @@ import java.lang.String; * The specification of colors in a given biome. */ public class RoofedForest { - @JsonProperty("fog_identifier") + @SerializedName("fog_identifier") public String fogIdentifier; - @JsonProperty("fog_ids_to_merge") + @SerializedName("fog_ids_to_merge") public String[] fogIdsToMerge; - @JsonProperty("inherit_from_prior_fog") + @SerializedName("inherit_from_prior_fog") public boolean inheritFromPriorFog; - @JsonProperty("remove_all_prior_fog") + @SerializedName("remove_all_prior_fog") public boolean removeAllPriorFog; - @JsonProperty("water_fog_distance") + @SerializedName("water_fog_distance") public int waterFogDistance; - @JsonProperty("water_surface_transparency") + @SerializedName("water_surface_transparency") public float waterSurfaceTransparency; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/Savanna.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/Savanna.java index 07244d0..4f759a5 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/Savanna.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/Savanna.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.biomesclient.biomes; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,22 +9,22 @@ import java.lang.String; * The specification of colors in a given biome. */ public class Savanna { - @JsonProperty("fog_identifier") + @SerializedName("fog_identifier") public String fogIdentifier; - @JsonProperty("fog_ids_to_merge") + @SerializedName("fog_ids_to_merge") public String[] fogIdsToMerge; - @JsonProperty("inherit_from_prior_fog") + @SerializedName("inherit_from_prior_fog") public boolean inheritFromPriorFog; - @JsonProperty("remove_all_prior_fog") + @SerializedName("remove_all_prior_fog") public boolean removeAllPriorFog; - @JsonProperty("water_fog_distance") + @SerializedName("water_fog_distance") public int waterFogDistance; - @JsonProperty("water_surface_transparency") + @SerializedName("water_surface_transparency") public float waterSurfaceTransparency; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/SavannaMutated.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/SavannaMutated.java index c17abce..cbbf41c 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/SavannaMutated.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/SavannaMutated.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.biomesclient.biomes; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,22 +9,22 @@ import java.lang.String; * The specification of colors in a given biome. */ public class SavannaMutated { - @JsonProperty("fog_identifier") + @SerializedName("fog_identifier") public String fogIdentifier; - @JsonProperty("fog_ids_to_merge") + @SerializedName("fog_ids_to_merge") public String[] fogIdsToMerge; - @JsonProperty("inherit_from_prior_fog") + @SerializedName("inherit_from_prior_fog") public boolean inheritFromPriorFog; - @JsonProperty("remove_all_prior_fog") + @SerializedName("remove_all_prior_fog") public boolean removeAllPriorFog; - @JsonProperty("water_fog_distance") + @SerializedName("water_fog_distance") public int waterFogDistance; - @JsonProperty("water_surface_transparency") + @SerializedName("water_surface_transparency") public float waterSurfaceTransparency; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/SavannaPlateau.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/SavannaPlateau.java index cf922c1..9ff8303 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/SavannaPlateau.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/SavannaPlateau.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.biomesclient.biomes; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,22 +9,22 @@ import java.lang.String; * The specification of colors in a given biome. */ public class SavannaPlateau { - @JsonProperty("fog_identifier") + @SerializedName("fog_identifier") public String fogIdentifier; - @JsonProperty("fog_ids_to_merge") + @SerializedName("fog_ids_to_merge") public String[] fogIdsToMerge; - @JsonProperty("inherit_from_prior_fog") + @SerializedName("inherit_from_prior_fog") public boolean inheritFromPriorFog; - @JsonProperty("remove_all_prior_fog") + @SerializedName("remove_all_prior_fog") public boolean removeAllPriorFog; - @JsonProperty("water_fog_distance") + @SerializedName("water_fog_distance") public int waterFogDistance; - @JsonProperty("water_surface_transparency") + @SerializedName("water_surface_transparency") public float waterSurfaceTransparency; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/SoulsandValley.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/SoulsandValley.java index 77dc88c..45c8848 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/SoulsandValley.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/SoulsandValley.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.biomesclient.biomes; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,22 +9,22 @@ import java.lang.String; * The specification of colors in a given biome. */ public class SoulsandValley { - @JsonProperty("fog_identifier") + @SerializedName("fog_identifier") public String fogIdentifier; - @JsonProperty("fog_ids_to_merge") + @SerializedName("fog_ids_to_merge") public String[] fogIdsToMerge; - @JsonProperty("inherit_from_prior_fog") + @SerializedName("inherit_from_prior_fog") public boolean inheritFromPriorFog; - @JsonProperty("remove_all_prior_fog") + @SerializedName("remove_all_prior_fog") public boolean removeAllPriorFog; - @JsonProperty("water_fog_distance") + @SerializedName("water_fog_distance") public int waterFogDistance; - @JsonProperty("water_surface_transparency") + @SerializedName("water_surface_transparency") public float waterSurfaceTransparency; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/StoneBeach.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/StoneBeach.java index 10f9df8..988ba05 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/StoneBeach.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/StoneBeach.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.biomesclient.biomes; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,22 +9,22 @@ import java.lang.String; * The specification of colors in a given biome. */ public class StoneBeach { - @JsonProperty("fog_identifier") + @SerializedName("fog_identifier") public String fogIdentifier; - @JsonProperty("fog_ids_to_merge") + @SerializedName("fog_ids_to_merge") public String[] fogIdsToMerge; - @JsonProperty("inherit_from_prior_fog") + @SerializedName("inherit_from_prior_fog") public boolean inheritFromPriorFog; - @JsonProperty("remove_all_prior_fog") + @SerializedName("remove_all_prior_fog") public boolean removeAllPriorFog; - @JsonProperty("water_fog_distance") + @SerializedName("water_fog_distance") public int waterFogDistance; - @JsonProperty("water_surface_transparency") + @SerializedName("water_surface_transparency") public float waterSurfaceTransparency; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/SunflowerPlains.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/SunflowerPlains.java index e6241cf..d02c9cd 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/SunflowerPlains.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/SunflowerPlains.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.biomesclient.biomes; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,22 +9,22 @@ import java.lang.String; * The specification of colors in a given biome. */ public class SunflowerPlains { - @JsonProperty("fog_identifier") + @SerializedName("fog_identifier") public String fogIdentifier; - @JsonProperty("fog_ids_to_merge") + @SerializedName("fog_ids_to_merge") public String[] fogIdsToMerge; - @JsonProperty("inherit_from_prior_fog") + @SerializedName("inherit_from_prior_fog") public boolean inheritFromPriorFog; - @JsonProperty("remove_all_prior_fog") + @SerializedName("remove_all_prior_fog") public boolean removeAllPriorFog; - @JsonProperty("water_fog_distance") + @SerializedName("water_fog_distance") public int waterFogDistance; - @JsonProperty("water_surface_transparency") + @SerializedName("water_surface_transparency") public float waterSurfaceTransparency; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/Swampland.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/Swampland.java index 925e8f6..1af552f 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/Swampland.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/Swampland.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.biomesclient.biomes; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,22 +9,22 @@ import java.lang.String; * The specification of colors in a given biome. */ public class Swampland { - @JsonProperty("fog_identifier") + @SerializedName("fog_identifier") public String fogIdentifier; - @JsonProperty("fog_ids_to_merge") + @SerializedName("fog_ids_to_merge") public String[] fogIdsToMerge; - @JsonProperty("inherit_from_prior_fog") + @SerializedName("inherit_from_prior_fog") public boolean inheritFromPriorFog; - @JsonProperty("remove_all_prior_fog") + @SerializedName("remove_all_prior_fog") public boolean removeAllPriorFog; - @JsonProperty("water_fog_distance") + @SerializedName("water_fog_distance") public int waterFogDistance; - @JsonProperty("water_surface_transparency") + @SerializedName("water_surface_transparency") public float waterSurfaceTransparency; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/SwamplandMutated.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/SwamplandMutated.java index b6fe5da..2705b14 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/SwamplandMutated.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/SwamplandMutated.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.biomesclient.biomes; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,22 +9,22 @@ import java.lang.String; * The specification of colors in a given biome. */ public class SwamplandMutated { - @JsonProperty("fog_identifier") + @SerializedName("fog_identifier") public String fogIdentifier; - @JsonProperty("fog_ids_to_merge") + @SerializedName("fog_ids_to_merge") public String[] fogIdsToMerge; - @JsonProperty("inherit_from_prior_fog") + @SerializedName("inherit_from_prior_fog") public boolean inheritFromPriorFog; - @JsonProperty("remove_all_prior_fog") + @SerializedName("remove_all_prior_fog") public boolean removeAllPriorFog; - @JsonProperty("water_fog_distance") + @SerializedName("water_fog_distance") public int waterFogDistance; - @JsonProperty("water_surface_transparency") + @SerializedName("water_surface_transparency") public float waterSurfaceTransparency; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/Taiga.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/Taiga.java index 5d74654..fe2dbed 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/Taiga.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/Taiga.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.biomesclient.biomes; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,22 +9,22 @@ import java.lang.String; * The specification of colors in a given biome. */ public class Taiga { - @JsonProperty("fog_identifier") + @SerializedName("fog_identifier") public String fogIdentifier; - @JsonProperty("fog_ids_to_merge") + @SerializedName("fog_ids_to_merge") public String[] fogIdsToMerge; - @JsonProperty("inherit_from_prior_fog") + @SerializedName("inherit_from_prior_fog") public boolean inheritFromPriorFog; - @JsonProperty("remove_all_prior_fog") + @SerializedName("remove_all_prior_fog") public boolean removeAllPriorFog; - @JsonProperty("water_fog_distance") + @SerializedName("water_fog_distance") public int waterFogDistance; - @JsonProperty("water_surface_transparency") + @SerializedName("water_surface_transparency") public float waterSurfaceTransparency; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/TaigaHills.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/TaigaHills.java index e3ebd9f..2166edc 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/TaigaHills.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/TaigaHills.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.biomesclient.biomes; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,22 +9,22 @@ import java.lang.String; * The specification of colors in a given biome. */ public class TaigaHills { - @JsonProperty("fog_identifier") + @SerializedName("fog_identifier") public String fogIdentifier; - @JsonProperty("fog_ids_to_merge") + @SerializedName("fog_ids_to_merge") public String[] fogIdsToMerge; - @JsonProperty("inherit_from_prior_fog") + @SerializedName("inherit_from_prior_fog") public boolean inheritFromPriorFog; - @JsonProperty("remove_all_prior_fog") + @SerializedName("remove_all_prior_fog") public boolean removeAllPriorFog; - @JsonProperty("water_fog_distance") + @SerializedName("water_fog_distance") public int waterFogDistance; - @JsonProperty("water_surface_transparency") + @SerializedName("water_surface_transparency") public float waterSurfaceTransparency; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/TaigaMutated.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/TaigaMutated.java index 84f6507..a77dcf3 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/TaigaMutated.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/TaigaMutated.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.biomesclient.biomes; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,22 +9,22 @@ import java.lang.String; * The specification of colors in a given biome. */ public class TaigaMutated { - @JsonProperty("fog_identifier") + @SerializedName("fog_identifier") public String fogIdentifier; - @JsonProperty("fog_ids_to_merge") + @SerializedName("fog_ids_to_merge") public String[] fogIdsToMerge; - @JsonProperty("inherit_from_prior_fog") + @SerializedName("inherit_from_prior_fog") public boolean inheritFromPriorFog; - @JsonProperty("remove_all_prior_fog") + @SerializedName("remove_all_prior_fog") public boolean removeAllPriorFog; - @JsonProperty("water_fog_distance") + @SerializedName("water_fog_distance") public int waterFogDistance; - @JsonProperty("water_surface_transparency") + @SerializedName("water_surface_transparency") public float waterSurfaceTransparency; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/TheEnd.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/TheEnd.java index 9208cb0..de7751c 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/TheEnd.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/TheEnd.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.biomesclient.biomes; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,22 +9,22 @@ import java.lang.String; * The specification of colors in a given biome. */ public class TheEnd { - @JsonProperty("fog_identifier") + @SerializedName("fog_identifier") public String fogIdentifier; - @JsonProperty("fog_ids_to_merge") + @SerializedName("fog_ids_to_merge") public String[] fogIdsToMerge; - @JsonProperty("inherit_from_prior_fog") + @SerializedName("inherit_from_prior_fog") public boolean inheritFromPriorFog; - @JsonProperty("remove_all_prior_fog") + @SerializedName("remove_all_prior_fog") public boolean removeAllPriorFog; - @JsonProperty("water_fog_distance") + @SerializedName("water_fog_distance") public int waterFogDistance; - @JsonProperty("water_surface_transparency") + @SerializedName("water_surface_transparency") public float waterSurfaceTransparency; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/WarmOcean.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/WarmOcean.java index 143c1bd..8da6228 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/WarmOcean.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/WarmOcean.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.biomesclient.biomes; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,22 +9,22 @@ import java.lang.String; * The specification of colors in a given biome. */ public class WarmOcean { - @JsonProperty("fog_identifier") + @SerializedName("fog_identifier") public String fogIdentifier; - @JsonProperty("fog_ids_to_merge") + @SerializedName("fog_ids_to_merge") public String[] fogIdsToMerge; - @JsonProperty("inherit_from_prior_fog") + @SerializedName("inherit_from_prior_fog") public boolean inheritFromPriorFog; - @JsonProperty("remove_all_prior_fog") + @SerializedName("remove_all_prior_fog") public boolean removeAllPriorFog; - @JsonProperty("water_fog_distance") + @SerializedName("water_fog_distance") public int waterFogDistance; - @JsonProperty("water_surface_transparency") + @SerializedName("water_surface_transparency") public float waterSurfaceTransparency; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/WarpedForest.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/WarpedForest.java index 00875c4..b0a8a85 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/WarpedForest.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/biomesclient/biomes/WarpedForest.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.biomesclient.biomes; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,22 +9,22 @@ import java.lang.String; * The specification of colors in a given biome. */ public class WarpedForest { - @JsonProperty("fog_identifier") + @SerializedName("fog_identifier") public String fogIdentifier; - @JsonProperty("fog_ids_to_merge") + @SerializedName("fog_ids_to_merge") public String[] fogIdsToMerge; - @JsonProperty("inherit_from_prior_fog") + @SerializedName("inherit_from_prior_fog") public boolean inheritFromPriorFog; - @JsonProperty("remove_all_prior_fog") + @SerializedName("remove_all_prior_fog") public boolean removeAllPriorFog; - @JsonProperty("water_fog_distance") + @SerializedName("water_fog_distance") public int waterFogDistance; - @JsonProperty("water_surface_transparency") + @SerializedName("water_surface_transparency") public float waterSurfaceTransparency; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/entity/Entity.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/entity/Entity.java index 445aaca..85737ee 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/entity/Entity.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/entity/Entity.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.entity; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,10 +9,10 @@ import java.lang.String; * A client side entity definition. */ public class Entity { - @JsonProperty("format_version") + @SerializedName("format_version") public String formatVersion; - @JsonProperty("minecraft:client_entity") + @SerializedName("minecraft:client_entity") public ClientEntity clientEntity; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/entity/cliententity/Description.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/entity/cliententity/Description.java index db5c461..bef56a9 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/entity/cliententity/Description.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/entity/cliententity/Description.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.entity.cliententity; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; import java.util.HashMap; import java.util.Map; @@ -15,42 +15,42 @@ import org.geysermc.pack.bedrock.resource.entity.cliententity.description.SpawnE public class Description { private Map animations = new HashMap<>(); - @JsonProperty("enable_attachables") + @SerializedName("enable_attachables") public boolean enableAttachables; private Map geometry = new HashMap<>(); - @JsonProperty("queryable_geometry") + @SerializedName("queryable_geometry") public String queryableGeometry; - @JsonProperty("hide_armor") + @SerializedName("hide_armor") public boolean hideArmor; - @JsonProperty("held_item_ignores_lighting") + @SerializedName("held_item_ignores_lighting") public boolean heldItemIgnoresLighting; public String identifier; private Map materials = new HashMap<>(); - @JsonProperty("min_engine_version") + @SerializedName("min_engine_version") public String minEngineVersion; - @JsonProperty("particle_effects") + @SerializedName("particle_effects") private Map particleEffects = new HashMap<>(); - @JsonProperty("particle_emitters") + @SerializedName("particle_emitters") private Map particleEmitters = new HashMap<>(); - @JsonProperty("render_controllers") + @SerializedName("render_controllers") public String[] renderControllers; public Scripts scripts; - @JsonProperty("sound_effects") + @SerializedName("sound_effects") private Map soundEffects = new HashMap<>(); - @JsonProperty("spawn_egg") + @SerializedName("spawn_egg") public SpawnEgg spawnEgg; private Map textures = new HashMap<>(); diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/entity/cliententity/description/Scripts.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/entity/cliententity/description/Scripts.java index 8677d44..284751f 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/entity/cliententity/description/Scripts.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/entity/cliententity/description/Scripts.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.entity.cliententity.description; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; import java.util.HashMap; import java.util.Map; @@ -13,7 +13,7 @@ import java.util.Map; public class Scripts { public String[] animate; - @JsonProperty("parent_setup") + @SerializedName("parent_setup") public String parentSetup; public String scale; @@ -24,10 +24,10 @@ public class Scripts { public String scalez; - @JsonProperty("should_update_bones_and_effects_offscreen") + @SerializedName("should_update_bones_and_effects_offscreen") public String shouldUpdateBonesAndEffectsOffscreen; - @JsonProperty("should_update_effects_offscreen") + @SerializedName("should_update_effects_offscreen") public String shouldUpdateEffectsOffscreen; private Map variables = new HashMap<>(); diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/entity/cliententity/description/SpawnEgg.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/entity/cliententity/description/SpawnEgg.java index 7dd1264..ac4f866 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/entity/cliententity/description/SpawnEgg.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/entity/cliententity/description/SpawnEgg.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.entity.cliententity.description; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,15 +9,15 @@ import java.lang.String; * The definition of how the spawn_egg icon looks like. */ public class SpawnEgg { - @JsonProperty("base_color") + @SerializedName("base_color") public String baseColor; - @JsonProperty("overlay_color") + @SerializedName("overlay_color") public String overlayColor; public String texture; - @JsonProperty("texture_index") + @SerializedName("texture_index") public int textureIndex; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/Fog.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/Fog.java index 9e13876..1ab7339 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/Fog.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/Fog.java @@ -1,16 +1,16 @@ package org.geysermc.pack.bedrock.resource.fog; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** * Fog */ public class Fog { - @JsonProperty("format_version") + @SerializedName("format_version") public String formatVersion; - @JsonProperty("minecraft:fog_settings") + @SerializedName("minecraft:fog_settings") public FogSettings fogSettings; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/Distance.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/Distance.java index ecf1261..d433aad 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/Distance.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/Distance.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.fog.fogsettings; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import org.geysermc.pack.bedrock.resource.fog.fogsettings.distance.Air; import org.geysermc.pack.bedrock.resource.fog.fogsettings.distance.Lava; import org.geysermc.pack.bedrock.resource.fog.fogsettings.distance.LavaResistance; @@ -22,10 +22,10 @@ public class Distance { public Lava lava; - @JsonProperty("lava_resistance") + @SerializedName("lava_resistance") public LavaResistance lavaResistance; - @JsonProperty("powder_snow") + @SerializedName("powder_snow") public PowderSnow powderSnow; public Air air() { diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/Volumetric.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/Volumetric.java index 36ad04d..32431e7 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/Volumetric.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/Volumetric.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.fog.fogsettings; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import org.geysermc.pack.bedrock.resource.fog.fogsettings.volumetric.Density; import org.geysermc.pack.bedrock.resource.fog.fogsettings.volumetric.MediaCoefficients; @@ -12,7 +12,7 @@ import org.geysermc.pack.bedrock.resource.fog.fogsettings.volumetric.MediaCoeffi public class Volumetric { public Density density; - @JsonProperty("media_coefficients") + @SerializedName("media_coefficients") public MediaCoefficients mediaCoefficients; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/distance/Air.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/distance/Air.java index 9ced189..b636811 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/distance/Air.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/distance/Air.java @@ -1,23 +1,23 @@ package org.geysermc.pack.bedrock.resource.fog.fogsettings.distance; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; import org.geysermc.pack.bedrock.resource.fog.fogsettings.distance.air.TransitionFog; public class Air { - @JsonProperty("fog_start") + @SerializedName("fog_start") public float fogStart; - @JsonProperty("fog_end") + @SerializedName("fog_end") public float fogEnd; - @JsonProperty("fog_color") + @SerializedName("fog_color") public String fogColor; - @JsonProperty("render_distance_type") + @SerializedName("render_distance_type") public String renderDistanceType; - @JsonProperty("transition_fog") + @SerializedName("transition_fog") public TransitionFog transitionFog; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/distance/Lava.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/distance/Lava.java index 3d37f49..133a30f 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/distance/Lava.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/distance/Lava.java @@ -1,23 +1,23 @@ package org.geysermc.pack.bedrock.resource.fog.fogsettings.distance; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; import org.geysermc.pack.bedrock.resource.fog.fogsettings.distance.lava.TransitionFog; public class Lava { - @JsonProperty("fog_start") + @SerializedName("fog_start") public float fogStart; - @JsonProperty("fog_end") + @SerializedName("fog_end") public float fogEnd; - @JsonProperty("fog_color") + @SerializedName("fog_color") public String fogColor; - @JsonProperty("render_distance_type") + @SerializedName("render_distance_type") public String renderDistanceType; - @JsonProperty("transition_fog") + @SerializedName("transition_fog") public TransitionFog transitionFog; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/distance/LavaResistance.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/distance/LavaResistance.java index 06b6eaa..f9809d1 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/distance/LavaResistance.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/distance/LavaResistance.java @@ -1,23 +1,23 @@ package org.geysermc.pack.bedrock.resource.fog.fogsettings.distance; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; import org.geysermc.pack.bedrock.resource.fog.fogsettings.distance.lavaresistance.TransitionFog; public class LavaResistance { - @JsonProperty("fog_start") + @SerializedName("fog_start") public float fogStart; - @JsonProperty("fog_end") + @SerializedName("fog_end") public float fogEnd; - @JsonProperty("fog_color") + @SerializedName("fog_color") public String fogColor; - @JsonProperty("render_distance_type") + @SerializedName("render_distance_type") public String renderDistanceType; - @JsonProperty("transition_fog") + @SerializedName("transition_fog") public TransitionFog transitionFog; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/distance/PowderSnow.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/distance/PowderSnow.java index 22bd4e2..2b6aef9 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/distance/PowderSnow.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/distance/PowderSnow.java @@ -1,23 +1,23 @@ package org.geysermc.pack.bedrock.resource.fog.fogsettings.distance; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; import org.geysermc.pack.bedrock.resource.fog.fogsettings.distance.powdersnow.TransitionFog; public class PowderSnow { - @JsonProperty("fog_start") + @SerializedName("fog_start") public float fogStart; - @JsonProperty("fog_end") + @SerializedName("fog_end") public float fogEnd; - @JsonProperty("fog_color") + @SerializedName("fog_color") public String fogColor; - @JsonProperty("render_distance_type") + @SerializedName("render_distance_type") public String renderDistanceType; - @JsonProperty("transition_fog") + @SerializedName("transition_fog") public TransitionFog transitionFog; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/distance/Water.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/distance/Water.java index f9897c8..7ad80b6 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/distance/Water.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/distance/Water.java @@ -1,23 +1,23 @@ package org.geysermc.pack.bedrock.resource.fog.fogsettings.distance; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; import org.geysermc.pack.bedrock.resource.fog.fogsettings.distance.water.TransitionFog; public class Water { - @JsonProperty("fog_start") + @SerializedName("fog_start") public float fogStart; - @JsonProperty("fog_end") + @SerializedName("fog_end") public float fogEnd; - @JsonProperty("fog_color") + @SerializedName("fog_color") public String fogColor; - @JsonProperty("render_distance_type") + @SerializedName("render_distance_type") public String renderDistanceType; - @JsonProperty("transition_fog") + @SerializedName("transition_fog") public TransitionFog transitionFog; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/distance/Weather.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/distance/Weather.java index 1ad3be4..61b0825 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/distance/Weather.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/distance/Weather.java @@ -1,23 +1,23 @@ package org.geysermc.pack.bedrock.resource.fog.fogsettings.distance; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; import org.geysermc.pack.bedrock.resource.fog.fogsettings.distance.weather.TransitionFog; public class Weather { - @JsonProperty("fog_start") + @SerializedName("fog_start") public float fogStart; - @JsonProperty("fog_end") + @SerializedName("fog_end") public float fogEnd; - @JsonProperty("fog_color") + @SerializedName("fog_color") public String fogColor; - @JsonProperty("render_distance_type") + @SerializedName("render_distance_type") public String renderDistanceType; - @JsonProperty("transition_fog") + @SerializedName("transition_fog") public TransitionFog transitionFog; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/distance/air/TransitionFog.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/distance/air/TransitionFog.java index 979ac18..fcf4f59 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/distance/air/TransitionFog.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/distance/air/TransitionFog.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.fog.fogsettings.distance.air; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import org.geysermc.pack.bedrock.resource.fog.fogsettings.distance.air.transitionfog.InitFog; /** @@ -9,19 +9,19 @@ import org.geysermc.pack.bedrock.resource.fog.fogsettings.distance.air.transitio * Additional fog data which will slowly transition to the distance fog of current biome. */ public class TransitionFog { - @JsonProperty("init_fog") + @SerializedName("init_fog") public InitFog initFog; - @JsonProperty("min_percent") + @SerializedName("min_percent") public float minPercent; - @JsonProperty("mid_seconds") + @SerializedName("mid_seconds") public float midSeconds; - @JsonProperty("mid_percent") + @SerializedName("mid_percent") public float midPercent; - @JsonProperty("max_seconds") + @SerializedName("max_seconds") public float maxSeconds; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/distance/air/transitionfog/InitFog.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/distance/air/transitionfog/InitFog.java index de37634..5d9b8ec 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/distance/air/transitionfog/InitFog.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/distance/air/transitionfog/InitFog.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.fog.fogsettings.distance.air.transitionfog; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,13 +9,13 @@ import java.lang.String; * Initial fog that will slowly transition into water distance fog of the biome when player goes into water. */ public class InitFog { - @JsonProperty("fog_color") + @SerializedName("fog_color") public String fogColor; - @JsonProperty("fog_start") + @SerializedName("fog_start") public float fogStart; - @JsonProperty("fog_end") + @SerializedName("fog_end") public float fogEnd; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/distance/lava/TransitionFog.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/distance/lava/TransitionFog.java index 9fbd352..a77ccb7 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/distance/lava/TransitionFog.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/distance/lava/TransitionFog.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.fog.fogsettings.distance.lava; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import org.geysermc.pack.bedrock.resource.fog.fogsettings.distance.lava.transitionfog.InitFog; /** @@ -9,19 +9,19 @@ import org.geysermc.pack.bedrock.resource.fog.fogsettings.distance.lava.transiti * Additional fog data which will slowly transition to the distance fog of current biome. */ public class TransitionFog { - @JsonProperty("init_fog") + @SerializedName("init_fog") public InitFog initFog; - @JsonProperty("min_percent") + @SerializedName("min_percent") public float minPercent; - @JsonProperty("mid_seconds") + @SerializedName("mid_seconds") public float midSeconds; - @JsonProperty("mid_percent") + @SerializedName("mid_percent") public float midPercent; - @JsonProperty("max_seconds") + @SerializedName("max_seconds") public float maxSeconds; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/distance/lava/transitionfog/InitFog.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/distance/lava/transitionfog/InitFog.java index bdce727..e62bf2c 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/distance/lava/transitionfog/InitFog.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/distance/lava/transitionfog/InitFog.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.fog.fogsettings.distance.lava.transitionfog; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,13 +9,13 @@ import java.lang.String; * Initial fog that will slowly transition into water distance fog of the biome when player goes into water. */ public class InitFog { - @JsonProperty("fog_color") + @SerializedName("fog_color") public String fogColor; - @JsonProperty("fog_start") + @SerializedName("fog_start") public float fogStart; - @JsonProperty("fog_end") + @SerializedName("fog_end") public float fogEnd; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/distance/lavaresistance/TransitionFog.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/distance/lavaresistance/TransitionFog.java index d8858c0..c7a321d 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/distance/lavaresistance/TransitionFog.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/distance/lavaresistance/TransitionFog.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.fog.fogsettings.distance.lavaresistance; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import org.geysermc.pack.bedrock.resource.fog.fogsettings.distance.lavaresistance.transitionfog.InitFog; /** @@ -9,19 +9,19 @@ import org.geysermc.pack.bedrock.resource.fog.fogsettings.distance.lavaresistanc * Additional fog data which will slowly transition to the distance fog of current biome. */ public class TransitionFog { - @JsonProperty("init_fog") + @SerializedName("init_fog") public InitFog initFog; - @JsonProperty("min_percent") + @SerializedName("min_percent") public float minPercent; - @JsonProperty("mid_seconds") + @SerializedName("mid_seconds") public float midSeconds; - @JsonProperty("mid_percent") + @SerializedName("mid_percent") public float midPercent; - @JsonProperty("max_seconds") + @SerializedName("max_seconds") public float maxSeconds; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/distance/lavaresistance/transitionfog/InitFog.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/distance/lavaresistance/transitionfog/InitFog.java index 7860293..e737d1d 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/distance/lavaresistance/transitionfog/InitFog.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/distance/lavaresistance/transitionfog/InitFog.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.fog.fogsettings.distance.lavaresistance.transitionfog; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,13 +9,13 @@ import java.lang.String; * Initial fog that will slowly transition into water distance fog of the biome when player goes into water. */ public class InitFog { - @JsonProperty("fog_color") + @SerializedName("fog_color") public String fogColor; - @JsonProperty("fog_start") + @SerializedName("fog_start") public float fogStart; - @JsonProperty("fog_end") + @SerializedName("fog_end") public float fogEnd; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/distance/powdersnow/TransitionFog.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/distance/powdersnow/TransitionFog.java index 20c790f..7d884e6 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/distance/powdersnow/TransitionFog.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/distance/powdersnow/TransitionFog.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.fog.fogsettings.distance.powdersnow; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import org.geysermc.pack.bedrock.resource.fog.fogsettings.distance.powdersnow.transitionfog.InitFog; /** @@ -9,19 +9,19 @@ import org.geysermc.pack.bedrock.resource.fog.fogsettings.distance.powdersnow.tr * Additional fog data which will slowly transition to the distance fog of current biome. */ public class TransitionFog { - @JsonProperty("init_fog") + @SerializedName("init_fog") public InitFog initFog; - @JsonProperty("min_percent") + @SerializedName("min_percent") public float minPercent; - @JsonProperty("mid_seconds") + @SerializedName("mid_seconds") public float midSeconds; - @JsonProperty("mid_percent") + @SerializedName("mid_percent") public float midPercent; - @JsonProperty("max_seconds") + @SerializedName("max_seconds") public float maxSeconds; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/distance/powdersnow/transitionfog/InitFog.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/distance/powdersnow/transitionfog/InitFog.java index 22c9a6c..159446a 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/distance/powdersnow/transitionfog/InitFog.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/distance/powdersnow/transitionfog/InitFog.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.fog.fogsettings.distance.powdersnow.transitionfog; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,13 +9,13 @@ import java.lang.String; * Initial fog that will slowly transition into water distance fog of the biome when player goes into water. */ public class InitFog { - @JsonProperty("fog_color") + @SerializedName("fog_color") public String fogColor; - @JsonProperty("fog_start") + @SerializedName("fog_start") public float fogStart; - @JsonProperty("fog_end") + @SerializedName("fog_end") public float fogEnd; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/distance/water/TransitionFog.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/distance/water/TransitionFog.java index 750403a..4c1de86 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/distance/water/TransitionFog.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/distance/water/TransitionFog.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.fog.fogsettings.distance.water; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import org.geysermc.pack.bedrock.resource.fog.fogsettings.distance.water.transitionfog.InitFog; /** @@ -9,19 +9,19 @@ import org.geysermc.pack.bedrock.resource.fog.fogsettings.distance.water.transit * Additional fog data which will slowly transition to the distance fog of current biome. */ public class TransitionFog { - @JsonProperty("init_fog") + @SerializedName("init_fog") public InitFog initFog; - @JsonProperty("min_percent") + @SerializedName("min_percent") public float minPercent; - @JsonProperty("mid_seconds") + @SerializedName("mid_seconds") public float midSeconds; - @JsonProperty("mid_percent") + @SerializedName("mid_percent") public float midPercent; - @JsonProperty("max_seconds") + @SerializedName("max_seconds") public float maxSeconds; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/distance/water/transitionfog/InitFog.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/distance/water/transitionfog/InitFog.java index b47664e..281c28a 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/distance/water/transitionfog/InitFog.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/distance/water/transitionfog/InitFog.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.fog.fogsettings.distance.water.transitionfog; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,13 +9,13 @@ import java.lang.String; * Initial fog that will slowly transition into water distance fog of the biome when player goes into water. */ public class InitFog { - @JsonProperty("fog_color") + @SerializedName("fog_color") public String fogColor; - @JsonProperty("fog_start") + @SerializedName("fog_start") public float fogStart; - @JsonProperty("fog_end") + @SerializedName("fog_end") public float fogEnd; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/distance/weather/TransitionFog.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/distance/weather/TransitionFog.java index 08224a9..57d2042 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/distance/weather/TransitionFog.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/distance/weather/TransitionFog.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.fog.fogsettings.distance.weather; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import org.geysermc.pack.bedrock.resource.fog.fogsettings.distance.weather.transitionfog.InitFog; /** @@ -9,19 +9,19 @@ import org.geysermc.pack.bedrock.resource.fog.fogsettings.distance.weather.trans * Additional fog data which will slowly transition to the distance fog of current biome. */ public class TransitionFog { - @JsonProperty("init_fog") + @SerializedName("init_fog") public InitFog initFog; - @JsonProperty("min_percent") + @SerializedName("min_percent") public float minPercent; - @JsonProperty("mid_seconds") + @SerializedName("mid_seconds") public float midSeconds; - @JsonProperty("mid_percent") + @SerializedName("mid_percent") public float midPercent; - @JsonProperty("max_seconds") + @SerializedName("max_seconds") public float maxSeconds; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/distance/weather/transitionfog/InitFog.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/distance/weather/transitionfog/InitFog.java index dcef98c..c974b68 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/distance/weather/transitionfog/InitFog.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/distance/weather/transitionfog/InitFog.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.fog.fogsettings.distance.weather.transitionfog; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,13 +9,13 @@ import java.lang.String; * Initial fog that will slowly transition into water distance fog of the biome when player goes into water. */ public class InitFog { - @JsonProperty("fog_color") + @SerializedName("fog_color") public String fogColor; - @JsonProperty("fog_start") + @SerializedName("fog_start") public float fogStart; - @JsonProperty("fog_end") + @SerializedName("fog_end") public float fogEnd; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/volumetric/Density.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/volumetric/Density.java index b01a5bb..1e41b49 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/volumetric/Density.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/volumetric/Density.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.fog.fogsettings.volumetric; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import org.geysermc.pack.bedrock.resource.fog.fogsettings.volumetric.density.Air; import org.geysermc.pack.bedrock.resource.fog.fogsettings.volumetric.density.Lava; import org.geysermc.pack.bedrock.resource.fog.fogsettings.volumetric.density.LavaResistance; @@ -18,7 +18,7 @@ public class Density { public Lava lava; - @JsonProperty("lava_resistance") + @SerializedName("lava_resistance") public LavaResistance lavaResistance; public Air air() { diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/volumetric/density/Air.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/volumetric/density/Air.java index 961801e..f6f7500 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/volumetric/density/Air.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/volumetric/density/Air.java @@ -1,15 +1,15 @@ package org.geysermc.pack.bedrock.resource.fog.fogsettings.volumetric.density; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; public class Air { - @JsonProperty("max_density") + @SerializedName("max_density") public float maxDensity; - @JsonProperty("max_density_height") + @SerializedName("max_density_height") public float maxDensityHeight; - @JsonProperty("zero_density_height") + @SerializedName("zero_density_height") public float zeroDensityHeight; public boolean uniform; diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/volumetric/density/Lava.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/volumetric/density/Lava.java index 9d6fcec..dba8475 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/volumetric/density/Lava.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/volumetric/density/Lava.java @@ -1,15 +1,15 @@ package org.geysermc.pack.bedrock.resource.fog.fogsettings.volumetric.density; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; public class Lava { - @JsonProperty("max_density") + @SerializedName("max_density") public float maxDensity; - @JsonProperty("max_density_height") + @SerializedName("max_density_height") public float maxDensityHeight; - @JsonProperty("zero_density_height") + @SerializedName("zero_density_height") public float zeroDensityHeight; public boolean uniform; diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/volumetric/density/LavaResistance.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/volumetric/density/LavaResistance.java index 4d9ce78..2b6bed7 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/volumetric/density/LavaResistance.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/volumetric/density/LavaResistance.java @@ -1,15 +1,15 @@ package org.geysermc.pack.bedrock.resource.fog.fogsettings.volumetric.density; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; public class LavaResistance { - @JsonProperty("max_density") + @SerializedName("max_density") public float maxDensity; - @JsonProperty("max_density_height") + @SerializedName("max_density_height") public float maxDensityHeight; - @JsonProperty("zero_density_height") + @SerializedName("zero_density_height") public float zeroDensityHeight; public boolean uniform; diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/volumetric/density/Water.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/volumetric/density/Water.java index 5508f66..e448e58 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/volumetric/density/Water.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/fog/fogsettings/volumetric/density/Water.java @@ -1,15 +1,15 @@ package org.geysermc.pack.bedrock.resource.fog.fogsettings.volumetric.density; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; public class Water { - @JsonProperty("max_density") + @SerializedName("max_density") public float maxDensity; - @JsonProperty("max_density_height") + @SerializedName("max_density_height") public float maxDensityHeight; - @JsonProperty("zero_density_height") + @SerializedName("zero_density_height") public float zeroDensityHeight; public boolean uniform; diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/items/Items.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/items/Items.java index bec49fe..fe7ca51 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/items/Items.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/items/Items.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.items; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,10 +9,10 @@ import java.lang.String; * Minecraft items 1.10.0 */ public class Items { - @JsonProperty("format_version") + @SerializedName("format_version") public String formatVersion; - @JsonProperty("minecraft:item") + @SerializedName("minecraft:item") public Item item; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/items/item/Components.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/items/item/Components.java index 56ad88b..e590cf6 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/items/item/Components.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/items/item/Components.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.items.item; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,10 +9,10 @@ import java.lang.String; * The components that describe this item. */ public class Components { - @JsonProperty("minecraft:icon") + @SerializedName("minecraft:icon") public String icon; - @JsonProperty("minecraft:render_offsets") + @SerializedName("minecraft:render_offsets") public String renderOffsets; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/manifest/Capabilities.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/manifest/Capabilities.java index c62fa05..57d4f34 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/manifest/Capabilities.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/manifest/Capabilities.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.manifest; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; /** * Capabilities @@ -8,7 +8,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; * These are the different features that the pack makes use of that aren't necessarily enabled by default. */ public class Capabilities { - @JsonProperty("experimental_custom_ui") + @SerializedName("experimental_custom_ui") public boolean experimentalCustomUi; public boolean chemistry; diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/manifest/Header.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/manifest/Header.java index fdc781a..5bfc364 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/manifest/Header.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/manifest/Header.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.manifest; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,15 +9,15 @@ import java.lang.String; * Section containing information regarding the name of the pack, description, and other features that are public facing. */ public class Header { - @JsonProperty("base_game_version") + @SerializedName("base_game_version") public float[] baseGameVersion; public String description; - @JsonProperty("lock_template_options") + @SerializedName("lock_template_options") public boolean lockTemplateOptions; - @JsonProperty("min_engine_version") + @SerializedName("min_engine_version") public float[] minEngineVersion; public String name; diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/manifest/Metadata.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/manifest/Metadata.java index 24cd20f..25d1887 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/manifest/Metadata.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/manifest/Metadata.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.manifest; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; import java.util.HashMap; import java.util.Map; @@ -17,7 +17,7 @@ public class Metadata { public String url; - @JsonProperty("generated_with") + @SerializedName("generated_with") private Map generatedWith = new HashMap<>(); /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/manifest/Subpacks.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/manifest/Subpacks.java index 54d9daf..28eb519 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/manifest/Subpacks.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/manifest/Subpacks.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.manifest; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,12 +9,12 @@ import java.lang.String; * A single definition of a subpack. */ public class Subpacks { - @JsonProperty("folder_name") + @SerializedName("folder_name") public String folderName; public String name; - @JsonProperty("memory_tier") + @SerializedName("memory_tier") public float memoryTier; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/materials/PlusVariants.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/materials/PlusVariants.java index aff1fc4..38c3965 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/materials/PlusVariants.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/materials/PlusVariants.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.materials; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; import java.util.ArrayList; import java.util.List; @@ -10,17 +10,17 @@ import org.geysermc.pack.bedrock.resource.materials.plusvariants.VertexFields; * Variant Item */ public class PlusVariants { - @JsonProperty("+defines") + @SerializedName("+defines") public String[] plusDefines; public List vertexFields = new ArrayList<>(); public String[] states; - @JsonProperty("+states") + @SerializedName("+states") public String[] plusStates; - @JsonProperty("-states") + @SerializedName("-states") public String[] minusStates; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/materials/Variants.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/materials/Variants.java index 7c41bc2..6a106b6 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/materials/Variants.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/materials/Variants.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.materials; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; import java.util.ArrayList; import java.util.List; @@ -10,17 +10,17 @@ import org.geysermc.pack.bedrock.resource.materials.variants.VertexFields; * Variant Item */ public class Variants { - @JsonProperty("+defines") + @SerializedName("+defines") public String[] plusDefines; public List vertexFields = new ArrayList<>(); public String[] states; - @JsonProperty("+states") + @SerializedName("+states") public String[] plusStates; - @JsonProperty("-states") + @SerializedName("-states") public String[] minusStates; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/models/entity/ModelEntity.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/models/entity/ModelEntity.java index 4043230..f6f4028 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/models/entity/ModelEntity.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/models/entity/ModelEntity.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.models.entity; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; import java.util.ArrayList; import java.util.List; @@ -14,10 +14,10 @@ import org.geysermc.pack.bedrock.resource.models.entity.modelentity.Geometry; public class ModelEntity { public boolean debug; - @JsonProperty("format_version") + @SerializedName("format_version") public String formatVersion; - @JsonProperty("minecraft:geometry") + @SerializedName("minecraft:geometry") public List geometry = new ArrayList<>(); /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/models/entity/modelentity/geometry/Bones.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/models/entity/modelentity/geometry/Bones.java index 15818cf..d6687dd 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/models/entity/modelentity/geometry/Bones.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/models/entity/modelentity/geometry/Bones.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.models.entity.modelentity.geometry; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; import java.util.ArrayList; import java.util.HashMap; @@ -33,15 +33,15 @@ public class Bones { public float[] pivot; - @JsonProperty("poly_mesh") + @SerializedName("poly_mesh") public PolyMesh polyMesh; - @JsonProperty("render_group_id") + @SerializedName("render_group_id") public int renderGroupId; public float[] rotation; - @JsonProperty("texture_meshes") + @SerializedName("texture_meshes") public List textureMeshes = new ArrayList<>(); /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/models/entity/modelentity/geometry/Description.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/models/entity/modelentity/geometry/Description.java index f18cfa1..1983f30 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/models/entity/modelentity/geometry/Description.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/models/entity/modelentity/geometry/Description.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.models.entity.modelentity.geometry; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -11,19 +11,19 @@ import java.lang.String; public class Description { public String identifier; - @JsonProperty("texture_width") + @SerializedName("texture_width") public float textureWidth; - @JsonProperty("texture_height") + @SerializedName("texture_height") public float textureHeight; - @JsonProperty("visible_bounds_offset") + @SerializedName("visible_bounds_offset") public float[] visibleBoundsOffset; - @JsonProperty("visible_bounds_width") + @SerializedName("visible_bounds_width") public float visibleBoundsWidth; - @JsonProperty("visible_bounds_height") + @SerializedName("visible_bounds_height") public float visibleBoundsHeight; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/models/entity/modelentity/geometry/bones/Locators.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/models/entity/modelentity/geometry/bones/Locators.java index f72fad1..d312c44 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/models/entity/modelentity/geometry/bones/Locators.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/models/entity/modelentity/geometry/bones/Locators.java @@ -1,13 +1,13 @@ package org.geysermc.pack.bedrock.resource.models.entity.modelentity.geometry.bones; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; public class Locators { public float[] offset; public float[] rotation; - @JsonProperty("ignore_inherited_scale") + @SerializedName("ignore_inherited_scale") public boolean ignoreInheritedScale; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/models/entity/modelentity/geometry/bones/PolyMesh.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/models/entity/modelentity/geometry/bones/PolyMesh.java index 2379154..7c02cff 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/models/entity/modelentity/geometry/bones/PolyMesh.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/models/entity/modelentity/geometry/bones/PolyMesh.java @@ -1,12 +1,12 @@ package org.geysermc.pack.bedrock.resource.models.entity.modelentity.geometry.bones; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; /** * ***EXPERIMENTAL*** A triangle or quad mesh object. Can be used in conjunction with cubes and texture geometry. */ public class PolyMesh { - @JsonProperty("normalized_uvs") + @SerializedName("normalized_uvs") public boolean normalizedUvs; public float[][] normals; diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/models/entity/modelentity/geometry/bones/TextureMeshes.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/models/entity/modelentity/geometry/bones/TextureMeshes.java index ce326a1..de83542 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/models/entity/modelentity/geometry/bones/TextureMeshes.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/models/entity/modelentity/geometry/bones/TextureMeshes.java @@ -1,10 +1,10 @@ package org.geysermc.pack.bedrock.resource.models.entity.modelentity.geometry.bones; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; public class TextureMeshes { - @JsonProperty("local_pivot") + @SerializedName("local_pivot") public float[] localPivot; public float[] position; diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/models/entity/modelentity/geometry/bones/cubes/uv/Down.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/models/entity/modelentity/geometry/bones/cubes/uv/Down.java index 3150d63..6db5e3c 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/models/entity/modelentity/geometry/bones/cubes/uv/Down.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/models/entity/modelentity/geometry/bones/cubes/uv/Down.java @@ -1,15 +1,15 @@ package org.geysermc.pack.bedrock.resource.models.entity.modelentity.geometry.bones.cubes.uv; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; public class Down { public float[] uv; - @JsonProperty("uv_size") + @SerializedName("uv_size") public float[] uvSize; - @JsonProperty("material_instance") + @SerializedName("material_instance") public String materialInstance; public float[] uv() { diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/models/entity/modelentity/geometry/bones/cubes/uv/East.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/models/entity/modelentity/geometry/bones/cubes/uv/East.java index bc32695..eaaed40 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/models/entity/modelentity/geometry/bones/cubes/uv/East.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/models/entity/modelentity/geometry/bones/cubes/uv/East.java @@ -1,15 +1,15 @@ package org.geysermc.pack.bedrock.resource.models.entity.modelentity.geometry.bones.cubes.uv; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; public class East { public float[] uv; - @JsonProperty("uv_size") + @SerializedName("uv_size") public float[] uvSize; - @JsonProperty("material_instance") + @SerializedName("material_instance") public String materialInstance; public float[] uv() { diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/models/entity/modelentity/geometry/bones/cubes/uv/North.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/models/entity/modelentity/geometry/bones/cubes/uv/North.java index 97c2c65..a4e41fb 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/models/entity/modelentity/geometry/bones/cubes/uv/North.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/models/entity/modelentity/geometry/bones/cubes/uv/North.java @@ -1,15 +1,15 @@ package org.geysermc.pack.bedrock.resource.models.entity.modelentity.geometry.bones.cubes.uv; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; public class North { public float[] uv; - @JsonProperty("uv_size") + @SerializedName("uv_size") public float[] uvSize; - @JsonProperty("material_instance") + @SerializedName("material_instance") public String materialInstance; public float[] uv() { diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/models/entity/modelentity/geometry/bones/cubes/uv/South.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/models/entity/modelentity/geometry/bones/cubes/uv/South.java index 782391b..4d253dc 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/models/entity/modelentity/geometry/bones/cubes/uv/South.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/models/entity/modelentity/geometry/bones/cubes/uv/South.java @@ -1,15 +1,15 @@ package org.geysermc.pack.bedrock.resource.models.entity.modelentity.geometry.bones.cubes.uv; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; public class South { public float[] uv; - @JsonProperty("uv_size") + @SerializedName("uv_size") public float[] uvSize; - @JsonProperty("material_instance") + @SerializedName("material_instance") public String materialInstance; public float[] uv() { diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/models/entity/modelentity/geometry/bones/cubes/uv/Up.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/models/entity/modelentity/geometry/bones/cubes/uv/Up.java index 9556d44..90b6f49 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/models/entity/modelentity/geometry/bones/cubes/uv/Up.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/models/entity/modelentity/geometry/bones/cubes/uv/Up.java @@ -1,15 +1,15 @@ package org.geysermc.pack.bedrock.resource.models.entity.modelentity.geometry.bones.cubes.uv; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; public class Up { public float[] uv; - @JsonProperty("uv_size") + @SerializedName("uv_size") public float[] uvSize; - @JsonProperty("material_instance") + @SerializedName("material_instance") public String materialInstance; public float[] uv() { diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/models/entity/modelentity/geometry/bones/cubes/uv/West.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/models/entity/modelentity/geometry/bones/cubes/uv/West.java index 826ac78..95f4384 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/models/entity/modelentity/geometry/bones/cubes/uv/West.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/models/entity/modelentity/geometry/bones/cubes/uv/West.java @@ -1,15 +1,15 @@ package org.geysermc.pack.bedrock.resource.models.entity.modelentity.geometry.bones.cubes.uv; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; public class West { public float[] uv; - @JsonProperty("uv_size") + @SerializedName("uv_size") public float[] uvSize; - @JsonProperty("material_instance") + @SerializedName("material_instance") public String materialInstance; public float[] uv() { diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/Particles.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/Particles.java index aff8c66..4c5d6e2 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/Particles.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/Particles.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.particles; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,10 +9,10 @@ import java.lang.String; * A particle definition file. */ public class Particles { - @JsonProperty("format_version") + @SerializedName("format_version") public String formatVersion; - @JsonProperty("particle_effect") + @SerializedName("particle_effect") public ParticleEffect particleEffect; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/Components.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/Components.java index 35d6abe..c0db684 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/Components.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/Components.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.particles.particleeffect; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; import org.geysermc.pack.bedrock.resource.particles.particleeffect.components.EmitterInitialization; import org.geysermc.pack.bedrock.resource.particles.particleeffect.components.EmitterLifetimeEvents; @@ -34,85 +34,85 @@ import org.geysermc.pack.bedrock.resource.particles.particleeffect.components.Pa * The particle components. */ public class Components { - @JsonProperty("minecraft:emitter_initialization") + @SerializedName("minecraft:emitter_initialization") public EmitterInitialization emitterInitialization; - @JsonProperty("minecraft:emitter_lifetime_events") + @SerializedName("minecraft:emitter_lifetime_events") public EmitterLifetimeEvents emitterLifetimeEvents; - @JsonProperty("minecraft:emitter_lifetime_expression") + @SerializedName("minecraft:emitter_lifetime_expression") public EmitterLifetimeExpression emitterLifetimeExpression; - @JsonProperty("minecraft:emitter_lifetime_once") + @SerializedName("minecraft:emitter_lifetime_once") public EmitterLifetimeOnce emitterLifetimeOnce; - @JsonProperty("minecraft:emitter_lifetime_looping") + @SerializedName("minecraft:emitter_lifetime_looping") public EmitterLifetimeLooping emitterLifetimeLooping; - @JsonProperty("minecraft:emitter_local_space") + @SerializedName("minecraft:emitter_local_space") public EmitterLocalSpace emitterLocalSpace; - @JsonProperty("minecraft:emitter_rate_instant") + @SerializedName("minecraft:emitter_rate_instant") public EmitterRateInstant emitterRateInstant; - @JsonProperty("minecraft:emitter_rate_manual") + @SerializedName("minecraft:emitter_rate_manual") public EmitterRateManual emitterRateManual; - @JsonProperty("minecraft:emitter_rate_steady") + @SerializedName("minecraft:emitter_rate_steady") public EmitterRateSteady emitterRateSteady; - @JsonProperty("minecraft:emitter_shape_box") + @SerializedName("minecraft:emitter_shape_box") public EmitterShapeBox emitterShapeBox; - @JsonProperty("minecraft:emitter_shape_custom") + @SerializedName("minecraft:emitter_shape_custom") public EmitterShapeCustom emitterShapeCustom; - @JsonProperty("minecraft:emitter_shape_disc") + @SerializedName("minecraft:emitter_shape_disc") public EmitterShapeDisc emitterShapeDisc; - @JsonProperty("minecraft:emitter_shape_entity_aabb") + @SerializedName("minecraft:emitter_shape_entity_aabb") public EmitterShapeEntityAabb emitterShapeEntityAabb; - @JsonProperty("minecraft:emitter_shape_point") + @SerializedName("minecraft:emitter_shape_point") public EmitterShapePoint emitterShapePoint; - @JsonProperty("minecraft:emitter_shape_sphere") + @SerializedName("minecraft:emitter_shape_sphere") public EmitterShapeSphere emitterShapeSphere; - @JsonProperty("minecraft:particle_appearance_billboard") + @SerializedName("minecraft:particle_appearance_billboard") public ParticleAppearanceBillboard particleAppearanceBillboard; - @JsonProperty("minecraft:particle_appearance_tinting") + @SerializedName("minecraft:particle_appearance_tinting") public ParticleAppearanceTinting particleAppearanceTinting; - @JsonProperty("minecraft:particle_appearance_lighting") + @SerializedName("minecraft:particle_appearance_lighting") public ParticleAppearanceLighting particleAppearanceLighting; - @JsonProperty("minecraft:particle_initialization") + @SerializedName("minecraft:particle_initialization") public ParticleInitialization particleInitialization; - @JsonProperty("minecraft:particle_initial_speed") + @SerializedName("minecraft:particle_initial_speed") public String particleInitialSpeed; - @JsonProperty("minecraft:particle_initial_spin") + @SerializedName("minecraft:particle_initial_spin") public ParticleInitialSpin particleInitialSpin; - @JsonProperty("minecraft:particle_lifetime_expression") + @SerializedName("minecraft:particle_lifetime_expression") public ParticleLifetimeExpression particleLifetimeExpression; - @JsonProperty("minecraft:particle_lifetime_events") + @SerializedName("minecraft:particle_lifetime_events") public ParticleLifetimeEvents particleLifetimeEvents; - @JsonProperty("minecraft:particle_kill_plane") + @SerializedName("minecraft:particle_kill_plane") public String[] particleKillPlane; - @JsonProperty("minecraft:particle_motion_collision") + @SerializedName("minecraft:particle_motion_collision") public ParticleMotionCollision particleMotionCollision; - @JsonProperty("minecraft:particle_motion_dynamic") + @SerializedName("minecraft:particle_motion_dynamic") public ParticleMotionDynamic particleMotionDynamic; - @JsonProperty("minecraft:particle_motion_parametric") + @SerializedName("minecraft:particle_motion_parametric") public ParticleMotionParametric particleMotionParametric; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/Curves.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/Curves.java index 210d296..6bf61f8 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/Curves.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/Curves.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.particles.particleeffect; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; import java.util.HashMap; import java.util.Map; @@ -18,7 +18,7 @@ public class Curves { public String type; - @JsonProperty("horizontal_range") + @SerializedName("horizontal_range") public String horizontalRange; public String input() { diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/Description.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/Description.java index 34e8672..0975871 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/Description.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/Description.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.particles.particleeffect; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; import org.geysermc.pack.bedrock.resource.particles.particleeffect.description.BasicRenderParameters; @@ -10,7 +10,7 @@ import org.geysermc.pack.bedrock.resource.particles.particleeffect.description.B public class Description { public String identifier; - @JsonProperty("basic_render_parameters") + @SerializedName("basic_render_parameters") public BasicRenderParameters basicRenderParameters; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/Events.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/Events.java index 6fe8ea0..f678f24 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/Events.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/Events.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.particles.particleeffect; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import org.geysermc.pack.bedrock.resource.particles.particleeffect.events.ParticleEffect; import org.geysermc.pack.bedrock.resource.particles.particleeffect.events.SoundEffect; @@ -8,10 +8,10 @@ import org.geysermc.pack.bedrock.resource.particles.particleeffect.events.SoundE * Events */ public class Events { - @JsonProperty("particle_effect") + @SerializedName("particle_effect") public ParticleEffect particleEffect; - @JsonProperty("sound_effect") + @SerializedName("sound_effect") public SoundEffect soundEffect; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/EmitterInitialization.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/EmitterInitialization.java index 501acad..51ce67c 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/EmitterInitialization.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/EmitterInitialization.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.particles.particleeffect.components; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,10 +9,10 @@ import java.lang.String; * This component allows the emitter to run some Molang at creation, primarily to populate any Molang variables that get used later. */ public class EmitterInitialization { - @JsonProperty("creation_expression") + @SerializedName("creation_expression") public String creationExpression; - @JsonProperty("per_update_expression") + @SerializedName("per_update_expression") public String perUpdateExpression; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/EmitterLifetimeEvents.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/EmitterLifetimeEvents.java index 73ec99b..136649b 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/EmitterLifetimeEvents.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/EmitterLifetimeEvents.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.particles.particleeffect.components; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; import java.util.ArrayList; import java.util.HashMap; @@ -12,15 +12,15 @@ import org.geysermc.pack.bedrock.resource.particles.particleeffect.components.em * Emitter Lifetime Events Component For 1.10.0 */ public class EmitterLifetimeEvents { - @JsonProperty("creation_event") + @SerializedName("creation_event") public String[] creationEvent; - @JsonProperty("expiration_event") + @SerializedName("expiration_event") public String[] expirationEvent; private Map timeline = new HashMap<>(); - @JsonProperty("looping_travel_distance_events") + @SerializedName("looping_travel_distance_events") public List loopingTravelDistanceEvents = new ArrayList<>(); public String[] creationEvent() { diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/EmitterLifetimeExpression.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/EmitterLifetimeExpression.java index 14f92f0..f109029 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/EmitterLifetimeExpression.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/EmitterLifetimeExpression.java @@ -1,16 +1,16 @@ package org.geysermc.pack.bedrock.resource.particles.particleeffect.components; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** * Emitter Rate Manual Component 1.10.0 */ public class EmitterLifetimeExpression { - @JsonProperty("activation_expression") + @SerializedName("activation_expression") public String activationExpression; - @JsonProperty("expiration_expression") + @SerializedName("expiration_expression") public String expirationExpression; public String activationExpression() { diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/EmitterLifetimeLooping.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/EmitterLifetimeLooping.java index 6f68ab1..504395c 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/EmitterLifetimeLooping.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/EmitterLifetimeLooping.java @@ -1,16 +1,16 @@ package org.geysermc.pack.bedrock.resource.particles.particleeffect.components; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** * Emitter Lifetime Looping Component For 1.10.0 */ public class EmitterLifetimeLooping { - @JsonProperty("active_time") + @SerializedName("active_time") public String activeTime; - @JsonProperty("sleep_time") + @SerializedName("sleep_time") public String sleepTime; public String activeTime() { diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/EmitterLifetimeOnce.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/EmitterLifetimeOnce.java index 2211b13..d7346bc 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/EmitterLifetimeOnce.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/EmitterLifetimeOnce.java @@ -1,13 +1,13 @@ package org.geysermc.pack.bedrock.resource.particles.particleeffect.components; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** * Emitter Lifetime Once Component For 1.10.0 */ public class EmitterLifetimeOnce { - @JsonProperty("active_time") + @SerializedName("active_time") public String activeTime; public String activeTime() { diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/EmitterRateInstant.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/EmitterRateInstant.java index 5c5de12..a7b1158 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/EmitterRateInstant.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/EmitterRateInstant.java @@ -1,13 +1,13 @@ package org.geysermc.pack.bedrock.resource.particles.particleeffect.components; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** * Emitter Rate Instant Component For 1.10.0 */ public class EmitterRateInstant { - @JsonProperty("num_particles") + @SerializedName("num_particles") public String numParticles; public String numParticles() { diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/EmitterRateManual.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/EmitterRateManual.java index 81bc809..32b292b 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/EmitterRateManual.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/EmitterRateManual.java @@ -1,13 +1,13 @@ package org.geysermc.pack.bedrock.resource.particles.particleeffect.components; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** * Emitter Rate Manual Component For 1.10.0 */ public class EmitterRateManual { - @JsonProperty("max_particles") + @SerializedName("max_particles") public String maxParticles; public String maxParticles() { diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/EmitterRateSteady.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/EmitterRateSteady.java index c1b33f8..7b32c5c 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/EmitterRateSteady.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/EmitterRateSteady.java @@ -1,16 +1,16 @@ package org.geysermc.pack.bedrock.resource.particles.particleeffect.components; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** * Emitter Rate Steady Component For 1.10.0 */ public class EmitterRateSteady { - @JsonProperty("max_particles") + @SerializedName("max_particles") public String maxParticles; - @JsonProperty("spawn_rate") + @SerializedName("spawn_rate") public String spawnRate; public String maxParticles() { diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/EmitterShapeBox.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/EmitterShapeBox.java index 3f59c18..edc1881 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/EmitterShapeBox.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/EmitterShapeBox.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.particles.particleeffect.components; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -13,10 +13,10 @@ public class EmitterShapeBox { public String[] offset; - @JsonProperty("half_dimensions") + @SerializedName("half_dimensions") public String[] halfDimensions; - @JsonProperty("surface_only") + @SerializedName("surface_only") public boolean surfaceOnly; public String direction() { diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/EmitterShapeDisc.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/EmitterShapeDisc.java index cf7079a..f6aff90 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/EmitterShapeDisc.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/EmitterShapeDisc.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.particles.particleeffect.components; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -13,10 +13,10 @@ public class EmitterShapeDisc { public String[] offset; - @JsonProperty("plane_normal") + @SerializedName("plane_normal") public String[] planeNormal; - @JsonProperty("surface_only") + @SerializedName("surface_only") public boolean surfaceOnly; public String direction() { diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/EmitterShapeSphere.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/EmitterShapeSphere.java index 49353d0..00ba238 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/EmitterShapeSphere.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/EmitterShapeSphere.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.particles.particleeffect.components; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -13,7 +13,7 @@ public class EmitterShapeSphere { public String radius; - @JsonProperty("surface_only") + @SerializedName("surface_only") public boolean surfaceOnly; public String direction() { diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/ParticleAppearanceBillboard.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/ParticleAppearanceBillboard.java index 270ff7c..70f80fd 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/ParticleAppearanceBillboard.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/ParticleAppearanceBillboard.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.particles.particleeffect.components; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; import org.geysermc.pack.bedrock.resource.particles.particleeffect.components.particleappearancebillboard.Direction; import org.geysermc.pack.bedrock.resource.particles.particleeffect.components.particleappearancebillboard.Uv; @@ -9,7 +9,7 @@ import org.geysermc.pack.bedrock.resource.particles.particleeffect.components.pa * Particle Appearance Billboard Component For 1.10.0 */ public class ParticleAppearanceBillboard { - @JsonProperty("facing_camera_mode") + @SerializedName("facing_camera_mode") public String facingCameraMode; public Direction direction; diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/ParticleInitialSpin.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/ParticleInitialSpin.java index 9987e06..84d7579 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/ParticleInitialSpin.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/ParticleInitialSpin.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.particles.particleeffect.components; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -11,7 +11,7 @@ import java.lang.String; public class ParticleInitialSpin { public String rotation; - @JsonProperty("rotation_rate") + @SerializedName("rotation_rate") public String rotationRate; public String rotation() { diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/ParticleInitialization.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/ParticleInitialization.java index d5465fb..27ffdb6 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/ParticleInitialization.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/ParticleInitialization.java @@ -1,16 +1,16 @@ package org.geysermc.pack.bedrock.resource.particles.particleeffect.components; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** * Particle Initialization Component For 1.10.0 */ public class ParticleInitialization { - @JsonProperty("per_update_expression") + @SerializedName("per_update_expression") public String perUpdateExpression; - @JsonProperty("per_render_expression") + @SerializedName("per_render_expression") public String perRenderExpression; public String perUpdateExpression() { diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/ParticleLifetimeEvents.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/ParticleLifetimeEvents.java index 3a258a1..ba5ea4b 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/ParticleLifetimeEvents.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/ParticleLifetimeEvents.java @@ -1,16 +1,16 @@ package org.geysermc.pack.bedrock.resource.particles.particleeffect.components; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** * Particle Lifetime Events Component For 1.10.0 */ public class ParticleLifetimeEvents { - @JsonProperty("creation_event") + @SerializedName("creation_event") public String[] creationEvent; - @JsonProperty("expiration_event") + @SerializedName("expiration_event") public String[] expirationEvent; public String[] creationEvent() { diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/ParticleLifetimeExpression.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/ParticleLifetimeExpression.java index 091794a..3b9cfea 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/ParticleLifetimeExpression.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/ParticleLifetimeExpression.java @@ -1,16 +1,16 @@ package org.geysermc.pack.bedrock.resource.particles.particleeffect.components; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** * Particle Lifetime Expression Component For 1.10.0 */ public class ParticleLifetimeExpression { - @JsonProperty("expiration_expression") + @SerializedName("expiration_expression") public String expirationExpression; - @JsonProperty("max_lifetime") + @SerializedName("max_lifetime") public String maxLifetime; public String expirationExpression() { diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/ParticleMotionCollision.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/ParticleMotionCollision.java index 55c44b4..e2b93a9 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/ParticleMotionCollision.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/ParticleMotionCollision.java @@ -1,24 +1,24 @@ package org.geysermc.pack.bedrock.resource.particles.particleeffect.components; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** * Particle Motion Collision Component For 1.10.0 */ public class ParticleMotionCollision { - @JsonProperty("collision_drag") + @SerializedName("collision_drag") public float collisionDrag; - @JsonProperty("coefficient_of_restitution") + @SerializedName("coefficient_of_restitution") public float coefficientOfRestitution; - @JsonProperty("collision_radius") + @SerializedName("collision_radius") public float collisionRadius; public String enabled; - @JsonProperty("expire_on_contact") + @SerializedName("expire_on_contact") public boolean expireOnContact; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/ParticleMotionDynamic.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/ParticleMotionDynamic.java index e66aafd..43d5595 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/ParticleMotionDynamic.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/ParticleMotionDynamic.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.particles.particleeffect.components; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,13 +9,13 @@ import java.lang.String; * This component specifies the dynamic properties of the particle, from a simulation standpoint what forces act upon the particle? These dynamics alter the velocity of the particle, which is a combination of the direction of the particle and the speed. Particle direction will always be in the direction of the velocity of the particle. */ public class ParticleMotionDynamic { - @JsonProperty("linear_drag_coefficient") + @SerializedName("linear_drag_coefficient") public String linearDragCoefficient; - @JsonProperty("rotation_acceleration") + @SerializedName("rotation_acceleration") public String rotationAcceleration; - @JsonProperty("rotation_drag_coefficient") + @SerializedName("rotation_drag_coefficient") public String rotationDragCoefficient; public String linearDragCoefficient() { diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/particleappearancebillboard/Direction.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/particleappearancebillboard/Direction.java index f8160e3..2b2f3b7 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/particleappearancebillboard/Direction.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/particleappearancebillboard/Direction.java @@ -1,12 +1,12 @@ package org.geysermc.pack.bedrock.resource.particles.particleeffect.components.particleappearancebillboard; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; public class Direction { public String mode; - @JsonProperty("min_speed_threshold") + @SerializedName("min_speed_threshold") public float minSpeedThreshold; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/particleappearancebillboard/Uv.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/particleappearancebillboard/Uv.java index 7b17bab..acfe0f0 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/particleappearancebillboard/Uv.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/particleappearancebillboard/Uv.java @@ -1,16 +1,16 @@ package org.geysermc.pack.bedrock.resource.particles.particleeffect.components.particleappearancebillboard; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import org.geysermc.pack.bedrock.resource.particles.particleeffect.components.particleappearancebillboard.uv.Flipbook; /** * Uv */ public class Uv { - @JsonProperty("texture_width") + @SerializedName("texture_width") public int textureWidth; - @JsonProperty("texture_height") + @SerializedName("texture_height") public int textureHeight; public Flipbook flipbook; diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/particleappearancebillboard/uv/Flipbook.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/particleappearancebillboard/uv/Flipbook.java index ab02bfe..490c5a4 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/particleappearancebillboard/uv/Flipbook.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/components/particleappearancebillboard/uv/Flipbook.java @@ -1,19 +1,19 @@ package org.geysermc.pack.bedrock.resource.particles.particleeffect.components.particleappearancebillboard.uv; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** * Flipbook */ public class Flipbook { - @JsonProperty("frames_per_second") + @SerializedName("frames_per_second") public String framesPerSecond; - @JsonProperty("max_frame") + @SerializedName("max_frame") public String maxFrame; - @JsonProperty("stretch_to_lifetime") + @SerializedName("stretch_to_lifetime") public boolean stretchToLifetime; public boolean loop; diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/events/SoundEffect.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/events/SoundEffect.java index 7b835e4..2f9f6dc 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/events/SoundEffect.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/particles/particleeffect/events/SoundEffect.java @@ -1,13 +1,13 @@ package org.geysermc.pack.bedrock.resource.particles.particleeffect.events; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** * Sound Effect */ public class SoundEffect { - @JsonProperty("event_name") + @SerializedName("event_name") public String eventName; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/render_controllers/RenderControllers.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/render_controllers/RenderControllers.java index a625029..945e331 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/render_controllers/RenderControllers.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/render_controllers/RenderControllers.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.render_controllers; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; import java.util.HashMap; import java.util.Map; @@ -11,10 +11,10 @@ import java.util.Map; * A collection of render controllers to apply. */ public class RenderControllers { - @JsonProperty("format_version") + @SerializedName("format_version") public String formatVersion; - @JsonProperty("render_controllers") + @SerializedName("render_controllers") private Map renderControllers = new HashMap<>(); /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/render_controllers/rendercontrollers/RenderControllers.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/render_controllers/rendercontrollers/RenderControllers.java index 6a25bb6..75ed357 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/render_controllers/rendercontrollers/RenderControllers.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/render_controllers/rendercontrollers/RenderControllers.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.render_controllers.rendercontrollers; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; import java.util.HashMap; import java.util.Map; @@ -15,32 +15,32 @@ public class RenderControllers { public Color color; - @JsonProperty("filter_lighting") + @SerializedName("filter_lighting") public boolean filterLighting; public String geometry; - @JsonProperty("ignore_lighting") + @SerializedName("ignore_lighting") public boolean ignoreLighting; - @JsonProperty("is_hurt_color") + @SerializedName("is_hurt_color") public IsHurtColor isHurtColor; - @JsonProperty("light_color_multiplier") + @SerializedName("light_color_multiplier") public String lightColorMultiplier; private Map materials = new HashMap<>(); - @JsonProperty("on_fire_color") + @SerializedName("on_fire_color") public OnFireColor onFireColor; - @JsonProperty("overlay_color") + @SerializedName("overlay_color") public OverlayColor overlayColor; - @JsonProperty("part_visibility") + @SerializedName("part_visibility") private Map partVisibility = new HashMap<>(); - @JsonProperty("uv_anim") + @SerializedName("uv_anim") public UvAnim uvAnim; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/sounds/InteractiveSounds.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/sounds/InteractiveSounds.java index 6ebe412..9b07a65 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/sounds/InteractiveSounds.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/sounds/InteractiveSounds.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.sounds; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; import java.util.HashMap; import java.util.Map; @@ -13,10 +13,10 @@ import org.geysermc.pack.bedrock.resource.sounds.interactivesounds.EntitySounds; * Interactive sounds definitions. */ public class InteractiveSounds { - @JsonProperty("block_sounds") + @SerializedName("block_sounds") private Map blockSounds = new HashMap<>(); - @JsonProperty("entity_sounds") + @SerializedName("entity_sounds") public EntitySounds entitySounds; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/sounds/MusicDefinitions.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/sounds/MusicDefinitions.java index d02025b..fc5b1ff 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/sounds/MusicDefinitions.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/sounds/MusicDefinitions.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.sounds; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -9,13 +9,13 @@ import java.lang.String; * The definition file of music of the resourcepack. */ public class MusicDefinitions { - @JsonProperty("event_name") + @SerializedName("event_name") public String eventName; - @JsonProperty("min_delay") + @SerializedName("min_delay") public int minDelay; - @JsonProperty("max_delay") + @SerializedName("max_delay") public int maxDelay; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/sounds/SoundDefinitions.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/sounds/SoundDefinitions.java index 1678129..4ae7f50 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/sounds/SoundDefinitions.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/sounds/SoundDefinitions.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.sounds; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; import java.util.HashMap; import java.util.Map; @@ -11,13 +11,13 @@ import java.util.Map; * The collection of sound definitions this resourcepack has defined. */ public class SoundDefinitions { - @JsonProperty("format_version") + @SerializedName("format_version") public String formatVersion; - @JsonProperty("sound_definitions") + @SerializedName("sound_definitions") private Map soundDefinitions = new HashMap<>(); - @JsonProperty("__use_legacy_max_distance") + @SerializedName("__use_legacy_max_distance") public String useLegacyMaxDistance; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/sounds/sounddefinitions/SoundDefinitions.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/sounds/sounddefinitions/SoundDefinitions.java index 670169f..e9978ba 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/sounds/sounddefinitions/SoundDefinitions.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/sounds/sounddefinitions/SoundDefinitions.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.sounds.sounddefinitions; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; import java.util.ArrayList; import java.util.List; @@ -9,14 +9,14 @@ import java.util.List; * Sound */ public class SoundDefinitions { - @JsonProperty("__use_legacy_max_distance") + @SerializedName("__use_legacy_max_distance") public boolean useLegacyMaxDistance; public String category; private List sounds = new ArrayList<>(); - @JsonProperty("max_distance") + @SerializedName("max_distance") public float maxDistance; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/sounds/sounddefinitions/Sounds.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/sounds/sounddefinitions/Sounds.java index ca1ad97..7aa4497 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/sounds/sounddefinitions/Sounds.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/sounds/sounddefinitions/Sounds.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.sounds.sounddefinitions; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; /** @@ -15,7 +15,7 @@ public class Sounds { public float volume; - @JsonProperty("load_on_low_memory") + @SerializedName("load_on_low_memory") public boolean loadOnLowMemory; public boolean stream; diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/textures/ItemTexture.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/textures/ItemTexture.java index 08de22f..247f6cb 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/textures/ItemTexture.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/textures/ItemTexture.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.textures; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; import java.util.HashMap; import java.util.Map; @@ -10,13 +10,13 @@ import org.geysermc.pack.bedrock.resource.textures.itemtexture.TextureData; * Item Texture File */ public class ItemTexture { - @JsonProperty("resource_pack_name") + @SerializedName("resource_pack_name") public String resourcePackName; - @JsonProperty("texture_data") + @SerializedName("texture_data") private Map textureData = new HashMap<>(); - @JsonProperty("texture_name") + @SerializedName("texture_name") public String textureName; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/textures/TerrainTexture.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/textures/TerrainTexture.java index 46a77ca..cc02148 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/textures/TerrainTexture.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/textures/TerrainTexture.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.textures; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; import java.util.HashMap; import java.util.Map; @@ -12,18 +12,18 @@ import org.geysermc.pack.bedrock.resource.textures.terraintexture.TextureData; * An collection of texture definitions. */ public class TerrainTexture { - @JsonProperty("num_mip_levels") + @SerializedName("num_mip_levels") public int numMipLevels; public int padding; - @JsonProperty("resource_pack_name") + @SerializedName("resource_pack_name") public String resourcePackName; - @JsonProperty("texture_data") + @SerializedName("texture_data") private Map textureData = new HashMap<>(); - @JsonProperty("texture_name") + @SerializedName("texture_name") public String textureName; /** diff --git a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/textures/terraintexture/texturedata/Textures.java b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/textures/terraintexture/texturedata/Textures.java index 923e5e6..8cfbac0 100644 --- a/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/textures/terraintexture/texturedata/Textures.java +++ b/pack-schema/bedrock/src/main/java/org/geysermc/pack/bedrock/resource/textures/terraintexture/texturedata/Textures.java @@ -1,6 +1,6 @@ package org.geysermc.pack.bedrock.resource.textures.terraintexture.texturedata; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import java.lang.String; import java.util.ArrayList; import java.util.List; @@ -14,7 +14,7 @@ import org.geysermc.pack.bedrock.resource.textures.terraintexture.texturedata.te public class Textures { public String path; - @JsonProperty("tint_color") + @SerializedName("tint_color") public String tintColor; public List variations = new ArrayList<>(); diff --git a/pack-schema/generator/build.gradle.kts b/pack-schema/generator/build.gradle.kts index 4e2becf..bf41c6d 100644 --- a/pack-schema/generator/build.gradle.kts +++ b/pack-schema/generator/build.gradle.kts @@ -1,5 +1,5 @@ dependencies { - implementation("com.fasterxml.jackson.core:jackson-databind:2.14.2") + implementation("com.google.code.gson:gson:2.10.1") implementation("io.vertx:vertx-json-schema:4.4.1") implementation("com.squareup:javapoet:1.13.0") diff --git a/pack-schema/generator/src/main/java/org/geysermc/pack/schema/converter/ConverterOptions.java b/pack-schema/generator/src/main/java/org/geysermc/pack/schema/converter/ConverterOptions.java index 460081d..aa36b84 100644 --- a/pack-schema/generator/src/main/java/org/geysermc/pack/schema/converter/ConverterOptions.java +++ b/pack-schema/generator/src/main/java/org/geysermc/pack/schema/converter/ConverterOptions.java @@ -26,10 +26,11 @@ package org.geysermc.pack.schema.converter; -import com.fasterxml.jackson.databind.ObjectMapper; +import com.google.gson.Gson; import java.io.IOException; import java.io.InputStream; +import java.io.InputStreamReader; public class ConverterOptions { private final String collisionPrefix; @@ -41,11 +42,7 @@ public class ConverterOptions { this.rootPackage = rootPackage; InputStream schemaResource = ConverterOptions.class.getResourceAsStream("/" + schemaConfig); - try { - this.schemaConfig = new ObjectMapper().readValue(schemaResource, SchemaConfig.class); - } catch (IOException ex) { - throw new RuntimeException("An error occurred reading schema config " + schemaConfig, ex); - } + this.schemaConfig = new Gson().fromJson(new InputStreamReader(schemaResource), SchemaConfig.class); } public String collisionPrefix() { diff --git a/pack-schema/generator/src/main/java/org/geysermc/pack/schema/converter/JsonTemplateToClassConverter.java b/pack-schema/generator/src/main/java/org/geysermc/pack/schema/converter/JsonTemplateToClassConverter.java index 0e45f9e..ee1a990 100644 --- a/pack-schema/generator/src/main/java/org/geysermc/pack/schema/converter/JsonTemplateToClassConverter.java +++ b/pack-schema/generator/src/main/java/org/geysermc/pack/schema/converter/JsonTemplateToClassConverter.java @@ -259,7 +259,7 @@ public final class JsonTemplateToClassConverter { if (spec != null) { if (!fieldName.equals(propertyName)) { - AnnotationSpec annotation = AnnotationSpec.builder(ClassName.get("com.fasterxml.jackson.annotation", "JsonProperty")) + AnnotationSpec annotation = AnnotationSpec.builder(ClassName.get("com.google.gson.annotations", "SerializedName")) .addMember("value", CodeBlock.of("\"" + propertyName + "\"")) .build(); @@ -749,7 +749,7 @@ public final class JsonTemplateToClassConverter { if (ifConst != null) { Object constValue = ifConst.getValue().getValue("const"); Object configuredOption = options.schemaConfig().getConditionals().get(ifConst.getKey()); - if (constValue.equals(configuredOption)) { + if (constValue.toString().equals(configuredOption)) { return parseRef(input, parentSchema, jsonObject.getJsonObject("then")); } else if (configuredOption == null) { System.err.println("Could not find " + ifConst.getKey() + " in " + options.schemaConfig().getConditionals()); diff --git a/pack-schema/generator/src/main/resources/schema-config.json b/pack-schema/generator/src/main/resources/schema-config.json index eeca0d8..0a02b73 100644 --- a/pack-schema/generator/src/main/resources/schema-config.json +++ b/pack-schema/generator/src/main/resources/schema-config.json @@ -1,8 +1,8 @@ { "conditionals": { - "Manifest.properties.format_version": 2, - "Attachables.properties.format_version": "1.10.0", - "Items.properties.format_version": "1.10.0", + "Manifest.properties.format_version": "2", + "Attachables.properties.format_version": "1.10", + "Items.properties.format_version": "1.10", "Entity.properties.format_version": "1.10.0", "ModelEntity.properties.format_version": "1.16.0" },