Skip to content

Commit 0417365

Browse files
committed
fixed component tick being offset by one second due to the nature of how the reactor is made active
1 parent abf0ba3 commit 0417365

File tree

6 files changed

+27
-27
lines changed

6 files changed

+27
-27
lines changed

src/main/java/org/gtreimagined/gt4r/blockentity/multi/BlockEntityReactorCore.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,8 @@ public void serverTick(Level level, BlockPos blockPos, BlockState blockState) {
165165
}
166166
}
167167

168-
this.doHeatTick();
169-
this.doEUTick();
168+
this.doHeatTick(isActive);
169+
this.doEUTick(isActive);
170170

171171
if (wasActive != isActive) {
172172
this.setMachineState(isActive ? MachineState.ACTIVE : MachineState.IDLE);
@@ -264,7 +264,7 @@ public void resetHullHeatCache() {
264264
this.hullHeatCache = null;
265265
}
266266

267-
private void doHeatTick() {
267+
private void doHeatTick(boolean isActive) {
268268
this.addedHeat = 0;
269269
int oldStoredHeat = storedHeat;
270270

@@ -276,7 +276,7 @@ private void doHeatTick() {
276276
for (int col = 0; col < COL_COUNT; col++) {
277277
var component = getComponent(col, row);
278278
if (component != null) {
279-
component.onHeatTick();
279+
component.onHeatTick(isActive);
280280
}
281281
}
282282
}
@@ -293,14 +293,14 @@ private void doHeatTick() {
293293
doHeatDamage();
294294
}
295295

296-
private void doEUTick() {
296+
private void doEUTick(boolean isActive) {
297297
this.addedEU = 0;
298298

299299
for (int row = 0; row < ROW_COUNT; row++) {
300300
for (int col = 0; col < COL_COUNT; col++) {
301301
var component = getComponent(col, row);
302302
if (component != null) {
303-
component.onEnergyTick();
303+
component.onEnergyTick(isActive);
304304
}
305305
}
306306
}

src/main/java/org/gtreimagined/gt4r/reactor/components/IComponentAdapter.java

+12-12
Original file line numberDiff line numberDiff line change
@@ -4,48 +4,48 @@
44

55
public interface IComponentAdapter {
66

7-
public int getX();
7+
int getX();
88

9-
public int getY();
9+
int getY();
1010

11-
public ItemStack getItemStack();
11+
ItemStack getItemStack();
1212

13-
public default boolean containsHeat() {
13+
default boolean containsHeat() {
1414
return false;
1515
}
1616

17-
public default int getStoredHeat() {
17+
default int getStoredHeat() {
1818
return 0;
1919
}
2020

2121
/**
2222
* @return The amount of heat rejected
2323
*/
24-
public default int addHeat(int delta) {
24+
default int addHeat(int delta) {
2525
return delta;
2626
}
2727

28-
public default void onHeatTick() {
28+
default void onHeatTick(boolean isActive) {
2929

3030
}
3131

32-
public default void onEnergyTick() {
32+
default void onEnergyTick(boolean isActive) {
3333

3434
}
3535

36-
public default boolean reflectsNeutrons() {
36+
default boolean reflectsNeutrons() {
3737
return false;
3838
}
3939

40-
public default int getFuelRodCount() {
40+
default int getFuelRodCount() {
4141
return 0;
4242
}
4343

44-
public default int getReactorMaxHeatIncrease() {
44+
default int getReactorMaxHeatIncrease() {
4545
return 0;
4646
}
4747

48-
public default double getExplosionRadiusMultiplier() {
48+
default double getExplosionRadiusMultiplier() {
4949
return 1.0;
5050
}
5151

src/main/java/org/gtreimagined/gt4r/reactor/components/adapters/BreederRodAdapter.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ public ItemStack getItemStack() {
3838
}
3939

4040
@Override
41-
public void onHeatTick() {
42-
if (!reactor.isActive()) {
41+
public void onHeatTick(boolean isActive) {
42+
if (!isActive) {
4343
return;
4444
}
4545

src/main/java/org/gtreimagined/gt4r/reactor/components/adapters/FuelRodAdapter.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ protected double getHeatMultiplier() {
6060
}
6161

6262
@Override
63-
public void onHeatTick() {
64-
if (!reactor.isActive()) {
63+
public void onHeatTick(boolean isActive) {
64+
if (!isActive) {
6565
return;
6666
}
6767

@@ -98,8 +98,8 @@ public void onHeatTick() {
9898
}
9999

100100
@Override
101-
public void onEnergyTick() {
102-
if (!reactor.isActive()) {
101+
public void onEnergyTick(boolean isActive) {
102+
if (!isActive) {
103103
return;
104104
}
105105

src/main/java/org/gtreimagined/gt4r/reactor/components/adapters/HeatMoverAdapter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ protected int getTransferFromNeighbour(IComponentAdapter neighbour) {
7474
}
7575

7676
@Override
77-
public void onHeatTick() {
77+
public void onHeatTick(boolean isActive) {
7878
int fromReactor = getTransferFromReactor();
7979

8080
if (fromReactor != 0) {

src/main/java/org/gtreimagined/gt4r/reactor/components/adapters/NeutronReflectorAdapter.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ public ItemStack getItemStack() {
3939
}
4040

4141
@Override
42-
public void onHeatTick() {
43-
if (!reactor.isActive()) {
42+
public void onHeatTick(boolean isActive) {
43+
if (!isActive) {
4444
return;
4545
}
4646

0 commit comments

Comments
 (0)