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

The Great Renamening of 2020

Browse Source
This commit is contained in:
Sebastian Hartte
2020-06-22 12:14:54 +02:00
parent abe3334488
commit b4471b1abb
441 changed files with 3395 additions and 3468 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/block/crafting/AbstractCraftingUnitBlock.java
+7 -7
View File
@@ -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<T extends TileCraftingTile> extends AEBaseTileBlock<T> {
public abstract class AbstractCraftingUnitBlock<T extends CraftingTileEntity> extends AEBaseTileBlock<T> {
public static final BooleanProperty FORMED = BooleanProperty.create("formed");
public static final BooleanProperty POWERED = BooleanProperty.create("powered");
@@ -57,7 +57,7 @@ public abstract class AbstractCraftingUnitBlock<T extends TileCraftingTile> 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<T extends TileCraftingTile> 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<T extends TileCraftingTile> 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()));
}
src/main/java/appeng/block/crafting/BlockCraftingMonitor.java → src/main/java/appeng/block/crafting/CraftingMonitorBlock.java
+3 -3
View File
@@ -18,10 +18,10 @@
package appeng.block.crafting;
import appeng.tile.crafting.TileCraftingMonitorTile;
import appeng.tile.crafting.CraftingMonitorTileEntity;
public class BlockCraftingMonitor extends AbstractCraftingUnitBlock<TileCraftingMonitorTile> {
public BlockCraftingMonitor(Properties props) {
public class CraftingMonitorBlock extends AbstractCraftingUnitBlock<CraftingMonitorTileEntity> {
public CraftingMonitorBlock(Properties props) {
super(props, CraftingUnitType.MONITOR);
}
}
src/main/java/appeng/block/crafting/BlockCraftingStorage.java → src/main/java/appeng/block/crafting/CraftingStorageBlock.java
+3 -3
View File
@@ -18,11 +18,11 @@
package appeng.block.crafting;
import appeng.tile.crafting.TileCraftingStorageTile;
import appeng.tile.crafting.CraftingStorageTileEntity;
public class BlockCraftingStorage extends AbstractCraftingUnitBlock<TileCraftingStorageTile> {
public class CraftingStorageBlock extends AbstractCraftingUnitBlock<CraftingStorageTileEntity> {
public BlockCraftingStorage(Properties props, CraftingUnitType type) {
public CraftingStorageBlock(Properties props, CraftingUnitType type) {
super(props, type);
}
src/main/java/appeng/block/crafting/ItemCraftingStorage.java → src/main/java/appeng/block/crafting/CraftingStorageItem.java
+2 -2
View File
@@ -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);
}
src/main/java/appeng/block/crafting/CraftingUnitBlock.java
+2 -2
View File
@@ -18,9 +18,9 @@
package appeng.block.crafting;
import appeng.tile.crafting.TileCraftingTile;
import appeng.tile.crafting.CraftingTileEntity;
public class CraftingUnitBlock extends AbstractCraftingUnitBlock<TileCraftingTile> {
public class CraftingUnitBlock extends AbstractCraftingUnitBlock<CraftingTileEntity> {
public CraftingUnitBlock(Properties props, CraftingUnitType type) {
super(props, type);
src/main/java/appeng/block/crafting/BlockMolecularAssembler.java → src/main/java/appeng/block/crafting/MolecularAssemblerBlock.java
+7 -7
View File
@@ -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<TileMolecularAssembler> {
public class MolecularAssemblerBlock extends AEBaseTileBlock<MolecularAssemblerTileEntity> {
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<TileMolecularAssemb
}
@Override
protected BlockState updateBlockStateFromTileEntity(BlockState currentState, TileMolecularAssembler te) {
protected BlockState updateBlockStateFromTileEntity(BlockState currentState, MolecularAssemblerTileEntity te) {
return currentState.with(POWERED, te.isPowered());
}
@Override
public ActionResultType onBlockActivated(BlockState state, World w, BlockPos pos, PlayerEntity p, Hand hand,
BlockRayTraceResult hit) {
final TileMolecularAssembler tg = this.getTileEntity(w, pos);
final MolecularAssemblerTileEntity tg = this.getTileEntity(w, pos);
if (tg != null && !p.isCrouching()) {
if (!tg.isRemote()) {
ContainerOpener.openContainer(ContainerMolecularAssembler.TYPE, p,
ContainerOpener.openContainer(MolecularAssemblerContainer.TYPE, p,
ContainerLocator.forTileEntitySide(tg, hit.getFace()));
}
return ActionResultType.SUCCESS;