Fixed javadoc, fixed cables giving the details of their provider instead of themselves

This commit is contained in:
Tracker-Friendly 2025-02-24 18:17:10 +00:00
parent 111f9cbdad
commit b45e79029e
3 changed files with 5 additions and 9 deletions

View file

@ -9,10 +9,11 @@ public interface EnergyProvider {
/** /**
* When called by a receiver, attempts to remove energy from the provider. * When called by a receiver, attempts to remove energy from the provider.
* Do not attempt to extract energy until {@link EnergyReceiver#ready(EnergyProvider)} is called by the receiver. * Do not attempt to extract energy until {@link EnergyReceiver#ready(EnergyProvider)} is called by the receiver.
* The receiver may attempt to remove itself from the provider if it is no longer able to receive energy; this will be done via unready.
* *
* @param amount The target amount of energy to extract * @param amount The target amount of energy to extract
* @param receiver The receiver that is attempting to extract energy * @param receiver The receiver that is attempting to extract energy
* @return The amount of energy actually extracted. If zero, the receiver will not attempt to extract energy until {@link EnergyReceiver#ready(EnergyProvider)} is called. * @return The amount of energy actually extracted.
*/ */
long extract(long amount, EnergyReceiver receiver); long extract(long amount, EnergyReceiver receiver);

View file

@ -43,18 +43,16 @@ public class SimpleCable extends BlockEntity implements EnergyProvider, EnergyRe
@Override @Override
public long extract(long amount, EnergyReceiver receiver) { public long extract(long amount, EnergyReceiver receiver) {
System.out.println("Extracting " + amount + " energy");
long extracted = Math.min(Math.min(outputRate, amount), energy); long extracted = Math.min(Math.min(outputRate, amount), energy);
energy -= extracted; energy -= extracted;
if (energy == 0) {
CoordinateMatchMaker.removeProvider(providerDetails);
}
return extracted; return extracted;
} }
@Override @Override
public void exists(EnergyReceiver receiver, ArrayList<Vec3i> pointsOfPresence) { public void exists(EnergyReceiver receiver, ArrayList<Vec3i> pointsOfPresence) {
if (currentProvider != null) { if (currentProvider != null) {
receiver.ready(currentProvider); receiver.ready(this);
} }
} }

View file

@ -44,9 +44,6 @@ public class SimpleCodeOnlyCable implements EnergyProvider, EnergyReceiver, Serv
long extracted = Math.min(Math.min(outputRate, amount), energy); long extracted = Math.min(Math.min(outputRate, amount), energy);
energy -= extracted; energy -= extracted;
System.out.println(name + " extracted " + extracted + " energy"); System.out.println(name + " extracted " + extracted + " energy");
if (energy == 0) {
CoordinateMatchMaker.removeProvider(providerDetails);
}
return extracted; return extracted;
} }
@ -54,7 +51,7 @@ public class SimpleCodeOnlyCable implements EnergyProvider, EnergyReceiver, Serv
public void exists(EnergyReceiver receiver, ArrayList<Vec3i> pointsOfPresence) { public void exists(EnergyReceiver receiver, ArrayList<Vec3i> pointsOfPresence) {
System.out.println(name + " found other receiver"); System.out.println(name + " found other receiver");
if (currentProvider != null) { if (currentProvider != null) {
receiver.ready(currentProvider); receiver.ready(this);
} }
} }