Skip to content

HotFix #68

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
QiuYe-123 merged 3 commits into from
Dec 16, 2025
Merged

HotFix #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9bedf1e
HotFix
QiuYe-123 Dec 16, 2025
e0edc10
HotFix
QiuYe-123 Dec 16, 2025
e1c647d
HotFix
QiuYe-123 Dec 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .../cn/qiuye/gtmoremachine/common/data/machines/multiblockmachine/WirelessMultiMachines.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public class WirelessMultiMachines {
.rotationState(RotationState.NON_Y_AXIS)
.appearanceBlock(GTBlocks.HIGH_POWER_CASING)
.recipeType(GTRecipeTypes.DUMMY_RECIPES)
.pattern((definition) -> FactoryBlockPattern.start()
.pattern(definition -> FactoryBlockPattern.start()
.aisle("B")
.aisle("A")
.aisle("~")
Expand All @@ -41,7 +41,7 @@ public class WirelessMultiMachines {
.rotationState(RotationState.NON_Y_AXIS)
.appearanceBlock(GTBlocks.HIGH_POWER_CASING)
.recipeType(GTRecipeTypes.DUMMY_RECIPES)
.pattern((definition) -> FactoryBlockPattern.start()
.pattern(definition -> FactoryBlockPattern.start()
.aisle("B")
.aisle("A")
.aisle("~")
Expand Down
5 changes: 1 addition & 4 deletions src/main/java/cn/qiuye/gtmoremachine/common/item/WirelessEnergyBindingToolBehavior.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,7 @@ class WirelessEnergyBindingToolBehavior : IInteractionItem {
}
else -> BigInteger.ZERO
}
fun getmachine(level: BlockGetter?, pos: BlockPos): MetaMachine? {
val machine = level?.let { MetaMachine.getMachine(it, pos) } ?: return null
return machine
}
fun getmachine(level: BlockGetter, pos: BlockPos): MetaMachine = MetaMachine.getMachine(level, pos)!!
private fun calculateBatteryRate(machine: BatteryBufferMachine): BigInteger {
val inv = machine.batteryInventory
var rate = BigInteger.ZERO
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/cn/qiuye/gtmoremachine/forge/ForgeCommonEventListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@ public static void onServerTickEvent(TickEvent.ServerTickEvent event) {
boolean refreshBinding = event.getServer().getTickCount() % 200 == 0;
for (WirelessEnergyContainer container : WirelessEnergySavedData.INSTANCE.containerMap.values()) {
if (refreshBinding) {
BigInteger rate = BigInteger.ZERO;
BigInteger rate;
GlobalPos pos = container.getBindPos();
MetaMachine machine = WirelessEnergyBindingToolBehavior.Companion.getmachine(event.getServer().getLevel(pos.dimension()), pos.pos());
if (machine != null) {
if (pos != null) {
MetaMachine machine = WirelessEnergyBindingToolBehavior.Companion.getmachine(event.getServer().getLevel(pos.dimension()), pos.pos());
rate = WirelessEnergyBindingToolBehavior.Companion.getRate(machine);
container.setDimensional(14, rate.compareTo(BigInteger.ZERO) > 0, machine);
container.setRate(rate);
}
container.setRate(rate);
}
container.getAllEnergyStat().tick();
container.getInEnergyStat().tick();
Expand Down