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/tile/misc/CellWorkbenchTileEntity.java
+3 -3
View File
@@ -21,7 +21,7 @@ package appeng.tile.misc;
import java.util.List;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
@@ -94,7 +94,7 @@ public class CellWorkbenchTileEntity extends AEBaseTileEntity
}
@Override
public CompoundNBT write(final CompoundNBT data) {
public CompoundTag write(final CompoundTag data) {
super.write(data);
this.cell.writeToNBT(data, "cell");
this.config.writeToNBT(data, "config");
@@ -103,7 +103,7 @@ public class CellWorkbenchTileEntity extends AEBaseTileEntity
}
@Override
public void read(final CompoundNBT data) {
public void read(final CompoundTag data) {
super.read(data);
this.cell.readFromNBT(data, "cell");
this.config.readFromNBT(data, "config");
src/main/java/appeng/tile/misc/ChargerTileEntity.java
+1 -1
View File
@@ -27,7 +27,7 @@ import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.ItemStack;
import net.minecraft.network.PacketBuffer;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.Direction;
import net.minecraft.util.math.Direction;
import net.minecraftforge.items.IItemHandler;
import appeng.api.AEApi;
src/main/java/appeng/tile/misc/CondenserTileEntity.java
+4 -4
View File
@@ -22,9 +22,9 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.Direction;
import net.minecraft.util.math.Direction;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.common.util.LazyOptional;
import net.minecraftforge.fluids.FluidAttributes;
@@ -86,7 +86,7 @@ public class CondenserTileEntity extends AEBaseInvTileEntity implements IConfigM
}
@Override
public CompoundNBT write(final CompoundNBT data) {
public CompoundTag write(final CompoundTag data) {
super.write(data);
this.cm.writeToNBT(data);
data.putDouble("storedPower", this.getStoredPower());
@@ -94,7 +94,7 @@ public class CondenserTileEntity extends AEBaseInvTileEntity implements IConfigM
}
@Override
public void read(final CompoundNBT data) {
public void read(final CompoundTag data) {
super.read(data);
this.cm.readFromNBT(data);
this.setStoredPower(data.getDouble("storedPower"));
src/main/java/appeng/tile/misc/InscriberRecipes.java
+3 -3
View File
@@ -10,7 +10,7 @@ import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.IRecipe;
import net.minecraft.item.crafting.Ingredient;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.text.StringTextComponent;
import net.minecraft.world.World;
@@ -77,12 +77,12 @@ public final class InscriberRecipes {
String name = "";
if (!plateA.isEmpty()) {
final CompoundNBT tag = plateA.getOrCreateTag();
final CompoundTag tag = plateA.getOrCreateTag();
name += tag.getString(MaterialItem.TAG_INSCRIBE_NAME);
}
if (!plateB.isEmpty()) {
final CompoundNBT tag = plateB.getOrCreateTag();
final CompoundTag tag = plateB.getOrCreateTag();
name += " " + tag.getString(MaterialItem.TAG_INSCRIBE_NAME);
}
src/main/java/appeng/tile/misc/InscriberTileEntity.java
+4 -4
View File
@@ -26,10 +26,10 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.PacketBuffer;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.Direction;
import net.minecraft.util.math.Direction;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.items.IItemHandler;
@@ -127,7 +127,7 @@ public class InscriberTileEntity extends AENetworkPowerTileEntity
}
@Override
public CompoundNBT write(final CompoundNBT data) {
public CompoundTag write(final CompoundTag data) {
super.write(data);
this.upgrades.writeToNBT(data, "upgrades");
this.settings.writeToNBT(data);
@@ -135,7 +135,7 @@ public class InscriberTileEntity extends AENetworkPowerTileEntity
}
@Override
public void read(final CompoundNBT data) {
public void read(final CompoundTag data) {
super.read(data);
this.upgrades.readFromNBT(data, "upgrades");
this.settings.readFromNBT(data);
src/main/java/appeng/tile/misc/InterfaceTileEntity.java
+4 -4
View File
@@ -29,11 +29,11 @@ import com.google.common.collect.ImmutableSet;
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.network.PacketBuffer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.Direction;
import net.minecraft.util.math.Direction;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.common.capabilities.Capability;
@@ -150,7 +150,7 @@ public class InterfaceTileEntity extends AENetworkInvTileEntity
}
@Override
public CompoundNBT write(final CompoundNBT data) {
public CompoundTag write(final CompoundTag data) {
super.write(data);
data.putBoolean("omniDirectional", this.omniDirectional);
this.duality.writeToNBT(data);
@@ -158,7 +158,7 @@ public class InterfaceTileEntity extends AENetworkInvTileEntity
}
@Override
public void read(final CompoundNBT data) {
public void read(final CompoundTag data) {
super.read(data);
this.omniDirectional = data.getBoolean("omniDirectional");
src/main/java/appeng/tile/misc/PaintSplotchesTileEntity.java
+4 -4
View File
@@ -31,10 +31,10 @@ import io.netty.buffer.Unpooled;
import net.minecraft.block.BlockState;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.PacketBuffer;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.Direction;
import net.minecraft.util.math.Direction;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Vec3d;
import net.minecraft.world.LightType;
@@ -67,7 +67,7 @@ public class PaintSplotchesTileEntity extends AEBaseTileEntity {
}
@Override
public CompoundNBT write(final CompoundNBT data) {
public CompoundTag write(final CompoundTag data) {
super.write(data);
final PacketBuffer myDat = new PacketBuffer(Unpooled.buffer());
this.writeBuffer(myDat);
@@ -91,7 +91,7 @@ public class PaintSplotchesTileEntity extends AEBaseTileEntity {
}
@Override
public void read(final CompoundNBT data) {
public void read(final CompoundTag data) {
super.read(data);
if (data.contains("dots")) {
this.readBuffer(new PacketBuffer(Unpooled.copiedBuffer(data.getByteArray("dots"))));
src/main/java/appeng/tile/misc/QuartzGrowthAcceleratorTileEntity.java
+1 -1
View File
@@ -23,7 +23,7 @@ import java.util.EnumSet;
import net.minecraft.network.PacketBuffer;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.Direction;
import net.minecraft.util.math.Direction;
import appeng.api.implementations.IPowerChannelState;
import appeng.api.implementations.tiles.ICrystalGrowthAccelerator;
src/main/java/appeng/tile/misc/SecurityStationTileEntity.java
+9 -9
View File
@@ -26,11 +26,11 @@ import java.util.Map;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.nbt.INBT;
import net.minecraft.network.PacketBuffer;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.Direction;
import net.minecraft.util.math.Direction;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.common.MinecraftForge;
@@ -149,7 +149,7 @@ public class SecurityStationTileEntity extends AENetworkTileEntity implements IT
}
@Override
public CompoundNBT write(final CompoundNBT data) {
public CompoundTag write(final CompoundTag data) {
super.write(data);
this.cm.writeToNBT(data);
data.putByte("paintedColor", (byte) this.paintedColor.ordinal());
@@ -157,11 +157,11 @@ public class SecurityStationTileEntity extends AENetworkTileEntity implements IT
data.putLong("securityKey", this.securityKey);
this.getConfigSlot().writeToNBT(data, "config");
final CompoundNBT storedItems = new CompoundNBT();
final CompoundTag storedItems = new CompoundTag();
int offset = 0;
for (final IAEItemStack ais : this.inventory.getStoredItems()) {
final CompoundNBT it = new CompoundNBT();
final CompoundTag it = new CompoundTag();
ais.createItemStack().write(it);
storedItems.put(String.valueOf(offset), it);
offset++;
@@ -172,7 +172,7 @@ public class SecurityStationTileEntity extends AENetworkTileEntity implements IT
}
@Override
public void read(final CompoundNBT data) {
public void read(final CompoundTag data) {
super.read(data);
this.cm.readFromNBT(data);
if (data.contains("paintedColor")) {
@@ -182,11 +182,11 @@ public class SecurityStationTileEntity extends AENetworkTileEntity implements IT
this.securityKey = data.getLong("securityKey");
this.getConfigSlot().readFromNBT(data, "config");
final CompoundNBT storedItems = data.getCompound("storedItems");
final CompoundTag storedItems = data.getCompound("storedItems");
for (final Object key : storedItems.keySet()) {
final INBT obj = storedItems.get((String) key);
if (obj instanceof CompoundNBT) {
this.inventory.getStoredItems().add(AEItemStack.fromItemStack(ItemStack.read((CompoundNBT) obj)));
if (obj instanceof CompoundTag) {
this.inventory.getStoredItems().add(AEItemStack.fromItemStack(ItemStack.read((CompoundTag) obj)));
}
}
}
src/main/java/appeng/tile/misc/VibrationChamberTileEntity.java
+4 -4
View File
@@ -24,10 +24,10 @@ import javax.annotation.Nonnull;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.PacketBuffer;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.Direction;
import net.minecraft.util.math.Direction;
import net.minecraftforge.common.ForgeHooks;
import net.minecraftforge.items.IItemHandler;
@@ -92,7 +92,7 @@ public class VibrationChamberTileEntity extends AENetworkInvTileEntity implement
}
@Override
public CompoundNBT write(final CompoundNBT data) {
public CompoundTag write(final CompoundTag data) {
super.write(data);
data.putDouble("burnTime", this.getBurnTime());
data.putDouble("maxBurnTime", this.getMaxBurnTime());
@@ -101,7 +101,7 @@ public class VibrationChamberTileEntity extends AENetworkInvTileEntity implement
}
@Override
public void read(final CompoundNBT data) {
public void read(final CompoundTag data) {
super.read(data);
this.setBurnTime(data.getDouble("burnTime"));
this.setMaxBurnTime(data.getDouble("maxBurnTime"));