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

More package restructuring.

Browse Source
This commit is contained in:
Florian Nücke
2020-12-29 18:53:28 +01:00
parent 11fbc57709
commit d0e581fb8a
21 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/li/cil/oc2/OpenComputers.java
View File

@@ -5,13 +5,13 @@ import li.cil.oc2.api.API;
import li.cil.oc2.client.ClientSetup;
import li.cil.oc2.common.CommonSetup;
import li.cil.oc2.common.block.Blocks;
import li.cil.oc2.common.block.entity.TileEntities;
import li.cil.oc2.common.bus.device.DeviceTypes;
import li.cil.oc2.common.bus.device.data.BaseBlockDevices;
import li.cil.oc2.common.bus.device.data.Firmwares;
import li.cil.oc2.common.bus.device.provider.Providers;
import li.cil.oc2.common.container.Containers;
import li.cil.oc2.common.item.Items;
import li.cil.oc2.common.tileentity.TileEntities;
import li.cil.sedna.devicetree.DeviceTreeRegistry;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;

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

@@ -2,8 +2,8 @@ package li.cil.oc2.client;
import li.cil.oc2.client.gui.ComputerContainerScreen;
import li.cil.oc2.client.renderer.tileentity.ComputerTileEntityRenderer;
import li.cil.oc2.common.block.entity.TileEntities;
import li.cil.oc2.common.container.Containers;
import li.cil.oc2.common.tileentity.TileEntities;
import net.minecraft.client.gui.ScreenManager;
import net.minecraftforge.fml.client.registry.ClientRegistry;
import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;

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

@@ -7,10 +7,10 @@ import li.cil.oc2.api.API;
import li.cil.oc2.client.gui.terminal.TerminalInput;
import li.cil.oc2.client.gui.widget.Sprite;
import li.cil.oc2.client.gui.widget.ToggleImageButton;
import li.cil.oc2.common.block.entity.ComputerTileEntity;
import li.cil.oc2.common.network.Network;
import li.cil.oc2.common.network.message.ComputerPowerMessage;
import li.cil.oc2.common.network.message.TerminalBlockInputMessage;
import li.cil.oc2.common.tileentity.ComputerTileEntity;
import li.cil.oc2.common.vm.Terminal;
import net.minecraft.client.entity.player.ClientPlayerEntity;
import net.minecraft.client.gui.screen.Screen;

2
src/main/java/li/cil/oc2/client/renderer/tileentity/ComputerTileEntityRenderer.java
View File

@@ -6,7 +6,7 @@ import com.mojang.blaze3d.vertex.IVertexBuilder;
import li.cil.oc2.api.API;
import li.cil.oc2.client.renderer.OpenComputersRenderType;
import li.cil.oc2.common.block.ComputerBlock;
import li.cil.oc2.common.block.entity.ComputerTileEntity;
import li.cil.oc2.common.tileentity.ComputerTileEntity;
import li.cil.oc2.common.vm.Terminal;
import net.minecraft.client.gui.FontRenderer;
import net.minecraft.client.renderer.IRenderTypeBuffer;

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

@@ -1,11 +1,11 @@
package li.cil.oc2.common.block;
import com.google.common.collect.Maps;
import li.cil.oc2.common.block.entity.BusCableTileEntity;
import li.cil.oc2.common.block.entity.TileEntities;
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.tileentity.BusCableTileEntity;
import li.cil.oc2.common.tileentity.TileEntities;
import li.cil.oc2.common.util.ItemStackUtils;
import li.cil.oc2.common.util.WorldUtils;
import net.minecraft.block.Block;

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

@@ -2,11 +2,11 @@ package li.cil.oc2.common.block;
import li.cil.oc2.api.bus.device.capabilities.RedstoneEmitter;
import li.cil.oc2.client.gui.TerminalScreen;
import li.cil.oc2.common.block.entity.ComputerTileEntity;
import li.cil.oc2.common.block.entity.TileEntities;
import li.cil.oc2.common.capabilities.Capabilities;
import li.cil.oc2.common.container.ComputerContainer;
import li.cil.oc2.common.integration.Wrenches;
import li.cil.oc2.common.tileentity.ComputerTileEntity;
import li.cil.oc2.common.tileentity.TileEntities;
import li.cil.oc2.common.util.TooltipUtils;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;

4
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.block.entity.RedstoneInterfaceTileEntity;
import li.cil.oc2.common.block.entity.TileEntities;
import li.cil.oc2.common.tileentity.RedstoneInterfaceTileEntity;
import li.cil.oc2.common.tileentity.TileEntities;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.block.HorizontalBlock;

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

@@ -2,7 +2,7 @@ package li.cil.oc2.common.container;
import li.cil.oc2.api.bus.device.DeviceTypes;
import li.cil.oc2.common.block.Blocks;
import li.cil.oc2.common.block.entity.ComputerTileEntity;
import li.cil.oc2.common.tileentity.ComputerTileEntity;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.entity.player.PlayerInventory;
import net.minecraft.network.PacketBuffer;

2
src/main/java/li/cil/oc2/common/network/message/AbstractTerminalBlockMessage.java
View File

@@ -1,6 +1,6 @@
package li.cil.oc2.common.network.message;
import li.cil.oc2.common.block.entity.ComputerTileEntity;
import li.cil.oc2.common.tileentity.ComputerTileEntity;
import net.minecraft.network.PacketBuffer;
import net.minecraft.util.math.BlockPos;

2
src/main/java/li/cil/oc2/common/network/message/ComputerBootErrorMessage.java
View File

