more gtceu p2p fixes

This commit is contained in:
PrototypeTrousers
2022-01-20 17:05:21 -03:00
parent e0ddb92b81
commit 4414451f5e
5 changed files with 40 additions and 17 deletions
@@ -80,14 +80,9 @@ public final class P2PTunnelRegistry implements IP2PTunnelRegistry
gtceOreDict.add("cableGtSingle");
for(String oreDict : gtceOreDict) {
Arrays.stream(OreDictionary.getOreNames()).filter(s -> s.startsWith(oreDict)).forEach(s -> {
OreHelper.INSTANCE.getCachedOres(s).forEach(
stack -> {
this.addNewAttunement(stack, TunnelType.GTCEU_POWER);
AELog.info("Added " + stack + " to P2P Tunnel Registry");
});
}
);
Arrays.stream( OreDictionary.getOreNames() ).filter( oreName -> oreName.startsWith( oreDict ) ).forEach( oreName -> {
OreHelper.INSTANCE.getCachedOres( oreName ).forEach( stack -> this.addNewAttunement( stack, TunnelType.GTCEU_POWER ) );
} );
}
/**
@@ -94,7 +94,32 @@ public class PartP2PGTCEPower extends PartP2PTunnel<PartP2PGTCEPower>
@Override
public long getEnergyCanBeInserted()
{
return Long.MAX_VALUE;
long canInsert = 0;
if( outputs.isEmpty() )
{
try
{
for( PartP2PGTCEPower o : PartP2PGTCEPower.this.getOutputs() )
outputs.add( o );
}
catch( GridAccessException e )
{
e.printStackTrace();
}
}
while ( !outputs.isEmpty() )
{
PartP2PGTCEPower target = outputs.poll();
final IEnergyContainer output = target.getAttachedEnergyStorage();
if( output == null || output.getEnergyCanBeInserted() <= 0 )
{
continue;
}
canInsert += output.getEnergyCanBeInserted();
}
return canInsert;
}
@Override
@@ -165,13 +190,13 @@ public class PartP2PGTCEPower extends PartP2PTunnel<PartP2PGTCEPower>
@Override
public long getInputAmperage()
{
return Long.MAX_VALUE;
return 0;
}
@Override
public long getInputVoltage()
{
return Long.MAX_VALUE;
return 0;
}
}
@@ -186,7 +211,11 @@ public class PartP2PGTCEPower extends PartP2PTunnel<PartP2PGTCEPower>
}
final IEnergyContainer output = getAttachedEnergyStorage();
voltage *= 0.95;
return output.acceptEnergyFromNetwork( facing, voltage, amperage );
if( voltage > 0 )
{
return output.acceptEnergyFromNetwork( facing, voltage, amperage );
}
return 0;
}
@Override
@@ -204,7 +204,7 @@ public class OreHelper
return oreIDs;
}
List<ItemStack> getCachedOres( final String oreName )
public List<ItemStack> getCachedOres( final String oreName )
{
return this.oreDictCache.getUnchecked( oreName );
}