Update to 1.14.2

This commit is contained in:
LexManos authored and cpw committed 2019-06-07 16:50:47 -04:00
1 parent d3e8804dbf
commit a7df63e1a1
1010 files changed
+15254 -19520

No files matched your search

@@ -23,8 +23,8 @@ import java.util.concurrent.Callable;
import com.google.common.base.Throwables;
import net.minecraft.nbt.INBTBase;
import net.minecraft.util.EnumFacing;
import net.minecraft.nbt.INBT;
import net.minecraft.util.Direction;
import net.minecraftforge.common.util.LazyOptional;
import javax.annotation.Nonnull;
@@ -60,7 +60,7 @@ public class Capability<T>
* @return a NBT holding the data. Null if no data needs to be stored.
*/
@Nullable
INBTBase writeNBT(Capability<T> capability, T instance, EnumFacing side);
INBT writeNBT(Capability<T> capability, T instance, Direction side);
/**
* Read the capability instance from a NBT tag.
@@ -81,7 +81,7 @@ public class Capability<T>
* @param side The side of the object the instance is associated with.
* @param nbt A NBT holding the data. Must not be null, as doesn't make sense to call this function with nothing to read...
*/
void readNBT(Capability<T> capability, T instance, EnumFacing side, INBTBase nbt);
void readNBT(Capability<T> capability, T instance, Direction side, INBT nbt);
}
/**
@@ -99,7 +99,7 @@ public class Capability<T>
* Quick access to the IStorage's readNBT.
* See {@link IStorage#readNBT(Capability, Object, EnumFacing, NBTBase)} for documentation.
*/
public void readNBT(T instance, EnumFacing side, INBTBase nbt)
public void readNBT(T instance, Direction side, INBT nbt)
{
storage.readNBT(this, instance, side, nbt);
}
@@ -109,7 +109,7 @@ public class Capability<T>
* See {@link IStorage#writeNBT(Capability, Object, EnumFacing)} for documentation.
*/
@Nullable
public INBTBase writeNBT(T instance, EnumFacing side)
public INBT writeNBT(T instance, Direction side)
{
return storage.writeNBT(this, instance, side);
}
@@ -28,9 +28,9 @@ import java.util.Map;
import com.google.common.collect.Lists;
import mcp.MethodsReturnNonnullByDefault;
import net.minecraft.nbt.INBTBase;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.EnumFacing;
import net.minecraft.nbt.INBT;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.util.Direction;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.common.util.INBTSerializable;
import net.minecraftforge.common.util.LazyOptional;
@@ -47,10 +47,10 @@ import net.minecraftforge.common.util.LazyOptional;
*/
@ParametersAreNonnullByDefault
@MethodsReturnNonnullByDefault
public final class CapabilityDispatcher implements INBTSerializable<NBTTagCompound>, ICapabilityProvider
public final class CapabilityDispatcher implements INBTSerializable<CompoundNBT>, ICapabilityProvider
{
private ICapabilityProvider[] caps;
private INBTSerializable<INBTBase>[] writers;
private INBTSerializable<INBT>[] writers;
private String[] names;
private final List<Runnable> listeners;
@@ -63,7 +63,7 @@ public final class CapabilityDispatcher implements INBTSerializable<NBTTagCompou
public CapabilityDispatcher(Map<ResourceLocation, ICapabilityProvider> list, List<Runnable> listeners, @Nullable ICapabilityProvider parent)
{
List<ICapabilityProvider> lstCaps = Lists.newArrayList();
List<INBTSerializable<INBTBase>> lstWriters = Lists.newArrayList();
List<INBTSerializable<INBT>> lstWriters = Lists.newArrayList();
List<String> lstNames = Lists.newArrayList();
this.listeners = listeners;
@@ -72,7 +72,7 @@ public final class CapabilityDispatcher implements INBTSerializable<NBTTagCompou
lstCaps.add(parent);
if (parent instanceof INBTSerializable)
{
lstWriters.add((INBTSerializable<INBTBase>)parent);
lstWriters.add((INBTSerializable<INBT>)parent);
lstNames.add("Parent");
}
}
@@ -83,7 +83,7 @@ public final class CapabilityDispatcher implements INBTSerializable<NBTTagCompou
lstCaps.add(prov);
if (prov instanceof INBTSerializable)
{
lstWriters.add((INBTSerializable<INBTBase>)prov);
lstWriters.add((INBTSerializable<INBT>)prov);
lstNames.add(entry.getKey().toString());
}
}
@@ -95,7 +95,7 @@ public final class CapabilityDispatcher implements INBTSerializable<NBTTagCompou
@Override
public <T> LazyOptional<T> getCapability(Capability<T> cap, @Nullable EnumFacing side)
public <T> LazyOptional<T> getCapability(Capability<T> cap, @Nullable Direction side)
{
for (ICapabilityProvider c : caps)
{
@@ -108,24 +108,24 @@ public final class CapabilityDispatcher implements INBTSerializable<NBTTagCompou
}
@Override
public NBTTagCompound serializeNBT()
public CompoundNBT serializeNBT()
{
NBTTagCompound nbt = new NBTTagCompound();
CompoundNBT nbt = new CompoundNBT();
for (int x = 0; x < writers.length; x++)
{
nbt.setTag(names[x], writers[x].serializeNBT());
nbt.func_218657_a(names[x], writers[x].serializeNBT());
}
return nbt;
}
@Override
public void deserializeNBT(NBTTagCompound nbt)
public void deserializeNBT(CompoundNBT nbt)
{
for (int x = 0; x < writers.length; x++)
{
if (nbt.hasKey(names[x]))
if (nbt.contains(names[x]))
{
writers[x].deserializeNBT(nbt.getTag(names[x]));
writers[x].deserializeNBT(nbt.get(names[x]));
}
}
}
@@ -22,10 +22,9 @@ package net.minecraftforge.common.capabilities;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import javax.annotation.ParametersAreNonnullByDefault;
import mcp.MethodsReturnNonnullByDefault;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.EnumFacing;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.util.Direction;
import net.minecraftforge.common.util.LazyOptional;
import net.minecraftforge.event.ForgeEventFactory;
@@ -79,7 +78,7 @@ public abstract class CapabilityProvider<B extends CapabilityProvider<B>> implem
}
}
protected final @Nullable NBTTagCompound serializeCaps()
protected final @Nullable CompoundNBT serializeCaps()
{
final CapabilityDispatcher disp = getCapabilities();
if (disp != null)
@@ -89,7 +88,7 @@ public abstract class CapabilityProvider<B extends CapabilityProvider<B>> implem
return null;
}
protected final void deserializeCaps(NBTTagCompound tag)
protected final void deserializeCaps(CompoundNBT tag)
{
final CapabilityDispatcher disp = getCapabilities();
if (disp != null)
@@ -113,7 +112,7 @@ public abstract class CapabilityProvider<B extends CapabilityProvider<B>> implem
@Override
@Nonnull
public <T> LazyOptional<T> getCapability(@Nonnull Capability<T> cap, @Nullable EnumFacing side)
public <T> LazyOptional<T> getCapability(@Nonnull Capability<T> cap, @Nullable Direction side)
{
final CapabilityDispatcher disp = getCapabilities();
return !valid || disp == null ? LazyOptional.empty() : disp.getCapability(cap, side);
@@ -22,7 +22,7 @@ package net.minecraftforge.common.capabilities;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.Direction;
import net.minecraftforge.common.util.LazyOptional;
public interface ICapabilityProvider
@@ -38,7 +38,7 @@ public interface ICapabilityProvider
* <strong>CAN BE NULL</strong>. Null is defined to represent 'internal' or 'self'
* @return The requested an optional holding the requested capability.
*/
@Nonnull <T> LazyOptional<T> getCapability(@Nonnull final Capability<T> cap, final @Nullable EnumFacing side);
@Nonnull <T> LazyOptional<T> getCapability(@Nonnull final Capability<T> cap, final @Nullable Direction side);
/*
* Purely added as a bouncer to sided version, to make modders stop complaining about calling with a null value.
@@ -19,8 +19,8 @@
package net.minecraftforge.common.capabilities;
import net.minecraft.nbt.INBTBase;
import net.minecraft.nbt.INBT;
import net.minecraftforge.common.util.INBTSerializable;
//Just a mix of the two, useful in patches to lower the size.
public interface ICapabilitySerializable<T extends INBTBase> extends ICapabilityProvider, INBTSerializable<T>{}
public interface ICapabilitySerializable<T extends INBT> extends ICapabilityProvider, INBTSerializable<T>{}