From 8d153998fa8364460b2e23f6cb94e58f5d01bce7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zo=C3=AB=20Gidiere?= Date: Sun, 5 Oct 2025 21:55:16 -0600 Subject: [PATCH] Reformat Code --- ...inedPipelineBiomeColorMappingTemplate.java | 4 +-- .../api/block/state/BlockStateExtended.java | 18 +++++------ .../configured/ConfiguredStructure.java | 4 +-- platforms/allay/build.gradle.kts | 2 +- .../java/com/dfsek/terra/allay/Mapping.java | 13 +++++--- .../nms/v1_21_9/config/SpawnEntryConfig.java | 5 ++-- .../terra/minestom/addon/MinestomAddon.java | 5 ++-- .../MinecraftChunkGeneratorWrapper.java | 19 +++++------- .../mod/handle/MinecraftWorldHandle.java | 7 ++--- .../block/state/BlockStateArgumentMixin.java | 30 ++++++++----------- .../terra/chunk/ChunkRegionMixin.java | 28 +++++++---------- .../terra/chunk/WorldChunkMixin.java | 12 ++++---- .../terra/chunk/data/ProtoChunkMixin.java | 5 ++-- .../terra/nbt/NbtCompoundMixin.java | 7 +---- .../terra/world/ChunkRegionMixin.java | 21 ++++++------- .../terra/world/ServerWorldMixin.java | 27 +++++++---------- .../com/dfsek/terra/mod/util/PresetUtil.java | 8 +++-- 17 files changed, 93 insertions(+), 122 deletions(-) diff --git a/common/addons/pipeline-image/src/main/java/com/dfsek/terra/addons/biome/pipeline/image/config/converter/mapping/DefinedPipelineBiomeColorMappingTemplate.java b/common/addons/pipeline-image/src/main/java/com/dfsek/terra/addons/biome/pipeline/image/config/converter/mapping/DefinedPipelineBiomeColorMappingTemplate.java index b13150586..d743e9e8b 100644 --- a/common/addons/pipeline-image/src/main/java/com/dfsek/terra/addons/biome/pipeline/image/config/converter/mapping/DefinedPipelineBiomeColorMappingTemplate.java +++ b/common/addons/pipeline-image/src/main/java/com/dfsek/terra/addons/biome/pipeline/image/config/converter/mapping/DefinedPipelineBiomeColorMappingTemplate.java @@ -3,13 +3,13 @@ package com.dfsek.terra.addons.biome.pipeline.image.config.converter.mapping; import com.dfsek.tectonic.api.config.template.annotations.Value; import com.dfsek.tectonic.api.config.template.object.ObjectTemplate; +import java.util.Map; + import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome; import com.dfsek.terra.addons.image.config.ColorLoader.ColorString; import com.dfsek.terra.addons.image.converter.mapping.ColorMapping; import com.dfsek.terra.addons.image.util.MapUtil; -import java.util.Map; - public class DefinedPipelineBiomeColorMappingTemplate implements ObjectTemplate> { diff --git a/common/api/src/main/java/com/dfsek/terra/api/block/state/BlockStateExtended.java b/common/api/src/main/java/com/dfsek/terra/api/block/state/BlockStateExtended.java index c274736ab..72faaf9a7 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/block/state/BlockStateExtended.java +++ b/common/api/src/main/java/com/dfsek/terra/api/block/state/BlockStateExtended.java @@ -4,6 +4,13 @@ import com.dfsek.terra.api.block.BlockData; public interface BlockStateExtended extends BlockState { + /** + * Gets the BlockData. + * + * @return BlockData of this BlockStateExtended + */ + BlockData getData(); + /** * Sets the BlockData. * @@ -11,14 +18,7 @@ public interface BlockStateExtended extends BlockState { * * @return New BlockStateExtended with the given BlockData */ - BlockStateExtended setData(BlockData data); - - /** - * Gets the BlockData. - * - * @return BlockData of this BlockStateExtended - */ - BlockData getData(); + BlockStateExtended setData(BlockData data); /** * Gets the BlockState. @@ -28,5 +28,5 @@ public interface BlockStateExtended extends BlockState { BlockState getState(); @Override - default boolean isExtended() {return true;} + default boolean isExtended() { return true; } } diff --git a/common/api/src/main/java/com/dfsek/terra/api/structure/configured/ConfiguredStructure.java b/common/api/src/main/java/com/dfsek/terra/api/structure/configured/ConfiguredStructure.java index 74b840624..ca5988484 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/structure/configured/ConfiguredStructure.java +++ b/common/api/src/main/java/com/dfsek/terra/api/structure/configured/ConfiguredStructure.java @@ -7,14 +7,14 @@ package com.dfsek.terra.api.structure.configured; +import org.jetbrains.annotations.ApiStatus.Experimental; + import com.dfsek.terra.api.registry.key.StringIdentifiable; import com.dfsek.terra.api.structure.Structure; import com.dfsek.terra.api.structure.StructureSpawn; import com.dfsek.terra.api.util.collection.ProbabilityCollection; import com.dfsek.terra.api.util.range.Range; -import org.jetbrains.annotations.ApiStatus.Experimental; - @Experimental public interface ConfiguredStructure extends StringIdentifiable { diff --git a/platforms/allay/build.gradle.kts b/platforms/allay/build.gradle.kts index 336598615..be9399a84 100644 --- a/platforms/allay/build.gradle.kts +++ b/platforms/allay/build.gradle.kts @@ -30,7 +30,7 @@ dependencies { geyserMappings("GeyserMC.mappings", "biomes", Versions.Allay.mappings, ext = "json") geyserMappings("GeyserMC.mappings-generator", "new_generator_blocks", Versions.Allay.mappingsGenerator, ext = "json") - mcmeta("misode.mcmeta", "blocks/data", Versions.Allay.mcmeta, ext ="json") + mcmeta("misode.mcmeta", "blocks/data", Versions.Allay.mcmeta, ext = "json") } tasks.processResources { diff --git a/platforms/allay/src/main/java/com/dfsek/terra/allay/Mapping.java b/platforms/allay/src/main/java/com/dfsek/terra/allay/Mapping.java index adec64cd3..cfd142356 100644 --- a/platforms/allay/src/main/java/com/dfsek/terra/allay/Mapping.java +++ b/platforms/allay/src/main/java/com/dfsek/terra/allay/Mapping.java @@ -102,7 +102,8 @@ public final class Mapping { return false; } - Map mappings = from(stream, new TypeToken<>() {}); + Map mappings = from(stream, new TypeToken<>() { + }); mappings.forEach((javaId, mapping) -> JE_BIOME_ID_TO_BE.put(javaId, mapping.bedrockId())); } catch(IOException e) { TerraAllayPlugin.INSTANCE.getPluginLogger().error("Failed to load biomes mapping", e); @@ -118,7 +119,8 @@ public final class Mapping { return false; } - Map mappings = from(stream, new TypeToken<>() {}); + Map mappings = from(stream, new TypeToken<>() { + }); mappings.forEach((javaId, mapping) -> { ItemType itemType = ItemTypeGetter .name(mapping.bedrockId()) @@ -140,7 +142,8 @@ public final class Mapping { return false; } - Map> root = from(stream, new TypeToken<>() {}); + Map> root = from(stream, new TypeToken<>() { + }); List mappings = root.get("mappings"); mappings.forEach(mapping -> { JeBlockState jeState = createJeBlockState(mapping.javaState()); @@ -163,7 +166,8 @@ public final class Mapping { return false; } - Map>> data = from(stream, new TypeToken<>() {}); + Map>> data = from(stream, new TypeToken<>() { + }); for(var entry : data.entrySet()) { JE_BLOCK_DEFAULT_PROPERTIES.put( "minecraft:" + entry.getKey(), @@ -249,6 +253,7 @@ public final class Mapping { } } + // see https://stackoverflow.com/questions/59655279/is-there-an-easy-way-to-make-gson-skip-a-field-if-theres-an-error-deserializing public static class IgnoreFailureTypeAdapterFactory implements TypeAdapterFactory { @Override diff --git a/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/config/SpawnEntryConfig.java b/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/config/SpawnEntryConfig.java index fa7658556..dd9eb4efc 100644 --- a/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/config/SpawnEntryConfig.java +++ b/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/config/SpawnEntryConfig.java @@ -3,12 +3,11 @@ package com.dfsek.terra.bukkit.nms.v1_21_9.config; import com.dfsek.tectonic.api.config.template.annotations.Default; import com.dfsek.tectonic.api.config.template.annotations.Value; import com.dfsek.tectonic.api.config.template.object.ObjectTemplate; - -import com.dfsek.terra.api.util.range.Range; - import net.minecraft.world.entity.EntityType; import net.minecraft.world.level.biome.MobSpawnSettings.SpawnerData; +import com.dfsek.terra.api.util.range.Range; + public class SpawnEntryConfig implements ObjectTemplate { @Value("type") diff --git a/platforms/minestom/src/main/java/com/dfsek/terra/minestom/addon/MinestomAddon.java b/platforms/minestom/src/main/java/com/dfsek/terra/minestom/addon/MinestomAddon.java index 8c08fb1ba..1dc3bc0cc 100644 --- a/platforms/minestom/src/main/java/com/dfsek/terra/minestom/addon/MinestomAddon.java +++ b/platforms/minestom/src/main/java/com/dfsek/terra/minestom/addon/MinestomAddon.java @@ -2,6 +2,8 @@ package com.dfsek.terra.minestom.addon; import ca.solostudios.strata.Versions; import ca.solostudios.strata.version.Version; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.dfsek.terra.api.addon.BaseAddon; import com.dfsek.terra.api.event.events.config.ConfigurationLoadEvent; @@ -10,9 +12,6 @@ import com.dfsek.terra.api.world.biome.Biome; import com.dfsek.terra.minestom.TerraMinestomPlatform; import com.dfsek.terra.minestom.config.VanillaBiomeProperties; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - public class MinestomAddon implements BaseAddon { private static final Version VERSION = Versions.getVersion(1, 0, 0); diff --git a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/generation/MinecraftChunkGeneratorWrapper.java b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/generation/MinecraftChunkGeneratorWrapper.java index f29696bfd..4a19a6c85 100644 --- a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/generation/MinecraftChunkGeneratorWrapper.java +++ b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/generation/MinecraftChunkGeneratorWrapper.java @@ -17,17 +17,10 @@ package com.dfsek.terra.mod.generation; -import com.dfsek.seismic.math.coord.CoordFunctions; - -import com.dfsek.terra.api.block.state.BlockStateExtended; - import com.mojang.serialization.MapCodec; -import net.minecraft.block.BlockEntityProvider; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; -import net.minecraft.block.entity.BlockEntity; import net.minecraft.command.argument.BlockStateArgument; -import net.minecraft.nbt.NbtCompound; import net.minecraft.registry.entry.RegistryEntry; import net.minecraft.util.Util; import net.minecraft.util.math.BlockPos; @@ -55,6 +48,7 @@ import org.slf4j.LoggerFactory; import java.util.List; import java.util.concurrent.CompletableFuture; +import com.dfsek.terra.api.block.state.BlockStateExtended; import com.dfsek.terra.api.config.ConfigPack; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; import com.dfsek.terra.api.world.chunk.generation.ChunkGenerator; @@ -141,10 +135,11 @@ public class MinecraftChunkGeneratorWrapper extends net.minecraft.world.gen.chun for(int y = world.getMaxHeight(); y >= world.getMinHeight(); y--) { double noise = structureWeightSampler.sample(new UnblendedNoisePos(x + xi, y, z + zi)); if(noise > threshold) { - com.dfsek.terra.api.block.state.BlockState data = delegate.getPalette(x + xi, y, z + zi, world, biomeProvider).get(depth, x + xi, y, z + zi, world.getSeed()); + com.dfsek.terra.api.block.state.BlockState data = delegate.getPalette(x + xi, y, z + zi, world, biomeProvider).get( + depth, x + xi, y, z + zi, world.getSeed()); BlockPos blockPos = new BlockPos(x, y, z); boolean isExtended = data.isExtended() && data.getClass().equals(BlockStateArgument.class); - if (isExtended) { + if(isExtended) { BlockStateExtended blockStateExtended = (BlockStateExtended) data; net.minecraft.block.BlockState blockState = (net.minecraft.block.BlockState) blockStateExtended.getState(); @@ -200,7 +195,8 @@ public class MinecraftChunkGeneratorWrapper extends net.minecraft.world.gen.chun int min = height.getBottomY(); for(int y = height.getTopYInclusive() - 1; y >= min; y--) { com.dfsek.terra.api.block.state.BlockState terraBlockState = delegate.getBlock(properties, x, y, z, biomeProvider); - BlockState blockState = (BlockState) (terraBlockState.isExtended() ? ((BlockStateExtended) terraBlockState).getState() : terraBlockState); + BlockState blockState = + (BlockState) (terraBlockState.isExtended() ? ((BlockStateExtended) terraBlockState).getState() : terraBlockState); if(heightmap .getBlockPredicate() .test(blockState)) return y + 1; @@ -215,7 +211,8 @@ public class MinecraftChunkGeneratorWrapper extends net.minecraft.world.gen.chun BiomeProvider biomeProvider = pack.getBiomeProvider(); for(int y = height.getTopYInclusive() - 1; y >= height.getBottomY(); y--) { com.dfsek.terra.api.block.state.BlockState terraBlockState = delegate.getBlock(properties, x, y, z, biomeProvider); - BlockState blockState = (BlockState) (terraBlockState.isExtended() ? ((BlockStateExtended) terraBlockState).getState() : terraBlockState); + BlockState blockState = + (BlockState) (terraBlockState.isExtended() ? ((BlockStateExtended) terraBlockState).getState() : terraBlockState); array[y - height.getBottomY()] = blockState; } return new VerticalBlockSample(height.getBottomY(), array); diff --git a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/handle/MinecraftWorldHandle.java b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/handle/MinecraftWorldHandle.java index b3204c326..3ed61d67b 100644 --- a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/handle/MinecraftWorldHandle.java +++ b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/handle/MinecraftWorldHandle.java @@ -17,8 +17,6 @@ package com.dfsek.terra.mod.handle; -import com.dfsek.terra.api.block.state.BlockStateExtended; - import com.mojang.brigadier.exceptions.CommandSyntaxException; import net.minecraft.block.BlockEntityProvider; import net.minecraft.block.Blocks; @@ -35,6 +33,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.dfsek.terra.api.block.state.BlockState; +import com.dfsek.terra.api.block.state.BlockStateExtended; import com.dfsek.terra.api.entity.EntityType; import com.dfsek.terra.api.handle.WorldHandle; @@ -51,10 +50,10 @@ public class MinecraftWorldHandle implements WorldHandle { try { BlockResult blockResult = BlockArgumentParser.block(Registries.BLOCK, data, true); BlockState blockState; - if (blockResult.nbt() != null) { + if(blockResult.nbt() != null) { net.minecraft.block.BlockState state = blockResult.blockState(); NbtCompound nbtCompound = blockResult.nbt(); - if (state.hasBlockEntity()) { + if(state.hasBlockEntity()) { BlockEntity blockEntity = ((BlockEntityProvider) state.getBlock()).createBlockEntity(new BlockPos(0, 0, 0), state); nbtCompound.putInt("x", 0); diff --git a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/implementations/terra/block/state/BlockStateArgumentMixin.java b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/implementations/terra/block/state/BlockStateArgumentMixin.java index 0fefa2b99..9b4626ec8 100644 --- a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/implementations/terra/block/state/BlockStateArgumentMixin.java +++ b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/implementations/terra/block/state/BlockStateArgumentMixin.java @@ -1,20 +1,9 @@ package com.dfsek.terra.mod.mixin.implementations.terra.block.state; -import com.dfsek.terra.api.block.BlockData; -import com.dfsek.terra.api.block.BlockType; -import com.dfsek.terra.api.block.state.BlockStateExtended; - -import com.dfsek.terra.api.block.state.properties.Property; -import com.dfsek.terra.mod.mixin.access.StateAccessor; - -import net.minecraft.block.AbstractBlock.AbstractBlockState; -import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.pattern.CachedBlockPosition; import net.minecraft.command.argument.BlockStateArgument; import net.minecraft.nbt.NbtCompound; -import net.minecraft.registry.Registries; -import net.minecraft.state.State; import org.jetbrains.annotations.Nullable; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Implements; @@ -25,24 +14,28 @@ import org.spongepowered.asm.mixin.Shadow; import java.util.Set; import java.util.function.Predicate; -import java.util.stream.Collectors; + +import com.dfsek.terra.api.block.BlockData; +import com.dfsek.terra.api.block.BlockType; +import com.dfsek.terra.api.block.state.BlockStateExtended; +import com.dfsek.terra.api.block.state.properties.Property; @Mixin(BlockStateArgument.class) @Implements(@Interface(iface = BlockStateExtended.class, prefix = "terra$")) public abstract class BlockStateArgumentMixin implements Predicate { + @Shadow + @Nullable + @Final + private NbtCompound data; + @Shadow public abstract BlockState getBlockState(); @Shadow public abstract Set> getProperties(); - @Shadow - @Nullable - @Final - private NbtCompound data; - public boolean terra$matches(com.dfsek.terra.api.block.state.BlockState other) { return ((com.dfsek.terra.api.block.state.BlockState) getBlockState()).matches(other); } @@ -80,7 +73,8 @@ public abstract class BlockStateArgumentMixin implements Predicate> PRESETS = new ArrayList<>(); - public static Pair createDefault(ConfigPack pack, ModPlatform platform, boolean extended, boolean packInMetapack) { + public static Pair createDefault(ConfigPack pack, ModPlatform platform, boolean extended, + boolean packInMetapack) { Registry dimensionTypeRegistry = platform.dimensionTypeRegistry(); Registry chunkGeneratorSettingsRegistry = platform.chunkGeneratorSettingsRegistry(); Registry multiNoiseBiomeSourceParameterLists = @@ -55,7 +56,8 @@ public class PresetUtil { HashMap, DimensionOptions> dimensionMap = new HashMap<>(); - insertCustom(platform, "minecraft:overworld", pack, dimensionTypeRegistry, chunkGeneratorSettingsRegistry, dimensionMap, packInMetapack); + insertCustom(platform, "minecraft:overworld", pack, dimensionTypeRegistry, chunkGeneratorSettingsRegistry, dimensionMap, + packInMetapack); insertDefaults(dimensionTypeRegistry, chunkGeneratorSettingsRegistry, multiNoiseBiomeSourceParameterLists, platform.biomeRegistry(), dimensionMap); @@ -111,7 +113,7 @@ public class PresetUtil { Identifier dimensionTypeID = Identifier.of("terra", pack.getID().toLowerCase(Locale.ROOT)); DimensionType dimensionType; - if (!packInMetapack) { + if(!packInMetapack) { dimensionType = DimensionUtil.createDimension(vanillaWorldProperties, defaultDimension, platform); RegistryKey dimensionTypeRegistryKey = MinecraftUtil.registerDimensionTypeKey( dimensionTypeID);