Skip to content

Commit 138ff38

Browse files
author
Circulate233
committed
唉,通量,唉
1 parent a065f90 commit 138ff38

File tree

6 files changed

+52
-8
lines changed

6 files changed

+52
-8
lines changed

build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ plugins {
1313

1414
// Project properties
1515
group = "github.kasuminova.novaeng"
16-
version = "1.22.3"
16+
version = "1.22.4"
1717

1818
// Set the toolchain version to decouple the Java we run Gradle with from the Java used to compile and run the mod
1919
java {
@@ -273,9 +273,9 @@ dependencies {
273273
implementation(rfg.deobf("curse.maven:lazy-ae2-322347:3254160"))
274274
compileOnly(rfg.deobf("curse.maven:better-chat-363860:3048407"))
275275
compileOnly(rfg.deobf("curse.maven:ae2-fluid-crafting-rework-623955:5237484"))
276-
compileOnly(rfg.deobf("curse.maven:ingame-info-xml-225604:2489566"))
277276
compileOnly(rfg.deobf("curse.maven:lunatriuscore-225605:2489549"))
278277
compileOnly(rfg.deobf("curse.maven:immersive-engineering-231951:2974106"))
278+
compileOnly(rfg.deobf("curse.maven:ingame-info-xml-225604:2489566"))
279279
compileOnly(rfg.deobf("curse.maven:unidict-244258:3553627"))
280280
compileOnly(rfg.deobf("curse.maven:wanionlib-253043:4623135"))
281281
compileOnly(rfg.deobf("curse.maven:dme-737252:5043404"))

src/main/java/github/kasuminova/novaeng/common/handler/DreamEnergyPortHandler.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,9 @@ public void addToBuffer(long energy) {
4848
}
4949
}
5050

51-
boolean init = true;
52-
5351
public long removeFromBuffer(long energy) {
5452
long a = Math.min(Math.min(energy, this.getBuffer()), Math.max(Long.MAX_VALUE - this.removed,0));
55-
if (a <= 0L || init) {
56-
init = false;
53+
if (a <= 0L) {
5754
return 0L;
5855
} else {
5956
DreamEnergyCore.extractEnergy(getCtrl(),1,a);

src/main/java/github/kasuminova/novaeng/mixin/fluxnetworks/MixinFluxNetworkServer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public abstract class MixinFluxNetworkServer extends FluxNetworkBase {
1616

1717
@Redirect(method = "onEndServerTick", at = @At(value = "INVOKE", target = "Lsonar/fluxnetworks/api/network/ITransferHandler;getRequest()J",ordinal = 1))
1818
public long getRequest(ITransferHandler instance){
19-
var i = instance.getRequest();
19+
long i = instance.getRequest();
2020
if (this.bufferLimiter == Long.MAX_VALUE) {
2121
return 0;
2222
} else return Math.min(Long.MAX_VALUE - this.bufferLimiter, i);
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
package github.kasuminova.novaeng.mixin.fluxnetworks;
2+
3+
import net.minecraft.util.EnumFacing;
4+
import org.spongepowered.asm.mixin.Final;
5+
import org.spongepowered.asm.mixin.Mixin;
6+
import org.spongepowered.asm.mixin.Shadow;
7+
import org.spongepowered.asm.mixin.injection.At;
8+
import org.spongepowered.asm.mixin.injection.Redirect;
9+
import sonar.fluxnetworks.common.connection.transfer.BasicPointHandler;
10+
import sonar.fluxnetworks.common.connection.transfer.ConnectionTransfer;
11+
import sonar.fluxnetworks.common.connection.transfer.FluxPointHandler;
12+
import sonar.fluxnetworks.common.tileentity.TileFluxPoint;
13+
14+
import java.util.Map;
15+
16+
@Mixin(value = FluxPointHandler.class,remap = false)
17+
public abstract class MixinFluxPointHandler extends BasicPointHandler<TileFluxPoint> {
18+
19+
@Shadow @Final private Map<EnumFacing, ConnectionTransfer> transfers;
20+
21+
public MixinFluxPointHandler(TileFluxPoint device) {
22+
super(device);
23+
}
24+
25+
@Redirect(method = "sendToConsumers",at = @At(value = "INVOKE", target = "Lsonar/fluxnetworks/common/connection/transfer/ConnectionTransfer;sendToTile(JZ)J"))
26+
public long sendToConsumersRedirect(ConnectionTransfer instance, long l, boolean amount) {
27+
return Math.max(instance.sendToTile(l,amount),0);
28+
}
29+
}
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
package github.kasuminova.novaeng.mixin.fluxnetworks;
2+
3+
import net.minecraft.item.ItemStack;
4+
import org.spongepowered.asm.mixin.Mixin;
5+
import org.spongepowered.asm.mixin.injection.At;
6+
import org.spongepowered.asm.mixin.injection.Redirect;
7+
import sonar.fluxnetworks.api.energy.IItemEnergyHandler;
8+
9+
@Mixin(targets = "sonar.fluxnetworks.common.connection.transfer.FluxControllerHandler$WirelessHandler",remap = false)
10+
public class MixinWirelessHandler {
11+
12+
@Redirect(method = "chargeItems",at = @At(value = "INVOKE", target = "Lsonar/fluxnetworks/api/energy/IItemEnergyHandler;addEnergy(JLnet/minecraft/item/ItemStack;Z)J"))
13+
private long chargeItemsRedirect(IItemEnergyHandler instance, long l, ItemStack itemStack, boolean b) {
14+
return Math.max(instance.addEnergy(l,itemStack,b),0);
15+
}
16+
}

src/main/resources/mixins.novaeng_core_fluxnetworks.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
],
99
"mixins": [
1010
"MixinBasicTransferHandler",
11-
"MixinFluxNetworkServer"
11+
"MixinFluxNetworkServer",
12+
"MixinFluxPointHandler",
13+
"MixinWirelessHandler"
1214
]
1315
}

0 commit comments

Comments
 (0)