mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-18 19:39:22 +00:00
Invalidate capabilities that we attach to vanilla entities and TileEntities. Closes #5307
This commit is contained in:
1 parent
d930c8ae8b
commit
0b1b3c68fa
13 files changed
+139
-53
No files matched your search
@@ -52,18 +52,20 @@ public final class CapabilityDispatcher implements INBTSerializable<NBTTagCompou
|
||||
private ICapabilityProvider[] caps;
|
||||
private INBTSerializable<INBTBase>[] writers;
|
||||
private String[] names;
|
||||
private final List<Runnable> listeners;
|
||||
|
||||
public CapabilityDispatcher(Map<ResourceLocation, ICapabilityProvider> list)
|
||||
public CapabilityDispatcher(Map<ResourceLocation, ICapabilityProvider> list, List<Runnable> listeners)
|
||||
{
|
||||
this(list, null);
|
||||
this(list, listeners, null);
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
public CapabilityDispatcher(Map<ResourceLocation, ICapabilityProvider> list, @Nullable ICapabilityProvider parent)
|
||||
public CapabilityDispatcher(Map<ResourceLocation, ICapabilityProvider> list, List<Runnable> listeners, @Nullable ICapabilityProvider parent)
|
||||
{
|
||||
List<ICapabilityProvider> lstCaps = Lists.newArrayList();
|
||||
List<INBTSerializable<INBTBase>> lstWriters = Lists.newArrayList();
|
||||
List<String> lstNames = Lists.newArrayList();
|
||||
this.listeners = listeners;
|
||||
|
||||
if (parent != null) // Parents go first!
|
||||
{
|
||||
@@ -134,4 +136,9 @@ public final class CapabilityDispatcher implements INBTSerializable<NBTTagCompou
|
||||
if (this.writers.length == 0) return other.writers.length == 0;
|
||||
return this.serializeNBT().equals(other.serializeNBT());
|
||||
}
|
||||
|
||||
public void invalidate()
|
||||
{
|
||||
this.listeners.forEach(Runnable::run);
|
||||
}
|
||||
}
|
||||
@@ -35,24 +35,25 @@ public abstract class CapabilityProvider<B extends CapabilityProvider<B>> implem
|
||||
{
|
||||
private final @Nonnull Class<B> baseClass;
|
||||
private @Nullable CapabilityDispatcher capabilities;
|
||||
|
||||
private boolean valid = true;
|
||||
|
||||
protected CapabilityProvider(Class<B> baseClass)
|
||||
{
|
||||
this.baseClass = baseClass;
|
||||
}
|
||||
|
||||
|
||||
protected final void gatherCapabilities() { gatherCapabilities(null); }
|
||||
|
||||
|
||||
protected final void gatherCapabilities(@Nullable ICapabilityProvider parent)
|
||||
{
|
||||
this.capabilities = ForgeEventFactory.gatherCapabilities(baseClass, this, parent);
|
||||
}
|
||||
|
||||
|
||||
protected final @Nullable CapabilityDispatcher getCapabilities()
|
||||
{
|
||||
return this.capabilities;
|
||||
}
|
||||
|
||||
|
||||
public final boolean areCapsCompatible(CapabilityProvider<B> other)
|
||||
{
|
||||
return areCapsCompatible(other.getCapabilities());
|
||||
@@ -71,23 +72,23 @@ public abstract class CapabilityProvider<B extends CapabilityProvider<B>> implem
|
||||
{
|
||||
return other.areCompatible(null);
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
return disp.areCompatible(other);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
protected final @Nullable NBTTagCompound serializeCaps()
|
||||
{
|
||||
final CapabilityDispatcher disp = getCapabilities();
|
||||
if (disp != null)
|
||||
if (disp != null)
|
||||
{
|
||||
return disp.serializeNBT();
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
protected final void deserializeCaps(NBTTagCompound tag)
|
||||
{
|
||||
final CapabilityDispatcher disp = getCapabilities();
|
||||
@@ -97,11 +98,19 @@ public abstract class CapabilityProvider<B extends CapabilityProvider<B>> implem
|
||||
}
|
||||
}
|
||||
|
||||
protected void invalidateCaps()
|
||||
{
|
||||
this.valid = false;
|
||||
final CapabilityDispatcher disp = getCapabilities();
|
||||
if (disp != null)
|
||||
disp.invalidate();
|
||||
}
|
||||
|
||||
@Override
|
||||
@Nonnull
|
||||
public <T> LazyOptional<T> getCapability(@Nonnull Capability<T> cap, @Nullable EnumFacing side)
|
||||
{
|
||||
final CapabilityDispatcher disp = getCapabilities();
|
||||
return disp == null ? LazyOptional.empty() : disp.getCapability(cap, side);
|
||||
return !valid || disp == null ? LazyOptional.empty() : disp.getCapability(cap, side);
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user