Skip to content

Commit a23e4b7

Browse files
committed
收拾sddsd的圣遗物
1 parent e7fced1 commit a23e4b7

5 files changed

Lines changed: 13 additions & 13 deletions

File tree

src/main/java/com/circulation/random_complement/mixin/te5/dynamo/MixinTileDynamoBase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public abstract class MixinTileDynamoBase extends TileInventory implements ITick
2626

2727
@Redirect(method = "installAugmentToSlot", at = @At(value = "INVOKE", target = "Lcofh/thermalexpansion/block/dynamo/TileDynamoBase;getBasePower(I)I"))
2828
public int setBasePower(TileDynamoBase instance, int level, @Local(ordinal = 0, argsOnly = true) int slot) {
29-
return getBasePower(level) * this.augments[slot].getCount();
29+
return getBasePower(level) * Math.min(RCConfig.COFHCORE.SocketLimitModified, this.augments[slot].getCount());
3030
}
3131

3232
@ModifyConstant(method = "installAugmentToSlot", constant = @Constant(intValue = 15, ordinal = 0))

src/main/java/com/circulation/random_complement/mixin/te5/machine/MixinTileBrewer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ public class MixinTileBrewer extends TileMachineBase {
1313

1414
@ModifyConstant(method = "installAugmentToSlot", constant = @Constant(intValue = 15, ordinal = 0))
1515
private int setMachineBrewerReagentReuseChance(int constant, @Local(ordinal = 0, argsOnly = true) int slot) {
16-
return constant * this.augments[slot].getCount();
16+
return constant * Math.min(RCConfig.COFHCORE.SocketLimitModified, this.augments[slot].getCount());
1717
}
1818

1919
@ModifyConstant(method = "installAugmentToSlot", constant = @Constant(intValue = 15, ordinal = 1))
2020
private int setMachineBrewerReagentEnergyMod(int constant, @Local(ordinal = 0, argsOnly = true) int slot) {
21-
return RCConfig.TE5.IncreasedEnergyConsumption ? constant * this.augments[slot].getCount() : constant;
21+
return RCConfig.TE5.IncreasedEnergyConsumption ? constant * Math.min(RCConfig.COFHCORE.SocketLimitModified, this.augments[slot].getCount()) : constant;
2222
}
2323
}

src/main/java/com/circulation/random_complement/mixin/te5/machine/MixinTileInsolator.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
public class MixinTileInsolator extends TileMachineBase {
1313

1414
@ModifyConstant(method = "installAugmentToSlot", constant = @Constant(intValue = 20))
15-
private int setMachineInsolatorFertilizerReuseChance(int constant, @Local(ordinal = 0) int slot) {
16-
return constant * this.augments[slot].getCount();
15+
private int setMachineInsolatorFertilizerReuseChance(int constant, @Local(ordinal = 0, argsOnly = true) int slot) {
16+
return constant * Math.min(RCConfig.COFHCORE.SocketLimitModified, this.augments[slot].getCount());
1717
}
1818

1919
@ModifyConstant(method = "installAugmentToSlot", constant = @Constant(intValue = 15))
20-
private int setMachineInsolatorFertilizerEnergyMod(int constant, @Local(ordinal = 0) int slot) {
21-
return RCConfig.TE5.IncreasedEnergyConsumption ? constant * this.augments[slot].getCount() : constant;
20+
private int setMachineInsolatorFertilizerEnergyMod(int constant, @Local(ordinal = 0, argsOnly = true) int slot) {
21+
return RCConfig.TE5.IncreasedEnergyConsumption ? constant * Math.min(RCConfig.COFHCORE.SocketLimitModified, this.augments[slot].getCount()) : constant;
2222
}
2323
}

src/main/java/com/circulation/random_complement/mixin/te5/machine/MixinTileMachineBase.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,21 +27,21 @@ private int setReuseChance(int constant) {
2727

2828
@Redirect(method = "installAugmentToSlot", at = @At(value = "INVOKE", target = "Lcofh/thermalexpansion/block/machine/TileMachineBase;getBasePower(I)I"))
2929
public int setBasePower(TileMachineBase instance, int level, @Local(ordinal = 0, argsOnly = true) int slot) {
30-
return getBasePower(level) * this.augments[slot].getCount();
30+
return getBasePower(level) * Math.min(RCConfig.COFHCORE.SocketLimitModified, this.augments[slot].getCount());
3131
}
3232

3333
@ModifyConstant(method = "installAugmentToSlot", constant = @Constant(intValue = 10, ordinal = 0))
3434
private int setMachinePowerEnergyMod(int constant, @Local(ordinal = 0, argsOnly = true) int slot) {
35-
return RCConfig.TE5.IncreasedEnergyConsumption ? constant * this.augments[slot].getCount() : constant;
35+
return RCConfig.TE5.IncreasedEnergyConsumption ? constant * Math.min(RCConfig.COFHCORE.SocketLimitModified, this.augments[slot].getCount()) : constant;
3636
}
3737

3838
@ModifyConstant(method = "installAugmentToSlot", constant = @Constant(intValue = 15))
3939
private int setSecondaryChance(int constant, @Local(ordinal = 0, argsOnly = true) int slot) {
40-
return constant * this.augments[slot].getCount();
40+
return constant * Math.min(RCConfig.COFHCORE.SocketLimitModified, this.augments[slot].getCount());
4141
}
4242

4343
@ModifyConstant(method = "installAugmentToSlot", constant = @Constant(intValue = 10, ordinal = 1))
4444
private int setMachineSecondaryEnergyMod(int constant, @Local(ordinal = 0, argsOnly = true) int slot) {
45-
return RCConfig.TE5.IncreasedEnergyConsumption ? constant * this.augments[slot].getCount() : constant;
45+
return RCConfig.TE5.IncreasedEnergyConsumption ? constant * Math.min(RCConfig.COFHCORE.SocketLimitModified, this.augments[slot].getCount()) : constant;
4646
}
4747
}

src/main/java/com/circulation/random_complement/mixin/te5/machine/MixinTileSmelter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ public abstract class MixinTileSmelter extends TileMachineBase {
1313

1414
@ModifyConstant(method = "installAugmentToSlot", constant = @Constant(intValue = 15, ordinal = 0))
1515
private int setMachineSmelterReuseChance(int constant, @Local(ordinal = 0, argsOnly = true) int slot) {
16-
return constant * this.augments[slot].getCount();
16+
return constant * Math.min(RCConfig.COFHCORE.SocketLimitModified, this.augments[slot].getCount());
1717
}
1818

1919
@ModifyConstant(method = "installAugmentToSlot", constant = @Constant(intValue = 15, ordinal = 1))
2020
private int setMachineSmelterEnergyMod(int constant, @Local(ordinal = 0, argsOnly = true) int slot) {
21-
return RCConfig.TE5.IncreasedEnergyConsumption ? constant * this.augments[slot].getCount() : constant;
21+
return RCConfig.TE5.IncreasedEnergyConsumption ? constant * Math.min(RCConfig.COFHCORE.SocketLimitModified, this.augments[slot].getCount()) : constant;
2222
}
2323
}

0 commit comments

Comments
 (0)