diff --git a/src/api/java/appeng/api/implementations/items/IGrowableCrystal.java b/src/api/java/appeng/api/implementations/items/IGrowableCrystal.java index 3fdb75476..276da1d75 100644 --- a/src/api/java/appeng/api/implementations/items/IGrowableCrystal.java +++ b/src/api/java/appeng/api/implementations/items/IGrowableCrystal.java @@ -23,13 +23,13 @@ package appeng.api.implementations.items; +import javax.annotation.Nullable; + import net.minecraft.block.BlockState; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import javax.annotation.Nullable; - public interface IGrowableCrystal { ItemStack triggerGrowth(ItemStack is); diff --git a/src/main/java/appeng/core/AEConfig.java b/src/main/java/appeng/core/AEConfig.java index ad65a17f5..1e9f3906a 100644 --- a/src/main/java/appeng/core/AEConfig.java +++ b/src/main/java/appeng/core/AEConfig.java @@ -30,6 +30,10 @@ import java.util.Map; import java.util.function.DoubleSupplier; import java.util.stream.Collectors; +import javax.annotation.Nullable; + +import com.google.common.base.Strings; + import appeng.api.config.CondenserOutput; import appeng.api.config.PowerMultiplier; import appeng.api.config.PowerUnits; @@ -49,9 +53,6 @@ import appeng.core.config.StringListOption; import appeng.core.config.StringOption; import appeng.core.settings.TickRates; import appeng.util.EnumCycler; -import com.google.common.base.Strings; - -import javax.annotation.Nullable; public final class AEConfig { @@ -623,11 +624,13 @@ public final class AEConfig { tickRateMax.put(tickRate, tickrates.addInt(tickRate.name() + "Max", tickRate.getDefaultMax())); } - ConfigSection inWorldPurification = root.subsection("inWorldPurification", "Settings for in-world purification of crystals."); + ConfigSection inWorldPurification = root.subsection("inWorldPurification", + "Settings for in-world purification of crystals."); - improvedFluidTag = inWorldPurification.addString("improvedFluidTag", "", "A fluid tag that identifies fluids that improve crystal purification speed. Does not affect purification with water/lava."); - improvedFluidMultiplier = inWorldPurification - .addDouble("improvedFluidMultiplier", 2.0, 1.0, 10.0, "The speed multiplier to use when the crystals are submerged in the improved fluid."); + improvedFluidTag = inWorldPurification.addString("improvedFluidTag", "", + "A fluid tag that identifies fluids that improve crystal purification speed. Does not affect purification with water/lava."); + improvedFluidMultiplier = inWorldPurification.addDouble("improvedFluidMultiplier", 2.0, 1.0, 10.0, + "The speed multiplier to use when the crystals are submerged in the improved fluid."); } } diff --git a/src/main/java/appeng/core/api/definitions/ApiBlocks.java b/src/main/java/appeng/core/api/definitions/ApiBlocks.java index 47441fd2e..f61a35d92 100644 --- a/src/main/java/appeng/core/api/definitions/ApiBlocks.java +++ b/src/main/java/appeng/core/api/definitions/ApiBlocks.java @@ -279,7 +279,8 @@ public final class ApiBlocks implements IBlocks { } }).build(); this.quartzVibrantGlass = deco - .block("quartz_vibrant_glass", () -> new QuartzLampBlock(glassProps().lightLevel(15).allowsSpawning(neverAllowSpawn))) + .block("quartz_vibrant_glass", + () -> new QuartzLampBlock(glassProps().lightLevel(15).allowsSpawning(neverAllowSpawn))) .addFeatures(AEFeature.DECORATIVE_LIGHTS, AEFeature.QUARTZ_GLASS) .rendering(new BlockRenderingCustomizer() { @Override diff --git a/src/main/java/appeng/core/features/registries/LocatableRegistry.java b/src/main/java/appeng/core/features/registries/LocatableRegistry.java index 00eb737d2..65ba671d1 100644 --- a/src/main/java/appeng/core/features/registries/LocatableRegistry.java +++ b/src/main/java/appeng/core/features/registries/LocatableRegistry.java @@ -41,9 +41,9 @@ public final class LocatableRegistry implements ILocatableRegistry { if (change == LocatableEvent.REGISTER) { AELog.debug("Registering locatable %s: %s", target.getLocatableSerial(), target); - this.set.put(target.getLocatableSerial(), target); + this.set.put(target.getLocatableSerial(), target); } else if (change == LocatableEvent.UNREGISTER) { - AELog.debug("Unregistering locatable %s: %s", target.getLocatableSerial(), target); + AELog.debug("Unregistering locatable %s: %s", target.getLocatableSerial(), target); this.set.remove(target.getLocatableSerial()); } }); diff --git a/src/main/java/appeng/items/misc/CrystalSeedItem.java b/src/main/java/appeng/items/misc/CrystalSeedItem.java index d2f2b1017..93e7d327e 100644 --- a/src/main/java/appeng/items/misc/CrystalSeedItem.java +++ b/src/main/java/appeng/items/misc/CrystalSeedItem.java @@ -18,13 +18,12 @@ package appeng.items.misc; -import appeng.api.implementations.items.IGrowableCrystal; -import appeng.core.AEConfig; -import appeng.core.localization.ButtonToolTips; -import appeng.entity.GrowingCrystalEntity; -import appeng.hooks.AECustomEntityItem; -import appeng.items.AEBaseItem; +import java.util.List; + +import javax.annotation.Nullable; + import com.google.common.base.Preconditions; + import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.fabricmc.fabric.api.tag.TagRegistry; @@ -49,8 +48,12 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; -import javax.annotation.Nullable; -import java.util.List; +import appeng.api.implementations.items.IGrowableCrystal; +import appeng.core.AEConfig; +import appeng.core.localization.ButtonToolTips; +import appeng.entity.GrowingCrystalEntity; +import appeng.hooks.AECustomEntityItem; +import appeng.items.AEBaseItem; /** * This item reprents one of the seeds used to grow various forms of quartz by @@ -80,8 +83,8 @@ public class CrystalSeedItem extends AEBaseItem implements IGrowableCrystal, AEC this.grownItem = Preconditions.checkNotNull(grownItem); String improvedFluidTagName = AEConfig.instance().getImprovedFluidTag(); - this.improvedFluidTag = improvedFluidTagName != null ? - TagRegistry.fluid(new Identifier(improvedFluidTagName)) : null; + this.improvedFluidTag = improvedFluidTagName != null ? TagRegistry.fluid(new Identifier(improvedFluidTagName)) + : null; } @Nullable diff --git a/src/main/java/appeng/mixins/tags/FluidTagsAccessor.java b/src/main/java/appeng/mixins/tags/FluidTagsAccessor.java index 931b23e90..d41a7ac66 100644 --- a/src/main/java/appeng/mixins/tags/FluidTagsAccessor.java +++ b/src/main/java/appeng/mixins/tags/FluidTagsAccessor.java @@ -1,14 +1,14 @@ package appeng.mixins.tags; -import net.minecraft.tag.RequiredTagList; -import net.minecraft.tag.TagGroup; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Accessor; import org.spongepowered.asm.mixin.gen.Invoker; import net.minecraft.fluid.Fluid; import net.minecraft.tag.FluidTags; +import net.minecraft.tag.RequiredTagList; import net.minecraft.tag.Tag; +import net.minecraft.tag.TagGroup; @Mixin(FluidTags.class) public interface FluidTagsAccessor { diff --git a/src/main/java/appeng/parts/VoxelShapeCache.java b/src/main/java/appeng/parts/VoxelShapeCache.java index 2aff9b9f6..7b9183302 100644 --- a/src/main/java/appeng/parts/VoxelShapeCache.java +++ b/src/main/java/appeng/parts/VoxelShapeCache.java @@ -18,23 +18,25 @@ package appeng.parts; +import java.util.List; + import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; + import net.minecraft.util.function.BooleanBiFunction; import net.minecraft.util.math.Box; import net.minecraft.util.shape.VoxelShape; import net.minecraft.util.shape.VoxelShapes; -import java.util.List; - /** * While creation of a {@link net.minecraft.util.shape.VoxelShape} with - * {@link net.minecraft.util.shape.VoxelShapes#cuboid(Box)} is fast enough, combining voxel - * shapes with {@link net.minecraft.util.shape.VoxelShapes#union(VoxelShape, VoxelShape)} or any other - * combination method, as well as {@link VoxelShape#simplify()} are extremely - * slow. For example: Creating a VoxelShape for a list of 5 bounding boxes - * 10,000 times takes about 1.7 seconds. + * {@link net.minecraft.util.shape.VoxelShapes#cuboid(Box)} is fast enough, + * combining voxel shapes with + * {@link net.minecraft.util.shape.VoxelShapes#union(VoxelShape, VoxelShape)} or + * any other combination method, as well as {@link VoxelShape#simplify()} are + * extremely slow. For example: Creating a VoxelShape for a list of 5 + * bounding boxes 10,000 times takes about 1.7 seconds. * *

* To reduce the impact of this on cables, we introduce a global voxel shape