Splash of Smoke

- Removed nbt side-effects of the fan processing recipe check for ground items
- Fixes intersecting fan streams making passing ground items unable to be processed
This commit is contained in:
simibubi 2022-03-03 14:51:27 +01:00
parent 6420f54194
commit ccd4833148

View file

@ -76,13 +76,9 @@ public class InWorldProcessing {
if (compound.contains("Processing")) { if (compound.contains("Processing")) {
CompoundTag processing = compound.getCompound("Processing"); CompoundTag processing = compound.getCompound("Processing");
if (Type.valueOf(processing.getString("Type")) != type) { if (Type.valueOf(processing.getString("Type")) != type)
boolean canProcess = type.canProcess(entity.getItem(), entity.level); return type.canProcess(entity.getItem(), entity.level);
processing.putString("Type", type.name()); else if (processing.getInt("Time") >= 0)
if (!canProcess)
processing.putInt("Time", -1);
return canProcess;
} else if (processing.getInt("Time") >= 0)
return true; return true;
else if (processing.getInt("Time") == -1) else if (processing.getInt("Time") == -1)
return false; return false;
@ -445,12 +441,10 @@ public class InWorldProcessing {
}, },
NONE { NONE {
@Override @Override
public void spawnParticlesForProcessing(Level level, Vec3 pos) { public void spawnParticlesForProcessing(Level level, Vec3 pos) {}
}
@Override @Override
public void affectEntity(Entity entity, Level level) { public void affectEntity(Entity entity, Level level) {}
}
@Override @Override
public boolean canProcess(ItemStack stack, Level level) { public boolean canProcess(ItemStack stack, Level level) {