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/fluids/util/AEFluidInventory.java
+9 -9
View File
@@ -5,7 +5,7 @@ import java.util.Objects;
import javax.annotation.Nonnull;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.nbt.CompoundTag;
import net.minecraftforge.fluids.FluidStack;
import appeng.api.storage.data.IAEFluidStack;
@@ -266,16 +266,16 @@ public class AEFluidInventory implements IAEFluidTank {
return stack;
}
public void writeToNBT(final CompoundNBT data, final String name) {
final CompoundNBT c = new CompoundNBT();
public void writeToNBT(final CompoundTag data, final String name) {
final CompoundTag c = new CompoundTag();
this.writeToNBT(c);
data.put(name, c);
}
private void writeToNBT(final CompoundNBT target) {
private void writeToNBT(final CompoundTag target) {
for (int x = 0; x < this.fluids.length; x++) {
try {
final CompoundNBT c = new CompoundNBT();
final CompoundTag c = new CompoundTag();
if (this.fluids[x] != null) {
this.fluids[x].writeToNBT(c);
@@ -287,17 +287,17 @@ public class AEFluidInventory implements IAEFluidTank {
}
}
public void readFromNBT(final CompoundNBT data, final String name) {
final CompoundNBT c = data.getCompound(name);
public void readFromNBT(final CompoundTag data, final String name) {
final CompoundTag c = data.getCompound(name);
if (!c.isEmpty()) {
this.readFromNBT(c);
}
}
private void readFromNBT(final CompoundNBT target) {
private void readFromNBT(final CompoundTag target) {
for (int x = 0; x < this.fluids.length; x++) {
try {
final CompoundNBT c = target.getCompound("#" + x);
final CompoundTag c = target.getCompound("#" + x);
if (!c.isEmpty()) {
this.fluids[x] = AEFluidStack.fromNBT(c);
src/main/java/appeng/fluids/util/AEFluidStack.java
+7 -7
View File
@@ -27,7 +27,7 @@ import net.minecraft.fluid.EmptyFluid;
import net.minecraft.fluid.Fluid;
import net.minecraft.fluid.Fluids;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.PacketBuffer;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.common.util.Constants;
@@ -51,7 +51,7 @@ public final class AEFluidStack extends AEStack<IAEFluidStack> implements IAEFlu
private static final String NBT_FLUID_TAG = "ft";
private final Fluid fluid;
private CompoundNBT tagCompound;
private CompoundTag tagCompound;
private AEFluidStack(final AEFluidStack fluidStack) {
this.fluid = fluidStack.fluid;
@@ -66,7 +66,7 @@ public final class AEFluidStack extends AEStack<IAEFluidStack> implements IAEFlu
}
}
private AEFluidStack(@Nonnull Fluid fluid, long amount, @Nullable CompoundNBT tag) {
private AEFluidStack(@Nonnull Fluid fluid, long amount, @Nullable CompoundTag tag) {
if (fluid == Fluids.EMPTY) {
System.out.println();
}
@@ -88,21 +88,21 @@ public final class AEFluidStack extends AEStack<IAEFluidStack> implements IAEFlu
}
long amount = input.getAmount();
CompoundNBT tag = null;
CompoundTag tag = null;
if (input.getTag() != null) {
tag = input.getTag().copy();
}
return new AEFluidStack(fluid, amount, tag);
}
public static IAEFluidStack fromNBT(final CompoundNBT data) {
public static IAEFluidStack fromNBT(final CompoundTag data) {
ResourceLocation fluidId = new ResourceLocation(data.getString(NBT_FLUID_ID));
Fluid fluid = ForgeRegistries.FLUIDS.getValue(fluidId);
if (fluid == null || fluid == Fluids.EMPTY) {
return null;
}
CompoundNBT tag = null;
CompoundTag tag = null;
if (data.contains(NBT_FLUID_TAG, Constants.NBT.TAG_COMPOUND)) {
tag = data.getCompound(NBT_FLUID_TAG);
}
@@ -126,7 +126,7 @@ public final class AEFluidStack extends AEStack<IAEFluidStack> implements IAEFlu
}
@Override
public void writeToNBT(final CompoundNBT data) {
public void writeToNBT(final CompoundTag data) {
data.putString(NBT_FLUID_ID, this.fluid.getRegistryName().toString());
if (this.hasTagCompound()) {
data.put(NBT_FLUID_TAG, this.tagCompound);