Jika/oc2r
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Autoformat and organize imports.

Browse Source
This commit is contained in:
Florian Nücke
2021-12-31 02:36:29 +01:00
parent bbf487d404
commit 3fab593a3c
144 changed files with 971 additions and 975 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/li/cil/oc2/api/bus/device/DeviceType.java
View File

@@ -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;
/**

2
src/main/java/li/cil/oc2/api/bus/device/data/BlockDeviceData.java
View File

@@ -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;
/**

2
src/main/java/li/cil/oc2/api/bus/device/data/Firmware.java
View File

@@ -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;
/**

1
src/main/java/li/cil/oc2/api/bus/device/vm/context/VMLifecycleEventBus.java
View File

@@ -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

6
src/main/java/li/cil/oc2/api/util/RobotOperationSide.java
View File

@@ -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++) {

8
src/main/java/li/cil/oc2/client/ClientSetup.java
View File

@@ -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;

6
src/main/java/li/cil/oc2/client/audio/LoopingBlockEntitySound.java
View File

@@ -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 {

2
src/main/java/li/cil/oc2/client/audio/LoopingSoundManager.java
View File

@@ -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;

34
src/main/java/li/cil/oc2/client/gui/AbstractMachineInventoryScreen.java
View File

@@ -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<T extends AbstractMachineTe
super.init();
addRenderableWidget(new ToggleImageButton(
this, leftPos - Sprites.SIDEBAR_3.width + 4, topPos + CONTROLS_TOP + 4,
12, 12,
new TranslatableComponent(Constants.COMPUTER_SCREEN_POWER_CAPTION),
new TranslatableComponent(Constants.COMPUTER_SCREEN_POWER_DESCRIPTION),
Sprites.POWER_BUTTON_BASE,
Sprites.POWER_BUTTON_PRESSED,
Sprites.POWER_BUTTON_ACTIVE
this, leftPos - Sprites.SIDEBAR_3.width + 4, topPos + CONTROLS_TOP + 4,
12, 12,
new TranslatableComponent(Constants.COMPUTER_SCREEN_POWER_CAPTION),
new TranslatableComponent(Constants.COMPUTER_SCREEN_POWER_DESCRIPTION),
Sprites.POWER_BUTTON_BASE,
Sprites.POWER_BUTTON_PRESSED,
Sprites.POWER_BUTTON_ACTIVE
) {
@Override
public void onPress() {
@@ -57,12 +57,12 @@ public abstract class AbstractMachineInventoryScreen<T extends AbstractMachineTe
});
addRenderableWidget(new ImageButton(
this, leftPos - Sprites.SIDEBAR_3.width + 4, topPos + CONTROLS_TOP + 4 + 14,
12, 12,
new TranslatableComponent(Constants.MACHINE_OPEN_TERMINAL_CAPTION),
null,
Sprites.INVENTORY_BUTTON_ACTIVE,
Sprites.INVENTORY_BUTTON_INACTIVE
this, leftPos - Sprites.SIDEBAR_3.width + 4, topPos + CONTROLS_TOP + 4 + 14,
12, 12,
new TranslatableComponent(Constants.MACHINE_OPEN_TERMINAL_CAPTION),
null,
Sprites.INVENTORY_BUTTON_ACTIVE,
Sprites.INVENTORY_BUTTON_INACTIVE
) {
@Override
public void onPress() {
@@ -85,8 +85,8 @@ public abstract class AbstractMachineInventoryScreen<T extends AbstractMachineTe
if (isMouseOver(mouseX, mouseY, -Sprites.SIDEBAR_2.width + 4, ENERGY_TOP + 4, Sprites.ENERGY_BAR.width, Sprites.ENERGY_BAR.height)) {
final List<? extends FormattedText> 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);
}

54
src/main/java/li/cil/oc2/client/gui/AbstractMachineTerminalScreen.java
View File

@@ -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<T extends AbstractMachineTer
if (isMouseOver(mouseX, mouseY, -Sprites.SIDEBAR_2.width + 4, ENERGY_TOP + 4, Sprites.ENERGY_BAR.width, Sprites.ENERGY_BAR.height)) {
final List<? extends FormattedText> 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<T extends AbstractMachineTer
@Override
public boolean charTyped(final char ch, final int modifiers) {
return terminalWidget.charTyped(ch, modifiers) ||
super.charTyped(ch, modifiers);
super.charTyped(ch, modifiers);
}
@Override
@@ -101,13 +101,13 @@ public abstract class AbstractMachineTerminalScreen<T extends AbstractMachineTer
terminalWidget.init();
addRenderableWidget(new ToggleImageButton(
this, leftPos - Sprites.SIDEBAR_3.width + 4, topPos + CONTROLS_TOP + 4,
12, 12,
new TranslatableComponent(Constants.COMPUTER_SCREEN_POWER_CAPTION),
new TranslatableComponent(Constants.COMPUTER_SCREEN_POWER_DESCRIPTION),
Sprites.POWER_BUTTON_BASE,
Sprites.POWER_BUTTON_PRESSED,
Sprites.POWER_BUTTON_ACTIVE
this, leftPos - Sprites.SIDEBAR_3.width + 4, topPos + CONTROLS_TOP + 4,
12, 12,
new TranslatableComponent(Constants.COMPUTER_SCREEN_POWER_CAPTION),
new TranslatableComponent(Constants.COMPUTER_SCREEN_POWER_DESCRIPTION),
Sprites.POWER_BUTTON_BASE,
Sprites.POWER_BUTTON_PRESSED,
Sprites.POWER_BUTTON_ACTIVE
) {
@Override
public void onPress() {
@@ -122,13 +122,13 @@ public abstract class AbstractMachineTerminalScreen<T extends AbstractMachineTer
});
addRenderableWidget(new ToggleImageButton(
this, leftPos - Sprites.SIDEBAR_3.width + 4, topPos + CONTROLS_TOP + 4 + 14,
12, 12,
new TranslatableComponent(Constants.TERMINAL_CAPTURE_INPUT_CAPTION),
new TranslatableComponent(Constants.TERMINAL_CAPTURE_INPUT_DESCRIPTION),
Sprites.INPUT_BUTTON_BASE,
Sprites.INPUT_BUTTON_PRESSED,
Sprites.INPUT_BUTTON_ACTIVE
this, leftPos - Sprites.SIDEBAR_3.width + 4, topPos + CONTROLS_TOP + 4 + 14,
12, 12,
new TranslatableComponent(Constants.TERMINAL_CAPTURE_INPUT_CAPTION),
new TranslatableComponent(Constants.TERMINAL_CAPTURE_INPUT_DESCRIPTION),
Sprites.INPUT_BUTTON_BASE,
Sprites.INPUT_BUTTON_PRESSED,
Sprites.INPUT_BUTTON_ACTIVE
) {
@Override
public void onPress() {
@@ -143,12 +143,12 @@ public abstract class AbstractMachineTerminalScreen<T extends AbstractMachineTer
});
addRenderableWidget(new ImageButton(
this, leftPos - Sprites.SIDEBAR_3.width + 4, topPos + CONTROLS_TOP + 4 + 14 + 14,
12, 12,
new TranslatableComponent(Constants.MACHINE_OPEN_INVENTORY_CAPTION),
null,
Sprites.INVENTORY_BUTTON_INACTIVE,
Sprites.INVENTORY_BUTTON_ACTIVE
this, leftPos - Sprites.SIDEBAR_3.width + 4, topPos + CONTROLS_TOP + 4 + 14 + 14,
12, 12,
new TranslatableComponent(Constants.MACHINE_OPEN_INVENTORY_CAPTION),
null,
Sprites.INVENTORY_BUTTON_INACTIVE,
Sprites.INVENTORY_BUTTON_ACTIVE
) {
@Override
public void onPress() {

6
src/main/java/li/cil/oc2/client/gui/AbstractModContainerScreen.java
View File

@@ -16,8 +16,8 @@ public abstract class AbstractModContainerScreen<T extends AbstractContainerMenu
final int localMouseX = mouseX - leftPos;
final int localMouseY = mouseY - topPos;
return localMouseX >= x &&
localMouseX < x + width &&
localMouseY >= y &&
localMouseY < y + height;
localMouseX < x + width &&
localMouseY >= y &&
localMouseY < y + height;
}
}

8
src/main/java/li/cil/oc2/client/gui/BusInterfaceScreen.java
View File

@@ -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;

4
src/main/java/li/cil/oc2/client/gui/ComputerContainerScreen.java
View File

@@ -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<ComputerInventoryContainer> {
public ComputerContainerScreen(final ComputerInventoryContainer container, final Inventory inventory, final Component title) {

2
src/main/java/li/cil/oc2/client/gui/ComputerTerminalScreen.java
View File

@@ -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<ComputerTerminalContainer> {
public ComputerTerminalScreen(final ComputerTerminalContainer container, final Inventory playerInventory, final Component title) {

16
src/main/java/li/cil/oc2/client/gui/MachineTerminalWidget.java
View File

@@ -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);
}
}

4
src/main/java/li/cil/oc2/client/gui/RobotContainerScreen.java
View File

@@ -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<RobotInventoryContainer> {
private static final int SLOT_SIZE = 18;

4
src/main/java/li/cil/oc2/client/gui/RobotTerminalScreen.java
View File

@@ -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<RobotTerminalContainer> {
private static final int SLOTS_X = (MachineTerminalWidget.WIDTH - Sprites.HOTBAR.width) / 2;

16
src/main/java/li/cil/oc2/client/gui/terminal/TerminalInput.java
View File

@@ -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);
}
}

6
src/main/java/li/cil/oc2/client/gui/widget/ImageButton.java
View File

@@ -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;

22
src/main/java/li/cil/oc2/client/gui/widget/ToggleImageButton.java
View File

@@ -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) {

10
src/main/java/li/cil/oc2/client/item/CustomItemColors.java
View File

@@ -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) {

10
src/main/java/li/cil/oc2/client/item/CustomItemModelProperties.java
View File

@@ -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));
}
}

18
src/main/java/li/cil/oc2/client/model/BusCableBakedModel.java
View File

@@ -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;

18
src/main/java/li/cil/oc2/client/renderer/BusInterfaceNameRenderer.java
View File

@@ -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;

4
src/main/java/li/cil/oc2/client/renderer/ModRenderType.java
View File

@@ -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;

4
src/main/java/li/cil/oc2/client/renderer/color/BusCableBlockColor.java
View File

@@ -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;

4
src/main/java/li/cil/oc2/common/Main.java
View File

@@ -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));
}
}

4
src/main/java/li/cil/oc2/common/block/BusCableBlock.java
View File

@@ -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;

19
src/main/java/li/cil/oc2/common/block/ChargerBlock.java
View File

@@ -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));
}

4
src/main/java/li/cil/oc2/common/block/ComputerBlock.java
View File

@@ -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;

2
src/main/java/li/cil/oc2/common/block/CreativeEnergyBlock.java
View File

@@ -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;

2
src/main/java/li/cil/oc2/common/block/DiskDriveBlock.java
View File

@@ -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;

21
src/main/java/li/cil/oc2/common/block/NetworkConnectorBlock.java
View File

@@ -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);

8
src/main/java/li/cil/oc2/common/block/NetworkHubBlock.java
View File

@@ -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));
}

2
src/main/java/li/cil/oc2/common/block/RedstoneInterfaceBlock.java
View File

@@ -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;

16
src/main/java/li/cil/oc2/common/blockentity/BusCableBlockEntity.java
View File

@@ -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;

2
src/main/java/li/cil/oc2/common/blockentity/ComputerBlockEntity.java
View File

@@ -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;

2
src/main/java/li/cil/oc2/common/blockentity/ModBlockEntity.java
View File

@@ -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;

4
src/main/java/li/cil/oc2/common/blockentity/NetworkHubBlockEntity.java
View File

@@ -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;

46
src/main/java/li/cil/oc2/common/blockentity/RedstoneInterfaceBlockEntity.java
View File

@@ -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].");
}
///////////////////////////////////////////////////////////////////

10
src/main/java/li/cil/oc2/common/bus/BlockEntityDeviceBusElement.java
View File

@@ -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<DeviceBusElement> capability = blockEntity
.getCapability(Capabilities.DEVICE_BUS_ELEMENT, direction.getOpposite());
.getCapability(Capabilities.DEVICE_BUS_ELEMENT, direction.getOpposite());
capability.ifPresent(DeviceBus::scheduleScan);
}
}

2
src/main/java/li/cil/oc2/common/bus/ItemHandlerDeviceBusElement.java
View File

@@ -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;

20
src/main/java/li/cil/oc2/common/bus/RPCDeviceBusAdapter.java
View File

@@ -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<UUID> 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) -> {

4
src/main/java/li/cil/oc2/common/bus/device/DeviceTypes.java
View File

@@ -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)
));
}
}

2
src/main/java/li/cil/oc2/common/bus/device/item/ByteBufferFlashMemoryVMDevice.java
View File

@@ -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;

59
src/main/java/li/cil/oc2/common/bus/device/item/FileImportExportCardItemDevice.java
View File

@@ -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.");
}
}

2
src/main/java/li/cil/oc2/common/bus/device/item/FirmwareFlashMemoryVMDevice.java
View File

@@ -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<ItemStack> implements VMDevice, ItemDevice, FirmwareLoader {
private final Firmware firmware;

2
src/main/java/li/cil/oc2/common/bus/device/item/HardDriveVMDevice.java
View File

@@ -26,7 +26,7 @@ public class HardDriveVMDevice extends AbstractBlockDeviceVMDevice<ByteBufferBlo
this.size = size;
this.readonly = readonly;
this.soundEmitter = new ThrottledSoundEmitter(location, SoundEvents.HDD_ACCESS.get())
.withMinInterval(Duration.ofSeconds(1));
.withMinInterval(Duration.ofSeconds(1));
}
///////////////////////////////////////////////////////////////////

12
src/main/java/li/cil/oc2/common/bus/device/item/InventoryOperationsModuleDevice.java
View File

@@ -5,13 +5,13 @@ import li.cil.oc2.api.bus.device.object.Parameter;
import li.cil.oc2.api.capabilities.Robot;
import li.cil.oc2.api.util.RobotOperationSide;
import li.cil.oc2.common.capabilities.Capabilities;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.item.ItemEntity;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.core.Direction;
import net.minecraft.world.phys.AABB;
import net.minecraft.core.BlockPos;
import net.minecraft.world.phys.Vec3;
import net.minecraftforge.common.util.LazyOptional;
import net.minecraftforge.items.IItemHandler;
@@ -169,7 +169,7 @@ public final class InventoryOperationsModuleDevice extends AbstractItemRPCDevice
final Direction direction = RobotOperationSide.getAdjustedDirection(side, entity);
return getItemStackHandlersInDirection(direction).findFirst().map(handler ->
takeFromInventory(count, handler, fromSlot)).orElse(0);
takeFromInventory(count, handler, fromSlot)).orElse(0);
}
///////////////////////////////////////////////////////////////////
@@ -197,9 +197,9 @@ public final class InventoryOperationsModuleDevice extends AbstractItemRPCDevice
private Stream<IItemHandler> 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<IItemHandler> getBlockItemHandlersAt(final Vec3 position, final Direction side) {

2
src/main/java/li/cil/oc2/common/bus/device/item/MemoryDevice.java
View File

@@ -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;

4
src/main/java/li/cil/oc2/common/bus/device/item/NetworkInterfaceCardItemDevice.java
View File

@@ -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;

46
src/main/java/li/cil/oc2/common/bus/device/item/RedstoneInterfaceCardItemDevice.java
View File

@@ -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].");
}
///////////////////////////////////////////////////////////////////

8
src/main/java/li/cil/oc2/common/bus/device/item/SoundCardItemDevice.java
View File

@@ -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;

4
src/main/java/li/cil/oc2/common/bus/device/provider/block/BlockStateDeviceProvider.java
View File

@@ -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 {

4
src/main/java/li/cil/oc2/common/bus/device/provider/block/DiskDriveDeviceProvider.java
View File

@@ -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;

4
src/main/java/li/cil/oc2/common/bus/device/provider/item/BlockOperationsModuleDeviceProvider.java
View File

@@ -27,8 +27,8 @@ public final class BlockOperationsModuleDeviceProvider extends AbstractItemDevic
@Override
protected Optional<ItemDevice> 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

6
src/main/java/li/cil/oc2/common/bus/device/provider/item/FileImportExportCardItemDeviceProvider.java
View File

@@ -27,7 +27,7 @@ public final class FileImportExportCardItemDeviceProvider extends AbstractItemDe
@Override
protected Optional<ItemDevice> 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<TerminalUserProvider> getTerminalUserProvider(final ItemDeviceQuery query) {
if (query.getContainerBlockEntity().isPresent()) {
final LazyOptional<TerminalUserProvider> 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<TerminalUserProvider> capability = query.getContainerEntity().get()
.getCapability(Capabilities.TERMINAL_USER_PROVIDER);
.getCapability(Capabilities.TERMINAL_USER_PROVIDER);
if (capability.isPresent()) {
return capability.resolve();
}

2
src/main/java/li/cil/oc2/common/bus/device/provider/item/FlashMemoryItemDeviceProvider.java
View File

@@ -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;

2
src/main/java/li/cil/oc2/common/bus/device/provider/item/HardDriveItemDeviceProvider.java
View File

@@ -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;

4
src/main/java/li/cil/oc2/common/bus/device/provider/item/InventoryOperationsModuleDeviceProvider.java
View File

@@ -27,8 +27,8 @@ public final class InventoryOperationsModuleDeviceProvider extends AbstractItemD
@Override
protected Optional<ItemDevice> 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

2
src/main/java/li/cil/oc2/common/bus/device/provider/item/MemoryItemDeviceProvider.java
View File

@@ -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;

2
src/main/java/li/cil/oc2/common/bus/device/provider/item/NetworkInterfaceCardItemDeviceProvider.java
View File

@@ -19,7 +19,7 @@ public final class NetworkInterfaceCardItemDeviceProvider extends AbstractItemDe
@Override
protected Optional<ItemDevice> getItemDevice(final ItemDeviceQuery query) {
return query.getContainerBlockEntity().map(blockEntity ->
new NetworkInterfaceCardItemDevice(query.getItemStack()));
new NetworkInterfaceCardItemDevice(query.getItemStack()));
}
@Override

2
src/main/java/li/cil/oc2/common/bus/device/provider/item/RedstoneInterfaceCardItemDeviceProvider.java
View File

@@ -19,7 +19,7 @@ public final class RedstoneInterfaceCardItemDeviceProvider extends AbstractItemD
@Override
protected Optional<ItemDevice> getItemDevice(final ItemDeviceQuery query) {
return query.getContainerBlockEntity().map(blockEntity ->
new RedstoneInterfaceCardItemDevice(query.getItemStack(), blockEntity));
new RedstoneInterfaceCardItemDevice(query.getItemStack(), blockEntity));
}
@Override

14
src/main/java/li/cil/oc2/common/bus/device/rpc/RPCDeviceList.java
View File

@@ -21,18 +21,18 @@ public final class RPCDeviceList implements RPCDevice {
@Override
public List<String> 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<RPCMethod> getMethods() {
return devices.stream()
.map(RPCDevice::getMethods)
.flatMap(Collection::stream)
.collect(Collectors.toList());
.map(RPCDevice::getMethods)
.flatMap(Collection::stream)
.collect(Collectors.toList());
}
@Override

4
src/main/java/li/cil/oc2/common/bus/device/rpc/RPCItemStackTagFilter.java
View File

@@ -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;

12
src/main/java/li/cil/oc2/common/bus/device/rpc/RPCItemStackTagFilters.java
View File

@@ -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();

2
src/main/java/li/cil/oc2/common/bus/device/rpc/RPCMethodParameterTypeAdapters.java
View File

@@ -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;

2
src/main/java/li/cil/oc2/common/bus/device/util/DeviceTypeImpl.java
View File

@@ -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<DeviceType> implements DeviceType {

6
src/main/java/li/cil/oc2/common/bus/device/util/Devices.java
View File

@@ -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;

4
src/main/java/li/cil/oc2/common/container/AbstractComputerContainer.java
View File

@@ -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;

2
src/main/java/li/cil/oc2/common/container/AbstractContainer.java
View File

@@ -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;

2
src/main/java/li/cil/oc2/common/container/AbstractMachineContainer.java
View File

@@ -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 {

2
src/main/java/li/cil/oc2/common/container/AbstractMachineTerminalContainer.java
View File

@@ -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;

2
src/main/java/li/cil/oc2/common/container/AbstractRobotContainer.java
View File

@@ -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;

18
src/main/java/li/cil/oc2/common/container/ComputerInventoryContainer.java
View File

@@ -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;

18
src/main/java/li/cil/oc2/common/container/ComputerTerminalContainer.java
View File

@@ -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;

4
src/main/java/li/cil/oc2/common/container/DeviceItemStackHandler.java
View File

@@ -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;

4
src/main/java/li/cil/oc2/common/container/FixedSizeItemStackHandler.java
View File

@@ -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 {

14
src/main/java/li/cil/oc2/common/container/RobotInventoryContainer.java
View File

@@ -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;

14
src/main/java/li/cil/oc2/common/container/RobotTerminalContainer.java
View File

@@ -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;

2
src/main/java/li/cil/oc2/common/container/TypedItemStackHandler.java
View File

@@ -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<Item> deviceType;

2
src/main/java/li/cil/oc2/common/container/TypedSlotItemHandler.java
View File

@@ -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;

4
src/main/java/li/cil/oc2/common/energy/EnergyStorageItemStack.java
View File

@@ -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;
}

57
src/main/java/li/cil/oc2/common/entity/RobotEntity.java
View File

@@ -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<BlockPos> TARGET_POSITION = SynchedEntityData.defineId(RobotEntity.class, EntityDataSerializers.BLOCK_POS);
public static final EntityDataAccessor<Direction> TARGET_DIRECTION = SynchedEntityData.defineId(RobotEntity.class, EntityDataSerializers.DIRECTION);

6
src/main/java/li/cil/oc2/common/entity/robot/RobotMovementAction.java
View File

@@ -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;

2
src/main/java/li/cil/oc2/common/entity/robot/RobotRotationAction.java
View File

@@ -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;

2
src/main/java/li/cil/oc2/common/entity/robot/RobotRotationActionType.java
View File

@@ -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 {

14
src/main/java/li/cil/oc2/common/item/AbstractBlockDeviceItem.java
View File

@@ -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);
}

10
src/main/java/li/cil/oc2/common/item/AbstractStorageItem.java
View File

@@ -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(")");
}
}

22
src/main/java/li/cil/oc2/common/item/BusCableItem.java
View File

@@ -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;

39
src/main/java/li/cil/oc2/common/item/BusInterfaceItem.java
View File

@@ -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<ConnectionType> 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);
}
///////////////////////////////////////////////////////////////////

4
src/main/java/li/cil/oc2/common/item/ChargerItem.java
View File

@@ -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) {

4
src/main/java/li/cil/oc2/common/item/FlashMemoryItem.java
View File

@@ -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;

14
src/main/java/li/cil/oc2/common/item/FlashMemoryWithExternalDataItem.java
View File

@@ -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);
}

4
src/main/java/li/cil/oc2/common/item/HardDriveItem.java
View File

@@ -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;

4
src/main/java/li/cil/oc2/common/item/HardDriveWithExternalDataItem.java
View File

@@ -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;

20
src/main/java/li/cil/oc2/common/item/Items.java
View File

@@ -39,28 +39,28 @@ public final class Items {
public static final RegistryObject<NetworkCableItem> NETWORK_CABLE = register("network_cable", NetworkCableItem::new);
public static final RegistryObject<MemoryItem> MEMORY_SMALL = register("memory_small", () ->
new MemoryItem(2 * Constants.MEGABYTE));
new MemoryItem(2 * Constants.MEGABYTE));
public static final RegistryObject<MemoryItem> MEMORY_MEDIUM = register("memory_medium", () ->
new MemoryItem(4 * Constants.MEGABYTE));
new MemoryItem(4 * Constants.MEGABYTE));
public static final RegistryObject<MemoryItem> MEMORY_LARGE = register("memory_large", () ->
new MemoryItem(8 * Constants.MEGABYTE));
new MemoryItem(8 * Constants.MEGABYTE));
public static final RegistryObject<HardDriveItem> 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<HardDriveItem> 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<HardDriveItem> 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<HardDriveWithExternalDataItem> 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<FlashMemoryItem> FLASH_MEMORY = register("flash_memory", () ->
new FlashMemoryItem(4 * Constants.KILOBYTE));
new FlashMemoryItem(4 * Constants.KILOBYTE));
public static final RegistryObject<FlashMemoryWithExternalDataItem> FLASH_MEMORY_CUSTOM = register("flash_memory_buildroot", () ->
new FlashMemoryWithExternalDataItem(Firmwares.BUILDROOT.getId()));
new FlashMemoryWithExternalDataItem(Firmwares.BUILDROOT.getId()));
public static final RegistryObject<FloppyItem> FLOPPY = register("floppy", () ->
new FloppyItem(512 * Constants.KILOBYTE));
new FloppyItem(512 * Constants.KILOBYTE));
public static final RegistryObject<Item> REDSTONE_INTERFACE_CARD = register("redstone_interface_card");
public static final RegistryObject<Item> NETWORK_INTERFACE_CARD = register("network_interface_card");

2
src/main/java/li/cil/oc2/common/item/MemoryItem.java
View File

@@ -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;

4
src/main/java/li/cil/oc2/common/item/ModItem.java
View File

@@ -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;

16
src/main/java/li/cil/oc2/common/item/NetworkCableItem.java
View File

@@ -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;

Some files were not shown because too many files have changed in this diff Show More