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

Migrations

Browse Source
This commit is contained in:
Sebastian Hartte
2020-06-27 16:18:20 +02:00
parent d638d083c2
commit ba71a82288
303 changed files with 1216 additions and 1210 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/parts/misc/CableAnchorPart.java
+5 -5
View File
@@ -26,14 +26,14 @@ import net.minecraft.entity.Entity;
import net.minecraft.entity.LivingEntity;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.PacketBuffer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.Hand;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Vec3d;
import net.minecraft.world.IBlockReader;
import net.minecraft.world.BlockView;
import net.minecraft.world.World;
import appeng.api.networking.IGridNode;
@@ -97,12 +97,12 @@ public class CableAnchorPart implements IPart {
}
@Override
public void writeToNBT(final CompoundNBT data) {
public void writeToNBT(final CompoundTag data) {
}
@Override
public void readFromNBT(final CompoundNBT data) {
public void readFromNBT(final CompoundTag data) {
}
@@ -117,7 +117,7 @@ public class CableAnchorPart implements IPart {
}
@Override
public void onNeighborChanged(IBlockReader w, BlockPos pos, BlockPos neighbor) {
public void onNeighborChanged(BlockView w, BlockPos pos, BlockPos neighbor) {
}
src/main/java/appeng/parts/misc/InterfacePart.java
+4 -4
View File
@@ -27,9 +27,9 @@ import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.inventory.CraftingInventory;
import net.minecraft.inventory.container.ContainerType;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.Direction;
import net.minecraft.util.math.Direction;
import net.minecraft.util.Hand;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.Vec3d;
@@ -126,13 +126,13 @@ public class InterfacePart extends BasicStatePart implements IGridTickable, ISto
}
@Override
public void readFromNBT(final CompoundNBT data) {
public void readFromNBT(final CompoundTag data) {
super.readFromNBT(data);
this.duality.readFromNBT(data);
}
@Override
public void writeToNBT(final CompoundNBT data) {
public void writeToNBT(final CompoundTag data) {
super.writeToNBT(data);
this.duality.writeToNBT(data);
}
src/main/java/appeng/parts/misc/SharedStorageBusPart.java
+5 -5
View File
@@ -22,9 +22,9 @@ import java.util.Collections;
import java.util.List;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockReader;
import net.minecraft.world.BlockView;
import appeng.api.AEApi;
import appeng.api.config.Settings;
@@ -134,20 +134,20 @@ public abstract class SharedStorageBusPart extends UpgradeablePart
}
@Override
public void onNeighborChanged(IBlockReader w, BlockPos pos, BlockPos neighbor) {
public void onNeighborChanged(BlockView w, BlockPos pos, BlockPos neighbor) {
if (pos.offset(this.getSide().getFacing()).equals(neighbor)) {
this.resetCache(false);
}
}
@Override
public void readFromNBT(final CompoundNBT data) {
public void readFromNBT(final CompoundTag data) {
super.readFromNBT(data);
this.priority = data.getInt("priority");
}
@Override
public void writeToNBT(final CompoundNBT data) {
public void writeToNBT(final CompoundTag data) {
super.writeToNBT(data);
data.putInt("priority", this.priority);
}
src/main/java/appeng/parts/misc/StorageBusPart.java
+6 -6
View File
@@ -25,14 +25,14 @@ import java.util.Objects;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.inventory.container.ContainerType;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.Direction;
import net.minecraft.util.math.Direction;
import net.minecraft.util.Hand;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Vec3d;
import net.minecraft.world.IBlockReader;
import net.minecraft.world.BlockView;
import net.minecraftforge.common.util.LazyOptional;
import net.minecraftforge.items.CapabilityItemHandler;
import net.minecraftforge.items.IItemHandler;
@@ -183,14 +183,14 @@ public class StorageBusPart extends UpgradeablePart
}
@Override
public void readFromNBT(final CompoundNBT data) {
public void readFromNBT(final CompoundTag data) {
super.readFromNBT(data);
this.Config.readFromNBT(data, "config");
this.priority = data.getInt("priority");
}
@Override
public void writeToNBT(final CompoundNBT data) {
public void writeToNBT(final CompoundTag data) {
super.writeToNBT(data);
this.Config.writeToNBT(data, "config");
data.putInt("priority", this.priority);
@@ -255,7 +255,7 @@ public class StorageBusPart extends UpgradeablePart
}
@Override
public void onNeighborChanged(IBlockReader w, BlockPos pos, BlockPos neighbor) {
public void onNeighborChanged(BlockView w, BlockPos pos, BlockPos neighbor) {
if (pos.offset(this.getSide().getFacing()).equals(neighbor)) {
final TileEntity te = w.getTileEntity(neighbor);
src/main/java/appeng/parts/misc/ToggleBusPart.java
+5 -5
View File
@@ -22,12 +22,12 @@ import java.util.EnumSet;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.Hand;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockReader;
import net.minecraft.world.BlockView;
import appeng.api.AEApi;
import appeng.api.exceptions.FailedConnectionException;
@@ -103,7 +103,7 @@ public class ToggleBusPart extends BasicStatePart {
}
@Override
public void onNeighborChanged(IBlockReader w, BlockPos pos, BlockPos neighbor) {
public void onNeighborChanged(BlockView w, BlockPos pos, BlockPos neighbor) {
final boolean oldHasRedstone = this.hasRedstone;
this.hasRedstone = this.getHost().hasRedstone(this.getSide());
@@ -114,13 +114,13 @@ public class ToggleBusPart extends BasicStatePart {
}
@Override
public void readFromNBT(final CompoundNBT extra) {
public void readFromNBT(final CompoundTag extra) {
super.readFromNBT(extra);
this.getOuterProxy().readFromNBT(extra);
}
@Override
public void writeToNBT(final CompoundNBT extra) {
public void writeToNBT(final CompoundTag extra) {
super.writeToNBT(extra);
this.getOuterProxy().writeToNBT(extra);
}