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

API compiles

Browse Source
This commit is contained in:
Sebastian Hartte
2020-06-27 18:09:44 +02:00
parent ba71a82288
commit 80fbb58d4f
572 changed files with 2995 additions and 3037 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/debug/ChunkLoaderTileEntity.java
+3 -3
View File
@@ -19,17 +19,17 @@
package appeng.debug;
import net.minecraft.tileentity.ITickableTileEntity;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.block.entity.BlockEntityType;
import net.minecraft.util.math.ChunkPos;
import net.minecraft.world.World;
import net.minecraft.world.server.ServerWorld;
import net.minecraft.server.world.ServerWorld;
import appeng.core.AELog;
import appeng.tile.AEBaseTileEntity;
public class ChunkLoaderTileEntity extends AEBaseTileEntity implements ITickableTileEntity {
public ChunkLoaderTileEntity(TileEntityType<?> tileEntityTypeIn) {
public ChunkLoaderTileEntity(BlockEntityType<?> tileEntityTypeIn) {
super(tileEntityTypeIn);
}
src/main/java/appeng/debug/CubeGeneratorTileEntity.java
+2 -2
View File
@@ -24,7 +24,7 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.item.ItemUseContext;
import net.minecraft.tileentity.ITickableTileEntity;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.block.entity.BlockEntityType;
import net.minecraft.util.math.Direction;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.text.StringTextComponent;
@@ -40,7 +40,7 @@ public class CubeGeneratorTileEntity extends AEBaseTileEntity implements ITickab
private int countdown = 20 * 10;
private PlayerEntity who = null;
public CubeGeneratorTileEntity(TileEntityType<?> tileEntityTypeIn) {
public CubeGeneratorTileEntity(BlockEntityType<?> tileEntityTypeIn) {
super(tileEntityTypeIn);
}
src/main/java/appeng/debug/DebugCardItem.java
+2 -2
View File
@@ -25,7 +25,7 @@ import net.minecraft.entity.Entity;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.ItemStack;
import net.minecraft.item.ItemUseContext;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.util.ActionResult;
import net.minecraft.util.math.Direction;
import net.minecraft.util.math.BlockPos;
@@ -84,7 +84,7 @@ public class DebugCardItem extends AEBaseItem {
this.outputMsg(player, "Grids: " + grids);
this.outputMsg(player, "Total Nodes: " + totalNodes);
} else {
final TileEntity te = world.getTileEntity(pos);
final BlockEntity te = world.getTileEntity(pos);
if (te instanceof IGridHost) {
final GridNode node = (GridNode) ((IGridHost) te).getGridNode(AEPartLocation.fromFacing(side));
src/main/java/appeng/debug/DebugPartPlacerItem.java
+3 -3
View File
@@ -2,11 +2,11 @@ package appeng.debug;
import java.util.Arrays;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.item.ItemUseContext;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ActionResult;
import net.minecraft.util.math.Direction;
import net.minecraft.util.math.BlockPos;
@@ -53,7 +53,7 @@ public class DebugPartPlacerItem extends AEBaseItem {
return ActionResult.FAIL;
}
TileEntity te = world.getTileEntity(pos);
BlockEntity te = world.getTileEntity(pos);
if (!(te instanceof IPartHost)) {
player.sendMessage(new StringTextComponent("Right-click something that will accept parts"));
return ActionResult.FAIL;
@@ -85,7 +85,7 @@ public class DebugPartPlacerItem extends AEBaseItem {
continue;
}
TileEntity t = world.getTileEntity(nextPos);
BlockEntity t = world.getTileEntity(nextPos);
if (!(t instanceof IPartHost)) {
continue;
}
src/main/java/appeng/debug/EnergyGeneratorTileEntity.java
+5 -5
View File
@@ -22,9 +22,9 @@ import javax.annotation.Nullable;
import com.google.common.math.IntMath;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.block.entity.BlockEntityType;
import net.minecraft.tileentity.ITickableTileEntity;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.math.Direction;
import net.minecraft.world.World;
import net.minecraftforge.common.capabilities.Capability;
@@ -41,7 +41,7 @@ public class EnergyGeneratorTileEntity extends AEBaseTileEntity implements ITick
*/
private static final int BASE_ENERGY = 8;
public EnergyGeneratorTileEntity(TileEntityType<?> tileEntityTypeIn) {
public EnergyGeneratorTileEntity(BlockEntityType<?> tileEntityTypeIn) {
super(tileEntityTypeIn);
}
@@ -54,7 +54,7 @@ public class EnergyGeneratorTileEntity extends AEBaseTileEntity implements ITick
int tier = 1;
for (Direction facing : Direction.values()) {
final TileEntity te = world.getTileEntity(this.getPos().offset(facing));
final BlockEntity te = world.getTileEntity(this.getPos().offset(facing));
if (te instanceof EnergyGeneratorTileEntity) {
tier++;
@@ -64,7 +64,7 @@ public class EnergyGeneratorTileEntity extends AEBaseTileEntity implements ITick
final int energyToInsert = IntMath.pow(BASE_ENERGY, tier);
for (Direction facing : Direction.values()) {
final TileEntity te = this.getWorld().getTileEntity(this.getPos().offset(facing));
final BlockEntity te = this.getWorld().getTileEntity(this.getPos().offset(facing));
final LazyOptional<IEnergyStorage> cap = te.getCapability(CapabilityEnergy.ENERGY, facing.getOpposite());
cap.ifPresent(consumer -> {
src/main/java/appeng/debug/ItemGenTileEntity.java
+5 -5
View File
@@ -24,16 +24,16 @@ import java.util.Queue;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import alexiil.mc.lib.attributes.item.ItemTransferable;
import net.minecraft.block.entity.BlockEntityType;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.item.Items;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.math.Direction;
import net.minecraft.util.NonNullList;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.common.util.LazyOptional;
import net.minecraftforge.items.CapabilityItemHandler;
import net.minecraftforge.items.IItemHandler;
import net.minecraftforge.registries.ForgeRegistries;
import appeng.tile.AEBaseTileEntity;
@@ -42,9 +42,9 @@ public class ItemGenTileEntity extends AEBaseTileEntity {
private static final Queue<ItemStack> POSSIBLE_ITEMS = new ArrayDeque<>();
private final IItemHandler handler = new QueuedItemHandler();
private final ItemTransferable handler = new QueuedItemHandler();
public ItemGenTileEntity(TileEntityType<?> tileEntityTypeIn) {
public ItemGenTileEntity(BlockEntityType<?> tileEntityTypeIn) {
super(tileEntityTypeIn);
if (POSSIBLE_ITEMS.isEmpty()) {
for (final Item mi : ForgeRegistries.ITEMS) {
@@ -81,7 +81,7 @@ public class ItemGenTileEntity extends AEBaseTileEntity {
return super.getCapability(capability, facing);
}
class QueuedItemHandler implements IItemHandler {
class QueuedItemHandler implements ItemTransferable {
@Override
@Nonnull
src/main/java/appeng/debug/MeteoritePlacerItem.java
+1 -1
View File
@@ -33,7 +33,7 @@ import net.minecraft.util.math.MutableBoundingBox;
import net.minecraft.util.text.StringTextComponent;
import net.minecraft.world.World;
import net.minecraft.world.chunk.Chunk;
import net.minecraft.world.server.ServerWorld;
import net.minecraft.server.world.ServerWorld;
import appeng.items.AEBaseItem;
import appeng.util.Platform;
src/main/java/appeng/debug/PhantomNodeTileEntity.java
+2 -2
View File
@@ -20,7 +20,7 @@ package appeng.debug;
import java.util.EnumSet;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.block.entity.BlockEntityType;
import net.minecraft.util.math.Direction;
import appeng.api.networking.IGridNode;
@@ -33,7 +33,7 @@ public class PhantomNodeTileEntity extends AENetworkTileEntity {
private AENetworkProxy proxy = null;
private boolean crashMode = false;
public PhantomNodeTileEntity(TileEntityType<?> tileEntityTypeIn) {
public PhantomNodeTileEntity(BlockEntityType<?> tileEntityTypeIn) {
super(tileEntityTypeIn);
}
src/main/java/appeng/debug/ReplicatorCardItem.java
+4 -4
View File
@@ -25,7 +25,7 @@ import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.ItemStack;
import net.minecraft.item.ItemUseContext;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.util.ActionResult;
import net.minecraft.util.math.Direction;
import net.minecraft.util.Hand;
@@ -90,7 +90,7 @@ public class ReplicatorCardItem extends AEBaseItem {
final int dimid = ish.getInt("dimid");
final World src_w = world.getServer().getWorld(DimensionType.getById(dimid));
final TileEntity te = src_w.getTileEntity(new BlockPos(src_x, src_y, src_z));
final BlockEntity te = src_w.getTileEntity(new BlockPos(src_x, src_y, src_z));
if (te instanceof IGridHost) {
final IGridHost gh = (IGridHost) te;
final Direction sideOff = Direction.values()[src_side];
@@ -131,8 +131,8 @@ public class ReplicatorCardItem extends AEBaseItem {
world.setBlockState(d, state);
if (blk != null && blk.hasTileEntity(state)) {
final TileEntity ote = src_w.getTileEntity(p);
final TileEntity nte = blk.createTileEntity(state, world);
final BlockEntity ote = src_w.getTileEntity(p);
final BlockEntity nte = blk.createTileEntity(state, world);
final CompoundTag data = new CompoundTag();
ote.write(data);
nte.read(data.copy());