diff --git a/src/api/java/appeng/api/implementations/parts/IPartCable.java b/src/api/java/appeng/api/implementations/parts/ICablePart.java similarity index 97% rename from src/api/java/appeng/api/implementations/parts/IPartCable.java rename to src/api/java/appeng/api/implementations/parts/ICablePart.java index aa7ca7ef8..28c183af7 100644 --- a/src/api/java/appeng/api/implementations/parts/IPartCable.java +++ b/src/api/java/appeng/api/implementations/parts/ICablePart.java @@ -40,7 +40,7 @@ import appeng.api.util.AEPartLocation; * Implemented on the {@link IPart}s cable objects that can be placed at * {@link AEPartLocation}.UNKNOWN in {@link IPartHost}s */ -public interface IPartCable extends IPart, IGridHost { +public interface ICablePart extends IPart, IGridHost { /** * does this cable support buses? diff --git a/src/api/java/appeng/api/implementations/parts/IPartMonitor.java b/src/api/java/appeng/api/implementations/parts/IMonitorPart.java similarity index 96% rename from src/api/java/appeng/api/implementations/parts/IPartMonitor.java rename to src/api/java/appeng/api/implementations/parts/IMonitorPart.java index 0f4f6476f..cf57a1f46 100644 --- a/src/api/java/appeng/api/implementations/parts/IPartMonitor.java +++ b/src/api/java/appeng/api/implementations/parts/IMonitorPart.java @@ -29,7 +29,7 @@ import appeng.api.parts.IPart; /** * Implemented by all screen like parts provided by AE. */ -public interface IPartMonitor extends IPart, IGridHost { +public interface IMonitorPart extends IPart, IGridHost { /** * @return if the device is online you should check this before providing any diff --git a/src/api/java/appeng/api/implementations/parts/IPartStorageMonitor.java b/src/api/java/appeng/api/implementations/parts/IStorageMonitorPart.java similarity index 96% rename from src/api/java/appeng/api/implementations/parts/IPartStorageMonitor.java rename to src/api/java/appeng/api/implementations/parts/IStorageMonitorPart.java index 099da92bc..e8833dc4a 100644 --- a/src/api/java/appeng/api/implementations/parts/IPartStorageMonitor.java +++ b/src/api/java/appeng/api/implementations/parts/IStorageMonitorPart.java @@ -31,7 +31,7 @@ import appeng.api.util.INetworkToolAgent; /** * The Storage monitor is a {@link IPart} located on the sides of a IPartHost */ -public interface IPartStorageMonitor extends IPartMonitor, IPart, IGridHost, INetworkToolAgent { +public interface IStorageMonitorPart extends IMonitorPart, IPart, IGridHost, INetworkToolAgent { /** * @return the item being displayed on the storage monitor, in AEStack Form, can diff --git a/src/main/java/appeng/block/AEBaseBlockItem.java b/src/main/java/appeng/block/AEBaseBlockItem.java index d04b37895..93d124b3a 100644 --- a/src/main/java/appeng/block/AEBaseBlockItem.java +++ b/src/main/java/appeng/block/AEBaseBlockItem.java @@ -36,11 +36,11 @@ import net.minecraftforge.api.distmarker.OnlyIn; import appeng.api.util.IOrientable; import appeng.api.util.IOrientableBlock; -import appeng.block.misc.BlockLightDetector; -import appeng.block.misc.BlockSkyCompass; -import appeng.block.networking.BlockWireless; +import appeng.block.misc.LightDetectorBlock; +import appeng.block.misc.SkyCompassBlock; +import appeng.block.networking.WirelessBlock; import appeng.me.helpers.IGridProxyable; -import appeng.tile.AEBaseTile; +import appeng.tile.AEBaseTileEntity; public class AEBaseBlockItem extends BlockItem { @@ -84,14 +84,14 @@ public class AEBaseBlockItem extends BlockItem { PlayerEntity player = context.getPlayer(); if (this.blockType instanceof AEBaseTileBlock) { - if (this.blockType instanceof BlockLightDetector) { + if (this.blockType instanceof LightDetectorBlock) { up = side; if (up == Direction.UP || up == Direction.DOWN) { forward = Direction.SOUTH; } else { forward = Direction.UP; } - } else if (this.blockType instanceof BlockWireless || this.blockType instanceof BlockSkyCompass) { + } else if (this.blockType instanceof WirelessBlock || this.blockType instanceof SkyCompassBlock) { forward = side; if (forward == Direction.UP || forward == Direction.DOWN) { up = Direction.SOUTH; @@ -133,8 +133,8 @@ public class AEBaseBlockItem extends BlockItem { return result; } - if (this.blockType instanceof AEBaseTileBlock && !(this.blockType instanceof BlockLightDetector)) { - final AEBaseTile tile = ((AEBaseTileBlock) this.blockType).getTileEntity(context.getWorld(), + if (this.blockType instanceof AEBaseTileBlock && !(this.blockType instanceof LightDetectorBlock)) { + final AEBaseTileEntity tile = ((AEBaseTileBlock) this.blockType).getTileEntity(context.getWorld(), context.getPos()); ori = tile; diff --git a/src/main/java/appeng/block/AEBaseTileBlock.java b/src/main/java/appeng/block/AEBaseTileBlock.java index 21c3a71c2..da13512ff 100644 --- a/src/main/java/appeng/block/AEBaseTileBlock.java +++ b/src/main/java/appeng/block/AEBaseTileBlock.java @@ -52,15 +52,15 @@ import appeng.api.implementations.items.MemoryCardMessages; import appeng.api.implementations.tiles.IColorableTile; import appeng.api.util.AEColor; import appeng.api.util.IOrientable; -import appeng.block.networking.BlockCableBus; -import appeng.tile.AEBaseInvTile; -import appeng.tile.AEBaseTile; -import appeng.tile.networking.TileCableBus; -import appeng.tile.storage.TileSkyChest; +import appeng.block.networking.CableBusBlock; +import appeng.tile.AEBaseInvTileEntity; +import appeng.tile.AEBaseTileEntity; +import appeng.tile.networking.CableBusTileEntity; +import appeng.tile.storage.SkyChestTileEntity; import appeng.util.Platform; import appeng.util.SettingsFrom; -public abstract class AEBaseTileBlock extends AEBaseBlock { +public abstract class AEBaseTileBlock extends AEBaseBlock { @Nonnull private Class tileEntityClass; @@ -75,7 +75,7 @@ public abstract class AEBaseTileBlock extends AEBaseBlock public void setTileEntity(final Class tileEntityClass, Supplier factory) { this.tileEntityClass = tileEntityClass; this.tileEntityFactory = factory; - this.setInventory(AEBaseInvTile.class.isAssignableFrom(tileEntityClass)); + this.setInventory(AEBaseInvTileEntity.class.isAssignableFrom(tileEntityClass)); } @Override @@ -127,7 +127,7 @@ public abstract class AEBaseTileBlock extends AEBaseBlock return; // Just a block state change } - final AEBaseTile te = this.getTileEntity(w, pos); + final AEBaseTileEntity te = this.getTileEntity(w, pos); if (te != null) { final ArrayList drops = new ArrayList<>(); if (te.dropItems()) { @@ -167,8 +167,8 @@ public abstract class AEBaseTileBlock extends AEBaseBlock @Override public int getComparatorInputOverride(BlockState state, final World w, final BlockPos pos) { final TileEntity te = this.getTileEntity(w, pos); - if (te instanceof AEBaseInvTile) { - AEBaseInvTile invTile = (AEBaseInvTile) te; + if (te instanceof AEBaseInvTileEntity) { + AEBaseInvTileEntity invTile = (AEBaseInvTileEntity) te; if (invTile.getInternalInventory().getSlots() > 0) { return ItemHandlerHelper.calcRedstoneFromInventory(invTile.getInternalInventory()); } @@ -192,7 +192,7 @@ public abstract class AEBaseTileBlock extends AEBaseBlock // than a translation component, since our custom naming cannot handle // untranslated // I18N strings and we would translate it using the server's locale :-( - AEBaseTile te = this.getTileEntity(w, pos); + AEBaseTileEntity te = this.getTileEntity(w, pos); if (te != null && is.hasDisplayName()) { ITextComponent displayName = is.getDisplayName(); if (displayName instanceof StringTextComponent) { @@ -212,13 +212,13 @@ public abstract class AEBaseTileBlock extends AEBaseBlock final BlockState blockState = world.getBlockState(pos); final Block block = blockState.getBlock(); - final AEBaseTile tile = this.getTileEntity(world, pos); + final AEBaseTileEntity tile = this.getTileEntity(world, pos); if (tile == null) { return ActionResultType.FAIL; } - if (tile instanceof TileCableBus || tile instanceof TileSkyChest) { + if (tile instanceof CableBusTileEntity || tile instanceof SkyChestTileEntity) { return ActionResultType.FAIL; } @@ -243,9 +243,9 @@ public abstract class AEBaseTileBlock extends AEBaseBlock return ActionResultType.FAIL; } - if (heldItem.getItem() instanceof IMemoryCard && !(this instanceof BlockCableBus)) { + if (heldItem.getItem() instanceof IMemoryCard && !(this instanceof CableBusBlock)) { final IMemoryCard memoryCard = (IMemoryCard) heldItem.getItem(); - final AEBaseTile tileEntity = this.getTileEntity(world, pos); + final AEBaseTileEntity tileEntity = this.getTileEntity(world, pos); if (tileEntity == null) { return ActionResultType.FAIL; diff --git a/src/main/java/appeng/block/crafting/AbstractCraftingUnitBlock.java b/src/main/java/appeng/block/crafting/AbstractCraftingUnitBlock.java index 18ae062b9..dec8ba807 100644 --- a/src/main/java/appeng/block/crafting/AbstractCraftingUnitBlock.java +++ b/src/main/java/appeng/block/crafting/AbstractCraftingUnitBlock.java @@ -32,10 +32,10 @@ import net.minecraft.world.World; import appeng.block.AEBaseTileBlock; import appeng.container.ContainerLocator; import appeng.container.ContainerOpener; -import appeng.container.implementations.ContainerCraftingCPU; -import appeng.tile.crafting.TileCraftingTile; +import appeng.container.implementations.CraftingCPUContainer; +import appeng.tile.crafting.CraftingTileEntity; -public abstract class AbstractCraftingUnitBlock extends AEBaseTileBlock { +public abstract class AbstractCraftingUnitBlock extends AEBaseTileBlock { public static final BooleanProperty FORMED = BooleanProperty.create("formed"); public static final BooleanProperty POWERED = BooleanProperty.create("powered"); @@ -57,7 +57,7 @@ public abstract class AbstractCraftingUnitBlock exte @Override public void neighborChanged(final BlockState state, final World worldIn, final BlockPos pos, final Block blockIn, final BlockPos fromPos, boolean isMoving) { - final TileCraftingTile cp = this.getTileEntity(worldIn, pos); + final CraftingTileEntity cp = this.getTileEntity(worldIn, pos); if (cp != null) { cp.updateMultiBlock(); } @@ -69,7 +69,7 @@ public abstract class AbstractCraftingUnitBlock exte return; // Just a block state change } - final TileCraftingTile cp = this.getTileEntity(w, pos); + final CraftingTileEntity cp = this.getTileEntity(w, pos); if (cp != null) { cp.breakCluster(); } @@ -80,11 +80,11 @@ public abstract class AbstractCraftingUnitBlock exte @Override public ActionResultType onBlockActivated(BlockState state, World w, BlockPos pos, PlayerEntity p, Hand hand, BlockRayTraceResult hit) { - final TileCraftingTile tg = this.getTileEntity(w, pos); + final CraftingTileEntity tg = this.getTileEntity(w, pos); if (tg != null && !p.isCrouching() && tg.isFormed() && tg.isActive()) { if (!w.isRemote()) { - ContainerOpener.openContainer(ContainerCraftingCPU.TYPE, p, + ContainerOpener.openContainer(CraftingCPUContainer.TYPE, p, ContainerLocator.forTileEntitySide(tg, hit.getFace())); } diff --git a/src/main/java/appeng/block/crafting/BlockCraftingMonitor.java b/src/main/java/appeng/block/crafting/CraftingMonitorBlock.java similarity index 81% rename from src/main/java/appeng/block/crafting/BlockCraftingMonitor.java rename to src/main/java/appeng/block/crafting/CraftingMonitorBlock.java index f51295bc4..2f7acdcd9 100644 --- a/src/main/java/appeng/block/crafting/BlockCraftingMonitor.java +++ b/src/main/java/appeng/block/crafting/CraftingMonitorBlock.java @@ -18,10 +18,10 @@ package appeng.block.crafting; -import appeng.tile.crafting.TileCraftingMonitorTile; +import appeng.tile.crafting.CraftingMonitorTileEntity; -public class BlockCraftingMonitor extends AbstractCraftingUnitBlock { - public BlockCraftingMonitor(Properties props) { +public class CraftingMonitorBlock extends AbstractCraftingUnitBlock { + public CraftingMonitorBlock(Properties props) { super(props, CraftingUnitType.MONITOR); } } diff --git a/src/main/java/appeng/block/crafting/BlockCraftingStorage.java b/src/main/java/appeng/block/crafting/CraftingStorageBlock.java similarity index 80% rename from src/main/java/appeng/block/crafting/BlockCraftingStorage.java rename to src/main/java/appeng/block/crafting/CraftingStorageBlock.java index 7d185d1a7..e89671b9c 100644 --- a/src/main/java/appeng/block/crafting/BlockCraftingStorage.java +++ b/src/main/java/appeng/block/crafting/CraftingStorageBlock.java @@ -18,11 +18,11 @@ package appeng.block.crafting; -import appeng.tile.crafting.TileCraftingStorageTile; +import appeng.tile.crafting.CraftingStorageTileEntity; -public class BlockCraftingStorage extends AbstractCraftingUnitBlock { +public class CraftingStorageBlock extends AbstractCraftingUnitBlock { - public BlockCraftingStorage(Properties props, CraftingUnitType type) { + public CraftingStorageBlock(Properties props, CraftingUnitType type) { super(props, type); } diff --git a/src/main/java/appeng/block/crafting/ItemCraftingStorage.java b/src/main/java/appeng/block/crafting/CraftingStorageItem.java similarity index 92% rename from src/main/java/appeng/block/crafting/ItemCraftingStorage.java rename to src/main/java/appeng/block/crafting/CraftingStorageItem.java index 4770530e1..b16cb538a 100644 --- a/src/main/java/appeng/block/crafting/ItemCraftingStorage.java +++ b/src/main/java/appeng/block/crafting/CraftingStorageItem.java @@ -26,9 +26,9 @@ import appeng.api.features.AEFeature; import appeng.block.AEBaseBlockItem; import appeng.core.AEConfig; -public class ItemCraftingStorage extends AEBaseBlockItem { +public class CraftingStorageItem extends AEBaseBlockItem { - public ItemCraftingStorage(Block id, Properties props) { + public CraftingStorageItem(Block id, Properties props) { super(id, props); } diff --git a/src/main/java/appeng/block/crafting/CraftingUnitBlock.java b/src/main/java/appeng/block/crafting/CraftingUnitBlock.java index cf61258a7..150ad9d66 100644 --- a/src/main/java/appeng/block/crafting/CraftingUnitBlock.java +++ b/src/main/java/appeng/block/crafting/CraftingUnitBlock.java @@ -18,9 +18,9 @@ package appeng.block.crafting; -import appeng.tile.crafting.TileCraftingTile; +import appeng.tile.crafting.CraftingTileEntity; -public class CraftingUnitBlock extends AbstractCraftingUnitBlock { +public class CraftingUnitBlock extends AbstractCraftingUnitBlock { public CraftingUnitBlock(Properties props, CraftingUnitType type) { super(props, type); diff --git a/src/main/java/appeng/block/crafting/BlockMolecularAssembler.java b/src/main/java/appeng/block/crafting/MolecularAssemblerBlock.java similarity index 82% rename from src/main/java/appeng/block/crafting/BlockMolecularAssembler.java rename to src/main/java/appeng/block/crafting/MolecularAssemblerBlock.java index c0c157610..6d1bb6361 100644 --- a/src/main/java/appeng/block/crafting/BlockMolecularAssembler.java +++ b/src/main/java/appeng/block/crafting/MolecularAssemblerBlock.java @@ -32,14 +32,14 @@ import net.minecraft.world.World; import appeng.block.AEBaseTileBlock; import appeng.container.ContainerLocator; import appeng.container.ContainerOpener; -import appeng.container.implementations.ContainerMolecularAssembler; -import appeng.tile.crafting.TileMolecularAssembler; +import appeng.container.implementations.MolecularAssemblerContainer; +import appeng.tile.crafting.MolecularAssemblerTileEntity; -public class BlockMolecularAssembler extends AEBaseTileBlock { +public class MolecularAssemblerBlock extends AEBaseTileBlock { public static final BooleanProperty POWERED = BooleanProperty.create("powered"); - public BlockMolecularAssembler(Block.Properties props) { + public MolecularAssemblerBlock(Block.Properties props) { super(props); setDefaultState(getDefaultState().with(POWERED, false)); } @@ -51,17 +51,17 @@ public class BlockMolecularAssembler extends AEBaseTileBlock { +public class CrankBlock extends AEBaseTileBlock { - public BlockCrank(Properties props) { + public CrankBlock(Properties props) { super(props); } @@ -62,7 +62,7 @@ public class BlockCrank extends AEBaseTileBlock { return ActionResultType.SUCCESS; } - final TileCrank tile = this.getTileEntity(w, pos); + final CrankTileEntity tile = this.getTileEntity(w, pos); if (tile != null) { if (tile.power()) { AeStats.TurnedCranks.addToPlayer(player, 1); @@ -81,7 +81,7 @@ public class BlockCrank extends AEBaseTileBlock { @Override public void onBlockPlacedBy(final World world, final BlockPos pos, final BlockState state, final LivingEntity placer, final ItemStack stack) { - final AEBaseTile tile = this.getTileEntity(world, pos); + final AEBaseTileEntity tile = this.getTileEntity(world, pos); if (tile != null) { final Direction mnt = this.findCrankable(world, pos); Direction forward = Direction.UP; @@ -97,7 +97,7 @@ public class BlockCrank extends AEBaseTileBlock { @Override public boolean isValidOrientation(final IWorld w, final BlockPos pos, final Direction forward, final Direction up) { final TileEntity te = w.getTileEntity(pos); - return !(te instanceof TileCrank) || this.isCrankable(w, pos, up.getOpposite()); + return !(te instanceof CrankTileEntity) || this.isCrankable(w, pos, up.getOpposite()); } private Direction findCrankable(final IBlockReader world, final BlockPos pos) { @@ -124,7 +124,7 @@ public class BlockCrank extends AEBaseTileBlock { @Override public void neighborChanged(BlockState state, World world, BlockPos pos, Block blockIn, BlockPos fromPos, boolean isMoving) { - final AEBaseTile tile = this.getTileEntity(world, pos); + final AEBaseTileEntity tile = this.getTileEntity(world, pos); if (tile != null) { if (!this.isCrankable(world, pos, tile.getUp().getOpposite())) { this.dropCrank(world, pos); @@ -140,7 +140,7 @@ public class BlockCrank extends AEBaseTileBlock { } private Direction getUp(IBlockReader world, BlockPos pos) { - TileCrank crank = getTileEntity(world, pos); + CrankTileEntity crank = getTileEntity(world, pos); return crank != null ? crank.getUp() : null; } diff --git a/src/main/java/appeng/block/grindstone/BlockGrinder.java b/src/main/java/appeng/block/grindstone/GrinderBlock.java similarity index 84% rename from src/main/java/appeng/block/grindstone/BlockGrinder.java rename to src/main/java/appeng/block/grindstone/GrinderBlock.java index ccc1de7f6..7ceedba54 100644 --- a/src/main/java/appeng/block/grindstone/BlockGrinder.java +++ b/src/main/java/appeng/block/grindstone/GrinderBlock.java @@ -32,22 +32,22 @@ import net.minecraft.world.World; import appeng.block.AEBaseTileBlock; import appeng.container.ContainerLocator; import appeng.container.ContainerOpener; -import appeng.container.implementations.ContainerGrinder; -import appeng.tile.grindstone.TileGrinder; +import appeng.container.implementations.GrinderContainer; +import appeng.tile.grindstone.GrinderTileEntity; -public class BlockGrinder extends AEBaseTileBlock { +public class GrinderBlock extends AEBaseTileBlock { - public BlockGrinder(Properties props) { + public GrinderBlock(Properties props) { super(props); } @Override public ActionResultType onActivated(final World w, final BlockPos pos, final PlayerEntity p, final Hand hand, final @Nullable ItemStack heldItem, final BlockRayTraceResult hit) { - final TileGrinder tg = this.getTileEntity(w, pos); + final GrinderTileEntity tg = this.getTileEntity(w, pos); if (tg != null && !p.isCrouching()) { if (p instanceof ServerPlayerEntity) { - ContainerOpener.openContainer(ContainerGrinder.TYPE, p, + ContainerOpener.openContainer(GrinderContainer.TYPE, p, ContainerLocator.forTileEntitySide(tg, hit.getFace())); } return ActionResultType.SUCCESS; diff --git a/src/main/java/appeng/block/misc/BlockCellWorkbench.java b/src/main/java/appeng/block/misc/CellWorkbenchBlock.java similarity index 83% rename from src/main/java/appeng/block/misc/BlockCellWorkbench.java rename to src/main/java/appeng/block/misc/CellWorkbenchBlock.java index bcb00a47c..d77da04f0 100644 --- a/src/main/java/appeng/block/misc/BlockCellWorkbench.java +++ b/src/main/java/appeng/block/misc/CellWorkbenchBlock.java @@ -31,13 +31,13 @@ import net.minecraft.world.World; import appeng.block.AEBaseTileBlock; import appeng.container.ContainerLocator; -import appeng.container.implementations.ContainerCellWorkbench; -import appeng.tile.misc.TileCellWorkbench; +import appeng.container.implementations.CellWorkbenchContainer; +import appeng.tile.misc.CellWorkbenchTileEntity; import appeng.util.Platform; -public class BlockCellWorkbench extends AEBaseTileBlock { +public class CellWorkbenchBlock extends AEBaseTileBlock { - public BlockCellWorkbench() { + public CellWorkbenchBlock() { super(defaultProps(Material.IRON)); } @@ -48,10 +48,10 @@ public class BlockCellWorkbench extends AEBaseTileBlock { return ActionResultType.PASS; } - final TileCellWorkbench tg = this.getTileEntity(w, pos); + final CellWorkbenchTileEntity tg = this.getTileEntity(w, pos); if (tg != null) { if (Platform.isServer()) { - ContainerCellWorkbench.open(p, ContainerLocator.forTileEntity(tg)); + CellWorkbenchContainer.open(p, ContainerLocator.forTileEntity(tg)); } return ActionResultType.SUCCESS; } diff --git a/src/main/java/appeng/block/misc/BlockCharger.java b/src/main/java/appeng/block/misc/ChargerBlock.java similarity index 93% rename from src/main/java/appeng/block/misc/BlockCharger.java rename to src/main/java/appeng/block/misc/ChargerBlock.java index c505d1da7..9e9b388a0 100644 --- a/src/main/java/appeng/block/misc/BlockCharger.java +++ b/src/main/java/appeng/block/misc/ChargerBlock.java @@ -57,12 +57,12 @@ import appeng.client.render.renderable.ItemRenderable; import appeng.client.render.tesr.ModularTESR; import appeng.core.AEConfig; import appeng.core.AppEng; -import appeng.tile.misc.TileCharger; +import appeng.tile.misc.ChargerTileEntity; import appeng.util.Platform; -public class BlockCharger extends AEBaseTileBlock { +public class ChargerBlock extends AEBaseTileBlock { - public BlockCharger() { + public ChargerBlock() { super(defaultProps(Material.IRON).notSolid()); this.setFullSize(this.setOpaque(false)); @@ -81,7 +81,7 @@ public class BlockCharger extends AEBaseTileBlock { } if (Platform.isServer()) { - final TileCharger tc = this.getTileEntity(w, pos); + final ChargerTileEntity tc = this.getTileEntity(w, pos); if (tc != null) { tc.activate(player); } @@ -101,7 +101,7 @@ public class BlockCharger extends AEBaseTileBlock { return; } - final TileCharger tile = this.getTileEntity(w, pos); + final ChargerTileEntity tile = this.getTileEntity(w, pos); if (tile != null) { if (AEApi.instance().definitions().materials().certusQuartzCrystalCharged() .isSameAs(tile.getInternalInventory().getStackInSlot(0))) { @@ -122,7 +122,7 @@ public class BlockCharger extends AEBaseTileBlock { @Override public VoxelShape getShape(BlockState state, IBlockReader w, BlockPos pos, ISelectionContext context) { - final TileCharger tile = this.getTileEntity(w, pos); + final ChargerTileEntity tile = this.getTileEntity(w, pos); if (tile != null) { final double twoPixels = 2.0 / 16.0; final Direction up = tile.getUp(); @@ -178,12 +178,12 @@ public class BlockCharger extends AEBaseTileBlock { } @OnlyIn(Dist.CLIENT) - public static Function> createTesr() { - return dispatcher -> new ModularTESR<>(dispatcher, new ItemRenderable<>(BlockCharger::getRenderedItem)); + public static Function> createTesr() { + return dispatcher -> new ModularTESR<>(dispatcher, new ItemRenderable<>(ChargerBlock::getRenderedItem)); } @OnlyIn(Dist.CLIENT) - private static Pair getRenderedItem(TileCharger tile) { + private static Pair getRenderedItem(ChargerTileEntity tile) { TransformationMatrix transform = new TransformationMatrix(new Vector3f(0.5f, 0.375f, 0.5f), null, null, null); return new ImmutablePair<>(tile.getInternalInventory().getStackInSlot(0), transform); } diff --git a/src/main/java/appeng/block/misc/BlockCondenser.java b/src/main/java/appeng/block/misc/CondenserBlock.java similarity index 85% rename from src/main/java/appeng/block/misc/BlockCondenser.java rename to src/main/java/appeng/block/misc/CondenserBlock.java index e6c5de87c..9303c2f7f 100644 --- a/src/main/java/appeng/block/misc/BlockCondenser.java +++ b/src/main/java/appeng/block/misc/CondenserBlock.java @@ -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.ContainerCondenser; -import appeng.tile.misc.TileCondenser; +import appeng.container.implementations.CondenserContainer; +import appeng.tile.misc.CondenserTileEntity; import appeng.util.Platform; -public class BlockCondenser extends AEBaseTileBlock { +public class CondenserBlock extends AEBaseTileBlock { - public BlockCondenser() { + public CondenserBlock() { super(defaultProps(Material.IRON)); } @@ -50,9 +50,9 @@ public class BlockCondenser extends AEBaseTileBlock { } if (Platform.isServer()) { - final TileCondenser tc = this.getTileEntity(w, pos); + final CondenserTileEntity tc = this.getTileEntity(w, pos); if (tc != null && !player.isCrouching()) { - ContainerOpener.openContainer(ContainerCondenser.TYPE, player, + ContainerOpener.openContainer(CondenserContainer.TYPE, player, ContainerLocator.forTileEntitySide(tc, hit.getFace())); return ActionResultType.SUCCESS; } diff --git a/src/main/java/appeng/block/misc/BlockInscriber.java b/src/main/java/appeng/block/misc/InscriberBlock.java similarity index 85% rename from src/main/java/appeng/block/misc/BlockInscriber.java rename to src/main/java/appeng/block/misc/InscriberBlock.java index c11730667..85c796b66 100644 --- a/src/main/java/appeng/block/misc/BlockInscriber.java +++ b/src/main/java/appeng/block/misc/InscriberBlock.java @@ -33,12 +33,12 @@ import net.minecraft.world.World; import appeng.block.AEBaseTileBlock; import appeng.container.ContainerLocator; import appeng.container.ContainerOpener; -import appeng.container.implementations.ContainerInscriber; -import appeng.tile.misc.TileInscriber; +import appeng.container.implementations.InscriberContainer; +import appeng.tile.misc.InscriberTileEntity; -public class BlockInscriber extends AEBaseTileBlock { +public class InscriberBlock extends AEBaseTileBlock { - public BlockInscriber(Properties props) { + public InscriberBlock(Properties props) { super(props); } @@ -52,10 +52,10 @@ public class BlockInscriber extends AEBaseTileBlock { public ActionResultType onActivated(final World w, final BlockPos pos, final PlayerEntity p, final Hand hand, final @Nullable ItemStack heldItem, final BlockRayTraceResult hit) { if (!p.isCrouching()) { - final TileInscriber tg = this.getTileEntity(w, pos); + final InscriberTileEntity tg = this.getTileEntity(w, pos); if (tg != null) { if (!tg.isRemote()) { - ContainerOpener.openContainer(ContainerInscriber.TYPE, p, + ContainerOpener.openContainer(InscriberContainer.TYPE, p, ContainerLocator.forTileEntitySide(tg, hit.getFace())); } return ActionResultType.SUCCESS; diff --git a/src/main/java/appeng/block/misc/InscriberRendering.java b/src/main/java/appeng/block/misc/InscriberRendering.java index c512f721c..0aa5c4caf 100644 --- a/src/main/java/appeng/block/misc/InscriberRendering.java +++ b/src/main/java/appeng/block/misc/InscriberRendering.java @@ -7,13 +7,13 @@ import net.minecraftforge.api.distmarker.OnlyIn; import appeng.bootstrap.TileEntityRendering; import appeng.bootstrap.TileEntityRenderingCustomizer; import appeng.client.render.tesr.InscriberTESR; -import appeng.tile.misc.TileInscriber; +import appeng.tile.misc.InscriberTileEntity; -public class InscriberRendering extends TileEntityRenderingCustomizer { +public class InscriberRendering extends TileEntityRenderingCustomizer { @OnlyIn(Dist.CLIENT) @Override - public void customize(TileEntityRendering rendering) { + public void customize(TileEntityRendering rendering) { rendering.tileEntityRenderer(InscriberTESR::new); } diff --git a/src/main/java/appeng/block/misc/BlockInterface.java b/src/main/java/appeng/block/misc/InterfaceBlock.java similarity index 85% rename from src/main/java/appeng/block/misc/BlockInterface.java rename to src/main/java/appeng/block/misc/InterfaceBlock.java index f1cd53ec9..d722325df 100644 --- a/src/main/java/appeng/block/misc/BlockInterface.java +++ b/src/main/java/appeng/block/misc/InterfaceBlock.java @@ -38,15 +38,15 @@ import appeng.api.util.IOrientable; import appeng.block.AEBaseTileBlock; import appeng.container.ContainerLocator; import appeng.container.ContainerOpener; -import appeng.container.implementations.ContainerInterface; -import appeng.tile.misc.TileInterface; +import appeng.container.implementations.InterfaceContainer; +import appeng.tile.misc.InterfaceTileEntity; import appeng.util.Platform; -public class BlockInterface extends AEBaseTileBlock { +public class InterfaceBlock extends AEBaseTileBlock { private static final BooleanProperty OMNIDIRECTIONAL = BooleanProperty.create("omnidirectional"); - public BlockInterface() { + public InterfaceBlock() { super(defaultProps(Material.IRON)); } @@ -57,7 +57,7 @@ public class BlockInterface extends AEBaseTileBlock { } @Override - protected BlockState updateBlockStateFromTileEntity(BlockState currentState, TileInterface te) { + protected BlockState updateBlockStateFromTileEntity(BlockState currentState, InterfaceTileEntity te) { return currentState.with(OMNIDIRECTIONAL, te.isOmniDirectional()); } @@ -68,10 +68,10 @@ public class BlockInterface extends AEBaseTileBlock { return ActionResultType.PASS; } - final TileInterface tg = this.getTileEntity(w, pos); + final InterfaceTileEntity tg = this.getTileEntity(w, pos); if (tg != null) { if (Platform.isServer()) { - ContainerOpener.openContainer(ContainerInterface.TYPE, p, + ContainerOpener.openContainer(InterfaceContainer.TYPE, p, ContainerLocator.forTileEntitySide(tg, hit.getFace())); } return ActionResultType.SUCCESS; @@ -86,8 +86,8 @@ public class BlockInterface extends AEBaseTileBlock { @Override protected void customRotateBlock(final IOrientable rotatable, final Direction axis) { - if (rotatable instanceof TileInterface) { - ((TileInterface) rotatable).setSide(axis); + if (rotatable instanceof InterfaceTileEntity) { + ((InterfaceTileEntity) rotatable).setSide(axis); } } } diff --git a/src/main/java/appeng/block/misc/BlockLightDetector.java b/src/main/java/appeng/block/misc/LightDetectorBlock.java similarity index 95% rename from src/main/java/appeng/block/misc/BlockLightDetector.java rename to src/main/java/appeng/block/misc/LightDetectorBlock.java index 534c8fc62..b22e3e8d2 100644 --- a/src/main/java/appeng/block/misc/BlockLightDetector.java +++ b/src/main/java/appeng/block/misc/LightDetectorBlock.java @@ -41,14 +41,14 @@ import appeng.api.util.IOrientable; import appeng.api.util.IOrientableBlock; import appeng.block.AEBaseTileBlock; import appeng.helpers.MetaRotation; -import appeng.tile.misc.TileLightDetector; +import appeng.tile.misc.LightDetectorTileEntity; -public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBlock { +public class LightDetectorBlock extends AEBaseTileBlock implements IOrientableBlock { // Used to alternate between two variants of the fixture on adjacent blocks public static final BooleanProperty ODD = BooleanProperty.create("odd"); - public BlockLightDetector() { + public LightDetectorBlock() { super(defaultProps(Material.MISCELLANEOUS).notSolid()); this.setDefaultState(this.getDefaultState().with(BlockStateProperties.FACING, Direction.UP).with(ODD, false)); @@ -75,7 +75,7 @@ public class BlockLightDetector extends AEBaseTileBlock imple public void onNeighborChange(BlockState state, IWorldReader world, BlockPos pos, BlockPos neighbor) { super.onNeighborChange(state, world, pos, neighbor); - final TileLightDetector tld = this.getTileEntity(world, pos); + final LightDetectorTileEntity tld = this.getTileEntity(world, pos); if (tld != null) { tld.updateLight(); } diff --git a/src/main/java/appeng/block/misc/BlockQuartzFixture.java b/src/main/java/appeng/block/misc/QuartzFixtureBlock.java similarity index 98% rename from src/main/java/appeng/block/misc/BlockQuartzFixture.java rename to src/main/java/appeng/block/misc/QuartzFixtureBlock.java index b7fafed16..26872af8c 100644 --- a/src/main/java/appeng/block/misc/BlockQuartzFixture.java +++ b/src/main/java/appeng/block/misc/QuartzFixtureBlock.java @@ -55,7 +55,7 @@ import appeng.core.AEConfig; import appeng.core.AppEng; import appeng.helpers.MetaRotation; -public class BlockQuartzFixture extends AEBaseBlock implements IOrientableBlock { +public class QuartzFixtureBlock extends AEBaseBlock implements IOrientableBlock { // Cache VoxelShapes for each facing private static final Map SHAPES; @@ -79,7 +79,7 @@ public class BlockQuartzFixture extends AEBaseBlock implements IOrientableBlock // Used to alternate between two variants of the fixture on adjacent blocks public static final BooleanProperty ODD = BooleanProperty.create("odd"); - public BlockQuartzFixture() { + public QuartzFixtureBlock() { super(defaultProps(Material.MISCELLANEOUS).doesNotBlockMovement().hardnessAndResistance(0).lightValue(14) .sound(SoundType.GLASS)); diff --git a/src/main/java/appeng/block/misc/BlockQuartzGrowthAccelerator.java b/src/main/java/appeng/block/misc/QuartzGrowthAcceleratorBlock.java similarity index 93% rename from src/main/java/appeng/block/misc/BlockQuartzGrowthAccelerator.java rename to src/main/java/appeng/block/misc/QuartzGrowthAcceleratorBlock.java index bcf4145ef..80a793291 100644 --- a/src/main/java/appeng/block/misc/BlockQuartzGrowthAccelerator.java +++ b/src/main/java/appeng/block/misc/QuartzGrowthAcceleratorBlock.java @@ -38,21 +38,21 @@ import appeng.block.AEBaseTileBlock; import appeng.client.render.effects.ParticleTypes; import appeng.core.AEConfig; import appeng.core.AppEng; -import appeng.tile.misc.TileQuartzGrowthAccelerator; +import appeng.tile.misc.QuartzGrowthAcceleratorTileEntity; import appeng.util.Platform; -public class BlockQuartzGrowthAccelerator extends AEBaseTileBlock +public class QuartzGrowthAcceleratorBlock extends AEBaseTileBlock implements IOrientableBlock { private static final BooleanProperty POWERED = BooleanProperty.create("powered"); - public BlockQuartzGrowthAccelerator() { + public QuartzGrowthAcceleratorBlock() { super(defaultProps(Material.ROCK).sound(SoundType.METAL)); this.setDefaultState(this.getDefaultState().with(POWERED, false)); } @Override - protected BlockState updateBlockStateFromTileEntity(BlockState currentState, TileQuartzGrowthAccelerator te) { + protected BlockState updateBlockStateFromTileEntity(BlockState currentState, QuartzGrowthAcceleratorTileEntity te) { return currentState.with(POWERED, te.isPowered()); } @@ -69,7 +69,7 @@ public class BlockQuartzGrowthAccelerator extends AEBaseTileBlock { +public class SecurityStationBlock extends AEBaseTileBlock { private static final BooleanProperty POWERED = BooleanProperty.create("powered"); - public BlockSecurityStation() { + public SecurityStationBlock() { super(defaultProps(Material.IRON)); this.setDefaultState(this.getDefaultState().with(POWERED, false)); @@ -56,7 +56,7 @@ public class BlockSecurityStation extends AEBaseTileBlock { } @Override - protected BlockState updateBlockStateFromTileEntity(BlockState currentState, TileSecurityStation te) { + protected BlockState updateBlockStateFromTileEntity(BlockState currentState, SecurityStationTileEntity te) { return currentState.with(POWERED, te.isActive()); } @@ -67,13 +67,13 @@ public class BlockSecurityStation extends AEBaseTileBlock { return ActionResultType.PASS; } - final TileSecurityStation tg = this.getTileEntity(w, pos); + final SecurityStationTileEntity tg = this.getTileEntity(w, pos); if (tg != null) { if (w.isRemote()) { return ActionResultType.SUCCESS; } - ContainerOpener.openContainer(ContainerSecurityStation.TYPE, p, + ContainerOpener.openContainer(SecurityStationContainer.TYPE, p, ContainerLocator.forTileEntitySide(tg, hit.getFace())); return ActionResultType.SUCCESS; } diff --git a/src/main/java/appeng/block/misc/BlockSkyCompass.java b/src/main/java/appeng/block/misc/SkyCompassBlock.java similarity index 93% rename from src/main/java/appeng/block/misc/BlockSkyCompass.java rename to src/main/java/appeng/block/misc/SkyCompassBlock.java index 32224546f..b052e0682 100644 --- a/src/main/java/appeng/block/misc/BlockSkyCompass.java +++ b/src/main/java/appeng/block/misc/SkyCompassBlock.java @@ -33,17 +33,17 @@ import net.minecraft.world.IWorldReader; import net.minecraft.world.World; import appeng.block.AEBaseTileBlock; -import appeng.tile.misc.TileSkyCompass; +import appeng.tile.misc.SkyCompassTileEntity; -public class BlockSkyCompass extends AEBaseTileBlock { +public class SkyCompassBlock extends AEBaseTileBlock { - public BlockSkyCompass(Block.Properties props) { + public SkyCompassBlock(Block.Properties props) { super(props); } @Override public boolean isValidOrientation(final IWorld w, final BlockPos pos, final Direction forward, final Direction up) { - final TileSkyCompass sc = this.getTileEntity(w, pos); + final SkyCompassTileEntity sc = this.getTileEntity(w, pos); if (sc != null) { return false; } @@ -59,7 +59,7 @@ public class BlockSkyCompass extends AEBaseTileBlock { @Override public void neighborChanged(BlockState state, World world, BlockPos pos, Block blockIn, BlockPos fromPos, boolean isMoving) { - final TileSkyCompass sc = this.getTileEntity(world, pos); + final SkyCompassTileEntity sc = this.getTileEntity(world, pos); final Direction forward = sc.getForward(); if (!this.canPlaceAt(world, pos, forward.getOpposite())) { this.dropTorch(world, pos); @@ -87,7 +87,7 @@ public class BlockSkyCompass extends AEBaseTileBlock { // TODO: This definitely needs to be memoized - final TileSkyCompass tile = this.getTileEntity(w, pos); + final SkyCompassTileEntity tile = this.getTileEntity(w, pos); if (tile != null) { final Direction forward = tile.getForward(); diff --git a/src/main/java/appeng/block/misc/SkyCompassRendering.java b/src/main/java/appeng/block/misc/SkyCompassRendering.java index eb994c492..a850d9b17 100644 --- a/src/main/java/appeng/block/misc/SkyCompassRendering.java +++ b/src/main/java/appeng/block/misc/SkyCompassRendering.java @@ -24,13 +24,13 @@ import net.minecraftforge.api.distmarker.OnlyIn; import appeng.bootstrap.TileEntityRendering; import appeng.bootstrap.TileEntityRenderingCustomizer; import appeng.client.render.tesr.SkyCompassTESR; -import appeng.tile.misc.TileSkyCompass; +import appeng.tile.misc.SkyCompassTileEntity; -public class SkyCompassRendering extends TileEntityRenderingCustomizer { +public class SkyCompassRendering extends TileEntityRenderingCustomizer { @Override @OnlyIn(Dist.CLIENT) - public void customize(TileEntityRendering rendering) { + public void customize(TileEntityRendering rendering) { rendering.tileEntityRenderer(SkyCompassTESR::new); } diff --git a/src/main/java/appeng/block/misc/BlockTinyTNT.java b/src/main/java/appeng/block/misc/TinyTNTBlock.java similarity index 94% rename from src/main/java/appeng/block/misc/BlockTinyTNT.java rename to src/main/java/appeng/block/misc/TinyTNTBlock.java index caf54455c..8efc2d908 100644 --- a/src/main/java/appeng/block/misc/BlockTinyTNT.java +++ b/src/main/java/appeng/block/misc/TinyTNTBlock.java @@ -44,14 +44,14 @@ import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld; import appeng.block.AEBaseBlock; -import appeng.entity.EntityTinyTNTPrimed; +import appeng.entity.TinyTNTPrimedEntity; -public class BlockTinyTNT extends AEBaseBlock { +public class TinyTNTBlock extends AEBaseBlock { private static final VoxelShape SHAPE = VoxelShapes .create(new AxisAlignedBB(0.25f, 0.0f, 0.25f, 0.75f, 0.5f, 0.75f)); - public BlockTinyTNT(Block.Properties props) { + public TinyTNTBlock(Block.Properties props) { super(props); setFullSize(setOpaque(false)); } @@ -83,7 +83,7 @@ public class BlockTinyTNT extends AEBaseBlock { public void startFuse(final World w, final BlockPos pos, final LivingEntity igniter) { if (!w.isRemote) { - final EntityTinyTNTPrimed primedTinyTNTEntity = new EntityTinyTNTPrimed(w, pos.getX() + 0.5F, + final TinyTNTPrimedEntity primedTinyTNTEntity = new TinyTNTPrimedEntity(w, pos.getX() + 0.5F, pos.getY() + 0.5F, pos.getZ() + 0.5F, igniter); w.addEntity(primedTinyTNTEntity); w.playSound(null, primedTinyTNTEntity.getPosX(), primedTinyTNTEntity.getPosY(), @@ -141,7 +141,7 @@ public class BlockTinyTNT extends AEBaseBlock { public void onExplosionDestroy(final World w, final BlockPos pos, final Explosion exp) { super.onExplosionDestroy(w, pos, exp); if (!w.isRemote) { - final EntityTinyTNTPrimed primedTinyTNTEntity = new EntityTinyTNTPrimed(w, pos.getX() + 0.5F, + final TinyTNTPrimedEntity primedTinyTNTEntity = new TinyTNTPrimedEntity(w, pos.getX() + 0.5F, pos.getY() + 0.5F, pos.getZ() + 0.5F, exp.getExplosivePlacedBy()); primedTinyTNTEntity .setFuse(w.rand.nextInt(primedTinyTNTEntity.getFuse() / 4) + primedTinyTNTEntity.getFuse() / 8); diff --git a/src/main/java/appeng/block/misc/BlockVibrationChamber.java b/src/main/java/appeng/block/misc/VibrationChamberBlock.java similarity index 86% rename from src/main/java/appeng/block/misc/BlockVibrationChamber.java rename to src/main/java/appeng/block/misc/VibrationChamberBlock.java index 0e4cc3630..4f1f5c466 100644 --- a/src/main/java/appeng/block/misc/BlockVibrationChamber.java +++ b/src/main/java/appeng/block/misc/VibrationChamberBlock.java @@ -40,24 +40,24 @@ import net.minecraft.world.World; import appeng.block.AEBaseTileBlock; import appeng.container.ContainerLocator; import appeng.container.ContainerOpener; -import appeng.container.implementations.ContainerVibrationChamber; +import appeng.container.implementations.VibrationChamberContainer; import appeng.core.AEConfig; -import appeng.tile.AEBaseTile; -import appeng.tile.misc.TileVibrationChamber; +import appeng.tile.AEBaseTileEntity; +import appeng.tile.misc.VibrationChamberTileEntity; import appeng.util.Platform; -public final class BlockVibrationChamber extends AEBaseTileBlock { +public final class VibrationChamberBlock extends AEBaseTileBlock { // Indicates that the vibration chamber is currently working private static final BooleanProperty ACTIVE = BooleanProperty.create("active"); - public BlockVibrationChamber() { + public VibrationChamberBlock() { super(defaultProps(Material.IRON).hardnessAndResistance(4.2F)); this.setDefaultState(this.getDefaultState().with(ACTIVE, false)); } @Override - protected BlockState updateBlockStateFromTileEntity(BlockState currentState, TileVibrationChamber te) { + protected BlockState updateBlockStateFromTileEntity(BlockState currentState, VibrationChamberTileEntity te) { return currentState.with(ACTIVE, te.isOn); } @@ -75,9 +75,9 @@ public final class BlockVibrationChamber extends AEBaseTileBlock implements IAEFacade { +public class CableBusBlock extends AEBaseTileBlock implements IAEFacade { private static final ICableBusContainer NULL_CABLE_BUS = new NullCableBusContainer(); - public BlockCableBus() { + public CableBusBlock() { super(defaultProps(AEGlassMaterial.INSTANCE).notSolid().noDrops()); } @@ -146,7 +146,7 @@ public class BlockCableBus extends AEBaseTileBlock implements IAEF public boolean removedByPlayer(BlockState state, World world, BlockPos pos, PlayerEntity player, boolean willHarvest, IFluidState fluid) { if (player.abilities.isCreativeMode) { - final AEBaseTile tile = this.getTileEntity(world, pos); + final AEBaseTileEntity tile = this.getTileEntity(world, pos); if (tile != null) { tile.disableDrops(); } @@ -284,8 +284,8 @@ public class BlockCableBus extends AEBaseTileBlock implements IAEF final TileEntity te = w.getTileEntity(pos); ICableBusContainer out = null; - if (te instanceof TileCableBus) { - out = ((TileCableBus) te).getCableBus(); + if (te instanceof CableBusTileEntity) { + out = ((CableBusTileEntity) te).getCableBus(); } return out == null ? NULL_CABLE_BUS : out; @@ -296,8 +296,8 @@ public class BlockCableBus extends AEBaseTileBlock implements IAEF final TileEntity te = w.getTileEntity(pos); IFacadeContainer out = null; - if (te instanceof TileCableBus) { - out = ((TileCableBus) te).getCableBus().getFacadeContainer(); + if (te instanceof CableBusTileEntity) { + out = ((CableBusTileEntity) te).getCableBus().getFacadeContainer(); } return out; @@ -313,7 +313,7 @@ public class BlockCableBus extends AEBaseTileBlock implements IAEF final Vec3d hitVec = rtr.getHitVec().subtract(new Vec3d(pos)); if (this.cb(worldIn, pos).clicked(player, Hand.MAIN_HAND, hitVec)) { - NetworkHandler.instance().sendToServer(new PacketClick(pos, brtr.getFace(), (float) hitVec.x, + NetworkHandler.instance().sendToServer(new ClickPacket(pos, brtr.getFace(), (float) hitVec.x, (float) hitVec.y, (float) hitVec.z, Hand.MAIN_HAND, true)); } } @@ -372,7 +372,7 @@ public class BlockCableBus extends AEBaseTileBlock implements IAEF public VoxelShape getShape(BlockState state, IBlockReader w, BlockPos pos, ISelectionContext context) { // FIXME: this has to be cached, optimized, fixed in all kinds of ways - TileCableBus te = getTileEntity(w, pos); + CableBusTileEntity te = getTileEntity(w, pos); VoxelShape result = VoxelShapes.empty(); if (te != null) { for (final AxisAlignedBB bx : te.getCableBus().getSelectedBoundingBoxesFromPool(false, true, @@ -389,7 +389,7 @@ public class BlockCableBus extends AEBaseTileBlock implements IAEF public VoxelShape getCollisionShape(BlockState state, IBlockReader w, BlockPos pos, ISelectionContext context) { // FIXME: this has to be cached, optimized, fixed in all kinds of ways - TileCableBus te = getTileEntity(w, pos); + CableBusTileEntity te = getTileEntity(w, pos); VoxelShape result = VoxelShapes.empty(); if (te != null) { for (final AxisAlignedBB bx : te.getCableBus().getSelectedBoundingBoxesFromPool(false, true, diff --git a/src/main/java/appeng/block/networking/CableBusColor.java b/src/main/java/appeng/block/networking/CableBusColor.java index 922b0feca..41e701202 100644 --- a/src/main/java/appeng/block/networking/CableBusColor.java +++ b/src/main/java/appeng/block/networking/CableBusColor.java @@ -30,7 +30,7 @@ import net.minecraftforge.api.distmarker.OnlyIn; import appeng.api.util.AEColor; import appeng.parts.CableBusContainer; -import appeng.tile.networking.TileCableBus; +import appeng.tile.networking.CableBusTileEntity; /** * Exposes the cable bus color as tint indices 0 (dark variant), 1 (medium @@ -46,8 +46,8 @@ public class CableBusColor implements IBlockColor { if (worldIn != null && pos != null) { TileEntity tileEntity = worldIn.getTileEntity(pos); - if (tileEntity instanceof TileCableBus) { - CableBusContainer container = ((TileCableBus) tileEntity).getCableBus(); + if (tileEntity instanceof CableBusTileEntity) { + CableBusContainer container = ((CableBusTileEntity) tileEntity).getCableBus(); busColor = container.getColor(); } } diff --git a/src/main/java/appeng/block/networking/BlockController.java b/src/main/java/appeng/block/networking/ControllerBlock.java similarity index 95% rename from src/main/java/appeng/block/networking/BlockController.java rename to src/main/java/appeng/block/networking/ControllerBlock.java index 9c7237e46..afb5fc2c3 100644 --- a/src/main/java/appeng/block/networking/BlockController.java +++ b/src/main/java/appeng/block/networking/ControllerBlock.java @@ -30,9 +30,9 @@ import net.minecraft.world.IWorld; import net.minecraft.world.World; import appeng.block.AEBaseTileBlock; -import appeng.tile.networking.TileController; +import appeng.tile.networking.ControllerTileEntity; -public class BlockController extends AEBaseTileBlock { +public class ControllerBlock extends AEBaseTileBlock { public enum ControllerBlockState implements IStringSerializable { offline, online, conflicted; @@ -66,7 +66,7 @@ public class BlockController extends AEBaseTileBlock { public static final EnumProperty CONTROLLER_TYPE = EnumProperty.create("type", ControllerRenderType.class); - public BlockController() { + public ControllerBlock() { super(defaultProps(Material.IRON).hardnessAndResistance(6)); this.setDefaultState(this.getDefaultState().with(CONTROLLER_STATE, ControllerBlockState.offline) .with(CONTROLLER_TYPE, ControllerRenderType.block)); @@ -132,7 +132,7 @@ public class BlockController extends AEBaseTileBlock { @Override public void neighborChanged(BlockState state, World world, BlockPos pos, Block blockIn, BlockPos fromPos, boolean isMoving) { - final TileController tc = this.getTileEntity(world, pos); + final ControllerTileEntity tc = this.getTileEntity(world, pos); if (tc != null) { tc.onNeighborChange(false); } diff --git a/src/main/java/appeng/block/networking/BlockCreativeEnergyCell.java b/src/main/java/appeng/block/networking/CreativeEnergyCellBlock.java similarity index 83% rename from src/main/java/appeng/block/networking/BlockCreativeEnergyCell.java rename to src/main/java/appeng/block/networking/CreativeEnergyCellBlock.java index 519390c12..313e4a213 100644 --- a/src/main/java/appeng/block/networking/BlockCreativeEnergyCell.java +++ b/src/main/java/appeng/block/networking/CreativeEnergyCellBlock.java @@ -20,11 +20,11 @@ package appeng.block.networking; import appeng.block.AEBaseTileBlock; import appeng.helpers.AEGlassMaterial; -import appeng.tile.networking.TileCreativeEnergyCell; +import appeng.tile.networking.CreativeEnergyCellTileEntity; -public class BlockCreativeEnergyCell extends AEBaseTileBlock { +public class CreativeEnergyCellBlock extends AEBaseTileBlock { - public BlockCreativeEnergyCell() { + public CreativeEnergyCellBlock() { super(defaultProps(AEGlassMaterial.INSTANCE)); } } diff --git a/src/main/java/appeng/block/networking/BlockDenseEnergyCell.java b/src/main/java/appeng/block/networking/DenseEnergyCellBlock.java similarity index 90% rename from src/main/java/appeng/block/networking/BlockDenseEnergyCell.java rename to src/main/java/appeng/block/networking/DenseEnergyCellBlock.java index fadeeac3b..9ccb1b633 100644 --- a/src/main/java/appeng/block/networking/BlockDenseEnergyCell.java +++ b/src/main/java/appeng/block/networking/DenseEnergyCellBlock.java @@ -18,9 +18,9 @@ package appeng.block.networking; -public class BlockDenseEnergyCell extends BlockEnergyCell { +public class DenseEnergyCellBlock extends EnergyCellBlock { - public BlockDenseEnergyCell() { + public DenseEnergyCellBlock() { } diff --git a/src/main/java/appeng/block/networking/BlockEnergyAcceptor.java b/src/main/java/appeng/block/networking/EnergyAcceptorBlock.java similarity index 84% rename from src/main/java/appeng/block/networking/BlockEnergyAcceptor.java rename to src/main/java/appeng/block/networking/EnergyAcceptorBlock.java index 22f598be8..c31bd8c3c 100644 --- a/src/main/java/appeng/block/networking/BlockEnergyAcceptor.java +++ b/src/main/java/appeng/block/networking/EnergyAcceptorBlock.java @@ -21,11 +21,11 @@ package appeng.block.networking; import net.minecraft.block.material.Material; import appeng.block.AEBaseTileBlock; -import appeng.tile.networking.TileEnergyAcceptor; +import appeng.tile.networking.EnergyAcceptorTileEntity; -public class BlockEnergyAcceptor extends AEBaseTileBlock { +public class EnergyAcceptorBlock extends AEBaseTileBlock { - public BlockEnergyAcceptor() { + public EnergyAcceptorBlock() { super(defaultProps(Material.IRON)); } } diff --git a/src/main/java/appeng/block/networking/BlockEnergyCell.java b/src/main/java/appeng/block/networking/EnergyCellBlock.java similarity index 93% rename from src/main/java/appeng/block/networking/BlockEnergyCell.java rename to src/main/java/appeng/block/networking/EnergyCellBlock.java index da6e5965b..fbe05cdfa 100644 --- a/src/main/java/appeng/block/networking/BlockEnergyCell.java +++ b/src/main/java/appeng/block/networking/EnergyCellBlock.java @@ -31,13 +31,13 @@ import net.minecraftforge.api.distmarker.OnlyIn; import appeng.block.AEBaseTileBlock; import appeng.helpers.AEGlassMaterial; -import appeng.tile.networking.TileEnergyCell; +import appeng.tile.networking.EnergyCellTileEntity; -public class BlockEnergyCell extends AEBaseTileBlock { +public class EnergyCellBlock extends AEBaseTileBlock { public static final IntegerProperty ENERGY_STORAGE = IntegerProperty.create("fullness", 0, 7); - public BlockEnergyCell() { + public EnergyCellBlock() { super(defaultProps(AEGlassMaterial.INSTANCE)); } diff --git a/src/main/java/appeng/block/networking/BlockWireless.java b/src/main/java/appeng/block/networking/WirelessBlock.java similarity index 93% rename from src/main/java/appeng/block/networking/BlockWireless.java rename to src/main/java/appeng/block/networking/WirelessBlock.java index 2f104b1ae..c24c49191 100644 --- a/src/main/java/appeng/block/networking/BlockWireless.java +++ b/src/main/java/appeng/block/networking/WirelessBlock.java @@ -39,12 +39,12 @@ import net.minecraft.world.World; import appeng.block.AEBaseTileBlock; import appeng.container.ContainerLocator; import appeng.container.ContainerOpener; -import appeng.container.implementations.ContainerWireless; +import appeng.container.implementations.WirelessContainer; import appeng.helpers.AEGlassMaterial; -import appeng.tile.networking.TileWireless; +import appeng.tile.networking.WirelessTileEntity; import appeng.util.Platform; -public class BlockWireless extends AEBaseTileBlock { +public class WirelessBlock extends AEBaseTileBlock { enum State implements IStringSerializable { OFF, ON, HAS_CHANNEL; @@ -57,7 +57,7 @@ public class BlockWireless extends AEBaseTileBlock { public static final EnumProperty STATE = EnumProperty.create("state", State.class); - public BlockWireless() { + public WirelessBlock() { super(defaultProps(AEGlassMaterial.INSTANCE).notSolid()); this.setFullSize(false); this.setOpaque(false); @@ -65,7 +65,7 @@ public class BlockWireless extends AEBaseTileBlock { } @Override - protected BlockState updateBlockStateFromTileEntity(BlockState currentState, TileWireless te) { + protected BlockState updateBlockStateFromTileEntity(BlockState currentState, WirelessTileEntity te) { State teState = State.OFF; if (te.isActive()) { @@ -86,11 +86,11 @@ public class BlockWireless extends AEBaseTileBlock { @Override public ActionResultType onBlockActivated(BlockState state, World w, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { - final TileWireless tg = this.getTileEntity(w, pos); + final WirelessTileEntity tg = this.getTileEntity(w, pos); if (tg != null && !player.isCrouching()) { if (Platform.isServer()) { - ContainerOpener.openContainer(ContainerWireless.TYPE, player, + ContainerOpener.openContainer(WirelessContainer.TYPE, player, ContainerLocator.forTileEntitySide(tg, hit.getFace())); } return ActionResultType.SUCCESS; @@ -101,7 +101,7 @@ public class BlockWireless extends AEBaseTileBlock { @Override public VoxelShape getShape(BlockState state, IBlockReader w, BlockPos pos, ISelectionContext context) { - final TileWireless tile = this.getTileEntity(w, pos); + final WirelessTileEntity tile = this.getTileEntity(w, pos); if (tile != null) { final Direction forward = tile.getForward(); @@ -161,7 +161,7 @@ public class BlockWireless extends AEBaseTileBlock { @Override public VoxelShape getCollisionShape(BlockState state, IBlockReader w, BlockPos pos, ISelectionContext context) { - final TileWireless tile = this.getTileEntity(w, pos); + final WirelessTileEntity tile = this.getTileEntity(w, pos); if (tile != null) { final Direction forward = tile.getForward(); diff --git a/src/main/java/appeng/block/paint/PaintSplotchesBakedModel.java b/src/main/java/appeng/block/paint/PaintSplotchesBakedModel.java index 750818905..7d6cd06dd 100644 --- a/src/main/java/appeng/block/paint/PaintSplotchesBakedModel.java +++ b/src/main/java/appeng/block/paint/PaintSplotchesBakedModel.java @@ -26,7 +26,7 @@ import net.minecraftforge.client.model.data.IModelData; import appeng.client.render.cablebus.CubeBuilder; import appeng.core.AppEng; import appeng.helpers.Splotch; -import appeng.tile.misc.TilePaint; +import appeng.tile.misc.PaintSplotchesTileEntity; /** * Renders paint blocks, which render multiple "splotches" that have been @@ -58,7 +58,7 @@ class PaintSplotchesBakedModel implements IDynamicBakedModel { return Collections.emptyList(); } - PaintSplotches splotchesState = extraData.getData(TilePaint.SPLOTCHES); + PaintSplotches splotchesState = extraData.getData(PaintSplotchesTileEntity.SPLOTCHES); if (splotchesState == null) { // This is the inventory model which should usually not be used other than in diff --git a/src/main/java/appeng/block/paint/BlockPaint.java b/src/main/java/appeng/block/paint/PaintSplotchesBlock.java similarity index 90% rename from src/main/java/appeng/block/paint/BlockPaint.java rename to src/main/java/appeng/block/paint/PaintSplotchesBlock.java index 174b6b74d..52353d59c 100644 --- a/src/main/java/appeng/block/paint/BlockPaint.java +++ b/src/main/java/appeng/block/paint/PaintSplotchesBlock.java @@ -37,11 +37,11 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import appeng.block.AEBaseTileBlock; -import appeng.tile.misc.TilePaint; +import appeng.tile.misc.PaintSplotchesTileEntity; import appeng.util.Platform; -public class BlockPaint extends AEBaseTileBlock { - public BlockPaint() { +public class PaintSplotchesBlock extends AEBaseTileBlock { + public PaintSplotchesBlock() { super(defaultProps(Material.WATER, MaterialColor.AIR)); this.setFullSize(false); this.setOpaque(false); @@ -61,7 +61,7 @@ public class BlockPaint extends AEBaseTileBlock { @Override public void neighborChanged(BlockState state, World world, BlockPos pos, Block blockIn, BlockPos fromPos, boolean isMoving) { - final TilePaint tp = this.getTileEntity(world, pos); + final PaintSplotchesTileEntity tp = this.getTileEntity(world, pos); if (tp != null) { tp.neighborChanged(); @@ -77,7 +77,7 @@ public class BlockPaint extends AEBaseTileBlock { @Override public int getLightValue(final BlockState state, final IBlockReader w, final BlockPos pos) { - final TilePaint tp = this.getTileEntity(w, pos); + final PaintSplotchesTileEntity tp = this.getTileEntity(w, pos); if (tp != null) { return tp.getLightLevel(); diff --git a/src/main/java/appeng/block/paint/PaintRendering.java b/src/main/java/appeng/block/paint/PaintSplotchesRendering.java similarity index 89% rename from src/main/java/appeng/block/paint/PaintRendering.java rename to src/main/java/appeng/block/paint/PaintSplotchesRendering.java index e222edf1c..f6808ed03 100644 --- a/src/main/java/appeng/block/paint/PaintRendering.java +++ b/src/main/java/appeng/block/paint/PaintSplotchesRendering.java @@ -9,7 +9,7 @@ import appeng.bootstrap.BlockRenderingCustomizer; import appeng.bootstrap.IBlockRendering; import appeng.bootstrap.IItemRendering; -public class PaintRendering extends BlockRenderingCustomizer { +public class PaintSplotchesRendering extends BlockRenderingCustomizer { @Override @OnlyIn(Dist.CLIENT) diff --git a/src/main/java/appeng/block/qnb/QnbFormedBakedModel.java b/src/main/java/appeng/block/qnb/QnbFormedBakedModel.java index b874a0a3f..36ac3479f 100644 --- a/src/main/java/appeng/block/qnb/QnbFormedBakedModel.java +++ b/src/main/java/appeng/block/qnb/QnbFormedBakedModel.java @@ -28,7 +28,7 @@ import net.minecraftforge.client.model.data.IModelData; import appeng.api.AEApi; import appeng.client.render.cablebus.CubeBuilder; import appeng.core.AppEng; -import appeng.tile.qnb.TileQuantumBridge; +import appeng.tile.qnb.QuantumBridgeTileEntity; class QnbFormedBakedModel implements IDynamicBakedModel { @@ -79,7 +79,7 @@ class QnbFormedBakedModel implements IDynamicBakedModel { @Override public List getQuads(@Nullable BlockState state, @Nullable Direction side, Random rand, IModelData modelData) { - QnbFormedState formedState = modelData.getData(TileQuantumBridge.FORMED_STATE); + QnbFormedState formedState = modelData.getData(QuantumBridgeTileEntity.FORMED_STATE); if (formedState == null) { return this.baseModel.getQuads(state, side, rand); diff --git a/src/main/java/appeng/block/qnb/BlockQuantumBase.java b/src/main/java/appeng/block/qnb/QuantumBaseBlock.java similarity index 88% rename from src/main/java/appeng/block/qnb/BlockQuantumBase.java rename to src/main/java/appeng/block/qnb/QuantumBaseBlock.java index 45dc955bb..daf7f2eb5 100644 --- a/src/main/java/appeng/block/qnb/BlockQuantumBase.java +++ b/src/main/java/appeng/block/qnb/QuantumBaseBlock.java @@ -31,9 +31,9 @@ import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import appeng.block.AEBaseTileBlock; -import appeng.tile.qnb.TileQuantumBridge; +import appeng.tile.qnb.QuantumBridgeTileEntity; -public abstract class BlockQuantumBase extends AEBaseTileBlock { +public abstract class QuantumBaseBlock extends AEBaseTileBlock { public static final BooleanProperty FORMED = BooleanProperty.create("formed"); @@ -44,7 +44,7 @@ public abstract class BlockQuantumBase extends AEBaseTileBlock { +public class SpatialIOPortBlock extends AEBaseTileBlock { - public BlockSpatialIOPort() { + public SpatialIOPortBlock() { super(defaultProps(Material.IRON)); } @Override public void neighborChanged(BlockState state, World world, BlockPos pos, Block blockIn, BlockPos fromPos, boolean isMoving) { - final TileSpatialIOPort te = this.getTileEntity(world, pos); + final SpatialIOPortTileEntity te = this.getTileEntity(world, pos); if (te != null) { te.updateRedstoneState(); } @@ -60,10 +60,10 @@ public class BlockSpatialIOPort extends AEBaseTileBlock { return ActionResultType.PASS; } - final TileSpatialIOPort tg = this.getTileEntity(w, pos); + final SpatialIOPortTileEntity tg = this.getTileEntity(w, pos); if (tg != null) { if (Platform.isServer()) { - ContainerOpener.openContainer(ContainerSpatialIOPort.TYPE, p, + ContainerOpener.openContainer(SpatialIOPortContainer.TYPE, p, ContainerLocator.forTileEntitySide(tg, hit.getFace())); } return ActionResultType.SUCCESS; diff --git a/src/main/java/appeng/block/spatial/BlockSpatialPylon.java b/src/main/java/appeng/block/spatial/SpatialPylonBlock.java similarity index 84% rename from src/main/java/appeng/block/spatial/BlockSpatialPylon.java rename to src/main/java/appeng/block/spatial/SpatialPylonBlock.java index b2a1094dc..58221ad6f 100644 --- a/src/main/java/appeng/block/spatial/BlockSpatialPylon.java +++ b/src/main/java/appeng/block/spatial/SpatialPylonBlock.java @@ -26,18 +26,18 @@ import net.minecraft.world.World; import appeng.block.AEBaseTileBlock; import appeng.helpers.AEGlassMaterial; -import appeng.tile.spatial.TileSpatialPylon; +import appeng.tile.spatial.SpatialPylonTileEntity; -public class BlockSpatialPylon extends AEBaseTileBlock { +public class SpatialPylonBlock extends AEBaseTileBlock { - public BlockSpatialPylon() { + public SpatialPylonBlock() { super(defaultProps(AEGlassMaterial.INSTANCE)); } @Override public void neighborChanged(BlockState state, World world, BlockPos pos, Block blockIn, BlockPos fromPos, boolean isMoving) { - final TileSpatialPylon tsp = this.getTileEntity(world, pos); + final SpatialPylonTileEntity tsp = this.getTileEntity(world, pos); if (tsp != null) { tsp.neighborChanged(); } @@ -45,7 +45,7 @@ public class BlockSpatialPylon extends AEBaseTileBlock { @Override public int getLightValue(final BlockState state, final IBlockReader w, final BlockPos pos) { - final TileSpatialPylon tsp = this.getTileEntity(w, pos); + final SpatialPylonTileEntity tsp = this.getTileEntity(w, pos); if (tsp != null) { return tsp.getLightValue(); } diff --git a/src/main/java/appeng/block/storage/BlockChest.java b/src/main/java/appeng/block/storage/ChestBlock.java similarity index 90% rename from src/main/java/appeng/block/storage/BlockChest.java rename to src/main/java/appeng/block/storage/ChestBlock.java index d6fd1fe28..91e6b117f 100644 --- a/src/main/java/appeng/block/storage/BlockChest.java +++ b/src/main/java/appeng/block/storage/ChestBlock.java @@ -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 { +public class ChestBlock extends AEBaseTileBlock { private final static EnumProperty 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 { } @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 { @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 { p.sendMessage(PlayerMessages.ChestCannotReadStorageCell.get()); } } else { - ContainerOpener.openContainer(ContainerChest.TYPE, p, + ContainerOpener.openContainer(ChestContainer.TYPE, p, ContainerLocator.forTileEntitySide(tg, hit.getFace())); } diff --git a/src/main/java/appeng/block/storage/BlockDrive.java b/src/main/java/appeng/block/storage/DriveBlock.java similarity index 85% rename from src/main/java/appeng/block/storage/BlockDrive.java rename to src/main/java/appeng/block/storage/DriveBlock.java index 7d6057fc3..69d9d5b36 100644 --- a/src/main/java/appeng/block/storage/BlockDrive.java +++ b/src/main/java/appeng/block/storage/DriveBlock.java @@ -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 { +public class DriveBlock extends AEBaseTileBlock { - public BlockDrive() { + public DriveBlock() { super(defaultProps(Material.IRON)); } @@ -49,10 +49,10 @@ public class BlockDrive extends AEBaseTileBlock { 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; } diff --git a/src/main/java/appeng/block/storage/BlockIOPort.java b/src/main/java/appeng/block/storage/IOPortBlock.java similarity index 85% rename from src/main/java/appeng/block/storage/BlockIOPort.java rename to src/main/java/appeng/block/storage/IOPortBlock.java index 1f3bfbe80..e5b51a7a6 100644 --- a/src/main/java/appeng/block/storage/BlockIOPort.java +++ b/src/main/java/appeng/block/storage/IOPortBlock.java @@ -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 { +public class IOPortBlock extends AEBaseTileBlock { - 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 { 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; diff --git a/src/main/java/appeng/block/storage/BlockSkyChest.java b/src/main/java/appeng/block/storage/SkyChestBlock.java similarity index 91% rename from src/main/java/appeng/block/storage/BlockSkyChest.java rename to src/main/java/appeng/block/storage/SkyChestBlock.java index 5e9906c78..7c3d1ebab 100644 --- a/src/main/java/appeng/block/storage/BlockSkyChest.java +++ b/src/main/java/appeng/block/storage/SkyChestBlock.java @@ -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 { +public class SkyChestBlock extends AEBaseTileBlock { 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 { 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 { 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 { } 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) { diff --git a/src/main/java/appeng/bootstrap/FeatureFactory.java b/src/main/java/appeng/bootstrap/FeatureFactory.java index 3c61b4e12..a79ca38c8 100644 --- a/src/main/java/appeng/bootstrap/FeatureFactory.java +++ b/src/main/java/appeng/bootstrap/FeatureFactory.java @@ -42,7 +42,7 @@ import net.minecraftforge.api.distmarker.OnlyIn; import appeng.api.features.AEFeature; import appeng.bootstrap.components.ModelOverrideComponent; -import appeng.tile.AEBaseTile; +import appeng.tile.AEBaseTileEntity; import appeng.util.Platform; public class FeatureFactory { @@ -85,8 +85,8 @@ public class FeatureFactory { return new EntityBuilder(this, id, factory, classification).features(this.defaultFeatures); } - public TileEntityBuilder tileEntity(String id, Class teClass, - Function, T> factory) { + public TileEntityBuilder tileEntity(String id, Class teClass, + Function, T> factory) { return new TileEntityBuilder<>(this, id, teClass, factory).features(this.defaultFeatures); } diff --git a/src/main/java/appeng/bootstrap/TileEntityBuilder.java b/src/main/java/appeng/bootstrap/TileEntityBuilder.java index 354ecd360..a14b93c46 100644 --- a/src/main/java/appeng/bootstrap/TileEntityBuilder.java +++ b/src/main/java/appeng/bootstrap/TileEntityBuilder.java @@ -24,7 +24,7 @@ import appeng.bootstrap.definitions.TileEntityDefinition; import appeng.core.AppEng; import appeng.core.features.ActivityState; import appeng.core.features.BlockStackSrc; -import appeng.tile.AEBaseTile; +import appeng.tile.AEBaseTileEntity; import appeng.util.Platform; /** @@ -33,7 +33,7 @@ import appeng.util.Platform; * * @param */ -public class TileEntityBuilder { +public class TileEntityBuilder { private final FeatureFactory factory; @@ -95,7 +95,7 @@ public class TileEntityBuilder { type.setRegistryName(AppEng.MOD_ID, registryName); registry.register(type); - AEBaseTile.registerTileItem(tileClass, new BlockStackSrc(blocks.get(0), ActivityState.Enabled)); + AEBaseTileEntity.registerTileItem(tileClass, new BlockStackSrc(blocks.get(0), ActivityState.Enabled)); for (Block block : blocks) { if (block instanceof AEBaseTileBlock) { diff --git a/src/main/java/appeng/bootstrap/TileEntityRendering.java b/src/main/java/appeng/bootstrap/TileEntityRendering.java index 9fa585454..dc4bcf33c 100644 --- a/src/main/java/appeng/bootstrap/TileEntityRendering.java +++ b/src/main/java/appeng/bootstrap/TileEntityRendering.java @@ -25,9 +25,9 @@ import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import appeng.tile.AEBaseTile; +import appeng.tile.AEBaseTileEntity; -public class TileEntityRendering { +public class TileEntityRendering { @OnlyIn(Dist.CLIENT) Function> tileEntityRenderer; diff --git a/src/main/java/appeng/bootstrap/TileEntityRenderingCustomizer.java b/src/main/java/appeng/bootstrap/TileEntityRenderingCustomizer.java index 3ebb7899c..f084c69ef 100644 --- a/src/main/java/appeng/bootstrap/TileEntityRenderingCustomizer.java +++ b/src/main/java/appeng/bootstrap/TileEntityRenderingCustomizer.java @@ -21,14 +21,14 @@ package appeng.bootstrap; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import appeng.tile.AEBaseTile; +import appeng.tile.AEBaseTileEntity; /** * A callback that allows the rendering of a tile entity to be customized. Sadly * this class is required and no lambdas can be used due to them not being able * to be annotated with @OnlyIn(CLIENT). */ -public abstract class TileEntityRenderingCustomizer { +public abstract class TileEntityRenderingCustomizer { @OnlyIn(Dist.CLIENT) public abstract void customize(TileEntityRendering rendering); diff --git a/src/main/java/appeng/client/ClientHelper.java b/src/main/java/appeng/client/ClientHelper.java index e43bf2dd4..5d7700ccb 100644 --- a/src/main/java/appeng/client/ClientHelper.java +++ b/src/main/java/appeng/client/ClientHelper.java @@ -43,7 +43,7 @@ import appeng.client.render.effects.*; import appeng.core.AEConfig; import appeng.core.AppEng; import appeng.core.sync.network.NetworkHandler; -import appeng.core.sync.packets.PacketValueConfig; +import appeng.core.sync.packets.ConfigValuePacket; import appeng.helpers.IMouseWheelItem; import appeng.server.ServerHelper; import appeng.util.Platform; @@ -222,7 +222,7 @@ public class ClientHelper extends ServerHelper { if (mainHand || offHand) { NetworkHandler.instance() - .sendToServer(new PacketValueConfig("Item", me.getScrollDelta() > 0 ? "WheelUp" : "WheelDown")); + .sendToServer(new ConfigValuePacket("Item", me.getScrollDelta() > 0 ? "WheelUp" : "WheelDown")); me.setCanceled(true); } } diff --git a/src/main/java/appeng/client/gui/AEBaseMEGui.java b/src/main/java/appeng/client/gui/AEBaseMEScreen.java similarity index 95% rename from src/main/java/appeng/client/gui/AEBaseMEGui.java rename to src/main/java/appeng/client/gui/AEBaseMEScreen.java index db1e2b0b7..8a9285dcc 100644 --- a/src/main/java/appeng/client/gui/AEBaseMEGui.java +++ b/src/main/java/appeng/client/gui/AEBaseMEScreen.java @@ -34,9 +34,9 @@ import appeng.container.AEBaseContainer; import appeng.core.AEConfig; import appeng.core.localization.ButtonToolTips; -public abstract class AEBaseMEGui extends AEBaseGui { +public abstract class AEBaseMEScreen extends AEBaseScreen { - public AEBaseMEGui(T container, PlayerInventory playerInventory, ITextComponent title) { + public AEBaseMEScreen(T container, PlayerInventory playerInventory, ITextComponent title) { super(container, playerInventory, title); } diff --git a/src/main/java/appeng/client/gui/AEBaseGui.java b/src/main/java/appeng/client/gui/AEBaseScreen.java similarity index 91% rename from src/main/java/appeng/client/gui/AEBaseGui.java rename to src/main/java/appeng/client/gui/AEBaseScreen.java index d58506436..9ab12de61 100644 --- a/src/main/java/appeng/client/gui/AEBaseGui.java +++ b/src/main/java/appeng/client/gui/AEBaseScreen.java @@ -59,8 +59,8 @@ import net.minecraftforge.fml.client.gui.GuiUtils; import appeng.api.storage.data.IAEFluidStack; import appeng.api.storage.data.IAEItemStack; -import appeng.client.gui.widgets.GuiCustomSlot; -import appeng.client.gui.widgets.GuiScrollbar; +import appeng.client.gui.widgets.CustomSlotWidget; +import appeng.client.gui.widgets.Scrollbar; import appeng.client.gui.widgets.ITooltip; import appeng.client.me.InternalSlotME; import appeng.client.me.SlotDisconnected; @@ -71,36 +71,36 @@ import appeng.container.slot.AppEngCraftingSlot; import appeng.container.slot.AppEngSlot; import appeng.container.slot.AppEngSlot.CalculatedValidity; import appeng.container.slot.IOptionalSlot; -import appeng.container.slot.SlotCraftingTerm; -import appeng.container.slot.SlotDisabled; -import appeng.container.slot.SlotFake; -import appeng.container.slot.SlotInaccessible; -import appeng.container.slot.SlotOutput; -import appeng.container.slot.SlotPatternTerm; -import appeng.container.slot.SlotRestrictedInput; +import appeng.container.slot.CraftingTermSlot; +import appeng.container.slot.DisabledSlot; +import appeng.container.slot.FakeSlot; +import appeng.container.slot.InaccessibleSlot; +import appeng.container.slot.OutputSlot; +import appeng.container.slot.PatternTermSlot; +import appeng.container.slot.RestrictedInputSlot; import appeng.core.AELog; import appeng.core.AppEng; import appeng.core.sync.network.NetworkHandler; -import appeng.core.sync.packets.PacketInventoryAction; -import appeng.core.sync.packets.PacketSwapSlots; +import appeng.core.sync.packets.InventoryActionPacket; +import appeng.core.sync.packets.SwapSlotsPacket; import appeng.fluids.client.render.FluidStackSizeRenderer; import appeng.fluids.container.slots.IMEFluidSlot; import appeng.helpers.InventoryAction; -public abstract class AEBaseGui extends ContainerScreen { +public abstract class AEBaseScreen extends ContainerScreen { private final List meSlots = new ArrayList<>(); // drag y private final Set drag_click = new HashSet<>(); private final StackSizeRenderer stackSizeRenderer = new StackSizeRenderer(); private final FluidStackSizeRenderer fluidStackSizeRenderer = new FluidStackSizeRenderer(); - private GuiScrollbar myScrollBar = null; + private Scrollbar myScrollBar = null; private boolean disableShiftClick = false; private Stopwatch dbl_clickTimer = Stopwatch.createStarted(); private ItemStack dbl_whichItem = ItemStack.EMPTY; private Slot bl_clicked; - protected final List guiSlots = new ArrayList<>(); + protected final List guiSlots = new ArrayList<>(); - public AEBaseGui(T container, PlayerInventory playerInventory, ITextComponent title) { + public AEBaseScreen(T container, PlayerInventory playerInventory, ITextComponent title) { super(container, playerInventory, title); } @@ -128,11 +128,11 @@ public abstract class AEBaseGui extends ContainerScre RenderSystem.pushMatrix(); RenderSystem.translatef(this.guiLeft, this.guiTop, 0.0F); RenderSystem.enableDepthTest(); - for (final GuiCustomSlot c : this.guiSlots) { + for (final CustomSlotWidget c : this.guiSlots) { this.drawGuiSlot(c, mouseX, mouseY, partialTicks); } RenderSystem.disableDepthTest(); - for (final GuiCustomSlot c : this.guiSlots) { + for (final CustomSlotWidget c : this.guiSlots) { this.drawTooltip(c, mouseX - this.guiLeft, mouseY - this.guiTop); } RenderSystem.popMatrix(); @@ -147,7 +147,7 @@ public abstract class AEBaseGui extends ContainerScre } } - protected void drawGuiSlot(GuiCustomSlot slot, int mouseX, int mouseY, float partialTicks) { + protected void drawGuiSlot(CustomSlotWidget slot, int mouseX, int mouseY, float partialTicks) { if (slot.isSlotEnabled()) { final int left = slot.xPos(); final int top = slot.yPos(); @@ -250,7 +250,7 @@ public abstract class AEBaseGui extends ContainerScre } } - for (final GuiCustomSlot slot : this.guiSlots) { + for (final CustomSlotWidget slot : this.guiSlots) { slot.drawBackground(ox, oy, getBlitOffset()); } @@ -269,7 +269,7 @@ public abstract class AEBaseGui extends ContainerScre } } - for (GuiCustomSlot slot : this.guiSlots) { + for (CustomSlotWidget slot : this.guiSlots) { if (this.isPointInRegion(slot.xPos(), slot.yPos(), slot.getWidth(), slot.getHeight(), xCoord, yCoord) && slot.canClick(getPlayer())) { slot.slotClicked(getPlayer().inventory.getItemStack(), btn); @@ -294,11 +294,11 @@ public abstract class AEBaseGui extends ContainerScre this.getScrollBar().click((int) mouseX - this.guiLeft, (int) mouseY - this.guiTop); } - if (slot instanceof SlotFake && !itemstack.isEmpty()) { + if (slot instanceof FakeSlot && !itemstack.isEmpty()) { this.drag_click.add(slot); if (this.drag_click.size() > 1) { for (final Slot dr : this.drag_click) { - final PacketInventoryAction p = new PacketInventoryAction( + final InventoryActionPacket p = new InventoryActionPacket( mouseButton == 0 ? InventoryAction.PICKUP_OR_SET_DOWN : InventoryAction.PLACE_SINGLE, dr.slotNumber, 0); NetworkHandler.instance().sendToServer(p); @@ -317,7 +317,7 @@ public abstract class AEBaseGui extends ContainerScre final ClickType clickType) { final PlayerEntity player = getPlayer(); - if (slot instanceof SlotFake) { + if (slot instanceof FakeSlot) { final InventoryAction action = mouseButton == 1 ? InventoryAction.SPLIT_OR_PLACE_SINGLE : InventoryAction.PICKUP_OR_SET_DOWN; @@ -325,19 +325,19 @@ public abstract class AEBaseGui extends ContainerScre return; } - final PacketInventoryAction p = new PacketInventoryAction(action, slotIdx, 0); + final InventoryActionPacket p = new InventoryActionPacket(action, slotIdx, 0); NetworkHandler.instance().sendToServer(p); return; } - if (slot instanceof SlotPatternTerm) { + if (slot instanceof PatternTermSlot) { if (mouseButton == 6) { return; // prevent weird double clicks.. } - NetworkHandler.instance().sendToServer(((SlotPatternTerm) slot).getRequest(hasShiftDown())); - } else if (slot instanceof SlotCraftingTerm) { + NetworkHandler.instance().sendToServer(((PatternTermSlot) slot).getRequest(hasShiftDown())); + } else if (slot instanceof CraftingTermSlot) { if (mouseButton == 6) { return; // prevent weird double clicks.. } @@ -350,7 +350,7 @@ public abstract class AEBaseGui extends ContainerScre action = (mouseButton == 1) ? InventoryAction.CRAFT_STACK : InventoryAction.CRAFT_ITEM; } - final PacketInventoryAction p = new PacketInventoryAction(action, slotIdx, 0); + final InventoryActionPacket p = new InventoryActionPacket(action, slotIdx, 0); NetworkHandler.instance().sendToServer(p); return; @@ -370,7 +370,7 @@ public abstract class AEBaseGui extends ContainerScre } ((AEBaseContainer) this.container).setTargetStack(stack); - final PacketInventoryAction p = new PacketInventoryAction(InventoryAction.MOVE_REGION, slotNum, 0); + final InventoryActionPacket p = new InventoryActionPacket(InventoryAction.MOVE_REGION, slotNum, 0); NetworkHandler.instance().sendToServer(p); return; } @@ -401,7 +401,7 @@ public abstract class AEBaseGui extends ContainerScre } if (action != null) { - final PacketInventoryAction p = new PacketInventoryAction(action, slot.getSlotIndex(), + final InventoryActionPacket p = new InventoryActionPacket(action, slot.getSlotIndex(), ((SlotDisconnected) slot).getSlot().getId()); NetworkHandler.instance().sendToServer(p); } @@ -449,7 +449,7 @@ public abstract class AEBaseGui extends ContainerScre if (action != null) { this.container.setTargetStack(stack); - final PacketInventoryAction p = new PacketInventoryAction(action, this.getInventorySlots().size(), 0); + final InventoryActionPacket p = new InventoryActionPacket(action, this.getInventorySlots().size(), 0); NetworkHandler.instance().sendToServer(p); } @@ -522,7 +522,7 @@ public abstract class AEBaseGui extends ContainerScre if (s.getSlotIndex() == j && s.inventory == ((AEBaseContainer) this.container).getPlayerInv()) { NetworkHandler.instance() - .sendToServer(new PacketSwapSlots(s.slotNumber, theSlot.slotNumber)); + .sendToServer(new SwapSlotsPacket(s.slotNumber, theSlot.slotNumber)); return true; } } @@ -575,7 +575,7 @@ public abstract class AEBaseGui extends ContainerScre final int times = (int) Math.abs(wheel); final int inventorySize = this.getInventorySlots().size(); for (int h = 0; h < times; h++) { - final PacketInventoryAction p = new PacketInventoryAction(direction, inventorySize, 0); + final InventoryActionPacket p = new InventoryActionPacket(direction, inventorySize, 0); NetworkHandler.instance().sendToServer(p); } } @@ -716,13 +716,13 @@ public abstract class AEBaseGui extends ContainerScre if (!is.isEmpty() && s instanceof AppEngSlot) { AppEngSlot aeSlot = (AppEngSlot) s; if (aeSlot.getIsValid() == CalculatedValidity.NotAvailable) { - boolean isValid = s.isItemValid(is) || s instanceof SlotOutput - || s instanceof AppEngCraftingSlot || s instanceof SlotDisabled - || s instanceof SlotInaccessible || s instanceof SlotFake - || s instanceof SlotRestrictedInput || s instanceof SlotDisconnected; - if (isValid && s instanceof SlotRestrictedInput) { + boolean isValid = s.isItemValid(is) || s instanceof OutputSlot + || s instanceof AppEngCraftingSlot || s instanceof DisabledSlot + || s instanceof InaccessibleSlot || s instanceof FakeSlot + || s instanceof RestrictedInputSlot || s instanceof SlotDisconnected; + if (isValid && s instanceof RestrictedInputSlot) { try { - isValid = ((SlotRestrictedInput) s).isValid(is, getMinecraft().world); + isValid = ((RestrictedInputSlot) s).isValid(is, getMinecraft().world); } catch (final Exception err) { AELog.debug(err); } @@ -770,11 +770,11 @@ public abstract class AEBaseGui extends ContainerScre getMinecraft().getTextureManager().bindTexture(loc); } - protected GuiScrollbar getScrollBar() { + protected Scrollbar getScrollBar() { return this.myScrollBar; } - protected void setScrollBar(final GuiScrollbar myScrollBar) { + protected void setScrollBar(final Scrollbar myScrollBar) { this.myScrollBar = myScrollBar; } diff --git a/src/main/java/appeng/client/gui/implementations/AESubGui.java b/src/main/java/appeng/client/gui/implementations/AESubScreen.java similarity index 62% rename from src/main/java/appeng/client/gui/implementations/AESubGui.java rename to src/main/java/appeng/client/gui/implementations/AESubScreen.java index 163265104..a971b7aa1 100644 --- a/src/main/java/appeng/client/gui/implementations/AESubGui.java +++ b/src/main/java/appeng/client/gui/implementations/AESubScreen.java @@ -11,29 +11,29 @@ import net.minecraft.item.ItemStack; import appeng.api.AEApi; import appeng.api.definitions.IDefinitions; import appeng.api.definitions.IParts; -import appeng.client.gui.AEBaseGui; -import appeng.client.gui.widgets.GuiTabButton; -import appeng.container.implementations.ContainerChest; -import appeng.container.implementations.ContainerCraftingTerm; -import appeng.container.implementations.ContainerMEMonitorable; -import appeng.container.implementations.ContainerPatternTerm; -import appeng.container.implementations.ContainerWirelessTerm; +import appeng.client.gui.AEBaseScreen; +import appeng.client.gui.widgets.TabButton; +import appeng.container.implementations.ChestContainer; +import appeng.container.implementations.CraftingTermContainer; +import appeng.container.implementations.MEMonitorableContainer; +import appeng.container.implementations.PatternTermContainer; +import appeng.container.implementations.WirelessTermContainer; import appeng.core.sync.network.NetworkHandler; -import appeng.core.sync.packets.PacketSwitchGuis; +import appeng.core.sync.packets.SwitchGuisPacket; import appeng.helpers.IPriorityHost; import appeng.helpers.WirelessTerminalGuiObject; -import appeng.parts.reporting.PartCraftingTerminal; -import appeng.parts.reporting.PartPatternTerminal; -import appeng.parts.reporting.PartTerminal; -import appeng.tile.storage.TileChest; +import appeng.parts.reporting.CraftingTerminalPart; +import appeng.parts.reporting.PatternTerminalPart; +import appeng.parts.reporting.TerminalPart; +import appeng.tile.storage.ChestTileEntity; /** * Utility class for sub-screens of other containers that allow returning to the * primary container UI. */ -final class AESubGui { +final class AESubScreen { - private final AEBaseGui gui; + private final AEBaseScreen gui; private final ContainerType previousContainerType; private final ItemStack previousContainerIcon; @@ -41,19 +41,19 @@ final class AESubGui { * Based on the container we're opening for, try to determine what it's * "primary" GUI would be so that we can go back to it. */ - public AESubGui(AEBaseGui gui, Object containerTarget) { + public AESubScreen(AEBaseScreen gui, Object containerTarget) { this.gui = gui; final IDefinitions definitions = AEApi.instance().definitions(); final IParts parts = definitions.parts(); - if (containerTarget instanceof TileChest) { + if (containerTarget instanceof ChestTileEntity) { // A chest is also a priority host, but the priority _interface_ can only be // opened from the // chest ui that doesn't actually show the contents of the inserted cell. IPriorityHost priorityHost = (IPriorityHost) containerTarget; this.previousContainerIcon = priorityHost.getItemStackRepresentation(); - this.previousContainerType = ContainerChest.TYPE; + this.previousContainerType = ChestContainer.TYPE; } else if (containerTarget instanceof IPriorityHost) { @@ -64,22 +64,22 @@ final class AESubGui { else if (containerTarget instanceof WirelessTerminalGuiObject) { this.previousContainerIcon = definitions.items().wirelessTerminal().maybeStack(1).orElse(ItemStack.EMPTY); - this.previousContainerType = ContainerWirelessTerm.TYPE; + this.previousContainerType = WirelessTermContainer.TYPE; } - else if (containerTarget instanceof PartTerminal) { + else if (containerTarget instanceof TerminalPart) { this.previousContainerIcon = parts.terminal().maybeStack(1).orElse(ItemStack.EMPTY); - this.previousContainerType = ContainerMEMonitorable.TYPE; + this.previousContainerType = MEMonitorableContainer.TYPE; } - else if (containerTarget instanceof PartCraftingTerminal) { + else if (containerTarget instanceof CraftingTerminalPart) { this.previousContainerIcon = parts.craftingTerminal().maybeStack(1).orElse(ItemStack.EMPTY); - this.previousContainerType = ContainerCraftingTerm.TYPE; + this.previousContainerType = CraftingTermContainer.TYPE; } - else if (containerTarget instanceof PartPatternTerminal) { + else if (containerTarget instanceof PatternTerminalPart) { this.previousContainerIcon = parts.patternTerminal().maybeStack(1).orElse(ItemStack.EMPTY); - this.previousContainerType = ContainerPatternTerm.TYPE; + this.previousContainerType = PatternTermContainer.TYPE; } else { @@ -88,17 +88,17 @@ final class AESubGui { } } - public final GuiTabButton addBackButton(Consumer buttonAdder, int x, int y) { + public final TabButton addBackButton(Consumer buttonAdder, int x, int y) { return addBackButton(buttonAdder, x, y, null); } - public final GuiTabButton addBackButton(Consumer buttonAdder, int x, int y, @Nullable String label) { + public final TabButton addBackButton(Consumer buttonAdder, int x, int y, @Nullable String label) { if (this.previousContainerType != null && !previousContainerIcon.isEmpty()) { if (label == null) { label = previousContainerIcon.getDisplayName().getString(); } ItemRenderer itemRenderer = gui.getMinecraft().getItemRenderer(); - GuiTabButton button = new GuiTabButton(gui.getGuiLeft() + x, gui.getGuiTop() + y, previousContainerIcon, + TabButton button = new TabButton(gui.getGuiLeft() + x, gui.getGuiTop() + y, previousContainerIcon, label, itemRenderer, btn -> goBack()); buttonAdder.accept(button); return button; @@ -107,7 +107,7 @@ final class AESubGui { } public final void goBack() { - NetworkHandler.instance().sendToServer(new PacketSwitchGuis(this.previousContainerType)); + NetworkHandler.instance().sendToServer(new SwitchGuisPacket(this.previousContainerType)); } } diff --git a/src/main/java/appeng/client/gui/implementations/GuiCellWorkbench.java b/src/main/java/appeng/client/gui/implementations/CellWorkbenchScreen.java similarity index 83% rename from src/main/java/appeng/client/gui/implementations/GuiCellWorkbench.java rename to src/main/java/appeng/client/gui/implementations/CellWorkbenchScreen.java index 943e7ac88..5cb390f60 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiCellWorkbench.java +++ b/src/main/java/appeng/client/gui/implementations/CellWorkbenchScreen.java @@ -30,32 +30,32 @@ import appeng.api.config.FuzzyMode; import appeng.api.config.Settings; import appeng.api.config.Upgrades; import appeng.api.implementations.items.IUpgradeModule; -import appeng.client.gui.widgets.GuiActionButton; -import appeng.client.gui.widgets.GuiSettingToggleButton; -import appeng.client.gui.widgets.GuiToggleButton; -import appeng.container.implementations.ContainerCellWorkbench; +import appeng.client.gui.widgets.ActionButton; +import appeng.client.gui.widgets.SettingToggleButton; +import appeng.client.gui.widgets.ToggleButton; +import appeng.container.implementations.CellWorkbenchContainer; import appeng.core.localization.GuiText; import appeng.core.sync.network.NetworkHandler; -import appeng.core.sync.packets.PacketValueConfig; +import appeng.core.sync.packets.ConfigValuePacket; -public class GuiCellWorkbench extends GuiUpgradeable { +public class CellWorkbenchScreen extends UpgradeableScreen { - private GuiToggleButton copyMode; + private ToggleButton copyMode; - public GuiCellWorkbench(ContainerCellWorkbench container, PlayerInventory playerInventory, ITextComponent title) { + public CellWorkbenchScreen(CellWorkbenchContainer container, PlayerInventory playerInventory, ITextComponent title) { super(container, playerInventory, title); this.ySize = 251; } @Override protected void addButtons() { - this.fuzzyMode = this.addButton(new GuiSettingToggleButton<>(this.guiLeft - 18, this.guiTop + 68, + this.fuzzyMode = this.addButton(new SettingToggleButton<>(this.guiLeft - 18, this.guiTop + 68, Settings.FUZZY_MODE, FuzzyMode.IGNORE_ALL, this::toggleFuzzyMode)); - this.addButton(new GuiActionButton(this.guiLeft - 18, this.guiTop + 28, ActionItems.WRENCH, + this.addButton(new ActionButton(this.guiLeft - 18, this.guiTop + 28, ActionItems.WRENCH, act1 -> action("Partition"))); this.addButton( - new GuiActionButton(this.guiLeft - 18, this.guiTop + 8, ActionItems.CLOSE, act -> action("Clear"))); - this.copyMode = this.addButton(new GuiToggleButton(this.guiLeft - 18, this.guiTop + 48, 11 * 16 + 5, + new ActionButton(this.guiLeft - 18, this.guiTop + 8, ActionItems.CLOSE, act -> action("Clear"))); + this.copyMode = this.addButton(new ToggleButton(this.guiLeft - 18, this.guiTop + 48, 11 * 16 + 5, 12 * 16 + 5, GuiText.CopyMode.getLocal(), GuiText.CopyModeDesc.getLocal(), act -> action("CopyMode"))); } @@ -146,12 +146,12 @@ public class GuiCellWorkbench extends GuiUpgradeable { } private void action(String type) { - NetworkHandler.instance().sendToServer(new PacketValueConfig("CellWorkbench.Action", type)); + NetworkHandler.instance().sendToServer(new ConfigValuePacket("CellWorkbench.Action", type)); } - private void toggleFuzzyMode(GuiSettingToggleButton button, boolean backwards) { + private void toggleFuzzyMode(SettingToggleButton button, boolean backwards) { FuzzyMode fz = button.getNextValue(backwards); - NetworkHandler.instance().sendToServer(new PacketValueConfig("CellWorkbench.Fuzzy", fz.name())); + NetworkHandler.instance().sendToServer(new ConfigValuePacket("CellWorkbench.Fuzzy", fz.name())); } } diff --git a/src/main/java/appeng/client/gui/implementations/GuiChest.java b/src/main/java/appeng/client/gui/implementations/ChestScreen.java similarity index 75% rename from src/main/java/appeng/client/gui/implementations/GuiChest.java rename to src/main/java/appeng/client/gui/implementations/ChestScreen.java index 4eefd5cc7..9597347be 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiChest.java +++ b/src/main/java/appeng/client/gui/implementations/ChestScreen.java @@ -22,17 +22,17 @@ import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.text.ITextComponent; import net.minecraftforge.fml.client.gui.GuiUtils; -import appeng.client.gui.AEBaseGui; -import appeng.client.gui.widgets.GuiTabButton; -import appeng.container.implementations.ContainerChest; -import appeng.container.implementations.ContainerPriority; +import appeng.client.gui.AEBaseScreen; +import appeng.client.gui.widgets.TabButton; +import appeng.container.implementations.ChestContainer; +import appeng.container.implementations.PriorityContainer; import appeng.core.localization.GuiText; import appeng.core.sync.network.NetworkHandler; -import appeng.core.sync.packets.PacketSwitchGuis; +import appeng.core.sync.packets.SwitchGuisPacket; -public class GuiChest extends AEBaseGui { +public class ChestScreen extends AEBaseScreen { - public GuiChest(ContainerChest container, PlayerInventory playerInventory, ITextComponent title) { + public ChestScreen(ChestContainer container, PlayerInventory playerInventory, ITextComponent title) { super(container, playerInventory, title); this.ySize = 166; } @@ -41,12 +41,12 @@ public class GuiChest extends AEBaseGui { public void init() { super.init(); - this.addButton(new GuiTabButton(this.guiLeft + 154, this.guiTop, 2 + 4 * 16, GuiText.Priority.getLocal(), + this.addButton(new TabButton(this.guiLeft + 154, this.guiTop, 2 + 4 * 16, GuiText.Priority.getLocal(), this.itemRenderer, btn -> openPriority())); } private void openPriority() { - NetworkHandler.instance().sendToServer(new PacketSwitchGuis(ContainerPriority.TYPE)); + NetworkHandler.instance().sendToServer(new SwitchGuisPacket(PriorityContainer.TYPE)); } @Override diff --git a/src/main/java/appeng/client/gui/implementations/GuiCondenser.java b/src/main/java/appeng/client/gui/implementations/CondenserScreen.java similarity index 73% rename from src/main/java/appeng/client/gui/implementations/GuiCondenser.java rename to src/main/java/appeng/client/gui/implementations/CondenserScreen.java index 309736d1c..dd4205830 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiCondenser.java +++ b/src/main/java/appeng/client/gui/implementations/CondenserScreen.java @@ -24,19 +24,19 @@ import net.minecraftforge.fml.client.gui.GuiUtils; import appeng.api.config.CondenserOutput; import appeng.api.config.Settings; -import appeng.client.gui.AEBaseGui; -import appeng.client.gui.widgets.GuiProgressBar; -import appeng.client.gui.widgets.GuiProgressBar.Direction; -import appeng.client.gui.widgets.GuiServerSettingToggleButton; -import appeng.client.gui.widgets.GuiSettingToggleButton; -import appeng.container.implementations.ContainerCondenser; +import appeng.client.gui.AEBaseScreen; +import appeng.client.gui.widgets.ProgressBar; +import appeng.client.gui.widgets.ProgressBar.Direction; +import appeng.client.gui.widgets.ServerSettingToggleButton; +import appeng.client.gui.widgets.SettingToggleButton; +import appeng.container.implementations.CondenserContainer; import appeng.core.localization.GuiText; -public class GuiCondenser extends AEBaseGui { +public class CondenserScreen extends AEBaseScreen { - private GuiSettingToggleButton mode; + private SettingToggleButton mode; - public GuiCondenser(ContainerCondenser container, PlayerInventory playerInventory, ITextComponent title) { + public CondenserScreen(CondenserContainer container, PlayerInventory playerInventory, ITextComponent title) { super(container, playerInventory, title); this.ySize = 197; } @@ -45,10 +45,10 @@ public class GuiCondenser extends AEBaseGui { public void init() { super.init(); - this.mode = new GuiServerSettingToggleButton<>(128 + this.guiLeft, 52 + this.guiTop, Settings.CONDENSER_OUTPUT, + this.mode = new ServerSettingToggleButton<>(128 + this.guiLeft, 52 + this.guiTop, Settings.CONDENSER_OUTPUT, this.container.getOutput()); - this.addButton(new GuiProgressBar(this.container, "guis/condenser.png", 120 + this.guiLeft, 25 + this.guiTop, + this.addButton(new ProgressBar(this.container, "guis/condenser.png", 120 + this.guiLeft, 25 + this.guiTop, 178, 25, 6, 18, Direction.VERTICAL, GuiText.StoredEnergy.getLocal())); this.addButton(this.mode); } diff --git a/src/main/java/appeng/client/gui/implementations/GuiCraftAmount.java b/src/main/java/appeng/client/gui/implementations/CraftAmountScreen.java similarity index 90% rename from src/main/java/appeng/client/gui/implementations/GuiCraftAmount.java rename to src/main/java/appeng/client/gui/implementations/CraftAmountScreen.java index a58be6b00..629b7ac80 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiCraftAmount.java +++ b/src/main/java/appeng/client/gui/implementations/CraftAmountScreen.java @@ -24,24 +24,24 @@ import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.text.ITextComponent; import net.minecraftforge.fml.client.gui.GuiUtils; -import appeng.client.gui.AEBaseGui; -import appeng.client.gui.widgets.GuiNumberBox; -import appeng.container.implementations.ContainerCraftAmount; +import appeng.client.gui.AEBaseScreen; +import appeng.client.gui.widgets.NumberBox; +import appeng.container.implementations.CraftAmountContainer; import appeng.core.AEConfig; import appeng.core.localization.GuiText; import appeng.core.sync.network.NetworkHandler; -import appeng.core.sync.packets.PacketCraftRequest; +import appeng.core.sync.packets.CraftRequestPacket; -public class GuiCraftAmount extends AEBaseGui { - private final AESubGui subGui; +public class CraftAmountScreen extends AEBaseScreen { + private final AESubScreen subGui; - private GuiNumberBox amountToCraft; + private NumberBox amountToCraft; private Button next; - public GuiCraftAmount(ContainerCraftAmount container, PlayerInventory playerInventory, ITextComponent title) { + public CraftAmountScreen(CraftAmountContainer container, PlayerInventory playerInventory, ITextComponent title) { super(container, playerInventory, title); - this.subGui = new AESubGui(this, container.getTarget()); + this.subGui = new AESubScreen(this, container.getTarget()); } @Override @@ -68,7 +68,7 @@ public class GuiCraftAmount extends AEBaseGui { subGui.addBackButton(this::addButton, 154, 0); - this.amountToCraft = new GuiNumberBox(this.font, this.guiLeft + 62, this.guiTop + 57, 59, this.font.FONT_HEIGHT, + this.amountToCraft = new NumberBox(this.font, this.guiLeft + 62, this.guiTop + 57, 59, this.font.FONT_HEIGHT, Integer.class); this.amountToCraft.setEnableBackgroundDrawing(false); this.amountToCraft.setMaxStringLength(16); @@ -80,7 +80,7 @@ public class GuiCraftAmount extends AEBaseGui { private void confirm(Button button) { NetworkHandler.instance() - .sendToServer(new PacketCraftRequest(Integer.parseInt(this.amountToCraft.getText()), hasShiftDown())); + .sendToServer(new CraftRequestPacket(Integer.parseInt(this.amountToCraft.getText()), hasShiftDown())); } @Override diff --git a/src/main/java/appeng/client/gui/implementations/GuiCraftConfirm.java b/src/main/java/appeng/client/gui/implementations/CraftConfirmScreen.java similarity index 95% rename from src/main/java/appeng/client/gui/implementations/GuiCraftConfirm.java rename to src/main/java/appeng/client/gui/implementations/CraftConfirmScreen.java index fac0e3fc9..5c631e4e6 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiCraftConfirm.java +++ b/src/main/java/appeng/client/gui/implementations/CraftConfirmScreen.java @@ -37,17 +37,17 @@ import appeng.api.AEApi; import appeng.api.storage.channels.IItemStorageChannel; import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IItemList; -import appeng.client.gui.AEBaseGui; -import appeng.client.gui.widgets.GuiScrollbar; -import appeng.container.implementations.ContainerCraftConfirm; +import appeng.client.gui.AEBaseScreen; +import appeng.client.gui.widgets.Scrollbar; +import appeng.container.implementations.CraftConfirmContainer; import appeng.core.localization.GuiText; import appeng.core.sync.network.NetworkHandler; -import appeng.core.sync.packets.PacketValueConfig; +import appeng.core.sync.packets.ConfigValuePacket; import appeng.util.Platform; -public class GuiCraftConfirm extends AEBaseGui { +public class CraftConfirmScreen extends AEBaseScreen { - private final AESubGui subGui; + private final AESubScreen subGui; private final int rows = 5; @@ -64,13 +64,13 @@ public class GuiCraftConfirm extends AEBaseGui { private Button selectCPU; private int tooltip = -1; - public GuiCraftConfirm(ContainerCraftConfirm container, PlayerInventory playerInventory, ITextComponent title) { + public CraftConfirmScreen(CraftConfirmContainer container, PlayerInventory playerInventory, ITextComponent title) { super(container, playerInventory, title); - this.subGui = new AESubGui(this, container.getTarget()); + this.subGui = new AESubScreen(this, container.getTarget()); this.xSize = 238; this.ySize = 206; - final GuiScrollbar scrollbar = new GuiScrollbar(); + final Scrollbar scrollbar = new Scrollbar(); this.setScrollBar(scrollbar); } @@ -450,11 +450,11 @@ public class GuiCraftConfirm extends AEBaseGui { private void selectNextCpu() { final boolean backwards = minecraft.mouseHelper.isRightDown(); - NetworkHandler.instance().sendToServer(new PacketValueConfig("Terminal.Cpu", backwards ? "Prev" : "Next")); + NetworkHandler.instance().sendToServer(new ConfigValuePacket("Terminal.Cpu", backwards ? "Prev" : "Next")); } private void start() { - NetworkHandler.instance().sendToServer(new PacketValueConfig("Terminal.Start", "Start")); + NetworkHandler.instance().sendToServer(new ConfigValuePacket("Terminal.Start", "Start")); } } diff --git a/src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java b/src/main/java/appeng/client/gui/implementations/CraftingCPUScreen.java similarity index 96% rename from src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java rename to src/main/java/appeng/client/gui/implementations/CraftingCPUScreen.java index 97465eebf..0e26789f5 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java +++ b/src/main/java/appeng/client/gui/implementations/CraftingCPUScreen.java @@ -42,18 +42,18 @@ import appeng.api.storage.channels.IItemStorageChannel; import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IItemList; import appeng.api.util.AEColor; -import appeng.client.gui.AEBaseGui; -import appeng.client.gui.widgets.GuiScrollbar; +import appeng.client.gui.AEBaseScreen; +import appeng.client.gui.widgets.Scrollbar; import appeng.client.gui.widgets.ISortSource; -import appeng.container.implementations.ContainerCraftingCPU; +import appeng.container.implementations.CraftingCPUContainer; import appeng.core.AEConfig; import appeng.core.localization.GuiText; import appeng.core.sync.network.NetworkHandler; -import appeng.core.sync.packets.PacketValueConfig; +import appeng.core.sync.packets.ConfigValuePacket; import appeng.util.Platform; import appeng.util.ReadableNumberConverter; -public class GuiCraftingCPU extends AEBaseGui implements ISortSource { +public class CraftingCPUScreen extends AEBaseScreen implements ISortSource { private static final int GUI_HEIGHT = 184; private static final int GUI_WIDTH = 238; @@ -90,12 +90,12 @@ public class GuiCraftingCPU extends AEBaseGui private Button cancel; private int tooltip = -1; - public GuiCraftingCPU(T container, PlayerInventory playerInventory, ITextComponent title) { + public CraftingCPUScreen(T container, PlayerInventory playerInventory, ITextComponent title) { super(container, playerInventory, title); this.ySize = GUI_HEIGHT; this.xSize = GUI_WIDTH; - final GuiScrollbar scrollbar = new GuiScrollbar(); + final Scrollbar scrollbar = new Scrollbar(); this.setScrollBar(scrollbar); } @@ -107,7 +107,7 @@ public class GuiCraftingCPU extends AEBaseGui } private void cancel() { - NetworkHandler.instance().sendToServer(new PacketValueConfig("TileCrafting.Cancel", "Cancel")); + NetworkHandler.instance().sendToServer(new ConfigValuePacket("TileCrafting.Cancel", "Cancel")); } @Override diff --git a/src/main/java/appeng/client/gui/implementations/GuiCraftingStatus.java b/src/main/java/appeng/client/gui/implementations/CraftingStatusScreen.java similarity index 83% rename from src/main/java/appeng/client/gui/implementations/GuiCraftingStatus.java rename to src/main/java/appeng/client/gui/implementations/CraftingStatusScreen.java index 5296eb787..f00c2d69f 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiCraftingStatus.java +++ b/src/main/java/appeng/client/gui/implementations/CraftingStatusScreen.java @@ -26,20 +26,20 @@ import net.minecraft.client.gui.widget.button.Button; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.text.ITextComponent; -import appeng.container.implementations.ContainerCraftingStatus; +import appeng.container.implementations.CraftingStatusContainer; import appeng.core.localization.GuiText; import appeng.core.sync.network.NetworkHandler; -import appeng.core.sync.packets.PacketValueConfig; +import appeng.core.sync.packets.ConfigValuePacket; -public class GuiCraftingStatus extends GuiCraftingCPU { +public class CraftingStatusScreen extends CraftingCPUScreen { - private final AESubGui subGui; + private final AESubScreen subGui; private Button selectCPU; - public GuiCraftingStatus(ContainerCraftingStatus container, PlayerInventory playerInventory, ITextComponent title) { + public CraftingStatusScreen(CraftingStatusContainer container, PlayerInventory playerInventory, ITextComponent title) { super(container, playerInventory, title); - this.subGui = new AESubGui(this, container.getTarget()); + this.subGui = new AESubScreen(this, container.getTarget()); } @Override @@ -90,7 +90,7 @@ public class GuiCraftingStatus extends GuiCraftingCPU { // FIXME: Extract to separate class? Shared with GuiCraftConfirm private void selectNextCpu() { final boolean backwards = minecraft.mouseHelper.isRightDown(); - NetworkHandler.instance().sendToServer(new PacketValueConfig("Terminal.Cpu", backwards ? "Prev" : "Next")); + NetworkHandler.instance().sendToServer(new ConfigValuePacket("Terminal.Cpu", backwards ? "Prev" : "Next")); } } diff --git a/src/main/java/appeng/client/gui/implementations/GuiCraftingTerm.java b/src/main/java/appeng/client/gui/implementations/CraftingTermScreen.java similarity index 76% rename from src/main/java/appeng/client/gui/implementations/GuiCraftingTerm.java rename to src/main/java/appeng/client/gui/implementations/CraftingTermScreen.java index cd4189b95..f78274da0 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiCraftingTerm.java +++ b/src/main/java/appeng/client/gui/implementations/CraftingTermScreen.java @@ -23,17 +23,17 @@ import net.minecraft.inventory.container.Slot; import net.minecraft.util.text.ITextComponent; import appeng.api.config.ActionItems; -import appeng.client.gui.widgets.GuiActionButton; -import appeng.container.implementations.ContainerCraftingTerm; -import appeng.container.slot.SlotCraftingMatrix; +import appeng.client.gui.widgets.ActionButton; +import appeng.container.implementations.CraftingTermContainer; +import appeng.container.slot.CraftingMatrixSlot; import appeng.core.localization.GuiText; import appeng.core.sync.network.NetworkHandler; -import appeng.core.sync.packets.PacketInventoryAction; +import appeng.core.sync.packets.InventoryActionPacket; import appeng.helpers.InventoryAction; -public class GuiCraftingTerm extends GuiMEMonitorable { +public class CraftingTermScreen extends MEMonitorableScreen { - public GuiCraftingTerm(ContainerCraftingTerm container, PlayerInventory playerInventory, ITextComponent title) { + public CraftingTermScreen(CraftingTermContainer container, PlayerInventory playerInventory, ITextComponent title) { super(container, playerInventory, title); this.setReservedSpace(73); } @@ -41,13 +41,13 @@ public class GuiCraftingTerm extends GuiMEMonitorable { private void clear() { Slot s = null; for (final Object j : this.container.inventorySlots) { - if (j instanceof SlotCraftingMatrix) { + if (j instanceof CraftingMatrixSlot) { s = (Slot) j; } } if (s != null) { - final PacketInventoryAction p = new PacketInventoryAction(InventoryAction.MOVE_REGION, s.slotNumber, 0); + final InventoryActionPacket p = new InventoryActionPacket(InventoryAction.MOVE_REGION, s.slotNumber, 0); NetworkHandler.instance().sendToServer(p); } } @@ -55,7 +55,7 @@ public class GuiCraftingTerm extends GuiMEMonitorable { @Override public void init() { super.init(); - GuiActionButton clearBtn = this.addButton(new GuiActionButton(this.guiLeft + 92, this.guiTop + this.ySize - 156, + ActionButton clearBtn = this.addButton(new ActionButton(this.guiLeft + 92, this.guiTop + this.ySize - 156, ActionItems.STASH, btn -> clear())); clearBtn.setHalfSize(true); } diff --git a/src/main/java/appeng/client/gui/implementations/GuiDrive.java b/src/main/java/appeng/client/gui/implementations/DriveScreen.java similarity index 75% rename from src/main/java/appeng/client/gui/implementations/GuiDrive.java rename to src/main/java/appeng/client/gui/implementations/DriveScreen.java index 07a4c45e6..e7f0a4112 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiDrive.java +++ b/src/main/java/appeng/client/gui/implementations/DriveScreen.java @@ -22,17 +22,17 @@ import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.text.ITextComponent; import net.minecraftforge.fml.client.gui.GuiUtils; -import appeng.client.gui.AEBaseGui; -import appeng.client.gui.widgets.GuiTabButton; -import appeng.container.implementations.ContainerDrive; -import appeng.container.implementations.ContainerPriority; +import appeng.client.gui.AEBaseScreen; +import appeng.client.gui.widgets.TabButton; +import appeng.container.implementations.DriveContainer; +import appeng.container.implementations.PriorityContainer; import appeng.core.localization.GuiText; import appeng.core.sync.network.NetworkHandler; -import appeng.core.sync.packets.PacketSwitchGuis; +import appeng.core.sync.packets.SwitchGuisPacket; -public class GuiDrive extends AEBaseGui { +public class DriveScreen extends AEBaseScreen { - public GuiDrive(ContainerDrive container, PlayerInventory playerInventory, ITextComponent title) { + public DriveScreen(DriveContainer container, PlayerInventory playerInventory, ITextComponent title) { super(container, playerInventory, title); this.ySize = 199; } @@ -41,12 +41,12 @@ public class GuiDrive extends AEBaseGui { public void init() { super.init(); - this.addButton(new GuiTabButton(this.guiLeft + 154, this.guiTop, 2 + 4 * 16, GuiText.Priority.getLocal(), + this.addButton(new TabButton(this.guiLeft + 154, this.guiTop, 2 + 4 * 16, GuiText.Priority.getLocal(), this.itemRenderer, btn -> openPriorityGui())); } private void openPriorityGui() { - NetworkHandler.instance().sendToServer(new PacketSwitchGuis(ContainerPriority.TYPE)); + NetworkHandler.instance().sendToServer(new SwitchGuisPacket(PriorityContainer.TYPE)); } @Override diff --git a/src/main/java/appeng/client/gui/implementations/GuiFormationPlane.java b/src/main/java/appeng/client/gui/implementations/FormationPlaneScreen.java similarity index 66% rename from src/main/java/appeng/client/gui/implementations/GuiFormationPlane.java rename to src/main/java/appeng/client/gui/implementations/FormationPlaneScreen.java index 4e3d549a0..7f24cee41 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiFormationPlane.java +++ b/src/main/java/appeng/client/gui/implementations/FormationPlaneScreen.java @@ -24,32 +24,32 @@ import net.minecraft.util.text.ITextComponent; import appeng.api.config.FuzzyMode; import appeng.api.config.Settings; import appeng.api.config.YesNo; -import appeng.client.gui.widgets.GuiServerSettingToggleButton; -import appeng.client.gui.widgets.GuiSettingToggleButton; -import appeng.client.gui.widgets.GuiTabButton; -import appeng.container.implementations.ContainerFormationPlane; -import appeng.container.implementations.ContainerPriority; +import appeng.client.gui.widgets.ServerSettingToggleButton; +import appeng.client.gui.widgets.SettingToggleButton; +import appeng.client.gui.widgets.TabButton; +import appeng.container.implementations.FormationPlaneContainer; +import appeng.container.implementations.PriorityContainer; import appeng.core.localization.GuiText; import appeng.core.sync.network.NetworkHandler; -import appeng.core.sync.packets.PacketSwitchGuis; +import appeng.core.sync.packets.SwitchGuisPacket; -public class GuiFormationPlane extends GuiUpgradeable { +public class FormationPlaneScreen extends UpgradeableScreen { - private GuiSettingToggleButton placeMode; + private SettingToggleButton placeMode; - public GuiFormationPlane(ContainerFormationPlane container, PlayerInventory playerInventory, ITextComponent title) { + public FormationPlaneScreen(FormationPlaneContainer container, PlayerInventory playerInventory, ITextComponent title) { super(container, playerInventory, title); this.ySize = 251; } @Override protected void addButtons() { - this.placeMode = new GuiServerSettingToggleButton<>(this.guiLeft - 18, this.guiTop + 28, Settings.PLACE_BLOCK, + this.placeMode = new ServerSettingToggleButton<>(this.guiLeft - 18, this.guiTop + 28, Settings.PLACE_BLOCK, YesNo.YES); - this.fuzzyMode = new GuiServerSettingToggleButton<>(this.guiLeft - 18, this.guiTop + 48, Settings.FUZZY_MODE, + this.fuzzyMode = new ServerSettingToggleButton<>(this.guiLeft - 18, this.guiTop + 48, Settings.FUZZY_MODE, FuzzyMode.IGNORE_ALL); - this.addButton(new GuiTabButton(this.guiLeft + 154, this.guiTop, 2 + 4 * 16, GuiText.Priority.getLocal(), + this.addButton(new TabButton(this.guiLeft + 154, this.guiTop, 2 + 4 * 16, GuiText.Priority.getLocal(), this.itemRenderer, btn -> openPriorityGui())); this.addButton(this.placeMode); @@ -66,7 +66,7 @@ public class GuiFormationPlane extends GuiUpgradeable { } if (this.placeMode != null) { - this.placeMode.set(((ContainerFormationPlane) this.cvb).getPlaceMode()); + this.placeMode.set(((FormationPlaneContainer) this.cvb).getPlaceMode()); } } @@ -76,7 +76,7 @@ public class GuiFormationPlane extends GuiUpgradeable { } private void openPriorityGui() { - NetworkHandler.instance().sendToServer(new PacketSwitchGuis(ContainerPriority.TYPE)); + NetworkHandler.instance().sendToServer(new SwitchGuisPacket(PriorityContainer.TYPE)); } } diff --git a/src/main/java/appeng/client/gui/implementations/GuiGrinder.java b/src/main/java/appeng/client/gui/implementations/GrinderScreen.java similarity index 86% rename from src/main/java/appeng/client/gui/implementations/GuiGrinder.java rename to src/main/java/appeng/client/gui/implementations/GrinderScreen.java index e95301c8c..1e19a1263 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiGrinder.java +++ b/src/main/java/appeng/client/gui/implementations/GrinderScreen.java @@ -22,13 +22,13 @@ import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.text.ITextComponent; import net.minecraftforge.fml.client.gui.GuiUtils; -import appeng.client.gui.AEBaseGui; -import appeng.container.implementations.ContainerGrinder; +import appeng.client.gui.AEBaseScreen; +import appeng.container.implementations.GrinderContainer; import appeng.core.localization.GuiText; -public class GuiGrinder extends AEBaseGui { +public class GrinderScreen extends AEBaseScreen { - public GuiGrinder(ContainerGrinder container, PlayerInventory playerInventory, ITextComponent title) { + public GrinderScreen(GrinderContainer container, PlayerInventory playerInventory, ITextComponent title) { super(container, playerInventory, title); this.ySize = 176; } diff --git a/src/main/java/appeng/client/gui/implementations/GuiIOPort.java b/src/main/java/appeng/client/gui/implementations/IOPortScreen.java similarity index 75% rename from src/main/java/appeng/client/gui/implementations/GuiIOPort.java rename to src/main/java/appeng/client/gui/implementations/IOPortScreen.java index b4d41b2ee..5760e4f52 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiIOPort.java +++ b/src/main/java/appeng/client/gui/implementations/IOPortScreen.java @@ -27,31 +27,31 @@ import appeng.api.config.OperationMode; import appeng.api.config.RedstoneMode; import appeng.api.config.Settings; import appeng.api.definitions.IDefinitions; -import appeng.client.gui.widgets.GuiServerSettingToggleButton; -import appeng.client.gui.widgets.GuiSettingToggleButton; -import appeng.container.implementations.ContainerIOPort; +import appeng.client.gui.widgets.ServerSettingToggleButton; +import appeng.client.gui.widgets.SettingToggleButton; +import appeng.container.implementations.IOPortContainer; import appeng.core.localization.GuiText; -public class GuiIOPort extends GuiUpgradeable { +public class IOPortScreen extends UpgradeableScreen { - private GuiSettingToggleButton fullMode; - private GuiSettingToggleButton operationMode; + private SettingToggleButton fullMode; + private SettingToggleButton operationMode; - public GuiIOPort(ContainerIOPort container, PlayerInventory playerInventory, ITextComponent title) { + public IOPortScreen(IOPortContainer container, PlayerInventory playerInventory, ITextComponent title) { super(container, playerInventory, title); this.ySize = 166; } @Override protected void addButtons() { - this.fullMode = new GuiServerSettingToggleButton<>(this.guiLeft - 18, this.guiTop + 8, Settings.FULLNESS_MODE, + this.fullMode = new ServerSettingToggleButton<>(this.guiLeft - 18, this.guiTop + 8, Settings.FULLNESS_MODE, FullnessMode.EMPTY); - this.operationMode = new GuiServerSettingToggleButton<>(this.guiLeft + 80, this.guiTop + 17, + this.operationMode = new ServerSettingToggleButton<>(this.guiLeft + 80, this.guiTop + 17, Settings.OPERATION_MODE, OperationMode.EMPTY); this.addButton(this.operationMode); this.addButton(this.fullMode); - this.redstoneMode = new GuiServerSettingToggleButton<>(this.guiLeft - 18, this.guiTop + 28, + this.redstoneMode = new ServerSettingToggleButton<>(this.guiLeft - 18, this.guiTop + 28, Settings.REDSTONE_CONTROLLED, RedstoneMode.IGNORE); addButton(this.redstoneMode); } @@ -66,11 +66,11 @@ public class GuiIOPort extends GuiUpgradeable { } if (this.operationMode != null) { - this.operationMode.set(((ContainerIOPort) this.cvb).getOperationMode()); + this.operationMode.set(((IOPortContainer) this.cvb).getOperationMode()); } if (this.fullMode != null) { - this.fullMode.set(((ContainerIOPort) this.cvb).getFullMode()); + this.fullMode.set(((IOPortContainer) this.cvb).getFullMode()); } } diff --git a/src/main/java/appeng/client/gui/implementations/GuiInscriber.java b/src/main/java/appeng/client/gui/implementations/InscriberScreen.java similarity index 83% rename from src/main/java/appeng/client/gui/implementations/GuiInscriber.java rename to src/main/java/appeng/client/gui/implementations/InscriberScreen.java index 2fd185f26..880803638 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiInscriber.java +++ b/src/main/java/appeng/client/gui/implementations/InscriberScreen.java @@ -22,17 +22,17 @@ import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.text.ITextComponent; import net.minecraftforge.fml.client.gui.GuiUtils; -import appeng.client.gui.AEBaseGui; -import appeng.client.gui.widgets.GuiProgressBar; -import appeng.client.gui.widgets.GuiProgressBar.Direction; -import appeng.container.implementations.ContainerInscriber; +import appeng.client.gui.AEBaseScreen; +import appeng.client.gui.widgets.ProgressBar; +import appeng.client.gui.widgets.ProgressBar.Direction; +import appeng.container.implementations.InscriberContainer; import appeng.core.localization.GuiText; -public class GuiInscriber extends AEBaseGui { +public class InscriberScreen extends AEBaseScreen { - private GuiProgressBar pb; + private ProgressBar pb; - public GuiInscriber(ContainerInscriber container, PlayerInventory playerInventory, ITextComponent title) { + public InscriberScreen(InscriberContainer container, PlayerInventory playerInventory, ITextComponent title) { super(container, playerInventory, title); this.ySize = 176; this.xSize = this.hasToolbox() ? 246 : 211; @@ -46,7 +46,7 @@ public class GuiInscriber extends AEBaseGui { public void init() { super.init(); - this.pb = new GuiProgressBar(this.container, "guis/inscriber.png", 135, 39, 135, 177, 6, 18, + this.pb = new ProgressBar(this.container, "guis/inscriber.png", 135, 39, 135, 177, 6, 18, Direction.VERTICAL); this.addButton(this.pb); } diff --git a/src/main/java/appeng/client/gui/implementations/GuiInterface.java b/src/main/java/appeng/client/gui/implementations/InterfaceScreen.java similarity index 65% rename from src/main/java/appeng/client/gui/implementations/GuiInterface.java rename to src/main/java/appeng/client/gui/implementations/InterfaceScreen.java index 54ace0c4d..10bf73f48 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiInterface.java +++ b/src/main/java/appeng/client/gui/implementations/InterfaceScreen.java @@ -23,37 +23,37 @@ import net.minecraft.util.text.ITextComponent; import appeng.api.config.Settings; import appeng.api.config.YesNo; -import appeng.client.gui.widgets.GuiServerSettingToggleButton; -import appeng.client.gui.widgets.GuiSettingToggleButton; -import appeng.client.gui.widgets.GuiTabButton; -import appeng.client.gui.widgets.GuiToggleButton; -import appeng.container.implementations.ContainerInterface; -import appeng.container.implementations.ContainerPriority; +import appeng.client.gui.widgets.ServerSettingToggleButton; +import appeng.client.gui.widgets.SettingToggleButton; +import appeng.client.gui.widgets.TabButton; +import appeng.client.gui.widgets.ToggleButton; +import appeng.container.implementations.InterfaceContainer; +import appeng.container.implementations.PriorityContainer; import appeng.core.localization.GuiText; import appeng.core.sync.network.NetworkHandler; -import appeng.core.sync.packets.PacketConfigButton; -import appeng.core.sync.packets.PacketSwitchGuis; +import appeng.core.sync.packets.ConfigButtonPacket; +import appeng.core.sync.packets.SwitchGuisPacket; -public class GuiInterface extends GuiUpgradeable { +public class InterfaceScreen extends UpgradeableScreen { - private GuiSettingToggleButton blockMode; - private GuiToggleButton interfaceMode; + private SettingToggleButton blockMode; + private ToggleButton interfaceMode; - public GuiInterface(ContainerInterface container, PlayerInventory playerInventory, ITextComponent title) { + public InterfaceScreen(InterfaceContainer container, PlayerInventory playerInventory, ITextComponent title) { super(container, playerInventory, title); this.ySize = 211; } @Override protected void addButtons() { - this.addButton(new GuiTabButton(this.guiLeft + 154, this.guiTop, 2 + 4 * 16, GuiText.Priority.getLocal(), + this.addButton(new TabButton(this.guiLeft + 154, this.guiTop, 2 + 4 * 16, GuiText.Priority.getLocal(), this.itemRenderer, btn -> openPriorityGui())); - this.blockMode = new GuiServerSettingToggleButton<>(this.guiLeft - 18, this.guiTop + 8, Settings.BLOCK, + this.blockMode = new ServerSettingToggleButton<>(this.guiLeft - 18, this.guiTop + 8, Settings.BLOCK, YesNo.NO); this.addButton(this.blockMode); - this.interfaceMode = new GuiToggleButton(this.guiLeft - 18, this.guiTop + 26, 84, 85, + this.interfaceMode = new ToggleButton(this.guiLeft - 18, this.guiTop + 26, 84, 85, GuiText.InterfaceTerminal.getLocal(), GuiText.InterfaceTerminalHint.getLocal(), btn -> selectNextInterfaceMode()); this.addButton(this.interfaceMode); @@ -62,11 +62,11 @@ public class GuiInterface extends GuiUpgradeable { @Override public void drawFG(final int offsetX, final int offsetY, final int mouseX, final int mouseY) { if (this.blockMode != null) { - this.blockMode.set(((ContainerInterface) this.cvb).getBlockingMode()); + this.blockMode.set(((InterfaceContainer) this.cvb).getBlockingMode()); } if (this.interfaceMode != null) { - this.interfaceMode.setState(((ContainerInterface) this.cvb).getInterfaceTerminalMode() == YesNo.YES); + this.interfaceMode.setState(((InterfaceContainer) this.cvb).getInterfaceTerminalMode() == YesNo.YES); } this.font.drawString(this.getGuiDisplayName(GuiText.Interface.getLocal()), 8, 6, 4210752); @@ -84,12 +84,12 @@ public class GuiInterface extends GuiUpgradeable { } private void openPriorityGui() { - NetworkHandler.instance().sendToServer(new PacketSwitchGuis(ContainerPriority.TYPE)); + NetworkHandler.instance().sendToServer(new SwitchGuisPacket(PriorityContainer.TYPE)); } private void selectNextInterfaceMode() { final boolean backwards = getMinecraft().mouseHelper.isRightDown(); - NetworkHandler.instance().sendToServer(new PacketConfigButton(Settings.INTERFACE_TERMINAL, backwards)); + NetworkHandler.instance().sendToServer(new ConfigButtonPacket(Settings.INTERFACE_TERMINAL, backwards)); } } diff --git a/src/main/java/appeng/client/gui/implementations/GuiInterfaceTerminal.java b/src/main/java/appeng/client/gui/implementations/InterfaceTerminalScreen.java similarity index 95% rename from src/main/java/appeng/client/gui/implementations/GuiInterfaceTerminal.java rename to src/main/java/appeng/client/gui/implementations/InterfaceTerminalScreen.java index 4a0e8d3d5..f8ea5a6b5 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiInterfaceTerminal.java +++ b/src/main/java/appeng/client/gui/implementations/InterfaceTerminalScreen.java @@ -43,17 +43,17 @@ import net.minecraftforge.fml.client.gui.GuiUtils; import appeng.api.AEApi; import appeng.api.storage.channels.IItemStorageChannel; import appeng.client.ActionKey; -import appeng.client.gui.AEBaseGui; -import appeng.client.gui.widgets.GuiScrollbar; -import appeng.client.gui.widgets.MEGuiTextField; +import appeng.client.gui.AEBaseScreen; +import appeng.client.gui.widgets.Scrollbar; +import appeng.client.gui.widgets.AETextField; import appeng.client.me.ClientDCInternalInv; import appeng.client.me.SlotDisconnected; -import appeng.container.implementations.ContainerInterfaceTerminal; +import appeng.container.implementations.InterfaceTerminalContainer; import appeng.core.AppEng; import appeng.core.localization.GuiText; import appeng.util.Platform; -public class GuiInterfaceTerminal extends AEBaseGui { +public class InterfaceTerminalScreen extends AEBaseScreen { private static final int LINES_ON_PAGE = 6; @@ -65,12 +65,12 @@ public class GuiInterfaceTerminal extends AEBaseGui private final Map> cachedSearches = new WeakHashMap<>(); private boolean refreshList = false; - private MEGuiTextField searchField; + private AETextField searchField; - public GuiInterfaceTerminal(ContainerInterfaceTerminal container, PlayerInventory playerInventory, - ITextComponent title) { + public InterfaceTerminalScreen(InterfaceTerminalContainer container, PlayerInventory playerInventory, + ITextComponent title) { super(container, playerInventory, title); - final GuiScrollbar scrollbar = new GuiScrollbar(); + final Scrollbar scrollbar = new Scrollbar(); this.setScrollBar(scrollbar); this.xSize = 195; this.ySize = 222; @@ -84,7 +84,7 @@ public class GuiInterfaceTerminal extends AEBaseGui this.getScrollBar().setHeight(106); this.getScrollBar().setTop(18); - this.searchField = new MEGuiTextField(this.font, this.guiLeft + 104, this.guiTop + 4, 65, 12); + this.searchField = new AETextField(this.font, this.guiLeft + 104, this.guiTop + 4, 65, 12); this.searchField.setEnableBackgroundDrawing(false); this.searchField.setMaxStringLength(25); this.searchField.setTextColor(0xFFFFFF); diff --git a/src/main/java/appeng/client/gui/implementations/GuiLevelEmitter.java b/src/main/java/appeng/client/gui/implementations/LevelEmitterScreen.java similarity index 83% rename from src/main/java/appeng/client/gui/implementations/GuiLevelEmitter.java rename to src/main/java/appeng/client/gui/implementations/LevelEmitterScreen.java index 0dbd3cfe0..78954efce 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiLevelEmitter.java +++ b/src/main/java/appeng/client/gui/implementations/LevelEmitterScreen.java @@ -29,18 +29,18 @@ import appeng.api.config.RedstoneMode; import appeng.api.config.Settings; import appeng.api.config.Upgrades; import appeng.api.config.YesNo; -import appeng.client.gui.widgets.GuiNumberBox; -import appeng.client.gui.widgets.GuiServerSettingToggleButton; -import appeng.client.gui.widgets.GuiSettingToggleButton; -import appeng.container.implementations.ContainerLevelEmitter; +import appeng.client.gui.widgets.NumberBox; +import appeng.client.gui.widgets.ServerSettingToggleButton; +import appeng.client.gui.widgets.SettingToggleButton; +import appeng.container.implementations.LevelEmitterContainer; import appeng.core.AEConfig; import appeng.core.localization.GuiText; import appeng.core.sync.network.NetworkHandler; -import appeng.core.sync.packets.PacketValueConfig; +import appeng.core.sync.packets.ConfigValuePacket; -public class GuiLevelEmitter extends GuiUpgradeable { +public class LevelEmitterScreen extends UpgradeableScreen { - private GuiNumberBox level; + private NumberBox level; private Button plus1; private Button plus10; @@ -51,10 +51,10 @@ public class GuiLevelEmitter extends GuiUpgradeable { private Button minus100; private Button minus1000; - private GuiSettingToggleButton levelMode; - private GuiSettingToggleButton craftingMode; + private SettingToggleButton levelMode; + private SettingToggleButton craftingMode; - public GuiLevelEmitter(ContainerLevelEmitter container, PlayerInventory playerInventory, ITextComponent title) { + public LevelEmitterScreen(LevelEmitterContainer container, PlayerInventory playerInventory, ITextComponent title) { super(container, playerInventory, title); } @@ -62,7 +62,7 @@ public class GuiLevelEmitter extends GuiUpgradeable { public void init() { super.init(); - this.level = new GuiNumberBox(this.font, this.guiLeft + 24, this.guiTop + 43, 79, this.font.FONT_HEIGHT, + this.level = new NumberBox(this.font, this.guiLeft + 24, this.guiTop + 43, 79, this.font.FONT_HEIGHT, Long.class); this.level.setEnableBackgroundDrawing(false); this.level.setMaxStringLength(16); @@ -74,13 +74,13 @@ public class GuiLevelEmitter extends GuiUpgradeable { @Override protected void addButtons() { - this.levelMode = new GuiServerSettingToggleButton<>(this.guiLeft - 18, this.guiTop + 8, Settings.LEVEL_TYPE, + this.levelMode = new ServerSettingToggleButton<>(this.guiLeft - 18, this.guiTop + 8, Settings.LEVEL_TYPE, LevelType.ITEM_LEVEL); - this.redstoneMode = new GuiServerSettingToggleButton<>(this.guiLeft - 18, this.guiTop + 28, + this.redstoneMode = new ServerSettingToggleButton<>(this.guiLeft - 18, this.guiTop + 28, Settings.REDSTONE_EMITTER, RedstoneMode.LOW_SIGNAL); - this.fuzzyMode = new GuiServerSettingToggleButton<>(this.guiLeft - 18, this.guiTop + 48, Settings.FUZZY_MODE, + this.fuzzyMode = new ServerSettingToggleButton<>(this.guiLeft - 18, this.guiTop + 48, Settings.FUZZY_MODE, FuzzyMode.IGNORE_ALL); - this.craftingMode = new GuiServerSettingToggleButton<>(this.guiLeft - 18, this.guiTop + 48, + this.craftingMode = new ServerSettingToggleButton<>(this.guiLeft - 18, this.guiTop + 48, Settings.CRAFT_VIA_REDSTONE, YesNo.NO); final int a = AEConfig.instance().levelByStackAmounts(0); @@ -134,7 +134,7 @@ public class GuiLevelEmitter extends GuiUpgradeable { } if (this.levelMode != null) { - this.levelMode.set(((ContainerLevelEmitter) this.cvb).getLevelMode()); + this.levelMode.set(((LevelEmitterContainer) this.cvb).getLevelMode()); } } @@ -186,7 +186,7 @@ public class GuiLevelEmitter extends GuiUpgradeable { this.level.setText(Out = Long.toString(result)); - NetworkHandler.instance().sendToServer(new PacketValueConfig("LevelEmitter.Value", Out)); + NetworkHandler.instance().sendToServer(new ConfigValuePacket("LevelEmitter.Value", Out)); } catch (final NumberFormatException e) { // nope.. this.level.setText("0"); @@ -219,7 +219,7 @@ public class GuiLevelEmitter extends GuiUpgradeable { Out = "0"; } - NetworkHandler.instance().sendToServer(new PacketValueConfig("LevelEmitter.Value", Out)); + NetworkHandler.instance().sendToServer(new ConfigValuePacket("LevelEmitter.Value", Out)); return true; } } diff --git a/src/main/java/appeng/client/gui/implementations/GuiMEMonitorable.java b/src/main/java/appeng/client/gui/implementations/MEMonitorableScreen.java similarity index 84% rename from src/main/java/appeng/client/gui/implementations/GuiMEMonitorable.java rename to src/main/java/appeng/client/gui/implementations/MEMonitorableScreen.java index 17d5d1c56..4424499ce 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiMEMonitorable.java +++ b/src/main/java/appeng/client/gui/implementations/MEMonitorableScreen.java @@ -36,29 +36,29 @@ import appeng.api.storage.data.IAEItemStack; import appeng.api.util.IConfigManager; import appeng.api.util.IConfigurableObject; import appeng.client.ActionKey; -import appeng.client.gui.AEBaseMEGui; +import appeng.client.gui.AEBaseMEScreen; import appeng.client.gui.widgets.*; import appeng.client.me.InternalSlotME; import appeng.client.me.ItemRepo; -import appeng.container.implementations.ContainerCraftingStatus; -import appeng.container.implementations.ContainerMEMonitorable; +import appeng.container.implementations.CraftingStatusContainer; +import appeng.container.implementations.MEMonitorableContainer; import appeng.container.slot.AppEngSlot; -import appeng.container.slot.SlotCraftingMatrix; -import appeng.container.slot.SlotFakeCraftingMatrix; +import appeng.container.slot.CraftingMatrixSlot; +import appeng.container.slot.FakeCraftingMatrixSlot; import appeng.core.AEConfig; import appeng.core.AppEng; import appeng.core.localization.GuiText; import appeng.core.sync.network.NetworkHandler; -import appeng.core.sync.packets.PacketSwitchGuis; -import appeng.core.sync.packets.PacketValueConfig; +import appeng.core.sync.packets.SwitchGuisPacket; +import appeng.core.sync.packets.ConfigValuePacket; import appeng.helpers.WirelessTerminalGuiObject; import appeng.integration.abstraction.JEIFacade; -import appeng.parts.reporting.AbstractPartTerminal; -import appeng.tile.misc.TileSecurityStation; +import appeng.parts.reporting.AbstractTerminalPart; +import appeng.tile.misc.SecurityStationTileEntity; import appeng.util.IConfigManagerHost; import appeng.util.Platform; -public class GuiMEMonitorable extends AEBaseMEGui +public class MEMonitorableScreen extends AEBaseMEScreen implements ISortSource, IConfigManagerHost { private static int craftingGridOffsetX; @@ -71,8 +71,8 @@ public class GuiMEMonitorable extends AEBaseME private final IConfigManager configSrc; private final boolean viewCell; private final ItemStack[] myCurrentViewCells = new ItemStack[5]; - private GuiTabButton craftingStatusBtn; - private MEGuiTextField searchField; + private TabButton craftingStatusBtn; + private AETextField searchField; private GuiText myName; private int perRow = 9; private int reservedSpace = 0; @@ -80,17 +80,17 @@ public class GuiMEMonitorable extends AEBaseME private int rows = 0; private int maxRows = Integer.MAX_VALUE; private int standardSize; - private GuiSettingToggleButton viewModeToggle; - private GuiSettingToggleButton sortByToggle; - private GuiSettingToggleButton sortDirToggle; + private SettingToggleButton viewModeToggle; + private SettingToggleButton sortByToggle; + private SettingToggleButton sortDirToggle; private boolean isAutoFocus = false; private int currentMouseX = 0; private int currentMouseY = 0; - public GuiMEMonitorable(T container, PlayerInventory playerInventory, ITextComponent title) { + public MEMonitorableScreen(T container, PlayerInventory playerInventory, ITextComponent title) { super(container, playerInventory, title); - final GuiScrollbar scrollbar = new GuiScrollbar(); + final Scrollbar scrollbar = new Scrollbar(); this.setScrollBar(scrollbar); this.repo = new ItemRepo(scrollbar, this); setScrollBar(); @@ -110,7 +110,7 @@ public class GuiMEMonitorable extends AEBaseME this.viewCell = te instanceof IViewCellStorage; - if (te instanceof TileSecurityStation) { + if (te instanceof SecurityStationTileEntity) { this.myName = GuiText.Security; } else if (te instanceof WirelessTerminalGuiObject) { this.myName = GuiText.WirelessTerminal; @@ -118,7 +118,7 @@ public class GuiMEMonitorable extends AEBaseME this.myName = GuiText.PortableCell; } else if (te instanceof IMEChest) { this.myName = GuiText.Chest; - } else if (te instanceof AbstractPartTerminal) { + } else if (te instanceof AbstractTerminalPart) { this.myName = GuiText.Terminal; } else { throw new IllegalArgumentException("Invalid GUI target given: " + te); @@ -141,7 +141,7 @@ public class GuiMEMonitorable extends AEBaseME } private void showCraftingStatus() { - NetworkHandler.instance().sendToServer(new PacketSwitchGuis(ContainerCraftingStatus.TYPE)); + NetworkHandler.instance().sendToServer(new SwitchGuisPacket(CraftingStatusContainer.TYPE)); } @Override @@ -189,33 +189,33 @@ public class GuiMEMonitorable extends AEBaseME int offset = this.guiTop + 8; if (this.customSortOrder) { - this.sortByToggle = this.addButton(new GuiSettingToggleButton<>(this.guiLeft - 18, offset, Settings.SORT_BY, + this.sortByToggle = this.addButton(new SettingToggleButton<>(this.guiLeft - 18, offset, Settings.SORT_BY, getSortBy(), Platform::isSortOrderAvailable, this::toggleServerSetting)); offset += 20; } - if (this.viewCell || this instanceof GuiWirelessTerm) { - this.viewModeToggle = this.addButton(new GuiSettingToggleButton<>(this.guiLeft - 18, offset, + if (this.viewCell || this instanceof WirelessTermScreen) { + this.viewModeToggle = this.addButton(new SettingToggleButton<>(this.guiLeft - 18, offset, Settings.VIEW_MODE, getSortDisplay(), this::toggleServerSetting)); offset += 20; } - this.addButton(this.sortDirToggle = new GuiSettingToggleButton<>(this.guiLeft - 18, offset, + this.addButton(this.sortDirToggle = new SettingToggleButton<>(this.guiLeft - 18, offset, Settings.SORT_DIRECTION, getSortDir(), this::toggleServerSetting)); offset += 20; SearchBoxMode searchMode = AEConfig.instance().getTerminalSearchMode(); - this.addButton(new GuiSettingToggleButton<>(this.guiLeft - 18, offset, Settings.SEARCH_MODE, searchMode, + this.addButton(new SettingToggleButton<>(this.guiLeft - 18, offset, Settings.SEARCH_MODE, searchMode, Platform::isSearchModeAvailable, this::toggleTerminalSearchMode)); offset += 20; - if (!(this instanceof GuiMEPortableCell) || this instanceof GuiWirelessTerm) { - this.addButton(new GuiSettingToggleButton<>(this.guiLeft - 18, offset, Settings.TERMINAL_STYLE, + if (!(this instanceof MEPortableCellScreen) || this instanceof WirelessTermScreen) { + this.addButton(new SettingToggleButton<>(this.guiLeft - 18, offset, Settings.TERMINAL_STYLE, terminalStyle, this::toggleTerminalStyle)); } - this.searchField = new MEGuiTextField(this.font, this.guiLeft + Math.max(80, this.offsetX), this.guiTop + 4, 90, + this.searchField = new AETextField(this.font, this.guiLeft + Math.max(80, this.offsetX), this.guiTop + 4, 90, 12); this.searchField.setEnableBackgroundDrawing(false); this.searchField.setMaxStringLength(25); @@ -223,8 +223,8 @@ public class GuiMEMonitorable extends AEBaseME this.searchField.setSelectionColor(0xFF008000); this.searchField.setVisible(true); - if (this.viewCell || this instanceof GuiWirelessTerm) { - this.craftingStatusBtn = this.addButton(new GuiTabButton(this.guiLeft + 170, this.guiTop - 4, 2 + 11 * 16, + if (this.viewCell || this instanceof WirelessTermScreen) { + this.craftingStatusBtn = this.addButton(new TabButton(this.guiLeft + 170, this.guiTop - 4, 2 + 11 * 16, GuiText.CraftingStatus.getLocal(), this.itemRenderer, btn -> showCraftingStatus())); this.craftingStatusBtn.setHideEdge(13); } @@ -261,7 +261,7 @@ public class GuiMEMonitorable extends AEBaseME } } - if (s instanceof SlotCraftingMatrix || s instanceof SlotFakeCraftingMatrix) { + if (s instanceof CraftingMatrixSlot || s instanceof FakeCraftingMatrixSlot) { if (s.xPos > 0 && s.yPos > 0) { craftingGridOffsetX = Math.min(craftingGridOffsetX, s.xPos); craftingGridOffsetY = Math.min(craftingGridOffsetY, s.yPos); @@ -312,7 +312,7 @@ public class GuiMEMonitorable extends AEBaseME final int x_width = 197; blit(offsetX, offsetY, 0, 0, x_width, 18); - if (this.viewCell || (this instanceof GuiSecurityStation)) { + if (this.viewCell || (this instanceof SecurityStationScreen)) { blit(offsetX + x_width, offsetY, x_width, 0, 46, 128); } @@ -482,23 +482,23 @@ public class GuiMEMonitorable extends AEBaseME this.standardSize = standardSize; } - private void toggleTerminalSearchMode(GuiSettingToggleButton btn, boolean backwards) { + private void toggleTerminalSearchMode(SettingToggleButton btn, boolean backwards) { SearchBoxMode next = btn.getNextValue(backwards); AEConfig.instance().setTerminalSearchMode(next); btn.set(next); this.reinitalize(); } - private void toggleTerminalStyle(GuiSettingToggleButton btn, boolean backwards) { + private void toggleTerminalStyle(SettingToggleButton btn, boolean backwards) { TerminalStyle next = btn.getNextValue(backwards); AEConfig.instance().setTerminalStyle(next); btn.set(next); this.reinitalize(); } - private > void toggleServerSetting(GuiSettingToggleButton btn, boolean backwards) { + private > void toggleServerSetting(SettingToggleButton btn, boolean backwards) { S next = btn.getNextValue(backwards); - NetworkHandler.instance().sendToServer(new PacketValueConfig(btn.getSetting().name(), next.name())); + NetworkHandler.instance().sendToServer(new ConfigValuePacket(btn.getSetting().name(), next.name())); btn.set(next); } diff --git a/src/main/java/appeng/client/gui/implementations/GuiMEPortableCell.java b/src/main/java/appeng/client/gui/implementations/MEPortableCellScreen.java similarity index 79% rename from src/main/java/appeng/client/gui/implementations/GuiMEPortableCell.java rename to src/main/java/appeng/client/gui/implementations/MEPortableCellScreen.java index 51c342ee5..31fcbd637 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiMEPortableCell.java +++ b/src/main/java/appeng/client/gui/implementations/MEPortableCellScreen.java @@ -21,11 +21,11 @@ package appeng.client.gui.implementations; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.text.ITextComponent; -import appeng.container.implementations.ContainerMEPortableCell; +import appeng.container.implementations.MEPortableCellContainer; -public class GuiMEPortableCell extends GuiMEMonitorable { +public class MEPortableCellScreen extends MEMonitorableScreen { - public GuiMEPortableCell(ContainerMEPortableCell container, PlayerInventory playerInventory, ITextComponent title) { + public MEPortableCellScreen(MEPortableCellContainer container, PlayerInventory playerInventory, ITextComponent title) { super(container, playerInventory, title); } diff --git a/src/main/java/appeng/client/gui/implementations/GuiMolecularAssembler.java b/src/main/java/appeng/client/gui/implementations/MolecularAssemblerScreen.java similarity index 75% rename from src/main/java/appeng/client/gui/implementations/GuiMolecularAssembler.java rename to src/main/java/appeng/client/gui/implementations/MolecularAssemblerScreen.java index a646c7cc5..f36c3bb1a 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiMolecularAssembler.java +++ b/src/main/java/appeng/client/gui/implementations/MolecularAssemblerScreen.java @@ -23,18 +23,18 @@ import net.minecraft.util.text.ITextComponent; import appeng.api.config.RedstoneMode; import appeng.api.config.Settings; -import appeng.client.gui.widgets.GuiProgressBar; -import appeng.client.gui.widgets.GuiProgressBar.Direction; -import appeng.client.gui.widgets.GuiServerSettingToggleButton; -import appeng.container.implementations.ContainerMolecularAssembler; +import appeng.client.gui.widgets.ProgressBar; +import appeng.client.gui.widgets.ProgressBar.Direction; +import appeng.client.gui.widgets.ServerSettingToggleButton; +import appeng.container.implementations.MolecularAssemblerContainer; import appeng.core.localization.GuiText; -public class GuiMolecularAssembler extends GuiUpgradeable { +public class MolecularAssemblerScreen extends UpgradeableScreen { - private GuiProgressBar pb; + private ProgressBar pb; - public GuiMolecularAssembler(ContainerMolecularAssembler container, PlayerInventory playerInventory, - ITextComponent title) { + public MolecularAssemblerScreen(MolecularAssemblerContainer container, PlayerInventory playerInventory, + ITextComponent title) { super(container, playerInventory, title); this.ySize = 197; } @@ -43,14 +43,14 @@ public class GuiMolecularAssembler extends GuiUpgradeable(this.guiLeft - 18, this.guiTop + 8, + this.redstoneMode = new ServerSettingToggleButton<>(this.guiLeft - 18, this.guiTop + 8, Settings.REDSTONE_CONTROLLED, RedstoneMode.IGNORE); addButton(this.redstoneMode); } diff --git a/src/main/java/appeng/client/gui/implementations/GuiNetworkStatus.java b/src/main/java/appeng/client/gui/implementations/NetworkStatusScreen.java similarity index 95% rename from src/main/java/appeng/client/gui/implementations/GuiNetworkStatus.java rename to src/main/java/appeng/client/gui/implementations/NetworkStatusScreen.java index ac1671577..ca8793438 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiNetworkStatus.java +++ b/src/main/java/appeng/client/gui/implementations/NetworkStatusScreen.java @@ -32,25 +32,25 @@ import appeng.api.config.SortDir; import appeng.api.config.SortOrder; import appeng.api.config.ViewItems; import appeng.api.storage.data.IAEItemStack; -import appeng.client.gui.AEBaseGui; +import appeng.client.gui.AEBaseScreen; import appeng.client.gui.widgets.CommonButtons; -import appeng.client.gui.widgets.GuiScrollbar; +import appeng.client.gui.widgets.Scrollbar; import appeng.client.gui.widgets.ISortSource; import appeng.client.me.ItemRepo; import appeng.client.me.SlotME; -import appeng.container.implementations.ContainerNetworkStatus; +import appeng.container.implementations.NetworkStatusContainer; import appeng.core.localization.GuiText; import appeng.util.Platform; -public class GuiNetworkStatus extends AEBaseGui implements ISortSource { +public class NetworkStatusScreen extends AEBaseScreen implements ISortSource { private final ItemRepo repo; private final int rows = 4; private int tooltip = -1; - public GuiNetworkStatus(ContainerNetworkStatus container, PlayerInventory playerInventory, ITextComponent title) { + public NetworkStatusScreen(NetworkStatusContainer container, PlayerInventory playerInventory, ITextComponent title) { super(container, playerInventory, title); - final GuiScrollbar scrollbar = new GuiScrollbar(); + final Scrollbar scrollbar = new Scrollbar(); this.setScrollBar(scrollbar); this.repo = new ItemRepo(scrollbar, this); diff --git a/src/main/java/appeng/client/gui/implementations/GuiNetworkTool.java b/src/main/java/appeng/client/gui/implementations/NetworkToolScreen.java similarity index 78% rename from src/main/java/appeng/client/gui/implementations/GuiNetworkTool.java rename to src/main/java/appeng/client/gui/implementations/NetworkToolScreen.java index 4688e5487..50ca9a241 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiNetworkTool.java +++ b/src/main/java/appeng/client/gui/implementations/NetworkToolScreen.java @@ -22,18 +22,18 @@ import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.text.ITextComponent; import net.minecraftforge.fml.client.gui.GuiUtils; -import appeng.client.gui.AEBaseGui; -import appeng.client.gui.widgets.GuiToggleButton; -import appeng.container.implementations.ContainerNetworkTool; +import appeng.client.gui.AEBaseScreen; +import appeng.client.gui.widgets.ToggleButton; +import appeng.container.implementations.NetworkToolContainer; import appeng.core.localization.GuiText; import appeng.core.sync.network.NetworkHandler; -import appeng.core.sync.packets.PacketValueConfig; +import appeng.core.sync.packets.ConfigValuePacket; -public class GuiNetworkTool extends AEBaseGui { +public class NetworkToolScreen extends AEBaseScreen { - private GuiToggleButton tFacades; + private ToggleButton tFacades; - public GuiNetworkTool(ContainerNetworkTool container, PlayerInventory playerInventory, ITextComponent title) { + public NetworkToolScreen(NetworkToolContainer container, PlayerInventory playerInventory, ITextComponent title) { super(container, playerInventory, title); this.ySize = 166; } @@ -42,7 +42,7 @@ public class GuiNetworkTool extends AEBaseGui { public void init() { super.init(); - this.tFacades = new GuiToggleButton(this.guiLeft - 18, this.guiTop + 8, 23, 22, + this.tFacades = new ToggleButton(this.guiLeft - 18, this.guiTop + 8, 23, 22, GuiText.TransparentFacades.getLocal(), GuiText.TransparentFacadesHint.getLocal(), btn -> toggleFacades()); @@ -50,7 +50,7 @@ public class GuiNetworkTool extends AEBaseGui { } private void toggleFacades() { - NetworkHandler.instance().sendToServer(new PacketValueConfig("NetworkTool", "Toggle")); + NetworkHandler.instance().sendToServer(new ConfigValuePacket("NetworkTool", "Toggle")); } @Override diff --git a/src/main/java/appeng/client/gui/implementations/GuiPatternTerm.java b/src/main/java/appeng/client/gui/implementations/PatternTermScreen.java similarity index 73% rename from src/main/java/appeng/client/gui/implementations/GuiPatternTerm.java rename to src/main/java/appeng/client/gui/implementations/PatternTermScreen.java index 53e55be50..8a78a696f 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiPatternTerm.java +++ b/src/main/java/appeng/client/gui/implementations/PatternTermScreen.java @@ -24,15 +24,15 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.text.ITextComponent; import appeng.api.config.ActionItems; -import appeng.client.gui.widgets.GuiActionButton; -import appeng.client.gui.widgets.GuiTabButton; -import appeng.container.implementations.ContainerPatternTerm; +import appeng.client.gui.widgets.ActionButton; +import appeng.client.gui.widgets.TabButton; +import appeng.container.implementations.PatternTermContainer; import appeng.container.slot.AppEngSlot; import appeng.core.localization.GuiText; import appeng.core.sync.network.NetworkHandler; -import appeng.core.sync.packets.PacketValueConfig; +import appeng.core.sync.packets.ConfigValuePacket; -public class GuiPatternTerm extends GuiMEMonitorable { +public class PatternTermScreen extends MEMonitorableScreen { private static final String BACKGROUND_CRAFTING_MODE = "guis/pattern.png"; private static final String BACKGROUND_PROCESSING_MODE = "guis/pattern2.png"; @@ -43,12 +43,12 @@ public class GuiPatternTerm extends GuiMEMonitorable { private static final String CRAFTMODE_CRFTING = "1"; private static final String CRAFTMODE_PROCESSING = "0"; - private GuiTabButton tabCraftButton; - private GuiTabButton tabProcessButton; - private GuiActionButton substitutionsEnabledBtn; - private GuiActionButton substitutionsDisabledBtn; + private TabButton tabCraftButton; + private TabButton tabProcessButton; + private ActionButton substitutionsEnabledBtn; + private ActionButton substitutionsDisabledBtn; - public GuiPatternTerm(ContainerPatternTerm container, PlayerInventory playerInventory, ITextComponent title) { + public PatternTermScreen(PatternTermContainer container, PlayerInventory playerInventory, ITextComponent title) { super(container, playerInventory, title); this.setReservedSpace(81); } @@ -57,50 +57,50 @@ public class GuiPatternTerm extends GuiMEMonitorable { public void init() { super.init(); - this.tabCraftButton = new GuiTabButton(this.guiLeft + 173, this.guiTop + this.ySize - 177, + this.tabCraftButton = new TabButton(this.guiLeft + 173, this.guiTop + this.ySize - 177, new ItemStack(Blocks.CRAFTING_TABLE), GuiText.CraftingPattern.getLocal(), this.itemRenderer, btn -> toggleCraftMode(CRAFTMODE_PROCESSING)); this.addButton(this.tabCraftButton); - this.tabProcessButton = new GuiTabButton(this.guiLeft + 173, this.guiTop + this.ySize - 177, + this.tabProcessButton = new TabButton(this.guiLeft + 173, this.guiTop + this.ySize - 177, new ItemStack(Blocks.FURNACE), GuiText.ProcessingPattern.getLocal(), this.itemRenderer, btn -> toggleCraftMode(CRAFTMODE_CRFTING)); this.addButton(this.tabProcessButton); - this.substitutionsEnabledBtn = new GuiActionButton(this.guiLeft + 84, this.guiTop + this.ySize - 163, + this.substitutionsEnabledBtn = new ActionButton(this.guiLeft + 84, this.guiTop + this.ySize - 163, ActionItems.ENABLE_SUBSTITUTION, act -> toggleSubstitutions(SUBSITUTION_DISABLE)); this.substitutionsEnabledBtn.setHalfSize(true); this.addButton(this.substitutionsEnabledBtn); - this.substitutionsDisabledBtn = new GuiActionButton(this.guiLeft + 84, this.guiTop + this.ySize - 163, + this.substitutionsDisabledBtn = new ActionButton(this.guiLeft + 84, this.guiTop + this.ySize - 163, ActionItems.DISABLE_SUBSTITUTION, act -> toggleSubstitutions(SUBSITUTION_ENABLE)); this.substitutionsDisabledBtn.setHalfSize(true); this.addButton(this.substitutionsDisabledBtn); - GuiActionButton clearBtn = new GuiActionButton(this.guiLeft + 74, this.guiTop + this.ySize - 163, + ActionButton clearBtn = new ActionButton(this.guiLeft + 74, this.guiTop + this.ySize - 163, ActionItems.CLOSE, act -> clear()); clearBtn.setHalfSize(true); this.addButton(clearBtn); - GuiActionButton encodeBtn = new GuiActionButton(this.guiLeft + 147, this.guiTop + this.ySize - 142, + ActionButton encodeBtn = new ActionButton(this.guiLeft + 147, this.guiTop + this.ySize - 142, ActionItems.ENCODE, act -> encode()); this.addButton(encodeBtn); } private void toggleCraftMode(String mode) { - NetworkHandler.instance().sendToServer(new PacketValueConfig("PatternTerminal.CraftMode", mode)); + NetworkHandler.instance().sendToServer(new ConfigValuePacket("PatternTerminal.CraftMode", mode)); } private void toggleSubstitutions(String mode) { - NetworkHandler.instance().sendToServer(new PacketValueConfig("PatternTerminal.Substitute", mode)); + NetworkHandler.instance().sendToServer(new ConfigValuePacket("PatternTerminal.Substitute", mode)); } private void encode() { - NetworkHandler.instance().sendToServer(new PacketValueConfig("PatternTerminal.Encode", "1")); + NetworkHandler.instance().sendToServer(new ConfigValuePacket("PatternTerminal.Encode", "1")); } private void clear() { - NetworkHandler.instance().sendToServer(new PacketValueConfig("PatternTerminal.Clear", "1")); + NetworkHandler.instance().sendToServer(new ConfigValuePacket("PatternTerminal.Clear", "1")); } @Override diff --git a/src/main/java/appeng/client/gui/implementations/GuiPriority.java b/src/main/java/appeng/client/gui/implementations/PriorityScreen.java similarity index 85% rename from src/main/java/appeng/client/gui/implementations/GuiPriority.java rename to src/main/java/appeng/client/gui/implementations/PriorityScreen.java index 82c74259f..b35902cb5 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiPriority.java +++ b/src/main/java/appeng/client/gui/implementations/PriorityScreen.java @@ -23,23 +23,23 @@ import net.minecraft.client.util.InputMappings; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.text.ITextComponent; -import appeng.client.gui.AEBaseGui; -import appeng.client.gui.widgets.GuiNumberBox; -import appeng.container.implementations.ContainerPriority; +import appeng.client.gui.AEBaseScreen; +import appeng.client.gui.widgets.NumberBox; +import appeng.container.implementations.PriorityContainer; import appeng.core.AEConfig; import appeng.core.localization.GuiText; import appeng.core.sync.network.NetworkHandler; -import appeng.core.sync.packets.PacketValueConfig; +import appeng.core.sync.packets.ConfigValuePacket; -public class GuiPriority extends AEBaseGui { +public class PriorityScreen extends AEBaseScreen { - private final AESubGui subGui; + private final AESubScreen subGui; - private GuiNumberBox priority; + private NumberBox priority; - public GuiPriority(ContainerPriority container, PlayerInventory playerInventory, ITextComponent title) { + public PriorityScreen(PriorityContainer container, PlayerInventory playerInventory, ITextComponent title) { super(container, playerInventory, title); - this.subGui = new AESubGui(this, container.getPriorityHost()); + this.subGui = new AESubScreen(this, container.getPriorityHost()); } @Override @@ -63,7 +63,7 @@ public class GuiPriority extends AEBaseGui { this.subGui.addBackButton(this::addButton, 154, 0); - this.priority = new GuiNumberBox(this.font, this.guiLeft + 62, this.guiTop + 57, 59, this.font.FONT_HEIGHT, + this.priority = new NumberBox(this.font, this.guiLeft + 62, this.guiTop + 57, 59, this.font.FONT_HEIGHT, Long.class); this.priority.setEnableBackgroundDrawing(false); this.priority.setMaxStringLength(16); @@ -109,7 +109,7 @@ public class GuiPriority extends AEBaseGui { this.priority.setText(out = Long.toString(result)); - NetworkHandler.instance().sendToServer(new PacketValueConfig("PriorityHost.Priority", out)); + NetworkHandler.instance().sendToServer(new ConfigValuePacket("PriorityHost.Priority", out)); } catch (final NumberFormatException e) { // nope.. this.priority.setText("0"); @@ -135,7 +135,7 @@ public class GuiPriority extends AEBaseGui { out = "0"; } - NetworkHandler.instance().sendToServer(new PacketValueConfig("PriorityHost.Priority", out)); + NetworkHandler.instance().sendToServer(new ConfigValuePacket("PriorityHost.Priority", out)); return true; } return false; @@ -162,7 +162,7 @@ public class GuiPriority extends AEBaseGui { out = "0"; } - NetworkHandler.instance().sendToServer(new PacketValueConfig("PriorityHost.Priority", out)); + NetworkHandler.instance().sendToServer(new ConfigValuePacket("PriorityHost.Priority", out)); return true; } } diff --git a/src/main/java/appeng/client/gui/implementations/GuiQNB.java b/src/main/java/appeng/client/gui/implementations/QNBScreen.java similarity index 87% rename from src/main/java/appeng/client/gui/implementations/GuiQNB.java rename to src/main/java/appeng/client/gui/implementations/QNBScreen.java index a047b59b4..0baa0a4d9 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiQNB.java +++ b/src/main/java/appeng/client/gui/implementations/QNBScreen.java @@ -22,13 +22,13 @@ import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.text.ITextComponent; import net.minecraftforge.fml.client.gui.GuiUtils; -import appeng.client.gui.AEBaseGui; -import appeng.container.implementations.ContainerQNB; +import appeng.client.gui.AEBaseScreen; +import appeng.container.implementations.QNBContainer; import appeng.core.localization.GuiText; -public class GuiQNB extends AEBaseGui { +public class QNBScreen extends AEBaseScreen { - public GuiQNB(ContainerQNB container, PlayerInventory playerInventory, ITextComponent title) { + public QNBScreen(QNBContainer container, PlayerInventory playerInventory, ITextComponent title) { super(container, playerInventory, title); this.ySize = 166; } diff --git a/src/main/java/appeng/client/gui/implementations/GuiQuartzKnife.java b/src/main/java/appeng/client/gui/implementations/QuartzKnifeScreen.java similarity index 87% rename from src/main/java/appeng/client/gui/implementations/GuiQuartzKnife.java rename to src/main/java/appeng/client/gui/implementations/QuartzKnifeScreen.java index 8f25226a4..390951f58 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiQuartzKnife.java +++ b/src/main/java/appeng/client/gui/implementations/QuartzKnifeScreen.java @@ -27,18 +27,18 @@ import net.minecraft.util.text.ITextComponent; import net.minecraftforge.fml.client.gui.GuiUtils; import appeng.client.ActionKey; -import appeng.client.gui.AEBaseGui; -import appeng.container.implementations.ContainerQuartzKnife; +import appeng.client.gui.AEBaseScreen; +import appeng.container.implementations.QuartzKnifeContainer; import appeng.core.AppEng; import appeng.core.localization.GuiText; import appeng.core.sync.network.NetworkHandler; -import appeng.core.sync.packets.PacketValueConfig; +import appeng.core.sync.packets.ConfigValuePacket; -public class GuiQuartzKnife extends AEBaseGui { +public class QuartzKnifeScreen extends AEBaseScreen { private TextFieldWidget name; - public GuiQuartzKnife(ContainerQuartzKnife container, PlayerInventory playerInventory, ITextComponent title) { + public QuartzKnifeScreen(QuartzKnifeContainer container, PlayerInventory playerInventory, ITextComponent title) { super(container, playerInventory, title); this.ySize = 184; } @@ -73,7 +73,7 @@ public class GuiQuartzKnife extends AEBaseGui { if (this.name.isFocused() && this.name.charTyped(character, key)) { final String Out = this.name.getText(); container.setName(Out); - NetworkHandler.instance().sendToServer(new PacketValueConfig("QuartzKnife.Name", Out)); + NetworkHandler.instance().sendToServer(new ConfigValuePacket("QuartzKnife.Name", Out)); return true; } @@ -100,7 +100,7 @@ public class GuiQuartzKnife extends AEBaseGui { if (this.name.keyPressed(keyCode, scanCode, p_keyPressed_3_)) { final String Out = this.name.getText(); container.setName(Out); - NetworkHandler.instance().sendToServer(new PacketValueConfig("QuartzKnife.Name", Out)); + NetworkHandler.instance().sendToServer(new ConfigValuePacket("QuartzKnife.Name", Out)); return true; } diff --git a/src/main/java/appeng/client/gui/implementations/GuiSecurityStation.java b/src/main/java/appeng/client/gui/implementations/SecurityStationScreen.java similarity index 75% rename from src/main/java/appeng/client/gui/implementations/GuiSecurityStation.java rename to src/main/java/appeng/client/gui/implementations/SecurityStationScreen.java index f864160fb..71d95c1be 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiSecurityStation.java +++ b/src/main/java/appeng/client/gui/implementations/SecurityStationScreen.java @@ -23,22 +23,22 @@ import net.minecraft.util.text.ITextComponent; import appeng.api.config.SecurityPermissions; import appeng.api.config.SortOrder; -import appeng.client.gui.widgets.GuiToggleButton; -import appeng.container.implementations.ContainerSecurityStation; +import appeng.client.gui.widgets.ToggleButton; +import appeng.container.implementations.SecurityStationContainer; import appeng.core.localization.GuiText; import appeng.core.sync.network.NetworkHandler; -import appeng.core.sync.packets.PacketValueConfig; +import appeng.core.sync.packets.ConfigValuePacket; -public class GuiSecurityStation extends GuiMEMonitorable { +public class SecurityStationScreen extends MEMonitorableScreen { - private GuiToggleButton inject; - private GuiToggleButton extract; - private GuiToggleButton craft; - private GuiToggleButton build; - private GuiToggleButton security; + private ToggleButton inject; + private ToggleButton extract; + private ToggleButton craft; + private ToggleButton build; + private ToggleButton security; - public GuiSecurityStation(ContainerSecurityStation container, PlayerInventory playerInventory, - ITextComponent title) { + public SecurityStationScreen(SecurityStationContainer container, PlayerInventory playerInventory, + ITextComponent title) { super(container, playerInventory, title); this.setCustomSortOrder(false); this.setReservedSpace(33); @@ -50,7 +50,7 @@ public class GuiSecurityStation extends GuiMEMonitorable toggleOption(SecurityPermissions.INJECT))); - this.extract = this.addButton(new GuiToggleButton(this.guiLeft + 56 + 18, top, 11 * 16 + 1, 12 * 16 + 1, + this.extract = this.addButton(new ToggleButton(this.guiLeft + 56 + 18, top, 11 * 16 + 1, 12 * 16 + 1, SecurityPermissions.EXTRACT.getTranslatedName(), SecurityPermissions.EXTRACT.getTranslatedTip(), btn -> toggleOption(SecurityPermissions.EXTRACT))); - this.craft = this.addButton(new GuiToggleButton(this.guiLeft + 56 + 18 * 2, top, 11 * 16 + 2, 12 * 16 + 2, + this.craft = this.addButton(new ToggleButton(this.guiLeft + 56 + 18 * 2, top, 11 * 16 + 2, 12 * 16 + 2, SecurityPermissions.CRAFT.getTranslatedName(), SecurityPermissions.CRAFT.getTranslatedTip(), btn -> toggleOption(SecurityPermissions.CRAFT))); - this.build = this.addButton(new GuiToggleButton(this.guiLeft + 56 + 18 * 3, top, 11 * 16 + 3, 12 * 16 + 3, + this.build = this.addButton(new ToggleButton(this.guiLeft + 56 + 18 * 3, top, 11 * 16 + 3, 12 * 16 + 3, SecurityPermissions.BUILD.getTranslatedName(), SecurityPermissions.BUILD.getTranslatedTip(), btn -> toggleOption(SecurityPermissions.BUILD))); - this.security = this.addButton(new GuiToggleButton(this.guiLeft + 56 + 18 * 4, top, 11 * 16 + 4, 12 * 16 + 4, + this.security = this.addButton(new ToggleButton(this.guiLeft + 56 + 18 * 4, top, 11 * 16 + 4, 12 * 16 + 4, SecurityPermissions.SECURITY.getTranslatedName(), SecurityPermissions.SECURITY.getTranslatedTip(), btn -> toggleOption(SecurityPermissions.SECURITY))); } diff --git a/src/main/java/appeng/client/gui/implementations/GuiSkyChest.java b/src/main/java/appeng/client/gui/implementations/SkyChestScreen.java similarity index 88% rename from src/main/java/appeng/client/gui/implementations/GuiSkyChest.java rename to src/main/java/appeng/client/gui/implementations/SkyChestScreen.java index 935390d7b..60bbbe571 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiSkyChest.java +++ b/src/main/java/appeng/client/gui/implementations/SkyChestScreen.java @@ -23,16 +23,16 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.ITextComponent; import net.minecraftforge.fml.client.gui.GuiUtils; -import appeng.client.gui.AEBaseGui; -import appeng.container.implementations.ContainerSkyChest; +import appeng.client.gui.AEBaseScreen; +import appeng.container.implementations.SkyChestContainer; import appeng.core.AppEng; import appeng.core.localization.GuiText; -public class GuiSkyChest extends AEBaseGui { +public class SkyChestScreen extends AEBaseScreen { private static final ResourceLocation TEXTURE = new ResourceLocation(AppEng.MOD_ID, "textures/guis/skychest.png"); - public GuiSkyChest(ContainerSkyChest container, PlayerInventory playerInv, ITextComponent title) { + public SkyChestScreen(SkyChestContainer container, PlayerInventory playerInv, ITextComponent title) { super(container, playerInv, title); this.ySize = 195; } diff --git a/src/main/java/appeng/client/gui/implementations/GuiSpatialIOPort.java b/src/main/java/appeng/client/gui/implementations/SpatialIOPortScreen.java similarity index 91% rename from src/main/java/appeng/client/gui/implementations/GuiSpatialIOPort.java rename to src/main/java/appeng/client/gui/implementations/SpatialIOPortScreen.java index e09d8508b..d20e37fad 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiSpatialIOPort.java +++ b/src/main/java/appeng/client/gui/implementations/SpatialIOPortScreen.java @@ -22,15 +22,15 @@ import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.text.ITextComponent; import net.minecraftforge.fml.client.gui.GuiUtils; -import appeng.client.gui.AEBaseGui; +import appeng.client.gui.AEBaseScreen; import appeng.client.gui.widgets.CommonButtons; -import appeng.container.implementations.ContainerSpatialIOPort; +import appeng.container.implementations.SpatialIOPortContainer; import appeng.core.localization.GuiText; import appeng.util.Platform; -public class GuiSpatialIOPort extends AEBaseGui { +public class SpatialIOPortScreen extends AEBaseScreen { - public GuiSpatialIOPort(ContainerSpatialIOPort container, PlayerInventory playerInventory, ITextComponent title) { + public SpatialIOPortScreen(SpatialIOPortContainer container, PlayerInventory playerInventory, ITextComponent title) { super(container, playerInventory, title); this.ySize = 199; } diff --git a/src/main/java/appeng/client/gui/implementations/GuiStorageBus.java b/src/main/java/appeng/client/gui/implementations/StorageBusScreen.java similarity index 57% rename from src/main/java/appeng/client/gui/implementations/GuiStorageBus.java rename to src/main/java/appeng/client/gui/implementations/StorageBusScreen.java index 3b94dbfad..1f5a0f2f3 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiStorageBus.java +++ b/src/main/java/appeng/client/gui/implementations/StorageBusScreen.java @@ -26,39 +26,39 @@ import appeng.api.config.ActionItems; import appeng.api.config.FuzzyMode; import appeng.api.config.Settings; import appeng.api.config.StorageFilter; -import appeng.client.gui.widgets.GuiActionButton; -import appeng.client.gui.widgets.GuiServerSettingToggleButton; -import appeng.client.gui.widgets.GuiSettingToggleButton; -import appeng.client.gui.widgets.GuiTabButton; -import appeng.container.implementations.ContainerPriority; -import appeng.container.implementations.ContainerStorageBus; +import appeng.client.gui.widgets.ActionButton; +import appeng.client.gui.widgets.ServerSettingToggleButton; +import appeng.client.gui.widgets.SettingToggleButton; +import appeng.client.gui.widgets.TabButton; +import appeng.container.implementations.PriorityContainer; +import appeng.container.implementations.StorageBusContainer; import appeng.core.localization.GuiText; import appeng.core.sync.network.NetworkHandler; -import appeng.core.sync.packets.PacketSwitchGuis; -import appeng.core.sync.packets.PacketValueConfig; +import appeng.core.sync.packets.SwitchGuisPacket; +import appeng.core.sync.packets.ConfigValuePacket; -public class GuiStorageBus extends GuiUpgradeable { +public class StorageBusScreen extends UpgradeableScreen { - private GuiSettingToggleButton rwMode; - private GuiSettingToggleButton storageFilter; + private SettingToggleButton rwMode; + private SettingToggleButton storageFilter; - public GuiStorageBus(ContainerStorageBus container, PlayerInventory playerInventory, ITextComponent title) { + public StorageBusScreen(StorageBusContainer container, PlayerInventory playerInventory, ITextComponent title) { super(container, playerInventory, title); this.ySize = 251; } @Override protected void addButtons() { - addButton(new GuiActionButton(this.guiLeft - 18, this.guiTop + 8, ActionItems.CLOSE, btn -> clear())); - addButton(new GuiActionButton(this.guiLeft - 18, this.guiTop + 28, ActionItems.WRENCH, btn -> partition())); - this.rwMode = new GuiServerSettingToggleButton<>(this.guiLeft - 18, this.guiTop + 48, Settings.ACCESS, + addButton(new ActionButton(this.guiLeft - 18, this.guiTop + 8, ActionItems.CLOSE, btn -> clear())); + addButton(new ActionButton(this.guiLeft - 18, this.guiTop + 28, ActionItems.WRENCH, btn -> partition())); + this.rwMode = new ServerSettingToggleButton<>(this.guiLeft - 18, this.guiTop + 48, Settings.ACCESS, AccessRestriction.READ_WRITE); - this.storageFilter = new GuiServerSettingToggleButton<>(this.guiLeft - 18, this.guiTop + 68, + this.storageFilter = new ServerSettingToggleButton<>(this.guiLeft - 18, this.guiTop + 68, Settings.STORAGE_FILTER, StorageFilter.EXTRACTABLE_ONLY); - this.fuzzyMode = new GuiServerSettingToggleButton<>(this.guiLeft - 18, this.guiTop + 88, Settings.FUZZY_MODE, + this.fuzzyMode = new ServerSettingToggleButton<>(this.guiLeft - 18, this.guiTop + 88, Settings.FUZZY_MODE, FuzzyMode.IGNORE_ALL); - this.addButton(new GuiTabButton(this.guiLeft + 154, this.guiTop, 2 + 4 * 16, GuiText.Priority.getLocal(), + this.addButton(new TabButton(this.guiLeft + 154, this.guiTop, 2 + 4 * 16, GuiText.Priority.getLocal(), this.itemRenderer, btn -> openPriorityGui())); this.addButton(this.storageFilter); @@ -76,11 +76,11 @@ public class GuiStorageBus extends GuiUpgradeable { } if (this.storageFilter != null) { - this.storageFilter.set(((ContainerStorageBus) this.cvb).getStorageFilter()); + this.storageFilter.set(((StorageBusContainer) this.cvb).getStorageFilter()); } if (this.rwMode != null) { - this.rwMode.set(((ContainerStorageBus) this.cvb).getReadWriteMode()); + this.rwMode.set(((StorageBusContainer) this.cvb).getReadWriteMode()); } } @@ -90,15 +90,15 @@ public class GuiStorageBus extends GuiUpgradeable { } private void partition() { - NetworkHandler.instance().sendToServer(new PacketValueConfig("StorageBus.Action", "Partition")); + NetworkHandler.instance().sendToServer(new ConfigValuePacket("StorageBus.Action", "Partition")); } private void clear() { - NetworkHandler.instance().sendToServer(new PacketValueConfig("StorageBus.Action", "Clear")); + NetworkHandler.instance().sendToServer(new ConfigValuePacket("StorageBus.Action", "Clear")); } private void openPriorityGui() { - NetworkHandler.instance().sendToServer(new PacketSwitchGuis(ContainerPriority.TYPE)); + NetworkHandler.instance().sendToServer(new SwitchGuisPacket(PriorityContainer.TYPE)); } } diff --git a/src/main/java/appeng/client/gui/implementations/GuiUpgradeable.java b/src/main/java/appeng/client/gui/implementations/UpgradeableScreen.java similarity index 77% rename from src/main/java/appeng/client/gui/implementations/GuiUpgradeable.java rename to src/main/java/appeng/client/gui/implementations/UpgradeableScreen.java index 988dd427b..71add3ef1 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiUpgradeable.java +++ b/src/main/java/appeng/client/gui/implementations/UpgradeableScreen.java @@ -29,25 +29,25 @@ import appeng.api.config.Settings; import appeng.api.config.Upgrades; import appeng.api.config.YesNo; import appeng.api.implementations.IUpgradeableHost; -import appeng.client.gui.AEBaseGui; -import appeng.client.gui.widgets.GuiServerSettingToggleButton; -import appeng.client.gui.widgets.GuiSettingToggleButton; -import appeng.container.implementations.ContainerUpgradeable; +import appeng.client.gui.AEBaseScreen; +import appeng.client.gui.widgets.ServerSettingToggleButton; +import appeng.client.gui.widgets.SettingToggleButton; +import appeng.container.implementations.UpgradeableContainer; import appeng.core.localization.GuiText; -import appeng.parts.automation.PartExportBus; -import appeng.parts.automation.PartImportBus; +import appeng.parts.automation.ExportBusPart; +import appeng.parts.automation.ImportBusPart; -public class GuiUpgradeable extends AEBaseGui { +public class UpgradeableScreen extends AEBaseScreen { - protected final ContainerUpgradeable cvb; + protected final UpgradeableContainer cvb; protected final IUpgradeableHost bc; - protected GuiSettingToggleButton redstoneMode; - protected GuiSettingToggleButton fuzzyMode; - protected GuiSettingToggleButton craftMode; - protected GuiSettingToggleButton schedulingMode; + protected SettingToggleButton redstoneMode; + protected SettingToggleButton fuzzyMode; + protected SettingToggleButton craftMode; + protected SettingToggleButton schedulingMode; - public GuiUpgradeable(T container, PlayerInventory playerInventory, ITextComponent title) { + public UpgradeableScreen(T container, PlayerInventory playerInventory, ITextComponent title) { super(container, playerInventory, title); this.cvb = container; @@ -67,16 +67,16 @@ public class GuiUpgradeable extends AEBaseGui } protected void addButtons() { - this.redstoneMode = new GuiServerSettingToggleButton<>(this.guiLeft - 18, this.guiTop + 8, + this.redstoneMode = new ServerSettingToggleButton<>(this.guiLeft - 18, this.guiTop + 8, Settings.REDSTONE_CONTROLLED, RedstoneMode.IGNORE); addButton(this.redstoneMode); - this.fuzzyMode = new GuiServerSettingToggleButton<>(this.guiLeft - 18, this.guiTop + 28, Settings.FUZZY_MODE, + this.fuzzyMode = new ServerSettingToggleButton<>(this.guiLeft - 18, this.guiTop + 28, Settings.FUZZY_MODE, FuzzyMode.IGNORE_ALL); addButton(this.fuzzyMode); - this.craftMode = new GuiServerSettingToggleButton<>(this.guiLeft - 18, this.guiTop + 48, Settings.CRAFT_ONLY, + this.craftMode = new ServerSettingToggleButton<>(this.guiLeft - 18, this.guiTop + 48, Settings.CRAFT_ONLY, YesNo.NO); addButton(this.craftMode); - this.schedulingMode = new GuiServerSettingToggleButton<>(this.guiLeft - 18, this.guiTop + 68, + this.schedulingMode = new ServerSettingToggleButton<>(this.guiLeft - 18, this.guiTop + 68, Settings.SCHEDULING_MODE, SchedulingMode.DEFAULT); addButton(this.schedulingMode); } @@ -131,7 +131,7 @@ public class GuiUpgradeable extends AEBaseGui } if (this.schedulingMode != null) { this.schedulingMode.setVisibility( - this.bc.getInstalledUpgrades(Upgrades.CAPACITY) > 0 && this.bc instanceof PartExportBus); + this.bc.getInstalledUpgrades(Upgrades.CAPACITY) > 0 && this.bc instanceof ExportBusPart); } } @@ -144,7 +144,7 @@ public class GuiUpgradeable extends AEBaseGui } protected GuiText getName() { - return this.bc instanceof PartImportBus ? GuiText.ImportBus : GuiText.ExportBus; + return this.bc instanceof ImportBusPart ? GuiText.ImportBus : GuiText.ExportBus; } } diff --git a/src/main/java/appeng/client/gui/implementations/GuiVibrationChamber.java b/src/main/java/appeng/client/gui/implementations/VibrationChamberScreen.java similarity index 74% rename from src/main/java/appeng/client/gui/implementations/GuiVibrationChamber.java rename to src/main/java/appeng/client/gui/implementations/VibrationChamberScreen.java index bdd1aadf9..9b37c404e 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiVibrationChamber.java +++ b/src/main/java/appeng/client/gui/implementations/VibrationChamberScreen.java @@ -24,19 +24,19 @@ import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.text.ITextComponent; import net.minecraftforge.fml.client.gui.GuiUtils; -import appeng.client.gui.AEBaseGui; -import appeng.client.gui.widgets.GuiProgressBar; -import appeng.client.gui.widgets.GuiProgressBar.Direction; -import appeng.container.implementations.ContainerVibrationChamber; +import appeng.client.gui.AEBaseScreen; +import appeng.client.gui.widgets.ProgressBar; +import appeng.client.gui.widgets.ProgressBar.Direction; +import appeng.container.implementations.VibrationChamberContainer; import appeng.core.localization.GuiText; -import appeng.tile.misc.TileVibrationChamber; +import appeng.tile.misc.VibrationChamberTileEntity; -public class GuiVibrationChamber extends AEBaseGui { +public class VibrationChamberScreen extends AEBaseScreen { - private GuiProgressBar pb; + private ProgressBar pb; - public GuiVibrationChamber(ContainerVibrationChamber container, PlayerInventory playerInventory, - ITextComponent title) { + public VibrationChamberScreen(VibrationChamberContainer container, PlayerInventory playerInventory, + ITextComponent title) { super(container, playerInventory, title); this.ySize = 166; } @@ -45,7 +45,7 @@ public class GuiVibrationChamber extends AEBaseGui { public void init() { super.init(); - this.pb = new GuiProgressBar(this.container, "guis/vibchamber.png", 99, 36, 176, 14, 6, 18, Direction.VERTICAL); + this.pb = new ProgressBar(this.container, "guis/vibchamber.png", 99, 36, 176, 14, 6, 18, Direction.VERTICAL); this.addButton(this.pb); } @@ -54,8 +54,8 @@ public class GuiVibrationChamber extends AEBaseGui { this.font.drawString(this.getGuiDisplayName(GuiText.VibrationChamber.getLocal()), 8, 6, 4210752); this.font.drawString(GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752); - this.pb.setFullMsg(TileVibrationChamber.POWER_PER_TICK * this.container.getCurrentProgress() - / TileVibrationChamber.DILATION_SCALING + " AE/t"); + this.pb.setFullMsg(VibrationChamberTileEntity.POWER_PER_TICK * this.container.getCurrentProgress() + / VibrationChamberTileEntity.DILATION_SCALING + " AE/t"); if (this.container.getRemainingBurnTime() > 0) { final int i1 = this.container.getRemainingBurnTime() * 12 / 100; diff --git a/src/main/java/appeng/client/gui/implementations/GuiWireless.java b/src/main/java/appeng/client/gui/implementations/WirelessScreen.java similarity index 90% rename from src/main/java/appeng/client/gui/implementations/GuiWireless.java rename to src/main/java/appeng/client/gui/implementations/WirelessScreen.java index dd0a0f7aa..e8dda8a5a 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiWireless.java +++ b/src/main/java/appeng/client/gui/implementations/WirelessScreen.java @@ -22,15 +22,15 @@ import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.text.ITextComponent; import net.minecraftforge.fml.client.gui.GuiUtils; -import appeng.client.gui.AEBaseGui; +import appeng.client.gui.AEBaseScreen; import appeng.client.gui.widgets.CommonButtons; -import appeng.container.implementations.ContainerWireless; +import appeng.container.implementations.WirelessContainer; import appeng.core.localization.GuiText; import appeng.util.Platform; -public class GuiWireless extends AEBaseGui { +public class WirelessScreen extends AEBaseScreen { - public GuiWireless(ContainerWireless container, PlayerInventory playerInventory, ITextComponent title) { + public WirelessScreen(WirelessContainer container, PlayerInventory playerInventory, ITextComponent title) { super(container, playerInventory, title); this.ySize = 166; } diff --git a/src/main/java/appeng/client/gui/implementations/GuiWirelessTerm.java b/src/main/java/appeng/client/gui/implementations/WirelessTermScreen.java similarity index 79% rename from src/main/java/appeng/client/gui/implementations/GuiWirelessTerm.java rename to src/main/java/appeng/client/gui/implementations/WirelessTermScreen.java index c3b4ec11e..ac8f8a31a 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiWirelessTerm.java +++ b/src/main/java/appeng/client/gui/implementations/WirelessTermScreen.java @@ -21,12 +21,12 @@ package appeng.client.gui.implementations; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.text.ITextComponent; -import appeng.container.implementations.ContainerMEPortableCell; +import appeng.container.implementations.MEPortableCellContainer; // FIXME: Extended from GuiPortableCell before... Why? -public class GuiWirelessTerm extends GuiMEMonitorable { +public class WirelessTermScreen extends MEMonitorableScreen { - public GuiWirelessTerm(ContainerMEPortableCell container, PlayerInventory playerInventory, ITextComponent title) { + public WirelessTermScreen(MEPortableCellContainer container, PlayerInventory playerInventory, ITextComponent title) { super(container, playerInventory, title); } diff --git a/src/main/java/appeng/client/gui/widgets/MEGuiTextField.java b/src/main/java/appeng/client/gui/widgets/AETextField.java similarity index 96% rename from src/main/java/appeng/client/gui/widgets/MEGuiTextField.java rename to src/main/java/appeng/client/gui/widgets/AETextField.java index 618aa3870..4e920a63a 100644 --- a/src/main/java/appeng/client/gui/widgets/MEGuiTextField.java +++ b/src/main/java/appeng/client/gui/widgets/AETextField.java @@ -34,7 +34,7 @@ import net.minecraft.client.renderer.vertex.DefaultVertexFormats; * * The rendering does pay attention to the size of the '_' caret. */ -public class MEGuiTextField extends TextFieldWidget { +public class AETextField extends TextFieldWidget { private static final int PADDING = 2; private final int _fontPad; @@ -50,8 +50,8 @@ public class MEGuiTextField extends TextFieldWidget { * @param width absolute width * @param height absolute height */ - public MEGuiTextField(final FontRenderer fontRenderer, final int xPos, final int yPos, final int width, - final int height) { + public AETextField(final FontRenderer fontRenderer, final int xPos, final int yPos, final int width, + final int height) { super(fontRenderer, xPos + PADDING, yPos + PADDING, width - 2 * PADDING - (int) fontRenderer.getCharWidth('_'), height - 2 * PADDING, ""); diff --git a/src/main/java/appeng/client/gui/widgets/GuiActionButton.java b/src/main/java/appeng/client/gui/widgets/ActionButton.java similarity index 94% rename from src/main/java/appeng/client/gui/widgets/GuiActionButton.java rename to src/main/java/appeng/client/gui/widgets/ActionButton.java index cbe9e1a3f..8d4303175 100644 --- a/src/main/java/appeng/client/gui/widgets/GuiActionButton.java +++ b/src/main/java/appeng/client/gui/widgets/ActionButton.java @@ -24,11 +24,11 @@ import java.util.regex.Pattern; import appeng.api.config.ActionItems; import appeng.core.localization.ButtonToolTips; -public class GuiActionButton extends GuiIconButton implements ITooltip { +public class ActionButton extends IconButton implements ITooltip { private static final Pattern PATTERN_NEW_LINE = Pattern.compile("\\n", Pattern.LITERAL); private final int iconIndex; - public GuiActionButton(final int x, final int y, final ActionItems action, Consumer onPress) { + public ActionButton(final int x, final int y, final ActionItems action, Consumer onPress) { super(x, y, btn -> onPress.accept(action)); ButtonToolTips displayName; diff --git a/src/main/java/appeng/client/gui/widgets/CommonButtons.java b/src/main/java/appeng/client/gui/widgets/CommonButtons.java index 2829f5e06..0df07c2cd 100644 --- a/src/main/java/appeng/client/gui/widgets/CommonButtons.java +++ b/src/main/java/appeng/client/gui/widgets/CommonButtons.java @@ -9,12 +9,12 @@ public final class CommonButtons { private CommonButtons() { } - public static GuiSettingToggleButton togglePowerUnit(int x, int y) { - return new GuiSettingToggleButton<>(x, y, Settings.POWER_UNITS, AEConfig.instance().getSelectedPowerUnit(), + public static SettingToggleButton togglePowerUnit(int x, int y) { + return new SettingToggleButton<>(x, y, Settings.POWER_UNITS, AEConfig.instance().getSelectedPowerUnit(), CommonButtons::togglePowerUnit); } - private static void togglePowerUnit(GuiSettingToggleButton button, boolean backwards) { + private static void togglePowerUnit(SettingToggleButton button, boolean backwards) { AEConfig.instance().nextPowerUnit(backwards); button.set(AEConfig.instance().getSelectedPowerUnit()); } diff --git a/src/main/java/appeng/client/gui/widgets/GuiCustomSlot.java b/src/main/java/appeng/client/gui/widgets/CustomSlotWidget.java similarity index 89% rename from src/main/java/appeng/client/gui/widgets/GuiCustomSlot.java rename to src/main/java/appeng/client/gui/widgets/CustomSlotWidget.java index b55b4d28b..1f18f0028 100644 --- a/src/main/java/appeng/client/gui/widgets/GuiCustomSlot.java +++ b/src/main/java/appeng/client/gui/widgets/CustomSlotWidget.java @@ -6,12 +6,12 @@ import net.minecraft.client.gui.AbstractGui; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -public abstract class GuiCustomSlot extends AbstractGui implements ITooltip { +public abstract class CustomSlotWidget extends AbstractGui implements ITooltip { private final int x; private final int y; private final int id; - public GuiCustomSlot(final int id, final int x, final int y) { + public CustomSlotWidget(final int id, final int x, final int y) { this.x = x; this.y = y; this.id = id; diff --git a/src/main/java/appeng/client/gui/widgets/GuiIconButton.java b/src/main/java/appeng/client/gui/widgets/IconButton.java similarity index 96% rename from src/main/java/appeng/client/gui/widgets/GuiIconButton.java rename to src/main/java/appeng/client/gui/widgets/IconButton.java index c92eaa8a4..40091320f 100644 --- a/src/main/java/appeng/client/gui/widgets/GuiIconButton.java +++ b/src/main/java/appeng/client/gui/widgets/IconButton.java @@ -26,13 +26,13 @@ import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.client.gui.GuiUtils; -public abstract class GuiIconButton extends Button implements ITooltip { +public abstract class IconButton extends Button implements ITooltip { public static final ResourceLocation TEXTURE_STATES = new ResourceLocation("appliedenergistics2", "textures/guis/states.png"); private boolean halfSize = false; - public GuiIconButton(final int x, final int y, IPressable onPress) { + public IconButton(final int x, final int y, IPressable onPress) { super(x, y, 16, 16, "", onPress); } diff --git a/src/main/java/appeng/client/gui/widgets/GuiNumberBox.java b/src/main/java/appeng/client/gui/widgets/NumberBox.java similarity index 89% rename from src/main/java/appeng/client/gui/widgets/GuiNumberBox.java rename to src/main/java/appeng/client/gui/widgets/NumberBox.java index 8bf2aaf61..16570f90f 100644 --- a/src/main/java/appeng/client/gui/widgets/GuiNumberBox.java +++ b/src/main/java/appeng/client/gui/widgets/NumberBox.java @@ -22,12 +22,12 @@ import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.widget.TextFieldWidget; // FIXME: Fix this piece of crap (i.e. onChange listener) -public class GuiNumberBox extends TextFieldWidget { +public class NumberBox extends TextFieldWidget { private final Class type; - public GuiNumberBox(final FontRenderer fontRenderer, final int x, final int y, final int width, final int height, - final Class type) { + public NumberBox(final FontRenderer fontRenderer, final int x, final int y, final int width, final int height, + final Class type) { super(fontRenderer, x, y, width, height, "0"); this.type = type; } diff --git a/src/main/java/appeng/client/gui/widgets/GuiProgressBar.java b/src/main/java/appeng/client/gui/widgets/ProgressBar.java similarity index 87% rename from src/main/java/appeng/client/gui/widgets/GuiProgressBar.java rename to src/main/java/appeng/client/gui/widgets/ProgressBar.java index f64ad2ad0..5b2b1568e 100644 --- a/src/main/java/appeng/client/gui/widgets/GuiProgressBar.java +++ b/src/main/java/appeng/client/gui/widgets/ProgressBar.java @@ -26,7 +26,7 @@ import net.minecraftforge.fml.client.gui.GuiUtils; import appeng.container.interfaces.IProgressProvider; import appeng.core.localization.GuiText; -public class GuiProgressBar extends Widget implements ITooltip { +public class ProgressBar extends Widget implements ITooltip { private final IProgressProvider source; private final ResourceLocation texture; @@ -36,13 +36,13 @@ public class GuiProgressBar extends Widget implements ITooltip { private final String titleName; private String fullMsg; - public GuiProgressBar(final IProgressProvider source, final String texture, final int posX, final int posY, - final int u, final int y, final int width, final int height, final Direction dir) { + public ProgressBar(final IProgressProvider source, final String texture, final int posX, final int posY, + final int u, final int y, final int width, final int height, final Direction dir) { this(source, texture, posX, posY, u, y, width, height, dir, null); } - public GuiProgressBar(final IProgressProvider source, final String texture, final int posX, final int posY, - final int u, final int y, final int width, final int height, final Direction dir, final String title) { + public ProgressBar(final IProgressProvider source, final String texture, final int posX, final int posY, + final int u, final int y, final int width, final int height, final Direction dir, final String title) { super(posX, posY, width, height, ""); this.source = source; this.texture = new ResourceLocation("appliedenergistics2", "textures/" + texture); diff --git a/src/main/java/appeng/client/gui/widgets/GuiScrollbar.java b/src/main/java/appeng/client/gui/widgets/Scrollbar.java similarity index 91% rename from src/main/java/appeng/client/gui/widgets/GuiScrollbar.java rename to src/main/java/appeng/client/gui/widgets/Scrollbar.java index 6e5c95fe1..4b842ed18 100644 --- a/src/main/java/appeng/client/gui/widgets/GuiScrollbar.java +++ b/src/main/java/appeng/client/gui/widgets/Scrollbar.java @@ -22,9 +22,9 @@ import com.mojang.blaze3d.systems.RenderSystem; import net.minecraftforge.fml.client.gui.GuiUtils; -import appeng.client.gui.AEBaseGui; +import appeng.client.gui.AEBaseScreen; -public class GuiScrollbar implements IScrollSource { +public class Scrollbar implements IScrollSource { private int displayX = 0; private int displayY = 0; @@ -36,7 +36,7 @@ public class GuiScrollbar implements IScrollSource { private int minScroll = 0; private int currentScroll = 0; - public void draw(final AEBaseGui g) { + public void draw(final AEBaseScreen g) { g.bindTexture("minecraft", "gui/container/creative_inventory/tabs.png"); RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f); @@ -58,7 +58,7 @@ public class GuiScrollbar implements IScrollSource { return this.displayX; } - public GuiScrollbar setLeft(final int v) { + public Scrollbar setLeft(final int v) { this.displayX = v; return this; } @@ -67,7 +67,7 @@ public class GuiScrollbar implements IScrollSource { return this.displayY; } - public GuiScrollbar setTop(final int v) { + public Scrollbar setTop(final int v) { this.displayY = v; return this; } @@ -76,7 +76,7 @@ public class GuiScrollbar implements IScrollSource { return this.width; } - public GuiScrollbar setWidth(final int v) { + public Scrollbar setWidth(final int v) { this.width = v; return this; } @@ -85,7 +85,7 @@ public class GuiScrollbar implements IScrollSource { return this.height; } - public GuiScrollbar setHeight(final int v) { + public Scrollbar setHeight(final int v) { this.height = v; return this; } diff --git a/src/main/java/appeng/client/gui/widgets/GuiServerSettingToggleButton.java b/src/main/java/appeng/client/gui/widgets/ServerSettingToggleButton.java similarity index 65% rename from src/main/java/appeng/client/gui/widgets/GuiServerSettingToggleButton.java rename to src/main/java/appeng/client/gui/widgets/ServerSettingToggleButton.java index d449f68ab..12d9abb2c 100644 --- a/src/main/java/appeng/client/gui/widgets/GuiServerSettingToggleButton.java +++ b/src/main/java/appeng/client/gui/widgets/ServerSettingToggleButton.java @@ -20,19 +20,19 @@ package appeng.client.gui.widgets; import appeng.api.config.Settings; import appeng.core.sync.network.NetworkHandler; -import appeng.core.sync.packets.PacketConfigButton; +import appeng.core.sync.packets.ConfigButtonPacket; /** * Convenience button that automatically sends settings changes to the server. */ -public class GuiServerSettingToggleButton> extends GuiSettingToggleButton { +public class ServerSettingToggleButton> extends SettingToggleButton { - public GuiServerSettingToggleButton(final int x, final int y, final Settings setting, final T val) { - super(x, y, setting, val, GuiServerSettingToggleButton::sendToServer); + public ServerSettingToggleButton(final int x, final int y, final Settings setting, final T val) { + super(x, y, setting, val, ServerSettingToggleButton::sendToServer); } - private static > void sendToServer(GuiSettingToggleButton button, boolean backwards) { - NetworkHandler.instance().sendToServer(new PacketConfigButton(button.getSetting(), backwards)); + private static > void sendToServer(SettingToggleButton button, boolean backwards) { + NetworkHandler.instance().sendToServer(new ConfigButtonPacket(button.getSetting(), backwards)); } } diff --git a/src/main/java/appeng/client/gui/widgets/GuiSettingToggleButton.java b/src/main/java/appeng/client/gui/widgets/SettingToggleButton.java similarity index 95% rename from src/main/java/appeng/client/gui/widgets/GuiSettingToggleButton.java rename to src/main/java/appeng/client/gui/widgets/SettingToggleButton.java index 750511600..582aaf580 100644 --- a/src/main/java/appeng/client/gui/widgets/GuiSettingToggleButton.java +++ b/src/main/java/appeng/client/gui/widgets/SettingToggleButton.java @@ -49,29 +49,29 @@ import appeng.api.config.YesNo; import appeng.core.localization.ButtonToolTips; import appeng.util.EnumCycler; -public class GuiSettingToggleButton> extends GuiIconButton { +public class SettingToggleButton> extends IconButton { private static final Pattern COMPILE = Pattern.compile("%s"); private static final Pattern PATTERN_NEW_LINE = Pattern.compile("\\n", Pattern.LITERAL); private static Map appearances; private final Settings buttonSetting; - private final IHandler> onPress; + private final IHandler> onPress; private final EnumSet validValues; private String fillVar; private T currentValue; @FunctionalInterface - public interface IHandler> { + public interface IHandler> { void handle(T button, boolean backwards); } - public GuiSettingToggleButton(final int x, final int y, final Settings setting, final T val, - IHandler> onPress) { + public SettingToggleButton(final int x, final int y, final Settings setting, final T val, + IHandler> onPress) { this(x, y, setting, val, t -> true, onPress); } - public GuiSettingToggleButton(final int x, final int y, final Settings setting, final T val, - Predicate isValidValue, IHandler> onPress) { - super(x, y, GuiSettingToggleButton::onPress); + public SettingToggleButton(final int x, final int y, final Settings setting, final T val, + Predicate isValidValue, IHandler> onPress) { + super(x, y, SettingToggleButton::onPress); this.onPress = onPress; // Build a list of values (in order) that are valid w.r.t. the given predicate @@ -223,8 +223,8 @@ public class GuiSettingToggleButton> extends GuiIconButton { } private static void onPress(Button btn) { - if (btn instanceof GuiSettingToggleButton) { - ((GuiSettingToggleButton) btn).triggerPress(); + if (btn instanceof SettingToggleButton) { + ((SettingToggleButton) btn).triggerPress(); } } diff --git a/src/main/java/appeng/client/gui/widgets/GuiTabButton.java b/src/main/java/appeng/client/gui/widgets/TabButton.java similarity index 90% rename from src/main/java/appeng/client/gui/widgets/GuiTabButton.java rename to src/main/java/appeng/client/gui/widgets/TabButton.java index 43f835aee..c63939aa9 100644 --- a/src/main/java/appeng/client/gui/widgets/GuiTabButton.java +++ b/src/main/java/appeng/client/gui/widgets/TabButton.java @@ -27,7 +27,7 @@ import net.minecraft.client.renderer.RenderHelper; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -public class GuiTabButton extends Button implements ITooltip { +public class TabButton extends Button implements ITooltip { public static final ResourceLocation TEXTURE_STATES = new ResourceLocation("appliedenergistics2", "textures/guis/states.png"); private final ItemRenderer itemRenderer; @@ -35,8 +35,8 @@ public class GuiTabButton extends Button implements ITooltip { private int myIcon = -1; private ItemStack myItem; - public GuiTabButton(final int x, final int y, final int ico, final String message, final ItemRenderer ir, - IPressable onPress) { + public TabButton(final int x, final int y, final int ico, final String message, final ItemRenderer ir, + IPressable onPress) { super(x, y, 22, 22, message, onPress); this.myIcon = ico; @@ -52,8 +52,8 @@ public class GuiTabButton extends Button implements ITooltip { * @param message mouse over message * @param ir renderer */ - public GuiTabButton(final int x, final int y, final ItemStack ico, final String message, final ItemRenderer ir, - IPressable onPress) { + public TabButton(final int x, final int y, final ItemStack ico, final String message, final ItemRenderer ir, + IPressable onPress) { super(x, y, 22, 22, message, onPress); this.myItem = ico; this.itemRenderer = ir; diff --git a/src/main/java/appeng/client/gui/widgets/GuiToggleButton.java b/src/main/java/appeng/client/gui/widgets/ToggleButton.java similarity index 94% rename from src/main/java/appeng/client/gui/widgets/GuiToggleButton.java rename to src/main/java/appeng/client/gui/widgets/ToggleButton.java index 746f7c23b..8ea34376d 100644 --- a/src/main/java/appeng/client/gui/widgets/GuiToggleButton.java +++ b/src/main/java/appeng/client/gui/widgets/ToggleButton.java @@ -28,7 +28,7 @@ import net.minecraft.client.resources.I18n; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.client.gui.GuiUtils; -public class GuiToggleButton extends Button implements ITooltip { +public class ToggleButton extends Button implements ITooltip { public static final ResourceLocation TEXTURE_STATES = new ResourceLocation("appliedenergistics2", "textures/guis/states.png"); private static final Pattern PATTERN_NEW_LINE = Pattern.compile("\\n", Pattern.LITERAL); @@ -40,8 +40,8 @@ public class GuiToggleButton extends Button implements ITooltip { private boolean isActive; - public GuiToggleButton(final int x, final int y, final int on, final int off, final String displayName, - final String displayHint, IPressable onPress) { + public ToggleButton(final int x, final int y, final int on, final int off, final String displayName, + final String displayHint, IPressable onPress) { super(x, y, 16, 16, "", onPress); this.iconIdxOn = on; this.iconIdxOff = off; diff --git a/src/main/java/appeng/client/me/ItemRepo.java b/src/main/java/appeng/client/me/ItemRepo.java index 81b1fc795..964f45a48 100644 --- a/src/main/java/appeng/client/me/ItemRepo.java +++ b/src/main/java/appeng/client/me/ItemRepo.java @@ -40,7 +40,7 @@ import appeng.client.gui.widgets.IScrollSource; import appeng.client.gui.widgets.ISortSource; import appeng.core.AEConfig; import appeng.integration.abstraction.JEIFacade; -import appeng.items.storage.ItemViewCell; +import appeng.items.storage.ViewCellItem; import appeng.util.ItemSorters; import appeng.util.Platform; import appeng.util.prioritylist.IPartitionList; @@ -90,7 +90,7 @@ public class ItemRepo { } public void setViewCell(final ItemStack[] list) { - this.myPartitionList = ItemViewCell.createFilter(list); + this.myPartitionList = ViewCellItem.createFilter(list); this.updateView(); } diff --git a/src/main/java/appeng/client/me/SlotDisconnected.java b/src/main/java/appeng/client/me/SlotDisconnected.java index 8c06ee81c..2cef14263 100644 --- a/src/main/java/appeng/client/me/SlotDisconnected.java +++ b/src/main/java/appeng/client/me/SlotDisconnected.java @@ -22,7 +22,7 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import appeng.container.slot.AppEngSlot; -import appeng.items.misc.ItemEncodedPattern; +import appeng.items.misc.EncodedPatternItem; import appeng.util.Platform; public class SlotDisconnected extends AppEngSlot { @@ -53,8 +53,8 @@ public class SlotDisconnected extends AppEngSlot { public ItemStack getDisplayStack() { if (Platform.isClient()) { final ItemStack is = super.getStack(); - if (!is.isEmpty() && is.getItem() instanceof ItemEncodedPattern) { - final ItemEncodedPattern iep = (ItemEncodedPattern) is.getItem(); + if (!is.isEmpty() && is.getItem() instanceof EncodedPatternItem) { + final EncodedPatternItem iep = (EncodedPatternItem) is.getItem(); final ItemStack out = iep.getOutput(is); if (!out.isEmpty()) { return out; diff --git a/src/main/java/appeng/client/render/FacadeDispatcherBakedModel.java b/src/main/java/appeng/client/render/FacadeDispatcherBakedModel.java index 9452d6d7d..cc08c4068 100644 --- a/src/main/java/appeng/client/render/FacadeDispatcherBakedModel.java +++ b/src/main/java/appeng/client/render/FacadeDispatcherBakedModel.java @@ -30,7 +30,7 @@ import it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import appeng.client.render.cablebus.FacadeBuilder; -import appeng.items.parts.ItemFacade; +import appeng.items.parts.FacadeItem; /** * This baked model class is used as a dispatcher to redirect the renderer to @@ -52,11 +52,11 @@ public class FacadeDispatcherBakedModel extends DelegateBakedModel { @Override public IBakedModel getModelWithOverrides(IBakedModel originalModel, ItemStack stack, World world, LivingEntity entity) { - if (!(stack.getItem() instanceof ItemFacade)) { + if (!(stack.getItem() instanceof FacadeItem)) { return originalModel; } - ItemFacade itemFacade = (ItemFacade) stack.getItem(); + FacadeItem itemFacade = (FacadeItem) stack.getItem(); ItemStack textureItem = itemFacade.getTextureItem(stack); diff --git a/src/main/java/appeng/client/render/cablebus/FacadeBuilder.java b/src/main/java/appeng/client/render/cablebus/FacadeBuilder.java index f9b52de7f..34f21e827 100644 --- a/src/main/java/appeng/client/render/cablebus/FacadeBuilder.java +++ b/src/main/java/appeng/client/render/cablebus/FacadeBuilder.java @@ -51,7 +51,7 @@ import net.minecraftforge.client.model.data.IModelData; import appeng.api.AEApi; import appeng.api.util.AEAxisAlignedBB; -import appeng.parts.misc.PartCableAnchor; +import appeng.parts.misc.CableAnchorPart; import appeng.thirdparty.codechicken.lib.model.CachedFormat; import appeng.thirdparty.codechicken.lib.model.Quad; import appeng.thirdparty.codechicken.lib.model.pipeline.BakedPipeline; @@ -123,7 +123,7 @@ public class FacadeBuilder { FacadeRenderState facadeRenderState = entry.getValue(); boolean renderStilt = !sidesWithParts.contains(side); if (layer == RenderType.getCutout() && renderStilt) { - for (ResourceLocation part : PartCableAnchor.FACADE_MODELS.getModels()) { + for (ResourceLocation part : CableAnchorPart.FACADE_MODELS.getModels()) { IBakedModel partModel = modelLookup.apply(part); QuadRotator rotator = new QuadRotator(); quads.addAll(rotator.rotateQuads(gatherQuads(partModel, null, rand, EmptyModelData.INSTANCE), side, diff --git a/src/main/java/appeng/client/render/crafting/CraftingMonitorTESR.java b/src/main/java/appeng/client/render/crafting/CraftingMonitorTESR.java index 9c7799006..3f6afde46 100644 --- a/src/main/java/appeng/client/render/crafting/CraftingMonitorTESR.java +++ b/src/main/java/appeng/client/render/crafting/CraftingMonitorTESR.java @@ -29,21 +29,21 @@ import net.minecraftforge.api.distmarker.OnlyIn; import appeng.api.storage.data.IAEItemStack; import appeng.client.render.TesrRenderHelper; -import appeng.tile.crafting.TileCraftingMonitorTile; +import appeng.tile.crafting.CraftingMonitorTileEntity; /** * Renders the item currently being crafted */ @OnlyIn(Dist.CLIENT) -public class CraftingMonitorTESR extends TileEntityRenderer { +public class CraftingMonitorTESR extends TileEntityRenderer { public CraftingMonitorTESR(TileEntityRendererDispatcher rendererDispatcherIn) { super(rendererDispatcherIn); } @Override - public void render(TileCraftingMonitorTile te, float partialTicks, MatrixStack matrixStack, - IRenderTypeBuffer buffers, int combinedLight, int combinedOverlay) { + public void render(CraftingMonitorTileEntity te, float partialTicks, MatrixStack matrixStack, + IRenderTypeBuffer buffers, int combinedLight, int combinedOverlay) { Direction facing = te.getForward(); diff --git a/src/main/java/appeng/client/render/crafting/EncodedPatternBakedModel.java b/src/main/java/appeng/client/render/crafting/EncodedPatternBakedModel.java index ad0c6ea8d..b819e8a45 100644 --- a/src/main/java/appeng/client/render/crafting/EncodedPatternBakedModel.java +++ b/src/main/java/appeng/client/render/crafting/EncodedPatternBakedModel.java @@ -17,7 +17,7 @@ import net.minecraft.world.World; import net.minecraftforge.client.model.PerspectiveMapWrapper; import appeng.client.render.DelegateBakedModel; -import appeng.items.misc.ItemEncodedPattern; +import appeng.items.misc.EncodedPatternItem; /** * This model is used to substitute the crafting result's item model for our @@ -116,7 +116,7 @@ public class EncodedPatternBakedModel extends DelegateBakedModel { @Nullable LivingEntity entity) { boolean shiftHeld = Screen.hasShiftDown(); if (shiftHeld) { - ItemEncodedPattern iep = (ItemEncodedPattern) stack.getItem(); + EncodedPatternItem iep = (EncodedPatternItem) stack.getItem(); ItemStack output = iep.getOutput(stack); if (!output.isEmpty()) { IBakedModel realModel = Minecraft.getInstance().getItemRenderer().getItemModelMesher() diff --git a/src/main/java/appeng/client/render/crafting/MonitorBakedModel.java b/src/main/java/appeng/client/render/crafting/MonitorBakedModel.java index 3e997ea8c..37bce9f5d 100644 --- a/src/main/java/appeng/client/render/crafting/MonitorBakedModel.java +++ b/src/main/java/appeng/client/render/crafting/MonitorBakedModel.java @@ -24,7 +24,7 @@ import net.minecraft.util.Direction; import net.minecraftforge.client.model.data.IModelData; import appeng.api.util.AEColor; -import appeng.block.crafting.BlockCraftingMonitor; +import appeng.block.crafting.CraftingMonitorBlock; import appeng.client.render.cablebus.CubeBuilder; import appeng.client.render.model.AEModelData; import appeng.tile.crafting.CraftingMonitorModelData; @@ -76,7 +76,7 @@ public class MonitorBakedModel extends CraftingCubeBakedModel { // Now add the three layered light textures AEColor color = getColor(modelData); - boolean powered = state.get(BlockCraftingMonitor.POWERED); + boolean powered = state.get(CraftingMonitorBlock.POWERED); builder.setRenderFullBright(powered); diff --git a/src/main/java/appeng/client/render/model/GlassBakedModel.java b/src/main/java/appeng/client/render/model/GlassBakedModel.java index 0c4161405..5984a066a 100644 --- a/src/main/java/appeng/client/render/model/GlassBakedModel.java +++ b/src/main/java/appeng/client/render/model/GlassBakedModel.java @@ -52,7 +52,7 @@ import net.minecraftforge.client.model.data.ModelDataMap; import net.minecraftforge.client.model.data.ModelProperty; import net.minecraftforge.client.model.pipeline.BakedQuadBuilder; -import appeng.decorative.solid.BlockQuartzGlass; +import appeng.decorative.solid.QuartzGlassBlock; import appeng.decorative.solid.GlassState; class GlassBakedModel implements IDynamicBakedModel { @@ -322,7 +322,7 @@ class GlassBakedModel implements IDynamicBakedModel { } private static boolean isGlassBlock(IBlockReader world, BlockPos pos, Direction facing) { - return world.getBlockState(pos.offset(facing)).getBlock() instanceof BlockQuartzGlass; + return world.getBlockState(pos.offset(facing)).getBlock() instanceof QuartzGlassBlock; } } diff --git a/src/main/java/appeng/client/render/spatial/SpatialPylonBakedModel.java b/src/main/java/appeng/client/render/spatial/SpatialPylonBakedModel.java index fdc004793..f9b3432d3 100644 --- a/src/main/java/appeng/client/render/spatial/SpatialPylonBakedModel.java +++ b/src/main/java/appeng/client/render/spatial/SpatialPylonBakedModel.java @@ -36,7 +36,7 @@ import net.minecraftforge.client.model.data.IDynamicBakedModel; import net.minecraftforge.client.model.data.IModelData; import appeng.client.render.cablebus.CubeBuilder; -import appeng.tile.spatial.TileSpatialPylon; +import appeng.tile.spatial.SpatialPylonTileEntity; /** * The baked model that will be used for rendering the spatial pylon. @@ -59,16 +59,16 @@ class SpatialPylonBakedModel implements IDynamicBakedModel { if (flags != 0) { Direction ori = null; - int displayAxis = flags & TileSpatialPylon.DISPLAY_Z; - if (displayAxis == TileSpatialPylon.DISPLAY_X) { + int displayAxis = flags & SpatialPylonTileEntity.DISPLAY_Z; + if (displayAxis == SpatialPylonTileEntity.DISPLAY_X) { ori = Direction.EAST; - if ((flags & TileSpatialPylon.DISPLAY_MIDDLE) == TileSpatialPylon.DISPLAY_END_MAX) { + if ((flags & SpatialPylonTileEntity.DISPLAY_MIDDLE) == SpatialPylonTileEntity.DISPLAY_END_MAX) { builder.setUvRotation(Direction.SOUTH, 1); builder.setUvRotation(Direction.NORTH, 1); builder.setUvRotation(Direction.UP, 2); builder.setUvRotation(Direction.DOWN, 2); - } else if ((flags & TileSpatialPylon.DISPLAY_MIDDLE) == TileSpatialPylon.DISPLAY_END_MIN) { + } else if ((flags & SpatialPylonTileEntity.DISPLAY_MIDDLE) == SpatialPylonTileEntity.DISPLAY_END_MIN) { builder.setUvRotation(Direction.SOUTH, 2); builder.setUvRotation(Direction.NORTH, 2); builder.setUvRotation(Direction.UP, 1); @@ -81,9 +81,9 @@ class SpatialPylonBakedModel implements IDynamicBakedModel { } } - else if (displayAxis == TileSpatialPylon.DISPLAY_Y) { + else if (displayAxis == SpatialPylonTileEntity.DISPLAY_Y) { ori = Direction.UP; - if ((flags & TileSpatialPylon.DISPLAY_MIDDLE) == TileSpatialPylon.DISPLAY_END_MAX) { + if ((flags & SpatialPylonTileEntity.DISPLAY_MIDDLE) == SpatialPylonTileEntity.DISPLAY_END_MAX) { builder.setUvRotation(Direction.NORTH, 3); builder.setUvRotation(Direction.SOUTH, 3); builder.setUvRotation(Direction.EAST, 3); @@ -91,12 +91,12 @@ class SpatialPylonBakedModel implements IDynamicBakedModel { } } - else if (displayAxis == TileSpatialPylon.DISPLAY_Z) { + else if (displayAxis == SpatialPylonTileEntity.DISPLAY_Z) { ori = Direction.NORTH; - if ((flags & TileSpatialPylon.DISPLAY_MIDDLE) == TileSpatialPylon.DISPLAY_END_MAX) { + if ((flags & SpatialPylonTileEntity.DISPLAY_MIDDLE) == SpatialPylonTileEntity.DISPLAY_END_MAX) { builder.setUvRotation(Direction.EAST, 2); builder.setUvRotation(Direction.WEST, 1); - } else if ((flags & TileSpatialPylon.DISPLAY_MIDDLE) == TileSpatialPylon.DISPLAY_END_MIN) { + } else if ((flags & SpatialPylonTileEntity.DISPLAY_MIDDLE) == SpatialPylonTileEntity.DISPLAY_END_MIN) { builder.setUvRotation(Direction.EAST, 1); builder.setUvRotation(Direction.WEST, 2); builder.setUvRotation(Direction.UP, 3); @@ -115,7 +115,7 @@ class SpatialPylonBakedModel implements IDynamicBakedModel { this.textures.get(getTextureTypeFromSideOutside(flags, ori, Direction.WEST))); builder.addCube(0, 0, 0, 16, 16, 16); - if ((flags & TileSpatialPylon.DISPLAY_POWERED_ENABLED) == TileSpatialPylon.DISPLAY_POWERED_ENABLED) { + if ((flags & SpatialPylonTileEntity.DISPLAY_POWERED_ENABLED) == SpatialPylonTileEntity.DISPLAY_POWERED_ENABLED) { builder.setRenderFullBright(true); } @@ -138,7 +138,7 @@ class SpatialPylonBakedModel implements IDynamicBakedModel { } private int getFlags(IModelData modelData) { - Integer flags = modelData.getData(TileSpatialPylon.STATE); + Integer flags = modelData.getData(SpatialPylonTileEntity.STATE); return flags != null ? flags : 0; } @@ -147,11 +147,11 @@ class SpatialPylonBakedModel implements IDynamicBakedModel { return SpatialPylonTextureType.BASE; } - if ((flags & TileSpatialPylon.DISPLAY_MIDDLE) == TileSpatialPylon.DISPLAY_MIDDLE) { + if ((flags & SpatialPylonTileEntity.DISPLAY_MIDDLE) == SpatialPylonTileEntity.DISPLAY_MIDDLE) { return SpatialPylonTextureType.BASE_SPANNED; - } else if ((flags & TileSpatialPylon.DISPLAY_MIDDLE) == TileSpatialPylon.DISPLAY_END_MIN) { + } else if ((flags & SpatialPylonTileEntity.DISPLAY_MIDDLE) == SpatialPylonTileEntity.DISPLAY_END_MIN) { return SpatialPylonTextureType.BASE_END; - } else if ((flags & TileSpatialPylon.DISPLAY_MIDDLE) == TileSpatialPylon.DISPLAY_END_MAX) { + } else if ((flags & SpatialPylonTileEntity.DISPLAY_MIDDLE) == SpatialPylonTileEntity.DISPLAY_END_MAX) { return SpatialPylonTextureType.BASE_END; } @@ -159,17 +159,17 @@ class SpatialPylonBakedModel implements IDynamicBakedModel { } private static SpatialPylonTextureType getTextureTypeFromSideInside(int flags, Direction ori, Direction dir) { - final boolean good = (flags & TileSpatialPylon.DISPLAY_ENABLED) == TileSpatialPylon.DISPLAY_ENABLED; + final boolean good = (flags & SpatialPylonTileEntity.DISPLAY_ENABLED) == SpatialPylonTileEntity.DISPLAY_ENABLED; if (ori == dir || ori.getOpposite() == dir) { return good ? SpatialPylonTextureType.DIM : SpatialPylonTextureType.RED; } - if ((flags & TileSpatialPylon.DISPLAY_MIDDLE) == TileSpatialPylon.DISPLAY_MIDDLE) { + if ((flags & SpatialPylonTileEntity.DISPLAY_MIDDLE) == SpatialPylonTileEntity.DISPLAY_MIDDLE) { return good ? SpatialPylonTextureType.DIM_SPANNED : SpatialPylonTextureType.RED_SPANNED; - } else if ((flags & TileSpatialPylon.DISPLAY_MIDDLE) == TileSpatialPylon.DISPLAY_END_MIN) { + } else if ((flags & SpatialPylonTileEntity.DISPLAY_MIDDLE) == SpatialPylonTileEntity.DISPLAY_END_MIN) { return good ? SpatialPylonTextureType.DIM_END : SpatialPylonTextureType.RED_END; - } else if ((flags & TileSpatialPylon.DISPLAY_MIDDLE) == TileSpatialPylon.DISPLAY_END_MAX) { + } else if ((flags & SpatialPylonTileEntity.DISPLAY_MIDDLE) == SpatialPylonTileEntity.DISPLAY_END_MAX) { return good ? SpatialPylonTextureType.DIM_END : SpatialPylonTextureType.RED_END; } diff --git a/src/main/java/appeng/client/render/tesr/CrankTESR.java b/src/main/java/appeng/client/render/tesr/CrankTESR.java index 25e398d7b..e361262f2 100644 --- a/src/main/java/appeng/client/render/tesr/CrankTESR.java +++ b/src/main/java/appeng/client/render/tesr/CrankTESR.java @@ -30,27 +30,26 @@ import net.minecraft.client.renderer.Quaternion; import net.minecraft.client.renderer.model.IBakedModel; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; -import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import appeng.client.render.FacingToRotation; -import appeng.tile.grindstone.TileCrank; +import appeng.tile.grindstone.CrankTileEntity; /** * This FastTESR only handles the animated model of the turning crank. When the * crank is at rest, it is rendered using a normal model. */ @OnlyIn(Dist.CLIENT) -public class CrankTESR extends TileEntityRenderer { +public class CrankTESR extends TileEntityRenderer { public CrankTESR(TileEntityRendererDispatcher rendererDispatcherIn) { super(rendererDispatcherIn); } @Override - public void render(TileCrank te, float partialTicks, MatrixStack ms, IRenderTypeBuffer buffers, int combinedLightIn, - int combinedOverlayIn) { + public void render(CrankTileEntity te, float partialTicks, MatrixStack ms, IRenderTypeBuffer buffers, int combinedLightIn, + int combinedOverlayIn) { // Apply GL transformations relative to the center of the block: 1) TE rotation // and 2) crank rotation diff --git a/src/main/java/appeng/client/render/tesr/DriveLedTileEntityRenderer.java b/src/main/java/appeng/client/render/tesr/DriveLedTileEntityRenderer.java index 02a176760..48632f4b9 100644 --- a/src/main/java/appeng/client/render/tesr/DriveLedTileEntityRenderer.java +++ b/src/main/java/appeng/client/render/tesr/DriveLedTileEntityRenderer.java @@ -18,13 +18,13 @@ import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import appeng.block.storage.DriveSlotState; import appeng.client.render.FacingToRotation; -import appeng.tile.storage.TileDrive; +import appeng.tile.storage.DriveTileEntity; /** * Renders the drive cell status indicators. */ @OnlyIn(Dist.CLIENT) -public class DriveLedTileEntityRenderer extends TileEntityRenderer { +public class DriveLedTileEntityRenderer extends TileEntityRenderer { private static final EnumMap STATE_COLORS; @@ -68,8 +68,8 @@ public class DriveLedTileEntityRenderer extends TileEntityRenderer { } @Override - public void render(TileDrive drive, float partialTicks, MatrixStack ms, IRenderTypeBuffer buffers, - int combinedLightIn, int combinedOverlayIn) { + public void render(DriveTileEntity drive, float partialTicks, MatrixStack ms, IRenderTypeBuffer buffers, + int combinedLightIn, int combinedOverlayIn) { if (drive.getCellCount() != 10) { throw new IllegalStateException("Expected drive to have 10 slots"); @@ -119,7 +119,7 @@ public class DriveLedTileEntityRenderer extends TileEntityRenderer { } - private Vector3f getColorForSlot(TileDrive drive, int slot, float partialTicks) { + private Vector3f getColorForSlot(DriveTileEntity drive, int slot, float partialTicks) { DriveSlotState state = DriveSlotState.fromCellStatus(drive.getCellStatus(slot)); if (state == DriveSlotState.EMPTY) { return null; diff --git a/src/main/java/appeng/client/render/tesr/InscriberTESR.java b/src/main/java/appeng/client/render/tesr/InscriberTESR.java index e2706ae2a..5cac15f85 100644 --- a/src/main/java/appeng/client/render/tesr/InscriberTESR.java +++ b/src/main/java/appeng/client/render/tesr/InscriberTESR.java @@ -25,13 +25,13 @@ import appeng.api.features.InscriberProcessType; import appeng.client.render.FacingToRotation; import appeng.core.AppEng; import appeng.recipes.handlers.InscriberRecipe; -import appeng.tile.misc.TileInscriber; +import appeng.tile.misc.InscriberTileEntity; /** * Renders the dynamic parts of an inscriber (the presses, the animation and the * item being smashed) */ -public final class InscriberTESR extends TileEntityRenderer { +public final class InscriberTESR extends TileEntityRenderer { private static final float ITEM_RENDER_SCALE = 1.0f / 1.2f; @@ -43,8 +43,8 @@ public final class InscriberTESR extends TileEntityRenderer { } @Override - public void render(TileInscriber tile, float partialTicks, MatrixStack ms, IRenderTypeBuffer buffers, - int combinedLight, int combinedOverlay) { + public void render(InscriberTileEntity tile, float partialTicks, MatrixStack ms, IRenderTypeBuffer buffers, + int combinedLight, int combinedOverlay) { // render inscriber diff --git a/src/main/java/appeng/client/render/tesr/ModularTESR.java b/src/main/java/appeng/client/render/tesr/ModularTESR.java index 06e98af3c..34f71dd48 100644 --- a/src/main/java/appeng/client/render/tesr/ModularTESR.java +++ b/src/main/java/appeng/client/render/tesr/ModularTESR.java @@ -31,10 +31,10 @@ import net.minecraftforge.api.distmarker.OnlyIn; import appeng.client.render.FacingToRotation; import appeng.client.render.renderable.Renderable; -import appeng.tile.AEBaseTile; +import appeng.tile.AEBaseTileEntity; @OnlyIn(Dist.CLIENT) -public class ModularTESR extends TileEntityRenderer { +public class ModularTESR extends TileEntityRenderer { private final List> renderables; diff --git a/src/main/java/appeng/client/render/tesr/SkyChestTESR.java b/src/main/java/appeng/client/render/tesr/SkyChestTESR.java index 406f8a0f5..6374db6e8 100644 --- a/src/main/java/appeng/client/render/tesr/SkyChestTESR.java +++ b/src/main/java/appeng/client/render/tesr/SkyChestTESR.java @@ -35,14 +35,14 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.client.event.TextureStitchEvent; -import appeng.block.storage.BlockSkyChest; -import appeng.block.storage.BlockSkyChest.SkyChestType; +import appeng.block.storage.SkyChestBlock; +import appeng.block.storage.SkyChestBlock.SkyChestType; import appeng.core.AppEng; -import appeng.tile.storage.TileSkyChest; +import appeng.tile.storage.SkyChestTileEntity; // This is mostly a copy&paste job of the vanilla chest TESR @OnlyIn(Dist.CLIENT) -public class SkyChestTESR extends TileEntityRenderer { +public class SkyChestTESR extends TileEntityRenderer { public static final Material TEXTURE_STONE = new Material(Atlases.CHEST_ATLAS, new ResourceLocation(AppEng.MOD_ID, "models/skychest")); @@ -68,8 +68,8 @@ public class SkyChestTESR extends TileEntityRenderer { } @Override - public void render(TileSkyChest tileEntityIn, float partialTicks, MatrixStack matrixStackIn, - IRenderTypeBuffer bufferIn, int combinedLightIn, int combinedOverlayIn) { + public void render(SkyChestTileEntity tileEntityIn, float partialTicks, MatrixStack matrixStackIn, + IRenderTypeBuffer bufferIn, int combinedLightIn, int combinedOverlayIn) { matrixStackIn.push(); float f = tileEntityIn.getForward().getHorizontalAngle(); matrixStackIn.translate(0.5D, 0.5D, 0.5D); @@ -97,13 +97,13 @@ public class SkyChestTESR extends TileEntityRenderer { chestBottom.render(matrixStackIn, bufferIn, combinedLightIn, combinedOverlayIn); } - protected Material getMaterial(TileSkyChest tileEntity) { + protected Material getMaterial(SkyChestTileEntity tileEntity) { SkyChestType type = SkyChestType.BLOCK; if (tileEntity.getWorld() != null) { Block blockType = tileEntity.getBlockState().getBlock(); - if (blockType instanceof BlockSkyChest) { - type = ((BlockSkyChest) blockType).type; + if (blockType instanceof SkyChestBlock) { + type = ((SkyChestBlock) blockType).type; } } diff --git a/src/main/java/appeng/client/render/tesr/SkyCompassTESR.java b/src/main/java/appeng/client/render/tesr/SkyCompassTESR.java index eb4bc4de0..666186051 100644 --- a/src/main/java/appeng/client/render/tesr/SkyCompassTESR.java +++ b/src/main/java/appeng/client/render/tesr/SkyCompassTESR.java @@ -36,10 +36,10 @@ import net.minecraftforge.client.model.data.ModelDataMap; import appeng.client.render.FacingToRotation; import appeng.client.render.model.SkyCompassBakedModel; -import appeng.tile.misc.TileSkyCompass; +import appeng.tile.misc.SkyCompassTileEntity; @OnlyIn(Dist.CLIENT) -public class SkyCompassTESR extends TileEntityRenderer { +public class SkyCompassTESR extends TileEntityRenderer { private static BlockRendererDispatcher blockRenderer; @@ -48,8 +48,8 @@ public class SkyCompassTESR extends TileEntityRenderer { } @Override - public void render(TileSkyCompass te, float partialTicks, MatrixStack ms, IRenderTypeBuffer buffers, - int combinedLightIn, int combinedOverlayIn) { + public void render(SkyCompassTileEntity te, float partialTicks, MatrixStack ms, IRenderTypeBuffer buffers, + int combinedLightIn, int combinedOverlayIn) { if (blockRenderer == null) { blockRenderer = Minecraft.getInstance().getBlockRendererDispatcher(); @@ -86,7 +86,7 @@ public class SkyCompassTESR extends TileEntityRenderer { } - private static float getRotation(TileSkyCompass skyCompass) { + private static float getRotation(SkyCompassTileEntity skyCompass) { float rotation; if (skyCompass.getForward() == Direction.UP || skyCompass.getForward() == Direction.DOWN) { diff --git a/src/main/java/appeng/container/AEBaseContainer.java b/src/main/java/appeng/container/AEBaseContainer.java index d91857eea..9fed47136 100644 --- a/src/main/java/appeng/container/AEBaseContainer.java +++ b/src/main/java/appeng/container/AEBaseContainer.java @@ -56,18 +56,18 @@ import appeng.client.me.SlotME; import appeng.container.guisync.GuiSync; import appeng.container.guisync.SyncData; import appeng.container.slot.AppEngSlot; -import appeng.container.slot.SlotCraftingMatrix; -import appeng.container.slot.SlotCraftingTerm; -import appeng.container.slot.SlotDisabled; -import appeng.container.slot.SlotFake; -import appeng.container.slot.SlotInaccessible; -import appeng.container.slot.SlotPlayerHotBar; -import appeng.container.slot.SlotPlayerInv; +import appeng.container.slot.CraftingMatrixSlot; +import appeng.container.slot.CraftingTermSlot; +import appeng.container.slot.DisabledSlot; +import appeng.container.slot.FakeSlot; +import appeng.container.slot.InaccessibleSlot; +import appeng.container.slot.PlayerHotBarSlot; +import appeng.container.slot.PlayerInvSlot; import appeng.core.AELog; import appeng.core.sync.network.NetworkHandler; -import appeng.core.sync.packets.PacketInventoryAction; -import appeng.core.sync.packets.PacketTargetItemStack; -import appeng.core.sync.packets.PacketValueConfig; +import appeng.core.sync.packets.InventoryActionPacket; +import appeng.core.sync.packets.TargetItemStackPacket; +import appeng.core.sync.packets.ConfigValuePacket; import appeng.helpers.ICustomNameObject; import appeng.helpers.InventoryAction; import appeng.me.helpers.PlayerSource; @@ -97,12 +97,12 @@ public abstract class AEBaseContainer extends Container { private List playerInventorySlots = null; public AEBaseContainer(ContainerType containerType, int id, final PlayerInventory ip, final TileEntity myTile, - final IPart myPart) { + final IPart myPart) { this(containerType, id, ip, myTile, myPart, null); } public AEBaseContainer(ContainerType containerType, int id, final PlayerInventory ip, final TileEntity myTile, - final IPart myPart, final IGuiItemObject gio) { + final IPart myPart, final IGuiItemObject gio) { super(containerType, id); this.invPlayer = ip; this.tileEntity = myTile; @@ -171,7 +171,7 @@ public abstract class AEBaseContainer extends Container { return; } - NetworkHandler.instance().sendToServer(new PacketTargetItemStack((AEItemStack) stack)); + NetworkHandler.instance().sendToServer(new TargetItemStackPacket((AEItemStack) stack)); } this.clientRequestedTargetItem = stack == null ? null : stack.copy(); @@ -268,9 +268,9 @@ public abstract class AEBaseContainer extends Container { for (int i = 0; i < 3; i++) { for (int j = 0; j < 9; j++) { if (this.locked.contains(j + i * 9 + 9)) { - this.addSlot(new SlotDisabled(ih, j + i * 9 + 9, 8 + j * 18 + offsetX, offsetY + i * 18)); + this.addSlot(new DisabledSlot(ih, j + i * 9 + 9, 8 + j * 18 + offsetX, offsetY + i * 18)); } else { - this.addSlot(new SlotPlayerInv(ih, j + i * 9 + 9, 8 + j * 18 + offsetX, offsetY + i * 18)); + this.addSlot(new PlayerInvSlot(ih, j + i * 9 + 9, 8 + j * 18 + offsetX, offsetY + i * 18)); } } } @@ -278,9 +278,9 @@ public abstract class AEBaseContainer extends Container { // bind player hotbar for (int i = 0; i < 9; i++) { if (this.locked.contains(i)) { - this.addSlot(new SlotDisabled(ih, i, 8 + i * 18 + offsetX, 58 + offsetY)); + this.addSlot(new DisabledSlot(ih, i, 8 + i * 18 + offsetX, 58 + offsetY)); } else { - this.addSlot(new SlotPlayerHotBar(ih, i, 8 + i * 18 + offsetX, 58 + offsetY)); + this.addSlot(new PlayerHotBarSlot(ih, i, 8 + i * 18 + offsetX, 58 + offsetY)); } } } @@ -325,7 +325,7 @@ public abstract class AEBaseContainer extends Container { final AppEngSlot clickSlot = (AppEngSlot) this.inventorySlots.get(idx); // require AE SLots! - if (clickSlot instanceof SlotDisabled || clickSlot instanceof SlotInaccessible) { + if (clickSlot instanceof DisabledSlot || clickSlot instanceof InaccessibleSlot) { return ItemStack.EMPTY; } if (clickSlot != null && clickSlot.getHasStack()) { @@ -348,7 +348,7 @@ public abstract class AEBaseContainer extends Container { for (final Object inventorySlot : this.inventorySlots) { final AppEngSlot cs = (AppEngSlot) inventorySlot; - if (!(cs.isPlayerSide()) && !(cs instanceof SlotFake) && !(cs instanceof SlotCraftingMatrix)) { + if (!(cs.isPlayerSide()) && !(cs instanceof FakeSlot) && !(cs instanceof CraftingMatrixSlot)) { if (cs.isItemValid(tis)) { selectedSlots.add(cs); } @@ -362,7 +362,7 @@ public abstract class AEBaseContainer extends Container { for (final Object inventorySlot : this.inventorySlots) { final AppEngSlot cs = (AppEngSlot) inventorySlot; - if ((cs.isPlayerSide()) && !(cs instanceof SlotFake) && !(cs instanceof SlotCraftingMatrix)) { + if ((cs.isPlayerSide()) && !(cs instanceof FakeSlot) && !(cs instanceof CraftingMatrixSlot)) { if (cs.isItemValid(tis)) { selectedSlots.add(cs); } @@ -380,7 +380,7 @@ public abstract class AEBaseContainer extends Container { final AppEngSlot cs = (AppEngSlot) inventorySlot; final ItemStack destination = cs.getStack(); - if (!(cs.isPlayerSide()) && cs instanceof SlotFake) { + if (!(cs.isPlayerSide()) && cs instanceof FakeSlot) { if (Platform.itemComparisons().isSameItem(destination, tis)) { break; } else if (destination.isEmpty()) { @@ -396,7 +396,7 @@ public abstract class AEBaseContainer extends Container { if (!tis.isEmpty()) { // find partials.. for (final Slot d : selectedSlots) { - if (d instanceof SlotDisabled || d instanceof SlotME) { + if (d instanceof DisabledSlot || d instanceof SlotME) { continue; } @@ -440,7 +440,7 @@ public abstract class AEBaseContainer extends Container { // FIXME figure out whats the difference between this and the one above ?! // any match.. for (final Slot d : selectedSlots) { - if (d instanceof SlotDisabled || d instanceof SlotME) { + if (d instanceof DisabledSlot || d instanceof SlotME) { continue; } @@ -540,18 +540,18 @@ public abstract class AEBaseContainer extends Container { if (slot >= 0 && slot < this.inventorySlots.size()) { final Slot s = this.getSlot(slot); - if (s instanceof SlotCraftingTerm) { + if (s instanceof CraftingTermSlot) { switch (action) { case CRAFT_SHIFT: case CRAFT_ITEM: case CRAFT_STACK: - ((SlotCraftingTerm) s).doClick(action, player); + ((CraftingTermSlot) s).doClick(action, player); this.updateHeld(player); default: } } - if (s instanceof SlotFake) { + if (s instanceof FakeSlot) { final ItemStack hand = player.inventory.getItemStack(); switch (action) { @@ -606,7 +606,7 @@ public abstract class AEBaseContainer extends Container { final List from = new ArrayList<>(); for (final Object j : this.inventorySlots) { - if (j instanceof Slot && j.getClass() == s.getClass() && !(j instanceof SlotCraftingTerm)) { + if (j instanceof Slot && j.getClass() == s.getClass() && !(j instanceof CraftingTermSlot)) { from.add((Slot) j); } } @@ -841,7 +841,7 @@ public abstract class AEBaseContainer extends Container { protected void updateHeld(final ServerPlayerEntity p) { if (Platform.isServer()) { - NetworkHandler.instance().sendTo(new PacketInventoryAction(InventoryAction.UPDATE_HAND, 0, + NetworkHandler.instance().sendTo(new InventoryActionPacket(InventoryAction.UPDATE_HAND, 0, AEItemStack.fromItemStack(p.inventory.getItemStack())), p); } } @@ -897,7 +897,7 @@ public abstract class AEBaseContainer extends Container { } if (this.getCustomName() != null) { - NetworkHandler.instance().sendTo(new PacketValueConfig("CustomName", this.getCustomName()), + NetworkHandler.instance().sendTo(new ConfigValuePacket("CustomName", this.getCustomName()), (ServerPlayerEntity) this.getPlayerInventory().player); } } diff --git a/src/main/java/appeng/container/guisync/SyncData.java b/src/main/java/appeng/container/guisync/SyncData.java index d90e2b0d0..1ba319a2b 100644 --- a/src/main/java/appeng/container/guisync/SyncData.java +++ b/src/main/java/appeng/container/guisync/SyncData.java @@ -30,8 +30,8 @@ import net.minecraft.util.text.ITextComponent; import appeng.container.AEBaseContainer; import appeng.core.AELog; import appeng.core.sync.network.NetworkHandler; -import appeng.core.sync.packets.PacketProgressBar; -import appeng.core.sync.packets.PacketValueConfig; +import appeng.core.sync.packets.ProgressBarPacket; +import appeng.core.sync.packets.ConfigValuePacket; /** * This class is responsible for synchronizing Container-fields from server to @@ -86,7 +86,7 @@ public class SyncData { if (val != null) { json = ITextComponent.Serializer.toJson((ITextComponent) val); } - NetworkHandler.instance().sendTo(new PacketValueConfig("SyncDat." + this.channel, json), + NetworkHandler.instance().sendTo(new ConfigValuePacket("SyncDat." + this.channel, json), (ServerPlayerEntity) o); } } @@ -98,14 +98,14 @@ public class SyncData { if (fieldType.equals(String.class)) { if (o instanceof ServerPlayerEntity) { - NetworkHandler.instance().sendTo(new PacketValueConfig("SyncDat." + this.channel, (String) val), + NetworkHandler.instance().sendTo(new ConfigValuePacket("SyncDat." + this.channel, (String) val), (ServerPlayerEntity) o); } } else if (this.fieldType.isEnum()) { o.sendWindowProperty(this.source, this.channel, ((Enum) val).ordinal()); } else if (val instanceof Long) { if (o instanceof ServerPlayerEntity) { - NetworkHandler.instance().sendTo(new PacketProgressBar(this.channel, (Long) val), + NetworkHandler.instance().sendTo(new ProgressBarPacket(this.channel, (Long) val), (ServerPlayerEntity) o); } } else if (fieldType.equals(Boolean.class) || fieldType.equals(boolean.class)) { diff --git a/src/main/java/appeng/container/implementations/ContainerCellWorkbench.java b/src/main/java/appeng/container/implementations/CellWorkbenchContainer.java similarity index 88% rename from src/main/java/appeng/container/implementations/ContainerCellWorkbench.java rename to src/main/java/appeng/container/implementations/CellWorkbenchContainer.java index ab02cca8c..00626eb51 100644 --- a/src/main/java/appeng/container/implementations/ContainerCellWorkbench.java +++ b/src/main/java/appeng/container/implementations/CellWorkbenchContainer.java @@ -44,35 +44,35 @@ import appeng.api.storage.data.IAEStack; import appeng.api.storage.data.IItemList; import appeng.container.ContainerLocator; import appeng.container.guisync.GuiSync; -import appeng.container.slot.OptionalSlotRestrictedInput; -import appeng.container.slot.SlotFakeTypeOnly; -import appeng.container.slot.SlotRestrictedInput; -import appeng.tile.misc.TileCellWorkbench; +import appeng.container.slot.OptionalRestrictedInputSlot; +import appeng.container.slot.FakeTypeOnlySlot; +import appeng.container.slot.RestrictedInputSlot; +import appeng.tile.misc.CellWorkbenchTileEntity; import appeng.util.EnumCycler; import appeng.util.Platform; import appeng.util.helpers.ItemHandlerUtil; import appeng.util.inv.WrapperSupplierItemHandler; import appeng.util.iterators.NullIterator; -public class ContainerCellWorkbench extends ContainerUpgradeable { +public class CellWorkbenchContainer extends UpgradeableContainer { - public static ContainerType TYPE; + public static ContainerType TYPE; - private static final ContainerHelper helper = new ContainerHelper<>( - ContainerCellWorkbench::new, TileCellWorkbench.class); + private static final ContainerHelper helper = new ContainerHelper<>( + CellWorkbenchContainer::new, CellWorkbenchTileEntity.class); - private final TileCellWorkbench workBench; + private final CellWorkbenchTileEntity workBench; @GuiSync(2) public CopyMode copyMode = CopyMode.CLEAR_ON_REMOVE; private ItemStack prevStack = ItemStack.EMPTY; private int lastUpgrades = 0; - public ContainerCellWorkbench(int id, final PlayerInventory ip, final TileCellWorkbench te) { + public CellWorkbenchContainer(int id, final PlayerInventory ip, final CellWorkbenchTileEntity te) { super(TYPE, id, ip, te); this.workBench = te; } - public static ContainerCellWorkbench fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { + public static CellWorkbenchContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { return helper.fromNetwork(windowId, inv, buf); } @@ -103,7 +103,7 @@ public class ContainerCellWorkbench extends ContainerUpgradeable { @Override protected void setupConfig() { final IItemHandler cell = this.getUpgradeable().getInventoryByName("cell"); - this.addSlot(new SlotRestrictedInput(SlotRestrictedInput.PlacableItemType.WORKBENCH_CELL, cell, 0, 152, 8, + this.addSlot(new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.WORKBENCH_CELL, cell, 0, 152, 8, this.getPlayerInv())); final IItemHandler inv = this.getUpgradeable().getInventoryByName("config"); @@ -116,7 +116,7 @@ public class ContainerCellWorkbench extends ContainerUpgradeable { final int x = 8; for (int w = 0; w < 7; w++) { for (int z = 0; z < 9; z++) { - this.addSlot(new SlotFakeTypeOnly(inv, offset, x + z * 18, y + w * 18)); + this.addSlot(new FakeTypeOnlySlot(inv, offset, x + z * 18, y + w * 18)); offset++; } } @@ -124,7 +124,7 @@ public class ContainerCellWorkbench extends ContainerUpgradeable { for (int zz = 0; zz < 3; zz++) { for (int z = 0; z < 8; z++) { final int iSLot = zz * 8 + z; - this.addSlot(new OptionalSlotRestrictedInput(SlotRestrictedInput.PlacableItemType.UPGRADES, + this.addSlot(new OptionalRestrictedInputSlot(RestrictedInputSlot.PlacableItemType.UPGRADES, upgradeInventory, this, iSLot, 187 + zz * 18, 8 + 18 * z, iSLot, this.getPlayerInventory())); } } @@ -157,8 +157,8 @@ public class ContainerCellWorkbench extends ContainerUpgradeable { if (this.prevStack != is) { // if the bars changed an item was probably made, so just send shit! for (final Slot s : this.inventorySlots) { - if (s instanceof OptionalSlotRestrictedInput) { - final OptionalSlotRestrictedInput sri = (OptionalSlotRestrictedInput) s; + if (s instanceof OptionalRestrictedInputSlot) { + final OptionalRestrictedInputSlot sri = (OptionalRestrictedInputSlot) s; listener.sendSlotContents(this, sri.slotNumber, sri.getStack()); } } diff --git a/src/main/java/appeng/container/implementations/ContainerChest.java b/src/main/java/appeng/container/implementations/ChestContainer.java similarity index 73% rename from src/main/java/appeng/container/implementations/ContainerChest.java rename to src/main/java/appeng/container/implementations/ChestContainer.java index 35a689d01..ee640a364 100644 --- a/src/main/java/appeng/container/implementations/ContainerChest.java +++ b/src/main/java/appeng/container/implementations/ChestContainer.java @@ -26,26 +26,26 @@ import net.minecraft.network.PacketBuffer; import appeng.api.config.SecurityPermissions; import appeng.container.AEBaseContainer; import appeng.container.ContainerLocator; -import appeng.container.slot.SlotRestrictedInput; -import appeng.tile.storage.TileChest; +import appeng.container.slot.RestrictedInputSlot; +import appeng.tile.storage.ChestTileEntity; -public class ContainerChest extends AEBaseContainer { +public class ChestContainer extends AEBaseContainer { - public static ContainerType TYPE; + public static ContainerType TYPE; - private static final ContainerHelper helper = new ContainerHelper<>(ContainerChest::new, - TileChest.class, SecurityPermissions.BUILD); + private static final ContainerHelper helper = new ContainerHelper<>(ChestContainer::new, + ChestTileEntity.class, SecurityPermissions.BUILD); - public ContainerChest(int id, final PlayerInventory ip, final TileChest chest) { + public ChestContainer(int id, final PlayerInventory ip, final ChestTileEntity chest) { super(TYPE, id, ip, chest, null); - this.addSlot(new SlotRestrictedInput(SlotRestrictedInput.PlacableItemType.STORAGE_CELLS, + this.addSlot(new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.STORAGE_CELLS, chest.getInternalInventory(), 1, 80, 37, this.getPlayerInventory())); this.bindPlayerInventory(ip, 0, 166 - /* height of player inventory */82); } - public static ContainerChest fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { + public static ChestContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { return helper.fromNetwork(windowId, inv, buf); } diff --git a/src/main/java/appeng/container/implementations/ContainerCondenser.java b/src/main/java/appeng/container/implementations/CondenserContainer.java similarity index 79% rename from src/main/java/appeng/container/implementations/ContainerCondenser.java rename to src/main/java/appeng/container/implementations/CondenserContainer.java index f4c910eb3..b2e71c6a8 100644 --- a/src/main/java/appeng/container/implementations/ContainerCondenser.java +++ b/src/main/java/appeng/container/implementations/CondenserContainer.java @@ -30,19 +30,19 @@ import appeng.container.AEBaseContainer; import appeng.container.ContainerLocator; import appeng.container.guisync.GuiSync; import appeng.container.interfaces.IProgressProvider; -import appeng.container.slot.SlotOutput; -import appeng.container.slot.SlotRestrictedInput; -import appeng.tile.misc.TileCondenser; +import appeng.container.slot.OutputSlot; +import appeng.container.slot.RestrictedInputSlot; +import appeng.tile.misc.CondenserTileEntity; import appeng.util.Platform; -public class ContainerCondenser extends AEBaseContainer implements IProgressProvider { +public class CondenserContainer extends AEBaseContainer implements IProgressProvider { - public static ContainerType TYPE; + public static ContainerType TYPE; - private static final ContainerHelper helper = new ContainerHelper<>( - ContainerCondenser::new, TileCondenser.class); + private static final ContainerHelper helper = new ContainerHelper<>( + CondenserContainer::new, CondenserTileEntity.class); - private final TileCondenser condenser; + private final CondenserTileEntity condenser; @GuiSync(0) public long requiredEnergy = 0; @GuiSync(1) @@ -50,22 +50,22 @@ public class ContainerCondenser extends AEBaseContainer implements IProgressProv @GuiSync(2) public CondenserOutput output = CondenserOutput.TRASH; - public ContainerCondenser(int id, final PlayerInventory ip, final TileCondenser condenser) { + public CondenserContainer(int id, final PlayerInventory ip, final CondenserTileEntity condenser) { super(TYPE, id, ip, condenser, null); this.condenser = condenser; IItemHandler inv = condenser.getInternalInventory(); - this.addSlot(new SlotRestrictedInput(SlotRestrictedInput.PlacableItemType.TRASH, inv, 0, 51, 52, ip)); - this.addSlot(new SlotOutput(inv, 1, 105, 52, -1)); + this.addSlot(new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.TRASH, inv, 0, 51, 52, ip)); + this.addSlot(new OutputSlot(inv, 1, 105, 52, -1)); this.addSlot( - (new SlotRestrictedInput(SlotRestrictedInput.PlacableItemType.STORAGE_COMPONENT, inv, 2, 101, 26, ip)) + (new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.STORAGE_COMPONENT, inv, 2, 101, 26, ip)) .setStackLimit(1)); this.bindPlayerInventory(ip, 0, 197 - /* height of player inventory */82); } - public static ContainerCondenser fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { + public static CondenserContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { return helper.fromNetwork(windowId, inv, buf); } diff --git a/src/main/java/appeng/container/implementations/ContainerCraftAmount.java b/src/main/java/appeng/container/implementations/CraftAmountContainer.java similarity index 85% rename from src/main/java/appeng/container/implementations/ContainerCraftAmount.java rename to src/main/java/appeng/container/implementations/CraftAmountContainer.java index 2615e1b5b..68cd508a1 100644 --- a/src/main/java/appeng/container/implementations/ContainerCraftAmount.java +++ b/src/main/java/appeng/container/implementations/CraftAmountContainer.java @@ -35,28 +35,28 @@ import appeng.api.storage.ITerminalHost; import appeng.api.storage.data.IAEItemStack; import appeng.container.AEBaseContainer; import appeng.container.ContainerLocator; -import appeng.container.slot.SlotInaccessible; +import appeng.container.slot.InaccessibleSlot; import appeng.me.helpers.PlayerSource; import appeng.tile.inventory.AppEngInternalInventory; -public class ContainerCraftAmount extends AEBaseContainer { +public class CraftAmountContainer extends AEBaseContainer { - public static ContainerType TYPE; + public static ContainerType TYPE; - private static final ContainerHelper helper = new ContainerHelper<>( - ContainerCraftAmount::new, ITerminalHost.class, SecurityPermissions.CRAFT); + private static final ContainerHelper helper = new ContainerHelper<>( + CraftAmountContainer::new, ITerminalHost.class, SecurityPermissions.CRAFT); private final Slot craftingItem; private IAEItemStack itemToCreate; - public ContainerCraftAmount(int id, PlayerInventory ip, final ITerminalHost te) { + public CraftAmountContainer(int id, PlayerInventory ip, final ITerminalHost te) { super(TYPE, id, ip, te); - this.craftingItem = new SlotInaccessible(new AppEngInternalInventory(null, 1), 0, 34, 53); + this.craftingItem = new InaccessibleSlot(new AppEngInternalInventory(null, 1), 0, 34, 53); this.addSlot(this.getCraftingItem()); } - public static ContainerCraftAmount fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { + public static CraftAmountContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { return helper.fromNetwork(windowId, inv, buf); } diff --git a/src/main/java/appeng/container/implementations/ContainerCraftConfirm.java b/src/main/java/appeng/container/implementations/CraftConfirmContainer.java similarity index 91% rename from src/main/java/appeng/container/implementations/ContainerCraftConfirm.java rename to src/main/java/appeng/container/implementations/CraftConfirmContainer.java index ebcc6f763..27ecceada 100644 --- a/src/main/java/appeng/container/implementations/ContainerCraftConfirm.java +++ b/src/main/java/appeng/container/implementations/CraftConfirmContainer.java @@ -59,22 +59,22 @@ import appeng.container.ContainerOpener; import appeng.container.guisync.GuiSync; import appeng.core.AELog; import appeng.core.sync.network.NetworkHandler; -import appeng.core.sync.packets.PacketMEInventoryUpdate; +import appeng.core.sync.packets.MEInventoryUpdatePacket; import appeng.helpers.WirelessTerminalGuiObject; import appeng.me.helpers.PlayerSource; -import appeng.parts.reporting.PartCraftingTerminal; -import appeng.parts.reporting.PartPatternTerminal; -import appeng.parts.reporting.PartTerminal; +import appeng.parts.reporting.CraftingTerminalPart; +import appeng.parts.reporting.PatternTerminalPart; +import appeng.parts.reporting.TerminalPart; import appeng.util.Platform; -public class ContainerCraftConfirm extends AEBaseContainer { +public class CraftConfirmContainer extends AEBaseContainer { - public static ContainerType TYPE; + public static ContainerType TYPE; - private static final ContainerHelper helper = new ContainerHelper<>( - ContainerCraftConfirm::new, ITerminalHost.class, SecurityPermissions.CRAFT); + private static final ContainerHelper helper = new ContainerHelper<>( + CraftConfirmContainer::new, ITerminalHost.class, SecurityPermissions.CRAFT); - public static ContainerCraftConfirm fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { + public static CraftConfirmContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { return helper.fromNetwork(windowId, inv, buf); } @@ -102,7 +102,7 @@ public class ContainerCraftConfirm extends AEBaseContainer { @GuiSync(7) public ITextComponent myName; - public ContainerCraftConfirm(int id, PlayerInventory ip, ITerminalHost te) { + public CraftConfirmContainer(int id, PlayerInventory ip, ITerminalHost te) { super(TYPE, id, ip, te); } @@ -192,9 +192,9 @@ public class ContainerCraftConfirm extends AEBaseContainer { } try { - final PacketMEInventoryUpdate a = new PacketMEInventoryUpdate((byte) 0); - final PacketMEInventoryUpdate b = new PacketMEInventoryUpdate((byte) 1); - final PacketMEInventoryUpdate c = this.result.isSimulation() ? new PacketMEInventoryUpdate((byte) 2) + final MEInventoryUpdatePacket a = new MEInventoryUpdatePacket((byte) 0); + final MEInventoryUpdatePacket b = new MEInventoryUpdatePacket((byte) 1); + final MEInventoryUpdatePacket c = this.result.isSimulation() ? new MEInventoryUpdatePacket((byte) 2) : null; final IItemList plan = AEApi.instance().storage() @@ -297,19 +297,19 @@ public class ContainerCraftConfirm extends AEBaseContainer { final IActionHost ah = this.getActionHost(); if (ah instanceof WirelessTerminalGuiObject) { - originalGui = ContainerWirelessTerm.TYPE; + originalGui = WirelessTermContainer.TYPE; } - if (ah instanceof PartTerminal) { - originalGui = ContainerMEMonitorable.TYPE; + if (ah instanceof TerminalPart) { + originalGui = MEMonitorableContainer.TYPE; } - if (ah instanceof PartCraftingTerminal) { - originalGui = ContainerCraftingTerm.TYPE; + if (ah instanceof CraftingTerminalPart) { + originalGui = CraftingTermContainer.TYPE; } - if (ah instanceof PartPatternTerminal) { - originalGui = ContainerPatternTerm.TYPE; + if (ah instanceof PatternTerminalPart) { + originalGui = PatternTermContainer.TYPE; } if (this.result != null && !this.isSimulation()) { diff --git a/src/main/java/appeng/container/implementations/ContainerCraftingCPU.java b/src/main/java/appeng/container/implementations/CraftingCPUContainer.java similarity index 87% rename from src/main/java/appeng/container/implementations/ContainerCraftingCPU.java rename to src/main/java/appeng/container/implementations/CraftingCPUContainer.java index 6ff4ed501..e6d47d3fa 100644 --- a/src/main/java/appeng/container/implementations/ContainerCraftingCPU.java +++ b/src/main/java/appeng/container/implementations/CraftingCPUContainer.java @@ -44,21 +44,21 @@ import appeng.container.AEBaseContainer; import appeng.container.ContainerLocator; import appeng.container.guisync.GuiSync; import appeng.core.sync.network.NetworkHandler; -import appeng.core.sync.packets.PacketMEInventoryUpdate; -import appeng.core.sync.packets.PacketValueConfig; +import appeng.core.sync.packets.MEInventoryUpdatePacket; +import appeng.core.sync.packets.ConfigValuePacket; import appeng.helpers.ICustomNameObject; import appeng.me.cluster.IAEMultiBlock; import appeng.me.cluster.implementations.CraftingCPUCluster; -import appeng.tile.crafting.TileCraftingTile; +import appeng.tile.crafting.CraftingTileEntity; import appeng.util.Platform; -public class ContainerCraftingCPU extends AEBaseContainer +public class CraftingCPUContainer extends AEBaseContainer implements IMEMonitorHandlerReceiver, ICustomNameObject { - public static ContainerType TYPE; + public static ContainerType TYPE; - private static final ContainerHelper helper = new ContainerHelper<>( - ContainerCraftingCPU::new, TileCraftingTile.class, SecurityPermissions.CRAFT); + private static final ContainerHelper helper = new ContainerHelper<>( + CraftingCPUContainer::new, CraftingTileEntity.class, SecurityPermissions.CRAFT); private final IItemList list = AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class) .createList(); @@ -69,11 +69,11 @@ public class ContainerCraftingCPU extends AEBaseContainer @GuiSync(0) public long eta = -1; - private ContainerCraftingCPU(int id, final PlayerInventory ip, final TileCraftingTile te) { + private CraftingCPUContainer(int id, final PlayerInventory ip, final CraftingTileEntity te) { this(TYPE, id, ip, te); } - public ContainerCraftingCPU(ContainerType containerType, int id, final PlayerInventory ip, final Object te) { + public CraftingCPUContainer(ContainerType containerType, int id, final PlayerInventory ip, final Object te) { super(containerType, id, ip, te); final IActionHost host = (IActionHost) (te instanceof IActionHost ? te : null); @@ -81,7 +81,7 @@ public class ContainerCraftingCPU extends AEBaseContainer this.setNetwork(host.getActionableNode().getGrid()); } - if (te instanceof TileCraftingTile) { + if (te instanceof CraftingTileEntity) { this.setCPU((ICraftingCPU) ((IAEMultiBlock) te).getCluster()); } @@ -90,7 +90,7 @@ public class ContainerCraftingCPU extends AEBaseContainer } } - public static ContainerCraftingCPU fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { + public static CraftingCPUContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { return helper.fromNetwork(windowId, inv, buf); } @@ -109,7 +109,7 @@ public class ContainerCraftingCPU extends AEBaseContainer for (final Object g : this.listeners) { if (g instanceof PlayerEntity) { - NetworkHandler.instance().sendTo(new PacketValueConfig("CraftingStatus", "Clear"), + NetworkHandler.instance().sendTo(new ConfigValuePacket("CraftingStatus", "Clear"), (ServerPlayerEntity) g); } } @@ -165,9 +165,9 @@ public class ContainerCraftingCPU extends AEBaseContainer this.setEstimatedTime(eta); } - final PacketMEInventoryUpdate a = new PacketMEInventoryUpdate((byte) 0); - final PacketMEInventoryUpdate b = new PacketMEInventoryUpdate((byte) 1); - final PacketMEInventoryUpdate c = new PacketMEInventoryUpdate((byte) 2); + final MEInventoryUpdatePacket a = new MEInventoryUpdatePacket((byte) 0); + final MEInventoryUpdatePacket b = new MEInventoryUpdatePacket((byte) 1); + final MEInventoryUpdatePacket c = new MEInventoryUpdatePacket((byte) 2); for (final IAEItemStack out : this.list) { a.appendItem(this.getMonitor().getItemStack(out, CraftingItemList.STORAGE)); diff --git a/src/main/java/appeng/container/implementations/ContainerCraftingStatus.java b/src/main/java/appeng/container/implementations/CraftingStatusContainer.java similarity index 92% rename from src/main/java/appeng/container/implementations/ContainerCraftingStatus.java rename to src/main/java/appeng/container/implementations/CraftingStatusContainer.java index efaed6b9c..2b5d61912 100644 --- a/src/main/java/appeng/container/implementations/ContainerCraftingStatus.java +++ b/src/main/java/appeng/container/implementations/CraftingStatusContainer.java @@ -38,14 +38,14 @@ import appeng.container.ContainerLocator; import appeng.container.guisync.GuiSync; import appeng.util.Platform; -public class ContainerCraftingStatus extends ContainerCraftingCPU { +public class CraftingStatusContainer extends CraftingCPUContainer { - public static ContainerType TYPE; + public static ContainerType TYPE; - private static final ContainerHelper helper = new ContainerHelper<>( - ContainerCraftingStatus::new, ITerminalHost.class, SecurityPermissions.CRAFT); + private static final ContainerHelper helper = new ContainerHelper<>( + CraftingStatusContainer::new, ITerminalHost.class, SecurityPermissions.CRAFT); - public static ContainerCraftingStatus fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { + public static CraftingStatusContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { return helper.fromNetwork(windowId, inv, buf); } @@ -61,7 +61,7 @@ public class ContainerCraftingStatus extends ContainerCraftingCPU { @GuiSync(7) public ITextComponent myName; - public ContainerCraftingStatus(int id, final PlayerInventory ip, final ITerminalHost te) { + public CraftingStatusContainer(int id, final PlayerInventory ip, final ITerminalHost te) { super(TYPE, id, ip, te); } diff --git a/src/main/java/appeng/container/implementations/ContainerCraftingTerm.java b/src/main/java/appeng/container/implementations/CraftingTermContainer.java similarity index 84% rename from src/main/java/appeng/container/implementations/ContainerCraftingTerm.java rename to src/main/java/appeng/container/implementations/CraftingTermContainer.java index 61e69836b..d6b17caf1 100644 --- a/src/main/java/appeng/container/implementations/ContainerCraftingTerm.java +++ b/src/main/java/appeng/container/implementations/CraftingTermContainer.java @@ -35,24 +35,24 @@ import appeng.api.config.SecurityPermissions; import appeng.api.storage.ITerminalHost; import appeng.container.ContainerLocator; import appeng.container.ContainerNull; -import appeng.container.slot.SlotCraftingMatrix; -import appeng.container.slot.SlotCraftingTerm; +import appeng.container.slot.CraftingMatrixSlot; +import appeng.container.slot.CraftingTermSlot; import appeng.helpers.IContainerCraftingPacket; -import appeng.parts.reporting.PartCraftingTerminal; +import appeng.parts.reporting.CraftingTerminalPart; import appeng.tile.inventory.AppEngInternalInventory; import appeng.util.inv.IAEAppEngInventory; import appeng.util.inv.InvOperation; import appeng.util.inv.WrapperInvItemHandler; -public class ContainerCraftingTerm extends ContainerMEMonitorable +public class CraftingTermContainer extends MEMonitorableContainer implements IAEAppEngInventory, IContainerCraftingPacket { - public static ContainerType TYPE; + public static ContainerType TYPE; - private static final ContainerHelper helper = new ContainerHelper<>( - ContainerCraftingTerm::new, ITerminalHost.class, SecurityPermissions.CRAFT); + private static final ContainerHelper helper = new ContainerHelper<>( + CraftingTermContainer::new, ITerminalHost.class, SecurityPermissions.CRAFT); - public static ContainerCraftingTerm fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { + public static CraftingTermContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { return helper.fromNetwork(windowId, inv, buf); } @@ -60,26 +60,26 @@ public class ContainerCraftingTerm extends ContainerMEMonitorable return helper.open(player, locator); } - private final PartCraftingTerminal ct; + private final CraftingTerminalPart ct; private final AppEngInternalInventory output = new AppEngInternalInventory(this, 1); - private final SlotCraftingMatrix[] craftingSlots = new SlotCraftingMatrix[9]; - private final SlotCraftingTerm outputSlot; + private final CraftingMatrixSlot[] craftingSlots = new CraftingMatrixSlot[9]; + private final CraftingTermSlot outputSlot; private IRecipe currentRecipe; - public ContainerCraftingTerm(int id, final PlayerInventory ip, final ITerminalHost monitorable) { + public CraftingTermContainer(int id, final PlayerInventory ip, final ITerminalHost monitorable) { super(TYPE, id, ip, monitorable, false); - this.ct = (PartCraftingTerminal) monitorable; + this.ct = (CraftingTerminalPart) monitorable; final IItemHandler crafting = this.ct.getInventoryByName("crafting"); for (int y = 0; y < 3; y++) { for (int x = 0; x < 3; x++) { - this.addSlot(this.craftingSlots[x + y * 3] = new SlotCraftingMatrix(this, crafting, x + y * 3, + this.addSlot(this.craftingSlots[x + y * 3] = new CraftingMatrixSlot(this, crafting, x + y * 3, 37 + x * 18, -72 + y * 18)); } } - this.addSlot(this.outputSlot = new SlotCraftingTerm(this.getPlayerInv().player, this.getActionSource(), + this.addSlot(this.outputSlot = new CraftingTermSlot(this.getPlayerInv().player, this.getActionSource(), this.getPowerSource(), monitorable, crafting, crafting, this.output, 131, -72 + 18, this)); this.bindPlayerInventory(ip, 0, 0); diff --git a/src/main/java/appeng/container/implementations/ContainerDrive.java b/src/main/java/appeng/container/implementations/DriveContainer.java similarity index 73% rename from src/main/java/appeng/container/implementations/ContainerDrive.java rename to src/main/java/appeng/container/implementations/DriveContainer.java index 5e855e18e..9f0649d39 100644 --- a/src/main/java/appeng/container/implementations/ContainerDrive.java +++ b/src/main/java/appeng/container/implementations/DriveContainer.java @@ -25,17 +25,17 @@ import net.minecraft.network.PacketBuffer; import appeng.container.AEBaseContainer; import appeng.container.ContainerLocator; -import appeng.container.slot.SlotRestrictedInput; -import appeng.tile.storage.TileDrive; +import appeng.container.slot.RestrictedInputSlot; +import appeng.tile.storage.DriveTileEntity; -public class ContainerDrive extends AEBaseContainer { +public class DriveContainer extends AEBaseContainer { - public static ContainerType TYPE; + public static ContainerType TYPE; - private static final ContainerHelper helper = new ContainerHelper<>(ContainerDrive::new, - TileDrive.class); + private static final ContainerHelper helper = new ContainerHelper<>(DriveContainer::new, + DriveTileEntity.class); - public static ContainerDrive fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { + public static DriveContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { return helper.fromNetwork(windowId, inv, buf); } @@ -43,12 +43,12 @@ public class ContainerDrive extends AEBaseContainer { return helper.open(player, locator); } - public ContainerDrive(int id, final PlayerInventory ip, final TileDrive drive) { + public DriveContainer(int id, final PlayerInventory ip, final DriveTileEntity drive) { super(TYPE, id, ip, drive, null); for (int y = 0; y < 5; y++) { for (int x = 0; x < 2; x++) { - this.addSlot(new SlotRestrictedInput(SlotRestrictedInput.PlacableItemType.STORAGE_CELLS, + this.addSlot(new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.STORAGE_CELLS, drive.getInternalInventory(), x + y * 2, 71 + x * 18, 14 + y * 18, this.getPlayerInventory())); } } diff --git a/src/main/java/appeng/container/implementations/ContainerFormationPlane.java b/src/main/java/appeng/container/implementations/FormationPlaneContainer.java similarity index 77% rename from src/main/java/appeng/container/implementations/ContainerFormationPlane.java rename to src/main/java/appeng/container/implementations/FormationPlaneContainer.java index e0d6dbda3..1e7b0a10b 100644 --- a/src/main/java/appeng/container/implementations/ContainerFormationPlane.java +++ b/src/main/java/appeng/container/implementations/FormationPlaneContainer.java @@ -31,20 +31,20 @@ import appeng.api.config.Upgrades; import appeng.api.config.YesNo; import appeng.container.ContainerLocator; import appeng.container.guisync.GuiSync; -import appeng.container.slot.OptionalSlotFakeTypeOnly; -import appeng.container.slot.SlotFakeTypeOnly; -import appeng.container.slot.SlotRestrictedInput; -import appeng.parts.automation.PartFormationPlane; +import appeng.container.slot.OptionalTypeOnlyFakeSlot; +import appeng.container.slot.FakeTypeOnlySlot; +import appeng.container.slot.RestrictedInputSlot; +import appeng.parts.automation.FormationPlanePart; import appeng.util.Platform; -public class ContainerFormationPlane extends ContainerUpgradeable { +public class FormationPlaneContainer extends UpgradeableContainer { - public static ContainerType TYPE; + public static ContainerType TYPE; - private static final ContainerHelper helper = new ContainerHelper<>( - ContainerFormationPlane::new, PartFormationPlane.class, SecurityPermissions.BUILD); + private static final ContainerHelper helper = new ContainerHelper<>( + FormationPlaneContainer::new, FormationPlanePart.class, SecurityPermissions.BUILD); - public static ContainerFormationPlane fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { + public static FormationPlaneContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { return helper.fromNetwork(windowId, inv, buf); } @@ -55,7 +55,7 @@ public class ContainerFormationPlane extends ContainerUpgradeable { @GuiSync(6) public YesNo placeMode; - public ContainerFormationPlane(int id, final PlayerInventory ip, final PartFormationPlane te) { + public FormationPlaneContainer(int id, final PlayerInventory ip, final FormationPlanePart te) { super(TYPE, id, ip, te); } @@ -73,23 +73,23 @@ public class ContainerFormationPlane extends ContainerUpgradeable { for (int y = 0; y < 7; y++) { for (int x = 0; x < 9; x++) { if (y < 2) { - this.addSlot(new SlotFakeTypeOnly(config, y * 9 + x, xo + x * 18, yo + y * 18)); + this.addSlot(new FakeTypeOnlySlot(config, y * 9 + x, xo + x * 18, yo + y * 18)); } else { - this.addSlot(new OptionalSlotFakeTypeOnly(config, this, y * 9 + x, xo, yo, x, y, y - 2)); + this.addSlot(new OptionalTypeOnlyFakeSlot(config, this, y * 9 + x, xo, yo, x, y, y - 2)); } } } final IItemHandler upgrades = this.getUpgradeable().getInventoryByName("upgrades"); - this.addSlot((new SlotRestrictedInput(SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 0, 187, 8, + this.addSlot((new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.UPGRADES, upgrades, 0, 187, 8, this.getPlayerInventory())).setNotDraggable()); - this.addSlot((new SlotRestrictedInput(SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 1, 187, 8 + 18, + this.addSlot((new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.UPGRADES, upgrades, 1, 187, 8 + 18, this.getPlayerInventory())).setNotDraggable()); - this.addSlot((new SlotRestrictedInput(SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 2, 187, + this.addSlot((new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.UPGRADES, upgrades, 2, 187, 8 + 18 * 2, this.getPlayerInventory())).setNotDraggable()); - this.addSlot((new SlotRestrictedInput(SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 3, 187, + this.addSlot((new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.UPGRADES, upgrades, 3, 187, 8 + 18 * 3, this.getPlayerInventory())).setNotDraggable()); - this.addSlot((new SlotRestrictedInput(SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 4, 187, + this.addSlot((new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.UPGRADES, upgrades, 4, 187, 8 + 18 * 4, this.getPlayerInventory())).setNotDraggable()); } diff --git a/src/main/java/appeng/container/implementations/ContainerGrinder.java b/src/main/java/appeng/container/implementations/GrinderContainer.java similarity index 64% rename from src/main/java/appeng/container/implementations/ContainerGrinder.java rename to src/main/java/appeng/container/implementations/GrinderContainer.java index afbc8b58e..49c97bda6 100644 --- a/src/main/java/appeng/container/implementations/ContainerGrinder.java +++ b/src/main/java/appeng/container/implementations/GrinderContainer.java @@ -26,19 +26,19 @@ import net.minecraftforge.items.IItemHandler; import appeng.container.AEBaseContainer; import appeng.container.ContainerLocator; -import appeng.container.slot.SlotInaccessible; -import appeng.container.slot.SlotOutput; -import appeng.container.slot.SlotRestrictedInput; -import appeng.tile.grindstone.TileGrinder; +import appeng.container.slot.InaccessibleSlot; +import appeng.container.slot.OutputSlot; +import appeng.container.slot.RestrictedInputSlot; +import appeng.tile.grindstone.GrinderTileEntity; -public class ContainerGrinder extends AEBaseContainer { +public class GrinderContainer extends AEBaseContainer { - public static ContainerType TYPE; + public static ContainerType TYPE; - private static final ContainerHelper helper = new ContainerHelper<>( - ContainerGrinder::new, TileGrinder.class); + private static final ContainerHelper helper = new ContainerHelper<>( + GrinderContainer::new, GrinderTileEntity.class); - public static ContainerGrinder fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { + public static GrinderContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { return helper.fromNetwork(windowId, inv, buf); } @@ -46,23 +46,23 @@ public class ContainerGrinder extends AEBaseContainer { return helper.open(player, locator); } - public ContainerGrinder(int id, final PlayerInventory ip, final TileGrinder grinder) { + public GrinderContainer(int id, final PlayerInventory ip, final GrinderTileEntity grinder) { super(TYPE, id, ip, grinder, null); IItemHandler inv = grinder.getInternalInventory(); - this.addSlot(new SlotRestrictedInput(SlotRestrictedInput.PlacableItemType.ORE, inv, 0, 12, 17, + this.addSlot(new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.ORE, inv, 0, 12, 17, this.getPlayerInventory())); - this.addSlot(new SlotRestrictedInput(SlotRestrictedInput.PlacableItemType.ORE, inv, 1, 12 + 18, 17, + this.addSlot(new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.ORE, inv, 1, 12 + 18, 17, this.getPlayerInventory())); - this.addSlot(new SlotRestrictedInput(SlotRestrictedInput.PlacableItemType.ORE, inv, 2, 12 + 36, 17, + this.addSlot(new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.ORE, inv, 2, 12 + 36, 17, this.getPlayerInventory())); - this.addSlot(new SlotInaccessible(inv, 6, 80, 40)); + this.addSlot(new InaccessibleSlot(inv, 6, 80, 40)); - this.addSlot(new SlotOutput(inv, 3, 112, 63, 2 * 16 + 15)); - this.addSlot(new SlotOutput(inv, 4, 112 + 18, 63, 2 * 16 + 15)); - this.addSlot(new SlotOutput(inv, 5, 112 + 36, 63, 2 * 16 + 15)); + this.addSlot(new OutputSlot(inv, 3, 112, 63, 2 * 16 + 15)); + this.addSlot(new OutputSlot(inv, 4, 112 + 18, 63, 2 * 16 + 15)); + this.addSlot(new OutputSlot(inv, 5, 112 + 36, 63, 2 * 16 + 15)); this.bindPlayerInventory(ip, 0, 176 - /* height of player inventory */82); } diff --git a/src/main/java/appeng/container/implementations/ContainerIOPort.java b/src/main/java/appeng/container/implementations/IOPortContainer.java similarity index 79% rename from src/main/java/appeng/container/implementations/ContainerIOPort.java rename to src/main/java/appeng/container/implementations/IOPortContainer.java index 233528fa7..e06699f45 100644 --- a/src/main/java/appeng/container/implementations/ContainerIOPort.java +++ b/src/main/java/appeng/container/implementations/IOPortContainer.java @@ -31,19 +31,19 @@ import appeng.api.config.SecurityPermissions; import appeng.api.config.Settings; import appeng.container.ContainerLocator; import appeng.container.guisync.GuiSync; -import appeng.container.slot.SlotOutput; -import appeng.container.slot.SlotRestrictedInput; -import appeng.tile.storage.TileIOPort; +import appeng.container.slot.OutputSlot; +import appeng.container.slot.RestrictedInputSlot; +import appeng.tile.storage.IOPortTileEntity; import appeng.util.Platform; -public class ContainerIOPort extends ContainerUpgradeable { +public class IOPortContainer extends UpgradeableContainer { - public static ContainerType TYPE; + public static ContainerType TYPE; - private static final ContainerHelper helper = new ContainerHelper<>( - ContainerIOPort::new, TileIOPort.class, SecurityPermissions.BUILD); + private static final ContainerHelper helper = new ContainerHelper<>( + IOPortContainer::new, IOPortTileEntity.class, SecurityPermissions.BUILD); - public static ContainerIOPort fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { + public static IOPortContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { return helper.fromNetwork(windowId, inv, buf); } @@ -56,7 +56,7 @@ public class ContainerIOPort extends ContainerUpgradeable { @GuiSync(3) public OperationMode opMode = OperationMode.EMPTY; - public ContainerIOPort(int id, final PlayerInventory ip, final TileIOPort te) { + public IOPortContainer(int id, final PlayerInventory ip, final IOPortTileEntity te) { super(TYPE, id, ip, te); } @@ -74,7 +74,7 @@ public class ContainerIOPort extends ContainerUpgradeable { for (int y = 0; y < 3; y++) { for (int x = 0; x < 2; x++) { - this.addSlot(new SlotRestrictedInput(SlotRestrictedInput.PlacableItemType.STORAGE_CELLS, cells, + this.addSlot(new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.STORAGE_CELLS, cells, x + y * 2, offX + x * 18, offY + y * 18, this.getPlayerInventory())); } } @@ -83,17 +83,17 @@ public class ContainerIOPort extends ContainerUpgradeable { offY = 17; for (int y = 0; y < 3; y++) { for (int x = 0; x < 2; x++) { - this.addSlot(new SlotOutput(cells, 6 + x + y * 2, offX + x * 18, offY + y * 18, - SlotRestrictedInput.PlacableItemType.STORAGE_CELLS.IIcon)); + this.addSlot(new OutputSlot(cells, 6 + x + y * 2, offX + x * 18, offY + y * 18, + RestrictedInputSlot.PlacableItemType.STORAGE_CELLS.IIcon)); } } final IItemHandler upgrades = this.getUpgradeable().getInventoryByName("upgrades"); - this.addSlot((new SlotRestrictedInput(SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 0, 187, 8, + this.addSlot((new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.UPGRADES, upgrades, 0, 187, 8, this.getPlayerInventory())).setNotDraggable()); - this.addSlot((new SlotRestrictedInput(SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 1, 187, 8 + 18, + this.addSlot((new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.UPGRADES, upgrades, 1, 187, 8 + 18, this.getPlayerInventory())).setNotDraggable()); - this.addSlot((new SlotRestrictedInput(SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 2, 187, + this.addSlot((new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.UPGRADES, upgrades, 2, 187, 8 + 18 * 2, this.getPlayerInventory())).setNotDraggable()); } diff --git a/src/main/java/appeng/container/implementations/ContainerInscriber.java b/src/main/java/appeng/container/implementations/InscriberContainer.java similarity index 81% rename from src/main/java/appeng/container/implementations/ContainerInscriber.java rename to src/main/java/appeng/container/implementations/InscriberContainer.java index fc2e8622a..9c238092b 100644 --- a/src/main/java/appeng/container/implementations/ContainerInscriber.java +++ b/src/main/java/appeng/container/implementations/InscriberContainer.java @@ -31,10 +31,10 @@ import appeng.api.definitions.IItemDefinition; import appeng.container.ContainerLocator; import appeng.container.guisync.GuiSync; import appeng.container.interfaces.IProgressProvider; -import appeng.container.slot.SlotOutput; -import appeng.container.slot.SlotRestrictedInput; +import appeng.container.slot.OutputSlot; +import appeng.container.slot.RestrictedInputSlot; import appeng.tile.misc.InscriberRecipes; -import appeng.tile.misc.TileInscriber; +import appeng.tile.misc.InscriberTileEntity; import appeng.util.Platform; /** @@ -43,14 +43,14 @@ import appeng.util.Platform; * @version rv2 * @since rv0 */ -public class ContainerInscriber extends ContainerUpgradeable implements IProgressProvider { +public class InscriberContainer extends UpgradeableContainer implements IProgressProvider { - public static ContainerType TYPE; + public static ContainerType TYPE; - private static final ContainerHelper helper = new ContainerHelper<>( - ContainerInscriber::new, TileInscriber.class); + private static final ContainerHelper helper = new ContainerHelper<>( + InscriberContainer::new, InscriberTileEntity.class); - public static ContainerInscriber fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { + public static InscriberContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { return helper.fromNetwork(windowId, inv, buf); } @@ -58,7 +58,7 @@ public class ContainerInscriber extends ContainerUpgradeable implements IProgres return helper.open(player, locator); } - private final TileInscriber ti; + private final InscriberTileEntity ti; private final Slot top; private final Slot middle; @@ -70,26 +70,26 @@ public class ContainerInscriber extends ContainerUpgradeable implements IProgres @GuiSync(3) public int processingTime = -1; - public ContainerInscriber(int id, final PlayerInventory ip, final TileInscriber te) { + public InscriberContainer(int id, final PlayerInventory ip, final InscriberTileEntity te) { super(TYPE, id, ip, te); this.ti = te; IItemHandler inv = te.getInternalInventory(); - SlotRestrictedInput top = new SlotRestrictedInput(SlotRestrictedInput.PlacableItemType.INSCRIBER_PLATE, inv, 0, + RestrictedInputSlot top = new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.INSCRIBER_PLATE, inv, 0, 45, 16, this.getPlayerInventory()); top.setStackLimit(1); this.top = this.addSlot(top); - SlotRestrictedInput bottom = new SlotRestrictedInput(SlotRestrictedInput.PlacableItemType.INSCRIBER_PLATE, inv, + RestrictedInputSlot bottom = new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.INSCRIBER_PLATE, inv, 1, 45, 62, this.getPlayerInventory()); bottom.setStackLimit(1); this.bottom = this.addSlot(bottom); - SlotRestrictedInput middle = new SlotRestrictedInput(SlotRestrictedInput.PlacableItemType.INSCRIBER_INPUT, inv, + RestrictedInputSlot middle = new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.INSCRIBER_INPUT, inv, 2, 63, 39, this.getPlayerInventory()); middle.setStackLimit(1); this.middle = this.addSlot(middle); - this.addSlot(new SlotOutput(inv, 3, 113, 40, -1)); + this.addSlot(new OutputSlot(inv, 3, 113, 40, -1)); } @Override diff --git a/src/main/java/appeng/container/implementations/ContainerInterface.java b/src/main/java/appeng/container/implementations/InterfaceContainer.java similarity index 82% rename from src/main/java/appeng/container/implementations/ContainerInterface.java rename to src/main/java/appeng/container/implementations/InterfaceContainer.java index b84b8e830..694e9ae36 100644 --- a/src/main/java/appeng/container/implementations/ContainerInterface.java +++ b/src/main/java/appeng/container/implementations/InterfaceContainer.java @@ -29,20 +29,20 @@ import appeng.api.config.YesNo; import appeng.api.util.IConfigManager; import appeng.container.ContainerLocator; import appeng.container.guisync.GuiSync; -import appeng.container.slot.SlotFake; -import appeng.container.slot.SlotNormal; -import appeng.container.slot.SlotRestrictedInput; +import appeng.container.slot.FakeSlot; +import appeng.container.slot.NormalSlot; +import appeng.container.slot.RestrictedInputSlot; import appeng.helpers.DualityInterface; import appeng.helpers.IInterfaceHost; -public class ContainerInterface extends ContainerUpgradeable { +public class InterfaceContainer extends UpgradeableContainer { - public static ContainerType TYPE; + public static ContainerType TYPE; - private static final ContainerHelper helper = new ContainerHelper<>( - ContainerInterface::new, IInterfaceHost.class, SecurityPermissions.BUILD); + private static final ContainerHelper helper = new ContainerHelper<>( + InterfaceContainer::new, IInterfaceHost.class, SecurityPermissions.BUILD); - public static ContainerInterface fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { + public static InterfaceContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { return helper.fromNetwork(windowId, inv, buf); } @@ -58,22 +58,22 @@ public class ContainerInterface extends ContainerUpgradeable { @GuiSync(4) public YesNo iTermMode = YesNo.YES; - public ContainerInterface(int id, final PlayerInventory ip, final IInterfaceHost te) { + public InterfaceContainer(int id, final PlayerInventory ip, final IInterfaceHost te) { super(TYPE, id, ip, te.getInterfaceDuality().getHost()); this.myDuality = te.getInterfaceDuality(); for (int x = 0; x < DualityInterface.NUMBER_OF_PATTERN_SLOTS; x++) { - this.addSlot(new SlotRestrictedInput(SlotRestrictedInput.PlacableItemType.ENCODED_PATTERN, + this.addSlot(new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.ENCODED_PATTERN, this.myDuality.getPatterns(), x, 8 + 18 * x, 90 + 7, this.getPlayerInventory())); } for (int x = 0; x < DualityInterface.NUMBER_OF_CONFIG_SLOTS; x++) { - this.addSlot(new SlotFake(this.myDuality.getConfig(), x, 8 + 18 * x, 35)); + this.addSlot(new FakeSlot(this.myDuality.getConfig(), x, 8 + 18 * x, 35)); } for (int x = 0; x < DualityInterface.NUMBER_OF_STORAGE_SLOTS; x++) { - this.addSlot(new SlotNormal(this.myDuality.getStorage(), x, 8 + 18 * x, 35 + 18)); + this.addSlot(new NormalSlot(this.myDuality.getStorage(), x, 8 + 18 * x, 35 + 18)); } } diff --git a/src/main/java/appeng/container/implementations/ContainerInterfaceTerminal.java b/src/main/java/appeng/container/implementations/InterfaceTerminalContainer.java similarity index 93% rename from src/main/java/appeng/container/implementations/ContainerInterfaceTerminal.java rename to src/main/java/appeng/container/implementations/InterfaceTerminalContainer.java index f0cb562ac..cc893c57b 100644 --- a/src/main/java/appeng/container/implementations/ContainerInterfaceTerminal.java +++ b/src/main/java/appeng/container/implementations/InterfaceTerminalContainer.java @@ -42,15 +42,15 @@ import appeng.api.networking.security.IActionHost; import appeng.container.AEBaseContainer; import appeng.container.ContainerLocator; import appeng.core.sync.network.NetworkHandler; -import appeng.core.sync.packets.PacketCompressedNBT; +import appeng.core.sync.packets.CompressedNBTPacket; import appeng.helpers.DualityInterface; import appeng.helpers.IInterfaceHost; import appeng.helpers.InventoryAction; -import appeng.items.misc.ItemEncodedPattern; -import appeng.parts.misc.PartInterface; -import appeng.parts.reporting.PartInterfaceTerminal; +import appeng.items.misc.EncodedPatternItem; +import appeng.parts.misc.InterfacePart; +import appeng.parts.reporting.InterfaceTerminalPart; import appeng.tile.inventory.AppEngInternalInventory; -import appeng.tile.misc.TileInterface; +import appeng.tile.misc.InterfaceTileEntity; import appeng.util.InventoryAdaptor; import appeng.util.Platform; import appeng.util.helpers.ItemHandlerUtil; @@ -60,14 +60,14 @@ import appeng.util.inv.WrapperFilteredItemHandler; import appeng.util.inv.WrapperRangeItemHandler; import appeng.util.inv.filter.IAEItemFilter; -public final class ContainerInterfaceTerminal extends AEBaseContainer { +public final class InterfaceTerminalContainer extends AEBaseContainer { - public static ContainerType TYPE; + public static ContainerType TYPE; - private static final ContainerHelper helper = new ContainerHelper<>( - ContainerInterfaceTerminal::new, PartInterfaceTerminal.class, SecurityPermissions.BUILD); + private static final ContainerHelper helper = new ContainerHelper<>( + InterfaceTerminalContainer::new, InterfaceTerminalPart.class, SecurityPermissions.BUILD); - public static ContainerInterfaceTerminal fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { + public static InterfaceTerminalContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { return helper.fromNetwork(windowId, inv, buf); } @@ -85,7 +85,7 @@ public final class ContainerInterfaceTerminal extends AEBaseContainer { private IGrid grid; private CompoundNBT data = new CompoundNBT(); - public ContainerInterfaceTerminal(int id, final PlayerInventory ip, final PartInterfaceTerminal anchor) { + public InterfaceTerminalContainer(int id, final PlayerInventory ip, final InterfaceTerminalPart anchor) { super(TYPE, id, ip, anchor); if (Platform.isServer()) { @@ -114,7 +114,7 @@ public final class ContainerInterfaceTerminal extends AEBaseContainer { if (host != null) { final IGridNode agn = host.getActionableNode(); if (agn != null && agn.isActive()) { - for (final IGridNode gn : this.grid.getMachines(TileInterface.class)) { + for (final IGridNode gn : this.grid.getMachines(InterfaceTileEntity.class)) { if (gn.isActive()) { final IInterfaceHost ih = (IInterfaceHost) gn.getMachine(); if (ih.getInterfaceDuality().getConfigManager() @@ -137,7 +137,7 @@ public final class ContainerInterfaceTerminal extends AEBaseContainer { } } - for (final IGridNode gn : this.grid.getMachines(PartInterface.class)) { + for (final IGridNode gn : this.grid.getMachines(InterfacePart.class)) { if (gn.isActive()) { final IInterfaceHost ih = (IInterfaceHost) gn.getMachine(); if (ih.getInterfaceDuality().getConfigManager() @@ -177,7 +177,7 @@ public final class ContainerInterfaceTerminal extends AEBaseContainer { if (!this.data.isEmpty()) { try { - NetworkHandler.instance().sendTo(new PacketCompressedNBT(this.data), + NetworkHandler.instance().sendTo(new CompressedNBTPacket(this.data), (ServerPlayerEntity) this.getPlayerInv().player); } catch (final IOException e) { // :P @@ -288,7 +288,7 @@ public final class ContainerInterfaceTerminal extends AEBaseContainer { if (host != null) { final IGridNode agn = host.getActionableNode(); if (agn != null && agn.isActive()) { - for (final IGridNode gn : this.grid.getMachines(TileInterface.class)) { + for (final IGridNode gn : this.grid.getMachines(InterfaceTileEntity.class)) { final IInterfaceHost ih = (IInterfaceHost) gn.getMachine(); final DualityInterface dual = ih.getInterfaceDuality(); if (gn.isActive() && dual.getConfigManager().getSetting(Settings.INTERFACE_TERMINAL) == YesNo.YES) { @@ -296,7 +296,7 @@ public final class ContainerInterfaceTerminal extends AEBaseContainer { } } - for (final IGridNode gn : this.grid.getMachines(PartInterface.class)) { + for (final IGridNode gn : this.grid.getMachines(InterfacePart.class)) { final IInterfaceHost ih = (IInterfaceHost) gn.getMachine(); final DualityInterface dual = ih.getInterfaceDuality(); if (gn.isActive() && dual.getConfigManager().getSetting(Settings.INTERFACE_TERMINAL) == YesNo.YES) { @@ -378,7 +378,7 @@ public final class ContainerInterfaceTerminal extends AEBaseContainer { @Override public boolean allowInsert(IItemHandler inv, int slot, ItemStack stack) { - return !stack.isEmpty() && stack.getItem() instanceof ItemEncodedPattern; + return !stack.isEmpty() && stack.getItem() instanceof EncodedPatternItem; } } } diff --git a/src/main/java/appeng/container/implementations/ContainerLevelEmitter.java b/src/main/java/appeng/container/implementations/LevelEmitterContainer.java similarity index 80% rename from src/main/java/appeng/container/implementations/ContainerLevelEmitter.java rename to src/main/java/appeng/container/implementations/LevelEmitterContainer.java index 9ef67ef7d..fc0bdd4d1 100644 --- a/src/main/java/appeng/container/implementations/ContainerLevelEmitter.java +++ b/src/main/java/appeng/container/implementations/LevelEmitterContainer.java @@ -35,19 +35,19 @@ import appeng.api.config.Settings; import appeng.api.config.YesNo; import appeng.container.ContainerLocator; import appeng.container.guisync.GuiSync; -import appeng.container.slot.SlotFakeTypeOnly; -import appeng.container.slot.SlotRestrictedInput; -import appeng.parts.automation.PartLevelEmitter; +import appeng.container.slot.FakeTypeOnlySlot; +import appeng.container.slot.RestrictedInputSlot; +import appeng.parts.automation.LevelEmitterPart; import appeng.util.Platform; -public class ContainerLevelEmitter extends ContainerUpgradeable { +public class LevelEmitterContainer extends UpgradeableContainer { - public static ContainerType TYPE; + public static ContainerType TYPE; - private static final ContainerHelper helper = new ContainerHelper<>( - ContainerLevelEmitter::new, PartLevelEmitter.class, SecurityPermissions.BUILD); + private static final ContainerHelper helper = new ContainerHelper<>( + LevelEmitterContainer::new, LevelEmitterPart.class, SecurityPermissions.BUILD); - public static ContainerLevelEmitter fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { + public static LevelEmitterContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { return helper.fromNetwork(windowId, inv, buf); } @@ -55,7 +55,7 @@ public class ContainerLevelEmitter extends ContainerUpgradeable { return helper.open(player, locator); } - private final PartLevelEmitter lvlEmitter; + private final LevelEmitterPart lvlEmitter; @OnlyIn(Dist.CLIENT) private TextFieldWidget textField; @@ -66,7 +66,7 @@ public class ContainerLevelEmitter extends ContainerUpgradeable { @GuiSync(4) public YesNo cmType; - public ContainerLevelEmitter(int id, final PlayerInventory ip, final PartLevelEmitter te) { + public LevelEmitterContainer(int id, final PlayerInventory ip, final LevelEmitterPart te) { super(TYPE, id, ip, te); this.lvlEmitter = te; } @@ -86,26 +86,26 @@ public class ContainerLevelEmitter extends ContainerUpgradeable { protected void setupConfig() { final IItemHandler upgrades = this.getUpgradeable().getInventoryByName("upgrades"); if (this.availableUpgrades() > 0) { - this.addSlot((new SlotRestrictedInput(SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 0, 187, 8, + this.addSlot((new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.UPGRADES, upgrades, 0, 187, 8, this.getPlayerInventory())).setNotDraggable()); } if (this.availableUpgrades() > 1) { - this.addSlot((new SlotRestrictedInput(SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 1, 187, + this.addSlot((new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.UPGRADES, upgrades, 1, 187, 8 + 18, this.getPlayerInventory())).setNotDraggable()); } if (this.availableUpgrades() > 2) { - this.addSlot((new SlotRestrictedInput(SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 2, 187, + this.addSlot((new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.UPGRADES, upgrades, 2, 187, 8 + 18 * 2, this.getPlayerInventory())).setNotDraggable()); } if (this.availableUpgrades() > 3) { - this.addSlot((new SlotRestrictedInput(SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 3, 187, + this.addSlot((new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.UPGRADES, upgrades, 3, 187, 8 + 18 * 3, this.getPlayerInventory())).setNotDraggable()); } final IItemHandler inv = this.getUpgradeable().getInventoryByName("config"); final int y = 40; final int x = 80 + 44; - this.addSlot(new SlotFakeTypeOnly(inv, 0, x, y)); + this.addSlot(new FakeTypeOnlySlot(inv, 0, x, y)); } @Override diff --git a/src/main/java/appeng/container/implementations/ContainerMEMonitorable.java b/src/main/java/appeng/container/implementations/MEMonitorableContainer.java similarity index 91% rename from src/main/java/appeng/container/implementations/ContainerMEMonitorable.java rename to src/main/java/appeng/container/implementations/MEMonitorableContainer.java index fcefe09bb..ddd8c81fb 100644 --- a/src/main/java/appeng/container/implementations/ContainerMEMonitorable.java +++ b/src/main/java/appeng/container/implementations/MEMonitorableContainer.java @@ -65,25 +65,25 @@ import appeng.api.util.IConfigurableObject; import appeng.container.AEBaseContainer; import appeng.container.ContainerLocator; import appeng.container.guisync.GuiSync; -import appeng.container.slot.SlotRestrictedInput; +import appeng.container.slot.RestrictedInputSlot; import appeng.core.AELog; import appeng.core.sync.network.NetworkHandler; -import appeng.core.sync.packets.PacketMEInventoryUpdate; -import appeng.core.sync.packets.PacketValueConfig; +import appeng.core.sync.packets.MEInventoryUpdatePacket; +import appeng.core.sync.packets.ConfigValuePacket; import appeng.me.helpers.ChannelPowerSrc; import appeng.util.ConfigManager; import appeng.util.IConfigManagerHost; import appeng.util.Platform; -public class ContainerMEMonitorable extends AEBaseContainer +public class MEMonitorableContainer extends AEBaseContainer implements IConfigManagerHost, IConfigurableObject, IMEMonitorHandlerReceiver { - public static ContainerType TYPE; + public static ContainerType TYPE; - private static final ContainerHelper helper = new ContainerHelper<>( - ContainerMEMonitorable::new, ITerminalHost.class); + private static final ContainerHelper helper = new ContainerHelper<>( + MEMonitorableContainer::new, ITerminalHost.class); - public static ContainerMEMonitorable fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { + public static MEMonitorableContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { return helper.fromNetwork(windowId, inv, buf); } @@ -91,7 +91,7 @@ public class ContainerMEMonitorable extends AEBaseContainer return helper.open(player, locator); } - private final SlotRestrictedInput[] cellView = new SlotRestrictedInput[5]; + private final RestrictedInputSlot[] cellView = new RestrictedInputSlot[5]; private final IMEMonitor monitor; private final IItemList items = AEApi.instance().storage() .getStorageChannel(IItemStorageChannel.class).createList(); @@ -105,12 +105,12 @@ public class ContainerMEMonitorable extends AEBaseContainer private IConfigManager serverCM; private IGridNode networkNode; - public ContainerMEMonitorable(int id, final PlayerInventory ip, final ITerminalHost monitorable) { + public MEMonitorableContainer(int id, final PlayerInventory ip, final ITerminalHost monitorable) { this(TYPE, id, ip, monitorable, true); } - public ContainerMEMonitorable(ContainerType containerType, int id, PlayerInventory ip, - final ITerminalHost monitorable, final boolean bindInventory) { + public MEMonitorableContainer(ContainerType containerType, int id, PlayerInventory ip, + final ITerminalHost monitorable, final boolean bindInventory) { super(containerType, id, ip, monitorable instanceof TileEntity ? (TileEntity) monitorable : null, monitorable instanceof IPart ? (IPart) monitorable : null, monitorable instanceof IGuiItemObject ? (IGuiItemObject) monitorable : null); @@ -164,7 +164,7 @@ public class ContainerMEMonitorable extends AEBaseContainer this.canAccessViewCells = false; if (monitorable instanceof IViewCellStorage) { for (int y = 0; y < 5; y++) { - this.cellView[y] = new SlotRestrictedInput(SlotRestrictedInput.PlacableItemType.VIEW_CELL, + this.cellView[y] = new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.VIEW_CELL, ((IViewCellStorage) monitorable).getViewCellStorage(), y, 206, y * 18 + 8, this.getPlayerInventory()); this.cellView[y].setAllowEdit(this.canAccessViewCells); @@ -197,7 +197,7 @@ public class ContainerMEMonitorable extends AEBaseContainer this.clientCM.putSetting(set, sideLocal); for (final IContainerListener crafter : this.listeners) { if (crafter instanceof ServerPlayerEntity) { - NetworkHandler.instance().sendTo(new PacketValueConfig(set.name(), sideLocal.name()), + NetworkHandler.instance().sendTo(new ConfigValuePacket(set.name(), sideLocal.name()), (ServerPlayerEntity) crafter); } } @@ -208,7 +208,7 @@ public class ContainerMEMonitorable extends AEBaseContainer try { final IItemList monitorCache = this.monitor.getStorageList(); - final PacketMEInventoryUpdate piu = new PacketMEInventoryUpdate(); + final MEInventoryUpdatePacket piu = new MEInventoryUpdatePacket(); for (final IAEItemStack is : this.items) { final IAEItemStack send = monitorCache.findPrecise(is); @@ -289,7 +289,7 @@ public class ContainerMEMonitorable extends AEBaseContainer private void queueInventory(final IContainerListener c) { if (Platform.isServer() && c instanceof PlayerEntity && this.monitor != null) { try { - PacketMEInventoryUpdate piu = new PacketMEInventoryUpdate(); + MEInventoryUpdatePacket piu = new MEInventoryUpdatePacket(); final IItemList monitorCache = this.monitor.getStorageList(); for (final IAEItemStack send : monitorCache) { @@ -298,7 +298,7 @@ public class ContainerMEMonitorable extends AEBaseContainer } catch (final BufferOverflowException boe) { NetworkHandler.instance().sendTo(piu, (ServerPlayerEntity) c); - piu = new PacketMEInventoryUpdate(); + piu = new MEInventoryUpdatePacket(); piu.appendItem(send); } } @@ -372,7 +372,7 @@ public class ContainerMEMonitorable extends AEBaseContainer return list; } - public SlotRestrictedInput getCellViewSlot(final int index) { + public RestrictedInputSlot getCellViewSlot(final int index) { return this.cellView[index]; } diff --git a/src/main/java/appeng/container/implementations/ContainerMEPortableCell.java b/src/main/java/appeng/container/implementations/MEPortableCellContainer.java similarity index 85% rename from src/main/java/appeng/container/implementations/ContainerMEPortableCell.java rename to src/main/java/appeng/container/implementations/MEPortableCellContainer.java index 719284a6c..497cdc4d5 100644 --- a/src/main/java/appeng/container/implementations/ContainerMEPortableCell.java +++ b/src/main/java/appeng/container/implementations/MEPortableCellContainer.java @@ -30,14 +30,14 @@ import appeng.api.implementations.guiobjects.IPortableCell; import appeng.container.ContainerLocator; import appeng.container.interfaces.IInventorySlotAware; -public class ContainerMEPortableCell extends ContainerMEMonitorable { +public class MEPortableCellContainer extends MEMonitorableContainer { - public static ContainerType TYPE; + public static ContainerType TYPE; - private static final ContainerHelper helper = new ContainerHelper<>( - ContainerMEPortableCell::new, IPortableCell.class); + private static final ContainerHelper helper = new ContainerHelper<>( + MEPortableCellContainer::new, IPortableCell.class); - public static ContainerMEPortableCell fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { + public static MEPortableCellContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { return helper.fromNetwork(windowId, inv, buf); } @@ -51,12 +51,12 @@ public class ContainerMEPortableCell extends ContainerMEMonitorable { private int ticks = 0; private final int slot; - public ContainerMEPortableCell(int id, final PlayerInventory ip, final IPortableCell monitorable) { + public MEPortableCellContainer(int id, final PlayerInventory ip, final IPortableCell monitorable) { this(TYPE, id, ip, monitorable); } - protected ContainerMEPortableCell(ContainerType type, int id, - final PlayerInventory ip, final IPortableCell monitorable) { + protected MEPortableCellContainer(ContainerType type, int id, + final PlayerInventory ip, final IPortableCell monitorable) { super(type, id, ip, monitorable, false); if (monitorable instanceof IInventorySlotAware) { final int slotIndex = ((IInventorySlotAware) monitorable).getInventorySlot(); diff --git a/src/main/java/appeng/container/implementations/ContainerMolecularAssembler.java b/src/main/java/appeng/container/implementations/MolecularAssemblerContainer.java similarity index 75% rename from src/main/java/appeng/container/implementations/ContainerMolecularAssembler.java rename to src/main/java/appeng/container/implementations/MolecularAssemblerContainer.java index c6224e970..341602fbe 100644 --- a/src/main/java/appeng/container/implementations/ContainerMolecularAssembler.java +++ b/src/main/java/appeng/container/implementations/MolecularAssemblerContainer.java @@ -35,21 +35,21 @@ import appeng.container.ContainerLocator; import appeng.container.guisync.GuiSync; import appeng.container.interfaces.IProgressProvider; import appeng.container.slot.AppEngSlot; -import appeng.container.slot.SlotMolecularAssemblerPattern; -import appeng.container.slot.SlotOutput; -import appeng.container.slot.SlotRestrictedInput; -import appeng.items.misc.ItemEncodedPattern; -import appeng.tile.crafting.TileMolecularAssembler; +import appeng.container.slot.MolecularAssemblerPatternSlot; +import appeng.container.slot.OutputSlot; +import appeng.container.slot.RestrictedInputSlot; +import appeng.items.misc.EncodedPatternItem; +import appeng.tile.crafting.MolecularAssemblerTileEntity; import appeng.util.Platform; -public class ContainerMolecularAssembler extends ContainerUpgradeable implements IProgressProvider { +public class MolecularAssemblerContainer extends UpgradeableContainer implements IProgressProvider { - public static ContainerType TYPE; + public static ContainerType TYPE; - private static final ContainerHelper helper = new ContainerHelper<>( - ContainerMolecularAssembler::new, TileMolecularAssembler.class); + private static final ContainerHelper helper = new ContainerHelper<>( + MolecularAssemblerContainer::new, MolecularAssemblerTileEntity.class); - public static ContainerMolecularAssembler fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { + public static MolecularAssemblerContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { return helper.fromNetwork(windowId, inv, buf); } @@ -58,28 +58,28 @@ public class ContainerMolecularAssembler extends ContainerUpgradeable implements } private static final int MAX_CRAFT_PROGRESS = 100; - private final TileMolecularAssembler tma; + private final MolecularAssemblerTileEntity tma; @GuiSync(4) public int craftProgress = 0; private Slot encodedPatternSlot; - public ContainerMolecularAssembler(int id, final PlayerInventory ip, final TileMolecularAssembler te) { + public MolecularAssemblerContainer(int id, final PlayerInventory ip, final MolecularAssemblerTileEntity te) { super(TYPE, id, ip, te); this.tma = te; } public boolean isValidItemForSlot(final int slotIndex, final ItemStack i) { - final IItemHandler mac = this.getUpgradeable().getInventoryByName(TileMolecularAssembler.INVENTORY_MAIN); + final IItemHandler mac = this.getUpgradeable().getInventoryByName(MolecularAssemblerTileEntity.INVENTORY_MAIN); final ItemStack is = mac.getStackInSlot(10); if (is.isEmpty()) { return false; } - if (is.getItem() instanceof ItemEncodedPattern) { + if (is.getItem() instanceof EncodedPatternItem) { final World w = this.getTileEntity().getWorld(); - final ItemEncodedPattern iep = (ItemEncodedPattern) is.getItem(); + final EncodedPatternItem iep = (EncodedPatternItem) is.getItem(); final ICraftingPatternDetails ph = iep.getPatternForItem(is, w); if (ph.isCraftable()) { return ph.isValidItemForSlot(slotIndex, i, w); @@ -99,11 +99,11 @@ public class ContainerMolecularAssembler extends ContainerUpgradeable implements int offX = 29; int offY = 30; - final IItemHandler mac = this.getUpgradeable().getInventoryByName(TileMolecularAssembler.INVENTORY_MAIN); + final IItemHandler mac = this.getUpgradeable().getInventoryByName(MolecularAssemblerTileEntity.INVENTORY_MAIN); for (int y = 0; y < 3; y++) { for (int x = 0; x < 3; x++) { - final SlotMolecularAssemblerPattern s = new SlotMolecularAssemblerPattern(this, mac, x + y * 3, + final MolecularAssemblerPatternSlot s = new MolecularAssemblerPatternSlot(this, mac, x + y * 3, offX + x * 18, offY + y * 18); this.addSlot(s); } @@ -113,23 +113,23 @@ public class ContainerMolecularAssembler extends ContainerUpgradeable implements offY = 16; encodedPatternSlot = this - .addSlot(new SlotRestrictedInput(SlotRestrictedInput.PlacableItemType.ENCODED_CRAFTING_PATTERN, mac, 10, + .addSlot(new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.ENCODED_CRAFTING_PATTERN, mac, 10, offX, offY, this.getPlayerInventory())); - this.addSlot(new SlotOutput(mac, 9, offX, offY + 32, -1)); + this.addSlot(new OutputSlot(mac, 9, offX, offY + 32, -1)); offX = 122; offY = 17; final IItemHandler upgrades = this.getUpgradeable().getInventoryByName("upgrades"); - this.addSlot((new SlotRestrictedInput(SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 0, 187, 8, + this.addSlot((new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.UPGRADES, upgrades, 0, 187, 8, this.getPlayerInventory())).setNotDraggable()); - this.addSlot((new SlotRestrictedInput(SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 1, 187, 8 + 18, + this.addSlot((new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.UPGRADES, upgrades, 1, 187, 8 + 18, this.getPlayerInventory())).setNotDraggable()); - this.addSlot((new SlotRestrictedInput(SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 2, 187, + this.addSlot((new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.UPGRADES, upgrades, 2, 187, 8 + 18 * 2, this.getPlayerInventory())).setNotDraggable()); - this.addSlot((new SlotRestrictedInput(SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 3, 187, + this.addSlot((new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.UPGRADES, upgrades, 3, 187, 8 + 18 * 3, this.getPlayerInventory())).setNotDraggable()); - this.addSlot((new SlotRestrictedInput(SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 4, 187, + this.addSlot((new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.UPGRADES, upgrades, 4, 187, 8 + 18 * 4, this.getPlayerInventory())).setNotDraggable()); } diff --git a/src/main/java/appeng/container/implementations/ContainerNetworkStatus.java b/src/main/java/appeng/container/implementations/NetworkStatusContainer.java similarity index 91% rename from src/main/java/appeng/container/implementations/ContainerNetworkStatus.java rename to src/main/java/appeng/container/implementations/NetworkStatusContainer.java index 8108ae8e1..a1d6b778f 100644 --- a/src/main/java/appeng/container/implementations/ContainerNetworkStatus.java +++ b/src/main/java/appeng/container/implementations/NetworkStatusContainer.java @@ -42,18 +42,18 @@ import appeng.container.AEBaseContainer; import appeng.container.ContainerLocator; import appeng.container.guisync.GuiSync; import appeng.core.sync.network.NetworkHandler; -import appeng.core.sync.packets.PacketMEInventoryUpdate; +import appeng.core.sync.packets.MEInventoryUpdatePacket; import appeng.util.Platform; import appeng.util.item.AEItemStack; -public class ContainerNetworkStatus extends AEBaseContainer { +public class NetworkStatusContainer extends AEBaseContainer { - public static ContainerType TYPE; + public static ContainerType TYPE; - private static final ContainerHelper helper = new ContainerHelper<>( - ContainerNetworkStatus::new, INetworkTool.class); + private static final ContainerHelper helper = new ContainerHelper<>( + NetworkStatusContainer::new, INetworkTool.class); - public static ContainerNetworkStatus fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { + public static NetworkStatusContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { return helper.fromNetwork(windowId, inv, buf); } @@ -72,7 +72,7 @@ public class ContainerNetworkStatus extends AEBaseContainer { private IGrid network; private int delay = 40; - public ContainerNetworkStatus(int id, PlayerInventory ip, final INetworkTool te) { + public NetworkStatusContainer(int id, PlayerInventory ip, final INetworkTool te) { super(TYPE, id, ip, null, null); final IGridHost host = te.getGridHost(); @@ -112,7 +112,7 @@ public class ContainerNetworkStatus extends AEBaseContainer { } try { - final PacketMEInventoryUpdate piu = new PacketMEInventoryUpdate(); + final MEInventoryUpdatePacket piu = new MEInventoryUpdatePacket(); for (final Class machineClass : this.network.getMachinesClasses()) { final IItemList list = AEApi.instance().storage() diff --git a/src/main/java/appeng/container/implementations/ContainerNetworkTool.java b/src/main/java/appeng/container/implementations/NetworkToolContainer.java similarity index 86% rename from src/main/java/appeng/container/implementations/ContainerNetworkTool.java rename to src/main/java/appeng/container/implementations/NetworkToolContainer.java index 86e7d3241..4f1cb40a6 100644 --- a/src/main/java/appeng/container/implementations/ContainerNetworkTool.java +++ b/src/main/java/appeng/container/implementations/NetworkToolContainer.java @@ -29,16 +29,16 @@ import appeng.api.implementations.guiobjects.INetworkTool; import appeng.container.AEBaseContainer; import appeng.container.ContainerLocator; import appeng.container.guisync.GuiSync; -import appeng.container.slot.SlotRestrictedInput; +import appeng.container.slot.RestrictedInputSlot; -public class ContainerNetworkTool extends AEBaseContainer { +public class NetworkToolContainer extends AEBaseContainer { - public static ContainerType TYPE; + public static ContainerType TYPE; - private static final ContainerHelper helper = new ContainerHelper<>( - ContainerNetworkTool::new, INetworkTool.class); + private static final ContainerHelper helper = new ContainerHelper<>( + NetworkToolContainer::new, INetworkTool.class); - public static ContainerNetworkTool fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { + public static NetworkToolContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { return helper.fromNetwork(windowId, inv, buf); } @@ -51,7 +51,7 @@ public class ContainerNetworkTool extends AEBaseContainer { @GuiSync(1) public boolean facadeMode; - public ContainerNetworkTool(int id, final PlayerInventory ip, final INetworkTool te) { + public NetworkToolContainer(int id, final PlayerInventory ip, final INetworkTool te) { super(TYPE, id, ip, null, null); this.toolInv = te; @@ -59,7 +59,7 @@ public class ContainerNetworkTool extends AEBaseContainer { for (int y = 0; y < 3; y++) { for (int x = 0; x < 3; x++) { - this.addSlot((new SlotRestrictedInput(SlotRestrictedInput.PlacableItemType.UPGRADES, te.getInventory(), + this.addSlot((new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.UPGRADES, te.getInventory(), y * 3 + x, 80 - 18 + x * 18, 37 - 18 + y * 18, this.getPlayerInventory()))); } } diff --git a/src/main/java/appeng/container/implementations/ContainerPatternTerm.java b/src/main/java/appeng/container/implementations/PatternTermContainer.java similarity index 89% rename from src/main/java/appeng/container/implementations/ContainerPatternTerm.java rename to src/main/java/appeng/container/implementations/PatternTermContainer.java index 67f0d90ba..e17c0b2a1 100644 --- a/src/main/java/appeng/container/implementations/ContainerPatternTerm.java +++ b/src/main/java/appeng/container/implementations/PatternTermContainer.java @@ -55,16 +55,16 @@ import appeng.container.ContainerLocator; import appeng.container.ContainerNull; import appeng.container.guisync.GuiSync; import appeng.container.slot.IOptionalSlotHost; -import appeng.container.slot.OptionalSlotFake; -import appeng.container.slot.SlotFakeCraftingMatrix; -import appeng.container.slot.SlotPatternOutputs; -import appeng.container.slot.SlotPatternTerm; -import appeng.container.slot.SlotRestrictedInput; -import appeng.core.sync.packets.PacketPatternSlot; +import appeng.container.slot.OptionalFakeSlot; +import appeng.container.slot.FakeCraftingMatrixSlot; +import appeng.container.slot.PatternOutputsSlot; +import appeng.container.slot.PatternTermSlot; +import appeng.container.slot.RestrictedInputSlot; +import appeng.core.sync.packets.PatternSlotPacket; import appeng.helpers.IContainerCraftingPacket; -import appeng.items.storage.ItemViewCell; +import appeng.items.storage.ViewCellItem; import appeng.me.helpers.MachineSource; -import appeng.parts.reporting.PartPatternTerminal; +import appeng.parts.reporting.PatternTerminalPart; import appeng.tile.inventory.AppEngInternalInventory; import appeng.util.InventoryAdaptor; import appeng.util.Platform; @@ -74,15 +74,15 @@ import appeng.util.inv.InvOperation; import appeng.util.inv.WrapperCursorItemHandler; import appeng.util.item.AEItemStack; -public class ContainerPatternTerm extends ContainerMEMonitorable +public class PatternTermContainer extends MEMonitorableContainer implements IAEAppEngInventory, IOptionalSlotHost, IContainerCraftingPacket { - public static ContainerType TYPE; + public static ContainerType TYPE; - private static final ContainerHelper helper = new ContainerHelper<>( - ContainerPatternTerm::new, ITerminalHost.class, SecurityPermissions.CRAFT); + private static final ContainerHelper helper = new ContainerHelper<>( + PatternTermContainer::new, ITerminalHost.class, SecurityPermissions.CRAFT); - public static ContainerPatternTerm fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { + public static PatternTermContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { return helper.fromNetwork(windowId, inv, buf); } @@ -90,14 +90,14 @@ public class ContainerPatternTerm extends ContainerMEMonitorable return helper.open(player, locator); } - private final PartPatternTerminal patternTerminal; + private final PatternTerminalPart patternTerminal; private final AppEngInternalInventory cOut = new AppEngInternalInventory(null, 1); private final IItemHandler crafting; - private final SlotFakeCraftingMatrix[] craftingSlots = new SlotFakeCraftingMatrix[9]; - private final OptionalSlotFake[] outputSlots = new OptionalSlotFake[3]; - private final SlotPatternTerm craftSlot; - private final SlotRestrictedInput patternSlotIN; - private final SlotRestrictedInput patternSlotOUT; + private final FakeCraftingMatrixSlot[] craftingSlots = new FakeCraftingMatrixSlot[9]; + private final OptionalFakeSlot[] outputSlots = new OptionalFakeSlot[3]; + private final PatternTermSlot craftSlot; + private final RestrictedInputSlot patternSlotIN; + private final RestrictedInputSlot patternSlotOUT; private IRecipe currentRecipe; @GuiSync(97) @@ -105,9 +105,9 @@ public class ContainerPatternTerm extends ContainerMEMonitorable @GuiSync(96) public boolean substitute = false; - public ContainerPatternTerm(int id, final PlayerInventory ip, final ITerminalHost monitorable) { + public PatternTermContainer(int id, final PlayerInventory ip, final ITerminalHost monitorable) { super(TYPE, id, ip, monitorable, false); - this.patternTerminal = (PartPatternTerminal) monitorable; + this.patternTerminal = (PatternTerminalPart) monitorable; final IItemHandler patternInv = this.getPatternTerminal().getInventoryByName("pattern"); final IItemHandler output = this.getPatternTerminal().getInventoryByName("output"); @@ -116,24 +116,24 @@ public class ContainerPatternTerm extends ContainerMEMonitorable for (int y = 0; y < 3; y++) { for (int x = 0; x < 3; x++) { - this.addSlot(this.craftingSlots[x + y * 3] = new SlotFakeCraftingMatrix(this.crafting, x + y * 3, + this.addSlot(this.craftingSlots[x + y * 3] = new FakeCraftingMatrixSlot(this.crafting, x + y * 3, 18 + x * 18, -76 + y * 18)); } } - this.addSlot(this.craftSlot = new SlotPatternTerm(ip.player, this.getActionSource(), this.getPowerSource(), + this.addSlot(this.craftSlot = new PatternTermSlot(ip.player, this.getActionSource(), this.getPowerSource(), monitorable, this.crafting, patternInv, this.cOut, 110, -76 + 18, this, 2, this)); this.craftSlot.setIIcon(-1); for (int y = 0; y < 3; y++) { - this.addSlot(this.outputSlots[y] = new SlotPatternOutputs(output, this, y, 110, -76 + y * 18, 0, 0, 1)); + this.addSlot(this.outputSlots[y] = new PatternOutputsSlot(output, this, y, 110, -76 + y * 18, 0, 0, 1)); this.outputSlots[y].setRenderDisabled(false); this.outputSlots[y].setIIcon(-1); } - this.addSlot(this.patternSlotIN = new SlotRestrictedInput(SlotRestrictedInput.PlacableItemType.BLANK_PATTERN, + this.addSlot(this.patternSlotIN = new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.BLANK_PATTERN, patternInv, 0, 147, -72 - 9, this.getPlayerInventory())); - this.addSlot(this.patternSlotOUT = new SlotRestrictedInput(SlotRestrictedInput.PlacableItemType.ENCODED_PATTERN, + this.addSlot(this.patternSlotOUT = new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.ENCODED_PATTERN, patternInv, 1, 147, -72 + 34, this.getPlayerInventory())); this.patternSlotOUT.setStackLimit(1); @@ -285,7 +285,7 @@ public class ContainerPatternTerm extends ContainerMEMonitorable final List list = new ArrayList<>(3); boolean hasValue = false; - for (final OptionalSlotFake outputSlot : this.outputSlots) { + for (final OptionalFakeSlot outputSlot : this.outputSlots) { final ItemStack out = outputSlot.getStack(); if (!out.isEmpty() && out.getCount() > 0) { @@ -336,7 +336,7 @@ public class ContainerPatternTerm extends ContainerMEMonitorable } } - public void craftOrGetItem(final PacketPatternSlot packetPatternSlot) { + public void craftOrGetItem(final PatternSlotPacket packetPatternSlot) { if (packetPatternSlot.slotItem != null && this.getCellInventory() != null) { final IAEItemStack out = packetPatternSlot.slotItem.copy(); InventoryAdaptor inv = new AdaptorItemHandler( @@ -389,7 +389,7 @@ public class ContainerPatternTerm extends ContainerMEMonitorable if (!ic.getStackInSlot(x).isEmpty()) { final ItemStack pulled = Platform.extractItemsByRecipe(this.getPowerSource(), this.getActionSource(), storage, p.world, r, is, ic, ic.getStackInSlot(x), x, all, - Actionable.MODULATE, ItemViewCell.createFilter(this.getViewCells())); + Actionable.MODULATE, ViewCellItem.createFilter(this.getViewCells())); real.setInventorySlotContents(x, pulled); } } @@ -457,7 +457,7 @@ public class ContainerPatternTerm extends ContainerMEMonitorable if (s == this.patternSlotOUT && Platform.isServer()) { for (final IContainerListener listener : this.listeners) { for (final Slot slot : this.inventorySlots) { - if (slot instanceof OptionalSlotFake || slot instanceof SlotFakeCraftingMatrix) { + if (slot instanceof OptionalFakeSlot || slot instanceof FakeCraftingMatrixSlot) { listener.sendSlotContents(this, slot.slotNumber, slot.getStack()); } } @@ -514,7 +514,7 @@ public class ContainerPatternTerm extends ContainerMEMonitorable this.craftingMode = craftingMode; } - public PartPatternTerminal getPatternTerminal() { + public PatternTerminalPart getPatternTerminal() { return this.patternTerminal; } diff --git a/src/main/java/appeng/container/implementations/ContainerPriority.java b/src/main/java/appeng/container/implementations/PriorityContainer.java similarity index 89% rename from src/main/java/appeng/container/implementations/ContainerPriority.java rename to src/main/java/appeng/container/implementations/PriorityContainer.java index 4eadc1878..549bc43e1 100644 --- a/src/main/java/appeng/container/implementations/ContainerPriority.java +++ b/src/main/java/appeng/container/implementations/PriorityContainer.java @@ -35,14 +35,14 @@ import appeng.container.guisync.GuiSync; import appeng.helpers.IPriorityHost; import appeng.util.Platform; -public class ContainerPriority extends AEBaseContainer { +public class PriorityContainer extends AEBaseContainer { - public static ContainerType TYPE; + public static ContainerType TYPE; - private static final ContainerHelper helper = new ContainerHelper<>( - ContainerPriority::new, IPriorityHost.class, SecurityPermissions.BUILD); + private static final ContainerHelper helper = new ContainerHelper<>( + PriorityContainer::new, IPriorityHost.class, SecurityPermissions.BUILD); - public static ContainerPriority fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { + public static PriorityContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { return helper.fromNetwork(windowId, inv, buf); } @@ -57,7 +57,7 @@ public class ContainerPriority extends AEBaseContainer { @GuiSync(2) public long PriorityValue = -1; - public ContainerPriority(int id, final PlayerInventory ip, final IPriorityHost te) { + public PriorityContainer(int id, final PlayerInventory ip, final IPriorityHost te) { super(TYPE, id, ip, (TileEntity) (te instanceof TileEntity ? te : null), (IPart) (te instanceof IPart ? te : null)); this.priHost = te; diff --git a/src/main/java/appeng/container/implementations/ContainerQNB.java b/src/main/java/appeng/container/implementations/QNBContainer.java similarity index 72% rename from src/main/java/appeng/container/implementations/ContainerQNB.java rename to src/main/java/appeng/container/implementations/QNBContainer.java index b563355b3..d584048a3 100644 --- a/src/main/java/appeng/container/implementations/ContainerQNB.java +++ b/src/main/java/appeng/container/implementations/QNBContainer.java @@ -26,17 +26,17 @@ import net.minecraft.network.PacketBuffer; import appeng.api.config.SecurityPermissions; import appeng.container.AEBaseContainer; import appeng.container.ContainerLocator; -import appeng.container.slot.SlotRestrictedInput; -import appeng.tile.qnb.TileQuantumBridge; +import appeng.container.slot.RestrictedInputSlot; +import appeng.tile.qnb.QuantumBridgeTileEntity; -public class ContainerQNB extends AEBaseContainer { +public class QNBContainer extends AEBaseContainer { - public static ContainerType TYPE; + public static ContainerType TYPE; - private static final ContainerHelper helper = new ContainerHelper<>( - ContainerQNB::new, TileQuantumBridge.class, SecurityPermissions.BUILD); + private static final ContainerHelper helper = new ContainerHelper<>( + QNBContainer::new, QuantumBridgeTileEntity.class, SecurityPermissions.BUILD); - public static ContainerQNB fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { + public static QNBContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { return helper.fromNetwork(windowId, inv, buf); } @@ -44,10 +44,10 @@ public class ContainerQNB extends AEBaseContainer { return helper.open(player, locator); } - public ContainerQNB(int id, final PlayerInventory ip, final TileQuantumBridge quantumBridge) { + public QNBContainer(int id, final PlayerInventory ip, final QuantumBridgeTileEntity quantumBridge) { super(TYPE, id, ip, quantumBridge, null); - this.addSlot((new SlotRestrictedInput(SlotRestrictedInput.PlacableItemType.QE_SINGULARITY, + this.addSlot((new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.QE_SINGULARITY, quantumBridge.getInternalInventory(), 0, 80, 37, this.getPlayerInventory())).setStackLimit(1)); this.bindPlayerInventory(ip, 0, 166 - /* height of player inventory */82); diff --git a/src/main/java/appeng/container/implementations/ContainerQuartzKnife.java b/src/main/java/appeng/container/implementations/QuartzKnifeContainer.java similarity index 80% rename from src/main/java/appeng/container/implementations/ContainerQuartzKnife.java rename to src/main/java/appeng/container/implementations/QuartzKnifeContainer.java index 00712f9e7..077205b5e 100644 --- a/src/main/java/appeng/container/implementations/ContainerQuartzKnife.java +++ b/src/main/java/appeng/container/implementations/QuartzKnifeContainer.java @@ -33,21 +33,21 @@ import net.minecraftforge.items.IItemHandler; import appeng.api.AEApi; import appeng.container.AEBaseContainer; import appeng.container.ContainerLocator; -import appeng.container.slot.SlotOutput; -import appeng.container.slot.SlotRestrictedInput; +import appeng.container.slot.OutputSlot; +import appeng.container.slot.RestrictedInputSlot; import appeng.items.contents.QuartzKnifeObj; -import appeng.items.materials.ItemMaterial; +import appeng.items.materials.MaterialItem; import appeng.tile.inventory.AppEngInternalInventory; import appeng.util.Platform; -public class ContainerQuartzKnife extends AEBaseContainer { +public class QuartzKnifeContainer extends AEBaseContainer { - public static ContainerType TYPE; + public static ContainerType TYPE; - private static final ContainerHelper helper = new ContainerHelper<>( - ContainerQuartzKnife::new, QuartzKnifeObj.class); + private static final ContainerHelper helper = new ContainerHelper<>( + QuartzKnifeContainer::new, QuartzKnifeObj.class); - public static ContainerQuartzKnife fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { + public static QuartzKnifeContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { return helper.fromNetwork(windowId, inv, buf); } @@ -60,12 +60,12 @@ public class ContainerQuartzKnife extends AEBaseContainer { private final IItemHandler inSlot = new AppEngInternalInventory(null, 1, 1); private String myName = ""; - public ContainerQuartzKnife(int id, final PlayerInventory ip, final QuartzKnifeObj te) { + public QuartzKnifeContainer(int id, final PlayerInventory ip, final QuartzKnifeObj te) { super(TYPE, id, ip, null, null); this.toolInv = te; this.addSlot( - new SlotRestrictedInput(SlotRestrictedInput.PlacableItemType.METAL_INGOTS, this.inSlot, 0, 94, 44, ip)); + new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.METAL_INGOTS, this.inSlot, 0, 94, 44, ip)); this.addSlot(new QuartzKniveSlot(this.inSlot, 0, 134, 44, -1)); this.lockPlayerInventorySlot(ip.currentItem); @@ -104,7 +104,7 @@ public class ContainerQuartzKnife extends AEBaseContainer { } } - private class QuartzKniveSlot extends SlotOutput { + private class QuartzKniveSlot extends OutputSlot { QuartzKniveSlot(IItemHandler a, int b, int c, int d, int i) { super(a, b, c, d, i); } @@ -117,11 +117,11 @@ public class ContainerQuartzKnife extends AEBaseContainer { return ItemStack.EMPTY; } - if (SlotRestrictedInput.isMetalIngot(input)) { - if (ContainerQuartzKnife.this.myName.length() > 0) { + if (RestrictedInputSlot.isMetalIngot(input)) { + if (QuartzKnifeContainer.this.myName.length() > 0) { return AEApi.instance().definitions().materials().namePress().maybeStack(1).map(namePressStack -> { final CompoundNBT compound = namePressStack.getOrCreateTag(); - compound.putString(ItemMaterial.TAG_INSCRIBE_NAME, ContainerQuartzKnife.this.myName); + compound.putString(MaterialItem.TAG_INSCRIBE_NAME, QuartzKnifeContainer.this.myName); return namePressStack; }).orElse(ItemStack.EMPTY); @@ -150,16 +150,16 @@ public class ContainerQuartzKnife extends AEBaseContainer { private void makePlate() { if (Platform.isServer()) { if (!this.getItemHandler().extractItem(0, 1, false).isEmpty()) { - final ItemStack item = ContainerQuartzKnife.this.toolInv.getItemStack(); + final ItemStack item = QuartzKnifeContainer.this.toolInv.getItemStack(); final ItemStack before = item.copy(); - item.damageItem(1, ContainerQuartzKnife.this.getPlayerInv().player, p -> { - ContainerQuartzKnife.this.getPlayerInv().setInventorySlotContents( - ContainerQuartzKnife.this.getPlayerInv().currentItem, ItemStack.EMPTY); + item.damageItem(1, QuartzKnifeContainer.this.getPlayerInv().player, p -> { + QuartzKnifeContainer.this.getPlayerInv().setInventorySlotContents( + QuartzKnifeContainer.this.getPlayerInv().currentItem, ItemStack.EMPTY); MinecraftForge.EVENT_BUS.post(new PlayerDestroyItemEvent( - ContainerQuartzKnife.this.getPlayerInv().player, before, null)); + QuartzKnifeContainer.this.getPlayerInv().player, before, null)); }); - ContainerQuartzKnife.this.detectAndSendChanges(); + QuartzKnifeContainer.this.detectAndSendChanges(); } } } diff --git a/src/main/java/appeng/container/implementations/ContainerSecurityStation.java b/src/main/java/appeng/container/implementations/SecurityStationContainer.java similarity index 83% rename from src/main/java/appeng/container/implementations/ContainerSecurityStation.java rename to src/main/java/appeng/container/implementations/SecurityStationContainer.java index 4cbe49181..bfdf27c06 100644 --- a/src/main/java/appeng/container/implementations/ContainerSecurityStation.java +++ b/src/main/java/appeng/container/implementations/SecurityStationContainer.java @@ -34,47 +34,47 @@ import appeng.api.implementations.items.IBiometricCard; import appeng.api.storage.ITerminalHost; import appeng.container.ContainerLocator; import appeng.container.guisync.GuiSync; -import appeng.container.slot.SlotOutput; -import appeng.container.slot.SlotRestrictedInput; +import appeng.container.slot.OutputSlot; +import appeng.container.slot.RestrictedInputSlot; import appeng.tile.inventory.AppEngInternalInventory; -import appeng.tile.misc.TileSecurityStation; +import appeng.tile.misc.SecurityStationTileEntity; import appeng.util.inv.IAEAppEngInventory; import appeng.util.inv.InvOperation; -public class ContainerSecurityStation extends ContainerMEMonitorable implements IAEAppEngInventory { +public class SecurityStationContainer extends MEMonitorableContainer implements IAEAppEngInventory { - public static ContainerType TYPE; + public static ContainerType TYPE; - private static final ContainerHelper helper = new ContainerHelper<>( - ContainerSecurityStation::new, ITerminalHost.class, SecurityPermissions.SECURITY); + private static final ContainerHelper helper = new ContainerHelper<>( + SecurityStationContainer::new, ITerminalHost.class, SecurityPermissions.SECURITY); - private final SlotRestrictedInput configSlot; + private final RestrictedInputSlot configSlot; private final AppEngInternalInventory wirelessEncoder = new AppEngInternalInventory(this, 2); - private final SlotRestrictedInput wirelessIn; - private final SlotOutput wirelessOut; + private final RestrictedInputSlot wirelessIn; + private final OutputSlot wirelessOut; - private final TileSecurityStation securityBox; + private final SecurityStationTileEntity securityBox; @GuiSync(0) public int permissionMode = 0; - public ContainerSecurityStation(int id, final PlayerInventory ip, final ITerminalHost monitorable) { + public SecurityStationContainer(int id, final PlayerInventory ip, final ITerminalHost monitorable) { super(TYPE, id, ip, monitorable, false); - this.securityBox = (TileSecurityStation) monitorable; + this.securityBox = (SecurityStationTileEntity) monitorable; - this.addSlot(this.configSlot = new SlotRestrictedInput(SlotRestrictedInput.PlacableItemType.BIOMETRIC_CARD, + this.addSlot(this.configSlot = new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.BIOMETRIC_CARD, this.securityBox.getConfigSlot(), 0, 37, -33, ip)); - this.addSlot(this.wirelessIn = new SlotRestrictedInput(SlotRestrictedInput.PlacableItemType.ENCODABLE_ITEM, + this.addSlot(this.wirelessIn = new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.ENCODABLE_ITEM, this.wirelessEncoder, 0, 212, 10, ip)); - this.addSlot(this.wirelessOut = new SlotOutput(this.wirelessEncoder, 1, 212, 68, -1)); + this.addSlot(this.wirelessOut = new OutputSlot(this.wirelessEncoder, 1, 212, 68, -1)); this.bindPlayerInventory(ip, 0, 0); } - public static ContainerSecurityStation fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { + public static SecurityStationContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { return helper.fromNetwork(windowId, inv, buf); } diff --git a/src/main/java/appeng/container/implementations/ContainerSkyChest.java b/src/main/java/appeng/container/implementations/SkyChestContainer.java similarity index 75% rename from src/main/java/appeng/container/implementations/ContainerSkyChest.java rename to src/main/java/appeng/container/implementations/SkyChestContainer.java index bec5696d0..cef59e279 100644 --- a/src/main/java/appeng/container/implementations/ContainerSkyChest.java +++ b/src/main/java/appeng/container/implementations/SkyChestContainer.java @@ -25,25 +25,25 @@ import net.minecraft.network.PacketBuffer; import appeng.container.AEBaseContainer; import appeng.container.ContainerLocator; -import appeng.container.slot.SlotNormal; -import appeng.tile.storage.TileSkyChest; +import appeng.container.slot.NormalSlot; +import appeng.tile.storage.SkyChestTileEntity; -public class ContainerSkyChest extends AEBaseContainer { +public class SkyChestContainer extends AEBaseContainer { - public static ContainerType TYPE; + public static ContainerType TYPE; - private static final ContainerHelper helper = new ContainerHelper<>( - ContainerSkyChest::new, TileSkyChest.class); + private static final ContainerHelper helper = new ContainerHelper<>( + SkyChestContainer::new, SkyChestTileEntity.class); - private final TileSkyChest chest; + private final SkyChestTileEntity chest; - public ContainerSkyChest(int id, final PlayerInventory ip, final TileSkyChest chest) { + public SkyChestContainer(int id, final PlayerInventory ip, final SkyChestTileEntity chest) { super(TYPE, id, ip, chest, null); this.chest = chest; for (int y = 0; y < 4; y++) { for (int x = 0; x < 9; x++) { - this.addSlot(new SlotNormal(this.chest.getInternalInventory(), y * 9 + x, 8 + 18 * x, 24 + 18 * y)); + this.addSlot(new NormalSlot(this.chest.getInternalInventory(), y * 9 + x, 8 + 18 * x, 24 + 18 * y)); } } @@ -52,7 +52,7 @@ public class ContainerSkyChest extends AEBaseContainer { this.bindPlayerInventory(ip, 0, 195 - /* height of player inventory */82); } - public static ContainerSkyChest fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { + public static SkyChestContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { return helper.fromNetwork(windowId, inv, buf); } diff --git a/src/main/java/appeng/container/implementations/ContainerSpatialIOPort.java b/src/main/java/appeng/container/implementations/SpatialIOPortContainer.java similarity index 84% rename from src/main/java/appeng/container/implementations/ContainerSpatialIOPort.java rename to src/main/java/appeng/container/implementations/SpatialIOPortContainer.java index 1230d8154..e6fe36bea 100644 --- a/src/main/java/appeng/container/implementations/ContainerSpatialIOPort.java +++ b/src/main/java/appeng/container/implementations/SpatialIOPortContainer.java @@ -32,17 +32,17 @@ import appeng.api.util.DimensionalCoord; import appeng.container.AEBaseContainer; import appeng.container.ContainerLocator; import appeng.container.guisync.GuiSync; -import appeng.container.slot.SlotOutput; -import appeng.container.slot.SlotRestrictedInput; -import appeng.tile.spatial.TileSpatialIOPort; +import appeng.container.slot.OutputSlot; +import appeng.container.slot.RestrictedInputSlot; +import appeng.tile.spatial.SpatialIOPortTileEntity; import appeng.util.Platform; -public class ContainerSpatialIOPort extends AEBaseContainer { +public class SpatialIOPortContainer extends AEBaseContainer { - public static ContainerType TYPE; + public static ContainerType TYPE; - private static final ContainerHelper helper = new ContainerHelper<>( - ContainerSpatialIOPort::new, TileSpatialIOPort.class, SecurityPermissions.BUILD); + private static final ContainerHelper helper = new ContainerHelper<>( + SpatialIOPortContainer::new, SpatialIOPortTileEntity.class, SecurityPermissions.BUILD); @GuiSync(0) public long currentPower; @@ -62,22 +62,22 @@ public class ContainerSpatialIOPort extends AEBaseContainer { @GuiSync(33) public int zSize; - public ContainerSpatialIOPort(int id, final PlayerInventory ip, final TileSpatialIOPort spatialIOPort) { + public SpatialIOPortContainer(int id, final PlayerInventory ip, final SpatialIOPortTileEntity spatialIOPort) { super(TYPE, id, ip, spatialIOPort, null); if (Platform.isServer()) { this.network = spatialIOPort.getGridNode(AEPartLocation.INTERNAL).getGrid(); } - this.addSlot(new SlotRestrictedInput(SlotRestrictedInput.PlacableItemType.SPATIAL_STORAGE_CELLS, + this.addSlot(new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.SPATIAL_STORAGE_CELLS, spatialIOPort.getInternalInventory(), 0, 52, 48, this.getPlayerInventory())); - this.addSlot(new SlotOutput(spatialIOPort.getInternalInventory(), 1, 113, 48, - SlotRestrictedInput.PlacableItemType.SPATIAL_STORAGE_CELLS.IIcon)); + this.addSlot(new OutputSlot(spatialIOPort.getInternalInventory(), 1, 113, 48, + RestrictedInputSlot.PlacableItemType.SPATIAL_STORAGE_CELLS.IIcon)); this.bindPlayerInventory(ip, 0, 197 - /* height of player inventory */82); } - public static ContainerSpatialIOPort fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { + public static SpatialIOPortContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { return helper.fromNetwork(windowId, inv, buf); } diff --git a/src/main/java/appeng/container/implementations/ContainerStorageBus.java b/src/main/java/appeng/container/implementations/StorageBusContainer.java similarity index 84% rename from src/main/java/appeng/container/implementations/ContainerStorageBus.java rename to src/main/java/appeng/container/implementations/StorageBusContainer.java index fd4a43281..77469ce31 100644 --- a/src/main/java/appeng/container/implementations/ContainerStorageBus.java +++ b/src/main/java/appeng/container/implementations/StorageBusContainer.java @@ -40,22 +40,22 @@ import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IItemList; import appeng.container.ContainerLocator; import appeng.container.guisync.GuiSync; -import appeng.container.slot.OptionalSlotFakeTypeOnly; -import appeng.container.slot.SlotFakeTypeOnly; -import appeng.container.slot.SlotRestrictedInput; -import appeng.parts.misc.PartStorageBus; +import appeng.container.slot.OptionalTypeOnlyFakeSlot; +import appeng.container.slot.FakeTypeOnlySlot; +import appeng.container.slot.RestrictedInputSlot; +import appeng.parts.misc.StorageBusPart; import appeng.util.Platform; import appeng.util.helpers.ItemHandlerUtil; import appeng.util.iterators.NullIterator; -public class ContainerStorageBus extends ContainerUpgradeable { +public class StorageBusContainer extends UpgradeableContainer { - public static ContainerType TYPE; + public static ContainerType TYPE; - private static final ContainerHelper helper = new ContainerHelper<>( - ContainerStorageBus::new, PartStorageBus.class, SecurityPermissions.BUILD); + private static final ContainerHelper helper = new ContainerHelper<>( + StorageBusContainer::new, StorageBusPart.class, SecurityPermissions.BUILD); - public static ContainerStorageBus fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { + public static StorageBusContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { return helper.fromNetwork(windowId, inv, buf); } @@ -63,7 +63,7 @@ public class ContainerStorageBus extends ContainerUpgradeable { return helper.open(player, locator); } - private final PartStorageBus storageBus; + private final StorageBusPart storageBus; @GuiSync(3) public AccessRestriction rwMode = AccessRestriction.READ_WRITE; @@ -71,7 +71,7 @@ public class ContainerStorageBus extends ContainerUpgradeable { @GuiSync(4) public StorageFilter storageFilter = StorageFilter.EXTRACTABLE_ONLY; - public ContainerStorageBus(int id, final PlayerInventory ip, final PartStorageBus te) { + public StorageBusContainer(int id, final PlayerInventory ip, final StorageBusPart te) { super(TYPE, id, ip, te); this.storageBus = te; } @@ -90,23 +90,23 @@ public class ContainerStorageBus extends ContainerUpgradeable { for (int y = 0; y < 7; y++) { for (int x = 0; x < 9; x++) { if (y < 2) { - this.addSlot(new SlotFakeTypeOnly(config, y * 9 + x, xo + x * 18, yo + y * 18)); + this.addSlot(new FakeTypeOnlySlot(config, y * 9 + x, xo + x * 18, yo + y * 18)); } else { - this.addSlot(new OptionalSlotFakeTypeOnly(config, this, y * 9 + x, xo, yo, x, y, y - 2)); + this.addSlot(new OptionalTypeOnlyFakeSlot(config, this, y * 9 + x, xo, yo, x, y, y - 2)); } } } final IItemHandler upgrades = this.getUpgradeable().getInventoryByName("upgrades"); - this.addSlot((new SlotRestrictedInput(SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 0, 187, 8, + this.addSlot((new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.UPGRADES, upgrades, 0, 187, 8, this.getPlayerInventory())).setNotDraggable()); - this.addSlot((new SlotRestrictedInput(SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 1, 187, 8 + 18, + this.addSlot((new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.UPGRADES, upgrades, 1, 187, 8 + 18, this.getPlayerInventory())).setNotDraggable()); - this.addSlot((new SlotRestrictedInput(SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 2, 187, + this.addSlot((new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.UPGRADES, upgrades, 2, 187, 8 + 18 * 2, this.getPlayerInventory())).setNotDraggable()); - this.addSlot((new SlotRestrictedInput(SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 3, 187, + this.addSlot((new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.UPGRADES, upgrades, 3, 187, 8 + 18 * 3, this.getPlayerInventory())).setNotDraggable()); - this.addSlot((new SlotRestrictedInput(SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 4, 187, + this.addSlot((new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.UPGRADES, upgrades, 4, 187, 8 + 18 * 4, this.getPlayerInventory())).setNotDraggable()); } diff --git a/src/main/java/appeng/container/implementations/ContainerUpgradeable.java b/src/main/java/appeng/container/implementations/UpgradeableContainer.java similarity index 80% rename from src/main/java/appeng/container/implementations/ContainerUpgradeable.java rename to src/main/java/appeng/container/implementations/UpgradeableContainer.java index 8045cb78e..92a37712d 100644 --- a/src/main/java/appeng/container/implementations/ContainerUpgradeable.java +++ b/src/main/java/appeng/container/implementations/UpgradeableContainer.java @@ -44,23 +44,23 @@ import appeng.container.AEBaseContainer; import appeng.container.ContainerLocator; import appeng.container.guisync.GuiSync; import appeng.container.slot.IOptionalSlotHost; -import appeng.container.slot.OptionalSlotFake; -import appeng.container.slot.OptionalSlotFakeTypeOnly; -import appeng.container.slot.SlotFakeTypeOnly; -import appeng.container.slot.SlotRestrictedInput; +import appeng.container.slot.OptionalFakeSlot; +import appeng.container.slot.OptionalTypeOnlyFakeSlot; +import appeng.container.slot.FakeTypeOnlySlot; +import appeng.container.slot.RestrictedInputSlot; import appeng.items.contents.NetworkToolViewer; -import appeng.items.tools.ToolNetworkTool; -import appeng.parts.automation.PartExportBus; +import appeng.items.tools.NetworkToolItem; +import appeng.parts.automation.ExportBusPart; import appeng.util.Platform; -public class ContainerUpgradeable extends AEBaseContainer implements IOptionalSlotHost { +public class UpgradeableContainer extends AEBaseContainer implements IOptionalSlotHost { - public static ContainerType TYPE; + public static ContainerType TYPE; - private static final ContainerHelper helper = new ContainerHelper<>( - ContainerUpgradeable::new, IUpgradeableHost.class, SecurityPermissions.BUILD); + private static final ContainerHelper helper = new ContainerHelper<>( + UpgradeableContainer::new, IUpgradeableHost.class, SecurityPermissions.BUILD); - public static ContainerUpgradeable fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { + public static UpgradeableContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { return helper.fromNetwork(windowId, inv, buf); } @@ -80,12 +80,12 @@ public class ContainerUpgradeable extends AEBaseContainer implements IOptionalSl private int tbSlot; private NetworkToolViewer tbInventory; - public ContainerUpgradeable(int id, final PlayerInventory ip, final IUpgradeableHost te) { + public UpgradeableContainer(int id, final PlayerInventory ip, final IUpgradeableHost te) { this(TYPE, id, ip, te); } - public ContainerUpgradeable(ContainerType containerType, int id, final PlayerInventory ip, - final IUpgradeableHost te) { + public UpgradeableContainer(ContainerType containerType, int id, final PlayerInventory ip, + final IUpgradeableHost te) { super(containerType, id, ip, (TileEntity) (te instanceof TileEntity ? te : null), (IPart) (te instanceof IPart ? te : null)); this.upgradeable = te; @@ -114,7 +114,7 @@ public class ContainerUpgradeable extends AEBaseContainer implements IOptionalSl final IInventory pi = this.getPlayerInv(); for (int x = 0; x < pi.getSizeInventory(); x++) { final ItemStack pii = pi.getStackInSlot(x); - if (!pii.isEmpty() && pii.getItem() instanceof ToolNetworkTool) { + if (!pii.isEmpty() && pii.getItem() instanceof NetworkToolItem) { this.lockPlayerInventorySlot(x); this.tbSlot = x; this.tbInventory = (NetworkToolViewer) ((IGuiItem) pii.getItem()).getGuiObject(pii, x, w, @@ -126,7 +126,7 @@ public class ContainerUpgradeable extends AEBaseContainer implements IOptionalSl if (this.hasToolbox()) { for (int v = 0; v < 3; v++) { for (int u = 0; u < 3; u++) { - this.addSlot((new SlotRestrictedInput(SlotRestrictedInput.PlacableItemType.UPGRADES, + this.addSlot((new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.UPGRADES, this.tbInventory.getInternalInventory(), u + v * 3, 186 + u * 18, this.getHeight() - 82 + v * 18, this.getPlayerInventory())).setPlayerSide()); } @@ -152,37 +152,37 @@ public class ContainerUpgradeable extends AEBaseContainer implements IOptionalSl final IItemHandler inv = this.getUpgradeable().getInventoryByName("config"); final int y = 40; final int x = 80; - this.addSlot(new SlotFakeTypeOnly(inv, 0, x, y)); + this.addSlot(new FakeTypeOnlySlot(inv, 0, x, y)); if (this.supportCapacity()) { - this.addSlot(new OptionalSlotFakeTypeOnly(inv, this, 1, x, y, -1, 0, 1)); - this.addSlot(new OptionalSlotFakeTypeOnly(inv, this, 2, x, y, 1, 0, 1)); - this.addSlot(new OptionalSlotFakeTypeOnly(inv, this, 3, x, y, 0, -1, 1)); - this.addSlot(new OptionalSlotFakeTypeOnly(inv, this, 4, x, y, 0, 1, 1)); + this.addSlot(new OptionalTypeOnlyFakeSlot(inv, this, 1, x, y, -1, 0, 1)); + this.addSlot(new OptionalTypeOnlyFakeSlot(inv, this, 2, x, y, 1, 0, 1)); + this.addSlot(new OptionalTypeOnlyFakeSlot(inv, this, 3, x, y, 0, -1, 1)); + this.addSlot(new OptionalTypeOnlyFakeSlot(inv, this, 4, x, y, 0, 1, 1)); - this.addSlot(new OptionalSlotFakeTypeOnly(inv, this, 5, x, y, -1, -1, 2)); - this.addSlot(new OptionalSlotFakeTypeOnly(inv, this, 6, x, y, 1, -1, 2)); - this.addSlot(new OptionalSlotFakeTypeOnly(inv, this, 7, x, y, -1, 1, 2)); - this.addSlot(new OptionalSlotFakeTypeOnly(inv, this, 8, x, y, 1, 1, 2)); + this.addSlot(new OptionalTypeOnlyFakeSlot(inv, this, 5, x, y, -1, -1, 2)); + this.addSlot(new OptionalTypeOnlyFakeSlot(inv, this, 6, x, y, 1, -1, 2)); + this.addSlot(new OptionalTypeOnlyFakeSlot(inv, this, 7, x, y, -1, 1, 2)); + this.addSlot(new OptionalTypeOnlyFakeSlot(inv, this, 8, x, y, 1, 1, 2)); } } protected void setupUpgrades() { final IItemHandler upgrades = this.getUpgradeable().getInventoryByName("upgrades"); if (this.availableUpgrades() > 0) { - this.addSlot((new SlotRestrictedInput(SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 0, 187, 8, + this.addSlot((new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.UPGRADES, upgrades, 0, 187, 8, this.getPlayerInventory())).setNotDraggable()); } if (this.availableUpgrades() > 1) { - this.addSlot((new SlotRestrictedInput(SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 1, 187, + this.addSlot((new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.UPGRADES, upgrades, 1, 187, 8 + 18, this.getPlayerInventory())).setNotDraggable()); } if (this.availableUpgrades() > 2) { - this.addSlot((new SlotRestrictedInput(SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 2, 187, + this.addSlot((new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.UPGRADES, upgrades, 2, 187, 8 + 18 * 2, this.getPlayerInventory())).setNotDraggable()); } if (this.availableUpgrades() > 3) { - this.addSlot((new SlotRestrictedInput(SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 3, 187, + this.addSlot((new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.UPGRADES, upgrades, 3, 187, 8 + 18 * 3, this.getPlayerInventory())).setNotDraggable()); } } @@ -207,8 +207,8 @@ public class ContainerUpgradeable extends AEBaseContainer implements IOptionalSl this.checkToolbox(); for (final Object o : this.inventorySlots) { - if (o instanceof OptionalSlotFake) { - final OptionalSlotFake fs = (OptionalSlotFake) o; + if (o instanceof OptionalFakeSlot) { + final OptionalFakeSlot fs = (OptionalFakeSlot) o; if (!fs.isSlotEnabled() && !fs.getDisplayStack().isEmpty()) { fs.clearStack(); } @@ -221,7 +221,7 @@ public class ContainerUpgradeable extends AEBaseContainer implements IOptionalSl protected void loadSettingsFromHost(final IConfigManager cm) { this.setFuzzyMode((FuzzyMode) cm.getSetting(Settings.FUZZY_MODE)); this.setRedStoneMode((RedstoneMode) cm.getSetting(Settings.REDSTONE_CONTROLLED)); - if (this.getUpgradeable() instanceof PartExportBus) { + if (this.getUpgradeable() instanceof ExportBusPart) { this.setCraftingMode((YesNo) cm.getSetting(Settings.CRAFT_ONLY)); this.setSchedulingMode((SchedulingMode) cm.getSetting(Settings.SCHEDULING_MODE)); } diff --git a/src/main/java/appeng/container/implementations/ContainerVibrationChamber.java b/src/main/java/appeng/container/implementations/VibrationChamberContainer.java similarity index 76% rename from src/main/java/appeng/container/implementations/ContainerVibrationChamber.java rename to src/main/java/appeng/container/implementations/VibrationChamberContainer.java index cb66deef9..9f02101ee 100644 --- a/src/main/java/appeng/container/implementations/ContainerVibrationChamber.java +++ b/src/main/java/appeng/container/implementations/VibrationChamberContainer.java @@ -27,18 +27,18 @@ import appeng.container.AEBaseContainer; import appeng.container.ContainerLocator; import appeng.container.guisync.GuiSync; import appeng.container.interfaces.IProgressProvider; -import appeng.container.slot.SlotRestrictedInput; -import appeng.tile.misc.TileVibrationChamber; +import appeng.container.slot.RestrictedInputSlot; +import appeng.tile.misc.VibrationChamberTileEntity; import appeng.util.Platform; -public class ContainerVibrationChamber extends AEBaseContainer implements IProgressProvider { +public class VibrationChamberContainer extends AEBaseContainer implements IProgressProvider { - public static ContainerType TYPE; + public static ContainerType TYPE; - private static final ContainerHelper helper = new ContainerHelper<>( - ContainerVibrationChamber::new, TileVibrationChamber.class); + private static final ContainerHelper helper = new ContainerHelper<>( + VibrationChamberContainer::new, VibrationChamberTileEntity.class); - public static ContainerVibrationChamber fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { + public static VibrationChamberContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { return helper.fromNetwork(windowId, inv, buf); } @@ -46,17 +46,17 @@ public class ContainerVibrationChamber extends AEBaseContainer implements IProgr return helper.open(player, locator); } - private final TileVibrationChamber vibrationChamber; + private final VibrationChamberTileEntity vibrationChamber; @GuiSync(0) public int burnSpeed = 0; @GuiSync(1) public int remainingBurnTime = 0; - public ContainerVibrationChamber(int id, final PlayerInventory ip, final TileVibrationChamber vibrationChamber) { + public VibrationChamberContainer(int id, final PlayerInventory ip, final VibrationChamberTileEntity vibrationChamber) { super(TYPE, id, ip, vibrationChamber, null); this.vibrationChamber = vibrationChamber; - this.addSlot(new SlotRestrictedInput(SlotRestrictedInput.PlacableItemType.FUEL, + this.addSlot(new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.FUEL, vibrationChamber.getInternalInventory(), 0, 80, 37, this.getPlayerInventory())); this.bindPlayerInventory(ip, 0, 166 - /* height of player inventory */82); @@ -84,6 +84,6 @@ public class ContainerVibrationChamber extends AEBaseContainer implements IProgr @Override public int getMaxProgress() { - return TileVibrationChamber.MAX_BURN_SPEED; + return VibrationChamberTileEntity.MAX_BURN_SPEED; } } diff --git a/src/main/java/appeng/container/implementations/ContainerWireless.java b/src/main/java/appeng/container/implementations/WirelessContainer.java similarity index 77% rename from src/main/java/appeng/container/implementations/ContainerWireless.java rename to src/main/java/appeng/container/implementations/WirelessContainer.java index ecba86b4f..ecd6438ef 100644 --- a/src/main/java/appeng/container/implementations/ContainerWireless.java +++ b/src/main/java/appeng/container/implementations/WirelessContainer.java @@ -27,18 +27,18 @@ import appeng.api.config.SecurityPermissions; import appeng.container.AEBaseContainer; import appeng.container.ContainerLocator; import appeng.container.guisync.GuiSync; -import appeng.container.slot.SlotRestrictedInput; +import appeng.container.slot.RestrictedInputSlot; import appeng.core.AEConfig; -import appeng.tile.networking.TileWireless; +import appeng.tile.networking.WirelessTileEntity; -public class ContainerWireless extends AEBaseContainer { +public class WirelessContainer extends AEBaseContainer { - public static ContainerType TYPE; + public static ContainerType TYPE; - private static final ContainerHelper helper = new ContainerHelper<>( - ContainerWireless::new, TileWireless.class, SecurityPermissions.BUILD); + private static final ContainerHelper helper = new ContainerHelper<>( + WirelessContainer::new, WirelessTileEntity.class, SecurityPermissions.BUILD); - public static ContainerWireless fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { + public static WirelessContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { return helper.fromNetwork(windowId, inv, buf); } @@ -46,16 +46,16 @@ public class ContainerWireless extends AEBaseContainer { return helper.open(player, locator); } - private final SlotRestrictedInput boosterSlot; + private final RestrictedInputSlot boosterSlot; @GuiSync(1) public long range = 0; @GuiSync(2) public long drain = 0; - public ContainerWireless(int id, final PlayerInventory ip, final TileWireless te) { + public WirelessContainer(int id, final PlayerInventory ip, final WirelessTileEntity te) { super(TYPE, id, ip, te, null); - this.addSlot(this.boosterSlot = new SlotRestrictedInput(SlotRestrictedInput.PlacableItemType.RANGE_BOOSTER, + this.addSlot(this.boosterSlot = new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.RANGE_BOOSTER, te.getInternalInventory(), 0, 80, 47, this.getPlayerInventory())); this.bindPlayerInventory(ip, 0, 166 - /* height of player inventory */82); diff --git a/src/main/java/appeng/container/implementations/ContainerWirelessTerm.java b/src/main/java/appeng/container/implementations/WirelessTermContainer.java similarity index 85% rename from src/main/java/appeng/container/implementations/ContainerWirelessTerm.java rename to src/main/java/appeng/container/implementations/WirelessTermContainer.java index 32f70e85b..0c6459941 100644 --- a/src/main/java/appeng/container/implementations/ContainerWirelessTerm.java +++ b/src/main/java/appeng/container/implementations/WirelessTermContainer.java @@ -29,14 +29,14 @@ import appeng.core.localization.PlayerMessages; import appeng.helpers.WirelessTerminalGuiObject; import appeng.util.Platform; -public class ContainerWirelessTerm extends ContainerMEPortableCell { +public class WirelessTermContainer extends MEPortableCellContainer { - public static ContainerType TYPE; + public static ContainerType TYPE; - private static final ContainerHelper helper = new ContainerHelper<>( - ContainerWirelessTerm::new, WirelessTerminalGuiObject.class); + private static final ContainerHelper helper = new ContainerHelper<>( + WirelessTermContainer::new, WirelessTerminalGuiObject.class); - public static ContainerWirelessTerm fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { + public static WirelessTermContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { return helper.fromNetwork(windowId, inv, buf); } @@ -46,7 +46,7 @@ public class ContainerWirelessTerm extends ContainerMEPortableCell { private final WirelessTerminalGuiObject wirelessTerminalGUIObject; - public ContainerWirelessTerm(int id, final PlayerInventory ip, final WirelessTerminalGuiObject gui) { + public WirelessTermContainer(int id, final PlayerInventory ip, final WirelessTerminalGuiObject gui) { super(TYPE, id, ip, gui); this.wirelessTerminalGUIObject = gui; } diff --git a/src/main/java/appeng/container/interfaces/IProgressProvider.java b/src/main/java/appeng/container/interfaces/IProgressProvider.java index 44868d2f6..7d1e5e3c0 100644 --- a/src/main/java/appeng/container/interfaces/IProgressProvider.java +++ b/src/main/java/appeng/container/interfaces/IProgressProvider.java @@ -18,11 +18,13 @@ package appeng.container.interfaces; +import appeng.client.gui.widgets.ProgressBar; + /** * This interface provides the data for anything simulating a progress. * * Its main use is in combination with the - * {@link appeng.client.gui.widgets.GuiProgressBar}, which ensures to scale it + * {@link ProgressBar}, which ensures to scale it * to a percentage of 0 to 100. */ public interface IProgressProvider { diff --git a/src/main/java/appeng/container/slot/SlotCraftingMatrix.java b/src/main/java/appeng/container/slot/CraftingMatrixSlot.java similarity index 91% rename from src/main/java/appeng/container/slot/SlotCraftingMatrix.java rename to src/main/java/appeng/container/slot/CraftingMatrixSlot.java index 9ad28e7bc..60d204c3a 100644 --- a/src/main/java/appeng/container/slot/SlotCraftingMatrix.java +++ b/src/main/java/appeng/container/slot/CraftingMatrixSlot.java @@ -25,12 +25,12 @@ import net.minecraftforge.items.IItemHandler; import appeng.container.AEBaseContainer; import appeng.util.inv.WrapperInvItemHandler; -public class SlotCraftingMatrix extends AppEngSlot { +public class CraftingMatrixSlot extends AppEngSlot { private final AEBaseContainer c; private final IInventory wrappedInventory; - public SlotCraftingMatrix(final AEBaseContainer c, final IItemHandler par1iInventory, final int par2, - final int par3, final int par4) { + public CraftingMatrixSlot(final AEBaseContainer c, final IItemHandler par1iInventory, final int par2, + final int par3, final int par4) { super(par1iInventory, par2, par3, par4); this.c = c; this.wrappedInventory = new WrapperInvItemHandler(par1iInventory); diff --git a/src/main/java/appeng/container/slot/SlotCraftingTerm.java b/src/main/java/appeng/container/slot/CraftingTermSlot.java similarity index 92% rename from src/main/java/appeng/container/slot/SlotCraftingTerm.java rename to src/main/java/appeng/container/slot/CraftingTermSlot.java index fef6e53bb..8a1939b92 100644 --- a/src/main/java/appeng/container/slot/SlotCraftingTerm.java +++ b/src/main/java/appeng/container/slot/CraftingTermSlot.java @@ -43,10 +43,10 @@ import appeng.api.storage.channels.IItemStorageChannel; import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IItemList; import appeng.container.ContainerNull; -import appeng.container.implementations.ContainerCraftingTerm; +import appeng.container.implementations.CraftingTermContainer; import appeng.helpers.IContainerCraftingPacket; import appeng.helpers.InventoryAction; -import appeng.items.storage.ItemViewCell; +import appeng.items.storage.ViewCellItem; import appeng.util.InventoryAdaptor; import appeng.util.Platform; import appeng.util.helpers.ItemHandlerUtil; @@ -55,7 +55,7 @@ import appeng.util.inv.WrapperCursorItemHandler; import appeng.util.inv.WrapperInvItemHandler; import appeng.util.item.AEItemStack; -public class SlotCraftingTerm extends AppEngCraftingSlot { +public class CraftingTermSlot extends AppEngCraftingSlot { private final IItemHandler craftInv; private final IItemHandler pattern; @@ -65,9 +65,9 @@ public class SlotCraftingTerm extends AppEngCraftingSlot { private final IStorageMonitorable storage; private final IContainerCraftingPacket container; - public SlotCraftingTerm(final PlayerEntity player, final IActionSource mySrc, final IEnergySource energySrc, - final IStorageMonitorable storage, final IItemHandler cMatrix, final IItemHandler secondMatrix, - final IItemHandler output, final int x, final int y, final IContainerCraftingPacket ccp) { + public CraftingTermSlot(final PlayerEntity player, final IActionSource mySrc, final IEnergySource energySrc, + final IStorageMonitorable storage, final IItemHandler cMatrix, final IItemHandler secondMatrix, + final IItemHandler output, final int x, final int y, final IContainerCraftingPacket ccp) { super(player, cMatrix, output, 0, x, y); this.energySrc = energySrc; this.storage = storage; @@ -149,8 +149,8 @@ public class SlotCraftingTerm extends AppEngCraftingSlot { // TODO: This is really hacky and NEEDS to be solved with a full container/gui // refactoring. protected IRecipe findRecipe(CraftingInventory ic, World world) { - if (this.container instanceof ContainerCraftingTerm) { - final ContainerCraftingTerm containerTerminal = (ContainerCraftingTerm) this.container; + if (this.container instanceof CraftingTermContainer) { + final CraftingTermContainer containerTerminal = (CraftingTermContainer) this.container; final IRecipe recipe = containerTerminal.getCurrentRecipe(); if (recipe != null && recipe.matches(ic, world)) { @@ -165,8 +165,8 @@ public class SlotCraftingTerm extends AppEngCraftingSlot { // refactoring. @Override protected NonNullList getRemainingItems(CraftingInventory ic, World world) { - if (this.container instanceof ContainerCraftingTerm) { - final ContainerCraftingTerm containerTerminal = (ContainerCraftingTerm) this.container; + if (this.container instanceof CraftingTermContainer) { + final CraftingTermContainer containerTerminal = (CraftingTermContainer) this.container; final IRecipe recipe = containerTerminal.getCurrentRecipe(); if (recipe != null && recipe.matches(ic, world)) { @@ -230,7 +230,7 @@ public class SlotCraftingTerm extends AppEngCraftingSlot { if (!this.getPattern().getStackInSlot(x).isEmpty()) { set[x] = Platform.extractItemsByRecipe(this.energySrc, this.mySrc, inv, p.world, r, is, ic, this.getPattern().getStackInSlot(x), x, all, Actionable.MODULATE, - ItemViewCell.createFilter(this.container.getViewCells())); + ViewCellItem.createFilter(this.container.getViewCells())); ic.setInventorySlotContents(x, set[x]); } } diff --git a/src/main/java/appeng/container/slot/SlotDisabled.java b/src/main/java/appeng/container/slot/DisabledSlot.java similarity index 92% rename from src/main/java/appeng/container/slot/SlotDisabled.java rename to src/main/java/appeng/container/slot/DisabledSlot.java index 6ed1690c4..15864f92e 100644 --- a/src/main/java/appeng/container/slot/SlotDisabled.java +++ b/src/main/java/appeng/container/slot/DisabledSlot.java @@ -22,9 +22,9 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraftforge.items.IItemHandler; -public class SlotDisabled extends AppEngSlot { +public class DisabledSlot extends AppEngSlot { - public SlotDisabled(final IItemHandler par1iInventory, final int slotIndex, final int x, final int y) { + public DisabledSlot(final IItemHandler par1iInventory, final int slotIndex, final int x, final int y) { super(par1iInventory, slotIndex, x, y); } diff --git a/src/main/java/appeng/container/slot/SlotFakeBlacklist.java b/src/main/java/appeng/container/slot/FakeBlacklistSlot.java similarity index 91% rename from src/main/java/appeng/container/slot/SlotFakeBlacklist.java rename to src/main/java/appeng/container/slot/FakeBlacklistSlot.java index a6cffd5cd..3fb2fac8a 100644 --- a/src/main/java/appeng/container/slot/SlotFakeBlacklist.java +++ b/src/main/java/appeng/container/slot/FakeBlacklistSlot.java @@ -20,9 +20,9 @@ package appeng.container.slot; import net.minecraftforge.items.IItemHandler; -public class SlotFakeBlacklist extends SlotFakeTypeOnly { +public class FakeBlacklistSlot extends FakeTypeOnlySlot { - public SlotFakeBlacklist(final IItemHandler inv, final int idx, final int x, final int y) { + public FakeBlacklistSlot(final IItemHandler inv, final int idx, final int x, final int y) { super(inv, idx, x, y); } diff --git a/src/main/java/appeng/container/slot/SlotFakeCraftingMatrix.java b/src/main/java/appeng/container/slot/FakeCraftingMatrixSlot.java similarity index 89% rename from src/main/java/appeng/container/slot/SlotFakeCraftingMatrix.java rename to src/main/java/appeng/container/slot/FakeCraftingMatrixSlot.java index 390ca8602..6634f7209 100644 --- a/src/main/java/appeng/container/slot/SlotFakeCraftingMatrix.java +++ b/src/main/java/appeng/container/slot/FakeCraftingMatrixSlot.java @@ -20,9 +20,9 @@ package appeng.container.slot; import net.minecraftforge.items.IItemHandler; -public class SlotFakeCraftingMatrix extends SlotFake { +public class FakeCraftingMatrixSlot extends FakeSlot { - public SlotFakeCraftingMatrix(final IItemHandler inv, final int idx, final int x, final int y) { + public FakeCraftingMatrixSlot(final IItemHandler inv, final int idx, final int x, final int y) { super(inv, idx, x, y); } } diff --git a/src/main/java/appeng/container/slot/SlotFake.java b/src/main/java/appeng/container/slot/FakeSlot.java similarity index 94% rename from src/main/java/appeng/container/slot/SlotFake.java rename to src/main/java/appeng/container/slot/FakeSlot.java index f8cd8a715..a60ed6308 100644 --- a/src/main/java/appeng/container/slot/SlotFake.java +++ b/src/main/java/appeng/container/slot/FakeSlot.java @@ -22,9 +22,9 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraftforge.items.IItemHandler; -public class SlotFake extends AppEngSlot { +public class FakeSlot extends AppEngSlot { - public SlotFake(final IItemHandler inv, final int idx, final int x, final int y) { + public FakeSlot(final IItemHandler inv, final int idx, final int x, final int y) { super(inv, idx, x, y); } diff --git a/src/main/java/appeng/container/slot/SlotFakeTypeOnly.java b/src/main/java/appeng/container/slot/FakeTypeOnlySlot.java similarity index 92% rename from src/main/java/appeng/container/slot/SlotFakeTypeOnly.java rename to src/main/java/appeng/container/slot/FakeTypeOnlySlot.java index d4c9f6640..169938ab5 100644 --- a/src/main/java/appeng/container/slot/SlotFakeTypeOnly.java +++ b/src/main/java/appeng/container/slot/FakeTypeOnlySlot.java @@ -21,9 +21,9 @@ package appeng.container.slot; import net.minecraft.item.ItemStack; import net.minecraftforge.items.IItemHandler; -public class SlotFakeTypeOnly extends SlotFake { +public class FakeTypeOnlySlot extends FakeSlot { - public SlotFakeTypeOnly(final IItemHandler inv, final int idx, final int x, final int y) { + public FakeTypeOnlySlot(final IItemHandler inv, final int idx, final int x, final int y) { super(inv, idx, x, y); } diff --git a/src/main/java/appeng/container/slot/SlotInaccessible.java b/src/main/java/appeng/container/slot/InaccessibleSlot.java similarity index 93% rename from src/main/java/appeng/container/slot/SlotInaccessible.java rename to src/main/java/appeng/container/slot/InaccessibleSlot.java index 23321d0bc..4f72271a6 100644 --- a/src/main/java/appeng/container/slot/SlotInaccessible.java +++ b/src/main/java/appeng/container/slot/InaccessibleSlot.java @@ -22,11 +22,11 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraftforge.items.IItemHandler; -public class SlotInaccessible extends AppEngSlot { +public class InaccessibleSlot extends AppEngSlot { private ItemStack dspStack = ItemStack.EMPTY; - public SlotInaccessible(final IItemHandler i, final int slotIdx, final int x, final int y) { + public InaccessibleSlot(final IItemHandler i, final int slotIdx, final int x, final int y) { super(i, slotIdx, x, y); } diff --git a/src/main/java/appeng/container/slot/SlotMolecularAssemblerPattern.java b/src/main/java/appeng/container/slot/MolecularAssemblerPatternSlot.java similarity index 75% rename from src/main/java/appeng/container/slot/SlotMolecularAssemblerPattern.java rename to src/main/java/appeng/container/slot/MolecularAssemblerPatternSlot.java index 0031d914f..20fb3fb38 100644 --- a/src/main/java/appeng/container/slot/SlotMolecularAssemblerPattern.java +++ b/src/main/java/appeng/container/slot/MolecularAssemblerPatternSlot.java @@ -21,14 +21,14 @@ package appeng.container.slot; import net.minecraft.item.ItemStack; import net.minecraftforge.items.IItemHandler; -import appeng.container.implementations.ContainerMolecularAssembler; +import appeng.container.implementations.MolecularAssemblerContainer; -public class SlotMolecularAssemblerPattern extends AppEngSlot { +public class MolecularAssemblerPatternSlot extends AppEngSlot { - private final ContainerMolecularAssembler mac; + private final MolecularAssemblerContainer mac; - public SlotMolecularAssemblerPattern(final ContainerMolecularAssembler mac, final IItemHandler i, final int slotIdx, - final int x, final int y) { + public MolecularAssemblerPatternSlot(final MolecularAssemblerContainer mac, final IItemHandler i, final int slotIdx, + final int x, final int y) { super(i, slotIdx, x, y); this.mac = mac; } diff --git a/src/main/java/appeng/container/slot/SlotNormal.java b/src/main/java/appeng/container/slot/NormalSlot.java similarity index 89% rename from src/main/java/appeng/container/slot/SlotNormal.java rename to src/main/java/appeng/container/slot/NormalSlot.java index d07a855ca..55304cb39 100644 --- a/src/main/java/appeng/container/slot/SlotNormal.java +++ b/src/main/java/appeng/container/slot/NormalSlot.java @@ -20,9 +20,9 @@ package appeng.container.slot; import net.minecraftforge.items.IItemHandler; -public class SlotNormal extends AppEngSlot { +public class NormalSlot extends AppEngSlot { - public SlotNormal(final IItemHandler inv, final int slot, final int xPos, final int yPos) { + public NormalSlot(final IItemHandler inv, final int slot, final int xPos, final int yPos) { super(inv, slot, xPos, yPos); } } diff --git a/src/main/java/appeng/container/slot/OptionalSlotFake.java b/src/main/java/appeng/container/slot/OptionalFakeSlot.java similarity index 90% rename from src/main/java/appeng/container/slot/OptionalSlotFake.java rename to src/main/java/appeng/container/slot/OptionalFakeSlot.java index db6513aa9..ff2460146 100644 --- a/src/main/java/appeng/container/slot/OptionalSlotFake.java +++ b/src/main/java/appeng/container/slot/OptionalFakeSlot.java @@ -23,7 +23,7 @@ import javax.annotation.Nonnull; import net.minecraft.item.ItemStack; import net.minecraftforge.items.IItemHandler; -public class OptionalSlotFake extends SlotFake implements IOptionalSlot { +public class OptionalFakeSlot extends FakeSlot implements IOptionalSlot { private final int srcX; private final int srcY; @@ -31,8 +31,8 @@ public class OptionalSlotFake extends SlotFake implements IOptionalSlot { private final IOptionalSlotHost host; private boolean renderDisabled = true; - public OptionalSlotFake(final IItemHandler inv, final IOptionalSlotHost containerBus, final int idx, final int x, - final int y, final int offX, final int offY, final int groupNum) { + public OptionalFakeSlot(final IItemHandler inv, final IOptionalSlotHost containerBus, final int idx, final int x, + final int y, final int offX, final int offY, final int groupNum) { super(inv, idx, x + offX * 18, y + offY * 18); this.srcX = x; this.srcY = y; diff --git a/src/main/java/appeng/container/slot/OptionalSlotNormal.java b/src/main/java/appeng/container/slot/OptionalNormalSlot.java similarity index 87% rename from src/main/java/appeng/container/slot/OptionalSlotNormal.java rename to src/main/java/appeng/container/slot/OptionalNormalSlot.java index 3a5e065b7..826040c3a 100644 --- a/src/main/java/appeng/container/slot/OptionalSlotNormal.java +++ b/src/main/java/appeng/container/slot/OptionalNormalSlot.java @@ -20,13 +20,13 @@ package appeng.container.slot; import net.minecraftforge.items.IItemHandler; -public class OptionalSlotNormal extends AppEngSlot implements IOptionalSlot { +public class OptionalNormalSlot extends AppEngSlot implements IOptionalSlot { private final int groupNum; private final IOptionalSlotHost host; - public OptionalSlotNormal(final IItemHandler inv, final IOptionalSlotHost containerBus, final int slot, - final int xPos, final int yPos, final int groupNum) { + public OptionalNormalSlot(final IItemHandler inv, final IOptionalSlotHost containerBus, final int slot, + final int xPos, final int yPos, final int groupNum) { super(inv, slot, xPos, yPos); this.groupNum = groupNum; this.host = containerBus; diff --git a/src/main/java/appeng/container/slot/OptionalSlotRestrictedInput.java b/src/main/java/appeng/container/slot/OptionalRestrictedInputSlot.java similarity index 83% rename from src/main/java/appeng/container/slot/OptionalSlotRestrictedInput.java rename to src/main/java/appeng/container/slot/OptionalRestrictedInputSlot.java index b442fd1b3..8872e3d4d 100644 --- a/src/main/java/appeng/container/slot/OptionalSlotRestrictedInput.java +++ b/src/main/java/appeng/container/slot/OptionalRestrictedInputSlot.java @@ -21,13 +21,13 @@ package appeng.container.slot; import net.minecraft.entity.player.PlayerInventory; import net.minecraftforge.items.IItemHandler; -public class OptionalSlotRestrictedInput extends SlotRestrictedInput { +public class OptionalRestrictedInputSlot extends RestrictedInputSlot { private final int groupNum; private final IOptionalSlotHost host; - public OptionalSlotRestrictedInput(final PlacableItemType valid, final IItemHandler i, final IOptionalSlotHost host, - final int slotIndex, final int x, final int y, final int grpNum, final PlayerInventory invPlayer) { + public OptionalRestrictedInputSlot(final PlacableItemType valid, final IItemHandler i, final IOptionalSlotHost host, + final int slotIndex, final int x, final int y, final int grpNum, final PlayerInventory invPlayer) { super(valid, i, slotIndex, x, y, invPlayer); this.groupNum = grpNum; this.host = host; diff --git a/src/main/java/appeng/container/slot/OptionalSlotFakeTypeOnly.java b/src/main/java/appeng/container/slot/OptionalTypeOnlyFakeSlot.java similarity index 84% rename from src/main/java/appeng/container/slot/OptionalSlotFakeTypeOnly.java rename to src/main/java/appeng/container/slot/OptionalTypeOnlyFakeSlot.java index 1030f0a93..c719d7553 100644 --- a/src/main/java/appeng/container/slot/OptionalSlotFakeTypeOnly.java +++ b/src/main/java/appeng/container/slot/OptionalTypeOnlyFakeSlot.java @@ -21,10 +21,10 @@ package appeng.container.slot; import net.minecraft.item.ItemStack; import net.minecraftforge.items.IItemHandler; -public class OptionalSlotFakeTypeOnly extends OptionalSlotFake { +public class OptionalTypeOnlyFakeSlot extends OptionalFakeSlot { - public OptionalSlotFakeTypeOnly(final IItemHandler inv, final IOptionalSlotHost containerBus, final int idx, - final int x, final int y, final int offX, final int offY, final int groupNum) { + public OptionalTypeOnlyFakeSlot(final IItemHandler inv, final IOptionalSlotHost containerBus, final int idx, + final int x, final int y, final int offX, final int offY, final int groupNum) { super(inv, containerBus, idx, x, y, offX, offY, groupNum); } diff --git a/src/main/java/appeng/container/slot/SlotOutput.java b/src/main/java/appeng/container/slot/OutputSlot.java similarity index 91% rename from src/main/java/appeng/container/slot/SlotOutput.java rename to src/main/java/appeng/container/slot/OutputSlot.java index 9f13dbbdf..0c8778620 100644 --- a/src/main/java/appeng/container/slot/SlotOutput.java +++ b/src/main/java/appeng/container/slot/OutputSlot.java @@ -21,9 +21,9 @@ package appeng.container.slot; import net.minecraft.item.ItemStack; import net.minecraftforge.items.IItemHandler; -public class SlotOutput extends AppEngSlot { +public class OutputSlot extends AppEngSlot { - public SlotOutput(final IItemHandler a, final int b, final int c, final int d, final int i) { + public OutputSlot(final IItemHandler a, final int b, final int c, final int d, final int i) { super(a, b, c, d); this.setIIcon(i); } diff --git a/src/main/java/appeng/container/slot/SlotPatternOutputs.java b/src/main/java/appeng/container/slot/PatternOutputsSlot.java similarity index 84% rename from src/main/java/appeng/container/slot/SlotPatternOutputs.java rename to src/main/java/appeng/container/slot/PatternOutputsSlot.java index 8f0128f80..2a9d2f739 100644 --- a/src/main/java/appeng/container/slot/SlotPatternOutputs.java +++ b/src/main/java/appeng/container/slot/PatternOutputsSlot.java @@ -20,10 +20,10 @@ package appeng.container.slot; import net.minecraftforge.items.IItemHandler; -public class SlotPatternOutputs extends OptionalSlotFake { +public class PatternOutputsSlot extends OptionalFakeSlot { - public SlotPatternOutputs(final IItemHandler inv, final IOptionalSlotHost containerBus, final int idx, final int x, - final int y, final int offX, final int offY, final int groupNum) { + public PatternOutputsSlot(final IItemHandler inv, final IOptionalSlotHost containerBus, final int idx, final int x, + final int y, final int offX, final int offY, final int groupNum) { super(inv, containerBus, idx, x, y, offX, offY, groupNum); } diff --git a/src/main/java/appeng/container/slot/SlotPatternTerm.java b/src/main/java/appeng/container/slot/PatternTermSlot.java similarity index 76% rename from src/main/java/appeng/container/slot/SlotPatternTerm.java rename to src/main/java/appeng/container/slot/PatternTermSlot.java index 79f6b6951..9c3112157 100644 --- a/src/main/java/appeng/container/slot/SlotPatternTerm.java +++ b/src/main/java/appeng/container/slot/PatternTermSlot.java @@ -27,27 +27,27 @@ import appeng.api.networking.energy.IEnergySource; import appeng.api.networking.security.IActionSource; import appeng.api.storage.IStorageMonitorable; import appeng.api.storage.channels.IItemStorageChannel; -import appeng.core.sync.AppEngPacket; -import appeng.core.sync.packets.PacketPatternSlot; +import appeng.core.sync.BasePacket; +import appeng.core.sync.packets.PatternSlotPacket; import appeng.helpers.IContainerCraftingPacket; -public class SlotPatternTerm extends SlotCraftingTerm { +public class PatternTermSlot extends CraftingTermSlot { private final int groupNum; private final IOptionalSlotHost host; - public SlotPatternTerm(final PlayerEntity player, final IActionSource mySrc, final IEnergySource energySrc, - final IStorageMonitorable storage, final IItemHandler cMatrix, final IItemHandler secondMatrix, - final IItemHandler output, final int x, final int y, final IOptionalSlotHost h, final int groupNumber, - final IContainerCraftingPacket c) { + public PatternTermSlot(final PlayerEntity player, final IActionSource mySrc, final IEnergySource energySrc, + final IStorageMonitorable storage, final IItemHandler cMatrix, final IItemHandler secondMatrix, + final IItemHandler output, final int x, final int y, final IOptionalSlotHost h, final int groupNumber, + final IContainerCraftingPacket c) { super(player, mySrc, energySrc, storage, cMatrix, secondMatrix, output, x, y, c); this.host = h; this.groupNum = groupNumber; } - public AppEngPacket getRequest(final boolean shift) { - return new PacketPatternSlot(this.getPattern(), + public BasePacket getRequest(final boolean shift) { + return new PatternSlotPacket(this.getPattern(), AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class).createStack(this.getStack()), shift); } diff --git a/src/main/java/appeng/container/slot/SlotPlayerHotBar.java b/src/main/java/appeng/container/slot/PlayerHotBarSlot.java similarity index 90% rename from src/main/java/appeng/container/slot/SlotPlayerHotBar.java rename to src/main/java/appeng/container/slot/PlayerHotBarSlot.java index 767b913b0..f8e29d0e7 100644 --- a/src/main/java/appeng/container/slot/SlotPlayerHotBar.java +++ b/src/main/java/appeng/container/slot/PlayerHotBarSlot.java @@ -20,9 +20,9 @@ package appeng.container.slot; import net.minecraftforge.items.IItemHandler; -public class SlotPlayerHotBar extends AppEngSlot { +public class PlayerHotBarSlot extends AppEngSlot { - public SlotPlayerHotBar(final IItemHandler par1iInventory, final int par2, final int par3, final int par4) { + public PlayerHotBarSlot(final IItemHandler par1iInventory, final int par2, final int par3, final int par4) { super(par1iInventory, par2, par3, par4); this.setPlayerSide(true); } diff --git a/src/main/java/appeng/container/slot/SlotPlayerInv.java b/src/main/java/appeng/container/slot/PlayerInvSlot.java similarity index 91% rename from src/main/java/appeng/container/slot/SlotPlayerInv.java rename to src/main/java/appeng/container/slot/PlayerInvSlot.java index 0a66a6e46..921c65752 100644 --- a/src/main/java/appeng/container/slot/SlotPlayerInv.java +++ b/src/main/java/appeng/container/slot/PlayerInvSlot.java @@ -22,9 +22,9 @@ import net.minecraftforge.items.IItemHandler; // there is nothing special about this slot, its simply used to represent the players inventory, vs a container slot. -public class SlotPlayerInv extends AppEngSlot { +public class PlayerInvSlot extends AppEngSlot { - public SlotPlayerInv(final IItemHandler par1iInventory, final int idx, final int x, final int y) { + public PlayerInvSlot(final IItemHandler par1iInventory, final int idx, final int x, final int y) { super(par1iInventory, idx, x, y); this.setPlayerSide(true); diff --git a/src/main/java/appeng/container/slot/SlotRestrictedInput.java b/src/main/java/appeng/container/slot/RestrictedInputSlot.java similarity index 96% rename from src/main/java/appeng/container/slot/SlotRestrictedInput.java rename to src/main/java/appeng/container/slot/RestrictedInputSlot.java index 46f16e212..a21b867ee 100644 --- a/src/main/java/appeng/container/slot/SlotRestrictedInput.java +++ b/src/main/java/appeng/container/slot/RestrictedInputSlot.java @@ -26,7 +26,6 @@ import com.google.common.collect.ImmutableList; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.container.Slot; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.util.ResourceLocation; @@ -46,7 +45,7 @@ import appeng.api.implementations.items.IStorageComponent; import appeng.api.implementations.items.IUpgradeModule; import appeng.api.networking.crafting.ICraftingPatternDetails; import appeng.api.storage.ICellWorkbenchItem; -import appeng.items.misc.ItemEncodedPattern; +import appeng.items.misc.EncodedPatternItem; import appeng.recipes.handlers.GrinderRecipes; import appeng.tile.misc.InscriberRecipes; import appeng.util.Platform; @@ -57,7 +56,7 @@ import appeng.util.Platform; * @version rv2 * @since rv0 */ -public class SlotRestrictedInput extends AppEngSlot { +public class RestrictedInputSlot extends AppEngSlot { private static final List METAL_INGOT_TAGS = ImmutableList.of( new ResourceLocation("forge:ingots/copper"), new ResourceLocation("forge:ingots/tin"), @@ -71,8 +70,8 @@ public class SlotRestrictedInput extends AppEngSlot { private boolean allowEdit = true; private int stackLimit = -1; - public SlotRestrictedInput(final PlacableItemType valid, final IItemHandler i, final int slotIndex, final int x, - final int y, final PlayerInventory p) { + public RestrictedInputSlot(final PlacableItemType valid, final IItemHandler i, final int slotIndex, final int x, + final int y, final PlayerInventory p) { super(i, slotIndex, x, y); this.which = valid; this.setIIcon(valid.IIcon); @@ -232,8 +231,8 @@ public class SlotRestrictedInput extends AppEngSlot { public ItemStack getDisplayStack() { if (Platform.isClient() && (this.which == PlacableItemType.ENCODED_PATTERN)) { final ItemStack is = super.getStack(); - if (!is.isEmpty() && is.getItem() instanceof ItemEncodedPattern) { - final ItemEncodedPattern iep = (ItemEncodedPattern) is.getItem(); + if (!is.isEmpty() && is.getItem() instanceof EncodedPatternItem) { + final EncodedPatternItem iep = (EncodedPatternItem) is.getItem(); final ItemStack out = iep.getOutput(is); if (!out.isEmpty()) { return out; diff --git a/src/main/java/appeng/container/slot/SlotInaccessibleHD.java b/src/main/java/appeng/container/slot/SlotInaccessibleHD.java deleted file mode 100644 index c1519fa11..000000000 --- a/src/main/java/appeng/container/slot/SlotInaccessibleHD.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * This file is part of Applied Energistics 2. - * Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved. - * - * Applied Energistics 2 is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Applied Energistics 2 is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Applied Energistics 2. If not, see . - */ - -package appeng.container.slot; - -import net.minecraftforge.items.IItemHandler; - -public class SlotInaccessibleHD extends SlotInaccessible { - - public SlotInaccessibleHD(final IItemHandler i, final int slotIdx, final int x, final int y) { - super(i, slotIdx, x, y); - } -} diff --git a/src/main/java/appeng/core/AELog.java b/src/main/java/appeng/core/AELog.java index 627414d90..84c58dab2 100644 --- a/src/main/java/appeng/core/AELog.java +++ b/src/main/java/appeng/core/AELog.java @@ -29,7 +29,7 @@ import net.minecraft.block.BlockState; import net.minecraft.util.math.BlockPos; import appeng.api.features.AEFeature; -import appeng.tile.AEBaseTile; +import appeng.tile.AEBaseTileEntity; import appeng.util.Platform; public final class AELog { @@ -301,7 +301,7 @@ public final class AELog { * @param aeBaseTile */ public static void blockUpdate(@Nonnull final BlockPos pos, @Nonnull BlockState currentState, - @Nonnull BlockState newState, @Nonnull final AEBaseTile aeBaseTile) { + @Nonnull BlockState newState, @Nonnull final AEBaseTileEntity aeBaseTile) { if (AEConfig.instance().isFeatureEnabled(AEFeature.UPDATE_LOGGING)) { info(BLOCK_UPDATE, aeBaseTile.getClass().getName(), pos, currentState, newState); } diff --git a/src/main/java/appeng/core/AppEng.java b/src/main/java/appeng/core/AppEng.java index 2f9b202d3..be2469a96 100644 --- a/src/main/java/appeng/core/AppEng.java +++ b/src/main/java/appeng/core/AppEng.java @@ -164,12 +164,12 @@ public final class AppEng { ((ClientHelper) proxy).clientInit(); - RenderingRegistry.registerEntityRenderingHandler(EntityTinyTNTPrimed.TYPE, RenderTinyTNTPrimed::new); - RenderingRegistry.registerEntityRenderingHandler(EntitySingularity.TYPE, + RenderingRegistry.registerEntityRenderingHandler(TinyTNTPrimedEntity.TYPE, TinyTNTPrimedRenderer::new); + RenderingRegistry.registerEntityRenderingHandler(SingularityEntity.TYPE, m -> new ItemRenderer(m, Minecraft.getInstance().getItemRenderer())); - RenderingRegistry.registerEntityRenderingHandler(EntityGrowingCrystal.TYPE, + RenderingRegistry.registerEntityRenderingHandler(GrowingCrystalEntity.TYPE, m -> new ItemRenderer(m, Minecraft.getInstance().getItemRenderer())); - RenderingRegistry.registerEntityRenderingHandler(EntityChargedQuartz.TYPE, + RenderingRegistry.registerEntityRenderingHandler(ChargedQuartzEntity.TYPE, m -> new ItemRenderer(m, Minecraft.getInstance().getItemRenderer())); // TODO: Do not use the internal API diff --git a/src/main/java/appeng/core/CommonHelper.java b/src/main/java/appeng/core/CommonHelper.java index d5a2fc4cb..773612f12 100644 --- a/src/main/java/appeng/core/CommonHelper.java +++ b/src/main/java/appeng/core/CommonHelper.java @@ -33,7 +33,7 @@ import appeng.api.parts.CableRenderMode; import appeng.block.AEBaseBlock; import appeng.client.ActionKey; import appeng.client.EffectType; -import appeng.core.sync.AppEngPacket; +import appeng.core.sync.BasePacket; public abstract class CommonHelper { @@ -44,7 +44,7 @@ public abstract class CommonHelper { public abstract List getPlayers(); public abstract void sendToAllNearExcept(PlayerEntity p, double x, double y, double z, double dist, World w, - AppEngPacket packet); + BasePacket packet); public abstract void spawnEffect(EffectType effect, World world, double posX, double posY, double posZ, Object extra); diff --git a/src/main/java/appeng/core/FacadeItemGroup.java b/src/main/java/appeng/core/FacadeItemGroup.java index e1210a0db..9061805eb 100644 --- a/src/main/java/appeng/core/FacadeItemGroup.java +++ b/src/main/java/appeng/core/FacadeItemGroup.java @@ -29,18 +29,18 @@ import net.minecraft.item.Items; import net.minecraft.util.NonNullList; import net.minecraftforge.registries.ForgeRegistries; -import appeng.items.parts.ItemFacade; +import appeng.items.parts.FacadeItem; public final class FacadeItemGroup extends ItemGroup { - private final ItemFacade itemFacade; + private final FacadeItem itemFacade; private List subTypes = null; public FacadeItemGroup() { super("appliedenergistics2.facades"); - itemFacade = (ItemFacade) Api.INSTANCE.definitions().items().facade().item(); + itemFacade = (FacadeItem) Api.INSTANCE.definitions().items().facade().item(); } @Override diff --git a/src/main/java/appeng/core/Registration.java b/src/main/java/appeng/core/Registration.java index b8dce9452..7c02f347f 100644 --- a/src/main/java/appeng/core/Registration.java +++ b/src/main/java/appeng/core/Registration.java @@ -98,7 +98,7 @@ import appeng.core.stats.PartItemPredicate; import appeng.fluids.client.gui.*; import appeng.fluids.container.*; import appeng.fluids.registries.BasicFluidCellGuiHandler; -import appeng.items.parts.ItemFacade; +import appeng.items.parts.FacadeItem; import appeng.me.cache.*; import appeng.recipes.conditions.FeaturesEnabled; import appeng.recipes.game.DisassembleRecipe; @@ -110,7 +110,7 @@ import appeng.recipes.handlers.InscriberRecipeSerializer; import appeng.server.AECommand; import appeng.spatial.StorageCellBiome; import appeng.spatial.StorageCellModDimension; -import appeng.tile.AEBaseTile; +import appeng.tile.AEBaseTileEntity; import appeng.tile.crafting.MolecularAssemblerRenderer; import appeng.worldgen.ChargedQuartzOreConfig; import appeng.worldgen.ChargedQuartzOreFeature; @@ -201,131 +201,131 @@ final class Registration { public void registerContainerTypes(RegistryEvent.Register> event) { final IForgeRegistry> registry = event.getRegistry(); - ContainerCellWorkbench.TYPE = registerContainer(registry, "cellworkbench", ContainerCellWorkbench::fromNetwork, - ContainerCellWorkbench::open); - ContainerChest.TYPE = registerContainer(registry, "chest", ContainerChest::fromNetwork, ContainerChest::open); - ContainerCondenser.TYPE = registerContainer(registry, "condenser", ContainerCondenser::fromNetwork, - ContainerCondenser::open); - ContainerCraftAmount.TYPE = registerContainer(registry, "craftamount", ContainerCraftAmount::fromNetwork, - ContainerCraftAmount::open); - ContainerCraftConfirm.TYPE = registerContainer(registry, "craftconfirm", ContainerCraftConfirm::fromNetwork, - ContainerCraftConfirm::open); - ContainerCraftingCPU.TYPE = registerContainer(registry, "craftingcpu", ContainerCraftingCPU::fromNetwork, - ContainerCraftingCPU::open); - ContainerCraftingStatus.TYPE = registerContainer(registry, "craftingstatus", - ContainerCraftingStatus::fromNetwork, ContainerCraftingStatus::open); - ContainerCraftingTerm.TYPE = registerContainer(registry, "craftingterm", ContainerCraftingTerm::fromNetwork, - ContainerCraftingTerm::open); - ContainerDrive.TYPE = registerContainer(registry, "drive", ContainerDrive::fromNetwork, ContainerDrive::open); - ContainerFormationPlane.TYPE = registerContainer(registry, "formationplane", - ContainerFormationPlane::fromNetwork, ContainerFormationPlane::open); - ContainerGrinder.TYPE = registerContainer(registry, "grinder", ContainerGrinder::fromNetwork, - ContainerGrinder::open); - ContainerInscriber.TYPE = registerContainer(registry, "inscriber", ContainerInscriber::fromNetwork, - ContainerInscriber::open); - ContainerInterface.TYPE = registerContainer(registry, "interface", ContainerInterface::fromNetwork, - ContainerInterface::open); - ContainerInterfaceTerminal.TYPE = registerContainer(registry, "interfaceterminal", - ContainerInterfaceTerminal::fromNetwork, ContainerInterfaceTerminal::open); - ContainerIOPort.TYPE = registerContainer(registry, "ioport", ContainerIOPort::fromNetwork, - ContainerIOPort::open); - ContainerLevelEmitter.TYPE = registerContainer(registry, "levelemitter", ContainerLevelEmitter::fromNetwork, - ContainerLevelEmitter::open); - ContainerMolecularAssembler.TYPE = registerContainer(registry, "molecular_assembler", - ContainerMolecularAssembler::fromNetwork, ContainerMolecularAssembler::open); - ContainerMEMonitorable.TYPE = registerContainer(registry, "memonitorable", ContainerMEMonitorable::fromNetwork, - ContainerMEMonitorable::open); - ContainerMEPortableCell.TYPE = registerContainer(registry, "meportablecell", - ContainerMEPortableCell::fromNetwork, ContainerMEPortableCell::open); - ContainerNetworkStatus.TYPE = registerContainer(registry, "networkstatus", ContainerNetworkStatus::fromNetwork, - ContainerNetworkStatus::open); - ContainerNetworkTool.TYPE = registerContainer(registry, "networktool", ContainerNetworkTool::fromNetwork, - ContainerNetworkTool::open); - ContainerPatternTerm.TYPE = registerContainer(registry, "patternterm", ContainerPatternTerm::fromNetwork, - ContainerPatternTerm::open); - ContainerPriority.TYPE = registerContainer(registry, "priority", ContainerPriority::fromNetwork, - ContainerPriority::open); - ContainerQNB.TYPE = registerContainer(registry, "qnb", ContainerQNB::fromNetwork, ContainerQNB::open); - ContainerQuartzKnife.TYPE = registerContainer(registry, "quartzknife", ContainerQuartzKnife::fromNetwork, - ContainerQuartzKnife::open); - ContainerSecurityStation.TYPE = registerContainer(registry, "securitystation", - ContainerSecurityStation::fromNetwork, ContainerSecurityStation::open); - ContainerSkyChest.TYPE = registerContainer(registry, "skychest", ContainerSkyChest::fromNetwork, - ContainerSkyChest::open); - ContainerSpatialIOPort.TYPE = registerContainer(registry, "spatialioport", ContainerSpatialIOPort::fromNetwork, - ContainerSpatialIOPort::open); - ContainerStorageBus.TYPE = registerContainer(registry, "storagebus", ContainerStorageBus::fromNetwork, - ContainerStorageBus::open); - ContainerUpgradeable.TYPE = registerContainer(registry, "upgradeable", ContainerUpgradeable::fromNetwork, - ContainerUpgradeable::open); - ContainerVibrationChamber.TYPE = registerContainer(registry, "vibrationchamber", - ContainerVibrationChamber::fromNetwork, ContainerVibrationChamber::open); - ContainerWireless.TYPE = registerContainer(registry, "wireless", ContainerWireless::fromNetwork, - ContainerWireless::open); - ContainerWirelessTerm.TYPE = registerContainer(registry, "wirelessterm", ContainerWirelessTerm::fromNetwork, - ContainerWirelessTerm::open); + CellWorkbenchContainer.TYPE = registerContainer(registry, "cellworkbench", CellWorkbenchContainer::fromNetwork, + CellWorkbenchContainer::open); + ChestContainer.TYPE = registerContainer(registry, "chest", ChestContainer::fromNetwork, ChestContainer::open); + CondenserContainer.TYPE = registerContainer(registry, "condenser", CondenserContainer::fromNetwork, + CondenserContainer::open); + CraftAmountContainer.TYPE = registerContainer(registry, "craftamount", CraftAmountContainer::fromNetwork, + CraftAmountContainer::open); + CraftConfirmContainer.TYPE = registerContainer(registry, "craftconfirm", CraftConfirmContainer::fromNetwork, + CraftConfirmContainer::open); + CraftingCPUContainer.TYPE = registerContainer(registry, "craftingcpu", CraftingCPUContainer::fromNetwork, + CraftingCPUContainer::open); + CraftingStatusContainer.TYPE = registerContainer(registry, "craftingstatus", + CraftingStatusContainer::fromNetwork, CraftingStatusContainer::open); + CraftingTermContainer.TYPE = registerContainer(registry, "craftingterm", CraftingTermContainer::fromNetwork, + CraftingTermContainer::open); + DriveContainer.TYPE = registerContainer(registry, "drive", DriveContainer::fromNetwork, DriveContainer::open); + FormationPlaneContainer.TYPE = registerContainer(registry, "formationplane", + FormationPlaneContainer::fromNetwork, FormationPlaneContainer::open); + GrinderContainer.TYPE = registerContainer(registry, "grinder", GrinderContainer::fromNetwork, + GrinderContainer::open); + InscriberContainer.TYPE = registerContainer(registry, "inscriber", InscriberContainer::fromNetwork, + InscriberContainer::open); + InterfaceContainer.TYPE = registerContainer(registry, "interface", InterfaceContainer::fromNetwork, + InterfaceContainer::open); + InterfaceTerminalContainer.TYPE = registerContainer(registry, "interfaceterminal", + InterfaceTerminalContainer::fromNetwork, InterfaceTerminalContainer::open); + IOPortContainer.TYPE = registerContainer(registry, "ioport", IOPortContainer::fromNetwork, + IOPortContainer::open); + LevelEmitterContainer.TYPE = registerContainer(registry, "levelemitter", LevelEmitterContainer::fromNetwork, + LevelEmitterContainer::open); + MolecularAssemblerContainer.TYPE = registerContainer(registry, "molecular_assembler", + MolecularAssemblerContainer::fromNetwork, MolecularAssemblerContainer::open); + MEMonitorableContainer.TYPE = registerContainer(registry, "memonitorable", MEMonitorableContainer::fromNetwork, + MEMonitorableContainer::open); + MEPortableCellContainer.TYPE = registerContainer(registry, "meportablecell", + MEPortableCellContainer::fromNetwork, MEPortableCellContainer::open); + NetworkStatusContainer.TYPE = registerContainer(registry, "networkstatus", NetworkStatusContainer::fromNetwork, + NetworkStatusContainer::open); + NetworkToolContainer.TYPE = registerContainer(registry, "networktool", NetworkToolContainer::fromNetwork, + NetworkToolContainer::open); + PatternTermContainer.TYPE = registerContainer(registry, "patternterm", PatternTermContainer::fromNetwork, + PatternTermContainer::open); + PriorityContainer.TYPE = registerContainer(registry, "priority", PriorityContainer::fromNetwork, + PriorityContainer::open); + QNBContainer.TYPE = registerContainer(registry, "qnb", QNBContainer::fromNetwork, QNBContainer::open); + QuartzKnifeContainer.TYPE = registerContainer(registry, "quartzknife", QuartzKnifeContainer::fromNetwork, + QuartzKnifeContainer::open); + SecurityStationContainer.TYPE = registerContainer(registry, "securitystation", + SecurityStationContainer::fromNetwork, SecurityStationContainer::open); + SkyChestContainer.TYPE = registerContainer(registry, "skychest", SkyChestContainer::fromNetwork, + SkyChestContainer::open); + SpatialIOPortContainer.TYPE = registerContainer(registry, "spatialioport", SpatialIOPortContainer::fromNetwork, + SpatialIOPortContainer::open); + StorageBusContainer.TYPE = registerContainer(registry, "storagebus", StorageBusContainer::fromNetwork, + StorageBusContainer::open); + UpgradeableContainer.TYPE = registerContainer(registry, "upgradeable", UpgradeableContainer::fromNetwork, + UpgradeableContainer::open); + VibrationChamberContainer.TYPE = registerContainer(registry, "vibrationchamber", + VibrationChamberContainer::fromNetwork, VibrationChamberContainer::open); + WirelessContainer.TYPE = registerContainer(registry, "wireless", WirelessContainer::fromNetwork, + WirelessContainer::open); + WirelessTermContainer.TYPE = registerContainer(registry, "wirelessterm", WirelessTermContainer::fromNetwork, + WirelessTermContainer::open); - ContainerFluidFormationPlane.TYPE = registerContainer(registry, "fluid_formation_plane", - ContainerFluidFormationPlane::fromNetwork, ContainerFluidFormationPlane::open); - ContainerFluidIO.TYPE = registerContainer(registry, "fluid_io", ContainerFluidIO::fromNetwork, - ContainerFluidIO::open); - ContainerFluidInterface.TYPE = registerContainer(registry, "fluid_interface", - ContainerFluidInterface::fromNetwork, ContainerFluidInterface::open); - ContainerFluidLevelEmitter.TYPE = registerContainer(registry, "fluid_level_emitter", - ContainerFluidLevelEmitter::fromNetwork, ContainerFluidLevelEmitter::open); - ContainerFluidStorageBus.TYPE = registerContainer(registry, "fluid_storage_bus", - ContainerFluidStorageBus::fromNetwork, ContainerFluidStorageBus::open); - ContainerFluidTerminal.TYPE = registerContainer(registry, "fluid_terminal", ContainerFluidTerminal::fromNetwork, - ContainerFluidTerminal::open); + FluidFormationPlaneContainer.TYPE = registerContainer(registry, "fluid_formation_plane", + FluidFormationPlaneContainer::fromNetwork, FluidFormationPlaneContainer::open); + FluidIOContainer.TYPE = registerContainer(registry, "fluid_io", FluidIOContainer::fromNetwork, + FluidIOContainer::open); + FluidInterfaceContainer.TYPE = registerContainer(registry, "fluid_interface", + FluidInterfaceContainer::fromNetwork, FluidInterfaceContainer::open); + FluidLevelEmitterContainer.TYPE = registerContainer(registry, "fluid_level_emitter", + FluidLevelEmitterContainer::fromNetwork, FluidLevelEmitterContainer::open); + FluidStorageBusContainer.TYPE = registerContainer(registry, "fluid_storage_bus", + FluidStorageBusContainer::fromNetwork, FluidStorageBusContainer::open); + FluidTerminalContainer.TYPE = registerContainer(registry, "fluid_terminal", FluidTerminalContainer::fromNetwork, + FluidTerminalContainer::open); DistExecutor.runWhenOn(Dist.CLIENT, () -> () -> { - ScreenManager.registerFactory(ContainerGrinder.TYPE, GuiGrinder::new); - ScreenManager.registerFactory(ContainerQNB.TYPE, GuiQNB::new); - ScreenManager.registerFactory(ContainerSkyChest.TYPE, GuiSkyChest::new); - ScreenManager.registerFactory(ContainerChest.TYPE, GuiChest::new); - ScreenManager.registerFactory(ContainerWireless.TYPE, GuiWireless::new); - ScreenManager.>registerFactory( - ContainerMEMonitorable.TYPE, GuiMEMonitorable::new); - ScreenManager.registerFactory(ContainerMEPortableCell.TYPE, GuiMEPortableCell::new); - ScreenManager.registerFactory(ContainerWirelessTerm.TYPE, GuiWirelessTerm::new); - ScreenManager.registerFactory(ContainerNetworkStatus.TYPE, GuiNetworkStatus::new); - ScreenManager.>registerFactory( - ContainerCraftingCPU.TYPE, GuiCraftingCPU::new); - ScreenManager.registerFactory(ContainerNetworkTool.TYPE, GuiNetworkTool::new); - ScreenManager.registerFactory(ContainerQuartzKnife.TYPE, GuiQuartzKnife::new); - ScreenManager.registerFactory(ContainerDrive.TYPE, GuiDrive::new); - ScreenManager.registerFactory(ContainerVibrationChamber.TYPE, GuiVibrationChamber::new); - ScreenManager.registerFactory(ContainerCondenser.TYPE, GuiCondenser::new); - ScreenManager.registerFactory(ContainerInterface.TYPE, GuiInterface::new); - ScreenManager.registerFactory(ContainerFluidInterface.TYPE, GuiFluidInterface::new); - ScreenManager.>registerFactory( - ContainerUpgradeable.TYPE, GuiUpgradeable::new); - ScreenManager.registerFactory(ContainerFluidIO.TYPE, GuiFluidIO::new); - ScreenManager.registerFactory(ContainerIOPort.TYPE, GuiIOPort::new); - ScreenManager.registerFactory(ContainerStorageBus.TYPE, GuiStorageBus::new); - ScreenManager.registerFactory(ContainerFluidStorageBus.TYPE, GuiFluidStorageBus::new); - ScreenManager.registerFactory(ContainerFormationPlane.TYPE, GuiFormationPlane::new); - ScreenManager.registerFactory(ContainerFluidFormationPlane.TYPE, GuiFluidFormationPlane::new); - ScreenManager.registerFactory(ContainerPriority.TYPE, GuiPriority::new); - ScreenManager.registerFactory(ContainerSecurityStation.TYPE, GuiSecurityStation::new); - ScreenManager.registerFactory(ContainerCraftingTerm.TYPE, GuiCraftingTerm::new); - ScreenManager.registerFactory(ContainerPatternTerm.TYPE, GuiPatternTerm::new); - ScreenManager.registerFactory(ContainerFluidTerminal.TYPE, GuiFluidTerminal::new); - ScreenManager.registerFactory(ContainerLevelEmitter.TYPE, GuiLevelEmitter::new); - ScreenManager.registerFactory(ContainerFluidLevelEmitter.TYPE, GuiFluidLevelEmitter::new); - ScreenManager.registerFactory(ContainerSpatialIOPort.TYPE, GuiSpatialIOPort::new); - ScreenManager.registerFactory(ContainerInscriber.TYPE, GuiInscriber::new); - ScreenManager.registerFactory(ContainerCellWorkbench.TYPE, GuiCellWorkbench::new); - ScreenManager.registerFactory(ContainerMolecularAssembler.TYPE, GuiMolecularAssembler::new); - ScreenManager.registerFactory(ContainerCraftAmount.TYPE, GuiCraftAmount::new); - ScreenManager.registerFactory(ContainerCraftConfirm.TYPE, GuiCraftConfirm::new); - ScreenManager.registerFactory(ContainerInterfaceTerminal.TYPE, GuiInterfaceTerminal::new); - ScreenManager.registerFactory(ContainerCraftingStatus.TYPE, GuiCraftingStatus::new); + ScreenManager.registerFactory(GrinderContainer.TYPE, GrinderScreen::new); + ScreenManager.registerFactory(QNBContainer.TYPE, QNBScreen::new); + ScreenManager.registerFactory(SkyChestContainer.TYPE, SkyChestScreen::new); + ScreenManager.registerFactory(ChestContainer.TYPE, ChestScreen::new); + ScreenManager.registerFactory(WirelessContainer.TYPE, WirelessScreen::new); + ScreenManager.>registerFactory( + MEMonitorableContainer.TYPE, MEMonitorableScreen::new); + ScreenManager.registerFactory(MEPortableCellContainer.TYPE, MEPortableCellScreen::new); + ScreenManager.registerFactory(WirelessTermContainer.TYPE, WirelessTermScreen::new); + ScreenManager.registerFactory(NetworkStatusContainer.TYPE, NetworkStatusScreen::new); + ScreenManager.>registerFactory( + CraftingCPUContainer.TYPE, CraftingCPUScreen::new); + ScreenManager.registerFactory(NetworkToolContainer.TYPE, NetworkToolScreen::new); + ScreenManager.registerFactory(QuartzKnifeContainer.TYPE, QuartzKnifeScreen::new); + ScreenManager.registerFactory(DriveContainer.TYPE, DriveScreen::new); + ScreenManager.registerFactory(VibrationChamberContainer.TYPE, VibrationChamberScreen::new); + ScreenManager.registerFactory(CondenserContainer.TYPE, CondenserScreen::new); + ScreenManager.registerFactory(InterfaceContainer.TYPE, InterfaceScreen::new); + ScreenManager.registerFactory(FluidInterfaceContainer.TYPE, FluidInterfaceScreen::new); + ScreenManager.>registerFactory( + UpgradeableContainer.TYPE, UpgradeableScreen::new); + ScreenManager.registerFactory(FluidIOContainer.TYPE, FluidIOScreen::new); + ScreenManager.registerFactory(IOPortContainer.TYPE, IOPortScreen::new); + ScreenManager.registerFactory(StorageBusContainer.TYPE, StorageBusScreen::new); + ScreenManager.registerFactory(FluidStorageBusContainer.TYPE, FluidStorageBusScreen::new); + ScreenManager.registerFactory(FormationPlaneContainer.TYPE, FormationPlaneScreen::new); + ScreenManager.registerFactory(FluidFormationPlaneContainer.TYPE, FluidFormationPlaneScreen::new); + ScreenManager.registerFactory(PriorityContainer.TYPE, PriorityScreen::new); + ScreenManager.registerFactory(SecurityStationContainer.TYPE, SecurityStationScreen::new); + ScreenManager.registerFactory(CraftingTermContainer.TYPE, CraftingTermScreen::new); + ScreenManager.registerFactory(PatternTermContainer.TYPE, PatternTermScreen::new); + ScreenManager.registerFactory(FluidTerminalContainer.TYPE, FluidTerminalScreen::new); + ScreenManager.registerFactory(LevelEmitterContainer.TYPE, LevelEmitterScreen::new); + ScreenManager.registerFactory(FluidLevelEmitterContainer.TYPE, FluidLevelEmitterScreen::new); + ScreenManager.registerFactory(SpatialIOPortContainer.TYPE, SpatialIOPortScreen::new); + ScreenManager.registerFactory(InscriberContainer.TYPE, InscriberScreen::new); + ScreenManager.registerFactory(CellWorkbenchContainer.TYPE, CellWorkbenchScreen::new); + ScreenManager.registerFactory(MolecularAssemblerContainer.TYPE, MolecularAssemblerScreen::new); + ScreenManager.registerFactory(CraftAmountContainer.TYPE, CraftAmountScreen::new); + ScreenManager.registerFactory(CraftConfirmContainer.TYPE, CraftConfirmScreen::new); + ScreenManager.registerFactory(InterfaceTerminalContainer.TYPE, InterfaceTerminalScreen::new); + ScreenManager.registerFactory(CraftingStatusContainer.TYPE, CraftingStatusScreen::new); }); } private ContainerType registerContainer(IForgeRegistry> registry, - String id, IContainerFactory factory, ContainerOpener.Opener opener) { + String id, IContainerFactory factory, ContainerOpener.Opener opener) { ContainerType type = IForgeContainerType.create(factory); type.setRegistryName(AppEng.MOD_ID, id); registry.register(type); @@ -339,7 +339,7 @@ final class Registration { GrinderRecipe.TYPE = new AERecipeType<>(GrinderRecipeSerializer.INSTANCE.getRegistryName()); InscriberRecipe.TYPE = new AERecipeType<>(InscriberRecipeSerializer.INSTANCE.getRegistryName()); - ItemFacade facadeItem = (ItemFacade) Api.INSTANCE.definitions().items().facade().item(); + FacadeItem facadeItem = (FacadeItem) Api.INSTANCE.definitions().items().facade().item(); r.registerAll(DisassembleRecipe.SERIALIZER, GrinderRecipeSerializer.INSTANCE, InscriberRecipeSerializer.INSTANCE, FacadeRecipe.getSerializer(facadeItem), DisassembleRecipe.SERIALIZER); @@ -527,7 +527,7 @@ final class Registration { /* * Whitelist AE2 */ - mr.whiteListTileEntity(AEBaseTile.class); + mr.whiteListTileEntity(AEBaseTileEntity.class); /* * world gen diff --git a/src/main/java/appeng/core/api/definitions/ApiBlocks.java b/src/main/java/appeng/core/api/definitions/ApiBlocks.java index d18d756f9..780da2dc2 100644 --- a/src/main/java/appeng/core/api/definitions/ApiBlocks.java +++ b/src/main/java/appeng/core/api/definitions/ApiBlocks.java @@ -28,7 +28,6 @@ import net.minecraft.block.StairsBlock; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.RenderType; import net.minecraft.entity.EntityClassification; -import net.minecraft.util.ResourceLocation; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.common.ToolType; @@ -39,50 +38,50 @@ import appeng.api.definitions.ITileDefinition; import appeng.api.features.AEFeature; import appeng.block.AEBaseBlockItemChargeable; import appeng.block.crafting.AbstractCraftingUnitBlock.CraftingUnitType; -import appeng.block.crafting.BlockCraftingMonitor; -import appeng.block.crafting.BlockCraftingStorage; -import appeng.block.crafting.BlockMolecularAssembler; +import appeng.block.crafting.CraftingMonitorBlock; +import appeng.block.crafting.CraftingStorageBlock; +import appeng.block.crafting.MolecularAssemblerBlock; import appeng.block.crafting.CraftingUnitBlock; -import appeng.block.crafting.ItemCraftingStorage; -import appeng.block.grindstone.BlockCrank; -import appeng.block.grindstone.BlockGrinder; -import appeng.block.misc.BlockCellWorkbench; -import appeng.block.misc.BlockCharger; -import appeng.block.misc.BlockCondenser; -import appeng.block.misc.BlockInscriber; -import appeng.block.misc.BlockInterface; -import appeng.block.misc.BlockLightDetector; -import appeng.block.misc.BlockQuartzFixture; -import appeng.block.misc.BlockQuartzGrowthAccelerator; -import appeng.block.misc.BlockSecurityStation; -import appeng.block.misc.BlockSkyCompass; -import appeng.block.misc.BlockTinyTNT; -import appeng.block.misc.BlockVibrationChamber; +import appeng.block.crafting.CraftingStorageItem; +import appeng.block.grindstone.CrankBlock; +import appeng.block.grindstone.GrinderBlock; +import appeng.block.misc.CellWorkbenchBlock; +import appeng.block.misc.ChargerBlock; +import appeng.block.misc.CondenserBlock; +import appeng.block.misc.InscriberBlock; +import appeng.block.misc.InterfaceBlock; +import appeng.block.misc.LightDetectorBlock; +import appeng.block.misc.QuartzFixtureBlock; +import appeng.block.misc.QuartzGrowthAcceleratorBlock; +import appeng.block.misc.SecurityStationBlock; +import appeng.block.misc.SkyCompassBlock; +import appeng.block.misc.TinyTNTBlock; +import appeng.block.misc.VibrationChamberBlock; import appeng.block.misc.InscriberRendering; import appeng.block.misc.SecurityStationRendering; import appeng.block.misc.SkyCompassRendering; -import appeng.block.networking.BlockCableBus; -import appeng.block.networking.BlockController; -import appeng.block.networking.BlockCreativeEnergyCell; -import appeng.block.networking.BlockDenseEnergyCell; -import appeng.block.networking.BlockEnergyAcceptor; -import appeng.block.networking.BlockEnergyCell; -import appeng.block.networking.BlockWireless; +import appeng.block.networking.CableBusBlock; +import appeng.block.networking.ControllerBlock; +import appeng.block.networking.CreativeEnergyCellBlock; +import appeng.block.networking.DenseEnergyCellBlock; +import appeng.block.networking.EnergyAcceptorBlock; +import appeng.block.networking.EnergyCellBlock; +import appeng.block.networking.WirelessBlock; import appeng.block.networking.CableBusRendering; import appeng.block.networking.ControllerRendering; import appeng.block.networking.WirelessRendering; -import appeng.block.paint.BlockPaint; -import appeng.block.paint.PaintRendering; -import appeng.block.qnb.BlockQuantumLinkChamber; -import appeng.block.qnb.BlockQuantumRing; +import appeng.block.paint.PaintSplotchesBlock; +import appeng.block.paint.PaintSplotchesRendering; +import appeng.block.qnb.QuantumLinkChamberBlock; +import appeng.block.qnb.QuantumRingBlock; import appeng.block.qnb.QuantumBridgeRendering; -import appeng.block.spatial.BlockMatrixFrame; -import appeng.block.spatial.BlockSpatialIOPort; -import appeng.block.spatial.BlockSpatialPylon; -import appeng.block.storage.BlockChest; -import appeng.block.storage.BlockDrive; -import appeng.block.storage.BlockIOPort; -import appeng.block.storage.BlockSkyChest; +import appeng.block.spatial.MatrixFrameBlock; +import appeng.block.spatial.SpatialIOPortBlock; +import appeng.block.spatial.SpatialPylonBlock; +import appeng.block.storage.ChestBlock; +import appeng.block.storage.DriveBlock; +import appeng.block.storage.IOPortBlock; +import appeng.block.storage.SkyChestBlock; import appeng.block.storage.ChestRendering; import appeng.block.storage.DriveRendering; import appeng.bootstrap.BlockRenderingCustomizer; @@ -101,62 +100,61 @@ import appeng.client.render.spatial.SpatialPylonRendering; import appeng.client.render.tesr.CrankTESR; import appeng.client.render.tesr.DriveLedTileEntityRenderer; import appeng.client.render.tesr.SkyChestTESR; -import appeng.core.AppEng; -import appeng.debug.BlockChunkloader; -import appeng.debug.BlockCubeGenerator; -import appeng.debug.BlockEnergyGenerator; -import appeng.debug.BlockItemGen; -import appeng.debug.BlockPhantomNode; -import appeng.debug.TileChunkLoader; -import appeng.debug.TileCubeGenerator; -import appeng.debug.TileEnergyGenerator; -import appeng.debug.TileItemGen; -import appeng.debug.TilePhantomNode; +import appeng.debug.ChunkLoaderBlock; +import appeng.debug.CubeGeneratorBlock; +import appeng.debug.EnergyGeneratorBlock; +import appeng.debug.ItemGenBlock; +import appeng.debug.PhantomNodeBlock; +import appeng.debug.ChunkLoaderTileEntity; +import appeng.debug.CubeGeneratorTileEntity; +import appeng.debug.EnergyGeneratorTileEntity; +import appeng.debug.ItemGenTileEntity; +import appeng.debug.PhantomNodeTileEntity; import appeng.decorative.AEDecorativeBlock; -import appeng.decorative.solid.BlockChargedQuartzOre; -import appeng.decorative.solid.BlockQuartzGlass; -import appeng.decorative.solid.BlockQuartzLamp; -import appeng.decorative.solid.BlockQuartzOre; -import appeng.decorative.solid.BlockQuartzPillar; -import appeng.decorative.solid.BlockSkyStone; -import appeng.decorative.solid.BlockSkyStone.SkystoneType; -import appeng.entity.EntityTinyTNTPrimed; -import appeng.fluids.block.BlockFluidInterface; -import appeng.fluids.tile.TileFluidInterface; -import appeng.hooks.DispenserBehaviorTinyTNT; +import appeng.decorative.solid.ChargedQuartzOreBlock; +import appeng.decorative.solid.QuartzGlassBlock; +import appeng.decorative.solid.QuartzLampBlock; +import appeng.decorative.solid.QuartzOreBlock; +import appeng.decorative.solid.QuartzPillarBlock; +import appeng.decorative.solid.SkyStoneBlock; +import appeng.decorative.solid.SkyStoneBlock.SkystoneType; +import appeng.entity.TinyTNTPrimedEntity; +import appeng.fluids.block.FluidInterfaceBlock; +import appeng.fluids.tile.FluidInterfaceTileEntity; +import appeng.hooks.TinyTNTDispenseItemBehavior; import appeng.tile.crafting.MolecularAssemblerRenderer; -import appeng.tile.crafting.TileCraftingMonitorTile; -import appeng.tile.crafting.TileCraftingStorageTile; -import appeng.tile.crafting.TileCraftingTile; -import appeng.tile.crafting.TileMolecularAssembler; -import appeng.tile.grindstone.TileCrank; -import appeng.tile.grindstone.TileGrinder; -import appeng.tile.misc.TileCellWorkbench; -import appeng.tile.misc.TileCharger; -import appeng.tile.misc.TileCondenser; -import appeng.tile.misc.TileInscriber; -import appeng.tile.misc.TileInterface; -import appeng.tile.misc.TileLightDetector; -import appeng.tile.misc.TilePaint; -import appeng.tile.misc.TileQuartzGrowthAccelerator; -import appeng.tile.misc.TileSecurityStation; -import appeng.tile.misc.TileSkyCompass; -import appeng.tile.misc.TileVibrationChamber; +import appeng.tile.crafting.CraftingMonitorTileEntity; +import appeng.tile.crafting.CraftingStorageTileEntity; +import appeng.tile.crafting.CraftingTileEntity; +import appeng.tile.crafting.MolecularAssemblerTileEntity; +import appeng.tile.grindstone.CrankTileEntity; +import appeng.tile.grindstone.GrinderTileEntity; +import appeng.tile.misc.CellWorkbenchTileEntity; +import appeng.tile.misc.ChargerTileEntity; +import appeng.tile.misc.CondenserTileEntity; +import appeng.tile.misc.InscriberTileEntity; +import appeng.tile.misc.InterfaceTileEntity; +import appeng.tile.misc.LightDetectorTileEntity; +import appeng.tile.misc.PaintSplotchesTileEntity; +import appeng.tile.misc.QuartzGrowthAcceleratorTileEntity; +import appeng.tile.misc.SecurityStationTileEntity; +import appeng.tile.misc.SkyCompassTileEntity; +import appeng.tile.misc.VibrationChamberTileEntity; import appeng.tile.networking.CableBusTESR; -import appeng.tile.networking.TileCableBus; -import appeng.tile.networking.TileController; -import appeng.tile.networking.TileCreativeEnergyCell; -import appeng.tile.networking.TileDenseEnergyCell; -import appeng.tile.networking.TileEnergyAcceptor; -import appeng.tile.networking.TileEnergyCell; -import appeng.tile.networking.TileWireless; -import appeng.tile.qnb.TileQuantumBridge; -import appeng.tile.spatial.TileSpatialIOPort; -import appeng.tile.spatial.TileSpatialPylon; -import appeng.tile.storage.TileChest; -import appeng.tile.storage.TileDrive; -import appeng.tile.storage.TileIOPort; -import appeng.tile.storage.TileSkyChest; +import appeng.tile.networking.CableBusTileEntity; +import appeng.tile.networking.ControllerTileEntity; +import appeng.tile.networking.CreativeEnergyCellTileEntity; +import appeng.tile.networking.DenseEnergyCellTileEntity; +import appeng.tile.networking.EnergyAcceptorTileEntity; +import appeng.tile.networking.EnergyCellTileEntity; +import appeng.tile.networking.WirelessTileEntity; +import appeng.tile.qnb.QuantumBridgeTileEntity; +import appeng.tile.spatial.SpatialIOPortTileEntity; +import appeng.tile.spatial.SpatialPylonTileEntity; +import appeng.tile.storage.ChestTileEntity; +import appeng.tile.storage.DriveTileEntity; +import appeng.tile.storage.IOPortTileEntity; +import appeng.tile.storage.SkyChestTileEntity; /** * Internal implementation for the API blocks @@ -245,9 +243,9 @@ public final class ApiBlocks implements IBlocks { 150); public ApiBlocks(FeatureFactory registry) { - this.quartzOre = registry.block("quartz_ore", () -> new BlockQuartzOre(QUARTZ_PROPERTIES)) + this.quartzOre = registry.block("quartz_ore", () -> new QuartzOreBlock(QUARTZ_PROPERTIES)) .features(AEFeature.CERTUS_ORE).build(); - this.quartzOreCharged = registry.block("charged_quartz_ore", () -> new BlockChargedQuartzOre(QUARTZ_PROPERTIES)) + this.quartzOreCharged = registry.block("charged_quartz_ore", () -> new ChargedQuartzOreBlock(QUARTZ_PROPERTIES)) .features(AEFeature.CERTUS_ORE, AEFeature.CHARGED_CERTUS_ORE).rendering(new BlockRenderingCustomizer() { @Override @OnlyIn(Dist.CLIENT) @@ -255,16 +253,16 @@ public final class ApiBlocks implements IBlocks { rendering.renderType(RenderType.getCutout()); } }).build(); - this.matrixFrame = registry.block("matrix_frame", BlockMatrixFrame::new).features(AEFeature.SPATIAL_IO).build(); + this.matrixFrame = registry.block("matrix_frame", MatrixFrameBlock::new).features(AEFeature.SPATIAL_IO).build(); FeatureFactory deco = registry.features(AEFeature.DECORATIVE_BLOCKS); this.quartzBlock = deco.block("quartz_block", () -> new AEDecorativeBlock(QUARTZ_PROPERTIES)).build(); - this.quartzPillar = deco.block("quartz_pillar", () -> new BlockQuartzPillar(QUARTZ_PROPERTIES)).build(); + this.quartzPillar = deco.block("quartz_pillar", () -> new QuartzPillarBlock(QUARTZ_PROPERTIES)).build(); this.chiseledQuartzBlock = deco.block("chiseled_quartz_block", () -> new AEDecorativeBlock(QUARTZ_PROPERTIES)) .build(); this.quartzGlass = registry.features(AEFeature.QUARTZ_GLASS) - .block("quartz_glass", () -> new BlockQuartzGlass(defaultProps(Material.GLASS).notSolid())) + .block("quartz_glass", () -> new QuartzGlassBlock(defaultProps(Material.GLASS).notSolid())) .rendering(new BlockRenderingCustomizer() { @Override @OnlyIn(Dist.CLIENT) @@ -274,7 +272,7 @@ public final class ApiBlocks implements IBlocks { }).build(); this.quartzVibrantGlass = deco .block("quartz_vibrant_glass", - () -> new BlockQuartzLamp(defaultProps(Material.GLASS).lightValue(15).notSolid())) + () -> new QuartzLampBlock(defaultProps(Material.GLASS).lightValue(15).notSolid())) .addFeatures(AEFeature.DECORATIVE_LIGHTS, AEFeature.QUARTZ_GLASS) .rendering(new BlockRenderingCustomizer() { @Override @@ -284,7 +282,7 @@ public final class ApiBlocks implements IBlocks { } }).build(); - this.quartzFixture = registry.block("quartz_fixture", BlockQuartzFixture::new) + this.quartzFixture = registry.block("quartz_fixture", QuartzFixtureBlock::new) .features(AEFeature.DECORATIVE_LIGHTS).rendering(new BlockRenderingCustomizer() { @Override @OnlyIn(Dist.CLIENT) @@ -299,174 +297,174 @@ public final class ApiBlocks implements IBlocks { this.skyStoneBlock = registry .features( AEFeature.SKY_STONE) - .block("sky_stone_block", () -> new BlockSkyStone(SkystoneType.STONE, + .block("sky_stone_block", () -> new SkyStoneBlock(SkystoneType.STONE, defaultProps(Material.ROCK).hardnessAndResistance(50, 150).harvestLevel(3))) .build(); this.smoothSkyStoneBlock = registry.features(AEFeature.SKY_STONE) - .block("smooth_sky_stone_block", () -> new BlockSkyStone(SkystoneType.BLOCK, SKYSTONE_PROPERTIES)) + .block("smooth_sky_stone_block", () -> new SkyStoneBlock(SkystoneType.BLOCK, SKYSTONE_PROPERTIES)) .build(); this.skyStoneBrick = deco - .block("sky_stone_brick", () -> new BlockSkyStone(SkystoneType.BRICK, SKYSTONE_PROPERTIES)) + .block("sky_stone_brick", () -> new SkyStoneBlock(SkystoneType.BRICK, SKYSTONE_PROPERTIES)) .addFeatures(AEFeature.SKY_STONE).build(); this.skyStoneSmallBrick = deco - .block("sky_stone_small_brick", () -> new BlockSkyStone(SkystoneType.SMALL_BRICK, SKYSTONE_PROPERTIES)) + .block("sky_stone_small_brick", () -> new SkyStoneBlock(SkystoneType.SMALL_BRICK, SKYSTONE_PROPERTIES)) .addFeatures(AEFeature.SKY_STONE).build(); Block.Properties skyStoneChestProps = defaultProps(Material.ROCK).hardnessAndResistance(50, 150).notSolid(); - TileEntityDefinition skyChestTile = registry.tileEntity("sky_chest", TileSkyChest.class, TileSkyChest::new) - .rendering(new TileEntityRenderingCustomizer() { + TileEntityDefinition skyChestTile = registry.tileEntity("sky_chest", SkyChestTileEntity.class, SkyChestTileEntity::new) + .rendering(new TileEntityRenderingCustomizer() { @Override @OnlyIn(Dist.CLIENT) - public void customize(TileEntityRendering rendering) { + public void customize(TileEntityRendering rendering) { rendering.tileEntityRenderer(SkyChestTESR::new); } }).build(); this.skyStoneChest = registry - .block("sky_stone_chest", () -> new BlockSkyChest(BlockSkyChest.SkyChestType.STONE, skyStoneChestProps)) + .block("sky_stone_chest", () -> new SkyChestBlock(SkyChestBlock.SkyChestType.STONE, skyStoneChestProps)) .features(AEFeature.SKY_STONE, AEFeature.SKY_STONE_CHESTS).tileEntity(skyChestTile).build(); this.smoothSkyStoneChest = registry .block("smooth_sky_stone_chest", - () -> new BlockSkyChest(BlockSkyChest.SkyChestType.BLOCK, skyStoneChestProps)) + () -> new SkyChestBlock(SkyChestBlock.SkyChestType.BLOCK, skyStoneChestProps)) .features(AEFeature.SKY_STONE, AEFeature.SKY_STONE_CHESTS).tileEntity(skyChestTile).build(); - this.skyCompass = registry.block("sky_compass", () -> new BlockSkyCompass(defaultProps(Material.MISCELLANEOUS))) + this.skyCompass = registry.block("sky_compass", () -> new SkyCompassBlock(defaultProps(Material.MISCELLANEOUS))) .features(AEFeature.METEORITE_COMPASS) - .tileEntity(registry.tileEntity("sky_compass", TileSkyCompass.class, TileSkyCompass::new) + .tileEntity(registry.tileEntity("sky_compass", SkyCompassTileEntity.class, SkyCompassTileEntity::new) .rendering(new SkyCompassRendering()).build()) .build(); this.grindstone = registry - .block("grindstone", () -> new BlockGrinder(defaultProps(Material.ROCK).hardnessAndResistance(3.2f))) + .block("grindstone", () -> new GrinderBlock(defaultProps(Material.ROCK).hardnessAndResistance(3.2f))) .features(AEFeature.GRIND_STONE) - .tileEntity(registry.tileEntity("grindstone", TileGrinder.class, TileGrinder::new).build()).build(); + .tileEntity(registry.tileEntity("grindstone", GrinderTileEntity.class, GrinderTileEntity::new).build()).build(); this.crank = registry .block("crank", - () -> new BlockCrank( + () -> new CrankBlock( defaultProps(Material.WOOD).harvestTool(ToolType.AXE).harvestLevel(0).notSolid())) .features(AEFeature.GRIND_STONE) - .tileEntity(registry.tileEntity("crank", TileCrank.class, TileCrank::new) - .rendering(new TileEntityRenderingCustomizer() { + .tileEntity(registry.tileEntity("crank", CrankTileEntity.class, CrankTileEntity::new) + .rendering(new TileEntityRenderingCustomizer() { @Override @OnlyIn(Dist.CLIENT) - public void customize(TileEntityRendering rendering) { + public void customize(TileEntityRendering rendering) { rendering.tileEntityRenderer(CrankTESR::new); } }).build()) .build(); - this.inscriber = registry.block("inscriber", () -> new BlockInscriber(defaultProps(Material.IRON).notSolid())) + this.inscriber = registry.block("inscriber", () -> new InscriberBlock(defaultProps(Material.IRON).notSolid())) .features(AEFeature.INSCRIBER) - .tileEntity(registry.tileEntity("inscriber", TileInscriber.class, TileInscriber::new) + .tileEntity(registry.tileEntity("inscriber", InscriberTileEntity.class, InscriberTileEntity::new) .rendering(new InscriberRendering()).build()) .build(); - this.wirelessAccessPoint = registry.block("wireless_access_point", BlockWireless::new) + this.wirelessAccessPoint = registry.block("wireless_access_point", WirelessBlock::new) .features(AEFeature.WIRELESS_ACCESS_TERMINAL) - .tileEntity(registry.tileEntity("wireless_access_point", TileWireless.class, TileWireless::new).build()) + .tileEntity(registry.tileEntity("wireless_access_point", WirelessTileEntity.class, WirelessTileEntity::new).build()) .rendering(new WirelessRendering()).build(); - this.charger = registry.block("charger", BlockCharger::new).features(AEFeature.CHARGER) - .tileEntity(registry.tileEntity("charger", TileCharger.class, TileCharger::new) - .rendering(new TileEntityRenderingCustomizer() { + this.charger = registry.block("charger", ChargerBlock::new).features(AEFeature.CHARGER) + .tileEntity(registry.tileEntity("charger", ChargerTileEntity.class, ChargerTileEntity::new) + .rendering(new TileEntityRenderingCustomizer() { @Override @OnlyIn(Dist.CLIENT) - public void customize(TileEntityRendering rendering) { - rendering.tileEntityRenderer(BlockCharger.createTesr()); + public void customize(TileEntityRendering rendering) { + rendering.tileEntityRenderer(ChargerBlock.createTesr()); } }).build()) .build(); - EntityTinyTNTPrimed.TYPE = registry - .entity("tiny_tnt_primed", EntityTinyTNTPrimed::new, EntityClassification.MISC) + TinyTNTPrimedEntity.TYPE = registry + .entity("tiny_tnt_primed", TinyTNTPrimedEntity::new, EntityClassification.MISC) .customize(p -> p.setTrackingRange(16).setUpdateInterval(4).setShouldReceiveVelocityUpdates(true)) .build(); this.tinyTNT = registry .block("tiny_tnt", - () -> new BlockTinyTNT( + () -> new TinyTNTBlock( defaultProps(Material.TNT).sound(SoundType.GROUND).hardnessAndResistance(0).notSolid())) .features(AEFeature.TINY_TNT).bootstrap((block, item) -> (IInitComponent) () -> DispenserBlock - .registerDispenseBehavior(item, new DispenserBehaviorTinyTNT())) + .registerDispenseBehavior(item, new TinyTNTDispenseItemBehavior())) .build(); - this.securityStation = registry.block("security_station", BlockSecurityStation::new) + this.securityStation = registry.block("security_station", SecurityStationBlock::new) .features(AEFeature.SECURITY).tileEntity(registry - .tileEntity("security_station", TileSecurityStation.class, TileSecurityStation::new).build()) + .tileEntity("security_station", SecurityStationTileEntity.class, SecurityStationTileEntity::new).build()) .rendering(new SecurityStationRendering()).build(); TileEntityDefinition quantumRingTile = registry - .tileEntity("quantum_ring", TileQuantumBridge.class, TileQuantumBridge::new).build(); - this.quantumRing = registry.block("quantum_ring", BlockQuantumRing::new) + .tileEntity("quantum_ring", QuantumBridgeTileEntity.class, QuantumBridgeTileEntity::new).build(); + this.quantumRing = registry.block("quantum_ring", QuantumRingBlock::new) .features(AEFeature.QUANTUM_NETWORK_BRIDGE).tileEntity(quantumRingTile) .rendering(new QuantumBridgeRendering()).build(); - this.quantumLink = registry.block("quantum_link", BlockQuantumLinkChamber::new) + this.quantumLink = registry.block("quantum_link", QuantumLinkChamberBlock::new) .features(AEFeature.QUANTUM_NETWORK_BRIDGE).tileEntity(quantumRingTile) .rendering(new QuantumBridgeRendering()).build(); - this.spatialPylon = registry.block("spatial_pylon", BlockSpatialPylon::new).features(AEFeature.SPATIAL_IO) - .tileEntity(registry.tileEntity("spatial_pylon", TileSpatialPylon.class, TileSpatialPylon::new).build()) + this.spatialPylon = registry.block("spatial_pylon", SpatialPylonBlock::new).features(AEFeature.SPATIAL_IO) + .tileEntity(registry.tileEntity("spatial_pylon", SpatialPylonTileEntity.class, SpatialPylonTileEntity::new).build()) .rendering(new SpatialPylonRendering()).build(); - this.spatialIOPort = registry.block("spatial_io_port", BlockSpatialIOPort::new).features(AEFeature.SPATIAL_IO) + this.spatialIOPort = registry.block("spatial_io_port", SpatialIOPortBlock::new).features(AEFeature.SPATIAL_IO) .tileEntity( - registry.tileEntity("spatial_io_port", TileSpatialIOPort.class, TileSpatialIOPort::new).build()) + registry.tileEntity("spatial_io_port", SpatialIOPortTileEntity.class, SpatialIOPortTileEntity::new).build()) .build(); - this.controller = registry.block("controller", BlockController::new).features(AEFeature.CHANNELS) - .tileEntity(registry.tileEntity("controller", TileController.class, TileController::new).build()) + this.controller = registry.block("controller", ControllerBlock::new).features(AEFeature.CHANNELS) + .tileEntity(registry.tileEntity("controller", ControllerTileEntity.class, ControllerTileEntity::new).build()) .rendering(new ControllerRendering()).build(); - this.drive = registry.block("drive", BlockDrive::new).features(AEFeature.STORAGE_CELLS, AEFeature.ME_DRIVE) - .tileEntity(registry.tileEntity("drive", TileDrive.class, TileDrive::new) - .rendering(new TileEntityRenderingCustomizer() { + this.drive = registry.block("drive", DriveBlock::new).features(AEFeature.STORAGE_CELLS, AEFeature.ME_DRIVE) + .tileEntity(registry.tileEntity("drive", DriveTileEntity.class, DriveTileEntity::new) + .rendering(new TileEntityRenderingCustomizer() { @Override @OnlyIn(Dist.CLIENT) - public void customize(TileEntityRendering rendering) { + public void customize(TileEntityRendering rendering) { rendering.tileEntityRenderer(DriveLedTileEntityRenderer::new); } }).build()) .rendering(new DriveRendering()).build(); - this.chest = registry.block("chest", BlockChest::new).features(AEFeature.STORAGE_CELLS, AEFeature.ME_CHEST) - .tileEntity(registry.tileEntity("chest", TileChest.class, TileChest::new).build()) + this.chest = registry.block("chest", ChestBlock::new).features(AEFeature.STORAGE_CELLS, AEFeature.ME_CHEST) + .tileEntity(registry.tileEntity("chest", ChestTileEntity.class, ChestTileEntity::new).build()) .rendering(new ChestRendering()).build(); - this.iface = registry.block("interface", BlockInterface::new).features(AEFeature.INTERFACE) - .tileEntity(registry.tileEntity("interface", TileInterface.class, TileInterface::new).build()).build(); - this.fluidIface = registry.block("fluid_interface", BlockFluidInterface::new) + this.iface = registry.block("interface", InterfaceBlock::new).features(AEFeature.INTERFACE) + .tileEntity(registry.tileEntity("interface", InterfaceTileEntity.class, InterfaceTileEntity::new).build()).build(); + this.fluidIface = registry.block("fluid_interface", FluidInterfaceBlock::new) .features(AEFeature.FLUID_INTERFACE).tileEntity(registry - .tileEntity("fluid_interface", TileFluidInterface.class, TileFluidInterface::new).build()) + .tileEntity("fluid_interface", FluidInterfaceTileEntity.class, FluidInterfaceTileEntity::new).build()) .build(); - this.cellWorkbench = registry.block("cell_workbench", BlockCellWorkbench::new).features(AEFeature.STORAGE_CELLS) + this.cellWorkbench = registry.block("cell_workbench", CellWorkbenchBlock::new).features(AEFeature.STORAGE_CELLS) .tileEntity( - registry.tileEntity("cell_workbench", TileCellWorkbench.class, TileCellWorkbench::new).build()) + registry.tileEntity("cell_workbench", CellWorkbenchTileEntity.class, CellWorkbenchTileEntity::new).build()) .build(); - this.iOPort = registry.block("io_port", BlockIOPort::new).features(AEFeature.STORAGE_CELLS, AEFeature.IO_PORT) - .tileEntity(registry.tileEntity("io_port", TileIOPort.class, TileIOPort::new).build()).build(); - this.condenser = registry.block("condenser", BlockCondenser::new).features(AEFeature.CONDENSER) - .tileEntity(registry.tileEntity("condenser", TileCondenser.class, TileCondenser::new).build()).build(); - this.energyAcceptor = registry.block("energy_acceptor", BlockEnergyAcceptor::new) + this.iOPort = registry.block("io_port", IOPortBlock::new).features(AEFeature.STORAGE_CELLS, AEFeature.IO_PORT) + .tileEntity(registry.tileEntity("io_port", IOPortTileEntity.class, IOPortTileEntity::new).build()).build(); + this.condenser = registry.block("condenser", CondenserBlock::new).features(AEFeature.CONDENSER) + .tileEntity(registry.tileEntity("condenser", CondenserTileEntity.class, CondenserTileEntity::new).build()).build(); + this.energyAcceptor = registry.block("energy_acceptor", EnergyAcceptorBlock::new) .features(AEFeature.ENERGY_ACCEPTOR).tileEntity(registry - .tileEntity("energy_acceptor", TileEnergyAcceptor.class, TileEnergyAcceptor::new).build()) + .tileEntity("energy_acceptor", EnergyAcceptorTileEntity.class, EnergyAcceptorTileEntity::new).build()) .build(); - this.vibrationChamber = registry.block("vibration_chamber", BlockVibrationChamber::new) + this.vibrationChamber = registry.block("vibration_chamber", VibrationChamberBlock::new) .features(AEFeature.POWER_GEN) .tileEntity(registry - .tileEntity("vibration_chamber", TileVibrationChamber.class, TileVibrationChamber::new).build()) + .tileEntity("vibration_chamber", VibrationChamberTileEntity.class, VibrationChamberTileEntity::new).build()) .build(); - this.quartzGrowthAccelerator = registry.block("quartz_growth_accelerator", BlockQuartzGrowthAccelerator::new) - .tileEntity(registry.tileEntity("quartz_growth_accelerator", TileQuartzGrowthAccelerator.class, - TileQuartzGrowthAccelerator::new).build()) + this.quartzGrowthAccelerator = registry.block("quartz_growth_accelerator", QuartzGrowthAcceleratorBlock::new) + .tileEntity(registry.tileEntity("quartz_growth_accelerator", QuartzGrowthAcceleratorTileEntity.class, + QuartzGrowthAcceleratorTileEntity::new).build()) .features(AEFeature.CRYSTAL_GROWTH_ACCELERATOR).build(); - this.energyCell = registry.block("energy_cell", BlockEnergyCell::new).features(AEFeature.ENERGY_CELLS) + this.energyCell = registry.block("energy_cell", EnergyCellBlock::new).features(AEFeature.ENERGY_CELLS) .item(AEBaseBlockItemChargeable::new) - .tileEntity(registry.tileEntity("energy_cell", TileEnergyCell.class, TileEnergyCell::new).build()) + .tileEntity(registry.tileEntity("energy_cell", EnergyCellTileEntity.class, EnergyCellTileEntity::new).build()) .build(); - this.energyCellDense = registry.block("dense_energy_cell", BlockDenseEnergyCell::new) + this.energyCellDense = registry.block("dense_energy_cell", DenseEnergyCellBlock::new) .features(AEFeature.ENERGY_CELLS, AEFeature.DENSE_ENERGY_CELLS).item(AEBaseBlockItemChargeable::new) .tileEntity(registry - .tileEntity("dense_energy_cell", TileDenseEnergyCell.class, TileDenseEnergyCell::new).build()) + .tileEntity("dense_energy_cell", DenseEnergyCellTileEntity.class, DenseEnergyCellTileEntity::new).build()) .build(); - this.energyCellCreative = registry.block("creative_energy_cell", BlockCreativeEnergyCell::new) + this.energyCellCreative = registry.block("creative_energy_cell", CreativeEnergyCellBlock::new) .features(AEFeature.CREATIVE) .tileEntity(registry - .tileEntity("creative_energy_cell", TileCreativeEnergyCell.class, TileCreativeEnergyCell::new) + .tileEntity("creative_energy_cell", CreativeEnergyCellTileEntity.class, CreativeEnergyCellTileEntity::new) .build()) .build(); TileEntityDefinition craftingUnit = registry - .tileEntity("crafting_unit", TileCraftingTile.class, TileCraftingTile::new).build(); + .tileEntity("crafting_unit", CraftingTileEntity.class, CraftingTileEntity::new).build(); FeatureFactory crafting = registry.features(AEFeature.CRAFTING_CPU); Block.Properties craftingBlockProps = defaultProps(Material.IRON); @@ -479,34 +477,34 @@ public final class ApiBlocks implements IBlocks { .rendering(new CraftingCubeRendering()).tileEntity(craftingUnit).build(); TileEntityDefinition craftingStorage = registry - .tileEntity("crafting_storage", TileCraftingStorageTile.class, TileCraftingStorageTile::new).build(); + .tileEntity("crafting_storage", CraftingStorageTileEntity.class, CraftingStorageTileEntity::new).build(); this.craftingStorage1k = crafting .block("1k_crafting_storage", - () -> new BlockCraftingStorage(craftingBlockProps, CraftingUnitType.STORAGE_1K)) - .item(ItemCraftingStorage::new).tileEntity(craftingStorage).rendering(new CraftingCubeRendering()) + () -> new CraftingStorageBlock(craftingBlockProps, CraftingUnitType.STORAGE_1K)) + .item(CraftingStorageItem::new).tileEntity(craftingStorage).rendering(new CraftingCubeRendering()) .build(); this.craftingStorage4k = crafting .block("4k_crafting_storage", - () -> new BlockCraftingStorage(craftingBlockProps, CraftingUnitType.STORAGE_4K)) - .item(ItemCraftingStorage::new).tileEntity(craftingStorage).rendering(new CraftingCubeRendering()) + () -> new CraftingStorageBlock(craftingBlockProps, CraftingUnitType.STORAGE_4K)) + .item(CraftingStorageItem::new).tileEntity(craftingStorage).rendering(new CraftingCubeRendering()) .build(); this.craftingStorage16k = crafting .block("16k_crafting_storage", - () -> new BlockCraftingStorage(craftingBlockProps, CraftingUnitType.STORAGE_16K)) - .item(ItemCraftingStorage::new).tileEntity(craftingStorage).rendering(new CraftingCubeRendering()) + () -> new CraftingStorageBlock(craftingBlockProps, CraftingUnitType.STORAGE_16K)) + .item(CraftingStorageItem::new).tileEntity(craftingStorage).rendering(new CraftingCubeRendering()) .build(); this.craftingStorage64k = crafting .block("64k_crafting_storage", - () -> new BlockCraftingStorage(craftingBlockProps, CraftingUnitType.STORAGE_64K)) - .item(ItemCraftingStorage::new).tileEntity(craftingStorage).rendering(new CraftingCubeRendering()) + () -> new CraftingStorageBlock(craftingBlockProps, CraftingUnitType.STORAGE_64K)) + .item(CraftingStorageItem::new).tileEntity(craftingStorage).rendering(new CraftingCubeRendering()) .build(); - this.craftingMonitor = crafting.block("crafting_monitor", () -> new BlockCraftingMonitor(craftingBlockProps)) + this.craftingMonitor = crafting.block("crafting_monitor", () -> new CraftingMonitorBlock(craftingBlockProps)) .tileEntity(registry - .tileEntity("crafting_monitor", TileCraftingMonitorTile.class, TileCraftingMonitorTile::new) - .rendering(new TileEntityRenderingCustomizer() { + .tileEntity("crafting_monitor", CraftingMonitorTileEntity.class, CraftingMonitorTileEntity::new) + .rendering(new TileEntityRenderingCustomizer() { @OnlyIn(Dist.CLIENT) @Override - public void customize(TileEntityRendering rendering) { + public void customize(TileEntityRendering rendering) { rendering.tileEntityRenderer(CraftingMonitorTESR::new); } }).build()) @@ -526,7 +524,7 @@ public final class ApiBlocks implements IBlocks { }).build(); this.molecularAssembler = registry - .block("molecular_assembler", () -> new BlockMolecularAssembler(defaultProps(Material.IRON).notSolid())) + .block("molecular_assembler", () -> new MolecularAssemblerBlock(defaultProps(Material.IRON).notSolid())) .features(AEFeature.MOLECULAR_ASSEMBLER).rendering(new BlockRenderingCustomizer() { @OnlyIn(Dist.CLIENT) @Override @@ -535,20 +533,20 @@ public final class ApiBlocks implements IBlocks { } }) .tileEntity(registry - .tileEntity("molecular_assembler", TileMolecularAssembler.class, TileMolecularAssembler::new) - .rendering(new TileEntityRenderingCustomizer() { + .tileEntity("molecular_assembler", MolecularAssemblerTileEntity.class, MolecularAssemblerTileEntity::new) + .rendering(new TileEntityRenderingCustomizer() { @Override @OnlyIn(Dist.CLIENT) - public void customize(TileEntityRendering rendering) { + public void customize(TileEntityRendering rendering) { rendering.tileEntityRenderer(MolecularAssemblerRenderer::new); } }).build()) .build(); - this.lightDetector = registry.block("light_detector", BlockLightDetector::new) + this.lightDetector = registry.block("light_detector", LightDetectorBlock::new) .features(AEFeature.LIGHT_DETECTOR) .tileEntity( - registry.tileEntity("light_detector", TileLightDetector.class, TileLightDetector::new).build()) + registry.tileEntity("light_detector", LightDetectorTileEntity.class, LightDetectorTileEntity::new).build()) .rendering(new BlockRenderingCustomizer() { @Override @OnlyIn(Dist.CLIENT) @@ -556,9 +554,9 @@ public final class ApiBlocks implements IBlocks { rendering.renderType(RenderType.getCutout()); } }).build(); - this.paint = registry.block("paint", BlockPaint::new).features(AEFeature.PAINT_BALLS) - .tileEntity(registry.tileEntity("paint", TilePaint.class, TilePaint::new).build()) - .rendering(new PaintRendering()).build(); + this.paint = registry.block("paint", PaintSplotchesBlock::new).features(AEFeature.PAINT_BALLS) + .tileEntity(registry.tileEntity("paint", PaintSplotchesTileEntity.class, PaintSplotchesTileEntity::new).build()) + .rendering(new PaintSplotchesRendering()).build(); this.skyStoneStairs = deco .block("sky_stone_stairs", @@ -594,12 +592,12 @@ public final class ApiBlocks implements IBlocks { () -> new StairsBlock(this.quartzPillar().block()::getDefaultState, QUARTZ_PROPERTIES)) .addFeatures(AEFeature.CERTUS).build(); - this.multiPart = registry.block("cable_bus", BlockCableBus::new).rendering(new CableBusRendering()) - .tileEntity(registry.tileEntity("cable_bus", TileCableBus.class, TileCableBus::new) - .rendering(new TileEntityRenderingCustomizer() { + this.multiPart = registry.block("cable_bus", CableBusBlock::new).rendering(new CableBusRendering()) + .tileEntity(registry.tileEntity("cable_bus", CableBusTileEntity.class, CableBusTileEntity::new) + .rendering(new TileEntityRenderingCustomizer() { @Override @OnlyIn(Dist.CLIENT) - public void customize(TileEntityRendering rendering) { + public void customize(TileEntityRendering rendering) { rendering.tileEntityRenderer(CableBusTESR::new); } }).build()) @@ -623,27 +621,27 @@ public final class ApiBlocks implements IBlocks { this.quartzPillarSlab = deco.block("quartz_pillar_slab", () -> new SlabBlock(QUARTZ_PROPERTIES)) .addFeatures(AEFeature.CERTUS).build(); - this.itemGen = registry.block("debug_item_gen", BlockItemGen::new) + this.itemGen = registry.block("debug_item_gen", ItemGenBlock::new) .features(AEFeature.UNSUPPORTED_DEVELOPER_TOOLS, AEFeature.CREATIVE) - .tileEntity(registry.tileEntity("debug_item_gen", TileItemGen.class, TileItemGen::new).build()).build(); - this.chunkLoader = registry.block("debug_chunk_loader", BlockChunkloader::new) + .tileEntity(registry.tileEntity("debug_item_gen", ItemGenTileEntity.class, ItemGenTileEntity::new).build()).build(); + this.chunkLoader = registry.block("debug_chunk_loader", ChunkLoaderBlock::new) .features(AEFeature.UNSUPPORTED_DEVELOPER_TOOLS, AEFeature.CREATIVE) .tileEntity( - registry.tileEntity("debug_chunk_loader", TileChunkLoader.class, TileChunkLoader::new).build()) + registry.tileEntity("debug_chunk_loader", ChunkLoaderTileEntity.class, ChunkLoaderTileEntity::new).build()) .build(); - this.phantomNode = registry.block("debug_phantom_node", BlockPhantomNode::new) + this.phantomNode = registry.block("debug_phantom_node", PhantomNodeBlock::new) .features(AEFeature.UNSUPPORTED_DEVELOPER_TOOLS, AEFeature.CREATIVE) .tileEntity( - registry.tileEntity("debug_phantom_node", TilePhantomNode.class, TilePhantomNode::new).build()) + registry.tileEntity("debug_phantom_node", PhantomNodeTileEntity.class, PhantomNodeTileEntity::new).build()) .build(); - this.cubeGenerator = registry.block("debug_cube_gen", BlockCubeGenerator::new) + this.cubeGenerator = registry.block("debug_cube_gen", CubeGeneratorBlock::new) .features(AEFeature.UNSUPPORTED_DEVELOPER_TOOLS, AEFeature.CREATIVE) .tileEntity( - registry.tileEntity("debug_cube_gen", TileCubeGenerator.class, TileCubeGenerator::new).build()) + registry.tileEntity("debug_cube_gen", CubeGeneratorTileEntity.class, CubeGeneratorTileEntity::new).build()) .build(); - this.energyGenerator = registry.block("debug_energy_gen", BlockEnergyGenerator::new) + this.energyGenerator = registry.block("debug_energy_gen", EnergyGeneratorBlock::new) .features(AEFeature.UNSUPPORTED_DEVELOPER_TOOLS, AEFeature.CREATIVE).tileEntity(registry - .tileEntity("debug_energy_gen", TileEnergyGenerator.class, TileEnergyGenerator::new).build()) + .tileEntity("debug_energy_gen", EnergyGeneratorTileEntity.class, EnergyGeneratorTileEntity::new).build()) .build(); } diff --git a/src/main/java/appeng/core/api/definitions/ApiItems.java b/src/main/java/appeng/core/api/definitions/ApiItems.java index d3815453d..eb835857e 100644 --- a/src/main/java/appeng/core/api/definitions/ApiItems.java +++ b/src/main/java/appeng/core/api/definitions/ApiItems.java @@ -34,44 +34,44 @@ import appeng.bootstrap.FeatureFactory; import appeng.core.features.ActivityState; import appeng.core.features.ColoredItemDefinition; import appeng.core.features.ItemStackSrc; -import appeng.debug.ToolDebugCard; -import appeng.debug.ToolDebugPartPlacer; -import appeng.debug.ToolEraser; -import appeng.debug.ToolMeteoritePlacer; -import appeng.debug.ToolReplicatorCard; -import appeng.entity.EntityGrowingCrystal; +import appeng.debug.DebugCardItem; +import appeng.debug.DebugPartPlacerItem; +import appeng.debug.EraserItem; +import appeng.debug.MeteoritePlacerItem; +import appeng.debug.ReplicatorCardItem; +import appeng.entity.GrowingCrystalEntity; import appeng.fluids.items.BasicFluidStorageCell; import appeng.fluids.items.FluidDummyItem; import appeng.fluids.items.FluidDummyItemRendering; -import appeng.hooks.DispenserBlockTool; -import appeng.hooks.DispenserMatterCannon; +import appeng.hooks.BlockToolDispenseItemBehavior; +import appeng.hooks.MatterCannonDispenseItemBehavior; import appeng.items.materials.MaterialType; -import appeng.items.misc.ItemCrystalSeed; -import appeng.items.misc.ItemEncodedPattern; -import appeng.items.misc.ItemPaintBall; -import appeng.items.misc.ItemPaintBallRendering; -import appeng.items.parts.ItemFacade; -import appeng.items.storage.BasicItemStorageCell; -import appeng.items.storage.ItemCreativeStorageCell; -import appeng.items.storage.ItemSpatialStorageCell; -import appeng.items.storage.ItemViewCell; -import appeng.items.tools.ToolBiometricCard; -import appeng.items.tools.ToolMemoryCard; -import appeng.items.tools.ToolNetworkTool; -import appeng.items.tools.powered.ToolChargedStaff; -import appeng.items.tools.powered.ToolColorApplicator; -import appeng.items.tools.powered.ToolColorApplicatorRendering; -import appeng.items.tools.powered.ToolEntropyManipulator; -import appeng.items.tools.powered.ToolMatterCannon; -import appeng.items.tools.powered.ToolPortableCell; -import appeng.items.tools.powered.ToolWirelessTerminal; -import appeng.items.tools.quartz.ToolQuartzAxe; -import appeng.items.tools.quartz.ToolQuartzCuttingKnife; -import appeng.items.tools.quartz.ToolQuartzHoe; -import appeng.items.tools.quartz.ToolQuartzPickaxe; -import appeng.items.tools.quartz.ToolQuartzSpade; -import appeng.items.tools.quartz.ToolQuartzSword; -import appeng.items.tools.quartz.ToolQuartzWrench; +import appeng.items.misc.CrystalSeedItem; +import appeng.items.misc.EncodedPatternItem; +import appeng.items.misc.PaintBallItem; +import appeng.items.misc.PaintBallItemRendering; +import appeng.items.parts.FacadeItem; +import appeng.items.storage.BasicStorageCellItem; +import appeng.items.storage.CreativeStorageCellItem; +import appeng.items.storage.SpatialStorageCellItem; +import appeng.items.storage.ViewCellItem; +import appeng.items.tools.BiometricCardItem; +import appeng.items.tools.MemoryCardItem; +import appeng.items.tools.NetworkToolItem; +import appeng.items.tools.powered.ChargedStaffItem; +import appeng.items.tools.powered.ColorApplicatorItem; +import appeng.items.tools.powered.ColorApplicatorItemRendering; +import appeng.items.tools.powered.EntropyManipulatorItem; +import appeng.items.tools.powered.MatterCannonItem; +import appeng.items.tools.powered.PortableCellItem; +import appeng.items.tools.powered.WirelessTerminalItem; +import appeng.items.tools.quartz.QuartzAxeItem; +import appeng.items.tools.quartz.QuartzCuttingKnifeItem; +import appeng.items.tools.quartz.QuartzHoeItem; +import appeng.items.tools.quartz.QuartzPickaxeItem; +import appeng.items.tools.quartz.QuartzSpadeItem; +import appeng.items.tools.quartz.QuartzSwordItem; +import appeng.items.tools.quartz.QuartzWrenchItem; /** * Internal implementation for the API items @@ -142,83 +142,83 @@ public final class ApiItems implements IItems { public ApiItems(FeatureFactory registry, ApiMaterials materials) { FeatureFactory certusTools = registry.features(AEFeature.CERTUS_QUARTZ_TOOLS); this.certusQuartzAxe = certusTools - .item("certus_quartz_axe", props -> new ToolQuartzAxe(props, AEFeature.CERTUS_QUARTZ_TOOLS)) + .item("certus_quartz_axe", props -> new QuartzAxeItem(props, AEFeature.CERTUS_QUARTZ_TOOLS)) .itemGroup(ItemGroup.TOOLS).addFeatures(AEFeature.QUARTZ_AXE).build(); this.certusQuartzHoe = certusTools - .item("certus_quartz_hoe", props -> new ToolQuartzHoe(props, AEFeature.CERTUS_QUARTZ_TOOLS)) + .item("certus_quartz_hoe", props -> new QuartzHoeItem(props, AEFeature.CERTUS_QUARTZ_TOOLS)) .itemGroup(ItemGroup.TOOLS).addFeatures(AEFeature.QUARTZ_HOE).build(); this.certusQuartzShovel = certusTools - .item("certus_quartz_shovel", props -> new ToolQuartzSpade(props, AEFeature.CERTUS_QUARTZ_TOOLS)) + .item("certus_quartz_shovel", props -> new QuartzSpadeItem(props, AEFeature.CERTUS_QUARTZ_TOOLS)) .itemGroup(ItemGroup.TOOLS).addFeatures(AEFeature.QUARTZ_SPADE).build(); this.certusQuartzPick = certusTools - .item("certus_quartz_pickaxe", props -> new ToolQuartzPickaxe(props, AEFeature.CERTUS_QUARTZ_TOOLS)) + .item("certus_quartz_pickaxe", props -> new QuartzPickaxeItem(props, AEFeature.CERTUS_QUARTZ_TOOLS)) .itemGroup(ItemGroup.TOOLS).addFeatures(AEFeature.QUARTZ_PICKAXE).build(); this.certusQuartzSword = certusTools - .item("certus_quartz_sword", props -> new ToolQuartzSword(props, AEFeature.CERTUS_QUARTZ_TOOLS)) + .item("certus_quartz_sword", props -> new QuartzSwordItem(props, AEFeature.CERTUS_QUARTZ_TOOLS)) .itemGroup(ItemGroup.COMBAT).addFeatures(AEFeature.QUARTZ_SWORD).build(); - this.certusQuartzWrench = certusTools.item("certus_quartz_wrench", ToolQuartzWrench::new) + this.certusQuartzWrench = certusTools.item("certus_quartz_wrench", QuartzWrenchItem::new) .itemGroup(ItemGroup.TOOLS).props(props -> props.maxStackSize(1)).addFeatures(AEFeature.QUARTZ_WRENCH) .build(); this.certusQuartzKnife = certusTools .item("certus_quartz_cutting_knife", - props -> new ToolQuartzCuttingKnife(props, AEFeature.CERTUS_QUARTZ_TOOLS)) + props -> new QuartzCuttingKnifeItem(props, AEFeature.CERTUS_QUARTZ_TOOLS)) .itemGroup(ItemGroup.TOOLS).props(props -> props.maxStackSize(1).maxDamage(50).setNoRepair()) .addFeatures(AEFeature.QUARTZ_KNIFE).build(); FeatureFactory netherTools = registry.features(AEFeature.NETHER_QUARTZ_TOOLS); this.netherQuartzAxe = netherTools - .item("nether_quartz_axe", props -> new ToolQuartzAxe(props, AEFeature.NETHER_QUARTZ_TOOLS)) + .item("nether_quartz_axe", props -> new QuartzAxeItem(props, AEFeature.NETHER_QUARTZ_TOOLS)) .itemGroup(ItemGroup.TOOLS).addFeatures(AEFeature.QUARTZ_AXE).build(); this.netherQuartzHoe = netherTools - .item("nether_quartz_hoe", props -> new ToolQuartzHoe(props, AEFeature.NETHER_QUARTZ_TOOLS)) + .item("nether_quartz_hoe", props -> new QuartzHoeItem(props, AEFeature.NETHER_QUARTZ_TOOLS)) .itemGroup(ItemGroup.TOOLS).addFeatures(AEFeature.QUARTZ_HOE).build(); this.netherQuartzShovel = netherTools - .item("nether_quartz_shovel", props -> new ToolQuartzSpade(props, AEFeature.NETHER_QUARTZ_TOOLS)) + .item("nether_quartz_shovel", props -> new QuartzSpadeItem(props, AEFeature.NETHER_QUARTZ_TOOLS)) .itemGroup(ItemGroup.TOOLS).addFeatures(AEFeature.QUARTZ_SPADE).build(); this.netherQuartzPick = netherTools - .item("nether_quartz_pickaxe", props -> new ToolQuartzPickaxe(props, AEFeature.NETHER_QUARTZ_TOOLS)) + .item("nether_quartz_pickaxe", props -> new QuartzPickaxeItem(props, AEFeature.NETHER_QUARTZ_TOOLS)) .itemGroup(ItemGroup.TOOLS).addFeatures(AEFeature.QUARTZ_PICKAXE).build(); this.netherQuartzSword = netherTools - .item("nether_quartz_sword", props -> new ToolQuartzSword(props, AEFeature.NETHER_QUARTZ_TOOLS)) + .item("nether_quartz_sword", props -> new QuartzSwordItem(props, AEFeature.NETHER_QUARTZ_TOOLS)) .itemGroup(ItemGroup.COMBAT).addFeatures(AEFeature.QUARTZ_SWORD).build(); - this.netherQuartzWrench = netherTools.item("nether_quartz_wrench", ToolQuartzWrench::new) + this.netherQuartzWrench = netherTools.item("nether_quartz_wrench", QuartzWrenchItem::new) .itemGroup(ItemGroup.TOOLS).props(props -> props.maxStackSize(1)).addFeatures(AEFeature.QUARTZ_WRENCH) .build(); this.netherQuartzKnife = netherTools .item("nether_quartz_cutting_knife", - props -> new ToolQuartzCuttingKnife(props, AEFeature.NETHER_QUARTZ_TOOLS)) + props -> new QuartzCuttingKnifeItem(props, AEFeature.NETHER_QUARTZ_TOOLS)) .itemGroup(ItemGroup.TOOLS).props(props -> props.maxStackSize(1).maxDamage(50).setNoRepair()) .addFeatures(AEFeature.QUARTZ_KNIFE).build(); Consumer chargedDefaults = props -> props.maxStackSize(1).maxDamage(32).setNoRepair(); FeatureFactory powerTools = registry.features(AEFeature.POWERED_TOOLS); - this.entropyManipulator = powerTools.item("entropy_manipulator", ToolEntropyManipulator::new) + this.entropyManipulator = powerTools.item("entropy_manipulator", EntropyManipulatorItem::new) .props(chargedDefaults).addFeatures(AEFeature.ENTROPY_MANIPULATOR) - .dispenserBehavior(DispenserBlockTool::new).build(); - this.wirelessTerminal = powerTools.item("wireless_terminal", ToolWirelessTerminal::new).props(chargedDefaults) + .dispenserBehavior(BlockToolDispenseItemBehavior::new).build(); + this.wirelessTerminal = powerTools.item("wireless_terminal", WirelessTerminalItem::new).props(chargedDefaults) .addFeatures(AEFeature.WIRELESS_ACCESS_TERMINAL).build(); - this.chargedStaff = powerTools.item("charged_staff", ToolChargedStaff::new).props(chargedDefaults) + this.chargedStaff = powerTools.item("charged_staff", ChargedStaffItem::new).props(chargedDefaults) .addFeatures(AEFeature.CHARGED_STAFF).build(); - this.massCannon = powerTools.item("matter_cannon", ToolMatterCannon::new).props(chargedDefaults) - .addFeatures(AEFeature.MATTER_CANNON).dispenserBehavior(DispenserMatterCannon::new).build(); - this.portableCell = powerTools.item("portable_cell", ToolPortableCell::new).props(chargedDefaults) + this.massCannon = powerTools.item("matter_cannon", MatterCannonItem::new).props(chargedDefaults) + .addFeatures(AEFeature.MATTER_CANNON).dispenserBehavior(MatterCannonDispenseItemBehavior::new).build(); + this.portableCell = powerTools.item("portable_cell", PortableCellItem::new).props(chargedDefaults) .addFeatures(AEFeature.PORTABLE_CELL, AEFeature.STORAGE_CELLS).build(); - this.colorApplicator = powerTools.item("color_applicator", ToolColorApplicator::new).props(chargedDefaults) - .addFeatures(AEFeature.COLOR_APPLICATOR).dispenserBehavior(DispenserBlockTool::new) - .rendering(new ToolColorApplicatorRendering()).build(); + this.colorApplicator = powerTools.item("color_applicator", ColorApplicatorItem::new).props(chargedDefaults) + .addFeatures(AEFeature.COLOR_APPLICATOR).dispenserBehavior(BlockToolDispenseItemBehavior::new) + .rendering(new ColorApplicatorItemRendering()).build(); - this.biometricCard = registry.item("biometric_card", ToolBiometricCard::new) + this.biometricCard = registry.item("biometric_card", BiometricCardItem::new) .props(props -> props.maxStackSize(1)).features(AEFeature.SECURITY).build(); - this.memoryCard = registry.item("memory_card", ToolMemoryCard::new).props(props -> props.maxStackSize(1)) + this.memoryCard = registry.item("memory_card", MemoryCardItem::new).props(props -> props.maxStackSize(1)) .features(AEFeature.MEMORY_CARD).build(); - this.networkTool = registry.item("network_tool", ToolNetworkTool::new) + this.networkTool = registry.item("network_tool", NetworkToolItem::new) .props(props -> props.maxStackSize(1).addToolType(ToolType.get("wrench"), 0)) .features(AEFeature.NETWORK_TOOL).build(); - this.cellCreative = registry.item("creative_storage_cell", ItemCreativeStorageCell::new) + this.cellCreative = registry.item("creative_storage_cell", CreativeStorageCellItem::new) .props(props -> props.maxStackSize(1)).features(AEFeature.STORAGE_CELLS, AEFeature.CREATIVE).build(); - this.viewCell = registry.item("view_cell", ItemViewCell::new).props(props -> props.maxStackSize(1)) + this.viewCell = registry.item("view_cell", ViewCellItem::new).props(props -> props.maxStackSize(1)) .features(AEFeature.VIEW_CELL).build(); Consumer storageCellProps = p -> p.maxStackSize(1); @@ -226,19 +226,19 @@ public final class ApiItems implements IItems { FeatureFactory storageCells = registry.features(AEFeature.STORAGE_CELLS); this.cell1k = storageCells .item("1k_storage_cell", - props -> new BasicItemStorageCell(props, MaterialType.ITEM_1K_CELL_COMPONENT, 1)) + props -> new BasicStorageCellItem(props, MaterialType.ITEM_1K_CELL_COMPONENT, 1)) .props(storageCellProps).build(); this.cell4k = storageCells .item("4k_storage_cell", - props -> new BasicItemStorageCell(props, MaterialType.ITEM_4K_CELL_COMPONENT, 4)) + props -> new BasicStorageCellItem(props, MaterialType.ITEM_4K_CELL_COMPONENT, 4)) .props(storageCellProps).build(); this.cell16k = storageCells .item("16k_storage_cell", - props -> new BasicItemStorageCell(props, MaterialType.ITEM_16K_CELL_COMPONENT, 16)) + props -> new BasicStorageCellItem(props, MaterialType.ITEM_16K_CELL_COMPONENT, 16)) .props(storageCellProps).build(); this.cell64k = storageCells .item("64k_storage_cell", - props -> new BasicItemStorageCell(props, MaterialType.ITEM_64K_CELL_COMPONENT, 64)) + props -> new BasicStorageCellItem(props, MaterialType.ITEM_64K_CELL_COMPONENT, 64)) .props(storageCellProps).build(); this.fluidCell1k = storageCells @@ -260,47 +260,47 @@ public final class ApiItems implements IItems { FeatureFactory spatialCells = registry.features(AEFeature.SPATIAL_IO); this.spatialCell2 = spatialCells - .item("2_cubed_spatial_storage_cell", props -> new ItemSpatialStorageCell(props, 2)) + .item("2_cubed_spatial_storage_cell", props -> new SpatialStorageCellItem(props, 2)) .props(storageCellProps).build(); this.spatialCell16 = spatialCells - .item("16_cubed_spatial_storage_cell", props -> new ItemSpatialStorageCell(props, 16)) + .item("16_cubed_spatial_storage_cell", props -> new SpatialStorageCellItem(props, 16)) .props(storageCellProps).build(); this.spatialCell128 = spatialCells - .item("128_cubed_spatial_storage_cell", props -> new ItemSpatialStorageCell(props, 128)) + .item("128_cubed_spatial_storage_cell", props -> new SpatialStorageCellItem(props, 128)) .props(storageCellProps).build(); - this.facade = registry.item("facade", ItemFacade::new).features(AEFeature.FACADES).build(); + this.facade = registry.item("facade", FacadeItem::new).features(AEFeature.FACADES).build(); this.certusCrystalSeed = registry .item("certus_crystal_seed", - props -> new ItemCrystalSeed(props, materials.purifiedCertusQuartzCrystal().item())) + props -> new CrystalSeedItem(props, materials.purifiedCertusQuartzCrystal().item())) .features(AEFeature.CRYSTAL_SEEDS).build(); this.fluixCrystalSeed = registry .item("fluix_crystal_seed", - props -> new ItemCrystalSeed(props, materials.purifiedFluixCrystal().item())) + props -> new CrystalSeedItem(props, materials.purifiedFluixCrystal().item())) .features(AEFeature.CRYSTAL_SEEDS).build(); this.netherQuartzSeed = registry .item("nether_quartz_seed", - props -> new ItemCrystalSeed(props, materials.purifiedNetherQuartzCrystal().item())) + props -> new CrystalSeedItem(props, materials.purifiedNetherQuartzCrystal().item())) .features(AEFeature.CRYSTAL_SEEDS).build(); - EntityGrowingCrystal.TYPE = registry - .entity("growing_crystal", EntityGrowingCrystal::new, EntityClassification.MISC) + GrowingCrystalEntity.TYPE = registry + .entity("growing_crystal", GrowingCrystalEntity::new, EntityClassification.MISC) .customize(builder -> builder.size(0.25F, 0.25F)).build(); // rv1 - this.encodedPattern = registry.item("encoded_pattern", ItemEncodedPattern::new) + this.encodedPattern = registry.item("encoded_pattern", EncodedPatternItem::new) .props(props -> props.maxStackSize(1)).features(AEFeature.PATTERNS).build(); this.coloredPaintBall = createPaintBalls(registry, "_paint_ball", false); this.coloredLumenPaintBall = createPaintBalls(registry, "_lumen_paint_ball", true); FeatureFactory debugTools = registry.features(AEFeature.UNSUPPORTED_DEVELOPER_TOOLS, AEFeature.CREATIVE); - this.toolEraser = debugTools.item("debug_eraser", ToolEraser::new).build(); - this.toolMeteoritePlacer = debugTools.item("debug_meteorite_placer", ToolMeteoritePlacer::new).build(); - this.toolDebugCard = debugTools.item("debug_card", ToolDebugCard::new).build(); - this.toolReplicatorCard = debugTools.item("debug_replicator_card", ToolReplicatorCard::new).build(); - debugTools.item("debug_part_placer", ToolDebugPartPlacer::new).build(); + this.toolEraser = debugTools.item("debug_eraser", EraserItem::new).build(); + this.toolMeteoritePlacer = debugTools.item("debug_meteorite_placer", MeteoritePlacerItem::new).build(); + this.toolDebugCard = debugTools.item("debug_card", DebugCardItem::new).build(); + this.toolReplicatorCard = debugTools.item("debug_replicator_card", ReplicatorCardItem::new).build(); + debugTools.item("debug_part_placer", DebugPartPlacerItem::new).build(); this.dummyFluidItem = registry.item("dummy_fluid_item", FluidDummyItem::new) .rendering(new FluidDummyItemRendering()).build(); @@ -314,8 +314,8 @@ public final class ApiItems implements IItems { } String id = color.registryPrefix + idSuffix; - IItemDefinition paintBall = registry.item(id, props -> new ItemPaintBall(props, color, lumen)) - .features(AEFeature.PAINT_BALLS).rendering(new ItemPaintBallRendering(color, lumen)).build(); + IItemDefinition paintBall = registry.item(id, props -> new PaintBallItem(props, color, lumen)) + .features(AEFeature.PAINT_BALLS).rendering(new PaintBallItemRendering(color, lumen)).build(); colors.add(color, new ItemStackSrc(paintBall.item(), ActivityState.Enabled)); } return colors; diff --git a/src/main/java/appeng/core/api/definitions/ApiMaterials.java b/src/main/java/appeng/core/api/definitions/ApiMaterials.java index 805ef05d6..0e31301a3 100644 --- a/src/main/java/appeng/core/api/definitions/ApiMaterials.java +++ b/src/main/java/appeng/core/api/definitions/ApiMaterials.java @@ -28,9 +28,9 @@ import appeng.api.features.AEFeature; import appeng.bootstrap.FeatureFactory; import appeng.core.AEConfig; import appeng.core.features.MaterialStackSrc; -import appeng.entity.EntityChargedQuartz; -import appeng.entity.EntitySingularity; -import appeng.items.materials.ItemMaterial; +import appeng.entity.ChargedQuartzEntity; +import appeng.entity.SingularityEntity; +import appeng.items.materials.MaterialItem; import appeng.items.materials.MaterialType; /** @@ -118,14 +118,14 @@ public final class ApiMaterials implements IMaterials { public ApiMaterials(FeatureFactory registry) { this.registry = registry; - EntitySingularity.TYPE = registry - .entity("singularity", EntitySingularity::new, EntityClassification.MISC) + SingularityEntity.TYPE = registry + .entity("singularity", SingularityEntity::new, EntityClassification.MISC) .customize(builder -> builder.size(0.2f, 0.2f).setTrackingRange(16).setUpdateInterval(4) .setShouldReceiveVelocityUpdates(true)) .build(); - EntityChargedQuartz.TYPE = registry - .entity("charged_quartz", EntityChargedQuartz::new, EntityClassification.MISC) + ChargedQuartzEntity.TYPE = registry + .entity("charged_quartz", ChargedQuartzEntity::new, EntityClassification.MISC) .customize(builder -> builder.size(0.2f, 0.2f).setTrackingRange(16).setUpdateInterval(4) .setShouldReceiveVelocityUpdates(true)) .build(); @@ -192,7 +192,7 @@ public final class ApiMaterials implements IMaterials { private IItemDefinition createMaterial(final MaterialType mat) { Preconditions.checkState(!mat.isRegistered(), "Cannot create the same material twice."); - IItemDefinition def = registry.item(mat.getId(), props -> new ItemMaterial(props, mat)) + IItemDefinition def = registry.item(mat.getId(), props -> new MaterialItem(props, mat)) .features(mat.getFeature().toArray(new AEFeature[0])).build(); boolean enabled = true; diff --git a/src/main/java/appeng/core/api/definitions/ApiParts.java b/src/main/java/appeng/core/api/definitions/ApiParts.java index 10cf74521..8b3c59b6b 100644 --- a/src/main/java/appeng/core/api/definitions/ApiParts.java +++ b/src/main/java/appeng/core/api/definitions/ApiParts.java @@ -35,50 +35,50 @@ import appeng.core.features.ActivityState; import appeng.core.features.ColoredItemDefinition; import appeng.core.features.ItemStackSrc; import appeng.core.features.registries.PartModels; -import appeng.fluids.parts.PartFluidAnnihilationPlane; -import appeng.fluids.parts.PartFluidExportBus; -import appeng.fluids.parts.PartFluidFormationPlane; -import appeng.fluids.parts.PartFluidImportBus; -import appeng.fluids.parts.PartFluidInterface; -import appeng.fluids.parts.PartFluidLevelEmitter; -import appeng.fluids.parts.PartFluidStorageBus; -import appeng.fluids.parts.PartFluidTerminal; +import appeng.fluids.parts.FluidAnnihilationPlanePart; +import appeng.fluids.parts.FluidExportBusPart; +import appeng.fluids.parts.FluidFormationPlanePart; +import appeng.fluids.parts.FluidImportBusPart; +import appeng.fluids.parts.FluidInterfacePart; +import appeng.fluids.parts.FluidLevelEmitterPart; +import appeng.fluids.parts.FluidStorageBusPart; +import appeng.fluids.parts.FluidTerminalPart; import appeng.items.parts.ColoredPartItem; -import appeng.items.parts.ItemPart; -import appeng.items.parts.ItemPartRendering; +import appeng.items.parts.PartItem; +import appeng.items.parts.PartItemRendering; import appeng.items.parts.PartType; -import appeng.parts.automation.PartAnnihilationPlane; -import appeng.parts.automation.PartExportBus; -import appeng.parts.automation.PartFormationPlane; -import appeng.parts.automation.PartIdentityAnnihilationPlane; -import appeng.parts.automation.PartImportBus; -import appeng.parts.automation.PartLevelEmitter; -import appeng.parts.misc.PartCableAnchor; -import appeng.parts.misc.PartInterface; -import appeng.parts.misc.PartInvertedToggleBus; -import appeng.parts.misc.PartStorageBus; -import appeng.parts.misc.PartToggleBus; -import appeng.parts.networking.PartCableCovered; -import appeng.parts.networking.PartCableGlass; -import appeng.parts.networking.PartCableSmart; -import appeng.parts.networking.PartDenseCableCovered; -import appeng.parts.networking.PartDenseCableSmart; -import appeng.parts.networking.PartQuartzFiber; -import appeng.parts.p2p.PartP2PFEPower; -import appeng.parts.p2p.PartP2PFluids; -import appeng.parts.p2p.PartP2PItems; -import appeng.parts.p2p.PartP2PLight; -import appeng.parts.p2p.PartP2PRedstone; -import appeng.parts.p2p.PartP2PTunnelME; -import appeng.parts.reporting.PartConversionMonitor; -import appeng.parts.reporting.PartCraftingTerminal; -import appeng.parts.reporting.PartDarkPanel; -import appeng.parts.reporting.PartInterfaceTerminal; -import appeng.parts.reporting.PartPanel; -import appeng.parts.reporting.PartPatternTerminal; -import appeng.parts.reporting.PartSemiDarkPanel; -import appeng.parts.reporting.PartStorageMonitor; -import appeng.parts.reporting.PartTerminal; +import appeng.parts.automation.AnnihilationPlanePart; +import appeng.parts.automation.ExportBusPart; +import appeng.parts.automation.FormationPlanePart; +import appeng.parts.automation.IdentityAnnihilationPlanePart; +import appeng.parts.automation.ImportBusPart; +import appeng.parts.automation.LevelEmitterPart; +import appeng.parts.misc.CableAnchorPart; +import appeng.parts.misc.InterfacePart; +import appeng.parts.misc.InvertedToggleBusPart; +import appeng.parts.misc.StorageBusPart; +import appeng.parts.misc.ToggleBusPart; +import appeng.parts.networking.CoveredCablePart; +import appeng.parts.networking.GlassCablePart; +import appeng.parts.networking.SmartCablePart; +import appeng.parts.networking.CoveredDenseCablePart; +import appeng.parts.networking.SmartDenseCablePart; +import appeng.parts.networking.QuartzFiberPart; +import appeng.parts.p2p.FEP2PTunnelPart; +import appeng.parts.p2p.FluidP2PTunnelPart; +import appeng.parts.p2p.ItemP2PTunnelPart; +import appeng.parts.p2p.LightP2PTunnelPart; +import appeng.parts.p2p.RedstoneP2PTunnelPart; +import appeng.parts.p2p.MEP2PTunnelPart; +import appeng.parts.reporting.ConversionMonitorPart; +import appeng.parts.reporting.CraftingTerminalPart; +import appeng.parts.reporting.DarkPanelPart; +import appeng.parts.reporting.InterfaceTerminalPart; +import appeng.parts.reporting.PanelPart; +import appeng.parts.reporting.PatternTerminalPart; +import appeng.parts.reporting.SemiDarkPanelPart; +import appeng.parts.reporting.StorageMonitorPart; +import appeng.parts.reporting.TerminalPart; /** * Internal implementation for the API parts @@ -130,70 +130,70 @@ public final class ApiParts implements IParts { registerPartModels(partModels); this.cableSmart = constructColoredDefinition(registry, "smart_cable", PartType.CABLE_SMART, - PartCableSmart::new); + SmartCablePart::new); this.cableCovered = constructColoredDefinition(registry, "covered_cable", PartType.CABLE_COVERED, - PartCableCovered::new); + CoveredCablePart::new); this.cableGlass = constructColoredDefinition(registry, "glass_cable", PartType.CABLE_GLASS, - PartCableGlass::new); + GlassCablePart::new); this.cableDenseCovered = constructColoredDefinition(registry, "covered_dense_cable", - PartType.CABLE_DENSE_COVERED, PartDenseCableCovered::new); + PartType.CABLE_DENSE_COVERED, CoveredDenseCablePart::new); this.cableDenseSmart = constructColoredDefinition(registry, "smart_dense_cable", PartType.CABLE_DENSE_SMART, - PartDenseCableSmart::new); - this.quartzFiber = createPart(registry, "quartz_fiber", PartType.QUARTZ_FIBER, PartQuartzFiber::new); - this.toggleBus = createPart(registry, "toggle_bus", PartType.TOGGLE_BUS, PartToggleBus::new); + SmartDenseCablePart::new); + this.quartzFiber = createPart(registry, "quartz_fiber", PartType.QUARTZ_FIBER, QuartzFiberPart::new); + this.toggleBus = createPart(registry, "toggle_bus", PartType.TOGGLE_BUS, ToggleBusPart::new); this.invertedToggleBus = createPart(registry, "inverted_toggle_bus", PartType.INVERTED_TOGGLE_BUS, - PartInvertedToggleBus::new); - this.cableAnchor = createPart(registry, "cable_anchor", PartType.CABLE_ANCHOR, PartCableAnchor::new); - this.monitor = createPart(registry, "monitor", PartType.MONITOR, PartPanel::new); + InvertedToggleBusPart::new); + this.cableAnchor = createPart(registry, "cable_anchor", PartType.CABLE_ANCHOR, CableAnchorPart::new); + this.monitor = createPart(registry, "monitor", PartType.MONITOR, PanelPart::new); this.semiDarkMonitor = createPart(registry, "semi_dark_monitor", PartType.SEMI_DARK_MONITOR, - PartSemiDarkPanel::new); - this.darkMonitor = createPart(registry, "dark_monitor", PartType.DARK_MONITOR, PartDarkPanel::new); - this.storageBus = createPart(registry, "storage_bus", PartType.STORAGE_BUS, PartStorageBus::new); + SemiDarkPanelPart::new); + this.darkMonitor = createPart(registry, "dark_monitor", PartType.DARK_MONITOR, DarkPanelPart::new); + this.storageBus = createPart(registry, "storage_bus", PartType.STORAGE_BUS, StorageBusPart::new); this.fluidStorageBus = createPart(registry, "fluid_storage_bus", PartType.FLUID_STORAGE_BUS, - PartFluidStorageBus::new); - this.importBus = createPart(registry, "import_bus", PartType.IMPORT_BUS, PartImportBus::new); + FluidStorageBusPart::new); + this.importBus = createPart(registry, "import_bus", PartType.IMPORT_BUS, ImportBusPart::new); this.fluidImportBus = createPart(registry, "fluid_import_bus", PartType.FLUID_IMPORT_BUS, - PartFluidImportBus::new); - this.exportBus = createPart(registry, "export_bus", PartType.EXPORT_BUS, PartExportBus::new); + FluidImportBusPart::new); + this.exportBus = createPart(registry, "export_bus", PartType.EXPORT_BUS, ExportBusPart::new); this.fluidExportBus = createPart(registry, "fluid_export_bus", PartType.FLUID_EXPORT_BUS, - PartFluidExportBus::new); - this.levelEmitter = createPart(registry, "level_emitter", PartType.LEVEL_EMITTER, PartLevelEmitter::new); + FluidExportBusPart::new); + this.levelEmitter = createPart(registry, "level_emitter", PartType.LEVEL_EMITTER, LevelEmitterPart::new); this.fluidLevelEmitter = createPart(registry, "fluid_level_emitter", PartType.FLUID_LEVEL_EMITTER, - PartFluidLevelEmitter::new); + FluidLevelEmitterPart::new); this.annihilationPlane = createPart(registry, "annihilation_plane", PartType.ANNIHILATION_PLANE, - PartAnnihilationPlane::new); + AnnihilationPlanePart::new); this.identityAnnihilationPlane = createPart(registry, "identity_annihilation_plane", - PartType.IDENTITY_ANNIHILATION_PLANE, PartIdentityAnnihilationPlane::new); + PartType.IDENTITY_ANNIHILATION_PLANE, IdentityAnnihilationPlanePart::new); this.fluidAnnihilationPlane = createPart(registry, "fluid_annihilation_plane", - PartType.FLUID_ANNIHILATION_PLANE, PartFluidAnnihilationPlane::new); + PartType.FLUID_ANNIHILATION_PLANE, FluidAnnihilationPlanePart::new); this.formationPlane = createPart(registry, "formation_plane", PartType.FORMATION_PLANE, - PartFormationPlane::new); + FormationPlanePart::new); this.fluidFormationPlane = createPart(registry, "fluid_formation_plane", PartType.FLUID_FORMATION_PLANE, - PartFluidFormationPlane::new); + FluidFormationPlanePart::new); this.patternTerminal = createPart(registry, "pattern_terminal", PartType.PATTERN_TERMINAL, - PartPatternTerminal::new); + PatternTerminalPart::new); this.craftingTerminal = createPart(registry, "crafting_terminal", PartType.CRAFTING_TERMINAL, - PartCraftingTerminal::new); - this.terminal = createPart(registry, "terminal", PartType.TERMINAL, PartTerminal::new); + CraftingTerminalPart::new); + this.terminal = createPart(registry, "terminal", PartType.TERMINAL, TerminalPart::new); this.storageMonitor = createPart(registry, "storage_monitor", PartType.STORAGE_MONITOR, - PartStorageMonitor::new); + StorageMonitorPart::new); this.conversionMonitor = createPart(registry, "conversion_monitor", PartType.CONVERSION_MONITOR, - PartConversionMonitor::new); - this.iface = createPart(registry, "cable_interface", PartType.INTERFACE, PartInterface::new); + ConversionMonitorPart::new); + this.iface = createPart(registry, "cable_interface", PartType.INTERFACE, InterfacePart::new); this.fluidIface = createPart(registry, "cable_fluid_interface", PartType.FLUID_INTERFACE, - PartFluidInterface::new); - this.p2PTunnelME = createPart(registry, "me_p2p_tunnel", PartType.P2P_TUNNEL_ME, PartP2PTunnelME::new); + FluidInterfacePart::new); + this.p2PTunnelME = createPart(registry, "me_p2p_tunnel", PartType.P2P_TUNNEL_ME, MEP2PTunnelPart::new); this.p2PTunnelRedstone = createPart(registry, "redstone_p2p_tunnel", PartType.P2P_TUNNEL_REDSTONE, - PartP2PRedstone::new); - this.p2PTunnelItems = createPart(registry, "item_p2p_tunnel", PartType.P2P_TUNNEL_ITEM, PartP2PItems::new); - this.p2PTunnelFluids = createPart(registry, "fluid_p2p_tunnel", PartType.P2P_TUNNEL_FLUID, PartP2PFluids::new); + RedstoneP2PTunnelPart::new); + this.p2PTunnelItems = createPart(registry, "item_p2p_tunnel", PartType.P2P_TUNNEL_ITEM, ItemP2PTunnelPart::new); + this.p2PTunnelFluids = createPart(registry, "fluid_p2p_tunnel", PartType.P2P_TUNNEL_FLUID, FluidP2PTunnelPart::new); this.p2PTunnelEU = null; // FIXME createPart( "ic2_p2p_tunnel", PartType.P2P_TUNNEL_IC2, // PartP2PIC2Power::new); - this.p2PTunnelFE = createPart(registry, "fe_p2p_tunnel", PartType.P2P_TUNNEL_FE, PartP2PFEPower::new); - this.p2PTunnelLight = createPart(registry, "light_p2p_tunnel", PartType.P2P_TUNNEL_LIGHT, PartP2PLight::new); + this.p2PTunnelFE = createPart(registry, "fe_p2p_tunnel", PartType.P2P_TUNNEL_FE, FEP2PTunnelPart::new); + this.p2PTunnelLight = createPart(registry, "light_p2p_tunnel", PartType.P2P_TUNNEL_LIGHT, LightP2PTunnelPart::new); this.interfaceTerminal = createPart(registry, "interface_terminal", PartType.INTERFACE_TERMINAL, - PartInterfaceTerminal::new); - this.fluidTerminal = createPart(registry, "fluid_terminal", PartType.FLUID_TERMINAL, PartFluidTerminal::new); + InterfaceTerminalPart::new); + this.fluidTerminal = createPart(registry, "fluid_terminal", PartType.FLUID_TERMINAL, FluidTerminalPart::new); } private void registerPartModels(PartModels partModels) { @@ -212,8 +212,8 @@ public final class ApiParts implements IParts { private IItemDefinition createPart(FeatureFactory registry, String id, PartType type, Function factory) { - return registry.item(id, props -> new ItemPart<>(props, type, factory)).itemGroup(CreativeTab.INSTANCE) - .rendering(new ItemPartRendering()).build(); + return registry.item(id, props -> new PartItem<>(props, type, factory)).itemGroup(CreativeTab.INSTANCE) + .rendering(new PartItemRendering()).build(); } private AEColoredItemDefinition constructColoredDefinition(FeatureFactory registry, @@ -224,7 +224,7 @@ public final class ApiParts implements IParts { String id = color.registryPrefix + '_' + idSuffix; IItemDefinition itemDef = registry.item(id, props -> new ColoredPartItem<>(props, type, factory, color)) - .itemGroup(CreativeTab.INSTANCE).rendering(new ItemPartRendering(color)).build(); + .itemGroup(CreativeTab.INSTANCE).rendering(new PartItemRendering(color)).build(); definition.add(color, new ItemStackSrc(itemDef.item(), ActivityState.Enabled)); } diff --git a/src/main/java/appeng/core/features/registries/WirelessRegistry.java b/src/main/java/appeng/core/features/registries/WirelessRegistry.java index f86ead8a4..c4725b487 100644 --- a/src/main/java/appeng/core/features/registries/WirelessRegistry.java +++ b/src/main/java/appeng/core/features/registries/WirelessRegistry.java @@ -32,7 +32,7 @@ import appeng.api.features.IWirelessTermHandler; import appeng.api.features.IWirelessTermRegistry; import appeng.container.ContainerLocator; import appeng.container.ContainerOpener; -import appeng.container.implementations.ContainerWirelessTerm; +import appeng.container.implementations.WirelessTermContainer; import appeng.core.localization.PlayerMessages; import appeng.util.Platform; @@ -96,7 +96,7 @@ public final class WirelessRegistry implements IWirelessTermRegistry { } if (handler.hasPower(player, 0.5, item)) { - ContainerOpener.openContainer(ContainerWirelessTerm.TYPE, player, ContainerLocator.forHand(player, hand)); + ContainerOpener.openContainer(WirelessTermContainer.TYPE, player, ContainerLocator.forHand(player, hand)); } else { player.sendMessage(PlayerMessages.DeviceNotPowered.get()); } diff --git a/src/main/java/appeng/core/features/registries/cell/BasicItemCellGuiHandler.java b/src/main/java/appeng/core/features/registries/cell/BasicItemCellGuiHandler.java index d56b9b572..19ac7564e 100644 --- a/src/main/java/appeng/core/features/registries/cell/BasicItemCellGuiHandler.java +++ b/src/main/java/appeng/core/features/registries/cell/BasicItemCellGuiHandler.java @@ -15,7 +15,7 @@ import appeng.api.storage.channels.IItemStorageChannel; import appeng.api.storage.data.IAEStack; import appeng.container.ContainerLocator; import appeng.container.ContainerOpener; -import appeng.container.implementations.ContainerMEMonitorable; +import appeng.container.implementations.MEMonitorableContainer; public class BasicItemCellGuiHandler implements ICellGuiHandler { @Override @@ -26,7 +26,7 @@ public class BasicItemCellGuiHandler implements ICellGuiHandler { @Override public void openChestGui(final PlayerEntity player, final IChestOrDrive chest, final ICellHandler cellHandler, final IMEInventoryHandler inv, final ItemStack is, final IStorageChannel chan) { - ContainerOpener.openContainer(ContainerMEMonitorable.TYPE, player, + ContainerOpener.openContainer(MEMonitorableContainer.TYPE, player, ContainerLocator.forTileEntitySide((TileEntity) chest, chest.getUp())); } } diff --git a/src/main/java/appeng/core/features/registries/cell/CreativeCellHandler.java b/src/main/java/appeng/core/features/registries/cell/CreativeCellHandler.java index 96c5b9700..7909358df 100644 --- a/src/main/java/appeng/core/features/registries/cell/CreativeCellHandler.java +++ b/src/main/java/appeng/core/features/registries/cell/CreativeCellHandler.java @@ -26,21 +26,21 @@ import appeng.api.storage.ICellInventoryHandler; import appeng.api.storage.ISaveProvider; import appeng.api.storage.IStorageChannel; import appeng.api.storage.channels.IItemStorageChannel; -import appeng.items.storage.ItemCreativeStorageCell; +import appeng.items.storage.CreativeStorageCellItem; import appeng.me.storage.CreativeCellInventory; public final class CreativeCellHandler implements ICellHandler { @Override public boolean isCell(final ItemStack is) { - return !is.isEmpty() && is.getItem() instanceof ItemCreativeStorageCell; + return !is.isEmpty() && is.getItem() instanceof CreativeStorageCellItem; } @Override public ICellInventoryHandler getCellInventory(final ItemStack is, final ISaveProvider container, final IStorageChannel channel) { if (channel == AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class) && !is.isEmpty() - && is.getItem() instanceof ItemCreativeStorageCell) { + && is.getItem() instanceof CreativeStorageCellItem) { return CreativeCellInventory.getCell(is); } return null; diff --git a/src/main/java/appeng/core/stats/PartItemPredicate.java b/src/main/java/appeng/core/stats/PartItemPredicate.java index fc5a25d42..198a9dd90 100644 --- a/src/main/java/appeng/core/stats/PartItemPredicate.java +++ b/src/main/java/appeng/core/stats/PartItemPredicate.java @@ -26,7 +26,7 @@ import net.minecraft.util.JSONUtils; import net.minecraft.util.ResourceLocation; import appeng.core.AppEng; -import appeng.items.parts.ItemPart; +import appeng.items.parts.PartItem; import appeng.items.parts.PartType; public class PartItemPredicate extends ItemPredicate { @@ -38,8 +38,8 @@ public class PartItemPredicate extends ItemPredicate { @Override public boolean test(ItemStack item) { - if (item.getItem() instanceof ItemPart) { - ItemPart itemPart = (ItemPart) item.getItem(); + if (item.getItem() instanceof PartItem) { + PartItem itemPart = (PartItem) item.getItem(); return itemPart.getType() == partType; } return false; diff --git a/src/main/java/appeng/core/sync/AppEngPacketHandlerBase.java b/src/main/java/appeng/core/sync/AppEngPacketHandlerBase.java deleted file mode 100644 index f9496f885..000000000 --- a/src/main/java/appeng/core/sync/AppEngPacketHandlerBase.java +++ /dev/null @@ -1,105 +0,0 @@ -/* - * This file is part of Applied Energistics 2. - * Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved. - * - * Applied Energistics 2 is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Applied Energistics 2 is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Applied Energistics 2. If not, see . - */ - -package appeng.core.sync; - -import java.util.HashMap; -import java.util.Map; -import java.util.function.Function; - -import net.minecraft.network.PacketBuffer; - -import appeng.core.sync.packets.*; - -public class AppEngPacketHandlerBase { - private static final Map, PacketTypes> REVERSE_LOOKUP = new HashMap<>(); - - public enum PacketTypes { - PACKET_COMPASS_REQUEST(PacketCompassRequest.class, PacketCompassRequest::new), - - PACKET_COMPASS_RESPONSE(PacketCompassResponse.class, PacketCompassResponse::new), - - PACKET_INVENTORY_ACTION(PacketInventoryAction.class, PacketInventoryAction::new), - - PACKET_ME_INVENTORY_UPDATE(PacketMEInventoryUpdate.class, PacketMEInventoryUpdate::new), - - PACKET_ME_FLUID_INVENTORY_UPDATE(PacketMEFluidInventoryUpdate.class, PacketMEFluidInventoryUpdate::new), - - PACKET_CONFIG_BUTTON(PacketConfigButton.class, PacketConfigButton::new), - - PACKET_PART_PLACEMENT(PacketPartPlacement.class, PacketPartPlacement::new), - - PACKET_LIGHTNING(PacketLightning.class, PacketLightning::new), - - PACKET_MATTER_CANNON(PacketMatterCannon.class, PacketMatterCannon::new), - - PACKET_MOCK_EXPLOSION(PacketMockExplosion.class, PacketMockExplosion::new), - - PACKET_VALUE_CONFIG(PacketValueConfig.class, PacketValueConfig::new), - - PACKET_ITEM_TRANSITION_EFFECT(PacketItemTransitionEffect.class, PacketItemTransitionEffect::new), - - PACKET_BLOCK_TRANSITION_EFFECT(PacketBlockTransitionEffect.class, PacketBlockTransitionEffect::new), - - PACKET_PROGRESS_VALUE(PacketProgressBar.class, PacketProgressBar::new), - - PACKET_CLICK(PacketClick.class, PacketClick::new), - - PACKET_SWITCH_GUIS(PacketSwitchGuis.class, PacketSwitchGuis::new), - - PACKET_SWAP_SLOTS(PacketSwapSlots.class, PacketSwapSlots::new), - - PACKET_PATTERN_SLOT(PacketPatternSlot.class, PacketPatternSlot::new), - - PACKET_RECIPE_JEI(PacketJEIRecipe.class, PacketJEIRecipe::new), - - PACKET_TARGET_ITEM(PacketTargetItemStack.class, PacketTargetItemStack::new), - - PACKET_TARGET_FLUID(PacketTargetFluidStack.class, PacketTargetFluidStack::new), - - PACKET_CRAFTING_REQUEST(PacketCraftRequest.class, PacketCraftRequest::new), - - PACKET_ASSEMBLER_ANIMATION(PacketAssemblerAnimation.class, PacketAssemblerAnimation::new), - - PACKET_COMPRESSED_NBT(PacketCompressedNBT.class, PacketCompressedNBT::new), - - PACKET_PAINTED_ENTITY(PacketPaintedEntity.class, PacketPaintedEntity::new), - - PACKET_FLUID_TANK(PacketFluidSlot.class, PacketFluidSlot::new); - - private final Function factory; - - PacketTypes(Class packetClass, Function factory) { - this.factory = factory; - - REVERSE_LOOKUP.put(packetClass, this); - } - - public static PacketTypes getPacket(final int id) { - return (values())[id]; - } - - static PacketTypes getID(final Class c) { - return REVERSE_LOOKUP.get(c); - } - - public AppEngPacket parsePacket(final PacketBuffer in) throws IllegalArgumentException { - return this.factory.apply(in); - } - } -} diff --git a/src/main/java/appeng/core/sync/AppEngPacket.java b/src/main/java/appeng/core/sync/BasePacket.java similarity index 95% rename from src/main/java/appeng/core/sync/AppEngPacket.java rename to src/main/java/appeng/core/sync/BasePacket.java index f243beb8b..74a7caf0a 100644 --- a/src/main/java/appeng/core/sync/AppEngPacket.java +++ b/src/main/java/appeng/core/sync/BasePacket.java @@ -31,7 +31,7 @@ import appeng.core.AELog; import appeng.core.sync.network.INetworkInfo; import appeng.core.sync.network.NetworkHandler; -public abstract class AppEngPacket { +public abstract class BasePacket { private PacketBuffer p; public void serverPacketData(final INetworkInfo manager, final PlayerEntity player) { @@ -40,7 +40,7 @@ public abstract class AppEngPacket { } public final int getPacketID() { - return AppEngPacketHandlerBase.PacketTypes.getID(this.getClass()).ordinal(); + return PacketHandlerBase.PacketTypes.getID(this.getClass()).ordinal(); } public void clientPacketData(final INetworkInfo network, final PlayerEntity player) { diff --git a/src/main/java/appeng/core/sync/GuiHostType.java b/src/main/java/appeng/core/sync/GuiHostType.java deleted file mode 100644 index 906b12ea8..000000000 --- a/src/main/java/appeng/core/sync/GuiHostType.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * This file is part of Applied Energistics 2. - * Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved. - * - * Applied Energistics 2 is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Applied Energistics 2 is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Applied Energistics 2. If not, see . - */ - -package appeng.core.sync; - -public enum GuiHostType { - ITEM_OR_WORLD, ITEM, WORLD; - - public boolean isItem() { - return this != WORLD; - } - - boolean isTile() { - return this != ITEM; - } -} diff --git a/src/main/java/appeng/core/sync/PacketHandlerBase.java b/src/main/java/appeng/core/sync/PacketHandlerBase.java new file mode 100644 index 000000000..58a3c7b22 --- /dev/null +++ b/src/main/java/appeng/core/sync/PacketHandlerBase.java @@ -0,0 +1,104 @@ +/* + * This file is part of Applied Energistics 2. + * Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved. + * + * Applied Energistics 2 is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Applied Energistics 2 is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Applied Energistics 2. If not, see . + */ + +package appeng.core.sync; + +import java.util.HashMap; +import java.util.Map; +import java.util.function.Function; + +import appeng.core.sync.packets.*; +import net.minecraft.network.PacketBuffer; + +public class PacketHandlerBase { + private static final Map, PacketTypes> REVERSE_LOOKUP = new HashMap<>(); + + public enum PacketTypes { + PACKET_COMPASS_REQUEST(CompassRequestPacket.class, CompassRequestPacket::new), + + PACKET_COMPASS_RESPONSE(CompassResponsePacket.class, CompassResponsePacket::new), + + PACKET_INVENTORY_ACTION(InventoryActionPacket.class, InventoryActionPacket::new), + + PACKET_ME_INVENTORY_UPDATE(MEInventoryUpdatePacket.class, MEInventoryUpdatePacket::new), + + PACKET_ME_FLUID_INVENTORY_UPDATE(MEFluidInventoryUpdatePacket.class, MEFluidInventoryUpdatePacket::new), + + PACKET_CONFIG_BUTTON(ConfigButtonPacket.class, ConfigButtonPacket::new), + + PACKET_PART_PLACEMENT(PartPlacementPacket.class, PartPlacementPacket::new), + + PACKET_LIGHTNING(LightningPacket.class, LightningPacket::new), + + PACKET_MATTER_CANNON(MatterCannonPacket.class, MatterCannonPacket::new), + + PACKET_MOCK_EXPLOSION(MockExplosionPacket.class, MockExplosionPacket::new), + + PACKET_VALUE_CONFIG(ConfigValuePacket.class, ConfigValuePacket::new), + + PACKET_ITEM_TRANSITION_EFFECT(ItemTransitionEffectPacket.class, ItemTransitionEffectPacket::new), + + PACKET_BLOCK_TRANSITION_EFFECT(BlockTransitionEffectPacket.class, BlockTransitionEffectPacket::new), + + PACKET_PROGRESS_VALUE(ProgressBarPacket.class, ProgressBarPacket::new), + + PACKET_CLICK(ClickPacket.class, ClickPacket::new), + + PACKET_SWITCH_GUIS(SwitchGuisPacket.class, SwitchGuisPacket::new), + + PACKET_SWAP_SLOTS(SwapSlotsPacket.class, SwapSlotsPacket::new), + + PACKET_PATTERN_SLOT(PatternSlotPacket.class, PatternSlotPacket::new), + + PACKET_RECIPE_JEI(JEIRecipePacket.class, JEIRecipePacket::new), + + PACKET_TARGET_ITEM(TargetItemStackPacket.class, TargetItemStackPacket::new), + + PACKET_TARGET_FLUID(TargetFluidStackPacket.class, TargetFluidStackPacket::new), + + PACKET_CRAFTING_REQUEST(CraftRequestPacket.class, CraftRequestPacket::new), + + PACKET_ASSEMBLER_ANIMATION(AssemblerAnimationPacket.class, AssemblerAnimationPacket::new), + + PACKET_COMPRESSED_NBT(CompressedNBTPacket.class, CompressedNBTPacket::new), + + PACKET_PAINTED_ENTITY(PaintedEntityPacket.class, PaintedEntityPacket::new), + + PACKET_FLUID_TANK(FluidSlotPacket.class, FluidSlotPacket::new); + + private final Function factory; + + PacketTypes(Class packetClass, Function factory) { + this.factory = factory; + + REVERSE_LOOKUP.put(packetClass, this); + } + + public static PacketTypes getPacket(final int id) { + return (values())[id]; + } + + static PacketTypes getID(final Class c) { + return REVERSE_LOOKUP.get(c); + } + + public BasePacket parsePacket(final PacketBuffer in) throws IllegalArgumentException { + return this.factory.apply(in); + } + } +} diff --git a/src/main/java/appeng/core/sync/network/AppEngClientPacketHandler.java b/src/main/java/appeng/core/sync/network/ClientPacketHandler.java similarity index 84% rename from src/main/java/appeng/core/sync/network/AppEngClientPacketHandler.java rename to src/main/java/appeng/core/sync/network/ClientPacketHandler.java index b492222e0..dd3ea3996 100644 --- a/src/main/java/appeng/core/sync/network/AppEngClientPacketHandler.java +++ b/src/main/java/appeng/core/sync/network/ClientPacketHandler.java @@ -24,17 +24,17 @@ import net.minecraft.network.INetHandler; import net.minecraft.network.PacketBuffer; import appeng.core.AELog; -import appeng.core.sync.AppEngPacket; -import appeng.core.sync.AppEngPacketHandlerBase; +import appeng.core.sync.BasePacket; +import appeng.core.sync.PacketHandlerBase; -public class AppEngClientPacketHandler extends AppEngPacketHandlerBase implements IPacketHandler { +public class ClientPacketHandler extends PacketHandlerBase implements IPacketHandler { @Override public void onPacketData(final INetworkInfo manager, final INetHandler handler, final PacketBuffer packet, final PlayerEntity player) { try { final int packetType = packet.readInt(); - final AppEngPacket pack = PacketTypes.getPacket(packetType).parsePacket(packet); + final BasePacket pack = PacketTypes.getPacket(packetType).parsePacket(packet); pack.clientPacketData(manager, Minecraft.getInstance().player); } catch (final IllegalArgumentException e) { AELog.debug(e); diff --git a/src/main/java/appeng/core/sync/network/NetworkHandler.java b/src/main/java/appeng/core/sync/network/NetworkHandler.java index a98700f50..bd6357931 100644 --- a/src/main/java/appeng/core/sync/network/NetworkHandler.java +++ b/src/main/java/appeng/core/sync/network/NetworkHandler.java @@ -36,7 +36,7 @@ import net.minecraftforge.fml.network.NetworkEvent; import net.minecraftforge.fml.network.NetworkRegistry; import net.minecraftforge.fml.network.event.EventNetworkChannel; -import appeng.core.sync.AppEngPacket; +import appeng.core.sync.BasePacket; public class NetworkHandler { private static NetworkHandler instance; @@ -52,7 +52,7 @@ public class NetworkHandler { .eventNetworkChannel(); ec.registerObject(this); - this.clientHandler = DistExecutor.unsafeRunForDist(() -> AppEngClientPacketHandler::new, () -> () -> null); + this.clientHandler = DistExecutor.unsafeRunForDist(() -> ClientPacketHandler::new, () -> () -> null); this.serverHandler = this.createServerSide(); } @@ -66,7 +66,7 @@ public class NetworkHandler { private IPacketHandler createServerSide() { try { - return new AppEngServerPacketHandler(); + return new ServerPacketHandler(); } catch (final Throwable t) { return null; } @@ -109,26 +109,26 @@ public class NetworkHandler { return this.myChannelName; } - public void sendToAll(final AppEngPacket message) { + public void sendToAll(final BasePacket message) { getServer().getPlayerList().sendPacketToAllPlayers(message.toPacket(NetworkDirection.PLAY_TO_CLIENT)); } - public void sendTo(final AppEngPacket message, final ServerPlayerEntity player) { + public void sendTo(final BasePacket message, final ServerPlayerEntity player) { player.connection.sendPacket(message.toPacket(NetworkDirection.PLAY_TO_CLIENT)); } - public void sendToAllAround(final AppEngPacket message, final TargetPoint point) { + public void sendToAllAround(final BasePacket message, final TargetPoint point) { IPacket pkt = message.toPacket(NetworkDirection.PLAY_TO_CLIENT); getServer().getPlayerList().sendToAllNearExcept(point.excluded, point.x, point.y, point.z, point.r2, point.dim, pkt); } - public void sendToDimension(final AppEngPacket message, final DimensionType dim) { + public void sendToDimension(final BasePacket message, final DimensionType dim) { getServer().getPlayerList().sendPacketToAllPlayersInDimension(message.toPacket(NetworkDirection.PLAY_TO_CLIENT), dim); } - public void sendToServer(final AppEngPacket message) { + public void sendToServer(final BasePacket message) { Minecraft.getInstance().getConnection().sendPacket(message.toPacket(NetworkDirection.PLAY_TO_SERVER)); } diff --git a/src/main/java/appeng/core/sync/network/AppEngServerPacketHandler.java b/src/main/java/appeng/core/sync/network/ServerPacketHandler.java similarity index 83% rename from src/main/java/appeng/core/sync/network/AppEngServerPacketHandler.java rename to src/main/java/appeng/core/sync/network/ServerPacketHandler.java index be9c1eeb2..082dd05a4 100644 --- a/src/main/java/appeng/core/sync/network/AppEngServerPacketHandler.java +++ b/src/main/java/appeng/core/sync/network/ServerPacketHandler.java @@ -23,17 +23,17 @@ import net.minecraft.network.INetHandler; import net.minecraft.network.PacketBuffer; import appeng.core.AELog; -import appeng.core.sync.AppEngPacket; -import appeng.core.sync.AppEngPacketHandlerBase; +import appeng.core.sync.BasePacket; +import appeng.core.sync.PacketHandlerBase; -public final class AppEngServerPacketHandler extends AppEngPacketHandlerBase implements IPacketHandler { +public final class ServerPacketHandler extends PacketHandlerBase implements IPacketHandler { @Override public void onPacketData(final INetworkInfo manager, final INetHandler handler, final PacketBuffer packet, final PlayerEntity player) { try { final int packetType = packet.readInt(); - final AppEngPacket pack = PacketTypes.getPacket(packetType).parsePacket(packet); + final BasePacket pack = PacketTypes.getPacket(packetType).parsePacket(packet); pack.serverPacketData(manager, player); } catch (final IllegalArgumentException e) { AELog.debug(e); diff --git a/src/main/java/appeng/core/sync/packets/PacketAssemblerAnimation.java b/src/main/java/appeng/core/sync/packets/AssemblerAnimationPacket.java similarity index 84% rename from src/main/java/appeng/core/sync/packets/PacketAssemblerAnimation.java rename to src/main/java/appeng/core/sync/packets/AssemblerAnimationPacket.java index 83cb76a8e..63b63ef4b 100644 --- a/src/main/java/appeng/core/sync/packets/PacketAssemblerAnimation.java +++ b/src/main/java/appeng/core/sync/packets/AssemblerAnimationPacket.java @@ -28,26 +28,26 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import appeng.api.storage.data.IAEItemStack; -import appeng.core.sync.AppEngPacket; +import appeng.core.sync.BasePacket; import appeng.core.sync.network.INetworkInfo; import appeng.tile.crafting.AssemblerAnimationStatus; -import appeng.tile.crafting.TileMolecularAssembler; +import appeng.tile.crafting.MolecularAssemblerTileEntity; import appeng.util.item.AEItemStack; -public class PacketAssemblerAnimation extends AppEngPacket { +public class AssemblerAnimationPacket extends BasePacket { private final BlockPos pos; public final byte rate; public final IAEItemStack is; - public PacketAssemblerAnimation(final PacketBuffer stream) { + public AssemblerAnimationPacket(final PacketBuffer stream) { this.pos = stream.readBlockPos(); this.rate = stream.readByte(); this.is = AEItemStack.fromPacket(stream); } // api - public PacketAssemblerAnimation(final BlockPos pos, final byte rate, final IAEItemStack is) { + public AssemblerAnimationPacket(final BlockPos pos, final byte rate, final IAEItemStack is) { final PacketBuffer data = new PacketBuffer(Unpooled.buffer()); @@ -64,8 +64,8 @@ public class PacketAssemblerAnimation extends AppEngPacket { @OnlyIn(Dist.CLIENT) public void clientPacketData(final INetworkInfo network, final PlayerEntity player) { TileEntity te = player.getEntityWorld().getTileEntity(pos); - if (te instanceof TileMolecularAssembler) { - TileMolecularAssembler ma = (TileMolecularAssembler) te; + if (te instanceof MolecularAssemblerTileEntity) { + MolecularAssemblerTileEntity ma = (MolecularAssemblerTileEntity) te; ma.setAnimationStatus(new AssemblerAnimationStatus(rate, is.asItemStackRepresentation())); } } diff --git a/src/main/java/appeng/core/sync/packets/PacketBlockTransitionEffect.java b/src/main/java/appeng/core/sync/packets/BlockTransitionEffectPacket.java similarity index 95% rename from src/main/java/appeng/core/sync/packets/PacketBlockTransitionEffect.java rename to src/main/java/appeng/core/sync/packets/BlockTransitionEffectPacket.java index 896c54579..df82537c0 100644 --- a/src/main/java/appeng/core/sync/packets/PacketBlockTransitionEffect.java +++ b/src/main/java/appeng/core/sync/packets/BlockTransitionEffectPacket.java @@ -41,7 +41,7 @@ import appeng.api.util.AEPartLocation; import appeng.client.render.effects.EnergyParticleData; import appeng.core.AELog; import appeng.core.AppEng; -import appeng.core.sync.AppEngPacket; +import appeng.core.sync.BasePacket; import appeng.core.sync.network.INetworkInfo; import appeng.util.Platform; @@ -49,7 +49,7 @@ import appeng.util.Platform; * Plays the block breaking or fluid pickup sound and a transition particle * effect into the supplied direction. Used primarily by annihilation planes. */ -public class PacketBlockTransitionEffect extends AppEngPacket { +public class BlockTransitionEffectPacket extends BasePacket { private final BlockPos pos; private final BlockState blockState; @@ -60,8 +60,8 @@ public class PacketBlockTransitionEffect extends AppEngPacket { BLOCK, FLUID, NONE } - public PacketBlockTransitionEffect(BlockPos pos, BlockState blockState, AEPartLocation direction, - SoundMode soundMode) { + public BlockTransitionEffectPacket(BlockPos pos, BlockState blockState, AEPartLocation direction, + SoundMode soundMode) { this.pos = pos; this.blockState = blockState; this.direction = direction; @@ -81,7 +81,7 @@ public class PacketBlockTransitionEffect extends AppEngPacket { this.configureWrite(data); } - public PacketBlockTransitionEffect(final PacketBuffer stream) { + public BlockTransitionEffectPacket(final PacketBuffer stream) { this.pos = stream.readBlockPos(); int blockStateId = stream.readInt(); diff --git a/src/main/java/appeng/core/sync/packets/PacketClick.java b/src/main/java/appeng/core/sync/packets/ClickPacket.java similarity index 83% rename from src/main/java/appeng/core/sync/packets/PacketClick.java rename to src/main/java/appeng/core/sync/packets/ClickPacket.java index fbbfd2c82..f99f9ed1e 100644 --- a/src/main/java/appeng/core/sync/packets/PacketClick.java +++ b/src/main/java/appeng/core/sync/packets/ClickPacket.java @@ -36,16 +36,16 @@ import appeng.api.definitions.IComparableDefinition; import appeng.api.definitions.IItems; import appeng.api.implementations.items.IMemoryCard; import appeng.api.implementations.items.MemoryCardMessages; -import appeng.block.networking.BlockCableBus; +import appeng.block.networking.CableBusBlock; import appeng.container.ContainerLocator; import appeng.container.ContainerOpener; -import appeng.container.implementations.ContainerNetworkTool; -import appeng.core.sync.AppEngPacket; +import appeng.container.implementations.NetworkToolContainer; +import appeng.core.sync.BasePacket; import appeng.core.sync.network.INetworkInfo; -import appeng.items.tools.ToolNetworkTool; -import appeng.items.tools.powered.ToolColorApplicator; +import appeng.items.tools.NetworkToolItem; +import appeng.items.tools.powered.ColorApplicatorItem; -public class PacketClick extends AppEngPacket { +public class ClickPacket extends BasePacket { private final int x; private final int y; @@ -57,7 +57,7 @@ public class PacketClick extends AppEngPacket { private Hand hand; private final boolean leftClick; - public PacketClick(final PacketBuffer stream) { + public ClickPacket(final PacketBuffer stream) { this.x = stream.readInt(); this.y = stream.readInt(); this.z = stream.readInt(); @@ -75,23 +75,23 @@ public class PacketClick extends AppEngPacket { } // API for when a block was right clicked - public PacketClick(ItemUseContext context) { + public ClickPacket(ItemUseContext context) { this(context.getPos(), context.getFace(), context.getPos().getX(), context.getPos().getY(), context.getPos().getZ(), context.getHand()); } // API for when an item in hand was right-clicked, with no block context - public PacketClick(Hand hand) { + public ClickPacket(Hand hand) { this(BlockPos.ZERO, null, 0, 0, 0, hand); } - private PacketClick(final BlockPos pos, final Direction side, final float hitX, final float hitY, final float hitZ, - final Hand hand) { + private ClickPacket(final BlockPos pos, final Direction side, final float hitX, final float hitY, final float hitZ, + final Hand hand) { this(pos, side, hitX, hitY, hitZ, hand, false); } - public PacketClick(final BlockPos pos, final Direction side, final float hitX, final float hitY, final float hitZ, - final Hand hand, boolean leftClick) { + public ClickPacket(final BlockPos pos, final Direction side, final float hitX, final float hitY, final float hitZ, + final Hand hand, boolean leftClick) { final PacketBuffer data = new PacketBuffer(Unpooled.buffer()); @@ -129,14 +129,14 @@ public class PacketClick extends AppEngPacket { if (this.leftClick) { final Block block = player.world.getBlockState(pos).getBlock(); - if (block instanceof BlockCableBus) { - ((BlockCableBus) block).onBlockClickPacket(player.world, pos, player, this.hand, + if (block instanceof CableBusBlock) { + ((CableBusBlock) block).onBlockClickPacket(player.world, pos, player, this.hand, new Vec3d(this.hitX, this.hitY, this.hitZ)); } } else { if (!is.isEmpty()) { - if (is.getItem() instanceof ToolNetworkTool) { - final ToolNetworkTool tnt = (ToolNetworkTool) is.getItem(); + if (is.getItem() instanceof NetworkToolItem) { + final NetworkToolItem tnt = (NetworkToolItem) is.getItem(); if (hasBlockContext()) { // Reconstruct an item use context @@ -144,7 +144,7 @@ public class PacketClick extends AppEngPacket { new BlockRayTraceResult(new Vec3d(hitX, hitY, hitZ), side, pos, false)); tnt.serverSideToolLogic(useContext); } else { - ContainerOpener.openContainer(ContainerNetworkTool.TYPE, player, + ContainerOpener.openContainer(NetworkToolContainer.TYPE, player, ContainerLocator.forHand(player, hand)); } } @@ -156,7 +156,7 @@ public class PacketClick extends AppEngPacket { } else if (maybeColorApplicator.isSameAs(is)) { - final ToolColorApplicator mem = (ToolColorApplicator) is.getItem(); + final ColorApplicatorItem mem = (ColorApplicatorItem) is.getItem(); mem.cycleColors(is, mem.getColor(is), 1); } } diff --git a/src/main/java/appeng/core/sync/packets/PacketCompassRequest.java b/src/main/java/appeng/core/sync/packets/CompassRequestPacket.java similarity index 87% rename from src/main/java/appeng/core/sync/packets/PacketCompassRequest.java rename to src/main/java/appeng/core/sync/packets/CompassRequestPacket.java index ff07c0e5b..0a7549df6 100644 --- a/src/main/java/appeng/core/sync/packets/PacketCompassRequest.java +++ b/src/main/java/appeng/core/sync/packets/CompassRequestPacket.java @@ -25,13 +25,13 @@ import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.network.PacketBuffer; import appeng.api.util.DimensionalCoord; -import appeng.core.sync.AppEngPacket; +import appeng.core.sync.BasePacket; import appeng.core.sync.network.INetworkInfo; import appeng.core.sync.network.NetworkHandler; import appeng.core.worlddata.WorldData; import appeng.services.compass.ICompassCallback; -public class PacketCompassRequest extends AppEngPacket implements ICompassCallback { +public class CompassRequestPacket extends BasePacket implements ICompassCallback { final long attunement; final int cx; @@ -40,7 +40,7 @@ public class PacketCompassRequest extends AppEngPacket implements ICompassCallba private PlayerEntity talkBackTo; - public PacketCompassRequest(final PacketBuffer stream) { + public CompassRequestPacket(final PacketBuffer stream) { this.attunement = stream.readLong(); this.cx = stream.readInt(); this.cz = stream.readInt(); @@ -48,7 +48,7 @@ public class PacketCompassRequest extends AppEngPacket implements ICompassCallba } // api - public PacketCompassRequest(final long attunement, final int cx, final int cz, final int cdy) { + public CompassRequestPacket(final long attunement, final int cx, final int cz, final int cdy) { final PacketBuffer data = new PacketBuffer(Unpooled.buffer()); @@ -64,7 +64,7 @@ public class PacketCompassRequest extends AppEngPacket implements ICompassCallba @Override public void calculatedDirection(final boolean hasResult, final boolean spin, final double radians, final double dist) { - NetworkHandler.instance().sendTo(new PacketCompassResponse(this, hasResult, spin, radians), + NetworkHandler.instance().sendTo(new CompassResponsePacket(this, hasResult, spin, radians), (ServerPlayerEntity) this.talkBackTo); } diff --git a/src/main/java/appeng/core/sync/packets/PacketCompassResponse.java b/src/main/java/appeng/core/sync/packets/CompassResponsePacket.java similarity index 89% rename from src/main/java/appeng/core/sync/packets/PacketCompassResponse.java rename to src/main/java/appeng/core/sync/packets/CompassResponsePacket.java index 7fbfd4fac..40b809da0 100644 --- a/src/main/java/appeng/core/sync/packets/PacketCompassResponse.java +++ b/src/main/java/appeng/core/sync/packets/CompassResponsePacket.java @@ -23,12 +23,12 @@ import io.netty.buffer.Unpooled; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.network.PacketBuffer; -import appeng.core.sync.AppEngPacket; +import appeng.core.sync.BasePacket; import appeng.core.sync.network.INetworkInfo; import appeng.hooks.CompassManager; import appeng.hooks.CompassResult; -public class PacketCompassResponse extends AppEngPacket { +public class CompassResponsePacket extends BasePacket { private final long attunement; private final int cx; @@ -37,7 +37,7 @@ public class PacketCompassResponse extends AppEngPacket { private CompassResult cr; - public PacketCompassResponse(final PacketBuffer stream) { + public CompassResponsePacket(final PacketBuffer stream) { this.attunement = stream.readLong(); this.cx = stream.readInt(); this.cz = stream.readInt(); @@ -47,8 +47,8 @@ public class PacketCompassResponse extends AppEngPacket { } // api - public PacketCompassResponse(final PacketCompassRequest req, final boolean hasResult, final boolean spin, - final double radians) { + public CompassResponsePacket(final CompassRequestPacket req, final boolean hasResult, final boolean spin, + final double radians) { final PacketBuffer data = new PacketBuffer(Unpooled.buffer()); diff --git a/src/main/java/appeng/core/sync/packets/PacketCompressedNBT.java b/src/main/java/appeng/core/sync/packets/CompressedNBTPacket.java similarity index 86% rename from src/main/java/appeng/core/sync/packets/PacketCompressedNBT.java rename to src/main/java/appeng/core/sync/packets/CompressedNBTPacket.java index 4ca47d6b4..42dedfa75 100644 --- a/src/main/java/appeng/core/sync/packets/PacketCompressedNBT.java +++ b/src/main/java/appeng/core/sync/packets/CompressedNBTPacket.java @@ -37,12 +37,12 @@ import net.minecraft.network.PacketBuffer; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import appeng.client.gui.implementations.GuiInterfaceTerminal; -import appeng.core.sync.AppEngPacket; +import appeng.client.gui.implementations.InterfaceTerminalScreen; +import appeng.core.sync.BasePacket; import appeng.core.sync.network.INetworkInfo; //TODO, this is pointless, NBT is already compressed when written to a PacketBuffer. -public class PacketCompressedNBT extends AppEngPacket { +public class CompressedNBTPacket extends BasePacket { // input. private final CompoundNBT in; @@ -50,7 +50,7 @@ public class PacketCompressedNBT extends AppEngPacket { private final PacketBuffer data; private final GZIPOutputStream compressFrame; - public PacketCompressedNBT(final PacketBuffer stream) { + public CompressedNBTPacket(final PacketBuffer stream) { this.data = null; this.compressFrame = null; @@ -72,7 +72,7 @@ public class PacketCompressedNBT extends AppEngPacket { } // api - public PacketCompressedNBT(final CompoundNBT din) throws IOException { + public CompressedNBTPacket(final CompoundNBT din) throws IOException { this.data = new PacketBuffer(Unpooled.buffer(2048)); this.data.writeInt(this.getPacketID()); @@ -83,7 +83,7 @@ public class PacketCompressedNBT extends AppEngPacket { @Override public void write(final int value) { - PacketCompressedNBT.this.data.writeByte(value); + CompressedNBTPacket.this.data.writeByte(value); } }); @@ -98,8 +98,8 @@ public class PacketCompressedNBT extends AppEngPacket { public void clientPacketData(final INetworkInfo network, final PlayerEntity player) { final Screen gs = Minecraft.getInstance().currentScreen; - if (gs instanceof GuiInterfaceTerminal) { - ((GuiInterfaceTerminal) gs).postUpdate(this.in); + if (gs instanceof InterfaceTerminalScreen) { + ((InterfaceTerminalScreen) gs).postUpdate(this.in); } } } diff --git a/src/main/java/appeng/core/sync/packets/PacketConfigButton.java b/src/main/java/appeng/core/sync/packets/ConfigButtonPacket.java similarity index 92% rename from src/main/java/appeng/core/sync/packets/PacketConfigButton.java rename to src/main/java/appeng/core/sync/packets/ConfigButtonPacket.java index d45c5f1b8..adea6dfe6 100644 --- a/src/main/java/appeng/core/sync/packets/PacketConfigButton.java +++ b/src/main/java/appeng/core/sync/packets/ConfigButtonPacket.java @@ -30,21 +30,21 @@ import appeng.api.config.Settings; import appeng.api.util.IConfigManager; import appeng.api.util.IConfigurableObject; import appeng.container.AEBaseContainer; -import appeng.core.sync.AppEngPacket; +import appeng.core.sync.BasePacket; import appeng.core.sync.network.INetworkInfo; import appeng.util.EnumCycler; -public final class PacketConfigButton extends AppEngPacket { +public final class ConfigButtonPacket extends BasePacket { private final Settings option; private final boolean rotationDirection; - public PacketConfigButton(final PacketBuffer stream) { + public ConfigButtonPacket(final PacketBuffer stream) { this.option = Settings.values()[stream.readInt()]; this.rotationDirection = stream.readBoolean(); } // api - public PacketConfigButton(final Settings option, final boolean rotationDirection) { + public ConfigButtonPacket(final Settings option, final boolean rotationDirection) { this.option = option; this.rotationDirection = rotationDirection; diff --git a/src/main/java/appeng/core/sync/packets/PacketValueConfig.java b/src/main/java/appeng/core/sync/packets/ConfigValuePacket.java similarity index 71% rename from src/main/java/appeng/core/sync/packets/PacketValueConfig.java rename to src/main/java/appeng/core/sync/packets/ConfigValuePacket.java index ac4c22fd2..545c49239 100644 --- a/src/main/java/appeng/core/sync/packets/PacketValueConfig.java +++ b/src/main/java/appeng/core/sync/packets/ConfigValuePacket.java @@ -18,6 +18,8 @@ package appeng.core.sync.packets; +import appeng.client.gui.implementations.CraftingCPUScreen; +import appeng.core.sync.BasePacket; import io.netty.buffer.Unpooled; import net.minecraft.client.Minecraft; @@ -32,37 +34,35 @@ import appeng.api.config.FuzzyMode; import appeng.api.config.Settings; import appeng.api.util.IConfigManager; import appeng.api.util.IConfigurableObject; -import appeng.client.gui.implementations.GuiCraftingCPU; import appeng.container.AEBaseContainer; -import appeng.container.implementations.ContainerCellWorkbench; -import appeng.container.implementations.ContainerCraftConfirm; -import appeng.container.implementations.ContainerCraftingCPU; -import appeng.container.implementations.ContainerCraftingStatus; -import appeng.container.implementations.ContainerLevelEmitter; -import appeng.container.implementations.ContainerNetworkTool; -import appeng.container.implementations.ContainerPatternTerm; -import appeng.container.implementations.ContainerPriority; -import appeng.container.implementations.ContainerQuartzKnife; -import appeng.container.implementations.ContainerSecurityStation; -import appeng.container.implementations.ContainerStorageBus; -import appeng.core.sync.AppEngPacket; +import appeng.container.implementations.CellWorkbenchContainer; +import appeng.container.implementations.CraftConfirmContainer; +import appeng.container.implementations.CraftingCPUContainer; +import appeng.container.implementations.CraftingStatusContainer; +import appeng.container.implementations.LevelEmitterContainer; +import appeng.container.implementations.NetworkToolContainer; +import appeng.container.implementations.PatternTermContainer; +import appeng.container.implementations.PriorityContainer; +import appeng.container.implementations.QuartzKnifeContainer; +import appeng.container.implementations.SecurityStationContainer; +import appeng.container.implementations.StorageBusContainer; import appeng.core.sync.network.INetworkInfo; -import appeng.fluids.container.ContainerFluidLevelEmitter; -import appeng.fluids.container.ContainerFluidStorageBus; +import appeng.fluids.container.FluidLevelEmitterContainer; +import appeng.fluids.container.FluidStorageBusContainer; import appeng.helpers.IMouseWheelItem; -public class PacketValueConfig extends AppEngPacket { +public class ConfigValuePacket extends BasePacket { private final String Name; private final String Value; - public PacketValueConfig(final PacketBuffer stream) { + public ConfigValuePacket(final PacketBuffer stream) { this.Name = stream.readString(); this.Value = stream.readString(); } // api - public PacketValueConfig(final String name, final String value) { + public ConfigValuePacket(final String name, final String value) { this.Name = name; this.Value = value; @@ -98,35 +98,35 @@ public class PacketValueConfig extends AppEngPacket { final ItemStack is = player.getHeldItem(hand); final IMouseWheelItem si = (IMouseWheelItem) is.getItem(); si.onWheel(is, this.Value.equals("WheelUp")); - } else if (this.Name.equals("Terminal.Cpu") && c instanceof ContainerCraftingStatus) { - final ContainerCraftingStatus qk = (ContainerCraftingStatus) c; + } else if (this.Name.equals("Terminal.Cpu") && c instanceof CraftingStatusContainer) { + final CraftingStatusContainer qk = (CraftingStatusContainer) c; qk.cycleCpu(this.Value.equals("Next")); - } else if (this.Name.equals("Terminal.Cpu") && c instanceof ContainerCraftConfirm) { - final ContainerCraftConfirm qk = (ContainerCraftConfirm) c; + } else if (this.Name.equals("Terminal.Cpu") && c instanceof CraftConfirmContainer) { + final CraftConfirmContainer qk = (CraftConfirmContainer) c; qk.cycleCpu(this.Value.equals("Next")); - } else if (this.Name.equals("Terminal.Start") && c instanceof ContainerCraftConfirm) { - final ContainerCraftConfirm qk = (ContainerCraftConfirm) c; + } else if (this.Name.equals("Terminal.Start") && c instanceof CraftConfirmContainer) { + final CraftConfirmContainer qk = (CraftConfirmContainer) c; qk.startJob(); - } else if (this.Name.equals("TileCrafting.Cancel") && c instanceof ContainerCraftingCPU) { - final ContainerCraftingCPU qk = (ContainerCraftingCPU) c; + } else if (this.Name.equals("TileCrafting.Cancel") && c instanceof CraftingCPUContainer) { + final CraftingCPUContainer qk = (CraftingCPUContainer) c; qk.cancelCrafting(); - } else if (this.Name.equals("QuartzKnife.Name") && c instanceof ContainerQuartzKnife) { - final ContainerQuartzKnife qk = (ContainerQuartzKnife) c; + } else if (this.Name.equals("QuartzKnife.Name") && c instanceof QuartzKnifeContainer) { + final QuartzKnifeContainer qk = (QuartzKnifeContainer) c; qk.setName(this.Value); - } else if (this.Name.equals("TileSecurityStation.ToggleOption") && c instanceof ContainerSecurityStation) { - final ContainerSecurityStation sc = (ContainerSecurityStation) c; + } else if (this.Name.equals("TileSecurityStation.ToggleOption") && c instanceof SecurityStationContainer) { + final SecurityStationContainer sc = (SecurityStationContainer) c; sc.toggleSetting(this.Value, player); - } else if (this.Name.equals("PriorityHost.Priority") && c instanceof ContainerPriority) { - final ContainerPriority pc = (ContainerPriority) c; + } else if (this.Name.equals("PriorityHost.Priority") && c instanceof PriorityContainer) { + final PriorityContainer pc = (PriorityContainer) c; pc.setPriority(Integer.parseInt(this.Value), player); - } else if (this.Name.equals("LevelEmitter.Value") && c instanceof ContainerLevelEmitter) { - final ContainerLevelEmitter lvc = (ContainerLevelEmitter) c; + } else if (this.Name.equals("LevelEmitter.Value") && c instanceof LevelEmitterContainer) { + final LevelEmitterContainer lvc = (LevelEmitterContainer) c; lvc.setLevel(Long.parseLong(this.Value), player); - } else if (this.Name.equals("FluidLevelEmitter.Value") && c instanceof ContainerFluidLevelEmitter) { - final ContainerFluidLevelEmitter lvc = (ContainerFluidLevelEmitter) c; + } else if (this.Name.equals("FluidLevelEmitter.Value") && c instanceof FluidLevelEmitterContainer) { + final FluidLevelEmitterContainer lvc = (FluidLevelEmitterContainer) c; lvc.setLevel(Long.parseLong(this.Value), player); - } else if (this.Name.startsWith("PatternTerminal.") && c instanceof ContainerPatternTerm) { - final ContainerPatternTerm cpt = (ContainerPatternTerm) c; + } else if (this.Name.startsWith("PatternTerminal.") && c instanceof PatternTermContainer) { + final PatternTermContainer cpt = (PatternTermContainer) c; if (this.Name.equals("PatternTerminal.CraftMode")) { cpt.getPatternTerminal().setCraftingRecipe(this.Value.equals("1")); } else if (this.Name.equals("PatternTerminal.Encode")) { @@ -139,21 +139,21 @@ public class PacketValueConfig extends AppEngPacket { } else if (this.Name.startsWith("StorageBus.")) { if (this.Name.equals("StorageBus.Action")) { if (this.Value.equals("Partition")) { - if (c instanceof ContainerStorageBus) { - ((ContainerStorageBus) c).partition(); - } else if (c instanceof ContainerFluidStorageBus) { - ((ContainerFluidStorageBus) c).partition(); + if (c instanceof StorageBusContainer) { + ((StorageBusContainer) c).partition(); + } else if (c instanceof FluidStorageBusContainer) { + ((FluidStorageBusContainer) c).partition(); } } else if (this.Value.equals("Clear")) { - if (c instanceof ContainerStorageBus) { - ((ContainerStorageBus) c).clear(); - } else if (c instanceof ContainerFluidStorageBus) { - ((ContainerFluidStorageBus) c).clear(); + if (c instanceof StorageBusContainer) { + ((StorageBusContainer) c).clear(); + } else if (c instanceof FluidStorageBusContainer) { + ((FluidStorageBusContainer) c).clear(); } } } - } else if (this.Name.startsWith("CellWorkbench.") && c instanceof ContainerCellWorkbench) { - final ContainerCellWorkbench ccw = (ContainerCellWorkbench) c; + } else if (this.Name.startsWith("CellWorkbench.") && c instanceof CellWorkbenchContainer) { + final CellWorkbenchContainer ccw = (CellWorkbenchContainer) c; if (this.Name.equals("CellWorkbench.Action")) { if (this.Value.equals("CopyMode")) { ccw.nextWorkBenchCopyMode(); @@ -165,9 +165,9 @@ public class PacketValueConfig extends AppEngPacket { } else if (this.Name.equals("CellWorkbench.Fuzzy")) { ccw.setFuzzy(FuzzyMode.valueOf(this.Value)); } - } else if (c instanceof ContainerNetworkTool) { + } else if (c instanceof NetworkToolContainer) { if (this.Name.equals("NetworkTool") && this.Value.equals("Toggle")) { - ((ContainerNetworkTool) c).toggleFacadeMode(); + ((NetworkToolContainer) c).toggleFacadeMode(); } } else if (c instanceof IConfigurableObject) { final IConfigManager cm = ((IConfigurableObject) c).getConfigManager(); @@ -198,8 +198,8 @@ public class PacketValueConfig extends AppEngPacket { ((AEBaseContainer) c).stringSync(Integer.parseInt(this.Name.substring(8)), this.Value); } else if (this.Name.equals("CraftingStatus") && this.Value.equals("Clear")) { final Screen gs = Minecraft.getInstance().currentScreen; - if (gs instanceof GuiCraftingCPU) { - ((GuiCraftingCPU) gs).clearItems(); + if (gs instanceof CraftingCPUScreen) { + ((CraftingCPUScreen) gs).clearItems(); } } else if (c instanceof IConfigurableObject) { final IConfigManager cm = ((IConfigurableObject) c).getConfigManager(); diff --git a/src/main/java/appeng/core/sync/packets/PacketCraftRequest.java b/src/main/java/appeng/core/sync/packets/CraftRequestPacket.java similarity index 81% rename from src/main/java/appeng/core/sync/packets/PacketCraftRequest.java rename to src/main/java/appeng/core/sync/packets/CraftRequestPacket.java index 7a08216ae..56bf5bce3 100644 --- a/src/main/java/appeng/core/sync/packets/PacketCraftRequest.java +++ b/src/main/java/appeng/core/sync/packets/CraftRequestPacket.java @@ -32,23 +32,23 @@ import appeng.api.networking.crafting.ICraftingJob; import appeng.api.networking.security.IActionHost; import appeng.container.ContainerLocator; import appeng.container.ContainerOpener; -import appeng.container.implementations.ContainerCraftAmount; -import appeng.container.implementations.ContainerCraftConfirm; +import appeng.container.implementations.CraftAmountContainer; +import appeng.container.implementations.CraftConfirmContainer; import appeng.core.AELog; -import appeng.core.sync.AppEngPacket; +import appeng.core.sync.BasePacket; import appeng.core.sync.network.INetworkInfo; -public class PacketCraftRequest extends AppEngPacket { +public class CraftRequestPacket extends BasePacket { private final long amount; private final boolean heldShift; - public PacketCraftRequest(final PacketBuffer stream) { + public CraftRequestPacket(final PacketBuffer stream) { this.heldShift = stream.readBoolean(); this.amount = stream.readLong(); } - public PacketCraftRequest(final int craftAmt, final boolean shift) { + public CraftRequestPacket(final int craftAmt, final boolean shift) { this.amount = craftAmt; this.heldShift = shift; @@ -63,8 +63,8 @@ public class PacketCraftRequest extends AppEngPacket { @Override public void serverPacketData(final INetworkInfo manager, final PlayerEntity player) { - if (player.openContainer instanceof ContainerCraftAmount) { - final ContainerCraftAmount cca = (ContainerCraftAmount) player.openContainer; + if (player.openContainer instanceof CraftAmountContainer) { + final CraftAmountContainer cca = (CraftAmountContainer) player.openContainer; final Object target = cca.getTarget(); if (target instanceof IActionHost) { final IActionHost ah = (IActionHost) target; @@ -88,10 +88,10 @@ public class PacketCraftRequest extends AppEngPacket { final ContainerLocator locator = cca.getLocator(); if (locator != null) { - ContainerOpener.openContainer(ContainerCraftConfirm.TYPE, player, locator); + ContainerOpener.openContainer(CraftConfirmContainer.TYPE, player, locator); - if (player.openContainer instanceof ContainerCraftConfirm) { - final ContainerCraftConfirm ccc = (ContainerCraftConfirm) player.openContainer; + if (player.openContainer instanceof CraftConfirmContainer) { + final CraftConfirmContainer ccc = (CraftConfirmContainer) player.openContainer; ccc.setAutoStart(this.heldShift); ccc.setJob(futureJob); cca.detectAndSendChanges(); diff --git a/src/main/java/appeng/core/sync/packets/PacketFluidSlot.java b/src/main/java/appeng/core/sync/packets/FluidSlotPacket.java similarity index 92% rename from src/main/java/appeng/core/sync/packets/PacketFluidSlot.java rename to src/main/java/appeng/core/sync/packets/FluidSlotPacket.java index e010c919c..b397ac282 100644 --- a/src/main/java/appeng/core/sync/packets/PacketFluidSlot.java +++ b/src/main/java/appeng/core/sync/packets/FluidSlotPacket.java @@ -29,15 +29,15 @@ import net.minecraft.nbt.CompoundNBT; import net.minecraft.network.PacketBuffer; import appeng.api.storage.data.IAEFluidStack; -import appeng.core.sync.AppEngPacket; +import appeng.core.sync.BasePacket; import appeng.core.sync.network.INetworkInfo; import appeng.fluids.container.IFluidSyncContainer; import appeng.fluids.util.AEFluidStack; -public class PacketFluidSlot extends AppEngPacket { +public class FluidSlotPacket extends BasePacket { private final Map list; - public PacketFluidSlot(final PacketBuffer stream) { + public FluidSlotPacket(final PacketBuffer stream) { this.list = new HashMap<>(); CompoundNBT tag = stream.readCompoundTag(); @@ -47,7 +47,7 @@ public class PacketFluidSlot extends AppEngPacket { } // api - public PacketFluidSlot(final Map list) { + public FluidSlotPacket(final Map list) { this.list = list; final CompoundNBT sendTag = new CompoundNBT(); for (Map.Entry fs : list.entrySet()) { diff --git a/src/main/java/appeng/core/sync/packets/PacketInventoryAction.java b/src/main/java/appeng/core/sync/packets/InventoryActionPacket.java similarity index 88% rename from src/main/java/appeng/core/sync/packets/PacketInventoryAction.java rename to src/main/java/appeng/core/sync/packets/InventoryActionPacket.java index 667c75cc2..4bde52464 100644 --- a/src/main/java/appeng/core/sync/packets/PacketInventoryAction.java +++ b/src/main/java/appeng/core/sync/packets/InventoryActionPacket.java @@ -29,22 +29,22 @@ import appeng.api.storage.data.IAEItemStack; import appeng.container.AEBaseContainer; import appeng.container.ContainerLocator; import appeng.container.ContainerOpener; -import appeng.container.implementations.ContainerCraftAmount; +import appeng.container.implementations.CraftAmountContainer; import appeng.core.AppEng; -import appeng.core.sync.AppEngPacket; +import appeng.core.sync.BasePacket; import appeng.core.sync.network.INetworkInfo; import appeng.helpers.InventoryAction; import appeng.util.Platform; import appeng.util.item.AEItemStack; -public class PacketInventoryAction extends AppEngPacket { +public class InventoryActionPacket extends BasePacket { private final InventoryAction action; private final int slot; private final long id; private final IAEItemStack slotItem; - public PacketInventoryAction(final PacketBuffer stream) { + public InventoryActionPacket(final PacketBuffer stream) { this.action = InventoryAction.values()[stream.readInt()]; this.slot = stream.readInt(); this.id = stream.readLong(); @@ -57,7 +57,7 @@ public class PacketInventoryAction extends AppEngPacket { } // api - public PacketInventoryAction(final InventoryAction action, final int slot, final IAEItemStack slotItem) { + public InventoryActionPacket(final InventoryAction action, final int slot, final IAEItemStack slotItem) { if (Platform.isClient()) { throw new IllegalStateException("invalid packet, client cannot post inv actions with stacks."); @@ -86,7 +86,7 @@ public class PacketInventoryAction extends AppEngPacket { } // api - public PacketInventoryAction(final InventoryAction action, final int slot, final long id) { + public InventoryActionPacket(final InventoryAction action, final int slot, final long id) { this.action = action; this.slot = slot; this.id = id; @@ -111,10 +111,10 @@ public class PacketInventoryAction extends AppEngPacket { if (this.action == InventoryAction.AUTO_CRAFT) { final ContainerLocator locator = baseContainer.getLocator(); if (locator != null) { - ContainerOpener.openContainer(ContainerCraftAmount.TYPE, player, locator); + ContainerOpener.openContainer(CraftAmountContainer.TYPE, player, locator); - if (sender.openContainer instanceof ContainerCraftAmount) { - final ContainerCraftAmount cca = (ContainerCraftAmount) sender.openContainer; + if (sender.openContainer instanceof CraftAmountContainer) { + final CraftAmountContainer cca = (CraftAmountContainer) sender.openContainer; if (baseContainer.getTargetStack() != null) { cca.getCraftingItem().putStack(baseContainer.getTargetStack().asItemStackRepresentation()); diff --git a/src/main/java/appeng/core/sync/packets/PacketItemTransitionEffect.java b/src/main/java/appeng/core/sync/packets/ItemTransitionEffectPacket.java similarity index 93% rename from src/main/java/appeng/core/sync/packets/PacketItemTransitionEffect.java rename to src/main/java/appeng/core/sync/packets/ItemTransitionEffectPacket.java index ee7bdd2a8..dabdebb11 100644 --- a/src/main/java/appeng/core/sync/packets/PacketItemTransitionEffect.java +++ b/src/main/java/appeng/core/sync/packets/ItemTransitionEffectPacket.java @@ -30,7 +30,7 @@ import net.minecraftforge.api.distmarker.OnlyIn; import appeng.api.util.AEPartLocation; import appeng.client.render.effects.EnergyParticleData; import appeng.core.AppEng; -import appeng.core.sync.AppEngPacket; +import appeng.core.sync.BasePacket; import appeng.core.sync.network.INetworkInfo; import appeng.util.Platform; @@ -38,14 +38,14 @@ import appeng.util.Platform; * Plays a transition particle effect into the supplied direction. Used * primarily by annihilation planes. */ -public class PacketItemTransitionEffect extends AppEngPacket { +public class ItemTransitionEffectPacket extends BasePacket { private final double x; private final double y; private final double z; private final AEPartLocation d; - public PacketItemTransitionEffect(double x, double y, double z, AEPartLocation direction) { + public ItemTransitionEffectPacket(double x, double y, double z, AEPartLocation direction) { this.x = x; this.y = y; this.z = z; @@ -62,7 +62,7 @@ public class PacketItemTransitionEffect extends AppEngPacket { this.configureWrite(data); } - public PacketItemTransitionEffect(final PacketBuffer stream) { + public ItemTransitionEffectPacket(final PacketBuffer stream) { this.x = stream.readFloat(); this.y = stream.readFloat(); this.z = stream.readFloat(); diff --git a/src/main/java/appeng/core/sync/packets/PacketJEIRecipe.java b/src/main/java/appeng/core/sync/packets/JEIRecipePacket.java similarity index 95% rename from src/main/java/appeng/core/sync/packets/PacketJEIRecipe.java rename to src/main/java/appeng/core/sync/packets/JEIRecipePacket.java index 3c7412336..f4fae638b 100644 --- a/src/main/java/appeng/core/sync/packets/PacketJEIRecipe.java +++ b/src/main/java/appeng/core/sync/packets/JEIRecipePacket.java @@ -41,10 +41,10 @@ import appeng.api.networking.storage.IStorageGrid; import appeng.api.storage.IMEMonitor; import appeng.api.storage.channels.IItemStorageChannel; import appeng.api.storage.data.IAEItemStack; -import appeng.core.sync.AppEngPacket; +import appeng.core.sync.BasePacket; import appeng.core.sync.network.INetworkInfo; import appeng.helpers.IContainerCraftingPacket; -import appeng.items.storage.ItemViewCell; +import appeng.items.storage.ViewCellItem; import appeng.util.Platform; import appeng.util.helpers.ItemHandlerUtil; import appeng.util.inv.AdaptorItemHandler; @@ -52,11 +52,11 @@ import appeng.util.inv.WrapperInvItemHandler; import appeng.util.item.AEItemStack; import appeng.util.prioritylist.IPartitionList; -public class PacketJEIRecipe extends AppEngPacket { +public class JEIRecipePacket extends BasePacket { private ItemStack[][] recipe; - public PacketJEIRecipe(final PacketBuffer stream) { + public JEIRecipePacket(final PacketBuffer stream) { final CompoundNBT comp = stream.readCompoundTag(); if (comp != null) { this.recipe = new ItemStack[9][]; @@ -73,7 +73,7 @@ public class PacketJEIRecipe extends AppEngPacket { } // api - public PacketJEIRecipe(final CompoundNBT recipe) { + public JEIRecipePacket(final CompoundNBT recipe) { final PacketBuffer data = new PacketBuffer(Unpooled.buffer()); data.writeInt(this.getPacketID()); @@ -114,7 +114,7 @@ public class PacketJEIRecipe extends AppEngPacket { if (inv != null && this.recipe != null && security != null) { final IMEMonitor storage = inv .getInventory(AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class)); - final IPartitionList filter = ItemViewCell.createFilter(cct.getViewCells()); + final IPartitionList filter = ViewCellItem.createFilter(cct.getViewCells()); for (int x = 0; x < craftMatrix.getSlots(); x++) { ItemStack currentItem = craftMatrix.getStackInSlot(x); diff --git a/src/main/java/appeng/core/sync/packets/PacketLightning.java b/src/main/java/appeng/core/sync/packets/LightningPacket.java similarity index 91% rename from src/main/java/appeng/core/sync/packets/PacketLightning.java rename to src/main/java/appeng/core/sync/packets/LightningPacket.java index d906c7b8d..666d552a6 100644 --- a/src/main/java/appeng/core/sync/packets/PacketLightning.java +++ b/src/main/java/appeng/core/sync/packets/LightningPacket.java @@ -28,24 +28,24 @@ import net.minecraftforge.api.distmarker.OnlyIn; import appeng.client.render.effects.ParticleTypes; import appeng.core.AEConfig; -import appeng.core.sync.AppEngPacket; +import appeng.core.sync.BasePacket; import appeng.core.sync.network.INetworkInfo; import appeng.util.Platform; -public class PacketLightning extends AppEngPacket { +public class LightningPacket extends BasePacket { private final double x; private final double y; private final double z; - public PacketLightning(final PacketBuffer stream) { + public LightningPacket(final PacketBuffer stream) { this.x = stream.readFloat(); this.y = stream.readFloat(); this.z = stream.readFloat(); } // api - public PacketLightning(final double x, final double y, final double z) { + public LightningPacket(final double x, final double y, final double z) { this.x = x; this.y = y; this.z = z; diff --git a/src/main/java/appeng/core/sync/packets/PacketMEFluidInventoryUpdate.java b/src/main/java/appeng/core/sync/packets/MEFluidInventoryUpdatePacket.java similarity index 90% rename from src/main/java/appeng/core/sync/packets/PacketMEFluidInventoryUpdate.java rename to src/main/java/appeng/core/sync/packets/MEFluidInventoryUpdatePacket.java index 35a3f3eb7..10caeebd1 100644 --- a/src/main/java/appeng/core/sync/packets/PacketMEFluidInventoryUpdate.java +++ b/src/main/java/appeng/core/sync/packets/MEFluidInventoryUpdatePacket.java @@ -24,7 +24,6 @@ import java.io.OutputStream; import java.nio.BufferOverflowException; import java.util.LinkedList; import java.util.List; -import java.util.zip.DeflaterOutputStream; import java.util.zip.GZIPInputStream; import java.util.zip.GZIPOutputStream; @@ -43,9 +42,9 @@ import net.minecraftforge.fml.network.NetworkDirection; import appeng.api.storage.data.IAEFluidStack; import appeng.core.AELog; -import appeng.core.sync.AppEngPacket; +import appeng.core.sync.BasePacket; import appeng.core.sync.network.INetworkInfo; -import appeng.fluids.client.gui.GuiFluidTerminal; +import appeng.fluids.client.gui.FluidTerminalScreen; import appeng.fluids.util.AEFluidStack; /** @@ -53,7 +52,7 @@ import appeng.fluids.util.AEFluidStack; * @version rv6 - 22/05/2018 * @since rv6 22/05/2018 */ -public class PacketMEFluidInventoryUpdate extends AppEngPacket { +public class MEFluidInventoryUpdatePacket extends BasePacket { private static final int UNCOMPRESSED_PACKET_BYTE_LIMIT = 16 * 1024 * 1024; private static final int OPERATION_BYTE_LIMIT = 2 * 1024; private static final int TEMP_BUFFER_SIZE = 1024; @@ -73,7 +72,7 @@ public class PacketMEFluidInventoryUpdate extends AppEngPacket { private int writtenBytes = 0; private boolean empty = true; - public PacketMEFluidInventoryUpdate(final PacketBuffer stream) { + public MEFluidInventoryUpdatePacket(final PacketBuffer stream) { this.data = null; this.compressFrame = null; this.list = new LinkedList<>(); @@ -112,12 +111,12 @@ public class PacketMEFluidInventoryUpdate extends AppEngPacket { } // api - public PacketMEFluidInventoryUpdate() throws IOException { + public MEFluidInventoryUpdatePacket() throws IOException { this((byte) 0); } // api - public PacketMEFluidInventoryUpdate(final byte ref) throws IOException { + public MEFluidInventoryUpdatePacket(final byte ref) throws IOException { this.ref = ref; this.data = new PacketBuffer(Unpooled.buffer(OPERATION_BYTE_LIMIT)); this.data.writeInt(this.getPacketID()); @@ -126,7 +125,7 @@ public class PacketMEFluidInventoryUpdate extends AppEngPacket { this.compressFrame = new GZIPOutputStream(new OutputStream() { @Override public void write(final int value) { - PacketMEFluidInventoryUpdate.this.data.writeByte(value); + MEFluidInventoryUpdatePacket.this.data.writeByte(value); } }); @@ -138,8 +137,8 @@ public class PacketMEFluidInventoryUpdate extends AppEngPacket { public void clientPacketData(final INetworkInfo network, final PlayerEntity player) { final Screen gs = Minecraft.getInstance().currentScreen; - if (gs instanceof GuiFluidTerminal) { - ((GuiFluidTerminal) gs).postUpdate(this.list); + if (gs instanceof FluidTerminalScreen) { + ((FluidTerminalScreen) gs).postUpdate(this.list); } } diff --git a/src/main/java/appeng/core/sync/packets/PacketMEInventoryUpdate.java b/src/main/java/appeng/core/sync/packets/MEInventoryUpdatePacket.java similarity index 83% rename from src/main/java/appeng/core/sync/packets/PacketMEInventoryUpdate.java rename to src/main/java/appeng/core/sync/packets/MEInventoryUpdatePacket.java index 74c2e8c4a..7fac77538 100644 --- a/src/main/java/appeng/core/sync/packets/PacketMEInventoryUpdate.java +++ b/src/main/java/appeng/core/sync/packets/MEInventoryUpdatePacket.java @@ -41,16 +41,16 @@ import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.fml.network.NetworkDirection; import appeng.api.storage.data.IAEItemStack; -import appeng.client.gui.implementations.GuiCraftConfirm; -import appeng.client.gui.implementations.GuiCraftingCPU; -import appeng.client.gui.implementations.GuiMEMonitorable; -import appeng.client.gui.implementations.GuiNetworkStatus; +import appeng.client.gui.implementations.CraftConfirmScreen; +import appeng.client.gui.implementations.CraftingCPUScreen; +import appeng.client.gui.implementations.MEMonitorableScreen; +import appeng.client.gui.implementations.NetworkStatusScreen; import appeng.core.AELog; -import appeng.core.sync.AppEngPacket; +import appeng.core.sync.BasePacket; import appeng.core.sync.network.INetworkInfo; import appeng.util.item.AEItemStack; -public class PacketMEInventoryUpdate extends AppEngPacket { +public class MEInventoryUpdatePacket extends BasePacket { private static final int UNCOMPRESSED_PACKET_BYTE_LIMIT = 16 * 1024 * 1024; private static final int OPERATION_BYTE_LIMIT = 2 * 1024; private static final int TEMP_BUFFER_SIZE = 1024; @@ -70,7 +70,7 @@ public class PacketMEInventoryUpdate extends AppEngPacket { private int writtenBytes = 0; private boolean empty = true; - public PacketMEInventoryUpdate(final PacketBuffer stream) { + public MEInventoryUpdatePacket(final PacketBuffer stream) { this.data = null; this.compressFrame = null; this.list = new ArrayList<>(); @@ -110,12 +110,12 @@ public class PacketMEInventoryUpdate extends AppEngPacket { } // api - public PacketMEInventoryUpdate() throws IOException { + public MEInventoryUpdatePacket() throws IOException { this((byte) 0); } // api - public PacketMEInventoryUpdate(final byte ref) throws IOException { + public MEInventoryUpdatePacket(final byte ref) throws IOException { this.ref = ref; this.data = new PacketBuffer(Unpooled.buffer(OPERATION_BYTE_LIMIT)); this.data.writeInt(this.getPacketID()); @@ -124,7 +124,7 @@ public class PacketMEInventoryUpdate extends AppEngPacket { this.compressFrame = new GZIPOutputStream(new OutputStream() { @Override public void write(final int value) { - PacketMEInventoryUpdate.this.data.writeByte(value); + MEInventoryUpdatePacket.this.data.writeByte(value); } }); @@ -136,20 +136,20 @@ public class PacketMEInventoryUpdate extends AppEngPacket { public void clientPacketData(final INetworkInfo network, final PlayerEntity player) { final Screen gs = Minecraft.getInstance().currentScreen; - if (gs instanceof GuiCraftConfirm) { - ((GuiCraftConfirm) gs).postUpdate(this.list, this.ref); + if (gs instanceof CraftConfirmScreen) { + ((CraftConfirmScreen) gs).postUpdate(this.list, this.ref); } - if (gs instanceof GuiCraftingCPU) { - ((GuiCraftingCPU) gs).postUpdate(this.list, this.ref); + if (gs instanceof CraftingCPUScreen) { + ((CraftingCPUScreen) gs).postUpdate(this.list, this.ref); } - if (gs instanceof GuiMEMonitorable) { - ((GuiMEMonitorable) gs).postUpdate(this.list); + if (gs instanceof MEMonitorableScreen) { + ((MEMonitorableScreen) gs).postUpdate(this.list); } - if (gs instanceof GuiNetworkStatus) { - ((GuiNetworkStatus) gs).postUpdate(this.list); + if (gs instanceof NetworkStatusScreen) { + ((NetworkStatusScreen) gs).postUpdate(this.list); } } diff --git a/src/main/java/appeng/core/sync/packets/PacketMatterCannon.java b/src/main/java/appeng/core/sync/packets/MatterCannonPacket.java similarity index 91% rename from src/main/java/appeng/core/sync/packets/PacketMatterCannon.java rename to src/main/java/appeng/core/sync/packets/MatterCannonPacket.java index 2955cf22d..ec6a7b690 100644 --- a/src/main/java/appeng/core/sync/packets/PacketMatterCannon.java +++ b/src/main/java/appeng/core/sync/packets/MatterCannonPacket.java @@ -27,10 +27,10 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import appeng.client.render.effects.ParticleTypes; -import appeng.core.sync.AppEngPacket; +import appeng.core.sync.BasePacket; import appeng.core.sync.network.INetworkInfo; -public class PacketMatterCannon extends AppEngPacket { +public class MatterCannonPacket extends BasePacket { private final double x; private final double y; @@ -40,7 +40,7 @@ public class PacketMatterCannon extends AppEngPacket { private final double dz; private final byte len; - public PacketMatterCannon(final PacketBuffer stream) { + public MatterCannonPacket(final PacketBuffer stream) { this.x = stream.readFloat(); this.y = stream.readFloat(); this.z = stream.readFloat(); @@ -51,8 +51,8 @@ public class PacketMatterCannon extends AppEngPacket { } // api - public PacketMatterCannon(final double x, final double y, final double z, final float dx, final float dy, - final float dz, final byte len) { + public MatterCannonPacket(final double x, final double y, final double z, final float dx, final float dy, + final float dz, final byte len) { final float dl = dx * dx + dy * dy + dz * dz; final float dlz = (float) Math.sqrt(dl); diff --git a/src/main/java/appeng/core/sync/packets/PacketMockExplosion.java b/src/main/java/appeng/core/sync/packets/MockExplosionPacket.java similarity index 90% rename from src/main/java/appeng/core/sync/packets/PacketMockExplosion.java rename to src/main/java/appeng/core/sync/packets/MockExplosionPacket.java index 2d3431076..b4cae5f4b 100644 --- a/src/main/java/appeng/core/sync/packets/PacketMockExplosion.java +++ b/src/main/java/appeng/core/sync/packets/MockExplosionPacket.java @@ -28,23 +28,23 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import appeng.core.AppEng; -import appeng.core.sync.AppEngPacket; +import appeng.core.sync.BasePacket; import appeng.core.sync.network.INetworkInfo; -public class PacketMockExplosion extends AppEngPacket { +public class MockExplosionPacket extends BasePacket { private final double x; private final double y; private final double z; - public PacketMockExplosion(final PacketBuffer stream) { + public MockExplosionPacket(final PacketBuffer stream) { this.x = stream.readDouble(); this.y = stream.readDouble(); this.z = stream.readDouble(); } // api - public PacketMockExplosion(final double x, final double y, final double z) { + public MockExplosionPacket(final double x, final double y, final double z) { this.x = x; this.y = y; this.z = z; diff --git a/src/main/java/appeng/core/sync/packets/PacketPaintedEntity.java b/src/main/java/appeng/core/sync/packets/PaintedEntityPacket.java similarity index 90% rename from src/main/java/appeng/core/sync/packets/PacketPaintedEntity.java rename to src/main/java/appeng/core/sync/packets/PaintedEntityPacket.java index d7e604c94..a5dbeea92 100644 --- a/src/main/java/appeng/core/sync/packets/PacketPaintedEntity.java +++ b/src/main/java/appeng/core/sync/packets/PaintedEntityPacket.java @@ -24,25 +24,25 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.network.PacketBuffer; import appeng.api.util.AEColor; -import appeng.core.sync.AppEngPacket; +import appeng.core.sync.BasePacket; import appeng.core.sync.network.INetworkInfo; import appeng.hooks.TickHandler; import appeng.hooks.TickHandler.PlayerColor; -public class PacketPaintedEntity extends AppEngPacket { +public class PaintedEntityPacket extends BasePacket { private final AEColor myColor; private final int entityId; private int ticks; - public PacketPaintedEntity(final PacketBuffer stream) { + public PaintedEntityPacket(final PacketBuffer stream) { this.entityId = stream.readInt(); this.myColor = AEColor.values()[stream.readByte()]; this.ticks = stream.readInt(); } // api - public PacketPaintedEntity(final int myEntity, final AEColor myColor, final int ticksLeft) { + public PaintedEntityPacket(final int myEntity, final AEColor myColor, final int ticksLeft) { final PacketBuffer data = new PacketBuffer(Unpooled.buffer()); diff --git a/src/main/java/appeng/core/sync/packets/PacketPartPlacement.java b/src/main/java/appeng/core/sync/packets/PartPlacementPacket.java similarity index 92% rename from src/main/java/appeng/core/sync/packets/PacketPartPlacement.java rename to src/main/java/appeng/core/sync/packets/PartPlacementPacket.java index d0c73bb6c..6ba7a1307 100644 --- a/src/main/java/appeng/core/sync/packets/PacketPartPlacement.java +++ b/src/main/java/appeng/core/sync/packets/PartPlacementPacket.java @@ -28,11 +28,11 @@ import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import appeng.core.AppEng; -import appeng.core.sync.AppEngPacket; +import appeng.core.sync.BasePacket; import appeng.core.sync.network.INetworkInfo; import appeng.parts.PartPlacement; -public class PacketPartPlacement extends AppEngPacket { +public class PartPlacementPacket extends BasePacket { private int x; private int y; @@ -41,7 +41,7 @@ public class PacketPartPlacement extends AppEngPacket { private float eyeHeight; private Hand hand; - public PacketPartPlacement(final PacketBuffer stream) { + public PartPlacementPacket(final PacketBuffer stream) { this.x = stream.readInt(); this.y = stream.readInt(); this.z = stream.readInt(); @@ -51,7 +51,7 @@ public class PacketPartPlacement extends AppEngPacket { } // api - public PacketPartPlacement(final BlockPos pos, final Direction face, final float eyeHeight, final Hand hand) { + public PartPlacementPacket(final BlockPos pos, final Direction face, final float eyeHeight, final Hand hand) { final PacketBuffer data = new PacketBuffer(Unpooled.buffer()); data.writeInt(this.getPacketID()); diff --git a/src/main/java/appeng/core/sync/packets/PacketPatternSlot.java b/src/main/java/appeng/core/sync/packets/PatternSlotPacket.java similarity index 87% rename from src/main/java/appeng/core/sync/packets/PacketPatternSlot.java rename to src/main/java/appeng/core/sync/packets/PatternSlotPacket.java index f489a67b5..056b7f78f 100644 --- a/src/main/java/appeng/core/sync/packets/PacketPatternSlot.java +++ b/src/main/java/appeng/core/sync/packets/PatternSlotPacket.java @@ -28,12 +28,12 @@ import net.minecraftforge.items.IItemHandler; import appeng.api.AEApi; import appeng.api.storage.channels.IItemStorageChannel; import appeng.api.storage.data.IAEItemStack; -import appeng.container.implementations.ContainerPatternTerm; -import appeng.core.sync.AppEngPacket; +import appeng.container.implementations.PatternTermContainer; +import appeng.core.sync.BasePacket; import appeng.core.sync.network.INetworkInfo; import appeng.util.item.AEItemStack; -public class PacketPatternSlot extends AppEngPacket { +public class PatternSlotPacket extends BasePacket { public final IAEItemStack slotItem; @@ -41,7 +41,7 @@ public class PacketPatternSlot extends AppEngPacket { public final boolean shift; - public PacketPatternSlot(final PacketBuffer stream) { + public PatternSlotPacket(final PacketBuffer stream) { this.shift = stream.readBoolean(); @@ -63,7 +63,7 @@ public class PacketPatternSlot extends AppEngPacket { } // api - public PacketPatternSlot(final IItemHandler pat, final IAEItemStack slotItem, final boolean shift) { + public PatternSlotPacket(final IItemHandler pat, final IAEItemStack slotItem, final boolean shift) { this.slotItem = slotItem; this.shift = shift; @@ -96,8 +96,8 @@ public class PacketPatternSlot extends AppEngPacket { @Override public void serverPacketData(final INetworkInfo manager, final PlayerEntity player) { final ServerPlayerEntity sender = (ServerPlayerEntity) player; - if (sender.openContainer instanceof ContainerPatternTerm) { - final ContainerPatternTerm patternTerminal = (ContainerPatternTerm) sender.openContainer; + if (sender.openContainer instanceof PatternTermContainer) { + final PatternTermContainer patternTerminal = (PatternTermContainer) sender.openContainer; patternTerminal.craftOrGetItem(this); } } diff --git a/src/main/java/appeng/core/sync/packets/PacketProgressBar.java b/src/main/java/appeng/core/sync/packets/ProgressBarPacket.java similarity index 90% rename from src/main/java/appeng/core/sync/packets/PacketProgressBar.java rename to src/main/java/appeng/core/sync/packets/ProgressBarPacket.java index d8483b95c..1b98e5d10 100644 --- a/src/main/java/appeng/core/sync/packets/PacketProgressBar.java +++ b/src/main/java/appeng/core/sync/packets/ProgressBarPacket.java @@ -25,21 +25,21 @@ import net.minecraft.inventory.container.Container; import net.minecraft.network.PacketBuffer; import appeng.container.AEBaseContainer; -import appeng.core.sync.AppEngPacket; +import appeng.core.sync.BasePacket; import appeng.core.sync.network.INetworkInfo; -public class PacketProgressBar extends AppEngPacket { +public class ProgressBarPacket extends BasePacket { private final short id; private final long value; - public PacketProgressBar(final PacketBuffer stream) { + public ProgressBarPacket(final PacketBuffer stream) { this.id = stream.readShort(); this.value = stream.readLong(); } // api - public PacketProgressBar(final int shortID, final long value) { + public ProgressBarPacket(final int shortID, final long value) { this.id = (short) shortID; this.value = value; diff --git a/src/main/java/appeng/core/sync/packets/PacketSwapSlots.java b/src/main/java/appeng/core/sync/packets/SwapSlotsPacket.java similarity index 89% rename from src/main/java/appeng/core/sync/packets/PacketSwapSlots.java rename to src/main/java/appeng/core/sync/packets/SwapSlotsPacket.java index 6cc8e7337..e32b77608 100644 --- a/src/main/java/appeng/core/sync/packets/PacketSwapSlots.java +++ b/src/main/java/appeng/core/sync/packets/SwapSlotsPacket.java @@ -24,21 +24,21 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.network.PacketBuffer; import appeng.container.AEBaseContainer; -import appeng.core.sync.AppEngPacket; +import appeng.core.sync.BasePacket; import appeng.core.sync.network.INetworkInfo; -public class PacketSwapSlots extends AppEngPacket { +public class SwapSlotsPacket extends BasePacket { private final int slotA; private final int slotB; - public PacketSwapSlots(final PacketBuffer stream) { + public SwapSlotsPacket(final PacketBuffer stream) { this.slotA = stream.readInt(); this.slotB = stream.readInt(); } // api - public PacketSwapSlots(final int slotA, final int slotB) { + public SwapSlotsPacket(final int slotA, final int slotB) { final PacketBuffer data = new PacketBuffer(Unpooled.buffer()); data.writeInt(this.getPacketID()); diff --git a/src/main/java/appeng/core/sync/packets/PacketSwitchGuis.java b/src/main/java/appeng/core/sync/packets/SwitchGuisPacket.java similarity index 91% rename from src/main/java/appeng/core/sync/packets/PacketSwitchGuis.java rename to src/main/java/appeng/core/sync/packets/SwitchGuisPacket.java index ebdc276d1..31f7a508e 100644 --- a/src/main/java/appeng/core/sync/packets/PacketSwitchGuis.java +++ b/src/main/java/appeng/core/sync/packets/SwitchGuisPacket.java @@ -29,19 +29,19 @@ import net.minecraftforge.registries.ForgeRegistries; import appeng.container.AEBaseContainer; import appeng.container.ContainerLocator; import appeng.container.ContainerOpener; -import appeng.core.sync.AppEngPacket; +import appeng.core.sync.BasePacket; import appeng.core.sync.network.INetworkInfo; -public class PacketSwitchGuis extends AppEngPacket { +public class SwitchGuisPacket extends BasePacket { private final ContainerType newGui; - public PacketSwitchGuis(final PacketBuffer stream) { + public SwitchGuisPacket(final PacketBuffer stream) { this.newGui = ForgeRegistries.CONTAINERS.getValue(stream.readResourceLocation()); } // api - public PacketSwitchGuis(final ContainerType newGui) { + public SwitchGuisPacket(final ContainerType newGui) { this.newGui = newGui; final PacketBuffer data = new PacketBuffer(Unpooled.buffer()); diff --git a/src/main/java/appeng/core/sync/packets/PacketTargetFluidStack.java b/src/main/java/appeng/core/sync/packets/TargetFluidStackPacket.java similarity index 83% rename from src/main/java/appeng/core/sync/packets/PacketTargetFluidStack.java rename to src/main/java/appeng/core/sync/packets/TargetFluidStackPacket.java index f97237ee8..6cc693a79 100644 --- a/src/main/java/appeng/core/sync/packets/PacketTargetFluidStack.java +++ b/src/main/java/appeng/core/sync/packets/TargetFluidStackPacket.java @@ -24,9 +24,9 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.network.PacketBuffer; import appeng.core.AELog; -import appeng.core.sync.AppEngPacket; +import appeng.core.sync.BasePacket; import appeng.core.sync.network.INetworkInfo; -import appeng.fluids.container.ContainerFluidTerminal; +import appeng.fluids.container.FluidTerminalContainer; import appeng.fluids.util.AEFluidStack; /** @@ -34,10 +34,10 @@ import appeng.fluids.util.AEFluidStack; * @version rv6 - 23/05/2018 * @since rv6 23/05/2018 */ -public class PacketTargetFluidStack extends AppEngPacket { +public class TargetFluidStackPacket extends BasePacket { private AEFluidStack stack; - public PacketTargetFluidStack(final PacketBuffer stream) { + public TargetFluidStackPacket(final PacketBuffer stream) { try { if (stream.readableBytes() > 0) { this.stack = (AEFluidStack) AEFluidStack.fromPacket(stream); @@ -51,7 +51,7 @@ public class PacketTargetFluidStack extends AppEngPacket { } // api - public PacketTargetFluidStack(AEFluidStack stack) { + public TargetFluidStackPacket(AEFluidStack stack) { this.stack = stack; @@ -69,8 +69,8 @@ public class PacketTargetFluidStack extends AppEngPacket { @Override public void serverPacketData(final INetworkInfo manager, final PlayerEntity player) { - if (player.openContainer instanceof ContainerFluidTerminal) { - ((ContainerFluidTerminal) player.openContainer).setTargetStack(this.stack); + if (player.openContainer instanceof FluidTerminalContainer) { + ((FluidTerminalContainer) player.openContainer).setTargetStack(this.stack); } } } diff --git a/src/main/java/appeng/core/sync/packets/PacketTargetItemStack.java b/src/main/java/appeng/core/sync/packets/TargetItemStackPacket.java similarity index 90% rename from src/main/java/appeng/core/sync/packets/PacketTargetItemStack.java rename to src/main/java/appeng/core/sync/packets/TargetItemStackPacket.java index 324864109..bf700c139 100644 --- a/src/main/java/appeng/core/sync/packets/PacketTargetItemStack.java +++ b/src/main/java/appeng/core/sync/packets/TargetItemStackPacket.java @@ -25,14 +25,14 @@ import net.minecraft.network.PacketBuffer; import appeng.container.AEBaseContainer; import appeng.core.AELog; -import appeng.core.sync.AppEngPacket; +import appeng.core.sync.BasePacket; import appeng.core.sync.network.INetworkInfo; import appeng.util.item.AEItemStack; -public class PacketTargetItemStack extends AppEngPacket { +public class TargetItemStackPacket extends BasePacket { private AEItemStack stack; - public PacketTargetItemStack(final PacketBuffer stream) { + public TargetItemStackPacket(final PacketBuffer stream) { try { if (stream.readableBytes() > 0) { this.stack = AEItemStack.fromPacket(stream); @@ -46,7 +46,7 @@ public class PacketTargetItemStack extends AppEngPacket { } // api - public PacketTargetItemStack(AEItemStack stack) { + public TargetItemStackPacket(AEItemStack stack) { this.stack = stack; diff --git a/src/main/java/appeng/debug/BlockChunkloader.java b/src/main/java/appeng/debug/ChunkLoaderBlock.java similarity index 89% rename from src/main/java/appeng/debug/BlockChunkloader.java rename to src/main/java/appeng/debug/ChunkLoaderBlock.java index 1e9ef8fef..88c185ec7 100644 --- a/src/main/java/appeng/debug/BlockChunkloader.java +++ b/src/main/java/appeng/debug/ChunkLoaderBlock.java @@ -22,9 +22,9 @@ import net.minecraft.block.material.Material; import appeng.block.AEBaseTileBlock; -public class BlockChunkloader extends AEBaseTileBlock { +public class ChunkLoaderBlock extends AEBaseTileBlock { - public BlockChunkloader() { + public ChunkLoaderBlock() { super(defaultProps(Material.IRON)); } diff --git a/src/main/java/appeng/debug/TileChunkLoader.java b/src/main/java/appeng/debug/ChunkLoaderTileEntity.java similarity index 92% rename from src/main/java/appeng/debug/TileChunkLoader.java rename to src/main/java/appeng/debug/ChunkLoaderTileEntity.java index 949ddc547..7c85bd99c 100644 --- a/src/main/java/appeng/debug/TileChunkLoader.java +++ b/src/main/java/appeng/debug/ChunkLoaderTileEntity.java @@ -25,11 +25,11 @@ import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld; import appeng.core.AELog; -import appeng.tile.AEBaseTile; +import appeng.tile.AEBaseTileEntity; -public class TileChunkLoader extends AEBaseTile implements ITickableTileEntity { +public class ChunkLoaderTileEntity extends AEBaseTileEntity implements ITickableTileEntity { - public TileChunkLoader(TileEntityType tileEntityTypeIn) { + public ChunkLoaderTileEntity(TileEntityType tileEntityTypeIn) { super(tileEntityTypeIn); } diff --git a/src/main/java/appeng/debug/BlockCubeGenerator.java b/src/main/java/appeng/debug/CubeGeneratorBlock.java similarity index 89% rename from src/main/java/appeng/debug/BlockCubeGenerator.java rename to src/main/java/appeng/debug/CubeGeneratorBlock.java index 4ede00ca2..4ca4182c2 100644 --- a/src/main/java/appeng/debug/BlockCubeGenerator.java +++ b/src/main/java/appeng/debug/CubeGeneratorBlock.java @@ -31,16 +31,16 @@ import net.minecraft.world.World; import appeng.block.AEBaseTileBlock; -public class BlockCubeGenerator extends AEBaseTileBlock { +public class CubeGeneratorBlock extends AEBaseTileBlock { - public BlockCubeGenerator() { + public CubeGeneratorBlock() { super(defaultProps(Material.IRON)); } @Override public ActionResultType onActivated(final World w, final BlockPos pos, final PlayerEntity player, final Hand hand, final @Nullable ItemStack heldItem, final BlockRayTraceResult hit) { - final TileCubeGenerator tcg = this.getTileEntity(w, pos); + final CubeGeneratorTileEntity tcg = this.getTileEntity(w, pos); if (tcg != null) { tcg.click(player); } diff --git a/src/main/java/appeng/debug/TileCubeGenerator.java b/src/main/java/appeng/debug/CubeGeneratorTileEntity.java similarity index 94% rename from src/main/java/appeng/debug/TileCubeGenerator.java rename to src/main/java/appeng/debug/CubeGeneratorTileEntity.java index 8072250b1..a69e174f5 100644 --- a/src/main/java/appeng/debug/TileCubeGenerator.java +++ b/src/main/java/appeng/debug/CubeGeneratorTileEntity.java @@ -30,17 +30,17 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.StringTextComponent; import appeng.core.AppEng; -import appeng.tile.AEBaseTile; +import appeng.tile.AEBaseTileEntity; import appeng.util.Platform; -public class TileCubeGenerator extends AEBaseTile implements ITickableTileEntity { +public class CubeGeneratorTileEntity extends AEBaseTileEntity implements ITickableTileEntity { private int size = 3; private ItemStack is = ItemStack.EMPTY; private int countdown = 20 * 10; private PlayerEntity who = null; - public TileCubeGenerator(TileEntityType tileEntityTypeIn) { + public CubeGeneratorTileEntity(TileEntityType tileEntityTypeIn) { super(tileEntityTypeIn); } diff --git a/src/main/java/appeng/debug/ToolDebugCard.java b/src/main/java/appeng/debug/DebugCardItem.java similarity index 94% rename from src/main/java/appeng/debug/ToolDebugCard.java rename to src/main/java/appeng/debug/DebugCardItem.java index 3937fa824..287810531 100644 --- a/src/main/java/appeng/debug/ToolDebugCard.java +++ b/src/main/java/appeng/debug/DebugCardItem.java @@ -48,12 +48,12 @@ import appeng.items.AEBaseItem; import appeng.me.Grid; import appeng.me.GridNode; import appeng.me.cache.TickManagerCache; -import appeng.parts.p2p.PartP2PTunnel; -import appeng.tile.networking.TileController; +import appeng.parts.p2p.P2PTunnelPart; +import appeng.tile.networking.ControllerTileEntity; -public class ToolDebugCard extends AEBaseItem { +public class DebugCardItem extends AEBaseItem { - public ToolDebugCard(Properties properties) { + public DebugCardItem(Properties properties) { super(properties); } @@ -108,7 +108,7 @@ public class ToolDebugCard extends AEBaseItem { next = new HashSet<>(); for (final IGridNode n : current) { - if (n.getMachine() instanceof TileController) { + if (n.getMachine() instanceof ControllerTileEntity) { break outer; } @@ -127,8 +127,8 @@ public class ToolDebugCard extends AEBaseItem { this.outputMsg(player, "Cable Distance: " + length); } - if (center.getMachine() instanceof PartP2PTunnel) { - this.outputMsg(player, "Freq: " + ((PartP2PTunnel) center.getMachine()).getFrequency()); + if (center.getMachine() instanceof P2PTunnelPart) { + this.outputMsg(player, "Freq: " + ((P2PTunnelPart) center.getMachine()).getFrequency()); } final TickManagerCache tmc = g.getCache(ITickManager.class); diff --git a/src/main/java/appeng/debug/ToolDebugPartPlacer.java b/src/main/java/appeng/debug/DebugPartPlacerItem.java similarity index 94% rename from src/main/java/appeng/debug/ToolDebugPartPlacer.java rename to src/main/java/appeng/debug/DebugPartPlacerItem.java index 6500fc583..bb7476378 100644 --- a/src/main/java/appeng/debug/ToolDebugPartPlacer.java +++ b/src/main/java/appeng/debug/DebugPartPlacerItem.java @@ -21,16 +21,16 @@ import appeng.api.parts.PartItemStack; import appeng.api.util.AEPartLocation; import appeng.items.AEBaseItem; import appeng.items.parts.ColoredPartItem; -import appeng.items.parts.ItemPart; +import appeng.items.parts.PartItem; /** - * This tool will try to place anything that is registered as a {@link ItemPart} + * This tool will try to place anything that is registered as a {@link PartItem} * (and not a colored one) onto an existing cable to quickly test parts and * their rendering. */ -public class ToolDebugPartPlacer extends AEBaseItem { +public class DebugPartPlacerItem extends AEBaseItem { - public ToolDebugPartPlacer(Properties properties) { + public DebugPartPlacerItem(Properties properties) { super(properties); } @@ -72,7 +72,7 @@ public class ToolDebugPartPlacer extends AEBaseItem { BlockPos nextPos = pos; for (Item item : ForgeRegistries.ITEMS) { - if (!(item instanceof ItemPart)) { + if (!(item instanceof PartItem)) { continue; } diff --git a/src/main/java/appeng/debug/BlockEnergyGenerator.java b/src/main/java/appeng/debug/EnergyGeneratorBlock.java similarity index 88% rename from src/main/java/appeng/debug/BlockEnergyGenerator.java rename to src/main/java/appeng/debug/EnergyGeneratorBlock.java index bc707c471..052098777 100644 --- a/src/main/java/appeng/debug/BlockEnergyGenerator.java +++ b/src/main/java/appeng/debug/EnergyGeneratorBlock.java @@ -22,9 +22,9 @@ import net.minecraft.block.material.Material; import appeng.block.AEBaseTileBlock; -public class BlockEnergyGenerator extends AEBaseTileBlock { +public class EnergyGeneratorBlock extends AEBaseTileBlock { - public BlockEnergyGenerator() { + public EnergyGeneratorBlock() { super(defaultProps(Material.IRON)); } diff --git a/src/main/java/appeng/debug/TileEnergyGenerator.java b/src/main/java/appeng/debug/EnergyGeneratorTileEntity.java similarity index 92% rename from src/main/java/appeng/debug/TileEnergyGenerator.java rename to src/main/java/appeng/debug/EnergyGeneratorTileEntity.java index 8e3eb0152..f07e7a539 100644 --- a/src/main/java/appeng/debug/TileEnergyGenerator.java +++ b/src/main/java/appeng/debug/EnergyGeneratorTileEntity.java @@ -32,16 +32,16 @@ import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.energy.CapabilityEnergy; import net.minecraftforge.energy.IEnergyStorage; -import appeng.tile.AEBaseTile; +import appeng.tile.AEBaseTileEntity; -public class TileEnergyGenerator extends AEBaseTile implements ITickableTileEntity, IEnergyStorage { +public class EnergyGeneratorTileEntity extends AEBaseTileEntity implements ITickableTileEntity, IEnergyStorage { /** * The base energy injected each tick. Adjacent TileEnergyGenerators will * increase it to pow(base, #generators). */ private static final int BASE_ENERGY = 8; - public TileEnergyGenerator(TileEntityType tileEntityTypeIn) { + public EnergyGeneratorTileEntity(TileEntityType tileEntityTypeIn) { super(tileEntityTypeIn); } @@ -56,7 +56,7 @@ public class TileEnergyGenerator extends AEBaseTile implements ITickableTileEnti for (Direction facing : Direction.values()) { final TileEntity te = world.getTileEntity(this.getPos().offset(facing)); - if (te instanceof TileEnergyGenerator) { + if (te instanceof EnergyGeneratorTileEntity) { tier++; } } diff --git a/src/main/java/appeng/debug/ToolEraser.java b/src/main/java/appeng/debug/EraserItem.java similarity index 98% rename from src/main/java/appeng/debug/ToolEraser.java rename to src/main/java/appeng/debug/EraserItem.java index 5fdce4b48..b2d62ae68 100644 --- a/src/main/java/appeng/debug/ToolEraser.java +++ b/src/main/java/appeng/debug/EraserItem.java @@ -36,13 +36,13 @@ import net.minecraft.world.World; import appeng.core.AELog; import appeng.items.AEBaseItem; -public class ToolEraser extends AEBaseItem { +public class EraserItem extends AEBaseItem { private static final int BOX_SIZE = 48; private static final int BLOCK_ERASE_LIMIT = BOX_SIZE * BOX_SIZE * BOX_SIZE; final static Set COMMON_BLOCKS = new HashSet<>(); - public ToolEraser(Properties properties) { + public EraserItem(Properties properties) { super(properties); } diff --git a/src/main/java/appeng/debug/BlockItemGen.java b/src/main/java/appeng/debug/ItemGenBlock.java similarity index 90% rename from src/main/java/appeng/debug/BlockItemGen.java rename to src/main/java/appeng/debug/ItemGenBlock.java index 48ce88bd7..b9732893a 100644 --- a/src/main/java/appeng/debug/BlockItemGen.java +++ b/src/main/java/appeng/debug/ItemGenBlock.java @@ -22,9 +22,9 @@ import net.minecraft.block.material.Material; import appeng.block.AEBaseTileBlock; -public class BlockItemGen extends AEBaseTileBlock { +public class ItemGenBlock extends AEBaseTileBlock { - public BlockItemGen() { + public ItemGenBlock() { super(defaultProps(Material.IRON)); } diff --git a/src/main/java/appeng/debug/TileItemGen.java b/src/main/java/appeng/debug/ItemGenTileEntity.java similarity index 96% rename from src/main/java/appeng/debug/TileItemGen.java rename to src/main/java/appeng/debug/ItemGenTileEntity.java index 44becf1ee..40127ff6f 100644 --- a/src/main/java/appeng/debug/TileItemGen.java +++ b/src/main/java/appeng/debug/ItemGenTileEntity.java @@ -36,15 +36,15 @@ import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.registries.ForgeRegistries; -import appeng.tile.AEBaseTile; +import appeng.tile.AEBaseTileEntity; -public class TileItemGen extends AEBaseTile { +public class ItemGenTileEntity extends AEBaseTileEntity { private static final Queue POSSIBLE_ITEMS = new ArrayDeque<>(); private final IItemHandler handler = new QueuedItemHandler(); - public TileItemGen(TileEntityType tileEntityTypeIn) { + public ItemGenTileEntity(TileEntityType tileEntityTypeIn) { super(tileEntityTypeIn); if (POSSIBLE_ITEMS.isEmpty()) { for (final Item mi : ForgeRegistries.ITEMS) { diff --git a/src/main/java/appeng/debug/ToolMeteoritePlacer.java b/src/main/java/appeng/debug/MeteoritePlacerItem.java similarity index 97% rename from src/main/java/appeng/debug/ToolMeteoritePlacer.java rename to src/main/java/appeng/debug/MeteoritePlacerItem.java index 19e24c6c2..3908d4bd9 100644 --- a/src/main/java/appeng/debug/ToolMeteoritePlacer.java +++ b/src/main/java/appeng/debug/MeteoritePlacerItem.java @@ -36,9 +36,9 @@ import appeng.worldgen.MeteoritePlacer; import appeng.worldgen.MeteoriteSpawner; import appeng.worldgen.PlacedMeteoriteSettings; -public class ToolMeteoritePlacer extends AEBaseItem { +public class MeteoritePlacerItem extends AEBaseItem { - public ToolMeteoritePlacer(Properties properties) { + public MeteoritePlacerItem(Properties properties) { super(properties); } diff --git a/src/main/java/appeng/debug/BlockPhantomNode.java b/src/main/java/appeng/debug/PhantomNodeBlock.java similarity index 89% rename from src/main/java/appeng/debug/BlockPhantomNode.java rename to src/main/java/appeng/debug/PhantomNodeBlock.java index 94c2b9d60..610b4d24e 100644 --- a/src/main/java/appeng/debug/BlockPhantomNode.java +++ b/src/main/java/appeng/debug/PhantomNodeBlock.java @@ -31,16 +31,16 @@ import net.minecraft.world.World; import appeng.block.AEBaseTileBlock; -public class BlockPhantomNode extends AEBaseTileBlock { +public class PhantomNodeBlock extends AEBaseTileBlock { - public BlockPhantomNode() { + public PhantomNodeBlock() { super(defaultProps(Material.IRON)); } @Override public ActionResultType onActivated(final World w, final BlockPos pos, final PlayerEntity player, final Hand hand, final @Nullable ItemStack heldItem, final BlockRayTraceResult hit) { - final TilePhantomNode tpn = this.getTileEntity(w, pos); + final PhantomNodeTileEntity tpn = this.getTileEntity(w, pos); tpn.triggerCrashMode(); return ActionResultType.SUCCESS; } diff --git a/src/main/java/appeng/debug/TilePhantomNode.java b/src/main/java/appeng/debug/PhantomNodeTileEntity.java similarity index 90% rename from src/main/java/appeng/debug/TilePhantomNode.java rename to src/main/java/appeng/debug/PhantomNodeTileEntity.java index cef7f5ac9..492cddb3b 100644 --- a/src/main/java/appeng/debug/TilePhantomNode.java +++ b/src/main/java/appeng/debug/PhantomNodeTileEntity.java @@ -26,14 +26,14 @@ import net.minecraft.util.Direction; import appeng.api.networking.IGridNode; import appeng.api.util.AEPartLocation; import appeng.me.helpers.AENetworkProxy; -import appeng.tile.grid.AENetworkTile; +import appeng.tile.grid.AENetworkTileEntity; -public class TilePhantomNode extends AENetworkTile { +public class PhantomNodeTileEntity extends AENetworkTileEntity { private AENetworkProxy proxy = null; private boolean crashMode = false; - public TilePhantomNode(TileEntityType tileEntityTypeIn) { + public PhantomNodeTileEntity(TileEntityType tileEntityTypeIn) { super(tileEntityTypeIn); } diff --git a/src/main/java/appeng/debug/ToolReplicatorCard.java b/src/main/java/appeng/debug/ReplicatorCardItem.java similarity index 98% rename from src/main/java/appeng/debug/ToolReplicatorCard.java rename to src/main/java/appeng/debug/ReplicatorCardItem.java index f0b1d3c74..b3ca0a0b5 100644 --- a/src/main/java/appeng/debug/ToolReplicatorCard.java +++ b/src/main/java/appeng/debug/ReplicatorCardItem.java @@ -42,9 +42,9 @@ import appeng.api.util.AEPartLocation; import appeng.api.util.DimensionalCoord; import appeng.items.AEBaseItem; -public class ToolReplicatorCard extends AEBaseItem { +public class ReplicatorCardItem extends AEBaseItem { - public ToolReplicatorCard(Properties properties) { + public ReplicatorCardItem(Properties properties) { super(properties); } diff --git a/src/main/java/appeng/decorative/solid/BlockChargedQuartzOre.java b/src/main/java/appeng/decorative/solid/ChargedQuartzOreBlock.java similarity index 95% rename from src/main/java/appeng/decorative/solid/BlockChargedQuartzOre.java rename to src/main/java/appeng/decorative/solid/ChargedQuartzOreBlock.java index b27eafec7..efc9d9e6e 100644 --- a/src/main/java/appeng/decorative/solid/BlockChargedQuartzOre.java +++ b/src/main/java/appeng/decorative/solid/ChargedQuartzOreBlock.java @@ -31,8 +31,8 @@ import appeng.client.render.effects.ParticleTypes; import appeng.core.AEConfig; import appeng.core.AppEng; -public class BlockChargedQuartzOre extends BlockQuartzOre { - public BlockChargedQuartzOre(Properties props) { +public class ChargedQuartzOreBlock extends QuartzOreBlock { + public ChargedQuartzOreBlock(Properties props) { super(props); } diff --git a/src/main/java/appeng/decorative/solid/BlockQuartzGlass.java b/src/main/java/appeng/decorative/solid/QuartzGlassBlock.java similarity index 93% rename from src/main/java/appeng/decorative/solid/BlockQuartzGlass.java rename to src/main/java/appeng/decorative/solid/QuartzGlassBlock.java index 49e359a03..f8d063852 100644 --- a/src/main/java/appeng/decorative/solid/BlockQuartzGlass.java +++ b/src/main/java/appeng/decorative/solid/QuartzGlassBlock.java @@ -25,9 +25,9 @@ import net.minecraft.util.Direction; import appeng.helpers.AEGlassMaterial; -public class BlockQuartzGlass extends AbstractGlassBlock { +public class QuartzGlassBlock extends AbstractGlassBlock { - public BlockQuartzGlass(Properties props) { + public QuartzGlassBlock(Properties props) { super(props); } diff --git a/src/main/java/appeng/decorative/solid/BlockQuartzLamp.java b/src/main/java/appeng/decorative/solid/QuartzLampBlock.java similarity index 94% rename from src/main/java/appeng/decorative/solid/BlockQuartzLamp.java rename to src/main/java/appeng/decorative/solid/QuartzLampBlock.java index 6f771d175..f576765fe 100644 --- a/src/main/java/appeng/decorative/solid/BlockQuartzLamp.java +++ b/src/main/java/appeng/decorative/solid/QuartzLampBlock.java @@ -30,9 +30,9 @@ import appeng.client.render.effects.ParticleTypes; import appeng.core.AEConfig; import appeng.core.AppEng; -public class BlockQuartzLamp extends BlockQuartzGlass { +public class QuartzLampBlock extends QuartzGlassBlock { - public BlockQuartzLamp(Properties props) { + public QuartzLampBlock(Properties props) { super(props); } diff --git a/src/main/java/appeng/decorative/solid/BlockQuartzOre.java b/src/main/java/appeng/decorative/solid/QuartzOreBlock.java similarity index 92% rename from src/main/java/appeng/decorative/solid/BlockQuartzOre.java rename to src/main/java/appeng/decorative/solid/QuartzOreBlock.java index e7654dca5..35822eff6 100644 --- a/src/main/java/appeng/decorative/solid/BlockQuartzOre.java +++ b/src/main/java/appeng/decorative/solid/QuartzOreBlock.java @@ -24,8 +24,8 @@ import net.minecraft.util.math.MathHelper; import appeng.block.AEBaseBlock; -public class BlockQuartzOre extends AEBaseBlock { - public BlockQuartzOre(Properties props) { +public class QuartzOreBlock extends AEBaseBlock { + public QuartzOreBlock(Properties props) { super(props); } diff --git a/src/main/java/appeng/decorative/solid/BlockQuartzPillar.java b/src/main/java/appeng/decorative/solid/QuartzPillarBlock.java similarity index 94% rename from src/main/java/appeng/decorative/solid/BlockQuartzPillar.java rename to src/main/java/appeng/decorative/solid/QuartzPillarBlock.java index 32da88cc1..5398eb59f 100644 --- a/src/main/java/appeng/decorative/solid/BlockQuartzPillar.java +++ b/src/main/java/appeng/decorative/solid/QuartzPillarBlock.java @@ -32,10 +32,10 @@ import appeng.api.util.IOrientableBlock; import appeng.decorative.AEDecorativeBlock; import appeng.helpers.MetaRotation; -public class BlockQuartzPillar extends AEDecorativeBlock implements IOrientableBlock { +public class QuartzPillarBlock extends AEDecorativeBlock implements IOrientableBlock { public static final EnumProperty AXIS = BlockStateProperties.AXIS; - public BlockQuartzPillar(Properties props) { + public QuartzPillarBlock(Properties props) { super(props); // The upwards facing pillar is the default (i.e. for the item model) diff --git a/src/main/java/appeng/decorative/solid/BlockSkyStone.java b/src/main/java/appeng/decorative/solid/SkyStoneBlock.java similarity index 96% rename from src/main/java/appeng/decorative/solid/BlockSkyStone.java rename to src/main/java/appeng/decorative/solid/SkyStoneBlock.java index a302d09fe..853e344c6 100644 --- a/src/main/java/appeng/decorative/solid/BlockSkyStone.java +++ b/src/main/java/appeng/decorative/solid/SkyStoneBlock.java @@ -35,12 +35,12 @@ import net.minecraftforge.eventbus.api.SubscribeEvent; import appeng.block.AEBaseBlock; import appeng.core.worlddata.WorldData; -public class BlockSkyStone extends AEBaseBlock { +public class SkyStoneBlock extends AEBaseBlock { private static final float BREAK_SPEAK_SCALAR = 0.1f; private static final double BREAK_SPEAK_THRESHOLD = 7.0; private final SkystoneType type; - public BlockSkyStone(SkystoneType type, Properties props) { + public SkyStoneBlock(SkystoneType type, Properties props) { super(props); this.type = type; diff --git a/src/main/java/appeng/entity/AEBaseEntityItem.java b/src/main/java/appeng/entity/AEBaseItemEntity.java similarity index 83% rename from src/main/java/appeng/entity/AEBaseEntityItem.java rename to src/main/java/appeng/entity/AEBaseItemEntity.java index 056027c5b..86d954390 100644 --- a/src/main/java/appeng/entity/AEBaseEntityItem.java +++ b/src/main/java/appeng/entity/AEBaseItemEntity.java @@ -29,14 +29,14 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.world.World; import net.minecraftforge.fml.network.NetworkHooks; -public abstract class AEBaseEntityItem extends ItemEntity { +public abstract class AEBaseItemEntity extends ItemEntity { - protected AEBaseEntityItem(EntityType entityType, final World world) { + protected AEBaseItemEntity(EntityType entityType, final World world) { super(entityType, world); } - protected AEBaseEntityItem(EntityType entityType, final World world, final double x, - final double y, final double z, final ItemStack stack) { + protected AEBaseItemEntity(EntityType entityType, final World world, final double x, + final double y, final double z, final ItemStack stack) { this(entityType, world); this.setPosition(x, y, z); this.rotationYaw = this.rand.nextFloat() * 360.0F; diff --git a/src/main/java/appeng/entity/EntityChargedQuartz.java b/src/main/java/appeng/entity/ChargedQuartzEntity.java similarity index 94% rename from src/main/java/appeng/entity/EntityChargedQuartz.java rename to src/main/java/appeng/entity/ChargedQuartzEntity.java index 847f3331a..0581023f9 100644 --- a/src/main/java/appeng/entity/EntityChargedQuartz.java +++ b/src/main/java/appeng/entity/ChargedQuartzEntity.java @@ -40,18 +40,18 @@ import appeng.core.AEConfig; import appeng.core.AppEng; import appeng.util.Platform; -public final class EntityChargedQuartz extends AEBaseEntityItem { +public final class ChargedQuartzEntity extends AEBaseItemEntity { - public static EntityType TYPE; + public static EntityType TYPE; private int delay = 0; private int transformTime = 0; - public EntityChargedQuartz(EntityType entityType, World world) { + public ChargedQuartzEntity(EntityType entityType, World world) { super(entityType, world); } - public EntityChargedQuartz(final World w, final double x, final double y, final double z, final ItemStack is) { + public ChargedQuartzEntity(final World w, final double x, final double y, final double z, final ItemStack is) { super(TYPE, w, x, y, z, is); } diff --git a/src/main/java/appeng/entity/EntityGrowingCrystal.java b/src/main/java/appeng/entity/GrowingCrystalEntity.java similarity index 93% rename from src/main/java/appeng/entity/EntityGrowingCrystal.java rename to src/main/java/appeng/entity/GrowingCrystalEntity.java index 0a41f541e..f2ba87ef5 100644 --- a/src/main/java/appeng/entity/EntityGrowingCrystal.java +++ b/src/main/java/appeng/entity/GrowingCrystalEntity.java @@ -34,20 +34,20 @@ import appeng.api.implementations.tiles.ICrystalGrowthAccelerator; import appeng.client.EffectType; import appeng.core.AEConfig; import appeng.core.AppEng; -import appeng.items.misc.ItemCrystalSeed; +import appeng.items.misc.CrystalSeedItem; import appeng.util.Platform; -public final class EntityGrowingCrystal extends AEBaseEntityItem { +public final class GrowingCrystalEntity extends AEBaseItemEntity { - public static EntityType TYPE; + public static EntityType TYPE; private int progress_1000 = 0; - public EntityGrowingCrystal(EntityType type, World world) { + public GrowingCrystalEntity(EntityType type, World world) { super(type, world); } - public EntityGrowingCrystal(final World w, final double x, final double y, final double z, final ItemStack is) { + public GrowingCrystalEntity(final World w, final double x, final double y, final double z, final ItemStack is) { super(TYPE, w, x, y, z, is); this.setNoDespawn(); } @@ -175,7 +175,7 @@ public final class EntityGrowingCrystal extends AEBaseEntityItem { @Override protected void applyFloatMotion() { ItemStack item = getItem(); - if (item.getItem() instanceof ItemCrystalSeed) { + if (item.getItem() instanceof CrystalSeedItem) { return; } super.applyFloatMotion(); diff --git a/src/main/java/appeng/entity/EntitySingularity.java b/src/main/java/appeng/entity/SingularityEntity.java similarity index 91% rename from src/main/java/appeng/entity/EntitySingularity.java rename to src/main/java/appeng/entity/SingularityEntity.java index f1d95514f..cbb4cbd80 100644 --- a/src/main/java/appeng/entity/EntitySingularity.java +++ b/src/main/java/appeng/entity/SingularityEntity.java @@ -36,17 +36,17 @@ import appeng.api.features.AEFeature; import appeng.core.AEConfig; import appeng.util.Platform; -public final class EntitySingularity extends AEBaseEntityItem { +public final class SingularityEntity extends AEBaseItemEntity { - public static EntityType TYPE; + public static EntityType TYPE; private static int randTickSeed = 0; - public EntitySingularity(EntityType entityType, final World w) { + public SingularityEntity(EntityType entityType, final World w) { super(entityType, w); } - public EntitySingularity(final World w, final double x, final double y, final double z, final ItemStack is) { + public SingularityEntity(final World w, final double x, final double y, final double z, final ItemStack is) { super(TYPE, w, x, y, z, is); } @@ -98,7 +98,7 @@ public final class EntitySingularity extends AEBaseEntityItem { randTickSeed++; item.grow(-1); - final EntitySingularity entity = new EntitySingularity(this.world, this.getPosX(), + final SingularityEntity entity = new SingularityEntity(this.world, this.getPosX(), this.getPosY(), this.getPosZ(), singularityStack); this.world.addEntity(entity); }); diff --git a/src/main/java/appeng/entity/EntityTinyTNTPrimed.java b/src/main/java/appeng/entity/TinyTNTPrimedEntity.java similarity index 93% rename from src/main/java/appeng/entity/EntityTinyTNTPrimed.java rename to src/main/java/appeng/entity/TinyTNTPrimedEntity.java index e8f6323af..dcf720dbf 100644 --- a/src/main/java/appeng/entity/EntityTinyTNTPrimed.java +++ b/src/main/java/appeng/entity/TinyTNTPrimedEntity.java @@ -45,20 +45,20 @@ import appeng.api.AEApi; import appeng.api.features.AEFeature; import appeng.core.AEConfig; import appeng.core.AppEng; -import appeng.core.sync.packets.PacketMockExplosion; +import appeng.core.sync.packets.MockExplosionPacket; import appeng.util.Platform; -public final class EntityTinyTNTPrimed extends TNTEntity implements IEntityAdditionalSpawnData { +public final class TinyTNTPrimedEntity extends TNTEntity implements IEntityAdditionalSpawnData { - public static EntityType TYPE; + public static EntityType TYPE; - public EntityTinyTNTPrimed(EntityType type, World worldIn) { + public TinyTNTPrimedEntity(EntityType type, World worldIn) { super(type, worldIn); this.preventEntitySpawning = true; } - public EntityTinyTNTPrimed(final World w, final double x, final double y, final double z, - final LivingEntity igniter) { + public TinyTNTPrimedEntity(final World w, final double x, final double y, final double z, + final LivingEntity igniter) { super(w, x, y, z, igniter); } @@ -167,7 +167,7 @@ public final class EntityTinyTNTPrimed extends TNTEntity implements IEntityAddit } AppEng.proxy.sendToAllNearExcept(null, this.getPosX(), this.getPosY(), this.getPosZ(), 64, this.world, - new PacketMockExplosion(this.getPosX(), this.getPosY(), this.getPosZ())); + new MockExplosionPacket(this.getPosX(), this.getPosY(), this.getPosZ())); } @Override diff --git a/src/main/java/appeng/entity/RenderTinyTNTPrimed.java b/src/main/java/appeng/entity/TinyTNTPrimedRenderer.java similarity index 88% rename from src/main/java/appeng/entity/RenderTinyTNTPrimed.java rename to src/main/java/appeng/entity/TinyTNTPrimedRenderer.java index 682eba61a..81115d2b4 100644 --- a/src/main/java/appeng/entity/RenderTinyTNTPrimed.java +++ b/src/main/java/appeng/entity/TinyTNTPrimedRenderer.java @@ -34,16 +34,16 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @OnlyIn(Dist.CLIENT) -public class RenderTinyTNTPrimed extends EntityRenderer { +public class TinyTNTPrimedRenderer extends EntityRenderer { - public RenderTinyTNTPrimed(final EntityRendererManager manager) { + public TinyTNTPrimedRenderer(final EntityRendererManager manager) { super(manager); this.shadowSize = 0.5F; } @Override - public void render(EntityTinyTNTPrimed tnt, float entityYaw, float partialTicks, MatrixStack mStack, - IRenderTypeBuffer buffers, int packedLight) { + public void render(TinyTNTPrimedEntity tnt, float entityYaw, float partialTicks, MatrixStack mStack, + IRenderTypeBuffer buffers, int packedLight) { final BlockRendererDispatcher blockrendererdispatcher = Minecraft.getInstance().getBlockRendererDispatcher(); mStack.push(); mStack.translate(0, 0.25F, 0); @@ -78,7 +78,7 @@ public class RenderTinyTNTPrimed extends EntityRenderer { } @Override - public ResourceLocation getEntityTexture(final EntityTinyTNTPrimed entity) { + public ResourceLocation getEntityTexture(final TinyTNTPrimedEntity entity) { return AtlasTexture.LOCATION_BLOCKS_TEXTURE; } } diff --git a/src/main/java/appeng/facade/FacadeContainer.java b/src/main/java/appeng/facade/FacadeContainer.java index 36e8a42fd..283ac5118 100644 --- a/src/main/java/appeng/facade/FacadeContainer.java +++ b/src/main/java/appeng/facade/FacadeContainer.java @@ -30,7 +30,7 @@ import appeng.api.parts.IFacadeContainer; import appeng.api.parts.IFacadePart; import appeng.api.parts.IPartHost; import appeng.api.util.AEPartLocation; -import appeng.items.parts.ItemFacade; +import appeng.items.parts.FacadeItem; import appeng.parts.CableBusStorage; public class FacadeContainer implements IFacadeContainer { @@ -112,7 +112,7 @@ public class FacadeContainer implements IFacadeContainer { Optional maybeFacadeItem = AEApi.instance().definitions().items().facade() .maybeItem(); if (maybeFacadeItem.isPresent()) { - final ItemFacade ifa = (ItemFacade) maybeFacadeItem.get(); + final FacadeItem ifa = (FacadeItem) maybeFacadeItem.get(); final ItemStack facade = ifa.createFromID(id); if (facade != null) { changed = changed || this.storage.getFacade(x) == null; diff --git a/src/main/java/appeng/fluids/block/BlockFluidInterface.java b/src/main/java/appeng/fluids/block/FluidInterfaceBlock.java similarity index 87% rename from src/main/java/appeng/fluids/block/BlockFluidInterface.java rename to src/main/java/appeng/fluids/block/FluidInterfaceBlock.java index 6ead8a0e6..443e56b47 100644 --- a/src/main/java/appeng/fluids/block/BlockFluidInterface.java +++ b/src/main/java/appeng/fluids/block/FluidInterfaceBlock.java @@ -33,12 +33,12 @@ import net.minecraft.world.World; import appeng.block.AEBaseTileBlock; import appeng.container.ContainerLocator; import appeng.container.ContainerOpener; -import appeng.fluids.container.ContainerFluidInterface; -import appeng.fluids.tile.TileFluidInterface; +import appeng.fluids.container.FluidInterfaceContainer; +import appeng.fluids.tile.FluidInterfaceTileEntity; import appeng.util.Platform; -public class BlockFluidInterface extends AEBaseTileBlock { - public BlockFluidInterface() { +public class FluidInterfaceBlock extends AEBaseTileBlock { + public FluidInterfaceBlock() { super(defaultProps(Material.IRON)); } @@ -52,7 +52,7 @@ public class BlockFluidInterface extends AEBaseTileBlock { final TileEntity tg = this.getTileEntity(w, pos); if (tg != null) { if (Platform.isServer()) { - ContainerOpener.openContainer(ContainerFluidInterface.TYPE, p, + ContainerOpener.openContainer(FluidInterfaceContainer.TYPE, p, ContainerLocator.forTileEntitySide(tg, hit.getFace())); } return ActionResultType.SUCCESS; diff --git a/src/main/java/appeng/fluids/client/gui/GuiFluidFormationPlane.java b/src/main/java/appeng/fluids/client/gui/FluidFormationPlaneScreen.java similarity index 50% rename from src/main/java/appeng/fluids/client/gui/GuiFluidFormationPlane.java rename to src/main/java/appeng/fluids/client/gui/FluidFormationPlaneScreen.java index b535917d0..030701225 100644 --- a/src/main/java/appeng/fluids/client/gui/GuiFluidFormationPlane.java +++ b/src/main/java/appeng/fluids/client/gui/FluidFormationPlaneScreen.java @@ -4,20 +4,20 @@ package appeng.fluids.client.gui; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.text.ITextComponent; -import appeng.client.gui.implementations.GuiUpgradeable; -import appeng.client.gui.widgets.GuiTabButton; -import appeng.container.implementations.ContainerPriority; +import appeng.client.gui.implementations.UpgradeableScreen; +import appeng.client.gui.widgets.TabButton; +import appeng.container.implementations.PriorityContainer; import appeng.core.localization.GuiText; import appeng.core.sync.network.NetworkHandler; -import appeng.core.sync.packets.PacketSwitchGuis; -import appeng.fluids.client.gui.widgets.GuiFluidSlot; -import appeng.fluids.client.gui.widgets.GuiOptionalFluidSlot; -import appeng.fluids.container.ContainerFluidFormationPlane; +import appeng.core.sync.packets.SwitchGuisPacket; +import appeng.fluids.client.gui.widgets.FluidSlotWidget; +import appeng.fluids.client.gui.widgets.OptionalFluidSlotWidget; +import appeng.fluids.container.FluidFormationPlaneContainer; import appeng.fluids.util.IAEFluidTank; -public class GuiFluidFormationPlane extends GuiUpgradeable { - public GuiFluidFormationPlane(ContainerFluidFormationPlane container, PlayerInventory playerInventory, - ITextComponent title) { +public class FluidFormationPlaneScreen extends UpgradeableScreen { + public FluidFormationPlaneScreen(FluidFormationPlaneContainer container, PlayerInventory playerInventory, + ITextComponent title) { super(container, playerInventory, title); this.ySize = 251; } @@ -35,9 +35,9 @@ public class GuiFluidFormationPlane extends GuiUpgradeable openPriorityGui())); } private void openPriorityGui() { - NetworkHandler.instance().sendToServer(new PacketSwitchGuis(ContainerPriority.TYPE)); + NetworkHandler.instance().sendToServer(new SwitchGuisPacket(PriorityContainer.TYPE)); } @Override diff --git a/src/main/java/appeng/fluids/client/gui/GuiFluidIO.java b/src/main/java/appeng/fluids/client/gui/FluidIOScreen.java similarity index 52% rename from src/main/java/appeng/fluids/client/gui/GuiFluidIO.java rename to src/main/java/appeng/fluids/client/gui/FluidIOScreen.java index 997a6e33e..04e8f0003 100644 --- a/src/main/java/appeng/fluids/client/gui/GuiFluidIO.java +++ b/src/main/java/appeng/fluids/client/gui/FluidIOScreen.java @@ -21,12 +21,12 @@ package appeng.fluids.client.gui; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.text.ITextComponent; -import appeng.client.gui.implementations.GuiUpgradeable; +import appeng.client.gui.implementations.UpgradeableScreen; import appeng.core.localization.GuiText; -import appeng.fluids.client.gui.widgets.GuiFluidSlot; -import appeng.fluids.client.gui.widgets.GuiOptionalFluidSlot; -import appeng.fluids.container.ContainerFluidIO; -import appeng.fluids.parts.PartFluidImportBus; +import appeng.fluids.client.gui.widgets.FluidSlotWidget; +import appeng.fluids.client.gui.widgets.OptionalFluidSlotWidget; +import appeng.fluids.container.FluidIOContainer; +import appeng.fluids.parts.FluidImportBusPart; import appeng.fluids.util.IAEFluidTank; /** @@ -34,9 +34,9 @@ import appeng.fluids.util.IAEFluidTank; * @version rv5 - 1/05/2018 * @since rv5 1/05/2018 */ -public class GuiFluidIO extends GuiUpgradeable { +public class FluidIOScreen extends UpgradeableScreen { - public GuiFluidIO(ContainerFluidIO container, PlayerInventory playerInventory, ITextComponent title) { + public FluidIOScreen(FluidIOContainer container, PlayerInventory playerInventory, ITextComponent title) { super(container, playerInventory, title); } @@ -48,20 +48,20 @@ public class GuiFluidIO extends GuiUpgradeable { final int y = 40; final int x = 80; - this.guiSlots.add(new GuiFluidSlot(inv, 0, 0, x, y)); - this.guiSlots.add(new GuiOptionalFluidSlot(inv, container, 1, 1, 1, x, y, -1, 0)); - this.guiSlots.add(new GuiOptionalFluidSlot(inv, container, 2, 2, 1, x, y, 1, 0)); - this.guiSlots.add(new GuiOptionalFluidSlot(inv, container, 3, 3, 1, x, y, 0, -1)); - this.guiSlots.add(new GuiOptionalFluidSlot(inv, container, 4, 4, 1, x, y, 0, 1)); + this.guiSlots.add(new FluidSlotWidget(inv, 0, 0, x, y)); + this.guiSlots.add(new OptionalFluidSlotWidget(inv, container, 1, 1, 1, x, y, -1, 0)); + this.guiSlots.add(new OptionalFluidSlotWidget(inv, container, 2, 2, 1, x, y, 1, 0)); + this.guiSlots.add(new OptionalFluidSlotWidget(inv, container, 3, 3, 1, x, y, 0, -1)); + this.guiSlots.add(new OptionalFluidSlotWidget(inv, container, 4, 4, 1, x, y, 0, 1)); - this.guiSlots.add(new GuiOptionalFluidSlot(inv, container, 5, 5, 2, x, y, -1, -1)); - this.guiSlots.add(new GuiOptionalFluidSlot(inv, container, 6, 6, 2, x, y, 1, -1)); - this.guiSlots.add(new GuiOptionalFluidSlot(inv, container, 7, 7, 2, x, y, -1, 1)); - this.guiSlots.add(new GuiOptionalFluidSlot(inv, container, 8, 8, 2, x, y, 1, 1)); + this.guiSlots.add(new OptionalFluidSlotWidget(inv, container, 5, 5, 2, x, y, -1, -1)); + this.guiSlots.add(new OptionalFluidSlotWidget(inv, container, 6, 6, 2, x, y, 1, -1)); + this.guiSlots.add(new OptionalFluidSlotWidget(inv, container, 7, 7, 2, x, y, -1, 1)); + this.guiSlots.add(new OptionalFluidSlotWidget(inv, container, 8, 8, 2, x, y, 1, 1)); } @Override protected GuiText getName() { - return this.bc instanceof PartFluidImportBus ? GuiText.ImportBusFluids : GuiText.ExportBusFluids; + return this.bc instanceof FluidImportBusPart ? GuiText.ImportBusFluids : GuiText.ExportBusFluids; } } diff --git a/src/main/java/appeng/fluids/client/gui/GuiFluidInterface.java b/src/main/java/appeng/fluids/client/gui/FluidInterfaceScreen.java similarity index 73% rename from src/main/java/appeng/fluids/client/gui/GuiFluidInterface.java rename to src/main/java/appeng/fluids/client/gui/FluidInterfaceScreen.java index 32682473f..9120e7f46 100644 --- a/src/main/java/appeng/fluids/client/gui/GuiFluidInterface.java +++ b/src/main/java/appeng/fluids/client/gui/FluidInterfaceScreen.java @@ -22,20 +22,20 @@ import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.text.ITextComponent; import net.minecraftforge.fml.client.gui.GuiUtils; -import appeng.client.gui.implementations.GuiUpgradeable; -import appeng.client.gui.widgets.GuiTabButton; -import appeng.container.implementations.ContainerPriority; +import appeng.client.gui.implementations.UpgradeableScreen; +import appeng.client.gui.widgets.TabButton; +import appeng.container.implementations.PriorityContainer; import appeng.core.localization.GuiText; import appeng.core.sync.network.NetworkHandler; -import appeng.core.sync.packets.PacketSwitchGuis; -import appeng.fluids.client.gui.widgets.GuiFluidSlot; -import appeng.fluids.client.gui.widgets.GuiFluidTank; -import appeng.fluids.container.ContainerFluidInterface; +import appeng.core.sync.packets.SwitchGuisPacket; +import appeng.fluids.client.gui.widgets.FluidSlotWidget; +import appeng.fluids.client.gui.widgets.FluidTankWidget; +import appeng.fluids.container.FluidInterfaceContainer; import appeng.fluids.helper.DualityFluidInterface; import appeng.fluids.util.IAEFluidTank; -public class GuiFluidInterface extends GuiUpgradeable { - public GuiFluidInterface(ContainerFluidInterface container, PlayerInventory playerInventory, ITextComponent title) { +public class FluidInterfaceScreen extends UpgradeableScreen { + public FluidInterfaceScreen(FluidInterfaceContainer container, PlayerInventory playerInventory, ITextComponent title) { super(container, playerInventory, title); this.ySize = 231; } @@ -48,13 +48,13 @@ public class GuiFluidInterface extends GuiUpgradeable { final IAEFluidTank fluidTank = this.container.getTanks(); for (int i = 0; i < DualityFluidInterface.NUMBER_OF_TANKS; ++i) { - final GuiFluidTank guiTank = new GuiFluidTank(fluidTank, i, this.getGuiLeft() + 35 + 18 * i, + final FluidTankWidget guiTank = new FluidTankWidget(fluidTank, i, this.getGuiLeft() + 35 + 18 * i, this.getGuiTop() + 53, 16, 68); this.addButton(guiTank); - this.guiSlots.add(new GuiFluidSlot(configFluids, i, i, 35 + 18 * i, 35)); + this.guiSlots.add(new FluidSlotWidget(configFluids, i, i, 35 + 18 * i, 35)); } - this.addButton(new GuiTabButton(this.getGuiLeft() + 154, this.getGuiTop(), 2 + 4 * 16, + this.addButton(new TabButton(this.getGuiLeft() + 154, this.getGuiTop(), 2 + 4 * 16, GuiText.Priority.getLocal(), this.itemRenderer, btn -> openPriorityGui())); } @@ -77,7 +77,7 @@ public class GuiFluidInterface extends GuiUpgradeable { } private void openPriorityGui() { - NetworkHandler.instance().sendToServer(new PacketSwitchGuis(ContainerPriority.TYPE)); + NetworkHandler.instance().sendToServer(new SwitchGuisPacket(PriorityContainer.TYPE)); } @Override diff --git a/src/main/java/appeng/fluids/client/gui/GuiFluidLevelEmitter.java b/src/main/java/appeng/fluids/client/gui/FluidLevelEmitterScreen.java similarity index 80% rename from src/main/java/appeng/fluids/client/gui/GuiFluidLevelEmitter.java rename to src/main/java/appeng/fluids/client/gui/FluidLevelEmitterScreen.java index 6f22e3862..a69b8aa8a 100644 --- a/src/main/java/appeng/fluids/client/gui/GuiFluidLevelEmitter.java +++ b/src/main/java/appeng/fluids/client/gui/FluidLevelEmitterScreen.java @@ -8,21 +8,21 @@ import net.minecraft.util.text.ITextComponent; import appeng.api.config.RedstoneMode; import appeng.api.config.Settings; -import appeng.client.gui.implementations.GuiUpgradeable; -import appeng.client.gui.widgets.GuiNumberBox; -import appeng.client.gui.widgets.GuiServerSettingToggleButton; +import appeng.client.gui.implementations.UpgradeableScreen; +import appeng.client.gui.widgets.NumberBox; +import appeng.client.gui.widgets.ServerSettingToggleButton; import appeng.core.AEConfig; import appeng.core.localization.GuiText; import appeng.core.sync.network.NetworkHandler; -import appeng.core.sync.packets.PacketValueConfig; -import appeng.fluids.client.gui.widgets.GuiFluidSlot; -import appeng.fluids.container.ContainerFluidLevelEmitter; +import appeng.core.sync.packets.ConfigValuePacket; +import appeng.fluids.client.gui.widgets.FluidSlotWidget; +import appeng.fluids.container.FluidLevelEmitterContainer; -public class GuiFluidLevelEmitter extends GuiUpgradeable { - private GuiNumberBox level; +public class FluidLevelEmitterScreen extends UpgradeableScreen { + private NumberBox level; - public GuiFluidLevelEmitter(ContainerFluidLevelEmitter container, PlayerInventory playerInventory, - ITextComponent title) { + public FluidLevelEmitterScreen(FluidLevelEmitterContainer container, PlayerInventory playerInventory, + ITextComponent title) { super(container, playerInventory, title); } @@ -30,7 +30,7 @@ public class GuiFluidLevelEmitter extends GuiUpgradeable(this.guiLeft - 18, this.guiTop + 28, + this.redstoneMode = new ServerSettingToggleButton<>(this.guiLeft - 18, this.guiTop + 28, Settings.REDSTONE_EMITTER, RedstoneMode.LOW_SIGNAL); final int a = AEConfig.instance().levelByMillyBuckets(0); @@ -118,7 +118,7 @@ public class GuiFluidLevelEmitter extends GuiUpgradeable { - private GuiSettingToggleButton rwMode; - private GuiSettingToggleButton storageFilter; +public class FluidStorageBusScreen extends UpgradeableScreen { + private SettingToggleButton rwMode; + private SettingToggleButton storageFilter; - public GuiFluidStorageBus(ContainerFluidStorageBus container, PlayerInventory playerInventory, - ITextComponent title) { + public FluidStorageBusScreen(FluidStorageBusContainer container, PlayerInventory playerInventory, + ITextComponent title) { super(container, playerInventory, title); this.ySize = 251; } @@ -69,9 +69,9 @@ public class GuiFluidStorageBus extends GuiUpgradeable for (int x = 0; x < 9; x++) { final int idx = y * 9 + x; if (y < 2) { - this.guiSlots.add(new GuiFluidSlot(config, idx, idx, xo + x * 18, yo + y * 18)); + this.guiSlots.add(new FluidSlotWidget(config, idx, idx, xo + x * 18, yo + y * 18)); } else { - this.guiSlots.add(new GuiOptionalFluidSlot(config, container, idx, idx, y - 2, xo, yo, x, y)); + this.guiSlots.add(new OptionalFluidSlotWidget(config, container, idx, idx, y - 2, xo, yo, x, y)); } } } @@ -79,16 +79,16 @@ public class GuiFluidStorageBus extends GuiUpgradeable @Override protected void addButtons() { - addButton(new GuiActionButton(this.guiLeft - 18, this.guiTop + 8, ActionItems.CLOSE, btn -> clear())); - addButton(new GuiActionButton(this.guiLeft - 18, this.guiTop + 28, ActionItems.WRENCH, btn -> partition())); - this.rwMode = new GuiServerSettingToggleButton<>(this.guiLeft - 18, this.guiTop + 48, Settings.ACCESS, + addButton(new ActionButton(this.guiLeft - 18, this.guiTop + 8, ActionItems.CLOSE, btn -> clear())); + addButton(new ActionButton(this.guiLeft - 18, this.guiTop + 28, ActionItems.WRENCH, btn -> partition())); + this.rwMode = new ServerSettingToggleButton<>(this.guiLeft - 18, this.guiTop + 48, Settings.ACCESS, AccessRestriction.READ_WRITE); - this.storageFilter = new GuiServerSettingToggleButton<>(this.guiLeft - 18, this.guiTop + 68, + this.storageFilter = new ServerSettingToggleButton<>(this.guiLeft - 18, this.guiTop + 68, Settings.STORAGE_FILTER, StorageFilter.EXTRACTABLE_ONLY); - this.fuzzyMode = new GuiServerSettingToggleButton<>(this.guiLeft - 18, this.guiTop + 88, Settings.FUZZY_MODE, + this.fuzzyMode = new ServerSettingToggleButton<>(this.guiLeft - 18, this.guiTop + 88, Settings.FUZZY_MODE, FuzzyMode.IGNORE_ALL); - addButton(this.addButton(new GuiTabButton(this.guiLeft + 154, this.guiTop, 2 + 4 * 16, + addButton(this.addButton(new TabButton(this.guiLeft + 154, this.guiTop, 2 + 4 * 16, GuiText.Priority.getLocal(), this.itemRenderer, btn -> openPriorityGui()))); this.addButton(this.storageFilter); @@ -106,11 +106,11 @@ public class GuiFluidStorageBus extends GuiUpgradeable } if (this.storageFilter != null) { - this.storageFilter.set(((ContainerFluidStorageBus) this.cvb).getStorageFilter()); + this.storageFilter.set(((FluidStorageBusContainer) this.cvb).getStorageFilter()); } if (this.rwMode != null) { - this.rwMode.set(((ContainerFluidStorageBus) this.cvb).getReadWriteMode()); + this.rwMode.set(((FluidStorageBusContainer) this.cvb).getReadWriteMode()); } } @@ -120,15 +120,15 @@ public class GuiFluidStorageBus extends GuiUpgradeable } private void partition() { - NetworkHandler.instance().sendToServer(new PacketValueConfig("StorageBus.Action", "Partition")); + NetworkHandler.instance().sendToServer(new ConfigValuePacket("StorageBus.Action", "Partition")); } private void clear() { - NetworkHandler.instance().sendToServer(new PacketValueConfig("StorageBus.Action", "Clear")); + NetworkHandler.instance().sendToServer(new ConfigValuePacket("StorageBus.Action", "Clear")); } private void openPriorityGui() { - NetworkHandler.instance().sendToServer(new PacketSwitchGuis(ContainerPriority.TYPE)); + NetworkHandler.instance().sendToServer(new SwitchGuisPacket(PriorityContainer.TYPE)); } @Override diff --git a/src/main/java/appeng/fluids/client/gui/GuiFluidTerminal.java b/src/main/java/appeng/fluids/client/gui/FluidTerminalScreen.java similarity index 87% rename from src/main/java/appeng/fluids/client/gui/GuiFluidTerminal.java rename to src/main/java/appeng/fluids/client/gui/FluidTerminalScreen.java index 06a456966..a2a61d7d6 100644 --- a/src/main/java/appeng/fluids/client/gui/GuiFluidTerminal.java +++ b/src/main/java/appeng/fluids/client/gui/FluidTerminalScreen.java @@ -40,11 +40,11 @@ import appeng.api.config.ViewItems; import appeng.api.storage.data.IAEFluidStack; import appeng.api.util.IConfigManager; import appeng.client.ActionKey; -import appeng.client.gui.AEBaseMEGui; -import appeng.client.gui.widgets.GuiScrollbar; -import appeng.client.gui.widgets.GuiSettingToggleButton; +import appeng.client.gui.AEBaseMEScreen; +import appeng.client.gui.widgets.Scrollbar; +import appeng.client.gui.widgets.SettingToggleButton; import appeng.client.gui.widgets.ISortSource; -import appeng.client.gui.widgets.MEGuiTextField; +import appeng.client.gui.widgets.AETextField; import appeng.client.me.FluidRepo; import appeng.client.me.InternalFluidSlotME; import appeng.client.me.SlotFluidME; @@ -52,9 +52,9 @@ import appeng.core.AELog; import appeng.core.AppEng; import appeng.core.localization.GuiText; import appeng.core.sync.network.NetworkHandler; -import appeng.core.sync.packets.PacketInventoryAction; -import appeng.core.sync.packets.PacketValueConfig; -import appeng.fluids.container.ContainerFluidTerminal; +import appeng.core.sync.packets.InventoryActionPacket; +import appeng.core.sync.packets.ConfigValuePacket; +import appeng.fluids.container.FluidTerminalContainer; import appeng.fluids.container.slots.IMEFluidSlot; import appeng.helpers.InventoryAction; import appeng.util.IConfigManagerHost; @@ -65,7 +65,7 @@ import appeng.util.Platform; * @version rv6 - 12/05/2018 * @since rv6 12/05/2018 */ -public class GuiFluidTerminal extends AEBaseMEGui implements ISortSource, IConfigManagerHost { +public class FluidTerminalScreen extends AEBaseMEScreen implements ISortSource, IConfigManagerHost { private final List meFluidSlots = new LinkedList<>(); private final FluidRepo repo; private final IConfigManager configSrc; @@ -75,15 +75,15 @@ public class GuiFluidTerminal extends AEBaseMEGui implem private static final int ROWS = 6; private static final int COLS = 9; - private MEGuiTextField searchField; - private GuiSettingToggleButton sortByBox; - private GuiSettingToggleButton sortDirBox; + private AETextField searchField; + private SettingToggleButton sortByBox; + private SettingToggleButton sortDirBox; - public GuiFluidTerminal(ContainerFluidTerminal container, PlayerInventory playerInventory, ITextComponent title) { + public FluidTerminalScreen(FluidTerminalContainer container, PlayerInventory playerInventory, ITextComponent title) { super(container, playerInventory, title); this.xSize = 185; this.ySize = 222; - final GuiScrollbar scrollbar = new GuiScrollbar(); + final Scrollbar scrollbar = new Scrollbar(); this.setScrollBar(scrollbar); this.repo = new FluidRepo(scrollbar, this); this.configSrc = container.getConfigManager(); @@ -95,7 +95,7 @@ public class GuiFluidTerminal extends AEBaseMEGui implem this.guiLeft = (this.width - this.xSize) / 2; this.guiTop = (this.height - this.ySize) / 2; - this.searchField = new MEGuiTextField(this.font, this.guiLeft + 80, this.guiTop + 4, 90, 12); + this.searchField = new AETextField(this.font, this.guiLeft + 80, this.guiTop + 4, 90, 12); this.searchField.setEnableBackgroundDrawing(false); this.searchField.setMaxStringLength(25); this.searchField.setTextColor(0xFFFFFF); @@ -104,11 +104,11 @@ public class GuiFluidTerminal extends AEBaseMEGui implem int offset = this.guiTop; - this.sortByBox = this.addButton(new GuiSettingToggleButton<>(this.guiLeft - 18, offset, Settings.SORT_BY, + this.sortByBox = this.addButton(new SettingToggleButton<>(this.guiLeft - 18, offset, Settings.SORT_BY, getSortBy(), Platform::isSortOrderAvailable, this::toggleServerSetting)); offset += 20; - this.sortDirBox = this.addButton(new GuiSettingToggleButton<>(this.guiLeft - 18, offset, + this.sortDirBox = this.addButton(new SettingToggleButton<>(this.guiLeft - 18, offset, Settings.SORT_DIRECTION, getSortDir(), this::toggleServerSetting)); for (int y = 0; y < ROWS; y++) { @@ -180,9 +180,9 @@ public class GuiFluidTerminal extends AEBaseMEGui implem super.renderHoveredToolTip(mouseX, mouseY); } - private > void toggleServerSetting(GuiSettingToggleButton btn, boolean backwards) { + private > void toggleServerSetting(SettingToggleButton btn, boolean backwards) { S next = btn.getNextValue(backwards); - NetworkHandler.instance().sendToServer(new PacketValueConfig(btn.getSetting().name(), next.name())); + NetworkHandler.instance().sendToServer(new ConfigValuePacket(btn.getSetting().name(), next.name())); btn.set(next); } @@ -197,14 +197,14 @@ public class GuiFluidTerminal extends AEBaseMEGui implem this.container.setTargetStack(meSlot.getAEFluidStack()); AELog.debug("mouse0 GUI STACK SIZE %s", meSlot.getAEFluidStack().getStackSize()); NetworkHandler.instance() - .sendToServer(new PacketInventoryAction(InventoryAction.FILL_ITEM, slot.slotNumber, 0)); + .sendToServer(new InventoryActionPacket(InventoryAction.FILL_ITEM, slot.slotNumber, 0)); } else { this.container.setTargetStack(meSlot.getAEFluidStack()); if (meSlot.getAEFluidStack() != null) { AELog.debug("mouse1 GUI STACK SIZE %s", meSlot.getAEFluidStack().getStackSize()); } NetworkHandler.instance() - .sendToServer(new PacketInventoryAction(InventoryAction.EMPTY_ITEM, slot.slotNumber, 0)); + .sendToServer(new InventoryActionPacket(InventoryAction.EMPTY_ITEM, slot.slotNumber, 0)); } } return; diff --git a/src/main/java/appeng/fluids/client/gui/widgets/GuiFluidSlot.java b/src/main/java/appeng/fluids/client/gui/widgets/FluidSlotWidget.java similarity index 91% rename from src/main/java/appeng/fluids/client/gui/widgets/GuiFluidSlot.java rename to src/main/java/appeng/fluids/client/gui/widgets/FluidSlotWidget.java index ebc1fb686..ce842fdee 100644 --- a/src/main/java/appeng/fluids/client/gui/widgets/GuiFluidSlot.java +++ b/src/main/java/appeng/fluids/client/gui/widgets/FluidSlotWidget.java @@ -18,17 +18,17 @@ import net.minecraftforge.fluids.FluidUtil; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import appeng.api.storage.data.IAEFluidStack; -import appeng.client.gui.widgets.GuiCustomSlot; +import appeng.client.gui.widgets.CustomSlotWidget; import appeng.core.sync.network.NetworkHandler; -import appeng.core.sync.packets.PacketFluidSlot; +import appeng.core.sync.packets.FluidSlotPacket; import appeng.fluids.util.AEFluidStack; import appeng.fluids.util.IAEFluidTank; -public class GuiFluidSlot extends GuiCustomSlot { +public class FluidSlotWidget extends CustomSlotWidget { private final IAEFluidTank fluids; private final int slot; - public GuiFluidSlot(final IAEFluidTank fluids, final int slot, final int id, final int x, final int y) { + public FluidSlotWidget(final IAEFluidTank fluids, final int slot, final int id, final int x, final int y) { super(id, x, y); this.fluids = fluids; this.slot = slot; @@ -96,6 +96,6 @@ public class GuiFluidSlot extends GuiCustomSlot { public void setFluidStack(final IAEFluidStack stack) { this.fluids.setFluidInSlot(this.slot, stack); NetworkHandler.instance() - .sendToServer(new PacketFluidSlot(Collections.singletonMap(this.getId(), this.getFluidStack()))); + .sendToServer(new FluidSlotPacket(Collections.singletonMap(this.getId(), this.getFluidStack()))); } } diff --git a/src/main/java/appeng/fluids/client/gui/widgets/GuiFluidTank.java b/src/main/java/appeng/fluids/client/gui/widgets/FluidTankWidget.java similarity index 96% rename from src/main/java/appeng/fluids/client/gui/widgets/GuiFluidTank.java rename to src/main/java/appeng/fluids/client/gui/widgets/FluidTankWidget.java index 7ede56bc3..80a97b4d1 100644 --- a/src/main/java/appeng/fluids/client/gui/widgets/GuiFluidTank.java +++ b/src/main/java/appeng/fluids/client/gui/widgets/FluidTankWidget.java @@ -35,11 +35,11 @@ import appeng.client.gui.widgets.ITooltip; import appeng.fluids.util.IAEFluidTank; @OnlyIn(Dist.CLIENT) -public class GuiFluidTank extends Widget implements ITooltip { +public class FluidTankWidget extends Widget implements ITooltip { private final IAEFluidTank tank; private final int slot; - public GuiFluidTank(IAEFluidTank tank, int slot, int x, int y, int w, int h) { + public FluidTankWidget(IAEFluidTank tank, int slot, int x, int y, int w, int h) { super(x, y, w, h, ""); this.tank = tank; this.slot = slot; diff --git a/src/main/java/appeng/fluids/client/gui/widgets/GuiOptionalFluidSlot.java b/src/main/java/appeng/fluids/client/gui/widgets/OptionalFluidSlotWidget.java similarity index 85% rename from src/main/java/appeng/fluids/client/gui/widgets/GuiOptionalFluidSlot.java rename to src/main/java/appeng/fluids/client/gui/widgets/OptionalFluidSlotWidget.java index 9c4bb38f8..17413298d 100644 --- a/src/main/java/appeng/fluids/client/gui/widgets/GuiOptionalFluidSlot.java +++ b/src/main/java/appeng/fluids/client/gui/widgets/OptionalFluidSlotWidget.java @@ -9,14 +9,14 @@ import appeng.api.storage.data.IAEFluidStack; import appeng.container.slot.IOptionalSlotHost; import appeng.fluids.util.IAEFluidTank; -public class GuiOptionalFluidSlot extends GuiFluidSlot { +public class OptionalFluidSlotWidget extends FluidSlotWidget { private final IOptionalSlotHost containerBus; private final int groupNum; private final int srcX; private final int srcY; - public GuiOptionalFluidSlot(IAEFluidTank fluids, final IOptionalSlotHost containerBus, int slot, int id, - int groupNum, int x, int y, int xoffs, int yoffs) { + public OptionalFluidSlotWidget(IAEFluidTank fluids, final IOptionalSlotHost containerBus, int slot, int id, + int groupNum, int x, int y, int xoffs, int yoffs) { super(fluids, slot, id, x + xoffs * 18, y + yoffs * 18); this.containerBus = containerBus; this.groupNum = groupNum; diff --git a/src/main/java/appeng/fluids/container/ContainerFluidConfigurable.java b/src/main/java/appeng/fluids/container/FluidConfigurableContainer.java similarity index 93% rename from src/main/java/appeng/fluids/container/ContainerFluidConfigurable.java rename to src/main/java/appeng/fluids/container/FluidConfigurableContainer.java index 363733d82..0204b1267 100644 --- a/src/main/java/appeng/fluids/container/ContainerFluidConfigurable.java +++ b/src/main/java/appeng/fluids/container/FluidConfigurableContainer.java @@ -15,16 +15,16 @@ import net.minecraftforge.fluids.FluidUtil; import appeng.api.config.Upgrades; import appeng.api.implementations.IUpgradeableHost; import appeng.api.storage.data.IAEFluidStack; -import appeng.container.implementations.ContainerUpgradeable; +import appeng.container.implementations.UpgradeableContainer; import appeng.fluids.helper.FluidSyncHelper; import appeng.fluids.util.AEFluidStack; import appeng.fluids.util.IAEFluidTank; import appeng.util.Platform; -public abstract class ContainerFluidConfigurable extends ContainerUpgradeable implements IFluidSyncContainer { +public abstract class FluidConfigurableContainer extends UpgradeableContainer implements IFluidSyncContainer { private FluidSyncHelper sync = null; - public ContainerFluidConfigurable(ContainerType containerType, int id, PlayerInventory ip, IUpgradeableHost te) { + public FluidConfigurableContainer(ContainerType containerType, int id, PlayerInventory ip, IUpgradeableHost te) { super(containerType, id, ip, te); } diff --git a/src/main/java/appeng/fluids/container/ContainerFluidFormationPlane.java b/src/main/java/appeng/fluids/container/FluidFormationPlaneContainer.java similarity index 72% rename from src/main/java/appeng/fluids/container/ContainerFluidFormationPlane.java rename to src/main/java/appeng/fluids/container/FluidFormationPlaneContainer.java index 6b92a68c3..efe5bdfba 100644 --- a/src/main/java/appeng/fluids/container/ContainerFluidFormationPlane.java +++ b/src/main/java/appeng/fluids/container/FluidFormationPlaneContainer.java @@ -12,18 +12,18 @@ import appeng.api.config.Upgrades; import appeng.api.storage.data.IAEFluidStack; import appeng.container.ContainerLocator; import appeng.container.implementations.ContainerHelper; -import appeng.container.slot.SlotRestrictedInput; -import appeng.fluids.parts.PartFluidFormationPlane; +import appeng.container.slot.RestrictedInputSlot; +import appeng.fluids.parts.FluidFormationPlanePart; import appeng.fluids.util.IAEFluidTank; -public class ContainerFluidFormationPlane extends ContainerFluidConfigurable { +public class FluidFormationPlaneContainer extends FluidConfigurableContainer { - public static ContainerType TYPE; + public static ContainerType TYPE; - private static final ContainerHelper helper = new ContainerHelper<>( - ContainerFluidFormationPlane::new, PartFluidFormationPlane.class, SecurityPermissions.BUILD); + private static final ContainerHelper helper = new ContainerHelper<>( + FluidFormationPlaneContainer::new, FluidFormationPlanePart.class, SecurityPermissions.BUILD); - public static ContainerFluidFormationPlane fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { + public static FluidFormationPlaneContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { return helper.fromNetwork(windowId, inv, buf); } @@ -31,9 +31,9 @@ public class ContainerFluidFormationPlane extends ContainerFluidConfigurable { return helper.open(player, locator); } - private final PartFluidFormationPlane plane; + private final FluidFormationPlanePart plane; - public ContainerFluidFormationPlane(int id, final PlayerInventory ip, final PartFluidFormationPlane te) { + public FluidFormationPlaneContainer(int id, final PlayerInventory ip, final FluidFormationPlanePart te) { super(TYPE, id, ip, te); this.plane = te; } @@ -51,15 +51,15 @@ public class ContainerFluidFormationPlane extends ContainerFluidConfigurable { @Override protected void setupConfig() { final IItemHandler upgrades = this.getUpgradeable().getInventoryByName("upgrades"); - this.addSlot((new SlotRestrictedInput(SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 0, 187, 8, + this.addSlot((new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.UPGRADES, upgrades, 0, 187, 8, this.getPlayerInventory())).setNotDraggable()); - this.addSlot((new SlotRestrictedInput(SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 1, 187, 8 + 18, + this.addSlot((new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.UPGRADES, upgrades, 1, 187, 8 + 18, this.getPlayerInventory())).setNotDraggable()); - this.addSlot((new SlotRestrictedInput(SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 2, 187, + this.addSlot((new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.UPGRADES, upgrades, 2, 187, 8 + 18 * 2, this.getPlayerInventory())).setNotDraggable()); - this.addSlot((new SlotRestrictedInput(SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 3, 187, + this.addSlot((new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.UPGRADES, upgrades, 3, 187, 8 + 18 * 3, this.getPlayerInventory())).setNotDraggable()); - this.addSlot((new SlotRestrictedInput(SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 4, 187, + this.addSlot((new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.UPGRADES, upgrades, 4, 187, 8 + 18 * 4, this.getPlayerInventory())).setNotDraggable()); } diff --git a/src/main/java/appeng/fluids/container/ContainerFluidIO.java b/src/main/java/appeng/fluids/container/FluidIOContainer.java similarity index 77% rename from src/main/java/appeng/fluids/container/ContainerFluidIO.java rename to src/main/java/appeng/fluids/container/FluidIOContainer.java index 94e444dd2..fa0c345ad 100644 --- a/src/main/java/appeng/fluids/container/ContainerFluidIO.java +++ b/src/main/java/appeng/fluids/container/FluidIOContainer.java @@ -26,7 +26,7 @@ import net.minecraft.network.PacketBuffer; import appeng.api.config.SecurityPermissions; import appeng.container.ContainerLocator; import appeng.container.implementations.ContainerHelper; -import appeng.fluids.parts.PartSharedFluidBus; +import appeng.fluids.parts.SharedFluidBusPart; import appeng.fluids.util.IAEFluidTank; /** @@ -34,14 +34,14 @@ import appeng.fluids.util.IAEFluidTank; * @version rv5 - 1/05/2018 * @since rv5 1/05/2018 */ -public class ContainerFluidIO extends ContainerFluidConfigurable { +public class FluidIOContainer extends FluidConfigurableContainer { - public static ContainerType TYPE; + public static ContainerType TYPE; - private static final ContainerHelper helper = new ContainerHelper<>( - ContainerFluidIO::new, PartSharedFluidBus.class, SecurityPermissions.BUILD); + private static final ContainerHelper helper = new ContainerHelper<>( + FluidIOContainer::new, SharedFluidBusPart.class, SecurityPermissions.BUILD); - public static ContainerFluidIO fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { + public static FluidIOContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { return helper.fromNetwork(windowId, inv, buf); } @@ -49,9 +49,9 @@ public class ContainerFluidIO extends ContainerFluidConfigurable { return helper.open(player, locator); } - private final PartSharedFluidBus bus; + private final SharedFluidBusPart bus; - public ContainerFluidIO(int id, PlayerInventory ip, PartSharedFluidBus te) { + public FluidIOContainer(int id, PlayerInventory ip, SharedFluidBusPart te) { super(TYPE, id, ip, te); this.bus = te; } diff --git a/src/main/java/appeng/fluids/container/ContainerFluidInterface.java b/src/main/java/appeng/fluids/container/FluidInterfaceContainer.java similarity index 90% rename from src/main/java/appeng/fluids/container/ContainerFluidInterface.java rename to src/main/java/appeng/fluids/container/FluidInterfaceContainer.java index 33bc66947..19fa46dd2 100644 --- a/src/main/java/appeng/fluids/container/ContainerFluidInterface.java +++ b/src/main/java/appeng/fluids/container/FluidInterfaceContainer.java @@ -38,14 +38,14 @@ import appeng.fluids.helper.IFluidInterfaceHost; import appeng.fluids.util.IAEFluidTank; import appeng.util.Platform; -public class ContainerFluidInterface extends ContainerFluidConfigurable { +public class FluidInterfaceContainer extends FluidConfigurableContainer { - public static ContainerType TYPE; + public static ContainerType TYPE; - private static final ContainerHelper helper = new ContainerHelper<>( - ContainerFluidInterface::new, IFluidInterfaceHost.class, SecurityPermissions.BUILD); + private static final ContainerHelper helper = new ContainerHelper<>( + FluidInterfaceContainer::new, IFluidInterfaceHost.class, SecurityPermissions.BUILD); - public static ContainerFluidInterface fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { + public static FluidInterfaceContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { return helper.fromNetwork(windowId, inv, buf); } @@ -56,7 +56,7 @@ public class ContainerFluidInterface extends ContainerFluidConfigurable { private final DualityFluidInterface myDuality; private final FluidSyncHelper tankSync; - public ContainerFluidInterface(int id, final PlayerInventory ip, final IFluidInterfaceHost te) { + public FluidInterfaceContainer(int id, final PlayerInventory ip, final IFluidInterfaceHost te) { super(TYPE, id, ip, te.getDualityFluidInterface().getHost()); this.myDuality = te.getDualityFluidInterface(); diff --git a/src/main/java/appeng/fluids/container/ContainerFluidLevelEmitter.java b/src/main/java/appeng/fluids/container/FluidLevelEmitterContainer.java similarity index 80% rename from src/main/java/appeng/fluids/container/ContainerFluidLevelEmitter.java rename to src/main/java/appeng/fluids/container/FluidLevelEmitterContainer.java index 224d0f002..575da6ebd 100644 --- a/src/main/java/appeng/fluids/container/ContainerFluidLevelEmitter.java +++ b/src/main/java/appeng/fluids/container/FluidLevelEmitterContainer.java @@ -14,17 +14,17 @@ import appeng.api.config.Settings; import appeng.container.ContainerLocator; import appeng.container.guisync.GuiSync; import appeng.container.implementations.ContainerHelper; -import appeng.fluids.parts.PartFluidLevelEmitter; +import appeng.fluids.parts.FluidLevelEmitterPart; import appeng.fluids.util.IAEFluidTank; import appeng.util.Platform; -public class ContainerFluidLevelEmitter extends ContainerFluidConfigurable { - public static ContainerType TYPE; +public class FluidLevelEmitterContainer extends FluidConfigurableContainer { + public static ContainerType TYPE; - private static final ContainerHelper helper = new ContainerHelper<>( - ContainerFluidLevelEmitter::new, PartFluidLevelEmitter.class, SecurityPermissions.BUILD); + private static final ContainerHelper helper = new ContainerHelper<>( + FluidLevelEmitterContainer::new, FluidLevelEmitterPart.class, SecurityPermissions.BUILD); - public static ContainerFluidLevelEmitter fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { + public static FluidLevelEmitterContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { return helper.fromNetwork(windowId, inv, buf); } @@ -32,14 +32,14 @@ public class ContainerFluidLevelEmitter extends ContainerFluidConfigurable { return helper.open(player, locator); } - private final PartFluidLevelEmitter lvlEmitter; + private final FluidLevelEmitterPart lvlEmitter; @OnlyIn(Dist.CLIENT) private TextFieldWidget textField; @GuiSync(3) public long EmitterValue = -1; - public ContainerFluidLevelEmitter(int id, final PlayerInventory ip, final PartFluidLevelEmitter te) { + public FluidLevelEmitterContainer(int id, final PlayerInventory ip, final FluidLevelEmitterPart te) { super(TYPE, id, ip, te); this.lvlEmitter = te; } diff --git a/src/main/java/appeng/fluids/container/ContainerFluidStorageBus.java b/src/main/java/appeng/fluids/container/FluidStorageBusContainer.java similarity index 86% rename from src/main/java/appeng/fluids/container/ContainerFluidStorageBus.java rename to src/main/java/appeng/fluids/container/FluidStorageBusContainer.java index 2ead9e4d5..605b2704f 100644 --- a/src/main/java/appeng/fluids/container/ContainerFluidStorageBus.java +++ b/src/main/java/appeng/fluids/container/FluidStorageBusContainer.java @@ -40,8 +40,8 @@ import appeng.api.storage.data.IItemList; import appeng.container.ContainerLocator; import appeng.container.guisync.GuiSync; import appeng.container.implementations.ContainerHelper; -import appeng.container.slot.SlotRestrictedInput; -import appeng.fluids.parts.PartFluidStorageBus; +import appeng.container.slot.RestrictedInputSlot; +import appeng.fluids.parts.FluidStorageBusPart; import appeng.fluids.util.IAEFluidTank; import appeng.util.Platform; import appeng.util.iterators.NullIterator; @@ -51,14 +51,14 @@ import appeng.util.iterators.NullIterator; * @version rv6 - 22/05/2018 * @since rv6 22/05/2018 */ -public class ContainerFluidStorageBus extends ContainerFluidConfigurable { +public class FluidStorageBusContainer extends FluidConfigurableContainer { - public static ContainerType TYPE; + public static ContainerType TYPE; - private static final ContainerHelper helper = new ContainerHelper<>( - ContainerFluidStorageBus::new, PartFluidStorageBus.class); + private static final ContainerHelper helper = new ContainerHelper<>( + FluidStorageBusContainer::new, FluidStorageBusPart.class); - public static ContainerFluidStorageBus fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { + public static FluidStorageBusContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { return helper.fromNetwork(windowId, inv, buf); } @@ -66,7 +66,7 @@ public class ContainerFluidStorageBus extends ContainerFluidConfigurable { return helper.open(player, locator); } - private final PartFluidStorageBus storageBus; + private final FluidStorageBusPart storageBus; @GuiSync(3) public AccessRestriction rwMode = AccessRestriction.READ_WRITE; @@ -74,7 +74,7 @@ public class ContainerFluidStorageBus extends ContainerFluidConfigurable { @GuiSync(4) public StorageFilter storageFilter = StorageFilter.EXTRACTABLE_ONLY; - public ContainerFluidStorageBus(int id, PlayerInventory ip, PartFluidStorageBus te) { + public FluidStorageBusContainer(int id, PlayerInventory ip, FluidStorageBusPart te) { super(TYPE, id, ip, te); this.storageBus = te; } @@ -87,15 +87,15 @@ public class ContainerFluidStorageBus extends ContainerFluidConfigurable { @Override protected void setupConfig() { final IItemHandler upgrades = this.getUpgradeable().getInventoryByName("upgrades"); - this.addSlot((new SlotRestrictedInput(SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 0, 187, 8, + this.addSlot((new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.UPGRADES, upgrades, 0, 187, 8, this.getPlayerInventory())).setNotDraggable()); - this.addSlot((new SlotRestrictedInput(SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 1, 187, 8 + 18, + this.addSlot((new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.UPGRADES, upgrades, 1, 187, 8 + 18, this.getPlayerInventory())).setNotDraggable()); - this.addSlot((new SlotRestrictedInput(SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 2, 187, + this.addSlot((new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.UPGRADES, upgrades, 2, 187, 8 + 18 * 2, this.getPlayerInventory())).setNotDraggable()); - this.addSlot((new SlotRestrictedInput(SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 3, 187, + this.addSlot((new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.UPGRADES, upgrades, 3, 187, 8 + 18 * 3, this.getPlayerInventory())).setNotDraggable()); - this.addSlot((new SlotRestrictedInput(SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 4, 187, + this.addSlot((new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.UPGRADES, upgrades, 4, 187, 8 + 18 * 4, this.getPlayerInventory())).setNotDraggable()); } diff --git a/src/main/java/appeng/fluids/container/ContainerFluidTerminal.java b/src/main/java/appeng/fluids/container/FluidTerminalContainer.java similarity index 94% rename from src/main/java/appeng/fluids/container/ContainerFluidTerminal.java rename to src/main/java/appeng/fluids/container/FluidTerminalContainer.java index 82d7ef86e..e73f0cd1b 100644 --- a/src/main/java/appeng/fluids/container/ContainerFluidTerminal.java +++ b/src/main/java/appeng/fluids/container/FluidTerminalContainer.java @@ -67,9 +67,9 @@ import appeng.container.guisync.GuiSync; import appeng.container.implementations.ContainerHelper; import appeng.core.AELog; import appeng.core.sync.network.NetworkHandler; -import appeng.core.sync.packets.PacketMEFluidInventoryUpdate; -import appeng.core.sync.packets.PacketTargetFluidStack; -import appeng.core.sync.packets.PacketValueConfig; +import appeng.core.sync.packets.MEFluidInventoryUpdatePacket; +import appeng.core.sync.packets.TargetFluidStackPacket; +import appeng.core.sync.packets.ConfigValuePacket; import appeng.fluids.util.AEFluidStack; import appeng.helpers.InventoryAction; import appeng.me.helpers.ChannelPowerSrc; @@ -82,15 +82,15 @@ import appeng.util.Platform; * @version rv6 - 12/05/2018 * @since rv6 12/05/2018 */ -public class ContainerFluidTerminal extends AEBaseContainer +public class FluidTerminalContainer extends AEBaseContainer implements IConfigManagerHost, IConfigurableObject, IMEMonitorHandlerReceiver { - public static ContainerType TYPE; + public static ContainerType TYPE; - private static final ContainerHelper helper = new ContainerHelper<>( - ContainerFluidTerminal::new, ITerminalHost.class, SecurityPermissions.BUILD); + private static final ContainerHelper helper = new ContainerHelper<>( + FluidTerminalContainer::new, ITerminalHost.class, SecurityPermissions.BUILD); - public static ContainerFluidTerminal fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { + public static FluidTerminalContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { return helper.fromNetwork(windowId, inv, buf); } @@ -111,7 +111,7 @@ public class ContainerFluidTerminal extends AEBaseContainer // Holds the fluid the client wishes to extract, or null for insert private IAEFluidStack clientRequestedTargetFluid = null; - public ContainerFluidTerminal(int id, PlayerInventory ip, ITerminalHost terminal) { + public FluidTerminalContainer(int id, PlayerInventory ip, ITerminalHost terminal) { super(TYPE, id, ip, terminal); this.terminal = terminal; this.clientCM = new ConfigManager(this); @@ -193,7 +193,7 @@ public class ContainerFluidTerminal extends AEBaseContainer private void queueInventory(final IContainerListener c) { if (Platform.isServer() && c instanceof PlayerEntity && this.monitor != null) { try { - PacketMEFluidInventoryUpdate piu = new PacketMEFluidInventoryUpdate(); + MEFluidInventoryUpdatePacket piu = new MEFluidInventoryUpdatePacket(); final IItemList monitorCache = this.monitor.getStorageList(); for (final IAEFluidStack send : monitorCache) { @@ -202,7 +202,7 @@ public class ContainerFluidTerminal extends AEBaseContainer } catch (final BufferOverflowException boe) { NetworkHandler.instance().sendTo(piu, (ServerPlayerEntity) c); - piu = new PacketMEFluidInventoryUpdate(); + piu = new MEFluidInventoryUpdatePacket(); piu.appendFluid(send); } } @@ -231,7 +231,7 @@ public class ContainerFluidTerminal extends AEBaseContainer && stack.getFluidStack().isFluidEqual(this.clientRequestedTargetFluid.getFluidStack())) { return; } - NetworkHandler.instance().sendToServer(new PacketTargetFluidStack((AEFluidStack) stack)); + NetworkHandler.instance().sendToServer(new TargetFluidStackPacket((AEFluidStack) stack)); } this.clientRequestedTargetFluid = stack == null ? null : stack.copy(); @@ -260,7 +260,7 @@ public class ContainerFluidTerminal extends AEBaseContainer this.clientCM.putSetting(set, sideLocal); for (final IContainerListener crafter : this.listeners) { if (crafter instanceof ServerPlayerEntity) { - NetworkHandler.instance().sendTo(new PacketValueConfig(set.name(), sideLocal.name()), + NetworkHandler.instance().sendTo(new ConfigValuePacket(set.name(), sideLocal.name()), (ServerPlayerEntity) crafter); } } @@ -271,7 +271,7 @@ public class ContainerFluidTerminal extends AEBaseContainer try { final IItemList monitorCache = this.monitor.getStorageList(); - final PacketMEFluidInventoryUpdate piu = new PacketMEFluidInventoryUpdate(); + final MEFluidInventoryUpdatePacket piu = new MEFluidInventoryUpdatePacket(); for (final IAEFluidStack is : this.fluids) { final IAEFluidStack send = monitorCache.findPrecise(is); diff --git a/src/main/java/appeng/fluids/helper/FluidSyncHelper.java b/src/main/java/appeng/fluids/helper/FluidSyncHelper.java index a1442250f..bcf7cd988 100644 --- a/src/main/java/appeng/fluids/helper/FluidSyncHelper.java +++ b/src/main/java/appeng/fluids/helper/FluidSyncHelper.java @@ -10,7 +10,7 @@ import net.minecraft.inventory.container.IContainerListener; import appeng.api.storage.data.IAEFluidStack; import appeng.core.sync.network.NetworkHandler; -import appeng.core.sync.packets.PacketFluidSlot; +import appeng.core.sync.packets.FluidSlotPacket; import appeng.fluids.util.AEFluidInventory; import appeng.fluids.util.IAEFluidTank; @@ -48,7 +48,7 @@ public class FluidSyncHelper { for (final IContainerListener l : listeners) { if (l instanceof ServerPlayerEntity) { - NetworkHandler.instance().sendTo(new PacketFluidSlot(data), (ServerPlayerEntity) l); + NetworkHandler.instance().sendTo(new FluidSlotPacket(data), (ServerPlayerEntity) l); } } } diff --git a/src/main/java/appeng/fluids/items/FluidDummyItem.java b/src/main/java/appeng/fluids/items/FluidDummyItem.java index 7923e9c91..03a9e397c 100644 --- a/src/main/java/appeng/fluids/items/FluidDummyItem.java +++ b/src/main/java/appeng/fluids/items/FluidDummyItem.java @@ -18,7 +18,6 @@ package appeng.fluids.items; -import net.minecraft.fluid.FluidState; import net.minecraft.fluid.Fluids; import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; diff --git a/src/main/java/appeng/fluids/parts/PartFluidAnnihilationPlane.java b/src/main/java/appeng/fluids/parts/FluidAnnihilationPlanePart.java similarity index 96% rename from src/main/java/appeng/fluids/parts/PartFluidAnnihilationPlane.java rename to src/main/java/appeng/fluids/parts/FluidAnnihilationPlanePart.java index 2b9f80d40..b75099c4d 100644 --- a/src/main/java/appeng/fluids/parts/PartFluidAnnihilationPlane.java +++ b/src/main/java/appeng/fluids/parts/FluidAnnihilationPlanePart.java @@ -47,18 +47,18 @@ import appeng.api.util.AECableType; import appeng.api.util.AEPartLocation; import appeng.core.AppEng; import appeng.core.settings.TickRates; -import appeng.core.sync.packets.PacketBlockTransitionEffect; +import appeng.core.sync.packets.BlockTransitionEffectPacket; import appeng.fluids.util.AEFluidStack; import appeng.items.parts.PartModels; import appeng.me.GridAccessException; import appeng.me.helpers.MachineSource; -import appeng.parts.PartBasicState; +import appeng.parts.BasicStatePart; import appeng.parts.automation.PlaneConnections; import appeng.parts.automation.PlaneModelData; import appeng.parts.automation.PlaneModels; import appeng.util.Platform; -public class PartFluidAnnihilationPlane extends PartBasicState implements IGridTickable { +public class FluidAnnihilationPlanePart extends BasicStatePart implements IGridTickable { public static final ResourceLocation TAG_BLACKLIST = new ResourceLocation(AppEng.MOD_ID, "blacklisted/fluid_annihilation_plane"); @@ -73,7 +73,7 @@ public class PartFluidAnnihilationPlane extends PartBasicState implements IGridT private final IActionSource mySrc = new MachineSource(this); - public PartFluidAnnihilationPlane(final ItemStack is) { + public FluidAnnihilationPlanePart(final ItemStack is) { super(is); } @@ -252,8 +252,8 @@ public class PartFluidAnnihilationPlane extends PartBasicState implements IGridT true); AppEng.proxy.sendToAllNearExcept(null, pos.getX(), pos.getY(), pos.getZ(), 64, w, - new PacketBlockTransitionEffect(pos, blockstate, this.getSide().getOpposite(), - PacketBlockTransitionEffect.SoundMode.FLUID)); + new BlockTransitionEffectPacket(pos, blockstate, this.getSide().getOpposite(), + BlockTransitionEffectPacket.SoundMode.FLUID)); return TickRateModulation.URGENT; } diff --git a/src/main/java/appeng/fluids/parts/PartFluidExportBus.java b/src/main/java/appeng/fluids/parts/FluidExportBusPart.java similarity index 98% rename from src/main/java/appeng/fluids/parts/PartFluidExportBus.java rename to src/main/java/appeng/fluids/parts/FluidExportBusPart.java index 36433b2e0..dcfef4e22 100644 --- a/src/main/java/appeng/fluids/parts/PartFluidExportBus.java +++ b/src/main/java/appeng/fluids/parts/FluidExportBusPart.java @@ -54,7 +54,7 @@ import appeng.parts.PartModel; * @version rv6 - 30/04/2018 * @since rv6 30/04/2018 */ -public class PartFluidExportBus extends PartSharedFluidBus { +public class FluidExportBusPart extends SharedFluidBusPart { public static final ResourceLocation MODEL_BASE = new ResourceLocation(AppEng.MOD_ID, "part/fluid_export_bus_base"); @PartModels public static final IPartModel MODELS_OFF = new PartModel(MODEL_BASE, @@ -68,7 +68,7 @@ public class PartFluidExportBus extends PartSharedFluidBus { private final IActionSource source; - public PartFluidExportBus(ItemStack is) { + public FluidExportBusPart(ItemStack is) { super(is); this.getConfigManager().registerSetting(Settings.REDSTONE_CONTROLLED, RedstoneMode.IGNORE); this.getConfigManager().registerSetting(Settings.FUZZY_MODE, FuzzyMode.IGNORE_ALL); diff --git a/src/main/java/appeng/fluids/parts/PartFluidFormationPlane.java b/src/main/java/appeng/fluids/parts/FluidFormationPlanePart.java similarity index 93% rename from src/main/java/appeng/fluids/parts/PartFluidFormationPlane.java rename to src/main/java/appeng/fluids/parts/FluidFormationPlanePart.java index 1e636d4f4..427385657 100644 --- a/src/main/java/appeng/fluids/parts/PartFluidFormationPlane.java +++ b/src/main/java/appeng/fluids/parts/FluidFormationPlanePart.java @@ -8,7 +8,6 @@ import java.util.List; import javax.annotation.Nonnull; import net.minecraft.block.BlockState; -import net.minecraft.entity.Entity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.container.ContainerType; import net.minecraft.item.ItemStack; @@ -47,20 +46,20 @@ import appeng.api.storage.data.IItemList; import appeng.api.util.AEPartLocation; import appeng.container.ContainerLocator; import appeng.container.ContainerOpener; -import appeng.fluids.container.ContainerFluidFormationPlane; +import appeng.fluids.container.FluidFormationPlaneContainer; import appeng.fluids.util.AEFluidInventory; import appeng.fluids.util.IAEFluidInventory; import appeng.fluids.util.IAEFluidTank; import appeng.items.parts.PartModels; import appeng.me.GridAccessException; import appeng.me.storage.MEInventoryHandler; -import appeng.parts.automation.PartAbstractFormationPlane; +import appeng.parts.automation.AbstractFormationPlanePart; import appeng.parts.automation.PlaneModelData; import appeng.parts.automation.PlaneModels; import appeng.util.Platform; import appeng.util.prioritylist.PrecisePriorityList; -public class PartFluidFormationPlane extends PartAbstractFormationPlane implements IAEFluidInventory { +public class FluidFormationPlanePart extends AbstractFormationPlanePart implements IAEFluidInventory { private static final PlaneModels MODELS = new PlaneModels("part/fluid_formation_plane", "part/fluid_formation_plane_on"); @@ -73,7 +72,7 @@ public class PartFluidFormationPlane extends PartAbstractFormationPlane getContainerType() { - return ContainerFluidFormationPlane.TYPE; + return FluidFormationPlaneContainer.TYPE; } } diff --git a/src/main/java/appeng/fluids/parts/PartFluidImportBus.java b/src/main/java/appeng/fluids/parts/FluidImportBusPart.java similarity index 98% rename from src/main/java/appeng/fluids/parts/PartFluidImportBus.java rename to src/main/java/appeng/fluids/parts/FluidImportBusPart.java index 5e3ef25b1..d3271db41 100644 --- a/src/main/java/appeng/fluids/parts/PartFluidImportBus.java +++ b/src/main/java/appeng/fluids/parts/FluidImportBusPart.java @@ -55,7 +55,7 @@ import appeng.parts.PartModel; * @version rv6 - 30/04/2018 * @since rv6 30/04/2018 */ -public class PartFluidImportBus extends PartSharedFluidBus { +public class FluidImportBusPart extends SharedFluidBusPart { public static final ResourceLocation MODEL_BASE = new ResourceLocation(AppEng.MOD_ID, "part/fluid_import_bus_base"); @PartModels public static final IPartModel MODELS_OFF = new PartModel(MODEL_BASE, @@ -69,7 +69,7 @@ public class PartFluidImportBus extends PartSharedFluidBus { private final IActionSource source; - public PartFluidImportBus(ItemStack is) { + public FluidImportBusPart(ItemStack is) { super(is); this.getConfigManager().registerSetting(Settings.REDSTONE_CONTROLLED, RedstoneMode.IGNORE); this.getConfigManager().registerSetting(Settings.FUZZY_MODE, FuzzyMode.IGNORE_ALL); diff --git a/src/main/java/appeng/fluids/parts/PartFluidInterface.java b/src/main/java/appeng/fluids/parts/FluidInterfacePart.java similarity index 94% rename from src/main/java/appeng/fluids/parts/PartFluidInterface.java rename to src/main/java/appeng/fluids/parts/FluidInterfacePart.java index 8397f506a..7889520f6 100644 --- a/src/main/java/appeng/fluids/parts/PartFluidInterface.java +++ b/src/main/java/appeng/fluids/parts/FluidInterfacePart.java @@ -53,17 +53,17 @@ import appeng.api.util.IConfigManager; import appeng.container.ContainerLocator; import appeng.container.ContainerOpener; import appeng.core.AppEng; -import appeng.fluids.container.ContainerFluidInterface; +import appeng.fluids.container.FluidInterfaceContainer; import appeng.fluids.helper.DualityFluidInterface; import appeng.fluids.helper.IFluidInterfaceHost; import appeng.helpers.IPriorityHost; import appeng.helpers.Reflected; import appeng.items.parts.PartModels; -import appeng.parts.PartBasicState; +import appeng.parts.BasicStatePart; import appeng.parts.PartModel; import appeng.util.Platform; -public class PartFluidInterface extends PartBasicState +public class FluidInterfacePart extends BasicStatePart implements IGridTickable, IStorageMonitorable, IFluidInterfaceHost, IPriorityHost { public static final ResourceLocation MODEL_BASE = new ResourceLocation(AppEng.MOD_ID, "part/fluid_interface_base"); @@ -82,7 +82,7 @@ public class PartFluidInterface extends PartBasicState private final DualityFluidInterface duality = new DualityFluidInterface(this.getProxy(), this); @Reflected - public PartFluidInterface(final ItemStack is) { + public FluidInterfacePart(final ItemStack is) { super(is); } @@ -132,7 +132,7 @@ public class PartFluidInterface extends PartBasicState @Override public boolean onPartActivate(final PlayerEntity p, final Hand hand, final Vec3d pos) { if (Platform.isServer()) { - ContainerOpener.openContainer(ContainerFluidInterface.TYPE, p, ContainerLocator.forPart(this)); + ContainerOpener.openContainer(FluidInterfaceContainer.TYPE, p, ContainerLocator.forPart(this)); } return true; @@ -211,6 +211,6 @@ public class PartFluidInterface extends PartBasicState @Override public ContainerType getContainerType() { - return ContainerFluidInterface.TYPE; + return FluidInterfaceContainer.TYPE; } } diff --git a/src/main/java/appeng/fluids/parts/PartFluidLevelEmitter.java b/src/main/java/appeng/fluids/parts/FluidLevelEmitterPart.java similarity index 97% rename from src/main/java/appeng/fluids/parts/PartFluidLevelEmitter.java rename to src/main/java/appeng/fluids/parts/FluidLevelEmitterPart.java index 805ee12c5..63b0a13b6 100644 --- a/src/main/java/appeng/fluids/parts/PartFluidLevelEmitter.java +++ b/src/main/java/appeng/fluids/parts/FluidLevelEmitterPart.java @@ -39,18 +39,18 @@ import appeng.api.util.IConfigManager; import appeng.container.ContainerLocator; import appeng.container.ContainerOpener; import appeng.core.AppEng; -import appeng.fluids.container.ContainerFluidLevelEmitter; +import appeng.fluids.container.FluidLevelEmitterContainer; import appeng.fluids.util.AEFluidInventory; import appeng.fluids.util.IAEFluidInventory; import appeng.fluids.util.IAEFluidTank; import appeng.items.parts.PartModels; import appeng.me.GridAccessException; import appeng.parts.PartModel; -import appeng.parts.automation.PartUpgradeable; +import appeng.parts.automation.UpgradeablePart; import appeng.util.IConfigManagerHost; import appeng.util.Platform; -public class PartFluidLevelEmitter extends PartUpgradeable +public class FluidLevelEmitterPart extends UpgradeablePart implements IStackWatcherHost, IConfigManagerHost, IAEFluidInventory, IMEMonitorHandlerReceiver { @PartModels public static final ResourceLocation MODEL_BASE_OFF = new ResourceLocation(AppEng.MOD_ID, @@ -83,7 +83,7 @@ public class PartFluidLevelEmitter extends PartUpgradeable private IStackWatcher stackWatcher = null; private final AEFluidInventory config = new AEFluidInventory(this, 1); - public PartFluidLevelEmitter(ItemStack is) { + public FluidLevelEmitterPart(ItemStack is) { super(is); this.getConfigManager().registerSetting(Settings.REDSTONE_EMITTER, RedstoneMode.HIGH_SIGNAL); @@ -283,7 +283,7 @@ public class PartFluidLevelEmitter extends PartUpgradeable @Override public boolean onPartActivate(final PlayerEntity player, final Hand hand, final Vec3d pos) { if (Platform.isServer()) { - ContainerOpener.openContainer(ContainerFluidLevelEmitter.TYPE, player, ContainerLocator.forPart(this)); + ContainerOpener.openContainer(FluidLevelEmitterContainer.TYPE, player, ContainerLocator.forPart(this)); } return true; } diff --git a/src/main/java/appeng/fluids/parts/PartFluidStorageBus.java b/src/main/java/appeng/fluids/parts/FluidStorageBusPart.java similarity index 97% rename from src/main/java/appeng/fluids/parts/PartFluidStorageBus.java rename to src/main/java/appeng/fluids/parts/FluidStorageBusPart.java index d812880a7..23a7841f9 100644 --- a/src/main/java/appeng/fluids/parts/PartFluidStorageBus.java +++ b/src/main/java/appeng/fluids/parts/FluidStorageBusPart.java @@ -68,7 +68,7 @@ import appeng.container.ContainerLocator; import appeng.container.ContainerOpener; import appeng.core.AppEng; import appeng.core.settings.TickRates; -import appeng.fluids.container.ContainerFluidStorageBus; +import appeng.fluids.container.FluidStorageBusContainer; import appeng.fluids.util.AEFluidInventory; import appeng.fluids.util.IAEFluidInventory; import appeng.fluids.util.IAEFluidTank; @@ -79,7 +79,7 @@ import appeng.me.helpers.MachineSource; import appeng.me.storage.ITickingMonitor; import appeng.me.storage.MEInventoryHandler; import appeng.parts.PartModel; -import appeng.parts.misc.PartSharedStorageBus; +import appeng.parts.misc.SharedStorageBusPart; import appeng.util.Platform; import appeng.util.prioritylist.FuzzyPriorityList; import appeng.util.prioritylist.PrecisePriorityList; @@ -89,7 +89,7 @@ import appeng.util.prioritylist.PrecisePriorityList; * @version rv6 - 22/05/2018 * @since rv6 22/05/2018 */ -public class PartFluidStorageBus extends PartSharedStorageBus +public class FluidStorageBusPart extends SharedStorageBusPart implements IMEMonitorHandlerReceiver, IAEFluidInventory { public static final ResourceLocation MODEL_BASE = new ResourceLocation(AppEng.MOD_ID, "part/fluid_storage_bus_base"); @@ -111,7 +111,7 @@ public class PartFluidStorageBus extends PartSharedStorageBus private int handlerHash = 0; private byte resetCacheLogic = 0; - public PartFluidStorageBus(ItemStack is) { + public FluidStorageBusPart(ItemStack is) { super(is); this.getConfigManager().registerSetting(Settings.ACCESS, AccessRestriction.READ_WRITE); this.getConfigManager().registerSetting(Settings.FUZZY_MODE, FuzzyMode.IGNORE_ALL); @@ -215,7 +215,7 @@ public class PartFluidStorageBus extends PartSharedStorageBus @Override public boolean onPartActivate(final PlayerEntity player, final Hand hand, final Vec3d pos) { if (Platform.isServer()) { - ContainerOpener.openContainer(ContainerFluidStorageBus.TYPE, player, ContainerLocator.forPart(this)); + ContainerOpener.openContainer(FluidStorageBusContainer.TYPE, player, ContainerLocator.forPart(this)); } return true; } @@ -439,6 +439,6 @@ public class PartFluidStorageBus extends PartSharedStorageBus @Override public ContainerType getContainerType() { - return ContainerFluidStorageBus.TYPE; + return FluidStorageBusContainer.TYPE; } } diff --git a/src/main/java/appeng/fluids/parts/PartFluidTerminal.java b/src/main/java/appeng/fluids/parts/FluidTerminalPart.java similarity index 89% rename from src/main/java/appeng/fluids/parts/PartFluidTerminal.java rename to src/main/java/appeng/fluids/parts/FluidTerminalPart.java index 633df35c5..eafd19439 100644 --- a/src/main/java/appeng/fluids/parts/PartFluidTerminal.java +++ b/src/main/java/appeng/fluids/parts/FluidTerminalPart.java @@ -25,17 +25,17 @@ import net.minecraft.util.ResourceLocation; import appeng.api.parts.IPartModel; import appeng.core.AppEng; -import appeng.fluids.container.ContainerFluidTerminal; +import appeng.fluids.container.FluidTerminalContainer; import appeng.items.parts.PartModels; import appeng.parts.PartModel; -import appeng.parts.reporting.AbstractPartTerminal; +import appeng.parts.reporting.AbstractTerminalPart; /** * @author BrockWS * @version rv6 - 12/05/2018 * @since rv6 12/05/2018 */ -public class PartFluidTerminal extends AbstractPartTerminal { +public class FluidTerminalPart extends AbstractTerminalPart { @PartModels public static final ResourceLocation MODEL_OFF = new ResourceLocation(AppEng.MOD_ID, "part/fluid_terminal_off"); @@ -46,13 +46,13 @@ public class PartFluidTerminal extends AbstractPartTerminal { public static final IPartModel MODELS_ON = new PartModel(MODEL_BASE, MODEL_ON, MODEL_STATUS_ON); public static final IPartModel MODELS_HAS_CHANNEL = new PartModel(MODEL_BASE, MODEL_ON, MODEL_STATUS_HAS_CHANNEL); - public PartFluidTerminal(ItemStack is) { + public FluidTerminalPart(ItemStack is) { super(is); } @Override public ContainerType getContainerType(PlayerEntity player) { - return ContainerFluidTerminal.TYPE; + return FluidTerminalContainer.TYPE; } @Override diff --git a/src/main/java/appeng/fluids/parts/PartSharedFluidBus.java b/src/main/java/appeng/fluids/parts/SharedFluidBusPart.java similarity index 94% rename from src/main/java/appeng/fluids/parts/PartSharedFluidBus.java rename to src/main/java/appeng/fluids/parts/SharedFluidBusPart.java index 9eb2caafa..b88649d01 100644 --- a/src/main/java/appeng/fluids/parts/PartSharedFluidBus.java +++ b/src/main/java/appeng/fluids/parts/SharedFluidBusPart.java @@ -40,11 +40,11 @@ import appeng.api.storage.channels.IFluidStorageChannel; import appeng.api.util.AECableType; import appeng.container.ContainerLocator; import appeng.container.ContainerOpener; -import appeng.fluids.container.ContainerFluidIO; +import appeng.fluids.container.FluidIOContainer; import appeng.fluids.util.AEFluidInventory; import appeng.fluids.util.IAEFluidTank; import appeng.me.GridAccessException; -import appeng.parts.automation.PartUpgradeable; +import appeng.parts.automation.UpgradeablePart; import appeng.util.Platform; /** @@ -52,12 +52,12 @@ import appeng.util.Platform; * @version rv6 - 30/04/2018 * @since rv6 30/04/2018 */ -public abstract class PartSharedFluidBus extends PartUpgradeable implements IGridTickable { +public abstract class SharedFluidBusPart extends UpgradeablePart implements IGridTickable { private final AEFluidInventory config = new AEFluidInventory(null, 9); private boolean lastRedstone; - public PartSharedFluidBus(ItemStack is) { + public SharedFluidBusPart(ItemStack is) { super(is); } @@ -92,7 +92,7 @@ public abstract class PartSharedFluidBus extends PartUpgradeable implements IGri @Override public boolean onPartActivate(final PlayerEntity player, final Hand hand, final Vec3d pos) { if (Platform.isServer()) { - ContainerOpener.openContainer(ContainerFluidIO.TYPE, player, ContainerLocator.forPart(this)); + ContainerOpener.openContainer(FluidIOContainer.TYPE, player, ContainerLocator.forPart(this)); } return true; diff --git a/src/main/java/appeng/fluids/registries/BasicFluidCellGuiHandler.java b/src/main/java/appeng/fluids/registries/BasicFluidCellGuiHandler.java index 366c438dd..7408ebd23 100644 --- a/src/main/java/appeng/fluids/registries/BasicFluidCellGuiHandler.java +++ b/src/main/java/appeng/fluids/registries/BasicFluidCellGuiHandler.java @@ -32,7 +32,7 @@ import appeng.api.storage.channels.IFluidStorageChannel; import appeng.api.storage.data.IAEStack; import appeng.container.ContainerLocator; import appeng.container.ContainerOpener; -import appeng.fluids.container.ContainerFluidTerminal; +import appeng.fluids.container.FluidTerminalContainer; public class BasicFluidCellGuiHandler implements ICellGuiHandler { @@ -44,7 +44,7 @@ public class BasicFluidCellGuiHandler implements ICellGuiHandler { @Override public void openChestGui(final PlayerEntity player, final IChestOrDrive chest, final ICellHandler cellHandler, final IMEInventoryHandler inv, final ItemStack is, final IStorageChannel chan) { - ContainerOpener.openContainer(ContainerFluidTerminal.TYPE, player, + ContainerOpener.openContainer(FluidTerminalContainer.TYPE, player, ContainerLocator.forTileEntitySide((TileEntity) chest, chest.getUp())); } } diff --git a/src/main/java/appeng/fluids/tile/TileFluidInterface.java b/src/main/java/appeng/fluids/tile/FluidInterfaceTileEntity.java similarity index 93% rename from src/main/java/appeng/fluids/tile/TileFluidInterface.java rename to src/main/java/appeng/fluids/tile/FluidInterfaceTileEntity.java index 3501523f9..1be699478 100644 --- a/src/main/java/appeng/fluids/tile/TileFluidInterface.java +++ b/src/main/java/appeng/fluids/tile/FluidInterfaceTileEntity.java @@ -45,16 +45,16 @@ import appeng.api.util.AECableType; import appeng.api.util.AEPartLocation; import appeng.api.util.DimensionalCoord; import appeng.api.util.IConfigManager; -import appeng.fluids.container.ContainerFluidInterface; +import appeng.fluids.container.FluidInterfaceContainer; import appeng.fluids.helper.DualityFluidInterface; import appeng.fluids.helper.IFluidInterfaceHost; import appeng.helpers.IPriorityHost; -import appeng.tile.grid.AENetworkTile; +import appeng.tile.grid.AENetworkTileEntity; -public class TileFluidInterface extends AENetworkTile implements IGridTickable, IFluidInterfaceHost, IPriorityHost { +public class FluidInterfaceTileEntity extends AENetworkTileEntity implements IGridTickable, IFluidInterfaceHost, IPriorityHost { private final DualityFluidInterface duality = new DualityFluidInterface(this.getProxy(), this); - public TileFluidInterface(TileEntityType tileEntityTypeIn) { + public FluidInterfaceTileEntity(TileEntityType tileEntityTypeIn) { super(tileEntityTypeIn); } @@ -162,6 +162,6 @@ public class TileFluidInterface extends AENetworkTile implements IGridTickable, @Override public ContainerType getContainerType() { - return ContainerFluidInterface.TYPE; + return FluidInterfaceContainer.TYPE; } } diff --git a/src/main/java/appeng/helpers/MetaRotation.java b/src/main/java/appeng/helpers/MetaRotation.java index 6b297beea..fe68fc092 100644 --- a/src/main/java/appeng/helpers/MetaRotation.java +++ b/src/main/java/appeng/helpers/MetaRotation.java @@ -27,7 +27,7 @@ import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import appeng.api.util.IOrientable; -import appeng.decorative.solid.BlockQuartzPillar; +import appeng.decorative.solid.QuartzPillarBlock; public class MetaRotation implements IOrientable { @@ -63,8 +63,8 @@ public class MetaRotation implements IOrientable { } // TODO 1.10.2-R - Temp - if (state.has(BlockQuartzPillar.AXIS)) { - Axis a = state.get(BlockQuartzPillar.AXIS); + if (state.has(QuartzPillarBlock.AXIS)) { + Axis a = state.get(QuartzPillarBlock.AXIS); switch (a) { case X: return Direction.EAST; @@ -87,7 +87,7 @@ public class MetaRotation implements IOrientable { } else { // TODO 1.10.2-R - Temp ((World) this.w).setBlockState(this.pos, - this.w.getBlockState(this.pos).with(BlockQuartzPillar.AXIS, up.getAxis())); + this.w.getBlockState(this.pos).with(QuartzPillarBlock.AXIS, up.getAxis())); } } else { throw new IllegalStateException(this.w.getClass().getName() + " received, expected World"); diff --git a/src/main/java/appeng/helpers/WirelessTerminalGuiObject.java b/src/main/java/appeng/helpers/WirelessTerminalGuiObject.java index b1317cf3a..b7dac3f75 100644 --- a/src/main/java/appeng/helpers/WirelessTerminalGuiObject.java +++ b/src/main/java/appeng/helpers/WirelessTerminalGuiObject.java @@ -45,7 +45,7 @@ import appeng.api.storage.data.IItemList; import appeng.api.util.DimensionalCoord; import appeng.api.util.IConfigManager; import appeng.container.interfaces.IInventorySlotAware; -import appeng.tile.networking.TileWireless; +import appeng.tile.networking.WirelessTileEntity; public class WirelessTerminalGuiObject implements IPortableCell, IActionHost, IInventorySlotAware { @@ -244,7 +244,7 @@ public class WirelessTerminalGuiObject implements IPortableCell, IActionHost, II return false; } - final IMachineSet tw = this.targetGrid.getMachines(TileWireless.class); + final IMachineSet tw = this.targetGrid.getMachines(WirelessTileEntity.class); this.myWap = null; diff --git a/src/main/java/appeng/hooks/DispenserBlockTool.java b/src/main/java/appeng/hooks/BlockToolDispenseItemBehavior.java similarity index 95% rename from src/main/java/appeng/hooks/DispenserBlockTool.java rename to src/main/java/appeng/hooks/BlockToolDispenseItemBehavior.java index 3d8bcb3a9..dc5d277bb 100644 --- a/src/main/java/appeng/hooks/DispenserBlockTool.java +++ b/src/main/java/appeng/hooks/BlockToolDispenseItemBehavior.java @@ -29,7 +29,7 @@ import net.minecraft.util.Direction; import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld; -public final class DispenserBlockTool extends DefaultDispenseItemBehavior { +public final class BlockToolDispenseItemBehavior extends DefaultDispenseItemBehavior { @Override protected ItemStack dispenseStack(final IBlockSource dispenser, final ItemStack dispensedItem) { diff --git a/src/main/java/appeng/hooks/CompassManager.java b/src/main/java/appeng/hooks/CompassManager.java index cd8c784d4..c48cbb033 100644 --- a/src/main/java/appeng/hooks/CompassManager.java +++ b/src/main/java/appeng/hooks/CompassManager.java @@ -21,11 +21,8 @@ package appeng.hooks; import java.util.HashMap; import java.util.Iterator; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.server.ServerWorld; - import appeng.core.sync.network.NetworkHandler; -import appeng.core.sync.packets.PacketCompassRequest; +import appeng.core.sync.packets.CompassRequestPacket; public class CompassManager { @@ -67,7 +64,7 @@ public class CompassManager { } private void requestUpdate(final CompassRequest r) { - NetworkHandler.instance().sendToServer(new PacketCompassRequest(r.attunement, r.cx, r.cz, r.cdy)); + NetworkHandler.instance().sendToServer(new CompassRequestPacket(r.attunement, r.cx, r.cz, r.cdy)); } private static class CompassRequest { diff --git a/src/main/java/appeng/hooks/DispenserMatterCannon.java b/src/main/java/appeng/hooks/MatterCannonDispenseItemBehavior.java similarity index 90% rename from src/main/java/appeng/hooks/DispenserMatterCannon.java rename to src/main/java/appeng/hooks/MatterCannonDispenseItemBehavior.java index 45d30a368..35c192baa 100644 --- a/src/main/java/appeng/hooks/DispenserMatterCannon.java +++ b/src/main/java/appeng/hooks/MatterCannonDispenseItemBehavior.java @@ -29,15 +29,15 @@ import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld; import appeng.api.util.AEPartLocation; -import appeng.items.tools.powered.ToolMatterCannon; +import appeng.items.tools.powered.MatterCannonItem; import appeng.util.Platform; -public final class DispenserMatterCannon extends DefaultDispenseItemBehavior { +public final class MatterCannonDispenseItemBehavior extends DefaultDispenseItemBehavior { @Override protected ItemStack dispenseStack(final IBlockSource dispenser, ItemStack dispensedItem) { final Item i = dispensedItem.getItem(); - if (i instanceof ToolMatterCannon) { + if (i instanceof MatterCannonItem) { final Direction Direction = dispenser.getBlockState().get(DispenserBlock.FACING); AEPartLocation dir = AEPartLocation.INTERNAL; for (final AEPartLocation d : AEPartLocation.SIDE_LOCATIONS) { @@ -47,7 +47,7 @@ public final class DispenserMatterCannon extends DefaultDispenseItemBehavior { } } - final ToolMatterCannon tm = (ToolMatterCannon) i; + final MatterCannonItem tm = (MatterCannonItem) i; final World w = dispenser.getWorld(); if (w instanceof ServerWorld) { diff --git a/src/main/java/appeng/hooks/TickHandler.java b/src/main/java/appeng/hooks/TickHandler.java index 9d5cc146d..ec26d0e7b 100644 --- a/src/main/java/appeng/hooks/TickHandler.java +++ b/src/main/java/appeng/hooks/TickHandler.java @@ -49,10 +49,10 @@ import appeng.api.util.AEColor; import appeng.core.AEConfig; import appeng.core.AELog; import appeng.core.AppEng; -import appeng.core.sync.packets.PacketPaintedEntity; +import appeng.core.sync.packets.PaintedEntityPacket; import appeng.crafting.CraftingJob; import appeng.me.Grid; -import appeng.tile.AEBaseTile; +import appeng.tile.AEBaseTileEntity; import appeng.util.IWorldCallable; import appeng.util.Platform; @@ -90,7 +90,7 @@ public class TickHandler { } } - public void addInit(final AEBaseTile tile) { + public void addInit(final AEBaseTileEntity tile) { if (Platform.isServer()) // for no there is no reason to care about this on the client... { this.getRepo().tiles.add(tile); @@ -181,7 +181,7 @@ public class TickHandler { // ready tiles. final HandlerRep repo = this.getRepo(); while (!repo.tiles.isEmpty()) { - final AEBaseTile bt = repo.tiles.poll(); + final AEBaseTileEntity bt = repo.tiles.poll(); if (!bt.isRemoved()) { bt.onReady(); } @@ -249,7 +249,7 @@ public class TickHandler { private static class HandlerRep { - private Queue tiles = new ArrayDeque<>(); + private Queue tiles = new ArrayDeque<>(); private Set networks = new HashSet<>(); private Set toAdd = new HashSet<>(); private Set toRemove = new HashSet<>(); @@ -292,8 +292,8 @@ public class TickHandler { this.ticksLeft = ticks; } - public PacketPaintedEntity getPacket() { - return new PacketPaintedEntity(this.myEntity, this.myColor, this.ticksLeft); + public PaintedEntityPacket getPacket() { + return new PaintedEntityPacket(this.myEntity, this.myColor, this.ticksLeft); } } } diff --git a/src/main/java/appeng/hooks/DispenserBehaviorTinyTNT.java b/src/main/java/appeng/hooks/TinyTNTDispenseItemBehavior.java similarity index 87% rename from src/main/java/appeng/hooks/DispenserBehaviorTinyTNT.java rename to src/main/java/appeng/hooks/TinyTNTDispenseItemBehavior.java index f13ebb1d7..ccd544da1 100644 --- a/src/main/java/appeng/hooks/DispenserBehaviorTinyTNT.java +++ b/src/main/java/appeng/hooks/TinyTNTDispenseItemBehavior.java @@ -25,9 +25,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.Direction; import net.minecraft.world.World; -import appeng.entity.EntityTinyTNTPrimed; +import appeng.entity.TinyTNTPrimedEntity; -public final class DispenserBehaviorTinyTNT extends DefaultDispenseItemBehavior { +public final class TinyTNTDispenseItemBehavior extends DefaultDispenseItemBehavior { @Override protected ItemStack dispenseStack(final IBlockSource dispenser, final ItemStack dispensedItem) { @@ -36,7 +36,7 @@ public final class DispenserBehaviorTinyTNT extends DefaultDispenseItemBehavior final int i = dispenser.getBlockPos().getX() + Direction.getXOffset(); final int j = dispenser.getBlockPos().getY() + Direction.getYOffset(); final int k = dispenser.getBlockPos().getZ() + Direction.getZOffset(); - final EntityTinyTNTPrimed primedTinyTNTEntity = new EntityTinyTNTPrimed(world, i + 0.5F, j + 0.5F, k + 0.5F, + final TinyTNTPrimedEntity primedTinyTNTEntity = new TinyTNTPrimedEntity(world, i + 0.5F, j + 0.5F, k + 0.5F, null); world.addEntity(primedTinyTNTEntity); dispensedItem.setCount(dispensedItem.getCount() - 1); diff --git a/src/main/java/appeng/integration/modules/jei/CondenserCategory.java b/src/main/java/appeng/integration/modules/jei/CondenserCategory.java index 6b94dcc41..68007ad7c 100644 --- a/src/main/java/appeng/integration/modules/jei/CondenserCategory.java +++ b/src/main/java/appeng/integration/modules/jei/CondenserCategory.java @@ -47,7 +47,7 @@ import appeng.api.definitions.IMaterials; import appeng.api.implementations.items.IStorageComponent; import appeng.core.Api; import appeng.core.AppEng; -import appeng.tile.misc.TileCondenser; +import appeng.tile.misc.CondenserTileEntity; class CondenserCategory implements IRecipeCategory { @@ -177,7 +177,7 @@ class CondenserCategory implements IRecipeCategory { private void addViableComponent(CondenserOutput condenserOutput, List viableComponents, ItemStack itemStack) { IStorageComponent comp = (IStorageComponent) itemStack.getItem(); - int storage = comp.getBytes(itemStack) * TileCondenser.BYTE_MULTIPLIER; + int storage = comp.getBytes(itemStack) * CondenserTileEntity.BYTE_MULTIPLIER; if (storage >= condenserOutput.requiredPower) { viableComponents.add(itemStack); } diff --git a/src/main/java/appeng/integration/modules/jei/FacadeRegistryPlugin.java b/src/main/java/appeng/integration/modules/jei/FacadeRegistryPlugin.java index bbab1e74b..a776cbe5e 100644 --- a/src/main/java/appeng/integration/modules/jei/FacadeRegistryPlugin.java +++ b/src/main/java/appeng/integration/modules/jei/FacadeRegistryPlugin.java @@ -33,7 +33,7 @@ import mezz.jei.api.recipe.advanced.IRecipeManagerPlugin; import mezz.jei.api.recipe.category.IRecipeCategory; import appeng.core.AppEng; -import appeng.items.parts.ItemFacade; +import appeng.items.parts.FacadeItem; /** * This plugin will dynamically add facade recipes for any item that can be @@ -41,11 +41,11 @@ import appeng.items.parts.ItemFacade; */ class FacadeRegistryPlugin implements IRecipeManagerPlugin { - private final ItemFacade itemFacade; + private final FacadeItem itemFacade; private final ItemStack cableAnchor; - FacadeRegistryPlugin(ItemFacade itemFacade, ItemStack cableAnchor) { + FacadeRegistryPlugin(FacadeItem itemFacade, ItemStack cableAnchor) { this.itemFacade = itemFacade; this.cableAnchor = cableAnchor; } @@ -55,7 +55,7 @@ class FacadeRegistryPlugin implements IRecipeManagerPlugin { if (focus.getMode() == IFocus.Mode.OUTPUT && focus.getValue() instanceof ItemStack) { // Looking up how a certain facade is crafted ItemStack itemStack = (ItemStack) focus.getValue(); - if (itemStack.getItem() instanceof ItemFacade) { + if (itemStack.getItem() instanceof FacadeItem) { return Collections.singletonList(VanillaRecipeCategoryUid.CRAFTING); } } else if (focus.getMode() == IFocus.Mode.INPUT && focus.getValue() instanceof ItemStack) { @@ -80,8 +80,8 @@ class FacadeRegistryPlugin implements IRecipeManagerPlugin { if (focus.getMode() == IFocus.Mode.OUTPUT && focus.getValue() instanceof ItemStack) { // Looking up how a certain facade is crafted ItemStack itemStack = (ItemStack) focus.getValue(); - if (itemStack.getItem() instanceof ItemFacade) { - ItemFacade facadeItem = (ItemFacade) itemStack.getItem(); + if (itemStack.getItem() instanceof FacadeItem) { + FacadeItem facadeItem = (FacadeItem) itemStack.getItem(); ItemStack textureItem = facadeItem.getTextureItem(itemStack); return Collections.singletonList((T) make(textureItem, this.cableAnchor, itemStack)); } diff --git a/src/main/java/appeng/integration/modules/jei/JEIPlugin.java b/src/main/java/appeng/integration/modules/jei/JEIPlugin.java index d8fcb652a..cd531bd2a 100644 --- a/src/main/java/appeng/integration/modules/jei/JEIPlugin.java +++ b/src/main/java/appeng/integration/modules/jei/JEIPlugin.java @@ -41,13 +41,13 @@ import appeng.api.definitions.IDefinitions; import appeng.api.definitions.IItemDefinition; import appeng.api.definitions.IMaterials; import appeng.api.features.AEFeature; -import appeng.container.implementations.ContainerCraftingTerm; -import appeng.container.implementations.ContainerPatternTerm; +import appeng.container.implementations.CraftingTermContainer; +import appeng.container.implementations.PatternTermContainer; import appeng.core.AEConfig; import appeng.core.AppEng; import appeng.core.localization.GuiText; import appeng.integration.abstraction.JEIFacade; -import appeng.items.parts.ItemFacade; +import appeng.items.parts.FacadeItem; import appeng.recipes.handlers.GrinderRecipe; import appeng.recipes.handlers.InscriberRecipe; @@ -76,9 +76,9 @@ public class JEIPlugin implements IModPlugin { @Override public void registerRecipeTransferHandlers(IRecipeTransferRegistration registration) { // Allow recipe transfer from JEI to crafting and pattern terminal - registration.addRecipeTransferHandler(new RecipeTransferHandler<>(ContainerCraftingTerm.class), + registration.addRecipeTransferHandler(new RecipeTransferHandler<>(CraftingTermContainer.class), VanillaRecipeCategoryUid.CRAFTING); - registration.addRecipeTransferHandler(new RecipeTransferHandler<>(ContainerPatternTerm.class), + registration.addRecipeTransferHandler(new RecipeTransferHandler<>(PatternTermContainer.class), VanillaRecipeCategoryUid.CRAFTING); } @@ -160,7 +160,7 @@ public class JEIPlugin implements IModPlugin { IDefinitions definitions = AEApi.instance().definitions(); if (AEConfig.instance().isFeatureEnabled(AEFeature.ENABLE_FACADE_CRAFTING)) { - ItemFacade itemFacade = (ItemFacade) definitions.items().facade().item(); + FacadeItem itemFacade = (FacadeItem) definitions.items().facade().item(); ItemStack cableAnchor = definitions.parts().cableAnchor().stack(1); registration.addRecipeManagerPlugin(new FacadeRegistryPlugin(itemFacade, cableAnchor)); } diff --git a/src/main/java/appeng/integration/modules/jei/RecipeTransferHandler.java b/src/main/java/appeng/integration/modules/jei/RecipeTransferHandler.java index 01d3056d2..89085726e 100644 --- a/src/main/java/appeng/integration/modules/jei/RecipeTransferHandler.java +++ b/src/main/java/appeng/integration/modules/jei/RecipeTransferHandler.java @@ -36,10 +36,10 @@ import mezz.jei.api.gui.ingredient.IGuiIngredient; import mezz.jei.api.recipe.transfer.IRecipeTransferError; import mezz.jei.api.recipe.transfer.IRecipeTransferHandler; -import appeng.container.slot.SlotCraftingMatrix; -import appeng.container.slot.SlotFakeCraftingMatrix; +import appeng.container.slot.CraftingMatrixSlot; +import appeng.container.slot.FakeCraftingMatrixSlot; import appeng.core.sync.network.NetworkHandler; -import appeng.core.sync.packets.PacketJEIRecipe; +import appeng.core.sync.packets.JEIRecipePacket; import appeng.util.Platform; class RecipeTransferHandler implements IRecipeTransferHandler { @@ -76,7 +76,7 @@ class RecipeTransferHandler implements IRecipeTransferHandl } for (final Slot slot : container.inventorySlots) { - if (slot instanceof SlotCraftingMatrix || slot instanceof SlotFakeCraftingMatrix) { + if (slot instanceof CraftingMatrixSlot || slot instanceof FakeCraftingMatrixSlot) { if (slot.getSlotIndex() == slotIndex) { final ListNBT tags = new ListNBT(); final List list = new ArrayList<>(); @@ -111,7 +111,7 @@ class RecipeTransferHandler implements IRecipeTransferHandl slotIndex++; } - NetworkHandler.instance().sendToServer(new PacketJEIRecipe(recipe)); + NetworkHandler.instance().sendToServer(new JEIRecipePacket(recipe)); return null; } diff --git a/src/main/java/appeng/integration/modules/theoneprobe/TileInfoProvider.java b/src/main/java/appeng/integration/modules/theoneprobe/TileInfoProvider.java index 815a3ac1f..3085fe7b2 100644 --- a/src/main/java/appeng/integration/modules/theoneprobe/TileInfoProvider.java +++ b/src/main/java/appeng/integration/modules/theoneprobe/TileInfoProvider.java @@ -38,7 +38,7 @@ import appeng.integration.modules.theoneprobe.tile.CraftingMonitorInfoProvider; import appeng.integration.modules.theoneprobe.tile.ITileProbInfoProvider; import appeng.integration.modules.theoneprobe.tile.PowerStateInfoProvider; import appeng.integration.modules.theoneprobe.tile.PowerStorageInfoProvider; -import appeng.tile.AEBaseTile; +import appeng.tile.AEBaseTileEntity; public final class TileInfoProvider implements IProbeInfoProvider { private final List providers; @@ -62,8 +62,8 @@ public final class TileInfoProvider implements IProbeInfoProvider { BlockState blockState, IProbeHitData data) { final TileEntity tile = world.getTileEntity(data.getPos()); - if (tile instanceof AEBaseTile) { - final AEBaseTile aeBaseTile = (AEBaseTile) tile; + if (tile instanceof AEBaseTileEntity) { + final AEBaseTileEntity aeBaseTile = (AEBaseTileEntity) tile; for (final ITileProbInfoProvider provider : this.providers) { provider.addProbeInfo(aeBaseTile, mode, probeInfo, player, world, blockState, data); diff --git a/src/main/java/appeng/integration/modules/theoneprobe/config/AEConfigProvider.java b/src/main/java/appeng/integration/modules/theoneprobe/config/AEConfigProvider.java index a38191d7d..0c2a7b60f 100644 --- a/src/main/java/appeng/integration/modules/theoneprobe/config/AEConfigProvider.java +++ b/src/main/java/appeng/integration/modules/theoneprobe/config/AEConfigProvider.java @@ -28,7 +28,7 @@ import mcjty.theoneprobe.api.IProbeConfigProvider; import mcjty.theoneprobe.api.IProbeHitData; import mcjty.theoneprobe.api.IProbeHitEntityData; -import appeng.tile.AEBaseTile; +import appeng.tile.AEBaseTileEntity; public class AEConfigProvider implements IProbeConfigProvider { @@ -41,7 +41,7 @@ public class AEConfigProvider implements IProbeConfigProvider { @Override public void getProbeConfig(IProbeConfig config, PlayerEntity player, World world, BlockState blockState, IProbeHitData data) { - if (world.getTileEntity(data.getPos()) instanceof AEBaseTile) { + if (world.getTileEntity(data.getPos()) instanceof AEBaseTileEntity) { config.setRFMode(0); } } diff --git a/src/main/java/appeng/integration/modules/theoneprobe/part/ChannelInfoProvider.java b/src/main/java/appeng/integration/modules/theoneprobe/part/ChannelInfoProvider.java index ff574868f..3b8358914 100644 --- a/src/main/java/appeng/integration/modules/theoneprobe/part/ChannelInfoProvider.java +++ b/src/main/java/appeng/integration/modules/theoneprobe/part/ChannelInfoProvider.java @@ -29,17 +29,17 @@ import mcjty.theoneprobe.api.ProbeMode; import appeng.api.parts.IPart; import appeng.integration.modules.theoneprobe.TheOneProbeText; -import appeng.parts.networking.PartCableSmart; -import appeng.parts.networking.PartDenseCableSmart; +import appeng.parts.networking.SmartCablePart; +import appeng.parts.networking.SmartDenseCablePart; public class ChannelInfoProvider implements IPartProbInfoProvider { @Override public void addProbeInfo(IPart part, ProbeMode mode, IProbeInfo probeInfo, PlayerEntity player, World world, BlockState blockState, IProbeHitData data) { - if (part instanceof PartDenseCableSmart || part instanceof PartCableSmart) { + if (part instanceof SmartDenseCablePart || part instanceof SmartCablePart) { final int usedChannels; - final int maxChannels = (part instanceof PartDenseCableSmart) ? 32 : 8; + final int maxChannels = (part instanceof SmartDenseCablePart) ? 32 : 8; if (part.getGridNode().isActive()) { final CompoundNBT tmp = new CompoundNBT(); diff --git a/src/main/java/appeng/integration/modules/theoneprobe/part/P2PStateInfoProvider.java b/src/main/java/appeng/integration/modules/theoneprobe/part/P2PStateInfoProvider.java index 7c60e64b6..b3345c296 100644 --- a/src/main/java/appeng/integration/modules/theoneprobe/part/P2PStateInfoProvider.java +++ b/src/main/java/appeng/integration/modules/theoneprobe/part/P2PStateInfoProvider.java @@ -31,7 +31,7 @@ import mcjty.theoneprobe.api.ProbeMode; import appeng.api.parts.IPart; import appeng.integration.modules.theoneprobe.TheOneProbeText; import appeng.me.GridAccessException; -import appeng.parts.p2p.PartP2PTunnel; +import appeng.parts.p2p.P2PTunnelPart; import appeng.util.Platform; public class P2PStateInfoProvider implements IPartProbInfoProvider { @@ -43,8 +43,8 @@ public class P2PStateInfoProvider implements IPartProbInfoProvider { @Override public void addProbeInfo(IPart part, ProbeMode mode, IProbeInfo probeInfo, PlayerEntity player, World world, BlockState blockState, IProbeHitData data) { - if (part instanceof PartP2PTunnel) { - final PartP2PTunnel tunnel = (PartP2PTunnel) part; + if (part instanceof P2PTunnelPart) { + final P2PTunnelPart tunnel = (P2PTunnelPart) part; if (!tunnel.isPowered()) { return; @@ -61,7 +61,7 @@ public class P2PStateInfoProvider implements IPartProbInfoProvider { state = STATE_INPUT; } } else { - final PartP2PTunnel input = tunnel.getInput(); + final P2PTunnelPart input = tunnel.getInput(); if (input != null) { state = STATE_OUTPUT; } @@ -86,7 +86,7 @@ public class P2PStateInfoProvider implements IPartProbInfoProvider { } } - private static int getOutputCount(PartP2PTunnel tunnel) { + private static int getOutputCount(P2PTunnelPart tunnel) { try { return Iterators.size(tunnel.getOutputs().iterator()); } catch (GridAccessException e) { diff --git a/src/main/java/appeng/integration/modules/theoneprobe/part/StorageMonitorInfoProvider.java b/src/main/java/appeng/integration/modules/theoneprobe/part/StorageMonitorInfoProvider.java index 359a4bd5d..42a2aeba5 100644 --- a/src/main/java/appeng/integration/modules/theoneprobe/part/StorageMonitorInfoProvider.java +++ b/src/main/java/appeng/integration/modules/theoneprobe/part/StorageMonitorInfoProvider.java @@ -27,7 +27,7 @@ import mcjty.theoneprobe.api.IProbeHitData; import mcjty.theoneprobe.api.IProbeInfo; import mcjty.theoneprobe.api.ProbeMode; -import appeng.api.implementations.parts.IPartStorageMonitor; +import appeng.api.implementations.parts.IStorageMonitorPart; import appeng.api.parts.IPart; import appeng.api.storage.data.IAEFluidStack; import appeng.api.storage.data.IAEItemStack; @@ -39,8 +39,8 @@ public class StorageMonitorInfoProvider implements IPartProbInfoProvider { @Override public void addProbeInfo(IPart part, ProbeMode mode, IProbeInfo probeInfo, PlayerEntity player, World world, BlockState blockState, IProbeHitData data) { - if (part instanceof IPartStorageMonitor) { - final IPartStorageMonitor monitor = (IPartStorageMonitor) part; + if (part instanceof IStorageMonitorPart) { + final IStorageMonitorPart monitor = (IStorageMonitorPart) part; final IAEStack displayed = monitor.getDisplayed(); final boolean isLocked = monitor.isLocked(); diff --git a/src/main/java/appeng/integration/modules/theoneprobe/tile/ChargerInfoProvider.java b/src/main/java/appeng/integration/modules/theoneprobe/tile/ChargerInfoProvider.java index 510627969..ee1347871 100644 --- a/src/main/java/appeng/integration/modules/theoneprobe/tile/ChargerInfoProvider.java +++ b/src/main/java/appeng/integration/modules/theoneprobe/tile/ChargerInfoProvider.java @@ -29,16 +29,16 @@ import mcjty.theoneprobe.api.IProbeHitData; import mcjty.theoneprobe.api.IProbeInfo; import mcjty.theoneprobe.api.ProbeMode; -import appeng.tile.AEBaseTile; -import appeng.tile.misc.TileCharger; +import appeng.tile.AEBaseTileEntity; +import appeng.tile.misc.ChargerTileEntity; public class ChargerInfoProvider implements ITileProbInfoProvider { @Override - public void addProbeInfo(AEBaseTile tile, ProbeMode mode, IProbeInfo probeInfo, PlayerEntity player, World world, - BlockState blockState, IProbeHitData data) { - if (tile instanceof TileCharger) { - final TileCharger charger = (TileCharger) tile; + public void addProbeInfo(AEBaseTileEntity tile, ProbeMode mode, IProbeInfo probeInfo, PlayerEntity player, World world, + BlockState blockState, IProbeHitData data) { + if (tile instanceof ChargerTileEntity) { + final ChargerTileEntity charger = (ChargerTileEntity) tile; final IItemHandler chargerInventory = charger.getInternalInventory(); final ItemStack chargingItem = chargerInventory.getStackInSlot(0); diff --git a/src/main/java/appeng/integration/modules/theoneprobe/tile/CraftingMonitorInfoProvider.java b/src/main/java/appeng/integration/modules/theoneprobe/tile/CraftingMonitorInfoProvider.java index 2506ae152..d7b2666f5 100644 --- a/src/main/java/appeng/integration/modules/theoneprobe/tile/CraftingMonitorInfoProvider.java +++ b/src/main/java/appeng/integration/modules/theoneprobe/tile/CraftingMonitorInfoProvider.java @@ -30,16 +30,16 @@ import mcjty.theoneprobe.api.ProbeMode; import appeng.api.storage.data.IAEItemStack; import appeng.integration.modules.theoneprobe.TheOneProbeText; -import appeng.tile.AEBaseTile; -import appeng.tile.crafting.TileCraftingMonitorTile; +import appeng.tile.AEBaseTileEntity; +import appeng.tile.crafting.CraftingMonitorTileEntity; public class CraftingMonitorInfoProvider implements ITileProbInfoProvider { @Override - public void addProbeInfo(AEBaseTile tile, ProbeMode mode, IProbeInfo probeInfo, PlayerEntity player, World world, - BlockState blockState, IProbeHitData data) { - if (tile instanceof TileCraftingMonitorTile) { - final TileCraftingMonitorTile monitor = (TileCraftingMonitorTile) tile; + public void addProbeInfo(AEBaseTileEntity tile, ProbeMode mode, IProbeInfo probeInfo, PlayerEntity player, World world, + BlockState blockState, IProbeHitData data) { + if (tile instanceof CraftingMonitorTileEntity) { + final CraftingMonitorTileEntity monitor = (CraftingMonitorTileEntity) tile; final IAEItemStack displayStack = monitor.getJobProgress(); if (displayStack != null) { diff --git a/src/main/java/appeng/integration/modules/theoneprobe/tile/ITileProbInfoProvider.java b/src/main/java/appeng/integration/modules/theoneprobe/tile/ITileProbInfoProvider.java index 380883c17..382340e87 100644 --- a/src/main/java/appeng/integration/modules/theoneprobe/tile/ITileProbInfoProvider.java +++ b/src/main/java/appeng/integration/modules/theoneprobe/tile/ITileProbInfoProvider.java @@ -27,11 +27,11 @@ import mcjty.theoneprobe.api.IProbeInfo; import mcjty.theoneprobe.api.IProbeInfoProvider; import mcjty.theoneprobe.api.ProbeMode; -import appeng.tile.AEBaseTile; +import appeng.tile.AEBaseTileEntity; /** * Similar to {@link IProbeInfoProvider}, but already providing the - * {@link AEBaseTile} being looked at. + * {@link AEBaseTileEntity} being looked at. * */ public interface ITileProbInfoProvider { @@ -40,6 +40,6 @@ public interface ITileProbInfoProvider { * @see IProbeInfoProvider#addProbeInfo(ProbeMode, IProbeInfo, EntityPlayer, * World, IBlockState, IProbeHitData) */ - void addProbeInfo(AEBaseTile tile, ProbeMode mode, IProbeInfo probeInfo, PlayerEntity player, World world, - BlockState blockState, IProbeHitData data); + void addProbeInfo(AEBaseTileEntity tile, ProbeMode mode, IProbeInfo probeInfo, PlayerEntity player, World world, + BlockState blockState, IProbeHitData data); } diff --git a/src/main/java/appeng/integration/modules/theoneprobe/tile/PowerStateInfoProvider.java b/src/main/java/appeng/integration/modules/theoneprobe/tile/PowerStateInfoProvider.java index 06c82ce07..b93e9c1b7 100644 --- a/src/main/java/appeng/integration/modules/theoneprobe/tile/PowerStateInfoProvider.java +++ b/src/main/java/appeng/integration/modules/theoneprobe/tile/PowerStateInfoProvider.java @@ -28,13 +28,13 @@ import mcjty.theoneprobe.api.ProbeMode; import appeng.api.implementations.IPowerChannelState; import appeng.integration.modules.theoneprobe.TheOneProbeText; -import appeng.tile.AEBaseTile; +import appeng.tile.AEBaseTileEntity; public class PowerStateInfoProvider implements ITileProbInfoProvider { @Override - public void addProbeInfo(AEBaseTile tile, ProbeMode mode, IProbeInfo probeInfo, PlayerEntity player, World world, - BlockState blockState, IProbeHitData data) { + public void addProbeInfo(AEBaseTileEntity tile, ProbeMode mode, IProbeInfo probeInfo, PlayerEntity player, World world, + BlockState blockState, IProbeHitData data) { if (tile instanceof IPowerChannelState) { final IPowerChannelState state = (IPowerChannelState) tile; diff --git a/src/main/java/appeng/integration/modules/theoneprobe/tile/PowerStorageInfoProvider.java b/src/main/java/appeng/integration/modules/theoneprobe/tile/PowerStorageInfoProvider.java index 43b752d40..835bd5869 100644 --- a/src/main/java/appeng/integration/modules/theoneprobe/tile/PowerStorageInfoProvider.java +++ b/src/main/java/appeng/integration/modules/theoneprobe/tile/PowerStorageInfoProvider.java @@ -28,14 +28,14 @@ import mcjty.theoneprobe.api.ProbeMode; import appeng.api.networking.energy.IAEPowerStorage; import appeng.integration.modules.theoneprobe.TheOneProbeText; -import appeng.tile.AEBaseTile; +import appeng.tile.AEBaseTileEntity; import appeng.util.Platform; public class PowerStorageInfoProvider implements ITileProbInfoProvider { @Override - public void addProbeInfo(AEBaseTile tile, ProbeMode mode, IProbeInfo probeInfo, PlayerEntity player, World world, - BlockState blockState, IProbeHitData data) { + public void addProbeInfo(AEBaseTileEntity tile, ProbeMode mode, IProbeInfo probeInfo, PlayerEntity player, World world, + BlockState blockState, IProbeHitData data) { if (tile instanceof IAEPowerStorage) { final IAEPowerStorage storage = (IAEPowerStorage) tile; final double maxPower = storage.getAEMaxPower(); diff --git a/src/main/java/appeng/items/materials/ItemMaterial.java b/src/main/java/appeng/items/materials/MaterialItem.java similarity index 98% rename from src/main/java/appeng/items/materials/ItemMaterial.java rename to src/main/java/appeng/items/materials/MaterialItem.java index dc1863ffd..8bd4add1f 100644 --- a/src/main/java/appeng/items/materials/ItemMaterial.java +++ b/src/main/java/appeng/items/materials/MaterialItem.java @@ -55,7 +55,7 @@ import appeng.items.AEBaseItem; import appeng.util.InventoryAdaptor; import appeng.util.inv.AdaptorItemHandler; -public final class ItemMaterial extends AEBaseItem implements IStorageComponent, IUpgradeModule { +public final class MaterialItem extends AEBaseItem implements IStorageComponent, IUpgradeModule { /** * NBT property used by the name press to store the name to be inscribed. @@ -66,7 +66,7 @@ public final class ItemMaterial extends AEBaseItem implements IStorageComponent, private final MaterialType materialType; - public ItemMaterial(Properties properties, MaterialType materialType) { + public MaterialItem(Properties properties, MaterialType materialType) { super(properties); this.materialType = materialType; } diff --git a/src/main/java/appeng/items/materials/MaterialType.java b/src/main/java/appeng/items/materials/MaterialType.java index c499ebde7..f9b6c5fb9 100644 --- a/src/main/java/appeng/items/materials/MaterialType.java +++ b/src/main/java/appeng/items/materials/MaterialType.java @@ -29,13 +29,13 @@ import net.minecraft.util.ResourceLocation; import appeng.api.features.AEFeature; import appeng.core.AppEng; import appeng.core.features.MaterialStackSrc; -import appeng.entity.EntityChargedQuartz; -import appeng.entity.EntitySingularity; +import appeng.entity.ChargedQuartzEntity; +import appeng.entity.SingularityEntity; public enum MaterialType { CERTUS_QUARTZ_CRYSTAL("certus_quartz_crystal", EnumSet.of(AEFeature.CERTUS), "crystalCertusQuartz"), CERTUS_QUARTZ_CRYSTAL_CHARGED("charged_certus_quartz_crystal", EnumSet.of(AEFeature.CERTUS), - EntityChargedQuartz.class), + ChargedQuartzEntity.class), CERTUS_QUARTZ_DUST("certus_quartz_dust", EnumSet.of(AEFeature.DUSTS, AEFeature.CERTUS), "dustCertusQuartz"), NETHER_QUARTZ_DUST("nether_quartz_dust", EnumSet.of(AEFeature.DUSTS), "dustNetherQuartz,dustQuartz"), @@ -106,10 +106,10 @@ public enum MaterialType { SKY_DUST("sky_dust", EnumSet.of(AEFeature.DUSTS)), ENDER_DUST("ender_dust", EnumSet.of(AEFeature.QUANTUM_NETWORK_BRIDGE), "dustEnder,dustEnderPearl", - EntitySingularity.class), - SINGULARITY("singularity", EnumSet.of(AEFeature.QUANTUM_NETWORK_BRIDGE), EntitySingularity.class), + SingularityEntity.class), + SINGULARITY("singularity", EnumSet.of(AEFeature.QUANTUM_NETWORK_BRIDGE), SingularityEntity.class), QUANTUM_ENTANGLED_SINGULARITY("quantum_entangled_singularity", EnumSet.of(AEFeature.QUANTUM_NETWORK_BRIDGE), - EntitySingularity.class), + SingularityEntity.class), BLANK_PATTERN("blank_pattern", EnumSet.of(AEFeature.PATTERNS)), CARD_CRAFTING("crafting_card", EnumSet.of(AEFeature.ADVANCED_CARDS, AEFeature.CRAFTING_CPU)), diff --git a/src/main/java/appeng/items/misc/ItemCrystalSeed.java b/src/main/java/appeng/items/misc/CrystalSeedItem.java similarity index 94% rename from src/main/java/appeng/items/misc/ItemCrystalSeed.java rename to src/main/java/appeng/items/misc/CrystalSeedItem.java index 86e4916a4..d83572a75 100644 --- a/src/main/java/appeng/items/misc/ItemCrystalSeed.java +++ b/src/main/java/appeng/items/misc/CrystalSeedItem.java @@ -43,14 +43,14 @@ import net.minecraftforge.api.distmarker.OnlyIn; import appeng.api.implementations.items.IGrowableCrystal; import appeng.core.localization.ButtonToolTips; -import appeng.entity.EntityGrowingCrystal; +import appeng.entity.GrowingCrystalEntity; import appeng.items.AEBaseItem; /** * This item reprents one of the seeds used to grow various forms of quartz by * throwing them into water (for that behavior, see the linked entity) */ -public class ItemCrystalSeed extends AEBaseItem implements IGrowableCrystal { +public class CrystalSeedItem extends AEBaseItem implements IGrowableCrystal { /** * Name of NBT tag used to store the growth progress value. @@ -67,7 +67,7 @@ public class ItemCrystalSeed extends AEBaseItem implements IGrowableCrystal { */ private final IItemProvider grownItem; - public ItemCrystalSeed(Properties properties, IItemProvider grownItem) { + public CrystalSeedItem(Properties properties, IItemProvider grownItem) { super(properties); this.grownItem = Preconditions.checkNotNull(grownItem); // Expose the growth of the seed to the model system @@ -129,7 +129,7 @@ public class ItemCrystalSeed extends AEBaseItem implements IGrowableCrystal { @Override public Entity createEntity(final World world, final Entity location, final ItemStack itemstack) { - final EntityGrowingCrystal egc = new EntityGrowingCrystal(world, location.getPosX(), location.getPosY(), + final GrowingCrystalEntity egc = new GrowingCrystalEntity(world, location.getPosX(), location.getPosY(), location.getPosZ(), itemstack); egc.setMotion(location.getMotion()); diff --git a/src/main/java/appeng/items/misc/ItemEncodedPattern.java b/src/main/java/appeng/items/misc/EncodedPatternItem.java similarity index 98% rename from src/main/java/appeng/items/misc/ItemEncodedPattern.java rename to src/main/java/appeng/items/misc/EncodedPatternItem.java index c6b48f3de..e1963d7e6 100644 --- a/src/main/java/appeng/items/misc/ItemEncodedPattern.java +++ b/src/main/java/appeng/items/misc/EncodedPatternItem.java @@ -48,11 +48,11 @@ import appeng.helpers.PatternHelper; import appeng.items.AEBaseItem; import appeng.util.Platform; -public class ItemEncodedPattern extends AEBaseItem implements ICraftingPatternItem { +public class EncodedPatternItem extends AEBaseItem implements ICraftingPatternItem { // rather simple client side caching. private static final Map SIMPLE_CACHE = new WeakHashMap<>(); - public ItemEncodedPattern(Properties properties) { + public EncodedPatternItem(Properties properties) { super(properties); } diff --git a/src/main/java/appeng/items/misc/ItemPaintBall.java b/src/main/java/appeng/items/misc/PaintBallItem.java similarity index 91% rename from src/main/java/appeng/items/misc/ItemPaintBall.java rename to src/main/java/appeng/items/misc/PaintBallItem.java index 69cdee394..dfb310029 100644 --- a/src/main/java/appeng/items/misc/ItemPaintBall.java +++ b/src/main/java/appeng/items/misc/PaintBallItem.java @@ -21,13 +21,13 @@ package appeng.items.misc; import appeng.api.util.AEColor; import appeng.items.AEBaseItem; -public class ItemPaintBall extends AEBaseItem { +public class PaintBallItem extends AEBaseItem { private final AEColor color; private final boolean lumen; - public ItemPaintBall(Properties properties, AEColor color, boolean lumen) { + public PaintBallItem(Properties properties, AEColor color, boolean lumen) { super(properties); this.color = color; this.lumen = lumen; diff --git a/src/main/java/appeng/items/misc/ItemPaintBallRendering.java b/src/main/java/appeng/items/misc/PaintBallItemRendering.java similarity index 93% rename from src/main/java/appeng/items/misc/ItemPaintBallRendering.java rename to src/main/java/appeng/items/misc/PaintBallItemRendering.java index ced0c0c6e..81fb3b3fc 100644 --- a/src/main/java/appeng/items/misc/ItemPaintBallRendering.java +++ b/src/main/java/appeng/items/misc/PaintBallItemRendering.java @@ -22,13 +22,13 @@ import appeng.api.util.AEColor; import appeng.bootstrap.IItemRendering; import appeng.bootstrap.ItemRenderingCustomizer; -public class ItemPaintBallRendering extends ItemRenderingCustomizer { +public class PaintBallItemRendering extends ItemRenderingCustomizer { private final boolean lumen; private final AEColor color; - public ItemPaintBallRendering(AEColor color, boolean lumen) { + public PaintBallItemRendering(AEColor color, boolean lumen) { this.lumen = lumen; this.color = color; } diff --git a/src/main/java/appeng/items/parts/ColoredPartItem.java b/src/main/java/appeng/items/parts/ColoredPartItem.java index 0c1c17b75..149ed47bc 100644 --- a/src/main/java/appeng/items/parts/ColoredPartItem.java +++ b/src/main/java/appeng/items/parts/ColoredPartItem.java @@ -7,7 +7,7 @@ import net.minecraft.item.ItemStack; import appeng.api.parts.IPart; import appeng.api.util.AEColor; -public class ColoredPartItem extends ItemPart { +public class ColoredPartItem extends PartItem { private final AEColor color; diff --git a/src/main/java/appeng/items/parts/ItemFacade.java b/src/main/java/appeng/items/parts/FacadeItem.java similarity index 98% rename from src/main/java/appeng/items/parts/ItemFacade.java rename to src/main/java/appeng/items/parts/FacadeItem.java index 8d9ac9a82..d696748e5 100644 --- a/src/main/java/appeng/items/parts/ItemFacade.java +++ b/src/main/java/appeng/items/parts/FacadeItem.java @@ -48,7 +48,7 @@ import appeng.facade.FacadePart; import appeng.facade.IFacadeItem; import appeng.items.AEBaseItem; -public class ItemFacade extends AEBaseItem implements IFacadeItem, IAlphaPassItem { +public class FacadeItem extends AEBaseItem implements IFacadeItem, IAlphaPassItem { /** * Block tag used to explicitly whitelist blocks for use in facades. @@ -57,7 +57,7 @@ public class ItemFacade extends AEBaseItem implements IFacadeItem, IAlphaPassIte private static final String NBT_ITEM_ID = "item"; - public ItemFacade(Properties properties) { + public FacadeItem(Properties properties) { super(properties); } diff --git a/src/main/java/appeng/items/parts/ItemPart.java b/src/main/java/appeng/items/parts/PartItem.java similarity index 94% rename from src/main/java/appeng/items/parts/ItemPart.java rename to src/main/java/appeng/items/parts/PartItem.java index 7c38aebdf..6af3ba4ef 100644 --- a/src/main/java/appeng/items/parts/ItemPart.java +++ b/src/main/java/appeng/items/parts/PartItem.java @@ -35,12 +35,12 @@ import appeng.api.parts.IPartItem; import appeng.core.localization.GuiText; import appeng.items.AEBaseItem; -public class ItemPart extends AEBaseItem implements IPartItem, IItemGroup { +public class PartItem extends AEBaseItem implements IPartItem, IItemGroup { private final PartType type; private final Function factory; - public ItemPart(Properties properties, PartType type, Function factory) { + public PartItem(Properties properties, PartType type, Function factory) { super(properties); this.type = type; this.factory = factory; @@ -68,8 +68,8 @@ public class ItemPart extends AEBaseItem implements IPartItem) is.getItem()).getType(); + if (is.getItem() instanceof PartItem) { + return ((PartItem) is.getItem()).getType(); } return PartType.INVALID_TYPE; } diff --git a/src/main/java/appeng/items/parts/ItemPartRendering.java b/src/main/java/appeng/items/parts/PartItemRendering.java similarity index 90% rename from src/main/java/appeng/items/parts/ItemPartRendering.java rename to src/main/java/appeng/items/parts/PartItemRendering.java index d51f16b1c..15e29e0f3 100644 --- a/src/main/java/appeng/items/parts/ItemPartRendering.java +++ b/src/main/java/appeng/items/parts/PartItemRendering.java @@ -26,15 +26,15 @@ import appeng.bootstrap.IItemRendering; import appeng.bootstrap.ItemRenderingCustomizer; import appeng.client.render.StaticItemColor; -public class ItemPartRendering extends ItemRenderingCustomizer { +public class PartItemRendering extends ItemRenderingCustomizer { private final AEColor color; - public ItemPartRendering() { + public PartItemRendering() { this.color = AEColor.TRANSPARENT; } - public ItemPartRendering(AEColor color) { + public PartItemRendering(AEColor color) { this.color = color; } diff --git a/src/main/java/appeng/items/parts/PartType.java b/src/main/java/appeng/items/parts/PartType.java index 2d71bcd5b..f8ec2b412 100644 --- a/src/main/java/appeng/items/parts/PartType.java +++ b/src/main/java/appeng/items/parts/PartType.java @@ -24,63 +24,61 @@ import java.util.HashSet; import java.util.Set; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import appeng.api.features.AEFeature; import appeng.api.parts.IPart; -import appeng.fluids.parts.PartFluidAnnihilationPlane; -import appeng.fluids.parts.PartFluidExportBus; -import appeng.fluids.parts.PartFluidFormationPlane; -import appeng.fluids.parts.PartFluidImportBus; -import appeng.fluids.parts.PartFluidInterface; -import appeng.fluids.parts.PartFluidLevelEmitter; -import appeng.fluids.parts.PartFluidStorageBus; -import appeng.fluids.parts.PartFluidTerminal; -import appeng.parts.automation.PartAnnihilationPlane; -import appeng.parts.automation.PartExportBus; -import appeng.parts.automation.PartFormationPlane; -import appeng.parts.automation.PartIdentityAnnihilationPlane; -import appeng.parts.automation.PartImportBus; -import appeng.parts.automation.PartLevelEmitter; -import appeng.parts.misc.PartCableAnchor; -import appeng.parts.misc.PartInterface; -import appeng.parts.misc.PartInvertedToggleBus; -import appeng.parts.misc.PartStorageBus; -import appeng.parts.misc.PartToggleBus; -import appeng.parts.networking.PartCableCovered; -import appeng.parts.networking.PartCableGlass; -import appeng.parts.networking.PartCableSmart; -import appeng.parts.networking.PartDenseCableCovered; -import appeng.parts.networking.PartDenseCableSmart; -import appeng.parts.networking.PartQuartzFiber; -import appeng.parts.p2p.PartP2PFEPower; -import appeng.parts.p2p.PartP2PFluids; -import appeng.parts.p2p.PartP2PItems; -import appeng.parts.p2p.PartP2PLight; -import appeng.parts.p2p.PartP2PRedstone; -import appeng.parts.p2p.PartP2PTunnelME; -import appeng.parts.reporting.PartConversionMonitor; -import appeng.parts.reporting.PartCraftingTerminal; -import appeng.parts.reporting.PartDarkPanel; -import appeng.parts.reporting.PartInterfaceTerminal; -import appeng.parts.reporting.PartPanel; -import appeng.parts.reporting.PartPatternTerminal; -import appeng.parts.reporting.PartSemiDarkPanel; -import appeng.parts.reporting.PartStorageMonitor; -import appeng.parts.reporting.PartTerminal; +import appeng.fluids.parts.FluidAnnihilationPlanePart; +import appeng.fluids.parts.FluidExportBusPart; +import appeng.fluids.parts.FluidFormationPlanePart; +import appeng.fluids.parts.FluidImportBusPart; +import appeng.fluids.parts.FluidInterfacePart; +import appeng.fluids.parts.FluidLevelEmitterPart; +import appeng.fluids.parts.FluidStorageBusPart; +import appeng.fluids.parts.FluidTerminalPart; +import appeng.parts.automation.AnnihilationPlanePart; +import appeng.parts.automation.ExportBusPart; +import appeng.parts.automation.FormationPlanePart; +import appeng.parts.automation.IdentityAnnihilationPlanePart; +import appeng.parts.automation.ImportBusPart; +import appeng.parts.automation.LevelEmitterPart; +import appeng.parts.misc.CableAnchorPart; +import appeng.parts.misc.InterfacePart; +import appeng.parts.misc.InvertedToggleBusPart; +import appeng.parts.misc.StorageBusPart; +import appeng.parts.misc.ToggleBusPart; +import appeng.parts.networking.CoveredCablePart; +import appeng.parts.networking.GlassCablePart; +import appeng.parts.networking.SmartCablePart; +import appeng.parts.networking.CoveredDenseCablePart; +import appeng.parts.networking.SmartDenseCablePart; +import appeng.parts.networking.QuartzFiberPart; +import appeng.parts.p2p.FEP2PTunnelPart; +import appeng.parts.p2p.FluidP2PTunnelPart; +import appeng.parts.p2p.ItemP2PTunnelPart; +import appeng.parts.p2p.LightP2PTunnelPart; +import appeng.parts.p2p.RedstoneP2PTunnelPart; +import appeng.parts.p2p.MEP2PTunnelPart; +import appeng.parts.reporting.ConversionMonitorPart; +import appeng.parts.reporting.CraftingTerminalPart; +import appeng.parts.reporting.DarkPanelPart; +import appeng.parts.reporting.InterfaceTerminalPart; +import appeng.parts.reporting.PanelPart; +import appeng.parts.reporting.PatternTerminalPart; +import appeng.parts.reporting.SemiDarkPanelPart; +import appeng.parts.reporting.StorageMonitorPart; +import appeng.parts.reporting.TerminalPart; public enum PartType { INVALID_TYPE(EnumSet.of(AEFeature.CORE), EnumSet.noneOf(IntegrationType.class), null), - CABLE_GLASS(EnumSet.of(AEFeature.GLASS_CABLES), EnumSet.noneOf(IntegrationType.class), PartCableGlass.class) { + CABLE_GLASS(EnumSet.of(AEFeature.GLASS_CABLES), EnumSet.noneOf(IntegrationType.class), GlassCablePart.class) { @Override public boolean isCable() { return true; } }, - CABLE_COVERED(EnumSet.of(AEFeature.COVERED_CABLES), EnumSet.noneOf(IntegrationType.class), PartCableCovered.class) { + CABLE_COVERED(EnumSet.of(AEFeature.COVERED_CABLES), EnumSet.noneOf(IntegrationType.class), CoveredCablePart.class) { @Override public boolean isCable() { return true; @@ -88,7 +86,7 @@ public enum PartType { }, CABLE_SMART(EnumSet.of(AEFeature.CHANNELS, AEFeature.SMART_CABLES), EnumSet.noneOf(IntegrationType.class), - PartCableSmart.class) { + SmartCablePart.class) { @Override public boolean isCable() { return true; @@ -96,7 +94,7 @@ public enum PartType { }, CABLE_DENSE_SMART(EnumSet.of(AEFeature.CHANNELS, AEFeature.DENSE_CABLES), EnumSet.noneOf(IntegrationType.class), - PartDenseCableSmart.class) { + SmartDenseCablePart.class) { @Override public boolean isCable() { return true; @@ -104,98 +102,98 @@ public enum PartType { }, CABLE_DENSE_COVERED(EnumSet.of(AEFeature.CHANNELS, AEFeature.DENSE_CABLES), EnumSet.noneOf(IntegrationType.class), - PartDenseCableCovered.class) { + CoveredDenseCablePart.class) { @Override public boolean isCable() { return true; } }, - TOGGLE_BUS(EnumSet.of(AEFeature.TOGGLE_BUS), EnumSet.noneOf(IntegrationType.class), PartToggleBus.class), + TOGGLE_BUS(EnumSet.of(AEFeature.TOGGLE_BUS), EnumSet.noneOf(IntegrationType.class), ToggleBusPart.class), INVERTED_TOGGLE_BUS(EnumSet.of(AEFeature.TOGGLE_BUS), EnumSet.noneOf(IntegrationType.class), - PartInvertedToggleBus.class), + InvertedToggleBusPart.class), - CABLE_ANCHOR(EnumSet.of(AEFeature.CABLE_ANCHOR), EnumSet.noneOf(IntegrationType.class), PartCableAnchor.class), + CABLE_ANCHOR(EnumSet.of(AEFeature.CABLE_ANCHOR), EnumSet.noneOf(IntegrationType.class), CableAnchorPart.class), - QUARTZ_FIBER(EnumSet.of(AEFeature.QUARTZ_FIBER), EnumSet.noneOf(IntegrationType.class), PartQuartzFiber.class), + QUARTZ_FIBER(EnumSet.of(AEFeature.QUARTZ_FIBER), EnumSet.noneOf(IntegrationType.class), QuartzFiberPart.class), - MONITOR(EnumSet.of(AEFeature.PANELS), EnumSet.noneOf(IntegrationType.class), PartPanel.class), + MONITOR(EnumSet.of(AEFeature.PANELS), EnumSet.noneOf(IntegrationType.class), PanelPart.class), - SEMI_DARK_MONITOR(EnumSet.of(AEFeature.PANELS), EnumSet.noneOf(IntegrationType.class), PartSemiDarkPanel.class), + SEMI_DARK_MONITOR(EnumSet.of(AEFeature.PANELS), EnumSet.noneOf(IntegrationType.class), SemiDarkPanelPart.class), - DARK_MONITOR(EnumSet.of(AEFeature.PANELS), EnumSet.noneOf(IntegrationType.class), PartDarkPanel.class), + DARK_MONITOR(EnumSet.of(AEFeature.PANELS), EnumSet.noneOf(IntegrationType.class), DarkPanelPart.class), - STORAGE_BUS(EnumSet.of(AEFeature.STORAGE_BUS), EnumSet.noneOf(IntegrationType.class), PartStorageBus.class), + STORAGE_BUS(EnumSet.of(AEFeature.STORAGE_BUS), EnumSet.noneOf(IntegrationType.class), StorageBusPart.class), FLUID_STORAGE_BUS(EnumSet.of(AEFeature.FLUID_STORAGE_BUS), EnumSet.noneOf(IntegrationType.class), - PartFluidStorageBus.class), + FluidStorageBusPart.class), - IMPORT_BUS(EnumSet.of(AEFeature.IMPORT_BUS), EnumSet.noneOf(IntegrationType.class), PartImportBus.class), + IMPORT_BUS(EnumSet.of(AEFeature.IMPORT_BUS), EnumSet.noneOf(IntegrationType.class), ImportBusPart.class), FLUID_IMPORT_BUS(EnumSet.of(AEFeature.FLUID_IMPORT_BUS), EnumSet.noneOf(IntegrationType.class), - PartFluidImportBus.class), + FluidImportBusPart.class), - EXPORT_BUS(EnumSet.of(AEFeature.EXPORT_BUS), EnumSet.noneOf(IntegrationType.class), PartExportBus.class), + EXPORT_BUS(EnumSet.of(AEFeature.EXPORT_BUS), EnumSet.noneOf(IntegrationType.class), ExportBusPart.class), FLUID_EXPORT_BUS(EnumSet.of(AEFeature.FLUID_EXPORT_BUS), EnumSet.noneOf(IntegrationType.class), - PartFluidExportBus.class), + FluidExportBusPart.class), - LEVEL_EMITTER(EnumSet.of(AEFeature.LEVEL_EMITTER), EnumSet.noneOf(IntegrationType.class), PartLevelEmitter.class), + LEVEL_EMITTER(EnumSet.of(AEFeature.LEVEL_EMITTER), EnumSet.noneOf(IntegrationType.class), LevelEmitterPart.class), FLUID_LEVEL_EMITTER(EnumSet.of(AEFeature.FLUID_LEVEL_EMITTER), EnumSet.noneOf(IntegrationType.class), - PartFluidLevelEmitter.class), + FluidLevelEmitterPart.class), ANNIHILATION_PLANE(EnumSet.of(AEFeature.ANNIHILATION_PLANE), EnumSet.noneOf(IntegrationType.class), - PartAnnihilationPlane.class), + AnnihilationPlanePart.class), IDENTITY_ANNIHILATION_PLANE(EnumSet.of(AEFeature.ANNIHILATION_PLANE, AEFeature.IDENTITY_ANNIHILATION_PLANE), - EnumSet.noneOf(IntegrationType.class), PartIdentityAnnihilationPlane.class), + EnumSet.noneOf(IntegrationType.class), IdentityAnnihilationPlanePart.class), FLUID_ANNIHILATION_PLANE(EnumSet.of(AEFeature.FLUID_ANNIHILATION_PLANE), EnumSet.noneOf(IntegrationType.class), - PartFluidAnnihilationPlane.class), + FluidAnnihilationPlanePart.class), FORMATION_PLANE(EnumSet.of(AEFeature.FORMATION_PLANE), EnumSet.noneOf(IntegrationType.class), - PartFormationPlane.class), + FormationPlanePart.class), FLUID_FORMATION_PLANE(EnumSet.of(AEFeature.FLUID_FORMATION_PLANE), EnumSet.noneOf(IntegrationType.class), - PartFluidFormationPlane.class), + FluidFormationPlanePart.class), - PATTERN_TERMINAL(EnumSet.of(AEFeature.PATTERNS), EnumSet.noneOf(IntegrationType.class), PartPatternTerminal.class), + PATTERN_TERMINAL(EnumSet.of(AEFeature.PATTERNS), EnumSet.noneOf(IntegrationType.class), PatternTerminalPart.class), CRAFTING_TERMINAL(EnumSet.of(AEFeature.CRAFTING_TERMINAL), EnumSet.noneOf(IntegrationType.class), - PartCraftingTerminal.class), + CraftingTerminalPart.class), - TERMINAL(EnumSet.of(AEFeature.TERMINAL), EnumSet.noneOf(IntegrationType.class), PartTerminal.class), + TERMINAL(EnumSet.of(AEFeature.TERMINAL), EnumSet.noneOf(IntegrationType.class), TerminalPart.class), STORAGE_MONITOR(EnumSet.of(AEFeature.STORAGE_MONITOR), EnumSet.noneOf(IntegrationType.class), - PartStorageMonitor.class), + StorageMonitorPart.class), CONVERSION_MONITOR(EnumSet.of(AEFeature.PART_CONVERSION_MONITOR), EnumSet.noneOf(IntegrationType.class), - PartConversionMonitor.class), + ConversionMonitorPart.class), - INTERFACE(EnumSet.of(AEFeature.INTERFACE), EnumSet.noneOf(IntegrationType.class), PartInterface.class), + INTERFACE(EnumSet.of(AEFeature.INTERFACE), EnumSet.noneOf(IntegrationType.class), InterfacePart.class), FLUID_INTERFACE(EnumSet.of(AEFeature.FLUID_INTERFACE), EnumSet.noneOf(IntegrationType.class), - PartFluidInterface.class), + FluidInterfacePart.class), P2P_TUNNEL_ME(EnumSet.of(AEFeature.P2P_TUNNEL, AEFeature.P2P_TUNNEL_ME), EnumSet.noneOf(IntegrationType.class), - PartP2PTunnelME.class), + MEP2PTunnelPart.class), P2P_TUNNEL_REDSTONE(EnumSet.of(AEFeature.P2P_TUNNEL, AEFeature.P2P_TUNNEL_REDSTONE), - EnumSet.noneOf(IntegrationType.class), PartP2PRedstone.class), + EnumSet.noneOf(IntegrationType.class), RedstoneP2PTunnelPart.class), P2P_TUNNEL_ITEM(EnumSet.of(AEFeature.P2P_TUNNEL, AEFeature.P2P_TUNNEL_ITEMS), EnumSet.noneOf(IntegrationType.class), - PartP2PItems.class), + ItemP2PTunnelPart.class), P2P_TUNNEL_FLUID(EnumSet.of(AEFeature.P2P_TUNNEL, AEFeature.P2P_TUNNEL_FLUIDS), - EnumSet.noneOf(IntegrationType.class), PartP2PFluids.class), + EnumSet.noneOf(IntegrationType.class), FluidP2PTunnelPart.class), //FIXME P2P_TUNNEL_IC2( 465, "p2p_tunnel_ic2", EnumSet.of( AEFeature.P2P_TUNNEL, AEFeature.P2P_TUNNEL_EU ), EnumSet //FIXME .of( IntegrationType.IC2 ), PartP2PIC2Power.class ), P2P_TUNNEL_LIGHT(EnumSet.of(AEFeature.P2P_TUNNEL, AEFeature.P2P_TUNNEL_LIGHT), - EnumSet.noneOf(IntegrationType.class), PartP2PLight.class), + EnumSet.noneOf(IntegrationType.class), LightP2PTunnelPart.class), P2P_TUNNEL_FE(EnumSet.of(AEFeature.P2P_TUNNEL, AEFeature.P2P_TUNNEL_FE), EnumSet.noneOf(IntegrationType.class), - PartP2PFEPower.class), + FEP2PTunnelPart.class), // P2PTunnelOpenComputers( 468, EnumSet.of( AEFeature.P2PTunnel, // AEFeature.P2PTunnelOpenComputers ), EnumSet.of( @@ -203,10 +201,10 @@ public enum PartType { // ), INTERFACE_TERMINAL(EnumSet.of(AEFeature.INTERFACE_TERMINAL), EnumSet.noneOf(IntegrationType.class), - PartInterfaceTerminal.class), + InterfaceTerminalPart.class), FLUID_TERMINAL(EnumSet.of(AEFeature.FLUID_TERMINAL), EnumSet.noneOf(IntegrationType.class), - PartFluidTerminal.class); + FluidTerminalPart.class); private final Set features; private final Set integrations; diff --git a/src/main/java/appeng/items/storage/BasicItemStorageCell.java b/src/main/java/appeng/items/storage/BasicStorageCellItem.java similarity index 95% rename from src/main/java/appeng/items/storage/BasicItemStorageCell.java rename to src/main/java/appeng/items/storage/BasicStorageCellItem.java index 93a21e9f0..1cae5a15f 100644 --- a/src/main/java/appeng/items/storage/BasicItemStorageCell.java +++ b/src/main/java/appeng/items/storage/BasicStorageCellItem.java @@ -28,12 +28,12 @@ import appeng.api.storage.data.IAEItemStack; import appeng.items.materials.MaterialType; import appeng.util.InventoryAdaptor; -public final class BasicItemStorageCell extends AbstractStorageCell { +public final class BasicStorageCellItem extends AbstractStorageCell { protected final int perType; protected final double idleDrain; - public BasicItemStorageCell(Properties props, final MaterialType whichCell, final int kilobytes) { + public BasicStorageCellItem(Properties props, final MaterialType whichCell, final int kilobytes) { super(props, whichCell, kilobytes); switch (whichCell) { case ITEM_1K_CELL_COMPONENT: diff --git a/src/main/java/appeng/items/storage/ItemCreativeStorageCell.java b/src/main/java/appeng/items/storage/CreativeStorageCellItem.java similarity index 95% rename from src/main/java/appeng/items/storage/ItemCreativeStorageCell.java rename to src/main/java/appeng/items/storage/CreativeStorageCellItem.java index 989f5318c..27b97d300 100644 --- a/src/main/java/appeng/items/storage/ItemCreativeStorageCell.java +++ b/src/main/java/appeng/items/storage/CreativeStorageCellItem.java @@ -37,9 +37,9 @@ import appeng.api.storage.channels.IItemStorageChannel; import appeng.items.AEBaseItem; import appeng.items.contents.CellConfig; -public class ItemCreativeStorageCell extends AEBaseItem implements ICellWorkbenchItem { +public class CreativeStorageCellItem extends AEBaseItem implements ICellWorkbenchItem { - public ItemCreativeStorageCell(Properties props) { + public CreativeStorageCellItem(Properties props) { super(props); } diff --git a/src/main/java/appeng/items/storage/ItemSpatialStorageCell.java b/src/main/java/appeng/items/storage/SpatialStorageCellItem.java similarity index 97% rename from src/main/java/appeng/items/storage/ItemSpatialStorageCell.java rename to src/main/java/appeng/items/storage/SpatialStorageCellItem.java index 109ed2d92..ca7305c1c 100644 --- a/src/main/java/appeng/items/storage/ItemSpatialStorageCell.java +++ b/src/main/java/appeng/items/storage/SpatialStorageCellItem.java @@ -43,12 +43,12 @@ import appeng.items.AEBaseItem; import appeng.spatial.SpatialDimensionManager; import appeng.spatial.StorageHelper; -public class ItemSpatialStorageCell extends AEBaseItem implements ISpatialStorageCell { +public class SpatialStorageCellItem extends AEBaseItem implements ISpatialStorageCell { private static final String TAG_DIMENSION_ID = "dimension_id"; private final int maxRegion; - public ItemSpatialStorageCell(Properties props, final int spatialScale) { + public SpatialStorageCellItem(Properties props, final int spatialScale) { super(props); this.maxRegion = spatialScale; } diff --git a/src/main/java/appeng/items/storage/ItemViewCell.java b/src/main/java/appeng/items/storage/ViewCellItem.java similarity index 96% rename from src/main/java/appeng/items/storage/ItemViewCell.java rename to src/main/java/appeng/items/storage/ViewCellItem.java index 57c5d0346..4a1166251 100644 --- a/src/main/java/appeng/items/storage/ItemViewCell.java +++ b/src/main/java/appeng/items/storage/ViewCellItem.java @@ -38,9 +38,9 @@ import appeng.util.prioritylist.IPartitionList; import appeng.util.prioritylist.MergedPriorityList; import appeng.util.prioritylist.PrecisePriorityList; -public class ItemViewCell extends AEBaseItem implements ICellWorkbenchItem { +public class ViewCellItem extends AEBaseItem implements ICellWorkbenchItem { - public ItemViewCell(Properties properties) { + public ViewCellItem(Properties properties) { super(properties); } @@ -54,7 +54,7 @@ public class ItemViewCell extends AEBaseItem implements ICellWorkbenchItem { continue; } - if ((currentViewCell.getItem() instanceof ItemViewCell)) { + if ((currentViewCell.getItem() instanceof ViewCellItem)) { final IItemList priorityList = AEApi.instance().storage() .getStorageChannel(IItemStorageChannel.class).createList(); diff --git a/src/main/java/appeng/items/tools/ToolBiometricCard.java b/src/main/java/appeng/items/tools/BiometricCardItem.java similarity index 98% rename from src/main/java/appeng/items/tools/ToolBiometricCard.java rename to src/main/java/appeng/items/tools/BiometricCardItem.java index b96795e67..ef7152b2f 100644 --- a/src/main/java/appeng/items/tools/ToolBiometricCard.java +++ b/src/main/java/appeng/items/tools/BiometricCardItem.java @@ -44,8 +44,8 @@ import appeng.api.networking.security.ISecurityRegistry; import appeng.core.localization.GuiText; import appeng.items.AEBaseItem; -public class ToolBiometricCard extends AEBaseItem implements IBiometricCard { - public ToolBiometricCard(Properties properties) { +public class BiometricCardItem extends AEBaseItem implements IBiometricCard { + public BiometricCardItem(Properties properties) { super(properties); } diff --git a/src/main/java/appeng/items/tools/ToolMemoryCard.java b/src/main/java/appeng/items/tools/MemoryCardItem.java similarity index 98% rename from src/main/java/appeng/items/tools/ToolMemoryCard.java rename to src/main/java/appeng/items/tools/MemoryCardItem.java index 40c0d5cf1..3fcb71284 100644 --- a/src/main/java/appeng/items/tools/ToolMemoryCard.java +++ b/src/main/java/appeng/items/tools/MemoryCardItem.java @@ -46,13 +46,13 @@ import appeng.core.localization.PlayerMessages; import appeng.items.AEBaseItem; import appeng.util.Platform; -public class ToolMemoryCard extends AEBaseItem implements IMemoryCard { +public class MemoryCardItem extends AEBaseItem implements IMemoryCard { private static final AEColor[] DEFAULT_COLOR_CODE = new AEColor[] { AEColor.TRANSPARENT, AEColor.TRANSPARENT, AEColor.TRANSPARENT, AEColor.TRANSPARENT, AEColor.TRANSPARENT, AEColor.TRANSPARENT, AEColor.TRANSPARENT, AEColor.TRANSPARENT, }; - public ToolMemoryCard(Properties properties) { + public MemoryCardItem(Properties properties) { super(properties); } diff --git a/src/main/java/appeng/items/tools/ToolNetworkTool.java b/src/main/java/appeng/items/tools/NetworkToolItem.java similarity index 90% rename from src/main/java/appeng/items/tools/ToolNetworkTool.java rename to src/main/java/appeng/items/tools/NetworkToolItem.java index 2b51f2610..dfe524a89 100644 --- a/src/main/java/appeng/items/tools/ToolNetworkTool.java +++ b/src/main/java/appeng/items/tools/NetworkToolItem.java @@ -46,18 +46,18 @@ import appeng.api.util.INetworkToolAgent; import appeng.container.AEBaseContainer; import appeng.container.ContainerLocator; import appeng.container.ContainerOpener; -import appeng.container.implementations.ContainerNetworkStatus; -import appeng.container.implementations.ContainerNetworkTool; +import appeng.container.implementations.NetworkStatusContainer; +import appeng.container.implementations.NetworkToolContainer; import appeng.core.AppEng; import appeng.core.sync.network.NetworkHandler; -import appeng.core.sync.packets.PacketClick; +import appeng.core.sync.packets.ClickPacket; import appeng.items.AEBaseItem; import appeng.items.contents.NetworkToolViewer; import appeng.util.Platform; -public class ToolNetworkTool extends AEBaseItem implements IGuiItem, IAEWrench { +public class NetworkToolItem extends AEBaseItem implements IGuiItem, IAEWrench { - public ToolNetworkTool(Properties properties) { + public NetworkToolItem(Properties properties) { super(properties); } @@ -77,7 +77,7 @@ public class ToolNetworkTool extends AEBaseItem implements IGuiItem, IAEWrench { final RayTraceResult mop = AppEng.proxy.getRTR(); if (mop == null || mop.getType() == RayTraceResult.Type.MISS) { - NetworkHandler.instance().sendToServer(new PacketClick(hand)); + NetworkHandler.instance().sendToServer(new ClickPacket(hand)); } } @@ -105,7 +105,7 @@ public class ToolNetworkTool extends AEBaseItem implements IGuiItem, IAEWrench { } if (Platform.isClient()) { - NetworkHandler.instance().sendToServer(new PacketClick(context)); + NetworkHandler.instance().sendToServer(new ClickPacket(context)); } return ActionResultType.SUCCESS; @@ -147,10 +147,10 @@ public class ToolNetworkTool extends AEBaseItem implements IGuiItem, IAEWrench { final TileEntity te = w.getTileEntity(pos); if (te instanceof IGridHost) { - ContainerOpener.openContainer(ContainerNetworkStatus.TYPE, p, + ContainerOpener.openContainer(NetworkStatusContainer.TYPE, p, ContainerLocator.forItemUseContext(useContext)); } else { - ContainerOpener.openContainer(ContainerNetworkTool.TYPE, p, ContainerLocator.forHand(p, hand)); + ContainerOpener.openContainer(NetworkToolContainer.TYPE, p, ContainerLocator.forHand(p, hand)); } return true; diff --git a/src/main/java/appeng/items/tools/powered/ToolChargedStaff.java b/src/main/java/appeng/items/tools/powered/ChargedStaffItem.java similarity index 91% rename from src/main/java/appeng/items/tools/powered/ToolChargedStaff.java rename to src/main/java/appeng/items/tools/powered/ChargedStaffItem.java index 70eabee55..187b59a3f 100644 --- a/src/main/java/appeng/items/tools/powered/ToolChargedStaff.java +++ b/src/main/java/appeng/items/tools/powered/ChargedStaffItem.java @@ -27,13 +27,13 @@ import net.minecraft.util.math.AxisAlignedBB; import appeng.api.config.Actionable; import appeng.core.AEConfig; import appeng.core.AppEng; -import appeng.core.sync.packets.PacketLightning; +import appeng.core.sync.packets.LightningPacket; import appeng.items.tools.powered.powersink.AEBasePoweredItem; import appeng.util.Platform; -public class ToolChargedStaff extends AEBasePoweredItem { +public class ChargedStaffItem extends AEBasePoweredItem { - public ToolChargedStaff(Item.Properties props) { + public ChargedStaffItem(Item.Properties props) { super(AEConfig.instance().getChargedStaffBattery(), props); } @@ -48,7 +48,7 @@ public class ToolChargedStaff extends AEBasePoweredItem { final float dy = (float) (Platform.getRandomFloat() * target.getHeight() + entityBoundingBox.minY); final float dz = (float) (Platform.getRandomFloat() * target.getWidth() + entityBoundingBox.minZ); AppEng.proxy.sendToAllNearExcept(null, dx, dy, dz, 32.0, target.world, - new PacketLightning(dx, dy, dz)); + new LightningPacket(dx, dy, dz)); } } target.attackEntityFrom(DamageSource.MAGIC, 6); diff --git a/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java b/src/main/java/appeng/items/tools/powered/ColorApplicatorItem.java similarity index 95% rename from src/main/java/appeng/items/tools/powered/ToolColorApplicator.java rename to src/main/java/appeng/items/tools/powered/ColorApplicatorItem.java index bfe3697ef..e49e4bb24 100644 --- a/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java +++ b/src/main/java/appeng/items/tools/powered/ColorApplicatorItem.java @@ -63,8 +63,8 @@ import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IItemList; import appeng.api.util.AEColor; import appeng.api.util.DimensionalCoord; -import appeng.block.networking.BlockCableBus; -import appeng.block.paint.BlockPaint; +import appeng.block.networking.CableBusBlock; +import appeng.block.paint.PaintSplotchesBlock; import appeng.core.AEConfig; import appeng.core.AppEng; import appeng.core.localization.GuiText; @@ -72,14 +72,14 @@ import appeng.helpers.IMouseWheelItem; import appeng.hooks.IBlockTool; import appeng.items.contents.CellConfig; import appeng.items.contents.CellUpgrades; -import appeng.items.misc.ItemPaintBall; +import appeng.items.misc.PaintBallItem; import appeng.items.tools.powered.powersink.AEBasePoweredItem; import appeng.me.helpers.BaseActionSource; -import appeng.tile.misc.TilePaint; +import appeng.tile.misc.PaintSplotchesTileEntity; import appeng.util.Platform; import appeng.util.item.AEItemStack; -public class ToolColorApplicator extends AEBasePoweredItem +public class ColorApplicatorItem extends AEBasePoweredItem implements IStorageCell, IItemGroup, IBlockTool, IMouseWheelItem { private static final Map TAG_TO_COLOR = ImmutableMap.builder() @@ -102,7 +102,7 @@ public class ToolColorApplicator extends AEBasePoweredItem private static final String TAG_COLOR = "color"; - public ToolColorApplicator(Item.Properties props) { + public ColorApplicatorItem(Item.Properties props) { super(AEConfig.instance().getColorApplicatorBattery(), props); addPropertyOverride(new ResourceLocation(AppEng.MOD_ID, "colored"), (itemStack, world, entity) -> { // If the stack has no color, don't use the colored model since the impact of @@ -165,11 +165,11 @@ public class ToolColorApplicator extends AEBasePoweredItem // clean paint balls.. final Block testBlk = w.getBlockState(pos.offset(side)).getBlock(); final TileEntity painted = w.getTileEntity(pos.offset(side)); - if (this.getAECurrentPower(is) > powerPerUse && testBlk instanceof BlockPaint - && painted instanceof TilePaint) { + if (this.getAECurrentPower(is) > powerPerUse && testBlk instanceof PaintSplotchesBlock + && painted instanceof PaintSplotchesTileEntity) { inv.extractItems(AEItemStack.fromItemStack(paintBall), Actionable.MODULATE, new BaseActionSource()); this.extractAEPower(is, powerPerUse, Actionable.MODULATE); - ((TilePaint) painted).cleanSide(side.getOpposite()); + ((PaintSplotchesTileEntity) painted).cleanSide(side.getOpposite()); return ActionResultType.SUCCESS; } } else if (!paintBall.isEmpty()) { @@ -219,8 +219,8 @@ public class ToolColorApplicator extends AEBasePoweredItem return AEColor.TRANSPARENT; } - if (paintBall.getItem() instanceof ItemPaintBall) { - final ItemPaintBall ipb = (ItemPaintBall) paintBall.getItem(); + if (paintBall.getItem() instanceof PaintBallItem) { + final PaintBallItem ipb = (PaintBallItem) paintBall.getItem(); return ipb.getColor(); } else { for (Map.Entry entry : TAG_TO_COLOR.entrySet()) { @@ -331,8 +331,8 @@ public class ToolColorApplicator extends AEBasePoweredItem return w.setBlockState(pos, newState); } - if (blk instanceof BlockCableBus && p != null) { - return ((BlockCableBus) blk).recolorBlock(w, pos, side, newColor.dye, p); + if (blk instanceof CableBusBlock && p != null) { + return ((CableBusBlock) blk).recolorBlock(w, pos, side, newColor.dye, p); } return blk.recolorBlock(state, w, pos, side, newColor.dye); diff --git a/src/main/java/appeng/items/tools/powered/ToolColorApplicatorRendering.java b/src/main/java/appeng/items/tools/powered/ColorApplicatorItemRendering.java similarity index 77% rename from src/main/java/appeng/items/tools/powered/ToolColorApplicatorRendering.java rename to src/main/java/appeng/items/tools/powered/ColorApplicatorItemRendering.java index 0775b7ba5..b3d40dfef 100644 --- a/src/main/java/appeng/items/tools/powered/ToolColorApplicatorRendering.java +++ b/src/main/java/appeng/items/tools/powered/ColorApplicatorItemRendering.java @@ -1,17 +1,14 @@ package appeng.items.tools.powered; -import net.minecraft.client.renderer.model.ModelResourceLocation; import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import appeng.api.util.AEColor; import appeng.bootstrap.IItemRendering; import appeng.bootstrap.ItemRenderingCustomizer; -import appeng.core.AppEng; -public class ToolColorApplicatorRendering extends ItemRenderingCustomizer { +public class ColorApplicatorItemRendering extends ItemRenderingCustomizer { @Override @OnlyIn(Dist.CLIENT) @@ -24,7 +21,7 @@ public class ToolColorApplicatorRendering extends ItemRenderingCustomizer { return -1; } - final AEColor col = ((ToolColorApplicator) itemStack.getItem()).getActiveColor(itemStack); + final AEColor col = ((ColorApplicatorItem) itemStack.getItem()).getActiveColor(itemStack); if (col == null) { return -1; diff --git a/src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java b/src/main/java/appeng/items/tools/powered/EntropyManipulatorItem.java similarity index 98% rename from src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java rename to src/main/java/appeng/items/tools/powered/EntropyManipulatorItem.java index d4efc4e67..2eb1c251e 100644 --- a/src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java +++ b/src/main/java/appeng/items/tools/powered/EntropyManipulatorItem.java @@ -45,7 +45,7 @@ import net.minecraft.world.server.ServerWorld; import appeng.api.config.Actionable; import appeng.api.util.DimensionalCoord; -import appeng.block.misc.BlockTinyTNT; +import appeng.block.misc.TinyTNTBlock; import appeng.container.ContainerNull; import appeng.core.AEConfig; import appeng.hooks.IBlockTool; @@ -53,11 +53,11 @@ import appeng.items.tools.powered.powersink.AEBasePoweredItem; import appeng.util.InWorldToolOperationResult; import appeng.util.Platform; -public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockTool { +public class EntropyManipulatorItem extends AEBasePoweredItem implements IBlockTool { private final Map heatUp; private final Map coolDown; - public ToolEntropyManipulator(Item.Properties props) { + public EntropyManipulatorItem(Item.Properties props) { super(AEConfig.instance().getEntropyManipulatorBattery(), props); this.heatUp = new HashMap<>(); @@ -261,9 +261,9 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT return ActionResultType.SUCCESS; } - if (block instanceof BlockTinyTNT) { + if (block instanceof TinyTNTBlock) { w.removeBlock(pos, false); - ((BlockTinyTNT) block).startFuse(w, pos, p); + ((TinyTNTBlock) block).startFuse(w, pos, p); return ActionResultType.SUCCESS; } diff --git a/src/main/java/appeng/items/tools/powered/ToolMatterCannon.java b/src/main/java/appeng/items/tools/powered/MatterCannonItem.java similarity index 96% rename from src/main/java/appeng/items/tools/powered/ToolMatterCannon.java rename to src/main/java/appeng/items/tools/powered/MatterCannonItem.java index eee8e0618..5c38b0ecf 100644 --- a/src/main/java/appeng/items/tools/powered/ToolMatterCannon.java +++ b/src/main/java/appeng/items/tools/powered/MatterCannonItem.java @@ -69,26 +69,26 @@ import appeng.core.AELog; import appeng.core.AppEng; import appeng.core.localization.PlayerMessages; import appeng.core.sync.network.NetworkHandler; -import appeng.core.sync.packets.PacketMatterCannon; +import appeng.core.sync.packets.MatterCannonPacket; import appeng.hooks.TickHandler; import appeng.hooks.TickHandler.PlayerColor; import appeng.items.contents.CellConfig; import appeng.items.contents.CellUpgrades; -import appeng.items.misc.ItemPaintBall; +import appeng.items.misc.PaintBallItem; import appeng.items.tools.powered.powersink.AEBasePoweredItem; import appeng.me.helpers.PlayerSource; -import appeng.tile.misc.TilePaint; +import appeng.tile.misc.PaintSplotchesTileEntity; import appeng.util.LookDirection; import appeng.util.Platform; -public class ToolMatterCannon extends AEBasePoweredItem implements IStorageCell { +public class MatterCannonItem extends AEBasePoweredItem implements IStorageCell { /** * AE energy units consumer per shot fired. */ private static final int ENERGY_PER_SHOT = 1600; - public ToolMatterCannon(Item.Properties props) { + public MatterCannonItem(Item.Properties props) { super(AEConfig.instance().getMatterCannonBattery(), props); } @@ -155,7 +155,7 @@ public class ToolMatterCannon extends AEBasePoweredItem implements IStorageCell< final float penetration = AEApi.instance().registries().matterCannon().getPenetration(ammo); // 196.96655f; if (penetration <= 0) { final ItemStack type = aeAmmo.asItemStackRepresentation(); - if (type.getItem() instanceof ItemPaintBall) { + if (type.getItem() instanceof PaintBallItem) { this.shootPaintBalls(type, w, p, rayFrom, rayTo, direction, d0, d1, d2); } return new ActionResult<>(ActionResultType.SUCCESS, p.getHeldItem(hand)); @@ -227,15 +227,15 @@ public class ToolMatterCannon extends AEBasePoweredItem implements IStorageCell< try { AppEng.proxy.sendToAllNearExcept(null, d0, d1, d2, 128, w, - new PacketMatterCannon(d0, d1, d2, (float) direction.x, (float) direction.y, (float) direction.z, + new MatterCannonPacket(d0, d1, d2, (float) direction.x, (float) direction.y, (float) direction.z, (byte) (pos.getType() == RayTraceResult.Type.MISS ? 32 : pos.getHitVec().squareDistanceTo(vec) + 1))); } catch (final Exception err) { AELog.debug(err); } - if (pos.getType() != RayTraceResult.Type.MISS && type != null && type.getItem() instanceof ItemPaintBall) { - final ItemPaintBall ipb = (ItemPaintBall) type.getItem(); + if (pos.getType() != RayTraceResult.Type.MISS && type != null && type.getItem() instanceof PaintBallItem) { + final PaintBallItem ipb = (PaintBallItem) type.getItem(); final AEColor col = ipb.getColor(); // boolean lit = ipb.isLumen( type ); @@ -272,9 +272,9 @@ public class ToolMatterCannon extends AEBasePoweredItem implements IStorageCell< } final TileEntity te = w.getTileEntity(hitPos); - if (te instanceof TilePaint) { + if (te instanceof PaintSplotchesTileEntity) { final Vec3d hp = pos.getHitVec().subtract(hitPos.getX(), hitPos.getY(), hitPos.getZ()); - ((TilePaint) te).addBlot(type, side.getOpposite(), hp); + ((PaintSplotchesTileEntity) te).addBlot(type, side.getOpposite(), hp); } } } @@ -336,7 +336,7 @@ public class ToolMatterCannon extends AEBasePoweredItem implements IStorageCell< try { AppEng.proxy.sendToAllNearExcept(null, d0, d1, d2, 128, w, - new PacketMatterCannon(d0, d1, d2, (float) direction.x, (float) direction.y, + new MatterCannonPacket(d0, d1, d2, (float) direction.x, (float) direction.y, (float) direction.z, (byte) (pos.getType() == RayTraceResult.Type.MISS ? 32 : pos.getHitVec().squareDistanceTo(vec) + 1))); } catch (final Exception err) { @@ -445,7 +445,7 @@ public class ToolMatterCannon extends AEBasePoweredItem implements IStorageCell< return false; } - if (requestedAddition.getItem() instanceof ItemPaintBall) { + if (requestedAddition.getItem() instanceof PaintBallItem) { return false; } diff --git a/src/main/java/appeng/items/tools/powered/ToolPortableCell.java b/src/main/java/appeng/items/tools/powered/PortableCellItem.java similarity index 95% rename from src/main/java/appeng/items/tools/powered/ToolPortableCell.java rename to src/main/java/appeng/items/tools/powered/PortableCellItem.java index 0a9845029..4cfd5c78b 100644 --- a/src/main/java/appeng/items/tools/powered/ToolPortableCell.java +++ b/src/main/java/appeng/items/tools/powered/PortableCellItem.java @@ -47,7 +47,7 @@ import appeng.api.storage.channels.IItemStorageChannel; import appeng.api.storage.data.IAEItemStack; import appeng.container.ContainerLocator; import appeng.container.ContainerOpener; -import appeng.container.implementations.ContainerMEPortableCell; +import appeng.container.implementations.MEPortableCellContainer; import appeng.core.AEConfig; import appeng.core.localization.GuiText; import appeng.items.contents.CellConfig; @@ -55,14 +55,14 @@ import appeng.items.contents.CellUpgrades; import appeng.items.contents.PortableCellViewer; import appeng.items.tools.powered.powersink.AEBasePoweredItem; -public class ToolPortableCell extends AEBasePoweredItem implements IStorageCell, IGuiItem, IItemGroup { - public ToolPortableCell(Item.Properties props) { +public class PortableCellItem extends AEBasePoweredItem implements IStorageCell, IGuiItem, IItemGroup { + public PortableCellItem(Item.Properties props) { super(AEConfig.instance().getPortableCellBattery(), props); } @Override public ActionResult onItemRightClick(final World w, final PlayerEntity player, final Hand hand) { - ContainerOpener.openContainer(ContainerMEPortableCell.TYPE, player, ContainerLocator.forHand(player, hand)); + ContainerOpener.openContainer(MEPortableCellContainer.TYPE, player, ContainerLocator.forHand(player, hand)); return new ActionResult<>(ActionResultType.SUCCESS, player.getHeldItem(hand)); } diff --git a/src/main/java/appeng/items/tools/powered/ToolWirelessTerminal.java b/src/main/java/appeng/items/tools/powered/WirelessTerminalItem.java similarity index 97% rename from src/main/java/appeng/items/tools/powered/ToolWirelessTerminal.java rename to src/main/java/appeng/items/tools/powered/WirelessTerminalItem.java index 6cf40f4a9..2c78defd0 100644 --- a/src/main/java/appeng/items/tools/powered/ToolWirelessTerminal.java +++ b/src/main/java/appeng/items/tools/powered/WirelessTerminalItem.java @@ -47,9 +47,9 @@ import appeng.core.localization.GuiText; import appeng.items.tools.powered.powersink.AEBasePoweredItem; import appeng.util.ConfigManager; -public class ToolWirelessTerminal extends AEBasePoweredItem implements IWirelessTermHandler { +public class WirelessTerminalItem extends AEBasePoweredItem implements IWirelessTermHandler { - public ToolWirelessTerminal(Item.Properties props) { + public WirelessTerminalItem(Item.Properties props) { super(AEConfig.instance().getWirelessTerminalBattery(), props); } diff --git a/src/main/java/appeng/items/tools/quartz/ToolQuartzAxe.java b/src/main/java/appeng/items/tools/quartz/QuartzAxeItem.java similarity index 92% rename from src/main/java/appeng/items/tools/quartz/ToolQuartzAxe.java rename to src/main/java/appeng/items/tools/quartz/QuartzAxeItem.java index a5d70ed2f..e6fcd8184 100644 --- a/src/main/java/appeng/items/tools/quartz/ToolQuartzAxe.java +++ b/src/main/java/appeng/items/tools/quartz/QuartzAxeItem.java @@ -26,10 +26,10 @@ import net.minecraft.item.ItemTier; import appeng.api.features.AEFeature; import appeng.util.Platform; -public class ToolQuartzAxe extends AxeItem { +public class QuartzAxeItem extends AxeItem { private final AEFeature type; - public ToolQuartzAxe(Item.Properties props, final AEFeature type) { + public QuartzAxeItem(Item.Properties props, final AEFeature type) { super(ItemTier.IRON, 6.0F, -3.1F, props); this.type = type; } diff --git a/src/main/java/appeng/items/tools/quartz/ToolQuartzCuttingKnife.java b/src/main/java/appeng/items/tools/quartz/QuartzCuttingKnifeItem.java similarity index 90% rename from src/main/java/appeng/items/tools/quartz/ToolQuartzCuttingKnife.java rename to src/main/java/appeng/items/tools/quartz/QuartzCuttingKnifeItem.java index 0a1f43660..9d070f2f4 100644 --- a/src/main/java/appeng/items/tools/quartz/ToolQuartzCuttingKnife.java +++ b/src/main/java/appeng/items/tools/quartz/QuartzCuttingKnifeItem.java @@ -33,15 +33,15 @@ import appeng.api.implementations.guiobjects.IGuiItem; import appeng.api.implementations.guiobjects.IGuiItemObject; import appeng.container.ContainerLocator; import appeng.container.ContainerOpener; -import appeng.container.implementations.ContainerQuartzKnife; +import appeng.container.implementations.QuartzKnifeContainer; import appeng.items.AEBaseItem; import appeng.items.contents.QuartzKnifeObj; import appeng.util.Platform; -public class ToolQuartzCuttingKnife extends AEBaseItem implements IGuiItem { +public class QuartzCuttingKnifeItem extends AEBaseItem implements IGuiItem { private final AEFeature type; - public ToolQuartzCuttingKnife(Item.Properties props, final AEFeature type) { + public QuartzCuttingKnifeItem(Item.Properties props, final AEFeature type) { super(props); this.type = type; } @@ -50,7 +50,7 @@ public class ToolQuartzCuttingKnife extends AEBaseItem implements IGuiItem { public ActionResultType onItemUse(ItemUseContext context) { PlayerEntity player = context.getPlayer(); if (Platform.isServer() && player != null) { - ContainerOpener.openContainer(ContainerQuartzKnife.TYPE, context.getPlayer(), + ContainerOpener.openContainer(QuartzKnifeContainer.TYPE, context.getPlayer(), ContainerLocator.forItemUseContext(context)); } return ActionResultType.SUCCESS; @@ -59,7 +59,7 @@ public class ToolQuartzCuttingKnife extends AEBaseItem implements IGuiItem { @Override public ActionResult onItemRightClick(final World w, final PlayerEntity p, final Hand hand) { if (Platform.isServer()) { - ContainerOpener.openContainer(ContainerQuartzKnife.TYPE, p, ContainerLocator.forHand(p, hand)); + ContainerOpener.openContainer(QuartzKnifeContainer.TYPE, p, ContainerLocator.forHand(p, hand)); } p.swingArm(hand); return new ActionResult<>(ActionResultType.SUCCESS, p.getHeldItem(hand)); diff --git a/src/main/java/appeng/items/tools/quartz/ToolQuartzHoe.java b/src/main/java/appeng/items/tools/quartz/QuartzHoeItem.java similarity index 92% rename from src/main/java/appeng/items/tools/quartz/ToolQuartzHoe.java rename to src/main/java/appeng/items/tools/quartz/QuartzHoeItem.java index 8cd663981..dc17a8d5a 100644 --- a/src/main/java/appeng/items/tools/quartz/ToolQuartzHoe.java +++ b/src/main/java/appeng/items/tools/quartz/QuartzHoeItem.java @@ -26,10 +26,10 @@ import net.minecraft.item.ItemTier; import appeng.api.features.AEFeature; import appeng.util.Platform; -public class ToolQuartzHoe extends HoeItem { +public class QuartzHoeItem extends HoeItem { private final AEFeature type; - public ToolQuartzHoe(Item.Properties props, final AEFeature type) { + public QuartzHoeItem(Item.Properties props, final AEFeature type) { super(ItemTier.IRON, -1.0F, props); this.type = type; } diff --git a/src/main/java/appeng/items/tools/quartz/ToolQuartzPickaxe.java b/src/main/java/appeng/items/tools/quartz/QuartzPickaxeItem.java similarity index 91% rename from src/main/java/appeng/items/tools/quartz/ToolQuartzPickaxe.java rename to src/main/java/appeng/items/tools/quartz/QuartzPickaxeItem.java index 84e861824..96eeb781d 100644 --- a/src/main/java/appeng/items/tools/quartz/ToolQuartzPickaxe.java +++ b/src/main/java/appeng/items/tools/quartz/QuartzPickaxeItem.java @@ -26,10 +26,10 @@ import net.minecraft.item.PickaxeItem; import appeng.api.features.AEFeature; import appeng.util.Platform; -public class ToolQuartzPickaxe extends PickaxeItem { +public class QuartzPickaxeItem extends PickaxeItem { private final AEFeature type; - public ToolQuartzPickaxe(Item.Properties props, final AEFeature type) { + public QuartzPickaxeItem(Item.Properties props, final AEFeature type) { super(ItemTier.IRON, 1, -2.8F, props); this.type = type; } diff --git a/src/main/java/appeng/items/tools/quartz/ToolQuartzSpade.java b/src/main/java/appeng/items/tools/quartz/QuartzSpadeItem.java similarity index 92% rename from src/main/java/appeng/items/tools/quartz/ToolQuartzSpade.java rename to src/main/java/appeng/items/tools/quartz/QuartzSpadeItem.java index 22b55b11e..bb650dda1 100644 --- a/src/main/java/appeng/items/tools/quartz/ToolQuartzSpade.java +++ b/src/main/java/appeng/items/tools/quartz/QuartzSpadeItem.java @@ -26,10 +26,10 @@ import net.minecraft.item.ShovelItem; import appeng.api.features.AEFeature; import appeng.util.Platform; -public class ToolQuartzSpade extends ShovelItem { +public class QuartzSpadeItem extends ShovelItem { private final AEFeature type; - public ToolQuartzSpade(Item.Properties props, final AEFeature type) { + public QuartzSpadeItem(Item.Properties props, final AEFeature type) { super(ItemTier.IRON, 1.5F, -3.0F, props); this.type = type; } diff --git a/src/main/java/appeng/items/tools/quartz/ToolQuartzSword.java b/src/main/java/appeng/items/tools/quartz/QuartzSwordItem.java similarity index 92% rename from src/main/java/appeng/items/tools/quartz/ToolQuartzSword.java rename to src/main/java/appeng/items/tools/quartz/QuartzSwordItem.java index 0e93f1d9a..1832eceb6 100644 --- a/src/main/java/appeng/items/tools/quartz/ToolQuartzSword.java +++ b/src/main/java/appeng/items/tools/quartz/QuartzSwordItem.java @@ -26,10 +26,10 @@ import net.minecraft.item.SwordItem; import appeng.api.features.AEFeature; import appeng.util.Platform; -public class ToolQuartzSword extends SwordItem { +public class QuartzSwordItem extends SwordItem { private final AEFeature type; - public ToolQuartzSword(Item.Properties props, AEFeature type) { + public QuartzSwordItem(Item.Properties props, AEFeature type) { super(ItemTier.IRON, 3, -2.4F, props); this.type = type; } diff --git a/src/main/java/appeng/items/tools/quartz/ToolQuartzWrench.java b/src/main/java/appeng/items/tools/quartz/QuartzWrenchItem.java similarity index 95% rename from src/main/java/appeng/items/tools/quartz/ToolQuartzWrench.java rename to src/main/java/appeng/items/tools/quartz/QuartzWrenchItem.java index 3619750dc..f6c476ccb 100644 --- a/src/main/java/appeng/items/tools/quartz/ToolQuartzWrench.java +++ b/src/main/java/appeng/items/tools/quartz/QuartzWrenchItem.java @@ -32,9 +32,9 @@ import appeng.block.AEBaseBlock; import appeng.items.AEBaseItem; import appeng.util.Platform; -public class ToolQuartzWrench extends AEBaseItem implements IAEWrench { +public class QuartzWrenchItem extends AEBaseItem implements IAEWrench { - public ToolQuartzWrench(Item.Properties props) { + public QuartzWrenchItem(Item.Properties props) { super(props); } diff --git a/src/main/java/appeng/me/cache/CraftingGridCache.java b/src/main/java/appeng/me/cache/CraftingGridCache.java index 44aaa6918..d73d4da90 100644 --- a/src/main/java/appeng/me/cache/CraftingGridCache.java +++ b/src/main/java/appeng/me/cache/CraftingGridCache.java @@ -83,8 +83,8 @@ import appeng.crafting.CraftingWatcher; import appeng.me.cluster.implementations.CraftingCPUCluster; import appeng.me.helpers.BaseActionSource; import appeng.me.helpers.GenericInterestManager; -import appeng.tile.crafting.TileCraftingStorageTile; -import appeng.tile.crafting.TileCraftingTile; +import appeng.tile.crafting.CraftingStorageTileEntity; +import appeng.tile.crafting.CraftingTileEntity; public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper, ICellProvider, IMEInventoryHandler { @@ -163,7 +163,7 @@ public class CraftingGridCache } } - if (machine instanceof TileCraftingTile) { + if (machine instanceof CraftingTileEntity) { this.updateList = true; } @@ -190,7 +190,7 @@ public class CraftingGridCache } } - if (machine instanceof TileCraftingTile) { + if (machine instanceof CraftingTileEntity) { this.updateList = true; } @@ -264,8 +264,8 @@ public class CraftingGridCache private void updateCPUClusters() { this.craftingCPUClusters.clear(); - for (final IGridNode cst : this.grid.getMachines(TileCraftingStorageTile.class)) { - final TileCraftingStorageTile tile = (TileCraftingStorageTile) cst.getMachine(); + for (final IGridNode cst : this.grid.getMachines(CraftingStorageTileEntity.class)) { + final CraftingStorageTileEntity tile = (CraftingStorageTileEntity) cst.getMachine(); final CraftingCPUCluster cluster = (CraftingCPUCluster) tile.getCluster(); if (cluster != null) { this.craftingCPUClusters.add(cluster); diff --git a/src/main/java/appeng/me/cache/P2PCache.java b/src/main/java/appeng/me/cache/P2PCache.java index b36db03d6..7c1b7408a 100644 --- a/src/main/java/appeng/me/cache/P2PCache.java +++ b/src/main/java/appeng/me/cache/P2PCache.java @@ -36,16 +36,16 @@ import appeng.api.networking.events.MENetworkPowerStatusChange; import appeng.api.networking.ticking.ITickManager; import appeng.core.AELog; import appeng.me.cache.helpers.TunnelCollection; -import appeng.parts.p2p.PartP2PTunnel; -import appeng.parts.p2p.PartP2PTunnelME; +import appeng.parts.p2p.P2PTunnelPart; +import appeng.parts.p2p.MEP2PTunnelPart; public class P2PCache implements IGridCache { - private static final TunnelCollection NULL_COLLECTION = new TunnelCollection(null, + private static final TunnelCollection NULL_COLLECTION = new TunnelCollection(null, null); private final IGrid myGrid; - private final HashMap inputs = new HashMap<>(); - private final Multimap outputs = LinkedHashMultimap.create(); + private final HashMap inputs = new HashMap<>(); + private final Multimap outputs = LinkedHashMultimap.create(); private final Random frequencyGenerator; public P2PCache(final IGrid g) { @@ -56,8 +56,8 @@ public class P2PCache implements IGridCache { @MENetworkEventSubscribe public void bootComplete(final MENetworkBootingStatusChange bootStatus) { final ITickManager tm = this.myGrid.getCache(ITickManager.class); - for (final PartP2PTunnel me : this.inputs.values()) { - if (me instanceof PartP2PTunnelME) { + for (final P2PTunnelPart me : this.inputs.values()) { + if (me instanceof MEP2PTunnelPart) { tm.wakeDevice(me.getGridNode()); } } @@ -66,8 +66,8 @@ public class P2PCache implements IGridCache { @MENetworkEventSubscribe public void bootComplete(final MENetworkPowerStatusChange power) { final ITickManager tm = this.myGrid.getCache(ITickManager.class); - for (final PartP2PTunnel me : this.inputs.values()) { - if (me instanceof PartP2PTunnelME) { + for (final P2PTunnelPart me : this.inputs.values()) { + if (me instanceof MEP2PTunnelPart) { tm.wakeDevice(me.getGridNode()); } } @@ -80,14 +80,14 @@ public class P2PCache implements IGridCache { @Override public void removeNode(final IGridNode node, final IGridHost machine) { - if (machine instanceof PartP2PTunnel) { - if (machine instanceof PartP2PTunnelME) { + if (machine instanceof P2PTunnelPart) { + if (machine instanceof MEP2PTunnelPart) { if (!node.hasFlag(GridFlags.REQUIRE_CHANNEL)) { return; } } - final PartP2PTunnel t = (PartP2PTunnel) machine; + final P2PTunnelPart t = (P2PTunnelPart) machine; // AELog.info( "rmv-" + (t.output ? "output: " : "input: ") + t.freq ); if (t.isOutput()) { @@ -102,14 +102,14 @@ public class P2PCache implements IGridCache { @Override public void addNode(final IGridNode node, final IGridHost machine) { - if (machine instanceof PartP2PTunnel) { - if (machine instanceof PartP2PTunnelME) { + if (machine instanceof P2PTunnelPart) { + if (machine instanceof MEP2PTunnelPart) { if (!node.hasFlag(GridFlags.REQUIRE_CHANNEL)) { return; } } - final PartP2PTunnel t = (PartP2PTunnel) machine; + final P2PTunnelPart t = (P2PTunnelPart) machine; // AELog.info( "add-" + (t.output ? "output: " : "input: ") + t.freq ); if (t.isOutput()) { @@ -138,14 +138,14 @@ public class P2PCache implements IGridCache { } private void updateTunnel(final short freq, final boolean updateOutputs, final boolean configChange) { - for (final PartP2PTunnel p : this.outputs.get(freq)) { + for (final P2PTunnelPart p : this.outputs.get(freq)) { if (configChange) { p.onTunnelConfigChange(); } p.onTunnelNetworkChange(); } - final PartP2PTunnel in = this.inputs.get(freq); + final P2PTunnelPart in = this.inputs.get(freq); if (in != null) { if (configChange) { in.onTunnelConfigChange(); @@ -154,7 +154,7 @@ public class P2PCache implements IGridCache { } } - public void updateFreq(final PartP2PTunnel t, final short newFrequency) { + public void updateFreq(final P2PTunnelPart t, final short newFrequency) { if (this.outputs.containsValue(t)) { this.outputs.remove(t.getFrequency(), t); } @@ -192,14 +192,14 @@ public class P2PCache implements IGridCache { return newFrequency; } - public TunnelCollection getOutputs(final short freq, final Class c) { - final PartP2PTunnel in = this.inputs.get(freq); + public TunnelCollection getOutputs(final short freq, final Class c) { + final P2PTunnelPart in = this.inputs.get(freq); if (in == null) { return NULL_COLLECTION; } - final TunnelCollection out = this.inputs.get(freq).getCollection(this.outputs.get(freq), c); + final TunnelCollection out = this.inputs.get(freq).getCollection(this.outputs.get(freq), c); if (out == null) { return NULL_COLLECTION; @@ -208,7 +208,7 @@ public class P2PCache implements IGridCache { return out; } - public PartP2PTunnel getInput(final short freq) { + public P2PTunnelPart getInput(final short freq) { return this.inputs.get(freq); } } diff --git a/src/main/java/appeng/me/cache/PathGridCache.java b/src/main/java/appeng/me/cache/PathGridCache.java index b9096d2c8..10f3840c1 100644 --- a/src/main/java/appeng/me/cache/PathGridCache.java +++ b/src/main/java/appeng/me/cache/PathGridCache.java @@ -56,12 +56,12 @@ import appeng.me.pathfinding.ControllerChannelUpdater; import appeng.me.pathfinding.ControllerValidator; import appeng.me.pathfinding.IPathItem; import appeng.me.pathfinding.PathSegment; -import appeng.tile.networking.TileController; +import appeng.tile.networking.ControllerTileEntity; public class PathGridCache implements IPathingGrid { private final List active = new ArrayList<>(); - private final Set controllers = new HashSet<>(); + private final Set controllers = new HashSet<>(); private final Set requireChannels = new HashSet<>(); private final Set blockDense = new HashSet<>(); private final IGrid myGrid; @@ -130,11 +130,11 @@ public class PathGridCache implements IPathingGrid { // myGrid.getPivot().beginVisit( new AdHocChannelUpdater( 0 ) // ); - for (final IGridNode node : this.myGrid.getMachines(TileController.class)) { + for (final IGridNode node : this.myGrid.getMachines(ControllerTileEntity.class)) { closedList.add((IPathItem) node); for (final IGridConnection gcc : node.getConnections()) { final GridConnection gc = (GridConnection) gcc; - if (!(gc.getOtherSide(node).getMachine() instanceof TileController)) { + if (!(gc.getOtherSide(node).getMachine() instanceof ControllerTileEntity)) { final List open = new ArrayList<>(); closedList.add(gc); open.add(gc); @@ -160,9 +160,9 @@ public class PathGridCache implements IPathingGrid { if (this.active.isEmpty() && this.ticksUntilReady <= 0) { if (this.controllerState == ControllerState.CONTROLLER_ONLINE) { - final Iterator controllerIterator = this.controllers.iterator(); + final Iterator controllerIterator = this.controllers.iterator(); if (controllerIterator.hasNext()) { - final TileController controller = controllerIterator.next(); + final ControllerTileEntity controller = controllerIterator.next(); controller.getGridNode(AEPartLocation.INTERNAL).beginVisit(new ControllerChannelUpdater()); } } @@ -179,7 +179,7 @@ public class PathGridCache implements IPathingGrid { @Override public void removeNode(final IGridNode gridNode, final IGridHost machine) { - if (machine instanceof TileController) { + if (machine instanceof ControllerTileEntity) { this.controllers.remove(machine); this.recalculateControllerNextTick = true; } @@ -199,8 +199,8 @@ public class PathGridCache implements IPathingGrid { @Override public void addNode(final IGridNode gridNode, final IGridHost machine) { - if (machine instanceof TileController) { - this.controllers.add((TileController) machine); + if (machine instanceof ControllerTileEntity) { + this.controllers.add((ControllerTileEntity) machine); this.recalculateControllerNextTick = true; } diff --git a/src/main/java/appeng/me/cache/SpatialPylonCache.java b/src/main/java/appeng/me/cache/SpatialPylonCache.java index 4315b7d5b..7d4eb9142 100644 --- a/src/main/java/appeng/me/cache/SpatialPylonCache.java +++ b/src/main/java/appeng/me/cache/SpatialPylonCache.java @@ -33,8 +33,8 @@ import appeng.api.util.DimensionalCoord; import appeng.api.util.IReadOnlyCollection; import appeng.core.AEConfig; import appeng.me.cluster.implementations.SpatialPylonCluster; -import appeng.tile.spatial.TileSpatialIOPort; -import appeng.tile.spatial.TileSpatialPylon; +import appeng.tile.spatial.SpatialIOPortTileEntity; +import appeng.tile.spatial.SpatialPylonTileEntity; public class SpatialPylonCache implements ISpatialCache { @@ -44,7 +44,7 @@ public class SpatialPylonCache implements ISpatialCache { private DimensionalCoord captureMin; private DimensionalCoord captureMax; private boolean isValid = false; - private List ioPorts = new ArrayList<>(); + private List ioPorts = new ArrayList<>(); private HashMap clusters = new HashMap<>(); public SpatialPylonCache(final IGrid g) { @@ -61,14 +61,14 @@ public class SpatialPylonCache implements ISpatialCache { this.clusters = new HashMap<>(); this.ioPorts = new ArrayList<>(); - for (final IGridNode gm : grid.getMachines(TileSpatialIOPort.class)) { - this.ioPorts.add((TileSpatialIOPort) gm.getMachine()); + for (final IGridNode gm : grid.getMachines(SpatialIOPortTileEntity.class)) { + this.ioPorts.add((SpatialIOPortTileEntity) gm.getMachine()); } - final IReadOnlyCollection set = grid.getMachines(TileSpatialPylon.class); + final IReadOnlyCollection set = grid.getMachines(SpatialPylonTileEntity.class); for (final IGridNode gm : set) { if (gm.meetsChannelRequirements()) { - final SpatialPylonCluster c = ((TileSpatialPylon) gm.getMachine()).getCluster(); + final SpatialPylonCluster c = ((SpatialPylonTileEntity) gm.getMachine()).getCluster(); if (c != null) { this.clusters.put(c, c); } diff --git a/src/main/java/appeng/me/cache/helpers/Connections.java b/src/main/java/appeng/me/cache/helpers/Connections.java index 8ab4dcfc6..b3d4847bd 100644 --- a/src/main/java/appeng/me/cache/helpers/Connections.java +++ b/src/main/java/appeng/me/cache/helpers/Connections.java @@ -23,17 +23,17 @@ import java.util.HashMap; import net.minecraft.world.World; import appeng.api.networking.IGridNode; -import appeng.parts.p2p.PartP2PTunnelME; +import appeng.parts.p2p.MEP2PTunnelPart; import appeng.util.IWorldCallable; public class Connections implements IWorldCallable { private final HashMap connections = new HashMap<>(); - private final PartP2PTunnelME me; + private final MEP2PTunnelPart me; private boolean create = false; private boolean destroy = false; - public Connections(final PartP2PTunnelME o) { + public Connections(final MEP2PTunnelPart o) { this.me = o; } diff --git a/src/main/java/appeng/me/cache/helpers/TunnelCollection.java b/src/main/java/appeng/me/cache/helpers/TunnelCollection.java index 3db13cb16..65addb24e 100644 --- a/src/main/java/appeng/me/cache/helpers/TunnelCollection.java +++ b/src/main/java/appeng/me/cache/helpers/TunnelCollection.java @@ -21,10 +21,10 @@ package appeng.me.cache.helpers; import java.util.Collection; import java.util.Iterator; -import appeng.parts.p2p.PartP2PTunnel; +import appeng.parts.p2p.P2PTunnelPart; import appeng.util.iterators.NullIterator; -public class TunnelCollection implements Iterable { +public class TunnelCollection implements Iterable { private final Class clz; private Collection tunnelSources; @@ -50,11 +50,11 @@ public class TunnelCollection implements Iterable { return new TunnelIterator<>(this.tunnelSources, this.clz); } - public boolean matches(final Class c) { + public boolean matches(final Class c) { return this.clz == c; } - public Class getClz() { + public Class getClz() { return this.clz; } diff --git a/src/main/java/appeng/me/cache/helpers/TunnelConnection.java b/src/main/java/appeng/me/cache/helpers/TunnelConnection.java index 0adae1665..d6048ee19 100644 --- a/src/main/java/appeng/me/cache/helpers/TunnelConnection.java +++ b/src/main/java/appeng/me/cache/helpers/TunnelConnection.java @@ -19,14 +19,14 @@ package appeng.me.cache.helpers; import appeng.api.networking.IGridConnection; -import appeng.parts.p2p.PartP2PTunnelME; +import appeng.parts.p2p.MEP2PTunnelPart; public class TunnelConnection { - private final PartP2PTunnelME tunnel; + private final MEP2PTunnelPart tunnel; private final IGridConnection c; - public TunnelConnection(final PartP2PTunnelME t, final IGridConnection con) { + public TunnelConnection(final MEP2PTunnelPart t, final IGridConnection con) { this.tunnel = t; this.c = con; } @@ -35,7 +35,7 @@ public class TunnelConnection { return this.c; } - public PartP2PTunnelME getTunnel() { + public MEP2PTunnelPart getTunnel() { return this.tunnel; } } \ No newline at end of file diff --git a/src/main/java/appeng/me/cache/helpers/TunnelIterator.java b/src/main/java/appeng/me/cache/helpers/TunnelIterator.java index 60c698186..9e10d2dee 100644 --- a/src/main/java/appeng/me/cache/helpers/TunnelIterator.java +++ b/src/main/java/appeng/me/cache/helpers/TunnelIterator.java @@ -21,9 +21,9 @@ package appeng.me.cache.helpers; import java.util.Collection; import java.util.Iterator; -import appeng.parts.p2p.PartP2PTunnel; +import appeng.parts.p2p.P2PTunnelPart; -public class TunnelIterator implements Iterator { +public class TunnelIterator implements Iterator { private final Iterator wrapped; private final Class targetType; diff --git a/src/main/java/appeng/me/cluster/implementations/CraftingCPUCalculator.java b/src/main/java/appeng/me/cluster/implementations/CraftingCPUCalculator.java index 8ac98bd93..887f0a97d 100644 --- a/src/main/java/appeng/me/cluster/implementations/CraftingCPUCalculator.java +++ b/src/main/java/appeng/me/cluster/implementations/CraftingCPUCalculator.java @@ -33,15 +33,15 @@ import appeng.api.util.WorldCoord; import appeng.me.cluster.IAECluster; import appeng.me.cluster.IAEMultiBlock; import appeng.me.cluster.MBCalculator; -import appeng.tile.crafting.TileCraftingTile; +import appeng.tile.crafting.CraftingTileEntity; public class CraftingCPUCalculator extends MBCalculator { - private final TileCraftingTile tqb; + private final CraftingTileEntity tqb; public CraftingCPUCalculator(final IAEMultiBlock t) { super(t); - this.tqb = (TileCraftingTile) t; + this.tqb = (CraftingTileEntity) t; } @Override @@ -79,8 +79,8 @@ public class CraftingCPUCalculator extends MBCalculator { return false; } - if (!storage && te instanceof TileCraftingTile) { - storage = ((TileCraftingTile) te).getStorageBytes() > 0; + if (!storage && te instanceof CraftingTileEntity) { + storage = ((CraftingTileEntity) te).getStorageBytes() > 0; } } } @@ -101,7 +101,7 @@ public class CraftingCPUCalculator extends MBCalculator { for (int x = min.x; x <= max.x; x++) { for (int y = min.y; y <= max.y; y++) { for (int z = min.z; z <= max.z; z++) { - final TileCraftingTile te = (TileCraftingTile) w.getTileEntity(new BlockPos(x, y, z)); + final CraftingTileEntity te = (CraftingTileEntity) w.getTileEntity(new BlockPos(x, y, z)); te.updateStatus(c); c.addTile(te); } @@ -126,6 +126,6 @@ public class CraftingCPUCalculator extends MBCalculator { @Override public boolean isValidTile(final TileEntity te) { - return te instanceof TileCraftingTile; + return te instanceof CraftingTileEntity; } } diff --git a/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java b/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java index af75643ad..fb67e777d 100644 --- a/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java +++ b/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java @@ -73,8 +73,8 @@ import appeng.crafting.MECraftingInventory; import appeng.me.cache.CraftingGridCache; import appeng.me.cluster.IAECluster; import appeng.me.helpers.MachineSource; -import appeng.tile.crafting.TileCraftingMonitorTile; -import appeng.tile.crafting.TileCraftingTile; +import appeng.tile.crafting.CraftingMonitorTileEntity; +import appeng.tile.crafting.CraftingTileEntity; import appeng.util.Platform; import appeng.util.item.AEItemStack; @@ -87,9 +87,9 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU { private final int[] usedOps = new int[3]; private final Map tasks = new HashMap<>(); // INSTANCE sate - private final List tiles = new ArrayList<>(); - private final List storage = new ArrayList<>(); - private final List status = new ArrayList<>(); + private final List tiles = new ArrayList<>(); + private final List storage = new ArrayList<>(); + private final List status = new ArrayList<>(); private final HashMap, Object> listeners = new HashMap<>(); private ICraftingLink myLastLink; private ITextComponent myName = null; @@ -150,7 +150,7 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU { @Override public void updateStatus(final boolean updateGrid) { - for (final TileCraftingTile r : this.tiles) { + for (final CraftingTileEntity r : this.tiles) { r.updateMeta(true); } } @@ -164,7 +164,7 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU { boolean posted = false; - for (final TileCraftingTile r : this.tiles) { + for (final CraftingTileEntity r : this.tiles) { final IGridNode n = r.getActionableNode(); if (n != null && !posted) { final IGrid g = n.getGrid(); @@ -183,7 +183,7 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU { return (Iterator) this.tiles.iterator(); } - void addTile(final TileCraftingTile te) { + void addTile(final CraftingTileEntity te) { if (this.machineSrc == null || te.isCoreBlock()) { this.machineSrc = new MachineSource(te); } @@ -196,7 +196,7 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU { this.availableStorage += te.getStorageBytes(); this.storage.add(te); } else if (te.isStatus()) { - this.status.add((TileCraftingMonitorTile) te); + this.status.add((CraftingMonitorTileEntity) te); } else if (te.isAccelerator()) { this.accelerator++; } @@ -393,7 +393,7 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU { send = null; } - for (final TileCraftingMonitorTile t : this.status) { + for (final CraftingMonitorTileEntity t : this.status) { t.setJob(send); } } @@ -402,15 +402,15 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU { return this.listeners.entrySet().iterator(); } - private TileCraftingTile getCore() { + private CraftingTileEntity getCore() { if (this.machineSrc == null) { return null; } - return (TileCraftingTile) this.machineSrc.machine().get(); + return (CraftingTileEntity) this.machineSrc.machine().get(); } private IGrid getGrid() { - for (final TileCraftingTile r : this.tiles) { + for (final CraftingTileEntity r : this.tiles) { final IGridNode gn = r.getActionableNode(); if (gn != null) { final IGrid g = gn.getGrid(); @@ -839,7 +839,7 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU { } public boolean isActive() { - final TileCraftingTile core = this.getCore(); + final CraftingTileEntity core = this.getCore(); if (core == null) { return false; @@ -1024,7 +1024,7 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU { } void done() { - final TileCraftingTile core = this.getCore(); + final CraftingTileEntity core = this.getCore(); core.setCoreBlock(true); @@ -1081,7 +1081,7 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU { public void updateName() { this.myName = null; - for (final TileCraftingTile te : this.tiles) { + for (final CraftingTileEntity te : this.tiles) { if (te.hasCustomInventoryName()) { if (this.myName != null) { @@ -1120,7 +1120,7 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU { } public void breakCluster() { - final TileCraftingTile t = this.getCore(); + final CraftingTileEntity t = this.getCore(); if (t != null) { t.breakCluster(); diff --git a/src/main/java/appeng/me/cluster/implementations/QuantumCalculator.java b/src/main/java/appeng/me/cluster/implementations/QuantumCalculator.java index 441596f83..66a34aa44 100644 --- a/src/main/java/appeng/me/cluster/implementations/QuantumCalculator.java +++ b/src/main/java/appeng/me/cluster/implementations/QuantumCalculator.java @@ -30,15 +30,15 @@ import appeng.api.util.WorldCoord; import appeng.me.cluster.IAECluster; import appeng.me.cluster.IAEMultiBlock; import appeng.me.cluster.MBCalculator; -import appeng.tile.qnb.TileQuantumBridge; +import appeng.tile.qnb.QuantumBridgeTileEntity; public class QuantumCalculator extends MBCalculator { - private final TileQuantumBridge tqb; + private final QuantumBridgeTileEntity tqb; public QuantumCalculator(final IAEMultiBlock t) { super(t); - this.tqb = (TileQuantumBridge) t; + this.tqb = (QuantumBridgeTileEntity) t; } @Override @@ -107,7 +107,7 @@ public class QuantumCalculator extends MBCalculator { for (int x = min.x; x <= max.x; x++) { for (int y = min.y; y <= max.y; y++) { for (int z = min.z; z <= max.z; z++) { - final TileQuantumBridge te = (TileQuantumBridge) w.getTileEntity(new BlockPos(x, y, z)); + final QuantumBridgeTileEntity te = (QuantumBridgeTileEntity) w.getTileEntity(new BlockPos(x, y, z)); num++; final byte flags; @@ -132,7 +132,7 @@ public class QuantumCalculator extends MBCalculator { @Override public boolean isValidTile(final TileEntity te) { - return te instanceof TileQuantumBridge; + return te instanceof QuantumBridgeTileEntity; } private boolean isBlockAtLocation(final IBlockReader w, final BlockPos pos, final IBlockDefinition def) { diff --git a/src/main/java/appeng/me/cluster/implementations/QuantumCluster.java b/src/main/java/appeng/me/cluster/implementations/QuantumCluster.java index bf7f8f80f..59ca9a572 100644 --- a/src/main/java/appeng/me/cluster/implementations/QuantumCluster.java +++ b/src/main/java/appeng/me/cluster/implementations/QuantumCluster.java @@ -40,7 +40,7 @@ import appeng.api.util.WorldCoord; import appeng.core.AELog; import appeng.me.cache.helpers.ConnectionWrapper; import appeng.me.cluster.IAECluster; -import appeng.tile.qnb.TileQuantumBridge; +import appeng.tile.qnb.QuantumBridgeTileEntity; import appeng.util.iterators.ChainedIterator; public class QuantumCluster implements ILocatable, IAECluster { @@ -49,17 +49,17 @@ public class QuantumCluster implements ILocatable, IAECluster { private final WorldCoord max; private boolean isDestroyed = false; private boolean updateStatus = true; - private TileQuantumBridge[] Ring; + private QuantumBridgeTileEntity[] Ring; private boolean registered = false; private ConnectionWrapper connection; private long thisSide; private long otherSide; - private TileQuantumBridge center; + private QuantumBridgeTileEntity center; public QuantumCluster(final WorldCoord min, final WorldCoord max) { this.min = min; this.max = max; - this.setRing(new TileQuantumBridge[8]); + this.setRing(new QuantumBridgeTileEntity[8]); } @SubscribeEvent @@ -208,12 +208,12 @@ public class QuantumCluster implements ILocatable, IAECluster { this.center.updateStatus(null, (byte) -1, this.isUpdateStatus()); - for (final TileQuantumBridge r : this.getRing()) { + for (final QuantumBridgeTileEntity r : this.getRing()) { r.updateStatus(null, (byte) -1, this.isUpdateStatus()); } this.center = null; - this.setRing(new TileQuantumBridge[8]); + this.setRing(new QuantumBridgeTileEntity[8]); } @Override @@ -222,7 +222,7 @@ public class QuantumCluster implements ILocatable, IAECluster { this.getRing()[4], this.getRing()[5], this.getRing()[6], this.getRing()[7], this.center); } - public boolean isCorner(final TileQuantumBridge tileQuantumBridge) { + public boolean isCorner(final QuantumBridgeTileEntity tileQuantumBridge) { return this.getRing()[0] == tileQuantumBridge || this.getRing()[2] == tileQuantumBridge || this.getRing()[4] == tileQuantumBridge || this.getRing()[6] == tileQuantumBridge; } @@ -232,11 +232,11 @@ public class QuantumCluster implements ILocatable, IAECluster { return this.thisSide; } - public TileQuantumBridge getCenter() { + public QuantumBridgeTileEntity getCenter() { return this.center; } - void setCenter(final TileQuantumBridge c) { + void setCenter(final QuantumBridgeTileEntity c) { this.registered = true; MinecraftForge.EVENT_BUS.register(this); this.center = c; @@ -250,11 +250,11 @@ public class QuantumCluster implements ILocatable, IAECluster { this.updateStatus = updateStatus; } - TileQuantumBridge[] getRing() { + QuantumBridgeTileEntity[] getRing() { return this.Ring; } - private void setRing(final TileQuantumBridge[] ring) { + private void setRing(final QuantumBridgeTileEntity[] ring) { this.Ring = ring; } } diff --git a/src/main/java/appeng/me/cluster/implementations/SpatialPylonCalculator.java b/src/main/java/appeng/me/cluster/implementations/SpatialPylonCalculator.java index f6b818f51..3ebef2058 100644 --- a/src/main/java/appeng/me/cluster/implementations/SpatialPylonCalculator.java +++ b/src/main/java/appeng/me/cluster/implementations/SpatialPylonCalculator.java @@ -27,15 +27,15 @@ import appeng.api.util.WorldCoord; import appeng.me.cluster.IAECluster; import appeng.me.cluster.IAEMultiBlock; import appeng.me.cluster.MBCalculator; -import appeng.tile.spatial.TileSpatialPylon; +import appeng.tile.spatial.SpatialPylonTileEntity; public class SpatialPylonCalculator extends MBCalculator { - private final TileSpatialPylon tqb; + private final SpatialPylonTileEntity tqb; public SpatialPylonCalculator(final IAEMultiBlock t) { super(t); - this.tqb = (TileSpatialPylon) t; + this.tqb = (SpatialPylonTileEntity) t; } @Override @@ -81,7 +81,7 @@ public class SpatialPylonCalculator extends MBCalculator { for (int x = min.x; x <= max.x; x++) { for (int y = min.y; y <= max.y; y++) { for (int z = min.z; z <= max.z; z++) { - final TileSpatialPylon te = (TileSpatialPylon) w.getTileEntity(new BlockPos(x, y, z)); + final SpatialPylonTileEntity te = (SpatialPylonTileEntity) w.getTileEntity(new BlockPos(x, y, z)); te.updateStatus(c); c.getLine().add((te)); } @@ -91,6 +91,6 @@ public class SpatialPylonCalculator extends MBCalculator { @Override public boolean isValidTile(final TileEntity te) { - return te instanceof TileSpatialPylon; + return te instanceof SpatialPylonTileEntity; } } diff --git a/src/main/java/appeng/me/cluster/implementations/SpatialPylonCluster.java b/src/main/java/appeng/me/cluster/implementations/SpatialPylonCluster.java index ae110f800..3d294650a 100644 --- a/src/main/java/appeng/me/cluster/implementations/SpatialPylonCluster.java +++ b/src/main/java/appeng/me/cluster/implementations/SpatialPylonCluster.java @@ -25,13 +25,13 @@ import java.util.List; import appeng.api.networking.IGridHost; import appeng.api.util.DimensionalCoord; import appeng.me.cluster.IAECluster; -import appeng.tile.spatial.TileSpatialPylon; +import appeng.tile.spatial.SpatialPylonTileEntity; public class SpatialPylonCluster implements IAECluster { private final DimensionalCoord min; private final DimensionalCoord max; - private final List line = new ArrayList<>(); + private final List line = new ArrayList<>(); private boolean isDestroyed = false; private Axis currentAxis = Axis.UNFORMED; @@ -54,7 +54,7 @@ public class SpatialPylonCluster implements IAECluster { @Override public void updateStatus(final boolean updateGrid) { - for (final TileSpatialPylon r : this.getLine()) { + for (final SpatialPylonTileEntity r : this.getLine()) { r.recalculateDisplay(); } } @@ -67,7 +67,7 @@ public class SpatialPylonCluster implements IAECluster { } this.isDestroyed = true; - for (final TileSpatialPylon r : this.getLine()) { + for (final SpatialPylonTileEntity r : this.getLine()) { r.updateStatus(null); } } @@ -105,7 +105,7 @@ public class SpatialPylonCluster implements IAECluster { return this.min; } - List getLine() { + List getLine() { return this.line; } diff --git a/src/main/java/appeng/me/helpers/AENetworkProxy.java b/src/main/java/appeng/me/helpers/AENetworkProxy.java index 8cbdde645..252418c2a 100644 --- a/src/main/java/appeng/me/helpers/AENetworkProxy.java +++ b/src/main/java/appeng/me/helpers/AENetworkProxy.java @@ -49,8 +49,8 @@ import appeng.core.worlddata.WorldData; import appeng.hooks.TickHandler; import appeng.me.GridAccessException; import appeng.me.cache.P2PCache; -import appeng.parts.networking.PartCable; -import appeng.tile.AEBaseTile; +import appeng.parts.networking.CablePart; +import appeng.tile.AEBaseTileEntity; import appeng.util.Platform; public class AENetworkProxy implements IGridBlock { @@ -95,8 +95,8 @@ public class AENetworkProxy implements IGridBlock { } public void validate() { - if (this.gp instanceof AEBaseTile) { - TickHandler.INSTANCE.addInit((AEBaseTile) this.gp); + if (this.gp instanceof AEBaseTileEntity) { + TickHandler.INSTANCE.addInit((AEBaseTileEntity) this.gp); } } @@ -280,8 +280,8 @@ public class AENetworkProxy implements IGridBlock { @Override public void onGridNotification(final GridNotification notification) { - if (this.gp instanceof PartCable) { - ((PartCable) this.gp).markForUpdate(); + if (this.gp instanceof CablePart) { + ((CablePart) this.gp).markForUpdate(); } } diff --git a/src/main/java/appeng/me/pathfinding/ControllerValidator.java b/src/main/java/appeng/me/pathfinding/ControllerValidator.java index f1fed445b..9b4febfd6 100644 --- a/src/main/java/appeng/me/pathfinding/ControllerValidator.java +++ b/src/main/java/appeng/me/pathfinding/ControllerValidator.java @@ -23,7 +23,7 @@ import net.minecraft.util.math.BlockPos; import appeng.api.networking.IGridHost; import appeng.api.networking.IGridNode; import appeng.api.networking.IGridVisitor; -import appeng.tile.networking.TileController; +import appeng.tile.networking.ControllerTileEntity; public class ControllerValidator implements IGridVisitor { @@ -48,8 +48,8 @@ public class ControllerValidator implements IGridVisitor { @Override public boolean visitNode(final IGridNode n) { final IGridHost host = n.getMachine(); - if (this.isValid() && host instanceof TileController) { - final TileController c = (TileController) host; + if (this.isValid() && host instanceof ControllerTileEntity) { + final ControllerTileEntity c = (ControllerTileEntity) host; final BlockPos pos = c.getPos(); diff --git a/src/main/java/appeng/me/storage/SecurityStationInventory.java b/src/main/java/appeng/me/storage/SecurityStationInventory.java index 1d076e23c..e5a46faee 100644 --- a/src/main/java/appeng/me/storage/SecurityStationInventory.java +++ b/src/main/java/appeng/me/storage/SecurityStationInventory.java @@ -32,15 +32,15 @@ import appeng.api.storage.channels.IItemStorageChannel; import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IItemList; import appeng.me.GridAccessException; -import appeng.tile.misc.TileSecurityStation; +import appeng.tile.misc.SecurityStationTileEntity; public class SecurityStationInventory implements IMEInventoryHandler { private final IItemList storedItems = AEApi.instance().storage() .getStorageChannel(IItemStorageChannel.class).createList(); - private final TileSecurityStation securityTile; + private final SecurityStationTileEntity securityTile; - public SecurityStationInventory(final TileSecurityStation ts) { + public SecurityStationInventory(final SecurityStationTileEntity ts) { this.securityTile = ts; } diff --git a/src/main/java/appeng/parts/AEBasePart.java b/src/main/java/appeng/parts/AEBasePart.java index 534b26d04..8bd1c8910 100644 --- a/src/main/java/appeng/parts/AEBasePart.java +++ b/src/main/java/appeng/parts/AEBasePart.java @@ -67,11 +67,11 @@ import appeng.api.util.DimensionalCoord; import appeng.api.util.IConfigManager; import appeng.helpers.ICustomNameObject; import appeng.helpers.IPriorityHost; -import appeng.items.parts.ItemPart; +import appeng.items.parts.PartItem; import appeng.items.parts.PartType; import appeng.me.helpers.AENetworkProxy; import appeng.me.helpers.IGridProxyable; -import appeng.parts.networking.PartCable; +import appeng.parts.networking.CablePart; import appeng.tile.inventory.AppEngInternalAEInventory; import appeng.util.Platform; import appeng.util.SettingsFrom; @@ -88,7 +88,7 @@ public abstract class AEBasePart implements IPart, IGridProxyable, IActionHost, Preconditions.checkNotNull(is); this.is = is; - this.proxy = new AENetworkProxy(this, "part", is, this instanceof PartCable); + this.proxy = new AENetworkProxy(this, "part", is, this instanceof CablePart); this.proxy.setValidSides(EnumSet.noneOf(Direction.class)); } @@ -98,11 +98,11 @@ public abstract class AEBasePart implements IPart, IGridProxyable, IActionHost, public PartType getType() { Item item = this.is.getItem(); - if (!(item instanceof ItemPart)) { + if (!(item instanceof PartItem)) { return PartType.INVALID_TYPE; } - return ((ItemPart) item).getType(); + return ((PartItem) item).getType(); } @Override diff --git a/src/main/java/appeng/parts/PartBasicState.java b/src/main/java/appeng/parts/BasicStatePart.java similarity index 96% rename from src/main/java/appeng/parts/PartBasicState.java rename to src/main/java/appeng/parts/BasicStatePart.java index 71d6ca102..324ce93ee 100644 --- a/src/main/java/appeng/parts/PartBasicState.java +++ b/src/main/java/appeng/parts/BasicStatePart.java @@ -30,14 +30,14 @@ import appeng.api.networking.events.MENetworkEventSubscribe; import appeng.api.networking.events.MENetworkPowerStatusChange; import appeng.me.GridAccessException; -public abstract class PartBasicState extends AEBasePart implements IPowerChannelState { +public abstract class BasicStatePart extends AEBasePart implements IPowerChannelState { protected static final int POWERED_FLAG = 1; protected static final int CHANNEL_FLAG = 2; private int clientFlags = 0; // sent as byte. - public PartBasicState(final ItemStack is) { + public BasicStatePart(final ItemStack is) { super(is); this.getProxy().setFlags(GridFlags.REQUIRE_CHANNEL); } diff --git a/src/main/java/appeng/parts/CableBusContainer.java b/src/main/java/appeng/parts/CableBusContainer.java index 80d20934f..d362ecc46 100644 --- a/src/main/java/appeng/parts/CableBusContainer.java +++ b/src/main/java/appeng/parts/CableBusContainer.java @@ -44,7 +44,7 @@ import net.minecraftforge.common.util.Constants; import appeng.api.AEApi; import appeng.api.config.YesNo; import appeng.api.exceptions.FailedConnectionException; -import appeng.api.implementations.parts.IPartCable; +import appeng.api.implementations.parts.ICablePart; import appeng.api.networking.IGridHost; import appeng.api.networking.IGridNode; import appeng.api.parts.*; @@ -59,7 +59,7 @@ import appeng.core.AELog; import appeng.facade.FacadeContainer; import appeng.helpers.AEMultiTile; import appeng.me.GridConnection; -import appeng.parts.networking.PartCable; +import appeng.parts.networking.CablePart; import appeng.util.Platform; public class CableBusContainer extends CableBusStorage implements AEMultiTile, ICableBusContainer { @@ -123,11 +123,11 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I final IPart bp = bi.createPart(is); if (bp != null) { - if (bp instanceof IPartCable) { + if (bp instanceof ICablePart) { boolean canPlace = true; for (final AEPartLocation d : AEPartLocation.SIDE_LOCATIONS) { if (this.getPart(d) != null - && !this.getPart(d).canBePlacedOn(((IPartCable) bp).supportsBuses())) { + && !this.getPart(d).canBePlacedOn(((ICablePart) bp).supportsBuses())) { canPlace = false; } } @@ -137,9 +137,9 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I } return this.getPart(AEPartLocation.INTERNAL) == null; - } else if (!(bp instanceof IPartCable) && side != AEPartLocation.INTERNAL) { + } else if (!(bp instanceof ICablePart) && side != AEPartLocation.INTERNAL) { final IPart cable = this.getPart(AEPartLocation.INTERNAL); - if (cable != null && !bp.canBePlacedOn(((IPartCable) cable).supportsBuses())) { + if (cable != null && !bp.canBePlacedOn(((ICablePart) cable).supportsBuses())) { return false; } @@ -161,11 +161,11 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I is.setCount(1); final IPart bp = bi.createPart(is); - if (bp instanceof IPartCable) { + if (bp instanceof ICablePart) { boolean canPlace = true; for (final AEPartLocation d : AEPartLocation.SIDE_LOCATIONS) { if (this.getPart(d) != null - && !this.getPart(d).canBePlacedOn(((IPartCable) bp).supportsBuses())) { + && !this.getPart(d).canBePlacedOn(((ICablePart) bp).supportsBuses())) { canPlace = false; } } @@ -178,7 +178,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I return null; } - this.setCenter((IPartCable) bp); + this.setCenter((ICablePart) bp); bp.setPartHostInfo(AEPartLocation.INTERNAL, this, this.tcb.getTile()); if (player != null) { @@ -215,9 +215,9 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I this.markForSave(); this.partChanged(); return AEPartLocation.INTERNAL; - } else if (bp != null && !(bp instanceof IPartCable) && side != AEPartLocation.INTERNAL) { + } else if (bp != null && !(bp instanceof ICablePart) && side != AEPartLocation.INTERNAL) { final IPart cable = this.getPart(AEPartLocation.INTERNAL); - if (cable != null && !bp.canBePlacedOn(((IPartCable) cable).supportsBuses())) { + if (cable != null && !bp.canBePlacedOn(((ICablePart) cable).supportsBuses())) { return null; } @@ -315,7 +315,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I @Override public AEColor getColor() { if (this.getCenter() != null) { - final IPartCable c = this.getCenter(); + final ICablePart c = this.getCenter(); return c.getCableColor(); } return AEColor.TRANSPARENT; @@ -576,7 +576,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I } if (this.getCenter() != null) { - final IPartCable c = this.getCenter(); + final ICablePart c = this.getCenter(); return c.getCableConnectionType(); } return AECableType.NONE; @@ -584,7 +584,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I @Override public float getCableConnectionLength(AECableType cable) { - return this.getPart(AEPartLocation.INTERNAL) instanceof IPartCable + return this.getPart(AEPartLocation.INTERNAL) instanceof ICablePart ? this.getPart(AEPartLocation.INTERNAL).getCableConnectionLength(cable) : -1; } @@ -609,7 +609,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I final IPart part = this.getPart(s); if (part != null) { - if (ignoreConnections && part instanceof IPartCable) { + if (ignoreConnections && part instanceof ICablePart) { bch.addBox(6.0, 6.0, 6.0, 10.0, 10.0, 10.0); } else { part.getBoxes(bch); @@ -917,7 +917,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I public boolean recolourBlock(final Direction side, final AEColor colour, final PlayerEntity who) { final IPart cable = this.getPart(AEPartLocation.INTERNAL); if (cable != null) { - final IPartCable pc = (IPartCable) cable; + final ICablePart pc = (ICablePart) cable; return pc.changeColor(colour, who); } return false; @@ -933,7 +933,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I @Override public CableBusRenderState getRenderState() { - final PartCable cable = (PartCable) this.getCenter(); + final CablePart cable = (CablePart) this.getCenter(); final CableBusRenderState renderState = new CableBusRenderState(); diff --git a/src/main/java/appeng/parts/CableBusStorage.java b/src/main/java/appeng/parts/CableBusStorage.java index 85a622033..b430c118e 100644 --- a/src/main/java/appeng/parts/CableBusStorage.java +++ b/src/main/java/appeng/parts/CableBusStorage.java @@ -20,7 +20,7 @@ package appeng.parts; import javax.annotation.Nullable; -import appeng.api.implementations.parts.IPartCable; +import appeng.api.implementations.parts.ICablePart; import appeng.api.parts.IFacadePart; import appeng.api.parts.IPart; import appeng.api.util.AEPartLocation; @@ -30,15 +30,15 @@ import appeng.api.util.AEPartLocation; */ public class CableBusStorage { - private IPartCable center; + private ICablePart center; private IPart[] sides; private IFacadePart[] facades; - protected IPartCable getCenter() { + protected ICablePart getCenter() { return this.center; } - protected void setCenter(final IPartCable center) { + protected void setCenter(final ICablePart center) { this.center = center; } diff --git a/src/main/java/appeng/parts/PartPlacement.java b/src/main/java/appeng/parts/PartPlacement.java index 6a7cd5b15..c1491de02 100644 --- a/src/main/java/appeng/parts/PartPlacement.java +++ b/src/main/java/appeng/parts/PartPlacement.java @@ -61,8 +61,8 @@ import appeng.api.util.AEPartLocation; import appeng.api.util.DimensionalCoord; import appeng.core.AppEng; import appeng.core.sync.network.NetworkHandler; -import appeng.core.sync.packets.PacketClick; -import appeng.core.sync.packets.PacketPartPlacement; +import appeng.core.sync.packets.ClickPacket; +import appeng.core.sync.packets.PartPlacementPacket; import appeng.facade.IFacadeItem; import appeng.util.LookDirection; import appeng.util.Platform; @@ -128,7 +128,7 @@ public class PartPlacement { } else { player.swingArm(hand); NetworkHandler.instance() - .sendToServer(new PacketPartPlacement(pos, side, getEyeOffset(player), hand)); + .sendToServer(new PartPlacementPacket(pos, side, getEyeOffset(player), hand)); } return ActionResultType.SUCCESS; } @@ -171,7 +171,7 @@ public class PartPlacement { } else { player.swingArm(hand); NetworkHandler.instance() - .sendToServer(new PacketPartPlacement(pos, side, getEyeOffset(player), hand)); + .sendToServer(new PartPlacementPacket(pos, side, getEyeOffset(player), hand)); return ActionResultType.SUCCESS; } } @@ -189,7 +189,7 @@ public class PartPlacement { if (sPart.part.onShiftActivate(player, hand, hitVec)) { if (world.isRemote) { NetworkHandler.instance() - .sendToServer(new PacketPartPlacement(pos, side, getEyeOffset(player), hand)); + .sendToServer(new PartPlacementPacket(pos, side, getEyeOffset(player), hand)); } return ActionResultType.SUCCESS; } @@ -254,7 +254,7 @@ public class PartPlacement { } else { player.swingArm(hand); NetworkHandler.instance() - .sendToServer(new PacketPartPlacement(pos, side, getEyeOffset(player), hand)); + .sendToServer(new PartPlacementPacket(pos, side, getEyeOffset(player), hand)); return ActionResultType.SUCCESS; } } else if (host != null && !host.canAddPart(held, AEPartLocation.fromFacing(side))) { @@ -386,7 +386,7 @@ public class PartPlacement { supportedItem |= items.colorApplicator().isSameAs(held); if (event.getPlayer().isCrouching() && !held.isEmpty() && supportedItem) { - NetworkHandler.instance().sendToServer(new PacketClick(event.getHand())); + NetworkHandler.instance().sendToServer(new ClickPacket(event.getHand())); } } } else if (event instanceof PlayerInteractEvent.RightClickBlock && !event.getPlayer().world.isRemote) { diff --git a/src/main/java/appeng/parts/automation/PartAbstractFormationPlane.java b/src/main/java/appeng/parts/automation/AbstractFormationPlanePart.java similarity index 97% rename from src/main/java/appeng/parts/automation/PartAbstractFormationPlane.java rename to src/main/java/appeng/parts/automation/AbstractFormationPlanePart.java index aac8327da..c18e0f46a 100644 --- a/src/main/java/appeng/parts/automation/PartAbstractFormationPlane.java +++ b/src/main/java/appeng/parts/automation/AbstractFormationPlanePart.java @@ -24,14 +24,14 @@ import appeng.api.util.AEPartLocation; import appeng.api.util.IConfigManager; import appeng.helpers.IPriorityHost; -public abstract class PartAbstractFormationPlane> extends PartUpgradeable +public abstract class AbstractFormationPlanePart> extends UpgradeablePart implements ICellContainer, IPriorityHost, IMEInventory { private boolean wasActive = false; private int priority = 0; protected boolean blocked = false; - public PartAbstractFormationPlane(ItemStack is) { + public AbstractFormationPlanePart(ItemStack is) { super(is); } diff --git a/src/main/java/appeng/parts/automation/PartAnnihilationPlane.java b/src/main/java/appeng/parts/automation/AnnihilationPlanePart.java similarity index 97% rename from src/main/java/appeng/parts/automation/PartAnnihilationPlane.java rename to src/main/java/appeng/parts/automation/AnnihilationPlanePart.java index acb1010da..6f43ed5d6 100644 --- a/src/main/java/appeng/parts/automation/PartAnnihilationPlane.java +++ b/src/main/java/appeng/parts/automation/AnnihilationPlanePart.java @@ -69,18 +69,18 @@ import appeng.api.util.AECableType; import appeng.api.util.AEPartLocation; import appeng.core.AppEng; import appeng.core.settings.TickRates; -import appeng.core.sync.packets.PacketBlockTransitionEffect; -import appeng.core.sync.packets.PacketItemTransitionEffect; +import appeng.core.sync.packets.BlockTransitionEffectPacket; +import appeng.core.sync.packets.ItemTransitionEffectPacket; import appeng.hooks.TickHandler; import appeng.items.parts.PartModels; import appeng.me.GridAccessException; import appeng.me.helpers.MachineSource; -import appeng.parts.PartBasicState; +import appeng.parts.BasicStatePart; import appeng.util.IWorldCallable; import appeng.util.Platform; import appeng.util.item.AEItemStack; -public class PartAnnihilationPlane extends PartBasicState implements IGridTickable, IWorldCallable { +public class AnnihilationPlanePart extends BasicStatePart implements IGridTickable, IWorldCallable { public static final ResourceLocation TAG_BLACKLIST = new ResourceLocation(AppEng.MOD_ID, "blacklisted/annihilation_plane"); @@ -96,7 +96,7 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab private boolean isAccepting = true; private boolean breaking = false; - public PartAnnihilationPlane(final ItemStack is) { + public AnnihilationPlanePart(final ItemStack is) { super(is); } @@ -283,7 +283,7 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab if (changed) { AppEng.proxy.sendToAllNearExcept(null, pos.getX(), pos.getY(), pos.getZ(), 64, - this.getTile().getWorld(), new PacketItemTransitionEffect(entity.getPosX(), + this.getTile().getWorld(), new ItemTransitionEffectPacket(entity.getPosX(), entity.getPosY(), entity.getPosZ(), this.getSide().getOpposite())); } } @@ -443,8 +443,8 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab energy.extractAEPower(requiredPower, Actionable.MODULATE, PowerMultiplier.CONFIG); AppEng.proxy.sendToAllNearExcept(null, pos.getX(), pos.getY(), pos.getZ(), 64, w, - new PacketBlockTransitionEffect(pos, blockState, this.getSide().getOpposite(), - PacketBlockTransitionEffect.SoundMode.NONE)); + new BlockTransitionEffectPacket(pos, blockState, this.getSide().getOpposite(), + BlockTransitionEffectPacket.SoundMode.NONE)); } @Override diff --git a/src/main/java/appeng/parts/automation/PartExportBus.java b/src/main/java/appeng/parts/automation/ExportBusPart.java similarity index 98% rename from src/main/java/appeng/parts/automation/PartExportBus.java rename to src/main/java/appeng/parts/automation/ExportBusPart.java index a3eb08088..22e17bee7 100644 --- a/src/main/java/appeng/parts/automation/PartExportBus.java +++ b/src/main/java/appeng/parts/automation/ExportBusPart.java @@ -54,7 +54,7 @@ import appeng.api.storage.data.IAEItemStack; import appeng.api.util.AECableType; import appeng.container.ContainerLocator; import appeng.container.ContainerOpener; -import appeng.container.implementations.ContainerUpgradeable; +import appeng.container.implementations.UpgradeableContainer; import appeng.core.AELog; import appeng.core.AppEng; import appeng.core.settings.TickRates; @@ -68,7 +68,7 @@ import appeng.util.InventoryAdaptor; import appeng.util.Platform; import appeng.util.item.AEItemStack; -public class PartExportBus extends PartSharedItemBus implements ICraftingRequester { +public class ExportBusPart extends SharedItemBusPart implements ICraftingRequester { public static final ResourceLocation MODEL_BASE = new ResourceLocation(AppEng.MOD_ID, "part/export_bus_base"); @@ -91,7 +91,7 @@ public class PartExportBus extends PartSharedItemBus implements ICraftingRequest private int nextSlot = 0; @Reflected - public PartExportBus(final ItemStack is) { + public ExportBusPart(final ItemStack is) { super(is); this.getConfigManager().registerSetting(Settings.REDSTONE_CONTROLLED, RedstoneMode.IGNORE); @@ -198,7 +198,7 @@ public class PartExportBus extends PartSharedItemBus implements ICraftingRequest @Override public boolean onPartActivate(final PlayerEntity player, final Hand hand, final Vec3d pos) { if (Platform.isServer()) { - ContainerOpener.openContainer(ContainerUpgradeable.TYPE, player, ContainerLocator.forPart(this)); + ContainerOpener.openContainer(UpgradeableContainer.TYPE, player, ContainerLocator.forPart(this)); } return true; } diff --git a/src/main/java/appeng/parts/automation/PartFormationPlane.java b/src/main/java/appeng/parts/automation/FormationPlanePart.java similarity index 97% rename from src/main/java/appeng/parts/automation/PartFormationPlane.java rename to src/main/java/appeng/parts/automation/FormationPlanePart.java index 436e3b7c5..e766c192a 100644 --- a/src/main/java/appeng/parts/automation/PartFormationPlane.java +++ b/src/main/java/appeng/parts/automation/FormationPlanePart.java @@ -75,7 +75,7 @@ import appeng.api.storage.data.IItemList; import appeng.api.util.AEPartLocation; import appeng.container.ContainerLocator; import appeng.container.ContainerOpener; -import appeng.container.implementations.ContainerFormationPlane; +import appeng.container.implementations.FormationPlaneContainer; import appeng.core.AEConfig; import appeng.items.parts.PartModels; import appeng.me.GridAccessException; @@ -86,7 +86,7 @@ import appeng.util.inv.InvOperation; import appeng.util.prioritylist.FuzzyPriorityList; import appeng.util.prioritylist.PrecisePriorityList; -public class PartFormationPlane extends PartAbstractFormationPlane { +public class FormationPlanePart extends AbstractFormationPlanePart { private static final PlaneModels MODELS = new PlaneModels("part/formation_plane", "part/formation_plane_on"); @@ -99,7 +99,7 @@ public class PartFormationPlane extends PartAbstractFormationPlane AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class)); private final AppEngInternalAEInventory Config = new AppEngInternalAEInventory(this, 63); - public PartFormationPlane(final ItemStack is) { + public FormationPlanePart(final ItemStack is) { super(is); this.getConfigManager().registerSetting(Settings.FUZZY_MODE, FuzzyMode.IGNORE_ALL); @@ -185,7 +185,7 @@ public class PartFormationPlane extends PartAbstractFormationPlane @Override public boolean onPartActivate(final PlayerEntity player, final Hand hand, final Vec3d pos) { if (Platform.isServer()) { - ContainerOpener.openContainer(ContainerFormationPlane.TYPE, player, ContainerLocator.forPart(this)); + ContainerOpener.openContainer(FormationPlaneContainer.TYPE, player, ContainerLocator.forPart(this)); } return true; } @@ -354,7 +354,7 @@ public class PartFormationPlane extends PartAbstractFormationPlane @Override public ContainerType getContainerType() { - return ContainerFormationPlane.TYPE; + return FormationPlaneContainer.TYPE; } private int countEntitesAround(World world, BlockPos pos) { diff --git a/src/main/java/appeng/parts/automation/PartIdentityAnnihilationPlane.java b/src/main/java/appeng/parts/automation/IdentityAnnihilationPlanePart.java similarity index 95% rename from src/main/java/appeng/parts/automation/PartIdentityAnnihilationPlane.java rename to src/main/java/appeng/parts/automation/IdentityAnnihilationPlanePart.java index a565fbe3a..cb187f5e0 100644 --- a/src/main/java/appeng/parts/automation/PartIdentityAnnihilationPlane.java +++ b/src/main/java/appeng/parts/automation/IdentityAnnihilationPlanePart.java @@ -39,7 +39,7 @@ import appeng.api.parts.IPartModel; import appeng.api.util.AEPartLocation; import appeng.items.parts.PartModels; -public class PartIdentityAnnihilationPlane extends PartAnnihilationPlane { +public class IdentityAnnihilationPlanePart extends AnnihilationPlanePart { private static final PlaneModels MODELS = new PlaneModels("part/identity_annihilation_plane", "part/identity_annihilation_plane_on"); @@ -51,7 +51,7 @@ public class PartIdentityAnnihilationPlane extends PartAnnihilationPlane { private static final float SILK_TOUCH_FACTOR = 16; - public PartIdentityAnnihilationPlane(final ItemStack is) { + public IdentityAnnihilationPlanePart(final ItemStack is) { super(is); } diff --git a/src/main/java/appeng/parts/automation/PartImportBus.java b/src/main/java/appeng/parts/automation/ImportBusPart.java similarity index 97% rename from src/main/java/appeng/parts/automation/PartImportBus.java rename to src/main/java/appeng/parts/automation/ImportBusPart.java index ca3275bac..680974dfc 100644 --- a/src/main/java/appeng/parts/automation/PartImportBus.java +++ b/src/main/java/appeng/parts/automation/ImportBusPart.java @@ -45,7 +45,7 @@ import appeng.api.storage.data.IAEItemStack; import appeng.api.util.AECableType; import appeng.container.ContainerLocator; import appeng.container.ContainerOpener; -import appeng.container.implementations.ContainerUpgradeable; +import appeng.container.implementations.UpgradeableContainer; import appeng.core.AppEng; import appeng.core.settings.TickRates; import appeng.helpers.Reflected; @@ -58,7 +58,7 @@ import appeng.util.Platform; import appeng.util.inv.IInventoryDestination; import appeng.util.item.AEItemStack; -public class PartImportBus extends PartSharedItemBus implements IInventoryDestination { +public class ImportBusPart extends SharedItemBusPart implements IInventoryDestination { public static final ResourceLocation MODEL_BASE = new ResourceLocation(AppEng.MOD_ID, "part/import_bus_base"); @PartModels @@ -76,7 +76,7 @@ public class PartImportBus extends PartSharedItemBus implements IInventoryDestin private boolean worked; // used in tickingRequest @Reflected - public PartImportBus(final ItemStack is) { + public ImportBusPart(final ItemStack is) { super(is); this.getConfigManager().registerSetting(Settings.REDSTONE_CONTROLLED, RedstoneMode.IGNORE); @@ -121,7 +121,7 @@ public class PartImportBus extends PartSharedItemBus implements IInventoryDestin @Override public boolean onPartActivate(final PlayerEntity player, final Hand hand, final Vec3d pos) { if (Platform.isServer()) { - ContainerOpener.openContainer(ContainerUpgradeable.TYPE, player, ContainerLocator.forPart(this)); + ContainerOpener.openContainer(UpgradeableContainer.TYPE, player, ContainerLocator.forPart(this)); } return true; } diff --git a/src/main/java/appeng/parts/automation/PartLevelEmitter.java b/src/main/java/appeng/parts/automation/LevelEmitterPart.java similarity index 98% rename from src/main/java/appeng/parts/automation/PartLevelEmitter.java rename to src/main/java/appeng/parts/automation/LevelEmitterPart.java index 1687ac790..be5262c64 100644 --- a/src/main/java/appeng/parts/automation/PartLevelEmitter.java +++ b/src/main/java/appeng/parts/automation/LevelEmitterPart.java @@ -72,7 +72,7 @@ import appeng.api.util.AEPartLocation; import appeng.api.util.IConfigManager; import appeng.container.ContainerLocator; import appeng.container.ContainerOpener; -import appeng.container.implementations.ContainerLevelEmitter; +import appeng.container.implementations.LevelEmitterContainer; import appeng.core.AppEng; import appeng.helpers.Reflected; import appeng.items.parts.PartModels; @@ -82,7 +82,7 @@ import appeng.tile.inventory.AppEngInternalAEInventory; import appeng.util.Platform; import appeng.util.inv.InvOperation; -public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherHost, IStackWatcherHost, +public class LevelEmitterPart extends UpgradeablePart implements IEnergyWatcherHost, IStackWatcherHost, ICraftingWatcherHost, IMEMonitorHandlerReceiver, ICraftingProvider { @PartModels @@ -125,7 +125,7 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH private double centerZ; @Reflected - public PartLevelEmitter(final ItemStack is) { + public LevelEmitterPart(final ItemStack is) { super(is); this.getConfigManager().registerSetting(Settings.REDSTONE_EMITTER, RedstoneMode.HIGH_SIGNAL); @@ -406,7 +406,7 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH @Override public boolean onPartActivate(final PlayerEntity player, final Hand hand, final Vec3d pos) { if (Platform.isServer()) { - ContainerOpener.openContainer(ContainerLevelEmitter.TYPE, player, ContainerLocator.forPart(this)); + ContainerOpener.openContainer(LevelEmitterContainer.TYPE, player, ContainerLocator.forPart(this)); } return true; } diff --git a/src/main/java/appeng/parts/automation/PartSharedItemBus.java b/src/main/java/appeng/parts/automation/SharedItemBusPart.java similarity index 97% rename from src/main/java/appeng/parts/automation/PartSharedItemBus.java rename to src/main/java/appeng/parts/automation/SharedItemBusPart.java index 7378cc025..c5a1ca553 100644 --- a/src/main/java/appeng/parts/automation/PartSharedItemBus.java +++ b/src/main/java/appeng/parts/automation/SharedItemBusPart.java @@ -34,12 +34,12 @@ import appeng.me.GridAccessException; import appeng.tile.inventory.AppEngInternalAEInventory; import appeng.util.InventoryAdaptor; -public abstract class PartSharedItemBus extends PartUpgradeable implements IGridTickable { +public abstract class SharedItemBusPart extends UpgradeablePart implements IGridTickable { private final AppEngInternalAEInventory config = new AppEngInternalAEInventory(this, 9); private boolean lastRedstone = false; - public PartSharedItemBus(final ItemStack is) { + public SharedItemBusPart(final ItemStack is) { super(is); } diff --git a/src/main/java/appeng/parts/automation/PartUpgradeable.java b/src/main/java/appeng/parts/automation/UpgradeablePart.java similarity index 96% rename from src/main/java/appeng/parts/automation/PartUpgradeable.java rename to src/main/java/appeng/parts/automation/UpgradeablePart.java index 95af40f5d..5576126fe 100644 --- a/src/main/java/appeng/parts/automation/PartUpgradeable.java +++ b/src/main/java/appeng/parts/automation/UpgradeablePart.java @@ -27,17 +27,17 @@ import appeng.api.config.RedstoneMode; import appeng.api.config.Settings; import appeng.api.config.Upgrades; import appeng.api.util.IConfigManager; -import appeng.parts.PartBasicState; +import appeng.parts.BasicStatePart; import appeng.util.ConfigManager; import appeng.util.IConfigManagerHost; import appeng.util.inv.IAEAppEngInventory; import appeng.util.inv.InvOperation; -public abstract class PartUpgradeable extends PartBasicState implements IAEAppEngInventory, IConfigManagerHost { +public abstract class UpgradeablePart extends BasicStatePart implements IAEAppEngInventory, IConfigManagerHost { private final IConfigManager manager; private final UpgradeInventory upgrades; - public PartUpgradeable(final ItemStack is) { + public UpgradeablePart(final ItemStack is) { super(is); this.upgrades = new StackUpgradeInventory(this.getItemStack(), this, this.getUpgradeSlots()); this.manager = new ConfigManager(this); diff --git a/src/main/java/appeng/parts/misc/PartCableAnchor.java b/src/main/java/appeng/parts/misc/CableAnchorPart.java similarity index 98% rename from src/main/java/appeng/parts/misc/PartCableAnchor.java rename to src/main/java/appeng/parts/misc/CableAnchorPart.java index 4655abeeb..b32b32da2 100644 --- a/src/main/java/appeng/parts/misc/PartCableAnchor.java +++ b/src/main/java/appeng/parts/misc/CableAnchorPart.java @@ -49,7 +49,7 @@ import appeng.core.AppEng; import appeng.items.parts.PartModels; import appeng.parts.PartModel; -public class PartCableAnchor implements IPart { +public class CableAnchorPart implements IPart { @PartModels public static final PartModel DEFAULT_MODELS = new PartModel(false, @@ -63,7 +63,7 @@ public class PartCableAnchor implements IPart { private IPartHost host = null; private AEPartLocation mySide = AEPartLocation.UP; - public PartCableAnchor(final ItemStack is) { + public CableAnchorPart(final ItemStack is) { this.is = is; } diff --git a/src/main/java/appeng/parts/misc/PartInterface.java b/src/main/java/appeng/parts/misc/InterfacePart.java similarity index 96% rename from src/main/java/appeng/parts/misc/PartInterface.java rename to src/main/java/appeng/parts/misc/InterfacePart.java index 012103c49..2d5dbaaef 100644 --- a/src/main/java/appeng/parts/misc/PartInterface.java +++ b/src/main/java/appeng/parts/misc/InterfacePart.java @@ -61,21 +61,21 @@ import appeng.api.util.AECableType; import appeng.api.util.IConfigManager; import appeng.container.ContainerLocator; import appeng.container.ContainerOpener; -import appeng.container.implementations.ContainerInterface; +import appeng.container.implementations.InterfaceContainer; import appeng.core.AppEng; import appeng.helpers.DualityInterface; import appeng.helpers.IInterfaceHost; import appeng.helpers.IPriorityHost; import appeng.helpers.Reflected; import appeng.items.parts.PartModels; -import appeng.parts.PartBasicState; +import appeng.parts.BasicStatePart; import appeng.parts.PartModel; import appeng.util.Platform; import appeng.util.inv.IAEAppEngInventory; import appeng.util.inv.IInventoryDestination; import appeng.util.inv.InvOperation; -public class PartInterface extends PartBasicState implements IGridTickable, IStorageMonitorable, IInventoryDestination, +public class InterfacePart extends BasicStatePart implements IGridTickable, IStorageMonitorable, IInventoryDestination, IInterfaceHost, IAEAppEngInventory, IPriorityHost { public static final ResourceLocation MODEL_BASE = new ResourceLocation(AppEng.MOD_ID, "part/interface_base"); @@ -95,7 +95,7 @@ public class PartInterface extends PartBasicState implements IGridTickable, ISto private final DualityInterface duality = new DualityInterface(this.getProxy(), this); @Reflected - public PartInterface(final ItemStack is) { + public InterfacePart(final ItemStack is) { super(is); } @@ -166,7 +166,7 @@ public class PartInterface extends PartBasicState implements IGridTickable, ISto @Override public boolean onPartActivate(final PlayerEntity p, final Hand hand, final Vec3d pos) { if (Platform.isServer()) { - ContainerOpener.openContainer(ContainerInterface.TYPE, p, ContainerLocator.forPart(this)); + ContainerOpener.openContainer(InterfaceContainer.TYPE, p, ContainerLocator.forPart(this)); } return true; } @@ -275,6 +275,6 @@ public class PartInterface extends PartBasicState implements IGridTickable, ISto @Override public ContainerType getContainerType() { - return ContainerInterface.TYPE; + return InterfaceContainer.TYPE; } } diff --git a/src/main/java/appeng/parts/misc/PartInvertedToggleBus.java b/src/main/java/appeng/parts/misc/InvertedToggleBusPart.java similarity index 95% rename from src/main/java/appeng/parts/misc/PartInvertedToggleBus.java rename to src/main/java/appeng/parts/misc/InvertedToggleBusPart.java index 5aed0bb86..0c15301c4 100644 --- a/src/main/java/appeng/parts/misc/PartInvertedToggleBus.java +++ b/src/main/java/appeng/parts/misc/InvertedToggleBusPart.java @@ -27,7 +27,7 @@ import appeng.helpers.Reflected; import appeng.items.parts.PartModels; import appeng.parts.PartModel; -public class PartInvertedToggleBus extends PartToggleBus { +public class InvertedToggleBusPart extends ToggleBusPart { @PartModels public static final ResourceLocation MODEL_BASE = new ResourceLocation(AppEng.MOD_ID, "part/inverted_toggle_bus_base"); @@ -37,7 +37,7 @@ public class PartInvertedToggleBus extends PartToggleBus { public static final PartModel MODELS_HAS_CHANNEL = new PartModel(MODEL_BASE, MODEL_STATUS_HAS_CHANNEL); @Reflected - public PartInvertedToggleBus(final ItemStack is) { + public InvertedToggleBusPart(final ItemStack is) { super(is); this.getProxy().setIdlePowerUsage(0.0); this.getOuterProxy().setIdlePowerUsage(0.0); diff --git a/src/main/java/appeng/parts/misc/PartSharedStorageBus.java b/src/main/java/appeng/parts/misc/SharedStorageBusPart.java similarity index 96% rename from src/main/java/appeng/parts/misc/PartSharedStorageBus.java rename to src/main/java/appeng/parts/misc/SharedStorageBusPart.java index c2dfc887a..6ab641705 100644 --- a/src/main/java/appeng/parts/misc/PartSharedStorageBus.java +++ b/src/main/java/appeng/parts/misc/SharedStorageBusPart.java @@ -43,19 +43,19 @@ import appeng.api.util.AECableType; import appeng.api.util.IConfigManager; import appeng.helpers.IPriorityHost; import appeng.me.GridAccessException; -import appeng.parts.automation.PartUpgradeable; +import appeng.parts.automation.UpgradeablePart; /** * @author BrockWS * @version rv6 - 22/05/2018 * @since rv6 22/05/2018 */ -public abstract class PartSharedStorageBus extends PartUpgradeable +public abstract class SharedStorageBusPart extends UpgradeablePart implements IGridTickable, ICellContainer, IPriorityHost { private boolean wasActive = false; private int priority = 0; - public PartSharedStorageBus(ItemStack is) { + public SharedStorageBusPart(ItemStack is) { super(is); } diff --git a/src/main/java/appeng/parts/misc/PartStorageBus.java b/src/main/java/appeng/parts/misc/StorageBusPart.java similarity index 98% rename from src/main/java/appeng/parts/misc/PartStorageBus.java rename to src/main/java/appeng/parts/misc/StorageBusPart.java index 749c559e2..ad4562abe 100644 --- a/src/main/java/appeng/parts/misc/PartStorageBus.java +++ b/src/main/java/appeng/parts/misc/StorageBusPart.java @@ -75,7 +75,7 @@ import appeng.api.util.IConfigManager; import appeng.capabilities.Capabilities; import appeng.container.ContainerLocator; import appeng.container.ContainerOpener; -import appeng.container.implementations.ContainerStorageBus; +import appeng.container.implementations.StorageBusContainer; import appeng.core.AppEng; import appeng.core.settings.TickRates; import appeng.helpers.IInterfaceHost; @@ -88,14 +88,14 @@ import appeng.me.storage.ITickingMonitor; import appeng.me.storage.MEInventoryHandler; import appeng.me.storage.MEMonitorIInventory; import appeng.parts.PartModel; -import appeng.parts.automation.PartUpgradeable; +import appeng.parts.automation.UpgradeablePart; import appeng.tile.inventory.AppEngInternalAEInventory; import appeng.util.Platform; import appeng.util.inv.InvOperation; import appeng.util.prioritylist.FuzzyPriorityList; import appeng.util.prioritylist.PrecisePriorityList; -public class PartStorageBus extends PartUpgradeable +public class StorageBusPart extends UpgradeablePart implements IGridTickable, ICellContainer, IMEMonitorHandlerReceiver, IPriorityHost { public static final ResourceLocation MODEL_BASE = new ResourceLocation(AppEng.MOD_ID, "part/storage_bus_base"); @@ -123,7 +123,7 @@ public class PartStorageBus extends PartUpgradeable private byte resetCacheLogic = 0; @Reflected - public PartStorageBus(final ItemStack is) { + public StorageBusPart(final ItemStack is) { super(is); this.getConfigManager().registerSetting(Settings.ACCESS, AccessRestriction.READ_WRITE); this.getConfigManager().registerSetting(Settings.FUZZY_MODE, FuzzyMode.IGNORE_ALL); @@ -277,7 +277,7 @@ public class PartStorageBus extends PartUpgradeable @Override public boolean onPartActivate(final PlayerEntity player, final Hand hand, final Vec3d pos) { if (Platform.isServer()) { - ContainerOpener.openContainer(ContainerStorageBus.TYPE, player, ContainerLocator.forPart(this)); + ContainerOpener.openContainer(StorageBusContainer.TYPE, player, ContainerLocator.forPart(this)); } return true; } @@ -564,6 +564,6 @@ public class PartStorageBus extends PartUpgradeable @Override public ContainerType getContainerType() { - return ContainerStorageBus.TYPE; + return StorageBusContainer.TYPE; } } diff --git a/src/main/java/appeng/parts/misc/PartToggleBus.java b/src/main/java/appeng/parts/misc/ToggleBusPart.java similarity index 98% rename from src/main/java/appeng/parts/misc/PartToggleBus.java rename to src/main/java/appeng/parts/misc/ToggleBusPart.java index 77f211900..5bb363b1a 100644 --- a/src/main/java/appeng/parts/misc/PartToggleBus.java +++ b/src/main/java/appeng/parts/misc/ToggleBusPart.java @@ -43,10 +43,10 @@ import appeng.core.AppEng; import appeng.helpers.Reflected; import appeng.items.parts.PartModels; import appeng.me.helpers.AENetworkProxy; -import appeng.parts.PartBasicState; +import appeng.parts.BasicStatePart; import appeng.parts.PartModel; -public class PartToggleBus extends PartBasicState { +public class ToggleBusPart extends BasicStatePart { @PartModels public static final ResourceLocation MODEL_BASE = new ResourceLocation(AppEng.MOD_ID, "part/toggle_bus_base"); @@ -70,7 +70,7 @@ public class PartToggleBus extends PartBasicState { private boolean hasRedstone = false; @Reflected - public PartToggleBus(final ItemStack is) { + public ToggleBusPart(final ItemStack is) { super(is); this.getProxy().setIdlePowerUsage(0.0); diff --git a/src/main/java/appeng/parts/networking/PartCable.java b/src/main/java/appeng/parts/networking/CablePart.java similarity index 98% rename from src/main/java/appeng/parts/networking/PartCable.java rename to src/main/java/appeng/parts/networking/CablePart.java index cd01d047b..d977cddc4 100644 --- a/src/main/java/appeng/parts/networking/PartCable.java +++ b/src/main/java/appeng/parts/networking/CablePart.java @@ -30,7 +30,7 @@ import net.minecraft.util.Direction; import appeng.api.AEApi; import appeng.api.config.SecurityPermissions; import appeng.api.definitions.IParts; -import appeng.api.implementations.parts.IPartCable; +import appeng.api.implementations.parts.ICablePart; import appeng.api.networking.GridFlags; import appeng.api.networking.IGridConnection; import appeng.api.networking.IGridHost; @@ -48,14 +48,14 @@ import appeng.me.GridAccessException; import appeng.parts.AEBasePart; import appeng.util.Platform; -public class PartCable extends AEBasePart implements IPartCable { +public class CablePart extends AEBasePart implements ICablePart { private final int[] channelsOnSide = { 0, 0, 0, 0, 0, 0 }; private EnumSet connections = EnumSet.noneOf(AEPartLocation.class); private boolean powered = false; - public PartCable(final ItemStack is) { + public CablePart(final ItemStack is) { super(is); this.getProxy().setFlags(GridFlags.PREFERRED); this.getProxy().setIdlePowerUsage(0.0); diff --git a/src/main/java/appeng/parts/networking/PartCableCovered.java b/src/main/java/appeng/parts/networking/CoveredCablePart.java similarity index 96% rename from src/main/java/appeng/parts/networking/PartCableCovered.java rename to src/main/java/appeng/parts/networking/CoveredCablePart.java index 5377f6263..1a340dbc3 100644 --- a/src/main/java/appeng/parts/networking/PartCableCovered.java +++ b/src/main/java/appeng/parts/networking/CoveredCablePart.java @@ -30,9 +30,9 @@ import appeng.api.util.AEPartLocation; import appeng.helpers.Reflected; import appeng.util.Platform; -public class PartCableCovered extends PartCable { +public class CoveredCablePart extends CablePart { @Reflected - public PartCableCovered(final ItemStack is) { + public CoveredCablePart(final ItemStack is) { super(is); } diff --git a/src/main/java/appeng/parts/networking/PartDenseCableCovered.java b/src/main/java/appeng/parts/networking/CoveredDenseCablePart.java similarity index 90% rename from src/main/java/appeng/parts/networking/PartDenseCableCovered.java rename to src/main/java/appeng/parts/networking/CoveredDenseCablePart.java index ceae8abcf..bb6ef57fe 100644 --- a/src/main/java/appeng/parts/networking/PartDenseCableCovered.java +++ b/src/main/java/appeng/parts/networking/CoveredDenseCablePart.java @@ -22,9 +22,9 @@ import net.minecraft.item.ItemStack; import appeng.api.util.AECableType; -public class PartDenseCableCovered extends PartDenseCable { +public class CoveredDenseCablePart extends DenseCablePart { - public PartDenseCableCovered(ItemStack is) { + public CoveredDenseCablePart(ItemStack is) { super(is); } diff --git a/src/main/java/appeng/parts/networking/PartDenseCable.java b/src/main/java/appeng/parts/networking/DenseCablePart.java similarity index 97% rename from src/main/java/appeng/parts/networking/PartDenseCable.java rename to src/main/java/appeng/parts/networking/DenseCablePart.java index 3d801e4dc..a198b1c5f 100644 --- a/src/main/java/appeng/parts/networking/PartDenseCable.java +++ b/src/main/java/appeng/parts/networking/DenseCablePart.java @@ -34,9 +34,9 @@ import appeng.api.util.AEPartLocation; import appeng.helpers.Reflected; import appeng.util.Platform; -public abstract class PartDenseCable extends PartCable { +public abstract class DenseCablePart extends CablePart { @Reflected - public PartDenseCable(final ItemStack is) { + public DenseCablePart(final ItemStack is) { super(is); this.getProxy().setFlags(GridFlags.DENSE_CAPACITY, GridFlags.PREFERRED); diff --git a/src/main/java/appeng/parts/networking/PartCableGlass.java b/src/main/java/appeng/parts/networking/GlassCablePart.java similarity index 90% rename from src/main/java/appeng/parts/networking/PartCableGlass.java rename to src/main/java/appeng/parts/networking/GlassCablePart.java index 946381709..f426786af 100644 --- a/src/main/java/appeng/parts/networking/PartCableGlass.java +++ b/src/main/java/appeng/parts/networking/GlassCablePart.java @@ -22,9 +22,9 @@ import net.minecraft.item.ItemStack; import appeng.helpers.Reflected; -public class PartCableGlass extends PartCable { +public class GlassCablePart extends CablePart { @Reflected - public PartCableGlass(final ItemStack is) { + public GlassCablePart(final ItemStack is) { super(is); } } diff --git a/src/main/java/appeng/parts/networking/PartQuartzFiber.java b/src/main/java/appeng/parts/networking/QuartzFiberPart.java similarity index 97% rename from src/main/java/appeng/parts/networking/PartQuartzFiber.java rename to src/main/java/appeng/parts/networking/QuartzFiberPart.java index d116591da..f071de90e 100644 --- a/src/main/java/appeng/parts/networking/PartQuartzFiber.java +++ b/src/main/java/appeng/parts/networking/QuartzFiberPart.java @@ -46,7 +46,7 @@ import appeng.me.helpers.AENetworkProxy; import appeng.parts.AEBasePart; import appeng.parts.PartModel; -public class PartQuartzFiber extends AEBasePart implements IEnergyGridProvider { +public class QuartzFiberPart extends AEBasePart implements IEnergyGridProvider { @PartModels private static final IPartModel MODELS = new PartModel(new ResourceLocation(AppEng.MOD_ID, "part/quartz_fiber")); @@ -54,7 +54,7 @@ public class PartQuartzFiber extends AEBasePart implements IEnergyGridProvider { private final AENetworkProxy outerProxy = new AENetworkProxy(this, "outer", this.getProxy().getMachineRepresentation(), true); - public PartQuartzFiber(final ItemStack is) { + public QuartzFiberPart(final ItemStack is) { super(is); this.getProxy().setIdlePowerUsage(0); this.getProxy().setFlags(GridFlags.CANNOT_CARRY); diff --git a/src/main/java/appeng/parts/networking/PartCableSmart.java b/src/main/java/appeng/parts/networking/SmartCablePart.java similarity index 96% rename from src/main/java/appeng/parts/networking/PartCableSmart.java rename to src/main/java/appeng/parts/networking/SmartCablePart.java index f023b9fdd..b22ee5e14 100644 --- a/src/main/java/appeng/parts/networking/PartCableSmart.java +++ b/src/main/java/appeng/parts/networking/SmartCablePart.java @@ -30,9 +30,9 @@ import appeng.api.util.AEPartLocation; import appeng.helpers.Reflected; import appeng.util.Platform; -public class PartCableSmart extends PartCable { +public class SmartCablePart extends CablePart { @Reflected - public PartCableSmart(final ItemStack is) { + public SmartCablePart(final ItemStack is) { super(is); } diff --git a/src/main/java/appeng/parts/networking/PartDenseCableSmart.java b/src/main/java/appeng/parts/networking/SmartDenseCablePart.java similarity index 91% rename from src/main/java/appeng/parts/networking/PartDenseCableSmart.java rename to src/main/java/appeng/parts/networking/SmartDenseCablePart.java index 893408632..f215dd2b3 100644 --- a/src/main/java/appeng/parts/networking/PartDenseCableSmart.java +++ b/src/main/java/appeng/parts/networking/SmartDenseCablePart.java @@ -22,9 +22,9 @@ import net.minecraft.item.ItemStack; import appeng.api.util.AECableType; -public class PartDenseCableSmart extends PartDenseCable { +public class SmartDenseCablePart extends DenseCablePart { - public PartDenseCableSmart(ItemStack is) { + public SmartDenseCablePart(ItemStack is) { super(is); } diff --git a/src/main/java/appeng/parts/p2p/PartP2PFEPower.java b/src/main/java/appeng/parts/p2p/FEP2PTunnelPart.java similarity index 86% rename from src/main/java/appeng/parts/p2p/PartP2PFEPower.java rename to src/main/java/appeng/parts/p2p/FEP2PTunnelPart.java index 7f060ed46..aedf5b8b3 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PFEPower.java +++ b/src/main/java/appeng/parts/p2p/FEP2PTunnelPart.java @@ -35,13 +35,13 @@ import appeng.capabilities.Capabilities; import appeng.items.parts.PartModels; import appeng.me.GridAccessException; -public class PartP2PFEPower extends PartP2PTunnel { +public class FEP2PTunnelPart extends P2PTunnelPart { private static final P2PModels MODELS = new P2PModels("part/p2p/p2p_tunnel_fe"); private static final IEnergyStorage NULL_ENERGY_STORAGE = new NullEnergyStorage(); private final IEnergyStorage inputHandler = new InputEnergyStorage(); private final IEnergyStorage outputHandler = new OutputEnergyStorage(); - public PartP2PFEPower(ItemStack is) { + public FEP2PTunnelPart(ItemStack is) { super(is); } @@ -98,7 +98,7 @@ public class PartP2PFEPower extends PartP2PTunnel { int total = 0; try { - final int outputTunnels = PartP2PFEPower.this.getOutputs().size(); + final int outputTunnels = FEP2PTunnelPart.this.getOutputs().size(); if (outputTunnels == 0 | maxReceive == 0) { return 0; @@ -107,7 +107,7 @@ public class PartP2PFEPower extends PartP2PTunnel { final int amountPerOutput = maxReceive / outputTunnels; int overflow = amountPerOutput == 0 ? maxReceive : maxReceive % amountPerOutput; - for (PartP2PFEPower target : PartP2PFEPower.this.getOutputs()) { + for (FEP2PTunnelPart target : FEP2PTunnelPart.this.getOutputs()) { final IEnergyStorage output = target.getAttachedEnergyStorage(); final int toSend = amountPerOutput + overflow; final int received = output.receiveEnergy(toSend, simulate); @@ -117,7 +117,7 @@ public class PartP2PFEPower extends PartP2PTunnel { } if (!simulate) { - PartP2PFEPower.this.queueTunnelDrain(PowerUnits.RF, total); + FEP2PTunnelPart.this.queueTunnelDrain(PowerUnits.RF, total); } } catch (GridAccessException ignored) { } @@ -140,7 +140,7 @@ public class PartP2PFEPower extends PartP2PTunnel { int total = 0; try { - for (PartP2PFEPower t : PartP2PFEPower.this.getOutputs()) { + for (FEP2PTunnelPart t : FEP2PTunnelPart.this.getOutputs()) { total += t.getAttachedEnergyStorage().getMaxEnergyStored(); } } catch (GridAccessException e) { @@ -155,7 +155,7 @@ public class PartP2PFEPower extends PartP2PTunnel { int total = 0; try { - for (PartP2PFEPower t : PartP2PFEPower.this.getOutputs()) { + for (FEP2PTunnelPart t : FEP2PTunnelPart.this.getOutputs()) { total += t.getAttachedEnergyStorage().getEnergyStored(); } } catch (GridAccessException e) { @@ -169,10 +169,10 @@ public class PartP2PFEPower extends PartP2PTunnel { private class OutputEnergyStorage implements IEnergyStorage { @Override public int extractEnergy(int maxExtract, boolean simulate) { - final int total = PartP2PFEPower.this.getAttachedEnergyStorage().extractEnergy(maxExtract, simulate); + final int total = FEP2PTunnelPart.this.getAttachedEnergyStorage().extractEnergy(maxExtract, simulate); if (!simulate) { - PartP2PFEPower.this.queueTunnelDrain(PowerUnits.RF, total); + FEP2PTunnelPart.this.queueTunnelDrain(PowerUnits.RF, total); } return total; @@ -185,7 +185,7 @@ public class PartP2PFEPower extends PartP2PTunnel { @Override public boolean canExtract() { - return PartP2PFEPower.this.getAttachedEnergyStorage().canExtract(); + return FEP2PTunnelPart.this.getAttachedEnergyStorage().canExtract(); } @Override @@ -195,12 +195,12 @@ public class PartP2PFEPower extends PartP2PTunnel { @Override public int getMaxEnergyStored() { - return PartP2PFEPower.this.getAttachedEnergyStorage().getMaxEnergyStored(); + return FEP2PTunnelPart.this.getAttachedEnergyStorage().getMaxEnergyStored(); } @Override public int getEnergyStored() { - return PartP2PFEPower.this.getAttachedEnergyStorage().getEnergyStored(); + return FEP2PTunnelPart.this.getAttachedEnergyStorage().getEnergyStored(); } } diff --git a/src/main/java/appeng/parts/p2p/PartP2PFluids.java b/src/main/java/appeng/parts/p2p/FluidP2PTunnelPart.java similarity index 87% rename from src/main/java/appeng/parts/p2p/PartP2PFluids.java rename to src/main/java/appeng/parts/p2p/FluidP2PTunnelPart.java index 0719532d1..82ac67fb1 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PFluids.java +++ b/src/main/java/appeng/parts/p2p/FluidP2PTunnelPart.java @@ -41,16 +41,16 @@ import appeng.api.parts.IPartModel; import appeng.items.parts.PartModels; import appeng.me.GridAccessException; -public class PartP2PFluids extends PartP2PTunnel implements IFluidHandler { +public class FluidP2PTunnelPart extends P2PTunnelPart implements IFluidHandler { private static final P2PModels MODELS = new P2PModels("part/p2p/p2p_tunnel_fluids"); - private static final ThreadLocal> DEPTH = new ThreadLocal<>();; + private static final ThreadLocal> DEPTH = new ThreadLocal<>();; private LazyOptional cachedTank; private int tmpUsed; - public PartP2PFluids(final ItemStack is) { + public FluidP2PTunnelPart(final ItemStack is) { super(is); } @@ -73,7 +73,7 @@ public class PartP2PFluids extends PartP2PTunnel implements IFlui this.cachedTank = null; if (this.isOutput()) { - final PartP2PFluids in = this.getInput(); + final FluidP2PTunnelPart in = this.getInput(); if (in != null) { in.onTunnelNetworkChange(); } @@ -119,9 +119,9 @@ public class PartP2PFluids extends PartP2PTunnel implements IFlui @Override public int fill(FluidStack resource, FluidAction action) { - final Deque stack = this.getDepth(); + final Deque stack = this.getDepth(); - for (final PartP2PFluids t : stack) { + for (final FluidP2PTunnelPart t : stack) { if (t == this) { return 0; } @@ -129,13 +129,13 @@ public class PartP2PFluids extends PartP2PTunnel implements IFlui stack.push(this); - final List list = this.getOutputs(resource.getFluid()); + final List list = this.getOutputs(resource.getFluid()); int requestTotal = 0; - Iterator i = list.iterator(); + Iterator i = list.iterator(); while (i.hasNext()) { - final PartP2PFluids l = i.next(); + final FluidP2PTunnelPart l = i.next(); final IFluidHandler tank = l.getTarget().orElse(null); if (tank != null) { l.tmpUsed = tank.fill(resource.copy(), FluidAction.SIMULATE); @@ -172,7 +172,7 @@ public class PartP2PFluids extends PartP2PTunnel implements IFlui int used = 0; while (i.hasNext() && available > 0) { - final PartP2PFluids l = i.next(); + final FluidP2PTunnelPart l = i.next(); final FluidStack insert = resource.copy(); insert.setAmount((int) Math.ceil(insert.getAmount() * ((double) l.tmpUsed / (double) requestTotal))); @@ -210,8 +210,8 @@ public class PartP2PFluids extends PartP2PTunnel implements IFlui return FluidStack.EMPTY; } - private Deque getDepth() { - Deque s = DEPTH.get(); + private Deque getDepth() { + Deque s = DEPTH.get(); if (s == null) { DEPTH.set(s = new ArrayDeque<>()); @@ -220,11 +220,11 @@ public class PartP2PFluids extends PartP2PTunnel implements IFlui return s; } - private List getOutputs(final Fluid input) { - final List outs = new ArrayList<>(); + private List getOutputs(final Fluid input) { + final List outs = new ArrayList<>(); try { - for (final PartP2PFluids l : this.getOutputs()) { + for (final FluidP2PTunnelPart l : this.getOutputs()) { final IFluidHandler handler = l.getTarget().orElse(null); if (handler != null) { diff --git a/src/main/java/appeng/parts/p2p/PartP2PItems.java b/src/main/java/appeng/parts/p2p/ItemP2PTunnelPart.java similarity index 95% rename from src/main/java/appeng/parts/p2p/PartP2PItems.java rename to src/main/java/appeng/parts/p2p/ItemP2PTunnelPart.java index 574480c80..c4454ac31 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PItems.java +++ b/src/main/java/appeng/parts/p2p/ItemP2PTunnelPart.java @@ -50,7 +50,7 @@ import appeng.me.cache.helpers.TunnelCollection; import appeng.util.Platform; import appeng.util.inv.WrapperChainedItemHandler; -public class PartP2PItems extends PartP2PTunnel implements IItemHandler, IGridTickable { +public class ItemP2PTunnelPart extends P2PTunnelPart implements IItemHandler, IGridTickable { private static final float POWER_DRAIN = 2.0f; private static final P2PModels MODELS = new P2PModels("part/p2p/p2p_tunnel_items"); private boolean partVisited = false; @@ -64,14 +64,14 @@ public class PartP2PItems extends PartP2PTunnel implements IItemHa private boolean requested; private IItemHandler cachedInv; - public PartP2PItems(final ItemStack is) { + public ItemP2PTunnelPart(final ItemStack is) { super(is); } @Override public void onNeighborChanged(IBlockReader w, BlockPos pos, BlockPos neighbor) { this.cachedInv = null; - final PartP2PItems input = this.getInput(); + final ItemP2PTunnelPart input = this.getInput(); if (input != null && this.isOutput()) { input.onTunnelNetworkChange(); } @@ -85,7 +85,7 @@ public class PartP2PItems extends PartP2PTunnel implements IItemHa } final List outs = new ArrayList(); - final TunnelCollection itemTunnels; + final TunnelCollection itemTunnels; try { itemTunnels = this.getOutputs(); @@ -93,7 +93,7 @@ public class PartP2PItems extends PartP2PTunnel implements IItemHa return EmptyHandler.INSTANCE; } - for (final PartP2PItems t : itemTunnels) { + for (final ItemP2PTunnelPart t : itemTunnels) { final IItemHandler inv = t.getOutputInv(); if (inv != null && inv != this) { if (Platform.getRandomInt() % 2 == 0) { @@ -188,7 +188,7 @@ public class PartP2PItems extends PartP2PTunnel implements IItemHa this.getHost().notifyNeighbors(); } } else { - final PartP2PItems input = this.getInput(); + final ItemP2PTunnelPart input = this.getInput(); if (input != null) { input.getHost().notifyNeighbors(); } diff --git a/src/main/java/appeng/parts/p2p/PartP2PLight.java b/src/main/java/appeng/parts/p2p/LightP2PTunnelPart.java similarity index 95% rename from src/main/java/appeng/parts/p2p/PartP2PLight.java rename to src/main/java/appeng/parts/p2p/LightP2PTunnelPart.java index 61538035d..da0ec7d5b 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PLight.java +++ b/src/main/java/appeng/parts/p2p/LightP2PTunnelPart.java @@ -40,7 +40,7 @@ import appeng.core.settings.TickRates; import appeng.items.parts.PartModels; import appeng.me.GridAccessException; -public class PartP2PLight extends PartP2PTunnel implements IGridTickable { +public class LightP2PTunnelPart extends P2PTunnelPart implements IGridTickable { private static final P2PModels MODELS = new P2PModels("part/p2p/p2p_tunnel_light"); @@ -52,7 +52,7 @@ public class PartP2PLight extends PartP2PTunnel implements IGridTi private int lastValue = 0; private int opacity = -1; - public PartP2PLight(final ItemStack is) { + public LightP2PTunnelPart(final ItemStack is) { super(is); } @@ -101,7 +101,7 @@ public class PartP2PLight extends PartP2PTunnel implements IGridTi if (this.lastValue != newLevel && this.getProxy().isActive()) { this.lastValue = newLevel; try { - for (final PartP2PLight out : this.getOutputs()) { + for (final LightP2PTunnelPart out : this.getOutputs()) { out.setLightLevel(this.lastValue); } } catch (final GridAccessException e) { @@ -165,7 +165,7 @@ public class PartP2PLight extends PartP2PTunnel implements IGridTi @Override public void onTunnelNetworkChange() { if (this.isOutput()) { - final PartP2PLight src = this.getInput(); + final LightP2PTunnelPart src = this.getInput(); if (src != null && src.getProxy().isActive()) { this.setLightLevel(src.lastValue); } else { diff --git a/src/main/java/appeng/parts/p2p/PartP2PTunnelME.java b/src/main/java/appeng/parts/p2p/MEP2PTunnelPart.java similarity index 95% rename from src/main/java/appeng/parts/p2p/PartP2PTunnelME.java rename to src/main/java/appeng/parts/p2p/MEP2PTunnelPart.java index 3f46019e1..abe9d20d6 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PTunnelME.java +++ b/src/main/java/appeng/parts/p2p/MEP2PTunnelPart.java @@ -49,7 +49,7 @@ import appeng.me.cache.helpers.Connections; import appeng.me.cache.helpers.TunnelConnection; import appeng.me.helpers.AENetworkProxy; -public class PartP2PTunnelME extends PartP2PTunnel implements IGridTickable { +public class MEP2PTunnelPart extends P2PTunnelPart implements IGridTickable { private static final P2PModels MODELS = new P2PModels("part/p2p/p2p_tunnel_me"); @@ -61,7 +61,7 @@ public class PartP2PTunnelME extends PartP2PTunnel implements I private final Connections connection = new Connections(this); private final AENetworkProxy outerProxy = new AENetworkProxy(this, "outer", ItemStack.EMPTY, true); - public PartP2PTunnelME(final ItemStack is) { + public MEP2PTunnelPart(final ItemStack is) { super(is); this.getProxy().setFlags(GridFlags.REQUIRE_CHANNEL, GridFlags.COMPRESSED_CHANNEL); this.outerProxy.setFlags(GridFlags.DENSE_CAPACITY, GridFlags.CANNOT_CARRY_COMPRESSED); @@ -183,15 +183,15 @@ public class PartP2PTunnelME extends PartP2PTunnel implements I } } - final List newSides = new ArrayList<>(); + final List newSides = new ArrayList<>(); try { - for (final PartP2PTunnelME me : this.getOutputs()) { + for (final MEP2PTunnelPart me : this.getOutputs()) { if (me.getProxy().isActive() && connections.getConnections().get(me.getGridNode()) == null) { newSides.add(me); } } - for (final PartP2PTunnelME me : newSides) { + for (final MEP2PTunnelPart me : newSides) { try { connections.getConnections().put(me.getGridNode(), new TunnelConnection(me, AEApi.instance() .grid().createGridConnection(this.outerProxy.getNode(), me.outerProxy.getNode()))); diff --git a/src/main/java/appeng/parts/p2p/PartP2PTunnel.java b/src/main/java/appeng/parts/p2p/P2PTunnelPart.java similarity index 94% rename from src/main/java/appeng/parts/p2p/PartP2PTunnel.java rename to src/main/java/appeng/parts/p2p/P2PTunnelPart.java index 0f8b5d5a1..a0ce7c22e 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PTunnel.java +++ b/src/main/java/appeng/parts/p2p/P2PTunnelPart.java @@ -51,20 +51,20 @@ import appeng.core.AEConfig; import appeng.me.GridAccessException; import appeng.me.cache.P2PCache; import appeng.me.cache.helpers.TunnelCollection; -import appeng.parts.PartBasicState; +import appeng.parts.BasicStatePart; import appeng.util.Platform; -public abstract class PartP2PTunnel extends PartBasicState { +public abstract class P2PTunnelPart extends BasicStatePart { private final TunnelCollection type = new TunnelCollection(null, this.getClass()); private boolean output; private short freq; - public PartP2PTunnel(final ItemStack is) { + public P2PTunnelPart(final ItemStack is) { super(is); } - public TunnelCollection getCollection(final Collection collection, - final Class c) { + public TunnelCollection getCollection(final Collection collection, + final Class c) { if (this.type.matches(c)) { this.type.setSource(collection); return this.type; @@ -79,7 +79,7 @@ public abstract class PartP2PTunnel extends PartBasicSt } try { - final PartP2PTunnel tunnel = this.getProxy().getP2P().getInput(this.getFrequency()); + final P2PTunnelPart tunnel = this.getProxy().getP2P().getInput(this.getFrequency()); if (this.getClass().isInstance(tunnel)) { return (T) tunnel; } @@ -179,13 +179,13 @@ public abstract class PartP2PTunnel extends PartBasicSt if (!newType.isEmpty()) { if (newType.getItem() instanceof IPartItem) { final IPart testPart = ((IPartItem) newType.getItem()).createPart(newType); - if (testPart instanceof PartP2PTunnel) { + if (testPart instanceof P2PTunnelPart) { this.getHost().removePart(this.getSide(), true); final AEPartLocation dir = this.getHost().addPart(newType, this.getSide(), player, hand); final IPart newBus = this.getHost().getPart(dir); - if (newBus instanceof PartP2PTunnel) { - final PartP2PTunnel newTunnel = (PartP2PTunnel) newBus; + if (newBus instanceof P2PTunnelPart) { + final P2PTunnelPart newTunnel = (P2PTunnelPart) newBus; newTunnel.setOutput(true); try { @@ -258,8 +258,8 @@ public abstract class PartP2PTunnel extends PartBasicSt final AEPartLocation dir = this.getHost().addPart(newType, this.getSide(), player, hand); final IPart newBus = this.getHost().getPart(dir); - if (newBus instanceof PartP2PTunnel) { - final PartP2PTunnel newTunnel = (PartP2PTunnel) newBus; + if (newBus instanceof P2PTunnelPart) { + final P2PTunnelPart newTunnel = (P2PTunnelPart) newBus; newTunnel.setOutput(oldOutput); newTunnel.onTunnelNetworkChange(); diff --git a/src/main/java/appeng/parts/p2p/PartP2PRedstone.java b/src/main/java/appeng/parts/p2p/RedstoneP2PTunnelPart.java similarity index 95% rename from src/main/java/appeng/parts/p2p/PartP2PRedstone.java rename to src/main/java/appeng/parts/p2p/RedstoneP2PTunnelPart.java index bb8817e5f..28ab67696 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PRedstone.java +++ b/src/main/java/appeng/parts/p2p/RedstoneP2PTunnelPart.java @@ -39,7 +39,7 @@ import appeng.items.parts.PartModels; import appeng.me.GridAccessException; import appeng.util.Platform; -public class PartP2PRedstone extends PartP2PTunnel { +public class RedstoneP2PTunnelPart extends P2PTunnelPart { private static final P2PModels MODELS = new P2PModels("part/p2p/p2p_tunnel_redstone"); @@ -51,7 +51,7 @@ public class PartP2PRedstone extends PartP2PTunnel { private int power; private boolean recursive = false; - public PartP2PRedstone(final ItemStack is) { + public RedstoneP2PTunnelPart(final ItemStack is) { super(is); } @@ -62,7 +62,7 @@ public class PartP2PRedstone extends PartP2PTunnel { private void setNetworkReady() { if (this.isOutput()) { - final PartP2PRedstone in = this.getInput(); + final RedstoneP2PTunnelPart in = this.getInput(); if (in != null) { this.putInput(in.power); } @@ -166,7 +166,7 @@ public class PartP2PRedstone extends PartP2PTunnel { private void sendToOutput(final int power) { try { - for (final PartP2PRedstone rs : this.getOutputs()) { + for (final RedstoneP2PTunnelPart rs : this.getOutputs()) { rs.putInput(power); } } catch (final GridAccessException e) { diff --git a/src/main/java/appeng/parts/reporting/AbstractPartDisplay.java b/src/main/java/appeng/parts/reporting/AbstractDisplayPart.java similarity index 94% rename from src/main/java/appeng/parts/reporting/AbstractPartDisplay.java rename to src/main/java/appeng/parts/reporting/AbstractDisplayPart.java index 8e33be5a4..2f529c606 100644 --- a/src/main/java/appeng/parts/reporting/AbstractPartDisplay.java +++ b/src/main/java/appeng/parts/reporting/AbstractDisplayPart.java @@ -36,7 +36,7 @@ import appeng.items.parts.PartModels; * @version rv3 * @since rv3 */ -public abstract class AbstractPartDisplay extends AbstractPartReporting { +public abstract class AbstractDisplayPart extends AbstractReportingPart { // The base chassis of all display parts @PartModels @@ -53,7 +53,7 @@ public abstract class AbstractPartDisplay extends AbstractPartReporting { protected static final ResourceLocation MODEL_STATUS_HAS_CHANNEL = new ResourceLocation(AppEng.MOD_ID, "part/display_status_has_channel"); - public AbstractPartDisplay(final ItemStack is) { + public AbstractDisplayPart(final ItemStack is) { super(is, true); } diff --git a/src/main/java/appeng/parts/reporting/AbstractPartMonitor.java b/src/main/java/appeng/parts/reporting/AbstractMonitorPart.java similarity index 95% rename from src/main/java/appeng/parts/reporting/AbstractPartMonitor.java rename to src/main/java/appeng/parts/reporting/AbstractMonitorPart.java index 3fb849c68..2f38ee34b 100644 --- a/src/main/java/appeng/parts/reporting/AbstractPartMonitor.java +++ b/src/main/java/appeng/parts/reporting/AbstractMonitorPart.java @@ -35,7 +35,7 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import appeng.api.AEApi; -import appeng.api.implementations.parts.IPartStorageMonitor; +import appeng.api.implementations.parts.IStorageMonitorPart; import appeng.api.networking.security.IActionSource; import appeng.api.networking.storage.IStackWatcher; import appeng.api.networking.storage.IStackWatcherHost; @@ -68,8 +68,8 @@ import appeng.util.item.AEItemStack; * @version rv3 * @since rv3 */ -public abstract class AbstractPartMonitor extends AbstractPartDisplay - implements IPartStorageMonitor, IStackWatcherHost { +public abstract class AbstractMonitorPart extends AbstractDisplayPart + implements IStorageMonitorPart, IStackWatcherHost { private static final IWideReadableNumberConverter NUMBER_CONVERTER = ReadableNumberConverter.INSTANCE; private IAEItemStack configuredItem; private String lastHumanReadableText; @@ -77,7 +77,7 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay private IStackWatcher myWatcher; @Reflected - public AbstractPartMonitor(final ItemStack is) { + public AbstractMonitorPart(final ItemStack is) { super(is); } @@ -222,8 +222,8 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay public void renderDynamic(float partialTicks, MatrixStack matrixStack, IRenderTypeBuffer buffers, int combinedLightIn, int combinedOverlayIn) { - if ((this.getClientFlags() & (PartPanel.POWERED_FLAG | PartPanel.CHANNEL_FLAG)) != (PartPanel.POWERED_FLAG - | PartPanel.CHANNEL_FLAG)) { + if ((this.getClientFlags() & (PanelPart.POWERED_FLAG | PanelPart.CHANNEL_FLAG)) != (PanelPart.POWERED_FLAG + | PanelPart.CHANNEL_FLAG)) { return; } diff --git a/src/main/java/appeng/parts/reporting/AbstractPartPanel.java b/src/main/java/appeng/parts/reporting/AbstractPanelPart.java similarity index 90% rename from src/main/java/appeng/parts/reporting/AbstractPartPanel.java rename to src/main/java/appeng/parts/reporting/AbstractPanelPart.java index f3bb015bb..4c73fe5e7 100644 --- a/src/main/java/appeng/parts/reporting/AbstractPartPanel.java +++ b/src/main/java/appeng/parts/reporting/AbstractPanelPart.java @@ -28,7 +28,7 @@ import appeng.items.parts.PartModels; /** * A very simple part for emitting light. * - * Opposed to the other subclass of {@link AbstractPartReporting}, it will only + * Opposed to the other subclass of {@link AbstractReportingPart}, it will only * use the bright front texture. * * @author AlgorithmX2 @@ -36,12 +36,12 @@ import appeng.items.parts.PartModels; * @version rv3 * @since rv3 */ -public abstract class AbstractPartPanel extends AbstractPartReporting { +public abstract class AbstractPanelPart extends AbstractReportingPart { @PartModels public static final ResourceLocation MODEL_BASE = new ResourceLocation(AppEng.MOD_ID, "part/monitor_base"); - public AbstractPartPanel(final ItemStack is) { + public AbstractPanelPart(final ItemStack is) { super(is, false); } diff --git a/src/main/java/appeng/parts/reporting/AbstractPartReporting.java b/src/main/java/appeng/parts/reporting/AbstractReportingPart.java similarity index 93% rename from src/main/java/appeng/parts/reporting/AbstractPartReporting.java rename to src/main/java/appeng/parts/reporting/AbstractReportingPart.java index f781d7ffd..59f46c7a9 100644 --- a/src/main/java/appeng/parts/reporting/AbstractPartReporting.java +++ b/src/main/java/appeng/parts/reporting/AbstractReportingPart.java @@ -33,7 +33,7 @@ import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import appeng.api.implementations.IPowerChannelState; -import appeng.api.implementations.parts.IPartMonitor; +import appeng.api.implementations.parts.IMonitorPart; import appeng.api.networking.GridFlags; import appeng.api.networking.events.MENetworkBootingStatusChange; import appeng.api.networking.events.MENetworkEventSubscribe; @@ -61,7 +61,7 @@ import appeng.util.Platform; * @version rv3 * @since rv3 */ -public abstract class AbstractPartReporting extends AEBasePart implements IPartMonitor, IPowerChannelState { +public abstract class AbstractReportingPart extends AEBasePart implements IMonitorPart, IPowerChannelState { protected static final int POWERED_FLAG = 4; protected static final int CHANNEL_FLAG = 16; @@ -71,11 +71,11 @@ public abstract class AbstractPartReporting extends AEBasePart implements IPartM private int clientFlags = 0; // sent as byte. private int opacity = -1; - public AbstractPartReporting(final ItemStack is) { + public AbstractReportingPart(final ItemStack is) { this(is, false); } - protected AbstractPartReporting(final ItemStack is, final boolean requireChannel) { + protected AbstractReportingPart(final ItemStack is, final boolean requireChannel) { super(is); if (requireChannel) { @@ -131,15 +131,15 @@ public abstract class AbstractPartReporting extends AEBasePart implements IPartM try { if (this.getProxy().getEnergy().isNetworkPowered()) { - this.clientFlags = this.getClientFlags() | AbstractPartReporting.POWERED_FLAG; + this.clientFlags = this.getClientFlags() | AbstractReportingPart.POWERED_FLAG; } if (this.getProxy().getPath().isNetworkBooting()) { - this.clientFlags = this.getClientFlags() | AbstractPartReporting.BOOTING_FLAG; + this.clientFlags = this.getClientFlags() | AbstractReportingPart.BOOTING_FLAG; } if (this.getProxy().getNode().meetsChannelRequirements()) { - this.clientFlags = this.getClientFlags() | AbstractPartReporting.CHANNEL_FLAG; + this.clientFlags = this.getClientFlags() | AbstractReportingPart.CHANNEL_FLAG; } } catch (final GridAccessException e) { // um.. nothing. @@ -234,7 +234,7 @@ public abstract class AbstractPartReporting extends AEBasePart implements IPartM if (Platform.isServer()) { return this.getProxy().getEnergy().isNetworkPowered(); } else { - return ((this.getClientFlags() & PartPanel.POWERED_FLAG) == PartPanel.POWERED_FLAG); + return ((this.getClientFlags() & PanelPart.POWERED_FLAG) == PanelPart.POWERED_FLAG); } } catch (final GridAccessException e) { return false; @@ -245,8 +245,8 @@ public abstract class AbstractPartReporting extends AEBasePart implements IPartM public final boolean isActive() { if (!this.isLightSource()) { return ((this.getClientFlags() - & (PartPanel.CHANNEL_FLAG | PartPanel.POWERED_FLAG)) == (PartPanel.CHANNEL_FLAG - | PartPanel.POWERED_FLAG)); + & (PanelPart.CHANNEL_FLAG | PanelPart.POWERED_FLAG)) == (PanelPart.CHANNEL_FLAG + | PanelPart.POWERED_FLAG)); } else { return this.isPowered(); } diff --git a/src/main/java/appeng/parts/reporting/AbstractPartTerminal.java b/src/main/java/appeng/parts/reporting/AbstractTerminalPart.java similarity index 95% rename from src/main/java/appeng/parts/reporting/AbstractPartTerminal.java rename to src/main/java/appeng/parts/reporting/AbstractTerminalPart.java index d7f22799c..306718efd 100644 --- a/src/main/java/appeng/parts/reporting/AbstractPartTerminal.java +++ b/src/main/java/appeng/parts/reporting/AbstractTerminalPart.java @@ -40,7 +40,7 @@ import appeng.api.storage.data.IAEStack; import appeng.api.util.IConfigManager; import appeng.container.ContainerLocator; import appeng.container.ContainerOpener; -import appeng.container.implementations.ContainerMEMonitorable; +import appeng.container.implementations.MEMonitorableContainer; import appeng.me.GridAccessException; import appeng.tile.inventory.AppEngInternalInventory; import appeng.util.ConfigManager; @@ -59,13 +59,13 @@ import appeng.util.inv.InvOperation; * @version rv3 * @since rv3 */ -public abstract class AbstractPartTerminal extends AbstractPartDisplay +public abstract class AbstractTerminalPart extends AbstractDisplayPart implements ITerminalHost, IConfigManagerHost, IViewCellStorage, IAEAppEngInventory { private final IConfigManager cm = new ConfigManager(this); private final AppEngInternalInventory viewCell = new AppEngInternalInventory(this, 5); - public AbstractPartTerminal(final ItemStack is) { + public AbstractTerminalPart(final ItemStack is) { super(is); this.cm.registerSetting(Settings.SORT_BY, SortOrder.NAME); @@ -114,7 +114,7 @@ public abstract class AbstractPartTerminal extends AbstractPartDisplay } public ContainerType getContainerType(final PlayerEntity player) { - return ContainerMEMonitorable.TYPE; + return MEMonitorableContainer.TYPE; } @Override diff --git a/src/main/java/appeng/parts/reporting/PartConversionMonitor.java b/src/main/java/appeng/parts/reporting/ConversionMonitorPart.java similarity index 98% rename from src/main/java/appeng/parts/reporting/PartConversionMonitor.java rename to src/main/java/appeng/parts/reporting/ConversionMonitorPart.java index 3451e396f..5c6c6ff1a 100644 --- a/src/main/java/appeng/parts/reporting/PartConversionMonitor.java +++ b/src/main/java/appeng/parts/reporting/ConversionMonitorPart.java @@ -46,7 +46,7 @@ import appeng.util.InventoryAdaptor; import appeng.util.Platform; import appeng.util.item.AEItemStack; -public class PartConversionMonitor extends AbstractPartMonitor { +public class ConversionMonitorPart extends AbstractMonitorPart { @PartModels public static final ResourceLocation MODEL_OFF = new ResourceLocation(AppEng.MOD_ID, "part/conversion_monitor_off"); @@ -68,7 +68,7 @@ public class PartConversionMonitor extends AbstractPartMonitor { MODEL_STATUS_HAS_CHANNEL); @Reflected - public PartConversionMonitor(final ItemStack is) { + public ConversionMonitorPart(final ItemStack is) { super(is); } diff --git a/src/main/java/appeng/parts/reporting/PartCraftingTerminal.java b/src/main/java/appeng/parts/reporting/CraftingTerminalPart.java similarity index 90% rename from src/main/java/appeng/parts/reporting/PartCraftingTerminal.java rename to src/main/java/appeng/parts/reporting/CraftingTerminalPart.java index 71f57d925..cbf27cee8 100644 --- a/src/main/java/appeng/parts/reporting/PartCraftingTerminal.java +++ b/src/main/java/appeng/parts/reporting/CraftingTerminalPart.java @@ -29,8 +29,8 @@ import net.minecraftforge.items.IItemHandler; import appeng.api.config.SecurityPermissions; import appeng.api.parts.IPartModel; -import appeng.container.implementations.ContainerCraftingTerm; -import appeng.container.implementations.ContainerMEMonitorable; +import appeng.container.implementations.CraftingTermContainer; +import appeng.container.implementations.MEMonitorableContainer; import appeng.core.AppEng; import appeng.helpers.Reflected; import appeng.items.parts.PartModels; @@ -38,7 +38,7 @@ import appeng.parts.PartModel; import appeng.tile.inventory.AppEngInternalInventory; import appeng.util.Platform; -public class PartCraftingTerminal extends AbstractPartTerminal { +public class CraftingTerminalPart extends AbstractTerminalPart { @PartModels public static final ResourceLocation MODEL_OFF = new ResourceLocation(AppEng.MOD_ID, "part/crafting_terminal_off"); @@ -52,7 +52,7 @@ public class PartCraftingTerminal extends AbstractPartTerminal { private final AppEngInternalInventory craftingGrid = new AppEngInternalInventory(this, 9); @Reflected - public PartCraftingTerminal(final ItemStack is) { + public CraftingTerminalPart(final ItemStack is) { super(is); } @@ -82,9 +82,9 @@ public class PartCraftingTerminal extends AbstractPartTerminal { @Override public ContainerType getContainerType(final PlayerEntity p) { if (Platform.checkPermissions(p, this, SecurityPermissions.CRAFT, false)) { - return ContainerCraftingTerm.TYPE; + return CraftingTermContainer.TYPE; } - return ContainerMEMonitorable.TYPE; + return MEMonitorableContainer.TYPE; } @Override diff --git a/src/main/java/appeng/parts/reporting/PartDarkPanel.java b/src/main/java/appeng/parts/reporting/DarkPanelPart.java similarity index 94% rename from src/main/java/appeng/parts/reporting/PartDarkPanel.java rename to src/main/java/appeng/parts/reporting/DarkPanelPart.java index 2cf2e2db8..2569a8301 100644 --- a/src/main/java/appeng/parts/reporting/PartDarkPanel.java +++ b/src/main/java/appeng/parts/reporting/DarkPanelPart.java @@ -27,7 +27,7 @@ import appeng.helpers.Reflected; import appeng.items.parts.PartModels; import appeng.parts.PartModel; -public class PartDarkPanel extends AbstractPartPanel { +public class DarkPanelPart extends AbstractPanelPart { @PartModels public static final ResourceLocation MODEL_OFF = new ResourceLocation(AppEng.MOD_ID, "part/monitor_dark_off"); @@ -38,7 +38,7 @@ public class PartDarkPanel extends AbstractPartPanel { public static final IPartModel MODELS_ON = new PartModel(MODEL_BASE, MODEL_ON); @Reflected - public PartDarkPanel(final ItemStack is) { + public DarkPanelPart(final ItemStack is) { super(is); } diff --git a/src/main/java/appeng/parts/reporting/PartInterfaceTerminal.java b/src/main/java/appeng/parts/reporting/InterfaceTerminalPart.java similarity index 88% rename from src/main/java/appeng/parts/reporting/PartInterfaceTerminal.java rename to src/main/java/appeng/parts/reporting/InterfaceTerminalPart.java index de05fedb6..3625cd0cf 100644 --- a/src/main/java/appeng/parts/reporting/PartInterfaceTerminal.java +++ b/src/main/java/appeng/parts/reporting/InterfaceTerminalPart.java @@ -27,13 +27,13 @@ import net.minecraft.util.math.Vec3d; import appeng.api.parts.IPartModel; import appeng.container.ContainerLocator; import appeng.container.ContainerOpener; -import appeng.container.implementations.ContainerInterfaceTerminal; +import appeng.container.implementations.InterfaceTerminalContainer; import appeng.core.AppEng; import appeng.items.parts.PartModels; import appeng.parts.PartModel; import appeng.util.Platform; -public class PartInterfaceTerminal extends AbstractPartDisplay { +public class InterfaceTerminalPart extends AbstractDisplayPart { @PartModels public static final ResourceLocation MODEL_OFF = new ResourceLocation(AppEng.MOD_ID, "part/interface_terminal_off"); @@ -44,7 +44,7 @@ public class PartInterfaceTerminal extends AbstractPartDisplay { public static final IPartModel MODELS_ON = new PartModel(MODEL_BASE, MODEL_ON, MODEL_STATUS_ON); public static final IPartModel MODELS_HAS_CHANNEL = new PartModel(MODEL_BASE, MODEL_ON, MODEL_STATUS_HAS_CHANNEL); - public PartInterfaceTerminal(final ItemStack is) { + public InterfaceTerminalPart(final ItemStack is) { super(is); } @@ -52,7 +52,7 @@ public class PartInterfaceTerminal extends AbstractPartDisplay { public boolean onPartActivate(final PlayerEntity player, final Hand hand, final Vec3d pos) { if (!super.onPartActivate(player, hand, pos)) { if (Platform.isServer()) { - ContainerOpener.openContainer(ContainerInterfaceTerminal.TYPE, player, ContainerLocator.forPart(this)); + ContainerOpener.openContainer(InterfaceTerminalContainer.TYPE, player, ContainerLocator.forPart(this)); } } return true; diff --git a/src/main/java/appeng/parts/reporting/PartPanel.java b/src/main/java/appeng/parts/reporting/PanelPart.java similarity index 95% rename from src/main/java/appeng/parts/reporting/PartPanel.java rename to src/main/java/appeng/parts/reporting/PanelPart.java index 5b6f12307..49b44c824 100644 --- a/src/main/java/appeng/parts/reporting/PartPanel.java +++ b/src/main/java/appeng/parts/reporting/PanelPart.java @@ -27,7 +27,7 @@ import appeng.helpers.Reflected; import appeng.items.parts.PartModels; import appeng.parts.PartModel; -public class PartPanel extends AbstractPartPanel { +public class PanelPart extends AbstractPanelPart { @PartModels public static final ResourceLocation MODEL_OFF = new ResourceLocation(AppEng.MOD_ID, "part/monitor_bright_off"); @@ -38,7 +38,7 @@ public class PartPanel extends AbstractPartPanel { public static final IPartModel MODELS_ON = new PartModel(MODEL_BASE, MODEL_ON); @Reflected - public PartPanel(final ItemStack is) { + public PanelPart(final ItemStack is) { super(is); } diff --git a/src/main/java/appeng/parts/reporting/PartPatternTerminal.java b/src/main/java/appeng/parts/reporting/PatternTerminalPart.java similarity index 95% rename from src/main/java/appeng/parts/reporting/PartPatternTerminal.java rename to src/main/java/appeng/parts/reporting/PatternTerminalPart.java index 7d367e5b0..89ab7a99d 100644 --- a/src/main/java/appeng/parts/reporting/PartPatternTerminal.java +++ b/src/main/java/appeng/parts/reporting/PatternTerminalPart.java @@ -32,8 +32,8 @@ import appeng.api.implementations.ICraftingPatternItem; import appeng.api.networking.crafting.ICraftingPatternDetails; import appeng.api.parts.IPartModel; import appeng.api.storage.data.IAEItemStack; -import appeng.container.implementations.ContainerMEMonitorable; -import appeng.container.implementations.ContainerPatternTerm; +import appeng.container.implementations.MEMonitorableContainer; +import appeng.container.implementations.PatternTermContainer; import appeng.core.AppEng; import appeng.helpers.Reflected; import appeng.items.parts.PartModels; @@ -42,7 +42,7 @@ import appeng.tile.inventory.AppEngInternalInventory; import appeng.util.Platform; import appeng.util.inv.InvOperation; -public class PartPatternTerminal extends AbstractPartTerminal { +public class PatternTerminalPart extends AbstractTerminalPart { @PartModels public static final ResourceLocation MODEL_OFF = new ResourceLocation(AppEng.MOD_ID, "part/pattern_terminal_off"); @@ -61,7 +61,7 @@ public class PartPatternTerminal extends AbstractPartTerminal { private boolean substitute = false; @Reflected - public PartPatternTerminal(final ItemStack is) { + public PatternTerminalPart(final ItemStack is) { super(is); } @@ -97,9 +97,9 @@ public class PartPatternTerminal extends AbstractPartTerminal { @Override public ContainerType getContainerType(final PlayerEntity p) { if (Platform.checkPermissions(p, this, SecurityPermissions.CRAFT, false)) { - return ContainerPatternTerm.TYPE; + return PatternTermContainer.TYPE; } - return ContainerMEMonitorable.TYPE; + return MEMonitorableContainer.TYPE; } @Override diff --git a/src/main/java/appeng/parts/reporting/PartSemiDarkPanel.java b/src/main/java/appeng/parts/reporting/SemiDarkPanelPart.java similarity index 95% rename from src/main/java/appeng/parts/reporting/PartSemiDarkPanel.java rename to src/main/java/appeng/parts/reporting/SemiDarkPanelPart.java index ab535f1db..4862a5fbd 100644 --- a/src/main/java/appeng/parts/reporting/PartSemiDarkPanel.java +++ b/src/main/java/appeng/parts/reporting/SemiDarkPanelPart.java @@ -27,7 +27,7 @@ import appeng.helpers.Reflected; import appeng.items.parts.PartModels; import appeng.parts.PartModel; -public class PartSemiDarkPanel extends AbstractPartPanel { +public class SemiDarkPanelPart extends AbstractPanelPart { @PartModels public static final ResourceLocation MODEL_OFF = new ResourceLocation(AppEng.MOD_ID, "part/monitor_medium_off"); @PartModels @@ -37,7 +37,7 @@ public class PartSemiDarkPanel extends AbstractPartPanel { public static final IPartModel MODELS_ON = new PartModel(MODEL_BASE, MODEL_ON); @Reflected - public PartSemiDarkPanel(final ItemStack is) { + public SemiDarkPanelPart(final ItemStack is) { super(is); } diff --git a/src/main/java/appeng/parts/reporting/PartStorageMonitor.java b/src/main/java/appeng/parts/reporting/StorageMonitorPart.java similarity index 95% rename from src/main/java/appeng/parts/reporting/PartStorageMonitor.java rename to src/main/java/appeng/parts/reporting/StorageMonitorPart.java index 688821920..4f27c984a 100644 --- a/src/main/java/appeng/parts/reporting/PartStorageMonitor.java +++ b/src/main/java/appeng/parts/reporting/StorageMonitorPart.java @@ -33,7 +33,7 @@ import appeng.parts.PartModel; * @version rv2 * @since rv0 */ -public class PartStorageMonitor extends AbstractPartMonitor { +public class StorageMonitorPart extends AbstractMonitorPart { @PartModels public static final ResourceLocation MODEL_OFF = new ResourceLocation(AppEng.MOD_ID, "part/storage_monitor_off"); @@ -56,7 +56,7 @@ public class PartStorageMonitor extends AbstractPartMonitor { MODEL_STATUS_HAS_CHANNEL); @Reflected - public PartStorageMonitor(final ItemStack is) { + public StorageMonitorPart(final ItemStack is) { super(is); } diff --git a/src/main/java/appeng/parts/reporting/PartTerminal.java b/src/main/java/appeng/parts/reporting/TerminalPart.java similarity index 94% rename from src/main/java/appeng/parts/reporting/PartTerminal.java rename to src/main/java/appeng/parts/reporting/TerminalPart.java index 8b5958ece..901b7fd04 100644 --- a/src/main/java/appeng/parts/reporting/PartTerminal.java +++ b/src/main/java/appeng/parts/reporting/TerminalPart.java @@ -26,7 +26,7 @@ import appeng.core.AppEng; import appeng.items.parts.PartModels; import appeng.parts.PartModel; -public class PartTerminal extends AbstractPartTerminal { +public class TerminalPart extends AbstractTerminalPart { @PartModels public static final ResourceLocation MODEL_OFF = new ResourceLocation(AppEng.MOD_ID, "part/terminal_off"); @@ -37,7 +37,7 @@ public class PartTerminal extends AbstractPartTerminal { public static final IPartModel MODELS_ON = new PartModel(MODEL_BASE, MODEL_ON, MODEL_STATUS_ON); public static final IPartModel MODELS_HAS_CHANNEL = new PartModel(MODEL_BASE, MODEL_ON, MODEL_STATUS_HAS_CHANNEL); - public PartTerminal(final ItemStack is) { + public TerminalPart(final ItemStack is) { super(is); } diff --git a/src/main/java/appeng/recipes/game/FacadeRecipe.java b/src/main/java/appeng/recipes/game/FacadeRecipe.java index adf4d3a2f..f3bdef4b7 100644 --- a/src/main/java/appeng/recipes/game/FacadeRecipe.java +++ b/src/main/java/appeng/recipes/game/FacadeRecipe.java @@ -33,15 +33,15 @@ import appeng.api.AEApi; import appeng.api.definitions.IComparableDefinition; import appeng.api.definitions.IDefinitions; import appeng.core.AppEng; -import appeng.items.parts.ItemFacade; +import appeng.items.parts.FacadeItem; public final class FacadeRecipe extends SpecialRecipe { public static SpecialRecipeSerializer SERIALIZER = null; private final IComparableDefinition anchor; - private final ItemFacade facade; + private final FacadeItem facade; - public FacadeRecipe(ResourceLocation id, ItemFacade facade) { + public FacadeRecipe(ResourceLocation id, FacadeItem facade) { super(id); this.facade = facade; final IDefinitions definitions = AEApi.instance().definitions(); @@ -87,7 +87,7 @@ public final class FacadeRecipe extends SpecialRecipe { return getSerializer(facade); } - public static IRecipeSerializer getSerializer(ItemFacade facade) { + public static IRecipeSerializer getSerializer(FacadeItem facade) { if (SERIALIZER == null) { SERIALIZER = new SpecialRecipeSerializer<>(id -> new FacadeRecipe(id, facade)); SERIALIZER.setRegistryName(new ResourceLocation(AppEng.MOD_ID, "facade")); diff --git a/src/main/java/appeng/server/ServerHelper.java b/src/main/java/appeng/server/ServerHelper.java index ce405871b..72d37e1b4 100644 --- a/src/main/java/appeng/server/ServerHelper.java +++ b/src/main/java/appeng/server/ServerHelper.java @@ -39,9 +39,9 @@ import appeng.block.AEBaseBlock; import appeng.client.ActionKey; import appeng.client.EffectType; import appeng.core.CommonHelper; -import appeng.core.sync.AppEngPacket; +import appeng.core.sync.BasePacket; import appeng.core.sync.network.NetworkHandler; -import appeng.items.tools.ToolNetworkTool; +import appeng.items.tools.NetworkToolItem; import appeng.util.Platform; public class ServerHelper extends CommonHelper { @@ -73,7 +73,7 @@ public class ServerHelper extends CommonHelper { @Override public void sendToAllNearExcept(final PlayerEntity p, final double x, final double y, final double z, - final double dist, final World w, final AppEngPacket packet) { + final double dist, final World w, final BasePacket packet) { if (Platform.isClient()) { return; } @@ -135,7 +135,7 @@ public class ServerHelper extends CommonHelper { for (int x = 0; x < PlayerInventory.getHotbarSize(); x++) { final ItemStack is = player.inventory.getStackInSlot(x); - if (!is.isEmpty() && is.getItem() instanceof ToolNetworkTool) { + if (!is.isEmpty() && is.getItem() instanceof NetworkToolItem) { final CompoundNBT c = is.getTag(); if (c != null && c.getBoolean("hideFacades")) { return CableRenderMode.CABLE_VIEW; diff --git a/src/main/java/appeng/tile/AEBaseInvTile.java b/src/main/java/appeng/tile/AEBaseInvTileEntity.java similarity index 95% rename from src/main/java/appeng/tile/AEBaseInvTile.java rename to src/main/java/appeng/tile/AEBaseInvTileEntity.java index adf30211a..a72434816 100644 --- a/src/main/java/appeng/tile/AEBaseInvTile.java +++ b/src/main/java/appeng/tile/AEBaseInvTileEntity.java @@ -38,9 +38,9 @@ import appeng.util.helpers.ItemHandlerUtil; import appeng.util.inv.IAEAppEngInventory; import appeng.util.inv.InvOperation; -public abstract class AEBaseInvTile extends AEBaseTile implements IAEAppEngInventory { +public abstract class AEBaseInvTileEntity extends AEBaseTileEntity implements IAEAppEngInventory { - public AEBaseInvTile(TileEntityType tileEntityTypeIn) { + public AEBaseInvTileEntity(TileEntityType tileEntityTypeIn) { super(tileEntityTypeIn); } diff --git a/src/main/java/appeng/tile/AEBaseTile.java b/src/main/java/appeng/tile/AEBaseTileEntity.java similarity index 97% rename from src/main/java/appeng/tile/AEBaseTile.java rename to src/main/java/appeng/tile/AEBaseTileEntity.java index 1e6581a8a..768d6b762 100644 --- a/src/main/java/appeng/tile/AEBaseTile.java +++ b/src/main/java/appeng/tile/AEBaseTileEntity.java @@ -62,9 +62,9 @@ import appeng.tile.inventory.AppEngInternalAEInventory; import appeng.util.Platform; import appeng.util.SettingsFrom; -public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile, ICustomNameObject { +public class AEBaseTileEntity extends TileEntity implements IOrientable, ICommonTile, ICustomNameObject { - private static final ThreadLocal> DROP_NO_ITEMS = new ThreadLocal<>(); + private static final ThreadLocal> DROP_NO_ITEMS = new ThreadLocal<>(); private static final Map, IStackSrc> ITEM_STACKS = new HashMap<>(); private int renderFragment = 0; @Nullable @@ -73,7 +73,7 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile, private Direction up = Direction.UP; private boolean markDirtyQueued = false; - public AEBaseTile(TileEntityType tileEntityTypeIn) { + public AEBaseTileEntity(TileEntityType tileEntityTypeIn) { super(tileEntityTypeIn); } @@ -82,7 +82,7 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile, } public boolean dropItems() { - final WeakReference what = DROP_NO_ITEMS.get(); + final WeakReference what = DROP_NO_ITEMS.get(); return what == null || what.get() != this; } diff --git a/src/main/java/appeng/tile/crafting/TileCraftingMonitorTile.java b/src/main/java/appeng/tile/crafting/CraftingMonitorTileEntity.java similarity index 96% rename from src/main/java/appeng/tile/crafting/TileCraftingMonitorTile.java rename to src/main/java/appeng/tile/crafting/CraftingMonitorTileEntity.java index a03c3e11c..743a30ebe 100644 --- a/src/main/java/appeng/tile/crafting/TileCraftingMonitorTile.java +++ b/src/main/java/appeng/tile/crafting/CraftingMonitorTileEntity.java @@ -39,7 +39,7 @@ import appeng.api.storage.data.IAEItemStack; import appeng.api.util.AEColor; import appeng.util.item.AEItemStack; -public class TileCraftingMonitorTile extends TileCraftingTile implements IColorableTile { +public class CraftingMonitorTileEntity extends CraftingTileEntity implements IColorableTile { @OnlyIn(Dist.CLIENT) private Integer dspList; @@ -50,7 +50,7 @@ public class TileCraftingMonitorTile extends TileCraftingTile implements IColora private IAEItemStack dspPlay; private AEColor paintedColor = AEColor.TRANSPARENT; - public TileCraftingMonitorTile(TileEntityType tileEntityTypeIn) { + public CraftingMonitorTileEntity(TileEntityType tileEntityTypeIn) { super(tileEntityTypeIn); } diff --git a/src/main/java/appeng/tile/crafting/TileCraftingStorageTile.java b/src/main/java/appeng/tile/crafting/CraftingStorageTileEntity.java similarity index 92% rename from src/main/java/appeng/tile/crafting/TileCraftingStorageTile.java rename to src/main/java/appeng/tile/crafting/CraftingStorageTileEntity.java index 9aab84106..937f822b9 100644 --- a/src/main/java/appeng/tile/crafting/TileCraftingStorageTile.java +++ b/src/main/java/appeng/tile/crafting/CraftingStorageTileEntity.java @@ -27,17 +27,17 @@ import appeng.api.AEApi; import appeng.api.definitions.IBlocks; import appeng.block.crafting.AbstractCraftingUnitBlock; -public class TileCraftingStorageTile extends TileCraftingTile { +public class CraftingStorageTileEntity extends CraftingTileEntity { private static final int KILO_SCALAR = 1024; - public TileCraftingStorageTile(TileEntityType tileEntityTypeIn) { + public CraftingStorageTileEntity(TileEntityType tileEntityTypeIn) { super(tileEntityTypeIn); } @Override protected ItemStack getItemFromTile(final Object obj) { final IBlocks blocks = AEApi.instance().definitions().blocks(); - final int storage = ((TileCraftingTile) obj).getStorageBytes() / KILO_SCALAR; + final int storage = ((CraftingTileEntity) obj).getStorageBytes() / KILO_SCALAR; Optional is; diff --git a/src/main/java/appeng/tile/crafting/TileCraftingTile.java b/src/main/java/appeng/tile/crafting/CraftingTileEntity.java similarity index 97% rename from src/main/java/appeng/tile/crafting/TileCraftingTile.java rename to src/main/java/appeng/tile/crafting/CraftingTileEntity.java index fd8fa8110..1b48cf870 100644 --- a/src/main/java/appeng/tile/crafting/TileCraftingTile.java +++ b/src/main/java/appeng/tile/crafting/CraftingTileEntity.java @@ -58,17 +58,17 @@ import appeng.me.cluster.implementations.CraftingCPUCalculator; import appeng.me.cluster.implementations.CraftingCPUCluster; import appeng.me.helpers.AENetworkProxy; import appeng.me.helpers.AENetworkProxyMultiblock; -import appeng.tile.grid.AENetworkTile; +import appeng.tile.grid.AENetworkTileEntity; import appeng.util.Platform; -public class TileCraftingTile extends AENetworkTile implements IAEMultiBlock, IPowerChannelState { +public class CraftingTileEntity extends AENetworkTileEntity implements IAEMultiBlock, IPowerChannelState { private final CraftingCPUCalculator calc = new CraftingCPUCalculator(this); private CompoundNBT previousState = null; private boolean isCoreBlock = false; private CraftingCPUCluster cluster; - public TileCraftingTile(TileEntityType tileEntityTypeIn) { + public CraftingTileEntity(TileEntityType tileEntityTypeIn) { super(tileEntityTypeIn); this.getProxy().setFlags(GridFlags.MULTIBLOCK, GridFlags.REQUIRE_CHANNEL); this.getProxy().setValidSides(EnumSet.noneOf(Direction.class)); @@ -83,7 +83,7 @@ public class TileCraftingTile extends AENetworkTile implements IAEMultiBlock, IP protected ItemStack getItemFromTile(final Object obj) { Optional is; - if (((TileCraftingTile) obj).isAccelerator()) { + if (((CraftingTileEntity) obj).isAccelerator()) { is = AEApi.instance().definitions().blocks().craftingAccelerator().maybeStack(1); } else { is = AEApi.instance().definitions().blocks().craftingUnit().maybeStack(1); diff --git a/src/main/java/appeng/tile/crafting/MolecularAssemblerRenderer.java b/src/main/java/appeng/tile/crafting/MolecularAssemblerRenderer.java index d6996d7e8..f56bc439e 100644 --- a/src/main/java/appeng/tile/crafting/MolecularAssemblerRenderer.java +++ b/src/main/java/appeng/tile/crafting/MolecularAssemblerRenderer.java @@ -53,7 +53,7 @@ import appeng.core.AppEng; * as the light strip when it's powered. */ @OnlyIn(Dist.CLIENT) -public class MolecularAssemblerRenderer extends TileEntityRenderer { +public class MolecularAssemblerRenderer extends TileEntityRenderer { public static final ResourceLocation LIGHTS_MODEL = new ResourceLocation(AppEng.MOD_ID, "block/molecular_assembler_lights"); @@ -67,8 +67,8 @@ public class MolecularAssemblerRenderer extends TileEntityRenderer tileEntityTypeIn) { + public MolecularAssemblerTileEntity(TileEntityType tileEntityTypeIn) { super(tileEntityTypeIn); final ITileDefinition assembler = AEApi.instance().definitions().blocks().molecularAssembler(); @@ -224,9 +224,9 @@ public class TileMolecularAssembler extends AENetworkInvTile if (data.contains("myPlan")) { final ItemStack myPat = ItemStack.read(data.getCompound("myPlan")); - if (!myPat.isEmpty() && myPat.getItem() instanceof ItemEncodedPattern) { + if (!myPat.isEmpty() && myPat.getItem() instanceof EncodedPatternItem) { final World w = this.getWorld(); - final ItemEncodedPattern iep = (ItemEncodedPattern) myPat.getItem(); + final EncodedPatternItem iep = (EncodedPatternItem) myPat.getItem(); final ICraftingPatternDetails ph = iep.getPatternForItem(myPat, w); if (ph != null && ph.isCraftable()) { this.forcePlan = true; @@ -250,10 +250,10 @@ public class TileMolecularAssembler extends AENetworkInvTile final ItemStack is = this.patternInv.getStackInSlot(0); - if (!is.isEmpty() && is.getItem() instanceof ItemEncodedPattern) { + if (!is.isEmpty() && is.getItem() instanceof EncodedPatternItem) { if (!ItemStack.areItemsEqual(is, this.myPattern)) { final World w = this.getWorld(); - final ItemEncodedPattern iep = (ItemEncodedPattern) is.getItem(); + final EncodedPatternItem iep = (EncodedPatternItem) is.getItem(); final ICraftingPatternDetails ph = iep.getPatternForItem(is, w); if (ph != null && ph.isCraftable()) { @@ -429,7 +429,7 @@ public class TileMolecularAssembler extends AENetworkInvTile final TargetPoint where = new TargetPoint(this.pos.getX(), this.pos.getY(), this.pos.getZ(), 32, this.world.getDimension().getType()); NetworkHandler.instance() - .sendToAllAround(new PacketAssemblerAnimation(this.pos, (byte) speed, item), where); + .sendToAllAround(new AssemblerAnimationPacket(this.pos, (byte) speed, item), where); } this.saveChanges(); @@ -555,8 +555,8 @@ public class TileMolecularAssembler extends AENetworkInvTile private class CraftingGridFilter implements IAEItemFilter { private boolean hasPattern() { - return TileMolecularAssembler.this.myPlan != null - && !ItemHandlerUtil.isEmpty(TileMolecularAssembler.this.patternInv); + return MolecularAssemblerTileEntity.this.myPlan != null + && !ItemHandlerUtil.isEmpty(MolecularAssemblerTileEntity.this.patternInv); } @Override @@ -571,8 +571,8 @@ public class TileMolecularAssembler extends AENetworkInvTile } if (this.hasPattern()) { - return TileMolecularAssembler.this.myPlan.isValidItemForSlot(slot, stack, - TileMolecularAssembler.this.getWorld()); + return MolecularAssemblerTileEntity.this.myPlan.isValidItemForSlot(slot, stack, + MolecularAssemblerTileEntity.this.getWorld()); } return false; } diff --git a/src/main/java/appeng/tile/grid/AENetworkInvTile.java b/src/main/java/appeng/tile/grid/AENetworkInvTileEntity.java similarity index 91% rename from src/main/java/appeng/tile/grid/AENetworkInvTile.java rename to src/main/java/appeng/tile/grid/AENetworkInvTileEntity.java index 0e46ed6d0..db0894c24 100644 --- a/src/main/java/appeng/tile/grid/AENetworkInvTile.java +++ b/src/main/java/appeng/tile/grid/AENetworkInvTileEntity.java @@ -26,13 +26,13 @@ import appeng.api.networking.security.IActionHost; import appeng.api.util.AEPartLocation; import appeng.me.helpers.AENetworkProxy; import appeng.me.helpers.IGridProxyable; -import appeng.tile.AEBaseInvTile; +import appeng.tile.AEBaseInvTileEntity; -public abstract class AENetworkInvTile extends AEBaseInvTile implements IActionHost, IGridProxyable { +public abstract class AENetworkInvTileEntity extends AEBaseInvTileEntity implements IActionHost, IGridProxyable { private final AENetworkProxy gridProxy = new AENetworkProxy(this, "proxy", this.getItemFromTile(this), true); - public AENetworkInvTile(TileEntityType tileEntityTypeIn) { + public AENetworkInvTileEntity(TileEntityType tileEntityTypeIn) { super(tileEntityTypeIn); } diff --git a/src/main/java/appeng/tile/grid/AENetworkPowerTile.java b/src/main/java/appeng/tile/grid/AENetworkPowerTileEntity.java similarity index 91% rename from src/main/java/appeng/tile/grid/AENetworkPowerTile.java rename to src/main/java/appeng/tile/grid/AENetworkPowerTileEntity.java index d7a665765..f2bee8aa6 100644 --- a/src/main/java/appeng/tile/grid/AENetworkPowerTile.java +++ b/src/main/java/appeng/tile/grid/AENetworkPowerTileEntity.java @@ -28,13 +28,13 @@ import appeng.api.util.AEPartLocation; import appeng.api.util.DimensionalCoord; import appeng.me.helpers.AENetworkProxy; import appeng.me.helpers.IGridProxyable; -import appeng.tile.powersink.AEBasePoweredTile; +import appeng.tile.powersink.AEBasePoweredTileEntity; -public abstract class AENetworkPowerTile extends AEBasePoweredTile implements IActionHost, IGridProxyable { +public abstract class AENetworkPowerTileEntity extends AEBasePoweredTileEntity implements IActionHost, IGridProxyable { private final AENetworkProxy gridProxy = new AENetworkProxy(this, "proxy", this.getItemFromTile(this), true); - public AENetworkPowerTile(TileEntityType tileEntityTypeIn) { + public AENetworkPowerTileEntity(TileEntityType tileEntityTypeIn) { super(tileEntityTypeIn); } diff --git a/src/main/java/appeng/tile/grid/AENetworkTile.java b/src/main/java/appeng/tile/grid/AENetworkTileEntity.java similarity index 93% rename from src/main/java/appeng/tile/grid/AENetworkTile.java rename to src/main/java/appeng/tile/grid/AENetworkTileEntity.java index c00cf6819..8180d4640 100644 --- a/src/main/java/appeng/tile/grid/AENetworkTile.java +++ b/src/main/java/appeng/tile/grid/AENetworkTileEntity.java @@ -28,13 +28,13 @@ import appeng.api.util.AEPartLocation; import appeng.api.util.DimensionalCoord; import appeng.me.helpers.AENetworkProxy; import appeng.me.helpers.IGridProxyable; -import appeng.tile.AEBaseTile; +import appeng.tile.AEBaseTileEntity; -public class AENetworkTile extends AEBaseTile implements IActionHost, IGridProxyable { +public class AENetworkTileEntity extends AEBaseTileEntity implements IActionHost, IGridProxyable { private final AENetworkProxy gridProxy = this.createProxy(); - public AENetworkTile(TileEntityType tileEntityTypeIn) { + public AENetworkTileEntity(TileEntityType tileEntityTypeIn) { super(tileEntityTypeIn); } diff --git a/src/main/java/appeng/tile/grindstone/TileCrank.java b/src/main/java/appeng/tile/grindstone/CrankTileEntity.java similarity index 95% rename from src/main/java/appeng/tile/grindstone/TileCrank.java rename to src/main/java/appeng/tile/grindstone/CrankTileEntity.java index 23200207c..a2aaf9ec0 100644 --- a/src/main/java/appeng/tile/grindstone/TileCrank.java +++ b/src/main/java/appeng/tile/grindstone/CrankTileEntity.java @@ -28,9 +28,9 @@ import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.Direction; import appeng.api.implementations.tiles.ICrankable; -import appeng.tile.AEBaseTile; +import appeng.tile.AEBaseTileEntity; -public class TileCrank extends AEBaseTile implements ITickableTileEntity { +public class CrankTileEntity extends AEBaseTileEntity implements ITickableTileEntity { private final int ticksPerRotation = 18; @@ -41,7 +41,7 @@ public class TileCrank extends AEBaseTile implements ITickableTileEntity { private int hits = 0; private int rotation = 0; - public TileCrank(TileEntityType tileEntityTypeIn) { + public CrankTileEntity(TileEntityType tileEntityTypeIn) { super(tileEntityTypeIn); } diff --git a/src/main/java/appeng/tile/grindstone/TileGrinder.java b/src/main/java/appeng/tile/grindstone/GrinderTileEntity.java similarity index 96% rename from src/main/java/appeng/tile/grindstone/TileGrinder.java rename to src/main/java/appeng/tile/grindstone/GrinderTileEntity.java index 24131d7e2..66fe1a50a 100644 --- a/src/main/java/appeng/tile/grindstone/TileGrinder.java +++ b/src/main/java/appeng/tile/grindstone/GrinderTileEntity.java @@ -32,7 +32,7 @@ import appeng.api.implementations.tiles.ICrankable; import appeng.recipes.handlers.GrinderOptionalResult; import appeng.recipes.handlers.GrinderRecipe; import appeng.recipes.handlers.GrinderRecipes; -import appeng.tile.AEBaseInvTile; +import appeng.tile.AEBaseInvTileEntity; import appeng.tile.inventory.AppEngInternalInventory; import appeng.util.InventoryAdaptor; import appeng.util.Platform; @@ -41,14 +41,14 @@ import appeng.util.inv.InvOperation; import appeng.util.inv.WrapperFilteredItemHandler; import appeng.util.inv.filter.IAEItemFilter; -public class TileGrinder extends AEBaseInvTile implements ICrankable { +public class GrinderTileEntity extends AEBaseInvTileEntity implements ICrankable { private static final int SLOT_PROCESSING = 6; private final AppEngInternalInventory inv = new AppEngInternalInventory(this, 7); private final IItemHandler invExt = new WrapperFilteredItemHandler(this.inv, new GrinderFilter()); private int points; - public TileGrinder(TileEntityType tileEntityTypeIn) { + public GrinderTileEntity(TileEntityType tileEntityTypeIn) { super(tileEntityTypeIn); } diff --git a/src/main/java/appeng/tile/misc/TileCellWorkbench.java b/src/main/java/appeng/tile/misc/CellWorkbenchTileEntity.java similarity index 96% rename from src/main/java/appeng/tile/misc/TileCellWorkbench.java rename to src/main/java/appeng/tile/misc/CellWorkbenchTileEntity.java index faeabeb15..5652e2c42 100644 --- a/src/main/java/appeng/tile/misc/TileCellWorkbench.java +++ b/src/main/java/appeng/tile/misc/CellWorkbenchTileEntity.java @@ -33,7 +33,7 @@ import appeng.api.config.Upgrades; import appeng.api.implementations.IUpgradeableHost; import appeng.api.storage.ICellWorkbenchItem; import appeng.api.util.IConfigManager; -import appeng.tile.AEBaseTile; +import appeng.tile.AEBaseTileEntity; import appeng.tile.inventory.AppEngInternalAEInventory; import appeng.tile.inventory.AppEngInternalInventory; import appeng.util.ConfigManager; @@ -42,7 +42,7 @@ import appeng.util.helpers.ItemHandlerUtil; import appeng.util.inv.IAEAppEngInventory; import appeng.util.inv.InvOperation; -public class TileCellWorkbench extends AEBaseTile implements IUpgradeableHost, IAEAppEngInventory, IConfigManagerHost { +public class CellWorkbenchTileEntity extends AEBaseTileEntity implements IUpgradeableHost, IAEAppEngInventory, IConfigManagerHost { private final AppEngInternalInventory cell = new AppEngInternalInventory(this, 1); private final AppEngInternalAEInventory config = new AppEngInternalAEInventory(this, 63); @@ -52,7 +52,7 @@ public class TileCellWorkbench extends AEBaseTile implements IUpgradeableHost, I private IItemHandler cacheConfig = null; private boolean locked = false; - public TileCellWorkbench(TileEntityType tileEntityTypeIn) { + public CellWorkbenchTileEntity(TileEntityType tileEntityTypeIn) { super(tileEntityTypeIn); this.manager.registerSetting(Settings.COPY_MODE, CopyMode.CLEAR_ON_REMOVE); this.cell.setEnableClientEvents(true); diff --git a/src/main/java/appeng/tile/misc/TileCharger.java b/src/main/java/appeng/tile/misc/ChargerTileEntity.java similarity index 98% rename from src/main/java/appeng/tile/misc/TileCharger.java rename to src/main/java/appeng/tile/misc/ChargerTileEntity.java index 18ce89585..257dccba0 100644 --- a/src/main/java/appeng/tile/misc/TileCharger.java +++ b/src/main/java/appeng/tile/misc/ChargerTileEntity.java @@ -48,21 +48,21 @@ import appeng.api.util.AEPartLocation; import appeng.api.util.DimensionalCoord; import appeng.core.settings.TickRates; import appeng.me.GridAccessException; -import appeng.tile.grid.AENetworkPowerTile; +import appeng.tile.grid.AENetworkPowerTileEntity; import appeng.tile.inventory.AppEngInternalInventory; import appeng.util.Platform; import appeng.util.inv.InvOperation; import appeng.util.inv.filter.IAEItemFilter; import appeng.util.item.AEItemStack; -public class TileCharger extends AENetworkPowerTile implements ICrankable, IGridTickable { +public class ChargerTileEntity extends AENetworkPowerTileEntity implements ICrankable, IGridTickable { private static final int POWER_MAXIMUM_AMOUNT = 1600; private static final int POWER_THRESHOLD = POWER_MAXIMUM_AMOUNT - 1; private static final int POWER_PER_CRANK_TURN = 160; private final AppEngInternalInventory inv = new AppEngInternalInventory(this, 1, 1, new ChargerInvFilter()); - public TileCharger(TileEntityType tileEntityTypeIn) { + public ChargerTileEntity(TileEntityType tileEntityTypeIn) { super(tileEntityTypeIn); this.getProxy().setValidSides(EnumSet.noneOf(Direction.class)); this.getProxy().setFlags(); diff --git a/src/main/java/appeng/tile/misc/CondenserItemInventory.java b/src/main/java/appeng/tile/misc/CondenserItemInventory.java index 64f1d74bd..82ec28c34 100644 --- a/src/main/java/appeng/tile/misc/CondenserItemInventory.java +++ b/src/main/java/appeng/tile/misc/CondenserItemInventory.java @@ -42,13 +42,13 @@ import appeng.util.item.ItemList; class CondenserItemInventory implements IMEMonitor, ITickingMonitor { private final HashMap, Object> listeners = new HashMap<>(); - private final TileCondenser target; + private final CondenserTileEntity target; private boolean hasChanged = true; private final ItemList cachedList = new ItemList(); private IActionSource actionSource = new BaseActionSource(); private ItemList changeSet = new ItemList(); - CondenserItemInventory(final TileCondenser te) { + CondenserItemInventory(final CondenserTileEntity te) { this.target = te; } diff --git a/src/main/java/appeng/tile/misc/TileCondenser.java b/src/main/java/appeng/tile/misc/CondenserTileEntity.java similarity index 96% rename from src/main/java/appeng/tile/misc/TileCondenser.java rename to src/main/java/appeng/tile/misc/CondenserTileEntity.java index 9d0ffe179..054c52500 100644 --- a/src/main/java/appeng/tile/misc/TileCondenser.java +++ b/src/main/java/appeng/tile/misc/CondenserTileEntity.java @@ -52,7 +52,7 @@ import appeng.api.storage.data.IAEStack; import appeng.api.util.IConfigManager; import appeng.api.util.IConfigurableObject; import appeng.capabilities.Capabilities; -import appeng.tile.AEBaseInvTile; +import appeng.tile.AEBaseInvTileEntity; import appeng.tile.inventory.AppEngInternalInventory; import appeng.util.ConfigManager; import appeng.util.IConfigManagerHost; @@ -61,7 +61,7 @@ import appeng.util.inv.WrapperChainedItemHandler; import appeng.util.inv.WrapperFilteredItemHandler; import appeng.util.inv.filter.AEItemFilters; -public class TileCondenser extends AEBaseInvTile implements IConfigManagerHost, IConfigurableObject { +public class CondenserTileEntity extends AEBaseInvTileEntity implements IConfigManagerHost, IConfigurableObject { public static final int BYTE_MULTIPLIER = 8; @@ -80,7 +80,7 @@ public class TileCondenser extends AEBaseInvTile implements IConfigManagerHost, private double storedPower = 0; - public TileCondenser(TileEntityType tileEntityTypeIn) { + public CondenserTileEntity(TileEntityType tileEntityTypeIn) { super(tileEntityTypeIn); this.cm.registerSetting(Settings.CONDENSER_OUTPUT, CondenserOutput.TRASH); } @@ -235,7 +235,7 @@ public class TileCondenser extends AEBaseInvTile implements IConfigManagerHost, return stack; } if (!simulate && !stack.isEmpty()) { - TileCondenser.this.addPower(stack.getCount()); + CondenserTileEntity.this.addPower(stack.getCount()); } return ItemStack.EMPTY; } @@ -283,7 +283,7 @@ public class TileCondenser extends AEBaseInvTile implements IConfigManagerHost, if (action == FluidAction.EXECUTE) { final IStorageChannel chan = AEApi.instance().storage() .getStorageChannel(IFluidStorageChannel.class); - TileCondenser.this + CondenserTileEntity.this .addPower((resource.isEmpty() ? 0.0 : (double) resource.getAmount()) / chan.transferFactor()); } @@ -331,7 +331,7 @@ public class TileCondenser extends AEBaseInvTile implements IConfigManagerHost, * to make sure a condenser is only ever used if an item can't go anywhere else. */ private class MEHandler implements IStorageMonitorableAccessor, IStorageMonitorable { - private final CondenserItemInventory itemInventory = new CondenserItemInventory(TileCondenser.this); + private final CondenserItemInventory itemInventory = new CondenserItemInventory(CondenserTileEntity.this); void outputChanged(ItemStack added, ItemStack removed) { this.itemInventory.updateOutput(added, removed); @@ -348,7 +348,7 @@ public class TileCondenser extends AEBaseInvTile implements IConfigManagerHost, if (channel == AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class)) { return (IMEMonitor) this.itemInventory; } else { - return new CondenserVoidInventory<>(TileCondenser.this, channel); + return new CondenserVoidInventory<>(CondenserTileEntity.this, channel); } } } diff --git a/src/main/java/appeng/tile/misc/CondenserVoidInventory.java b/src/main/java/appeng/tile/misc/CondenserVoidInventory.java index b7a937e4c..f916bd433 100644 --- a/src/main/java/appeng/tile/misc/CondenserVoidInventory.java +++ b/src/main/java/appeng/tile/misc/CondenserVoidInventory.java @@ -29,10 +29,10 @@ import appeng.api.storage.data.IItemList; class CondenserVoidInventory> implements IMEMonitor { - private final TileCondenser target; + private final CondenserTileEntity target; private final IStorageChannel channel; - CondenserVoidInventory(final TileCondenser te, final IStorageChannel channel) { + CondenserVoidInventory(final CondenserTileEntity te, final IStorageChannel channel) { this.target = te; this.channel = channel; } diff --git a/src/main/java/appeng/tile/misc/InscriberRecipes.java b/src/main/java/appeng/tile/misc/InscriberRecipes.java index d71f76ba7..a3a4cac3d 100644 --- a/src/main/java/appeng/tile/misc/InscriberRecipes.java +++ b/src/main/java/appeng/tile/misc/InscriberRecipes.java @@ -19,7 +19,7 @@ import appeng.api.AEApi; import appeng.api.definitions.IComparableDefinition; import appeng.api.features.InscriberProcessType; import appeng.core.AppEng; -import appeng.items.materials.ItemMaterial; +import appeng.items.materials.MaterialItem; import appeng.recipes.handlers.InscriberRecipe; /** @@ -78,12 +78,12 @@ public final class InscriberRecipes { if (!plateA.isEmpty()) { final CompoundNBT tag = plateA.getOrCreateTag(); - name += tag.getString(ItemMaterial.TAG_INSCRIBE_NAME); + name += tag.getString(MaterialItem.TAG_INSCRIBE_NAME); } if (!plateB.isEmpty()) { final CompoundNBT tag = plateB.getOrCreateTag(); - name += " " + tag.getString(ItemMaterial.TAG_INSCRIBE_NAME); + name += " " + tag.getString(MaterialItem.TAG_INSCRIBE_NAME); } final Ingredient startingItem = Ingredient.fromStacks(input.copy()); diff --git a/src/main/java/appeng/tile/misc/TileInscriber.java b/src/main/java/appeng/tile/misc/InscriberTileEntity.java similarity index 96% rename from src/main/java/appeng/tile/misc/TileInscriber.java rename to src/main/java/appeng/tile/misc/InscriberTileEntity.java index 29e532118..039a5df6d 100644 --- a/src/main/java/appeng/tile/misc/TileInscriber.java +++ b/src/main/java/appeng/tile/misc/InscriberTileEntity.java @@ -57,7 +57,7 @@ import appeng.me.GridAccessException; import appeng.parts.automation.DefinitionUpgradeInventory; import appeng.parts.automation.UpgradeInventory; import appeng.recipes.handlers.InscriberRecipe; -import appeng.tile.grid.AENetworkPowerTile; +import appeng.tile.grid.AENetworkPowerTileEntity; import appeng.tile.inventory.AppEngInternalInventory; import appeng.util.ConfigManager; import appeng.util.IConfigManagerHost; @@ -73,7 +73,7 @@ import appeng.util.item.AEItemStack; * @version rv2 * @since rv0 */ -public class TileInscriber extends AENetworkPowerTile implements IGridTickable, IUpgradeableHost, IConfigManagerHost { +public class InscriberTileEntity extends AENetworkPowerTileEntity implements IGridTickable, IUpgradeableHost, IConfigManagerHost { private final int maxProcessingTime = 100; private final IConfigManager settings; @@ -97,7 +97,7 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable, private final IItemHandlerModifiable inv = new WrapperChainedItemHandler(this.topItemHandler, this.bottomItemHandler, this.sideItemHandler); - public TileInscriber(TileEntityType tileEntityTypeIn) { + public InscriberTileEntity(TileEntityType tileEntityTypeIn) { super(tileEntityTypeIn); this.getProxy().setValidSides(EnumSet.noneOf(Direction.class)); @@ -410,11 +410,11 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable, private class ItemHandlerFilter implements IAEItemFilter { @Override public boolean allowExtract(IItemHandler inv, int slot, int amount) { - if (TileInscriber.this.isSmash()) { + if (InscriberTileEntity.this.isSmash()) { return false; } - return inv == TileInscriber.this.topItemHandler || inv == TileInscriber.this.bottomItemHandler || slot == 1; + return inv == InscriberTileEntity.this.topItemHandler || inv == InscriberTileEntity.this.bottomItemHandler || slot == 1; } @Override @@ -424,11 +424,11 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable, return false; } - if (TileInscriber.this.isSmash()) { + if (InscriberTileEntity.this.isSmash()) { return false; } - if (inv == TileInscriber.this.topItemHandler || inv == TileInscriber.this.bottomItemHandler) { + if (inv == InscriberTileEntity.this.topItemHandler || inv == InscriberTileEntity.this.bottomItemHandler) { if (AEApi.instance().definitions().materials().namePress().isSameAs(stack)) { return true; } diff --git a/src/main/java/appeng/tile/misc/TileInterface.java b/src/main/java/appeng/tile/misc/InterfaceTileEntity.java similarity index 97% rename from src/main/java/appeng/tile/misc/TileInterface.java rename to src/main/java/appeng/tile/misc/InterfaceTileEntity.java index ae41fe2c5..a1d3761b5 100644 --- a/src/main/java/appeng/tile/misc/TileInterface.java +++ b/src/main/java/appeng/tile/misc/InterfaceTileEntity.java @@ -58,16 +58,16 @@ import appeng.api.util.AECableType; import appeng.api.util.AEPartLocation; import appeng.api.util.DimensionalCoord; import appeng.api.util.IConfigManager; -import appeng.container.implementations.ContainerInterface; +import appeng.container.implementations.InterfaceContainer; import appeng.helpers.DualityInterface; import appeng.helpers.IInterfaceHost; import appeng.helpers.IPriorityHost; -import appeng.tile.grid.AENetworkInvTile; +import appeng.tile.grid.AENetworkInvTileEntity; import appeng.util.Platform; import appeng.util.inv.IInventoryDestination; import appeng.util.inv.InvOperation; -public class TileInterface extends AENetworkInvTile +public class InterfaceTileEntity extends AENetworkInvTileEntity implements IGridTickable, IInventoryDestination, IInterfaceHost, IPriorityHost { private final DualityInterface duality = new DualityInterface(this.getProxy(), this); @@ -75,7 +75,7 @@ public class TileInterface extends AENetworkInvTile // Indicates that this interface has no specific direction set private boolean omniDirectional = true; - public TileInterface(TileEntityType tileEntityTypeIn) { + public InterfaceTileEntity(TileEntityType tileEntityTypeIn) { super(tileEntityTypeIn); } @@ -311,6 +311,6 @@ public class TileInterface extends AENetworkInvTile @Override public ContainerType getContainerType() { - return ContainerInterface.TYPE; + return InterfaceContainer.TYPE; } } diff --git a/src/main/java/appeng/tile/misc/TileLightDetector.java b/src/main/java/appeng/tile/misc/LightDetectorTileEntity.java similarity index 89% rename from src/main/java/appeng/tile/misc/TileLightDetector.java rename to src/main/java/appeng/tile/misc/LightDetectorTileEntity.java index 9c6176251..4dc3fa2a7 100644 --- a/src/main/java/appeng/tile/misc/TileLightDetector.java +++ b/src/main/java/appeng/tile/misc/LightDetectorTileEntity.java @@ -21,15 +21,15 @@ package appeng.tile.misc; import net.minecraft.tileentity.ITickableTileEntity; import net.minecraft.tileentity.TileEntityType; -import appeng.tile.AEBaseTile; +import appeng.tile.AEBaseTileEntity; import appeng.util.Platform; -public class TileLightDetector extends AEBaseTile implements ITickableTileEntity { +public class LightDetectorTileEntity extends AEBaseTileEntity implements ITickableTileEntity { private int lastCheck = 30; private int lastLight = 0; - public TileLightDetector(TileEntityType tileEntityTypeIn) { + public LightDetectorTileEntity(TileEntityType tileEntityTypeIn) { super(tileEntityTypeIn); } diff --git a/src/main/java/appeng/tile/misc/TilePaint.java b/src/main/java/appeng/tile/misc/PaintSplotchesTileEntity.java similarity index 96% rename from src/main/java/appeng/tile/misc/TilePaint.java rename to src/main/java/appeng/tile/misc/PaintSplotchesTileEntity.java index 84d0c7c07..2528c60d0 100644 --- a/src/main/java/appeng/tile/misc/TilePaint.java +++ b/src/main/java/appeng/tile/misc/PaintSplotchesTileEntity.java @@ -45,10 +45,10 @@ import net.minecraftforge.client.model.data.ModelProperty; import appeng.api.util.AEColor; import appeng.block.paint.PaintSplotches; import appeng.helpers.Splotch; -import appeng.items.misc.ItemPaintBall; -import appeng.tile.AEBaseTile; +import appeng.items.misc.PaintBallItem; +import appeng.tile.AEBaseTileEntity; -public class TilePaint extends AEBaseTile { +public class PaintSplotchesTileEntity extends AEBaseTileEntity { public static final ModelProperty SPLOTCHES = new ModelProperty<>(); @@ -57,7 +57,7 @@ public class TilePaint extends AEBaseTile { private int isLit = 0; private List dots = null; - public TilePaint(TileEntityType tileEntityTypeIn) { + public PaintSplotchesTileEntity(TileEntityType tileEntityTypeIn) { super(tileEntityTypeIn); } @@ -216,7 +216,7 @@ public class TilePaint extends AEBaseTile { final BlockState blk = this.world.getBlockState(p); if (blk.isSolidSide(this.world, p, side.getOpposite())) { - final ItemPaintBall ipb = (ItemPaintBall) type.getItem(); + final PaintBallItem ipb = (PaintBallItem) type.getItem(); final AEColor col = ipb.getColor(); final boolean lit = ipb.isLumen(); diff --git a/src/main/java/appeng/tile/misc/TileQuartzGrowthAccelerator.java b/src/main/java/appeng/tile/misc/QuartzGrowthAcceleratorTileEntity.java similarity index 94% rename from src/main/java/appeng/tile/misc/TileQuartzGrowthAccelerator.java rename to src/main/java/appeng/tile/misc/QuartzGrowthAcceleratorTileEntity.java index 888f37dec..5c6bcb88e 100644 --- a/src/main/java/appeng/tile/misc/TileQuartzGrowthAccelerator.java +++ b/src/main/java/appeng/tile/misc/QuartzGrowthAcceleratorTileEntity.java @@ -32,15 +32,15 @@ import appeng.api.networking.events.MENetworkPowerStatusChange; import appeng.api.util.AECableType; import appeng.api.util.AEPartLocation; import appeng.me.GridAccessException; -import appeng.tile.grid.AENetworkTile; +import appeng.tile.grid.AENetworkTileEntity; import appeng.util.Platform; -public class TileQuartzGrowthAccelerator extends AENetworkTile +public class QuartzGrowthAcceleratorTileEntity extends AENetworkTileEntity implements IPowerChannelState, ICrystalGrowthAccelerator { private boolean hasPower = false; - public TileQuartzGrowthAccelerator(TileEntityType tileEntityTypeIn) { + public QuartzGrowthAcceleratorTileEntity(TileEntityType tileEntityTypeIn) { super(tileEntityTypeIn); this.getProxy().setValidSides(EnumSet.noneOf(Direction.class)); this.getProxy().setFlags(); diff --git a/src/main/java/appeng/tile/misc/TileSecurityStation.java b/src/main/java/appeng/tile/misc/SecurityStationTileEntity.java similarity index 97% rename from src/main/java/appeng/tile/misc/TileSecurityStation.java rename to src/main/java/appeng/tile/misc/SecurityStationTileEntity.java index 8114cf795..c6b6aead2 100644 --- a/src/main/java/appeng/tile/misc/TileSecurityStation.java +++ b/src/main/java/appeng/tile/misc/SecurityStationTileEntity.java @@ -70,7 +70,7 @@ import appeng.helpers.PlayerSecurityWrapper; import appeng.me.GridAccessException; import appeng.me.helpers.MEMonitorHandler; import appeng.me.storage.SecurityStationInventory; -import appeng.tile.grid.AENetworkTile; +import appeng.tile.grid.AENetworkTileEntity; import appeng.tile.inventory.AppEngInternalInventory; import appeng.util.ConfigManager; import appeng.util.IConfigManagerHost; @@ -80,7 +80,7 @@ import appeng.util.inv.IAEAppEngInventory; import appeng.util.inv.InvOperation; import appeng.util.item.AEItemStack; -public class TileSecurityStation extends AENetworkTile implements ITerminalHost, IAEAppEngInventory, ILocatable, +public class SecurityStationTileEntity extends AENetworkTileEntity implements ITerminalHost, IAEAppEngInventory, ILocatable, IConfigManagerHost, ISecurityProvider, IColorableTile { private static int difference = 0; @@ -92,7 +92,7 @@ public class TileSecurityStation extends AENetworkTile implements ITerminalHost, private AEColor paintedColor = AEColor.TRANSPARENT; private boolean isActive = false; - public TileSecurityStation(TileEntityType tileEntityTypeIn) { + public SecurityStationTileEntity(TileEntityType tileEntityTypeIn) { super(tileEntityTypeIn); this.getProxy().setFlags(GridFlags.REQUIRE_CHANNEL); this.getProxy().setIdlePowerUsage(2.0); diff --git a/src/main/java/appeng/tile/misc/TileSkyCompass.java b/src/main/java/appeng/tile/misc/SkyCompassTileEntity.java similarity index 84% rename from src/main/java/appeng/tile/misc/TileSkyCompass.java rename to src/main/java/appeng/tile/misc/SkyCompassTileEntity.java index d731a78ab..bc9445f34 100644 --- a/src/main/java/appeng/tile/misc/TileSkyCompass.java +++ b/src/main/java/appeng/tile/misc/SkyCompassTileEntity.java @@ -20,11 +20,11 @@ package appeng.tile.misc; import net.minecraft.tileentity.TileEntityType; -import appeng.tile.AEBaseTile; +import appeng.tile.AEBaseTileEntity; -public class TileSkyCompass extends AEBaseTile { +public class SkyCompassTileEntity extends AEBaseTileEntity { - public TileSkyCompass(TileEntityType tileEntityTypeIn) { + public SkyCompassTileEntity(TileEntityType tileEntityTypeIn) { super(tileEntityTypeIn); } diff --git a/src/main/java/appeng/tile/misc/TileVibrationChamber.java b/src/main/java/appeng/tile/misc/VibrationChamberTileEntity.java similarity index 97% rename from src/main/java/appeng/tile/misc/TileVibrationChamber.java rename to src/main/java/appeng/tile/misc/VibrationChamberTileEntity.java index eea5cf04a..67970cbdd 100644 --- a/src/main/java/appeng/tile/misc/TileVibrationChamber.java +++ b/src/main/java/appeng/tile/misc/VibrationChamberTileEntity.java @@ -42,14 +42,14 @@ import appeng.api.util.AEPartLocation; import appeng.api.util.DimensionalCoord; import appeng.core.settings.TickRates; import appeng.me.GridAccessException; -import appeng.tile.grid.AENetworkInvTile; +import appeng.tile.grid.AENetworkInvTileEntity; import appeng.tile.inventory.AppEngInternalInventory; import appeng.util.Platform; import appeng.util.inv.InvOperation; import appeng.util.inv.WrapperFilteredItemHandler; import appeng.util.inv.filter.IAEItemFilter; -public class TileVibrationChamber extends AENetworkInvTile implements IGridTickable { +public class VibrationChamberTileEntity extends AENetworkInvTileEntity implements IGridTickable { public static final double POWER_PER_TICK = 5; public static final int MIN_BURN_SPEED = 20; public static final int MAX_BURN_SPEED = 200; @@ -64,7 +64,7 @@ public class TileVibrationChamber extends AENetworkInvTile implements IGridTicka // client side.. public boolean isOn; - public TileVibrationChamber(TileEntityType tileEntityTypeIn) { + public VibrationChamberTileEntity(TileEntityType tileEntityTypeIn) { super(tileEntityTypeIn); this.getProxy().setIdlePowerUsage(0); this.getProxy().setFlags(); diff --git a/src/main/java/appeng/tile/networking/CableBusTESR.java b/src/main/java/appeng/tile/networking/CableBusTESR.java index 1801c760c..6900d7f0a 100644 --- a/src/main/java/appeng/tile/networking/CableBusTESR.java +++ b/src/main/java/appeng/tile/networking/CableBusTESR.java @@ -27,15 +27,15 @@ import net.minecraft.util.Direction; import appeng.api.parts.IPart; -public class CableBusTESR extends TileEntityRenderer { +public class CableBusTESR extends TileEntityRenderer { public CableBusTESR(TileEntityRendererDispatcher rendererDispatcherIn) { super(rendererDispatcherIn); } @Override - public void render(TileCableBus te, float partialTicks, MatrixStack ms, IRenderTypeBuffer buffers, - int combinedLightIn, int combinedOverlayIn) { + public void render(CableBusTileEntity te, float partialTicks, MatrixStack ms, IRenderTypeBuffer buffers, + int combinedLightIn, int combinedOverlayIn) { if (!te.getCableBus().isRequiresDynamicRender()) { return; } diff --git a/src/main/java/appeng/tile/networking/TileCableBus.java b/src/main/java/appeng/tile/networking/CableBusTileEntity.java similarity index 98% rename from src/main/java/appeng/tile/networking/TileCableBus.java rename to src/main/java/appeng/tile/networking/CableBusTileEntity.java index a17bead4a..22da703d4 100644 --- a/src/main/java/appeng/tile/networking/TileCableBus.java +++ b/src/main/java/appeng/tile/networking/CableBusTileEntity.java @@ -54,16 +54,16 @@ import appeng.client.render.cablebus.CableBusRenderState; import appeng.helpers.AEMultiTile; import appeng.hooks.TickHandler; import appeng.parts.CableBusContainer; -import appeng.tile.AEBaseTile; +import appeng.tile.AEBaseTileEntity; import appeng.util.Platform; -public class TileCableBus extends AEBaseTile implements AEMultiTile { +public class CableBusTileEntity extends AEBaseTileEntity implements AEMultiTile { private CableBusContainer cb = new CableBusContainer(this); private int oldLV = -1; // on re-calculate light when it changes - public TileCableBus(TileEntityType tileEntityTypeIn) { + public CableBusTileEntity(TileEntityType tileEntityTypeIn) { super(tileEntityTypeIn); } diff --git a/src/main/java/appeng/tile/networking/TileController.java b/src/main/java/appeng/tile/networking/ControllerTileEntity.java similarity index 91% rename from src/main/java/appeng/tile/networking/TileController.java rename to src/main/java/appeng/tile/networking/ControllerTileEntity.java index be6af9254..d5f3e9da8 100644 --- a/src/main/java/appeng/tile/networking/TileController.java +++ b/src/main/java/appeng/tile/networking/ControllerTileEntity.java @@ -39,16 +39,16 @@ import appeng.api.networking.events.MENetworkPowerStorage.PowerEventType; import appeng.api.networking.pathing.ControllerState; import appeng.api.util.AECableType; import appeng.api.util.AEPartLocation; -import appeng.block.networking.BlockController; -import appeng.block.networking.BlockController.ControllerBlockState; +import appeng.block.networking.ControllerBlock; +import appeng.block.networking.ControllerBlock.ControllerBlockState; import appeng.me.GridAccessException; -import appeng.tile.grid.AENetworkPowerTile; +import appeng.tile.grid.AENetworkPowerTileEntity; import appeng.util.inv.InvOperation; -public class TileController extends AENetworkPowerTile { +public class ControllerTileEntity extends AENetworkPowerTileEntity { private boolean isValid = false; - public TileController(TileEntityType tileEntityTypeIn) { + public ControllerTileEntity(TileEntityType tileEntityTypeIn) { super(tileEntityTypeIn); this.setInternalMaxPower(8000); this.setInternalPublicPowerStorage(true); @@ -116,9 +116,9 @@ public class TileController extends AENetworkPowerTile { } if (this.checkController(this.pos) - && this.world.getBlockState(this.pos).get(BlockController.CONTROLLER_STATE) != metaState) { + && this.world.getBlockState(this.pos).get(ControllerBlock.CONTROLLER_STATE) != metaState) { this.world.setBlockState(this.pos, - this.world.getBlockState(this.pos).with(BlockController.CONTROLLER_STATE, metaState)); + this.world.getBlockState(this.pos).with(ControllerBlock.CONTROLLER_STATE, metaState)); } } @@ -184,7 +184,7 @@ public class TileController extends AENetworkPowerTile { */ private boolean checkController(final BlockPos pos) { if (this.world.getChunkProvider().isChunkLoaded(new ChunkPos(pos.getX() >> 4, pos.getZ() >> 4))) { - return this.world.getTileEntity(pos) instanceof TileController; + return this.world.getTileEntity(pos) instanceof ControllerTileEntity; } return false; diff --git a/src/main/java/appeng/tile/networking/TileCreativeEnergyCell.java b/src/main/java/appeng/tile/networking/CreativeEnergyCellTileEntity.java similarity index 90% rename from src/main/java/appeng/tile/networking/TileCreativeEnergyCell.java rename to src/main/java/appeng/tile/networking/CreativeEnergyCellTileEntity.java index 309529205..4d37ecdae 100644 --- a/src/main/java/appeng/tile/networking/TileCreativeEnergyCell.java +++ b/src/main/java/appeng/tile/networking/CreativeEnergyCellTileEntity.java @@ -26,11 +26,11 @@ import appeng.api.config.PowerMultiplier; import appeng.api.networking.energy.IAEPowerStorage; import appeng.api.util.AECableType; import appeng.api.util.AEPartLocation; -import appeng.tile.grid.AENetworkTile; +import appeng.tile.grid.AENetworkTileEntity; -public class TileCreativeEnergyCell extends AENetworkTile implements IAEPowerStorage { +public class CreativeEnergyCellTileEntity extends AENetworkTileEntity implements IAEPowerStorage { - public TileCreativeEnergyCell(TileEntityType tileEntityTypeIn) { + public CreativeEnergyCellTileEntity(TileEntityType tileEntityTypeIn) { super(tileEntityTypeIn); this.getProxy().setIdlePowerUsage(0); } diff --git a/src/main/java/appeng/tile/networking/TileDenseEnergyCell.java b/src/main/java/appeng/tile/networking/DenseEnergyCellTileEntity.java similarity index 87% rename from src/main/java/appeng/tile/networking/TileDenseEnergyCell.java rename to src/main/java/appeng/tile/networking/DenseEnergyCellTileEntity.java index ae4d6252f..d935ecf67 100644 --- a/src/main/java/appeng/tile/networking/TileDenseEnergyCell.java +++ b/src/main/java/appeng/tile/networking/DenseEnergyCellTileEntity.java @@ -20,9 +20,9 @@ package appeng.tile.networking; import net.minecraft.tileentity.TileEntityType; -public class TileDenseEnergyCell extends TileEnergyCell { +public class DenseEnergyCellTileEntity extends EnergyCellTileEntity { - public TileDenseEnergyCell(TileEntityType tileEntityTypeIn) { + public DenseEnergyCellTileEntity(TileEntityType tileEntityTypeIn) { super(tileEntityTypeIn); this.setInternalMaxPower(200000 * 8); } diff --git a/src/main/java/appeng/tile/networking/TileEnergyAcceptor.java b/src/main/java/appeng/tile/networking/EnergyAcceptorTileEntity.java similarity index 92% rename from src/main/java/appeng/tile/networking/TileEnergyAcceptor.java rename to src/main/java/appeng/tile/networking/EnergyAcceptorTileEntity.java index 0e775136b..32e25d0f9 100644 --- a/src/main/java/appeng/tile/networking/TileEnergyAcceptor.java +++ b/src/main/java/appeng/tile/networking/EnergyAcceptorTileEntity.java @@ -28,12 +28,12 @@ import appeng.api.networking.energy.IEnergyGrid; import appeng.api.util.AECableType; import appeng.api.util.AEPartLocation; import appeng.me.GridAccessException; -import appeng.tile.grid.AENetworkPowerTile; +import appeng.tile.grid.AENetworkPowerTileEntity; import appeng.util.inv.InvOperation; -public class TileEnergyAcceptor extends AENetworkPowerTile { +public class EnergyAcceptorTileEntity extends AENetworkPowerTileEntity { - public TileEnergyAcceptor(TileEntityType tileEntityTypeIn) { + public EnergyAcceptorTileEntity(TileEntityType tileEntityTypeIn) { super(tileEntityTypeIn); this.getProxy().setIdlePowerUsage(0.0); this.setInternalMaxPower(0); diff --git a/src/main/java/appeng/tile/networking/TileEnergyCell.java b/src/main/java/appeng/tile/networking/EnergyCellTileEntity.java similarity index 94% rename from src/main/java/appeng/tile/networking/TileEnergyCell.java rename to src/main/java/appeng/tile/networking/EnergyCellTileEntity.java index bc5ecf35c..56673f07f 100644 --- a/src/main/java/appeng/tile/networking/TileEnergyCell.java +++ b/src/main/java/appeng/tile/networking/EnergyCellTileEntity.java @@ -29,19 +29,19 @@ import appeng.api.networking.events.MENetworkPowerStorage; import appeng.api.networking.events.MENetworkPowerStorage.PowerEventType; import appeng.api.util.AECableType; import appeng.api.util.AEPartLocation; -import appeng.block.networking.BlockEnergyCell; +import appeng.block.networking.EnergyCellBlock; import appeng.me.GridAccessException; -import appeng.tile.grid.AENetworkTile; +import appeng.tile.grid.AENetworkTileEntity; import appeng.util.SettingsFrom; -public class TileEnergyCell extends AENetworkTile implements IAEPowerStorage { +public class EnergyCellTileEntity extends AENetworkTileEntity implements IAEPowerStorage { private double internalCurrentPower = 0.0; private double internalMaxPower = 200000.0; private byte currentMeta = -1; - public TileEnergyCell(TileEntityType tileEntityTypeIn) { + public EnergyCellTileEntity(TileEntityType tileEntityTypeIn) { super(tileEntityTypeIn); this.getProxy().setIdlePowerUsage(0); } @@ -54,7 +54,7 @@ public class TileEnergyCell extends AENetworkTile implements IAEPowerStorage { @Override public void onReady() { super.onReady(); - final int value = this.world.getBlockState(this.pos).get(BlockEnergyCell.ENERGY_STORAGE); + final int value = this.world.getBlockState(this.pos).get(EnergyCellBlock.ENERGY_STORAGE); this.currentMeta = (byte) value; this.changePowerLevel(); } @@ -85,7 +85,7 @@ public class TileEnergyCell extends AENetworkTile implements IAEPowerStorage { if (this.currentMeta != storageLevel) { this.currentMeta = (byte) storageLevel; this.world.setBlockState(this.pos, - this.world.getBlockState(this.pos).with(BlockEnergyCell.ENERGY_STORAGE, storageLevel)); + this.world.getBlockState(this.pos).with(EnergyCellBlock.ENERGY_STORAGE, storageLevel)); } } diff --git a/src/main/java/appeng/tile/networking/TileWireless.java b/src/main/java/appeng/tile/networking/WirelessTileEntity.java similarity index 96% rename from src/main/java/appeng/tile/networking/TileWireless.java rename to src/main/java/appeng/tile/networking/WirelessTileEntity.java index 42300fcee..8253e732b 100644 --- a/src/main/java/appeng/tile/networking/TileWireless.java +++ b/src/main/java/appeng/tile/networking/WirelessTileEntity.java @@ -40,12 +40,12 @@ import appeng.api.util.AEPartLocation; import appeng.api.util.DimensionalCoord; import appeng.core.AEConfig; import appeng.me.GridAccessException; -import appeng.tile.grid.AENetworkInvTile; +import appeng.tile.grid.AENetworkInvTileEntity; import appeng.tile.inventory.AppEngInternalInventory; import appeng.util.inv.InvOperation; import appeng.util.inv.filter.AEItemDefinitionFilter; -public class TileWireless extends AENetworkInvTile implements IWirelessAccessPoint, IPowerChannelState { +public class WirelessTileEntity extends AENetworkInvTileEntity implements IWirelessAccessPoint, IPowerChannelState { public static final int POWERED_FLAG = 1; public static final int CHANNEL_FLAG = 2; @@ -54,7 +54,7 @@ public class TileWireless extends AENetworkInvTile implements IWirelessAccessPoi private int clientFlags = 0; - public TileWireless(TileEntityType tileEntityTypeIn) { + public WirelessTileEntity(TileEntityType tileEntityTypeIn) { super(tileEntityTypeIn); this.inv.setFilter(new AEItemDefinitionFilter(AEApi.instance().definitions().materials().wirelessBooster())); this.getProxy().setFlags(GridFlags.REQUIRE_CHANNEL); diff --git a/src/main/java/appeng/tile/powersink/AEBasePoweredTile.java b/src/main/java/appeng/tile/powersink/AEBasePoweredTileEntity.java similarity index 97% rename from src/main/java/appeng/tile/powersink/AEBasePoweredTile.java rename to src/main/java/appeng/tile/powersink/AEBasePoweredTileEntity.java index f754609f5..c110dab26 100644 --- a/src/main/java/appeng/tile/powersink/AEBasePoweredTile.java +++ b/src/main/java/appeng/tile/powersink/AEBasePoweredTileEntity.java @@ -39,9 +39,9 @@ import appeng.api.config.PowerUnits; import appeng.api.networking.energy.IAEPowerStorage; import appeng.api.networking.events.MENetworkPowerStorage.PowerEventType; import appeng.capabilities.Capabilities; -import appeng.tile.AEBaseInvTile; +import appeng.tile.AEBaseInvTileEntity; -public abstract class AEBasePoweredTile extends AEBaseInvTile implements IAEPowerStorage, IExternalPowerSink { +public abstract class AEBasePoweredTileEntity extends AEBaseInvTileEntity implements IAEPowerStorage, IExternalPowerSink { // values that determine general function, are set by inheriting classes if // needed. These should generally remain static. @@ -58,7 +58,7 @@ public abstract class AEBasePoweredTile extends AEBaseInvTile implements IAEPowe // IC2 private IC2PowerSink ic2Sink; - public AEBasePoweredTile(TileEntityType tileEntityTypeIn) { + public AEBasePoweredTileEntity(TileEntityType tileEntityTypeIn) { super(tileEntityTypeIn); this.forgeEnergyAdapter = new ForgeEnergyAdapter(this); this.forgeEnergyAdapterOptional = LazyOptional.of(() -> forgeEnergyAdapter); diff --git a/src/main/java/appeng/tile/qnb/TileQuantumBridge.java b/src/main/java/appeng/tile/qnb/QuantumBridgeTileEntity.java similarity index 96% rename from src/main/java/appeng/tile/qnb/TileQuantumBridge.java rename to src/main/java/appeng/tile/qnb/QuantumBridgeTileEntity.java index f1082afab..8d7e4bde0 100644 --- a/src/main/java/appeng/tile/qnb/TileQuantumBridge.java +++ b/src/main/java/appeng/tile/qnb/QuantumBridgeTileEntity.java @@ -52,11 +52,11 @@ import appeng.me.cluster.IAECluster; import appeng.me.cluster.IAEMultiBlock; import appeng.me.cluster.implementations.QuantumCalculator; import appeng.me.cluster.implementations.QuantumCluster; -import appeng.tile.grid.AENetworkInvTile; +import appeng.tile.grid.AENetworkInvTileEntity; import appeng.tile.inventory.AppEngInternalInventory; import appeng.util.inv.InvOperation; -public class TileQuantumBridge extends AENetworkInvTile implements IAEMultiBlock, ITickableTileEntity { +public class QuantumBridgeTileEntity extends AENetworkInvTileEntity implements IAEMultiBlock, ITickableTileEntity { public static final ModelProperty FORMED_STATE = new ModelProperty<>(); @@ -70,7 +70,7 @@ public class TileQuantumBridge extends AENetworkInvTile implements IAEMultiBlock private QuantumCluster cluster; private boolean updateStatus = false; - public TileQuantumBridge(TileEntityType tileEntityTypeIn) { + public QuantumBridgeTileEntity(TileEntityType tileEntityTypeIn) { super(tileEntityTypeIn); this.getProxy().setValidSides(EnumSet.noneOf(Direction.class)); this.getProxy().setFlags(GridFlags.DENSE_CAPACITY); @@ -230,7 +230,7 @@ public class TileQuantumBridge extends AENetworkInvTile implements IAEMultiBlock for (final Direction d : Direction.values()) { final TileEntity te = this.world.getTileEntity(this.pos.offset(d)); - if (te instanceof TileQuantumBridge) { + if (te instanceof QuantumBridgeTileEntity) { set.add(d); } } diff --git a/src/main/java/appeng/tile/spatial/TileSpatialIOPort.java b/src/main/java/appeng/tile/spatial/SpatialIOPortTileEntity.java similarity index 95% rename from src/main/java/appeng/tile/spatial/TileSpatialIOPort.java rename to src/main/java/appeng/tile/spatial/SpatialIOPortTileEntity.java index 5a4a408cc..b58658372 100644 --- a/src/main/java/appeng/tile/spatial/TileSpatialIOPort.java +++ b/src/main/java/appeng/tile/spatial/SpatialIOPortTileEntity.java @@ -43,7 +43,7 @@ import appeng.api.util.AEPartLocation; import appeng.api.util.DimensionalCoord; import appeng.hooks.TickHandler; import appeng.me.cache.SpatialPylonCache; -import appeng.tile.grid.AENetworkInvTile; +import appeng.tile.grid.AENetworkInvTileEntity; import appeng.tile.inventory.AppEngInternalInventory; import appeng.util.IWorldCallable; import appeng.util.Platform; @@ -51,13 +51,13 @@ import appeng.util.inv.InvOperation; import appeng.util.inv.WrapperFilteredItemHandler; import appeng.util.inv.filter.IAEItemFilter; -public class TileSpatialIOPort extends AENetworkInvTile implements IWorldCallable { +public class SpatialIOPortTileEntity extends AENetworkInvTileEntity implements IWorldCallable { private final AppEngInternalInventory inv = new AppEngInternalInventory(this, 2); private final IItemHandler invExt = new WrapperFilteredItemHandler(this.inv, new SpatialIOFilter()); private YesNo lastRedstoneState = YesNo.UNDECIDED; - public TileSpatialIOPort(TileEntityType tileEntityTypeIn) { + public SpatialIOPortTileEntity(TileEntityType tileEntityTypeIn) { super(tileEntityTypeIn); this.getProxy().setFlags(GridFlags.REQUIRE_CHANNEL); } @@ -182,7 +182,7 @@ public class TileSpatialIOPort extends AENetworkInvTile implements IWorldCallabl @Override public boolean allowInsert(IItemHandler inv, int slot, ItemStack stack) { - return (slot == 0 && TileSpatialIOPort.this.isSpatialCell(stack)); + return (slot == 0 && SpatialIOPortTileEntity.this.isSpatialCell(stack)); } } diff --git a/src/main/java/appeng/tile/spatial/TileSpatialPylon.java b/src/main/java/appeng/tile/spatial/SpatialPylonTileEntity.java similarity index 97% rename from src/main/java/appeng/tile/spatial/TileSpatialPylon.java rename to src/main/java/appeng/tile/spatial/SpatialPylonTileEntity.java index 3ce3b679e..5f4441950 100644 --- a/src/main/java/appeng/tile/spatial/TileSpatialPylon.java +++ b/src/main/java/appeng/tile/spatial/SpatialPylonTileEntity.java @@ -40,9 +40,9 @@ import appeng.me.cluster.implementations.SpatialPylonCalculator; import appeng.me.cluster.implementations.SpatialPylonCluster; import appeng.me.helpers.AENetworkProxy; import appeng.me.helpers.AENetworkProxyMultiblock; -import appeng.tile.grid.AENetworkTile; +import appeng.tile.grid.AENetworkTileEntity; -public class TileSpatialPylon extends AENetworkTile implements IAEMultiBlock { +public class SpatialPylonTileEntity extends AENetworkTileEntity implements IAEMultiBlock { public static final ModelProperty STATE = new ModelProperty<>(value -> { // The lower 6 bits are used @@ -66,7 +66,7 @@ public class TileSpatialPylon extends AENetworkTile implements IAEMultiBlock { private SpatialPylonCluster cluster; private boolean didHaveLight = false; - public TileSpatialPylon(TileEntityType tileEntityTypeIn) { + public SpatialPylonTileEntity(TileEntityType tileEntityTypeIn) { super(tileEntityTypeIn); this.getProxy().setFlags(GridFlags.REQUIRE_CHANNEL, GridFlags.MULTIBLOCK); this.getProxy().setIdlePowerUsage(0.5); diff --git a/src/main/java/appeng/tile/storage/TileChest.java b/src/main/java/appeng/tile/storage/ChestTileEntity.java similarity index 93% rename from src/main/java/appeng/tile/storage/TileChest.java rename to src/main/java/appeng/tile/storage/ChestTileEntity.java index f2249e474..6cb2b8b92 100644 --- a/src/main/java/appeng/tile/storage/TileChest.java +++ b/src/main/java/appeng/tile/storage/ChestTileEntity.java @@ -88,15 +88,15 @@ import appeng.api.storage.data.IAEStack; import appeng.api.util.AEColor; import appeng.api.util.IConfigManager; import appeng.capabilities.Capabilities; -import appeng.container.implementations.ContainerMEMonitorable; -import appeng.fluids.container.ContainerFluidTerminal; +import appeng.container.implementations.MEMonitorableContainer; +import appeng.fluids.container.FluidTerminalContainer; import appeng.fluids.util.AEFluidStack; import appeng.helpers.IPriorityHost; import appeng.me.GridAccessException; import appeng.me.helpers.MEMonitorHandler; import appeng.me.helpers.MachineSource; import appeng.me.storage.MEInventoryHandler; -import appeng.tile.grid.AENetworkPowerTile; +import appeng.tile.grid.AENetworkPowerTileEntity; import appeng.tile.inventory.AppEngInternalInventory; import appeng.util.ConfigManager; import appeng.util.IConfigManagerHost; @@ -107,7 +107,7 @@ import appeng.util.inv.WrapperChainedItemHandler; import appeng.util.inv.filter.IAEItemFilter; import appeng.util.item.AEItemStack; -public class TileChest extends AENetworkPowerTile +public class ChestTileEntity extends AENetworkPowerTileEntity implements IMEChest, ITerminalHost, IPriorityHost, IConfigManagerHost, IColorableTile, ITickableTileEntity { private final AppEngInternalInventory inputInventory = new AppEngInternalInventory(this, 1); private final AppEngInternalInventory cellInventory = new AppEngInternalInventory(this, 1); @@ -126,7 +126,7 @@ public class TileChest extends AENetworkPowerTile private Accessor accessor; private IFluidHandler fluidHandler; - public TileChest(TileEntityType tileEntityTypeIn) { + public ChestTileEntity(TileEntityType tileEntityTypeIn) { super(tileEntityTypeIn); this.setInternalMaxPower(PowerMultiplier.CONFIG.multiply(40)); this.getProxy().setFlags(GridFlags.REQUIRE_CHANNEL); @@ -587,28 +587,28 @@ public class TileChest extends AENetworkPowerTile @Override public boolean isValid(final Object verificationToken) { - TileChest.this.updateHandler(); - if (TileChest.this.cellHandler != null && this.chan == TileChest.this.cellHandler.getChannel()) { - return verificationToken == TileChest.this.cellHandler; + ChestTileEntity.this.updateHandler(); + if (ChestTileEntity.this.cellHandler != null && this.chan == ChestTileEntity.this.cellHandler.getChannel()) { + return verificationToken == ChestTileEntity.this.cellHandler; } return false; } @Override public void postChange(final IBaseMonitor monitor, final Iterable change, final IActionSource source) { - if (source == TileChest.this.mySrc - || source.machine().map(machine -> machine == TileChest.this).orElse(false)) { + if (source == ChestTileEntity.this.mySrc + || source.machine().map(machine -> machine == ChestTileEntity.this).orElse(false)) { try { - if (TileChest.this.getProxy().isActive()) { - TileChest.this.getProxy().getStorage().postAlterationOfStoredItems(this.chan, change, - TileChest.this.mySrc); + if (ChestTileEntity.this.getProxy().isActive()) { + ChestTileEntity.this.getProxy().getStorage().postAlterationOfStoredItems(this.chan, change, + ChestTileEntity.this.mySrc); } } catch (final GridAccessException e) { // :( } } - TileChest.this.blinkCell(0); + ChestTileEntity.this.blinkCell(0); } @Override @@ -640,9 +640,9 @@ public class TileChest extends AENetworkPowerTile } private boolean securityCheck(final PlayerEntity player, final SecurityPermissions requiredPermission) { - if (TileChest.this.getTile() instanceof IActionHost && requiredPermission != null) { + if (ChestTileEntity.this.getTile() instanceof IActionHost && requiredPermission != null) { - final IGridNode gn = ((IActionHost) TileChest.this.getTile()).getActionableNode(); + final IGridNode gn = ((IActionHost) ChestTileEntity.this.getTile()).getActionableNode(); if (gn != null) { final IGrid g = gn.getGrid(); if (g != null) { @@ -694,8 +694,8 @@ public class TileChest extends AENetworkPowerTile @Nullable @Override public IStorageMonitorable getInventory(IActionSource src) { - if (Platform.canAccess(TileChest.this.getProxy(), src)) { - return TileChest.this; + if (Platform.canAccess(ChestTileEntity.this.getProxy(), src)) { + return ChestTileEntity.this; } return null; } @@ -704,7 +704,7 @@ public class TileChest extends AENetworkPowerTile private class FluidHandler implements IFluidHandler, IFluidTank { private boolean canAcceptLiquids() { - return TileChest.this.cellHandler != null && TileChest.this.cellHandler.getChannel() == AEApi.instance() + return ChestTileEntity.this.cellHandler != null && ChestTileEntity.this.cellHandler.getChannel() == AEApi.instance() .storage().getStorageChannel(IFluidStorageChannel.class); } @@ -752,10 +752,10 @@ public class TileChest extends AENetworkPowerTile @Override public int fill(FluidStack resource, FluidAction action) { - TileChest.this.updateHandler(); + ChestTileEntity.this.updateHandler(); if (canAcceptLiquids()) { - final IAEFluidStack results = Platform.poweredInsert(TileChest.this, TileChest.this.cellHandler, - AEFluidStack.fromFluidStack(resource), TileChest.this.mySrc, + final IAEFluidStack results = Platform.poweredInsert(ChestTileEntity.this, ChestTileEntity.this.cellHandler, + AEFluidStack.fromFluidStack(resource), ChestTileEntity.this.mySrc, action == FluidAction.EXECUTE ? Actionable.MODULATE : Actionable.SIMULATE); if (results == null) { @@ -787,9 +787,9 @@ public class TileChest extends AENetworkPowerTile @Override public boolean allowInsert(IItemHandler inv, int slot, ItemStack stack) { - if (TileChest.this.isPowered()) { - TileChest.this.updateHandler(); - return TileChest.this.cellHandler != null && TileChest.this.cellHandler.getChannel() == AEApi.instance() + if (ChestTileEntity.this.isPowered()) { + ChestTileEntity.this.updateHandler(); + return ChestTileEntity.this.cellHandler != null && ChestTileEntity.this.cellHandler.getChannel() == AEApi.instance() .storage().getStorageChannel(IItemStorageChannel.class); } return false; @@ -821,11 +821,11 @@ public class TileChest extends AENetworkPowerTile if (this.cellHandler != null) { if (this.cellHandler.getChannel() == AEApi.instance().storage() .getStorageChannel(IItemStorageChannel.class)) { - return ContainerMEMonitorable.TYPE; + return MEMonitorableContainer.TYPE; } if (this.cellHandler.getChannel() == AEApi.instance().storage() .getStorageChannel(IFluidStorageChannel.class)) { - return ContainerFluidTerminal.TYPE; + return FluidTerminalContainer.TYPE; } } return null; diff --git a/src/main/java/appeng/tile/storage/TileDrive.java b/src/main/java/appeng/tile/storage/DriveTileEntity.java similarity index 97% rename from src/main/java/appeng/tile/storage/TileDrive.java rename to src/main/java/appeng/tile/storage/DriveTileEntity.java index 70a883b30..809545b7e 100644 --- a/src/main/java/appeng/tile/storage/TileDrive.java +++ b/src/main/java/appeng/tile/storage/DriveTileEntity.java @@ -61,18 +61,18 @@ import appeng.api.util.AEPartLocation; import appeng.api.util.DimensionalCoord; import appeng.block.storage.DriveSlotsState; import appeng.client.render.model.DriveModelData; -import appeng.container.implementations.ContainerDrive; +import appeng.container.implementations.DriveContainer; import appeng.helpers.IPriorityHost; import appeng.me.GridAccessException; import appeng.me.helpers.MachineSource; import appeng.me.storage.DriveWatcher; -import appeng.tile.grid.AENetworkInvTile; +import appeng.tile.grid.AENetworkInvTileEntity; import appeng.tile.inventory.AppEngCellInventory; import appeng.util.Platform; import appeng.util.inv.InvOperation; import appeng.util.inv.filter.IAEItemFilter; -public class TileDrive extends AENetworkInvTile implements IChestOrDrive, IPriorityHost { +public class DriveTileEntity extends AENetworkInvTileEntity implements IChestOrDrive, IPriorityHost { private static final int BIT_POWER_MASK = 0x80000000; private static final int BIT_BLINK_MASK = 0x24924924; @@ -102,7 +102,7 @@ public class TileDrive extends AENetworkInvTile implements IChestOrDrive, IPrior */ private int state = 0; - public TileDrive(TileEntityType tileEntityTypeIn) { + public DriveTileEntity(TileEntityType tileEntityTypeIn) { super(tileEntityTypeIn); this.mySrc = new MachineSource(this); this.getProxy().setFlags(GridFlags.REQUIRE_CHANNEL); @@ -444,6 +444,6 @@ public class TileDrive extends AENetworkInvTile implements IChestOrDrive, IPrior @Override public ContainerType getContainerType() { - return ContainerDrive.TYPE; + return DriveContainer.TYPE; } } diff --git a/src/main/java/appeng/tile/storage/TileIOPort.java b/src/main/java/appeng/tile/storage/IOPortTileEntity.java similarity index 98% rename from src/main/java/appeng/tile/storage/TileIOPort.java rename to src/main/java/appeng/tile/storage/IOPortTileEntity.java index 3d603936d..0e4236fb7 100644 --- a/src/main/java/appeng/tile/storage/TileIOPort.java +++ b/src/main/java/appeng/tile/storage/IOPortTileEntity.java @@ -22,6 +22,7 @@ import java.util.IdentityHashMap; import java.util.List; import java.util.Map; +import appeng.tile.grid.AENetworkInvTileEntity; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; @@ -61,7 +62,6 @@ import appeng.me.GridAccessException; import appeng.me.helpers.MachineSource; import appeng.parts.automation.BlockUpgradeInventory; import appeng.parts.automation.UpgradeInventory; -import appeng.tile.grid.AENetworkInvTile; import appeng.tile.inventory.AppEngInternalInventory; import appeng.util.ConfigManager; import appeng.util.IConfigManagerHost; @@ -74,7 +74,7 @@ import appeng.util.inv.WrapperChainedItemHandler; import appeng.util.inv.WrapperFilteredItemHandler; import appeng.util.inv.filter.AEItemFilters; -public class TileIOPort extends AENetworkInvTile implements IUpgradeableHost, IConfigManagerHost, IGridTickable { +public class IOPortTileEntity extends AENetworkInvTileEntity implements IUpgradeableHost, IConfigManagerHost, IGridTickable { private static final int NUMBER_OF_CELL_SLOTS = 6; private static final int NUMBER_OF_UPGRADE_SLOTS = 3; @@ -95,7 +95,7 @@ public class TileIOPort extends AENetworkInvTile implements IUpgradeableHost, IC private ItemStack currentCell; private Map, IMEInventory> cachedInventories; - public TileIOPort(TileEntityType tileEntityTypeIn) { + public IOPortTileEntity(TileEntityType tileEntityTypeIn) { super(tileEntityTypeIn); this.getProxy().setFlags(GridFlags.REQUIRE_CHANNEL); this.manager = new ConfigManager(this); diff --git a/src/main/java/appeng/tile/storage/TileSkyChest.java b/src/main/java/appeng/tile/storage/SkyChestTileEntity.java similarity index 94% rename from src/main/java/appeng/tile/storage/TileSkyChest.java rename to src/main/java/appeng/tile/storage/SkyChestTileEntity.java index b9dfa5b74..dd397ddfe 100644 --- a/src/main/java/appeng/tile/storage/TileSkyChest.java +++ b/src/main/java/appeng/tile/storage/SkyChestTileEntity.java @@ -32,12 +32,12 @@ import net.minecraft.util.SoundEvents; import net.minecraft.util.math.MathHelper; import net.minecraftforge.items.IItemHandler; -import appeng.block.storage.BlockSkyChest; -import appeng.tile.AEBaseInvTile; +import appeng.block.storage.SkyChestBlock; +import appeng.tile.AEBaseInvTileEntity; import appeng.tile.inventory.AppEngInternalInventory; import appeng.util.inv.InvOperation; -public class TileSkyChest extends AEBaseInvTile implements ITickableTileEntity, IChestLid { +public class SkyChestTileEntity extends AEBaseInvTileEntity implements ITickableTileEntity, IChestLid { private final AppEngInternalInventory inv = new AppEngInternalInventory(this, 9 * 4); @@ -48,7 +48,7 @@ public class TileSkyChest extends AEBaseInvTile implements ITickableTileEntity, private float lidAngle; private float prevLidAngle; - public TileSkyChest(TileEntityType type) { + public SkyChestTileEntity(TileEntityType type) { super(type); } @@ -116,7 +116,7 @@ public class TileSkyChest extends AEBaseInvTile implements ITickableTileEntity, // See ChestTileEntity private void onOpenOrClose() { Block block = this.getBlockState().getBlock(); - if (block instanceof BlockSkyChest) { + if (block instanceof SkyChestBlock) { this.world.addBlockEvent(this.pos, block, 1, this.numPlayersUsing); this.world.notifyNeighborsOfStateChange(this.pos, block); // FIXME: Uhm, we are we doing this?