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

1.15 port

Browse Source
This commit is contained in:
yueh
2020-05-18 14:02:45 +02:00
parent 0ea86c939c
commit 16d6d55d7f
630 changed files with 4211 additions and 12664 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/capabilities/Capabilities.java
+4 -30
View File
@@ -19,10 +19,8 @@
package appeng.capabilities;
import net.darkhax.tesla.api.ITeslaConsumer;
import net.darkhax.tesla.api.ITeslaHolder;
import net.minecraft.nbt.NBTBase;
import net.minecraft.util.EnumFacing;
import net.minecraft.nbt.INBT;
import net.minecraft.util.Direction;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.common.capabilities.CapabilityInject;
import net.minecraftforge.common.capabilities.CapabilityManager;
@@ -30,8 +28,6 @@ import net.minecraftforge.energy.IEnergyStorage;
import appeng.api.storage.ISpatialDimension;
import appeng.api.storage.IStorageMonitorableAccessor;
import appeng.integration.IntegrationRegistry;
import appeng.integration.IntegrationType;
/**
@@ -48,10 +44,6 @@ public final class Capabilities
public static Capability<ISpatialDimension> SPATIAL_DIMENSION;
public static Capability<ITeslaConsumer> TESLA_CONSUMER;
public static Capability<ITeslaHolder> TESLA_HOLDER;
public static Capability<IEnergyStorage> FORGE_ENERGY;
/**
@@ -75,24 +67,6 @@ public final class Capabilities
SPATIAL_DIMENSION = cap;
}
@CapabilityInject( ITeslaConsumer.class )
private static void capITeslaConsumerRegistered( Capability<ITeslaConsumer> cap )
{
if( IntegrationRegistry.INSTANCE.isEnabled( IntegrationType.TESLA ) )
{
TESLA_CONSUMER = cap;
}
}
@CapabilityInject( ITeslaHolder.class )
private static void capITeslaHolderRegistered( Capability<ITeslaHolder> cap )
{
if( IntegrationRegistry.INSTANCE.isEnabled( IntegrationType.TESLA ) )
{
TESLA_HOLDER = cap;
}
}
@CapabilityInject( IEnergyStorage.class )
private static void capIEnergyStorageRegistered( Capability<IEnergyStorage> cap )
{
@@ -105,13 +79,13 @@ public final class Capabilities
return new Capability.IStorage<T>()
{
@Override
public NBTBase writeNBT( Capability<T> capability, T instance, EnumFacing side )
public INBT writeNBT( Capability<T> capability, T instance, Direction side )
{
return null;
}
@Override
public void readNBT( Capability<T> capability, T instance, EnumFacing side, NBTBase nbt )
public void readNBT( Capability<T> capability, T instance, Direction side, INBT nbt )
{
}