@@ -1,7 +1,7 @@
package li.cil.oc2.common.network.message;
import li.cil.oc2.common.block.entity.ComputerTileEntity;
import li.cil.oc2.common.network.MessageUtils;
import li.cil.oc2.common.tileentity.ComputerTileEntity;
import net.minecraft.network.PacketBuffer;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.text.ITextComponent;

2
src/main/java/li/cil/oc2/common/network/message/ComputerBusStateMessage.java
View File

@@ -1,8 +1,8 @@
package li.cil.oc2.common.network.message;
import li.cil.oc2.common.block.entity.ComputerTileEntity;
import li.cil.oc2.common.bus.AbstractDeviceBusController;
import li.cil.oc2.common.network.MessageUtils;
import li.cil.oc2.common.tileentity.ComputerTileEntity;
import net.minecraft.network.PacketBuffer;
import net.minecraft.util.math.BlockPos;
import net.minecraftforge.fml.network.NetworkEvent;

2
src/main/java/li/cil/oc2/common/network/message/ComputerPowerMessage.java
View File

@@ -1,7 +1,7 @@
package li.cil.oc2.common.network.message;
import li.cil.oc2.common.block.entity.ComputerTileEntity;
import li.cil.oc2.common.network.MessageUtils;
import li.cil.oc2.common.tileentity.ComputerTileEntity;
import net.minecraft.entity.player.ServerPlayerEntity;
import net.minecraft.network.PacketBuffer;
import net.minecraft.util.math.BlockPos;

2
src/main/java/li/cil/oc2/common/network/message/ComputerRunStateMessage.java
View File

@@ -1,7 +1,7 @@
package li.cil.oc2.common.network.message;
import li.cil.oc2.common.block.entity.ComputerTileEntity;
import li.cil.oc2.common.network.MessageUtils;
import li.cil.oc2.common.tileentity.ComputerTileEntity;
import net.minecraft.network.PacketBuffer;
import net.minecraft.util.math.BlockPos;
import net.minecraftforge.fml.network.NetworkEvent;

2
src/main/java/li/cil/oc2/common/network/message/TerminalBlockInputMessage.java
View File

@@ -1,7 +1,7 @@
package li.cil.oc2.common.network.message;
import li.cil.oc2.common.block.entity.ComputerTileEntity;
import li.cil.oc2.common.network.MessageUtils;
import li.cil.oc2.common.tileentity.ComputerTileEntity;
import net.minecraft.network.PacketBuffer;
import net.minecraftforge.fml.network.NetworkEvent;

2
src/main/java/li/cil/oc2/common/network/message/TerminalBlockOutputMessage.java
View File

@@ -1,7 +1,7 @@
package li.cil.oc2.common.network.message;
import li.cil.oc2.common.block.entity.ComputerTileEntity;
import li.cil.oc2.common.network.MessageUtils;
import li.cil.oc2.common.tileentity.ComputerTileEntity;
import net.minecraft.network.PacketBuffer;
import net.minecraftforge.fml.network.NetworkEvent;

2
src/main/java/li/cil/oc2/common/block/entity/AbstractTileEntity.java → src/main/java/li/cil/oc2/common/tileentity/AbstractTileEntity.java
View File

@@ -1,4 +1,4 @@
package li.cil.oc2.common.block.entity;
package li.cil.oc2.common.tileentity;
import li.cil.oc2.common.util.ServerScheduler;
import net.minecraft.tileentity.TileEntity;

2
src/main/java/li/cil/oc2/common/block/entity/BusCableTileEntity.java → src/main/java/li/cil/oc2/common/tileentity/BusCableTileEntity.java
View File

@@ -1,4 +1,4 @@
package li.cil.oc2.common.block.entity;
package li.cil.oc2.common.tileentity;
import li.cil.oc2.common.block.BusCableBlock;
import li.cil.oc2.common.bus.TileEntityDeviceBusElement;

2
src/main/java/li/cil/oc2/common/block/entity/ComputerTileEntity.java → src/main/java/li/cil/oc2/common/tileentity/ComputerTileEntity.java
View File

@@ -1,4 +1,4 @@
package li.cil.oc2.common.block.entity;
package li.cil.oc2.common.tileentity;
import it.unimi.dsi.fastutil.bytes.ByteArrayFIFOQueue;
import li.cil.ceres.api.Serialized;

2
src/main/java/li/cil/oc2/common/block/entity/RedstoneInterfaceTileEntity.java → src/main/java/li/cil/oc2/common/tileentity/RedstoneInterfaceTileEntity.java
View File

@@ -1,4 +1,4 @@
package li.cil.oc2.common.block.entity;
package li.cil.oc2.common.tileentity;
import li.cil.oc2.api.bus.device.object.Callback;
import li.cil.oc2.api.bus.device.object.DocumentedDevice;

2
src/main/java/li/cil/oc2/common/block/entity/TileEntities.java → src/main/java/li/cil/oc2/common/tileentity/TileEntities.java
View File

@@ -1,4 +1,4 @@
package li.cil.oc2.common.block.entity;
package li.cil.oc2.common.tileentity;
import li.cil.oc2.Constants;
import li.cil.oc2.api.API;

2
src/main/java/li/cil/oc2/common/block/entity/package-info.java → src/main/java/li/cil/oc2/common/tileentity/package-info.java
View File

@@ -1,6 +1,6 @@
@ParametersAreNonnullByDefault
@MethodsReturnNonnullByDefault
package li.cil.oc2.common.block.entity;
package li.cil.oc2.common.tileentity;
import mcp.MethodsReturnNonnullByDefault;