diff --git a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/samplers/Sampler3D.java b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/samplers/Sampler3D.java index cdab4e40a..f043ffb7b 100644 --- a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/samplers/Sampler3D.java +++ b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/samplers/Sampler3D.java @@ -28,7 +28,8 @@ public class Sampler3D { } public double sample(double x, double y, double z) { - return interpolator.getNoise(x, y, z) + elevationInterpolator.getElevation(FloatingPointFunctions.round(x), FloatingPointFunctions.round(z)); + return interpolator.getNoise(x, y, z) + elevationInterpolator.getElevation(FloatingPointFunctions.round(x), + FloatingPointFunctions.round(z)); } public double sample(int x, int y, int z) { diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/NoiseAddon.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/NoiseAddon.java index 2fcab4281..0a3aeb102 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/NoiseAddon.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/NoiseAddon.java @@ -14,7 +14,6 @@ import com.dfsek.seismic.algorithms.sampler.arithmetic.MaxSampler; import com.dfsek.seismic.algorithms.sampler.arithmetic.MinSampler; import com.dfsek.seismic.algorithms.sampler.arithmetic.MultiplicationSampler; import com.dfsek.seismic.algorithms.sampler.arithmetic.SubtractionSampler; -import com.dfsek.seismic.algorithms.sampler.noise.cellular.CellularSampler; import com.dfsek.seismic.algorithms.sampler.noise.cellular.CellularStyleSampler; import com.dfsek.seismic.algorithms.sampler.noise.random.GaussianNoiseSampler; import com.dfsek.seismic.algorithms.sampler.noise.random.PositiveWhiteNoiseSampler; diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/CellularNoiseTemplate.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/CellularNoiseTemplate.java index 9b018d1ab..308e4481d 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/CellularNoiseTemplate.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/CellularNoiseTemplate.java @@ -7,8 +7,8 @@ package com.dfsek.terra.addons.noise.config.templates.noise; -import com.dfsek.seismic.algorithms.sampler.noise.cellular.CellularStyleSampler; import com.dfsek.seismic.algorithms.sampler.noise.cellular.CellularSampler; +import com.dfsek.seismic.algorithms.sampler.noise.cellular.CellularStyleSampler; import com.dfsek.seismic.algorithms.sampler.noise.simplex.OpenSimplex2Sampler; import com.dfsek.seismic.type.DistanceFunction; import com.dfsek.seismic.type.sampler.Sampler; @@ -32,7 +32,6 @@ public class CellularNoiseTemplate extends NoiseTemplate { @Default private @Meta double cellularJitter = 1.0D; - @Value("lookup") @Default private @Meta Sampler lookup = new OpenSimplex2Sampler(0.02d, 0); @@ -43,7 +42,8 @@ public class CellularNoiseTemplate extends NoiseTemplate { @Override public Sampler get() { - CellularSampler sampler = new CellularSampler(frequency, salt, lookup, cellularDistanceFunction, cellularReturnType, cellularJitter, saltLookup); + CellularSampler sampler = new CellularSampler(frequency, salt, lookup, cellularDistanceFunction, cellularReturnType, cellularJitter, + saltLookup); return sampler; } } diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/SimpleNoiseTemplate.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/SimpleNoiseTemplate.java index 304574020..d3822ec1a 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/SimpleNoiseTemplate.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/SimpleNoiseTemplate.java @@ -25,7 +25,7 @@ public class SimpleNoiseTemplate extends NoiseTemplate< NoiseFunction sampler; try { sampler = samplerClass.getConstructor(double.class, long.class) - .newInstance(frequency, salt); + .newInstance(frequency, salt); } catch(InstantiationException | IllegalAccessException | InvocationTargetException | NoSuchMethodException e) { throw new RuntimeException(e); } diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/fractal/BrownianMotionTemplate.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/fractal/BrownianMotionTemplate.java index 6ccb0e630..01a8cb11b 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/fractal/BrownianMotionTemplate.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/fractal/BrownianMotionTemplate.java @@ -15,7 +15,8 @@ import com.dfsek.seismic.type.sampler.Sampler; public class BrownianMotionTemplate extends FractalTemplate { @Override public Sampler get() { - BrownianMotionSampler sampler = new BrownianMotionSampler(salt, function, fractalGain, fractalLacunarity, weightedStrength, octaves); + BrownianMotionSampler sampler = new BrownianMotionSampler(salt, function, fractalGain, fractalLacunarity, weightedStrength, + octaves); return sampler; } } diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/BlockFunction.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/BlockFunction.java index 279c28079..128647bd3 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/BlockFunction.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/BlockFunction.java @@ -10,6 +10,11 @@ package com.dfsek.terra.addons.terrascript.script.functions; import com.dfsek.seismic.math.floatingpoint.FloatingPointFunctions; import com.dfsek.seismic.type.vector.Vector2; import com.dfsek.seismic.type.vector.Vector3; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; import com.dfsek.terra.addons.terrascript.parser.lang.ImplementationArguments; import com.dfsek.terra.addons.terrascript.parser.lang.Returnable; @@ -21,12 +26,6 @@ import com.dfsek.terra.addons.terrascript.tokenizer.Position; import com.dfsek.terra.api.Platform; import com.dfsek.terra.api.block.state.BlockState; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - public class BlockFunction implements Function { private static final Logger logger = LoggerFactory.getLogger(BlockFunction.class); diff --git a/common/api/src/main/java/com/dfsek/terra/api/registry/meta/CheckedRegistryHolder.java b/common/api/src/main/java/com/dfsek/terra/api/registry/meta/CheckedRegistryHolder.java index a55be5885..2554483ea 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/registry/meta/CheckedRegistryHolder.java +++ b/common/api/src/main/java/com/dfsek/terra/api/registry/meta/CheckedRegistryHolder.java @@ -1,10 +1,10 @@ package com.dfsek.terra.api.registry.meta; -import java.lang.reflect.Type; - import com.dfsek.terra.api.registry.CheckedRegistry; import com.dfsek.terra.api.util.reflection.TypeKey; +import java.lang.reflect.Type; + public interface CheckedRegistryHolder extends RegistryHolder { default CheckedRegistry getCheckedRegistry(Class clazz) throws IllegalStateException { diff --git a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/PlatformImpl.java b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/PlatformImpl.java index 84e9dfcc6..84efbc0cf 100644 --- a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/PlatformImpl.java +++ b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/PlatformImpl.java @@ -20,7 +20,6 @@ package com.dfsek.terra.bukkit; import com.dfsek.tectonic.api.TypeRegistry; import com.dfsek.tectonic.api.depth.DepthTracker; import com.dfsek.tectonic.api.exception.LoadException; - import io.papermc.paper.registry.RegistryAccess; import io.papermc.paper.registry.RegistryKey; import org.bukkit.Bukkit; diff --git a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java index 0a046651d..90bd3a075 100644 --- a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java +++ b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java @@ -50,10 +50,8 @@ import com.dfsek.terra.bukkit.world.BukkitAdapter; public class TerraBukkitPlugin extends JavaPlugin { private static final Logger logger = LoggerFactory.getLogger(TerraBukkitPlugin.class); - - private PlatformImpl platform; private final Map generatorMap = new HashMap<>(); - + private PlatformImpl platform; private AsyncScheduler asyncScheduler = this.getServer().getAsyncScheduler(); private GlobalRegionScheduler globalRegionScheduler = this.getServer().getGlobalRegionScheduler(); diff --git a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/hooks/MultiverseGeneratorPluginHook.java b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/hooks/MultiverseGeneratorPluginHook.java index e0e8f0d52..10be0f8ff 100644 --- a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/hooks/MultiverseGeneratorPluginHook.java +++ b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/hooks/MultiverseGeneratorPluginHook.java @@ -19,6 +19,11 @@ public final class MultiverseGeneratorPluginHook implements GeneratorPlugin { this.platform = platform; } + public static void register(Platform platform) { + MultiverseCoreApi.get().getGeneratorProvider() + .registerGeneratorPlugin(new MultiverseGeneratorPluginHook(platform)); + } + @Override public @NotNull Collection suggestIds(@Nullable String s) { return platform.getConfigRegistry().entries().stream() @@ -46,9 +51,4 @@ public final class MultiverseGeneratorPluginHook implements GeneratorPlugin { public @NotNull String getPluginName() { return "Terra"; } - - public static void register(Platform platform) { - MultiverseCoreApi.get().getGeneratorProvider() - .registerGeneratorPlugin(new MultiverseGeneratorPluginHook(platform)); - } } diff --git a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/listeners/CommonListener.java b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/listeners/CommonListener.java index b49b383f0..22e55d9d2 100644 --- a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/listeners/CommonListener.java +++ b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/listeners/CommonListener.java @@ -69,26 +69,26 @@ public class CommonListener implements Listener { @EventHandler public void onWolfSpawn(CreatureSpawnEvent event) { - if (!(event.getEntity() instanceof Wolf wolf)) { + if(!(event.getEntity() instanceof Wolf wolf)) { return; } // Doesn't apply if variant has already been applied - if (wolf.getVariant() != Variant.PALE) { + if(wolf.getVariant() != Variant.PALE) { return; } - if (!WOLF_VARIANT_SPAWN_REASONS.contains(event.getSpawnReason())) { + if(!WOLF_VARIANT_SPAWN_REASONS.contains(event.getSpawnReason())) { return; } World world = wolf.getWorld(); - if (!(world.getGenerator() instanceof BukkitChunkGeneratorWrapper wrapper)) { + if(!(world.getGenerator() instanceof BukkitChunkGeneratorWrapper wrapper)) { return; } ConfigPack pack = platform.getConfigRegistry().get(wrapper.getPack().getRegistryKey()).orElse(null); - if (pack == null) { + if(pack == null) { return; } diff --git a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/nms/Initializer.java b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/nms/Initializer.java index 2074ea493..132df6006 100644 --- a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/nms/Initializer.java +++ b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/nms/Initializer.java @@ -1,12 +1,10 @@ package com.dfsek.terra.bukkit.nms; -import com.dfsek.terra.bukkit.TerraBukkitPlugin; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.dfsek.terra.bukkit.BukkitAddon; import com.dfsek.terra.bukkit.PlatformImpl; +import com.dfsek.terra.bukkit.TerraBukkitPlugin; import com.dfsek.terra.bukkit.util.VersionUtil; @@ -18,7 +16,7 @@ public interface Initializer { Logger logger = LoggerFactory.getLogger(Initializer.class); PlatformImpl platform = constructPlatform(plugin); - if (platform == null) { + if(platform == null) { logger.error("NMS bindings for version {} do not exist. Support for this version is limited.", NMS); logger.error("This is usually due to running Terra on an unsupported Minecraft version."); String bypassKey = "IKnowThereAreNoNMSBindingsFor" + NMS + "ButIWillProceedAnyway"; @@ -48,7 +46,7 @@ public interface Initializer { private static PlatformImpl constructPlatform(TerraBukkitPlugin plugin) { try { String packageVersion = NMS; - if (NMS.equals("v1_21_5") || NMS.equals("v1_21_6")) { + if(NMS.equals("v1_21_5") || NMS.equals("v1_21_6")) { packageVersion = "v1_21_7"; } diff --git a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/world/BukkitBiomeInfo.java b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/world/BukkitBiomeInfo.java index eb59c3cb5..9079005e9 100644 --- a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/world/BukkitBiomeInfo.java +++ b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/world/BukkitBiomeInfo.java @@ -5,4 +5,5 @@ import org.bukkit.NamespacedKey; import com.dfsek.terra.api.properties.Properties; -public record BukkitBiomeInfo(NamespacedKey biomeKey) implements Properties {} +public record BukkitBiomeInfo(NamespacedKey biomeKey) implements Properties { +} diff --git a/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/AwfulBukkitHacks.java b/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/AwfulBukkitHacks.java index 0aad4091c..5558f489a 100644 --- a/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/AwfulBukkitHacks.java +++ b/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/AwfulBukkitHacks.java @@ -1,9 +1,5 @@ package com.dfsek.terra.bukkit.nms.v1_21_7; -import com.dfsek.terra.bukkit.nms.v1_21_7.config.VanillaBiomeProperties; - -import com.dfsek.terra.bukkit.world.BukkitBiomeInfo; - import net.minecraft.core.Holder; import net.minecraft.core.Holder.Reference; import net.minecraft.core.HolderSet; @@ -29,7 +25,8 @@ import java.util.Objects; import java.util.Set; import java.util.stream.Collectors; - +import com.dfsek.terra.bukkit.nms.v1_21_7.config.VanillaBiomeProperties; +import com.dfsek.terra.bukkit.world.BukkitBiomeInfo; import com.dfsek.terra.bukkit.world.BukkitPlatformBiome; import com.dfsek.terra.registry.master.ConfigRegistry; @@ -61,7 +58,8 @@ public class AwfulBukkitHacks { Biome platform = NMSBiomeInjector.createBiome(biomeRegistry.get(vanillaMinecraftKey).orElseThrow().value(), vanillaBiomeProperties); - ResourceLocation delegateMinecraftKey = ResourceLocation.fromNamespaceAndPath("terra", NMSBiomeInjector.createBiomeID(pack, key)); + ResourceLocation delegateMinecraftKey = ResourceLocation.fromNamespaceAndPath("terra", + NMSBiomeInjector.createBiomeID(pack, key)); NamespacedKey delegateBukkitKey = NamespacedKey.fromString(delegateMinecraftKey.toString()); ResourceKey delegateKey = ResourceKey.create(Registries.BIOME, delegateMinecraftKey); diff --git a/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/NMSPlatform.java b/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/NMSPlatform.java index d5e87fd96..c7d2fb49f 100644 --- a/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/NMSPlatform.java +++ b/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/NMSPlatform.java @@ -1,31 +1,7 @@ package com.dfsek.terra.bukkit.nms.v1_21_7; import com.dfsek.tectonic.api.TypeRegistry; - import com.dfsek.tectonic.api.exception.LoadException; - -import com.dfsek.terra.api.addon.BaseAddon; -import com.dfsek.terra.api.world.biome.PlatformBiome; -import com.dfsek.terra.bukkit.PlatformImpl; -import com.dfsek.terra.bukkit.TerraBukkitPlugin; - -import com.dfsek.terra.bukkit.nms.v1_21_7.config.BiomeAdditionsSoundTemplate; -import com.dfsek.terra.bukkit.nms.v1_21_7.config.BiomeMoodSoundTemplate; -import com.dfsek.terra.bukkit.nms.v1_21_7.config.BiomeParticleConfigTemplate; -import com.dfsek.terra.bukkit.nms.v1_21_7.config.EntityTypeTemplate; - -import com.dfsek.terra.bukkit.nms.v1_21_7.config.MusicSoundTemplate; - -import com.dfsek.terra.bukkit.nms.v1_21_7.config.SoundEventTemplate; - -import com.dfsek.terra.bukkit.nms.v1_21_7.config.SpawnCostConfig; - -import com.dfsek.terra.bukkit.nms.v1_21_7.config.SpawnEntryConfig; -import com.dfsek.terra.bukkit.nms.v1_21_7.config.SpawnSettingsTemplate; -import com.dfsek.terra.bukkit.nms.v1_21_7.config.SpawnTypeConfig; - -import com.dfsek.terra.bukkit.nms.v1_21_7.config.VillagerTypeTemplate; - import net.minecraft.resources.ResourceLocation; import net.minecraft.sounds.Music; import net.minecraft.sounds.SoundEvent; @@ -39,12 +15,27 @@ import net.minecraft.world.level.biome.Biome.Precipitation; import net.minecraft.world.level.biome.Biome.TemperatureModifier; import net.minecraft.world.level.biome.BiomeSpecialEffects.GrassColorModifier; import net.minecraft.world.level.biome.MobSpawnSettings; -import net.minecraft.world.level.biome.MobSpawnSettings.SpawnerData; import org.bukkit.Bukkit; import java.util.List; import java.util.Locale; +import com.dfsek.terra.api.addon.BaseAddon; +import com.dfsek.terra.api.world.biome.PlatformBiome; +import com.dfsek.terra.bukkit.PlatformImpl; +import com.dfsek.terra.bukkit.TerraBukkitPlugin; +import com.dfsek.terra.bukkit.nms.v1_21_7.config.BiomeAdditionsSoundTemplate; +import com.dfsek.terra.bukkit.nms.v1_21_7.config.BiomeMoodSoundTemplate; +import com.dfsek.terra.bukkit.nms.v1_21_7.config.BiomeParticleConfigTemplate; +import com.dfsek.terra.bukkit.nms.v1_21_7.config.EntityTypeTemplate; +import com.dfsek.terra.bukkit.nms.v1_21_7.config.MusicSoundTemplate; +import com.dfsek.terra.bukkit.nms.v1_21_7.config.SoundEventTemplate; +import com.dfsek.terra.bukkit.nms.v1_21_7.config.SpawnCostConfig; +import com.dfsek.terra.bukkit.nms.v1_21_7.config.SpawnEntryConfig; +import com.dfsek.terra.bukkit.nms.v1_21_7.config.SpawnSettingsTemplate; +import com.dfsek.terra.bukkit.nms.v1_21_7.config.SpawnTypeConfig; +import com.dfsek.terra.bukkit.nms.v1_21_7.config.VillagerTypeTemplate; + public class NMSPlatform extends PlatformImpl { @@ -72,7 +63,7 @@ public class NMSPlatform extends PlatformImpl { .registerLoader(GrassColorModifier.class, (type, o, loader, depthTracker) -> TemperatureModifier.valueOf(((String) o).toUpperCase( Locale.ROOT))) - .registerLoader(MobCategory.class, (type, o, loader, depthTracker) -> MobCategory.valueOf((String) o)) + .registerLoader(MobCategory.class, (type, o, loader, depthTracker) -> MobCategory.valueOf((String) o)) .registerLoader(AmbientParticleSettings.class, BiomeParticleConfigTemplate::new) .registerLoader(SoundEvent.class, SoundEventTemplate::new) .registerLoader(AmbientMoodSettings.class, BiomeMoodSoundTemplate::new) diff --git a/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/Reflection.java b/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/Reflection.java index 41c761654..7f0748570 100644 --- a/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/Reflection.java +++ b/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/Reflection.java @@ -130,6 +130,7 @@ public class Reflection { int invokeGrassColorFromTexture(Biome instance); } + @Proxies(VillagerType.class) public interface VillagerTypeProxy { @Static diff --git a/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/config/BiomeParticleConfigTemplate.java b/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/config/BiomeParticleConfigTemplate.java index 41c65dbab..c564a190f 100644 --- a/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/config/BiomeParticleConfigTemplate.java +++ b/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/config/BiomeParticleConfigTemplate.java @@ -7,10 +7,7 @@ import com.mojang.brigadier.StringReader; import com.mojang.brigadier.exceptions.CommandSyntaxException; import net.minecraft.commands.arguments.ParticleArgument; import net.minecraft.core.HolderLookup; -import net.minecraft.core.HolderLookup.Provider; -import net.minecraft.core.HolderLookup.RegistryLookup; import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.core.registries.Registries; import net.minecraft.world.level.biome.AmbientParticleSettings; import java.util.stream.Stream; @@ -24,7 +21,7 @@ public class BiomeParticleConfigTemplate implements ObjectTemplate { @Value("type") @Default diff --git a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/implementations/terra/inventory/meta/ItemStackMetaMixin.java b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/implementations/terra/inventory/meta/ItemStackMetaMixin.java index 91a487d0b..129bbb1ad 100644 --- a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/implementations/terra/inventory/meta/ItemStackMetaMixin.java +++ b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/implementations/terra/inventory/meta/ItemStackMetaMixin.java @@ -17,22 +17,18 @@ package com.dfsek.terra.mod.mixin.implementations.terra.inventory.meta; +import com.dfsek.terra.api.inventory.item.Enchantment; +import com.dfsek.terra.api.inventory.item.ItemMeta; + import net.minecraft.component.type.ItemEnchantmentsComponent; import net.minecraft.item.ItemStack; import net.minecraft.registry.entry.RegistryEntry; -import org.spongepowered.asm.mixin.Implements; -import org.spongepowered.asm.mixin.Interface; -import org.spongepowered.asm.mixin.Intrinsic; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.*; import java.util.Collections; import java.util.HashMap; import java.util.Map; -import com.dfsek.terra.api.inventory.item.Enchantment; -import com.dfsek.terra.api.inventory.item.ItemMeta; - @Mixin(ItemStack.class) @Implements(@Interface(iface = ItemMeta.class, prefix = "terra$"))