fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

The Great Renamening of 2020

Browse Source
This commit is contained in:
Sebastian Hartte
2020-06-22 12:14:54 +02:00
parent abe3334488
commit b4471b1abb
441 changed files with 3395 additions and 3468 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/block/storage/BlockChest.java → src/main/java/appeng/block/storage/ChestBlock.java
+7 -7
View File
@@ -36,16 +36,16 @@ import net.minecraft.world.World;
import appeng.block.AEBaseTileBlock;
import appeng.container.ContainerLocator;
import appeng.container.ContainerOpener;
import appeng.container.implementations.ContainerChest;
import appeng.container.implementations.ChestContainer;
import appeng.core.localization.PlayerMessages;
import appeng.tile.storage.TileChest;
import appeng.tile.storage.ChestTileEntity;
public class BlockChest extends AEBaseTileBlock<TileChest> {
public class ChestBlock extends AEBaseTileBlock<ChestTileEntity> {
private final static EnumProperty<DriveSlotState> SLOT_STATE = EnumProperty.create("slot_state",
DriveSlotState.class);
public BlockChest() {
public ChestBlock() {
super(defaultProps(Material.IRON));
this.setDefaultState(this.getDefaultState().with(SLOT_STATE, DriveSlotState.EMPTY));
}
@@ -57,7 +57,7 @@ public class BlockChest extends AEBaseTileBlock<TileChest> {
}
@Override
protected BlockState updateBlockStateFromTileEntity(BlockState currentState, TileChest te) {
protected BlockState updateBlockStateFromTileEntity(BlockState currentState, ChestTileEntity te) {
DriveSlotState slotState = DriveSlotState.EMPTY;
if (te.getCellCount() >= 1) {
@@ -74,7 +74,7 @@ public class BlockChest extends AEBaseTileBlock<TileChest> {
@Override
public ActionResultType onActivated(final World w, final BlockPos pos, final PlayerEntity p, final Hand hand,
final @Nullable ItemStack heldItem, final BlockRayTraceResult hit) {
final TileChest tg = this.getTileEntity(w, pos);
final ChestTileEntity tg = this.getTileEntity(w, pos);
if (tg != null && !p.isCrouching()) {
if (w.isRemote()) {
return ActionResultType.SUCCESS;
@@ -85,7 +85,7 @@ public class BlockChest extends AEBaseTileBlock<TileChest> {
p.sendMessage(PlayerMessages.ChestCannotReadStorageCell.get());
}
} else {
ContainerOpener.openContainer(ContainerChest.TYPE, p,
ContainerOpener.openContainer(ChestContainer.TYPE, p,
ContainerLocator.forTileEntitySide(tg, hit.getFace()));
}
src/main/java/appeng/block/storage/BlockDrive.java → src/main/java/appeng/block/storage/DriveBlock.java
+6 -6
View File
@@ -32,13 +32,13 @@ import net.minecraft.world.World;
import appeng.block.AEBaseTileBlock;
import appeng.container.ContainerLocator;
import appeng.container.ContainerOpener;
import appeng.container.implementations.ContainerDrive;
import appeng.tile.storage.TileDrive;
import appeng.container.implementations.DriveContainer;
import appeng.tile.storage.DriveTileEntity;
import appeng.util.Platform;
public class BlockDrive extends AEBaseTileBlock<TileDrive> {
public class DriveBlock extends AEBaseTileBlock<DriveTileEntity> {
public BlockDrive() {
public DriveBlock() {
super(defaultProps(Material.IRON));
}
@@ -49,10 +49,10 @@ public class BlockDrive extends AEBaseTileBlock<TileDrive> {
return ActionResultType.PASS;
}
final TileDrive tg = this.getTileEntity(w, pos);
final DriveTileEntity tg = this.getTileEntity(w, pos);
if (tg != null) {
if (Platform.isServer()) {
ContainerOpener.openContainer(ContainerDrive.TYPE, p, ContainerLocator.forTileEntity(tg));
ContainerOpener.openContainer(DriveContainer.TYPE, p, ContainerLocator.forTileEntity(tg));
}
return ActionResultType.SUCCESS;
}
src/main/java/appeng/block/storage/BlockIOPort.java → src/main/java/appeng/block/storage/IOPortBlock.java
+7 -7
View File
@@ -34,20 +34,20 @@ import net.minecraft.world.World;
import appeng.block.AEBaseTileBlock;
import appeng.container.ContainerLocator;
import appeng.container.ContainerOpener;
import appeng.container.implementations.ContainerIOPort;
import appeng.tile.storage.TileIOPort;
import appeng.container.implementations.IOPortContainer;
import appeng.tile.storage.IOPortTileEntity;
import appeng.util.Platform;
public class BlockIOPort extends AEBaseTileBlock<TileIOPort> {
public class IOPortBlock extends AEBaseTileBlock<IOPortTileEntity> {
public BlockIOPort() {
public IOPortBlock() {
super(defaultProps(Material.IRON));
}
@Override
public void neighborChanged(BlockState state, World world, BlockPos pos, Block blockIn, BlockPos fromPos,
boolean isMoving) {
final TileIOPort te = this.getTileEntity(world, pos);
final IOPortTileEntity te = this.getTileEntity(world, pos);
if (te != null) {
te.updateRedstoneState();
}
@@ -60,10 +60,10 @@ public class BlockIOPort extends AEBaseTileBlock<TileIOPort> {
return ActionResultType.PASS;
}
final TileIOPort tg = this.getTileEntity(w, pos);
final IOPortTileEntity tg = this.getTileEntity(w, pos);
if (tg != null) {
if (Platform.isServer()) {
ContainerOpener.openContainer(ContainerIOPort.TYPE, p,
ContainerOpener.openContainer(IOPortContainer.TYPE, p,
ContainerLocator.forTileEntitySide(tg, hit.getFace()));
}
return ActionResultType.SUCCESS;
src/main/java/appeng/block/storage/BlockSkyChest.java → src/main/java/appeng/block/storage/SkyChestBlock.java
+7 -7
View File
@@ -39,11 +39,11 @@ import net.minecraft.world.World;
import appeng.block.AEBaseTileBlock;
import appeng.container.ContainerLocator;
import appeng.container.ContainerOpener;
import appeng.container.implementations.ContainerSkyChest;
import appeng.tile.storage.TileSkyChest;
import appeng.container.implementations.SkyChestContainer;
import appeng.tile.storage.SkyChestTileEntity;
import appeng.util.Platform;
public class BlockSkyChest extends AEBaseTileBlock<TileSkyChest> {
public class SkyChestBlock extends AEBaseTileBlock<SkyChestTileEntity> {
private static final double AABB_OFFSET_BOTTOM = 0.00;
private static final double AABB_OFFSET_SIDES = 0.06;
@@ -55,7 +55,7 @@ public class BlockSkyChest extends AEBaseTileBlock<TileSkyChest> {
public final SkyChestType type;
public BlockSkyChest(final SkyChestType type, Properties props) {
public SkyChestBlock(final SkyChestType type, Properties props) {
super(props);
this.type = type;
}
@@ -74,12 +74,12 @@ public class BlockSkyChest extends AEBaseTileBlock<TileSkyChest> {
public ActionResultType onActivated(final World w, final BlockPos pos, final PlayerEntity player, final Hand hand,
final @Nullable ItemStack heldItem, final BlockRayTraceResult hit) {
if (Platform.isServer()) {
TileSkyChest tile = getTileEntity(w, pos);
SkyChestTileEntity tile = getTileEntity(w, pos);
if (tile == null) {
return ActionResultType.PASS;
}
ContainerOpener.openContainer(ContainerSkyChest.TYPE, player, ContainerLocator.forTileEntity(tile));
ContainerOpener.openContainer(SkyChestContainer.TYPE, player, ContainerLocator.forTileEntity(tile));
}
return ActionResultType.SUCCESS;
@@ -93,7 +93,7 @@ public class BlockSkyChest extends AEBaseTileBlock<TileSkyChest> {
}
private AxisAlignedBB computeAABB(final IBlockReader w, final BlockPos pos) {
final TileSkyChest sk = this.getTileEntity(w, pos);
final SkyChestTileEntity sk = this.getTileEntity(w, pos);
Direction o = Direction.UP;
if (sk != null) {