Formatting Fixes.

This commit is contained in:
Sebastian Hartte
2020-09-09 02:27:12 +02:00
parent a521e827db
commit 0be7322c2c
7 changed files with 40 additions and 31 deletions
@@ -23,13 +23,13 @@
package appeng.api.implementations.items; package appeng.api.implementations.items;
import javax.annotation.Nullable;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World; import net.minecraft.world.World;
import javax.annotation.Nullable;
public interface IGrowableCrystal { public interface IGrowableCrystal {
ItemStack triggerGrowth(ItemStack is); ItemStack triggerGrowth(ItemStack is);
+10 -7
View File
@@ -30,6 +30,10 @@ import java.util.Map;
import java.util.function.DoubleSupplier; import java.util.function.DoubleSupplier;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import javax.annotation.Nullable;
import com.google.common.base.Strings;
import appeng.api.config.CondenserOutput; import appeng.api.config.CondenserOutput;
import appeng.api.config.PowerMultiplier; import appeng.api.config.PowerMultiplier;
import appeng.api.config.PowerUnits; import appeng.api.config.PowerUnits;
@@ -49,9 +53,6 @@ import appeng.core.config.StringListOption;
import appeng.core.config.StringOption; import appeng.core.config.StringOption;
import appeng.core.settings.TickRates; import appeng.core.settings.TickRates;
import appeng.util.EnumCycler; import appeng.util.EnumCycler;
import com.google.common.base.Strings;
import javax.annotation.Nullable;
public final class AEConfig { public final class AEConfig {
@@ -623,11 +624,13 @@ public final class AEConfig {
tickRateMax.put(tickRate, tickrates.addInt(tickRate.name() + "Max", tickRate.getDefaultMax())); 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."); improvedFluidTag = inWorldPurification.addString("improvedFluidTag", "",
improvedFluidMultiplier = inWorldPurification "A fluid tag that identifies fluids that improve crystal purification speed. Does not affect purification with water/lava.");
.addDouble("improvedFluidMultiplier", 2.0, 1.0, 10.0, "The speed multiplier to use when the crystals are submerged in the improved fluid."); improvedFluidMultiplier = inWorldPurification.addDouble("improvedFluidMultiplier", 2.0, 1.0, 10.0,
"The speed multiplier to use when the crystals are submerged in the improved fluid.");
} }
} }
@@ -279,7 +279,8 @@ public final class ApiBlocks implements IBlocks {
} }
}).build(); }).build();
this.quartzVibrantGlass = deco 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) .addFeatures(AEFeature.DECORATIVE_LIGHTS, AEFeature.QUARTZ_GLASS)
.rendering(new BlockRenderingCustomizer() { .rendering(new BlockRenderingCustomizer() {
@Override @Override
@@ -41,9 +41,9 @@ public final class LocatableRegistry implements ILocatableRegistry {
if (change == LocatableEvent.REGISTER) { if (change == LocatableEvent.REGISTER) {
AELog.debug("Registering locatable %s: %s", target.getLocatableSerial(), target); 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) { } 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()); this.set.remove(target.getLocatableSerial());
} }
}); });
@@ -18,13 +18,12 @@
package appeng.items.misc; package appeng.items.misc;
import appeng.api.implementations.items.IGrowableCrystal; import java.util.List;
import appeng.core.AEConfig;
import appeng.core.localization.ButtonToolTips; import javax.annotation.Nullable;
import appeng.entity.GrowingCrystalEntity;
import appeng.hooks.AECustomEntityItem;
import appeng.items.AEBaseItem;
import com.google.common.base.Preconditions; import com.google.common.base.Preconditions;
import net.fabricmc.api.EnvType; import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment; import net.fabricmc.api.Environment;
import net.fabricmc.fabric.api.tag.TagRegistry; 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.util.math.MathHelper;
import net.minecraft.world.World; import net.minecraft.world.World;
import javax.annotation.Nullable; import appeng.api.implementations.items.IGrowableCrystal;
import java.util.List; 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 * 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); this.grownItem = Preconditions.checkNotNull(grownItem);
String improvedFluidTagName = AEConfig.instance().getImprovedFluidTag(); String improvedFluidTagName = AEConfig.instance().getImprovedFluidTag();
this.improvedFluidTag = improvedFluidTagName != null ? this.improvedFluidTag = improvedFluidTagName != null ? TagRegistry.fluid(new Identifier(improvedFluidTagName))
TagRegistry.fluid(new Identifier(improvedFluidTagName)) : null; : null;
} }
@Nullable @Nullable
@@ -1,14 +1,14 @@
package appeng.mixins.tags; 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.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor; import org.spongepowered.asm.mixin.gen.Accessor;
import org.spongepowered.asm.mixin.gen.Invoker; import org.spongepowered.asm.mixin.gen.Invoker;
import net.minecraft.fluid.Fluid; import net.minecraft.fluid.Fluid;
import net.minecraft.tag.FluidTags; import net.minecraft.tag.FluidTags;
import net.minecraft.tag.RequiredTagList;
import net.minecraft.tag.Tag; import net.minecraft.tag.Tag;
import net.minecraft.tag.TagGroup;
@Mixin(FluidTags.class) @Mixin(FluidTags.class)
public interface FluidTagsAccessor { public interface FluidTagsAccessor {
@@ -18,23 +18,25 @@
package appeng.parts; package appeng.parts;
import java.util.List;
import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheBuilder;
import com.google.common.cache.CacheLoader; import com.google.common.cache.CacheLoader;
import com.google.common.cache.LoadingCache; import com.google.common.cache.LoadingCache;
import net.minecraft.util.function.BooleanBiFunction; import net.minecraft.util.function.BooleanBiFunction;
import net.minecraft.util.math.Box; import net.minecraft.util.math.Box;
import net.minecraft.util.shape.VoxelShape; import net.minecraft.util.shape.VoxelShape;
import net.minecraft.util.shape.VoxelShapes; import net.minecraft.util.shape.VoxelShapes;
import java.util.List;
/** /**
* While creation of a {@link net.minecraft.util.shape.VoxelShape} with * While creation of a {@link net.minecraft.util.shape.VoxelShape} with
* {@link net.minecraft.util.shape.VoxelShapes#cuboid(Box)} is fast enough, combining voxel * {@link net.minecraft.util.shape.VoxelShapes#cuboid(Box)} is fast enough,
* shapes with {@link net.minecraft.util.shape.VoxelShapes#union(VoxelShape, VoxelShape)} or any other * combining voxel shapes with
* combination method, as well as {@link VoxelShape#simplify()} are <b>extremely * {@link net.minecraft.util.shape.VoxelShapes#union(VoxelShape, VoxelShape)} or
* slow</b>. For example: Creating a VoxelShape for a list of 5 bounding boxes * any other combination method, as well as {@link VoxelShape#simplify()} are
* 10,000 times takes about 1.7 seconds. * <b>extremely slow</b>. For example: Creating a VoxelShape for a list of 5
* bounding boxes 10,000 times takes about 1.7 seconds.
* *
* <p> * <p>
* To reduce the impact of this on cables, we introduce a global voxel shape * To reduce the impact of this on cables, we introduce a global voxel shape