Merge pull request #1216 from mrh0/mc1.15/dev

Improved modding support
This commit is contained in:
simibubi 2021-04-02 18:56:20 +02:00 committed by GitHub
commit c82896998c
Failed to generate hash of commit

View file

@ -60,8 +60,8 @@ public abstract class KineticTileEntity extends SmartTileEntity
private int flickerTally; private int flickerTally;
private int networkSize; private int networkSize;
private int validationCountdown; private int validationCountdown;
private float lastStressApplied; protected float lastStressApplied;
private float lastCapacityProvided; protected float lastCapacityProvided;
public KineticTileEntity(TileEntityType<?> typeIn) { public KineticTileEntity(TileEntityType<?> typeIn) {
super(typeIn); super(typeIn);
@ -161,7 +161,7 @@ public abstract class KineticTileEntity extends SmartTileEntity
} }
public float calculateStressApplied() { public float calculateStressApplied() {
float impact = (float) AllConfigs.SERVER.kinetics.stressValues.getImpactOf(getBlockState().getBlock()); float impact = (float) AllConfigs.SERVER.kinetics.stressValues.getImpactOf(getStressConfigKey());
this.lastStressApplied = impact; this.lastStressApplied = impact;
return impact; return impact;
} }