diff --git a/src/api/java/appeng/api/config/SecurityPermissions.java b/src/api/java/appeng/api/config/SecurityPermissions.java index 8fe52875d..c3a49fec5 100644 --- a/src/api/java/appeng/api/config/SecurityPermissions.java +++ b/src/api/java/appeng/api/config/SecurityPermissions.java @@ -23,11 +23,11 @@ package appeng.api.config; +import java.util.Locale; + import net.minecraft.text.Text; import net.minecraft.text.TranslatableText; -import java.util.Locale; - /** * Represent the security systems basic permissions, these are not for * anti-griefing, they are part of the mod as a gameplay feature. diff --git a/src/datagen/java/appeng/data/providers/tags/ConventionTagProvider.java b/src/datagen/java/appeng/data/providers/tags/ConventionTagProvider.java index 18c7d51b5..fd2b6eb95 100644 --- a/src/datagen/java/appeng/data/providers/tags/ConventionTagProvider.java +++ b/src/datagen/java/appeng/data/providers/tags/ConventionTagProvider.java @@ -3,10 +3,10 @@ package appeng.data.providers.tags; import java.io.IOException; import java.nio.file.Path; -import appeng.core.Api; import net.minecraft.block.Blocks; import net.minecraft.item.Items; +import appeng.core.Api; import appeng.core.AppEng; public class ConventionTagProvider extends TagProvider { diff --git a/src/main/java/appeng/client/gui/AEBaseScreen.java b/src/main/java/appeng/client/gui/AEBaseScreen.java index f3afe55d0..c5e0fa11e 100644 --- a/src/main/java/appeng/client/gui/AEBaseScreen.java +++ b/src/main/java/appeng/client/gui/AEBaseScreen.java @@ -175,8 +175,8 @@ public abstract class AEBaseScreen extends HandledScr slot.drawContent(getClient(), mouseX, mouseY, partialTicks); - if (this.isPointWithinBounds(left, top, slot.getTooltipAreaWidth(), slot.getTooltipAreaHeight(), mouseX, mouseY) - && slot.canClick(getPlayer())) { + if (this.isPointWithinBounds(left, top, slot.getTooltipAreaWidth(), slot.getTooltipAreaHeight(), mouseX, + mouseY) && slot.canClick(getPlayer())) { RenderSystem.colorMask(true, true, true, false); this.fillGradient(matrices, left, top, right, bottom, -2130706433, -2130706433); RenderSystem.colorMask(true, true, true, true); @@ -206,7 +206,8 @@ public abstract class AEBaseScreen extends HandledScr if (!tooltipText.isEmpty()) { String[] lines = tooltipText.split("\n"); // FIXME FABRIC List textLines = Arrays.stream(lines).map(LiteralText::new).collect(Collectors.toList()); - this.drawTooltip(matrices, x, y, textLines);} + this.drawTooltip(matrices, x, y, textLines); + } } // FIXME FABRIC: move out to json (?) diff --git a/src/main/java/appeng/client/gui/implementations/InterfaceTerminalScreen.java b/src/main/java/appeng/client/gui/implementations/InterfaceTerminalScreen.java index 9dc5a08df..dd93d23c0 100644 --- a/src/main/java/appeng/client/gui/implementations/InterfaceTerminalScreen.java +++ b/src/main/java/appeng/client/gui/implementations/InterfaceTerminalScreen.java @@ -95,8 +95,7 @@ public class InterfaceTerminalScreen extends AEBaseScreen im this.textRenderer.draw(matrices, GuiText.NetworkDetails.text(), 8, 6, 4210752); this.textRenderer.draw(matrices, - GuiText.StoredPower.withSuffix(": " + Platform.formatPowerLong(handler.getCurrentPower(), false)), 13, 16, - 4210752); + GuiText.StoredPower.withSuffix(": " + Platform.formatPowerLong(handler.getCurrentPower(), false)), 13, + 16, 4210752); this.textRenderer.draw(matrices, GuiText.MaxPower.withSuffix(": " + Platform.formatPowerLong(handler.getMaxPower(), false)), 13, 26, 4210752); this.textRenderer.draw(matrices, - GuiText.PowerInputRate.withSuffix(": " + Platform.formatPowerLong(handler.getAverageAddition(), true)), 13, - 143 - 10, 4210752); + GuiText.PowerInputRate.withSuffix(": " + Platform.formatPowerLong(handler.getAverageAddition(), true)), + 13, 143 - 10, 4210752); this.textRenderer.draw(matrices, GuiText.PowerUsageRate.withSuffix(": " + Platform.formatPowerLong(handler.getPowerUsage(), true)), 13, 143 - 20, 4210752); diff --git a/src/main/java/appeng/client/gui/implementations/NumberEntryWidget.java b/src/main/java/appeng/client/gui/implementations/NumberEntryWidget.java index d6c89b01d..82d9d0c82 100644 --- a/src/main/java/appeng/client/gui/implementations/NumberEntryWidget.java +++ b/src/main/java/appeng/client/gui/implementations/NumberEntryWidget.java @@ -9,13 +9,13 @@ import net.minecraft.client.font.TextRenderer; import net.minecraft.client.gui.Element; import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.text.Text; import appeng.client.gui.AEBaseScreen; import appeng.client.gui.NumberEntryType; import appeng.client.gui.widgets.ITickingWidget; import appeng.client.gui.widgets.NumberBox; import appeng.core.AEConfig; -import net.minecraft.text.Text; /** * A utility widget that consists of a text-field to enter a number with diff --git a/src/main/java/appeng/client/gui/implementations/QNBScreen.java b/src/main/java/appeng/client/gui/implementations/QNBScreen.java index 34c583800..bd89f9621 100644 --- a/src/main/java/appeng/client/gui/implementations/QNBScreen.java +++ b/src/main/java/appeng/client/gui/implementations/QNBScreen.java @@ -35,8 +35,7 @@ public class QNBScreen extends AEBaseScreen { @Override public void drawFG(MatrixStack matrices, final int offsetX, final int offsetY, final int mouseX, final int mouseY) { - this.textRenderer.draw(matrices, this.getGuiDisplayName(GuiText.QuantumLinkChamber.text()), 8, 6, - 4210752); + this.textRenderer.draw(matrices, this.getGuiDisplayName(GuiText.QuantumLinkChamber.text()), 8, 6, 4210752); this.textRenderer.draw(matrices, GuiText.inventory.text(), 8, this.backgroundHeight - 96 + 3, 4210752); } diff --git a/src/main/java/appeng/client/gui/implementations/QuartzKnifeScreen.java b/src/main/java/appeng/client/gui/implementations/QuartzKnifeScreen.java index b1a4e273e..5e059fd42 100644 --- a/src/main/java/appeng/client/gui/implementations/QuartzKnifeScreen.java +++ b/src/main/java/appeng/client/gui/implementations/QuartzKnifeScreen.java @@ -59,8 +59,7 @@ public class QuartzKnifeScreen extends AEBaseScreen { @Override public void drawFG(MatrixStack matrices, final int offsetX, final int offsetY, final int mouseX, final int mouseY) { - this.textRenderer.draw(matrices, this.getGuiDisplayName(GuiText.QuartzCuttingKnife.text()), 8, 6, - 4210752); + this.textRenderer.draw(matrices, this.getGuiDisplayName(GuiText.QuartzCuttingKnife.text()), 8, 6, 4210752); this.textRenderer.draw(matrices, GuiText.inventory.text(), 8, this.backgroundHeight - 96 + 3, 4210752); } diff --git a/src/main/java/appeng/client/gui/implementations/SpatialIOPortScreen.java b/src/main/java/appeng/client/gui/implementations/SpatialIOPortScreen.java index ed5c3ac8d..d3e21f851 100644 --- a/src/main/java/appeng/client/gui/implementations/SpatialIOPortScreen.java +++ b/src/main/java/appeng/client/gui/implementations/SpatialIOPortScreen.java @@ -63,8 +63,8 @@ public class SpatialIOPortScreen extends AEBaseScreen { .withSuffix(": " + this.handler.xSize + "x" + this.handler.ySize + "x" + this.handler.zSize); this.textRenderer.draw(matrices, text, 13, 93, 4210752); } else { - this.textRenderer.draw(matrices, GuiText.SCSSize.withSuffix(": ").append(GuiText.SCSInvalid.text()), - 13, 93, 4210752); + this.textRenderer.draw(matrices, GuiText.SCSSize.withSuffix(": ").append(GuiText.SCSInvalid.text()), 13, 93, + 4210752); } } diff --git a/src/main/java/appeng/client/gui/implementations/VibrationChamberScreen.java b/src/main/java/appeng/client/gui/implementations/VibrationChamberScreen.java index 5985b2131..389d6e5a4 100644 --- a/src/main/java/appeng/client/gui/implementations/VibrationChamberScreen.java +++ b/src/main/java/appeng/client/gui/implementations/VibrationChamberScreen.java @@ -51,8 +51,7 @@ public class VibrationChamberScreen extends AEBaseScreen @Override public void drawFG(MatrixStack matrices, int offsetX, int offsetY, int mouseX, int mouseY) { - this.textRenderer.draw(matrices, this.getGuiDisplayName(new LiteralText("Fluid Terminal")), 8, 6, - 4210752); + this.textRenderer.draw(matrices, this.getGuiDisplayName(new LiteralText("Fluid Terminal")), 8, 6, 4210752); this.textRenderer.draw(matrices, GuiText.inventory.text(), 8, this.backgroundHeight - 96 + 3, 4210752); } diff --git a/src/main/java/appeng/fluids/client/gui/widgets/OptionalFluidSlotWidget.java b/src/main/java/appeng/fluids/client/gui/widgets/OptionalFluidSlotWidget.java index 471130d8c..fcd6616c9 100644 --- a/src/main/java/appeng/fluids/client/gui/widgets/OptionalFluidSlotWidget.java +++ b/src/main/java/appeng/fluids/client/gui/widgets/OptionalFluidSlotWidget.java @@ -50,8 +50,8 @@ public class OptionalFluidSlotWidget extends FluidSlotWidget { } int oldZOffset = getZOffset(); setZOffset(currentZIndex); - drawTexture(matrices, guileft + this.getTooltipAreaX() - 1, guitop + this.getTooltipAreaY() - 1, this.srcX - 1, this.srcY - 1, - this.getTooltipAreaWidth() + 2, this.getTooltipAreaHeight() + 2); + drawTexture(matrices, guileft + this.getTooltipAreaX() - 1, guitop + this.getTooltipAreaY() - 1, this.srcX - 1, + this.srcY - 1, this.getTooltipAreaWidth() + 2, this.getTooltipAreaHeight() + 2); setZOffset(oldZOffset); } } diff --git a/src/main/java/appeng/fluids/parts/FluidAnnihilationPlanePart.java b/src/main/java/appeng/fluids/parts/FluidAnnihilationPlanePart.java index aa1ac5142..435eeb0c6 100644 --- a/src/main/java/appeng/fluids/parts/FluidAnnihilationPlanePart.java +++ b/src/main/java/appeng/fluids/parts/FluidAnnihilationPlanePart.java @@ -6,7 +6,6 @@ import java.util.List; import javax.annotation.Nonnull; -import appeng.mixins.FluidTagsAccessor; import net.minecraft.block.BlockState; import net.minecraft.block.FluidDrainable; import net.minecraft.block.entity.BlockEntity; @@ -48,6 +47,7 @@ import appeng.fluids.util.AEFluidStack; import appeng.items.parts.PartModels; import appeng.me.GridAccessException; import appeng.me.helpers.MachineSource; +import appeng.mixins.FluidTagsAccessor; import appeng.parts.BasicStatePart; import appeng.parts.automation.PlaneConnectionHelper; import appeng.parts.automation.PlaneConnections; @@ -56,7 +56,8 @@ import appeng.util.Platform; public class FluidAnnihilationPlanePart extends BasicStatePart implements IGridTickable { - public static final Tag.Identified TAG_BLACKLIST = FluidTagsAccessor.register(AppEng.makeId("blacklisted/fluid_annihilation_plane").toString()); + public static final Tag.Identified TAG_BLACKLIST = FluidTagsAccessor + .register(AppEng.makeId("blacklisted/fluid_annihilation_plane").toString()); private static final PlaneModels MODELS = new PlaneModels("part/fluid_annihilation_plane", "part/fluid_annihilation_plane_on"); diff --git a/src/main/java/appeng/hooks/HopperHooks.java b/src/main/java/appeng/hooks/HopperHooks.java index fe98d3b2d..a7d97df26 100644 --- a/src/main/java/appeng/hooks/HopperHooks.java +++ b/src/main/java/appeng/hooks/HopperHooks.java @@ -1,12 +1,5 @@ package appeng.hooks; -import alexiil.mc.lib.attributes.SearchOption; -import alexiil.mc.lib.attributes.SearchOptions; -import alexiil.mc.lib.attributes.item.ItemAttributes; -import alexiil.mc.lib.attributes.item.ItemExtractable; -import alexiil.mc.lib.attributes.item.ItemInsertable; -import alexiil.mc.lib.attributes.item.ItemInvUtil; -import alexiil.mc.lib.attributes.item.compat.FixedInventoryVanillaWrapper; import net.minecraft.block.HopperBlock; import net.minecraft.block.entity.Hopper; import net.minecraft.block.entity.HopperBlockEntity; @@ -16,6 +9,14 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.world.World; +import alexiil.mc.lib.attributes.SearchOption; +import alexiil.mc.lib.attributes.SearchOptions; +import alexiil.mc.lib.attributes.item.ItemAttributes; +import alexiil.mc.lib.attributes.item.ItemExtractable; +import alexiil.mc.lib.attributes.item.ItemInsertable; +import alexiil.mc.lib.attributes.item.ItemInvUtil; +import alexiil.mc.lib.attributes.item.compat.FixedInventoryVanillaWrapper; + // SEE: https://github.com/AlexIIL/LibBlockAttributes/pull/27 public final class HopperHooks { @@ -31,7 +32,8 @@ public final class HopperHooks { return ActionResult.PASS; } - ItemInsertable insertable = ItemAttributes.INSERTABLE.getFirstOrNull(world, targetPos, SearchOptions.inDirection(towards)); + ItemInsertable insertable = ItemAttributes.INSERTABLE.getFirstOrNull(world, targetPos, + SearchOptions.inDirection(towards)); if (insertable == null) { return ActionResult.PASS; // Let Vanilla handle non-LBA enabled inventories and Entities } @@ -53,8 +55,8 @@ public final class HopperHooks { private static final SearchOption EXTRACT_SEARCH = SearchOptions.inDirection(Direction.UP); /** - * Tries to extract items from an inventory above the given hopper into the hopper. - * Note that the given hopper can also be a hopper minecart. + * Tries to extract items from an inventory above the given hopper into the + * hopper. Note that the given hopper can also be a hopper minecart. */ public static ActionResult tryExtract(Hopper hopper) { World world = hopper.getWorld(); @@ -82,9 +84,12 @@ public final class HopperHooks { } private static boolean isVanillaInventoryAt(World world, BlockPos pos) { - // If there's a TE at the target position that implements Inventory (such that Hopper would handle it itself) - // defer to Vanilla to avoid injecting ourselves inbetween Vanilla blocks needlessly. - // ItemAttributes.INSERTABLE would return an auto-converted Inventory in such cases. + // If there's a TE at the target position that implements Inventory (such that + // Hopper would handle it itself) + // defer to Vanilla to avoid injecting ourselves inbetween Vanilla blocks + // needlessly. + // ItemAttributes.INSERTABLE would return an auto-converted Inventory in such + // cases. return world.getBlockEntity(pos) instanceof Inventory; } diff --git a/src/main/java/appeng/hooks/UnlitQuadHooks.java b/src/main/java/appeng/hooks/UnlitQuadHooks.java index a5835728d..d6fb15eed 100644 --- a/src/main/java/appeng/hooks/UnlitQuadHooks.java +++ b/src/main/java/appeng/hooks/UnlitQuadHooks.java @@ -3,8 +3,6 @@ package appeng.hooks; import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import appeng.core.AppEng; -import appeng.mixins.unlitquad.BakedQuadAccessor; import net.minecraft.client.render.LightmapTextureManager; import net.minecraft.client.render.VertexFormat; import net.minecraft.client.render.VertexFormatElement; @@ -17,6 +15,9 @@ import net.minecraft.util.Identifier; import net.minecraft.util.JsonHelper; import net.minecraft.util.math.Direction; +import appeng.core.AppEng; +import appeng.mixins.unlitquad.BakedQuadAccessor; + /** * Implementation details of allowing quads to be defined as "unlit" in JSON * models by specifying an "unlit" boolean property on the face. @@ -100,7 +101,8 @@ public class UnlitQuadHooks { * {@link #makeUnlit(BakedQuad)}. */ public static class UnlitModelElementFace extends ModelElementFace { - public UnlitModelElementFace(Direction cullFaceIn, int tintIndexIn, String textureIn, ModelElementTexture blockFaceUVIn) { + public UnlitModelElementFace(Direction cullFaceIn, int tintIndexIn, String textureIn, + ModelElementTexture blockFaceUVIn) { super(cullFaceIn, tintIndexIn, textureIn, blockFaceUVIn); } } diff --git a/src/main/java/appeng/items/storage/SpatialStorageCellItem.java b/src/main/java/appeng/items/storage/SpatialStorageCellItem.java index ac3417421..3b2ed6433 100644 --- a/src/main/java/appeng/items/storage/SpatialStorageCellItem.java +++ b/src/main/java/appeng/items/storage/SpatialStorageCellItem.java @@ -22,15 +22,6 @@ import java.time.Instant; import java.util.List; import java.util.Locale; -import appeng.api.implementations.items.ISpatialStorageCell; -import appeng.api.util.WorldCoord; -import appeng.core.AELog; -import appeng.core.localization.GuiText; -import appeng.items.AEBaseItem; -import appeng.spatial.SpatialStorageHelper; -import appeng.spatial.SpatialStoragePlot; -import appeng.spatial.SpatialStoragePlotManager; -import appeng.spatial.TransitionInfo; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.fabricmc.fabric.api.util.NbtType; @@ -43,6 +34,16 @@ import net.minecraft.util.Formatting; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import appeng.api.implementations.items.ISpatialStorageCell; +import appeng.api.util.WorldCoord; +import appeng.core.AELog; +import appeng.core.localization.GuiText; +import appeng.items.AEBaseItem; +import appeng.spatial.SpatialStorageHelper; +import appeng.spatial.SpatialStoragePlot; +import appeng.spatial.SpatialStoragePlotManager; +import appeng.spatial.TransitionInfo; + public class SpatialStorageCellItem extends AEBaseItem implements ISpatialStorageCell { private static final String TAG_PLOT_ID = "plot_id"; @@ -62,7 +63,7 @@ public class SpatialStorageCellItem extends AEBaseItem implements ISpatialStorag @Environment(EnvType.CLIENT) @Override public void appendTooltip(final ItemStack stack, final World world, final List lines, - final TooltipContext advancedTooltips) { + final TooltipContext advancedTooltips) { int plotId = this.getAllocatedPlotId(stack); if (plotId == -1) { lines.add(GuiText.Unformatted.text().copy().formatted(Formatting.ITALIC)); @@ -111,7 +112,7 @@ public class SpatialStorageCellItem extends AEBaseItem implements ISpatialStorag @Override public boolean doSpatialTransition(final ItemStack is, final ServerWorld w, final WorldCoord min, - final WorldCoord max, int playerId) { + final WorldCoord max, int playerId) { final int targetX = max.x - min.x - 1; final int targetY = max.y - min.y - 1; final int targetZ = max.z - min.z - 1; @@ -142,8 +143,8 @@ public class SpatialStorageCellItem extends AEBaseItem implements ISpatialStorag } // Store some information about this transition in the plot - TransitionInfo info = new TransitionInfo(w.getRegistryKey().getValue(), min.getBlockPos(), - max.getBlockPos(), Instant.now()); + TransitionInfo info = new TransitionInfo(w.getRegistryKey().getValue(), min.getBlockPos(), max.getBlockPos(), + Instant.now()); manager.setLastTransition(plot.getId(), info); try { diff --git a/src/main/java/appeng/mixins/FluidTagsAccessor.java b/src/main/java/appeng/mixins/FluidTagsAccessor.java index 906f8aabc..34060e7a6 100644 --- a/src/main/java/appeng/mixins/FluidTagsAccessor.java +++ b/src/main/java/appeng/mixins/FluidTagsAccessor.java @@ -1,10 +1,11 @@ package appeng.mixins; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Invoker; + import net.minecraft.fluid.Fluid; import net.minecraft.tag.FluidTags; import net.minecraft.tag.Tag; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.gen.Invoker; @Mixin(FluidTags.class) public interface FluidTagsAccessor { diff --git a/src/main/java/appeng/mixins/HopperMixin.java b/src/main/java/appeng/mixins/HopperMixin.java index 9afa67310..172f3a448 100644 --- a/src/main/java/appeng/mixins/HopperMixin.java +++ b/src/main/java/appeng/mixins/HopperMixin.java @@ -1,14 +1,16 @@ package appeng.mixins; -import appeng.hooks.HopperHooks; -import net.minecraft.block.entity.Hopper; -import net.minecraft.block.entity.HopperBlockEntity; -import net.minecraft.util.ActionResult; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; +import net.minecraft.block.entity.Hopper; +import net.minecraft.block.entity.HopperBlockEntity; +import net.minecraft.util.ActionResult; + +import appeng.hooks.HopperHooks; + // SEE: https://github.com/AlexIIL/LibBlockAttributes/pull/27 @SuppressWarnings("ConstantConditions") @Mixin(HopperBlockEntity.class) diff --git a/src/main/java/appeng/mixins/spatial/DimensionOptionMixin.java b/src/main/java/appeng/mixins/spatial/DimensionOptionMixin.java index 41f7f0a07..23629e7f2 100644 --- a/src/main/java/appeng/mixins/spatial/DimensionOptionMixin.java +++ b/src/main/java/appeng/mixins/spatial/DimensionOptionMixin.java @@ -3,12 +3,13 @@ package appeng.mixins.spatial; import java.util.List; import java.util.Map; -import net.minecraft.util.registry.RegistryKey; -import net.minecraft.world.dimension.DimensionOptions; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.ModifyVariable; +import net.minecraft.util.registry.RegistryKey; +import net.minecraft.world.dimension.DimensionOptions; + import appeng.spatial.SpatialStorageDimensionIds; /** diff --git a/src/main/java/appeng/mixins/spatial/DimensionTypeMixin.java b/src/main/java/appeng/mixins/spatial/DimensionTypeMixin.java index 8a75039c8..797163268 100644 --- a/src/main/java/appeng/mixins/spatial/DimensionTypeMixin.java +++ b/src/main/java/appeng/mixins/spatial/DimensionTypeMixin.java @@ -1,18 +1,20 @@ package appeng.mixins.spatial; -import appeng.spatial.SpatialStorageDimensionIds; -import net.minecraft.tag.BlockTags; -import net.minecraft.util.Identifier; -import net.minecraft.util.registry.DynamicRegistryManager; -import net.minecraft.util.registry.Registry; -import net.minecraft.world.dimension.DimensionType; +import java.util.OptionalLong; + import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Invoker; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import java.util.OptionalLong; +import net.minecraft.tag.BlockTags; +import net.minecraft.util.Identifier; +import net.minecraft.util.registry.DynamicRegistryManager; +import net.minecraft.util.registry.Registry; +import net.minecraft.world.dimension.DimensionType; + +import appeng.spatial.SpatialStorageDimensionIds; /** * Adds the storage cell world dimension type as a built-in dimension type. This @@ -23,17 +25,21 @@ import java.util.OptionalLong; public class DimensionTypeMixin { @Invoker("") - static DimensionType create(OptionalLong fixedTime, boolean hasSkylight, boolean hasCeiling, boolean ultrawarm, boolean natural, double coordinateScale, boolean piglinSafe, boolean bedWorks, boolean respawnAnchorWorks, boolean hasRaids, int logicalHeight, Identifier infiniburn, Identifier skyProperties, float ambientLight) { + static DimensionType create(OptionalLong fixedTime, boolean hasSkylight, boolean hasCeiling, boolean ultrawarm, + boolean natural, double coordinateScale, boolean piglinSafe, boolean bedWorks, boolean respawnAnchorWorks, + boolean hasRaids, int logicalHeight, Identifier infiniburn, Identifier skyProperties, float ambientLight) { throw new AssertionError(); } @Inject(method = "addRegistryDefaults", at = @At("TAIL")) - private static void addRegistryDefaults(DynamicRegistryManager.Impl registryTracker, CallbackInfoReturnable cir) { - DimensionType dimensionType = create(OptionalLong.of(12000), false, false, false, false, 1.0, - false, false, false, false, 256, BlockTags.INFINIBURN_OVERWORLD.getId(), SpatialStorageDimensionIds.SKY_PROPERTIES_ID, 1.0f); + private static void addRegistryDefaults(DynamicRegistryManager.Impl registryTracker, + CallbackInfoReturnable cir) { + DimensionType dimensionType = create(OptionalLong.of(12000), false, false, false, false, 1.0, false, false, + false, false, 256, BlockTags.INFINIBURN_OVERWORLD.getId(), SpatialStorageDimensionIds.SKY_PROPERTIES_ID, + 1.0f); - Registry.register(registryTracker.getDimensionTypes(), - SpatialStorageDimensionIds.DIMENSION_TYPE_ID.getValue(), dimensionType); + Registry.register(registryTracker.getDimensionTypes(), SpatialStorageDimensionIds.DIMENSION_TYPE_ID.getValue(), + dimensionType); } } diff --git a/src/main/java/appeng/mixins/spatial/EntityMixin.java b/src/main/java/appeng/mixins/spatial/EntityMixin.java index 422a72133..4d5d2aa04 100644 --- a/src/main/java/appeng/mixins/spatial/EntityMixin.java +++ b/src/main/java/appeng/mixins/spatial/EntityMixin.java @@ -1,18 +1,20 @@ package appeng.mixins.spatial; -import appeng.spatial.SpatialStorageDimensionIds; -import appeng.spatial.SpatialStorageHelper; -import net.minecraft.entity.Entity; -import net.minecraft.server.world.ServerWorld; -import net.minecraft.world.TeleportTarget; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; +import net.minecraft.entity.Entity; +import net.minecraft.server.world.ServerWorld; +import net.minecraft.world.TeleportTarget; + +import appeng.spatial.SpatialStorageDimensionIds; +import appeng.spatial.SpatialStorageHelper; + /** - * This mixin sets the teleport destination, because otherwise Vanilla will not move - * the player. + * This mixin sets the teleport destination, because otherwise Vanilla will not + * move the player. */ @Mixin(Entity.class) public class EntityMixin { diff --git a/src/main/java/appeng/mixins/spatial/SkyPropertiesMixin.java b/src/main/java/appeng/mixins/spatial/SkyPropertiesMixin.java index fa5ca3852..c482b756b 100644 --- a/src/main/java/appeng/mixins/spatial/SkyPropertiesMixin.java +++ b/src/main/java/appeng/mixins/spatial/SkyPropertiesMixin.java @@ -1,16 +1,19 @@ package appeng.mixins.spatial; -import appeng.spatial.SpatialStorageDimensionIds; -import appeng.spatial.SpatialStorageSkyProperties; -import it.unimi.dsi.fastutil.objects.Object2ObjectMap; -import net.minecraft.client.render.SkyProperties; -import net.minecraft.util.Identifier; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import net.minecraft.client.render.SkyProperties; +import net.minecraft.util.Identifier; + +import it.unimi.dsi.fastutil.objects.Object2ObjectMap; + +import appeng.spatial.SpatialStorageDimensionIds; +import appeng.spatial.SpatialStorageSkyProperties; + @Mixin(SkyProperties.class) public class SkyPropertiesMixin { diff --git a/src/main/java/appeng/mixins/unlitquad/BakedQuadAccessor.java b/src/main/java/appeng/mixins/unlitquad/BakedQuadAccessor.java index 12ff54e1c..4adaec8f9 100644 --- a/src/main/java/appeng/mixins/unlitquad/BakedQuadAccessor.java +++ b/src/main/java/appeng/mixins/unlitquad/BakedQuadAccessor.java @@ -1,9 +1,10 @@ package appeng.mixins.unlitquad; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Accessor; + import net.minecraft.client.render.model.BakedQuad; import net.minecraft.client.texture.Sprite; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.gen.Accessor; @Mixin(BakedQuad.class) public interface BakedQuadAccessor { diff --git a/src/main/java/appeng/mixins/unlitquad/JsonUnbakedModelMixin.java b/src/main/java/appeng/mixins/unlitquad/JsonUnbakedModelMixin.java index 66a147c56..0c33d6dc1 100644 --- a/src/main/java/appeng/mixins/unlitquad/JsonUnbakedModelMixin.java +++ b/src/main/java/appeng/mixins/unlitquad/JsonUnbakedModelMixin.java @@ -1,6 +1,10 @@ package appeng.mixins.unlitquad; -import appeng.hooks.UnlitQuadHooks; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + import net.minecraft.client.render.model.BakedQuad; import net.minecraft.client.render.model.ModelBakeSettings; import net.minecraft.client.render.model.json.JsonUnbakedModel; @@ -9,10 +13,8 @@ import net.minecraft.client.render.model.json.ModelElementFace; import net.minecraft.client.texture.Sprite; import net.minecraft.util.Identifier; import net.minecraft.util.math.Direction; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +import appeng.hooks.UnlitQuadHooks; /** * This mixin hooks into conversion from {@link ModelElementFace} to @@ -25,7 +27,7 @@ public class JsonUnbakedModelMixin { @Inject(method = "createQuad", at = @At("RETURN"), cancellable = true, require = 1, allow = 1) private static void onBakeFace(ModelElement element, ModelElementFace elementFace, Sprite sprite, Direction side, - ModelBakeSettings settings, Identifier id, CallbackInfoReturnable cri) { + ModelBakeSettings settings, Identifier id, CallbackInfoReturnable cri) { if (elementFace instanceof UnlitQuadHooks.UnlitModelElementFace) { cri.setReturnValue(UnlitQuadHooks.makeUnlit(cri.getReturnValue())); } diff --git a/src/main/java/appeng/mixins/unlitquad/ModelElementFaceDeserializerMixin.java b/src/main/java/appeng/mixins/unlitquad/ModelElementFaceDeserializerMixin.java index 9736e9567..1f20290f4 100644 --- a/src/main/java/appeng/mixins/unlitquad/ModelElementFaceDeserializerMixin.java +++ b/src/main/java/appeng/mixins/unlitquad/ModelElementFaceDeserializerMixin.java @@ -1,15 +1,18 @@ package appeng.mixins.unlitquad; -import appeng.hooks.UnlitQuadHooks; +import java.lang.reflect.Type; + import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonElement; -import net.minecraft.client.render.model.json.ModelElementFace; + import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import java.lang.reflect.Type; +import net.minecraft.client.render.model.json.ModelElementFace; + +import appeng.hooks.UnlitQuadHooks; /** * This mixin will call the hook to deserialize the unlit property, but only if @@ -20,7 +23,7 @@ public class ModelElementFaceDeserializerMixin { @Inject(method = "deserialize", at = @At("RETURN"), cancellable = true, allow = 1, remap = false) public void onDeserialize(JsonElement jsonElement, Type type, JsonDeserializationContext jsonDeserializationContext, - CallbackInfoReturnable cri) { + CallbackInfoReturnable cri) { if (!UnlitQuadHooks.isUnlitExtensionEnabled()) { return; // Not in a model that activated the deserializer } diff --git a/src/main/java/appeng/mixins/unlitquad/ModelLoaderMixin.java b/src/main/java/appeng/mixins/unlitquad/ModelLoaderMixin.java index 463d540bb..67801f853 100644 --- a/src/main/java/appeng/mixins/unlitquad/ModelLoaderMixin.java +++ b/src/main/java/appeng/mixins/unlitquad/ModelLoaderMixin.java @@ -1,15 +1,17 @@ package appeng.mixins.unlitquad; -import appeng.hooks.UnlitQuadHooks; -import net.minecraft.client.render.model.ModelLoader; -import net.minecraft.client.render.model.json.JsonUnbakedModel; -import net.minecraft.util.Identifier; +import java.io.IOException; + import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import java.io.IOException; +import net.minecraft.client.render.model.ModelLoader; +import net.minecraft.client.render.model.json.JsonUnbakedModel; +import net.minecraft.util.Identifier; + +import appeng.hooks.UnlitQuadHooks; /** * The only job of this mixin is to only enable the unlit extensions if the diff --git a/src/main/java/appeng/parts/automation/FormationPlanePart.java b/src/main/java/appeng/parts/automation/FormationPlanePart.java index a07b0f482..19424bad0 100644 --- a/src/main/java/appeng/parts/automation/FormationPlanePart.java +++ b/src/main/java/appeng/parts/automation/FormationPlanePart.java @@ -18,7 +18,33 @@ package appeng.parts.automation; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Random; + +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityType; +import net.minecraft.entity.ItemEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.AutomaticItemPlacementContext; +import net.minecraft.item.Item; +import net.minecraft.item.ItemPlacementContext; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.screen.ScreenHandlerType; +import net.minecraft.server.world.ServerWorld; +import net.minecraft.util.Hand; +import net.minecraft.util.hit.BlockHitResult; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Box; +import net.minecraft.util.math.Direction; +import net.minecraft.util.math.Vec3d; +import net.minecraft.world.World; + import alexiil.mc.lib.attributes.item.FixedItemInv; + import appeng.api.config.AccessRestriction; import appeng.api.config.Actionable; import appeng.api.config.FuzzyMode; @@ -53,30 +79,6 @@ import appeng.util.Platform; import appeng.util.inv.InvOperation; import appeng.util.prioritylist.FuzzyPriorityList; import appeng.util.prioritylist.PrecisePriorityList; -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityType; -import net.minecraft.entity.ItemEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.AutomaticItemPlacementContext; -import net.minecraft.item.Item; -import net.minecraft.item.ItemPlacementContext; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.screen.ScreenHandlerType; -import net.minecraft.server.world.ServerWorld; -import net.minecraft.util.Hand; -import net.minecraft.util.hit.BlockHitResult; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Box; -import net.minecraft.util.math.Direction; -import net.minecraft.util.math.Vec3d; -import net.minecraft.world.World; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Random; public class FormationPlanePart extends AbstractFormationPlanePart { @@ -361,8 +363,8 @@ public class FormationPlanePart extends AbstractFormationPlanePart } /** - * A custom {@link AutomaticItemPlacementContext} which also accepts a player needed - * various blocks like seeds. + * A custom {@link AutomaticItemPlacementContext} which also accepts a player + * needed various blocks like seeds. *

* Also removed {@link AutomaticItemPlacementContext#canReplaceExisting} as this * can cause a {@link StackOverflowError} for certain replaceable blocks. @@ -371,7 +373,7 @@ public class FormationPlanePart extends AbstractFormationPlanePart private final Direction lookDirection; public PlaneDirectionalPlaceContext(World world, PlayerEntity player, BlockPos pos, Direction lookDirection, - ItemStack itemStack, Direction facing) { + ItemStack itemStack, Direction facing) { super(world, player, Hand.MAIN_HAND, itemStack, new BlockHitResult(Vec3d.ofBottomCenter(pos), facing, pos, false)); this.lookDirection = lookDirection; @@ -397,13 +399,13 @@ public class FormationPlanePart extends AbstractFormationPlanePart switch (this.lookDirection) { case DOWN: default: - return new Direction[]{Direction.DOWN, Direction.NORTH, Direction.EAST, Direction.SOUTH, - Direction.WEST, Direction.UP}; + return new Direction[] { Direction.DOWN, Direction.NORTH, Direction.EAST, Direction.SOUTH, + Direction.WEST, Direction.UP }; case UP: - return new Direction[]{Direction.DOWN, Direction.UP, Direction.NORTH, Direction.EAST, - Direction.SOUTH, Direction.WEST}; + return new Direction[] { Direction.DOWN, Direction.UP, Direction.NORTH, Direction.EAST, + Direction.SOUTH, Direction.WEST }; case NORTH: - return new Direction[]{Direction.DOWN, Direction.NORTH, Direction.EAST, Direction.WEST, + return new Direction[] { Direction.DOWN, Direction.NORTH, Direction.EAST, Direction.WEST, Direction.UP, Direction.SOUTH }; case SOUTH: return new Direction[] { Direction.DOWN, Direction.SOUTH, Direction.EAST, Direction.WEST, diff --git a/src/main/java/appeng/parts/p2p/FluidP2PTunnelPart.java b/src/main/java/appeng/parts/p2p/FluidP2PTunnelPart.java index 1f2da27e3..2d36a07cd 100644 --- a/src/main/java/appeng/parts/p2p/FluidP2PTunnelPart.java +++ b/src/main/java/appeng/parts/p2p/FluidP2PTunnelPart.java @@ -18,6 +18,15 @@ package appeng.parts.p2p; +import java.util.List; + +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; +import net.minecraft.world.BlockView; +import net.minecraft.world.World; + import alexiil.mc.lib.attributes.Attribute; import alexiil.mc.lib.attributes.AttributeList; import alexiil.mc.lib.attributes.SearchOptions; @@ -31,18 +40,11 @@ import alexiil.mc.lib.attributes.fluid.impl.EmptyFluidExtractable; import alexiil.mc.lib.attributes.fluid.impl.RejectingFluidInsertable; import alexiil.mc.lib.attributes.fluid.volume.FluidKey; import alexiil.mc.lib.attributes.fluid.volume.FluidVolume; + import appeng.api.config.PowerUnits; import appeng.api.parts.IPartModel; import appeng.items.parts.PartModels; import appeng.me.GridAccessException; -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Direction; -import net.minecraft.world.BlockView; -import net.minecraft.world.World; - -import java.util.List; public class FluidP2PTunnelPart extends P2PTunnelPart { @@ -93,7 +95,8 @@ public class FluidP2PTunnelPart extends P2PTunnelPart { return MODELS.getModel(this.isPowered(), this.isActive()); } - // Gets the given attribute (or the defaultValue) of the block that this part attaches to + // Gets the given attribute (or the defaultValue) of the block that this part + // attaches to private T getAttachedAttribute(Attribute attribute, T defaultValue) { T result = null; if (this.isActive()) { @@ -138,7 +141,8 @@ public class FluidP2PTunnelPart extends P2PTunnelPart { } if (simulation.isAction()) { - FluidP2PTunnelPart.this.queueTunnelDrain(PowerUnits.RF, amount.sub(overflowAmount).asInexactDouble() * 1000); + FluidP2PTunnelPart.this.queueTunnelDrain(PowerUnits.RF, + amount.sub(overflowAmount).asInexactDouble() * 1000); } } catch (GridAccessException ignored) { } diff --git a/src/main/java/appeng/server/AECommand.java b/src/main/java/appeng/server/AECommand.java index 620f1bde6..5e81a5ad5 100644 --- a/src/main/java/appeng/server/AECommand.java +++ b/src/main/java/appeng/server/AECommand.java @@ -49,8 +49,8 @@ public final class AECommand { private void add(LiteralArgumentBuilder builder, Commands subCommand) { - LiteralArgumentBuilder subCommandBuilder = literal(subCommand.name().toLowerCase(Locale.ROOT)) - .requires(src -> src.hasPermissionLevel(subCommand.level)); + LiteralArgumentBuilder subCommandBuilder = literal( + subCommand.name().toLowerCase(Locale.ROOT)).requires(src -> src.hasPermissionLevel(subCommand.level)); subCommand.command.addArguments(subCommandBuilder); subCommandBuilder.executes(ctx -> { MinecraftServer server = AppEng.instance().getServer(); diff --git a/src/main/java/appeng/server/subcommands/SpatialStorageCommand.java b/src/main/java/appeng/server/subcommands/SpatialStorageCommand.java index 7512b3ed6..d374c088f 100644 --- a/src/main/java/appeng/server/subcommands/SpatialStorageCommand.java +++ b/src/main/java/appeng/server/subcommands/SpatialStorageCommand.java @@ -1,5 +1,7 @@ package appeng.server.subcommands; +import static net.minecraft.server.command.CommandManager.literal; + import java.time.Instant; import java.util.ArrayList; import java.util.Comparator; @@ -7,7 +9,6 @@ import java.util.List; import java.util.UUID; import java.util.function.UnaryOperator; -import appeng.core.AppEng; import com.mojang.brigadier.arguments.IntegerArgumentType; import com.mojang.brigadier.builder.LiteralArgumentBuilder; import com.mojang.brigadier.context.CommandContext; @@ -16,6 +17,7 @@ import com.mojang.brigadier.exceptions.CommandSyntaxException; import net.minecraft.command.CommandException; import net.minecraft.item.ItemStack; import net.minecraft.server.MinecraftServer; +import net.minecraft.server.command.CommandManager; import net.minecraft.server.command.ServerCommandSource; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.text.ClickEvent; @@ -29,6 +31,7 @@ import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockPos; import appeng.core.Api; +import appeng.core.AppEng; import appeng.core.worlddata.WorldData; import appeng.items.storage.SpatialStorageCellItem; import appeng.server.ISubCommand; @@ -37,9 +40,6 @@ import appeng.spatial.SpatialStoragePlot; import appeng.spatial.SpatialStoragePlotManager; import appeng.spatial.TransitionInfo; -import net.minecraft.server.command.CommandManager; -import static net.minecraft.server.command.CommandManager.literal; - /** * This admin command allows management of spatial storage plots. */ @@ -58,11 +58,12 @@ public class SpatialStorageCommand implements ISubCommand { }))); // Teleport into the plot - builder.then(literal("tp").then(CommandManager.argument("plotId", IntegerArgumentType.integer(1)).executes(ctx -> { - int plotId = IntegerArgumentType.getInteger(ctx, "plotId"); - teleportToPlot(ctx.getSource(), plotId); - return 1; - }))); + builder.then( + literal("tp").then(CommandManager.argument("plotId", IntegerArgumentType.integer(1)).executes(ctx -> { + int plotId = IntegerArgumentType.getInteger(ctx, "plotId"); + teleportToPlot(ctx.getSource(), plotId); + return 1; + }))); // Teleport from the current plot back to the source of its content, or do the // same for a given plot id @@ -76,8 +77,8 @@ public class SpatialStorageCommand implements ISubCommand { }))); // Creates a storage cell for the given plot id and gives it to the player - builder.then( - literal("givecell").then(CommandManager.argument("plotId", IntegerArgumentType.integer(1)).executes(ctx -> { + builder.then(literal("givecell") + .then(CommandManager.argument("plotId", IntegerArgumentType.integer(1)).executes(ctx -> { int plotId = IntegerArgumentType.getInteger(ctx, "plotId"); giveCell(ctx.getSource(), plotId); return 1; @@ -120,8 +121,7 @@ public class SpatialStorageCommand implements ISubCommand { private void teleportBack(ServerCommandSource source, SpatialStoragePlot plot) { TransitionInfo lastTransition = plot.getLastTransition(); if (lastTransition == null) { - throw new CommandException( - Text.of("This plot doesn't have a last known transition.")); + throw new CommandException(Text.of("This plot doesn't have a last known transition.")); } String command = getTeleportCommand(lastTransition.getWorldId(), lastTransition.getMin().add(0, 1, 0)); @@ -168,8 +168,8 @@ public class SpatialStorageCommand implements ISubCommand { // clickable link to the source) TransitionInfo lastTransition = plot.getLastTransition(); if (lastTransition != null) { - source.sendFeedback(new LiteralText("Last Transition:").formatted(Formatting.UNDERLINE, - Formatting.BOLD), true); + source.sendFeedback(new LiteralText("Last Transition:").formatted(Formatting.UNDERLINE, Formatting.BOLD), + true); String sourceWorldId = lastTransition.getWorldId().toString(); MutableText sourceLink = new LiteralText( @@ -189,8 +189,7 @@ public class SpatialStorageCommand implements ISubCommand { private static void teleportToPlot(ServerCommandSource source, int plotId) { SpatialStoragePlot plot = getPlot(plotId); - String teleportCommand = getTeleportCommand(SpatialStorageDimensionIds.WORLD_ID.getValue(), - plot.getOrigin()); + String teleportCommand = getTeleportCommand(SpatialStorageDimensionIds.WORLD_ID.getValue(), plot.getOrigin()); runCommandFor(source, teleportCommand); } @@ -211,8 +210,7 @@ public class SpatialStorageCommand implements ISubCommand { } if (!(cell.getItem() instanceof SpatialStorageCellItem)) { - throw new CommandException( - Text.of("Storage cell items don't implement the storage cell interface!")); + throw new CommandException(Text.of("Storage cell items don't implement the storage cell interface!")); } SpatialStorageCellItem spatialCellItem = (SpatialStorageCellItem) cell.getItem(); @@ -251,8 +249,7 @@ public class SpatialStorageCommand implements ISubCommand { Text tpLink = new LiteralText("Origin: " + origin) .styled(makeCommandLink("/ae2 spatial tp " + plot.getId(), "Click to teleport into plot")); - Text message = new LiteralText("").append(infoLink) - .append(" Size: " + size + " ").append(tpLink); + Text message = new LiteralText("").append(infoLink).append(" Size: " + size + " ").append(tpLink); sender.sendFeedback(message, true); } @@ -266,7 +263,7 @@ public class SpatialStorageCommand implements ISubCommand { private static UnaryOperator