diff --git a/src/main/java/li/cil/oc2/api/bus/device/DeviceType.java b/src/main/java/li/cil/oc2/api/bus/device/DeviceType.java index 6023cb5b..5199093d 100644 --- a/src/main/java/li/cil/oc2/api/bus/device/DeviceType.java +++ b/src/main/java/li/cil/oc2/api/bus/device/DeviceType.java @@ -1,8 +1,8 @@ package li.cil.oc2.api.bus.device; import li.cil.oc2.api.API; -import net.minecraft.resources.ResourceLocation; import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; import net.minecraftforge.registries.IForgeRegistryEntry; /** diff --git a/src/main/java/li/cil/oc2/api/bus/device/data/BlockDeviceData.java b/src/main/java/li/cil/oc2/api/bus/device/data/BlockDeviceData.java index a11c3265..1db182f4 100644 --- a/src/main/java/li/cil/oc2/api/bus/device/data/BlockDeviceData.java +++ b/src/main/java/li/cil/oc2/api/bus/device/data/BlockDeviceData.java @@ -2,8 +2,8 @@ package li.cil.oc2.api.bus.device.data; import li.cil.oc2.api.API; import li.cil.sedna.api.device.BlockDevice; -import net.minecraft.resources.ResourceLocation; import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; import net.minecraftforge.registries.IForgeRegistryEntry; /** diff --git a/src/main/java/li/cil/oc2/api/bus/device/data/Firmware.java b/src/main/java/li/cil/oc2/api/bus/device/data/Firmware.java index b98e8675..89487623 100644 --- a/src/main/java/li/cil/oc2/api/bus/device/data/Firmware.java +++ b/src/main/java/li/cil/oc2/api/bus/device/data/Firmware.java @@ -2,8 +2,8 @@ package li.cil.oc2.api.bus.device.data; import li.cil.oc2.api.API; import li.cil.sedna.api.memory.MemoryMap; -import net.minecraft.resources.ResourceLocation; import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; import net.minecraftforge.registries.IForgeRegistryEntry; /** diff --git a/src/main/java/li/cil/oc2/api/bus/device/vm/context/VMLifecycleEventBus.java b/src/main/java/li/cil/oc2/api/bus/device/vm/context/VMLifecycleEventBus.java index f88d7d85..1baf042e 100644 --- a/src/main/java/li/cil/oc2/api/bus/device/vm/context/VMLifecycleEventBus.java +++ b/src/main/java/li/cil/oc2/api/bus/device/vm/context/VMLifecycleEventBus.java @@ -2,6 +2,7 @@ package li.cil.oc2.api.bus.device.vm.context; /** * Allows registering for VM lifecycle events. + * * @see li.cil.oc2.api.bus.device.vm.event.VMInitializingEvent * @see li.cil.oc2.api.bus.device.vm.event.VMResumingRunningEvent * @see li.cil.oc2.api.bus.device.vm.event.VMResumedRunningEvent diff --git a/src/main/java/li/cil/oc2/api/util/RobotOperationSide.java b/src/main/java/li/cil/oc2/api/util/RobotOperationSide.java index 3084cdc7..c4e07dfa 100644 --- a/src/main/java/li/cil/oc2/api/util/RobotOperationSide.java +++ b/src/main/java/li/cil/oc2/api/util/RobotOperationSide.java @@ -1,7 +1,7 @@ package li.cil.oc2.api.util; -import net.minecraft.world.entity.Entity; import net.minecraft.core.Direction; +import net.minecraft.world.entity.Entity; import javax.annotation.Nullable; @@ -38,8 +38,8 @@ public enum RobotOperationSide { public static Direction getAdjustedDirection(@Nullable final RobotOperationSide side, final Entity entity) { Direction direction = side == null - ? RobotOperationSide.FRONT.getDirection() - : side.getDirection(); + ? RobotOperationSide.FRONT.getDirection() + : side.getDirection(); if (direction.getAxis().isHorizontal()) { final int horizontalIndex = entity.getDirection().get2DDataValue(); for (int i = 0; i < horizontalIndex; i++) { diff --git a/src/main/java/li/cil/oc2/client/ClientSetup.java b/src/main/java/li/cil/oc2/client/ClientSetup.java index afae7ab0..e892d1f7 100644 --- a/src/main/java/li/cil/oc2/client/ClientSetup.java +++ b/src/main/java/li/cil/oc2/client/ClientSetup.java @@ -10,18 +10,18 @@ import li.cil.oc2.client.item.CustomItemModelProperties; import li.cil.oc2.client.model.BusCableModelLoader; import li.cil.oc2.client.renderer.BusInterfaceNameRenderer; import li.cil.oc2.client.renderer.NetworkCableRenderer; -import li.cil.oc2.client.renderer.color.BusCableBlockColor; -import li.cil.oc2.client.renderer.entity.RobotRenderer; -import li.cil.oc2.client.renderer.entity.model.RobotModel; import li.cil.oc2.client.renderer.blockentity.ChargerRenderer; import li.cil.oc2.client.renderer.blockentity.ComputerRenderer; import li.cil.oc2.client.renderer.blockentity.DiskDriveRenderer; import li.cil.oc2.client.renderer.blockentity.NetworkConnectorRenderer; +import li.cil.oc2.client.renderer.color.BusCableBlockColor; +import li.cil.oc2.client.renderer.entity.RobotRenderer; +import li.cil.oc2.client.renderer.entity.model.RobotModel; import li.cil.oc2.common.block.Blocks; +import li.cil.oc2.common.blockentity.BlockEntities; import li.cil.oc2.common.bus.device.DeviceTypes; import li.cil.oc2.common.container.Containers; import li.cil.oc2.common.entity.Entities; -import li.cil.oc2.common.blockentity.BlockEntities; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screens.MenuScreens; import net.minecraft.client.renderer.ItemBlockRenderTypes; diff --git a/src/main/java/li/cil/oc2/client/audio/LoopingBlockEntitySound.java b/src/main/java/li/cil/oc2/client/audio/LoopingBlockEntitySound.java index 29bcc9df..422a0d11 100644 --- a/src/main/java/li/cil/oc2/client/audio/LoopingBlockEntitySound.java +++ b/src/main/java/li/cil/oc2/client/audio/LoopingBlockEntitySound.java @@ -2,11 +2,11 @@ package li.cil.oc2.client.audio; import li.cil.oc2.common.Constants; import net.minecraft.client.resources.sounds.AbstractTickableSoundInstance; -import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.sounds.SoundSource; import net.minecraft.sounds.SoundEvent; -import net.minecraft.world.level.ChunkPos; +import net.minecraft.sounds.SoundSource; import net.minecraft.util.Mth; +import net.minecraft.world.level.ChunkPos; +import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.phys.Vec3; public final class LoopingBlockEntitySound extends AbstractTickableSoundInstance { diff --git a/src/main/java/li/cil/oc2/client/audio/LoopingSoundManager.java b/src/main/java/li/cil/oc2/client/audio/LoopingSoundManager.java index 6e3f8fe2..b3d601b2 100644 --- a/src/main/java/li/cil/oc2/client/audio/LoopingSoundManager.java +++ b/src/main/java/li/cil/oc2/client/audio/LoopingSoundManager.java @@ -2,8 +2,8 @@ package li.cil.oc2.client.audio; import net.minecraft.client.Minecraft; import net.minecraft.client.resources.sounds.TickableSoundInstance; -import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.sounds.SoundEvent; +import net.minecraft.world.level.block.entity.BlockEntity; import java.util.WeakHashMap; diff --git a/src/main/java/li/cil/oc2/client/gui/AbstractMachineInventoryScreen.java b/src/main/java/li/cil/oc2/client/gui/AbstractMachineInventoryScreen.java index 02f63d85..c7b004f3 100644 --- a/src/main/java/li/cil/oc2/client/gui/AbstractMachineInventoryScreen.java +++ b/src/main/java/li/cil/oc2/client/gui/AbstractMachineInventoryScreen.java @@ -8,11 +8,11 @@ import li.cil.oc2.client.gui.widget.ToggleImageButton; import li.cil.oc2.common.Constants; import li.cil.oc2.common.container.AbstractMachineTerminalContainer; import li.cil.oc2.common.util.TooltipUtils; -import net.minecraft.world.entity.player.Inventory; +import net.minecraft.ChatFormatting; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.FormattedText; -import net.minecraft.ChatFormatting; import net.minecraft.network.chat.TranslatableComponent; +import net.minecraft.world.entity.player.Inventory; import java.util.List; @@ -36,13 +36,13 @@ public abstract class AbstractMachineInventoryScreen tooltip = asList( - new TranslatableComponent(Constants.TOOLTIP_ENERGY, withColor(energyStored + "/" + energyCapacity, ChatFormatting.GREEN)), - new TranslatableComponent(Constants.TOOLTIP_ENERGY_CONSUMPTION, withColor(String.valueOf(energyConsumption), ChatFormatting.GREEN)) + new TranslatableComponent(Constants.TOOLTIP_ENERGY, withColor(energyStored + "/" + energyCapacity, ChatFormatting.GREEN)), + new TranslatableComponent(Constants.TOOLTIP_ENERGY_CONSUMPTION, withColor(String.valueOf(energyConsumption), ChatFormatting.GREEN)) ); TooltipUtils.drawTooltip(stack, tooltip, mouseX, mouseY, 200); } diff --git a/src/main/java/li/cil/oc2/client/gui/AbstractMachineTerminalScreen.java b/src/main/java/li/cil/oc2/client/gui/AbstractMachineTerminalScreen.java index 007e556f..63f71464 100644 --- a/src/main/java/li/cil/oc2/client/gui/AbstractMachineTerminalScreen.java +++ b/src/main/java/li/cil/oc2/client/gui/AbstractMachineTerminalScreen.java @@ -1,19 +1,19 @@ package li.cil.oc2.client.gui; -import com.mojang.blaze3d.vertex.PoseStack; +import com.mojang.blaze3d.platform.InputConstants; import com.mojang.blaze3d.systems.RenderSystem; +import com.mojang.blaze3d.vertex.PoseStack; import li.cil.oc2.client.gui.widget.ImageButton; import li.cil.oc2.client.gui.widget.ToggleImageButton; import li.cil.oc2.common.Constants; import li.cil.oc2.common.container.AbstractMachineTerminalContainer; -import com.mojang.blaze3d.platform.InputConstants; import li.cil.oc2.common.util.TooltipUtils; +import net.minecraft.ChatFormatting; import net.minecraft.client.renderer.GameRenderer; -import net.minecraft.world.entity.player.Inventory; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.FormattedText; -import net.minecraft.ChatFormatting; import net.minecraft.network.chat.TranslatableComponent; +import net.minecraft.world.entity.player.Inventory; import java.util.List; @@ -58,8 +58,8 @@ public abstract class AbstractMachineTerminalScreen tooltip = asList( - new TranslatableComponent(Constants.TOOLTIP_ENERGY, withColor(energyStored + "/" + energyCapacity, ChatFormatting.GREEN)), - new TranslatableComponent(Constants.TOOLTIP_ENERGY_CONSUMPTION, withColor(String.valueOf(energyConsumption), ChatFormatting.GREEN)) + new TranslatableComponent(Constants.TOOLTIP_ENERGY, withColor(energyStored + "/" + energyCapacity, ChatFormatting.GREEN)), + new TranslatableComponent(Constants.TOOLTIP_ENERGY_CONSUMPTION, withColor(String.valueOf(energyConsumption), ChatFormatting.GREEN)) ); TooltipUtils.drawTooltip(stack, tooltip, mouseX, mouseY, 200); } @@ -76,7 +76,7 @@ public abstract class AbstractMachineTerminalScreen= x && - localMouseX < x + width && - localMouseY >= y && - localMouseY < y + height; + localMouseX < x + width && + localMouseY >= y && + localMouseY < y + height; } } diff --git a/src/main/java/li/cil/oc2/client/gui/BusInterfaceScreen.java b/src/main/java/li/cil/oc2/client/gui/BusInterfaceScreen.java index a9cc13ea..ead91401 100644 --- a/src/main/java/li/cil/oc2/client/gui/BusInterfaceScreen.java +++ b/src/main/java/li/cil/oc2/client/gui/BusInterfaceScreen.java @@ -1,18 +1,18 @@ package li.cil.oc2.client.gui; -import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.systems.RenderSystem; +import com.mojang.blaze3d.vertex.PoseStack; import li.cil.oc2.client.gui.widget.ImageButton; import li.cil.oc2.common.Constants; +import li.cil.oc2.common.blockentity.BusCableBlockEntity; import li.cil.oc2.common.item.Items; import li.cil.oc2.common.network.Network; import li.cil.oc2.common.network.message.BusInterfaceNameMessage; -import li.cil.oc2.common.blockentity.BusCableBlockEntity; -import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.gui.components.EditBox; +import net.minecraft.client.gui.screens.Screen; import net.minecraft.core.Direction; -import net.minecraft.world.phys.Vec3; import net.minecraft.network.chat.TranslatableComponent; +import net.minecraft.world.phys.Vec3; import org.lwjgl.glfw.GLFW; import static li.cil.oc2.common.util.TranslationUtils.text; diff --git a/src/main/java/li/cil/oc2/client/gui/ComputerContainerScreen.java b/src/main/java/li/cil/oc2/client/gui/ComputerContainerScreen.java index 2158de02..e7791acb 100644 --- a/src/main/java/li/cil/oc2/client/gui/ComputerContainerScreen.java +++ b/src/main/java/li/cil/oc2/client/gui/ComputerContainerScreen.java @@ -1,11 +1,11 @@ package li.cil.oc2.client.gui; -import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.systems.RenderSystem; +import com.mojang.blaze3d.vertex.PoseStack; import li.cil.oc2.common.container.ComputerInventoryContainer; import net.minecraft.client.renderer.GameRenderer; -import net.minecraft.world.entity.player.Inventory; import net.minecraft.network.chat.Component; +import net.minecraft.world.entity.player.Inventory; public final class ComputerContainerScreen extends AbstractMachineInventoryScreen { public ComputerContainerScreen(final ComputerInventoryContainer container, final Inventory inventory, final Component title) { diff --git a/src/main/java/li/cil/oc2/client/gui/ComputerTerminalScreen.java b/src/main/java/li/cil/oc2/client/gui/ComputerTerminalScreen.java index f085a9cc..8c702256 100644 --- a/src/main/java/li/cil/oc2/client/gui/ComputerTerminalScreen.java +++ b/src/main/java/li/cil/oc2/client/gui/ComputerTerminalScreen.java @@ -1,8 +1,8 @@ package li.cil.oc2.client.gui; import li.cil.oc2.common.container.ComputerTerminalContainer; -import net.minecraft.world.entity.player.Inventory; import net.minecraft.network.chat.Component; +import net.minecraft.world.entity.player.Inventory; public final class ComputerTerminalScreen extends AbstractMachineTerminalScreen { public ComputerTerminalScreen(final ComputerTerminalContainer container, final Inventory playerInventory, final Component title) { diff --git a/src/main/java/li/cil/oc2/client/gui/MachineTerminalWidget.java b/src/main/java/li/cil/oc2/client/gui/MachineTerminalWidget.java index dfa3f543..5dc96122 100644 --- a/src/main/java/li/cil/oc2/client/gui/MachineTerminalWidget.java +++ b/src/main/java/li/cil/oc2/client/gui/MachineTerminalWidget.java @@ -5,8 +5,8 @@ import li.cil.oc2.client.gui.terminal.TerminalInput; import li.cil.oc2.common.container.AbstractMachineTerminalContainer; import li.cil.oc2.common.vm.Terminal; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.GuiComponent; import net.minecraft.client.gui.Font; +import net.minecraft.client.gui.GuiComponent; import net.minecraft.network.chat.Component; import org.lwjgl.glfw.GLFW; @@ -63,10 +63,10 @@ public final class MachineTerminalWidget extends GuiComponent { final int textOffsetX = (TERMINAL_WIDTH - textWidth) / 2; final int textOffsetY = (TERMINAL_HEIGHT - font.lineHeight) / 2; font.drawShadow(stack, - error, - leftPos + TERMINAL_X + textOffsetX, - topPos + TERMINAL_Y + textOffsetY, - 0xEE3322); + error, + leftPos + TERMINAL_X + textOffsetX, + topPos + TERMINAL_Y + textOffsetY, + 0xEE3322); } } } @@ -124,12 +124,12 @@ public final class MachineTerminalWidget extends GuiComponent { private boolean shouldCaptureInput() { return isMouseOverTerminal && AbstractMachineTerminalScreen.isInputCaptureEnabled() && - container.getVirtualMachine().isRunning(); + container.getVirtualMachine().isRunning(); } private boolean isMouseOverTerminal(final int mouseX, final int mouseY) { return parent.isMouseOver(mouseX, mouseY, - MachineTerminalWidget.TERMINAL_X, MachineTerminalWidget.TERMINAL_Y, - MachineTerminalWidget.TERMINAL_WIDTH, MachineTerminalWidget.TERMINAL_HEIGHT); + MachineTerminalWidget.TERMINAL_X, MachineTerminalWidget.TERMINAL_Y, + MachineTerminalWidget.TERMINAL_WIDTH, MachineTerminalWidget.TERMINAL_HEIGHT); } } diff --git a/src/main/java/li/cil/oc2/client/gui/RobotContainerScreen.java b/src/main/java/li/cil/oc2/client/gui/RobotContainerScreen.java index 23ee308f..dc30c180 100644 --- a/src/main/java/li/cil/oc2/client/gui/RobotContainerScreen.java +++ b/src/main/java/li/cil/oc2/client/gui/RobotContainerScreen.java @@ -1,11 +1,11 @@ package li.cil.oc2.client.gui; -import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.systems.RenderSystem; +import com.mojang.blaze3d.vertex.PoseStack; import li.cil.oc2.common.container.RobotInventoryContainer; import net.minecraft.client.renderer.GameRenderer; -import net.minecraft.world.entity.player.Inventory; import net.minecraft.network.chat.Component; +import net.minecraft.world.entity.player.Inventory; public final class RobotContainerScreen extends AbstractMachineInventoryScreen { private static final int SLOT_SIZE = 18; diff --git a/src/main/java/li/cil/oc2/client/gui/RobotTerminalScreen.java b/src/main/java/li/cil/oc2/client/gui/RobotTerminalScreen.java index bc70b2ca..16a627b5 100644 --- a/src/main/java/li/cil/oc2/client/gui/RobotTerminalScreen.java +++ b/src/main/java/li/cil/oc2/client/gui/RobotTerminalScreen.java @@ -1,11 +1,11 @@ package li.cil.oc2.client.gui; -import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.systems.RenderSystem; +import com.mojang.blaze3d.vertex.PoseStack; import li.cil.oc2.common.container.RobotTerminalContainer; import net.minecraft.client.renderer.GameRenderer; -import net.minecraft.world.entity.player.Inventory; import net.minecraft.network.chat.Component; +import net.minecraft.world.entity.player.Inventory; public final class RobotTerminalScreen extends AbstractMachineTerminalScreen { private static final int SLOTS_X = (MachineTerminalWidget.WIDTH - Sprites.HOTBAR.width) / 2; diff --git a/src/main/java/li/cil/oc2/client/gui/terminal/TerminalInput.java b/src/main/java/li/cil/oc2/client/gui/terminal/TerminalInput.java index c5d4d3b8..6de39001 100644 --- a/src/main/java/li/cil/oc2/client/gui/terminal/TerminalInput.java +++ b/src/main/java/li/cil/oc2/client/gui/terminal/TerminalInput.java @@ -28,14 +28,14 @@ public final class TerminalInput { for (int i = 'A'; i <= 'Z'; i++) { addSequence(GLFW.GLFW_MOD_CONTROL, - GLFW.GLFW_KEY_A + (i - 'A'), - (byte) (1 + i - 'A')); + GLFW.GLFW_KEY_A + (i - 'A'), + (byte) (1 + i - 'A')); addSequence(GLFW.GLFW_MOD_CONTROL | GLFW.GLFW_MOD_ALT, - GLFW.GLFW_KEY_A + (i - 'A'), - (byte) 27, (byte) ('a' + i - 'A')); + GLFW.GLFW_KEY_A + (i - 'A'), + (byte) 27, (byte) ('a' + i - 'A')); addSequence(GLFW.GLFW_MOD_CONTROL | GLFW.GLFW_MOD_ALT | GLFW.GLFW_MOD_SHIFT, - GLFW.GLFW_KEY_A + (i - 'A'), - (byte) 27, (byte) i); + GLFW.GLFW_KEY_A + (i - 'A'), + (byte) 27, (byte) i); } addSequence(GLFW.GLFW_MOD_CONTROL, GLFW.GLFW_KEY_LEFT_BRACKET, (byte) 27); @@ -84,7 +84,7 @@ public final class TerminalInput { private static void addSequence(final int modifiers, final int keyCode, final byte... sequence) { KEYCODE_SEQUENCES - .computeIfAbsent(modifiers, i -> new Int2ObjectArrayMap<>()) - .put(keyCode, sequence); + .computeIfAbsent(modifiers, i -> new Int2ObjectArrayMap<>()) + .put(keyCode, sequence); } } diff --git a/src/main/java/li/cil/oc2/client/gui/widget/ImageButton.java b/src/main/java/li/cil/oc2/client/gui/widget/ImageButton.java index 0ff9df79..a7e1e495 100644 --- a/src/main/java/li/cil/oc2/client/gui/widget/ImageButton.java +++ b/src/main/java/li/cil/oc2/client/gui/widget/ImageButton.java @@ -2,13 +2,13 @@ package li.cil.oc2.client.gui.widget; import com.mojang.blaze3d.vertex.PoseStack; import li.cil.oc2.common.util.TooltipUtils; +import net.minecraft.ChatFormatting; +import net.minecraft.client.gui.components.AbstractButton; import net.minecraft.client.gui.narration.NarrationElementOutput; import net.minecraft.client.gui.screens.Screen; -import net.minecraft.client.gui.components.AbstractButton; -import net.minecraft.network.chat.TextColor; import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.TextColor; import net.minecraft.network.chat.TextComponent; -import net.minecraft.ChatFormatting; import javax.annotation.Nullable; import java.util.List; diff --git a/src/main/java/li/cil/oc2/client/gui/widget/ToggleImageButton.java b/src/main/java/li/cil/oc2/client/gui/widget/ToggleImageButton.java index c42b22f2..e5fbff37 100644 --- a/src/main/java/li/cil/oc2/client/gui/widget/ToggleImageButton.java +++ b/src/main/java/li/cil/oc2/client/gui/widget/ToggleImageButton.java @@ -2,13 +2,13 @@ package li.cil.oc2.client.gui.widget; import com.mojang.blaze3d.vertex.PoseStack; import li.cil.oc2.common.util.TooltipUtils; +import net.minecraft.ChatFormatting; +import net.minecraft.client.gui.components.AbstractButton; import net.minecraft.client.gui.narration.NarrationElementOutput; import net.minecraft.client.gui.screens.Screen; -import net.minecraft.client.gui.components.AbstractButton; -import net.minecraft.network.chat.TextColor; import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.TextColor; import net.minecraft.network.chat.TextComponent; -import net.minecraft.ChatFormatting; import javax.annotation.Nullable; import java.util.List; @@ -34,14 +34,14 @@ public abstract class ToggleImageButton extends AbstractButton { /////////////////////////////////////////////////////////////////// public ToggleImageButton( - final Screen parent, - final int x, final int y, - final int width, final int height, - final Component caption, - @Nullable final Component description, - final Sprite baseImage, - final Sprite pressedImage, - final Sprite activeImage) { + final Screen parent, + final int x, final int y, + final int width, final int height, + final Component caption, + @Nullable final Component description, + final Sprite baseImage, + final Sprite pressedImage, + final Sprite activeImage) { super(x, y, width, height, caption); this.parent = parent; if (description == null) { diff --git a/src/main/java/li/cil/oc2/client/item/CustomItemColors.java b/src/main/java/li/cil/oc2/client/item/CustomItemColors.java index 6a75b056..c7563670 100644 --- a/src/main/java/li/cil/oc2/client/item/CustomItemColors.java +++ b/src/main/java/li/cil/oc2/client/item/CustomItemColors.java @@ -36,11 +36,11 @@ public final class CustomItemColors { public static void initialize() { final ItemColors itemColors = Minecraft.getInstance().getItemColors(); itemColors.register((stack, layer) -> layer == 1 ? getColor(stack) : NO_TINT, - Items.HARD_DRIVE_SMALL.get(), - Items.HARD_DRIVE_MEDIUM.get(), - Items.HARD_DRIVE_LARGE.get(), - Items.HARD_DRIVE_CUSTOM.get(), - Items.FLOPPY.get()); + Items.HARD_DRIVE_SMALL.get(), + Items.HARD_DRIVE_MEDIUM.get(), + Items.HARD_DRIVE_LARGE.get(), + Items.HARD_DRIVE_CUSTOM.get(), + Items.FLOPPY.get()); } public static int getColorByDye(final DyeColor dye) { diff --git a/src/main/java/li/cil/oc2/client/item/CustomItemModelProperties.java b/src/main/java/li/cil/oc2/client/item/CustomItemModelProperties.java index 33a86363..bfe558e1 100644 --- a/src/main/java/li/cil/oc2/client/item/CustomItemModelProperties.java +++ b/src/main/java/li/cil/oc2/client/item/CustomItemModelProperties.java @@ -12,14 +12,14 @@ public final class CustomItemModelProperties { public static void initialize() { ItemProperties.register(Items.HARD_DRIVE_SMALL.get(), CustomItemModelProperties.COLOR_PROPERTY, - (stack, level, entity, seed) -> CustomItemColors.getColor(stack)); + (stack, level, entity, seed) -> CustomItemColors.getColor(stack)); ItemProperties.register(Items.HARD_DRIVE_MEDIUM.get(), CustomItemModelProperties.COLOR_PROPERTY, - (stack, level, entity, seed) -> CustomItemColors.getColor(stack)); + (stack, level, entity, seed) -> CustomItemColors.getColor(stack)); ItemProperties.register(Items.HARD_DRIVE_LARGE.get(), CustomItemModelProperties.COLOR_PROPERTY, - (stack, leve, entity, seed) -> CustomItemColors.getColor(stack)); + (stack, leve, entity, seed) -> CustomItemColors.getColor(stack)); ItemProperties.register(Items.HARD_DRIVE_CUSTOM.get(), CustomItemModelProperties.COLOR_PROPERTY, - (stack, level, entity, seed) -> CustomItemColors.getColor(stack)); + (stack, level, entity, seed) -> CustomItemColors.getColor(stack)); ItemProperties.register(Items.FLOPPY.get(), CustomItemModelProperties.COLOR_PROPERTY, - (stack, level, entity, seed) -> CustomItemColors.getColor(stack)); + (stack, level, entity, seed) -> CustomItemColors.getColor(stack)); } } diff --git a/src/main/java/li/cil/oc2/client/model/BusCableBakedModel.java b/src/main/java/li/cil/oc2/client/model/BusCableBakedModel.java index 12bf7480..86f5cb01 100644 --- a/src/main/java/li/cil/oc2/client/model/BusCableBakedModel.java +++ b/src/main/java/li/cil/oc2/client/model/BusCableBakedModel.java @@ -4,22 +4,22 @@ import li.cil.oc2.common.Constants; import li.cil.oc2.common.block.BusCableBlock; import li.cil.oc2.common.blockentity.BusCableBlockEntity; import li.cil.oc2.common.util.ItemStackUtils; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.block.Blocks; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.block.BlockModelShaper; -import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.ItemBlockRenderTypes; +import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.block.BlockModelShaper; import net.minecraft.client.renderer.block.model.BakedQuad; -import net.minecraft.client.resources.model.BakedModel; import net.minecraft.client.renderer.block.model.ItemOverrides; import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.block.state.properties.EnumProperty; -import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.core.Direction; +import net.minecraft.client.resources.model.BakedModel; import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.BlockAndTintGetter; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.block.state.properties.EnumProperty; import net.minecraftforge.client.MinecraftForgeClient; import net.minecraftforge.client.model.data.IDynamicBakedModel; import net.minecraftforge.client.model.data.IModelData; diff --git a/src/main/java/li/cil/oc2/client/renderer/BusInterfaceNameRenderer.java b/src/main/java/li/cil/oc2/client/renderer/BusInterfaceNameRenderer.java index 5a3d4907..93fe6a88 100644 --- a/src/main/java/li/cil/oc2/client/renderer/BusInterfaceNameRenderer.java +++ b/src/main/java/li/cil/oc2/client/renderer/BusInterfaceNameRenderer.java @@ -1,23 +1,23 @@ package li.cil.oc2.client.renderer; import com.mojang.blaze3d.vertex.PoseStack; +import com.mojang.blaze3d.vertex.Tesselator; +import com.mojang.math.Matrix4f; import li.cil.oc2.common.block.BusCableBlock; -import li.cil.oc2.common.integration.Wrenches; import li.cil.oc2.common.blockentity.BusCableBlockEntity; +import li.cil.oc2.common.integration.Wrenches; +import net.minecraft.client.Camera; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; -import net.minecraft.client.Camera; -import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.LightTexture; -import com.mojang.blaze3d.vertex.Tesselator; +import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.entity.EntityRenderDispatcher; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.core.Direction; import net.minecraft.core.BlockPos; -import net.minecraft.world.phys.BlockHitResult; -import com.mojang.math.Matrix4f; +import net.minecraft.core.Direction; +import net.minecraft.world.entity.player.Player; import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.phys.BlockHitResult; import net.minecraftforge.client.event.RenderLevelLastEvent; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.eventbus.api.SubscribeEvent; diff --git a/src/main/java/li/cil/oc2/client/renderer/ModRenderType.java b/src/main/java/li/cil/oc2/client/renderer/ModRenderType.java index 06c9dfaf..b222ff23 100644 --- a/src/main/java/li/cil/oc2/client/renderer/ModRenderType.java +++ b/src/main/java/li/cil/oc2/client/renderer/ModRenderType.java @@ -1,10 +1,10 @@ package li.cil.oc2.client.renderer; +import com.mojang.blaze3d.vertex.DefaultVertexFormat; +import com.mojang.blaze3d.vertex.VertexFormat; import li.cil.oc2.api.API; import net.minecraft.client.renderer.RenderStateShard; import net.minecraft.client.renderer.RenderType; -import com.mojang.blaze3d.vertex.DefaultVertexFormat; -import com.mojang.blaze3d.vertex.VertexFormat; import net.minecraft.resources.ResourceLocation; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; diff --git a/src/main/java/li/cil/oc2/client/renderer/color/BusCableBlockColor.java b/src/main/java/li/cil/oc2/client/renderer/color/BusCableBlockColor.java index cd3d1a77..7b453611 100644 --- a/src/main/java/li/cil/oc2/client/renderer/color/BusCableBlockColor.java +++ b/src/main/java/li/cil/oc2/client/renderer/color/BusCableBlockColor.java @@ -2,12 +2,12 @@ package li.cil.oc2.client.renderer.color; import li.cil.oc2.common.blockentity.BusCableBlockEntity; import li.cil.oc2.common.util.ItemStackUtils; -import net.minecraft.world.level.block.state.BlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.color.block.BlockColor; -import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.core.BlockPos; import net.minecraft.world.level.BlockAndTintGetter; +import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.level.block.state.BlockState; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; diff --git a/src/main/java/li/cil/oc2/common/Main.java b/src/main/java/li/cil/oc2/common/Main.java index 0c1a7393..0b79ebd4 100644 --- a/src/main/java/li/cil/oc2/common/Main.java +++ b/src/main/java/li/cil/oc2/common/Main.java @@ -5,6 +5,7 @@ import li.cil.oc2.api.API; import li.cil.oc2.client.ClientSetup; import li.cil.oc2.client.manual.Manuals; import li.cil.oc2.common.block.Blocks; +import li.cil.oc2.common.blockentity.BlockEntities; import li.cil.oc2.common.bus.device.DeviceTypes; import li.cil.oc2.common.bus.device.data.BlockDeviceDataRegistration; import li.cil.oc2.common.bus.device.data.Firmwares; @@ -16,7 +17,6 @@ import li.cil.oc2.common.item.crafting.RecipeSerializers; import li.cil.oc2.common.serialization.serializers.Serializers; import li.cil.oc2.common.tags.BlockTags; import li.cil.oc2.common.tags.ItemTags; -import li.cil.oc2.common.blockentity.BlockEntities; import li.cil.oc2.common.util.RegistryUtils; import li.cil.oc2.common.util.SoundEvents; import li.cil.sedna.Sedna; @@ -58,6 +58,6 @@ public final class Main { FMLJavaModLoadingContext.get().getModEventBus().register(CommonSetup.class); DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> () -> - FMLJavaModLoadingContext.get().getModEventBus().register(ClientSetup.class)); + FMLJavaModLoadingContext.get().getModEventBus().register(ClientSetup.class)); } } diff --git a/src/main/java/li/cil/oc2/common/block/BusCableBlock.java b/src/main/java/li/cil/oc2/common/block/BusCableBlock.java index 664f02b3..e4bf42e3 100644 --- a/src/main/java/li/cil/oc2/common/block/BusCableBlock.java +++ b/src/main/java/li/cil/oc2/common/block/BusCableBlock.java @@ -3,10 +3,10 @@ package li.cil.oc2.common.block; import com.google.common.collect.Maps; import li.cil.oc2.client.gui.BusInterfaceScreen; import li.cil.oc2.common.Constants; +import li.cil.oc2.common.blockentity.BlockEntities; +import li.cil.oc2.common.blockentity.BusCableBlockEntity; import li.cil.oc2.common.integration.Wrenches; import li.cil.oc2.common.item.Items; -import li.cil.oc2.common.blockentity.BusCableBlockEntity; -import li.cil.oc2.common.blockentity.BlockEntities; import li.cil.oc2.common.util.ItemStackUtils; import li.cil.oc2.common.util.LevelUtils; import net.minecraft.Util; diff --git a/src/main/java/li/cil/oc2/common/block/ChargerBlock.java b/src/main/java/li/cil/oc2/common/block/ChargerBlock.java index 655b05a7..aa58fd35 100644 --- a/src/main/java/li/cil/oc2/common/block/ChargerBlock.java +++ b/src/main/java/li/cil/oc2/common/block/ChargerBlock.java @@ -1,29 +1,28 @@ package li.cil.oc2.common.block; -import li.cil.oc2.common.blockentity.ChargerBlockEntity; import li.cil.oc2.common.blockentity.BlockEntities; +import li.cil.oc2.common.blockentity.ChargerBlockEntity; import li.cil.oc2.common.util.BlockEntityUtils; import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.world.item.context.BlockPlaceContext; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.*; +import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.BlockEntityTicker; import net.minecraft.world.level.block.entity.BlockEntityType; -import net.minecraft.world.level.material.Material; -import net.minecraft.world.item.context.BlockPlaceContext; +import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.StateDefinition; -import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.core.Direction; +import net.minecraft.world.level.material.Material; import javax.annotation.Nullable; -import net.minecraft.world.level.block.state.BlockState; - public final class ChargerBlock extends HalfTransparentBlock implements EntityBlock { public ChargerBlock() { super(Properties - .of(Material.METAL) - .sound(SoundType.METAL) - .strength(1.5f, 6.0f)); + .of(Material.METAL) + .sound(SoundType.METAL) + .strength(1.5f, 6.0f)); registerDefaultState(getStateDefinition().any().setValue(HorizontalDirectionalBlock.FACING, Direction.NORTH)); } diff --git a/src/main/java/li/cil/oc2/common/block/ComputerBlock.java b/src/main/java/li/cil/oc2/common/block/ComputerBlock.java index 22c1a7c9..27800323 100644 --- a/src/main/java/li/cil/oc2/common/block/ComputerBlock.java +++ b/src/main/java/li/cil/oc2/common/block/ComputerBlock.java @@ -3,11 +3,11 @@ package li.cil.oc2.common.block; import li.cil.oc2.api.bus.device.DeviceTypes; import li.cil.oc2.api.capabilities.RedstoneEmitter; import li.cil.oc2.common.Config; +import li.cil.oc2.common.blockentity.BlockEntities; +import li.cil.oc2.common.blockentity.ComputerBlockEntity; import li.cil.oc2.common.capabilities.Capabilities; import li.cil.oc2.common.integration.Wrenches; import li.cil.oc2.common.item.Items; -import li.cil.oc2.common.blockentity.ComputerBlockEntity; -import li.cil.oc2.common.blockentity.BlockEntities; import li.cil.oc2.common.util.BlockEntityUtils; import li.cil.oc2.common.util.NBTUtils; import li.cil.oc2.common.util.TooltipUtils; diff --git a/src/main/java/li/cil/oc2/common/block/CreativeEnergyBlock.java b/src/main/java/li/cil/oc2/common/block/CreativeEnergyBlock.java index b1075eca..283d52b2 100644 --- a/src/main/java/li/cil/oc2/common/block/CreativeEnergyBlock.java +++ b/src/main/java/li/cil/oc2/common/block/CreativeEnergyBlock.java @@ -1,7 +1,7 @@ package li.cil.oc2.common.block; -import li.cil.oc2.common.blockentity.CreativeEnergyBlockEntity; import li.cil.oc2.common.blockentity.BlockEntities; +import li.cil.oc2.common.blockentity.CreativeEnergyBlockEntity; import li.cil.oc2.common.util.BlockEntityUtils; import net.minecraft.core.BlockPos; import net.minecraft.world.level.Level; diff --git a/src/main/java/li/cil/oc2/common/block/DiskDriveBlock.java b/src/main/java/li/cil/oc2/common/block/DiskDriveBlock.java index e9ed4c88..45fec009 100644 --- a/src/main/java/li/cil/oc2/common/block/DiskDriveBlock.java +++ b/src/main/java/li/cil/oc2/common/block/DiskDriveBlock.java @@ -1,7 +1,7 @@ package li.cil.oc2.common.block; -import li.cil.oc2.common.blockentity.DiskDriveBlockEntity; import li.cil.oc2.common.blockentity.BlockEntities; +import li.cil.oc2.common.blockentity.DiskDriveBlockEntity; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.InteractionHand; diff --git a/src/main/java/li/cil/oc2/common/block/NetworkConnectorBlock.java b/src/main/java/li/cil/oc2/common/block/NetworkConnectorBlock.java index d4b8360e..518930de 100644 --- a/src/main/java/li/cil/oc2/common/block/NetworkConnectorBlock.java +++ b/src/main/java/li/cil/oc2/common/block/NetworkConnectorBlock.java @@ -1,29 +1,28 @@ package li.cil.oc2.common.block; -import li.cil.oc2.common.blockentity.NetworkConnectorBlockEntity; import li.cil.oc2.common.blockentity.BlockEntities; +import li.cil.oc2.common.blockentity.NetworkConnectorBlockEntity; import li.cil.oc2.common.util.BlockEntityUtils; +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.world.level.BlockGetter; +import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.EntityBlock; +import net.minecraft.world.level.block.FaceAttachedHorizontalDirectionalBlock; +import net.minecraft.world.level.block.SoundType; +import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.BlockEntityTicker; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.block.FaceAttachedHorizontalDirectionalBlock; -import net.minecraft.world.level.block.SoundType; -import net.minecraft.world.level.material.Material; import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.level.block.state.properties.AttachFace; -import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.core.Direction; -import net.minecraft.core.BlockPos; +import net.minecraft.world.level.material.Material; import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.VoxelShape; -import net.minecraft.world.level.BlockGetter; -import net.minecraft.world.level.Level; - -import java.util.Objects; import javax.annotation.Nullable; +import java.util.Objects; public final class NetworkConnectorBlock extends FaceAttachedHorizontalDirectionalBlock implements EntityBlock { private static final VoxelShape NEG_Z_SHAPE = Block.box(5, 5, 7, 11, 11, 16); diff --git a/src/main/java/li/cil/oc2/common/block/NetworkHubBlock.java b/src/main/java/li/cil/oc2/common/block/NetworkHubBlock.java index 69826da2..5c37a4b0 100644 --- a/src/main/java/li/cil/oc2/common/block/NetworkHubBlock.java +++ b/src/main/java/li/cil/oc2/common/block/NetworkHubBlock.java @@ -1,7 +1,7 @@ package li.cil.oc2.common.block; -import li.cil.oc2.common.blockentity.NetworkHubBlockEntity; import li.cil.oc2.common.blockentity.BlockEntities; +import li.cil.oc2.common.blockentity.NetworkHubBlockEntity; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.item.context.BlockPlaceContext; @@ -20,9 +20,9 @@ import javax.annotation.Nullable; public final class NetworkHubBlock extends HorizontalDirectionalBlock implements EntityBlock { public NetworkHubBlock() { super(Properties - .of(Material.METAL) - .sound(SoundType.METAL) - .strength(1.5f, 6.0f)); + .of(Material.METAL) + .sound(SoundType.METAL) + .strength(1.5f, 6.0f)); registerDefaultState(getStateDefinition().any().setValue(FACING, Direction.NORTH)); } diff --git a/src/main/java/li/cil/oc2/common/block/RedstoneInterfaceBlock.java b/src/main/java/li/cil/oc2/common/block/RedstoneInterfaceBlock.java index 2c3c5286..71d4b875 100644 --- a/src/main/java/li/cil/oc2/common/block/RedstoneInterfaceBlock.java +++ b/src/main/java/li/cil/oc2/common/block/RedstoneInterfaceBlock.java @@ -1,7 +1,7 @@ package li.cil.oc2.common.block; -import li.cil.oc2.common.blockentity.RedstoneInterfaceBlockEntity; import li.cil.oc2.common.blockentity.BlockEntities; +import li.cil.oc2.common.blockentity.RedstoneInterfaceBlockEntity; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.item.context.BlockPlaceContext; diff --git a/src/main/java/li/cil/oc2/common/blockentity/BusCableBlockEntity.java b/src/main/java/li/cil/oc2/common/blockentity/BusCableBlockEntity.java index 0e5b7573..e1cbf0da 100644 --- a/src/main/java/li/cil/oc2/common/blockentity/BusCableBlockEntity.java +++ b/src/main/java/li/cil/oc2/common/blockentity/BusCableBlockEntity.java @@ -12,18 +12,18 @@ import li.cil.oc2.common.network.message.BusCableFacadeMessage; import li.cil.oc2.common.network.message.BusInterfaceNameMessage; import li.cil.oc2.common.util.ItemStackUtils; import li.cil.oc2.common.util.NBTTagIds; +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.nbt.ListTag; +import net.minecraft.nbt.StringTag; +import net.minecraft.util.StringUtil; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.EntityBlock; import net.minecraft.world.level.block.RenderShape; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.item.ItemStack; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.nbt.ListTag; -import net.minecraft.nbt.StringTag; -import net.minecraft.core.Direction; -import net.minecraft.util.StringUtil; -import net.minecraft.core.BlockPos; -import net.minecraft.world.level.Level; import javax.annotation.Nullable; import java.util.HashSet; diff --git a/src/main/java/li/cil/oc2/common/blockentity/ComputerBlockEntity.java b/src/main/java/li/cil/oc2/common/blockentity/ComputerBlockEntity.java index bbabe4f2..f198242f 100644 --- a/src/main/java/li/cil/oc2/common/blockentity/ComputerBlockEntity.java +++ b/src/main/java/li/cil/oc2/common/blockentity/ComputerBlockEntity.java @@ -8,9 +8,9 @@ import li.cil.oc2.api.capabilities.TerminalUserProvider; import li.cil.oc2.client.audio.LoopingSoundManager; import li.cil.oc2.common.Config; import li.cil.oc2.common.block.ComputerBlock; -import li.cil.oc2.common.bus.CommonDeviceBusController; import li.cil.oc2.common.bus.BlockEntityDeviceBusController; import li.cil.oc2.common.bus.BlockEntityDeviceBusElement; +import li.cil.oc2.common.bus.CommonDeviceBusController; import li.cil.oc2.common.bus.device.util.BlockDeviceInfo; import li.cil.oc2.common.bus.device.util.Devices; import li.cil.oc2.common.capabilities.Capabilities; diff --git a/src/main/java/li/cil/oc2/common/blockentity/ModBlockEntity.java b/src/main/java/li/cil/oc2/common/blockentity/ModBlockEntity.java index e76d6736..52e605e9 100644 --- a/src/main/java/li/cil/oc2/common/blockentity/ModBlockEntity.java +++ b/src/main/java/li/cil/oc2/common/blockentity/ModBlockEntity.java @@ -2,9 +2,9 @@ package li.cil.oc2.common.blockentity; import li.cil.oc2.common.util.ServerScheduler; import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.BlockEntityType; -import net.minecraft.core.Direction; import net.minecraft.world.level.block.state.BlockState; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.util.LazyOptional; diff --git a/src/main/java/li/cil/oc2/common/blockentity/NetworkHubBlockEntity.java b/src/main/java/li/cil/oc2/common/blockentity/NetworkHubBlockEntity.java index 7b8f7b54..0fd3009f 100644 --- a/src/main/java/li/cil/oc2/common/blockentity/NetworkHubBlockEntity.java +++ b/src/main/java/li/cil/oc2/common/blockentity/NetworkHubBlockEntity.java @@ -3,9 +3,9 @@ package li.cil.oc2.common.blockentity; import li.cil.oc2.api.capabilities.NetworkInterface; import li.cil.oc2.common.Constants; import li.cil.oc2.common.capabilities.Capabilities; -import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.core.Direction; import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; import net.minecraftforge.common.util.LazyOptional; diff --git a/src/main/java/li/cil/oc2/common/blockentity/RedstoneInterfaceBlockEntity.java b/src/main/java/li/cil/oc2/common/blockentity/RedstoneInterfaceBlockEntity.java index 064a0076..08b1728d 100644 --- a/src/main/java/li/cil/oc2/common/blockentity/RedstoneInterfaceBlockEntity.java +++ b/src/main/java/li/cil/oc2/common/blockentity/RedstoneInterfaceBlockEntity.java @@ -7,13 +7,13 @@ import li.cil.oc2.api.bus.device.object.Parameter; import li.cil.oc2.api.util.Side; import li.cil.oc2.common.Constants; import li.cil.oc2.common.util.HorizontalBlockUtils; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.core.Direction; import net.minecraft.core.BlockPos; -import net.minecraft.world.level.ChunkPos; +import net.minecraft.core.Direction; +import net.minecraft.nbt.CompoundTag; import net.minecraft.util.Mth; +import net.minecraft.world.level.ChunkPos; +import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.level.block.state.BlockState; import javax.annotation.Nullable; import java.util.Collection; @@ -117,27 +117,27 @@ public final class RedstoneInterfaceBlockEntity extends BlockEntity implements N @Override public void getDeviceDocumentation(final DeviceVisitor visitor) { visitor.visitCallback(GET_REDSTONE_INPUT) - .description("Get the current redstone level received on the specified side. " + - "Note that if the current output level on the specified side is not " + - "zero, this will affect the measured level.\n" + - "Sides may be specified by name or zero-based index. Please note that" + - "the side depends on the orientation of the device.") - .returnValueDescription("the current received level on the specified side.") - .parameterDescription(SIDE, "the side to read the input level from."); + .description("Get the current redstone level received on the specified side. " + + "Note that if the current output level on the specified side is not " + + "zero, this will affect the measured level.\n" + + "Sides may be specified by name or zero-based index. Please note that" + + "the side depends on the orientation of the device.") + .returnValueDescription("the current received level on the specified side.") + .parameterDescription(SIDE, "the side to read the input level from."); visitor.visitCallback(GET_REDSTONE_OUTPUT) - .description("Get the current redstone level transmitted on the specified side. " + - "This will return the value last set via setRedstoneOutput().\n" + - "Sides may be specified by name or zero-based index. Please note that" + - "the side depends on the orientation of the device.") - .returnValueDescription("the current transmitted level on the specified side.") - .parameterDescription(SIDE, "the side to read the output level from."); + .description("Get the current redstone level transmitted on the specified side. " + + "This will return the value last set via setRedstoneOutput().\n" + + "Sides may be specified by name or zero-based index. Please note that" + + "the side depends on the orientation of the device.") + .returnValueDescription("the current transmitted level on the specified side.") + .parameterDescription(SIDE, "the side to read the output level from."); visitor.visitCallback(SET_REDSTONE_OUTPUT) - .description("Set the new redstone level transmitted on the specified side.\n" + - "Sides may be specified by name or zero-based index. Please note that" + - "the side depends on the orientation of the device.") - .parameterDescription(SIDE, "the side to write the output level to.") - .parameterDescription(VALUE, "the output level to set, will be clamped to [0, 15]."); + .description("Set the new redstone level transmitted on the specified side.\n" + + "Sides may be specified by name or zero-based index. Please note that" + + "the side depends on the orientation of the device.") + .parameterDescription(SIDE, "the side to write the output level to.") + .parameterDescription(VALUE, "the output level to set, will be clamped to [0, 15]."); } /////////////////////////////////////////////////////////////////// diff --git a/src/main/java/li/cil/oc2/common/bus/BlockEntityDeviceBusElement.java b/src/main/java/li/cil/oc2/common/bus/BlockEntityDeviceBusElement.java index 4d7b6c31..d66e964a 100644 --- a/src/main/java/li/cil/oc2/common/bus/BlockEntityDeviceBusElement.java +++ b/src/main/java/li/cil/oc2/common/bus/BlockEntityDeviceBusElement.java @@ -9,14 +9,14 @@ import li.cil.oc2.common.bus.device.rpc.TypeNameRPCDevice; import li.cil.oc2.common.bus.device.util.BlockDeviceInfo; import li.cil.oc2.common.bus.device.util.Devices; import li.cil.oc2.common.capabilities.Capabilities; -import li.cil.oc2.common.util.ServerScheduler; import li.cil.oc2.common.util.LevelUtils; -import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.core.Direction; +import li.cil.oc2.common.util.ServerScheduler; import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; import net.minecraft.world.level.ChunkPos; -import net.minecraft.world.level.LevelAccessor; import net.minecraft.world.level.Level; +import net.minecraft.world.level.LevelAccessor; +import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraftforge.common.util.LazyOptional; import javax.annotation.Nullable; @@ -165,7 +165,7 @@ public class BlockEntityDeviceBusElement extends AbstractGroupingBlockDeviceBusE } final LazyOptional capability = blockEntity - .getCapability(Capabilities.DEVICE_BUS_ELEMENT, direction.getOpposite()); + .getCapability(Capabilities.DEVICE_BUS_ELEMENT, direction.getOpposite()); capability.ifPresent(DeviceBus::scheduleScan); } } diff --git a/src/main/java/li/cil/oc2/common/bus/ItemHandlerDeviceBusElement.java b/src/main/java/li/cil/oc2/common/bus/ItemHandlerDeviceBusElement.java index e41eb0c0..1e327796 100644 --- a/src/main/java/li/cil/oc2/common/bus/ItemHandlerDeviceBusElement.java +++ b/src/main/java/li/cil/oc2/common/bus/ItemHandlerDeviceBusElement.java @@ -7,9 +7,9 @@ import li.cil.oc2.common.bus.device.util.Devices; import li.cil.oc2.common.bus.device.util.ItemDeviceInfo; import li.cil.oc2.common.util.ItemDeviceUtils; import li.cil.oc2.common.util.NBTTagIds; -import net.minecraft.world.item.ItemStack; import net.minecraft.nbt.CompoundTag; import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.item.ItemStack; import java.util.Collections; import java.util.HashSet; diff --git a/src/main/java/li/cil/oc2/common/bus/RPCDeviceBusAdapter.java b/src/main/java/li/cil/oc2/common/bus/RPCDeviceBusAdapter.java index 154093e1..8b33102c 100644 --- a/src/main/java/li/cil/oc2/common/bus/RPCDeviceBusAdapter.java +++ b/src/main/java/li/cil/oc2/common/bus/RPCDeviceBusAdapter.java @@ -59,12 +59,12 @@ public final class RPCDeviceBusAdapter implements Steppable { this.serialDevice = serialDevice; this.transmitBuffer = ByteBuffer.allocate(maxMessageSize); this.gson = RPCMethodParameterTypeAdapters.beginBuildGson() - .registerTypeAdapter(byte[].class, new UnsignedByteArrayJsonSerializer()) - .registerTypeAdapter(MethodInvocation.class, new MethodInvocationJsonDeserializer()) - .registerTypeAdapter(Message.class, new MessageJsonDeserializer()) - .registerTypeAdapter(RPCDeviceWithIdentifier.class, new RPCDeviceWithIdentifierJsonSerializer()) - .registerTypeHierarchyAdapter(RPCMethod.class, new RPCMethodJsonSerializer()) - .create(); + .registerTypeAdapter(byte[].class, new UnsignedByteArrayJsonSerializer()) + .registerTypeAdapter(MethodInvocation.class, new MethodInvocationJsonDeserializer()) + .registerTypeAdapter(Message.class, new MessageJsonDeserializer()) + .registerTypeAdapter(RPCDeviceWithIdentifier.class, new RPCDeviceWithIdentifierJsonSerializer()) + .registerTypeHierarchyAdapter(RPCMethod.class, new RPCMethodJsonSerializer()) + .create(); } /////////////////////////////////////////////////////////////////// @@ -122,8 +122,8 @@ public final class RPCDeviceBusAdapter implements Steppable { final Set identifiers = controller.getDeviceIdentifiers(device); for (final UUID identifier : identifiers) { devicesByIdentifier - .computeIfAbsent(identifier, unused -> new ArrayList<>()) - .add(rpcDevice); + .computeIfAbsent(identifier, unused -> new ArrayList<>()) + .add(rpcDevice); } } } @@ -140,8 +140,8 @@ public final class RPCDeviceBusAdapter implements Steppable { } identifiersByDevice - .computeIfAbsent(device, unused -> new ArrayList<>()) - .add(identifier); + .computeIfAbsent(device, unused -> new ArrayList<>()) + .add(identifier); }); identifiersByDevice.forEach((device, identifiers) -> { diff --git a/src/main/java/li/cil/oc2/common/bus/device/DeviceTypes.java b/src/main/java/li/cil/oc2/common/bus/device/DeviceTypes.java index e8ea89df..88af86f6 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/DeviceTypes.java +++ b/src/main/java/li/cil/oc2/common/bus/device/DeviceTypes.java @@ -35,8 +35,8 @@ public final class DeviceTypes { private static void register(final String name) { DEVICE_TYPES.register(name, () -> new DeviceTypeImpl( - new ResourceLocation(API.MOD_ID, "gui/icon/" + name), - text("gui.{mod}.device_type." + name) + new ResourceLocation(API.MOD_ID, "gui/icon/" + name), + text("gui.{mod}.device_type." + name) )); } } diff --git a/src/main/java/li/cil/oc2/common/bus/device/item/ByteBufferFlashMemoryVMDevice.java b/src/main/java/li/cil/oc2/common/bus/device/item/ByteBufferFlashMemoryVMDevice.java index cbdfb9c6..67eb87cd 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/item/ByteBufferFlashMemoryVMDevice.java +++ b/src/main/java/li/cil/oc2/common/bus/device/item/ByteBufferFlashMemoryVMDevice.java @@ -15,9 +15,9 @@ import li.cil.sedna.api.memory.MemoryAccessException; import li.cil.sedna.api.memory.MemoryMap; import li.cil.sedna.device.flash.FlashMemoryDevice; import li.cil.sedna.memory.MemoryMaps; -import net.minecraft.world.item.ItemStack; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.TranslatableComponent; +import net.minecraft.world.item.ItemStack; import java.nio.ByteBuffer; diff --git a/src/main/java/li/cil/oc2/common/bus/device/item/FileImportExportCardItemDevice.java b/src/main/java/li/cil/oc2/common/bus/device/item/FileImportExportCardItemDevice.java index acc0df01..ce5c956b 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/item/FileImportExportCardItemDevice.java +++ b/src/main/java/li/cil/oc2/common/bus/device/item/FileImportExportCardItemDevice.java @@ -9,10 +9,11 @@ import li.cil.oc2.common.network.Network; import li.cil.oc2.common.network.message.ExportedFileMessage; import li.cil.oc2.common.network.message.RequestImportedFileMessage; import li.cil.oc2.common.network.message.ServerCanceledImportFileMessage; -import net.minecraft.world.entity.player.Player; import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.item.ItemStack; import net.minecraft.util.StringUtil; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.ItemStack; +import net.minecraftforge.network.PacketDistributor; import javax.annotation.Nullable; import java.io.ByteArrayInputStream; @@ -24,8 +25,6 @@ import java.util.Collections; import java.util.Set; import java.util.WeakHashMap; -import net.minecraftforge.network.PacketDistributor; - public final class FileImportExportCardItemDevice extends AbstractItemRPCDevice implements DocumentedDevice { public static final int MAX_TRANSFERRED_FILE_SIZE = 512 * 1024; @@ -288,36 +287,36 @@ public final class FileImportExportCardItemDevice extends AbstractItemRPCDevice @Override public void getDeviceDocumentation(final DeviceVisitor visitor) { visitor.visitCallback(BEGIN_EXPORT_FILE) - .description("Begins exporting a file to external data storage. Requires calls to " + - WRITE_EXPORT_FILE + "() to provide data of the exported file and a call " + - "to " + FINISH_EXPORT_FILE + "() to complete the export.\n" + - "This method may error if the device is currently exporting or importing.") - .parameterDescription(NAME, "the name of the file being exported."); + .description("Begins exporting a file to external data storage. Requires calls to " + + WRITE_EXPORT_FILE + "() to provide data of the exported file and a call " + + "to " + FINISH_EXPORT_FILE + "() to complete the export.\n" + + "This method may error if the device is currently exporting or importing.") + .parameterDescription(NAME, "the name of the file being exported."); visitor.visitCallback(WRITE_EXPORT_FILE) - .description("Appends more data to the currently being exported file.\n" + - "This method may error if the device is not currently exporting or the " + - "export was interrupted.\n") - .parameterDescription(DATA, "the contents of the file being exported."); + .description("Appends more data to the currently being exported file.\n" + + "This method may error if the device is not currently exporting or the " + + "export was interrupted.\n") + .parameterDescription(DATA, "the contents of the file being exported."); visitor.visitCallback(FINISH_EXPORT_FILE) - .description("Finishes an export. This will prompt present users to select an external " + - "file location for the file being exported. If multiple users are present, " + - "the file is provided to all users.\n" + - "This method may error if the device is not currently exporting or the " + - "export was interrupted."); + .description("Finishes an export. This will prompt present users to select an external " + + "file location for the file being exported. If multiple users are present, " + + "the file is provided to all users.\n" + + "This method may error if the device is not currently exporting or the " + + "export was interrupted."); visitor.visitCallback(BEGIN_IMPORT_FILE) - .description("Begins a file import operation. This will prompt present users to select " + - "an externally stored file for import. If multiple users are present, the " + - "first user to select a file will have their file uploaded. Use the " + - READ_IMPORT_FILE + "() method to read the contents of the file being imported.\n" + - "This method may error if the device is currently exporting or importing."); + .description("Begins a file import operation. This will prompt present users to select " + + "an externally stored file for import. If multiple users are present, the " + + "first user to select a file will have their file uploaded. Use the " + + READ_IMPORT_FILE + "() method to read the contents of the file being imported.\n" + + "This method may error if the device is currently exporting or importing."); visitor.visitCallback(READ_IMPORT_FILE) - .description("Tries to read some data from a file being imported. Returns zero length " + - "data if no data is available yet. Returns null when no more data is " + - "available.\n" + - "This method may error if the device is not currently importing or the " + - "import was interrupted.") - .returnValueDescription("data from the file being imported."); + .description("Tries to read some data from a file being imported. Returns zero length " + + "data if no data is available yet. Returns null when no more data is " + + "available.\n" + + "This method may error if the device is not currently importing or the " + + "import was interrupted.") + .returnValueDescription("data from the file being imported."); visitor.visitCallback(RESET) - .description("Resets the device and cancels any currently running export or import operation."); + .description("Resets the device and cancels any currently running export or import operation."); } } diff --git a/src/main/java/li/cil/oc2/common/bus/device/item/FirmwareFlashMemoryVMDevice.java b/src/main/java/li/cil/oc2/common/bus/device/item/FirmwareFlashMemoryVMDevice.java index 14710b48..6a5ba8bd 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/item/FirmwareFlashMemoryVMDevice.java +++ b/src/main/java/li/cil/oc2/common/bus/device/item/FirmwareFlashMemoryVMDevice.java @@ -12,8 +12,8 @@ import li.cil.oc2.api.bus.device.vm.event.VMInitializingEvent; import li.cil.oc2.common.Constants; import li.cil.oc2.common.bus.device.util.IdentityProxy; import li.cil.sedna.api.memory.MemoryMap; -import net.minecraft.world.item.ItemStack; import net.minecraft.network.chat.TranslatableComponent; +import net.minecraft.world.item.ItemStack; public final class FirmwareFlashMemoryVMDevice extends IdentityProxy implements VMDevice, ItemDevice, FirmwareLoader { private final Firmware firmware; diff --git a/src/main/java/li/cil/oc2/common/bus/device/item/HardDriveVMDevice.java b/src/main/java/li/cil/oc2/common/bus/device/item/HardDriveVMDevice.java index 23dcbcbd..f11331cc 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/item/HardDriveVMDevice.java +++ b/src/main/java/li/cil/oc2/common/bus/device/item/HardDriveVMDevice.java @@ -26,7 +26,7 @@ public class HardDriveVMDevice extends AbstractBlockDeviceVMDevice - takeFromInventory(count, handler, fromSlot)).orElse(0); + takeFromInventory(count, handler, fromSlot)).orElse(0); } /////////////////////////////////////////////////////////////////// @@ -197,9 +197,9 @@ public final class InventoryOperationsModuleDevice extends AbstractItemRPCDevice private Stream getEntityItemHandlersAt(final Vec3 position, final Direction side) { final AABB bounds = AABB.unitCubeFromLowerCorner(position.subtract(0.5, 0.5, 0.5)); return entity.level.getEntities(entity, bounds).stream() - .map(e -> e.getCapability(Capabilities.ITEM_HANDLER, side)) - .filter(LazyOptional::isPresent) - .map(c -> c.orElseThrow(AssertionError::new)); + .map(e -> e.getCapability(Capabilities.ITEM_HANDLER, side)) + .filter(LazyOptional::isPresent) + .map(c -> c.orElseThrow(AssertionError::new)); } private Stream getBlockItemHandlersAt(final Vec3 position, final Direction side) { diff --git a/src/main/java/li/cil/oc2/common/bus/device/item/MemoryDevice.java b/src/main/java/li/cil/oc2/common/bus/device/item/MemoryDevice.java index 5487463f..72658858 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/item/MemoryDevice.java +++ b/src/main/java/li/cil/oc2/common/bus/device/item/MemoryDevice.java @@ -11,8 +11,8 @@ import li.cil.oc2.common.serialization.BlobStorage; import li.cil.oc2.common.util.NBTTagIds; import li.cil.sedna.api.device.PhysicalMemory; import li.cil.sedna.device.memory.ByteBufferMemory; -import net.minecraft.world.item.ItemStack; import net.minecraft.nbt.CompoundTag; +import net.minecraft.world.item.ItemStack; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/li/cil/oc2/common/bus/device/item/NetworkInterfaceCardItemDevice.java b/src/main/java/li/cil/oc2/common/bus/device/item/NetworkInterfaceCardItemDevice.java index 819f7d64..d4798f58 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/item/NetworkInterfaceCardItemDevice.java +++ b/src/main/java/li/cil/oc2/common/bus/device/item/NetworkInterfaceCardItemDevice.java @@ -15,9 +15,9 @@ import li.cil.oc2.common.capabilities.Capabilities; import li.cil.oc2.common.serialization.NBTSerialization; import li.cil.oc2.common.util.NBTTagIds; import li.cil.sedna.device.virtio.VirtIONetworkDevice; -import net.minecraft.world.item.ItemStack; -import net.minecraft.nbt.CompoundTag; import net.minecraft.core.Direction; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.world.item.ItemStack; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.capabilities.ICapabilityProvider; import net.minecraftforge.common.util.LazyOptional; diff --git a/src/main/java/li/cil/oc2/common/bus/device/item/RedstoneInterfaceCardItemDevice.java b/src/main/java/li/cil/oc2/common/bus/device/item/RedstoneInterfaceCardItemDevice.java index b9e196b2..98990f37 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/item/RedstoneInterfaceCardItemDevice.java +++ b/src/main/java/li/cil/oc2/common/bus/device/item/RedstoneInterfaceCardItemDevice.java @@ -8,14 +8,14 @@ import li.cil.oc2.api.util.Side; import li.cil.oc2.common.Constants; import li.cil.oc2.common.capabilities.Capabilities; import li.cil.oc2.common.util.HorizontalBlockUtils; -import net.minecraft.world.item.ItemStack; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.core.Direction; import net.minecraft.core.BlockPos; -import net.minecraft.world.level.ChunkPos; +import net.minecraft.core.Direction; +import net.minecraft.nbt.CompoundTag; import net.minecraft.util.Mth; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.ChunkPos; import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.capabilities.ICapabilityProvider; import net.minecraftforge.common.util.LazyOptional; @@ -125,27 +125,27 @@ public final class RedstoneInterfaceCardItemDevice extends AbstractItemRPCDevice @Override public void getDeviceDocumentation(final DocumentedDevice.DeviceVisitor visitor) { visitor.visitCallback(GET_REDSTONE_INPUT) - .description("Get the current redstone level received on the specified side. " + - "Note that if the current output level on the specified side is not " + - "zero, this will affect the measured level.\n" + - "Sides may be specified by name or zero-based index. Please note that" + - "the side depends on the orientation of the device's container.") - .returnValueDescription("the current received level on the specified side.") - .parameterDescription(SIDE, "the side to read the input level from."); + .description("Get the current redstone level received on the specified side. " + + "Note that if the current output level on the specified side is not " + + "zero, this will affect the measured level.\n" + + "Sides may be specified by name or zero-based index. Please note that" + + "the side depends on the orientation of the device's container.") + .returnValueDescription("the current received level on the specified side.") + .parameterDescription(SIDE, "the side to read the input level from."); visitor.visitCallback(GET_REDSTONE_OUTPUT) - .description("Get the current redstone level transmitted on the specified side. " + - "This will return the value last set via setRedstoneOutput().\n" + - "Sides may be specified by name or zero-based index. Please note that" + - "the side depends on the orientation of the device's container.") - .returnValueDescription("the current transmitted level on the specified side.") - .parameterDescription(SIDE, "the side to read the output level from."); + .description("Get the current redstone level transmitted on the specified side. " + + "This will return the value last set via setRedstoneOutput().\n" + + "Sides may be specified by name or zero-based index. Please note that" + + "the side depends on the orientation of the device's container.") + .returnValueDescription("the current transmitted level on the specified side.") + .parameterDescription(SIDE, "the side to read the output level from."); visitor.visitCallback(SET_REDSTONE_OUTPUT) - .description("Set the new redstone level transmitted on the specified side.\n" + - "Sides may be specified by name or zero-based index. Please note that" + - "the side depends on the orientation of the device's container.") - .parameterDescription(SIDE, "the side to write the output level to.") - .parameterDescription(VALUE, "the output level to set, will be clamped to [0, 15]."); + .description("Set the new redstone level transmitted on the specified side.\n" + + "Sides may be specified by name or zero-based index. Please note that" + + "the side depends on the orientation of the device's container.") + .parameterDescription(SIDE, "the side to write the output level to.") + .parameterDescription(VALUE, "the output level to set, will be clamped to [0, 15]."); } /////////////////////////////////////////////////////////////////// diff --git a/src/main/java/li/cil/oc2/common/bus/device/item/SoundCardItemDevice.java b/src/main/java/li/cil/oc2/common/bus/device/item/SoundCardItemDevice.java index 4f88f4ad..de827207 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/item/SoundCardItemDevice.java +++ b/src/main/java/li/cil/oc2/common/bus/device/item/SoundCardItemDevice.java @@ -4,12 +4,12 @@ import li.cil.oc2.api.bus.device.object.Callback; import li.cil.oc2.api.bus.device.object.Parameter; import li.cil.oc2.common.Constants; import li.cil.oc2.common.util.Location; -import net.minecraft.world.item.ItemStack; import net.minecraft.resources.ResourceLocation; -import net.minecraft.sounds.SoundSource; -import net.minecraft.sounds.SoundEvent; -import net.minecraft.world.level.LevelAccessor; import net.minecraft.server.level.ServerLevel; +import net.minecraft.sounds.SoundEvent; +import net.minecraft.sounds.SoundSource; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.LevelAccessor; import net.minecraftforge.registries.ForgeRegistries; import javax.annotation.Nullable; diff --git a/src/main/java/li/cil/oc2/common/bus/device/provider/block/BlockStateDeviceProvider.java b/src/main/java/li/cil/oc2/common/bus/device/provider/block/BlockStateDeviceProvider.java index 79f7401b..21d56568 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/provider/block/BlockStateDeviceProvider.java +++ b/src/main/java/li/cil/oc2/common/bus/device/provider/block/BlockStateDeviceProvider.java @@ -5,10 +5,10 @@ import li.cil.oc2.api.bus.device.object.Callbacks; import li.cil.oc2.api.bus.device.object.ObjectDevice; import li.cil.oc2.api.bus.device.provider.BlockDeviceQuery; import li.cil.oc2.common.bus.device.provider.util.AbstractBlockDeviceProvider; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.state.BlockState; import net.minecraft.core.BlockPos; import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.state.BlockState; import net.minecraftforge.common.util.LazyOptional; public final class BlockStateDeviceProvider extends AbstractBlockDeviceProvider { diff --git a/src/main/java/li/cil/oc2/common/bus/device/provider/block/DiskDriveDeviceProvider.java b/src/main/java/li/cil/oc2/common/bus/device/provider/block/DiskDriveDeviceProvider.java index 411c97b8..2c2637ec 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/provider/block/DiskDriveDeviceProvider.java +++ b/src/main/java/li/cil/oc2/common/bus/device/provider/block/DiskDriveDeviceProvider.java @@ -2,9 +2,9 @@ package li.cil.oc2.common.bus.device.provider.block; import li.cil.oc2.api.bus.device.Device; import li.cil.oc2.api.bus.device.provider.BlockDeviceQuery; -import li.cil.oc2.common.bus.device.provider.util.AbstractBlockEntityDeviceProvider; -import li.cil.oc2.common.blockentity.DiskDriveBlockEntity; import li.cil.oc2.common.blockentity.BlockEntities; +import li.cil.oc2.common.blockentity.DiskDriveBlockEntity; +import li.cil.oc2.common.bus.device.provider.util.AbstractBlockEntityDeviceProvider; import net.minecraft.world.level.block.HorizontalDirectionalBlock; import net.minecraftforge.common.util.LazyOptional; diff --git a/src/main/java/li/cil/oc2/common/bus/device/provider/item/BlockOperationsModuleDeviceProvider.java b/src/main/java/li/cil/oc2/common/bus/device/provider/item/BlockOperationsModuleDeviceProvider.java index c0820c3e..17e41697 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/provider/item/BlockOperationsModuleDeviceProvider.java +++ b/src/main/java/li/cil/oc2/common/bus/device/provider/item/BlockOperationsModuleDeviceProvider.java @@ -27,8 +27,8 @@ public final class BlockOperationsModuleDeviceProvider extends AbstractItemDevic @Override protected Optional getItemDevice(final ItemDeviceQuery query) { return query.getContainerEntity().flatMap(entity -> - entity.getCapability(Capabilities.ROBOT).map(robot -> - new BlockOperationsModuleDevice(query.getItemStack(), entity, robot))); + entity.getCapability(Capabilities.ROBOT).map(robot -> + new BlockOperationsModuleDevice(query.getItemStack(), entity, robot))); } @Override diff --git a/src/main/java/li/cil/oc2/common/bus/device/provider/item/FileImportExportCardItemDeviceProvider.java b/src/main/java/li/cil/oc2/common/bus/device/provider/item/FileImportExportCardItemDeviceProvider.java index bf4cb760..20209d5b 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/provider/item/FileImportExportCardItemDeviceProvider.java +++ b/src/main/java/li/cil/oc2/common/bus/device/provider/item/FileImportExportCardItemDeviceProvider.java @@ -27,7 +27,7 @@ public final class FileImportExportCardItemDeviceProvider extends AbstractItemDe @Override protected Optional getItemDevice(final ItemDeviceQuery query) { return getTerminalUserProvider(query).map(provider -> - new FileImportExportCardItemDevice(query.getItemStack(), provider)); + new FileImportExportCardItemDevice(query.getItemStack(), provider)); } @Override @@ -40,7 +40,7 @@ public final class FileImportExportCardItemDeviceProvider extends AbstractItemDe private Optional getTerminalUserProvider(final ItemDeviceQuery query) { if (query.getContainerBlockEntity().isPresent()) { final LazyOptional capability = query.getContainerBlockEntity().get() - .getCapability(Capabilities.TERMINAL_USER_PROVIDER); + .getCapability(Capabilities.TERMINAL_USER_PROVIDER); if (capability.isPresent()) { return capability.resolve(); } @@ -48,7 +48,7 @@ public final class FileImportExportCardItemDeviceProvider extends AbstractItemDe if (query.getContainerEntity().isPresent()) { final LazyOptional capability = query.getContainerEntity().get() - .getCapability(Capabilities.TERMINAL_USER_PROVIDER); + .getCapability(Capabilities.TERMINAL_USER_PROVIDER); if (capability.isPresent()) { return capability.resolve(); } diff --git a/src/main/java/li/cil/oc2/common/bus/device/provider/item/FlashMemoryItemDeviceProvider.java b/src/main/java/li/cil/oc2/common/bus/device/provider/item/FlashMemoryItemDeviceProvider.java index 5cf50303..d0d812f2 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/provider/item/FlashMemoryItemDeviceProvider.java +++ b/src/main/java/li/cil/oc2/common/bus/device/provider/item/FlashMemoryItemDeviceProvider.java @@ -8,8 +8,8 @@ import li.cil.oc2.common.Config; import li.cil.oc2.common.bus.device.item.ByteBufferFlashMemoryVMDevice; import li.cil.oc2.common.bus.device.provider.util.AbstractItemDeviceProvider; import li.cil.oc2.common.item.FlashMemoryItem; -import net.minecraft.world.item.ItemStack; import net.minecraft.util.Mth; +import net.minecraft.world.item.ItemStack; import java.util.Optional; diff --git a/src/main/java/li/cil/oc2/common/bus/device/provider/item/HardDriveItemDeviceProvider.java b/src/main/java/li/cil/oc2/common/bus/device/provider/item/HardDriveItemDeviceProvider.java index 8ff787b2..b0e5c430 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/provider/item/HardDriveItemDeviceProvider.java +++ b/src/main/java/li/cil/oc2/common/bus/device/provider/item/HardDriveItemDeviceProvider.java @@ -10,8 +10,8 @@ import li.cil.oc2.common.bus.device.item.HardDriveVMDevice; import li.cil.oc2.common.bus.device.provider.util.AbstractItemDeviceProvider; import li.cil.oc2.common.item.HardDriveItem; import li.cil.oc2.common.util.LocationSupplierUtils; -import net.minecraft.world.item.ItemStack; import net.minecraft.util.Mth; +import net.minecraft.world.item.ItemStack; import java.util.Optional; diff --git a/src/main/java/li/cil/oc2/common/bus/device/provider/item/InventoryOperationsModuleDeviceProvider.java b/src/main/java/li/cil/oc2/common/bus/device/provider/item/InventoryOperationsModuleDeviceProvider.java index dff25454..847b07d5 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/provider/item/InventoryOperationsModuleDeviceProvider.java +++ b/src/main/java/li/cil/oc2/common/bus/device/provider/item/InventoryOperationsModuleDeviceProvider.java @@ -27,8 +27,8 @@ public final class InventoryOperationsModuleDeviceProvider extends AbstractItemD @Override protected Optional getItemDevice(final ItemDeviceQuery query) { return query.getContainerEntity().flatMap(entity -> - entity.getCapability(Capabilities.ROBOT).map(robot -> - new InventoryOperationsModuleDevice(query.getItemStack(), entity, robot))); + entity.getCapability(Capabilities.ROBOT).map(robot -> + new InventoryOperationsModuleDevice(query.getItemStack(), entity, robot))); } @Override diff --git a/src/main/java/li/cil/oc2/common/bus/device/provider/item/MemoryItemDeviceProvider.java b/src/main/java/li/cil/oc2/common/bus/device/provider/item/MemoryItemDeviceProvider.java index d6eff3d3..ae2e1056 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/provider/item/MemoryItemDeviceProvider.java +++ b/src/main/java/li/cil/oc2/common/bus/device/provider/item/MemoryItemDeviceProvider.java @@ -9,8 +9,8 @@ import li.cil.oc2.common.Constants; import li.cil.oc2.common.bus.device.item.MemoryDevice; import li.cil.oc2.common.bus.device.provider.util.AbstractItemDeviceProvider; import li.cil.oc2.common.item.MemoryItem; -import net.minecraft.world.item.ItemStack; import net.minecraft.util.Mth; +import net.minecraft.world.item.ItemStack; import java.util.Optional; diff --git a/src/main/java/li/cil/oc2/common/bus/device/provider/item/NetworkInterfaceCardItemDeviceProvider.java b/src/main/java/li/cil/oc2/common/bus/device/provider/item/NetworkInterfaceCardItemDeviceProvider.java index 45cf7527..38fffc6c 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/provider/item/NetworkInterfaceCardItemDeviceProvider.java +++ b/src/main/java/li/cil/oc2/common/bus/device/provider/item/NetworkInterfaceCardItemDeviceProvider.java @@ -19,7 +19,7 @@ public final class NetworkInterfaceCardItemDeviceProvider extends AbstractItemDe @Override protected Optional getItemDevice(final ItemDeviceQuery query) { return query.getContainerBlockEntity().map(blockEntity -> - new NetworkInterfaceCardItemDevice(query.getItemStack())); + new NetworkInterfaceCardItemDevice(query.getItemStack())); } @Override diff --git a/src/main/java/li/cil/oc2/common/bus/device/provider/item/RedstoneInterfaceCardItemDeviceProvider.java b/src/main/java/li/cil/oc2/common/bus/device/provider/item/RedstoneInterfaceCardItemDeviceProvider.java index a712d281..716e94e3 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/provider/item/RedstoneInterfaceCardItemDeviceProvider.java +++ b/src/main/java/li/cil/oc2/common/bus/device/provider/item/RedstoneInterfaceCardItemDeviceProvider.java @@ -19,7 +19,7 @@ public final class RedstoneInterfaceCardItemDeviceProvider extends AbstractItemD @Override protected Optional getItemDevice(final ItemDeviceQuery query) { return query.getContainerBlockEntity().map(blockEntity -> - new RedstoneInterfaceCardItemDevice(query.getItemStack(), blockEntity)); + new RedstoneInterfaceCardItemDevice(query.getItemStack(), blockEntity)); } @Override diff --git a/src/main/java/li/cil/oc2/common/bus/device/rpc/RPCDeviceList.java b/src/main/java/li/cil/oc2/common/bus/device/rpc/RPCDeviceList.java index 82b1492e..8207aa64 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/rpc/RPCDeviceList.java +++ b/src/main/java/li/cil/oc2/common/bus/device/rpc/RPCDeviceList.java @@ -21,18 +21,18 @@ public final class RPCDeviceList implements RPCDevice { @Override public List getTypeNames() { return devices.stream() - .map(RPCDevice::getTypeNames) - .flatMap(Collection::stream) - .distinct() - .collect(Collectors.toList()); + .map(RPCDevice::getTypeNames) + .flatMap(Collection::stream) + .distinct() + .collect(Collectors.toList()); } @Override public List getMethods() { return devices.stream() - .map(RPCDevice::getMethods) - .flatMap(Collection::stream) - .collect(Collectors.toList()); + .map(RPCDevice::getMethods) + .flatMap(Collection::stream) + .collect(Collectors.toList()); } @Override diff --git a/src/main/java/li/cil/oc2/common/bus/device/rpc/RPCItemStackTagFilter.java b/src/main/java/li/cil/oc2/common/bus/device/rpc/RPCItemStackTagFilter.java index 436af38d..bc4f37e0 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/rpc/RPCItemStackTagFilter.java +++ b/src/main/java/li/cil/oc2/common/bus/device/rpc/RPCItemStackTagFilter.java @@ -1,11 +1,11 @@ package li.cil.oc2.common.bus.device.rpc; import li.cil.oc2.common.util.NBTTagIds; -import net.minecraft.nbt.Tag; -import net.minecraft.world.item.ItemStack; import net.minecraft.nbt.CompoundTag; +import net.minecraft.nbt.Tag; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.StringUtil; +import net.minecraft.world.item.ItemStack; import javax.annotation.Nullable; import java.util.Objects; diff --git a/src/main/java/li/cil/oc2/common/bus/device/rpc/RPCItemStackTagFilters.java b/src/main/java/li/cil/oc2/common/bus/device/rpc/RPCItemStackTagFilters.java index f1fad8da..c27c82d3 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/rpc/RPCItemStackTagFilters.java +++ b/src/main/java/li/cil/oc2/common/bus/device/rpc/RPCItemStackTagFilters.java @@ -3,12 +3,12 @@ package li.cil.oc2.common.bus.device.rpc; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.JsonElement; -import net.minecraft.server.packs.resources.SimpleJsonResourceReloadListener; -import net.minecraft.world.item.ItemStack; import net.minecraft.nbt.CompoundTag; -import net.minecraft.util.profiling.ProfilerFiller; -import net.minecraft.server.packs.resources.ResourceManager; import net.minecraft.resources.ResourceLocation; +import net.minecraft.server.packs.resources.ResourceManager; +import net.minecraft.server.packs.resources.SimpleJsonResourceReloadListener; +import net.minecraft.util.profiling.ProfilerFiller; +import net.minecraft.world.item.ItemStack; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.AddReloadListenerEvent; import org.apache.logging.log4j.LogManager; @@ -49,8 +49,8 @@ public final class RPCItemStackTagFilters { private static final class ReloadListener extends SimpleJsonResourceReloadListener { private static final Gson GSON = new GsonBuilder() - .registerTypeAdapter(ResourceLocation.class, new ResourceLocation.Serializer()) - .create(); + .registerTypeAdapter(ResourceLocation.class, new ResourceLocation.Serializer()) + .create(); public static final ReloadListener INSTANCE = new ReloadListener(); diff --git a/src/main/java/li/cil/oc2/common/bus/device/rpc/RPCMethodParameterTypeAdapters.java b/src/main/java/li/cil/oc2/common/bus/device/rpc/RPCMethodParameterTypeAdapters.java index 2ffde664..196909b4 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/rpc/RPCMethodParameterTypeAdapters.java +++ b/src/main/java/li/cil/oc2/common/bus/device/rpc/RPCMethodParameterTypeAdapters.java @@ -4,8 +4,8 @@ import com.google.gson.GsonBuilder; import li.cil.oc2.api.imc.RPCMethodParameterTypeAdapter; import li.cil.oc2.common.serialization.serializers.DirectionJsonSerializer; import li.cil.oc2.common.serialization.serializers.ItemStackJsonSerializer; -import net.minecraft.world.item.ItemStack; import net.minecraft.core.Direction; +import net.minecraft.world.item.ItemStack; import java.util.ArrayList; diff --git a/src/main/java/li/cil/oc2/common/bus/device/util/DeviceTypeImpl.java b/src/main/java/li/cil/oc2/common/bus/device/util/DeviceTypeImpl.java index 56aca776..71af3882 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/util/DeviceTypeImpl.java +++ b/src/main/java/li/cil/oc2/common/bus/device/util/DeviceTypeImpl.java @@ -1,8 +1,8 @@ package li.cil.oc2.common.bus.device.util; import li.cil.oc2.api.bus.device.DeviceType; -import net.minecraft.resources.ResourceLocation; import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; import net.minecraftforge.registries.ForgeRegistryEntry; public final class DeviceTypeImpl extends ForgeRegistryEntry implements DeviceType { diff --git a/src/main/java/li/cil/oc2/common/bus/device/util/Devices.java b/src/main/java/li/cil/oc2/common/bus/device/util/Devices.java index 9f3cc157..b7486cac 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/util/Devices.java +++ b/src/main/java/li/cil/oc2/common/bus/device/util/Devices.java @@ -8,12 +8,12 @@ import li.cil.oc2.api.bus.device.provider.BlockDeviceQuery; import li.cil.oc2.api.bus.device.provider.ItemDeviceProvider; import li.cil.oc2.api.bus.device.provider.ItemDeviceQuery; import li.cil.oc2.common.bus.device.provider.Providers; +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; import net.minecraft.world.entity.Entity; import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.core.Direction; -import net.minecraft.core.BlockPos; import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.registries.IForgeRegistry; diff --git a/src/main/java/li/cil/oc2/common/container/AbstractComputerContainer.java b/src/main/java/li/cil/oc2/common/container/AbstractComputerContainer.java index 6e8dbf8d..7d4968ff 100644 --- a/src/main/java/li/cil/oc2/common/container/AbstractComputerContainer.java +++ b/src/main/java/li/cil/oc2/common/container/AbstractComputerContainer.java @@ -1,19 +1,19 @@ package li.cil.oc2.common.container; import li.cil.oc2.common.block.Blocks; +import li.cil.oc2.common.blockentity.ComputerBlockEntity; import li.cil.oc2.common.bus.CommonDeviceBusController; import li.cil.oc2.common.network.Network; import li.cil.oc2.common.network.message.ComputerPowerMessage; import li.cil.oc2.common.network.message.ComputerTerminalInputMessage; import li.cil.oc2.common.network.message.OpenComputerInventoryMessage; import li.cil.oc2.common.network.message.OpenComputerTerminalMessage; -import li.cil.oc2.common.blockentity.ComputerBlockEntity; import li.cil.oc2.common.vm.Terminal; import li.cil.oc2.common.vm.VirtualMachine; import net.minecraft.world.entity.player.Player; -import net.minecraft.world.inventory.MenuType; import net.minecraft.world.inventory.ContainerData; import net.minecraft.world.inventory.ContainerLevelAccess; +import net.minecraft.world.inventory.MenuType; import net.minecraftforge.energy.IEnergyStorage; import java.nio.ByteBuffer; diff --git a/src/main/java/li/cil/oc2/common/container/AbstractContainer.java b/src/main/java/li/cil/oc2/common/container/AbstractContainer.java index 05160b04..6ca74672 100644 --- a/src/main/java/li/cil/oc2/common/container/AbstractContainer.java +++ b/src/main/java/li/cil/oc2/common/container/AbstractContainer.java @@ -1,7 +1,7 @@ package li.cil.oc2.common.container; -import net.minecraft.world.entity.player.Player; import net.minecraft.world.entity.player.Inventory; +import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.AbstractContainerMenu; import net.minecraft.world.inventory.MenuType; import net.minecraft.world.inventory.Slot; diff --git a/src/main/java/li/cil/oc2/common/container/AbstractMachineContainer.java b/src/main/java/li/cil/oc2/common/container/AbstractMachineContainer.java index 4f144f62..37530125 100644 --- a/src/main/java/li/cil/oc2/common/container/AbstractMachineContainer.java +++ b/src/main/java/li/cil/oc2/common/container/AbstractMachineContainer.java @@ -1,8 +1,8 @@ package li.cil.oc2.common.container; import li.cil.oc2.common.vm.VirtualMachine; -import net.minecraft.world.inventory.MenuType; import net.minecraft.world.inventory.ContainerData; +import net.minecraft.world.inventory.MenuType; import net.minecraft.world.inventory.SimpleContainerData; public abstract class AbstractMachineContainer extends AbstractContainer { diff --git a/src/main/java/li/cil/oc2/common/container/AbstractMachineTerminalContainer.java b/src/main/java/li/cil/oc2/common/container/AbstractMachineTerminalContainer.java index 14e9fffa..bb1e479c 100644 --- a/src/main/java/li/cil/oc2/common/container/AbstractMachineTerminalContainer.java +++ b/src/main/java/li/cil/oc2/common/container/AbstractMachineTerminalContainer.java @@ -1,8 +1,8 @@ package li.cil.oc2.common.container; import li.cil.oc2.common.vm.Terminal; -import net.minecraft.world.inventory.MenuType; import net.minecraft.world.inventory.ContainerData; +import net.minecraft.world.inventory.MenuType; import java.nio.ByteBuffer; diff --git a/src/main/java/li/cil/oc2/common/container/AbstractRobotContainer.java b/src/main/java/li/cil/oc2/common/container/AbstractRobotContainer.java index 985996a9..eef360b5 100644 --- a/src/main/java/li/cil/oc2/common/container/AbstractRobotContainer.java +++ b/src/main/java/li/cil/oc2/common/container/AbstractRobotContainer.java @@ -11,8 +11,8 @@ import li.cil.oc2.common.network.message.RobotTerminalInputMessage; import li.cil.oc2.common.vm.Terminal; import li.cil.oc2.common.vm.VirtualMachine; import net.minecraft.world.entity.player.Player; -import net.minecraft.world.inventory.MenuType; import net.minecraft.world.inventory.ContainerData; +import net.minecraft.world.inventory.MenuType; import java.nio.ByteBuffer; diff --git a/src/main/java/li/cil/oc2/common/container/ComputerInventoryContainer.java b/src/main/java/li/cil/oc2/common/container/ComputerInventoryContainer.java index ed83fcaa..f0fffb9f 100644 --- a/src/main/java/li/cil/oc2/common/container/ComputerInventoryContainer.java +++ b/src/main/java/li/cil/oc2/common/container/ComputerInventoryContainer.java @@ -1,20 +1,20 @@ package li.cil.oc2.common.container; import li.cil.oc2.api.bus.device.DeviceTypes; -import li.cil.oc2.common.bus.CommonDeviceBusController; import li.cil.oc2.common.blockentity.ComputerBlockEntity; +import li.cil.oc2.common.bus.CommonDeviceBusController; import li.cil.oc2.common.vm.VMItemStackHandlers; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.entity.player.Inventory; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.inventory.AbstractContainerMenu; -import net.minecraft.world.MenuProvider; -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.world.inventory.ContainerData; import net.minecraft.core.BlockPos; +import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.TranslatableComponent; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.MenuProvider; +import net.minecraft.world.entity.player.Inventory; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.inventory.AbstractContainerMenu; +import net.minecraft.world.inventory.ContainerData; +import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraftforge.energy.IEnergyStorage; import net.minecraftforge.network.NetworkHooks; diff --git a/src/main/java/li/cil/oc2/common/container/ComputerTerminalContainer.java b/src/main/java/li/cil/oc2/common/container/ComputerTerminalContainer.java index ead70720..01bc9164 100644 --- a/src/main/java/li/cil/oc2/common/container/ComputerTerminalContainer.java +++ b/src/main/java/li/cil/oc2/common/container/ComputerTerminalContainer.java @@ -1,18 +1,18 @@ package li.cil.oc2.common.container; -import li.cil.oc2.common.bus.CommonDeviceBusController; import li.cil.oc2.common.blockentity.ComputerBlockEntity; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.entity.player.Inventory; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.inventory.AbstractContainerMenu; -import net.minecraft.world.MenuProvider; -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.world.inventory.ContainerData; +import li.cil.oc2.common.bus.CommonDeviceBusController; import net.minecraft.core.BlockPos; +import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.TranslatableComponent; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.MenuProvider; +import net.minecraft.world.entity.player.Inventory; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.inventory.AbstractContainerMenu; +import net.minecraft.world.inventory.ContainerData; +import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraftforge.energy.IEnergyStorage; import net.minecraftforge.network.NetworkHooks; diff --git a/src/main/java/li/cil/oc2/common/container/DeviceItemStackHandler.java b/src/main/java/li/cil/oc2/common/container/DeviceItemStackHandler.java index 256eaf6d..5d5f2dad 100644 --- a/src/main/java/li/cil/oc2/common/container/DeviceItemStackHandler.java +++ b/src/main/java/li/cil/oc2/common/container/DeviceItemStackHandler.java @@ -2,9 +2,9 @@ package li.cil.oc2.common.container; import li.cil.oc2.api.bus.device.provider.ItemDeviceQuery; import li.cil.oc2.common.bus.ItemHandlerDeviceBusElement; -import net.minecraft.world.item.ItemStack; -import net.minecraft.nbt.CompoundTag; import net.minecraft.core.NonNullList; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.world.item.ItemStack; import javax.annotation.Nonnull; import java.util.function.Function; diff --git a/src/main/java/li/cil/oc2/common/container/FixedSizeItemStackHandler.java b/src/main/java/li/cil/oc2/common/container/FixedSizeItemStackHandler.java index 59b4df0e..04ca2a4c 100644 --- a/src/main/java/li/cil/oc2/common/container/FixedSizeItemStackHandler.java +++ b/src/main/java/li/cil/oc2/common/container/FixedSizeItemStackHandler.java @@ -1,9 +1,9 @@ package li.cil.oc2.common.container; import li.cil.oc2.common.util.NBTTagIds; -import net.minecraft.world.item.ItemStack; -import net.minecraft.nbt.CompoundTag; import net.minecraft.core.NonNullList; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.world.item.ItemStack; import net.minecraftforge.items.ItemStackHandler; public class FixedSizeItemStackHandler extends ItemStackHandler { diff --git a/src/main/java/li/cil/oc2/common/container/RobotInventoryContainer.java b/src/main/java/li/cil/oc2/common/container/RobotInventoryContainer.java index 62fe2d6b..f77c4dd2 100644 --- a/src/main/java/li/cil/oc2/common/container/RobotInventoryContainer.java +++ b/src/main/java/li/cil/oc2/common/container/RobotInventoryContainer.java @@ -5,15 +5,15 @@ import li.cil.oc2.common.bus.CommonDeviceBusController; import li.cil.oc2.common.energy.FixedEnergyStorage; import li.cil.oc2.common.entity.RobotEntity; import li.cil.oc2.common.vm.VMItemStackHandlers; -import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.entity.player.Inventory; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.inventory.AbstractContainerMenu; -import net.minecraft.world.MenuProvider; import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.world.inventory.ContainerData; import net.minecraft.network.chat.Component; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.MenuProvider; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.player.Inventory; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.inventory.AbstractContainerMenu; +import net.minecraft.world.inventory.ContainerData; import net.minecraftforge.items.ItemStackHandler; import net.minecraftforge.items.SlotItemHandler; import net.minecraftforge.network.NetworkHooks; diff --git a/src/main/java/li/cil/oc2/common/container/RobotTerminalContainer.java b/src/main/java/li/cil/oc2/common/container/RobotTerminalContainer.java index 665336e8..c8417ae9 100644 --- a/src/main/java/li/cil/oc2/common/container/RobotTerminalContainer.java +++ b/src/main/java/li/cil/oc2/common/container/RobotTerminalContainer.java @@ -4,15 +4,15 @@ import li.cil.oc2.client.gui.MachineTerminalWidget; import li.cil.oc2.common.bus.CommonDeviceBusController; import li.cil.oc2.common.energy.FixedEnergyStorage; import li.cil.oc2.common.entity.RobotEntity; -import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.entity.player.Inventory; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.inventory.AbstractContainerMenu; -import net.minecraft.world.MenuProvider; import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.world.inventory.ContainerData; import net.minecraft.network.chat.Component; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.MenuProvider; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.player.Inventory; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.inventory.AbstractContainerMenu; +import net.minecraft.world.inventory.ContainerData; import net.minecraftforge.items.ItemStackHandler; import net.minecraftforge.items.SlotItemHandler; import net.minecraftforge.network.NetworkHooks; diff --git a/src/main/java/li/cil/oc2/common/container/TypedItemStackHandler.java b/src/main/java/li/cil/oc2/common/container/TypedItemStackHandler.java index 8567974d..1ddc7366 100644 --- a/src/main/java/li/cil/oc2/common/container/TypedItemStackHandler.java +++ b/src/main/java/li/cil/oc2/common/container/TypedItemStackHandler.java @@ -1,8 +1,8 @@ package li.cil.oc2.common.container; +import net.minecraft.tags.Tag; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; -import net.minecraft.tags.Tag; public class TypedItemStackHandler extends FixedSizeItemStackHandler { private final Tag deviceType; diff --git a/src/main/java/li/cil/oc2/common/container/TypedSlotItemHandler.java b/src/main/java/li/cil/oc2/common/container/TypedSlotItemHandler.java index cec9368b..75857c8c 100644 --- a/src/main/java/li/cil/oc2/common/container/TypedSlotItemHandler.java +++ b/src/main/java/li/cil/oc2/common/container/TypedSlotItemHandler.java @@ -2,8 +2,8 @@ package li.cil.oc2.common.container; import com.mojang.datafixers.util.Pair; import li.cil.oc2.api.bus.device.DeviceType; -import net.minecraft.world.inventory.InventoryMenu; import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.inventory.InventoryMenu; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.SlotItemHandler; diff --git a/src/main/java/li/cil/oc2/common/energy/EnergyStorageItemStack.java b/src/main/java/li/cil/oc2/common/energy/EnergyStorageItemStack.java index 2d4ccfbb..09da79c7 100644 --- a/src/main/java/li/cil/oc2/common/energy/EnergyStorageItemStack.java +++ b/src/main/java/li/cil/oc2/common/energy/EnergyStorageItemStack.java @@ -2,8 +2,8 @@ package li.cil.oc2.common.energy; import li.cil.oc2.common.capabilities.Capabilities; import li.cil.oc2.common.util.NBTUtils; -import net.minecraft.world.item.ItemStack; import net.minecraft.core.Direction; +import net.minecraft.world.item.ItemStack; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.capabilities.ICapabilityProvider; import net.minecraftforge.common.util.LazyOptional; @@ -32,7 +32,7 @@ public final class EnergyStorageItemStack implements IEnergyStorage, ICapability final int receive = Math.min(maxReceive, receiveLimit); if (!simulate) { NBTUtils.getOrCreateChildTag(stack.getOrCreateTag(), tagPath) - .putInt(FixedEnergyStorage.STORED_TAG_NAME, stored + receive); + .putInt(FixedEnergyStorage.STORED_TAG_NAME, stored + receive); } return receive; } diff --git a/src/main/java/li/cil/oc2/common/entity/RobotEntity.java b/src/main/java/li/cil/oc2/common/entity/RobotEntity.java index 35b565c8..a19706ec 100644 --- a/src/main/java/li/cil/oc2/common/entity/RobotEntity.java +++ b/src/main/java/li/cil/oc2/common/entity/RobotEntity.java @@ -24,39 +24,44 @@ import li.cil.oc2.common.item.Items; import li.cil.oc2.common.network.Network; import li.cil.oc2.common.network.message.*; import li.cil.oc2.common.serialization.NBTSerialization; +import li.cil.oc2.common.util.LevelUtils; import li.cil.oc2.common.util.NBTTagIds; import li.cil.oc2.common.util.NBTUtils; import li.cil.oc2.common.util.TerminalUtils; -import li.cil.oc2.common.util.LevelUtils; import li.cil.oc2.common.vm.*; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.block.Blocks; -import net.minecraft.world.level.block.SoundType; -import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.EntityType; -import net.minecraft.world.entity.player.Player; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.storage.loot.LootContext; -import net.minecraft.world.level.storage.loot.parameters.LootContextParams; +import net.minecraft.core.BlockPos; +import net.minecraft.core.Cursor3D; +import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListTag; +import net.minecraft.network.chat.Component; import net.minecraft.network.protocol.Packet; import net.minecraft.network.syncher.EntityDataAccessor; import net.minecraft.network.syncher.EntityDataSerializers; import net.minecraft.network.syncher.SynchedEntityData; -import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.world.InteractionResult; -import net.minecraft.core.Direction; -import net.minecraft.world.InteractionHand; -import net.minecraft.world.phys.shapes.BooleanOp; -import net.minecraft.world.phys.shapes.VoxelShape; -import net.minecraft.world.phys.shapes.Shapes; -import net.minecraft.world.phys.Vec3; -import net.minecraft.network.chat.Component; -import net.minecraft.world.level.Level; import net.minecraft.server.level.ServerLevel; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.util.Mth; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.InteractionResult; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.EntityType; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.ChunkPos; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.block.SoundType; +import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.storage.loot.LootContext; +import net.minecraft.world.level.storage.loot.parameters.LootContextParams; +import net.minecraft.world.phys.AABB; +import net.minecraft.world.phys.Vec3; +import net.minecraft.world.phys.shapes.BooleanOp; +import net.minecraft.world.phys.shapes.Shapes; +import net.minecraft.world.phys.shapes.VoxelShape; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.common.MinecraftForge; @@ -66,6 +71,7 @@ import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.event.world.ChunkEvent; import net.minecraftforge.event.world.WorldEvent; import net.minecraftforge.items.ItemStackHandler; +import net.minecraftforge.network.NetworkHooks; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -76,13 +82,6 @@ import java.util.function.Consumer; import static java.util.Collections.singleton; import static li.cil.oc2.common.Constants.*; -import net.minecraft.core.BlockPos; -import net.minecraft.core.Cursor3D; -import net.minecraft.util.Mth; -import net.minecraft.world.level.ChunkPos; -import net.minecraft.world.phys.AABB; -import net.minecraftforge.network.NetworkHooks; - public final class RobotEntity extends Entity implements Robot { public static final EntityDataAccessor TARGET_POSITION = SynchedEntityData.defineId(RobotEntity.class, EntityDataSerializers.BLOCK_POS); public static final EntityDataAccessor TARGET_DIRECTION = SynchedEntityData.defineId(RobotEntity.class, EntityDataSerializers.DIRECTION); diff --git a/src/main/java/li/cil/oc2/common/entity/robot/RobotMovementAction.java b/src/main/java/li/cil/oc2/common/entity/robot/RobotMovementAction.java index 950c2a4b..c52ba967 100644 --- a/src/main/java/li/cil/oc2/common/entity/robot/RobotMovementAction.java +++ b/src/main/java/li/cil/oc2/common/entity/robot/RobotMovementAction.java @@ -5,11 +5,11 @@ import li.cil.oc2.common.entity.Entities; import li.cil.oc2.common.entity.RobotEntity; import li.cil.oc2.common.util.NBTTagIds; import li.cil.oc2.common.util.NBTUtils; -import net.minecraft.world.entity.MoverType; +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.NbtUtils; -import net.minecraft.core.Direction; -import net.minecraft.core.BlockPos; +import net.minecraft.world.entity.MoverType; import net.minecraft.world.phys.Vec3; import javax.annotation.Nullable; diff --git a/src/main/java/li/cil/oc2/common/entity/robot/RobotRotationAction.java b/src/main/java/li/cil/oc2/common/entity/robot/RobotRotationAction.java index fa4ce267..fc755670 100644 --- a/src/main/java/li/cil/oc2/common/entity/robot/RobotRotationAction.java +++ b/src/main/java/li/cil/oc2/common/entity/robot/RobotRotationAction.java @@ -4,8 +4,8 @@ import li.cil.oc2.common.Constants; import li.cil.oc2.common.entity.RobotEntity; import li.cil.oc2.common.util.NBTTagIds; import li.cil.oc2.common.util.NBTUtils; -import net.minecraft.nbt.CompoundTag; import net.minecraft.core.Direction; +import net.minecraft.nbt.CompoundTag; import net.minecraft.util.Mth; import javax.annotation.Nullable; diff --git a/src/main/java/li/cil/oc2/common/entity/robot/RobotRotationActionType.java b/src/main/java/li/cil/oc2/common/entity/robot/RobotRotationActionType.java index f6bbc35d..b4c1bab4 100644 --- a/src/main/java/li/cil/oc2/common/entity/robot/RobotRotationActionType.java +++ b/src/main/java/li/cil/oc2/common/entity/robot/RobotRotationActionType.java @@ -1,8 +1,8 @@ package li.cil.oc2.common.entity.robot; import li.cil.oc2.common.entity.RobotEntity; -import net.minecraft.nbt.CompoundTag; import net.minecraft.core.Direction; +import net.minecraft.nbt.CompoundTag; import net.minecraft.util.Mth; public final class RobotRotationActionType extends AbstractRobotActionType { diff --git a/src/main/java/li/cil/oc2/common/item/AbstractBlockDeviceItem.java b/src/main/java/li/cil/oc2/common/item/AbstractBlockDeviceItem.java index a1addac8..6d6fe497 100644 --- a/src/main/java/li/cil/oc2/common/item/AbstractBlockDeviceItem.java +++ b/src/main/java/li/cil/oc2/common/item/AbstractBlockDeviceItem.java @@ -3,12 +3,12 @@ package li.cil.oc2.common.item; import li.cil.oc2.api.bus.device.data.BlockDeviceData; import li.cil.oc2.common.bus.device.data.BlockDeviceDataRegistration; import li.cil.oc2.common.util.ItemStackUtils; -import net.minecraft.world.item.ItemStack; -import net.minecraft.resources.ResourceLocation; import net.minecraft.ResourceLocationException; -import net.minecraft.util.StringUtil; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.TextComponent; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.util.StringUtil; +import net.minecraft.world.item.ItemStack; import javax.annotation.Nullable; @@ -75,10 +75,10 @@ public abstract class AbstractBlockDeviceItem extends ModItem { final BlockDeviceData data = getData(stack); if (data != null) { return new TextComponent("") - .append(super.getName(stack)) - .append(" (") - .append(data.getDisplayName()) - .append(")"); + .append(super.getName(stack)) + .append(" (") + .append(data.getDisplayName()) + .append(")"); } else { return super.getName(stack); } diff --git a/src/main/java/li/cil/oc2/common/item/AbstractStorageItem.java b/src/main/java/li/cil/oc2/common/item/AbstractStorageItem.java index b3c6cc08..3215a5a4 100644 --- a/src/main/java/li/cil/oc2/common/item/AbstractStorageItem.java +++ b/src/main/java/li/cil/oc2/common/item/AbstractStorageItem.java @@ -3,10 +3,10 @@ package li.cil.oc2.common.item; import li.cil.oc2.common.util.ItemStackUtils; import li.cil.oc2.common.util.NBTTagIds; import li.cil.oc2.common.util.TextFormatUtils; -import net.minecraft.world.item.ItemStack; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.TextComponent; +import net.minecraft.world.item.ItemStack; public abstract class AbstractStorageItem extends ModItem { private static final String CAPACITY_TAG_NAME = "capacity"; @@ -50,9 +50,9 @@ public abstract class AbstractStorageItem extends ModItem { public Component getName(final ItemStack stack) { final int capacity = getCapacity(stack); return new TextComponent("") - .append(super.getName(stack)) - .append(" (") - .append(TextFormatUtils.formatSize(capacity)) - .append(")"); + .append(super.getName(stack)) + .append(" (") + .append(TextFormatUtils.formatSize(capacity)) + .append(")"); } } diff --git a/src/main/java/li/cil/oc2/common/item/BusCableItem.java b/src/main/java/li/cil/oc2/common/item/BusCableItem.java index 4dfd57a3..205abb2c 100644 --- a/src/main/java/li/cil/oc2/common/item/BusCableItem.java +++ b/src/main/java/li/cil/oc2/common/item/BusCableItem.java @@ -2,22 +2,22 @@ package li.cil.oc2.common.item; import li.cil.oc2.common.Config; import li.cil.oc2.common.block.BusCableBlock; -import li.cil.oc2.common.util.TooltipUtils; import li.cil.oc2.common.util.LevelUtils; +import li.cil.oc2.common.util.TooltipUtils; import net.minecraft.advancements.CriteriaTriggers; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.block.SoundType; -import net.minecraft.world.item.TooltipFlag; -import net.minecraft.world.entity.player.Player; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.item.context.BlockPlaceContext; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.context.UseOnContext; -import net.minecraft.world.InteractionResult; import net.minecraft.core.BlockPos; import net.minecraft.network.chat.Component; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.InteractionResult; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.TooltipFlag; +import net.minecraft.world.item.context.BlockPlaceContext; +import net.minecraft.world.item.context.UseOnContext; import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.SoundType; +import net.minecraft.world.level.block.state.BlockState; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; diff --git a/src/main/java/li/cil/oc2/common/item/BusInterfaceItem.java b/src/main/java/li/cil/oc2/common/item/BusInterfaceItem.java index 2ce875aa..884e9bba 100644 --- a/src/main/java/li/cil/oc2/common/item/BusInterfaceItem.java +++ b/src/main/java/li/cil/oc2/common/item/BusInterfaceItem.java @@ -4,24 +4,28 @@ import li.cil.oc2.common.Config; import li.cil.oc2.common.block.Blocks; import li.cil.oc2.common.block.BusCableBlock; import li.cil.oc2.common.block.BusCableBlock.ConnectionType; -import li.cil.oc2.common.util.TooltipUtils; import li.cil.oc2.common.util.LevelUtils; +import li.cil.oc2.common.util.TooltipUtils; import net.minecraft.advancements.CriteriaTriggers; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.block.SoundType; -import net.minecraft.world.item.TooltipFlag; -import net.minecraft.world.entity.player.Player; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.item.CreativeModeTab; -import net.minecraft.world.level.block.state.properties.EnumProperty; -import net.minecraft.world.InteractionResult; +import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.NonNullList; -import net.minecraft.core.BlockPos; -import net.minecraft.world.phys.Vec3; import net.minecraft.network.chat.Component; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.InteractionResult; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.CreativeModeTab; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.TooltipFlag; +import net.minecraft.world.item.context.BlockPlaceContext; +import net.minecraft.world.item.context.UseOnContext; import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.SoundType; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.block.state.properties.EnumProperty; +import net.minecraft.world.phys.Vec3; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @@ -29,11 +33,6 @@ import javax.annotation.Nullable; import java.util.List; import java.util.Map; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.context.BlockPlaceContext; -import net.minecraft.world.item.context.UseOnContext; - public final class BusInterfaceItem extends ModBlockItem { public BusInterfaceItem() { super(Blocks.BUS_CABLE.get()); @@ -93,10 +92,10 @@ public final class BusInterfaceItem extends ModBlockItem { } final EnumProperty connectionTypeProperty = - BusCableBlock.FACING_TO_CONNECTION_MAP.get(context.getClickedFace().getOpposite()); + BusCableBlock.FACING_TO_CONNECTION_MAP.get(context.getClickedFace().getOpposite()); return state - .setValue(BusCableBlock.HAS_CABLE, false) - .setValue(connectionTypeProperty, ConnectionType.INTERFACE); + .setValue(BusCableBlock.HAS_CABLE, false) + .setValue(connectionTypeProperty, ConnectionType.INTERFACE); } /////////////////////////////////////////////////////////////////// diff --git a/src/main/java/li/cil/oc2/common/item/ChargerItem.java b/src/main/java/li/cil/oc2/common/item/ChargerItem.java index e47d4af8..1c272193 100644 --- a/src/main/java/li/cil/oc2/common/item/ChargerItem.java +++ b/src/main/java/li/cil/oc2/common/item/ChargerItem.java @@ -1,10 +1,10 @@ package li.cil.oc2.common.item; import li.cil.oc2.common.Config; -import net.minecraft.world.level.block.Block; +import net.minecraft.core.NonNullList; import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.item.ItemStack; -import net.minecraft.core.NonNullList; +import net.minecraft.world.level.block.Block; public final class ChargerItem extends ModBlockItem { public ChargerItem(final Block block) { diff --git a/src/main/java/li/cil/oc2/common/item/FlashMemoryItem.java b/src/main/java/li/cil/oc2/common/item/FlashMemoryItem.java index 3dc37f44..7bf34fe6 100644 --- a/src/main/java/li/cil/oc2/common/item/FlashMemoryItem.java +++ b/src/main/java/li/cil/oc2/common/item/FlashMemoryItem.java @@ -3,9 +3,9 @@ package li.cil.oc2.common.item; import li.cil.oc2.api.API; import li.cil.oc2.common.bus.device.item.ByteBufferFlashMemoryVMDevice; import li.cil.oc2.common.util.NBTTagIds; -import net.minecraft.world.item.ItemStack; -import net.minecraft.nbt.CompoundTag; import net.minecraft.Util; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.world.item.ItemStack; import javax.annotation.Nullable; diff --git a/src/main/java/li/cil/oc2/common/item/FlashMemoryWithExternalDataItem.java b/src/main/java/li/cil/oc2/common/item/FlashMemoryWithExternalDataItem.java index 561ee3bb..48951d59 100644 --- a/src/main/java/li/cil/oc2/common/item/FlashMemoryWithExternalDataItem.java +++ b/src/main/java/li/cil/oc2/common/item/FlashMemoryWithExternalDataItem.java @@ -3,13 +3,13 @@ package li.cil.oc2.common.item; import li.cil.oc2.api.bus.device.data.Firmware; import li.cil.oc2.common.bus.device.data.Firmwares; import li.cil.oc2.common.util.ItemStackUtils; -import net.minecraft.world.item.ItemStack; -import net.minecraft.resources.ResourceLocation; import net.minecraft.ResourceLocationException; -import net.minecraft.util.StringUtil; import net.minecraft.Util; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.TextComponent; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.util.StringUtil; +import net.minecraft.world.item.ItemStack; import javax.annotation.Nullable; @@ -73,10 +73,10 @@ public final class FlashMemoryWithExternalDataItem extends ModItem { final Firmware firmware = getFirmware(stack); if (firmware != null) { return new TextComponent("") - .append(super.getName(stack)) - .append(" (") - .append(firmware.getDisplayName()) - .append(")"); + .append(super.getName(stack)) + .append(" (") + .append(firmware.getDisplayName()) + .append(")"); } else { return super.getName(stack); } diff --git a/src/main/java/li/cil/oc2/common/item/HardDriveItem.java b/src/main/java/li/cil/oc2/common/item/HardDriveItem.java index 6f8dbd17..f260c706 100644 --- a/src/main/java/li/cil/oc2/common/item/HardDriveItem.java +++ b/src/main/java/li/cil/oc2/common/item/HardDriveItem.java @@ -2,11 +2,11 @@ package li.cil.oc2.common.item; import li.cil.oc2.api.API; import li.cil.oc2.common.util.ColorUtils; +import net.minecraft.Util; +import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.DyeColor; import net.minecraft.world.item.DyeableLeatherItem; import net.minecraft.world.item.ItemStack; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.Util; import javax.annotation.Nullable; diff --git a/src/main/java/li/cil/oc2/common/item/HardDriveWithExternalDataItem.java b/src/main/java/li/cil/oc2/common/item/HardDriveWithExternalDataItem.java index 352f781a..449af1ed 100644 --- a/src/main/java/li/cil/oc2/common/item/HardDriveWithExternalDataItem.java +++ b/src/main/java/li/cil/oc2/common/item/HardDriveWithExternalDataItem.java @@ -2,11 +2,11 @@ package li.cil.oc2.common.item; import li.cil.oc2.api.API; import li.cil.oc2.common.util.ColorUtils; +import net.minecraft.Util; +import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.DyeColor; import net.minecraft.world.item.DyeableLeatherItem; import net.minecraft.world.item.ItemStack; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.Util; import javax.annotation.Nullable; diff --git a/src/main/java/li/cil/oc2/common/item/Items.java b/src/main/java/li/cil/oc2/common/item/Items.java index 19694172..3051e4db 100644 --- a/src/main/java/li/cil/oc2/common/item/Items.java +++ b/src/main/java/li/cil/oc2/common/item/Items.java @@ -39,28 +39,28 @@ public final class Items { public static final RegistryObject NETWORK_CABLE = register("network_cable", NetworkCableItem::new); public static final RegistryObject MEMORY_SMALL = register("memory_small", () -> - new MemoryItem(2 * Constants.MEGABYTE)); + new MemoryItem(2 * Constants.MEGABYTE)); public static final RegistryObject MEMORY_MEDIUM = register("memory_medium", () -> - new MemoryItem(4 * Constants.MEGABYTE)); + new MemoryItem(4 * Constants.MEGABYTE)); public static final RegistryObject MEMORY_LARGE = register("memory_large", () -> - new MemoryItem(8 * Constants.MEGABYTE)); + new MemoryItem(8 * Constants.MEGABYTE)); public static final RegistryObject HARD_DRIVE_SMALL = register("hard_drive_small", () -> - new HardDriveItem(2 * Constants.MEGABYTE, DyeColor.LIGHT_GRAY)); + new HardDriveItem(2 * Constants.MEGABYTE, DyeColor.LIGHT_GRAY)); public static final RegistryObject HARD_DRIVE_MEDIUM = register("hard_drive_medium", () -> - new HardDriveItem(4 * Constants.MEGABYTE, DyeColor.GREEN)); + new HardDriveItem(4 * Constants.MEGABYTE, DyeColor.GREEN)); public static final RegistryObject HARD_DRIVE_LARGE = register("hard_drive_large", () -> - new HardDriveItem(8 * Constants.MEGABYTE, DyeColor.CYAN)); + new HardDriveItem(8 * Constants.MEGABYTE, DyeColor.CYAN)); public static final RegistryObject HARD_DRIVE_CUSTOM = register("hard_drive_buildroot", () -> - new HardDriveWithExternalDataItem(BlockDeviceDataRegistration.BUILDROOT.getId(), DyeColor.BROWN)); + new HardDriveWithExternalDataItem(BlockDeviceDataRegistration.BUILDROOT.getId(), DyeColor.BROWN)); public static final RegistryObject FLASH_MEMORY = register("flash_memory", () -> - new FlashMemoryItem(4 * Constants.KILOBYTE)); + new FlashMemoryItem(4 * Constants.KILOBYTE)); public static final RegistryObject FLASH_MEMORY_CUSTOM = register("flash_memory_buildroot", () -> - new FlashMemoryWithExternalDataItem(Firmwares.BUILDROOT.getId())); + new FlashMemoryWithExternalDataItem(Firmwares.BUILDROOT.getId())); public static final RegistryObject FLOPPY = register("floppy", () -> - new FloppyItem(512 * Constants.KILOBYTE)); + new FloppyItem(512 * Constants.KILOBYTE)); public static final RegistryObject REDSTONE_INTERFACE_CARD = register("redstone_interface_card"); public static final RegistryObject NETWORK_INTERFACE_CARD = register("network_interface_card"); diff --git a/src/main/java/li/cil/oc2/common/item/MemoryItem.java b/src/main/java/li/cil/oc2/common/item/MemoryItem.java index 2eec87d6..045e847a 100644 --- a/src/main/java/li/cil/oc2/common/item/MemoryItem.java +++ b/src/main/java/li/cil/oc2/common/item/MemoryItem.java @@ -1,8 +1,8 @@ package li.cil.oc2.common.item; import li.cil.oc2.api.API; -import net.minecraft.resources.ResourceLocation; import net.minecraft.Util; +import net.minecraft.resources.ResourceLocation; import javax.annotation.Nullable; diff --git a/src/main/java/li/cil/oc2/common/item/ModItem.java b/src/main/java/li/cil/oc2/common/item/ModItem.java index aa998d0d..c3fc7ced 100644 --- a/src/main/java/li/cil/oc2/common/item/ModItem.java +++ b/src/main/java/li/cil/oc2/common/item/ModItem.java @@ -1,10 +1,10 @@ package li.cil.oc2.common.item; import li.cil.oc2.common.util.TooltipUtils; -import net.minecraft.world.item.TooltipFlag; +import net.minecraft.network.chat.Component; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; -import net.minecraft.network.chat.Component; +import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.level.Level; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; diff --git a/src/main/java/li/cil/oc2/common/item/NetworkCableItem.java b/src/main/java/li/cil/oc2/common/item/NetworkCableItem.java index ccf7ee40..808d4154 100644 --- a/src/main/java/li/cil/oc2/common/item/NetworkCableItem.java +++ b/src/main/java/li/cil/oc2/common/item/NetworkCableItem.java @@ -3,17 +3,17 @@ package li.cil.oc2.common.item; import li.cil.oc2.common.Constants; import li.cil.oc2.common.blockentity.NetworkConnectorBlockEntity; import li.cil.oc2.common.blockentity.NetworkConnectorBlockEntity.ConnectionResult; -import net.minecraft.world.entity.player.Player; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.context.UseOnContext; -import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.world.InteractionResultHolder; -import net.minecraft.world.InteractionResult; -import net.minecraft.world.InteractionHand; import net.minecraft.core.BlockPos; import net.minecraft.network.chat.TranslatableComponent; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.InteractionResult; +import net.minecraft.world.InteractionResultHolder; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.context.UseOnContext; import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.entity.BlockEntity; import java.util.Objects; import java.util.WeakHashMap; diff --git a/src/main/java/li/cil/oc2/common/item/RobotItem.java b/src/main/java/li/cil/oc2/common/item/RobotItem.java index c468994c..69d0aa63 100644 --- a/src/main/java/li/cil/oc2/common/item/RobotItem.java +++ b/src/main/java/li/cil/oc2/common/item/RobotItem.java @@ -8,9 +8,9 @@ import li.cil.oc2.common.energy.EnergyStorageItemStack; import li.cil.oc2.common.entity.Entities; import li.cil.oc2.common.entity.RobotEntity; import li.cil.oc2.common.entity.robot.RobotActions; +import li.cil.oc2.common.util.LevelUtils; import li.cil.oc2.common.util.NBTUtils; import li.cil.oc2.common.util.TooltipUtils; -import li.cil.oc2.common.util.LevelUtils; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer; import net.minecraft.core.BlockPos; diff --git a/src/main/java/li/cil/oc2/common/item/WrenchItem.java b/src/main/java/li/cil/oc2/common/item/WrenchItem.java index 161e396c..0be45908 100644 --- a/src/main/java/li/cil/oc2/common/item/WrenchItem.java +++ b/src/main/java/li/cil/oc2/common/item/WrenchItem.java @@ -1,18 +1,18 @@ package li.cil.oc2.common.item; import li.cil.oc2.common.tags.BlockTags; -import net.minecraft.world.level.block.state.BlockState; import net.minecraft.client.Minecraft; -import net.minecraft.world.entity.player.Player; +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.InteractionResult; +import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.context.UseOnContext; -import net.minecraft.world.InteractionResult; -import net.minecraft.core.Direction; -import net.minecraft.world.level.block.Rotation; -import net.minecraft.core.BlockPos; -import net.minecraft.world.level.LevelReader; import net.minecraft.world.level.Level; +import net.minecraft.world.level.LevelReader; +import net.minecraft.world.level.block.Rotation; +import net.minecraft.world.level.block.state.BlockState; import java.util.Objects; diff --git a/src/main/java/li/cil/oc2/common/network/MessageUtils.java b/src/main/java/li/cil/oc2/common/network/MessageUtils.java index 2a7466a3..bc74f6b5 100644 --- a/src/main/java/li/cil/oc2/common/network/MessageUtils.java +++ b/src/main/java/li/cil/oc2/common/network/MessageUtils.java @@ -3,11 +3,11 @@ package li.cil.oc2.common.network; import li.cil.oc2.common.util.LevelUtils; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.ClientLevel; -import net.minecraft.world.entity.Entity; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerLevel; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraftforge.network.NetworkEvent; import java.util.function.Consumer; diff --git a/src/main/java/li/cil/oc2/common/network/Network.java b/src/main/java/li/cil/oc2/common/network/Network.java index bbf04899..a7dc6fac 100644 --- a/src/main/java/li/cil/oc2/common/network/Network.java +++ b/src/main/java/li/cil/oc2/common/network/Network.java @@ -2,11 +2,11 @@ package li.cil.oc2.common.network; import li.cil.oc2.api.API; import li.cil.oc2.common.network.message.*; -import net.minecraft.world.entity.Entity; import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.entity.Entity; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.chunk.LevelChunk; import net.minecraftforge.network.NetworkDirection; import net.minecraftforge.network.NetworkRegistry; diff --git a/src/main/java/li/cil/oc2/common/network/message/AbstractTerminalBlockMessage.java b/src/main/java/li/cil/oc2/common/network/message/AbstractTerminalBlockMessage.java index ff401368..25f98f36 100644 --- a/src/main/java/li/cil/oc2/common/network/message/AbstractTerminalBlockMessage.java +++ b/src/main/java/li/cil/oc2/common/network/message/AbstractTerminalBlockMessage.java @@ -1,8 +1,8 @@ package li.cil.oc2.common.network.message; import li.cil.oc2.common.blockentity.ComputerBlockEntity; -import net.minecraft.network.FriendlyByteBuf; import net.minecraft.core.BlockPos; +import net.minecraft.network.FriendlyByteBuf; import java.nio.ByteBuffer; diff --git a/src/main/java/li/cil/oc2/common/network/message/AbstractTerminalEntityMessage.java b/src/main/java/li/cil/oc2/common/network/message/AbstractTerminalEntityMessage.java index 5a9c4dcf..7abada2e 100644 --- a/src/main/java/li/cil/oc2/common/network/message/AbstractTerminalEntityMessage.java +++ b/src/main/java/li/cil/oc2/common/network/message/AbstractTerminalEntityMessage.java @@ -1,7 +1,7 @@ package li.cil.oc2.common.network.message; -import net.minecraft.world.entity.Entity; import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.world.entity.Entity; import java.nio.ByteBuffer; diff --git a/src/main/java/li/cil/oc2/common/network/message/BusCableFacadeMessage.java b/src/main/java/li/cil/oc2/common/network/message/BusCableFacadeMessage.java index 31ab8d39..baef4608 100644 --- a/src/main/java/li/cil/oc2/common/network/message/BusCableFacadeMessage.java +++ b/src/main/java/li/cil/oc2/common/network/message/BusCableFacadeMessage.java @@ -1,7 +1,7 @@ package li.cil.oc2.common.network.message; -import li.cil.oc2.common.network.MessageUtils; import li.cil.oc2.common.blockentity.BusCableBlockEntity; +import li.cil.oc2.common.network.MessageUtils; import net.minecraft.core.BlockPos; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/li/cil/oc2/common/network/message/BusInterfaceNameMessage.java b/src/main/java/li/cil/oc2/common/network/message/BusInterfaceNameMessage.java index 40390c0e..b52d1cb6 100644 --- a/src/main/java/li/cil/oc2/common/network/message/BusInterfaceNameMessage.java +++ b/src/main/java/li/cil/oc2/common/network/message/BusInterfaceNameMessage.java @@ -1,10 +1,10 @@ package li.cil.oc2.common.network.message; -import li.cil.oc2.common.network.MessageUtils; import li.cil.oc2.common.blockentity.BusCableBlockEntity; -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.core.Direction; +import li.cil.oc2.common.network.MessageUtils; import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.network.FriendlyByteBuf; import net.minecraftforge.network.NetworkEvent; public abstract class BusInterfaceNameMessage extends AbstractMessage { diff --git a/src/main/java/li/cil/oc2/common/network/message/ComputerBootErrorMessage.java b/src/main/java/li/cil/oc2/common/network/message/ComputerBootErrorMessage.java index ecf32e44..5c75a86b 100644 --- a/src/main/java/li/cil/oc2/common/network/message/ComputerBootErrorMessage.java +++ b/src/main/java/li/cil/oc2/common/network/message/ComputerBootErrorMessage.java @@ -1,9 +1,9 @@ package li.cil.oc2.common.network.message; -import li.cil.oc2.common.network.MessageUtils; import li.cil.oc2.common.blockentity.ComputerBlockEntity; -import net.minecraft.network.FriendlyByteBuf; +import li.cil.oc2.common.network.MessageUtils; import net.minecraft.core.BlockPos; +import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.chat.Component; import net.minecraftforge.network.NetworkEvent; diff --git a/src/main/java/li/cil/oc2/common/network/message/ComputerBusStateMessage.java b/src/main/java/li/cil/oc2/common/network/message/ComputerBusStateMessage.java index 85df0ff7..172e99e4 100644 --- a/src/main/java/li/cil/oc2/common/network/message/ComputerBusStateMessage.java +++ b/src/main/java/li/cil/oc2/common/network/message/ComputerBusStateMessage.java @@ -1,10 +1,10 @@ package li.cil.oc2.common.network.message; +import li.cil.oc2.common.blockentity.ComputerBlockEntity; import li.cil.oc2.common.bus.CommonDeviceBusController; import li.cil.oc2.common.network.MessageUtils; -import li.cil.oc2.common.blockentity.ComputerBlockEntity; -import net.minecraft.network.FriendlyByteBuf; import net.minecraft.core.BlockPos; +import net.minecraft.network.FriendlyByteBuf; import net.minecraftforge.network.NetworkEvent; public final class ComputerBusStateMessage extends AbstractMessage { diff --git a/src/main/java/li/cil/oc2/common/network/message/ComputerPowerMessage.java b/src/main/java/li/cil/oc2/common/network/message/ComputerPowerMessage.java index 46ec6428..989a8c41 100644 --- a/src/main/java/li/cil/oc2/common/network/message/ComputerPowerMessage.java +++ b/src/main/java/li/cil/oc2/common/network/message/ComputerPowerMessage.java @@ -1,9 +1,9 @@ package li.cil.oc2.common.network.message; -import li.cil.oc2.common.network.MessageUtils; import li.cil.oc2.common.blockentity.ComputerBlockEntity; -import net.minecraft.network.FriendlyByteBuf; +import li.cil.oc2.common.network.MessageUtils; import net.minecraft.core.BlockPos; +import net.minecraft.network.FriendlyByteBuf; import net.minecraftforge.network.NetworkEvent; public final class ComputerPowerMessage extends AbstractMessage { @@ -40,12 +40,12 @@ public final class ComputerPowerMessage extends AbstractMessage { @Override protected void handleMessage(final NetworkEvent.Context context) { MessageUtils.withNearbyServerBlockEntityAt(context, pos, ComputerBlockEntity.class, - (computer) -> { - if (power) { - computer.start(); - } else { - computer.stop(); - } - }); + (computer) -> { + if (power) { + computer.start(); + } else { + computer.stop(); + } + }); } } diff --git a/src/main/java/li/cil/oc2/common/network/message/ComputerRunStateMessage.java b/src/main/java/li/cil/oc2/common/network/message/ComputerRunStateMessage.java index e46f619d..ca40d956 100644 --- a/src/main/java/li/cil/oc2/common/network/message/ComputerRunStateMessage.java +++ b/src/main/java/li/cil/oc2/common/network/message/ComputerRunStateMessage.java @@ -1,10 +1,10 @@ package li.cil.oc2.common.network.message; -import li.cil.oc2.common.network.MessageUtils; import li.cil.oc2.common.blockentity.ComputerBlockEntity; +import li.cil.oc2.common.network.MessageUtils; import li.cil.oc2.common.vm.VMRunState; -import net.minecraft.network.FriendlyByteBuf; import net.minecraft.core.BlockPos; +import net.minecraft.network.FriendlyByteBuf; import net.minecraftforge.network.NetworkEvent; public final class ComputerRunStateMessage extends AbstractMessage { diff --git a/src/main/java/li/cil/oc2/common/network/message/ComputerTerminalInputMessage.java b/src/main/java/li/cil/oc2/common/network/message/ComputerTerminalInputMessage.java index 8d613a7a..df138a40 100644 --- a/src/main/java/li/cil/oc2/common/network/message/ComputerTerminalInputMessage.java +++ b/src/main/java/li/cil/oc2/common/network/message/ComputerTerminalInputMessage.java @@ -1,7 +1,7 @@ package li.cil.oc2.common.network.message; -import li.cil.oc2.common.network.MessageUtils; import li.cil.oc2.common.blockentity.ComputerBlockEntity; +import li.cil.oc2.common.network.MessageUtils; import net.minecraft.network.FriendlyByteBuf; import net.minecraftforge.network.NetworkEvent; diff --git a/src/main/java/li/cil/oc2/common/network/message/ComputerTerminalOutputMessage.java b/src/main/java/li/cil/oc2/common/network/message/ComputerTerminalOutputMessage.java index e4088c58..ae0eac4b 100644 --- a/src/main/java/li/cil/oc2/common/network/message/ComputerTerminalOutputMessage.java +++ b/src/main/java/li/cil/oc2/common/network/message/ComputerTerminalOutputMessage.java @@ -1,7 +1,7 @@ package li.cil.oc2.common.network.message; -import li.cil.oc2.common.network.MessageUtils; import li.cil.oc2.common.blockentity.ComputerBlockEntity; +import li.cil.oc2.common.network.MessageUtils; import net.minecraft.network.FriendlyByteBuf; import net.minecraftforge.network.NetworkEvent; @@ -21,6 +21,6 @@ public final class ComputerTerminalOutputMessage extends AbstractTerminalBlockMe @Override protected void handleMessage(final NetworkEvent.Context context) { MessageUtils.withClientBlockEntityAt(pos, ComputerBlockEntity.class, - computer -> computer.getTerminal().putOutput(ByteBuffer.wrap(data))); + computer -> computer.getTerminal().putOutput(ByteBuffer.wrap(data))); } } diff --git a/src/main/java/li/cil/oc2/common/network/message/DiskDriveFloppyMessage.java b/src/main/java/li/cil/oc2/common/network/message/DiskDriveFloppyMessage.java index 41f290ed..1b9ba3da 100644 --- a/src/main/java/li/cil/oc2/common/network/message/DiskDriveFloppyMessage.java +++ b/src/main/java/li/cil/oc2/common/network/message/DiskDriveFloppyMessage.java @@ -1,11 +1,11 @@ package li.cil.oc2.common.network.message; -import li.cil.oc2.common.network.MessageUtils; import li.cil.oc2.common.blockentity.DiskDriveBlockEntity; -import net.minecraft.world.item.ItemStack; +import li.cil.oc2.common.network.MessageUtils; +import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.core.BlockPos; +import net.minecraft.world.item.ItemStack; import net.minecraftforge.network.NetworkEvent; public final class DiskDriveFloppyMessage extends AbstractMessage { @@ -42,6 +42,6 @@ public final class DiskDriveFloppyMessage extends AbstractMessage { @Override protected void handleMessage(final NetworkEvent.Context context) { MessageUtils.withClientBlockEntityAt(pos, DiskDriveBlockEntity.class, - (diskDrive) -> diskDrive.setFloppyClient(ItemStack.of(data))); + (diskDrive) -> diskDrive.setFloppyClient(ItemStack.of(data))); } } diff --git a/src/main/java/li/cil/oc2/common/network/message/NetworkConnectorConnectionsMessage.java b/src/main/java/li/cil/oc2/common/network/message/NetworkConnectorConnectionsMessage.java index ef9f1ea1..d9b83b88 100644 --- a/src/main/java/li/cil/oc2/common/network/message/NetworkConnectorConnectionsMessage.java +++ b/src/main/java/li/cil/oc2/common/network/message/NetworkConnectorConnectionsMessage.java @@ -1,9 +1,9 @@ package li.cil.oc2.common.network.message; -import li.cil.oc2.common.network.MessageUtils; import li.cil.oc2.common.blockentity.NetworkConnectorBlockEntity; -import net.minecraft.network.FriendlyByteBuf; +import li.cil.oc2.common.network.MessageUtils; import net.minecraft.core.BlockPos; +import net.minecraft.network.FriendlyByteBuf; import net.minecraftforge.network.NetworkEvent; import java.util.ArrayList; diff --git a/src/main/java/li/cil/oc2/common/network/message/OpenComputerInventoryMessage.java b/src/main/java/li/cil/oc2/common/network/message/OpenComputerInventoryMessage.java index e1371509..7eaccb53 100644 --- a/src/main/java/li/cil/oc2/common/network/message/OpenComputerInventoryMessage.java +++ b/src/main/java/li/cil/oc2/common/network/message/OpenComputerInventoryMessage.java @@ -1,9 +1,9 @@ package li.cil.oc2.common.network.message; -import li.cil.oc2.common.network.MessageUtils; import li.cil.oc2.common.blockentity.ComputerBlockEntity; -import net.minecraft.network.FriendlyByteBuf; +import li.cil.oc2.common.network.MessageUtils; import net.minecraft.core.BlockPos; +import net.minecraft.network.FriendlyByteBuf; import net.minecraft.server.level.ServerPlayer; import net.minecraftforge.network.NetworkEvent; diff --git a/src/main/java/li/cil/oc2/common/network/message/OpenComputerTerminalMessage.java b/src/main/java/li/cil/oc2/common/network/message/OpenComputerTerminalMessage.java index 4fbe1384..023ee8cc 100644 --- a/src/main/java/li/cil/oc2/common/network/message/OpenComputerTerminalMessage.java +++ b/src/main/java/li/cil/oc2/common/network/message/OpenComputerTerminalMessage.java @@ -1,9 +1,9 @@ package li.cil.oc2.common.network.message; -import li.cil.oc2.common.network.MessageUtils; import li.cil.oc2.common.blockentity.ComputerBlockEntity; -import net.minecraft.network.FriendlyByteBuf; +import li.cil.oc2.common.network.MessageUtils; import net.minecraft.core.BlockPos; +import net.minecraft.network.FriendlyByteBuf; import net.minecraft.server.level.ServerPlayer; import net.minecraftforge.network.NetworkEvent; diff --git a/src/main/java/li/cil/oc2/common/network/message/RequestImportedFileMessage.java b/src/main/java/li/cil/oc2/common/network/message/RequestImportedFileMessage.java index 451883c1..84dadbe8 100644 --- a/src/main/java/li/cil/oc2/common/network/message/RequestImportedFileMessage.java +++ b/src/main/java/li/cil/oc2/common/network/message/RequestImportedFileMessage.java @@ -4,7 +4,6 @@ import li.cil.oc2.client.gui.FileChooserScreen; import li.cil.oc2.common.bus.device.item.FileImportExportCardItemDevice; import li.cil.oc2.common.network.Network; import net.minecraft.client.Minecraft; -import net.minecraft.client.player.LocalPlayer; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.chat.TextColor; import net.minecraft.network.chat.TranslatableComponent; diff --git a/src/main/java/li/cil/oc2/common/network/message/RobotBootErrorMessage.java b/src/main/java/li/cil/oc2/common/network/message/RobotBootErrorMessage.java index 8ec743c4..4168ac5f 100644 --- a/src/main/java/li/cil/oc2/common/network/message/RobotBootErrorMessage.java +++ b/src/main/java/li/cil/oc2/common/network/message/RobotBootErrorMessage.java @@ -40,6 +40,6 @@ public final class RobotBootErrorMessage extends AbstractMessage { @Override protected void handleMessage(final NetworkEvent.Context context) { MessageUtils.withClientEntity(entityId, RobotEntity.class, - (robot) -> robot.getVirtualMachine().setBootErrorClient(value)); + (robot) -> robot.getVirtualMachine().setBootErrorClient(value)); } } diff --git a/src/main/java/li/cil/oc2/common/network/message/RobotBusStateMessage.java b/src/main/java/li/cil/oc2/common/network/message/RobotBusStateMessage.java index d8656e54..23ca7cb1 100644 --- a/src/main/java/li/cil/oc2/common/network/message/RobotBusStateMessage.java +++ b/src/main/java/li/cil/oc2/common/network/message/RobotBusStateMessage.java @@ -40,6 +40,6 @@ public final class RobotBusStateMessage extends AbstractMessage { @Override protected void handleMessage(final NetworkEvent.Context context) { MessageUtils.withClientEntity(entityId, RobotEntity.class, - (robot) -> robot.getVirtualMachine().setBusStateClient(value)); + (robot) -> robot.getVirtualMachine().setBusStateClient(value)); } } diff --git a/src/main/java/li/cil/oc2/common/network/message/RobotInitializationMessage.java b/src/main/java/li/cil/oc2/common/network/message/RobotInitializationMessage.java index d9f96d1a..d1433e9e 100644 --- a/src/main/java/li/cil/oc2/common/network/message/RobotInitializationMessage.java +++ b/src/main/java/li/cil/oc2/common/network/message/RobotInitializationMessage.java @@ -56,11 +56,11 @@ public final class RobotInitializationMessage extends AbstractMessage { @Override protected void handleMessage(final NetworkEvent.Context context) { MessageUtils.withClientEntity(entityId, RobotEntity.class, - (robot) -> { - robot.getVirtualMachine().setBusStateClient(busState); - robot.getVirtualMachine().setRunStateClient(runState); - robot.getVirtualMachine().setBootErrorClient(bootError); - NBTSerialization.deserialize(terminal, robot.getTerminal()); - }); + (robot) -> { + robot.getVirtualMachine().setBusStateClient(busState); + robot.getVirtualMachine().setRunStateClient(runState); + robot.getVirtualMachine().setBootErrorClient(bootError); + NBTSerialization.deserialize(terminal, robot.getTerminal()); + }); } } diff --git a/src/main/java/li/cil/oc2/common/network/message/RobotInitializationRequestMessage.java b/src/main/java/li/cil/oc2/common/network/message/RobotInitializationRequestMessage.java index 56009385..b32d34f1 100644 --- a/src/main/java/li/cil/oc2/common/network/message/RobotInitializationRequestMessage.java +++ b/src/main/java/li/cil/oc2/common/network/message/RobotInitializationRequestMessage.java @@ -36,6 +36,6 @@ public final class RobotInitializationRequestMessage extends AbstractMessage { @Override protected void handleMessage(final NetworkEvent.Context context) { MessageUtils.withServerEntity(context, entityId, RobotEntity.class, - (robot) -> Network.INSTANCE.reply(new RobotInitializationMessage(robot), context)); + (robot) -> Network.INSTANCE.reply(new RobotInitializationMessage(robot), context)); } } diff --git a/src/main/java/li/cil/oc2/common/network/message/RobotPowerMessage.java b/src/main/java/li/cil/oc2/common/network/message/RobotPowerMessage.java index 96adb9b5..05af00af 100644 --- a/src/main/java/li/cil/oc2/common/network/message/RobotPowerMessage.java +++ b/src/main/java/li/cil/oc2/common/network/message/RobotPowerMessage.java @@ -39,12 +39,12 @@ public final class RobotPowerMessage extends AbstractMessage { @Override protected void handleMessage(final NetworkEvent.Context context) { MessageUtils.withNearbyServerEntity(context, entityId, RobotEntity.class, - (robot) -> { - if (power) { - robot.start(); - } else { - robot.stop(); - } - }); + (robot) -> { + if (power) { + robot.start(); + } else { + robot.stop(); + } + }); } } diff --git a/src/main/java/li/cil/oc2/common/network/message/RobotRunStateMessage.java b/src/main/java/li/cil/oc2/common/network/message/RobotRunStateMessage.java index d2b5dd38..9456f114 100644 --- a/src/main/java/li/cil/oc2/common/network/message/RobotRunStateMessage.java +++ b/src/main/java/li/cil/oc2/common/network/message/RobotRunStateMessage.java @@ -40,6 +40,6 @@ public final class RobotRunStateMessage extends AbstractMessage { @Override protected void handleMessage(final NetworkEvent.Context context) { MessageUtils.withClientEntity(entityId, RobotEntity.class, - (robot) -> robot.getVirtualMachine().setRunStateClient(value)); + (robot) -> robot.getVirtualMachine().setRunStateClient(value)); } } diff --git a/src/main/java/li/cil/oc2/common/network/message/RobotTerminalOutputMessage.java b/src/main/java/li/cil/oc2/common/network/message/RobotTerminalOutputMessage.java index 7ae74588..1f093a6f 100644 --- a/src/main/java/li/cil/oc2/common/network/message/RobotTerminalOutputMessage.java +++ b/src/main/java/li/cil/oc2/common/network/message/RobotTerminalOutputMessage.java @@ -21,6 +21,6 @@ public final class RobotTerminalOutputMessage extends AbstractTerminalEntityMess @Override protected void handleMessage(final NetworkEvent.Context context) { MessageUtils.withClientEntity(entityId, RobotEntity.class, - robot -> robot.getTerminal().putOutput(ByteBuffer.wrap(data))); + robot -> robot.getTerminal().putOutput(ByteBuffer.wrap(data))); } } diff --git a/src/main/java/li/cil/oc2/common/tags/BlockTags.java b/src/main/java/li/cil/oc2/common/tags/BlockTags.java index 8414994f..523fe212 100644 --- a/src/main/java/li/cil/oc2/common/tags/BlockTags.java +++ b/src/main/java/li/cil/oc2/common/tags/BlockTags.java @@ -1,8 +1,8 @@ package li.cil.oc2.common.tags; import li.cil.oc2.api.API; -import net.minecraft.world.level.block.Block; import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.level.block.Block; import net.minecraftforge.common.Tags; public final class BlockTags { diff --git a/src/main/java/li/cil/oc2/common/util/FakePlayerUtils.java b/src/main/java/li/cil/oc2/common/util/FakePlayerUtils.java index b9e548f2..5139c7d7 100644 --- a/src/main/java/li/cil/oc2/common/util/FakePlayerUtils.java +++ b/src/main/java/li/cil/oc2/common/util/FakePlayerUtils.java @@ -5,13 +5,13 @@ import io.netty.util.concurrent.Future; import io.netty.util.concurrent.GenericFutureListener; import li.cil.oc2.api.API; import li.cil.oc2.common.Config; -import net.minecraft.world.entity.Entity; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.network.protocol.Packet; import net.minecraft.network.Connection; +import net.minecraft.network.protocol.Packet; import net.minecraft.network.protocol.PacketFlow; -import net.minecraft.server.network.ServerGamePacketListenerImpl; import net.minecraft.server.level.ServerLevel; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.server.network.ServerGamePacketListenerImpl; +import net.minecraft.world.entity.Entity; import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.common.util.FakePlayerFactory; @@ -26,7 +26,7 @@ public final class FakePlayerUtils { final ServerPlayer player = getFakePlayer(level); player.copyPosition(entity); player.xRotO = player.getXRot(); - player.yRotO = player.getYRot(); + player.yRotO = player.getYRot(); player.yHeadRot = player.getYRot(); player.yHeadRotO = player.getYRot(); return player; diff --git a/src/main/java/li/cil/oc2/common/util/HorizontalBlockUtils.java b/src/main/java/li/cil/oc2/common/util/HorizontalBlockUtils.java index 913d90fd..ae717fff 100644 --- a/src/main/java/li/cil/oc2/common/util/HorizontalBlockUtils.java +++ b/src/main/java/li/cil/oc2/common/util/HorizontalBlockUtils.java @@ -1,9 +1,9 @@ package li.cil.oc2.common.util; import li.cil.oc2.api.util.Side; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.block.HorizontalDirectionalBlock; import net.minecraft.core.Direction; +import net.minecraft.world.level.block.HorizontalDirectionalBlock; +import net.minecraft.world.level.block.state.BlockState; import javax.annotation.Nullable; diff --git a/src/main/java/li/cil/oc2/common/util/ItemDeviceUtils.java b/src/main/java/li/cil/oc2/common/util/ItemDeviceUtils.java index 485123b5..3b41e103 100644 --- a/src/main/java/li/cil/oc2/common/util/ItemDeviceUtils.java +++ b/src/main/java/li/cil/oc2/common/util/ItemDeviceUtils.java @@ -1,8 +1,8 @@ package li.cil.oc2.common.util; -import net.minecraft.world.item.ItemStack; import net.minecraft.nbt.CompoundTag; import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.item.ItemStack; import net.minecraftforge.registries.IForgeRegistryEntry; import javax.annotation.Nullable; diff --git a/src/main/java/li/cil/oc2/common/util/ItemStackUtils.java b/src/main/java/li/cil/oc2/common/util/ItemStackUtils.java index 987cd216..eb2b654d 100644 --- a/src/main/java/li/cil/oc2/common/util/ItemStackUtils.java +++ b/src/main/java/li/cil/oc2/common/util/ItemStackUtils.java @@ -1,14 +1,14 @@ package li.cil.oc2.common.util; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.nbt.CompoundTag; import net.minecraft.world.entity.item.ItemEntity; import net.minecraft.world.item.ItemStack; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.core.Direction; -import net.minecraft.core.BlockPos; -import net.minecraft.world.phys.Vec3; import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.phys.Vec3; import javax.annotation.Nullable; import java.util.Optional; @@ -93,9 +93,9 @@ public final class ItemStackUtils { final ItemEntity entity = new ItemEntity(level, px, py, pz, stack); entity.setDeltaMovement( - 0.0125 * (rng.nextDouble() - 0.5) + ox * 0.03, - 0.0125 * (rng.nextDouble() - 0.5) + oy * 0.08 + (ox + oz) * 0.03, - 0.0125 * (rng.nextDouble() - 0.5) + oz * 0.03 + 0.0125 * (rng.nextDouble() - 0.5) + ox * 0.03, + 0.0125 * (rng.nextDouble() - 0.5) + oy * 0.08 + (ox + oz) * 0.03, + 0.0125 * (rng.nextDouble() - 0.5) + oz * 0.03 ); entity.setDefaultPickUpDelay(); diff --git a/src/main/java/li/cil/oc2/common/util/LevelUtils.java b/src/main/java/li/cil/oc2/common/util/LevelUtils.java index 95ecfa40..93d4fc0e 100644 --- a/src/main/java/li/cil/oc2/common/util/LevelUtils.java +++ b/src/main/java/li/cil/oc2/common/util/LevelUtils.java @@ -1,14 +1,14 @@ package li.cil.oc2.common.util; +import net.minecraft.core.BlockPos; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.sounds.SoundEvent; +import net.minecraft.sounds.SoundSource; +import net.minecraft.world.level.ChunkPos; +import net.minecraft.world.level.LevelAccessor; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.SoundType; import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.sounds.SoundSource; -import net.minecraft.sounds.SoundEvent; -import net.minecraft.core.BlockPos; -import net.minecraft.world.level.ChunkPos; -import net.minecraft.world.level.LevelAccessor; import javax.annotation.Nullable; import java.util.function.Function; diff --git a/src/main/java/li/cil/oc2/common/util/NBTUtils.java b/src/main/java/li/cil/oc2/common/util/NBTUtils.java index 7519a1a4..1be048e4 100644 --- a/src/main/java/li/cil/oc2/common/util/NBTUtils.java +++ b/src/main/java/li/cil/oc2/common/util/NBTUtils.java @@ -1,8 +1,8 @@ package li.cil.oc2.common.util; -import net.minecraft.world.item.ItemStack; -import net.minecraft.nbt.CompoundTag; import net.minecraft.core.NonNullList; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.world.item.ItemStack; import net.minecraftforge.items.ItemStackHandler; import javax.annotation.Nullable; diff --git a/src/main/java/li/cil/oc2/common/util/TerminalUtils.java b/src/main/java/li/cil/oc2/common/util/TerminalUtils.java index 044cdb1a..3d3f2edd 100644 --- a/src/main/java/li/cil/oc2/common/util/TerminalUtils.java +++ b/src/main/java/li/cil/oc2/common/util/TerminalUtils.java @@ -7,12 +7,12 @@ import java.util.function.Consumer; public final class TerminalUtils { private static final ByteBuffer TERMINAL_RESET_SEQUENCE = ByteBuffer.wrap(new byte[]{ - // Make sure we're in normal mode. - 'J', - // Reset color and style. - '\033', '[', '0', 'm', - // Clear screen. - '\033', '[', '2', 'J' + // Make sure we're in normal mode. + 'J', + // Reset color and style. + '\033', '[', '0', 'm', + // Clear screen. + '\033', '[', '2', 'J' }); /////////////////////////////////////////////////////////////////// diff --git a/src/main/java/li/cil/oc2/common/util/ThrottledSoundEmitter.java b/src/main/java/li/cil/oc2/common/util/ThrottledSoundEmitter.java index 8164c079..0b15cb21 100644 --- a/src/main/java/li/cil/oc2/common/util/ThrottledSoundEmitter.java +++ b/src/main/java/li/cil/oc2/common/util/ThrottledSoundEmitter.java @@ -1,7 +1,7 @@ package li.cil.oc2.common.util; -import net.minecraft.sounds.SoundSource; import net.minecraft.sounds.SoundEvent; +import net.minecraft.sounds.SoundSource; import net.minecraft.util.Mth; import net.minecraft.world.level.LevelAccessor; diff --git a/src/main/java/li/cil/oc2/common/util/VoxelShapeUtils.java b/src/main/java/li/cil/oc2/common/util/VoxelShapeUtils.java index 0b437ef9..b0197c99 100644 --- a/src/main/java/li/cil/oc2/common/util/VoxelShapeUtils.java +++ b/src/main/java/li/cil/oc2/common/util/VoxelShapeUtils.java @@ -1,7 +1,7 @@ package li.cil.oc2.common.util; -import net.minecraft.world.phys.shapes.VoxelShape; import net.minecraft.world.phys.shapes.Shapes; +import net.minecraft.world.phys.shapes.VoxelShape; public final class VoxelShapeUtils { private static final ThreadLocal TEMP_SHAPE = new ThreadLocal<>(); diff --git a/src/main/java/li/cil/oc2/common/vm/Allocator.java b/src/main/java/li/cil/oc2/common/vm/Allocator.java index a024b39a..636c8cf3 100644 --- a/src/main/java/li/cil/oc2/common/vm/Allocator.java +++ b/src/main/java/li/cil/oc2/common/vm/Allocator.java @@ -77,7 +77,7 @@ public final class Allocator { for (final Allocation allocation : ALLOCATIONS.values()) { // Skip first three: Allocator::claimMemory, Allocation::new, Throwable::getStacktrace LOGGER.error(Arrays.stream(allocation.stacktrace).skip(3).map(StackTraceElement::toString) - .collect(Collectors.joining("\n ", "Leaked memory allocation:\n ", ""))); + .collect(Collectors.joining("\n ", "Leaked memory allocation:\n ", ""))); } } diff --git a/src/main/java/li/cil/oc2/common/vm/context/global/GlobalVMContext.java b/src/main/java/li/cil/oc2/common/vm/context/global/GlobalVMContext.java index ba09d00b..73bee47b 100644 --- a/src/main/java/li/cil/oc2/common/vm/context/global/GlobalVMContext.java +++ b/src/main/java/li/cil/oc2/common/vm/context/global/GlobalVMContext.java @@ -28,10 +28,12 @@ public final class GlobalVMContext implements VMContext, VMContextManagerCollect // or memory ranges previously used by other devices. Only claiming interrupts and // memory ranges explicitly will allow grabbing reserved ones. - @Serialized @SuppressWarnings("FieldMayBeFinal") + @Serialized + @SuppressWarnings("FieldMayBeFinal") private BitSet reservedInterrupts = new BitSet(); - @Serialized @SuppressWarnings("FieldMayBeFinal") + @Serialized + @SuppressWarnings("FieldMayBeFinal") private MemoryRangeList reservedMemoryRanges = new MemoryRangeList(); /////////////////////////////////////////////////////////////////// diff --git a/src/main/java/li/cil/oc2/data/DataGenerators.java b/src/main/java/li/cil/oc2/data/DataGenerators.java index e35ec3a8..58ce7f7d 100644 --- a/src/main/java/li/cil/oc2/data/DataGenerators.java +++ b/src/main/java/li/cil/oc2/data/DataGenerators.java @@ -1,7 +1,7 @@ package li.cil.oc2.data; -import net.minecraft.data.tags.BlockTagsProvider; import net.minecraft.data.DataGenerator; +import net.minecraft.data.tags.BlockTagsProvider; import net.minecraftforge.common.data.ExistingFileHelper; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; diff --git a/src/main/java/li/cil/oc2/data/ModBlockStateProvider.java b/src/main/java/li/cil/oc2/data/ModBlockStateProvider.java index 128a2dd8..fbf33c02 100644 --- a/src/main/java/li/cil/oc2/data/ModBlockStateProvider.java +++ b/src/main/java/li/cil/oc2/data/ModBlockStateProvider.java @@ -4,11 +4,11 @@ import li.cil.oc2.api.API; import li.cil.oc2.common.block.Blocks; import li.cil.oc2.common.block.BusCableBlock; import li.cil.oc2.common.item.Items; -import net.minecraft.world.level.block.Block; -import net.minecraft.data.DataGenerator; -import net.minecraft.world.item.Item; import net.minecraft.core.Direction; +import net.minecraft.data.DataGenerator; import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.item.Item; +import net.minecraft.world.level.block.Block; import net.minecraftforge.client.model.generators.*; import net.minecraftforge.common.data.ExistingFileHelper; import net.minecraftforge.registries.RegistryObject; @@ -34,18 +34,18 @@ public final class ModBlockStateProvider extends BlockStateProvider { horizontalBlock(Blocks.COMPUTER, Items.COMPUTER, COMPUTER_MODEL); horizontalBlock(Blocks.REDSTONE_INTERFACE, Items.REDSTONE_INTERFACE, REDSTONE_INTERFACE_MODEL); horizontalFaceBlock(Blocks.NETWORK_CONNECTOR, Items.NETWORK_CONNECTOR, NETWORK_CONNECTOR_MODEL) - .transforms() - .transform(ModelBuilder.Perspective.GUI) - .rotation(30, 315, 0) - .translation(0, 2, 0) - .scale(0.75f, 0.75f, 0.75f) - .end() - .transform(ModelBuilder.Perspective.FIXED) - .rotation(270, 0, 0) - .translation(0, 0, -5) - .scale(1, 1, 1) - .end() - .end(); + .transforms() + .transform(ModelBuilder.Perspective.GUI) + .rotation(30, 315, 0) + .translation(0, 2, 0) + .scale(0.75f, 0.75f, 0.75f) + .end() + .transform(ModelBuilder.Perspective.FIXED) + .rotation(270, 0, 0) + .translation(0, 0, -5) + .scale(1, 1, 1) + .end() + .end(); horizontalBlock(Blocks.NETWORK_HUB, Items.NETWORK_HUB, NETWORK_HUB_MODEL); horizontalBlock(Blocks.DISK_DRIVE, Items.DISK_DRIVE, DISK_DRIVE_MODEL); horizontalBlock(Blocks.CHARGER, Items.CHARGER, CHARGER_MODEL); @@ -66,9 +66,9 @@ public final class ModBlockStateProvider extends BlockStateProvider { // insert supports where appropriate, as well as for replacing it with a facade block model. builder.part() - .modelFile(baseModel) - .addModel() - .end(); + .modelFile(baseModel) + .addModel() + .end(); BusCableBlock.FACING_TO_CONNECTION_MAP.forEach((direction, connectionType) -> { final int rotationY = (int) direction.toYRot(); @@ -82,85 +82,85 @@ public final class ModBlockStateProvider extends BlockStateProvider { } builder.part() - .modelFile(linkModel) - .rotationY(rotationY) - .rotationX(rotationX) - .addModel() - .condition(connectionType, BusCableBlock.ConnectionType.CABLE) - .condition(BusCableBlock.HAS_FACADE, false) - .end(); + .modelFile(linkModel) + .rotationY(rotationY) + .rotationX(rotationX) + .addModel() + .condition(connectionType, BusCableBlock.ConnectionType.CABLE) + .condition(BusCableBlock.HAS_FACADE, false) + .end(); builder.part() - .modelFile(plugModel) - .rotationY(rotationY) - .rotationX(rotationX) - .addModel() - .condition(connectionType, BusCableBlock.ConnectionType.INTERFACE) - .condition(BusCableBlock.HAS_FACADE, false) - .end(); + .modelFile(plugModel) + .rotationY(rotationY) + .rotationX(rotationX) + .addModel() + .condition(connectionType, BusCableBlock.ConnectionType.INTERFACE) + .condition(BusCableBlock.HAS_FACADE, false) + .end(); }); itemModels().getBuilder(Items.BUS_CABLE.getId().getPath()) - .parent(straightModel) - .transforms() - .transform(ModelBuilder.Perspective.GUI) - .rotation(30, 225, 0) - .scale(0.75f) - .end() - .transform(ModelBuilder.Perspective.GROUND) - .translation(0, 3, 0) - .scale(0.75f) - .end() - .transform(ModelBuilder.Perspective.FIXED) - .rotation(0, 180, 0) - .scale(1.0f) - .end() - .transform(ModelBuilder.Perspective.THIRDPERSON_RIGHT) - .rotation(75, 45, 0) - .translation(0, 2.5f, 0) - .scale(0.75f) - .end() - .transform(ModelBuilder.Perspective.FIRSTPERSON_RIGHT) - .rotation(0, 45, 0) - .scale(0.75f) - .end() - .transform(ModelBuilder.Perspective.FIRSTPERSON_LEFT) - .rotation(0, 225, 0) - .scale(0.75f) - .end(); + .parent(straightModel) + .transforms() + .transform(ModelBuilder.Perspective.GUI) + .rotation(30, 225, 0) + .scale(0.75f) + .end() + .transform(ModelBuilder.Perspective.GROUND) + .translation(0, 3, 0) + .scale(0.75f) + .end() + .transform(ModelBuilder.Perspective.FIXED) + .rotation(0, 180, 0) + .scale(1.0f) + .end() + .transform(ModelBuilder.Perspective.THIRDPERSON_RIGHT) + .rotation(75, 45, 0) + .translation(0, 2.5f, 0) + .scale(0.75f) + .end() + .transform(ModelBuilder.Perspective.FIRSTPERSON_RIGHT) + .rotation(0, 45, 0) + .scale(0.75f) + .end() + .transform(ModelBuilder.Perspective.FIRSTPERSON_LEFT) + .rotation(0, 225, 0) + .scale(0.75f) + .end(); itemModels().getBuilder(Items.BUS_INTERFACE.getId().getPath()) - .parent(plugModel) - .transforms() - .transform(ModelBuilder.Perspective.GUI) - .rotation(30, 315, 0) - .translation(2, 1, 0) - .scale(0.75f) - .end() - .transform(ModelBuilder.Perspective.GROUND) - .translation(0, 3, -5) - .scale(0.75f) - .end() - .transform(ModelBuilder.Perspective.FIXED) - .rotation(0, 180, 0) - .translation(0, 0, 4) - .scale(1.0f) - .end() - .transform(ModelBuilder.Perspective.THIRDPERSON_RIGHT) - .rotation(75, 180, 0) - .translation(0, -1, 0) - .scale(0.75f) - .end() - .transform(ModelBuilder.Perspective.FIRSTPERSON_RIGHT) - .rotation(0, 180, 0) - .translation(0, 0, 2) - .scale(0.75f) - .end() - .transform(ModelBuilder.Perspective.FIRSTPERSON_LEFT) - .rotation(0, 180, 0) - .translation(0, 0, 2) - .scale(0.75f) - .end(); + .parent(plugModel) + .transforms() + .transform(ModelBuilder.Perspective.GUI) + .rotation(30, 315, 0) + .translation(2, 1, 0) + .scale(0.75f) + .end() + .transform(ModelBuilder.Perspective.GROUND) + .translation(0, 3, -5) + .scale(0.75f) + .end() + .transform(ModelBuilder.Perspective.FIXED) + .rotation(0, 180, 0) + .translation(0, 0, 4) + .scale(1.0f) + .end() + .transform(ModelBuilder.Perspective.THIRDPERSON_RIGHT) + .rotation(75, 180, 0) + .translation(0, -1, 0) + .scale(0.75f) + .end() + .transform(ModelBuilder.Perspective.FIRSTPERSON_RIGHT) + .rotation(0, 180, 0) + .translation(0, 0, 2) + .scale(0.75f) + .end() + .transform(ModelBuilder.Perspective.FIRSTPERSON_LEFT) + .rotation(0, 180, 0) + .translation(0, 0, 2) + .scale(0.75f) + .end(); } private ItemModelBuilder horizontalBlock(final RegistryObject block, final RegistryObject item, final ResourceLocation modelFileLocation) { diff --git a/src/main/java/li/cil/oc2/data/ModBlockTagsProvider.java b/src/main/java/li/cil/oc2/data/ModBlockTagsProvider.java index 7a38fa3f..c553e634 100644 --- a/src/main/java/li/cil/oc2/data/ModBlockTagsProvider.java +++ b/src/main/java/li/cil/oc2/data/ModBlockTagsProvider.java @@ -1,8 +1,8 @@ package li.cil.oc2.data; import li.cil.oc2.api.API; -import net.minecraft.data.tags.BlockTagsProvider; import net.minecraft.data.DataGenerator; +import net.minecraft.data.tags.BlockTagsProvider; import net.minecraftforge.common.data.ExistingFileHelper; import javax.annotation.Nullable; @@ -18,21 +18,21 @@ public final class ModBlockTagsProvider extends BlockTagsProvider { @Override protected void addTags() { tag(DEVICES).add( - COMPUTER.get(), - REDSTONE_INTERFACE.get(), - DISK_DRIVE.get() + COMPUTER.get(), + REDSTONE_INTERFACE.get(), + DISK_DRIVE.get() ); tag(CABLES).add( - BUS_CABLE.get() + BUS_CABLE.get() ); tag(WRENCH_BREAKABLE).add( - COMPUTER.get(), - BUS_CABLE.get(), - NETWORK_CONNECTOR.get(), - NETWORK_HUB.get(), - REDSTONE_INTERFACE.get(), - DISK_DRIVE.get(), - CHARGER.get() + COMPUTER.get(), + BUS_CABLE.get(), + NETWORK_CONNECTOR.get(), + NETWORK_HUB.get(), + REDSTONE_INTERFACE.get(), + DISK_DRIVE.get(), + CHARGER.get() ); } } diff --git a/src/main/java/li/cil/oc2/data/ModItemModelProvider.java b/src/main/java/li/cil/oc2/data/ModItemModelProvider.java index d97485ae..5f101913 100644 --- a/src/main/java/li/cil/oc2/data/ModItemModelProvider.java +++ b/src/main/java/li/cil/oc2/data/ModItemModelProvider.java @@ -4,8 +4,8 @@ import li.cil.oc2.api.API; import li.cil.oc2.common.entity.Entities; import li.cil.oc2.common.item.Items; import net.minecraft.data.DataGenerator; -import net.minecraft.world.item.Item; import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.item.Item; import net.minecraftforge.client.model.generators.ItemModelBuilder; import net.minecraftforge.client.model.generators.ItemModelProvider; import net.minecraftforge.common.data.ExistingFileHelper; @@ -27,17 +27,17 @@ public final class ModItemModelProvider extends ItemModelProvider { simple(Items.MEMORY_MEDIUM); simple(Items.MEMORY_LARGE); simple(Items.HARD_DRIVE_SMALL, "item/hard_drive_base") - .texture("layer1", "item/hard_drive_tint"); + .texture("layer1", "item/hard_drive_tint"); simple(Items.HARD_DRIVE_MEDIUM, "item/hard_drive_base") - .texture("layer1", "item/hard_drive_tint"); + .texture("layer1", "item/hard_drive_tint"); simple(Items.HARD_DRIVE_LARGE, "item/hard_drive_base") - .texture("layer1", "item/hard_drive_tint"); + .texture("layer1", "item/hard_drive_tint"); simple(Items.HARD_DRIVE_CUSTOM, "item/hard_drive_base") - .texture("layer1", "item/hard_drive_tint"); + .texture("layer1", "item/hard_drive_tint"); simple(Items.FLASH_MEMORY); simple(Items.FLASH_MEMORY_CUSTOM, "item/flash_memory"); simple(Items.FLOPPY, "item/floppy_base") - .texture("layer1", "item/floppy_tint"); + .texture("layer1", "item/floppy_tint"); simple(Items.REDSTONE_INTERFACE_CARD); simple(Items.NETWORK_INTERFACE_CARD); @@ -59,8 +59,8 @@ public final class ModItemModelProvider extends ItemModelProvider { private ItemModelBuilder simple(final RegistryObject item, final String texturePath) { return singleTexture(item.getId().getPath(), - new ResourceLocation("item/generated"), - "layer0", - new ResourceLocation(API.MOD_ID, texturePath)); + new ResourceLocation("item/generated"), + "layer0", + new ResourceLocation(API.MOD_ID, texturePath)); } } diff --git a/src/main/java/li/cil/oc2/data/ModRecipesProvider.java b/src/main/java/li/cil/oc2/data/ModRecipesProvider.java index 342a0d47..ef177fe8 100644 --- a/src/main/java/li/cil/oc2/data/ModRecipesProvider.java +++ b/src/main/java/li/cil/oc2/data/ModRecipesProvider.java @@ -2,18 +2,17 @@ package li.cil.oc2.data; import li.cil.oc2.common.item.Items; import net.minecraft.advancements.critereon.InventoryChangeTrigger; -import net.minecraft.data.*; +import net.minecraft.data.DataGenerator; +import net.minecraft.data.recipes.FinishedRecipe; +import net.minecraft.data.recipes.RecipeProvider; +import net.minecraft.data.recipes.ShapedRecipeBuilder; +import net.minecraft.data.recipes.ShapelessRecipeBuilder; import net.minecraft.tags.ItemTags; import net.minecraft.world.level.ItemLike; import net.minecraftforge.common.Tags; import java.util.function.Consumer; -import net.minecraft.data.recipes.FinishedRecipe; -import net.minecraft.data.recipes.RecipeProvider; -import net.minecraft.data.recipes.ShapedRecipeBuilder; -import net.minecraft.data.recipes.ShapelessRecipeBuilder; - public final class ModRecipesProvider extends RecipeProvider { public ModRecipesProvider(final DataGenerator generator) { super(generator); @@ -22,332 +21,332 @@ public final class ModRecipesProvider extends RecipeProvider { @Override protected void buildCraftingRecipes(Consumer consumer) { ShapedRecipeBuilder - .shaped(Items.COMPUTER.get()) - .pattern("ICI") - .pattern("XTX") - .pattern("IBI") - .define('I', Tags.Items.INGOTS_IRON) - .define('C', Tags.Items.CHESTS_WOODEN) - .define('X', Items.BUS_INTERFACE.get()) - .define('T', Items.TRANSISTOR.get()) - .define('B', Items.CIRCUIT_BOARD.get()) - .unlockedBy("has_transistor", inventoryChange(Items.TRANSISTOR.get())) - .unlockedBy("has_circuit_board", inventoryChange(Items.CIRCUIT_BOARD.get())) - .save(consumer); + .shaped(Items.COMPUTER.get()) + .pattern("ICI") + .pattern("XTX") + .pattern("IBI") + .define('I', Tags.Items.INGOTS_IRON) + .define('C', Tags.Items.CHESTS_WOODEN) + .define('X', Items.BUS_INTERFACE.get()) + .define('T', Items.TRANSISTOR.get()) + .define('B', Items.CIRCUIT_BOARD.get()) + .unlockedBy("has_transistor", inventoryChange(Items.TRANSISTOR.get())) + .unlockedBy("has_circuit_board", inventoryChange(Items.CIRCUIT_BOARD.get())) + .save(consumer); ShapedRecipeBuilder - .shaped(Items.BUS_CABLE.get(), 16) - .pattern("III") - .pattern("GTG") - .pattern("III") - .define('I', Tags.Items.INGOTS_IRON) - .define('G', Tags.Items.INGOTS_GOLD) - .define('T', Items.TRANSISTOR.get()) - .unlockedBy("has_transistor", inventoryChange(Items.TRANSISTOR.get())) - .save(consumer); + .shaped(Items.BUS_CABLE.get(), 16) + .pattern("III") + .pattern("GTG") + .pattern("III") + .define('I', Tags.Items.INGOTS_IRON) + .define('G', Tags.Items.INGOTS_GOLD) + .define('T', Items.TRANSISTOR.get()) + .unlockedBy("has_transistor", inventoryChange(Items.TRANSISTOR.get())) + .save(consumer); ShapelessRecipeBuilder - .shapeless(Items.BUS_INTERFACE.get()) - .requires(Items.TRANSISTOR.get()) - .requires(Items.BUS_CABLE.get()) - .unlockedBy("has_bus_cable", inventoryChange(Items.BUS_CABLE.get())) - .save(consumer); + .shapeless(Items.BUS_INTERFACE.get()) + .requires(Items.TRANSISTOR.get()) + .requires(Items.BUS_CABLE.get()) + .unlockedBy("has_bus_cable", inventoryChange(Items.BUS_CABLE.get())) + .save(consumer); ShapedRecipeBuilder - .shaped(Items.NETWORK_CONNECTOR.get(), 4) - .pattern("IGI") - .pattern("ITI") - .define('I', Tags.Items.INGOTS_IRON) - .define('G', Tags.Items.GLASS) - .define('T', Items.TRANSISTOR.get()) - .unlockedBy("has_transistor", inventoryChange(Items.TRANSISTOR.get())) - .save(consumer); + .shaped(Items.NETWORK_CONNECTOR.get(), 4) + .pattern("IGI") + .pattern("ITI") + .define('I', Tags.Items.INGOTS_IRON) + .define('G', Tags.Items.GLASS) + .define('T', Items.TRANSISTOR.get()) + .unlockedBy("has_transistor", inventoryChange(Items.TRANSISTOR.get())) + .save(consumer); ShapedRecipeBuilder - .shaped(Items.NETWORK_HUB.get()) - .pattern("ICI") - .pattern("XTX") - .pattern("ICI") - .define('I', Tags.Items.INGOTS_IRON) - .define('C', Items.NETWORK_CONNECTOR.get()) - .define('X', Items.BUS_INTERFACE.get()) - .define('T', Items.TRANSISTOR.get()) - .unlockedBy("has_network_connector", inventoryChange(Items.NETWORK_CONNECTOR.get())) - .save(consumer); + .shaped(Items.NETWORK_HUB.get()) + .pattern("ICI") + .pattern("XTX") + .pattern("ICI") + .define('I', Tags.Items.INGOTS_IRON) + .define('C', Items.NETWORK_CONNECTOR.get()) + .define('X', Items.BUS_INTERFACE.get()) + .define('T', Items.TRANSISTOR.get()) + .unlockedBy("has_network_connector", inventoryChange(Items.NETWORK_CONNECTOR.get())) + .save(consumer); ShapedRecipeBuilder - .shaped(Items.REDSTONE_INTERFACE.get()) - .pattern("IRI") - .pattern("XTX") - .pattern("IRI") - .define('I', Tags.Items.INGOTS_IRON) - .define('R', Tags.Items.DUSTS_REDSTONE) - .define('T', Items.TRANSISTOR.get()) - .define('X', Items.BUS_INTERFACE.get()) - .unlockedBy("has_computer", inventoryChange(Items.COMPUTER.get())) - .save(consumer); + .shaped(Items.REDSTONE_INTERFACE.get()) + .pattern("IRI") + .pattern("XTX") + .pattern("IRI") + .define('I', Tags.Items.INGOTS_IRON) + .define('R', Tags.Items.DUSTS_REDSTONE) + .define('T', Items.TRANSISTOR.get()) + .define('X', Items.BUS_INTERFACE.get()) + .unlockedBy("has_computer", inventoryChange(Items.COMPUTER.get())) + .save(consumer); ShapedRecipeBuilder - .shaped(Items.DISK_DRIVE.get()) - .pattern("IBI") - .pattern("XTX") - .pattern("IDI") - .define('I', Tags.Items.INGOTS_IRON) - .define('B', ItemTags.BUTTONS) - .define('T', Items.TRANSISTOR.get()) - .define('X', Items.BUS_INTERFACE.get()) - .define('D', net.minecraft.world.item.Items.DISPENSER) - .unlockedBy("has_computer", inventoryChange(Items.COMPUTER.get())) - .save(consumer); + .shaped(Items.DISK_DRIVE.get()) + .pattern("IBI") + .pattern("XTX") + .pattern("IDI") + .define('I', Tags.Items.INGOTS_IRON) + .define('B', ItemTags.BUTTONS) + .define('T', Items.TRANSISTOR.get()) + .define('X', Items.BUS_INTERFACE.get()) + .define('D', net.minecraft.world.item.Items.DISPENSER) + .unlockedBy("has_computer", inventoryChange(Items.COMPUTER.get())) + .save(consumer); ShapedRecipeBuilder - .shaped(Items.CHARGER.get()) - .pattern("IPI") - .pattern("XTX") - .pattern("IRI") - .define('I', Tags.Items.INGOTS_IRON) - .define('P', net.minecraft.world.item.Items.LIGHT_WEIGHTED_PRESSURE_PLATE) - .define('T', Items.TRANSISTOR.get()) - .define('X', Items.BUS_INTERFACE.get()) - .define('R', Tags.Items.STORAGE_BLOCKS_REDSTONE) - .unlockedBy("has_transistor", inventoryChange(Items.TRANSISTOR.get())) - .save(consumer); + .shaped(Items.CHARGER.get()) + .pattern("IPI") + .pattern("XTX") + .pattern("IRI") + .define('I', Tags.Items.INGOTS_IRON) + .define('P', net.minecraft.world.item.Items.LIGHT_WEIGHTED_PRESSURE_PLATE) + .define('T', Items.TRANSISTOR.get()) + .define('X', Items.BUS_INTERFACE.get()) + .define('R', Tags.Items.STORAGE_BLOCKS_REDSTONE) + .unlockedBy("has_transistor", inventoryChange(Items.TRANSISTOR.get())) + .save(consumer); ShapedRecipeBuilder - .shaped(Items.WRENCH.get()) - .pattern("I I") - .pattern(" T ") - .pattern(" I ") - .define('I', Tags.Items.INGOTS_IRON) - .define('T', Items.TRANSISTOR.get()) - .unlockedBy("has_transistor", inventoryChange(Items.TRANSISTOR.get())) - .save(consumer); + .shaped(Items.WRENCH.get()) + .pattern("I I") + .pattern(" T ") + .pattern(" I ") + .define('I', Tags.Items.INGOTS_IRON) + .define('T', Items.TRANSISTOR.get()) + .unlockedBy("has_transistor", inventoryChange(Items.TRANSISTOR.get())) + .save(consumer); WrenchRecipeBuilder - .wrenchRecipe(Items.MANUAL.get()) - .requires(net.minecraft.world.item.Items.BOOK) - .unlockedBy("has_book", inventoryChange(net.minecraft.world.item.Items.BOOK)) - .unlockedBy("has_wrench", inventoryChange(Items.WRENCH.get())) - .save(consumer); + .wrenchRecipe(Items.MANUAL.get()) + .requires(net.minecraft.world.item.Items.BOOK) + .unlockedBy("has_book", inventoryChange(net.minecraft.world.item.Items.BOOK)) + .unlockedBy("has_wrench", inventoryChange(Items.WRENCH.get())) + .save(consumer); ShapedRecipeBuilder - .shaped(Items.NETWORK_CABLE.get(), 8) - .pattern("SSS") - .pattern("GTG") - .pattern("SSS") - .define('S', Tags.Items.STRING) - .define('G', Tags.Items.GLASS) - .define('T', Items.TRANSISTOR.get()) - .unlockedBy("has_network_connector", inventoryChange(Items.NETWORK_CONNECTOR.get())) - .save(consumer); + .shaped(Items.NETWORK_CABLE.get(), 8) + .pattern("SSS") + .pattern("GTG") + .pattern("SSS") + .define('S', Tags.Items.STRING) + .define('G', Tags.Items.GLASS) + .define('T', Items.TRANSISTOR.get()) + .unlockedBy("has_network_connector", inventoryChange(Items.NETWORK_CONNECTOR.get())) + .save(consumer); ShapedRecipeBuilder - .shaped(Items.ROBOT.get()) - .pattern("ICI") - .pattern("PTP") - .pattern("IBI") - .define('I', Tags.Items.INGOTS_IRON) - .define('C', Tags.Items.CHESTS_WOODEN) - .define('P', net.minecraft.world.item.Items.PISTON) - .define('T', Items.TRANSISTOR.get()) - .define('B', Items.CIRCUIT_BOARD.get()) - .unlockedBy("has_transistor", inventoryChange(Items.TRANSISTOR.get())) - .unlockedBy("has_circuit_board", inventoryChange(Items.CIRCUIT_BOARD.get())) - .save(consumer); + .shaped(Items.ROBOT.get()) + .pattern("ICI") + .pattern("PTP") + .pattern("IBI") + .define('I', Tags.Items.INGOTS_IRON) + .define('C', Tags.Items.CHESTS_WOODEN) + .define('P', net.minecraft.world.item.Items.PISTON) + .define('T', Items.TRANSISTOR.get()) + .define('B', Items.CIRCUIT_BOARD.get()) + .unlockedBy("has_transistor", inventoryChange(Items.TRANSISTOR.get())) + .unlockedBy("has_circuit_board", inventoryChange(Items.CIRCUIT_BOARD.get())) + .save(consumer); ShapedRecipeBuilder - .shaped(Items.MEMORY_SMALL.get(), 2) - .pattern("ITI") - .pattern(" B ") - .define('I', Tags.Items.INGOTS_IRON) - .define('T', Items.TRANSISTOR.get()) - .define('B', Items.CIRCUIT_BOARD.get()) - .unlockedBy("has_computer", inventoryChange(Items.COMPUTER.get())) - .unlockedBy("has_robot", inventoryChange(Items.ROBOT.get())) - .save(consumer); + .shaped(Items.MEMORY_SMALL.get(), 2) + .pattern("ITI") + .pattern(" B ") + .define('I', Tags.Items.INGOTS_IRON) + .define('T', Items.TRANSISTOR.get()) + .define('B', Items.CIRCUIT_BOARD.get()) + .unlockedBy("has_computer", inventoryChange(Items.COMPUTER.get())) + .unlockedBy("has_robot", inventoryChange(Items.ROBOT.get())) + .save(consumer); ShapedRecipeBuilder - .shaped(Items.MEMORY_MEDIUM.get(), 2) - .pattern("GTG") - .pattern(" B ") - .define('G', Tags.Items.INGOTS_GOLD) - .define('T', Items.TRANSISTOR.get()) - .define('B', Items.CIRCUIT_BOARD.get()) - .unlockedBy("has_computer", inventoryChange(Items.COMPUTER.get())) - .unlockedBy("has_robot", inventoryChange(Items.ROBOT.get())) - .save(consumer); + .shaped(Items.MEMORY_MEDIUM.get(), 2) + .pattern("GTG") + .pattern(" B ") + .define('G', Tags.Items.INGOTS_GOLD) + .define('T', Items.TRANSISTOR.get()) + .define('B', Items.CIRCUIT_BOARD.get()) + .unlockedBy("has_computer", inventoryChange(Items.COMPUTER.get())) + .unlockedBy("has_robot", inventoryChange(Items.ROBOT.get())) + .save(consumer); ShapedRecipeBuilder - .shaped(Items.MEMORY_LARGE.get(), 2) - .pattern("DTD") - .pattern(" B ") - .define('D', Tags.Items.GEMS_DIAMOND) - .define('T', Items.TRANSISTOR.get()) - .define('B', Items.CIRCUIT_BOARD.get()) - .unlockedBy("has_computer", inventoryChange(Items.COMPUTER.get())) - .unlockedBy("has_robot", inventoryChange(Items.ROBOT.get())) - .save(consumer); + .shaped(Items.MEMORY_LARGE.get(), 2) + .pattern("DTD") + .pattern(" B ") + .define('D', Tags.Items.GEMS_DIAMOND) + .define('T', Items.TRANSISTOR.get()) + .define('B', Items.CIRCUIT_BOARD.get()) + .unlockedBy("has_computer", inventoryChange(Items.COMPUTER.get())) + .unlockedBy("has_robot", inventoryChange(Items.ROBOT.get())) + .save(consumer); ShapedRecipeBuilder - .shaped(Items.HARD_DRIVE_SMALL.get()) - .pattern("ITI") - .pattern("EBE") - .define('I', Tags.Items.INGOTS_IRON) - .define('T', Items.TRANSISTOR.get()) - .define('B', Items.CIRCUIT_BOARD.get()) - .define('E', Tags.Items.GEMS_EMERALD) - .unlockedBy("has_computer", inventoryChange(Items.COMPUTER.get())) - .unlockedBy("has_robot", inventoryChange(Items.ROBOT.get())) - .save(consumer); + .shaped(Items.HARD_DRIVE_SMALL.get()) + .pattern("ITI") + .pattern("EBE") + .define('I', Tags.Items.INGOTS_IRON) + .define('T', Items.TRANSISTOR.get()) + .define('B', Items.CIRCUIT_BOARD.get()) + .define('E', Tags.Items.GEMS_EMERALD) + .unlockedBy("has_computer", inventoryChange(Items.COMPUTER.get())) + .unlockedBy("has_robot", inventoryChange(Items.ROBOT.get())) + .save(consumer); ShapedRecipeBuilder - .shaped(Items.HARD_DRIVE_MEDIUM.get()) - .pattern("GTG") - .pattern("EBE") - .define('G', Tags.Items.INGOTS_GOLD) - .define('T', Items.TRANSISTOR.get()) - .define('B', Items.CIRCUIT_BOARD.get()) - .define('E', Tags.Items.GEMS_EMERALD) - .unlockedBy("has_computer", inventoryChange(Items.COMPUTER.get())) - .unlockedBy("has_robot", inventoryChange(Items.ROBOT.get())) - .save(consumer); + .shaped(Items.HARD_DRIVE_MEDIUM.get()) + .pattern("GTG") + .pattern("EBE") + .define('G', Tags.Items.INGOTS_GOLD) + .define('T', Items.TRANSISTOR.get()) + .define('B', Items.CIRCUIT_BOARD.get()) + .define('E', Tags.Items.GEMS_EMERALD) + .unlockedBy("has_computer", inventoryChange(Items.COMPUTER.get())) + .unlockedBy("has_robot", inventoryChange(Items.ROBOT.get())) + .save(consumer); ShapedRecipeBuilder - .shaped(Items.HARD_DRIVE_LARGE.get()) - .pattern("DTD") - .pattern("EBE") - .define('D', Tags.Items.GEMS_DIAMOND) - .define('T', Items.TRANSISTOR.get()) - .define('B', Items.CIRCUIT_BOARD.get()) - .define('E', Tags.Items.GEMS_EMERALD) - .unlockedBy("has_computer", inventoryChange(Items.COMPUTER.get())) - .unlockedBy("has_robot", inventoryChange(Items.ROBOT.get())) - .save(consumer); + .shaped(Items.HARD_DRIVE_LARGE.get()) + .pattern("DTD") + .pattern("EBE") + .define('D', Tags.Items.GEMS_DIAMOND) + .define('T', Items.TRANSISTOR.get()) + .define('B', Items.CIRCUIT_BOARD.get()) + .define('E', Tags.Items.GEMS_EMERALD) + .unlockedBy("has_computer", inventoryChange(Items.COMPUTER.get())) + .unlockedBy("has_robot", inventoryChange(Items.ROBOT.get())) + .save(consumer); WrenchRecipeBuilder - .wrenchRecipe(Items.HARD_DRIVE_CUSTOM.get()) - .requires(Items.HARD_DRIVE_LARGE.get()) - .unlockedBy("has_computer", inventoryChange(Items.COMPUTER.get())) - .unlockedBy("has_robot", inventoryChange(Items.ROBOT.get())) - .save(consumer); + .wrenchRecipe(Items.HARD_DRIVE_CUSTOM.get()) + .requires(Items.HARD_DRIVE_LARGE.get()) + .unlockedBy("has_computer", inventoryChange(Items.COMPUTER.get())) + .unlockedBy("has_robot", inventoryChange(Items.ROBOT.get())) + .save(consumer); ShapedRecipeBuilder - .shaped(Items.FLASH_MEMORY.get()) - .pattern("ITI") - .pattern("RBR") - .define('I', Tags.Items.INGOTS_IRON) - .define('T', Items.TRANSISTOR.get()) - .define('R', Tags.Items.DUSTS_REDSTONE) - .define('B', Items.CIRCUIT_BOARD.get()) - .unlockedBy("has_computer", inventoryChange(Items.COMPUTER.get())) - .unlockedBy("has_robot", inventoryChange(Items.ROBOT.get())) - .save(consumer); + .shaped(Items.FLASH_MEMORY.get()) + .pattern("ITI") + .pattern("RBR") + .define('I', Tags.Items.INGOTS_IRON) + .define('T', Items.TRANSISTOR.get()) + .define('R', Tags.Items.DUSTS_REDSTONE) + .define('B', Items.CIRCUIT_BOARD.get()) + .unlockedBy("has_computer", inventoryChange(Items.COMPUTER.get())) + .unlockedBy("has_robot", inventoryChange(Items.ROBOT.get())) + .save(consumer); WrenchRecipeBuilder - .wrenchRecipe(Items.FLASH_MEMORY_CUSTOM.get()) - .requires(Items.FLASH_MEMORY.get()) - .unlockedBy("has_computer", inventoryChange(Items.COMPUTER.get())) - .unlockedBy("has_robot", inventoryChange(Items.ROBOT.get())) - .save(consumer); + .wrenchRecipe(Items.FLASH_MEMORY_CUSTOM.get()) + .requires(Items.FLASH_MEMORY.get()) + .unlockedBy("has_computer", inventoryChange(Items.COMPUTER.get())) + .unlockedBy("has_robot", inventoryChange(Items.ROBOT.get())) + .save(consumer); ShapedRecipeBuilder - .shaped(Items.REDSTONE_INTERFACE_CARD.get()) - .pattern("IRT") - .pattern(" B ") - .define('R', net.minecraft.world.item.Items.REDSTONE_TORCH) - .define('I', Tags.Items.INGOTS_IRON) - .define('T', Items.TRANSISTOR.get()) - .define('B', Items.CIRCUIT_BOARD.get()) - .unlockedBy("has_computer", inventoryChange(Items.COMPUTER.get())) - .save(consumer); + .shaped(Items.REDSTONE_INTERFACE_CARD.get()) + .pattern("IRT") + .pattern(" B ") + .define('R', net.minecraft.world.item.Items.REDSTONE_TORCH) + .define('I', Tags.Items.INGOTS_IRON) + .define('T', Items.TRANSISTOR.get()) + .define('B', Items.CIRCUIT_BOARD.get()) + .unlockedBy("has_computer", inventoryChange(Items.COMPUTER.get())) + .save(consumer); ShapedRecipeBuilder - .shaped(Items.NETWORK_INTERFACE_CARD.get()) - .pattern("IGT") - .pattern(" B ") - .define('G', Tags.Items.GLASS) - .define('I', Tags.Items.INGOTS_IRON) - .define('T', Items.TRANSISTOR.get()) - .define('B', Items.CIRCUIT_BOARD.get()) - .unlockedBy("has_computer", inventoryChange(Items.COMPUTER.get())) - .save(consumer); + .shaped(Items.NETWORK_INTERFACE_CARD.get()) + .pattern("IGT") + .pattern(" B ") + .define('G', Tags.Items.GLASS) + .define('I', Tags.Items.INGOTS_IRON) + .define('T', Items.TRANSISTOR.get()) + .define('B', Items.CIRCUIT_BOARD.get()) + .unlockedBy("has_computer", inventoryChange(Items.COMPUTER.get())) + .save(consumer); ShapedRecipeBuilder - .shaped(Items.FILE_IMPORT_EXPORT_CARD.get()) - .pattern("IET") - .pattern(" B ") - .define('E', net.minecraft.world.item.Items.PAPER) - .define('I', Tags.Items.INGOTS_IRON) - .define('T', Items.TRANSISTOR.get()) - .define('B', Items.CIRCUIT_BOARD.get()) - .unlockedBy("has_computer", inventoryChange(Items.COMPUTER.get())) - .save(consumer); + .shaped(Items.FILE_IMPORT_EXPORT_CARD.get()) + .pattern("IET") + .pattern(" B ") + .define('E', net.minecraft.world.item.Items.PAPER) + .define('I', Tags.Items.INGOTS_IRON) + .define('T', Items.TRANSISTOR.get()) + .define('B', Items.CIRCUIT_BOARD.get()) + .unlockedBy("has_computer", inventoryChange(Items.COMPUTER.get())) + .save(consumer); ShapedRecipeBuilder - .shaped(Items.SOUND_CARD.get()) - .pattern("IST") - .pattern(" B ") - .define('S', net.minecraft.world.item.Items.NOTE_BLOCK) - .define('I', Tags.Items.INGOTS_IRON) - .define('T', Items.TRANSISTOR.get()) - .define('B', Items.CIRCUIT_BOARD.get()) - .unlockedBy("has_computer", inventoryChange(Items.COMPUTER.get())) - .save(consumer); + .shaped(Items.SOUND_CARD.get()) + .pattern("IST") + .pattern(" B ") + .define('S', net.minecraft.world.item.Items.NOTE_BLOCK) + .define('I', Tags.Items.INGOTS_IRON) + .define('T', Items.TRANSISTOR.get()) + .define('B', Items.CIRCUIT_BOARD.get()) + .unlockedBy("has_computer", inventoryChange(Items.COMPUTER.get())) + .save(consumer); ShapedRecipeBuilder - .shaped(Items.FLOPPY.get()) - .pattern("ITI") - .pattern("QBQ") - .define('I', Tags.Items.INGOTS_IRON) - .define('T', Items.TRANSISTOR.get()) - .define('Q', Tags.Items.GEMS_QUARTZ) - .define('B', Items.CIRCUIT_BOARD.get()) - .unlockedBy("has_disk_drive", inventoryChange(Items.DISK_DRIVE.get())) - .save(consumer); + .shaped(Items.FLOPPY.get()) + .pattern("ITI") + .pattern("QBQ") + .define('I', Tags.Items.INGOTS_IRON) + .define('T', Items.TRANSISTOR.get()) + .define('Q', Tags.Items.GEMS_QUARTZ) + .define('B', Items.CIRCUIT_BOARD.get()) + .unlockedBy("has_disk_drive", inventoryChange(Items.DISK_DRIVE.get())) + .save(consumer); ShapedRecipeBuilder - .shaped(Items.INVENTORY_OPERATIONS_MODULE.get()) - .pattern("TCG") - .pattern(" B ") - .define('T', Items.TRANSISTOR.get()) - .define('C', Tags.Items.CHESTS_WOODEN) - .define('G', Tags.Items.INGOTS_GOLD) - .define('B', Items.CIRCUIT_BOARD.get()) - .unlockedBy("has_robot", inventoryChange(Items.ROBOT.get())) - .save(consumer); + .shaped(Items.INVENTORY_OPERATIONS_MODULE.get()) + .pattern("TCG") + .pattern(" B ") + .define('T', Items.TRANSISTOR.get()) + .define('C', Tags.Items.CHESTS_WOODEN) + .define('G', Tags.Items.INGOTS_GOLD) + .define('B', Items.CIRCUIT_BOARD.get()) + .unlockedBy("has_robot", inventoryChange(Items.ROBOT.get())) + .save(consumer); ShapedRecipeBuilder - .shaped(Items.BLOCK_OPERATIONS_MODULE.get()) - .pattern("TPG") - .pattern(" B ") - .define('T', Items.TRANSISTOR.get()) - .define('P', net.minecraft.world.item.Items.DIAMOND_PICKAXE) - .define('G', Tags.Items.INGOTS_GOLD) - .define('B', Items.CIRCUIT_BOARD.get()) - .unlockedBy("has_robot", inventoryChange(Items.ROBOT.get())) - .save(consumer); + .shaped(Items.BLOCK_OPERATIONS_MODULE.get()) + .pattern("TPG") + .pattern(" B ") + .define('T', Items.TRANSISTOR.get()) + .define('P', net.minecraft.world.item.Items.DIAMOND_PICKAXE) + .define('G', Tags.Items.INGOTS_GOLD) + .define('B', Items.CIRCUIT_BOARD.get()) + .unlockedBy("has_robot", inventoryChange(Items.ROBOT.get())) + .save(consumer); ShapedRecipeBuilder - .shaped(Items.TRANSISTOR.get(), 8) - .pattern("RCR") - .pattern("III") - .define('I', Tags.Items.INGOTS_IRON) - .define('R', Tags.Items.DUSTS_REDSTONE) - .define('C', net.minecraft.world.item.Items.COMPARATOR) - .unlockedBy("has_gold", inventoryChange(net.minecraft.world.item.Items.GOLD_INGOT)) - .save(consumer); + .shaped(Items.TRANSISTOR.get(), 8) + .pattern("RCR") + .pattern("III") + .define('I', Tags.Items.INGOTS_IRON) + .define('R', Tags.Items.DUSTS_REDSTONE) + .define('C', net.minecraft.world.item.Items.COMPARATOR) + .unlockedBy("has_gold", inventoryChange(net.minecraft.world.item.Items.GOLD_INGOT)) + .save(consumer); ShapelessRecipeBuilder - .shapeless(Items.CIRCUIT_BOARD.get(), 4) - .requires(Tags.Items.INGOTS_GOLD) - .requires(net.minecraft.world.item.Items.CLAY_BALL) - .requires(Items.TRANSISTOR.get()) - .unlockedBy("has_transistor", inventoryChange(Items.TRANSISTOR.get())) - .save(consumer); + .shapeless(Items.CIRCUIT_BOARD.get(), 4) + .requires(Tags.Items.INGOTS_GOLD) + .requires(net.minecraft.world.item.Items.CLAY_BALL) + .requires(Items.TRANSISTOR.get()) + .unlockedBy("has_transistor", inventoryChange(Items.TRANSISTOR.get())) + .save(consumer); } private static InventoryChangeTrigger.TriggerInstance inventoryChange(final ItemLike item) { diff --git a/src/main/java/li/cil/oc2/data/WrenchRecipeBuilder.java b/src/main/java/li/cil/oc2/data/WrenchRecipeBuilder.java index 63d84db1..991a7930 100644 --- a/src/main/java/li/cil/oc2/data/WrenchRecipeBuilder.java +++ b/src/main/java/li/cil/oc2/data/WrenchRecipeBuilder.java @@ -11,12 +11,12 @@ import net.minecraft.advancements.CriterionTriggerInstance; import net.minecraft.advancements.RequirementsStrategy; import net.minecraft.advancements.critereon.RecipeUnlockedTrigger; import net.minecraft.data.recipes.FinishedRecipe; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.crafting.RecipeSerializer; -import net.minecraft.world.item.crafting.Ingredient; -import net.minecraft.tags.Tag; -import net.minecraft.world.level.ItemLike; import net.minecraft.resources.ResourceLocation; +import net.minecraft.tags.Tag; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.crafting.Ingredient; +import net.minecraft.world.item.crafting.RecipeSerializer; +import net.minecraft.world.level.ItemLike; import net.minecraftforge.registries.ForgeRegistries; import javax.annotation.Nullable;